@wendongfly/myhi 1.3.190 → 1.3.192

package/dist/chat.html

@@ -10,15 +10,21 @@
   <link rel="apple-touch-icon" href="/icon.png">
   <title>myhi 会话</title>
   <script src="/lib/machine.js" data-session></script>
+  <script src="/lib/prefs.js"></script>
   <script src="/sio-client/socket.io.min.js"></script>
+  <script src="/theme.js"></script>
   <script>
     (function(){try{
-      var t=localStorage.getItem('myhi_theme')||'dark';
+      var t=localStorage.getItem('myhi_theme')||window.MYHI_DEFAULT_THEME||'dark';
       var f=localStorage.getItem('myhi_font')||'medium';
       var r=document.documentElement;
       if(t&&t!=='dark') r.setAttribute('data-theme',t);
       r.setAttribute('data-font',f);
-      if(new URLSearchParams(location.search).get('embed')==='1') r.classList.add('embed');
+      var em=new URLSearchParams(location.search).get('embed');
+      if(em==='1') r.classList.add('embed');
+      // 首页电脑端工作台右侧嵌入：保留本页顶栏，左侧已有任务列表 → 藏掉分屏/切换/返回；
+      // 页面里的链接（如「首页 ⚙ 设置」）在整个窗口打开，别在右侧小框里再套一个首页
+      if(em==='ws'){ r.classList.add('embed-ws'); var bs=document.createElement('base'); bs.target='_top'; document.head.appendChild(bs); }
     }catch(e){}})();
   </script>
   <style>
@@ -54,6 +60,7 @@
     html[data-font="large"]  { font-size: 19.5px; }
     /* 分屏内嵌模式（?embed=1）：隐藏本页顶栏，让每个窗格更紧凑（外层 grid.html 提供窗格头） */
     html.embed #top-bar { display: none; }
+    html.embed-ws #grid-btn, html.embed-ws [onclick="openSwitchSheet()"], html.embed-ws [onclick="goBack()"] { display: none !important; }
     /* 分屏是 PC 大屏功能，手机端(触屏)隐藏入口 */
     @media (pointer: coarse) { #grid-btn { display: none !important; } }
 
@@ -204,7 +211,6 @@
     @media (hover: none) { .raw-copy { opacity: 0.85; } }
     /* AI 工具的原始输出默认不显示（设置→聊天→显示 打开；终端会话的命令输出不受影响） */
     body.hide-toolout .msg-raw.tool-out { display: none; }
-    .setting-toggle.off { opacity: 0.45; pointer-events: none; }
     /* 消息里其他带框内容（代码块/表格/diff/工具详情…）同款复制按钮，见 attachCopyBtns */
     .cpw, .cp-host { position: relative; }
     .cp-btn { user-select: none; }
@@ -223,7 +229,8 @@
     .msg-synthetic .syn-body { white-space: pre-wrap; font-family: 'SF Mono', 'Cascadia Code', 'Consolas', monospace; font-size: 0.75rem; line-height: 1.5; color: var(--muted); background: var(--surface); border: 1px solid var(--border); border-radius: 8px; padding: 0.5rem 0.75rem; max-height: 320px; overflow-y: auto; word-break: break-word; }
 
     /* ── 输入栏 ─────────────────────────────── */
-    #input-area { background: var(--surface); border-top: 1px solid var(--border); flex-shrink: 0; padding: 0.5rem 0.75rem 0.35rem; }
+    /* 输入区与对话同底色、不画分隔线：输入框自带圆角边框，浮在对话下方即可（原来一条贯穿的横线 + 浅色底带显得割裂） */
+    #input-area { background: var(--bg); flex-shrink: 0; padding: 0.5rem 0.75rem 0.35rem; }
     #input-area.no-shortcuts { padding-bottom: max(0.5rem, env(safe-area-inset-bottom)); }
     #input-box { background: var(--bg); border: 1px solid var(--border); border-radius: 12px; transition: border-color 0.2s; overflow: hidden; position: relative; }
     #img-preview { display: none; align-items: center; gap: 0.5rem; padding: 0.5rem 0.75rem; border-bottom: 1px solid var(--surface2); background: var(--surface); }
@@ -302,7 +309,7 @@
     #readonly-overlay { display: none; text-align: center; padding: 0.6rem; font-size: 0.8rem; color: var(--muted); background: var(--surface); }
 
     /* ── 快捷键栏 ───────────────────────────── */
-    #shortcut-bar { background: var(--surface); border-top: 1px solid var(--surface2); padding: 0.35rem 0.5rem; padding-bottom: max(0.35rem, env(safe-area-inset-bottom)); flex-shrink: 0; overflow: hidden; }
+    #shortcut-bar { background: var(--bg); padding: 0.35rem 0.5rem; padding-bottom: max(0.35rem, env(safe-area-inset-bottom)); flex-shrink: 0; overflow: hidden; }
     #shortcut-bar > div { display: flex; align-items: center; gap: 0.35rem; overflow-x: auto; scrollbar-width: none; }
     #shortcut-bar > div::-webkit-scrollbar { display: none; }
     .sk { background: var(--surface2); color: var(--text); border: 1px solid var(--border); border-radius: 6px; padding: 0.3rem 0.55rem; font-size: 0.75rem; font-family: 'SF Mono', 'Consolas', monospace; cursor: pointer; white-space: nowrap; flex-shrink: 0; user-select: none; -webkit-user-select: none; touch-action: manipulation; }
@@ -313,7 +320,7 @@
     /* ── 设置面板 ───────────────────────────── */
     #settings-backdrop { display: none; position: fixed; inset: 0; background: rgba(0,0,0,0.5); z-index: 60; }
     #settings-backdrop.open { display: block; }
-    #settings-panel { position: fixed; top: 0; right: -360px; width: 340px; max-width: 92vw; height: 100%; background: var(--surface); border-left: 1px solid var(--border); z-index: 61; transition: right 0.25s ease; overflow-y: auto; padding: 1rem; }
+    #settings-panel { position: fixed; top: 0; right: -360px; width: 340px; max-width: 92vw; height: 100%; background: var(--surface); border-left: 1px solid var(--border); z-index: 61; transition: right 0.25s ease; overflow-y: auto; padding: 1rem; box-sizing: border-box; }
     #settings-panel.open { right: 0; }
     .panel-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 0.6rem; font-size: 1rem; font-weight: 600; }
     .panel-close { background: none; border: none; color: var(--muted); font-size: 1.2rem; cursor: pointer; }
@@ -330,6 +337,18 @@
     .seg-row { display: flex; gap: 0.35rem; flex-wrap: wrap; }
     .seg { flex: 1; min-width: 3.2rem; background: var(--surface2); color: var(--text2); border: 1px solid var(--border); border-radius: 8px; padding: 0.45rem 0.3rem; font-size: 0.8rem; cursor: pointer; white-space: nowrap; }
     .seg.active { background: var(--purple); color: #fff; border-color: var(--purple); }
+    /* 设置里「名称 + 分段选择」一行 */
+    .set-line { display: flex; align-items: center; justify-content: space-between; gap: 0.6rem; padding: 0.45rem 0; font-size: 0.85rem; }
+    .set-line > span { flex: 0 1 auto; min-width: 3.5rem; }
+    .set-line small { display: block; font-size: 0.68rem; color: var(--muted); }
+    .set-line .seg-row { flex: 1 1 auto; max-width: 13.5rem; flex-wrap: nowrap; }
+    .set-line .seg { min-width: 0; padding: 0.38rem 0.2rem; font-size: 0.76rem; }
+    .set-task-hint { font-size: 0.74rem; color: var(--muted); line-height: 1.5; margin-bottom: 0.6rem; }
+    .set-task-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 0.45rem; }
+    .set-task-grid button { background: var(--surface2); color: var(--text); border: 1px solid var(--border); border-radius: 8px; padding: 0.6rem 0.5rem; font-size: 0.82rem; cursor: pointer; text-align: left; }
+    .set-task-grid button:hover { border-color: var(--purple); }
+    .set-foot { font-size: 0.72rem; color: var(--muted); line-height: 1.55; margin-top: 1rem; padding-top: 0.7rem; border-top: 1px solid var(--border); }
+    .set-foot a { color: var(--blue); }
     .setting-toggle input[type=checkbox] { width: 36px; height: 20px; appearance: none; -webkit-appearance: none; background: var(--border); border-radius: 10px; position: relative; cursor: pointer; transition: background 0.2s; }
     .setting-toggle input[type=checkbox]:checked { background: var(--green2); }
     .setting-toggle input[type=checkbox]::after { content: ''; position: absolute; top: 2px; left: 2px; width: 16px; height: 16px; background: #fff; border-radius: 50%; transition: left 0.2s; }
@@ -624,34 +643,16 @@
   <div id="settings-panel">
     <div class="panel-header"><span>设置</span><button class="panel-close" onclick="closeSettings()">✕</button></div>
     <div id="settings-tabs">
-      <button class="stab active" data-tab="look">外观</button>
-      <button class="stab" data-tab="chat">聊天</button>
+      <button class="stab active" data-tab="chat">聊天</button>
       <button class="stab" data-tab="bar">快捷栏</button>
-      <button class="stab" data-tab="more">更多</button>
+      <button class="stab" data-tab="task" id="stab-task">本任务</button>
     </div>
-    <div class="setting-group" data-stab="look">
-      <div style="font-size:0.8rem;color:var(--text2);margin:0.1rem 0 0.35rem">主题</div>
-      <div id="seg-theme" class="seg-row">
-        <button class="seg" data-theme="system">跟随系统</button>
-        <button class="seg" data-theme="dark">深色</button>
-        <button class="seg" data-theme="light">浅色</button>
-        <button class="seg" data-theme="black">纯黑</button>
-      </div>
-      <div style="font-size:0.8rem;color:var(--text2);margin:0.6rem 0 0.35rem">字号</div>
-      <div id="seg-font" class="seg-row">
-        <button class="seg" data-font="small">小</button>
-        <button class="seg" data-font="medium">中</button>
-        <button class="seg" data-font="large">大</button>
-      </div>
-    </div>
-    <div class="setting-group" data-stab="chat" style="display:none">
+    <div class="setting-group" data-stab="chat">
       <h4>显示</h4>
-      <label class="setting-toggle"><span>解析终端输出</span><input type="checkbox" id="set-parse" checked></label>
-      <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>
-      <label class="setting-toggle"><span>思考过程默认折叠</span><input type="checkbox" id="set-thinkcollapse" checked></label>
-      <label class="setting-toggle"><span>显示工具输出内容（AI 执行命令/读文件的原始结果）</span><input type="checkbox" id="set-toolout"></label>
-      <label class="setting-toggle" id="row-rawclip"><span>　└ 工具输出只显示前 8 行（可展开）</span><input type="checkbox" id="set-rawclip" checked></label>
+      <div class="set-line"><span>思考过程</span><div id="seg-think" class="seg-row"><button class="seg" data-v="hide">隐藏</button><button class="seg" data-v="fold">折叠</button><button class="seg" data-v="open">展开</button></div></div>
+      <div class="set-line"><span>工具调用</span><div id="seg-tools" class="seg-row"><button class="seg" data-v="fold">折叠</button><button class="seg" data-v="open">展开</button></div></div>
+      <div class="set-line"><span>工具输出<small>AI 执行命令/读文件的原始结果</small></span><div id="seg-toolout" class="seg-row"><button class="seg" data-v="hide">隐藏</button><button class="seg" data-v="clip">前8行</button><button class="seg" data-v="all">全部</button></div></div>
+      <label class="setting-toggle" id="row-parse"><span>把终端里的 Claude 输出整理成聊天样式</span><input type="checkbox" id="set-parse" checked></label>
     </div>
     <div class="setting-group" data-stab="chat" style="display:none">
       <h4>输入</h4>
@@ -675,15 +676,20 @@
       </div>
       <div id="sk-visible-list" style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:0.15rem 0.6rem;margin-top:0.5rem"></div>
     </div>
-    <div class="setting-group" data-stab="more" style="display:none">
-      <h4>全局设置</h4>
-      <div style="font-size:0.72rem;color:var(--muted);margin-bottom:0.45rem;line-height:1.5">本机名称、语音识别、账户等对所有任务生效的设置，统一放在首页的 ⚙ 设置里。这里的「外观 / 聊天 / 快捷栏」只影响当前这台设备。</div>
-      <button onclick="location.href='/?settings=1'" style="width:100%;background:var(--blue2);color:#fff;border:none;border-radius:8px;padding:0.55rem;font-size:0.82rem;cursor:pointer">前往首页 ⚙ 设置 →</button>
-    </div>
-    <div class="setting-group" data-stab="more" style="display:none">
-      <h4>服务管理</h4>
-      <button onclick="restartMyhi()" style="width:100%;padding:0.6rem;background:var(--red2);color:#fff;border:none;border-radius:8px;cursor:pointer;font-size:0.85rem;font-weight:600;margin-top:0.1rem">重启 myhi</button>
+    <div class="setting-group" data-stab="task" style="display:none">
+      <div class="set-task-hint">这些设置只对当前任务（或它所在的项目）生效，快捷栏里隐藏了的也能从这里打开。</div>
+      <div class="set-task-grid">
+        <button onclick="closeSettings();openModelSheet()">🤖 模型</button>
+        <button onclick="closeSettings();openGuardSheet()">🛡 隐私护栏</button>
+        <button onclick="closeSettings();openSecretsSheet()">🔑 密钥</button>
+        <button onclick="closeSettings();openFollowUpSheet()">🔄 自动跟进</button>
+        <button onclick="closeSettings();showMemory()">🧠 记忆</button>
+        <button onclick="closeSettings();openSkillSheet()">🧩 技能</button>
+        <button onclick="closeSettings();openInboxSheet()">📥 草稿箱</button>
+        <button onclick="closeSettings();openGitSheet()">⬆ 提交代码</button>
+      </div>
     </div>
+    <div class="set-foot">这里的设置会同步到你登录的其他设备。外观（主题 / 字号）、本机显示名、语音、版本升级与重启在 <a href="/?settings=1">首页 ⚙ 设置</a>。</div>
   </div>
 
   <!-- QR弹窗 -->
@@ -1217,7 +1223,7 @@
     let settings = loadSettings();
 
     function loadSettings() { try { return { ...DEFAULT_SETTINGS, ...JSON.parse(localStorage.getItem('myhi_chat_settings')) }; } catch { return { ...DEFAULT_SETTINGS }; } }
-    function saveSettings() { localStorage.setItem('myhi_chat_settings', JSON.stringify(settings)); }
+    function saveSettings() { localStorage.setItem('myhi_chat_settings', JSON.stringify(settings)); window.myhiPrefsPush?.(); }   // 同步到其他设备
 
     // ── 外观：主题 & 字号（跨页面共用 localStorage myhi_theme / myhi_font）──
     const THEME_META = { dark: '#0d1117', light: '#ffffff', black: '#000000', system: '#0d1117' };
@@ -1235,7 +1241,7 @@
       syncAppearanceUI();
     }
     function syncAppearanceUI() {
-      const t = localStorage.getItem('myhi_theme') || 'dark';
+      const t = localStorage.getItem('myhi_theme') || window.MYHI_DEFAULT_THEME || 'dark';
       const f = localStorage.getItem('myhi_font') || 'medium';
       document.querySelectorAll('#seg-theme .seg').forEach(b => b.classList.toggle('active', b.dataset.theme === t));
       document.querySelectorAll('#seg-font .seg').forEach(b => b.classList.toggle('active', b.dataset.font === f));
@@ -3585,7 +3591,8 @@
       overlay.appendChild(wrap);
     };
 
-    window.openSettings = function() { document.getElementById('settings-backdrop').classList.add('open'); document.getElementById('settings-panel').classList.add('open'); syncSettingsUI(); applySettingsTab(localStorage.getItem('myhi_settings_tab') || 'look'); };
+    window.openSettings = function() { document.getElementById('settings-backdrop').classList.add('open'); document.getElementById('settings-panel').classList.add('open'); syncSettingsUI(); const t0 = localStorage.getItem('myhi_settings_tab');
+      applySettingsTab(['bar', 'task'].includes(t0) && !(t0 === 'task' && currentSession?.mode !== 'agent') ? t0 : 'chat'); };
     // 设置抽屉分类页签（1.3.174：一屏只看一类，不再长条堆叠）
     function applySettingsTab(tab) {
       document.querySelectorAll('#settings-tabs .stab').forEach(b => b.classList.toggle('active', b.dataset.tab === tab));
@@ -4122,35 +4129,51 @@
     function syncSettingsUI() {
       syncAppearanceUI();
       document.getElementById('set-parse').checked = settings.parseOutput;
-      document.getElementById('set-thinking').checked = settings.showThinking;
-      document.getElementById('set-collapse').checked = settings.collapseTools;
-      document.getElementById('set-thinkcollapse').checked = settings.thinkCollapsed !== false;
-      document.getElementById('set-rawclip').checked = settings.rawClip !== false;
-      document.getElementById('set-toolout').checked = !!settings.showToolOut;
+      // 「整理终端输出」只对终端模式的 Claude 会话有用；「本任务」入口只对 AI 会话有用
+      const isAgent = currentSession?.mode === 'agent';
+      document.getElementById('row-parse').style.display = isAgent ? 'none' : '';
+      document.getElementById('stab-task').style.display = isAgent ? '' : 'none';
+      syncDisplaySegs();
       applyToolOut();
       syncEnterModeUI();
       syncSkModeUI();
     }
     document.getElementById('set-parse').addEventListener('change', (e) => { settings.parseOutput = e.target.checked; saveSettings(); });
-    document.getElementById('set-thinking').addEventListener('change', (e) => { settings.showThinking = e.target.checked; saveSettings(); });
-    document.getElementById('set-collapse').addEventListener('change', (e) => { settings.collapseTools = e.target.checked; saveSettings(); });
-    document.getElementById('set-thinkcollapse').addEventListener('change', (e) => { settings.thinkCollapsed = e.target.checked; saveSettings(); });
-    // 工具输出显隐：关着时「只显示前 8 行」没意义，置灰
-    function applyToolOut() {
-      document.body.classList.toggle('hide-toolout', !settings.showToolOut);
-      document.getElementById('row-rawclip')?.classList.toggle('off', !settings.showToolOut);
-    }
+    // AI 工具输出显隐（body.hide-toolout 藏掉 .msg-raw.tool-out；终端会话的命令输出不受影响）
+    function applyToolOut() { document.body.classList.toggle('hide-toolout', !settings.showToolOut); }
     applyToolOut();
-    document.getElementById('set-toolout').addEventListener('change', (e) => {
-      settings.showToolOut = e.target.checked; saveSettings(); applyToolOut();
-      // 刚显示出来的块要重新量一次高度（隐藏时量不出是否超过 8 行）
-      if (settings.showToolOut) chatArea.querySelectorAll('.msg-raw.tool-out').forEach(m => rawClipSync(m));
-    });
-    document.getElementById('set-rawclip').addEventListener('change', (e) => {
-      settings.rawClip = e.target.checked; saveSettings();
-      // 已渲染的输出块立即跟随新默认（用户手动点过的块也一并重置）
-      chatArea.querySelectorAll('.msg-raw').forEach(m => { delete m.dataset.open; rawClipSync(m); });
-    });
+    // 显示设置：三组分段选择，各对应原来的一两个开关
+    //   思考过程 隐藏/折叠/展开 = showThinking + thinkCollapsed；工具调用 折叠/展开 = collapseTools；
+    //   工具输出 隐藏/前 8 行/全部 = showToolOut + rawClip
+    function displayState() {
+      return {
+        think: !settings.showThinking ? 'hide' : (settings.thinkCollapsed !== false ? 'fold' : 'open'),
+        tools: settings.collapseTools ? 'fold' : 'open',
+        toolout: !settings.showToolOut ? 'hide' : (settings.rawClip !== false ? 'clip' : 'all'),
+      };
+    }
+    function syncDisplaySegs() {
+      const st = displayState();
+      for (const [id, key] of [['seg-think', 'think'], ['seg-tools', 'tools'], ['seg-toolout', 'toolout']]) {
+        document.querySelectorAll('#' + id + ' .seg').forEach(b => b.classList.toggle('active', b.dataset.v === st[key]));
+      }
+    }
+    document.querySelectorAll('#seg-think .seg').forEach(b => b.addEventListener('click', () => {
+      settings.showThinking = b.dataset.v !== 'hide';
+      if (b.dataset.v !== 'hide') settings.thinkCollapsed = b.dataset.v === 'fold';
+      saveSettings(); syncDisplaySegs();
+    }));
+    document.querySelectorAll('#seg-tools .seg').forEach(b => b.addEventListener('click', () => {
+      settings.collapseTools = b.dataset.v === 'fold'; saveSettings(); syncDisplaySegs();
+    }));
+    document.querySelectorAll('#seg-toolout .seg').forEach(b => b.addEventListener('click', () => {
+      const was = displayState().toolout;
+      settings.showToolOut = b.dataset.v !== 'hide';
+      if (b.dataset.v !== 'hide') settings.rawClip = b.dataset.v === 'clip';
+      saveSettings(); syncDisplaySegs(); applyToolOut();
+      // 显示方式变了：已渲染的输出块按新默认重新量（隐藏时量不出高度；用户手动点过的展开/收起也重置）
+      if (settings.showToolOut && was !== b.dataset.v) chatArea.querySelectorAll('.msg-raw.tool-out').forEach(m => { delete m.dataset.open; rawClipSync(m); });
+    }));
 
     window.restartMyhi = async function() {
       if (!confirm('确认重启 myhi 服务？\n重启期间连接会短暂中断，页面将自动重连。')) return;

package/dist/grid.html

@@ -7,9 +7,10 @@
   <title>myhi</title>
   <script src="/lib/machine.js"></script>
   <script src="/sio-client/socket.io.min.js"></script>
+  <script src="/theme.js"></script>
   <script>
     (function(){try{
-      var t=localStorage.getItem('myhi_theme')||'dark';
+      var t=localStorage.getItem('myhi_theme')||window.MYHI_DEFAULT_THEME||'dark';
       var f=localStorage.getItem('myhi_font')||'medium';
       var r=document.documentElement;
       if(t&&t!=='dark') r.setAttribute('data-theme',t);