@wendongfly/myhi 1.3.188 → 1.3.191

package/dist/chat.html

@@ -9,7 +9,8 @@
   <link rel="manifest" href="/manifest.json">
   <link rel="apple-touch-icon" href="/icon.png">
   <title>myhi 会话</title>
-  <script src="/lib/machine.js"></script>
+  <script src="/lib/machine.js" data-session></script>
+  <script src="/lib/prefs.js"></script>
   <script src="/sio-client/socket.io.min.js"></script>
   <script>
     (function(){try{
@@ -202,6 +203,8 @@
     .msg-raw:hover .raw-copy, .raw-copy.done { opacity: 1; }
     .raw-copy:hover, .cp-btn:hover { color: var(--text); border-color: var(--blue); }
     @media (hover: none) { .raw-copy { opacity: 0.85; } }
+    /* AI 工具的原始输出默认不显示（设置→聊天→显示 打开；终端会话的命令输出不受影响） */
+    body.hide-toolout .msg-raw.tool-out { display: none; }
     /* 消息里其他带框内容（代码块/表格/diff/工具详情…）同款复制按钮，见 attachCopyBtns */
     .cpw, .cp-host { position: relative; }
     .cp-btn { user-select: none; }
@@ -310,7 +313,7 @@
     /* ── 设置面板 ───────────────────────────── */
     #settings-backdrop { display: none; position: fixed; inset: 0; background: rgba(0,0,0,0.5); z-index: 60; }
     #settings-backdrop.open { display: block; }
-    #settings-panel { position: fixed; top: 0; right: -360px; width: 340px; max-width: 92vw; height: 100%; background: var(--surface); border-left: 1px solid var(--border); z-index: 61; transition: right 0.25s ease; overflow-y: auto; padding: 1rem; }
+    #settings-panel { position: fixed; top: 0; right: -360px; width: 340px; max-width: 92vw; height: 100%; background: var(--surface); border-left: 1px solid var(--border); z-index: 61; transition: right 0.25s ease; overflow-y: auto; padding: 1rem; box-sizing: border-box; }
     #settings-panel.open { right: 0; }
     .panel-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 0.6rem; font-size: 1rem; font-weight: 600; }
     .panel-close { background: none; border: none; color: var(--muted); font-size: 1.2rem; cursor: pointer; }
@@ -327,6 +330,18 @@
     .seg-row { display: flex; gap: 0.35rem; flex-wrap: wrap; }
     .seg { flex: 1; min-width: 3.2rem; background: var(--surface2); color: var(--text2); border: 1px solid var(--border); border-radius: 8px; padding: 0.45rem 0.3rem; font-size: 0.8rem; cursor: pointer; white-space: nowrap; }
     .seg.active { background: var(--purple); color: #fff; border-color: var(--purple); }
+    /* 设置里「名称 + 分段选择」一行 */
+    .set-line { display: flex; align-items: center; justify-content: space-between; gap: 0.6rem; padding: 0.45rem 0; font-size: 0.85rem; }
+    .set-line > span { flex: 0 1 auto; min-width: 3.5rem; }
+    .set-line small { display: block; font-size: 0.68rem; color: var(--muted); }
+    .set-line .seg-row { flex: 1 1 auto; max-width: 13.5rem; flex-wrap: nowrap; }
+    .set-line .seg { min-width: 0; padding: 0.38rem 0.2rem; font-size: 0.76rem; }
+    .set-task-hint { font-size: 0.74rem; color: var(--muted); line-height: 1.5; margin-bottom: 0.6rem; }
+    .set-task-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 0.45rem; }
+    .set-task-grid button { background: var(--surface2); color: var(--text); border: 1px solid var(--border); border-radius: 8px; padding: 0.6rem 0.5rem; font-size: 0.82rem; cursor: pointer; text-align: left; }
+    .set-task-grid button:hover { border-color: var(--purple); }
+    .set-foot { font-size: 0.72rem; color: var(--muted); line-height: 1.55; margin-top: 1rem; padding-top: 0.7rem; border-top: 1px solid var(--border); }
+    .set-foot a { color: var(--blue); }
     .setting-toggle input[type=checkbox] { width: 36px; height: 20px; appearance: none; -webkit-appearance: none; background: var(--border); border-radius: 10px; position: relative; cursor: pointer; transition: background 0.2s; }
     .setting-toggle input[type=checkbox]:checked { background: var(--green2); }
     .setting-toggle input[type=checkbox]::after { content: ''; position: absolute; top: 2px; left: 2px; width: 16px; height: 16px; background: #fff; border-radius: 50%; transition: left 0.2s; }
@@ -621,33 +636,16 @@
   <div id="settings-panel">
     <div class="panel-header"><span>设置</span><button class="panel-close" onclick="closeSettings()">✕</button></div>
     <div id="settings-tabs">
-      <button class="stab active" data-tab="look">外观</button>
-      <button class="stab" data-tab="chat">聊天</button>
+      <button class="stab active" data-tab="chat">聊天</button>
       <button class="stab" data-tab="bar">快捷栏</button>
-      <button class="stab" data-tab="more">更多</button>
+      <button class="stab" data-tab="task" id="stab-task">本任务</button>
     </div>
-    <div class="setting-group" data-stab="look">
-      <div style="font-size:0.8rem;color:var(--text2);margin:0.1rem 0 0.35rem">主题</div>
-      <div id="seg-theme" class="seg-row">
-        <button class="seg" data-theme="system">跟随系统</button>
-        <button class="seg" data-theme="dark">深色</button>
-        <button class="seg" data-theme="light">浅色</button>
-        <button class="seg" data-theme="black">纯黑</button>
-      </div>
-      <div style="font-size:0.8rem;color:var(--text2);margin:0.6rem 0 0.35rem">字号</div>
-      <div id="seg-font" class="seg-row">
-        <button class="seg" data-font="small">小</button>
-        <button class="seg" data-font="medium">中</button>
-        <button class="seg" data-font="large">大</button>
-      </div>
-    </div>
-    <div class="setting-group" data-stab="chat" style="display:none">
+    <div class="setting-group" data-stab="chat">
       <h4>显示</h4>
-      <label class="setting-toggle"><span>解析终端输出</span><input type="checkbox" id="set-parse" checked></label>
-      <label class="setting-toggle"><span>显示思考过程</span><input type="checkbox" id="set-thinking" checked></label>
-      <label class="setting-toggle"><span>工具调用默认折叠</span><input type="checkbox" id="set-collapse" checked></label>
-      <label class="setting-toggle"><span>思考过程默认折叠</span><input type="checkbox" id="set-thinkcollapse" checked></label>
-      <label class="setting-toggle"><span>工具输出只显示前 8 行（可展开）</span><input type="checkbox" id="set-rawclip" checked></label>
+      <div class="set-line"><span>思考过程</span><div id="seg-think" class="seg-row"><button class="seg" data-v="hide">隐藏</button><button class="seg" data-v="fold">折叠</button><button class="seg" data-v="open">展开</button></div></div>
+      <div class="set-line"><span>工具调用</span><div id="seg-tools" class="seg-row"><button class="seg" data-v="fold">折叠</button><button class="seg" data-v="open">展开</button></div></div>
+      <div class="set-line"><span>工具输出<small>AI 执行命令/读文件的原始结果</small></span><div id="seg-toolout" class="seg-row"><button class="seg" data-v="hide">隐藏</button><button class="seg" data-v="clip">前8行</button><button class="seg" data-v="all">全部</button></div></div>
+      <label class="setting-toggle" id="row-parse"><span>把终端里的 Claude 输出整理成聊天样式</span><input type="checkbox" id="set-parse" checked></label>
     </div>
     <div class="setting-group" data-stab="chat" style="display:none">
       <h4>输入</h4>
@@ -671,15 +669,20 @@
       </div>
       <div id="sk-visible-list" style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:0.15rem 0.6rem;margin-top:0.5rem"></div>
     </div>
-    <div class="setting-group" data-stab="more" style="display:none">
-      <h4>全局设置</h4>
-      <div style="font-size:0.72rem;color:var(--muted);margin-bottom:0.45rem;line-height:1.5">本机名称、语音识别、账户等对所有任务生效的设置，统一放在首页的 ⚙ 设置里。这里的「外观 / 聊天 / 快捷栏」只影响当前这台设备。</div>
-      <button onclick="location.href='/?settings=1'" style="width:100%;background:var(--blue2);color:#fff;border:none;border-radius:8px;padding:0.55rem;font-size:0.82rem;cursor:pointer">前往首页 ⚙ 设置 →</button>
-    </div>
-    <div class="setting-group" data-stab="more" style="display:none">
-      <h4>服务管理</h4>
-      <button onclick="restartMyhi()" style="width:100%;padding:0.6rem;background:var(--red2);color:#fff;border:none;border-radius:8px;cursor:pointer;font-size:0.85rem;font-weight:600;margin-top:0.1rem">重启 myhi</button>
+    <div class="setting-group" data-stab="task" style="display:none">
+      <div class="set-task-hint">这些设置只对当前任务（或它所在的项目）生效，快捷栏里隐藏了的也能从这里打开。</div>
+      <div class="set-task-grid">
+        <button onclick="closeSettings();openModelSheet()">🤖 模型</button>
+        <button onclick="closeSettings();openGuardSheet()">🛡 隐私护栏</button>
+        <button onclick="closeSettings();openSecretsSheet()">🔑 密钥</button>
+        <button onclick="closeSettings();openFollowUpSheet()">🔄 自动跟进</button>
+        <button onclick="closeSettings();showMemory()">🧠 记忆</button>
+        <button onclick="closeSettings();openSkillSheet()">🧩 技能</button>
+        <button onclick="closeSettings();openInboxSheet()">📥 草稿箱</button>
+        <button onclick="closeSettings();openGitSheet()">⬆ 提交代码</button>
+      </div>
     </div>
+    <div class="set-foot">这里的设置会同步到你登录的其他设备。外观（主题 / 字号）、本机显示名、语音、版本升级与重启在 <a href="/?settings=1">首页 ⚙ 设置</a>。</div>
   </div>
 
   <!-- QR弹窗 -->
@@ -1209,11 +1212,11 @@
     // 快捷栏：skVisible 逐按钮勾选（唯一显隐依据，null=默认全显）；skMode 仅记录最接近的预设（高亮用）
     const SK_LABELS = { draft:'📥 草稿', folder:'📂 文件夹', model:'模型', plan:'计划', compact:'压缩', resume:'恢复', clear:'清除', secrets:'🔑 密钥', guard:'🛡 护栏', followup:'🔄 跟进', git:'提交', memory:'记忆', skills:'技能', cost:'费用' };
     const SK_NORMAL_PRESET = ['draft', 'folder', 'plan', 'clear', 'guard', 'memory', 'skills'];
-    const DEFAULT_SETTINGS = { parseOutput: true, showThinking: true, collapseTools: true, thinkCollapsed: true, rawClip: true, enterMode: 'auto', skMode: null, skVisible: null };
+    const DEFAULT_SETTINGS = { parseOutput: true, showThinking: true, collapseTools: true, thinkCollapsed: true, rawClip: true, showToolOut: false, enterMode: 'auto', skMode: null, skVisible: null };
     let settings = loadSettings();
 
     function loadSettings() { try { return { ...DEFAULT_SETTINGS, ...JSON.parse(localStorage.getItem('myhi_chat_settings')) }; } catch { return { ...DEFAULT_SETTINGS }; } }
-    function saveSettings() { localStorage.setItem('myhi_chat_settings', JSON.stringify(settings)); }
+    function saveSettings() { localStorage.setItem('myhi_chat_settings', JSON.stringify(settings)); window.myhiPrefsPush?.(); }   // 同步到其他设备
 
     // ── 外观：主题 & 字号（跨页面共用 localStorage myhi_theme / myhi_font）──
     const THEME_META = { dark: '#0d1117', light: '#ffffff', black: '#000000', system: '#0d1117' };
@@ -1315,6 +1318,21 @@
     let _historyLoading = false;  // 防抖锁
     let _userScrolledUp = false;  // 用户已主动往上翻 → 关掉 trim 防被自动删
     const _histFingerprints = new Set(); // 已渲染历史消息指纹（翻页重叠兜底去重，agent:history 重放时清空）
+    // 回放里已画过的块（工具调用 id / 工具结果 id / 文本按 message.id）。AI 正在跑时进入会话（分屏盯任务最常见）：
+    // 服务端从 transcript 回放时，最新几条已经写进 transcript，紧接着同样的块又作为实时事件推过来 → 画两次。
+    // 实时事件按这些 id 查重，回放过的就跳过；agent:history 重放时清空。
+    const _replayedBlocks = new Set();
+    function blockKey(block, msgId) {
+      if (block.type === 'tool_use' && block.id) return 'tu:' + block.id;
+      if (block.type === 'tool_result' && block.tool_use_id) return 'tr:' + block.tool_use_id;
+      if (block.type === 'text' && block.text && msgId) return 'tx:' + msgId + ':' + block.text.slice(0, 80);
+      return null;
+    }
+    // 实时块是否在回放里画过（画过返回 true，调用方跳过）
+    function seenInReplay(block, msgId) {
+      const k = blockKey(block, msgId);
+      return !!k && _replayedBlocks.has(k);
+    }
 
     // 命令历史
     const cmdHistory = [];
@@ -2080,6 +2098,9 @@
     }
 
     function renderHistoryMessage(msg, parent) {
+      if (msg.type === 'assistant' && Array.isArray(msg.message?.content)) {
+        for (const b of msg.message.content) { const k = blockKey(b, msg.message.id); if (k) _replayedBlocks.add(k); }
+      } else if (msg.type === 'tool_result' && msg.id) _replayedBlocks.add('tr:' + msg.id);
       if (subaRoute(msg)) return; // 子代理内部历史消息归入对应面板（_history 兜底路径才有）
       const fp = histFingerprint(msg);
       if (fp) {
@@ -2094,7 +2115,7 @@
         if (!text) return;
         // 与 live 一致：工具输出 = 工具卡后面的独立 raw 代码块（addRawOutput 同款）
         const el = document.createElement('div');
-        el.className = 'msg msg-raw';
+        el.className = 'msg msg-raw tool-out';
         const block = document.createElement('div');
         block.className = 'code-block';
         block.innerHTML = renderAnsiHtml(text);
@@ -2268,13 +2289,14 @@
       }
     }
 
-    function addRawOutput(raw) {
+    // tool=true：AI 工具的输出（受「显示工具输出内容」开关控制）；否则是终端会话的命令输出，始终显示
+    function addRawOutput(raw, tool = false) {
       endStream(); endToolGroup();
       removeThinking();
       if (!stripAnsi(raw).trim()) return;
-      // 合并到上一个 raw 输出块（避免 DOM 碎片化）
+      // 合并到上一个同类 raw 输出块（避免 DOM 碎片化）
       const last = chatArea.lastElementChild;
-      if (last?.classList.contains('msg-raw')) {
+      if (last?.classList.contains('msg-raw') && last.classList.contains('tool-out') === tool) {
         const block = last.querySelector('.code-block');
         if (block) {
           block.innerHTML += renderAnsiHtml(raw);
@@ -2287,7 +2309,7 @@
         }
       }
       const msg = document.createElement('div');
-      msg.className = 'msg msg-raw';
+      msg.className = 'msg msg-raw' + (tool ? ' tool-out' : '');
       const block = document.createElement('div');
       block.className = 'code-block';
       block.innerHTML = renderAnsiHtml(raw);
@@ -2714,6 +2736,7 @@
         case 'user': {
           // 只有字符串 content 才可能是真人/草稿发言；claude 原生 user 事件带数组 content
           // （tool_result 块）不是用户说话，别渲染成气泡
+          if (msg.from && msg.from === socket.id) break;   // 自己发的，sendCommand 时已经画过
           if (msg.content && typeof msg.content === 'string') {
             endStream();
             const kind = syntheticUserKind(msg.content);
@@ -2743,6 +2766,7 @@
             // 避免渲染完第一段 text 后置位标志，导致同事件内 [text, tool_use, text] 的第二段被跳过
             const skipText = _streamedTextThisCall;
             for (const block of msg.message.content) {
+              if (seenInReplay(block, msg.message.id)) continue;   // 进会话时回放里已经画过
               if (block.type === 'thinking' && block.thinking) {
                 showThinking(block.thinking);
               } else if (block.type === 'text' && block.text) {
@@ -2761,7 +2785,7 @@
                 }
               } else if (block.type === 'tool_result') {
                 const content = typeof block.content === 'string' ? block.content : JSON.stringify(block.content);
-                if (!subaTryComplete(block.tool_use_id, content)) addRawOutput(content);
+                if (!subaTryComplete(block.tool_use_id, content)) addRawOutput(content, true);
               }
             }
           }
@@ -2841,11 +2865,11 @@
           // 独立工具结果消息。同时作为 call 边界兜底：如果某适配器没发 message_start，
           // 这里重置 call 标志能保证后续 assistant 文本不被前一个 call 的标志误吃
           _streamedTextThisCall = false;
-          if (msg.content) {
+          if (msg.content && !seenInReplay({ type: 'tool_result', tool_use_id: msg.tool_use_id })) {
             const text = typeof msg.content === 'string' ? msg.content
               : Array.isArray(msg.content) ? msg.content.map(b => b.text || '').join('\n')
               : JSON.stringify(msg.content);
-            if (text.trim() && !subaTryComplete(msg.tool_use_id, text)) addRawOutput(text);
+            if (text.trim() && !subaTryComplete(msg.tool_use_id, text)) addRawOutput(text, true);
           }
           setWorkState('working');
           break;
@@ -2878,6 +2902,7 @@
 
       subaResetAll();
       _histFingerprints.clear();
+      _replayedBlocks.clear();
       for (const msg of history) {
         renderHistoryMessage(msg, chatArea);
         trimMessages(); scrollToBottom();
@@ -3559,7 +3584,8 @@
       overlay.appendChild(wrap);
     };
 
-    window.openSettings = function() { document.getElementById('settings-backdrop').classList.add('open'); document.getElementById('settings-panel').classList.add('open'); syncSettingsUI(); applySettingsTab(localStorage.getItem('myhi_settings_tab') || 'look'); };
+    window.openSettings = function() { document.getElementById('settings-backdrop').classList.add('open'); document.getElementById('settings-panel').classList.add('open'); syncSettingsUI(); const t0 = localStorage.getItem('myhi_settings_tab');
+      applySettingsTab(['bar', 'task'].includes(t0) && !(t0 === 'task' && currentSession?.mode !== 'agent') ? t0 : 'chat'); };
     // 设置抽屉分类页签（1.3.174：一屏只看一类，不再长条堆叠）
     function applySettingsTab(tab) {
       document.querySelectorAll('#settings-tabs .stab').forEach(b => b.classList.toggle('active', b.dataset.tab === tab));
@@ -4096,22 +4122,51 @@
     function syncSettingsUI() {
       syncAppearanceUI();
       document.getElementById('set-parse').checked = settings.parseOutput;
-      document.getElementById('set-thinking').checked = settings.showThinking;
-      document.getElementById('set-collapse').checked = settings.collapseTools;
-      document.getElementById('set-thinkcollapse').checked = settings.thinkCollapsed !== false;
-      document.getElementById('set-rawclip').checked = settings.rawClip !== false;
+      // 「整理终端输出」只对终端模式的 Claude 会话有用；「本任务」入口只对 AI 会话有用
+      const isAgent = currentSession?.mode === 'agent';
+      document.getElementById('row-parse').style.display = isAgent ? 'none' : '';
+      document.getElementById('stab-task').style.display = isAgent ? '' : 'none';
+      syncDisplaySegs();
+      applyToolOut();
       syncEnterModeUI();
       syncSkModeUI();
     }
     document.getElementById('set-parse').addEventListener('change', (e) => { settings.parseOutput = e.target.checked; saveSettings(); });
-    document.getElementById('set-thinking').addEventListener('change', (e) => { settings.showThinking = e.target.checked; saveSettings(); });
-    document.getElementById('set-collapse').addEventListener('change', (e) => { settings.collapseTools = e.target.checked; saveSettings(); });
-    document.getElementById('set-thinkcollapse').addEventListener('change', (e) => { settings.thinkCollapsed = e.target.checked; saveSettings(); });
-    document.getElementById('set-rawclip').addEventListener('change', (e) => {
-      settings.rawClip = e.target.checked; saveSettings();
-      // 已渲染的输出块立即跟随新默认（用户手动点过的块也一并重置）
-      chatArea.querySelectorAll('.msg-raw').forEach(m => { delete m.dataset.open; rawClipSync(m); });
-    });
+    // AI 工具输出显隐（body.hide-toolout 藏掉 .msg-raw.tool-out；终端会话的命令输出不受影响）
+    function applyToolOut() { document.body.classList.toggle('hide-toolout', !settings.showToolOut); }
+    applyToolOut();
+    // 显示设置：三组分段选择，各对应原来的一两个开关
+    //   思考过程 隐藏/折叠/展开 = showThinking + thinkCollapsed；工具调用 折叠/展开 = collapseTools；
+    //   工具输出 隐藏/前 8 行/全部 = showToolOut + rawClip
+    function displayState() {
+      return {
+        think: !settings.showThinking ? 'hide' : (settings.thinkCollapsed !== false ? 'fold' : 'open'),
+        tools: settings.collapseTools ? 'fold' : 'open',
+        toolout: !settings.showToolOut ? 'hide' : (settings.rawClip !== false ? 'clip' : 'all'),
+      };
+    }
+    function syncDisplaySegs() {
+      const st = displayState();
+      for (const [id, key] of [['seg-think', 'think'], ['seg-tools', 'tools'], ['seg-toolout', 'toolout']]) {
+        document.querySelectorAll('#' + id + ' .seg').forEach(b => b.classList.toggle('active', b.dataset.v === st[key]));
+      }
+    }
+    document.querySelectorAll('#seg-think .seg').forEach(b => b.addEventListener('click', () => {
+      settings.showThinking = b.dataset.v !== 'hide';
+      if (b.dataset.v !== 'hide') settings.thinkCollapsed = b.dataset.v === 'fold';
+      saveSettings(); syncDisplaySegs();
+    }));
+    document.querySelectorAll('#seg-tools .seg').forEach(b => b.addEventListener('click', () => {
+      settings.collapseTools = b.dataset.v === 'fold'; saveSettings(); syncDisplaySegs();
+    }));
+    document.querySelectorAll('#seg-toolout .seg').forEach(b => b.addEventListener('click', () => {
+      const was = displayState().toolout;
+      settings.showToolOut = b.dataset.v !== 'hide';
+      if (b.dataset.v !== 'hide') settings.rawClip = b.dataset.v === 'clip';
+      saveSettings(); syncDisplaySegs(); applyToolOut();
+      // 显示方式变了：已渲染的输出块按新默认重新量（隐藏时量不出高度；用户手动点过的展开/收起也重置）
+      if (settings.showToolOut && was !== b.dataset.v) chatArea.querySelectorAll('.msg-raw.tool-out').forEach(m => { delete m.dataset.open; rawClipSync(m); });
+    }));
 
     window.restartMyhi = async function() {
       if (!confirm('确认重启 myhi 服务？\n重启期间连接会短暂中断，页面将自动重连。')) return;
@@ -6242,38 +6297,48 @@
       setTimeout(checkUpdate, 10 * 60 * 1000);
     })();
 
-    window.doUpdate = async function() {
+    // 等升级落地：轮询 /api/version（重启/停服期间连不上是正常的）。
+    // 成功 = 版本变了（且等于目标）；失败 = 服务端报了本次升级的失败原因；10 分钟兜底超时。
+    async function waitUpgrade(from, target, onTick) {
+      const t0 = Date.now();
+      while (Date.now() - t0 < 10 * 60 * 1000) {
+        await new Promise(r => setTimeout(r, 3000));
+        let v = null;
+        try { const r = await fetch('/api/version', { cache: 'no-store' }); if (r.ok) v = await r.json(); } catch {}
+        onTick?.(!!v, Math.round((Date.now() - t0) / 1000));
+        if (!v) continue;
+        if (v.current !== from && (!target || v.current === target)) return { ok: true, version: v.current };
+        const last = v.upgrade?.last;
+        if (!v.upgrade?.running && last && !last.ok && last.at >= t0 - 5000) return { ok: false, error: last.error };
+      }
+      return { ok: false, error: '等了 10 分钟仍未完成，请稍后刷新页面查看版本，或到服务器上查看 myhi log' };
+    }
+    window.doUpdate = async function(force) {
       if (!_versionInfo?.updateAvailable) return;
-      if (!confirm(`更新 myhi?\n当前: ${_versionInfo.current}\n最新: ${_versionInfo.latest}\n\n更新后服务将自动重启`)) return;
+      if (!force && !confirm(`更新 myhi?\n当前: ${_versionInfo.current}\n最新: ${_versionInfo.latest}\n\n更新后服务将自动重启`)) return;
       const badge = document.getElementById('update-badge');
-      badge.textContent = '⬆ 更新中...';
-      badge.style.color = 'var(--muted)';
+      const setBadge = (t, c) => { badge.textContent = t; badge.style.color = c || 'var(--muted)'; };
+      setBadge('⬆ 更新中...');
       try {
-        const resp = await fetch('/api/update', { method: 'POST' });
-        const data = await resp.json();
+        const resp = await fetch('/api/update', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ force: !!force }) });
+        const data = await resp.json().catch(() => ({}));
         if (!data.ok) {
+          // 有任务正在执行：说清楚会打断谁，确认后强制升级
+          if (data.busy?.length) {
+            if (confirm(data.error + '\n\n仍然现在升级吗？')) return doUpdate(true);
+            setBadge(`⬆ ${_versionInfo.latest}`, 'var(--yellow)'); return;
+          }
           addStatusMessage('更新失败：' + (data.error || '未知错误'));
-          badge.textContent = '⬆ 更新失败';
-          badge.style.color = 'var(--red)';
+          setBadge('⬆ 更新失败', 'var(--red)');
           return;
         }
         addStatusMessage(data.message || '升级中...');
-        badge.textContent = '⬆ 重启中...';
-        // 等待服务重启后自动刷新
-        setTimeout(() => {
-          let retries = 0;
-          const poll = setInterval(async () => {
-            try {
-              const r = await fetch('/api/version');
-              if (r.ok) { clearInterval(poll); location.reload(); }
-            } catch {}
-            if (++retries > 30) { clearInterval(poll); badge.textContent = '⬆ 请手动刷新'; badge.style.color = 'var(--red)'; }
-          }, 3000);
-        }, 5000);
+        const r = await waitUpgrade(data.from, data.target, (up, sec) => setBadge(up ? `⬆ 安装中 ${sec}s` : `⬆ 重启中 ${sec}s`));
+        if (r.ok) { addStatusMessage(`已升级到 ${r.version}，即将刷新`); setTimeout(() => location.reload(), 800); }
+        else { addStatusMessage('更新失败：' + r.error); setBadge('⬆ 更新失败', 'var(--red)'); }
       } catch (e) {
         addStatusMessage('更新失败: ' + e.message);
-        badge.textContent = `⬆ ${_versionInfo.latest}`;
-        badge.style.color = 'var(--yellow)';
+        setBadge(`⬆ ${_versionInfo.latest}`, 'var(--yellow)');
       }
     };