@co0ontty/wand 1.21.14 → 1.21.16

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

@@ -328,29 +328,81 @@
         // 先驱动跨视图的运行指示器（顶部进度条/徽章计时/气泡呼吸条）
         updateRunningIndicators(session);
 
-        // 旧的 .structured-status-bar（在 composer-top-row 里独立的小条）
-        // 已经合并进 #todo-progress 顶部状态条。这里只清理可能残留的旧节点 +
-        // 维护 composer in-flight 的发光态 + 同步 _statusBarStartTime 给
-        // 顶部徽章计时复用。
-        var legacy = document.querySelector(".structured-status-bar");
-        if (legacy) legacy.remove();
-
+        // Status bar now lives in .composer-top-row alongside the todo-progress collapse bar
+        var topRow = document.querySelector(".composer-top-row");
+        var existing = document.querySelector(".structured-status-bar");
         var composer = document.querySelector(".input-composer");
         if (!session || !isStructuredSession(session)) {
+          if (existing) existing.remove();
           if (composer) composer.classList.remove("in-flight");
-          if (_statusBarTimerId) { clearInterval(_statusBarTimerId); _statusBarTimerId = null; }
-          _statusBarStartTime = 0;
+          clearInterval(_statusBarTimerId);
+          _statusBarTimerId = null;
           return;
         }
 
-        var isInFlight = !!(session.structuredState && session.structuredState.inFlight);
+        var isInFlight = session.structuredState && session.structuredState.inFlight;
+
         if (isInFlight) {
-          if (!_statusBarStartTime) _statusBarStartTime = Date.now();
+          // Start timer if not already running
+          if (!_statusBarTimerId) {
+            _statusBarStartTime = Date.now();
+          }
+
+          // Add glow to input composer
           if (composer) composer.classList.add("in-flight");
+
+          if (!existing && topRow) {
+            var bar = document.createElement("div");
+            bar.className = "structured-status-bar";
+            bar.innerHTML =
+              '<span class="status-bar-dot"></span>' +
+              '<span class="status-bar-label">回复中</span>' +
+              '<span class="status-bar-timer">0.0s</span>';
+            // Append as last child of the top row so it sits to the right of the todo bar
+            topRow.appendChild(bar);
+            existing = bar;
+          } else if (existing && existing.classList.contains("completed")) {
+            // Was completed, now in-flight again — reset
+            existing.classList.remove("completed");
+            existing.style.animation = "none";
+            existing.querySelector(".status-bar-label").textContent = "回复中";
+            var dot = existing.querySelector(".status-bar-dot");
+            if (dot) dot.style.display = "";
+            _statusBarStartTime = Date.now();
+          }
+
+          // Start interval to update timer
+          if (!_statusBarTimerId) {
+            _statusBarTimerId = setInterval(function() {
+              var bar = document.querySelector(".structured-status-bar:not(.completed)");
+              if (!bar) { clearInterval(_statusBarTimerId); _statusBarTimerId = null; return; }
+              var elapsed = ((Date.now() - _statusBarStartTime) / 1000).toFixed(1);
+              var timerEl = bar.querySelector(".status-bar-timer");
+              if (timerEl) timerEl.textContent = elapsed + "s";
+            }, 100);
+          }
         } else {
+          // Not in-flight: show completion or remove
+          clearInterval(_statusBarTimerId);
+          _statusBarTimerId = null;
+
+          // Remove glow from input composer
           if (composer) composer.classList.remove("in-flight");
-          _statusBarStartTime = 0;
-          if (_statusBarTimerId) { clearInterval(_statusBarTimerId); _statusBarTimerId = null; }
+
+          if (existing && !existing.classList.contains("completed")) {
+            // Just finished — transition to completed state
+            var elapsed = _statusBarStartTime ? ((Date.now() - _statusBarStartTime) / 1000).toFixed(1) : "0.0";
+            existing.classList.add("completed");
+            existing.querySelector(".status-bar-label").textContent = "完成";
+            existing.querySelector(".status-bar-timer").textContent = elapsed + "s";
+            var dot = existing.querySelector(".status-bar-dot");
+            if (dot) dot.style.display = "none";
+            _statusBarStartTime = 0;
+            // Remove after animation ends
+            setTimeout(function() {
+              if (existing.parentNode) existing.remove();
+            }, 3000);
+          }
         }
       }
 
@@ -1373,12 +1425,10 @@
                     '<div class="todo-progress-header" id="todo-progress-toggle">' +
                       '<div class="todo-progress-left">' +
                         '<span class="todo-progress-spinner"></span>' +
-                        '<span class="todo-progress-message" id="todo-progress-message"></span>' +
-                      '</div>' +
-                      '<div class="todo-progress-right">' +
-                        '<span class="todo-progress-status" id="todo-progress-status">运行中</span>' +
-                        '<svg class="todo-progress-chevron" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"/></svg>' +
+                        '<span class="todo-progress-counter" id="todo-progress-counter">0/0</span>' +
+                        '<span class="todo-progress-task" id="todo-progress-task"></span>' +
                       '</div>' +
+                      '<svg class="todo-progress-chevron" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 12 15 18 9"/></svg>' +
                     '</div>' +
                     '<div class="todo-progress-body hidden" id="todo-progress-body">' +
                       '<ul class="todo-progress-list" id="todo-progress-list"></ul>' +
@@ -13746,6 +13796,17 @@
           }
 
           chatMessages.innerHTML = html;
+          // 会话切换 / 首次渲染后，浏览器会把旧的 scrollTop 钳制到新内容
+          // 的最大值——column-reverse 下这意味着视觉上跳到最上面（最旧消息），
+          // 也就是用户反馈的"退出再回来时被重定向到最上面"。这里在
+          // prevMsgCount === 0（resetChatRenderCache 后或刚从空状态进入）
+          // 强制 scrollTop=0（视觉底部 = 最新消息），避免错位。
+          // 注意：仅在"换会话/初次渲染"时强制重置；同一会话内的全量重渲染
+          // （prevMsgCount > 0，比如 forceFullRender 或消息数减少）继续走
+          // smartScrollToBottom，尊重用户的 chatAutoFollow 选择。
+          if (prevMsgCount === 0) {
+            chatMessages.scrollTop = 0;
+          }
           attachAllCopyHandlers(chatMessages);
           bindChatScrollListener();
           applyPersistedExpandState(chatMessages);
@@ -13970,122 +14031,77 @@
       });
 
       function updateTodoProgress(messages) {
-        var container = document.getElementById("todo-progress");
-        if (!container) return;
-
-        var session = state.sessions.find(function(s) { return s.id === state.selectedId; });
-        if (!session) {
-          container.classList.add("hidden");
-          return;
-        }
-
-        // ── 左侧：用户最新发出的一条消息 ──
-        var lastUserText = "";
-        if (Array.isArray(messages)) {
-          for (var i = messages.length - 1; i >= 0; i--) {
-            var umsg = messages[i];
-            if (!umsg || umsg.role !== "user" || !Array.isArray(umsg.content)) continue;
-            for (var uj = 0; uj < umsg.content.length; uj++) {
-              var ublock = umsg.content[uj];
-              if (ublock && ublock.type === "text" && ublock.text && ublock.text.trim()) {
-                lastUserText = ublock.text.trim().replace(/\s+/g, " ");
-                break;
-              }
+        var todos = null;
+        // Scan all messages for latest TodoWrite tool_use
+        for (var i = messages.length - 1; i >= 0; i--) {
+          var msg = messages[i];
+          if (!msg.content || !Array.isArray(msg.content)) continue;
+          for (var j = msg.content.length - 1; j >= 0; j--) {
+            var block = msg.content[j];
+            if (block.type === "tool_use" && block.name === "TodoWrite" && block.input && block.input.todos) {
+              todos = block.input.todos;
+              break;
             }
-            if (lastUserText) break;
           }
+          if (todos) break;
         }
 
-        // 没有任何用户消息（例如刚新建的空会话）才隐藏
-        if (!lastUserText) {
+        var container = document.getElementById("todo-progress");
+        if (!container) return;
+
+        if (!todos || todos.length === 0) {
           container.classList.add("hidden");
           return;
         }
-        container.classList.remove("hidden");
 
-        // ── 右侧：当前运行状态 ──
-        var sig = computeRunningSignal(session);
-        var isStructured = isStructuredSession(session);
-        var isRunning = isStructured ? !!sig.inFlight : !!sig.ptyRunning;
-        var statusText = isRunning
-          ? (isStructured ? "运行中" : "正在运行")
-          : "已完成";
+        container.classList.remove("hidden");
 
-        // ── 步骤数：来自最近一次 TodoWrite ──
-        var todos = null;
-        if (Array.isArray(messages)) {
-          for (var ti = messages.length - 1; ti >= 0; ti--) {
-            var tmsg = messages[ti];
-            if (!tmsg.content || !Array.isArray(tmsg.content)) continue;
-            for (var tj = tmsg.content.length - 1; tj >= 0; tj--) {
-              var tblock = tmsg.content[tj];
-              if (tblock && tblock.type === "tool_use" && tblock.name === "TodoWrite" && tblock.input && tblock.input.todos) {
-                todos = tblock.input.todos;
-                break;
-              }
+        var completed = 0;
+        var inProgress = 0;
+        var activeTask = "";
+        for (var k = 0; k < todos.length; k++) {
+          if (todos[k].status === "completed") completed++;
+          if (todos[k].status === "in_progress") {
+            inProgress++;
+            if (!activeTask) {
+              activeTask = todos[k].activeForm || todos[k].content || "";
             }
-            if (todos) break;
           }
         }
 
-        var hasTodos = !!(todos && todos.length > 0);
-        var allTodosDone = false;
-        var stepLabel = "";
-        if (hasTodos) {
-          var completedCount = 0;
-          var inProgressCount = 0;
-          for (var k = 0; k < todos.length; k++) {
-            if (todos[k].status === "completed") completedCount++;
-            if (todos[k].status === "in_progress") inProgressCount++;
-          }
-          allTodosDone = completedCount === todos.length;
-          if (isRunning && !allTodosDone) {
-            var stepIdx = Math.max(1, completedCount + (inProgressCount > 0 ? 1 : 0));
-            stepLabel = " · 第 " + stepIdx + "/" + todos.length + " 步";
-          }
+        // 显示当前执行步骤 = 已完成 + 正在进行（如果有）
+        var currentStep = completed + inProgress;
+        var allDone = completed === todos.length;
+        if (allDone) {
+          // Hide todo when all tasks are completed
+          container.classList.add("hidden");
+          return;
+        } else {
+          container.classList.remove("all-done");
         }
 
-        // ── 应用状态类 ──
-        container.classList.toggle("is-running", isRunning);
-        // 复用已有 .all-done 样式（隐藏 spinner + 显示绿色 ✓）
-        container.classList.toggle("all-done", !isRunning);
-        container.classList.toggle("has-todos", hasTodos);
-
-        // ── 写入 DOM ──
-        var msgEl = document.getElementById("todo-progress-message");
-        if (msgEl) msgEl.textContent = lastUserText;
+        var counter = document.getElementById("todo-progress-counter");
+        if (counter) counter.textContent = currentStep + "/" + todos.length;
 
-        var statusEl = document.getElementById("todo-progress-status");
-        if (statusEl) statusEl.textContent = statusText + stepLabel;
+        var task = document.getElementById("todo-progress-task");
+        if (task) task.textContent = activeTask;
 
-        // ── 渲染展开后的 todo 列表（仅当有 todos 时） ──
+        // Render expanded list
         var list = document.getElementById("todo-progress-list");
         if (list) {
-          if (!hasTodos) {
-            list.innerHTML = "";
-          } else {
-            var html = "";
-            for (var m = 0; m < todos.length; m++) {
-              var t = todos[m];
-              var st = t.status || "pending";
-              var itemClass = st === "in_progress" ? "active" : st === "completed" ? "done" : "";
-              var iconClass = st === "in_progress" ? "active" : st === "completed" ? "done" : "pending";
-              var icon = st === "completed" ? "✓" : st === "in_progress" ? "›" : "○";
-              html += '<li class="todo-progress-item ' + itemClass + '">' +
-                '<span class="todo-item-icon ' + iconClass + '">' + icon + '</span>' +
-                '<span>' + escapeHtml(t.content || "") + '</span>' +
-              '</li>';
-            }
-            list.innerHTML = html;
-          }
-        }
-
-        // 没有 todos 时强制收起 body（没东西可展开）
-        if (!hasTodos) {
-          todoExpanded = false;
-          container.classList.remove("expanded");
-          var body = document.getElementById("todo-progress-body");
-          if (body) body.classList.add("hidden");
+          var html = "";
+          for (var m = 0; m < todos.length; m++) {
+            var t = todos[m];
+            var st = t.status || "pending";
+            var itemClass = st === "in_progress" ? "active" : st === "completed" ? "done" : "";
+            var iconClass = st === "in_progress" ? "active" : st === "completed" ? "done" : "pending";
+            var icon = st === "completed" ? "✓" : st === "in_progress" ? "›" : "○";
+            html += '<li class="todo-progress-item ' + itemClass + '">' +
+              '<span class="todo-item-icon ' + iconClass + '">' + icon + '</span>' +
+              '<span>' + escapeHtml(t.content || "") + '</span>' +
+            '</li>';
+          }
+          list.innerHTML = html;
         }
 
         // Sync todo progress to native notification

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

@@ -5390,38 +5390,6 @@
       text-overflow: ellipsis;
       white-space: nowrap;
     }
-    /* 左侧：用户最新发出的消息 */
-    .todo-progress-message {
-      flex: 1;
-      min-width: 0;
-      font-size: 0.75rem;
-      font-weight: 500;
-      color: var(--text-primary);
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    /* 右侧：状态文字 + 折叠箭头 */
-    .todo-progress-right {
-      display: flex;
-      align-items: center;
-      gap: 6px;
-      flex-shrink: 0;
-      min-width: 0;
-    }
-    .todo-progress-status {
-      font-size: 0.75rem;
-      font-weight: 500;
-      color: var(--text-secondary);
-      white-space: nowrap;
-      letter-spacing: 0.01em;
-    }
-    .todo-progress.is-running .todo-progress-status {
-      color: var(--accent);
-    }
-    .todo-progress.all-done .todo-progress-status {
-      color: #4a7a4f;
-    }
     .todo-progress-chevron {
       color: var(--text-muted);
       flex-shrink: 0;
@@ -5430,16 +5398,6 @@
     .todo-progress.expanded .todo-progress-chevron {
       transform: rotate(180deg);
     }
-    /* 没有 todo 列表时，没什么可展开的——隐藏箭头并去掉指针手势 */
-    .todo-progress:not(.has-todos) .todo-progress-chevron {
-      display: none;
-    }
-    .todo-progress:not(.has-todos) .todo-progress-header {
-      cursor: default;
-    }
-    .todo-progress:not(.has-todos) .todo-progress-header:hover {
-      background: transparent;
-    }
     .todo-progress-body {
       border-top: 1px solid var(--border-subtle);
       padding: 6px 10px 8px;
@@ -8580,9 +8538,6 @@
       .todo-progress-header { padding: 3px 6px; gap: 4px; }
       .todo-progress-counter { font-size: 0.5625rem; }
       .todo-progress-task { font-size: 0.5625rem; }
-      .todo-progress-message { font-size: 0.625rem; }
-      .todo-progress-status { font-size: 0.5625rem; }
-      .todo-progress-right { gap: 4px; }
       .todo-progress-chevron { width: 12px; height: 12px; }
       .todo-progress-body { padding: 4px 6px; }
 

package/package.json

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