feat: auto-accept toggle in composer, fix generating state on session_ready, remove approve-and-remember

Author: Swofty-Developments

crates/tauri-app/frontend/src/components/chat/ChatArea.tsx

@@ -267,26 +267,15 @@ export function ChatArea() {
               {(approval) => {
                 const toolName = () => approval.description.split(":")[0]?.trim() || "tool";
 
-                function handleApproveAndRemember() {
-                  // Store an allow rule for this tool
-                  const rule = `${toolName()}`;
-                  ipc.getSetting("allowed_tools").then((current) => {
-                    const rules = current ? current.split(",") : [];
-                    if (!rules.includes(rule)) {
-                      rules.push(rule);
-                      ipc.setSetting("allowed_tools", rules.join(","));
-                    }
-                  }).catch(() => {});
-                  approveRequest(approval);
-                }
-
-                function handleBypassSession() {
-                  // Approve this request and set session to bypass
+                function handleAutoAccept() {
+                  // Set permission mode to bypass and approve ALL pending
                   ipc.setSetting("permission_mode", "bypassPermissions").catch(() => {});
+                  appStore.setStore("autoAcceptEnabled", true);
                   // Approve all pending approvals for this thread
-                  store.pendingApprovals
-                    .filter((a) => a.threadId === approval.threadId)
-                    .forEach((a) => approveRequest(a));
+                  const pending = [...store.pendingApprovals.filter((a) => a.threadId === approval.threadId)];
+                  for (const a of pending) {
+                    approveRequest(a);
+                  }
                 }
 
                 return (
@@ -303,11 +292,8 @@ export function ChatArea() {
                     <div class="approval-actions">
                       <button class="deny-btn" onClick={() => denyRequest(approval)}>Deny</button>
                       <button class="approve-btn" onClick={() => approveRequest(approval)}>Approve</button>
-                      <button class="approve-remember-btn" onClick={handleApproveAndRemember} title={`Always allow ${toolName()}`}>
-                        Approve &amp; Remember
-                      </button>
-                      <button class="bypass-btn" onClick={handleBypassSession} title="Auto-approve everything for this session">
-                        Bypass All
+                      <button class="bypass-btn" onClick={handleAutoAccept} title="Auto-approve everything from now on">
+                        Auto Accept
                       </button>
                     </div>
                   </div>
@@ -910,7 +896,7 @@ if (!document.getElementById("chat-styles")) {
       border-radius: var(--radius-pill);
     }
     .approval-actions { display: flex; gap: 6px; justify-content: flex-end; flex-wrap: wrap; }
-    .approve-btn, .deny-btn, .approve-remember-btn, .bypass-btn {
+    .approve-btn, .deny-btn, .bypass-btn {
       padding: 6px 12px;
       border-radius: var(--radius-sm);
       font-size: 11px;
@@ -922,15 +908,6 @@ if (!document.getElementById("chat-styles")) {
       color: #fff;
     }
     .approve-btn:hover { filter: brightness(1.1); transform: translateY(-1px); }
-    .approve-remember-btn {
-      background: rgba(76, 214, 148, 0.12);
-      border: 1px solid rgba(76, 214, 148, 0.25);
-      color: var(--green);
-    }
-    .approve-remember-btn:hover {
-      background: rgba(76, 214, 148, 0.2);
-      border-color: rgba(76, 214, 148, 0.4);
-    }
     .bypass-btn {
       background: rgba(240, 184, 64, 0.1);
       border: 1px solid rgba(240, 184, 64, 0.2);

crates/tauri-app/frontend/src/components/composer/Composer.tsx

@@ -352,6 +352,21 @@ export function Composer() {
               <svg class="chevron" width="8" height="8" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round"><polyline points="6 9 12 15 18 9" /></svg>
             </button>
             <ModelSelector />
+            <button
+              class="meta-pill"
+              classList={{ "meta-pill--active": store.autoAcceptEnabled }}
+              onClick={() => {
+                const next = !store.autoAcceptEnabled;
+                appStore.setStore("autoAcceptEnabled", next);
+                ipc.setSetting("permission_mode", next ? "bypassPermissions" : "default").catch(() => {});
+              }}
+              title={store.autoAcceptEnabled ? "Auto-accepting all tools (click to require approval)" : "Requiring approval (click to auto-accept)"}
+            >
+              <svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
+              </svg>
+              {store.autoAcceptEnabled ? "Auto" : "Ask"}
+            </button>
             <button class="meta-pill subtle" onClick={pickFolder}>
               <svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
                 <path d="M22 19a2 2 0 01-2 2H4a2 2 0 01-2-2V5a2 2 0 012-2h5l2 3h9a2 2 0 012 2z" />
@@ -571,6 +586,15 @@ if (!document.getElementById("composer-styles")) {
       gap: 5px;
     }
     .meta-pill:hover { background: var(--bg-accent); border-color: var(--border-strong); }
+    .meta-pill--active {
+      background: rgba(76, 214, 148, 0.1);
+      border-color: rgba(76, 214, 148, 0.2);
+      color: var(--green);
+    }
+    .meta-pill--active:hover {
+      background: rgba(76, 214, 148, 0.15);
+      border-color: rgba(76, 214, 148, 0.3);
+    }
     .meta-pill .chevron {
       color: var(--text-tertiary);
       transition: color 0.15s;

crates/tauri-app/frontend/src/stores/app-store.ts

@@ -42,6 +42,7 @@ export interface AppStore {
   attachments: Attachment[];
   threadTokenUsage: Record<string, ThreadTokenUsage>;
   notificationsEnabled: boolean;
+  autoAcceptEnabled: boolean;
   threadMessagesLoading: Record<string, boolean>;
   projectGitStatus: Record<string, "none" | "git" | "github">;
   projectPrMap: Record<string, Record<string, number>>;
@@ -80,6 +81,7 @@ function createAppStore() {
     attachments: [],
     threadTokenUsage: {},
     notificationsEnabled: true,
+    autoAcceptEnabled: false,
     threadMessagesLoading: {},
     projectGitStatus: {},
     projectPrMap: {},
@@ -557,7 +559,11 @@ function createAppStore() {
         break;
       }
       case "session_ready":
-        setStore("sessionStatuses", thread_id, "ready");
+        // Don't reset to "ready" if we're mid-generation —
+        // session_ready fires when the sidecar initializes but before the response
+        if (store.sessionStatuses[thread_id] !== "generating") {
+          setStore("sessionStatuses", thread_id, "ready");
+        }
         break;
       case "session_error": {
         setStore("sessionStatuses", thread_id, "error");
@@ -572,15 +578,20 @@ function createAppStore() {
       }
       case "approval_required":
         if (payload.request_id && payload.description) {
-          setStore("pendingApprovals", (a) => [
-            ...a,
-            {
-              sessionId: payload.session_id,
-              requestId: payload.request_id!,
-              description: payload.description!,
-              threadId: thread_id,
-            },
-          ]);
+          // Auto-accept if enabled
+          if (store.autoAcceptEnabled) {
+            ipc.respondToApproval(payload.session_id, payload.request_id!, true).catch(() => {});
+          } else {
+            setStore("pendingApprovals", (a) => [
+              ...a,
+              {
+                sessionId: payload.session_id,
+                requestId: payload.request_id!,
+                description: payload.description!,
+                threadId: thread_id,
+              },
+            ]);
+          }
         }
         break;
     }