zcode-pro 0.20.3 → 1.1.0

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, DEFAULT_SHORTCUTS } 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,85 @@ 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;
+      })();
+
+      // 会话快捷切换：入口键位（“快捷键”标签页可改）；此处定义在 refreshRows 之前，
+      // 功能行的描述与快捷键面板共用同一份当前键位
+      const HK_ACTIONS = [
+        ['switchLast', 'hkAltZ'],
+        ['switchPrev', 'hkAltX'],
+        ['switchNext', 'hkAltC'],
+        ['switchRecent', 'hkAltE'],
+        ['switchAttention', 'hkAltR'],
+      ];
+      const hkNames = () => ({
+        switchLast: L.hkNameLast, switchPrev: L.hkNamePrev, switchNext: L.hkNameNext,
+        switchRecent: L.hkNameRecent, switchAttention: L.hkNameAttention,
+      });
+      // 当前生效键位：配置里合法的单字符覆盖默认，其余回退默认
+      const hkKeys = () => {
+        const sc = config.shortcuts || {};
+        const keys = {};
+        for (const [a] of HK_ACTIONS) {
+          keys[a] = /^[a-z0-9]$/.test(sc[a]) ? sc[a] : DEFAULT_SHORTCUTS[a];
+        }
+        return keys;
+      };
+      // 开关描述按当前键位渲染（改键后 refreshRows 重绘即更新）；
+      // prev/next 出现在“按住 alt 再按 {prev}/{next}”语境，用裸键位避免 alt 重复
+      const sessionSwitchDesc = () => {
+        const k = hkKeys();
+        return L.featureSessionSwitchDesc
+          .replaceAll('{last}', 'alt+' + k.switchLast)
+          .replaceAll('{prev}', k.switchPrev)
+          .replaceAll('{next}', k.switchNext)
+          .replaceAll('{recent}', 'alt+' + k.switchRecent)
+          .replaceAll('{attention}', 'alt+' + k.switchAttention);
+      };
+
       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();
@@ -251,7 +330,7 @@ export function openSettingsDialog() {
             if (await setFeature('taskOrder', next)) f.taskOrder = next;
             refreshRows();
           }),
-          settingRow(L.featureSessionSwitch, L.featureSessionSwitchDesc, f.sessionSwitch !== false, async () => {
+          settingRow(L.featureSessionSwitch, sessionSwitchDesc(), f.sessionSwitch !== false, async () => {
             const next = !(f.sessionSwitch !== false);
             if (await setFeature('sessionSwitch', next)) f.sessionSwitch = next;
             refreshRows();
@@ -281,16 +360,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,56 +427,108 @@ 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,
       );
+      // “快捷键”：五个入口键可改（点“修改”后按下新键，字母/数字，Esc 取消），
+      // 弹窗内通用键（↑/↓、Enter、Esc、松开 alt）固定只读；开关仍在“功能”标签页。
+      // 键位与名称定义（HK_ACTIONS/hkNames/hkKeys）在 refreshRows 前共用
+      let hkRecording = null; // 正在录制新键的动作（null = 未在录制）
+      let hkKeyHandler = null;
+      const hkCard = h('div', { class: 'divide-y divide-border rounded-xl border border-border' });
+      const hkCell = (keyLabel, desc, extra) => h('div', { class: 'flex items-start gap-3 px-3 py-2.5' },
+        h('kbd', {
+          class: 'shrink-0 min-w-20 rounded-md border border-border px-2 py-0.5 text-center text-ui-xs text-foreground-subtle',
+          style: 'font-family: ui-monospace, SFMono-Regular, Menlo, monospace; line-height: 1.5;',
+        }, keyLabel),
+        h('div', { class: 'min-w-0 flex-1 text-ui-sm text-foreground-subtle' }, desc),
+        extra ? h('div', { class: 'ml-auto shrink-0 pl-3' }, extra) : null);
+      const renderShortcuts = () => {
+        const keys = hkKeys();
+        const names = hkNames();
+        hkCard.replaceChildren(
+          ...HK_ACTIONS.map(([a, descKey]) => {
+            const recording = hkRecording === a;
+            return hkCell(
+              recording ? L.hkRecording : 'alt + ' + keys[a],
+              L[descKey],
+              btnSmall(recording ? L.hkRecording : L.hkModify, () => { recording ? stopHkRecording() : startHkRecording(a); }));
+          }),
+          hkCell('↑ / ↓', L.hkArrow.replaceAll('{prev}', keys.switchPrev).replaceAll('{next}', keys.switchNext)),
+          hkCell('Enter', L.hkEnter),
+          hkCell('Esc', L.hkEsc),
+          hkCell(L.hkReleaseKey, L.hkRelease));
+      };
+      const stopHkRecording = () => {
+        hkRecording = null;
+        if (hkKeyHandler) {
+          document.removeEventListener('keydown', hkKeyHandler, true);
+          hkKeyHandler = null;
+        }
+        renderShortcuts();
+      };
+      const startHkRecording = (action) => {
+        hkRecording = action;
+        if (!hkKeyHandler) {
+          // 绑定本次弹窗实例：弹窗关闭（哪怕马上重开新弹窗）后旧监听器自摘，
+          // 不会吞掉新弹窗里的按键
+          const myOverlay = document.querySelector('.zcodepro-overlay');
+          hkKeyHandler = (e) => {
+            if (!myOverlay || !myOverlay.isConnected) { stopHkRecording(); return; }
+            if (e.isComposing) return;
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            if (e.key === 'Escape') { stopHkRecording(); return; }
+            const k = e.key.toLowerCase();
+            if (!/^[a-z0-9]$/.test(k)) { showToast(L.hkInvalid, 'error'); return; }
+            const keys = hkKeys();
+            const names = hkNames();
+            const conflict = HK_ACTIONS.find(([a]) => a !== hkRecording && keys[a] === k);
+            if (conflict) {
+              showToast(L.hkConflict.replaceAll('{k}', k).replaceAll('{name}', names[conflict[0]]), 'error');
+              return;
+            }
+            const a = hkRecording;
+            stopHkRecording();
+            void (async () => {
+              const res = await rpc('/config', { method: 'POST', body: { shortcuts: { [a]: k } } });
+              clearConfigCache();
+              window.dispatchEvent(new CustomEvent('zcodepro:config-changed'));
+              if (!res.ok) { showToast(L.failed + ': ' + errText(res), 'error'); renderShortcuts(); return; }
+              if (res.config && res.config.shortcuts) config.shortcuts = res.config.shortcuts;
+              showToast(L.hkSaved, 'success');
+              refreshRows(); // 功能标签页的开关描述跟随新键位
+              renderShortcuts();
+            })();
+          };
+          document.addEventListener('keydown', hkKeyHandler, true);
+        }
+        renderShortcuts();
+      };
+      renderShortcuts();
+      // 重置为默认：五个入口键一次性写回默认值，保存路径与单个改键一致
+      const resetShortcuts = async () => {
+        stopHkRecording(); // 录制进行中点重置：先结束录制再写回默认
+        const all = {};
+        for (const [a] of HK_ACTIONS) all[a] = DEFAULT_SHORTCUTS[a];
+        const res = await rpc('/config', { method: 'POST', body: { shortcuts: all } });
+        clearConfigCache();
+        window.dispatchEvent(new CustomEvent('zcodepro:config-changed'));
+        if (!res.ok) { showToast(L.failed + ': ' + errText(res), 'error'); return; }
+        if (res.config && res.config.shortcuts) config.shortcuts = res.config.shortcuts;
+        showToast(L.hkResetDone, 'success');
+        refreshRows(); // 功能标签页的开关描述跟随默认键位
+        renderShortcuts();
+      };
+      const paneShortcuts = h('div', { role: 'tabpanel', class: 'mt-4', style: 'display:none' },
+        h('div', { class: 'mb-2 text-ui-sm font-medium' }, L.hkTitle),
+        h('div', { class: 'mb-2 flex items-center gap-2' },
+          h('div', { class: 'min-w-0 flex-1 text-ui-xs/relaxed text-foreground-subtle' }, L.hkEditHint),
+          h('div', { class: 'shrink-0' }, btnSmall(L.hkReset, () => { void resetShortcuts(); }))),
+        hkCard,
+      );
       const paneStyles = h('div', { role: 'tabpanel', class: 'mt-4', style: 'display:none' });
       const panePerf = h('div', { role: 'tabpanel', class: 'mt-4', style: 'display:none' });
       const paneAgents = h('div', { role: 'tabpanel', class: 'mt-2', style: 'display:none' });
@@ -393,9 +539,10 @@ export function openSettingsDialog() {
       const paneHeadroom = h('div', { role: 'tabpanel', class: 'mt-4', style: 'display:none' });
       const paneTitleGen = h('div', { role: 'tabpanel', class: 'mt-4', style: 'display:none' });
       const paneDebug = h('div', { role: 'tabpanel', class: 'mt-4', style: 'display:none' });
-      const panes = { features: paneFeatures, styles: paneStyles, perf: panePerf, agents: paneAgents, proxy: paneProxy, sync: paneSync, vision: paneVision, headroom: paneHeadroom, rtk: paneRtk, debug: paneDebug };
+      const panes = { features: paneFeatures, shortcuts: paneShortcuts, styles: paneStyles, perf: panePerf, agents: paneAgents, proxy: paneProxy, sync: paneSync, vision: paneVision, headroom: paneHeadroom, rtk: paneRtk, debug: paneDebug };
       const tabDefs = [
         ['features', L.tabFeatures],
+        ['shortcuts', L.tabShortcuts],
         ['agents', L.tabBehavior],
         ['styles', L.tabStyles],
         ['perf', L.tabPerformance],
@@ -418,6 +565,8 @@ export function openSettingsDialog() {
         }, label)));
       const switchTab = (name) => {
         activeTab = name;
+        // 切走“快捷键”标签页时结束键位录制：否则在其它标签页打字会被录制监听吞掉
+        if (name !== 'shortcuts' && hkRecording) stopHkRecording();
         for (const [id, pane] of Object.entries(panes)) pane.style.display = id === name ? '' : 'none';
         renderTabs();
       };
@@ -497,6 +646,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 +2003,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 +2011,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 +2029,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 +2214,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',
@@ -2227,6 +2390,7 @@ export function openSettingsDialog() {
         statusLine,
         tablist,
         paneFeatures,
+        paneShortcuts,
         paneAgents,
         paneStyles,
         panePerf,

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 });
   }
 }