@wendongfly/myhi 1.3.44 → 1.3.47

package/dist/chat.html

@@ -237,6 +237,13 @@
     .action-sheet-item:active { background: #30363d; }
     .action-sheet-item .desc { font-size: 0.72rem; color: #8b949e; }
     .action-sheet-item .check { color: #3fb950; font-size: 0.9rem; }
+    .ask-q-block { padding: 0.5rem 0.3rem 0.3rem; border-top: 1px solid #21262d; }
+    .ask-q-block:first-child { border-top: none; }
+    .ask-q-label { font-size: 0.72rem; color: #8b949e; font-weight: 600; margin-bottom: 0.25rem; letter-spacing: 0.05em; }
+    .ask-q-text { font-size: 0.82rem; color: #c9d1d9; line-height: 1.5; white-space: pre-wrap; margin-bottom: 0.4rem; }
+    .ask-opt-selected { background: #1f3a5f !important; border: 1px solid #388bfd; }
+    .ask-opt-selected .check { color: #58a6ff; }
+    .ask-submit-btn:disabled { background: #30363d !important; color: #6e7681 !important; cursor: not-allowed; }
     .action-sheet-cancel { display: block; width: 100%; margin-top: 0.5rem; padding: 0.65rem; background: #21262d; border: none; border-radius: 10px; color: #8b949e; font-size: 0.85rem; cursor: pointer; text-align: center; }
     .mem-file { margin-bottom: 0.5rem; border: 1px solid #21262d; border-radius: 8px; overflow: hidden; }
     .mem-file-header { display: flex; align-items: center; gap: 0.35rem; padding: 0.4rem 0.6rem; background: #21262d; cursor: pointer; font-size: 0.75rem; color: #58a6ff; user-select: none; }
@@ -493,10 +500,11 @@
     <div class="action-sheet-box" style="max-height:70vh;display:flex;flex-direction:column">
       <div class="action-sheet-title" id="ask-sheet-title">提问</div>
       <div id="ask-sheet-body" style="flex:1;overflow-y:auto;padding:0.3rem 0;scrollbar-width:thin"></div>
-      <div style="padding:0.3rem 0.2rem">
+      <div id="ask-sheet-input-wrap" style="padding:0.3rem 0.2rem">
         <input id="ask-sheet-input" class="slash-inp" placeholder="输入自定义回答（可选）" autocomplete="off">
       </div>
-      <button class="action-sheet-cancel" style="background:#7c3aed;color:#fff;font-weight:600;margin-bottom:0.4rem" onclick="submitAskReply()">发送自定义回答</button>
+      <button id="ask-sheet-submit-multi" class="action-sheet-cancel ask-submit-btn" style="display:none;background:#388bfd;color:#fff;font-weight:600;margin-bottom:0.4rem" onclick="submitAskMulti()">提交回答</button>
+      <button id="ask-sheet-submit-single" class="action-sheet-cancel" style="background:#7c3aed;color:#fff;font-weight:600;margin-bottom:0.4rem" onclick="submitAskReply()">发送自定义回答</button>
       <button class="action-sheet-cancel" onclick="closeAskSheet()">取消</button>
     </div>
   </div>
@@ -800,7 +808,8 @@
     // ── 消息渲染 ──────────────────────────────────
     function addInputMessage(text) {
       endStream(); endToolGroup();
-      _streamedTextThisMessage = false; // 新一轮用户提问开始，重置流式渲染标志
+      _streamedTextThisCall = false;
+      _textRenderedThisTurn = false;
       const msg = document.createElement('div');
       msg.className = 'msg msg-input';
       msg.innerHTML = `<div><div class="bubble">${escHtml(text)}</div><div class="meta">${formatTime(new Date())}</div></div>`;
@@ -821,7 +830,14 @@
 
     let _streamEl = null; // 当前流式输出的 assistant 元素
     let _streamText = ''; // 累积的原始文本
-    let _streamedTextThisMessage = false; // 当前轮（自上次用户提问起）是否已通过 content_block_delta 流式渲染过 text；用于在末尾 assistant / result 事件中跳过重复渲染
+    // 拆成两个标志解耦：
+    //   _streamedTextThisCall  per-LLM-call：当前 LLM call 内是否已通过 content_block_delta 渲染过文本，
+    //     用于抑制同一 call 末尾 assistant 事件 text 块的重复回声。call 边界由 message_start / tool_result 重置。
+    //   _textRenderedThisTurn  per-turn：当前轮（自上次用户提问起）是否已渲染过任何答复文本，
+    //     用于抑制 result 事件的 msg.result 重复渲染。
+    // 之前合并成一个 per-turn 标志会让"非流式 + 多步工具调用"场景里第二条 assistant 事件的 text 被吃掉。
+    let _streamedTextThisCall = false;
+    let _textRenderedThisTurn = false;
 
     function addAssistantMessage(raw) {
       removeThinking(); endToolGroup();
@@ -1316,11 +1332,17 @@
         case 'assistant':
           removeThinking();
           if (msg.message?.content) {
+            // 进入 loop 前快照：同一 assistant 事件里所有 text 块统一按入口时刻的 call 标志决定，
+            // 避免渲染完第一段 text 后置位标志，导致同事件内 [text, tool_use, text] 的第二段被跳过
+            const skipText = _streamedTextThisCall;
             for (const block of msg.message.content) {
               if (block.type === 'thinking' && block.thinking) {
                 showThinking(block.thinking);
               } else if (block.type === 'text' && block.text) {
-                if (!_streamedTextThisMessage) addAssistantMessage(block.text);
+                if (!skipText) {
+                  addAssistantMessage(block.text);
+                  _textRenderedThisTurn = true;
+                }
               } else if (block.type === 'tool_use') {
                 if (block.name === 'AskUserQuestion' && block.input) {
                   openAskSheet(block.input);
@@ -1337,9 +1359,9 @@
         case 'result':
           removeThinking();
           setWorkState('idle');
-          // msg.result 是整轮的最终答复文本，纯文字回答时与流式 delta 内容相同；
-          // 已通过 content_block_delta 渲染过就跳过，避免生成第二个独立气泡
-          if (msg.result && !_streamedTextThisMessage) {
+          // msg.result 是整轮的最终答复文本，纯文字回答时与本轮已渲染的文本重复；
+          // 本轮已经通过流式或 assistant 事件渲染过就跳过，避免生成第二个独立气泡
+          if (msg.result && !_textRenderedThisTurn) {
             addAssistantMessage(typeof msg.result === 'string' ? msg.result : JSON.stringify(msg.result));
           }
           const cost = msg.total_cost_usd ? ` ($${msg.total_cost_usd.toFixed(4)})` : '';
@@ -1357,7 +1379,8 @@
           // 流式内容增量
           if (msg.delta?.type === 'text_delta' && msg.delta.text) {
             appendStream(msg.delta.text);
-            _streamedTextThisMessage = true;
+            _streamedTextThisCall = true;
+            _textRenderedThisTurn = true;
           } else if (msg.delta?.type === 'thinking_delta' && msg.delta.thinking) {
             appendThinking(msg.delta.thinking);
           } else if (msg.delta?.type === 'input_json_delta' && msg.delta.partial_json) {
@@ -1368,6 +1391,8 @@
           endStream();
           break;
         case 'message_start':
+          // 新 LLM call 边界：重置 call 标志，让本 call 的 assistant 文本能正常渲染（同一轮内可能有多次 call）
+          _streamedTextThisCall = false;
           setWorkState('working');
           break;
         case 'message_delta':
@@ -1384,7 +1409,9 @@
           setWorkState('working');
           break;
         case 'tool_result':
-          // 独立工具结果消息
+          // 独立工具结果消息。同时作为 call 边界兜底：如果某适配器没发 message_start，
+          // 这里重置 call 标志能保证后续 assistant 文本不被前一个 call 的标志误吃
+          _streamedTextThisCall = false;
           if (msg.content) {
             const text = typeof msg.content === 'string' ? msg.content
               : Array.isArray(msg.content) ? msg.content.map(b => b.text || '').join('\n')
@@ -1454,7 +1481,9 @@
         el.appendChild(content);
         chatArea.appendChild(el);
         _streamEl = el;
-        _streamedTextThisMessage = true;
+        // 还原后的气泡相当于"本 call 已渲染过文本"，避免回放完成后紧接着又收到的 assistant 事件再渲一次
+        _streamedTextThisCall = true;
+        _textRenderedThisTurn = true;
       }
 
       scrollToBottom();
@@ -1948,47 +1977,114 @@
     let currentModelId = '';
 
     // ── AskUserQuestion 弹窗 ──
+    // 多题模式状态：{ qList, answers: [{ question, label } | null] }
+    let askMultiState = null;
     window.openAskSheet = function(input) {
       const questions = input?.questions || input?.question;
       const sheet = document.getElementById('ask-sheet');
       const title = document.getElementById('ask-sheet-title');
       const body = document.getElementById('ask-sheet-body');
       const inp = document.getElementById('ask-sheet-input');
+      const inputWrap = document.getElementById('ask-sheet-input-wrap');
+      const btnMulti = document.getElementById('ask-sheet-submit-multi');
+      const btnSingle = document.getElementById('ask-sheet-submit-single');
       body.innerHTML = '';
       inp.value = '';
 
-      // 支持单个 question 或 questions 数组
-      const qList = Array.isArray(questions) ? questions : [{ question: questions || input?.question || '请选择', options: input?.options }];
+      // 区分单题/多题。questions 是非空数组且 length>1 才进入批量模式
+      const isMulti = Array.isArray(questions) && questions.length > 1;
+      const qList = Array.isArray(questions)
+        ? questions
+        : [{ question: questions || input?.question || '请选择', options: input?.options, header: input?.header }];
+
+      // 标题：多题用首题 header 或通用文案，单题保持原行为
+      title.textContent = (qList[0] && qList[0].header) || input?.header || (isMulti ? `提问（${qList.length} 题）` : '提问');
+
+      if (isMulti) {
+        askMultiState = { qList, answers: new Array(qList.length).fill(null) };
+        inputWrap.style.display = 'none';
+        btnSingle.style.display = 'none';
+        btnMulti.style.display = '';
+      } else {
+        askMultiState = null;
+        inputWrap.style.display = '';
+        btnSingle.style.display = '';
+        btnMulti.style.display = 'none';
+      }
 
-      qList.forEach(q => {
+      qList.forEach((q, qIdx) => {
         const qText = q.question || q.text || '';
-        title.textContent = q.header || '提问';
-        // 问题描述
+        const block = document.createElement('div');
+        block.className = isMulti ? 'ask-q-block' : '';
+
+        if (isMulti) {
+          const label = document.createElement('div');
+          label.className = 'ask-q-label';
+          label.textContent = `Q${qIdx + 1}`;
+          block.appendChild(label);
+        }
         if (qText) {
           const desc = document.createElement('div');
-          desc.style.cssText = 'padding:0.5rem 0.3rem;font-size:0.82rem;color:#c9d1d9;line-height:1.5;white-space:pre-wrap';
-          desc.textContent = qText;
-          body.appendChild(desc);
+          if (isMulti) {
+            desc.className = 'ask-q-text';
+            desc.textContent = qText;
+          } else {
+            desc.style.cssText = 'padding:0.5rem 0.3rem;font-size:0.82rem;color:#c9d1d9;line-height:1.5;white-space:pre-wrap';
+            desc.textContent = qText;
+          }
+          block.appendChild(desc);
         }
-        // 选项列表
         if (q.options?.length) {
-          q.options.forEach(opt => {
+          q.options.forEach((opt, optIdx) => {
             const item = document.createElement('div');
             item.className = 'action-sheet-item';
-            item.innerHTML = `<div><div>${escHtml(opt.label || opt.value || opt)}</div>${opt.description ? `<div class="desc">${escHtml(opt.description)}</div>` : ''}</div>`;
+            const label = opt.label || opt.value || String(opt);
+            item.innerHTML = `<div><div>${escHtml(label)}</div>${opt.description ? `<div class="desc">${escHtml(opt.description)}</div>` : ''}</div><span class="check" style="display:none">✓</span>`;
             item.onclick = () => {
-              closeAskSheet();
-              const reply = opt.label || opt.value || String(opt);
-              addInputMessage(reply);
-              socket.emit('agent:query', { prompt: reply });
-              showThinking();
+              if (isMulti) {
+                // 单选切换：清掉同题其它选中态，标记当前
+                Array.from(block.querySelectorAll('.action-sheet-item')).forEach(el => {
+                  el.classList.remove('ask-opt-selected');
+                  const c = el.querySelector('.check'); if (c) c.style.display = 'none';
+                });
+                item.classList.add('ask-opt-selected');
+                const c = item.querySelector('.check'); if (c) c.style.display = '';
+                askMultiState.answers[qIdx] = { question: qText, label };
+                refreshAskMultiSubmit();
+              } else {
+                closeAskSheet();
+                addInputMessage(label);
+                socket.emit('agent:query', { prompt: label });
+                showThinking();
+              }
             };
-            body.appendChild(item);
+            block.appendChild(item);
           });
         }
+        body.appendChild(block);
       });
+
+      if (isMulti) refreshAskMultiSubmit();
       sheet.classList.add('open');
-      inp.focus();
+      if (!isMulti) inp.focus();
+    };
+    function refreshAskMultiSubmit() {
+      const btn = document.getElementById('ask-sheet-submit-multi');
+      if (!askMultiState) return;
+      const remaining = askMultiState.answers.filter(a => !a).length;
+      btn.disabled = remaining > 0;
+      btn.textContent = remaining > 0 ? `还剩 ${remaining} 题未答` : '提交回答';
+    }
+    window.submitAskMulti = function() {
+      if (!askMultiState) return;
+      const { answers } = askMultiState;
+      if (answers.some(a => !a)) return;
+      const reply = answers.map((a, i) => `Q${i + 1}: ${a.question}\nA: ${a.label}`).join('\n\n');
+      closeAskSheet();
+      askMultiState = null;
+      addInputMessage(reply);
+      socket.emit('agent:query', { prompt: reply });
+      showThinking();
     };
     window.closeAskSheet = function() {
       document.getElementById('ask-sheet').classList.remove('open');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wendongfly/myhi",
-  "version": "1.3.44",
+  "version": "1.3.47",
   "description": "Web-based terminal sharing with chat UI — control your terminal from phone via LAN/Tailscale",
   "type": "module",
   "main": "dist/index.js",