@wendongfly/myhi 1.3.102 → 1.3.104

package/bin/myhi.js

@@ -11,6 +11,7 @@ const __dirname = dirname(__filename);
 // 解析 -p / --port 参数
 const args = process.argv.slice(2);
 let cmd = null;
+let httpOnlyFlag = null; // null=不改；true=切 HTTP-only；false=切回 HTTPS
 for (let i = 0; i < args.length; i++) {
   if ((args[i] === '-p' || args[i] === '--port') && args[i + 1]) {
     process.env.PORT = args[i + 1];
@@ -18,6 +19,10 @@ for (let i = 0; i < args.length; i++) {
   } else if (args[i].startsWith('--port=')) {
     process.env.PORT = args[i].split('=')[1];
     args.splice(i, 1); i--;
+  } else if (args[i] === '--http' || args[i] === '--no-https') {
+    httpOnlyFlag = true; args.splice(i, 1); i--;
+  } else if (args[i] === '--https') {
+    httpOnlyFlag = false; args.splice(i, 1); i--;
   } else if (!cmd && !args[i].startsWith('-')) {
     cmd = args[i];
   }
@@ -39,6 +44,24 @@ if (cmd === '--version' || cmd === '-v' || cmd === 'version') {
 const configDir = join(homedir(), '.myhi');
 const pidFile = join(configDir, 'daemon.pid');
 const logFile = join(configDir, 'daemon.log');
+const configFile = join(configDir, 'config.json');
+
+// --http / --https：持久化 HTTP-only 开关到 config.json，server 启动时读取（任何重启都保留，
+// 不依赖环境变量从 daemon 往下传）。设完若没显式命令，就自动 restart 让它立刻生效。
+if (httpOnlyFlag !== null) {
+  try {
+    mkdirSync(configDir, { recursive: true });
+    let cfg = {};
+    try { cfg = JSON.parse(readFileSync(configFile, 'utf8')); } catch {}
+    cfg.httpOnly = httpOnlyFlag;
+    writeFileSync(configFile, JSON.stringify(cfg, null, 2));
+    console.log(`[myhi] 已切换为 ${httpOnlyFlag ? 'HTTP（无 TLS，麦克风/摄像头等在非 localhost 会受限）' : 'HTTPS'} 模式`);
+  } catch (e) {
+    console.error('[myhi] 写入 config.json 失败:', e.message);
+    process.exit(1);
+  }
+  if (!cmd) cmd = 'restart'; // 无显式命令 → 切完直接重启使其生效
+}
 
 // ── 工具函数 ──────────────────────────────────────────────
 
@@ -585,6 +608,8 @@ myhi — 基于 Web 的终端共享工具 (${platform})
   myhi start           前台启动服务器
   myhi -p <port>       指定监听端口（默认 12300）
   myhi -d              后台启动（日志写入 ${configPath}daemon.log）
+  myhi --http          切为纯 HTTP（无 TLS）并重启，持久生效
+  myhi --https         切回 HTTPS（默认）并重启
   myhi stop            停止后台服务器
   myhi restart         重启后台服务器
   myhi status          查看运行状态

package/dist/chat.html

@@ -352,6 +352,7 @@
         <button class="tb-btn" id="btn-photo" onclick="openCamera()" title="拍照">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg>
         </button>
+        <span id="enter-hint" style="display:none;font-size:0.68rem;color:var(--muted);white-space:nowrap;align-self:center;margin-left:0.15rem"></span>
         <div class="spacer"></div>
         <button class="tb-btn" id="voice-btn" onclick="openVaSheet()" title="语音输入 / 需求助手">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M12 1a3 3 0 00-3 3v8a3 3 0 006 0V4a3 3 0 00-3-3z"/><path d="M19 10v2a7 7 0 01-14 0v-2"/><line x1="12" y1="19" x2="12" y2="23"/><line x1="8" y1="23" x2="16" y2="23"/></svg>
@@ -453,6 +454,18 @@
       <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>
     </div>
+    <div class="setting-group">
+      <h4>输入</h4>
+      <div style="font-size:0.8rem;color:var(--text2);margin:0.1rem 0 0.35rem">回车键</div>
+      <div id="seg-enter" class="seg-row">
+        <button class="seg" data-enter="auto">自动</button>
+        <button class="seg" data-enter="send">发送</button>
+        <button class="seg" data-enter="newline">换行</button>
+      </div>
+      <div style="font-size:0.72rem;color:var(--muted);margin-top:0.35rem;line-height:1.5">
+        自动：电脑回车发送 / Shift+回车换行；手机回车换行、用按钮发送。<br>发送：回车总是发送（换行用 Shift+回车）。换行：回车总是换行（发送用 Ctrl/⌘+回车 或按钮）。
+      </div>
+    </div>
     <div class="setting-group">
       <h4>语音识别 (ASR)</h4>
       <div style="font-size:0.72rem;color:var(--muted);margin-bottom:0.35rem">SenseVoice 或兼容服务的地址，留空表示禁用语音</div>
@@ -808,7 +821,7 @@
     let workState = 'idle';
 
     // 设置
-    const DEFAULT_SETTINGS = { parseOutput: true, showThinking: true, collapseTools: true };
+    const DEFAULT_SETTINGS = { parseOutput: true, showThinking: true, collapseTools: true, enterMode: 'auto' };
     let settings = loadSettings();
 
     function loadSettings() { try { return { ...DEFAULT_SETTINGS, ...JSON.parse(localStorage.getItem('myhi_chat_settings')) }; } catch { return { ...DEFAULT_SETTINGS }; } }
@@ -837,6 +850,24 @@
     }
     document.querySelectorAll('#seg-theme .seg').forEach(b => b.addEventListener('click', () => applyTheme(b.dataset.theme)));
     document.querySelectorAll('#seg-font .seg').forEach(b => b.addEventListener('click', () => applyFont(b.dataset.font)));
+    // 回车键行为（自动/发送/换行）——存 settings.enterMode，keydown 处理器读取
+    function updateEnterHint() {
+      const el = document.getElementById('enter-hint');
+      if (!el) return;
+      if (window.matchMedia('(pointer: coarse)').matches) { el.style.display = 'none'; return; } // 手机不显示
+      const mode = settings.enterMode || 'auto';
+      el.textContent = mode === 'newline' ? 'Enter 换行 · Ctrl+Enter 发送' : 'Enter 发送 · Shift+Enter 换行';
+      el.style.display = '';
+    }
+    function syncEnterModeUI() {
+      const m = settings.enterMode || 'auto';
+      document.querySelectorAll('#seg-enter .seg').forEach(b => b.classList.toggle('active', b.dataset.enter === m));
+      updateEnterHint();
+    }
+    document.querySelectorAll('#seg-enter .seg').forEach(b => b.addEventListener('click', () => {
+      settings.enterMode = b.dataset.enter; saveSettings(); syncEnterModeUI();
+    }));
+    updateEnterHint();
 
     // 输出累积
     let outputBuffer = '';
@@ -2035,8 +2066,17 @@
         }
         return;
       }
-      if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); sendCommand(); }
-      else if (e.key === 'ArrowUp' && !cmdInput.value) { if (historyIdx < cmdHistory.length - 1) { historyIdx++; cmdInput.value = cmdHistory[historyIdx]; } e.preventDefault(); }
+      if (e.key === 'Enter') {
+        if (e.isComposing || e.keyCode === 229) return;                            // 中文/日文输入法选词中，绝不发送
+        if (e.ctrlKey || e.metaKey) { e.preventDefault(); sendCommand(); return; } // Ctrl/⌘+回车 始终发送
+        const mode = settings.enterMode || 'auto';
+        const sendOnEnter = mode === 'send' ? !e.shiftKey
+          : mode === 'newline' ? false
+          : (!e.shiftKey && !window.matchMedia('(pointer: coarse)').matches);      // 自动：桌面(细指针)发送、触屏换行
+        if (sendOnEnter) { e.preventDefault(); sendCommand(); }
+        return;                                                                    // 不发送时交给 textarea 默认插入换行
+      }
+      if (e.key === 'ArrowUp' && !cmdInput.value) { if (historyIdx < cmdHistory.length - 1) { historyIdx++; cmdInput.value = cmdHistory[historyIdx]; } e.preventDefault(); }
       else if (e.key === 'ArrowDown' && !cmdInput.value) { if (historyIdx > 0) { historyIdx--; cmdInput.value = cmdHistory[historyIdx]; } else if (historyIdx === 0) { historyIdx = -1; cmdInput.value = ''; } e.preventDefault(); }
     });
 
@@ -2405,6 +2445,7 @@
       document.getElementById('set-parse').checked = settings.parseOutput;
       document.getElementById('set-thinking').checked = settings.showThinking;
       document.getElementById('set-collapse').checked = settings.collapseTools;
+      syncEnterModeUI();
       // 从服务端加载 ASR URL
       fetch('/api/server-config').then(r => r.json()).then(d => {
         document.getElementById('set-asr-url').value = d.asrUrl || '';