@wendongfly/myhi 1.3.49 → 1.3.52

package/bin/daemon.js

@@ -17,6 +17,36 @@ const pidFile    = join(configDir, 'daemon.pid');
 const serverEntry = join(__dirname, '../dist/index.js');
 
 mkdirSync(configDir, { recursive: true });
+
+// 单例守卫：如果已有活 daemon，先 SIGTERM 它再启动。否则双 daemon 会让各自的
+// server child 因互读 server.pid 而互杀，触发"连续崩溃 5 次"熔断（pc41 1.3.51 升级踩到）
+(function killOldDaemon() {
+  let oldPid;
+  try { oldPid = parseInt(readFileSync(pidFile, 'utf8').trim(), 10); } catch { return; }
+  if (!oldPid || oldPid === process.pid) return;
+  let alive = false;
+  try { process.kill(oldPid, 0); alive = true; } catch {}
+  if (!alive) return;
+  process.stderr.write(`[daemon] 检测到已运行的 daemon (PID ${oldPid})，先停止...\n`);
+  try {
+    if (process.platform === 'win32') execSync(`taskkill /PID ${oldPid} /F /T`, { stdio: 'pipe', timeout: 5000 });
+    else process.kill(oldPid, 'SIGTERM');
+  } catch {}
+  // 等最多 5 秒
+  const deadline = Date.now() + 5000;
+  while (Date.now() < deadline) {
+    try { process.kill(oldPid, 0); } catch { return; }
+    const end = Date.now() + 200;
+    while (Date.now() < end) {} // busy-wait, 此处无事件循环可用
+  }
+  let stillAlive = false;
+  try { process.kill(oldPid, 0); stillAlive = true; } catch {}
+  if (stillAlive) {
+    process.stderr.write(`[daemon] 无法停止旧 daemon (PID ${oldPid})，本进程退出避免冲突\n`);
+    process.exit(1);
+  }
+})();
+
 writeFileSync(pidFile, String(process.pid));
 
 let child = null;
@@ -35,7 +65,7 @@ function startServer() {
   log('启动 server 子进程...');
   child = fork(serverEntry, process.argv.slice(2), {
     stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
-    env: { ...process.env, MYHI_DAEMON: '1' },
+    env: { ...process.env, MYHI_DAEMON: '1', MYHI_DAEMON_PID: String(process.pid) },
     windowsHide: true,
   });
 

package/dist/chat.html

@@ -2769,35 +2769,58 @@
       addStatusMessage(`会话统计: ${inputs} 条提问, ${assistants} 条回复, ${tools} 次工具调用`);
     };
 
+    // ── 图片上传（拍照 / 选文件 / 剪贴板粘贴共用） ──────────
+    // 压缩源 Blob → POST /upload → setPendingImage
+    async function uploadImageBlob(srcBlob, filename) {
+      const img = new Image(); const url = URL.createObjectURL(srcBlob);
+      const blob = await new Promise((resolve, reject) => {
+        img.onload = () => { URL.revokeObjectURL(url); let {width:w, height:h} = img;
+          // 压缩策略：长边限制 1024px，JPEG 质量 0.7，适合截图分析
+          const M = 1024;
+          if(w>M||h>M){if(w>=h){h=Math.round(h*M/w);w=M}else{w=Math.round(w*M/h);h=M}}
+          const c=document.createElement('canvas');c.width=w;c.height=h;c.getContext('2d').drawImage(img,0,0,w,h);
+          c.toBlob(b=>b?resolve(b):reject(new Error('toBlob failed')),'image/jpeg',0.7); };
+        img.onerror=reject; img.src=url; });
+      const form = new FormData(); form.append('image', blob, filename || 'image.jpg');
+      const res = await fetch(`/upload?sessionId=${SESSION_ID}`, { method: 'POST', body: form });
+      const data = await res.json();
+      if (!data.path) throw new Error(data.error || '上传失败');
+      setPendingImage(data.path, URL.createObjectURL(blob));
+    }
+
     // ── 拍照上传 ──────────────────────────────────
     window.openCamera = async function() {
       const input = document.createElement('input'); input.type = 'file'; input.accept = 'image/*';
       input.onchange = async () => {
         const file = input.files?.[0]; if (!file) return;
         const btn = document.getElementById('btn-photo'); btn.classList.add('active'); btn.disabled = true;
-        try {
-          const img = new Image(); const url = URL.createObjectURL(file);
-          const blob = await new Promise((resolve, reject) => {
-            img.onload = () => { URL.revokeObjectURL(url); let {width:w, height:h} = img;
-              // 压缩策略：长边限制 1024px，JPEG 质量 0.7，适合截图分析
-              const M = 1024;
-              if(w>M||h>M){if(w>=h){h=Math.round(h*M/w);w=M}else{w=Math.round(w*M/h);h=M}}
-              const c=document.createElement('canvas');c.width=w;c.height=h;c.getContext('2d').drawImage(img,0,0,w,h);
-              c.toBlob(b=>b?resolve(b):reject(new Error('toBlob failed')),'image/jpeg',0.7); };
-            img.onerror=reject; img.src=url; });
-          const form = new FormData(); form.append('image', blob, 'photo.jpg');
-          const res = await fetch(`/upload?sessionId=${SESSION_ID}`, { method: 'POST', body: form }); const data = await res.json();
-          if (data.path) {
-            // 暂存图片，等用户输入文字后一起发送
-            const thumbUrl = URL.createObjectURL(blob);
-            setPendingImage(data.path, thumbUrl);
-          }
-          else addStatusMessage('上传失败: ' + (data.error || '未知'));
-        } catch (e) { addStatusMessage('出错: ' + e.message); }
+        try { await uploadImageBlob(file, 'photo.jpg'); }
+        catch (e) { addStatusMessage('出错: ' + e.message); }
         finally { btn.classList.remove('active'); btn.disabled = false; }
       }; input.click();
     };
 
+    // ── 剪贴板粘贴图片（桌面端 Ctrl+V）──────────────
+    // document 级监听：截图后切到浏览器直接 Ctrl+V，无需先聚焦输入框
+    document.addEventListener('paste', async (e) => {
+      const items = e.clipboardData?.items;
+      if (!items) return;
+      for (const item of items) {
+        if (item.kind === 'file' && item.type.startsWith('image/')) {
+          const blob = item.getAsFile();
+          if (!blob) continue;
+          e.preventDefault(); // 阻止浏览器把图片当文本塞进 textarea
+          addStatusMessage('粘贴图片上传中...');
+          try {
+            await uploadImageBlob(blob, 'paste.png');
+            document.getElementById('cmd-input')?.focus();
+          } catch (err) { addStatusMessage('上传失败: ' + err.message); }
+          return; // 只处理第一张
+        }
+      }
+      // 剪贴板里没有图片 → 不拦截，文本粘贴走默认行为
+    });
+
     // ── 语音输入 ──────────────────────────────────
     let recognition = null;
     let isRecording = false;