zcode-pro 1.5.0__tar.gz → 1.5.1__tar.gz

{zcode_pro-1.5.0 → zcode_pro-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: zcode-pro
-Version: 1.5.0
+Version: 1.5.1
 Summary: ZCode Pro — ZCode 桌面版界面增强启动器（不修改客户端文件），核心功能：项目自定义别名
 Project-URL: Homepage, https://github.com/duanluan/zcode-pro
 Project-URL: Repository, https://github.com/duanluan/zcode-pro
@@ -38,7 +38,7 @@ ZCode 桌面版界面增强工具。不修改客户端文件，通过 ZCode Pro
 | | ~~项目自定义别名~~（已停用） | 侧边栏显示自定义名称，仅界面显示，随时恢复；ZCode ≥ 3.16.1 已内置改名（项目菜单“编辑项目”），本功能自动停用并引导把已有别名迁移过去 |
 | | ~~切换文件夹~~（已停用） | 将项目指向另一个文件夹，侧边栏、标签页与任务历史一并迁移；切换前先停止运行中的任务；历史检查点仍引用原路径；ZCode ≥ 3.16.1 官方已支持一个项目挂多个目录，本功能随之停用 |
 | | 会话拖动排序 | 拖动调整置顶、项目与分组中的会话顺序，重启后不变 |
-| | 会话快捷切换 | `alt+z` 在当前与上次会话间来回切换；按住 `alt` 按 `x`（上移）/ `c`（下移）在最近会话列表中选择（初始 10 条，`c` 到底再加载 5 条），`alt+e` 直接打开最近 10 条，`alt+r` 打开正在运行与运行完未查看的任务；方向键同样可选，松开 `alt` 或 `Enter` 切换（类 `alt+tab`）；五个入口键可在 设置 → 快捷键 中修改 |
+| | 会话快捷切换 | `alt+z` 在当前与上次会话间来回切换；按住 `alt` 按 `x`（上移）/ `c`（下移）在最近会话列表中选择（初始 10 条，`c` 到底再加载 5 条），`alt+e` 直接打开最近 10 条，`alt+r` 打开正在运行与运行完未查看的任务；方向键同样可选，`Enter` 或点击行切换；五个入口键可在 设置 → 快捷键 中修改 |
 | | 重命名会话名锁定 | 手动重命名过的会话不再被自动标题覆盖，侧栏始终显示重命名后的名字 |
 | | 已置顶分区可折叠 | 侧边栏“已置顶”标题可点击折叠/展开其任务列表 |
 | | 文件菜单增强 | 会话中文件链接的右键菜单新增“默认应用打开”“打开所在目录” |

{zcode_pro-1.5.0 → zcode_pro-1.5.1}/README.en.md

@@ -18,7 +18,7 @@ Grouped by where each feature lives in the settings window: the category column
 | | ~~Custom project alias~~ (retired) | Show a custom name for a project in the sidebar; UI-only, revert anytime; renaming is built into ZCode ≥ 3.16.1 (project menu "Edit project") — the feature disables itself there and offers to migrate existing aliases |
 | | ~~Switch project folder~~ (retired) | Point a project at another folder; sidebar, tabs and task history follow. Stop running tasks before switching; historical checkpoints still reference the original path; retired on ZCode ≥ 3.16.1, where a project can hold multiple directories natively |
 | | Session drag ordering | Reorder sessions in Pinned, Projects and Groups; persists across refreshes |
-| | Session quick switch | `alt+z` toggles between the current and the last session; hold `alt` and press `x` (up) / `c` (down) to pick from recent sessions (10 shown initially, pressing `c` at the bottom loads 5 more), `alt+e` opens the last 10 directly, `alt+r` opens running / finished-but-unseen tasks; arrow keys also move the highlight, release `alt` or press `Enter` to switch (like `alt+tab`); the five trigger keys are customizable in Settings → Shortcuts |
+| | Session quick switch | `alt+z` toggles between the current and the last session; hold `alt` and press `x` (up) / `c` (down) to pick from recent sessions (10 shown initially, pressing `c` at the bottom loads 5 more), `alt+e` opens the last 10 directly, `alt+r` opens running / finished-but-unseen tasks; arrow keys also move the highlight, press `Enter` or click a row to switch; the five trigger keys are customizable in Settings → Shortcuts |
 | | Keep renamed session titles | Sessions you renamed keep their custom title; auto-generated titles no longer overwrite it in the sidebar |
 | | Collapsible Pinned section | The sidebar "Pinned" header collapses/expands its task list; the state is remembered |
 | | File menu actions | Adds "Open with default app" and "Reveal in file manager" to file links in chat |

{zcode_pro-1.5.0 → zcode_pro-1.5.1}/README.md

@@ -18,7 +18,7 @@ ZCode 桌面版界面增强工具。不修改客户端文件，通过 ZCode Pro
 | | ~~项目自定义别名~~（已停用） | 侧边栏显示自定义名称，仅界面显示，随时恢复；ZCode ≥ 3.16.1 已内置改名（项目菜单“编辑项目”），本功能自动停用并引导把已有别名迁移过去 |
 | | ~~切换文件夹~~（已停用） | 将项目指向另一个文件夹，侧边栏、标签页与任务历史一并迁移；切换前先停止运行中的任务；历史检查点仍引用原路径；ZCode ≥ 3.16.1 官方已支持一个项目挂多个目录，本功能随之停用 |
 | | 会话拖动排序 | 拖动调整置顶、项目与分组中的会话顺序，重启后不变 |
-| | 会话快捷切换 | `alt+z` 在当前与上次会话间来回切换；按住 `alt` 按 `x`（上移）/ `c`（下移）在最近会话列表中选择（初始 10 条，`c` 到底再加载 5 条），`alt+e` 直接打开最近 10 条，`alt+r` 打开正在运行与运行完未查看的任务；方向键同样可选，松开 `alt` 或 `Enter` 切换（类 `alt+tab`）；五个入口键可在 设置 → 快捷键 中修改 |
+| | 会话快捷切换 | `alt+z` 在当前与上次会话间来回切换；按住 `alt` 按 `x`（上移）/ `c`（下移）在最近会话列表中选择（初始 10 条，`c` 到底再加载 5 条），`alt+e` 直接打开最近 10 条，`alt+r` 打开正在运行与运行完未查看的任务；方向键同样可选，`Enter` 或点击行切换；五个入口键可在 设置 → 快捷键 中修改 |
 | | 重命名会话名锁定 | 手动重命名过的会话不再被自动标题覆盖，侧栏始终显示重命名后的名字 |
 | | 已置顶分区可折叠 | 侧边栏“已置顶”标题可点击折叠/展开其任务列表 |
 | | 文件菜单增强 | 会话中文件链接的右键菜单新增“默认应用打开”“打开所在目录” |

{zcode_pro-1.5.0 → zcode_pro-1.5.1}/dist/inject.js

@@ -280,14 +280,14 @@
     userFontDesc: "\u4F1A\u8BDD\u4E2D\u63D0\u95EE\u5185\u5BB9\u7684\u5B57\u4F53\uFF1B\u9009\u201C\u9ED8\u8BA4\u201D\u65F6\u8DDF\u968F\u754C\u9762\u5B57\u4F53\u3002",
     assistantFontName: "\u56DE\u7B54\u5B57\u4F53",
     assistantFontDesc: "\u4F1A\u8BDD\u4E2D\u56DE\u7B54\u6B63\u6587\u7684\u5B57\u4F53\uFF08\u4EE3\u7801\u5757\u4ECD\u7528\u7B49\u5BBD\u5B57\u4F53\uFF09\uFF1B\u9009\u201C\u9ED8\u8BA4\u201D\u65F6\u8DDF\u968F\u754C\u9762\u5B57\u4F53\u3002",
-    switcherHint: "{prev} / {next} \u6216 \u2191 / \u2193 \u9009\u62E9\uFF0CEnter \u6216\u677E\u5F00 alt \u5207\u6362\uFF0CEsc \u53D6\u6D88",
+    switcherHint: "{prev} / {next} \u6216 \u2191 / \u2193 \u9009\u62E9\uFF0CEnter \u6216\u70B9\u51FB\u884C\u5207\u6362\uFF0CEsc \u53D6\u6D88",
     switcherCurrent: "\u5F53\u524D",
     switcherEmpty: "\u6682\u65E0\u4E0A\u6B21\u4F1A\u8BDD\uFF08\u5207\u6362\u8FC7\u4F1A\u8BDD\u540E\u53EF\u7528\uFF09",
     switcherFailed: "\u672A\u80FD\u5207\u6362\u5230\u8BE5\u4F1A\u8BDD\uFF08\u53EF\u80FD\u5DF2\u5220\u9664\uFF09",
     switcherMore: "\u8FD8\u6709 {n} \u6761 \xB7 \u6309 c \u52A0\u8F7D",
     switcherRunning: "\u8FD0\u884C\u4E2D",
     switcherUnseen: "\u672A\u67E5\u770B",
-    switcherAttentionHint: "\u8FD0\u884C\u4E2D / \u8FD0\u884C\u5B8C\u672A\u67E5\u770B\u7684\u4EFB\u52A1 \xB7 {prev} / {next} \u6216 \u2191 / \u2193 \u9009\u62E9\uFF0CEnter \u6216\u677E\u5F00 alt \u5207\u6362",
+    switcherAttentionHint: "\u8FD0\u884C\u4E2D / \u8FD0\u884C\u5B8C\u672A\u67E5\u770B\u7684\u4EFB\u52A1 \xB7 {prev} / {next} \u6216 \u2191 / \u2193 \u9009\u62E9\uFF0CEnter \u6216\u70B9\u51FB\u884C\u5207\u6362",
     switcherAttentionEmpty: "\u6682\u65E0\u8FD0\u884C\u4E2D\u6216\u672A\u67E5\u770B\u7684\u4EFB\u52A1",
     featureNewtabPanels: "\u65B0\u6807\u7B7E\u9875\u63D2\u4EF6\u9762\u677F\u5165\u53E3",
     featureNewtabPanelsDesc: "\u65B0\u6807\u7B7E\u9875\u52A0\u5165\u7B2C\u4E09\u65B9\u63D2\u4EF6\uFF08headroom\u3001rtk \u7B49\uFF09\u7684\u9762\u677F\u5361\u7247\uFF0C\u70B9\u51FB\u5728\u4FA7\u8FB9\u9762\u677F\u6253\u5F00\u3002",
@@ -384,8 +384,6 @@
     hkArrow: "\u5F39\u7A97\u6253\u5F00\u65F6\u79FB\u52A8\u9AD8\u4EAE\uFF08\u4E0E alt + {prev} / alt + {next} \u540C\u89C4\u5219\uFF09",
     hkEnter: "\u786E\u8BA4\u5207\u6362\u5230\u9AD8\u4EAE\u7684\u4F1A\u8BDD",
     hkEsc: "\u53D6\u6D88\u5E76\u5173\u95ED\u5F39\u7A97",
-    hkRelease: "\u79FB\u52A8\u8FC7\u9AD8\u4EAE\u65F6\u677E\u5F00\u5373\u5207\u6362\uFF1B\u4ECE\u672A\u79FB\u52A8\u5219\u5F39\u7A97\u4FDD\u6301\u6253\u5F00\uFF0C\u7EE7\u7EED\u9009\u62E9",
-    hkReleaseKey: "\u677E\u5F00 alt",
     hkModify: "\u4FEE\u6539",
     hkRecording: "\u6309\u4E0B\u65B0\u952E\u2026",
     hkInvalid: "\u5FEB\u6377\u952E\u53EA\u652F\u6301\u5355\u4E2A\u5B57\u6BCD\u6216\u6570\u5B57",
@@ -478,7 +476,7 @@
     headroomDesc: "Headroom \u63D2\u4EF6\uFF1A\u672C\u5730\u538B\u7F29\u4EE3\u7406\u9A7B\u7559 127.0.0.1\uFF08\u9ED8\u8BA4 8787 \u7AEF\u53E3\uFF09\uFF0C\u538B\u7F29\u53D1\u5F80\u6A21\u578B\u7684\u4E0A\u4E0B\u6587\u4EE5\u7701 token\uFF08/hr-* \u547D\u4EE4\u7F16\u8F91\u540C\u4E00\u914D\u7F6E\uFF09\u3002\u5207\u6362\u8BBE\u5907\u4F1A\u91CD\u542F\u4EE3\u7406\uFF0C\u6B63\u5728\u5904\u7406\u7684\u8BF7\u6C42\u53EF\u80FD\u4E2D\u65AD\u4E00\u6B21\u3002",
     headroomBinMissing: "\u672A\u627E\u5230 headroom \u7A0B\u5E8F\uFF0C\u4EE3\u7406\u65E0\u6CD5\u542F\u52A8\uFF1B\u5B89\u88C5 headroom \u540E\u4EE5\u4E0B\u8BBE\u7F6E\u81EA\u52A8\u751F\u6548",
     hrInstallBin: "\u5B89\u88C5 headroom \u672C\u4F53",
-    hrBinInstalled: "headroom \u672C\u4F53\u5DF2\u5B89\u88C5\uFF1B\u91CD\u65B0\u6253\u5F00\u4F1A\u8BDD\u540E\u4EE3\u7406\u53EF\u7528\uFF08SessionStart \u94A9\u5B50\u81EA\u52A8\u62C9\u8D77\uFF09",
+    hrBinInstalled: "headroom \u672C\u4F53\u5DF2\u5B89\u88C5\uFF1B\u91CD\u65B0\u6253\u5F00\u5E94\u7528\u6216\u4F1A\u8BDD\u540E\u4EE3\u7406\u53EF\u7528\uFF08SessionStart \u94A9\u5B50\u81EA\u52A8\u62C9\u8D77\uFF09",
     headroomInstallTitle: "\u672A\u5B89\u88C5 headroom \u63D2\u4EF6",
     headroomInstallDesc: "\u4ECE zcode-plugins \u5E02\u573A\u5B89\u88C5\u540E\u5373\u53EF\u5728\u6B64\u7BA1\u7406\u538B\u7F29\u4EE3\u7406\uFF1B\u91CD\u542F\u4F1A\u8BDD\u540E\u751F\u6548\u3002",
     headroomInstall: "\u5B89\u88C5",
@@ -792,14 +790,14 @@
     userFontDesc: 'Font of question text in conversations; "default" follows the UI font.',
     assistantFontName: "Answer font",
     assistantFontDesc: 'Font of answer text in conversations (code blocks stay monospaced); "default" follows the UI font.',
-    switcherHint: "{prev} / {next} or \u2191 / \u2193 to choose, Enter or release alt to switch, Esc to cancel",
+    switcherHint: "{prev} / {next} or \u2191 / \u2193 to choose, Enter or click a row to switch, Esc to cancel",
     switcherCurrent: "current",
     switcherEmpty: "No previous session yet (available after you switch sessions)",
     switcherFailed: "Failed to switch to that session (it may have been deleted)",
     switcherMore: "{n} more \xB7 press c to load",
     switcherRunning: "running",
     switcherUnseen: "unseen",
-    switcherAttentionHint: "Running / finished but unseen tasks \xB7 {prev} / {next} or \u2191 / \u2193 to choose, Enter or release alt to switch",
+    switcherAttentionHint: "Running / finished but unseen tasks \xB7 {prev} / {next} or \u2191 / \u2193 to choose, Enter or click a row to switch",
     switcherAttentionEmpty: "No running or unseen tasks",
     featureNewtabPanels: "Plugin panels on the new tab page",
     featureNewtabPanelsDesc: "Adds third-party plugin panels (headroom, rtk, ...) to the new tab page; click to open in the side pane.",
@@ -896,8 +894,6 @@
     hkArrow: "Move the highlight while the popup is open (same rules as alt + {prev} / alt + {next})",
     hkEnter: "Switch to the highlighted session",
     hkEsc: "Cancel and close the popup",
-    hkRelease: "Releasing alt switches once the highlight has moved; otherwise the popup stays open for further selection",
-    hkReleaseKey: "release alt",
     hkModify: "Change",
     hkRecording: "press a key\u2026",
     hkInvalid: "Shortcuts accept a single letter or digit only",
@@ -990,7 +986,7 @@
     headroomDesc: "Headroom plugin: a local compression proxy on 127.0.0.1 (port 8787 by default) that compresses context sent to the model to save tokens (/hr-* commands edit the same file). Switching the device restarts the proxy, so requests in progress may be interrupted once.",
     headroomBinMissing: "The headroom program was not found, so the proxy cannot start. The settings below take effect once it is installed.",
     hrInstallBin: "Install headroom binary",
-    hrBinInstalled: "headroom installed; reopen a session and the hook will start the proxy automatically",
+    hrBinInstalled: "headroom installed; reopen the app or a session and the proxy will start automatically",
     headroomInstallTitle: "headroom plugin not installed",
     headroomInstallDesc: "Install it from the zcode-plugins marketplace to manage the compression proxy here; takes effect after a session restart.",
     headroomInstall: "Install",
@@ -4923,8 +4919,7 @@
             }),
             hkCell("\u2191 / \u2193", L.hkArrow.replaceAll("{prev}", keys.switchPrev).replaceAll("{next}", keys.switchNext)),
             hkCell("Enter", L.hkEnter),
-            hkCell("Esc", L.hkEsc),
-            hkCell(L.hkReleaseKey, L.hkRelease)
+            hkCell("Esc", L.hkEsc)
           );
         };
         const stopHkRecording = () => {
@@ -8044,7 +8039,7 @@
     }
   }
   function workspaceOf(key) {
-    const i = key.indexOf(":sess_");
+    const i = key.lastIndexOf(":");
     return i > 0 ? key.slice(0, i) : key;
   }
   function wsHead(row) {
@@ -8182,6 +8177,7 @@
   var anyActiveCache = { at: 0, value: null, busy: false };
   var sectionActive = { task: false, project: false, pinned: false };
   var activeProjectPaths = /* @__PURE__ */ new Set();
+  var authActiveByWs = /* @__PURE__ */ new Map();
   setInterval(() => {
     if (!anyActiveCache.busy && Date.now() - anyActiveCache.at >= 1e4) globalAnyActive();
   }, 1e4);
@@ -8193,6 +8189,7 @@
     sectionActive.project = false;
     sectionActive.pinned = false;
     activeProjectPaths = /* @__PURE__ */ new Set();
+    authActiveByWs = /* @__PURE__ */ new Map();
     void (async () => {
       let hit = null;
       try {
@@ -8244,12 +8241,24 @@
           const allIds = [...byKind.task, ...byKind.project];
           const st = allIds.length ? await rpc("/task-statuses?ids=" + encodeURIComponent(allIds.join(","))).catch(() => null) : null;
           const TERMINAL = /* @__PURE__ */ new Set(["completed", "error", "interrupted"]);
+          const recOf = (id) => st && st.ok && st.available ? st.statuses[id] : void 0;
           const live = (id) => {
-            const rec = st && st.ok && st.available ? st.statuses[id] : void 0;
+            const rec = recOf(id);
             if (rec === void 0) return true;
             if (!TERMINAL.has(rec.status)) return true;
             return Date.now() - rec.updatedAt < 3e5;
           };
+          const liveSession = (id) => {
+            const rec = recOf(id);
+            if (rec === void 0) return !!domRowKeyOf(id);
+            if (!TERMINAL.has(rec.status)) return true;
+            return Date.now() - rec.updatedAt < 3e5;
+          };
+          authActiveByWs = /* @__PURE__ */ new Map();
+          for (const [base, ids] of byKindByPath) {
+            const liveIds = ids.filter(liveSession);
+            if (liveIds.length) authActiveByWs.set(base, liveIds);
+          }
           activeProjectPaths = /* @__PURE__ */ new Set();
           for (const [base, ids] of byKindByPath) {
             if (!projPaths.has(base)) continue;
@@ -8272,7 +8281,7 @@
             for (const el of list.querySelectorAll("[data-task-item-key]")) {
               if (el.closest("section[data-project-id]")) continue;
               const k = el.getAttribute("data-task-item-key") || "";
-              const id = k.slice(k.indexOf(":sess_") + 1);
+              const id = k.slice(k.lastIndexOf(":") + 1);
               const base = k.slice(0, k.lastIndexOf(":")).replace(/[\/]+$/, "");
               const ids = byKindByPath.get(base) || [];
               if (ids.map(String).includes(id) && ids.some(live)) {
@@ -8423,9 +8432,23 @@
       current: curKey ? workspaceOf(curKey) || null : null
     };
   }
+  function domRowKeyOf(id) {
+    if (!id) return "";
+    try {
+      const el = document.querySelector(`[data-task-item-key$=":${CSS.escape(id)}"]`);
+      return el && el.getAttribute("data-task-item-key") || "";
+    } catch {
+      return "";
+    }
+  }
   function wsRunningKeys() {
     const keys = /* @__PURE__ */ new Set();
-    for (const set of runningByWs.values()) for (const k of set) keys.add(k);
+    for (const set of runningByWs.values()) {
+      for (const k of set) if (!k.endsWith(":active")) keys.add(k);
+    }
+    for (const [base, ids] of authActiveByWs) {
+      for (const id of ids) keys.add(domRowKeyOf(id) || `${base}:${id}`);
+    }
     return keys;
   }
   async function verifyWorkspaceNotRunning(ws) {
@@ -8603,7 +8626,6 @@
   var visibleCount = INITIAL_COUNT;
   var unseen = /* @__PURE__ */ new Set();
   var lastRunKeys = null;
-  var movedSinceOpen = false;
   var hotkeys = { ...DEFAULT_SHORTCUTS };
   function loadHotkeys() {
     return getConfig(true).then((cfg) => {
@@ -8621,7 +8643,7 @@
     return (tEl ? tEl.textContent : (item.innerText || "").split("\n")[0])?.trim() || "";
   }
   function workspaceOf2(key) {
-    const i = key.indexOf(":sess_");
+    const i = key.lastIndexOf(":");
     return i > 0 ? key.slice(0, i) : key;
   }
   function findCurrent() {
@@ -8672,7 +8694,8 @@
     }, SCAN_DEBOUNCE_MS2);
   }
   async function switchTo(key) {
-    const find = () => document.querySelector(`[data-task-item-key="${CSS.escape(key)}"]`);
+    const id = key.slice(key.lastIndexOf(":") + 1);
+    const find = () => document.querySelector(`[data-task-item-key="${CSS.escape(key)}"]`) || (id ? document.querySelector(`[data-task-item-key$=":${CSS.escape(id)}"]`) : null);
     let item = find();
     if (!item) {
       const ws = workspaceOf2(key);
@@ -8690,23 +8713,28 @@
   }
   function attentionList() {
     const run = wsRunningKeys();
+    const idOf = (k) => k.slice(k.lastIndexOf(":") + 1);
+    const runKeyById = new Map([...run].map((k) => [idOf(k), k]));
     const listed = /* @__PURE__ */ new Set();
     const head = [];
     for (const k of mru) {
-      if (run.has(k) || unseen.has(k)) {
-        head.push(k);
-        listed.add(k);
+      const id = idOf(k);
+      if (listed.has(id)) continue;
+      const runForm = runKeyById.get(id);
+      if (run.has(k) || unseen.has(k) || runForm) {
+        head.push(runForm || k);
+        listed.add(id);
       }
     }
     const tail = [];
-    for (const k of run) if (!listed.has(k)) {
+    const push = (k) => {
+      const id = idOf(k);
+      if (listed.has(id)) return;
+      listed.add(id);
       tail.push(k);
-      listed.add(k);
-    }
-    for (const k of unseen) if (!listed.has(k)) {
-      tail.push(k);
-      listed.add(k);
-    }
+    };
+    for (const k of run) push(k);
+    for (const k of unseen) push(k);
     return [...head, ...tail];
   }
   function activeList() {
@@ -8727,9 +8755,23 @@
   function findTitle(key) {
     const item = document.querySelector(`[data-task-item-key="${CSS.escape(key)}"]`);
     if (item) titles.set(key, firstLineOf(item));
-    const id = key.slice(key.indexOf(":sess_") + 1);
+    const id = key.slice(key.lastIndexOf(":") + 1);
     return titles.get(key) || `sess ${id.slice(0, 8)}`;
   }
+  async function fetchMissingTitles(keys) {
+    const sessIdOf3 = (k) => k.slice(k.lastIndexOf(":") + 1);
+    const missing = keys.filter((k) => {
+      const id = sessIdOf3(k);
+      return id && !titles.get(k) && !document.querySelector(`[data-task-item-key$=":${CSS.escape(id)}"]`);
+    });
+    if (!missing.length) return;
+    const st = await rpc("/task-statuses?ids=" + encodeURIComponent(missing.map(sessIdOf3).join(","))).catch(() => null);
+    if (!st || !st.ok || !st.available || !st.statuses) return;
+    for (const k of missing) {
+      const rec = st.statuses[sessIdOf3(k)];
+      if (rec && rec.title) titles.set(k, String(rec.title));
+    }
+  }
   function projLabelOf(key, aliases2) {
     const ws = workspaceOf2(key);
     if (!ws) return "";
@@ -8775,14 +8817,23 @@
       ));
     }
   }
-  async function openPopup(mode = "mru") {
+  var openPopupInflight = null;
+  function openPopup(mode = "mru") {
     if (popupEl) return;
+    if (openPopupInflight) return openPopupInflight;
+    openPopupInflight = openPopupInner(mode).finally(() => {
+      openPopupInflight = null;
+    });
+    return openPopupInflight;
+  }
+  async function openPopupInner(mode) {
     popupMode = mode;
     visibleCount = INITIAL_COUNT;
     highlight = 0;
-    movedSinceOpen = false;
     const cfg = await getConfig().catch(() => null);
     aliasesCache = cfg && cfg.aliases && typeof cfg.aliases === "object" ? cfg.aliases : {};
+    if (mode === "attention") await fetchMissingTitles(attentionList()).catch(() => {
+    });
     ensureStyle();
     const L = t();
     popupEl = h(
@@ -8817,7 +8868,6 @@
     const len = Math.min(activeList().length, visibleCount);
     if (len < 2) return;
     highlight = highlight > 0 ? highlight - 1 : len - 1;
-    movedSinceOpen = true;
     renderPopup();
     scrollHighlight();
   }
@@ -8833,7 +8883,6 @@
     } else {
       highlight = 0;
     }
-    movedSinceOpen = true;
     renderPopup();
     scrollHighlight();
   }
@@ -8856,8 +8905,10 @@
       if (document.hidden) return;
       const now = wsRunningKeys();
       if (lastRunKeys) {
+        const idOf = (k) => k.slice(k.lastIndexOf(":") + 1);
+        const nowIds = new Set([...now].map(idOf));
         for (const k of lastRunKeys) {
-          if (!now.has(k) && k !== current) unseen.add(k);
+          if (!nowIds.has(idOf(k)) && k !== current) unseen.add(k);
         }
       }
       lastRunKeys = now;
@@ -8874,6 +8925,14 @@
         closePopup(false);
         return;
       }
+      const bareK = e.key.toLowerCase();
+      if (popupEl && !e.altKey && !e.ctrlKey && !e.metaKey && !e.isComposing && (bareK === hotkeys.switchPrev || bareK === hotkeys.switchNext)) {
+        e.preventDefault();
+        e.stopImmediatePropagation();
+        if (bareK === hotkeys.switchPrev) moveUp();
+        else moveDown();
+        return;
+      }
       if (popupEl && (e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "Enter")) {
         e.preventDefault();
         e.stopImmediatePropagation();
@@ -8917,22 +8976,29 @@
           await openPopup("attention");
           return;
         }
-        if (mru.length < 2) {
-          showToast(t().switcherEmpty);
-          return;
-        }
         if (k === hotkeys.switchRecent) {
-          if (!e.repeat && !popupEl) await openPopup("mru");
+          if (!e.repeat && !popupEl && !openPopupInflight) {
+            if (!mru.length) {
+              showToast(t().switcherEmpty);
+              return;
+            }
+            await openPopup("mru");
+          }
           return;
         }
-        if (!popupEl) await openPopup("mru");
+        if (openPopupInflight) {
+          await openPopupInflight;
+        } else if (!popupEl) {
+          if (!mru.length) {
+            showToast(t().switcherEmpty);
+            return;
+          }
+          await openPopup("mru");
+        }
         if (k === hotkeys.switchPrev) moveUp();
         else moveDown();
       })();
     }, true);
-    document.addEventListener("keyup", (e) => {
-      if (e.key === "Alt" && popupEl && movedSinceOpen) closePopup(true);
-    }, true);
     window.addEventListener("blur", () => closePopup(false));
   }
 
@@ -8997,7 +9063,7 @@
     const cur = rows.find((e) => (e.className + "").includes("bg-selected")) || rows[rows.length - 1];
     const key = cur ? cur.getAttribute("data-task-item-key") : "";
     if (!key) return null;
-    const i = key.indexOf(":sess_");
+    const i = key.lastIndexOf(":");
     return i > 0 ? { workspacePath: key.slice(0, i), sessionId: key.slice(i + 1) } : null;
   }
   async function thirdPartySurfaces(bridge, workspacePath) {
@@ -9562,7 +9628,7 @@
   var fetching = null;
   var pendingKeys = /* @__PURE__ */ new Set();
   function sessIdOf(key) {
-    const i = key.indexOf(":sess_");
+    const i = key.lastIndexOf(":");
     return i > 0 ? key.slice(i + 1) : key;
   }
   function titleElsOf(item) {
@@ -9823,7 +9889,7 @@
   var attempted = /* @__PURE__ */ new Set();
   var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
   function sessIdOf2(key) {
-    const i = key.indexOf(":sess_");
+    const i = key.lastIndexOf(":");
     return i > 0 ? key.slice(i + 1) : "";
   }
   function currentKey() {

{zcode_pro-1.5.0 → zcode_pro-1.5.1}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zcode-pro",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "ZCode Pro — 为 ZCode 桌面版增加界面增强（不修改客户端文件，通过 ZCode Pro 快捷方式启动即可），核心功能：项目自定义别名",
   "type": "module",
   "bin": {

{zcode_pro-1.5.0 → zcode_pro-1.5.1}/src/host/helper.mjs

@@ -11,13 +11,13 @@ import { basename, delimiter, dirname, isAbsolute, join, resolve, sep } from 'no
 import { homedir, tmpdir, userInfo } from 'node:os';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { readSettings, writeSettingsAtomic, remapSettingsPaths, isProjectOpenInTabs } from './settings.mjs';
-import { taskIndexPath, probeTaskIndexWritable, remapTaskIndexPaths, taskIndexDriverAvailable, listOverriddenTitles, listTaskWorkspaceMap, setTaskTitleIfNotOverridden, setCustomSessionTitle, isTaskTitleOverridden, reconcileCustomTitles, getTaskProviderModel, listVirtualProjects, countTasks } from './taskIndex.mjs';
+import { taskIndexPath, probeTaskIndexWritable, remapTaskIndexPaths, taskIndexDriverAvailable, listOverriddenTitles, listTaskWorkspaceMap, listTaskStatuses, setTaskTitleIfNotOverridden, setCustomSessionTitle, isTaskTitleOverridden, reconcileCustomTitles, getTaskProviderModel, listVirtualProjects, countTasks } from './taskIndex.mjs';
 import { pickFolderSystem } from './pickFolder.mjs';
 import { reorderWorkspaceTasks, reorderGroupMembers } from './taskOrder.mjs';
 import { webdavRequest, webdavPutWithMkcol, webdavHttpText, parseWebdavListing, findCurl } from './webdav.mjs';
 import { resolveZcodeExecutable } from './paths.mjs';
 
-const VERSION = '1.5.0';
+const VERSION = '1.5.1';
 
 // 全局提示词固定在用户主目录：官方加载器按 HOME/USERPROFILE 拼 .zcode/AGENTS.md，
 // 不读 ZCODE_DATA_BASE_DIR（数据根迁走时全局指令仍在原位）。
@@ -707,6 +707,17 @@ export function startHelper({ port, token, dataRoot, state, agentsFile = default
           : { ok: true, available: false, projects: [], deletedRoots: [] });
         return;
       }
+      if (req.method === 'GET' && url.pathname === '/task-statuses') {
+        // 批量会话终态 + 标题：注入侧剔除 syncer 卡滞的误报、alt+r 弹窗显示
+        // 折叠项目会话标题都用它。读不到时 available=false，调用方按未确认处理
+        const ids = (url.searchParams.get('ids') || '')
+          .split(',').map((s) => s.trim()).filter(Boolean).slice(0, 200);
+        const statuses = ids.length ? await listTaskStatuses(dataRoot, ids) : {};
+        json(res, 200, statuses !== null
+          ? { ok: true, available: true, statuses }
+          : { ok: true, available: false, statuses: {} });
+        return;
+      }
       if (req.method === 'GET' && url.pathname === '/projects') {
         const settings = readSettings(settingsFile);
         const projects = (settings.recentProjects || []).map((p) => {
@@ -837,7 +848,9 @@ export function startHelper({ port, token, dataRoot, state, agentsFile = default
           json(res, 400, { ok: false, code: 'title-gen-disabled', error: '智能起名未开启' });
           return;
         }
-        const sessId = typeof body?.sessId === 'string' && /^sess_[A-Za-z0-9._-]+$/.test(body.sessId) ? body.sessId : '';
+        // 会话 id 有 sess_ 与 session_ 两种前缀（新版应用为 session_），两种都认，
+        // 否则新形式会话的标题永远不会写入数据库
+        const sessId = typeof body?.sessId === 'string' && /^(?:sess|session)_[A-Za-z0-9._-]+$/.test(body.sessId) ? body.sessId : '';
         let title;
         try {
           title = await generateTitleWith(cfg, text, dataRoot, sessId);
@@ -1512,7 +1525,8 @@ export function startHelper({ port, token, dataRoot, state, agentsFile = default
           renameSync(vTmp, vFile);
         }
       } catch { /* 无配置或不可写不影响启动 */ }
-      server.listen(port, '127.0.0.1', () => resolveStarted(server));
+      // 服务就绪即安排 headroom 代理兜底（内部延迟 5 秒执行，避开启动高峰）
+      server.listen(port, '127.0.0.1', () => { ensureHeadroomAtStartup(); resolveStarted(server); });
     };
     tryListen();
   });
@@ -1703,12 +1717,13 @@ function mergeTitleGenConfig(saved) {
   // 登录账号的套餐已在供应商列表里，跟随会话即覆盖原语义
   const provider = typeof s.provider === 'string' ? s.provider.trim().slice(0, 200) : d.provider;
   // customWritten：起名功能写过的 { sessId → { title, at } }，自动校正只认这些
-  // 记录（见 reconcileCustomTitles）。只收合法会话 id 与短字符串，超 7 天/500 条的丢弃
+  // 记录（见 reconcileCustomTitles）。只收合法会话 id（sess_/session_ 两种前缀，
+  // 新版应用为 session_）与短字符串，超 7 天/500 条的丢弃
   const written = {};
   const cutoff = Date.now() - 7 * 24 * 3600 * 1000;
   let kept = 0;
   for (const [k, v] of Object.entries((s.customWritten && typeof s.customWritten === 'object' && !Array.isArray(s.customWritten)) ? s.customWritten : {})) {
-    if (kept >= 500 || !/^sess_[A-Za-z0-9._-]+$/.test(k)) continue;
+    if (kept >= 500 || !/^(?:sess|session)_[A-Za-z0-9._-]+$/.test(k)) continue;
     if (!v || typeof v !== 'object' || typeof v.title !== 'string' || v.title.length > 200) continue;
     if (!Number.isFinite(v.at) || v.at < cutoff) continue;
     written[k] = { title: v.title, at: v.at };
@@ -2457,7 +2472,9 @@ export async function classifyIdleBusyWindows(procs, paths, lookupTaskWs) {
       if (child.ppid !== cli.pid) continue;
       if (isInfraCmdline(child.cmdline)) continue;
       if (!child.cmdline) { unattributed = true; continue; }
-      const sess = child.cmdline.match(/sess_[A-Za-z0-9-]+/);
+      // 会话 id 有 sess_ 与 session_ 两种前缀（新版应用为 session_）；匹配不到
+      // 会走 unattributed 全量判忙——新形式命令挂着时空闲回收会整体停摆
+      const sess = child.cmdline.match(/(?:sess|session)_[A-Za-z0-9-]+/);
       if (sess) await markByTask(sess[0]);
       else unattributed = true; // 用户进程但无会话线索：归属不到具体项目
     }
@@ -3664,6 +3681,20 @@ async function runHeadroomHook(args, timeoutMs = 30000) {
   });
 }
 
+// 启动兜底：整机重启后首次打开应用时恢复的是旧会话，触发 SessionStart(resume)，
+// 旧版 headroom 插件的钩子只匹配 startup，代理不会自动启动（要等用户新建会话或
+// 手动重启）。helper 就绪后延迟几秒补一次 ensure：动作幂等（已在跑秒回），新版
+// 插件侧还带跨进程锁；失败一律静默——没装 headroom 插件/本体的环境不能打扰启动。
+let headroomStartupEnsureFired = false;
+function ensureHeadroomAtStartup() {
+  if (headroomStartupEnsureFired) return;
+  headroomStartupEnsureFired = true;
+  const timer = setTimeout(() => {
+    runHeadroomHook(['ensure'], 20000).catch(() => { /* 兜底失败不影响启动 */ });
+  }, 5000);
+  timer.unref?.();
+}
+
 // 解析 ensure-proxy(.sh/.mjs) status 输出为结构化字段（字段名以脚本 hr_status 的输出为准；
 // headroom 插件 1.3.0+ 多实例模式由 hr-multi 输出同名字段，另附 instance: 行）。
 // 导出以便测试脚本直接驱动。

{zcode_pro-1.5.0 → zcode_pro-1.5.1}/src/host/taskIndex.mjs

@@ -241,8 +241,9 @@ export async function listVirtualProjects(dataRoot) {
   }
 }
 
-// 批量查会话终态：task_id → task_status。分区头运行判定用它剔除官方 syncer
-// 卡滞的报告（会话已完成但内存态仍报活跃时，任务行 loader 会一直卡转）。
+// 批量查会话终态：task_id → { status, updatedAt, title }。分区头运行判定用它
+// 剔除官方 syncer 卡滞的报告（会话已完成但内存态仍报活跃时，任务行 loader 会
+// 一直卡转）；title 供 alt+r 弹窗显示折叠项目（行不在场）会话的标题。
 // 读不到（库缺失/无驱动）返回 null，调用方按未确认处理
 export async function listTaskStatuses(dataRoot, ids) {
   const out = {};
@@ -252,17 +253,19 @@ export async function listTaskStatuses(dataRoot, ids) {
   if (!driver) return null;
   const esc = (v) => "'" + String(v).replace(/'/g, "''") + "'";
   const inList = ids.map((id) => esc(id)).join(', ');
-  const sql = `SELECT task_id, task_status, updated_at FROM tasks WHERE task_id IN (${inList})`;
+  const sql = `SELECT task_id, task_status, updated_at, title FROM tasks WHERE task_id IN (${inList})`;
   try {
     let rows;
     if (driver.kind === 'node') {
       const db = new driver.DatabaseSync(dbFile, { readOnly: true });
       try { rows = db.prepare(sql).all(); } finally { db.close(); }
     } else {
-      rows = runCli(dbFile, sql + ';').stdout.split('\n').filter(Boolean)
-        .map((l) => { const [id, st, at] = l.split('|'); return { task_id: id, task_status: st, updated_at: at }; });
+      // 标题可含任意字符（含分隔符），CLI 路径走 JSON 聚合，不做分隔符切分
+      const agg = runCli(dbFile,
+        `SELECT coalesce(json_group_array(json_object('task_id', task_id, 'task_status', task_status, 'updated_at', updated_at, 'title', title)), '[]') FROM tasks WHERE task_id IN (${inList});`);
+      rows = JSON.parse(agg.stdout.trim() || '[]');
     }
-    for (const r of rows) out[String(r.task_id)] = { status: String(r.task_status || ''), updatedAt: Number(r.updated_at) || 0 };
+    for (const r of rows) out[String(r.task_id)] = { status: String(r.task_status || ''), updatedAt: Number(r.updated_at) || 0, title: String(r.title || '') };
     return out;
   } catch {
     return null;
@@ -535,7 +538,8 @@ export async function reconcileCustomTitles(dataRoot, writtenMap) {
   };
 
   for (const [sessId, rec] of Object.entries(writtenMap)) {
-    if (!/^sess_[A-Za-z0-9._-]+$/.test(sessId) || !rec || typeof rec.title !== 'string') continue;
+    // 会话 id 有 sess_ 与 session_ 两种前缀（新版应用为 session_），两种都认
+    if (!/^(?:sess|session)_[A-Za-z0-9._-]+$/.test(sessId) || !rec || typeof rec.title !== 'string') continue;
     let cli;
     try { cli = await readCli(sessId); } catch { continue; }
     // CLI 已不是我们所写的 custom 标题：别人改过（手动改名/官方），不碰