@wendongfly/myhi 1.3.165 → 1.3.167

package/dist/chat.html

@@ -3205,16 +3205,12 @@
       if (workState !== 'idle') {
         (async () => {
           try {
-            const r = await fetch('/api/inbox', {
-              method: 'POST', headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ text: prompt, sessionId: SESSION_ID, source: 'busy' }),
-            });
-            const d = await r.json();
+            const d = await postDraft({ text: prompt, sessionId: SESSION_ID, source: 'busy' });
             if (d.error) { addStatusMessage('存草稿失败: ' + d.error); return; }
             _draftTipDismissed = false;
             await refreshInbox();
             addStatusMessage('📥 AI 正在跑，已把「重读 ' + p + '」存进草稿，干完自动接上');
-          } catch (e) { addStatusMessage('存草稿失败: ' + e.message); }
+          } catch (e) { addStatusMessage('存草稿失败: ' + draftErrMsg(e)); }
         })();
         return;
       }
@@ -4034,6 +4030,29 @@
     let _inboxCache = { drafts: [], counts: {} };
     let _draftTipDismissed = false;
 
+    // 存草稿统一走这里：网络层失败（Failed to fetch，多为连接被复用竞争/瞬时断连）
+    // 自动重试一次；clientKey 让服务端去重，重试不会记两条。
+    async function postDraft(body) {
+      body.clientKey = (crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`);
+      let lastErr;
+      for (let i = 0; i < 2; i++) {
+        try {
+          const r = await fetch('/api/inbox', {
+            method: 'POST', headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(body),
+          });
+          return await r.json();
+        } catch (e) {
+          lastErr = e;
+          if (!i) await new Promise((res) => setTimeout(res, 400));
+        }
+      }
+      throw lastErr;
+    }
+    function draftErrMsg(e) {
+      return e.message === 'Failed to fetch' ? '网络连接中断（重试仍失败）' : e.message;
+    }
+
     async function refreshInbox(silent = true) {
       try {
         const r = await fetch('/api/inbox');
@@ -4187,15 +4206,11 @@
       const text = ta.value.trim();
       if (!text && !_inboxNewImage) { addStatusMessage('写点什么或加张图再记'); return; }
       try {
-        const r = await fetch('/api/inbox', {
-          method: 'POST', headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            text, sessionId: SESSION_ID, source: 'manual',
-            autoSend: document.getElementById('inbox-new-autosend').checked,
-            images: _inboxNewImage ? [_inboxNewImage] : [],
-          }),
+        const d = await postDraft({
+          text, sessionId: SESSION_ID, source: 'manual',
+          autoSend: document.getElementById('inbox-new-autosend').checked,
+          images: _inboxNewImage ? [_inboxNewImage] : [],
         });
-        const d = await r.json();
         if (d.error) { addStatusMessage('存草稿失败: ' + d.error); return; }
         ta.value = '';
         clearInboxNewImage();
@@ -4203,7 +4218,7 @@
         await refreshInbox();
         renderInbox();
       } catch (e) {
-        addStatusMessage('存草稿失败: ' + e.message);
+        addStatusMessage('存草稿失败: ' + draftErrMsg(e));
       }
     };
 
@@ -4219,10 +4234,7 @@
         files: _pendingFile ? [{ path: _pendingFile.path, name: _pendingFile.name }] : [],
       };
       try {
-        const r = await fetch('/api/inbox', {
-          method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body),
-        });
-        const d = await r.json();
+        const d = await postDraft(body);
         if (d.error) { addStatusMessage('存草稿失败: ' + d.error); return false; }
         cmdInput.value = '';
         cmdInput.style.height = 'auto';
@@ -4236,7 +4248,7 @@
           : '📥 已存进草稿');
         return true;
       } catch (e) {
-        addStatusMessage('存草稿失败: ' + e.message);
+        addStatusMessage('存草稿失败: ' + draftErrMsg(e));
         return false;
       }
     };

package/dist/index.html

@@ -462,6 +462,7 @@
       <button id="appearance-btn" onclick="openAppearance()" title="外观" style="background:none;border:1px solid var(--border);color:var(--muted);font-size:0.75rem;padding:0.3rem 0.55rem;border-radius:6px;cursor:pointer;width:auto">🎨</button>
       <button id="doctor-btn" onclick="openDoctor()" style="background:none;border:1px solid var(--border);color:var(--muted);font-size:0.75rem;padding:0.3rem 0.6rem;border-radius:6px;cursor:pointer;width:auto">🩺 体检</button>
       <button id="usage-btn" onclick="showUsage()" style="background:none;border:1px solid var(--border);color:var(--muted);font-size:0.75rem;padding:0.3rem 0.6rem;border-radius:6px;cursor:pointer;width:auto">用量</button>
+      <button id="passwd-btn" onclick="openPasswdSheet()" title="修改我的密码" style="display:none;background:none;border:1px solid var(--border);color:var(--muted);font-size:0.75rem;padding:0.3rem 0.6rem;border-radius:6px;cursor:pointer;width:auto">🔑 改密码</button>
       <button id="logout-btn" onclick="doLogout()" style="display:none;background:none;border:1px solid var(--border);color:var(--muted);font-size:0.75rem;padding:0.3rem 0.6rem;border-radius:6px;cursor:pointer;width:auto">退出</button>
       <div id="conn-dot"></div>
     </div>
@@ -530,6 +531,31 @@
   <button onclick="closeNoteSheet()" style="width:100%;background:var(--bg,var(--bg));color:var(--muted,var(--muted));border:1px solid var(--border,var(--border));border-radius:10px;padding:0.65rem;font-size:0.85rem;cursor:pointer;margin-top:0.5rem">取消</button>
 </div>
 
+<!-- 修改密码 sheet（成员用户自助改密；管理员改密码在 /admin） -->
+<div id="passwd-backdrop" onclick="closePasswdSheet()" style="display:none;position:fixed;inset:0;background:rgba(0,0,0,0.55);z-index:30"></div>
+<div id="passwd-sheet" style="display:none;position:fixed;left:0;right:0;bottom:0;z-index:31;background:var(--surface);border-radius:16px 16px 0 0;padding:1rem 1rem calc(1rem + env(safe-area-inset-bottom));max-height:88vh;overflow-y:auto">
+  <div class="sheet-handle"></div>
+  <div class="sheet-title">🔑 修改我的密码</div>
+  <div style="font-size:0.7rem;color:var(--muted);line-height:1.55;margin-bottom:0.6rem">
+    需要验证原密码才能修改；新密码不能与其他用户的密码重复，至少 4 位。改完当前登录保持有效，下次登录用新密码。
+  </div>
+  <div class="field">
+    <label>原密码</label>
+    <input type="password" id="pw-old" autocomplete="current-password" style="width:100%;box-sizing:border-box;background:var(--bg);border:1px solid var(--border);border-radius:8px;color:var(--text);padding:0.6rem;font-size:0.85rem">
+  </div>
+  <div class="field">
+    <label>新密码</label>
+    <input type="password" id="pw-new" autocomplete="new-password" style="width:100%;box-sizing:border-box;background:var(--bg);border:1px solid var(--border);border-radius:8px;color:var(--text);padding:0.6rem;font-size:0.85rem">
+  </div>
+  <div class="field">
+    <label>确认新密码</label>
+    <input type="password" id="pw-new2" autocomplete="new-password" style="width:100%;box-sizing:border-box;background:var(--bg);border:1px solid var(--border);border-radius:8px;color:var(--text);padding:0.6rem;font-size:0.85rem">
+  </div>
+  <div id="pw-msg" style="font-size:0.75rem;color:var(--red);margin:0 0 0.4rem;min-height:1rem"></div>
+  <button onclick="submitPasswd()" style="width:100%;background:#d29922;color:#1a1a1a;border:none;border-radius:10px;padding:0.75rem;font-size:0.9rem;font-weight:700;cursor:pointer">确认修改</button>
+  <button onclick="closePasswdSheet()" style="width:100%;background:var(--bg);color:var(--muted);border:1px solid var(--border);border-radius:10px;padding:0.65rem;font-size:0.85rem;cursor:pointer;margin-top:0.5rem">取消</button>
+</div>
+
 <!-- Create sheet -->
 <div id="sheet-backdrop" onclick="closeSheet()"></div>
 <div id="sheet">
@@ -633,6 +659,10 @@
       document.getElementById('user-name').textContent = data.name;
       document.getElementById('logout-btn').style.display = '';
     }
+    // 成员用户（users.json 登录）才显示自助改密入口；管理员改密码在 /admin
+    if (data.hasUsers && data.role === 'operator') {
+      document.getElementById('passwd-btn').style.display = '';
+    }
     if (data.dir) {
       _userDir = data.dir;
       // 默认填入绑定目录，隐藏盘符栏，保留最近目录
@@ -699,6 +729,43 @@
     }
   }
 
+  // ── 修改密码（成员用户自助）────────────────────────────
+  window.openPasswdSheet = function() {
+    document.getElementById('pw-old').value = '';
+    document.getElementById('pw-new').value = '';
+    document.getElementById('pw-new2').value = '';
+    document.getElementById('pw-msg').textContent = '';
+    document.getElementById('passwd-backdrop').style.display = 'block';
+    document.getElementById('passwd-sheet').style.display = 'block';
+    document.getElementById('pw-old').focus();
+  };
+  window.closePasswdSheet = function() {
+    document.getElementById('passwd-backdrop').style.display = 'none';
+    document.getElementById('passwd-sheet').style.display = 'none';
+  };
+  window.submitPasswd = async function() {
+    const msg = document.getElementById('pw-msg');
+    const oldPw = document.getElementById('pw-old').value;
+    const newPw = document.getElementById('pw-new').value;
+    const newPw2 = document.getElementById('pw-new2').value;
+    msg.style.color = 'var(--red)';
+    if (!oldPw) { msg.textContent = '请输入原密码'; return; }
+    if (newPw.length < 4) { msg.textContent = '新密码至少 4 位'; return; }
+    if (newPw !== newPw2) { msg.textContent = '两次输入的新密码不一致'; return; }
+    if (newPw === oldPw) { msg.textContent = '新密码不能与原密码相同'; return; }
+    try {
+      const r = await fetch('/api/user/password', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ oldPassword: oldPw, newPassword: newPw }) });
+      const d = await r.json();
+      if (d.ok) {
+        msg.style.color = 'var(--green, #3fb950)';
+        msg.textContent = '✓ 密码已修改，下次登录请用新密码';
+        setTimeout(closePasswdSheet, 1500);
+      } else {
+        msg.textContent = d.error || '修改失败';
+      }
+    } catch { msg.textContent = '连接失败'; }
+  };
+
   function doLogout() {
     if (!confirm('确定退出登录？')) return;
     fetch('/logout', { method: 'POST' }).finally(() => {
@@ -1091,20 +1158,31 @@
     if (!sid) { alert('请选择归属任务'); return; }
     if (!text && !_notePendingImage) { alert('写点什么或传张图'); return; }
     try {
-      const r = await fetch('/api/inbox', {
-        method: 'POST', headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          text, sessionId: sid, source: 'home',
-          autoSend: document.getElementById('note-autosend').checked,
-          images: _notePendingImage ? [{ path: _notePendingImage.path, name: '图片' }] : [],
-        }),
-      });
-      const d = await r.json();
+      // 网络层失败自动重试一次；clientKey 让服务端去重，重试不会记两条
+      const clientKey = (crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`);
+      let d;
+      for (let i = 0; i < 2; i++) {
+        try {
+          const r = await fetch('/api/inbox', {
+            method: 'POST', headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              text, sessionId: sid, source: 'home', clientKey,
+              autoSend: document.getElementById('note-autosend').checked,
+              images: _notePendingImage ? [{ path: _notePendingImage.path, name: '图片' }] : [],
+            }),
+          });
+          d = await r.json();
+          break;
+        } catch (e) {
+          if (i) throw e;
+          await new Promise((res) => setTimeout(res, 400));
+        }
+      }
       if (d.error) { alert('存草稿失败：' + d.error); return; }
       closeNoteSheet();
       refreshDraftCounts();
     } catch (e) {
-      alert('存草稿失败：' + e.message);
+      alert('存草稿失败：' + (e.message === 'Failed to fetch' ? '网络连接中断（重试仍失败）' : e.message));
     }
   };