@akiojin/gwt 2.11.1 → 2.12.1

package/dist/claude.d.ts

@@ -8,6 +8,9 @@ export declare function launchClaudeCode(worktreePath: string, options?: {
     extraArgs?: string[];
     envOverrides?: Record<string, string>;
     model?: string;
-}): Promise<void>;
+    sessionId?: string | null;
+}): Promise<{
+    sessionId?: string | null;
+}>;
 export declare function isClaudeCodeAvailable(): Promise<boolean>;
 //# sourceMappingURL=claude.d.ts.map

package/dist/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"AAMA,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;CACX,GACL,OAAO,CAAC,IAAI,CAAC,CA+Of;AAiBD,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,CAqSxC;AAsBD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAe9D"}

package/dist/claude.js

@@ -2,6 +2,7 @@ import { execa } from "execa";
 import chalk from "chalk";
 import { existsSync } from "fs";
 import { createChildStdio, getTerminalStreams } from "./utils/terminal.js";
+import { findLatestClaudeSession } from "./utils/session.js";
 const CLAUDE_CLI_PACKAGE = "@anthropic-ai/claude-code@latest";
 export class ClaudeError extends Error {
     cause;
@@ -13,6 +14,7 @@ export class ClaudeError extends Error {
 }
 export async function launchClaudeCode(worktreePath, options = {}) {
     const terminal = getTerminalStreams();
+    const startedAt = Date.now();
     try {
         // Check if the worktree path exists
         if (!existsSync(worktreePath)) {
@@ -28,11 +30,19 @@ export async function launchClaudeCode(worktreePath, options = {}) {
         else if (options.model === "opus") {
             console.log(chalk.green(`   🎯 Model: ${options.model} (Default)`));
         }
+        const resumeSessionId = options.sessionId && options.sessionId.trim().length > 0
+            ? options.sessionId.trim()
+            : null;
         // Handle execution mode
         switch (options.mode) {
             case "continue":
-                args.push("-c");
-                console.log(chalk.cyan("   📱 Continuing most recent conversation"));
+                if (resumeSessionId) {
+                    args.push("--resume", resumeSessionId);
+                    console.log(chalk.cyan(`   📱 Continuing specific session: ${resumeSessionId}`));
+                }
+                else {
+                    console.log(chalk.yellow("   ℹ️  No saved session ID for this branch/tool. Starting new session."));
+                }
                 break;
             case "resume":
                 // TODO: Implement conversation selection with Ink UI
@@ -86,7 +96,13 @@ export async function launchClaudeCode(worktreePath, options = {}) {
                 }
                 */
                 // Use standard Claude Code resume for now
-                args.push("-r");
+                if (resumeSessionId) {
+                    args.push("--resume", resumeSessionId);
+                    console.log(chalk.cyan(`   🔄 Resuming Claude session: ${resumeSessionId}`));
+                }
+                else {
+                    args.push("-r");
+                }
                 break;
             case "normal":
             default:
@@ -114,6 +130,7 @@ export async function launchClaudeCode(worktreePath, options = {}) {
         if (options.extraArgs && options.extraArgs.length > 0) {
             args.push(...options.extraArgs);
         }
+        console.log(chalk.gray(`   📋 Args: ${args.join(" ")}`));
         terminal.exitRawMode();
         const baseEnv = {
             ...process.env,
@@ -127,7 +144,6 @@ export async function launchClaudeCode(worktreePath, options = {}) {
         const hasLocalClaude = await isClaudeCommandAvailable();
         try {
             if (hasLocalClaude) {
-                // Use locally installed claude command
                 console.log(chalk.green("   ✨ Using locally installed claude command"));
                 await execa("claude", args, {
                     cwd: worktreePath,
@@ -139,14 +155,12 @@ export async function launchClaudeCode(worktreePath, options = {}) {
                 });
             }
             else {
-                // Fallback to bunx
                 console.log(chalk.cyan("   🔄 Falling back to bunx @anthropic-ai/claude-code@latest"));
                 console.log(chalk.yellow("   💡 Recommended: Install Claude Code via official method for faster startup"));
                 console.log(chalk.yellow("      macOS/Linux: brew install --cask claude-code"));
                 console.log(chalk.yellow("      or: curl -fsSL https://claude.ai/install.sh | bash"));
                 console.log(chalk.yellow("      Windows: irm https://claude.ai/install.ps1 | iex"));
                 console.log("");
-                // Wait 2 seconds to let user read the message
                 await new Promise((resolve) => setTimeout(resolve, 2000));
                 await execa("bunx", [CLAUDE_CLI_PACKAGE, ...args], {
                     cwd: worktreePath,
@@ -161,6 +175,31 @@ export async function launchClaudeCode(worktreePath, options = {}) {
         finally {
             childStdio.cleanup();
         }
+        // File-based session detection only - no stdout capture
+        // Use only findLatestClaudeSession with short timeout, skip sessionProbe to avoid hanging
+        let capturedSessionId = null;
+        const finishedAt = Date.now();
+        try {
+            const latest = await findLatestClaudeSession(worktreePath, {
+                since: startedAt,
+                until: finishedAt + 30_000,
+                preferClosestTo: finishedAt,
+                windowMs: 10 * 60 * 1000,
+            });
+            // Priority: latest on disk > resumeSessionId
+            capturedSessionId = latest?.id ?? resumeSessionId ?? null;
+        }
+        catch {
+            capturedSessionId = resumeSessionId ?? null;
+        }
+        if (capturedSessionId) {
+            console.log(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
+            console.log(chalk.gray(`   Resume command: claude --resume ${capturedSessionId}`));
+        }
+        else {
+            console.log(chalk.yellow("\n   ℹ️  Could not determine Claude session ID automatically."));
+        }
+        return capturedSessionId ? { sessionId: capturedSessionId } : {};
     }
     catch (error) {
         const hasLocalClaude = await isClaudeCommandAvailable();
@@ -203,7 +242,12 @@ export async function launchClaudeCode(worktreePath, options = {}) {
 async function isClaudeCommandAvailable() {
     try {
         const command = process.platform === "win32" ? "where" : "which";
-        await execa(command, ["claude"], { shell: true });
+        await execa(command, ["claude"], {
+            shell: true,
+            stdin: "ignore",
+            stdout: "ignore",
+            stderr: "ignore",
+        });
         return true;
     }
     catch {

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

@@ -11,11 +11,18 @@ export interface SelectionResult {
     skipPermissions: boolean;
     model?: string | null;
     inferenceLevel?: InferenceLevel;
+    sessionId?: string | null;
 }
 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;AAS9E,OAAO,KAAK,EACV,MAAM,EAGN,cAAc,EAEf,MAAM,aAAa,CAAC;AAiCrB,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;CACjC;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,qBAw0BpE"}
+{"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"}

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

@@ -7,16 +7,20 @@ import { BranchActionSelectorScreen } from "../screens/BranchActionSelectorScree
 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";
 import { useGitData } from "../hooks/useGitData.js";
 import { useScreenState } from "../hooks/useScreenState.js";
 import { formatBranchItems } from "../utils/branchFormatter.js";
 import { calculateStatistics } from "../utils/statisticsCalculator.js";
 import { getRepositoryRoot, deleteBranch } from "../../../git.js";
+import { loadSession } from "../../../config/index.js";
 import { createWorktree, generateWorktreePath, getMergedPRWorktrees, isProtectedBranchName, removeWorktree, switchToProtectedBranch, } from "../../../worktree.js";
 import { getPackageVersion } from "../../../utils.js";
 import { resolveBaseBranchLabel, resolveBaseBranchRef, } from "../utils/baseBranch.js";
 import { getDefaultInferenceForModel, getDefaultModelOption, } from "../utils/modelOptions.js";
+import { resolveContinueSessionId, findLatestBranchSessionsByTool, } from "../utils/continueSession.js";
+import { findLatestCodexSession, findLatestCodexSessionId, findLatestClaudeSession, findLatestGeminiSession, } from "../../../utils/session.js";
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧"];
 const COMPLETION_HOLD_DURATION_MS = 3000;
 const PROTECTED_BRANCH_WARNING = "Root branches operate directly in the repository root. Create a new branch if you need a dedicated worktree.";
@@ -41,6 +45,14 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
     const { currentScreen, navigateTo, goBack } = useScreenState();
     // 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);
     // Selection state (for branch → tool → mode flow)
     const [selectedBranch, setSelectedBranch] = useState(null);
     const [creationSourceBranch, setCreationSourceBranch] = useState(null);
@@ -63,6 +75,12 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
             .then(setVersion)
             .catch(() => setVersion(null));
     }, []);
+    // Fetch repository root once for session lookups
+    useEffect(() => {
+        getRepositoryRoot()
+            .then(setRepoRoot)
+            .catch(() => setRepoRoot(null));
+    }, []);
     useEffect(() => {
         if (!cleanupInputLocked) {
             spinnerFrameIndexRef.current = 0;
@@ -110,6 +128,201 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
             setHiddenBranches(filtered);
         }
     }, [branches, hiddenBranches]);
+    // Load available sessions when entering session selector
+    useEffect(() => {
+        if (currentScreen !== "session-selector") {
+            return;
+        }
+        if (!selectedTool || !selectedBranch) {
+            setSessionOptions([]);
+            return;
+        }
+        setSessionLoading(true);
+        setSessionError(null);
+        (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("セッション一覧の取得に失敗しました");
+            }
+            finally {
+                setSessionLoading(false);
+            }
+        })();
+    }, [currentScreen, selectedTool, selectedBranch, repoRoot]);
+    // Load quick start options for selected branch (latest per tool)
+    useEffect(() => {
+        if (!selectedBranch) {
+            setBranchQuickStart([]);
+            return;
+        }
+        let cancelled = false;
+        setBranchQuickStartLoading(true);
+        (async () => {
+            try {
+                const root = repoRoot ?? (await getRepositoryRoot());
+                if (!repoRoot && root) {
+                    setRepoRoot(root);
+                }
+                if (!root) {
+                    if (!cancelled)
+                        setBranchQuickStart([]);
+                    return;
+                }
+                const sessionData = await loadSession(root);
+                const history = sessionData?.history ?? [];
+                const combinedHistory = [...history];
+                if (sessionData?.lastSessionId &&
+                    sessionData.lastBranch === selectedBranch.name &&
+                    sessionData.lastUsedTool) {
+                    const synthetic = {
+                        branch: sessionData.lastBranch,
+                        worktreePath: sessionData.lastWorktreePath ?? null,
+                        toolId: sessionData.lastUsedTool,
+                        toolLabel: sessionData.toolLabel ?? sessionData.lastUsedTool,
+                        sessionId: sessionData.lastSessionId,
+                        mode: sessionData.mode ?? null,
+                        model: sessionData.model ?? null,
+                        reasoningLevel: sessionData.reasoningLevel ?? null,
+                        skipPermissions: sessionData.skipPermissions ?? null,
+                        timestamp: sessionData.timestamp ?? Date.now(),
+                    };
+                    combinedHistory.push(synthetic);
+                }
+                const latestPerTool = findLatestBranchSessionsByTool(combinedHistory, selectedBranch.name, selectedWorktreePath);
+                const mapped = await Promise.all(latestPerTool.map(async (entry) => {
+                    let sessionId = entry.sessionId ?? null;
+                    // For Codex, prefer a newer filesystem session over stale history
+                    if (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;
+                            }
+                        }
+                        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") {
+                        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;
+                        }
+                        catch {
+                            // ignore lookup failure
+                        }
+                    }
+                    // For Gemini, prefer newest session file (Gemini keeps per-project chats)
+                    if (entry.toolId === "gemini-cli") {
+                        try {
+                            const gemSession = await findLatestGeminiSession(selectedWorktreePath ??
+                                selectedBranch?.displayName ??
+                                workingDirectory, {
+                                ...(entry.timestamp !== null && entry.timestamp !== undefined
+                                    ? { since: entry.timestamp - 60_000, preferClosestTo: entry.timestamp }
+                                    : {}),
+                                windowMs: 60 * 60 * 1000,
+                            });
+                            if (gemSession?.id)
+                                sessionId = gemSession.id;
+                        }
+                        catch {
+                            // ignore
+                        }
+                    }
+                    return {
+                        toolId: entry.toolId,
+                        toolLabel: entry.toolLabel,
+                        model: entry.model ?? null,
+                        inferenceLevel: (entry.reasoningLevel ??
+                            sessionData?.reasoningLevel ??
+                            null),
+                        sessionId,
+                        skipPermissions: entry.skipPermissions ?? sessionData?.skipPermissions ?? null,
+                        timestamp: entry.timestamp ?? null,
+                    };
+                }));
+                if (!cancelled) {
+                    setBranchQuickStart(mapped);
+                }
+            }
+            catch {
+                if (!cancelled)
+                    setBranchQuickStart([]);
+            }
+            finally {
+                if (!cancelled)
+                    setBranchQuickStartLoading(false);
+            }
+        })();
+        return () => {
+            cancelled = true;
+        };
+    }, [selectedBranch, repoRoot]);
+    // Load last session ID for "Continue" label when entering execution mode selector
+    useEffect(() => {
+        if (currentScreen !== "execution-mode-selector") {
+            return;
+        }
+        if (!selectedTool || !selectedBranch) {
+            setContinueSessionId(null);
+            return;
+        }
+        (async () => {
+            try {
+                const root = repoRoot ?? (await getRepositoryRoot());
+                if (!repoRoot && root) {
+                    setRepoRoot(root);
+                }
+                const sessionData = root ? await loadSession(root) : null;
+                const history = sessionData?.history ?? [];
+                const found = await resolveContinueSessionId({
+                    history,
+                    sessionData,
+                    branch: selectedBranch.name,
+                    toolId: selectedTool,
+                    repoRoot: root,
+                });
+                setContinueSessionId(found ?? null);
+            }
+            catch {
+                setContinueSessionId(null);
+            }
+        })();
+    }, [currentScreen, selectedTool, selectedBranch, repoRoot]);
     // Update preferred tool when branch or data changes
     useEffect(() => {
         if (!selectedBranch)
@@ -126,6 +339,12 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
         }
     }, []);
     const visibleBranches = useMemo(() => branches.filter((branch) => !hiddenBranches.includes(branch.name)), [branches, hiddenBranches]);
+    const selectedWorktreePath = useMemo(() => {
+        if (!selectedBranch)
+            return null;
+        const wt = worktrees.find((w) => w.branch === selectedBranch.name);
+        return wt?.path ?? null;
+    }, [selectedBranch, worktrees]);
     // Helper function to create content-based hash for branches
     const branchHash = useMemo(() => visibleBranches
         .map((b) => `${b.name}-${b.type}-${b.isCurrent}`)
@@ -288,7 +507,10 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                 color: "green",
             });
             refresh();
-            navigateTo("ai-tool-selector");
+            const nextScreen = branchQuickStart.length || branchQuickStartLoading
+                ? "branch-quick-start"
+                : "ai-tool-selector";
+            navigateTo(nextScreen);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -298,17 +520,30 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
             });
             console.error("Failed to switch protected branch:", error);
         }
-    }, [navigateTo, refresh, selectedBranch, setCleanupFooterMessage]);
+    }, [
+        branchQuickStart,
+        branchQuickStartLoading,
+        navigateTo,
+        refresh,
+        selectedBranch,
+        setCleanupFooterMessage,
+    ]);
     const handleUseExistingBranch = useCallback(() => {
         if (selectedBranch && isProtectedSelection(selectedBranch)) {
             void handleProtectedBranchSwitch();
             return;
         }
-        navigateTo("ai-tool-selector");
+        if (branchQuickStart.length) {
+            navigateTo("branch-quick-start");
+        }
+        else {
+            navigateTo("ai-tool-selector");
+        }
     }, [
         handleProtectedBranchSwitch,
         isProtectedSelection,
         navigateTo,
+        branchQuickStart.length,
         selectedBranch,
     ]);
     const handleCreateNewBranch = useCallback(() => {
@@ -529,35 +764,27 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
         }));
         navigateTo("execution-mode-selector");
     }, [navigateTo, selectedTool]);
-    // Handle session selection
-    const handleSessionSelect = useCallback((_session) => {
-        // TODO: Load selected session and navigate to next screen
-        // For now, just go back to branch list
-        goBack();
-    }, [goBack]);
-    // Handle execution mode and skipPermissions selection
-    const handleModeSelect = useCallback((result) => {
-        // All selections complete - exit with result
+    const completeSelection = useCallback((executionMode, skip, sessionId) => {
         if (selectedBranch && selectedTool) {
             const defaultModel = getDefaultModelOption(selectedTool);
             const resolvedModel = selectedModel?.model ?? defaultModel?.id ?? null;
             const resolvedInference = selectedModel?.inferenceLevel ??
                 getDefaultInferenceForModel(defaultModel ?? undefined);
-            const modelForPayload = resolvedModel;
             const payload = {
                 branch: selectedBranch.name,
                 displayName: selectedBranch.displayName,
                 branchType: selectedBranch.branchType,
                 tool: selectedTool,
-                mode: result.mode,
-                skipPermissions: result.skipPermissions,
-                ...(modelForPayload !== undefined ? { model: modelForPayload } : {}),
+                mode: executionMode,
+                skipPermissions: skip,
+                ...(resolvedModel !== undefined ? { model: resolvedModel } : {}),
                 ...(resolvedInference !== undefined
                     ? { inferenceLevel: resolvedInference }
                     : {}),
                 ...(selectedBranch.remoteBranch
                     ? { remoteBranch: selectedBranch.remoteBranch }
                     : {}),
+                ...(sessionId ? { sessionId } : {}),
             };
             onExit(payload);
             exit();
@@ -571,6 +798,59 @@ 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");
+            return;
+        }
+        const selected = branchQuickStart.find((opt) => opt.toolId === toolId) ??
+            branchQuickStart[0];
+        if (!selected) {
+            navigateTo("ai-tool-selector");
+            return;
+        }
+        setSelectedTool(selected.toolId);
+        setPreferredToolId(selected.toolId);
+        setSelectedModel(selected.model
+            ? {
+                model: selected.model,
+                inferenceLevel: selected.inferenceLevel ?? undefined,
+            }
+            : null);
+        const skip = selected.skipPermissions ?? false;
+        if (action === "reuse-continue") {
+            const hasSession = Boolean(selected.sessionId);
+            const mode = hasSession ? "resume" : "continue";
+            completeSelection(mode, skip, selected.sessionId ?? null);
+            return;
+        }
+        // "Start new with previous settings" skips the execution mode screen and launches immediately
+        completeSelection("normal", skip, null);
+    }, [
+        branchQuickStart,
+        navigateTo,
+        setPreferredToolId,
+        setSelectedModel,
+        setSelectedTool,
+        completeSelection,
+    ]);
+    // 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]);
     // Render screen based on currentScreen
     const renderScreen = () => {
         switch (currentScreen) {
@@ -596,6 +876,15 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                 }
                 return React.createElement(BranchActionSelectorScreen, { ...baseProps });
             }
+            case "branch-quick-start":
+                return (React.createElement(BranchQuickStartScreen, { branchName: selectedBranch?.displayName ?? "", previousOptions: branchQuickStart.map((opt) => ({
+                        toolId: opt.toolId,
+                        toolLabel: opt.toolLabel,
+                        model: opt.model ?? null,
+                        inferenceLevel: opt.inferenceLevel ?? null,
+                        skipPermissions: opt.skipPermissions ?? null,
+                        sessionId: opt.sessionId ?? null,
+                    })), loading: branchQuickStartLoading, onBack: goBack, onSelect: handleQuickStartSelect, version: version }));
             case "ai-tool-selector":
                 return (React.createElement(AIToolSelectorScreen, { onBack: goBack, onSelect: handleToolSelect, version: version, initialToolId: selectedTool ?? preferredToolId ?? null }));
             case "model-selector":
@@ -606,9 +895,9 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                 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: [], onBack: goBack, onSelect: handleSessionSelect, version: version }));
+                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 }));
+                return (React.createElement(ExecutionModeSelectorScreen, { onBack: goBack, onSelect: handleModeSelect, version: version, continueSessionId: continueSessionId }));
             default:
                 return (React.createElement(BranchListScreen, { branches: branchItems, stats: stats, onSelect: handleSelect, onQuit: handleQuit, onRefresh: refresh, loading: loading, error: error, lastUpdated: lastUpdated, loadingIndicatorDelay: loadingIndicatorDelay, version: version, workingDirectory: workingDirectory }));
         }