diff --git a/src/lib/stores/events.ts b/src/lib/stores/events.ts
index 55fa93f..67b5b2e 100644
--- a/src/lib/stores/events.ts
+++ b/src/lib/stores/events.ts
@@ -26,6 +26,7 @@ import {
 	activeKnowledgeHints,
 	agentMode,
 	pendingChanges,
+	permissionMode,
 	appendTextToParts,
 	appendToolToParts,
 	updateToolInParts,
@@ -698,7 +699,21 @@ export async function initEventListeners(): Promise<void> {
 				timestamp: new Date(),
 			};
 
-			pendingChanges.update((changes) => [...changes, change]);
+			// Im acceptEdits/bypassPermissions-Modus: automatisch akzeptieren
+			const currentPermMode = get(permissionMode);
+
+			if (currentPermMode === 'acceptEdits' || currentPermMode === 'bypassPermissions') {
+				// Automatisch akzeptieren — kein Pending
+				invoke('accept_change', { toolId }).then(() => {
+					console.log(`✅ Auto-Accept (${currentPermMode}): ${filePath}`);
+				}).catch((err: unknown) => {
+					console.error('Auto-Accept fehlgeschlagen:', err);
+					// Fallback: doch als Pending anzeigen
+					pendingChanges.update((changes) => [...changes, change]);
+				});
+			} else {
+				pendingChanges.update((changes) => [...changes, change]);
+			}
 
 			addMonitorEvent('tool', `Datei geaendert: ${filePath.split('/').pop()}`, {
 				toolId,