@wendongfly/myhi 1.3.182 → 1.3.184

package/dist/chat.html

@@ -22,6 +22,7 @@
     }catch(e){}})();
   </script>
   <style>
+    body.no-desktop [onclick="fpOpenFolder()"] { display: none !important; }
     /* ── 主题 & 字号（默认深色，值=原配色，深色零变化）───────── */
     :root {
       --bg:#0d1117; --surface:#161b22; --surface2:#21262d; --surface3:#1c2128; --border:#30363d;
@@ -267,6 +268,8 @@
     #mention-box .mi .m-name { color: var(--text); white-space: nowrap; }
     #mention-box .mi .m-hint { color: var(--muted); font-size: 0.66rem; margin-left: auto; padding-left: 0.5rem; flex-shrink: 0; }
     #mention-box .mi-empty { padding: 0.55rem 0.7rem; color: var(--muted); font-size: 0.75rem; }
+    #mention-box .mi-head { padding: 0.4rem 0.6rem 0.15rem; color: var(--muted); font-size: 0.66rem; font-weight: 600; letter-spacing: 0.04em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+    #mention-box .mi-tip { padding: 0.35rem 0.6rem 0.2rem; color: var(--dim, var(--muted)); font-size: 0.64rem; border-top: 1px solid var(--border); margin-top: 0.2rem; }
     #cmd-input { display: block; width: 100%; background: transparent; color: var(--text); border: none; padding: 0.6rem 0.75rem 0.3rem; font-family: 'SF Mono', 'Cascadia Code', 'Consolas', monospace; font-size: 0.85rem; outline: none; resize: none; line-height: 1.5; max-height: 140px; overflow-y: auto; }
     #cmd-input::placeholder { color: var(--dimmer); }
     @media (pointer: coarse) { #cmd-input { font-size: 1rem; padding: 0.75rem 0.75rem 0.35rem; line-height: 1.55; } }
@@ -1104,6 +1107,8 @@
     ansi.use_classes = false;
 
     fetch('/api/me').then(r => r.json()).then(data => {
+      // 服务端没有桌面（headless 部署）：「打开当前文件夹」必然无效，直接藏掉，只留文件面板
+      if (data?.desktop === false) document.body.classList.add('no-desktop');
       // 打包默认快捷栏预设：用户没自定义过勾选（skVisible 为 null）时采用服务端 config.json 的 skMode
       if (data?.skMode && settings.skVisible == null) {
         settings.skVisible = data.skMode === 'normal' ? skPresetNormal() : skPresetAll();
@@ -3202,7 +3207,7 @@
     //   输入框里打出 @词（@ 后无空白）时浮出文件搜索层：递归搜会话目录、
     //   最近修改优先；选中把 @词 替换成真实相对路径。「让 AI 读某个文件」
     //   不再需要手打文件名。也可在 📄 文件面板点「引用」达到同样效果。
-    const _mention = { open: false, start: -1, items: [], idx: 0 };
+    const _mention = { open: false, start: -1, items: [], idx: 0, browse: null, seq: 0 };
     const _mentionBox = document.createElement('div');
     _mentionBox.id = 'mention-box';
     document.body.appendChild(_mentionBox);
@@ -3221,24 +3226,38 @@
 
     function mentionClose() {
       _mention.open = false;
+      _mention.browse = null;
       _mention.items = [];
       _mentionBox.style.display = 'none';
     }
 
+    // 两种模式：只打 @ = 分层浏览（_mention.browse 记当前层，点文件夹进入下一层）；
+    // @ 后打了字 = 全局递归搜索（服务端已排好：本项目在前、项目外在后，匹配度优先）
+    const MENTION_GROUP = { own: '本项目', ext: '项目外' };
     function mentionRowHTML(f, i) {
-      const path = f.name;
-      const cut = path.lastIndexOf('/');
+      const on = i === _mention.idx ? 'on' : '';
+      if (f.act === 'up') return `<div class="mi ${on}" data-i="${i}"><span class="m-ico">⬆</span><span class="m-name">上一级</span></div>`;
+      if (f.act === 'self') return `<div class="mi ${on}" data-i="${i}"><span class="m-ico">✓</span><span class="m-name">引用这个文件夹</span><span class="m-hint">${f.abs ? '项目外目录' : '文件夹'}</span></div>`;
+      const path = f.label || f.name;
+      const cut = f.label ? -1 : path.lastIndexOf('/');
       const dir = cut >= 0 ? path.slice(0, cut + 1) : '';
       const name = cut >= 0 ? path.slice(cut + 1) : path;
       const ico = f.dir ? '📁' : (isEditableFile(name) ? '📝' : '📄');
-      const hint = f.dir ? (f.abs ? '项目外目录' : '文件夹') : (f.abs ? '项目外' : '引用');
-      return `<div class="mi ${i === _mention.idx ? 'on' : ''}" data-i="${i}"><span class="m-ico">${ico}</span><span class="m-dir">${escHtml(dir)}</span><span class="m-name">${escHtml(name)}</span><span class="m-hint">${hint}</span></div>`;
+      const hint = f.nav ? '进入 ›' : f.dir ? (f.abs ? '项目外目录' : '文件夹') : (f.abs ? '项目外' : '引用');
+      return `<div class="mi ${on}" data-i="${i}"><span class="m-ico">${ico}</span><span class="m-dir">${escHtml(dir)}</span><span class="m-name">${escHtml(name)}</span><span class="m-hint">${hint}</span></div>`;
     }
 
     function mentionRender() {
-      _mentionBox.innerHTML = _mention.items.length
-        ? _mention.items.map((f, i) => mentionRowHTML(f, i)).join('')
-        : '<div class="mi-empty">没有匹配的文件</div>';
+      const b = _mention.browse;
+      let html = b && b.crumb ? `<div class="mi-head">📂 ${escHtml(b.crumb)}</div>` : '';
+      let group = null;
+      _mention.items.forEach((f, i) => {
+        if (f.group && f.group !== group && !(b && b.crumb)) { group = f.group; html += `<div class="mi-head">${MENTION_GROUP[group]}</div>`; }
+        html += mentionRowHTML(f, i);
+      });
+      if (!_mention.items.some(f => !f.act)) html += `<div class="mi-empty">${b ? '这个文件夹是空的' : '没有匹配的文件'}</div>`;
+      if (b && _mention.items.some(f => f.nav)) html += '<div class="mi-tip">回车/点击进入文件夹 · Tab 直接引用文件夹 · 打字可全局搜索</div>';
+      _mentionBox.innerHTML = html;
       const r = cmdInput.getBoundingClientRect();
       _mentionBox.style.left = Math.max(8, r.left) + 'px';
       _mentionBox.style.width = Math.max(r.width, 240) + 'px';
@@ -3254,20 +3273,68 @@
         try {
           const r = await fetch(`/api/files/${SESSION_ID}/search?q=${encodeURIComponent(token)}`);
           const d = await r.json();
-          if (!_mention.open || !d.ok) return;
-          _mention.items = d.files || [];
+          if (!_mention.open || _mention.browse || !d.ok) return;
+          _mention.items = (d.files || []).map(f => ({ ...f, group: f.abs ? 'ext' : 'own' }));
           _mention.idx = 0;
           mentionRender();
         } catch { mentionClose(); }
       }, 140);
     }
 
+    // 分层浏览：root=null 顶层（本项目第一层 + 项目外根目录），-1 本项目内，i 第 i 个项目外根目录内
+    async function mentionBrowse(root, path) {
+      const seq = ++_mention.seq;
+      try {
+        const qs = root === null ? '' : `?root=${root}&path=${encodeURIComponent(path)}`;
+        const r = await fetch(`/api/files/${SESSION_ID}/at-browse${qs}`);
+        const d = await r.json();
+        if (seq !== _mention.seq || !_mention.open || !d.ok) return;
+        const items = [];
+        let crumb = '';
+        if (root !== null) {
+          const rootFull = path ? d.self.slice(0, -(path.length + 1)) : d.self;
+          const rootLabel = root === -1 ? '本项目' : '项目外 · ' + (rootFull.split('/').pop() || rootFull);
+          crumb = rootLabel + (path ? ' / ' + path.split('/').join(' / ') : '');
+          items.push({ act: 'up' });
+          if (path || root !== -1) items.push({ act: 'self', name: d.self, dir: true, abs: root !== -1 });
+        }
+        d.entries.forEach(e => items.push({ ...e, root: root === null ? -1 : root, nav: e.dir, group: root === null ? 'own' : null }));
+        (d.roots || []).forEach(x => items.push({ name: x.name, dir: true, abs: true, root: x.i, rel: '', nav: true, group: 'ext' }));
+        _mention.browse = { root, path, crumb };
+        _mention.items = items;
+        _mention.idx = Math.max(0, items.findIndex(f => !f.act));   // 默认落在第一个条目上，不是「上一级」
+        mentionRender();
+      } catch { mentionClose(); }
+    }
+
     function mentionUpdate() {
       const t = mentionToken();
       if (!t) return mentionClose();
+      const token = cmdInput.value.slice(t.start + 1, cmdInput.selectionStart ?? cmdInput.value.length);
+      const wasOpen = _mention.open && _mention.start === t.start;
       _mention.open = true;
       _mention.start = t.start;
-      mentionSearch(cmdInput.value.slice(t.start + 1, cmdInput.selectionStart ?? cmdInput.value.length));
+      if (!token) {
+        // 已在浏览某一层就别重置（keyup 等事件会反复进来）；新打开或从搜索删回空才回顶层
+        if (!(wasOpen && _mention.browse)) { _mention.browse = { root: null, path: '', crumb: '' }; mentionBrowse(null, ''); }
+        return;
+      }
+      _mention.browse = null;
+      _mention.seq++;
+      mentionSearch(token);
+    }
+
+    // 回车/点击：文件夹（浏览模式）进入、上一级返回、其余引用；Tab = 文件夹也直接引用
+    function mentionActivate(f, pickDir) {
+      if (!f) return;
+      if (f.act === 'up') {
+        const b = _mention.browse;
+        if (b.root !== null && b.path) mentionBrowse(b.root, b.path.includes('/') ? b.path.slice(0, b.path.lastIndexOf('/')) : '');
+        else mentionBrowse(null, '');
+        return;
+      }
+      if (f.nav && !pickDir) return mentionBrowse(f.root, f.rel);
+      mentionPick(f);
     }
 
     function mentionPick(f) {
@@ -3301,7 +3368,7 @@
       if (!d) return;
       if (Math.abs(e.clientX - d.x) >= 8 || Math.abs(e.clientY - d.y) >= 8) return; // 滚动手势
       const row = e.pointerType === 'touch' ? d.row : e.target.closest('.mi[data-i]');
-      if (row) mentionPick(_mention.items[Number(row.dataset.i)]);
+      if (row) mentionActivate(_mention.items[Number(row.dataset.i)]);
     });
     _mentionBox.addEventListener('pointercancel', () => { _mentionDown = null; });
     window.addEventListener('resize', () => { if (_mention.open) mentionClose(); });
@@ -3315,7 +3382,7 @@
           e.preventDefault(); _mention.idx = (_mention.idx - 1 + _mention.items.length) % _mention.items.length; mentionRender(); return;
         }
         if ((e.key === 'Enter' || e.key === 'Tab') && _mention.items.length && !e.isComposing && e.keyCode !== 229) {
-          e.preventDefault(); mentionPick(_mention.items[_mention.idx]); return;   // 补全层开着时回车=选中，不是发送
+          e.preventDefault(); mentionActivate(_mention.items[_mention.idx], e.key === 'Tab'); return;   // 补全层开着时回车=选中/进入，不是发送
         }
         if (e.key === 'Escape') { e.preventDefault(); mentionClose(); return; }    // 先关补全，别误触中断 AI
       }
@@ -3434,7 +3501,7 @@
         const d = await r.json();
         if (d.ok) {
           closeFilePanel();
-          addStatusMessage('📂 已在本机打开文件夹 ' + (d.cwd || ''));
+          addStatusMessage((d.via === 'task' ? '📂 已在本机桌面打开文件夹（myhi 在后台会话运行，经计划任务打开）' : '📂 已在本机打开文件夹 ') + (d.cwd || ''));
         } else {
           addStatusMessage('打开失败: ' + (d.error || '') + '（若你是远程访问本面板，此按钮本就不生效）');
         }

package/dist/index.html

@@ -99,6 +99,11 @@
     }
     .hd-btn:hover { color: var(--text); border-color: var(--border2); }
     #user-name { max-width: 7rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+    /* 顶栏放不下一行时逐级收紧（fitHeader 按实际宽度判断，大字号/窄窗口都适用）：先藏用户名，再只留图标 */
+    #header.hd-fit1 #user-name { display: none; }
+    #header.hd-fit2 .hd-btn .hd-txt { display: none; }
+    #header.hd-fit2 .hd-actions { gap: 0.4rem; }
+    #header.hd-fit2 .hd-btn { padding: 0.32rem 0.48rem; }
 
     /* ── 设置 sheet（全局设置收口：外观 / 本机名称 / @ 引用范围 / 语音 / 账户 / 服务）── */
     #set-backdrop { display: none; position: fixed; inset: 0; background: rgba(0,0,0,0.55); z-index: 30; }
@@ -851,6 +856,7 @@
     if ((data.exclusive || data.hasUsers) && data.name) {
       document.getElementById('user-name').textContent = data.name;
       document.getElementById('set-account-name').textContent = data.name;
+      fitHeader();
       document.getElementById('set-account').style.display = '';
       document.getElementById('logout-btn').style.display = '';
     }
@@ -980,7 +986,20 @@
     r.setAttribute('data-font', f);
     const meta = document.querySelector('meta[name="theme-color"]');
     if (meta) meta.setAttribute('content', THEME_META[t] || '#0d1117');
+    fitHeader();
   }
+  // 顶栏按钮组折行了就逐级收紧：字号「大」时按钮跟着 rem 变宽，固定断点兜不住
+  function fitHeader() {
+    const h = document.getElementById('header');
+    const acts = h.querySelector('.hd-actions');
+    const wraps = () => acts.offsetHeight > document.getElementById('settings-btn').offsetHeight * 1.5;
+    h.classList.remove('hd-fit1', 'hd-fit2');
+    if (wraps()) h.classList.add('hd-fit1');
+    if (wraps()) h.classList.add('hd-fit2');
+  }
+  window.addEventListener('resize', fitHeader);
+  document.fonts?.ready.then(fitHeader);
+  fitHeader();
   // ── 设置 sheet ─────────────────────────────────────────
   const THEMES = [['system','跟随系统'],['dark','深色'],['light','浅色'],['black','纯黑']];
   const FONTS = [['small','小'],['medium','中'],['large','大']];