fix: ensure permission/stats persist until explicit disconnect (#110)

Also includes cached tokens in cost calculations to provide more accurate billing estimates.

Reviewed-on: #110
Co-authored-by: Naomi Carrigan <commits@nhcarrigan.com>
Co-committed-by: Naomi Carrigan <commits@nhcarrigan.com>

src/lib/commands/slashCommands.ts

@@ -37,6 +37,12 @@ async function changeDirectory(path: string): Promise<void> {
     // Capture conversation history before disconnecting
     const conversationHistory = claudeStore.getConversationHistory();
 
+    // Get currently granted tools and config auto-granted tools
+    const activeConversation = get(conversationsStore.activeConversation);
+    const grantedTools = activeConversation ? Array.from(activeConversation.grantedTools) : [];
+    const config = configStore.getConfig();
+    const allAllowedTools = [...new Set([...grantedTools, ...config.auto_granted_tools])];
+
     await invoke("stop_claude", { conversationId });
 
     // Wait for clean shutdown
@@ -50,12 +56,11 @@ async function changeDirectory(path: string): Promise<void> {
       conversationId,
       options: {
         working_dir: validatedPath,
+        allowed_tools: allAllowedTools,
       },
     });
 
     // Update Discord RPC when reconnecting after directory change
-    const config = configStore.getConfig();
-    const activeConversation = get(conversationsStore.activeConversation);
     if (activeConversation) {
       await updateDiscordRpc(
         activeConversation.name,
@@ -102,6 +107,12 @@ async function startNewConversation(): Promise<void> {
       conversationId,
     });
 
+    // Get granted tools before interrupting
+    const activeConversation = get(conversationsStore.activeConversation);
+    const grantedTools = activeConversation ? Array.from(activeConversation.grantedTools) : [];
+    const config = configStore.getConfig();
+    const allAllowedTools = [...new Set([...grantedTools, ...config.auto_granted_tools])];
+
     claudeStore.addLine("system", "Starting new conversation...");
     characterState.setState("thinking");
 
@@ -115,12 +126,11 @@ async function startNewConversation(): Promise<void> {
       conversationId,
       options: {
         working_dir: workingDir,
+        allowed_tools: allAllowedTools,
       },
     });
 
     // Update Discord RPC when starting new conversation
-    const config = configStore.getConfig();
-    const activeConversation = get(conversationsStore.activeConversation);
     if (activeConversation) {
       await updateDiscordRpc(
         activeConversation.name,

src/lib/components/CompactMode.svelte

@@ -5,6 +5,7 @@
   import { characterState, characterInfo } from "$lib/stores/character";
   import { isStreamerMode } from "$lib/stores/config";
   import { handleNewUserMessage } from "$lib/notifications/rules";
+  import { setSkipNextGreeting } from "$lib/tauri";
   import type { CharacterState, CharacterStateInfo } from "$lib/types/states";
 
   interface Props {
@@ -127,6 +128,9 @@
       const conversationId = get(claudeStore.activeConversationId);
       if (!conversationId) return;
 
+      // Set flag to preserve stats/permissions (don't treat next connect as new session)
+      setSkipNextGreeting(true);
+
       await invoke("interrupt_claude", { conversationId });
       claudeStore.addLine("system", "Interrupted");
       characterState.setState("idle");

src/lib/components/InputBar.svelte

@@ -338,23 +338,28 @@ User: ${formattedMessage}`;
             throw new Error("No active conversation");
           }
 
-          // Get current working directory before reconnecting
+          // Get current working directory and granted tools before reconnecting
           const workingDir = await invoke<string>("get_working_directory", { conversationId });
+          const activeConversation = get(conversationsStore.activeConversation);
+          const grantedTools = activeConversation
+            ? Array.from(activeConversation.grantedTools)
+            : [];
+          const config = configStore.getConfig();
+          const allAllowedTools = [...new Set([...grantedTools, ...config.auto_granted_tools])];
 
           // Set the flag to skip greeting on next connection
           setSkipNextGreeting(true);
 
-          // Reconnect to Claude
+          // Reconnect to Claude with preserved permissions
           await invoke("start_claude", {
             conversationId,
             options: {
               working_dir: workingDir,
+              allowed_tools: allAllowedTools,
             },
           });
 
           // Update Discord RPC when reconnecting
-          const config = configStore.getConfig();
-          const activeConversation = get(conversationsStore.activeConversation);
           if (activeConversation) {
             await updateDiscordRpc(
               activeConversation.name,

src/lib/components/PermissionModal.svelte

@@ -1,22 +1,17 @@
 <script lang="ts">
   import { invoke } from "@tauri-apps/api/core";
   import { get } from "svelte/store";
-  import { claudeStore, hasPermissionPending } from "$lib/stores/claude";
+  import { claudeStore } from "$lib/stores/claude";
   import { characterState } from "$lib/stores/character";
   import type { PermissionRequest } from "$lib/types/messages";
-  import { updateDiscordRpc } from "$lib/tauri";
+  import { updateDiscordRpc, setSkipNextGreeting } from "$lib/tauri";
   import { conversationsStore } from "$lib/stores/conversations";
   import { configStore } from "$lib/stores/config";
 
-  let isVisible = $state(false);
   let permission: PermissionRequest | null = $state(null);
   let grantedToolsList: string[] = $state([]);
   let workingDirectory = $state("");
 
-  hasPermissionPending.subscribe((pending) => {
-    isVisible = pending;
-  });
-
   claudeStore.pendingPermission.subscribe((perm) => {
     permission = perm;
     if (perm) {
@@ -54,6 +49,9 @@
           throw new Error("No active conversation");
         }
 
+        // Prevent stats reset on reconnection
+        setSkipNextGreeting(true);
+
         await invoke("stop_claude", { conversationId });
 
         // Small delay to ensure clean shutdown
@@ -125,7 +123,7 @@ Please continue where we left off and retry that action now that you have permis
   }
 
   function handleKeydown(event: KeyboardEvent) {
-    if (!isVisible || !permission) return;
+    if (!permission) return;
 
     if (event.key === "Enter") {
       event.preventDefault();
@@ -139,7 +137,7 @@ Please continue where we left off and retry that action now that you have permis
 
 <svelte:window onkeydown={handleKeydown} />
 
-{#if isVisible && permission}
+{#if permission}
   <div
     class="permission-overlay fixed inset-0 bg-black/70 flex items-center justify-center z-50 backdrop-blur-sm"
   >

src/lib/components/StatusBar.svelte

@@ -30,7 +30,7 @@
     createSummary,
     sanitizeForJson,
   } from "$lib/utils/conversationUtils";
-  import { updateDiscordRpc } from "$lib/tauri";
+  import { updateDiscordRpc, setSkipNextGreeting } from "$lib/tauri";
 
   const DISCORD_URL = "https://chat.nhcarrigan.com";
   const DONATE_URL = "https://donate.nhcarrigan.com";
@@ -190,6 +190,9 @@
         throw new Error("No active conversation");
       }
       await invoke("stop_claude", { conversationId });
+
+      // Clear granted permissions when user explicitly disconnects
+      claudeStore.revokeAllTools();
     } catch (error) {
       console.error("Failed to stop Claude:", error);
     }
@@ -248,6 +251,9 @@
           : sanitizedContent;
 
       // Step 1: Disconnect from Claude to reset context
+      // Prevent stats reset on reconnection
+      setSkipNextGreeting(true);
+
       if (connectionStatus === "connected") {
         await invoke("stop_claude", { conversationId: activeId });
       }

src/lib/components/UserQuestionModal.svelte

@@ -5,7 +5,7 @@
   import { claudeStore, hasQuestionPending } from "$lib/stores/claude";
   import { characterState } from "$lib/stores/character";
   import type { UserQuestionEvent } from "$lib/types/messages";
-  import { updateDiscordRpc } from "$lib/tauri";
+  import { updateDiscordRpc, setSkipNextGreeting } from "$lib/tauri";
   import { conversationsStore } from "$lib/stores/conversations";
   import { configStore } from "$lib/stores/config";
 
@@ -89,6 +89,9 @@
     claudeStore.clearQuestion();
 
     try {
+      // Prevent stats reset on reconnection
+      setSkipNextGreeting(true);
+
       await invoke("stop_claude", { conversationId });
 
       await new Promise((resolve) => setTimeout(resolve, 500));