@co0ontty/wand 1.1.5 → 1.1.7

package/dist/claude-pty-bridge.js

@@ -435,12 +435,11 @@ export class ClaudePtyBridge extends EventEmitter {
             /\bgrant\b.*\bpermission\b/i.test(normalized) ||
             /\bhaven't granted\b/i.test(normalized) ||
             /\benter to confirm\b/i.test(normalized) ||
-            /\bwould you like to proceed\b/i.test(normalized) ||
-            /❯/.test(normalized));
+            /\bwould you like to proceed\b/i.test(normalized));
     }
     extractPromptText(normalized) {
         // Return a snippet around the permission prompt
-        const match = normalized.match(/.{0,100}(?:do you want to|permission|grant|enter to confirm|would you like to proceed|❯).{0,100}/i);
+        const match = normalized.match(/.{0,100}(?:do you want to|permission|grant|enter to confirm|would you like to proceed).{0,100}/i);
         return match?.[0] ?? normalized.slice(-100);
     }
     extractPermissionTarget(normalized) {

package/dist/process-manager.js

@@ -40,8 +40,7 @@ const PROMPT_PATTERNS = [
     /\bwould you like to\b/i,
     /\bshall i\b/i,
     /\bcan i\b/i,
-    /\bgrant\b.*\bpermission\b/i,
-    /❯/
+    /\bgrant\b.*\bpermission\b/i
 ];
 const REAL_CONVERSATION_MIN_LINES = 2;
 const REAL_CONVERSATION_MIN_MESSAGES = 2;
@@ -1143,16 +1142,14 @@ export class ProcessManager extends EventEmitter {
                 continue;
             const jsonlPath = path.join(getClaudeProjectDir(cwd), `${claudeSessionId}.jsonl`);
             try {
-                if (existsSync(jsonlPath)) {
-                    unlinkSync(jsonlPath);
-                    deleted++;
-                }
+                unlinkSync(jsonlPath);
+                deleted++;
             }
             catch {
-                // Best-effort — Claude cache cleanup is non-critical
+                // Best-effort — file may already be gone
             }
         }
-        if (deleted > 0) {
+        if (sessions.length > 0) {
             this.claudeHistoryCache = null;
         }
         return deleted;

package/dist/web-ui/content/scripts.js

@@ -165,6 +165,14 @@
         }
       }
 
+      function getConfigCwd() {
+        return (state.config && state.config.defaultCwd) || "/tmp";
+      }
+
+      function getEffectiveCwd() {
+        return state.workingDir || getConfigCwd();
+      }
+
       // PWA install prompt handling
       window.addEventListener('beforeinstallprompt', function(e) {
         e.preventDefault();
@@ -464,14 +472,14 @@
                 '</div>' +
                 '<div class="file-side-panel-body">' +
                   '<div class="file-explorer-header">' +
-                    '<span class="file-explorer-path" id="file-explorer-cwd">' + escapeHtml(selectedSession && selectedSession.cwd ? selectedSession.cwd : (state.config && state.config.defaultCwd ? state.config.defaultCwd : "")) + '</span>' +
+                    '<span class="file-explorer-path" id="file-explorer-cwd">' + escapeHtml(selectedSession && selectedSession.cwd ? selectedSession.cwd : getConfigCwd()) + '</span>' +
                     '<button class="file-explorer-refresh" id="file-explorer-refresh" title="刷新" aria-label="刷新文件列表">↻</button>' +
                   '</div>' +
                   '<div class="file-search-box">' +
                     '<input type="text" id="file-search-input" class="file-search-input" placeholder="搜索文件..." autocomplete="off" />' +
                     '<button class="file-search-clear" id="file-search-clear" type="button" aria-label="清除搜索">×</button>' +
                   '</div>' +
-                  '<div class="file-explorer" id="file-explorer">' + renderFileExplorer(selectedSession && selectedSession.cwd ? selectedSession.cwd : (state.config && state.config.defaultCwd ? state.config.defaultCwd : "")) + '</div>' +
+                  '<div class="file-explorer" id="file-explorer">' + renderFileExplorer(selectedSession && selectedSession.cwd ? selectedSession.cwd : getConfigCwd()) + '</div>' +
                 '</div>' +
               '</div>' +
               '<div id="output" class="terminal-container' + (state.selectedId ? "" : " hidden") + ' active">' +
@@ -498,7 +506,7 @@
                   '<div class="blank-chat-cwd-wrap">' +
                     '<div class="blank-chat-cwd" id="blank-chat-cwd" role="button" tabindex="0" title="点击切换工作目录">' +
                       '<span class="blank-chat-cwd-icon">📁</span>' +
-                      '<span class="blank-chat-cwd-path" id="blank-chat-cwd-path">' + escapeHtml(state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp")) + '</span>' +
+                      '<span class="blank-chat-cwd-path" id="blank-chat-cwd-path">' + escapeHtml(getEffectiveCwd()) + '</span>' +
                       '<span class="blank-chat-cwd-arrow" id="blank-chat-cwd-arrow">▼</span>' +
                     '</div>' +
                     '<div class="blank-chat-cwd-dropdown hidden" id="blank-chat-cwd-dropdown"></div>' +
@@ -1103,7 +1111,7 @@
       function updateFilePanelCwd(session) {
         var cwdEl = document.getElementById("file-explorer-cwd");
         if (!cwdEl) return;
-        var cwd = session && session.cwd ? session.cwd : (state.config && state.config.defaultCwd ? state.config.defaultCwd : "");
+        var cwd = session && session.cwd ? session.cwd : getConfigCwd();
         cwdEl.textContent = cwd;
       }
 
@@ -1142,7 +1150,7 @@
       }
 
       function renderFileExplorer(cwd) {
-        var root = cwd || (state.config && state.config.defaultCwd) || "";
+        var root = cwd || getConfigCwd();
         if (!root) {
           return '<div class="file-explorer empty">No working directory configured.</div>';
         }
@@ -1161,8 +1169,8 @@
           var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
           if (session) cwd = session.cwd || "";
         }
-        if (!cwd && state.config && state.config.defaultCwd) {
-          cwd = state.config.defaultCwd;
+        if (!cwd) {
+          cwd = getConfigCwd();
         }
         if (!cwd) {
           explorer.innerHTML = '<div class="file-explorer empty">No working directory.</div>';
@@ -1504,7 +1512,7 @@
       }
 
       function renderFolderPicker(state) {
-        var currentDir = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp");
+        var currentDir = getEffectiveCwd();
 
         // 如果有选中的会话，不显示单独的工作目录标签（已嵌入输入框内部）
         if (state.selectedId) {
@@ -1530,7 +1538,7 @@
 
       // 渲染内嵌到输入框的工作目录指示器
       function renderWorkingDirIndicator(state) {
-        var currentDir = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp");
+        var currentDir = getEffectiveCwd();
         var displayDir = currentDir;
 
         // 如果有选中的会话，使用会话的工作目录
@@ -1653,7 +1661,7 @@
               '<div class="field">' +
                 '<label class="field-label" for="cwd">工作目录</label>' +
                 '<div class="suggestions-wrap">' +
-                  '<input id="cwd" type="text" class="field-input" autocomplete="off" placeholder="' + escapeHtml(state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp")) + '" />' +
+                  '<input id="cwd" type="text" class="field-input" autocomplete="off" placeholder="' + escapeHtml(getEffectiveCwd()) + '" />' +
                   '<div id="cwd-suggestions" class="suggestions hidden"></div>' +
                 '</div>' +
                 '<p class="field-hint">留空则使用上方目录，支持路径自动补全。</p>' +
@@ -2221,7 +2229,7 @@
 
         if (folderPickerInput) {
           // Load initial folders from saved or default path
-          var initialPath = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp");
+          var initialPath = getEffectiveCwd();
           loadFolderSuggestions(initialPath);
 
           folderPickerInput.addEventListener("focus", function() {
@@ -2397,16 +2405,14 @@
           folderPickerModal.classList.remove("hidden");
           // Set initial path in input
           if (folderPickerInput) {
-            folderPickerInput.value = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp");
+            folderPickerInput.value = getEffectiveCwd();
           }
           // Load initial folders
-          var initialPath = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp");
+          var initialPath = getEffectiveCwd();
           loadFolderSuggestions(initialPath);
           renderBreadcrumb(initialPath);
         }
 
-        // Welcome screen folder button (legacy, now handled by initBlankChatCwd)
-
         if (closeFolderPicker && folderPickerModal) {
           closeFolderPicker.addEventListener("click", function() {
             folderPickerModal.classList.add("hidden");
@@ -2426,6 +2432,16 @@
         setupVisualViewportHandlers();
       }
 
+      function activateSessionItem(sessionId) {
+        var session = state.sessions.find(function(s) { return s.id === sessionId; });
+        if (session && session.status !== "running") {
+          resumeSessionFromList(sessionId);
+        } else {
+          selectSession(sessionId);
+        }
+        closeSessionsDrawer();
+      }
+
       function handleSessionItemClick(event) {
         var target = event.target;
         if (!target || !(target instanceof Element)) return;
@@ -2502,13 +2518,22 @@
           }
           if (_swipeState) return;
           if (item.dataset.sessionId) {
-            var clickedSession = state.sessions.find(function(s) { return s.id === item.dataset.sessionId; });
-            if (clickedSession && clickedSession.status !== "running") {
-              resumeSessionFromList(item.dataset.sessionId);
-            } else {
-              selectSession(item.dataset.sessionId);
-            }
-            closeSessionsDrawer();
+            activateSessionItem(item.dataset.sessionId);
+          } else if (item.dataset.claudeHistoryId) {
+            var claudeSessionId = item.dataset.claudeHistoryId;
+            var cwd = item.dataset.cwd;
+            resumeClaudeHistorySession(claudeSessionId, cwd)
+              .then(function(data) {
+                if (data && data.id) {
+                  state.selectedId = data.id;
+                  persistSelectedId();
+                  state.drafts[data.id] = "";
+                  loadSessions().then(function() {
+                    selectSession(data.id);
+                    closeSessionsDrawer();
+                  });
+                }
+              });
           }
         }
       }
@@ -2527,13 +2552,22 @@
           return;
         }
         if (item.dataset.sessionId) {
-          var keySession = state.sessions.find(function(s) { return s.id === item.dataset.sessionId; });
-          if (keySession && keySession.status !== "running") {
-            resumeSessionFromList(item.dataset.sessionId);
-          } else {
-            selectSession(item.dataset.sessionId);
-          }
-          closeSessionsDrawer();
+          activateSessionItem(item.dataset.sessionId);
+        } else if (item.dataset.claudeHistoryId) {
+          var claudeSessionId = item.dataset.claudeHistoryId;
+          var cwd = item.dataset.cwd;
+          resumeClaudeHistorySession(claudeSessionId, cwd)
+            .then(function(data) {
+              if (data && data.id) {
+                state.selectedId = data.id;
+                persistSelectedId();
+                state.drafts[data.id] = "";
+                loadSessions().then(function() {
+                  selectSession(data.id);
+                  closeSessionsDrawer();
+                });
+              }
+            });
         }
       }
 
@@ -2968,15 +3002,9 @@
         state.terminalViewportSize = { width: 0, height: 0 };
         state.terminalAutoFollow = true;
         clearTerminalScrollIdleTimer();
-        // Double-rAF: wait for browser to complete layout before measuring and fitting
+        // Retry-based fit: wait for browser to complete layout before measuring and fitting
         if (state.fitAddon) {
-          requestAnimationFrame(function() {
-            requestAnimationFrame(function() {
-              if (state.fitAddon && shouldResizeTerminalViewport()) {
-                state.fitAddon.fit();
-              }
-            });
-          });
+          ensureTerminalFit();
         }
 
         var viewport = getTerminalViewport();
@@ -3403,11 +3431,7 @@
             updateShellChrome();
 
             var selectedSession = state.sessions.find(function(s) { return s.id === id; });
-            if (data.messages && data.messages.length > 0) {
-              state.currentMessages = data.messages;
-            } else {
-              state.currentMessages = [];
-            }
+            state.currentMessages = data.messages || [];
 
             if (state.terminal) {
               syncTerminalBuffer(id, data.output || "", { mode: "replace" });
@@ -3891,7 +3915,7 @@
 
       function quickStartSession() {
         var command = getPreferredTool();
-        var defaultCwd = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "");
+        var defaultCwd = getEffectiveCwd();
         var defaultMode = (state.config && state.config.defaultMode) ? state.config.defaultMode : "default";
         state.preferredCommand = command;
         state.chatMode = getSafeModeForTool(command, state.chatMode);
@@ -3928,7 +3952,7 @@
 
         hideError(errorEl);
 
-        var defaultCwd = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "");
+        var defaultCwd = getEffectiveCwd();
         var selectedMode = getSafeModeForTool(command, state.modeValue);
         state.modeValue = selectedMode;
         state.chatMode = selectedMode;
@@ -4006,7 +4030,7 @@
       }
 
       function loadBlankChatCwdDropdown(dropdown) {
-        var defaultCwd = state.config && state.config.defaultCwd ? state.config.defaultCwd : "/tmp";
+        var defaultCwd = getConfigCwd();
         dropdown.innerHTML = '<div class="blank-chat-cwd-loading">加载中...</div>';
         fetch("/api/recent-paths", { credentials: "same-origin" })
           .then(function(res) { return res.json(); })
@@ -4364,7 +4388,7 @@
         welcomeInput.placeholder = "正在启动会话...";
         welcomeInput.disabled = true;
         var mode = state.chatMode || "full-access";
-        var defaultCwd = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "");
+        var defaultCwd = getEffectiveCwd();
         var preferredTool = getPreferredTool();
         fetch("/api/commands", {
           method: "POST",
@@ -4426,7 +4450,7 @@
 
         // No selected session, create a new one
         var mode = state.chatMode || "full-access";
-        var defaultCwd = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "");
+        var defaultCwd = getEffectiveCwd();
         var preferredTool = getPreferredTool();
         fetch("/api/commands", {
           method: "POST",
@@ -4493,9 +4517,8 @@
         // Init terminal if not already done
         if (!state.terminal) initTerminal();
         applyCurrentView();
-        if (state.currentView === "terminal") {
-          state.terminalViewportSize = { width: 0, height: 0 };
-          scheduleTerminalResize(true);
+        if (state.terminal && state.fitAddon) {
+          ensureTerminalFit();
         }
         // Don't call renderChat() here — loadOutput() always calls renderChat() after it resolves.
         // Calling renderChat() prematurely would render with stale/empty messages.
@@ -5380,7 +5403,7 @@
         welcomeInput.placeholder = "Claude 正在思考，请稍候...";
         welcomeInput.disabled = true;
         var mode = state.chatMode || "full-access";
-        var defaultCwd = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "");
+        var defaultCwd = getEffectiveCwd();
         var preferredTool = getPreferredTool();
         fetch("/api/commands", {
           method: "POST",
@@ -5416,7 +5439,7 @@
 
       function createSessionFromInput(value, inputBox, welcomeInput) {
         var mode = state.chatMode || "full-access";
-        var defaultCwd = state.workingDir || (state.config && state.config.defaultCwd ? state.config.defaultCwd : "");
+        var defaultCwd = getEffectiveCwd();
         var preferredTool = getPreferredTool();
         fetch("/api/commands", {
           method: "POST",
@@ -6463,6 +6486,34 @@
         updateTerminalJumpToBottomButton();
       }
 
+      function ensureTerminalFit() {
+        var maxAttempts = 10;
+        var attempt = 0;
+        function tryFit() {
+          attempt++;
+          state.terminalViewportSize = { width: 0, height: 0 };
+          if (shouldResizeTerminalViewport() && state.fitAddon) {
+            state.fitAddon.fit();
+            maybeScrollTerminalToBottom("resize");
+            if (state.selectedId && state.terminal) {
+              var nextSize = { cols: state.terminal.cols, rows: state.terminal.rows };
+              if (state.lastResize.cols !== nextSize.cols || state.lastResize.rows !== nextSize.rows) {
+                state.lastResize = nextSize;
+                fetch("/api/sessions/" + state.selectedId + "/resize", {
+                  method: "POST",
+                  headers: { "Content-Type": "application/json" },
+                  credentials: "same-origin",
+                  body: JSON.stringify(nextSize)
+                }).catch(function() {});
+              }
+            }
+          } else if (attempt < maxAttempts) {
+            requestAnimationFrame(tryFit);
+          }
+        }
+        requestAnimationFrame(tryFit);
+      }
+
       function scheduleTerminalResize(immediate) {
         if (state.resizeTimer) {
           clearTimeout(state.resizeTimer);
@@ -6588,7 +6639,7 @@
               }
               updateSessionSnapshot(snapshot);
               if (msg.sessionId === state.selectedId) {
-                if (msg.data.messages && msg.data.messages.length > 0) {
+                if (msg.data.messages) {
                   state.currentMessages = msg.data.messages;
                 }
                 updateTaskDisplay();
@@ -6661,6 +6712,8 @@
             if (msg.sessionId === state.selectedId && msg.data) {
               if (chatRenderTimer) { clearTimeout(chatRenderTimer); chatRenderTimer = null; }
               updateTerminalOutput(msg.data.output || "", msg.sessionId, "replace");
+              // Ensure terminal is properly fitted after receiving initial data
+              scheduleTerminalResize(true);
             }
             break;
           case 'usage':
@@ -6719,10 +6772,10 @@
             }
           }
           if (permissionActionsEl) permissionActionsEl.classList.remove("hidden");
-          // Also show in task bar
-          taskEl.textContent = pendingEscalation ? (pendingEscalation.reason || "等待 Claude 权限授权") : "等待 Claude 权限授权";
-          taskEl.classList.remove("hidden");
-          taskEl.classList.add("permission-blocked");
+          // Hide top task bar — permission info is already shown in the composer
+          taskEl.textContent = "";
+          taskEl.classList.add("hidden");
+          taskEl.classList.remove("permission-blocked");
           return;
         }
 

package/dist/web-ui/content/styles.css

@@ -1529,15 +1529,6 @@
       flex-shrink: 0;
       animation: task-pulse 1.2s ease-in-out infinite;
     }
-    .current-task.permission-blocked {
-      color: #d18b00;
-      background: rgba(240, 165, 0, 0.14);
-      border-color: rgba(240, 165, 0, 0.3);
-    }
-    .current-task.permission-blocked::before {
-      background: #f0a500;
-      animation: none;
-    }
     @keyframes task-pulse {
       0%, 100% { opacity: 1; transform: scale(1); }
       50% { opacity: 0.5; transform: scale(0.8); }
@@ -1559,8 +1550,8 @@
       padding: 10px;
       overflow: hidden;
       min-height: 0;
-      margin: 0 10px 10px;
-      border-radius: var(--radius-lg);
+      margin: 0 6px 6px;
+      border-radius: var(--radius-md);
       border: 1px solid rgba(140, 110, 85, 0.35);
       box-shadow:
         inset 0 1px 0 rgba(255, 255, 255, 0.06),
@@ -4861,7 +4852,7 @@
         width: min(300px, calc(100vw - 20px));
         top: 0;
       }
-      .terminal-container { margin: 0 12px 12px; min-height: 0; }
+      .terminal-container { margin: 0 6px 6px; min-height: 0; }
       .btn { min-height: 40px; }
       .btn-sm { min-height: 36px; padding: 0 10px; font-size: 0.75rem; height: 36px; }
       .btn-icon { width: 36px; height: 36px; min-height: 36px; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {