@wendongfly/myhi 1.3.94 → 1.3.96

package/bin/myhi.js

@@ -24,6 +24,18 @@ for (let i = 0; i < args.length; i++) {
 }
 if (!cmd) cmd = args[0];
 
+// --version / -v：只打印版本号就退出，绝不启动 server（否则会起孤儿进程霸占端口）
+if (cmd === '--version' || cmd === '-v' || cmd === 'version') {
+  try {
+    const pkg = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf8'));
+    console.log(pkg.version);
+  } catch (e) {
+    console.error('读取版本失败:', e.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
 const configDir = join(homedir(), '.myhi');
 const pidFile = join(configDir, 'daemon.pid');
 const logFile = join(configDir, 'daemon.log');

package/dist/chat.html

@@ -2431,132 +2431,155 @@
     ];
     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 = '';
-
-      // 区分单题/多题。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, qIdx) => {
-        const qText = q.question || q.text || '';
-        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');
-          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, optIdx) => {
-            const item = document.createElement('div');
-            item.className = 'action-sheet-item';
-            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 = () => {
-              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();
-              }
-            };
-            block.appendChild(item);
-          });
-        }
-        body.appendChild(block);
-      });
-
-      if (isMulti) refreshAskMultiSubmit();
-      sheet.classList.add('open');
-      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');
-    };
-    window.submitAskReply = function() {
-      const inp = document.getElementById('ask-sheet-input');
-      const text = inp.value.trim();
-      if (!text) return;
-      closeAskSheet();
-      addInputMessage(text);
-      socket.emit('agent:query', { prompt: text });
-      showThinking();
-    };
-    document.getElementById('ask-sheet-input').addEventListener('keydown', (e) => {
-      if (e.key === 'Enter') { e.preventDefault(); submitAskReply(); }
-    });
-
+    // ── AskUserQuestion 弹窗（累加多题）──
+    // AI 一轮里可能连发多个 AskUserQuestion 调用；旧逻辑每次 openAskSheet 都清空覆盖，
+    // 导致只看到最后一题、其余被顶掉无法回答。改为把本轮所有提问累加进同一弹窗，
+    // 多题一次答完；跨重渲染保留已选答案；去重防同一题被 assistant 事件+独立 tool_use 事件各触发一次。
+    let _askQuestions = [];
+    let askMultiState = null; // { answers: [{question,label}|null] }，下标与 _askQuestions 对齐
+
+    function _normalizeAsk(input) {
+      const q = input?.questions || input?.question;
+      const list = Array.isArray(q)
+        ? q
+        : [{ question: (typeof q === 'string' ? q : '') || input?.question || '请选择', options: input?.options, header: input?.header }];
+      return list.map((x) => ({
+        question: x.question || x.text || '',
+        options: x.options || x.choices || [],
+        header: x.header,
+      }));
+    }
+
+    window.openAskSheet = function(input) {
+      for (const q of _normalizeAsk(input)) {
+        if (!q.question || !_askQuestions.some((e) => e.question === q.question)) _askQuestions.push(q);
+      }
+      if (!_askQuestions.length) return;
+      _renderAskSheet();
+    };
+
+    function _renderAskSheet() {
+      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');
+
+      const qList = _askQuestions;
+      const isMulti = qList.length > 1;
+      if (!askMultiState) askMultiState = { answers: [] };
+      while (askMultiState.answers.length < qList.length) askMultiState.answers.push(null);
+
+      title.textContent = (qList[0] && qList[0].header) || (isMulti ? '提问（' + qList.length + ' 题）' : '提问');
+      if (isMulti) {
+        inputWrap.style.display = 'none';
+        btnSingle.style.display = 'none';
+        btnMulti.style.display = '';
+      } else {
+        inputWrap.style.display = '';
+        btnSingle.style.display = '';
+        btnMulti.style.display = 'none';
+      }
+
+      body.innerHTML = '';
+      qList.forEach((q, qIdx) => {
+        const qText = q.question || '';
+        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');
+          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) => {
+            const item = document.createElement('div');
+            item.className = 'action-sheet-item';
+            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>';
+            if (isMulti && askMultiState.answers[qIdx]?.label === label) {
+              item.classList.add('ask-opt-selected');
+              const c = item.querySelector('.check'); if (c) c.style.display = '';
+            }
+            item.onclick = () => {
+              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 {
+                _clearAsk();
+                addInputMessage(label);
+                socket.emit('agent:query', { prompt: label });
+                showThinking();
+              }
+            };
+            block.appendChild(item);
+          });
+        }
+        body.appendChild(block);
+      });
+
+      if (isMulti) refreshAskMultiSubmit();
+      sheet.classList.add('open');
+      if (!isMulti) inp.focus();
+    }
+
+    function refreshAskMultiSubmit() {
+      const btn = document.getElementById('ask-sheet-submit-multi');
+      if (!askMultiState) return;
+      const n = _askQuestions.length;
+      const remaining = n - askMultiState.answers.slice(0, n).filter(Boolean).length;
+      btn.disabled = remaining > 0;
+      btn.textContent = remaining > 0 ? '还剩 ' + remaining + ' 题未答' : '提交回答';
+    }
+
+    function _clearAsk() {
+      _askQuestions = [];
+      askMultiState = null;
+      const inp = document.getElementById('ask-sheet-input');
+      if (inp) inp.value = '';
+      document.getElementById('ask-sheet').classList.remove('open');
+    }
+
+    window.submitAskMulti = function() {
+      if (!askMultiState) return;
+      const n = _askQuestions.length;
+      const answers = askMultiState.answers.slice(0, n);
+      if (answers.some((a) => !a)) return;
+      const reply = answers.map((a, i) => 'Q' + (i + 1) + ': ' + a.question + '\nA: ' + a.label).join('\n\n');
+      _clearAsk();
+      addInputMessage(reply);
+      socket.emit('agent:query', { prompt: reply });
+      showThinking();
+    };
+    window.closeAskSheet = function() { _clearAsk(); };
+    window.submitAskReply = function() {
+      const inp = document.getElementById('ask-sheet-input');
+      const text = inp.value.trim();
+      if (!text) return;
+      _clearAsk();
+      addInputMessage(text);
+      socket.emit('agent:query', { prompt: text });
+      showThinking();
+    };
+    document.getElementById('ask-sheet-input').addEventListener('keydown', (e) => {
+      if (e.key === 'Enter') { e.preventDefault(); submitAskReply(); }
+    });
+
     window.openModelSheet = function() {
       const list = document.getElementById('model-list');
       list.innerHTML = '';