From a8774d0c87c6a623c2e899f21ae8174ce1914211 Mon Sep 17 00:00:00 2001
From: Naomi Carrigan <commits@nhcarrigan.com>
Date: Mon, 19 Jan 2026 22:25:06 -0800
Subject: [PATCH] feat: add interrupt button

---
 src-tauri/src/commands.rs          |   6 ++
 src-tauri/src/config.rs            |   3 +
 src-tauri/src/lib.rs               |   1 +
 src-tauri/src/wsl_bridge.rs        |  24 ++++++
 src/lib/components/InputBar.svelte | 131 +++++++++++++++++++++++++----
 src/lib/stores/claude.ts           |  32 +++++++
 src/lib/stores/historyRestore.ts   |  29 +++++++
 src/lib/tauri.ts                   |  23 ++++-
 8 files changed, 231 insertions(+), 18 deletions(-)
 create mode 100644 src/lib/stores/historyRestore.ts

diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index 1bafa39..6862fa8 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -25,6 +25,12 @@ pub async fn stop_claude(app: AppHandle, bridge: State<'_, SharedBridge>) -> Res
     Ok(())
 }
 
+#[tauri::command]
+pub async fn interrupt_claude(app: AppHandle, bridge: State<'_, SharedBridge>) -> Result<(), String> {
+    let mut bridge = bridge.lock();
+    bridge.interrupt(&app)
+}
+
 #[tauri::command]
 pub async fn send_prompt(bridge: State<'_, SharedBridge>, message: String) -> Result<(), String> {
     let mut bridge = bridge.lock();
diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
index 8aaf580..a801550 100644
--- a/src-tauri/src/config.rs
+++ b/src-tauri/src/config.rs
@@ -19,6 +19,9 @@ pub struct ClaudeStartOptions {
 
     #[serde(default)]
     pub allowed_tools: Vec<String>,
+
+    #[serde(default)]
+    pub skip_greeting: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index d7646eb..c595bbf 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -32,6 +32,7 @@ pub fn run() {
         .invoke_handler(tauri::generate_handler![
             start_claude,
             stop_claude,
+            interrupt_claude,
             send_prompt,
             is_claude_running,
             get_working_directory,
diff --git a/src-tauri/src/wsl_bridge.rs b/src-tauri/src/wsl_bridge.rs
index b3744f2..12e78ba 100644
--- a/src-tauri/src/wsl_bridge.rs
+++ b/src-tauri/src/wsl_bridge.rs
@@ -332,6 +332,30 @@ impl WslBridge {
         Ok(())
     }
 
+    pub fn interrupt(&mut self, app: &AppHandle) -> Result<(), String> {
+        // Due to persistent bug in Claude Code where ESC/Ctrl+C doesn't work,
+        // we have to kill the process. This is the only reliable way to stop it.
+        // See: https://github.com/anthropics/claude-code/issues/3455
+        if let Some(mut process) = self.process.take() {
+            // Kill the process immediately
+            let _ = process.kill();
+            let _ = process.wait();
+
+            // Clear stdin
+            self.stdin = None;
+
+            // Keep session_id and working directory for user reference
+            // The user will see what session was interrupted
+
+            // Emit disconnected status
+            emit_connection_status(app, ConnectionStatus::Disconnected);
+
+            Ok(())
+        } else {
+            Err("No active process to interrupt".to_string())
+        }
+    }
+
     pub fn stop(&mut self, app: &AppHandle) {
         if let Some(mut process) = self.process.take() {
             let _ = process.kill();
diff --git a/src/lib/components/InputBar.svelte b/src/lib/components/InputBar.svelte
index 3517c19..c057439 100644
--- a/src/lib/components/InputBar.svelte
+++ b/src/lib/components/InputBar.svelte
@@ -1,17 +1,30 @@
 <script lang="ts">
   import { invoke } from "@tauri-apps/api/core";
-  import { claudeStore } from "$lib/stores/claude";
+  import { claudeStore, isClaudeProcessing } from "$lib/stores/claude";
   import { characterState } from "$lib/stores/character";
   import { handleNewUserMessage } from "$lib/notifications/rules";
+  import { setSkipNextGreeting } from "$lib/tauri";
+  import {
+    setShouldRestoreHistory,
+    setSavedHistory,
+    getShouldRestoreHistory,
+    getSavedHistory,
+    clearHistoryRestore
+  } from "$lib/stores/historyRestore";
 
   let inputValue = $state("");
   let isSubmitting = $state(false);
   let isConnected = $state(false);
+  let isProcessing = $state(false);
 
   claudeStore.connectionStatus.subscribe((status) => {
     isConnected = status === "connected";
   });
 
+  isClaudeProcessing.subscribe((processing) => {
+    isProcessing = processing;
+  });
+
   async function handleSubmit(event: Event) {
     event.preventDefault();
 
@@ -21,6 +34,30 @@
     isSubmitting = true;
     inputValue = "";
 
+    // Check if we need to restore conversation history
+    let messageToSend = message;
+    if (getShouldRestoreHistory()) {
+      const savedHistory = getSavedHistory();
+      console.log("Should restore history:", true);
+      console.log("Saved history:", savedHistory);
+
+      if (savedHistory) {
+        // Prepend the conversation history with a context message
+        messageToSend = `[Previous conversation context:]
+${savedHistory}
+
+[Continuing conversation after reconnection:]
+User: ${message}`;
+
+        console.log("Message with history:", messageToSend);
+
+        // Clear the restoration flags
+        clearHistoryRestore();
+      }
+    } else {
+      console.log("Should restore history:", false);
+    }
+
     // Reset notification state for new user message
     handleNewUserMessage();
 
@@ -28,7 +65,7 @@
     characterState.setState("thinking");
 
     try {
-      await invoke("send_prompt", { message });
+      await invoke("send_prompt", { message: messageToSend });
     } catch (error) {
       console.error("Failed to send prompt:", error);
       claudeStore.addLine("error", `Failed to send: ${error}`);
@@ -38,6 +75,55 @@
     }
   }
 
+  async function handleInterrupt() {
+    // Save the conversation history FIRST before anything else
+    const history = claudeStore.getConversationHistory();
+    console.log("Saving conversation history:", history);
+
+    if (history) {
+      setSavedHistory(history);
+      setShouldRestoreHistory(true);
+      console.log("History saved and restoration flag set");
+    } else {
+      console.log("No history to save");
+    }
+
+    try {
+      await invoke("interrupt_claude");
+      claudeStore.addLine("system", "Process interrupted - reconnecting...");
+      characterState.setState("idle");
+
+      // Show connecting status while we reconnect
+      claudeStore.setConnectionStatus("connecting");
+
+      // Auto-reconnect after a brief delay
+      setTimeout(async () => {
+        try {
+          // Get current working directory before reconnecting
+          const workingDir = await invoke<string>("get_working_directory");
+
+          // Set the flag to skip greeting on next connection
+          setSkipNextGreeting(true);
+
+          // Reconnect to Claude
+          await invoke("start_claude", {
+            options: {
+              working_dir: workingDir
+            }
+          });
+        } catch (reconnectError) {
+          console.error("Failed to auto-reconnect:", reconnectError);
+          claudeStore.addLine("error", `Failed to reconnect: ${reconnectError}`);
+          claudeStore.addLine("system", "Please manually reconnect to continue");
+        }
+      }, 500); // Brief delay to ensure process is fully terminated
+
+    } catch (error) {
+      console.error("Failed to interrupt:", error);
+      claudeStore.addLine("error", `Failed to interrupt: ${error}`);
+    }
+  }
+
   function handleKeyDown(event: KeyboardEvent) {
     if (event.key === "Enter" && !event.shiftKey) {
       handleSubmit(event);
@@ -61,18 +147,31 @@
     ></textarea>
   </div>
 
-  <button
-    type="submit"
-    disabled={!isConnected || isSubmitting || !inputValue.trim()}
-    class="px-6 py-3 bg-[var(--accent-primary)] hover:bg-[var(--accent-secondary)]
-           text-white font-medium rounded-lg
-           disabled:opacity-50 disabled:cursor-not-allowed
-           transition-all duration-200 transform hover:scale-105 active:scale-95"
-  >
-    {#if isSubmitting}
-      <span class="inline-block animate-spin">⏳</span>
-    {:else}
-      Send
-    {/if}
-  </button>
+  {#if isProcessing}
+    <button
+      type="button"
+      onclick={handleInterrupt}
+      class="px-6 py-3 bg-red-600 hover:bg-red-700
+             text-white font-medium rounded-lg
+             transition-all duration-200 transform hover:scale-105 active:scale-95"
+      title="Interrupt the current response (Ctrl+C)"
+    >
+      <span class="font-bold">■</span> Stop
+    </button>
+  {:else}
+    <button
+      type="submit"
+      disabled={!isConnected || isSubmitting || !inputValue.trim()}
+      class="px-6 py-3 bg-[var(--accent-primary)] hover:bg-[var(--accent-secondary)]
+             text-white font-medium rounded-lg
+             disabled:opacity-50 disabled:cursor-not-allowed
+             transition-all duration-200 transform hover:scale-105 active:scale-95"
+    >
+      {#if isSubmitting}
+        <span class="inline-block animate-spin">⏳</span>
+      {:else}
+        Send
+      {/if}
+    </button>
+  {/if}
 </form>
diff --git a/src/lib/stores/claude.ts b/src/lib/stores/claude.ts
index 78d982c..5ddd784 100644
--- a/src/lib/stores/claude.ts
+++ b/src/lib/stores/claude.ts
@@ -1,5 +1,6 @@
 import { writable, derived } from "svelte/store";
 import type { ConnectionStatus, PermissionRequest } from "$lib/types/messages";
+import { characterState } from "$lib/stores/character";
 
 export interface TerminalLine {
   id: string;
@@ -18,6 +19,8 @@ function createClaudeStore() {
   const isProcessing = writable<boolean>(false);
   const grantedTools = writable<Set<string>>(new Set());
   const pendingRetryMessage = writable<string | null>(null);
+  const shouldRestoreHistory = writable<boolean>(false);
+  const savedConversationHistory = writable<string | null>(null);
 
   let lineIdCounter = 0;
 
@@ -34,6 +37,8 @@ function createClaudeStore() {
     isProcessing: { subscribe: isProcessing.subscribe },
     grantedTools: { subscribe: grantedTools.subscribe },
     pendingRetryMessage: { subscribe: pendingRetryMessage.subscribe },
+    shouldRestoreHistory: { subscribe: shouldRestoreHistory.subscribe },
+    savedConversationHistory: { subscribe: savedConversationHistory.subscribe },
 
     setConnectionStatus: (status: ConnectionStatus) => connectionStatus.set(status),
     setSessionId: (id: string | null) => sessionId.set(id),
@@ -106,6 +111,21 @@ function createClaudeStore() {
 
     setPendingRetryMessage: (message: string | null) => pendingRetryMessage.set(message),
 
+    setShouldRestoreHistory: (should: boolean) => shouldRestoreHistory.set(should),
+    setSavedConversationHistory: (history: string | null) => savedConversationHistory.set(history),
+
+    getShouldRestoreHistory: (): boolean => {
+      let should = false;
+      shouldRestoreHistory.subscribe((s) => (should = s))();
+      return should;
+    },
+
+    getSavedConversationHistory: (): string | null => {
+      let history: string | null = null;
+      savedConversationHistory.subscribe((h) => (history = h))();
+      return history;
+    },
+
     reset: () => {
       connectionStatus.set("disconnected");
       sessionId.set(null);
@@ -115,6 +135,8 @@ function createClaudeStore() {
       isProcessing.set(false);
       grantedTools.set(new Set());
       pendingRetryMessage.set(null);
+      shouldRestoreHistory.set(false);
+      savedConversationHistory.set(null);
     },
   };
 }
@@ -125,3 +147,13 @@ export const hasPermissionPending = derived(
   claudeStore.pendingPermission,
   ($permission) => $permission !== null
 );
+
+// Derived store to check if Claude is currently processing (can be interrupted)
+export const isClaudeProcessing = derived(
+  [claudeStore.connectionStatus, characterState],
+  ([$connectionStatus, $characterState]) => {
+    // Must be connected and in one of the processing states
+    return $connectionStatus === "connected" &&
+           ["thinking", "typing", "searching", "coding", "mcp"].includes($characterState);
+  }
+);
diff --git a/src/lib/stores/historyRestore.ts b/src/lib/stores/historyRestore.ts
new file mode 100644
index 0000000..2a52f54
--- /dev/null
+++ b/src/lib/stores/historyRestore.ts
@@ -0,0 +1,29 @@
+// Separate module for history restoration to ensure persistence across reconnects
+let shouldRestore = false;
+let savedHistory: string | null = null;
+
+export function setShouldRestoreHistory(should: boolean) {
+  shouldRestore = should;
+  console.log("Setting shouldRestoreHistory to:", should);
+}
+
+export function setSavedHistory(history: string | null) {
+  savedHistory = history;
+  console.log("Setting savedHistory, length:", history?.length || 0);
+}
+
+export function getShouldRestoreHistory(): boolean {
+  console.log("Getting shouldRestoreHistory:", shouldRestore);
+  return shouldRestore;
+}
+
+export function getSavedHistory(): string | null {
+  console.log("Getting savedHistory, length:", savedHistory?.length || 0);
+  return savedHistory;
+}
+
+export function clearHistoryRestore() {
+  console.log("Clearing history restore flags");
+  shouldRestore = false;
+  savedHistory = null;
+}
\ No newline at end of file
diff --git a/src/lib/tauri.ts b/src/lib/tauri.ts
index 406ecf0..0eeb0cc 100644
--- a/src/lib/tauri.ts
+++ b/src/lib/tauri.ts
@@ -21,6 +21,11 @@ interface StateChangePayload {
 
 let hasConnectedThisSession = false;
 let unlisteners: Array<() => void> = [];
+let skipNextGreeting = false;
+
+export function setSkipNextGreeting(skip: boolean) {
+  skipNextGreeting = skip;
+}
 
 function getTimeOfDay(): string {
   const hour = new Date().getHours();
@@ -42,6 +47,12 @@ function generateGreetingPrompt(): string {
 }
 
 async function sendGreeting() {
+  // Check if we should skip this greeting
+  if (skipNextGreeting) {
+    skipNextGreeting = false; // Reset the flag
+    return;
+  }
+
   const config = configStore.getConfig();
 
   if (!config.greeting_enabled) {
@@ -100,8 +111,16 @@ export async function initializeTauriListeners() {
         await sendGreeting();
       }
     } else if (status === "disconnected") {
-      hasConnectedThisSession = false;
-      claudeStore.addLine("system", "Disconnected from Claude Code");
+      // Only reset session flag if we're not about to reconnect
+      if (!skipNextGreeting) {
+        hasConnectedThisSession = false;
+      }
+
+      // Don't add system message if we're about to reconnect
+      if (!skipNextGreeting) {
+        claudeStore.addLine("system", "Disconnected from Claude Code");
+      }
+
       characterState.setState("idle");
     } else if (status === "error") {
       hasConnectedThisSession = false;