agentgui 1.0.854 → 1.0.856

package/lib/stream-event-handler.js

@@ -1,8 +1,25 @@
+<<<<<<< HEAD
 export function createEventHandler({ queries, activeExecutions, broadcastSync, rateLimitState, batcherRef, sessionId, conversationId, messageId, content, agentId, model, subAgent, ownedSessionIds, allBlocksRef, currentSequenceRef, scheduleRetry, eagerTTS, debugLog, parseRateLimitResetTime }) {
+=======
+/**
+ * Minimal Claude stdout event handler.
+ *
+ * Now that JsonlParser owns all event broadcasting (streaming_start,
+ * streaming_progress, streaming_complete) via the JSONL file watcher,
+ * this handler only needs to:
+ *   1. Extract session_id → call setClaudeSessionId + registerSession so the
+ *      parser links the file to the correct existing conversation/session.
+ *   2. Detect inline rate-limit messages in text/result blocks → scheduleRetry.
+ *
+ * No batcher, no broadcastSync for individual blocks.
+ */
+export function createEventHandler({ queries, activeExecutions, broadcastSync, rateLimitState, batcherRef, sessionId, conversationId, messageId, content, agentId, model, subAgent, getJsonlWatcher, scheduleRetry, eagerTTS, debugLog, parseRateLimitResetTime }) {
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
   return function onEvent(parsed) {
     batcherRef.eventCount++;
     const entry = activeExecutions.get(conversationId);
     if (entry) entry.lastActivity = Date.now();
+<<<<<<< HEAD
     if (parsed.session_id) {
       ownedSessionIds.add(parsed.session_id);
       if (!batcherRef.resumeSessionId || batcherRef.resumeSessionId !== parsed.session_id) {
@@ -25,16 +42,41 @@ export function createEventHandler({ queries, activeExecutions, broadcastSync, r
         currentSequenceRef.val++;
         batcherRef.batcher.add(sessionId, conversationId, currentSequenceRef.val, block.type || 'assistant', block);
         broadcastSync({ type: 'streaming_progress', sessionId, conversationId, block, blockRole: 'assistant', blockIndex: allBlocksRef.val.length - 1, seq: currentSequenceRef.val, timestamp: Date.now() });
+=======
+
+    // Register session with file watcher as soon as we see the session_id.
+    // This pre-maps claudeSessionId → (convId, dbSessionId) in JsonlParser before
+    // the 16ms file-watcher debounce fires, preventing duplicate conversation creation.
+    if (parsed.session_id) {
+      if (!batcherRef.resumeSessionId || batcherRef.resumeSessionId !== parsed.session_id) {
+        batcherRef.resumeSessionId = parsed.session_id;
+        queries.setClaudeSessionId(conversationId, parsed.session_id, sessionId);
+        try { getJsonlWatcher()?.registerSession(parsed.session_id, conversationId, sessionId); } catch (_) {}
+      }
+    }
+
+    debugLog(`[stream] Event ${batcherRef.eventCount}: type=${parsed.type}`);
+
+    // Rate-limit detection in assistant text blocks
+    if (parsed.type === 'assistant' && parsed.message?.content) {
+      for (const block of parsed.message.content) {
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
         if (block.type === 'text' && block.text) {
           const rateLimitMatch = block.text.match(/you'?ve hit your limit|rate limit exceeded/i);
           if (rateLimitMatch) {
             debugLog(`[rate-limit] Detected rate limit message in stream for conv ${conversationId}`);
             const retryAfterSec = parseRateLimitResetTime(block.text);
             const entry2 = activeExecutions.get(conversationId);
+<<<<<<< HEAD
             if (entry2 && entry2.pid) { try { process.kill(entry2.pid); } catch (e) {} }
             const existingCount = rateLimitState.get(conversationId)?.retryCount || 0;
             if (existingCount >= 3) {
               batcherRef.batcher.drain();
+=======
+            if (entry2 && entry2.pid) { try { process.kill(entry2.pid); } catch (_) {} }
+            const existingCount = rateLimitState.get(conversationId)?.retryCount || 0;
+            if (existingCount >= 3) {
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
               activeExecutions.delete(conversationId);
               queries.setIsStreaming(conversationId, false);
               const errMsg = queries.createMessage(conversationId, 'assistant', `Error: Rate limit exceeded after ${existingCount + 1} attempts. Please try again later.`);
@@ -44,7 +86,10 @@ export function createEventHandler({ queries, activeExecutions, broadcastSync, r
             }
             rateLimitState.set(conversationId, { retryAt: Date.now() + (retryAfterSec * 1000), cooldownMs: retryAfterSec * 1000, retryCount: existingCount + 1, isStreamDetected: true });
             broadcastSync({ type: 'rate_limit_hit', sessionId, conversationId, retryAfterMs: retryAfterSec * 1000, retryAt: Date.now() + (retryAfterSec * 1000), retryCount: 1, timestamp: Date.now() });
+<<<<<<< HEAD
             batcherRef.batcher.drain();
+=======
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
             activeExecutions.delete(conversationId);
             queries.setIsStreaming(conversationId, false);
             setTimeout(() => {
@@ -57,6 +102,7 @@ export function createEventHandler({ queries, activeExecutions, broadcastSync, r
           eagerTTS(block.text, conversationId, sessionId);
         }
       }
+<<<<<<< HEAD
     } else if (parsed.type === 'user' && parsed.message?.content) {
       for (const block of parsed.message.content) {
         if (block.type === 'tool_result') {
@@ -110,6 +156,40 @@ export function createEventHandler({ queries, activeExecutions, broadcastSync, r
       broadcastSync({ type: 'streaming_progress', sessionId, conversationId, block: { type: 'usage', usage: parsed.usage }, seq: currentSequenceRef.val, timestamp: Date.now() });
     } else if (parsed.type === 'plan') {
       broadcastSync({ type: 'streaming_progress', sessionId, conversationId, block: { type: 'plan', entries: parsed.entries }, seq: currentSequenceRef.val, timestamp: Date.now() });
+=======
+    }
+
+    // Rate-limit detection in result blocks
+    if (parsed.type === 'result' && parsed.result) {
+      const resultText = typeof parsed.result === 'string' ? parsed.result : JSON.stringify(parsed.result);
+      const rlMatch = resultText.match(/you'?ve hit your limit|rate limit exceeded/i);
+      if (rlMatch) {
+        debugLog(`[rate-limit] Detected rate limit in result for conv ${conversationId}`);
+        const retryAfterSec = parseRateLimitResetTime(resultText);
+        const entry3 = activeExecutions.get(conversationId);
+        if (entry3 && entry3.pid) { try { process.kill(entry3.pid); } catch (_) {} }
+        const existingCount2 = rateLimitState.get(conversationId)?.retryCount || 0;
+        if (existingCount2 >= 3) {
+          activeExecutions.delete(conversationId);
+          queries.setIsStreaming(conversationId, false);
+          const errMsg2 = queries.createMessage(conversationId, 'assistant', `Error: Rate limit exceeded after ${existingCount2 + 1} attempts. Please try again later.`);
+          broadcastSync({ type: 'message_created', conversationId, message: errMsg2, timestamp: Date.now() });
+          broadcastSync({ type: 'streaming_complete', sessionId, conversationId, interrupted: true, timestamp: Date.now() });
+          return;
+        }
+        rateLimitState.set(conversationId, { retryAt: Date.now() + (retryAfterSec * 1000), cooldownMs: retryAfterSec * 1000, retryCount: existingCount2 + 1, isStreamDetected: true });
+        broadcastSync({ type: 'rate_limit_hit', sessionId, conversationId, retryAfterMs: retryAfterSec * 1000, retryAt: Date.now() + (retryAfterSec * 1000), retryCount: existingCount2 + 1, timestamp: Date.now() });
+        activeExecutions.delete(conversationId);
+        queries.setIsStreaming(conversationId, false);
+        setTimeout(() => {
+          rateLimitState.delete(conversationId);
+          broadcastSync({ type: 'rate_limit_clear', conversationId, timestamp: Date.now() });
+          scheduleRetry(conversationId, messageId, content, agentId, model, subAgent);
+        }, retryAfterSec * 1000);
+        return;
+      }
+      if (resultText) eagerTTS(resultText, conversationId, sessionId);
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.854",
+  "version": "1.0.856",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/server.js

@@ -26,7 +26,7 @@ const sendWs = (ws, obj) => { if (ws.readyState === 1) ws.send(wsEncode(obj)); }
 import { startAll as startACPTools, stopAll as stopACPTools, getStatus as getACPStatus, getPort as getACPPort, ensureRunning, queryModels as queryACPModels, touch as touchACP } from './lib/acp-sdk-manager.js';
 import * as execMachine from './lib/execution-machine.js';
 import * as toolInstallMachine from './lib/tool-install-machine.js';
-import { _assetCache, htmlState, generateETag, warmAssetCache, serveFile as _serveFile, createChunkBatcher } from './lib/asset-server.js';
+import { _assetCache, htmlState, generateETag, warmAssetCache, serveFile as _serveFile } from './lib/asset-server.js';
 import { installGMAgentConfigs } from './lib/gm-agent-configs.js';
 import * as toolManager from './lib/tool-manager.js';
 import { pm2Manager } from './lib/pm2-manager.js';
@@ -53,7 +53,7 @@ const activeExecutions = new Map();
 const activeScripts = new Map();
 const messageQueues = new Map();
 const rateLimitState = new Map();
-const ownedSessionIds = new Set();
+let _jsonlWatcher = null;
 const activeProcessesByRunId = new Map();
 const checkpointManager = new CheckpointManager(queries);
 const STUCK_AGENT_THRESHOLD_MS = 1800000;
@@ -121,8 +121,9 @@ const { scheduleRetry, drainMessageQueue } = createMessageQueue({ queries, messa
 const { processMessageWithStreaming } = createProcessMessage({
   queries, activeExecutions, rateLimitState, execMachine,
   broadcastSync, runClaudeWithStreaming, cleanupExecution, checkpointManager,
-  discoveredAgents, ownedSessionIds, STARTUP_CWD, buildSystemPrompt,
-  parseRateLimitResetTime, eagerTTS, touchACP, createChunkBatcher,
+  discoveredAgents, STARTUP_CWD, buildSystemPrompt,
+  parseRateLimitResetTime, eagerTTS, touchACP,
+  getJsonlWatcher: () => _jsonlWatcher,
   debugLog, logError,
   scheduleRetry, drainMessageQueue, createEventHandler
 });
@@ -187,7 +188,7 @@ setInterval(performDbRecovery, 300000);
 
 const { onServerReady, getJsonlWatcher } = createOnServerReady({
   queries, broadcastSync, warmAssetCache, staticDir, toolManager, discoveredAgents,
-  PORT, BASE_URL, watch, ownedSessionIds, resumeInterruptedStreams, activeExecutions,
+  PORT, BASE_URL, watch, setWatcher: (w) => { _jsonlWatcher = w; }, resumeInterruptedStreams, activeExecutions,
   debugLog, installGMAgentConfigs, startACPTools, getACPStatus, execMachine,
   toolInstallMachine, getSpeech, ensureModelsDownloaded, performAutoImport,
   performAgentHealthCheck, pm2Manager, pm2Subscribers, recoverStaleSessions

package/static/css/main.css

@@ -1,3 +1,19 @@
+<<<<<<< HEAD
+    *, *::before, *::after { box-sizing: border-box; }
+
+    :root {
+      --color-primary: #3b82f6;
+      --color-primary-dark: #1e40af;
+      --color-bg-primary: #ffffff;
+      --color-bg-secondary: #f9fafb;
+      --color-bg-code: #f1f5f9;
+      --color-code-text: #1e293b;
+      --color-code-border: #cbd5e1;
+      --color-thinking-bg: #f5f3ff;
+      --color-text-primary: #111827;
+      --color-text-secondary: #6b7280;
+      --color-border: #e5e7eb;
+=======
     @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
 
     *, *::before, *::after { box-sizing: border-box; }
@@ -16,10 +32,30 @@
       --color-text-muted: #9ca3af;
       --color-border: #e5e7eb;
       --color-border-strong: #d1d5db;
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
       --color-success: #10b981;
       --color-error: #ef4444;
       --color-warning: #f59e0b;
       --color-info: #0891b2;
+<<<<<<< HEAD
+      --sidebar-width: 300px;
+      --header-height: 52px;
+      --msg-max-width: 800px;
+    }
+
+    html.dark {
+      --color-bg-primary: #1a1a1a;
+      --color-bg-secondary: #242424;
+      --color-text-primary: #e5e5e5;
+      --color-text-secondary: #a3a3a3;
+      --color-border: #333333;
+      --color-primary: #737373;
+      --color-primary-dark: #525252;
+      --color-bg-code: #1e293b;
+      --color-code-text: #e2e8f0;
+      --color-code-border: #334155;
+      --color-thinking-bg: #1e1a2e;
+=======
       --sidebar-width: 260px;
       --header-height: 48px;
       --msg-max-width: 800px;
@@ -51,17 +87,24 @@
       --shadow-sm: 0 1px 2px rgba(0,0,0,0.3);
       --shadow-md: 0 4px 12px rgba(0,0,0,0.4);
       --shadow-lg: 0 8px 24px rgba(0,0,0,0.5);
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
 
     html, body {
       margin: 0;
       padding: 0;
       height: 100%;
+<<<<<<< HEAD
+      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+      background-color: var(--color-bg-primary);
+      color: var(--color-text-primary);
+=======
       font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
       background-color: var(--color-bg-primary);
       color: var(--color-text-primary);
       -webkit-font-smoothing: antialiased;
       -moz-osx-font-smoothing: grayscale;
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
 
     /* ===== ROOT LAYOUT: sidebar + main, full viewport ===== */
@@ -82,7 +125,10 @@
       display: flex;
       flex-direction: column;
       background-color: var(--color-bg-secondary);
+<<<<<<< HEAD
+=======
       border-right: 1px solid var(--color-border);
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
       overflow: hidden;
       transition: none !important;
       animation: none !important;
@@ -97,26 +143,51 @@
     }
 
     .sidebar-header {
+<<<<<<< HEAD
+      padding: 0.75rem 1rem;
+=======
       padding: 0.875rem 1rem 0.75rem;
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
       display: flex;
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
       min-height: var(--header-height);
+<<<<<<< HEAD
+=======
       border-bottom: 1px solid var(--color-border);
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
 
     .sidebar-header h2 {
       margin: 0;
+<<<<<<< HEAD
+      font-size: 0.875rem;
+      font-weight: 600;
+      text-transform: uppercase;
+      letter-spacing: 0.05em;
+      color: var(--color-text-secondary);
+=======
       font-size: 1rem;
       font-weight: 700;
       letter-spacing: -0.01em;
       color: var(--color-text-primary);
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
       white-space: nowrap;
       overflow: hidden;
     }
 
     .sidebar-new-btn {
+<<<<<<< HEAD
+      padding: 0.375rem 0.625rem;
+      font-size: 0.75rem;
+      background-color: var(--color-primary);
+      color: white;
+      border: none;
+      border-radius: 0.375rem;
+      cursor: pointer;
+      transition: background-color 0.2s;
+=======
       padding: 0.375rem 0.75rem;
       font-size: 0.8rem;
       font-weight: 600;
@@ -126,6 +197,7 @@
       border-radius: var(--radius-md);
       cursor: pointer;
       transition: background-color var(--transition-fast);
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
       white-space: nowrap;
       flex-shrink: 0;
     }
@@ -154,6 +226,8 @@
 
     .sidebar-clone-btn:hover { border-color: var(--color-primary); color: var(--color-primary); }
 
+<<<<<<< HEAD
+=======
     /* Sidebar overflow menu */
     .sidebar-overflow-btn {
       width: 28px;
@@ -205,6 +279,7 @@
     .sidebar-overflow-menu-item.danger { color: var(--color-error); }
     .sidebar-overflow-menu-wrapper { position: relative; }
 
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     .clone-input-bar {
       display: flex;
       align-items: center;
@@ -285,6 +360,24 @@
     }
 
     .conversation-item {
+<<<<<<< HEAD
+      padding: 0.75rem 0.75rem;
+      margin: 0.125rem 0.5rem;
+      border-radius: 0.375rem;
+      cursor: pointer;
+      transition: background-color 0.15s;
+      border-left: 3px solid transparent;
+      user-select: none;
+    }
+
+    .conversation-item:hover { background-color: var(--color-bg-primary); }
+
+    .conversation-item.active {
+      background-color: var(--color-primary);
+      color: white;
+      border-left-color: var(--color-primary-dark);
+    }
+=======
       padding: 0.625rem 0.75rem;
       margin: 0.125rem 0.5rem;
       border-radius: var(--radius-md);
@@ -301,6 +394,7 @@
       color: var(--color-primary);
     }
     .conversation-item.active .conversation-item-meta { color: var(--color-primary); opacity: 0.7; }
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
 
     .conversation-item-title {
       font-weight: 500;
@@ -320,7 +414,11 @@
       text-overflow: ellipsis;
     }
 
+<<<<<<< HEAD
+    .conversation-item.active .conversation-item-meta { color: rgba(255,255,255,0.7); }
+=======
     /* conversation-item.active meta color handled in active block */
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
 
     .conversation-streaming-badge {
       display: inline-flex;
@@ -331,14 +429,22 @@
 
     .streaming-dot {
       display: inline-block;
+<<<<<<< HEAD
+      width: 0.5rem;
+      height: 0.5rem;
+=======
       width: 0.4rem;
       height: 0.4rem;
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
       border-radius: 50%;
       background-color: var(--color-success);
       animation: pulse 1.5s ease-in-out infinite;
     }
 
     .conversation-item.active .streaming-dot {
+<<<<<<< HEAD
+      background-color: #fff;
+=======
       background-color: var(--color-success);
     }
 
@@ -362,6 +468,7 @@
     @keyframes typing-bounce {
       0%, 80%, 100% { transform: scale(0.7); opacity: 0.5; }
       40% { transform: scale(1); opacity: 1; }
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
 
     .conversation-item {
@@ -377,6 +484,8 @@
       overflow: hidden;
     }
 
+<<<<<<< HEAD
+=======
     /* Date group headers in sidebar */
     .conv-date-group-header {
       padding: 0.5rem 1.25rem 0.25rem;
@@ -402,6 +511,7 @@
       margin-right: 0.375rem;
     }
 
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     .conversation-item.pinned { cursor: grab; }
     .conversation-item.pinned:active { cursor: grabbing; }
     .conversation-item-checkbox {
@@ -459,16 +569,25 @@
     .conversation-item.active .conversation-item-delete,
     .conversation-item.active .conversation-item-archive,
     .conversation-item.active .conversation-item-export {
+<<<<<<< HEAD
+      color: rgba(255,255,255,0.8);
+=======
       color: var(--color-primary);
       opacity: 0.7;
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
 
     .conversation-item.active .conversation-item-delete:hover,
     .conversation-item.active .conversation-item-archive:hover,
     .conversation-item.active .conversation-item-export:hover {
+<<<<<<< HEAD
+      background-color: rgba(255,255,255,0.2);
+      color: white;
+=======
       background-color: rgba(var(--color-primary-rgb),0.15);
       color: var(--color-primary);
       opacity: 1;
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
 
     .sidebar-empty {
@@ -494,11 +613,18 @@
       align-items: center;
       gap: 0.75rem;
       padding: 0 1rem;
+<<<<<<< HEAD
+      height: var(--header-height);
+      min-height: var(--header-height);
+      flex-shrink: 0;
+      background-color: var(--color-bg-secondary);
+=======
       height: 48px;
       min-height: 48px;
       flex-shrink: 0;
       background: var(--color-bg-primary);
       border-bottom: 1px solid var(--color-border);
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     }
 
     .sidebar-toggle-btn {
@@ -528,9 +654,14 @@
     }
 
     .header-title {
+<<<<<<< HEAD
+      font-size: 1.125rem;
+      font-weight: 600;
+=======
       font-size: 0.9375rem;
       font-weight: 600;
       letter-spacing: -0.01em;
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
       margin: 0;
       flex: 1;
       min-width: 0;
@@ -693,6 +824,8 @@
       flex-direction: column;
     }
 
+<<<<<<< HEAD
+=======
     /* ===== MESSAGE BUBBLES ===== */
     .message-user-bubble {
       display: flex;
@@ -771,6 +904,7 @@
     .message-action-btn svg { width: 13px; height: 13px; }
     .message-wrapper { position: relative; }
 
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     #output {
       display: flex;
       flex-direction: column;
@@ -1017,6 +1151,15 @@
       white-space: nowrap;
     }
 
+<<<<<<< HEAD
+    /* --- Input area: fixed at bottom --- */
+    .input-section {
+      flex-shrink: 0;
+      background-color: var(--color-bg-primary);
+      padding: 0.75rem 1rem;
+    }
+
+=======
     /* ===== INPUT AREA REDESIGN ===== */
     .input-section {
       flex-shrink: 0;
@@ -1139,6 +1282,7 @@
     .input-send-btn:disabled { opacity: 0.4; cursor: not-allowed; transform: none; }
     .input-send-btn svg { width: 16px; height: 16px; }
 
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     .input-wrapper {
       max-width: var(--msg-max-width);
       margin: 0 auto;
@@ -1401,9 +1545,15 @@
     .permanently-expanded > summary::marker { display: none; content: ''; }
 
     /* ===== Folder Browser Modal ===== */
+<<<<<<< HEAD
+    .folder-modal-overlay { display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.5); z-index:2000; align-items:center; justify-content:center; }
+    .folder-modal-overlay.visible { display:flex; }
+    .folder-modal { background:var(--color-bg-primary); border-radius:0.5rem; width:500px; max-width:90vw; max-height:80vh; display:flex; flex-direction:column; box-shadow:0 20px 60px rgba(0,0,0,0.3); }
+=======
     .folder-modal-overlay { display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.5); backdrop-filter:blur(8px); -webkit-backdrop-filter:blur(8px); z-index:2000; align-items:center; justify-content:center; transition:opacity 0.15s ease; animation:fadeIn 0.15s ease; }
     .folder-modal-overlay.visible { display:flex; }
     .folder-modal { background:var(--color-bg-primary); border-radius:var(--radius-xl); width:500px; max-width:90vw; max-height:80vh; display:flex; flex-direction:column; box-shadow:var(--shadow-lg); animation:scaleIn 0.15s ease; }
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     .folder-modal-header { padding:1rem; display:flex; justify-content:space-between; align-items:center; flex-shrink:0; }
     .folder-modal-header h3 { margin:0; font-size:1rem; font-weight:600; }
     .folder-modal-close { background:none; border:none; font-size:1.25rem; cursor:pointer; color:var(--color-text-secondary); padding:0.25rem; line-height:1; }
@@ -1423,6 +1573,8 @@
     .folder-modal-footer { padding:0.75rem 1rem; display:flex; justify-content:flex-end; gap:0.5rem; flex-shrink:0; }
     .folder-modal-footer .btn { padding:0.5rem 1rem; font-size:0.8rem; }
 
+<<<<<<< HEAD
+=======
     @keyframes fadeIn {
       from { opacity: 0; }
       to { opacity: 1; }
@@ -1432,6 +1584,7 @@
       to { opacity: 1; transform: scale(1); }
     }
 
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     .btn { padding:0.5rem 1rem; border:none; border-radius:0.375rem; font-weight:500; cursor:pointer; transition:all 0.15s; font-size:0.875rem; }
     .btn-primary { background-color:var(--color-primary); color:white; }
     .btn-primary:hover:not(:disabled) { background-color:var(--color-primary-dark); }
@@ -1554,6 +1707,8 @@
       scrollbar-color: #475569 transparent;
     }
 
+<<<<<<< HEAD
+=======
     /* Modern thin scrollbars */
     .sidebar-list, #output-scroll, .message-scroll-area {
       scrollbar-width: thin;
@@ -1563,6 +1718,7 @@
       scrollbar-color: var(--color-border-strong) transparent;
     }
 
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     .voice-mic-btn {
       position: absolute;
       top: 4px;
@@ -1818,6 +1974,8 @@
     .icon-sm svg { width: 1rem !important; height: 1rem !important; }
     .icon-lg svg { width: 1.5rem !important; height: 1.5rem !important; }
 
+<<<<<<< HEAD
+=======
     /* ===== STREAMING STATUS BAR ===== */
     .streaming-status-bar {
       max-width: var(--msg-max-width);
@@ -1942,6 +2100,7 @@
       line-height: 1.4;
     }
 
+>>>>>>> 6bfde951cbeb65ec72b73da9c23b9c8c0ba0bbc1
     /* ===== STREAMING BLOCK STYLES ===== */
     .block-text {
       margin-bottom: 0;