wave-code 0.7.1 → 0.8.0

package/dist/managers/InputManager.js

@@ -34,6 +34,7 @@ export class InputManager {
         this.showMcpManager = false;
         this.showRewindManager = false;
         this.showHelp = false;
+        this.showStatusCommand = false;
         // Permission mode state
         this.permissionMode = "default";
         // Flag to prevent handleInput conflicts when selector selection occurs
@@ -208,7 +209,11 @@ export class InputManager {
                 }
                 // If not an agent command or execution failed, check local commands
                 if (!commandExecuted) {
-                    if (command === "tasks") {
+                    if (command === "clear") {
+                        this.callbacks.onClearMessages?.();
+                        commandExecuted = true;
+                    }
+                    else if (command === "tasks") {
                         this.setShowBackgroundTaskManager(true);
                         commandExecuted = true;
                     }
@@ -224,6 +229,10 @@ export class InputManager {
                         this.setShowHelp(true);
                         commandExecuted = true;
                     }
+                    else if (command === "status") {
+                        this.setShowStatusCommand(true);
+                        commandExecuted = true;
+                    }
                 }
             })();
             this.handleCancelCommandSelect();
@@ -473,10 +482,27 @@ export class InputManager {
         this.showHelp = show;
         this.callbacks.onHelpStateChange?.(show);
     }
+    getShowStatusCommand() {
+        return this.showStatusCommand;
+    }
+    setShowStatusCommand(show) {
+        this.showStatusCommand = show;
+        this.callbacks.onStatusCommandStateChange?.(show);
+    }
     // Permission mode methods
     getPermissionMode() {
         return this.permissionMode;
     }
+    isAnySelectorOrManagerActive() {
+        return (this.showFileSelector ||
+            this.showCommandSelector ||
+            this.showHistorySearch ||
+            this.showBackgroundTaskManager ||
+            this.showMcpManager ||
+            this.showRewindManager ||
+            this.showHelp ||
+            this.showStatusCommand);
+    }
     setPermissionMode(mode) {
         this.permissionMode = mode;
     }
@@ -664,9 +690,7 @@ export class InputManager {
         // Handle interrupt request - use Esc key to interrupt AI request or command
         if (key.escape &&
             (isLoading || isCommandRunning) &&
-            !this.showBackgroundTaskManager &&
-            !this.showMcpManager &&
-            !this.showRewindManager) {
+            !this.isAnySelectorOrManagerActive()) {
             // Unified interrupt for AI message generation and command execution
             this.callbacks.onAbortMessage?.();
             return true;
@@ -678,18 +702,13 @@ export class InputManager {
             return true;
         }
         // Check if any selector is active
-        if (this.showFileSelector ||
-            this.showCommandSelector ||
-            this.showHistorySearch ||
-            this.showBackgroundTaskManager ||
-            this.showMcpManager ||
-            this.showRewindManager ||
-            this.showHelp) {
+        if (this.isAnySelectorOrManagerActive()) {
             if (this.showBackgroundTaskManager ||
                 this.showMcpManager ||
                 this.showRewindManager ||
-                this.showHelp) {
-                // Task manager, MCP manager, Rewind and Help don't need to handle input, handled by component itself
+                this.showHelp ||
+                this.showStatusCommand) {
+                // Task manager, MCP manager, Rewind, Help and Status don't need to handle input, handled by component itself
                 // Return true to indicate we've "handled" it (by ignoring it) so it doesn't leak to normal input
                 return true;
             }

package/dist/print-cli.d.ts

@@ -1,11 +1,9 @@
-export interface PrintCliOptions {
+import { BaseAppProps } from "./types.js";
+export interface PrintCliOptions extends BaseAppProps {
     restoreSessionId?: string;
     continueLastSession?: boolean;
     message?: string;
     showStats?: boolean;
-    bypassPermissions?: boolean;
-    pluginDirs?: string[];
-    tools?: string[];
 }
 export declare function startPrintCli(options: PrintCliOptions): Promise<void>;
 //# sourceMappingURL=print-cli.d.ts.map

package/dist/print-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAgK3E"}
+{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAsM3E"}

package/dist/print-cli.js

@@ -1,5 +1,6 @@
-import { Agent } from "wave-agent-sdk";
+import { Agent, hasUncommittedChanges, hasNewCommits, getDefaultRemoteBranch, } from "wave-agent-sdk";
 import { displayUsageSummary } from "./utils/usageSummary.js";
+import { removeWorktree } from "./utils/worktree.js";
 function displayTimingInfo(startTime, showStats) {
     // Skip timing info in test environment or if stats are disabled
     if (process.env.NODE_ENV === "test" || process.env.VITEST || !showStats) {
@@ -13,7 +14,7 @@ function displayTimingInfo(startTime, showStats) {
 }
 export async function startPrintCli(options) {
     const startTime = new Date();
-    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, pluginDirs, tools, } = options;
+    const { restoreSessionId, continueLastSession, message, showStats = false, bypassPermissions, pluginDirs, tools, worktreeSession, workdir, model, } = options;
     if ((!message || message.trim() === "") &&
         !continueLastSession &&
         !restoreSessionId) {
@@ -98,6 +99,8 @@ export async function startPrintCli(options) {
             permissionMode: bypassPermissions ? "bypassPermissions" : undefined,
             plugins: pluginDirs?.map((path) => ({ type: "local", path })),
             tools,
+            workdir,
+            model,
             // 保持流式模式以获得更好的命令行用户体验
         });
         // Send message if provided and not empty
@@ -119,6 +122,19 @@ export async function startPrintCli(options) {
         displayTimingInfo(startTime, showStats);
         // Destroy agent and exit after sendMessage completes
         await agent.destroy();
+        // Handle worktree cleanup for print mode
+        if (worktreeSession) {
+            const cwd = workdir || worktreeSession.path;
+            const baseBranch = getDefaultRemoteBranch(cwd);
+            const hasChanges = hasUncommittedChanges(cwd);
+            const hasCommits = hasNewCommits(cwd, baseBranch);
+            if (!hasChanges && !hasCommits) {
+                removeWorktree(worktreeSession);
+            }
+            else {
+                process.stdout.write(`\n⚠️ Worktree '${worktreeSession.name}' has changes or commits. Keeping it at: ${worktreeSession.path}\n`);
+            }
+        }
         process.exit(0);
     }
     catch (error) {
@@ -138,6 +154,19 @@ export async function startPrintCli(options) {
             // Display timing information even on error
             displayTimingInfo(startTime, showStats);
             await agent.destroy();
+            // Handle worktree cleanup for print mode even on error
+            if (worktreeSession) {
+                const cwd = workdir || worktreeSession.path;
+                const baseBranch = getDefaultRemoteBranch(cwd);
+                const hasChanges = hasUncommittedChanges(cwd);
+                const hasCommits = hasNewCommits(cwd, baseBranch);
+                if (!hasChanges && !hasCommits) {
+                    removeWorktree(worktreeSession);
+                }
+                else {
+                    process.stdout.write(`\n⚠️ Worktree '${worktreeSession.name}' has changes or commits. Keeping it at: ${worktreeSession.path}\n`);
+                }
+            }
         }
         process.exit(1);
     }

package/dist/session-selector-cli.d.ts

@@ -1,2 +1,4 @@
-export declare function startSessionSelectorCli(): Promise<string | null>;
+export declare function startSessionSelectorCli({ workdir, }?: {
+    workdir?: string;
+}): Promise<string | null>;
 //# sourceMappingURL=session-selector-cli.d.ts.map

package/dist/session-selector-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-selector-cli.d.ts","sourceRoot":"","sources":["../src/session-selector-cli.tsx"],"names":[],"mappings":"AAKA,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BtE"}
+{"version":3,"file":"session-selector-cli.d.ts","sourceRoot":"","sources":["../src/session-selector-cli.tsx"],"names":[],"mappings":"AAKA,wBAAsB,uBAAuB,CAAC,EAC5C,OAAO,GACR,GAAE;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;CACb,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+B9B"}

package/dist/session-selector-cli.js

@@ -2,8 +2,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { render, Box } from "ink";
 import { listSessions, truncateContent } from "wave-agent-sdk";
 import { SessionSelector } from "./components/SessionSelector.js";
-export async function startSessionSelectorCli() {
-    const currentWorkdir = process.cwd();
+export async function startSessionSelectorCli({ workdir, } = {}) {
+    const currentWorkdir = workdir || process.cwd();
     const sessions = await listSessions(currentWorkdir);
     if (sessions.length === 0) {
         console.log(`No sessions found for workdir: ${currentWorkdir}`);

package/dist/types.d.ts

@@ -0,0 +1,11 @@
+import { WorktreeSession } from "./utils/worktree.js";
+export interface BaseAppProps {
+    bypassPermissions?: boolean;
+    pluginDirs?: string[];
+    tools?: string[];
+    worktreeSession?: WorktreeSession;
+    workdir?: string;
+    version?: string;
+    model?: string;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/dist/utils/worktree.d.ts

@@ -0,0 +1,23 @@
+export interface WorktreeSession {
+    name: string;
+    path: string;
+    branch: string;
+    repoRoot: string;
+    hasUncommittedChanges: boolean;
+    hasNewCommits: boolean;
+    isNew: boolean;
+}
+export declare const WORKTREE_DIR = ".wave/worktrees";
+/**
+ * Create a new git worktree
+ * @param name Worktree name
+ * @param cwd Current working directory
+ * @returns Worktree session details
+ */
+export declare function createWorktree(name: string, cwd: string): WorktreeSession;
+/**
+ * Remove a git worktree and its associated branch
+ * @param session Worktree session details
+ */
+export declare function removeWorktree(session: WorktreeSession): void;
+//# sourceMappingURL=worktree.d.ts.map

package/dist/utils/worktree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/utils/worktree.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,eAAO,MAAM,YAAY,oBAAoB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,eAAe,CAyEzE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CA6D7D"}

package/dist/utils/worktree.js

@@ -0,0 +1,135 @@
+import { execSync } from "node:child_process";
+import * as path from "node:path";
+import * as fs from "node:fs";
+import { getGitRepoRoot, getDefaultRemoteBranch } from "wave-agent-sdk";
+export const WORKTREE_DIR = ".wave/worktrees";
+/**
+ * Create a new git worktree
+ * @param name Worktree name
+ * @param cwd Current working directory
+ * @returns Worktree session details
+ */
+export function createWorktree(name, cwd) {
+    const repoRoot = getGitRepoRoot(cwd);
+    const worktreePath = path.join(repoRoot, WORKTREE_DIR, name);
+    const branchName = `worktree-${name}`;
+    const baseBranch = getDefaultRemoteBranch(cwd);
+    // Ensure parent directory exists
+    const parentDir = path.dirname(worktreePath);
+    if (!fs.existsSync(parentDir)) {
+        fs.mkdirSync(parentDir, { recursive: true });
+    }
+    // Check if worktree already exists
+    if (fs.existsSync(worktreePath)) {
+        // If it exists, we assume it's already set up correctly
+        return {
+            name,
+            path: worktreePath,
+            branch: branchName,
+            repoRoot,
+            hasUncommittedChanges: false,
+            hasNewCommits: false,
+            isNew: false,
+        };
+    }
+    try {
+        // Create worktree and branch
+        execSync(`git worktree add -b ${branchName} "${worktreePath}" ${baseBranch}`, {
+            cwd: repoRoot,
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        return {
+            name,
+            path: worktreePath,
+            branch: branchName,
+            repoRoot,
+            hasUncommittedChanges: false,
+            hasNewCommits: false,
+            isNew: true,
+        };
+    }
+    catch (error) {
+        const stderr = error.stderr?.toString() || "";
+        if (stderr.includes("already exists")) {
+            // If branch already exists, try to add worktree without -b
+            try {
+                execSync(`git worktree add "${worktreePath}" ${branchName}`, {
+                    cwd: repoRoot,
+                    stdio: ["ignore", "pipe", "pipe"],
+                });
+                return {
+                    name,
+                    path: worktreePath,
+                    branch: branchName,
+                    repoRoot,
+                    hasUncommittedChanges: false,
+                    hasNewCommits: false,
+                    isNew: true,
+                };
+            }
+            catch (innerError) {
+                throw new Error(`Failed to add existing worktree branch: ${innerError.message}`);
+            }
+        }
+        throw new Error(`Failed to create worktree: ${error.message}\n${stderr}`);
+    }
+}
+/**
+ * Remove a git worktree and its associated branch
+ * @param session Worktree session details
+ */
+export function removeWorktree(session) {
+    const repoRoot = session.repoRoot;
+    try {
+        // Get current branch in worktree before removing it
+        let currentBranch;
+        try {
+            currentBranch = execSync(`git rev-parse --abbrev-ref HEAD`, {
+                cwd: session.path,
+                encoding: "utf8",
+                stdio: ["ignore", "pipe", "ignore"],
+            }).trim();
+        }
+        catch {
+            // Ignore errors getting current branch
+        }
+        // Remove worktree
+        execSync(`git worktree remove --force "${session.path}"`, {
+            cwd: repoRoot,
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        // Delete original branch
+        try {
+            execSync(`git branch -D ${session.branch}`, {
+                cwd: repoRoot,
+                stdio: ["ignore", "pipe", "pipe"],
+            });
+        }
+        catch {
+            // Ignore errors deleting original branch
+        }
+        // Delete current branch if it's different and not a protected branch
+        if (currentBranch &&
+            currentBranch !== session.branch &&
+            currentBranch !== "HEAD") {
+            const defaultRemoteBranch = getDefaultRemoteBranch(repoRoot);
+            const defaultBranchName = defaultRemoteBranch.split("/").pop();
+            if (currentBranch !== defaultBranchName &&
+                currentBranch !== "main" &&
+                currentBranch !== "master") {
+                try {
+                    execSync(`git branch -D ${currentBranch}`, {
+                        cwd: repoRoot,
+                        stdio: ["ignore", "pipe", "pipe"],
+                    });
+                }
+                catch {
+                    // Ignore errors deleting current branch
+                }
+            }
+        }
+    }
+    catch (error) {
+        console.error(`Failed to remove worktree or branch: ${error.message}`);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
     "react": "^19.2.4",
     "react-dom": "19.2.4",
     "yargs": "^17.7.2",
-    "wave-agent-sdk": "0.7.1"
+    "wave-agent-sdk": "0.8.0"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/cli.tsx

@@ -2,13 +2,12 @@ import React from "react";
 import { render } from "ink";
 import { App } from "./components/App.js";
 import { cleanupLogs } from "./utils/logger.js";
+import { removeWorktree } from "./utils/worktree.js";
+import { BaseAppProps } from "./types.js";
 
-export interface CliOptions {
+export interface CliOptions extends BaseAppProps {
   restoreSessionId?: string;
   continueLastSession?: boolean;
-  bypassPermissions?: boolean;
-  pluginDirs?: string[];
-  tools?: string[];
 }
 
 export async function startCli(options: CliOptions): Promise<void> {
@@ -18,77 +17,55 @@ export async function startCli(options: CliOptions): Promise<void> {
     bypassPermissions,
     pluginDirs,
     tools,
+    worktreeSession,
+    workdir,
+    version,
+    model,
   } = options;
 
   // Continue with ink-based UI for normal mode
-  // Global cleanup tracker
-  let isCleaningUp = false;
-  let appUnmounted = false;
+  let shouldRemoveWorktree = false;
 
-  const cleanup = async () => {
-    if (isCleaningUp) return;
-    isCleaningUp = true;
-
-    console.log("\nShutting down gracefully...");
-
-    try {
-      // Clean up old log files
-      await cleanupLogs().catch((error) => {
-        console.warn("Failed to cleanup old logs:", error);
-      });
-
-      // Unmount the React app to trigger cleanup
-      if (!appUnmounted) {
-        unmount();
-        appUnmounted = true;
-        // Give React time to cleanup
-        await new Promise((resolve) => setTimeout(resolve, 100));
-      }
-
-      process.exit(0);
-    } catch (error: unknown) {
-      console.error("Error during cleanup:", error);
-      process.exit(1);
-    }
+  const handleExit = (shouldRemove: boolean) => {
+    shouldRemoveWorktree = shouldRemove;
+    unmount();
   };
 
-  // Handle process signals
-  process.on("SIGINT", cleanup);
-  process.on("SIGTERM", cleanup);
-
-  // Handle uncaught exceptions
-  process.on("uncaughtException", (error) => {
-    console.error("Uncaught exception:", error);
-    cleanup();
-  });
-
-  process.on("unhandledRejection", (reason, promise) => {
-    console.error("Unhandled rejection at:", promise, "reason:", reason);
-    cleanup();
-  });
-
   // Render the application
-  const { unmount } = render(
+  const { unmount, waitUntilExit } = render(
     <App
       restoreSessionId={restoreSessionId}
       continueLastSession={continueLastSession}
       bypassPermissions={bypassPermissions}
       pluginDirs={pluginDirs}
       tools={tools}
+      worktreeSession={worktreeSession}
+      workdir={workdir}
+      version={version}
+      model={model}
+      onExit={handleExit}
     />,
+    { exitOnCtrlC: false },
   );
 
-  // Store unmount function for cleanup when process exits normally
-  process.on("exit", () => {
-    if (!appUnmounted) {
-      try {
-        unmount();
-      } catch {
-        // Ignore errors during unmount
-      }
+  // Wait for the app to finish unmounting
+  await waitUntilExit();
+
+  try {
+    // Clean up old log files
+    await cleanupLogs().catch((error) => {
+      console.warn("Failed to cleanup old logs:", error);
+    });
+
+    // Cleanup worktree if requested
+    if (shouldRemoveWorktree && worktreeSession) {
+      process.chdir(worktreeSession.repoRoot);
+      removeWorktree(worktreeSession);
     }
-  });
 
-  // Return a promise that never resolves to keep the CLI running
-  return new Promise(() => {});
+    process.exit(0);
+  } catch (error: unknown) {
+    console.error("Error during cleanup:", error);
+    process.exit(1);
+  }
 }

package/src/components/App.tsx

@@ -1,27 +1,105 @@
-import React, { useState, useEffect, useRef } from "react";
-import { useStdout } from "ink";
+import React, { useState, useEffect, useRef, useCallback } from "react";
+import { useStdout, useInput } from "ink";
 import { ChatInterface } from "./ChatInterface.js";
 import { ChatProvider, useChat } from "../contexts/useChat.js";
 import { AppProvider } from "../contexts/useAppConfig.js";
+import { WorktreeExitPrompt } from "./WorktreeExitPrompt.js";
+import {
+  hasUncommittedChanges,
+  hasNewCommits,
+  getDefaultRemoteBranch,
+} from "wave-agent-sdk";
+import { BaseAppProps } from "../types.js";
 
-interface AppProps {
+interface AppProps extends BaseAppProps {
   restoreSessionId?: string;
   continueLastSession?: boolean;
-  bypassPermissions?: boolean;
-  pluginDirs?: string[];
-  tools?: string[];
+  onExit: (shouldRemove: boolean) => void;
 }
 
-const AppWithProviders: React.FC<{
-  bypassPermissions?: boolean;
-  pluginDirs?: string[];
-  tools?: string[];
-}> = ({ bypassPermissions, pluginDirs, tools }) => {
+interface AppWithProvidersProps extends BaseAppProps {
+  onExit: (shouldRemove: boolean) => void;
+}
+
+const AppWithProviders: React.FC<AppWithProvidersProps> = ({
+  bypassPermissions,
+  pluginDirs,
+  tools,
+  worktreeSession,
+  workdir,
+  version,
+  model,
+  onExit,
+}) => {
+  const [isExiting, setIsExiting] = useState(false);
+  const [worktreeStatus, setWorktreeStatus] = useState<{
+    hasUncommittedChanges: boolean;
+    hasNewCommits: boolean;
+  } | null>(null);
+
+  const handleSignal = useCallback(async () => {
+    if (worktreeSession) {
+      const cwd = workdir || worktreeSession.path;
+      const baseBranch = getDefaultRemoteBranch(cwd);
+      const hasChanges = hasUncommittedChanges(cwd);
+      const hasCommits = hasNewCommits(cwd, baseBranch);
+
+      if (hasChanges || hasCommits) {
+        setWorktreeStatus({
+          hasUncommittedChanges: hasChanges,
+          hasNewCommits: hasCommits,
+        });
+        setIsExiting(true);
+      } else {
+        onExit(true);
+      }
+    } else {
+      onExit(false);
+    }
+  }, [worktreeSession, workdir, onExit]);
+
+  useInput((input, key) => {
+    if (input === "c" && key.ctrl) {
+      handleSignal();
+    }
+  });
+
+  useEffect(() => {
+    const onSigInt = () => handleSignal();
+    const onSigTerm = () => handleSignal();
+
+    process.on("SIGINT", onSigInt);
+    process.on("SIGTERM", onSigTerm);
+
+    return () => {
+      process.off("SIGINT", onSigInt);
+      process.off("SIGTERM", onSigTerm);
+    };
+  }, [handleSignal]);
+
+  if (isExiting && worktreeSession && worktreeStatus) {
+    return (
+      <WorktreeExitPrompt
+        name={worktreeSession.name}
+        path={worktreeSession.path}
+        hasUncommittedChanges={worktreeStatus.hasUncommittedChanges}
+        hasNewCommits={worktreeStatus.hasNewCommits}
+        onKeep={() => onExit(false)}
+        onRemove={() => onExit(true)}
+        onCancel={() => setIsExiting(false)}
+      />
+    );
+  }
+
   return (
     <ChatProvider
       bypassPermissions={bypassPermissions}
       pluginDirs={pluginDirs}
       tools={tools}
+      workdir={workdir}
+      worktreeSession={worktreeSession}
+      version={version}
+      model={model}
     >
       <ChatInterfaceWithRemount />
     </ChatProvider>
@@ -81,6 +159,11 @@ export const App: React.FC<AppProps> = ({
   bypassPermissions,
   pluginDirs,
   tools,
+  worktreeSession,
+  workdir,
+  version,
+  model,
+  onExit,
 }) => {
   return (
     <AppProvider
@@ -91,6 +174,11 @@ export const App: React.FC<AppProps> = ({
         bypassPermissions={bypassPermissions}
         pluginDirs={pluginDirs}
         tools={tools}
+        worktreeSession={worktreeSession}
+        workdir={workdir}
+        version={version}
+        model={model}
+        onExit={onExit}
       />
     </AppProvider>
   );