zcode-pro 0.20.3 → 1.0.0

package/src/inject/features/project-menu.js

@@ -1,7 +1,18 @@
-// 功能二：项目“更多”下拉菜单中新增“自定义别名”。
-// 识别方式：菜单内存在带 data-testid（值中含项目绝对路径）且文案为“移除/Remove”的菜单项。
-// 项目路径优先从 data-testid 提取；提取失败时回退为按项目名匹配 helper 返回的最近项目列表。
-import { rpc, getConfig, itemsOf, itemText } from '../core.js';
+// 功能二：项目“更多”下拉菜单中新增“打开文件夹 / 复制路径”。
+// 旧结构（3.15.x 及以前）：菜单内存在带 data-testid（值中含项目绝对路径）且文案为“移除/Remove”
+//   的菜单项，路径从 testid 提取；四项全注入（自定义别名/切换文件夹/打开文件夹/复制路径）。
+// 新结构（3.16.1 起）：菜单项带稳定 testid（virtual-project-edit/-delete/-remove-entry），
+//   项目行 section[data-project-id]；菜单打开时同步捕获触发行的 project-id，异步按 id 查
+//   helper 的 /projects-v2（官方任务索引 projects/project_roots）拿项目名与全部目录——
+//   不依赖项目展开状态或任务行。插在“编辑项目”之后：
+//   - 打开文件夹：单目录直接打开主目录；多目录悬停展开二级菜单列各目录（自绘浮层，
+//     官方 Radix 子菜单由 React 管理不便仿造）
+//   - 复制路径：复制主目录路径
+//   - 自定义别名与切换文件夹不再注入：官方“编辑项目”已支持改名与多目录增删
+//   （迁移存量别名见 alias-migration.js；旧结构下两项照旧注入）
+import { rpc, getConfig, itemsOf, itemText, isNewProjectSidebar, t } from '../core.js';
+import { showToast } from '../ui.js';
+import { copyToClipboard } from './copy-path.js';
 import { appendAliasItem } from './alias.js';
 import { appendRelocateItem } from './relocate-dialog.js';
 import { appendOpenFolderItem } from './open-folder.js';
@@ -18,13 +29,25 @@ function extractPathFromTestId(testid) {
   return m ? m[1] : null;
 }
 
-function basenameOf(p) {
-  return String(p || '').replace(/[\\/]+$/, '').split(/[\\/]/).pop() || '';
+// 新结构：菜单打开时找到触发的项目行。下拉按钮（virtual-project-menu）的打开态
+// 实测（3.16.1）只反映在 aria-expanded=true 上，data-state 不变化，两者都查；
+// 右键行（virtual-project-row）按 data-state/aria-expanded 兜底。菜单关闭后状态
+// 即消失，必须同步调用
+function openMenuProjectRow() {
+  const trigger = document.querySelector(
+    '[data-testid="virtual-project-menu"][aria-expanded="true"],'
+    + ' [data-testid="virtual-project-menu"][data-state="open"],'
+    + ' [data-testid="virtual-project-row"][data-state="open"],'
+    + ' [data-testid="virtual-project-row"][aria-expanded="true"]'
+  );
+  const row = trigger ? trigger.closest('section[data-project-id]') : null;
+  if (!row) return null;
+  const host = row.getAttribute('data-project-host');
+  return host === null || host === 'local' ? row : null;
 }
 
 async function resolveProjectPath(removeItem) {
-  const testid = removeItem.getAttribute('data-testid') || '';
-  const extracted = extractPathFromTestId(testid);
+  const extracted = extractPathFromTestId(removeItem.getAttribute('data-testid') || '');
   if (!extracted) return null;
   // 与 helper 的最近项目列表核对（仅用于确认路径有效；任务派生的项目可能不在列表中）
   const res = await rpc('/projects');
@@ -33,26 +56,193 @@ async function resolveProjectPath(removeItem) {
     const hit = res.projects.find((p) => norm(p.path) === norm(extracted));
     if (hit) return hit;
   }
-  return { path: extracted, name: basenameOf(extracted) };
+  return { path: extracted, name: String(extracted).replace(/[\\/]+$/, '').split(/[\\/]/).pop() || '' };
+}
+
+// —— 新结构注入：编辑项之后插入 ——
+// 官方菜单项结构：[data-radix-collection-item]（div，含 svg + 文本）。克隆保证样式一致
+function cloneMenuItem(anchor, testid, label) {
+  const item = anchor.cloneNode(true);
+  item.removeAttribute('data-testid');
+  item.removeAttribute('data-highlighted');
+  item.removeAttribute('id');
+  item.setAttribute('data-zcodepro-item', testid);
+  for (const child of [...item.childNodes]) child.remove();
+  const origIcon = anchor.querySelector('svg');
+  const iconClass = origIcon ? origIcon.getAttribute('class') : 'h-3.5 w-3.5';
+  // 文件夹图标
+  const ns = 'http://www.w3.org/2000/svg';
+  const svg = document.createElementNS(ns, 'svg');
+  svg.setAttribute('viewBox', '0 0 24 24');
+  svg.setAttribute('fill', 'none');
+  svg.setAttribute('stroke', 'currentColor');
+  svg.setAttribute('stroke-width', '2');
+  svg.setAttribute('stroke-linecap', 'round');
+  svg.setAttribute('stroke-linejoin', 'round');
+  svg.setAttribute('class', iconClass);
+  const p = document.createElementNS(ns, 'path');
+  p.setAttribute('d', 'M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z');
+  svg.append(p);
+  item.append(svg, document.createTextNode(label));
+  return item;
+}
+
+function wireHighlight(menu, item) {
+  item.addEventListener('mouseenter', () => {
+    for (const el of menu.querySelectorAll('[role="menuitem"]')) el.removeAttribute('data-highlighted');
+    item.setAttribute('data-highlighted', '');
+  });
+  item.addEventListener('mouseleave', () => item.removeAttribute('data-highlighted'));
+}
+
+// 多目录的二级子菜单：悬停“打开文件夹”即在右侧展开，一级菜单保持可见；
+// 点击该项同样展开（触屏可达）。移出项与子菜单 300ms 后收起；一级菜单被
+// 关闭（Esc/外部点击）时子菜单一并收起
+function attachFolderHover(menu, item, roots) {
+  const L = t();
+  let sub = null;
+  let subHovered = false;
+  let hideTimer = 0;
+  let aliveTimer = 0;
+
+  const removeSub = () => {
+    clearTimeout(hideTimer);
+    clearInterval(aliveTimer);
+    sub?.remove();
+    sub = null;
+    subHovered = false;
+  };
+  const position = () => {
+    const rect = item.getBoundingClientRect();
+    sub.style.left = rect.right + 'px';
+    sub.style.top = rect.top + 'px';
+    const r = sub.getBoundingClientRect();
+    if (r.right > window.innerWidth - 8) {
+      sub.style.left = '';
+      sub.style.right = (window.innerWidth - rect.left) + 'px';
+    }
+  };
+  const ensureSub = () => {
+    if (sub) { position(); return; }
+    sub = document.createElement('div');
+    sub.setAttribute('role', 'menu');
+    sub.setAttribute('data-zcodepro-item', 'open-folder-sub');
+    sub.className = 'zcodepro-card flex flex-col gap-0.5 rounded-lg border border-border bg-menu p-1 text-ui-sm shadow-lg';
+    sub.style.cssText = 'position:fixed;z-index:60;min-width:14rem;';
+    for (const root of roots) {
+      const base = String(root.path).replace(/[\\/]+$/, '').split(/[\\/]/).pop() || root.path;
+      const row = document.createElement('div');
+      row.setAttribute('role', 'menuitem');
+      row.className = 'flex cursor-pointer items-center gap-2 truncate rounded-md px-2 py-1.5 text-foreground transition-colors hover:bg-surface-hover';
+      row.title = root.path;
+      row.append(document.createTextNode(base + (root.primary ? ` · ${L.openFolderPrimary}` : '')));
+      row.addEventListener('click', () => {
+        // 关一级菜单（Escape 走 Radix）再打开目录
+        try { menu.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', code: 'Escape', bubbles: true, cancelable: true })); } catch { /* ignore */ }
+        removeSub();
+        void rpc('/open-folder', { method: 'POST', body: { path: root.path } });
+      });
+      sub.append(row);
+    }
+    sub.addEventListener('mouseenter', () => { subHovered = true; clearTimeout(hideTimer); });
+    sub.addEventListener('mouseleave', () => { subHovered = false; scheduleHide(); });
+    document.body.append(sub);
+    position();
+    // 子菜单存活期间周期确认一级还在（Radix 被关后不残留）
+    aliveTimer = setInterval(() => { if (!menu.isConnected) removeSub(); }, 400);
+  };
+  const scheduleHide = () => {
+    clearTimeout(hideTimer);
+    hideTimer = setTimeout(() => { if (!subHovered) removeSub(); }, 300);
+  };
+
+  item.addEventListener('mouseenter', () => { clearTimeout(hideTimer); ensureSub(); });
+  item.addEventListener('mouseleave', scheduleHide);
+  // 点击同样展开且不关一级（项是注入节点，不触发 Radix 的选中即关闭）
+  item.addEventListener('click', () => { clearTimeout(hideTimer); ensureSub(); });
+}
+
+async function injectNewMenuItems(content, menuRow) {
+  const L = t();
+  const projectId = menuRow.getAttribute('data-project-id');
+  const editItem = content.querySelector('[data-testid="virtual-project-edit"]');
+  if (!editItem || !projectId) return;
+  if (content.querySelector('[data-zcodepro-item]')) return;
+  const config = await getConfig();
+  // 同一组开关（旧结构共用 features.projectMenu）
+  if (config.features && config.features.projectMenu === false) return;
+  const res = await rpc('/projects-v2');
+  if (!res.ok || !res.available) return;
+  const proj = (res.projects || []).find((p) => p.id === projectId);
+  if (!proj) return;
+  const roots = (proj.roots || []).slice().sort((a, b) => (b.primary ? 1 : 0) - (a.primary ? 1 : 0));
+  if (!roots.length) return;
+  const primary = roots.find((r) => r.primary) || roots[0];
+
+  // 打开文件夹：单目录点击直接打开；多目录悬停/点击展开二级子菜单（带 › 指示）
+  const openItem = cloneMenuItem(editItem, 'open-folder', L.openFolderItem);
+  wireHighlight(content, openItem);
+  if (roots.length === 1) {
+    openItem.addEventListener('click', () => {
+      try { content.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', code: 'Escape', bubbles: true, cancelable: true })); } catch { /* ignore */ }
+      void rpc('/open-folder', { method: 'POST', body: { path: primary.path } });
+    });
+  } else {
+    // 行尾 › 子级指示（与官方菜单 chevron 同款样式）
+    const ns = 'http://www.w3.org/2000/svg';
+    const chev = document.createElementNS(ns, 'svg');
+    chev.setAttribute('viewBox', '0 0 24 24');
+    chev.setAttribute('fill', 'none');
+    chev.setAttribute('stroke', 'currentColor');
+    chev.setAttribute('stroke-width', '2');
+    chev.setAttribute('stroke-linecap', 'round');
+    chev.setAttribute('stroke-linejoin', 'round');
+    chev.setAttribute('class', 'ml-auto size-3.5 shrink-0 text-foreground-subtle');
+    const chevPath = document.createElementNS(ns, 'path');
+    chevPath.setAttribute('d', 'm9 18 6-6-6-6');
+    chev.append(chevPath);
+    openItem.append(chev);
+    attachFolderHover(content, openItem, roots);
+  }
+  editItem.after(openItem);
+
+  // 复制路径：主目录
+  const copyItem = cloneMenuItem(editItem, 'copy-path', L.copyPathItem);
+  wireHighlight(content, copyItem);
+  copyItem.addEventListener('click', () => {
+    try { content.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', code: 'Escape', bubbles: true, cancelable: true })); } catch { /* ignore */ }
+    void copyToClipboard(primary.path).then((ok) => showToast(ok ? L.pathCopied : L.pathCopyFailed, ok ? undefined : 'error'));
+  });
+  openItem.after(copyItem);
 }
 
 export function handleProjectMenu(content) {
-  if (content.querySelector('[data-zcodepro-item="alias"]')) return;
+  if (content.querySelector('[data-zcodepro-item]')) return;
   const items = itemsOf(content);
-  const removeItem = items.find(
-    (el) => el.hasAttribute('data-testid') && REMOVE_TEXTS.some((x) => itemText(el).startsWith(x))
-  );
-  if (!removeItem) return;
+  const newUi = isNewProjectSidebar();
+  // 菜单关闭后 data-state 即消失：项目行必须在任何 await 之前捕获
+  const menuRow = newUi ? openMenuProjectRow() : null;
+  const anchor = newUi
+    ? items.find((el) => el.getAttribute('data-testid') === 'virtual-project-edit')
+    : items.find(
+      (el) => el.hasAttribute('data-testid') && REMOVE_TEXTS.some((x) => itemText(el).startsWith(x))
+    );
+  if (!anchor) return;
+  if (newUi) {
+    if (!menuRow) return;
+    void injectNewMenuItems(content, menuRow);
+    return;
+  }
   void (async () => {
     const config = await getConfig();
     // 一组开关控制整组菜单项（别名 / 切换文件夹 / 打开文件夹 / 复制路径）
     if (config.features && config.features.projectMenu === false) return;
-    const project = await resolveProjectPath(removeItem);
+    const project = await resolveProjectPath(anchor);
     if (!project) return;
     // 菜单顺序：自定义别名 → 切换文件夹 → 打开文件夹 → 复制路径 → 移除（均插在“移除”之前）
-    appendAliasItem(content, removeItem, project);
-    appendRelocateItem(content, removeItem, project);
-    appendOpenFolderItem(content, removeItem, project);
-    appendCopyPathItem(content, removeItem, project);
+    appendAliasItem(content, anchor, project);
+    appendRelocateItem(content, anchor, project);
+    appendOpenFolderItem(content, anchor, project);
+    appendCopyPathItem(content, anchor, project);
   })();
 }

package/src/inject/features/session-switch.js

@@ -7,6 +7,7 @@
 // 目标条目在折叠项目下时先展开项目行再点击（展开先例见 pinned-expand.js）。
 import { h, t, getConfig } from '../core.js';
 import { ensureStyle, showToast } from '../ui.js';
+import { findProjectRow } from './ws-rows.js';
 
 const MRU_LIMIT = 50;
 const SCAN_DEBOUNCE_MS = 150;   // 相关 DOM 变动后的去抖，合并连续变动
@@ -93,7 +94,9 @@ async function switchTo(key) {
   let item = find();
   if (!item) {
     const ws = workspaceOf(key);
-    const header = document.querySelector(`[data-testid="workspace-item-${CSS.escape(ws)}"]`);
+    // 项目行按路径定位：旧结构查 testid，新结构（3.16.1 起）按 data-project-id
+    // 分区匹配（分区与路径的关联需该项目本次会话展开过一次，见 ws-rows.js）
+    const header = findProjectRow(ws);
     const expander = header && header.querySelector('[aria-expanded]');
     if (expander && expander.getAttribute('aria-expanded') === 'false') {
       expander.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
@@ -231,7 +234,8 @@ export function startSessionSwitch() {
     // x/c：弹窗导航（无可导航会话时与 z 一致轻提示）
     if (mru.length < 2) { showToast(t().switcherEmpty); return; }
     if (!popupEl) await openPopup();
-    moveHighlight(k === 'x' ? 1 : -1);
+    // 键位对调：alt+x 上移一位（更靠上/更近的键管向上），alt+c 下移
+    moveHighlight(k === 'x' ? -1 : 1);
     })();
   }, true);
 

package/src/inject/features/settings-dialog.js

@@ -1,9 +1,10 @@
 // “ZCode Pro 增强设置”弹窗：功能开关 + 样式调整 + 运行状态。
 // 顶部标签页切换（视觉参考侧栏“分组/项目”切换）；配置写入 helper（~/.zcode/zcodepro.json）。
-import { h, t, rpc, getConfig, clearConfigCache, errText, HELPER_URL, isZhLocale } from '../core.js';
+import { h, t, rpc, getConfig, clearConfigCache, errText, HELPER_URL, isZhLocale, isNewProjectSidebar } from '../core.js';
 import { openDialog, dialogFooter, btnPrimary, btnSecondary, btnSmall, settingRow, ensureStyle, showToast, numberField, unitField } from '../ui.js';
 import { comboField, providerOptionsOf, modelOptionsOf, modelPlaceholderOf, isManualConn } from '../provider-fields.js';
 import { refreshAliases } from './alias.js';
+import { migrationCard } from './alias-migration.js';
 import { applyStyles, STYLE_DEFAULTS, showStyleHighlight, hideStyleHighlight } from './styles.js';
 import { copyToClipboard, hCopyIcon } from './copy-path.js';
 
@@ -12,6 +13,9 @@ function openExternal(url) {
   try { void window.zcode.openExternal(url); } catch { /* ignore */ }
 }
 
+// 插件市场仓库（设置页“自动更新”行的仓库名链接指向它）
+const PLUGINS_REPO_URL = 'https://github.com/duanluan/zcode-plugins';
+
 // 本体升级交互（Headroom 的 pip 与 rtk 的 GitHub Releases 共用）：
 // 检查更新 → 升级（helper 后台任务，轮询进度，输出取最后一行、超长省略中间）→
 // 进行中可停止；关弹窗不中断升级，重开恢复显示。endpoint 为 /headroom 或 /rtk，
@@ -236,10 +240,51 @@ export function openSettingsDialog() {
       );
 
       const rows = h('div', { class: 'divide-y divide-border rounded-xl border border-border' });
+      const pluginsStatusLine = h('span', { class: 'max-w-40 truncate text-ui-xs/relaxed text-foreground-subtle' }, '…');
+      const pluginsBtn = btnSmall(L.pluginsCheckNow, () => { void runPluginsUpdate(); });
+      let pluginsUpdating = false;
+      const runPluginsUpdate = async () => {
+        // 并发守卫：打开弹窗的自动触发与手动点击可能撞在一起，第二个直接忽略
+        if (pluginsUpdating) return;
+        pluginsUpdating = true;
+        pluginsBtn.disabled = true;
+        pluginsStatusLine.textContent = L.pluginsUpdating;
+        const res = await rpc('/plugins/update', { method: 'POST', body: {} });
+        pluginsUpdating = false;
+        pluginsBtn.disabled = false;
+        if (!res.ok) {
+          pluginsStatusLine.textContent = '';
+          showToast(L.pluginsUpdateFailed + ': ' + errText(res), 'error');
+          return;
+        }
+        pluginsStatusLine.textContent = res.updated > 0
+          ? L.pluginsUpdatedDone.replaceAll('{n}', String(res.updated))
+          : L.pluginsUpToDate;
+        showToast(pluginsStatusLine.textContent, 'success');
+      };
+      void (async () => {
+        // 打开设置弹窗即自动更新（与启动时同语义）：开关开着且有新版时直接更，
+        // 状态行如实显示过程与结果；开关关闭时只检查并显示“N 个可更新”
+        const cfg = await getConfig(true).catch(() => null);
+        const res = await rpc('/plugins/status');
+        if (!res.ok) { pluginsStatusLine.textContent = ''; return; }
+        const n = (res.updates || []).length;
+        if (cfg && (cfg.features || {}).autoUpdatePlugins === true && n > 0) {
+          void runPluginsUpdate();
+          return;
+        }
+        pluginsStatusLine.textContent = n > 0
+          ? L.pluginsUpdatesFound.replaceAll('{n}', String(n))
+          : L.pluginsUpToDate;
+      })();
+
       const refreshRows = () => {
         const f = config.features || {};
         rows.replaceChildren(
-          settingRow(L.featureProjectMenu, L.featureProjectMenuDesc, f.projectMenu !== false, async () => {
+          // 3.16.1 起官方“编辑项目”支持修改名称：别名停用，此行只描述其余三项；
+          // 仍有存量别名时在最上方放迁移卡片（卡片自管移除，这里每次重建）
+          ...(isNewProjectSidebar() ? [migrationCard()] : []),
+          settingRow(L.featureProjectMenu, isNewProjectSidebar() ? L.featureProjectMenuDescNew : L.featureProjectMenuDesc, f.projectMenu !== false, async () => {
             const next = !(f.projectMenu !== false);
             if (await setFeature('projectMenu', next)) f.projectMenu = next;
             refreshRows();
@@ -281,16 +326,31 @@ export function openSettingsDialog() {
             if (await setFeature('wsRunningSpin', next)) f.wsRunningSpin = next;
             refreshRows();
           }),
-          settingRow(L.featurePinnedExpand, L.featurePinnedExpandDesc, f.pinnedKeepCollapsed !== false, async () => {
-            const next = !(f.pinnedKeepCollapsed !== false);
-            if (await setFeature('pinnedKeepCollapsed', next)) f.pinnedKeepCollapsed = next;
-            refreshRows();
-          }),
-          settingRow(L.featureAutoUpdatePlugins, L.featureAutoUpdatePluginsDesc, f.autoUpdatePlugins === true, async () => {
-            const next = !(f.autoUpdatePlugins === true);
-            if (await setFeature('autoUpdatePlugins', next)) f.autoUpdatePlugins = next;
-            refreshRows();
-          }),
+          (() => {
+            // 标题 = “自动更新 duanluan/zcode-plugins 插件”，仓库名可点击跳转仓库
+            const repoLink = h('span', {
+              class: 'cursor-pointer underline-offset-4 hover:underline',
+              title: PLUGINS_REPO_URL,
+              onClick: (ev) => { ev.stopPropagation(); openExternal(PLUGINS_REPO_URL); },
+            }, L.featureAutoUpdatePluginsRepo);
+            const row = settingRow('', '', f.autoUpdatePlugins === true, async () => {
+              const next = !(f.autoUpdatePlugins === true);
+              if (await setFeature('autoUpdatePlugins', next)) f.autoUpdatePlugins = next;
+              refreshRows();
+            }, h('div', { class: 'flex items-center gap-2' }, pluginsBtn));
+            // 标题行：自动更新 <链接> 插件；描述位放状态字（检查结果/更新进度）
+            const nameEl = row.querySelector('.text-ui-sm.font-medium');
+            if (nameEl) {
+              nameEl.replaceChildren(
+                document.createTextNode(L.featureAutoUpdatePlugins + ' '),
+                repoLink,
+                document.createTextNode(' 插件'),
+              );
+            }
+            const descEl = row.querySelector('[data-zcodepro-row-desc]');
+            if (descEl) descEl.replaceChildren(pluginsStatusLine);
+            return row;
+          })(),
         );
       };
       refreshRows();
@@ -333,54 +393,9 @@ export function openSettingsDialog() {
       let activeTab = 'features';
       // 插件更新卡片：显示 duanluan-zcode-plugins 市场状态，一键更新（helper /plugins/* 端点）；
       // 状态异步加载，打开弹窗不等待
-      const pluginsStatusLine = h('span', { class: 'text-ui-xs/relaxed text-foreground-subtle' }, '…');
-      const pluginsBtn = btnSmall(L.pluginsCheckNow, () => { void runPluginsUpdate(); });
-      const runPluginsUpdate = async () => {
-        pluginsBtn.disabled = true;
-        pluginsStatusLine.textContent = L.pluginsUpdating;
-        const res = await rpc('/plugins/update', { method: 'POST', body: {} });
-        pluginsBtn.disabled = false;
-        if (!res.ok) {
-          pluginsStatusLine.textContent = '';
-          showToast(L.pluginsUpdateFailed + ': ' + errText(res), 'error');
-          return;
-        }
-        pluginsStatusLine.textContent = res.updated > 0
-          ? L.pluginsUpdatedDone.replaceAll('{n}', String(res.updated))
-          : L.pluginsUpToDate;
-        showToast(pluginsStatusLine.textContent, 'success');
-      };
-      void (async () => {
-        const res = await rpc('/plugins/status');
-        if (!res.ok) { pluginsStatusLine.textContent = ''; return; }
-        pluginsStatusLine.textContent = (res.updates || []).length > 0
-          ? L.pluginsUpdatesFound.replaceAll('{n}', String(res.updates.length))
-          : L.pluginsUpToDate;
-      })();
-      // 标题中的 zcode-plugins 可点击跳转插件市场仓库（依赖宿主 openExternal 打开系统浏览器）
-      const PLUGINS_REPO_URL = 'https://github.com/duanluan/zcode-plugins';
-      const repoName = 'zcode-plugins';
-      const titleParts = L.pluginsUpdateTitle.split(repoName);
-      const pluginsTitle = h('div', { class: 'truncate text-ui-sm font-medium text-foreground' });
-      if (titleParts.length === 2 && typeof window.zcode?.openExternal === 'function') {
-        pluginsTitle.append(titleParts[0],
-          h('span', {
-            class: 'cursor-pointer underline-offset-4 hover:underline',
-            title: PLUGINS_REPO_URL,
-            onClick: () => openExternal(PLUGINS_REPO_URL),
-          }, repoName),
-          titleParts[1]);
-      } else {
-        pluginsTitle.append(L.pluginsUpdateTitle);
-      }
-      const pluginsCard = h('div', { class: 'mt-3 flex items-center justify-between gap-2 rounded-xl border border-border p-2' },
-        h('div', { class: 'min-w-0' },
-          pluginsTitle,
-          h('div', { class: 'mt-0.5 truncate text-ui-xs/relaxed text-foreground-subtle' }, pluginsStatusLine)),
-        pluginsBtn);
+
       const paneFeatures = h('div', { role: 'tabpanel', class: 'mt-4' },
         h('div', {}, rows),
-        pluginsCard,
         communityCards,
       );
       const paneStyles = h('div', { role: 'tabpanel', class: 'mt-4', style: 'display:none' });
@@ -497,6 +512,7 @@ export function openSettingsDialog() {
             cellPadH.el, h('span', { class: 'w-3 text-ui-xs text-foreground-subtle' }, 'px'))),
       };
       const cells = [
+        // 侧栏间距双结构：3.15.x 旧容器/行 + 3.16.1 新项目行（virtual-project-row）与任务行
         styleCell(L.sidebarProjectSpacingName, L.sidebarProjectSpacingDesc, 'sidebarProjectSpacing', { max: 24 }),
         styleCell(L.sidebarTaskSpacingName, L.sidebarTaskSpacingDesc, 'sidebarTaskSpacing', { max: 24 }),
         widthCell,
@@ -1853,6 +1869,7 @@ export function openSettingsDialog() {
         const hrStatusLine = h('div', { class: 'flex items-center gap-2' },
           h('span', { class: 'text-ui-sm text-foreground-subtle/70' }, '…'));
         const hrFacts = h('div', { class: 'mt-1.5 grid grid-cols-2 gap-x-4 gap-y-1 sm:grid-cols-3' });
+        const hrInstList = h('div', { class: 'mt-1.5 space-y-1', style: 'display:none' });
         const hrHintLine = h('p', { class: 'mt-1.5 text-ui-xs/relaxed text-amber-500', style: 'display:none' });
         const hrRefresh = async () => {
           const res = await rpc('/headroom/status');
@@ -1860,6 +1877,8 @@ export function openSettingsDialog() {
             hrStatusLine.replaceChildren(
               h('span', { class: 'text-ui-sm text-destructive' }, L.headroomStatusLoadFailed + ': ' + errText(res)));
             hrFacts.replaceChildren();
+            hrInstList.replaceChildren();
+            hrInstList.style.display = 'none';
             hrHintLine.style.display = 'none';
             return;
           }
@@ -1876,9 +1895,18 @@ export function openSettingsDialog() {
             fact(L.headroomCurrentBackend, hrDevLabel(s.backend)),
             fact(L.headroomDesiredBackend, hrDevLabel(s.desiredBackend)),
             fact(L.headroomPowerState, HR_PM[s.powerMode] || s.powerMode),
-            fact(L.headroomWatcher, s.watcherRunning ? L.headroomWatcherOn : L.headroomWatcherOff),
+            fact(L.headroomWatcher, s.watcherRunning == null ? '—' : (s.watcherRunning ? L.headroomWatcherOn : L.headroomWatcherOff)),
             fact(L.headroomSaverDetect, HR_DETECT[s.saverDetect] || s.saverDetect),
           );
+          // 多实例模式：列出各压缩实例（端口/格式/上游/供应商）与运行状态
+          const insts = Array.isArray(s.instances) ? s.instances : [];
+          hrInstList.replaceChildren(...insts.map((it) => h('div', { class: 'flex min-w-0 items-center gap-2' },
+            h('span', { class: 'shrink-0 font-mono text-ui-xs text-foreground-subtle' }, `:${it.port}`),
+            h('span', { class: 'min-w-0 flex-1 truncate text-ui-xs text-foreground-subtle', title: `${it.upstream} | ${it.providers}` },
+              `${it.format} → ${it.upstream}`),
+            h('span', { class: 'max-w-[40%] shrink-0 truncate text-ui-xs text-foreground-subtle/70', title: it.providers }, it.providers),
+            h('span', { class: 'shrink-0 text-ui-xs ' + (it.up ? 'text-emerald-600' : 'text-destructive') }, it.up ? L.hrInstRunning : L.hrInstStopped))));
+          hrInstList.style.display = insts.length ? '' : 'none';
           hrHintLine.textContent = s.saverHint || '';
           hrHintLine.style.display = s.saverHint ? '' : 'none';
         };
@@ -2052,6 +2080,7 @@ export function openSettingsDialog() {
               h('div', { class: 'flex items-center gap-1.5' }, hrRefreshBtn, hrStartBtn, hrRestartBtn, hrStopBtn)),
             hrStatusLine,
             hrFacts,
+            hrInstList,
             hrHintLine),
           h('div', {
             class: 'mt-2 rounded-xl border border-border p-1',

package/src/inject/features/styles.js

@@ -214,6 +214,9 @@ function buildCss(styles) {
       `${LIST} [data-testid^="workspace-item-"] > div:first-child{align-self:stretch !important;}`,
       `${SCROLL} [data-slot="collapsible-trigger"],${SCROLL} .flex.h-7{height:auto !important;}`,
       `${SCROLL} [data-slot="collapsible-trigger"]{min-height:${28 + 2 * pad}px !important;padding-block:${pad}px !important;padding-top:${pad}px !important;padding-bottom:${pad}px !important;}`,
+      // 3.16.1 新结构：项目行（virtual-project-row，固定 h-8）按视觉总量放行内留白；
+      // 分区间距由新侧栏容器自己的布局管理，不动
+      `section[data-project-id] [data-testid="virtual-project-row"]{height:auto !important;min-height:${28 + 2 * pad}px !important;padding-block:${Math.round(pad)}px !important;}`,
     );
   }
   const sts = styles.sidebarTaskSpacing;
@@ -228,6 +231,9 @@ function buildCss(styles) {
       `ul.space-y-0\\.5:has(> li[data-task-item-key]) > li{padding-block:${pad}px !important;padding-top:${pad}px !important;padding-bottom:${pad}px !important;}`,
       `${SCROLL} .flex.flex-col.gap-2{gap:${m}px !important;row-gap:${m}px !important;}`,
       `${SCROLL} div.cursor-pointer[class*="pl-8"]{padding-block:${pad}px !important;padding-top:${pad}px !important;padding-bottom:${pad}px !important;}`,
+      // 3.16.1 新结构：任务行（li[data-task-item-key]）行内留白 + 相邻行间距
+      `li[data-task-item-key]{padding-block:${Math.max(1, Math.round(pad))}px !important;}`,
+      `li[data-task-item-key] + li[data-task-item-key]{margin-block-start:${m}px !important;}`,
     );
   }
   return parts.join('');
@@ -275,7 +281,8 @@ const HL_SELECTORS = {
   thinkingLineHeight: `[data-testid^="chat-assistant-history-content"]`,
   userLineHeight: `${CONV} [class*="user-row"] .whitespace-pre-wrap`,
   contentWidth: '[data-v4-timeline-content-column]',
-  sidebarProjectSpacing: '[data-testid^="workspace-item-"]',
+  // 双结构：新侧栏项目行 / 旧 testid 行
+  sidebarProjectSpacing: 'section[data-project-id] [data-testid="virtual-project-row"], [data-testid^="workspace-item-"]',
   sidebarTaskSpacing: 'li[data-task-item-key]',
 };
 

package/src/inject/features/title-lock.js

@@ -28,6 +28,7 @@ const REVERIFY_MS = 3000;        // 回写后的再复核：纠正数据库写
 const MAP_REFRESH_MS = 60000;    // 任务行变动后至多一次的延迟表刷新：让新重命名会话进入锁定范围
 
 let installed = false;
+const seenRows = new WeakSet(); // 已见过的任务行；新上屏的行立即钉回（不等复核）
 let enabled = true;       // titleLock 开关（/pinned-titles 响应带来）
 let pinned = null;        // Map(task_id → 重命名标题)；null = 尚未取到/功能关闭
 let resolved = false;     // 首次成功通信（无论开关状态）后不再重试启动拉取
@@ -100,7 +101,19 @@ function writeTitle(el, text) {
 }
 
 // 失配 → 排期复核；到期后行可能已被 React 重挂载，按键重新定位
-function scheduleEnforce(key) {
+function scheduleEnforce(key, { immediate = false } = {}) {
+  if (immediate) {
+    // 新上屏的行（项目展开/滚动复现）带着旧名出现，用户此刻正看着列表——
+    // 立即用缓存表钉回，不等复核（编辑中的行不会到这：isMismatch 已排除 input）
+    if (enabled && pinned) {
+      const want = pinned.get(sessIdOf(key));
+      if (want !== undefined) {
+        for (const item of findRows(key)) {
+          for (const el of titleElsOf(item)) writeTitle(el, want);
+        }
+      }
+    }
+  }
   if (pendingKeys.has(key)) return;
   pendingKeys.add(key);
   setTimeout(() => {
@@ -138,7 +151,12 @@ function scan() {
   if (!enabled || !pinned || pinned.size === 0) return;
   for (const item of document.querySelectorAll(TASK_SEL)) {
     const key = isMismatch(item);
-    if (key) scheduleEnforce(key);
+    if (!key) { seenRows.add(item); continue; }
+    // 新上屏的失配行立即钉回（项目展开时旧名闪现 1 秒+，用户不知道点哪个）；
+    // 已在屏上的失配走原路径（复核后写，避免把刚提交的重命名改回旧名）
+    const fresh = !seenRows.has(item);
+    seenRows.add(item);
+    scheduleEnforce(key, { immediate: fresh });
   }
 }