zcode-pro 0.20.3 → 1.0.0

package/dist/inject.js

@@ -30,6 +30,35 @@
   function clearConfigCache() {
     configCache = { value: null, at: 0 };
   }
+  function zcodeAppVersion() {
+    const v = liveBoot().zcodeVersion;
+    return typeof v === "string" && v ? v : "";
+  }
+  function zcodeVersionGte(version, major, minor, patch = 0) {
+    const m = String(version || "").match(/^(\d+)\.(\d+)\.(\d+)/);
+    if (!m) return false;
+    const a = Number(m[1]), b = Number(m[2]), c = Number(m[3]);
+    return a > major || a === major && (b > minor || b === minor && c >= patch);
+  }
+  function officialRenameSupported() {
+    return zcodeVersionGte(zcodeAppVersion(), 3, 16, 1);
+  }
+  var newSidebarCached = false;
+  function isNewProjectSidebar() {
+    if (newSidebarCached) return true;
+    if (officialRenameSupported()) {
+      newSidebarCached = true;
+      return true;
+    }
+    try {
+      if (document.querySelector("section[data-project-id]")) {
+        newSidebarCached = true;
+        return true;
+      }
+    } catch {
+    }
+    return false;
+  }
   var zh = {
     settingsTitle: "ZCode Pro",
     tabFeatures: "\u529F\u80FD",
@@ -76,7 +105,7 @@
     syncRecLink: "\u575A\u679C\u4E91 WebDAV",
     syncRecSuffix: "\uFF1A\u767B\u5F55\u4E0E\u5BC6\u7801\u586B\u201C\u5E94\u7528\u5BC6\u7801\u201D\uFF0C\u4E0D\u662F\u8D26\u53F7\u5BC6\u7801\u3002",
     syncIncludeZcp: "ZCode Pro \u8BBE\u7F6E",
-    syncIncludeZcpDesc: "\u529F\u80FD\u5F00\u5173\u3001\u6837\u5F0F\u8C03\u6574\u3001\u9879\u76EE\u522B\u540D\u4E0E\u4EE3\u7406\u8BBE\u7F6E\uFF1B\u540C\u6B65\u914D\u7F6E\u4E0E\u51ED\u636E\u672C\u8EAB\u4E0D\u53C2\u4E0E\u540C\u6B65\u3002",
+    syncIncludeZcpDesc: "\u529F\u80FD\u5F00\u5173\u3001\u6837\u5F0F\u8C03\u6574\u4E0E\u4EE3\u7406\u8BBE\u7F6E\uFF1B\u540C\u6B65\u914D\u7F6E\u4E0E\u51ED\u636E\u672C\u8EAB\u4E0D\u53C2\u4E0E\u540C\u6B65\u3002\u9879\u76EE\u522B\u540D\u4E0D\u540C\u6B65\uFF08\u5B98\u65B9\u5DF2\u652F\u6301\u6539\u9879\u76EE\u540D\uFF09\u3002",
     syncIncludeModel: "\u6A21\u578B\u8BBE\u7F6E",
     syncIncludeModelDesc: "\u81EA\u5B9A\u4E49\u4F9B\u5E94\u5546\u4E0E\u6A21\u578B\u914D\u7F6E\uFF08config.json \u4E0E provider_config.json\uFF0C\u542B API Key\uFF09\u3002\u8D26\u53F7\u767B\u5F55\u7684\u51ED\u636E\uFF08\u5982 BigModel \u8BA2\u9605\uFF09\u4E0D\u53C2\u4E0E\u540C\u6B65\uFF0C\u5404\u673A\u5668\u7528\u5404\u81EA\u8D26\u53F7\u767B\u5F55\u3002",
     syncUpload: "\u4E0A\u4F20\u5230\u4E91\u7AEF",
@@ -176,8 +205,8 @@
     titleGenTesting: "\u751F\u6210\u4E2D\u2026",
     titleGenTestOk: "\u751F\u6210\u7ED3\u679C\uFF1A",
     titleGenTestFailed: "\u751F\u6210\u5931\u8D25",
-    featureWsRunning: "\u6298\u53E0\u9879\u76EE\u8FD0\u884C\u63D0\u793A\uFF08\u5B9E\u9A8C\u6027\uFF09",
-    featureWsRunningDesc: "\u6298\u53E0\u7684\u9879\u76EE\u91CC\u4ECD\u6709\u4F1A\u8BDD\u5728\u8FD0\u884C\u65F6\uFF0C\u9879\u76EE\u56FE\u6807\u65CB\u8F6C\u63D0\u793A\uFF1B\u5168\u90E8\u7ED3\u675F\u6216\u5C55\u5F00\u9879\u76EE\u540E\u6062\u590D\u3002\u671F\u95F4\u6BCF 60 \u79D2\u5728\u540E\u53F0\u77ED\u6682\u5C55\u5F00\u8BE5\u9879\u76EE\u590D\u6838\u8FD0\u884C\u72B6\u6001\u518D\u6536\u8D77\uFF0C\u4F1A\u8BDD\u884C\u4E0D\u663E\u793A\uFF0C\u4EC5\u9879\u76EE\u4F4D\u7F6E\u53EF\u80FD\u6709\u7EA6\u56DB\u5206\u4E4B\u4E00\u79D2\u7684\u8F7B\u5FAE\u9AD8\u5EA6\u8D77\u4F0F\u3002",
+    featureWsRunning: "\u6298\u53E0\u65F6\u4EFB\u52A1\u8FD0\u884C\u4E2D\u63D0\u793A",
+    featureWsRunningDesc: "\u6709\u4F1A\u8BDD\u5728\u8FD0\u884C\u65F6\uFF0C\u6298\u53E0\u7684\u9879\u76EE\u4E0E\u201C\u4EFB\u52A1\u201D\u201C\u5DF2\u7F6E\u9876\u201D\u7B49\u5206\u533A\u5934\u663E\u793A\u4E0E\u4EFB\u52A1\u8FD0\u884C\u4E2D\u540C\u6B3E\u7684\u52A0\u8F7D\u56FE\u6807\uFF0C\u5168\u90E8\u7ED3\u675F\u540E\u6D88\u5931\uFF1B3.16.1 \u4E4B\u524D\u6BCF 60 \u79D2\u4F1A\u5728\u540E\u53F0\u77ED\u6682\u5C55\u5F00\u9879\u76EE\u590D\u6838\u518D\u6536\u8D77\u3002",
     tabPerformance: "\u6027\u80FD",
     perfDesc: "ZCode \u4E3A\u6BCF\u4E2A\u6253\u5F00\u8FC7\u7684\u9879\u76EE\u5E38\u9A7B\u4E00\u4E2A\u4F1A\u8BDD\u8FDB\u7A0B\uFF0C\u5E94\u7528\u81EA\u8EAB\u4E0D\u4F1A\u56DE\u6536\uFF0C\u9879\u76EE\u591A\u4E86\u5185\u5B58\u5360\u7528\u5C31\u9AD8\u3002\u5F00\u542F\u540E\uFF0C\u957F\u65F6\u95F4\u672A\u4F7F\u7528\u4E14\u6CA1\u6709\u4EFB\u52A1\u5728\u8DD1\u7684\u9879\u76EE\u4F1A\u88AB\u81EA\u52A8\u91CA\u653E\uFF1A\u4F1A\u8BDD\u8BB0\u5F55\u4E0D\u53D7\u5F71\u54CD\uFF0C\u518D\u6B21\u6253\u5F00\u65F6\u81EA\u52A8\u6062\u590D\uFF0C\u4EC5\u9996\u6B21\u56DE\u590D\u6709\u51E0\u79D2\u7B49\u5F85\u3002\u6B63\u5728\u4F7F\u7528\u7684\u9879\u76EE\u3001\u8FD0\u884C\u4E2D\u7684\u4F1A\u8BDD\u4E0E\u540E\u53F0\u547D\u4EE4\u3001\u5B9A\u65F6\u4EFB\u52A1\u90FD\u4E0D\u4F1A\u88AB\u56DE\u6536\u3002\u540E\u53F0\u547D\u4EE4\u68C0\u6D4B\u4F9D\u8D56\u7CFB\u7EDF\u8FDB\u7A0B\u4FE1\u606F\uFF08Linux / macOS / Windows \u5404\u8D70\u7CFB\u7EDF\u81EA\u5E26\u5DE5\u5177\uFF09\uFF0C\u68C0\u6D4B\u4E0D\u53EF\u7528\u65F6\u529F\u80FD\u81EA\u52A8\u505C\u7528\u3002",
     featureIdleReclaim: "\u7A7A\u95F2\u9879\u76EE\u5185\u5B58\u56DE\u6536",
@@ -217,17 +246,16 @@
     imageCopied: "\u56FE\u7247\u5DF2\u590D\u5236\u5230\u526A\u8D34\u677F",
     imageCopyFailed: "\u590D\u5236\u56FE\u7247\u5931\u8D25",
     openFolderItem: "\u6253\u5F00\u6587\u4EF6\u5939",
+    openFolderPrimary: "\u4E3B\u76EE\u5F55",
     copyPathItem: "\u590D\u5236\u8DEF\u5F84",
     pathCopied: "\u8DEF\u5F84\u5DF2\u590D\u5236\u5230\u526A\u8D34\u677F",
     pathCopyFailed: "\u590D\u5236\u8DEF\u5F84\u5931\u8D25",
     fileOpenDefault: "\u9ED8\u8BA4\u5E94\u7528\u6253\u5F00",
     fileReveal: "\u6253\u5F00\u6240\u5728\u76EE\u5F55",
-    featurePinnedExpand: "\u7F6E\u9876\u4F1A\u8BDD\u4FDD\u6301\u9879\u76EE\u6298\u53E0\uFF08\u5B9E\u9A8C\u6027\uFF09",
-    featurePinnedExpandDesc: "\u70B9\u51FB\u6298\u53E0\u9879\u76EE\u7684\u7F6E\u9876\u4F1A\u8BDD\u540E\u5C06\u5176\u4FDD\u6301\u6298\u53E0\u3002\u53D7\u9650\u4E8E\u5E94\u7528\u673A\u5236\uFF0C\u9879\u76EE\u4F1A\u5148\u77ED\u6682\u5C55\u5F00\u518D\u7F29\u8D77\u3002",
-    featureAutoUpdatePlugins: "\u81EA\u52A8\u66F4\u65B0 zcode-plugins \u63D2\u4EF6",
-    featureAutoUpdatePluginsDesc: "\u542F\u52A8\u65F6\u81EA\u52A8\u68C0\u67E5\u5E76\u66F4\u65B0\u5DF2\u5B89\u88C5\u7684 zcode-plugins \u63D2\u4EF6\uFF08\u53EA\u5347\u7EA7\u4E0D\u5B89\u88C5\uFF0C\u5378\u8F7D\u4E0D\u4F1A\u88AB\u64A4\u9500\uFF09\uFF0C\u66F4\u65B0\u5728\u65B0\u4F1A\u8BDD\u751F\u6548\u3002",
-    pluginsUpdateTitle: "\u63D2\u4EF6\u66F4\u65B0 \xB7 zcode-plugins",
-    pluginsCheckNow: "\u68C0\u67E5\u5E76\u66F4\u65B0",
+    featureAutoUpdatePlugins: "\u81EA\u52A8\u66F4\u65B0",
+    featureAutoUpdatePluginsRepo: "duanluan/zcode-plugins",
+    featureAutoUpdatePluginsDesc: "",
+    pluginsCheckNow: "\u68C0\u67E5\u66F4\u65B0",
     pluginsUpdating: "\u6B63\u5728\u66F4\u65B0\u63D2\u4EF6\u2026",
     pluginsUpToDate: "\u63D2\u4EF6\u5DF2\u662F\u6700\u65B0",
     pluginsUpdatesFound: "{n} \u4E2A\u63D2\u4EF6\u53EF\u66F4\u65B0",
@@ -305,6 +333,8 @@
     hrUsageNone: "\u5F53\u524D\u6CA1\u6709\u8D70 headroom \u7684\u4F9B\u5E94\u5546\uFF0C\u672A\u5207\u6362",
     headroomLoadFailed: "\u8BFB\u53D6 Headroom \u914D\u7F6E\u5931\u8D25",
     headroomStatusTitle: "\u8FD0\u884C\u72B6\u6001",
+    hrInstRunning: "\u8FD0\u884C\u4E2D",
+    hrInstStopped: "\u672A\u8FD0\u884C",
     headroomStatusLoadFailed: "\u8BFB\u53D6\u8FD0\u884C\u72B6\u6001\u5931\u8D25",
     headroomProxyUp: "\u4EE3\u7406\u8FD0\u884C\u4E2D",
     headroomProxyDown: "\u4EE3\u7406\u672A\u8FD0\u884C",
@@ -370,6 +400,30 @@
     aliasSaved: "\u522B\u540D\u5DF2\u66F4\u65B0",
     aliasCleared: "\u5DF2\u6062\u590D\u771F\u5B9E\u540D\u79F0",
     aliasHint: "\u78C1\u76D8\u76EE\u5F55\u540D\u4E0D\u53D8\uFF1A\u7EC8\u7AEF\u3001\u6587\u4EF6\u7BA1\u7406\u5668\u4E0E\u5176\u4ED6\u5F15\u7528\u771F\u5B9E\u8DEF\u5F84\u7684\u754C\u9762\u4ECD\u663E\u793A\u539F\u540D\u3002",
+    featureProjectMenuDescNew: "\u9879\u76EE\u201C\u66F4\u591A\u201D\u83DC\u5355\u4E2D\u7684\u5207\u6362\u6587\u4EF6\u5939\u3001\u6253\u5F00\u6587\u4EF6\u5939\u4E0E\u590D\u5236\u8DEF\u5F84\u3002\u5B98\u65B9\u5DF2\u652F\u6301\u4FEE\u6539\u9879\u76EE\u540D\u79F0\uFF08\u7F16\u8F91\u9879\u76EE\uFF09\uFF0C\u81EA\u5B9A\u4E49\u522B\u540D\u5DF2\u505C\u7528\u3002",
+    aliasMigrateTitle: "\u8FC1\u79FB\u9879\u76EE\u522B\u540D",
+    aliasMigrateDesc: "\u5F53\u524D ZCode \u5DF2\u652F\u6301\u4FEE\u6539\u9879\u76EE\u540D\u79F0\uFF08\u9879\u76EE\u201C\u66F4\u591A\u201D\u83DC\u5355 \u2192 \u7F16\u8F91\u9879\u76EE\uFF09\uFF0C\u81EA\u5B9A\u4E49\u522B\u540D\u529F\u80FD\u5DF2\u505C\u7528\u3002\u53EF\u628A\u5DF2\u4FDD\u5B58\u7684\u522B\u540D\u5199\u5165\u5B98\u65B9\u9879\u76EE\u540D\u79F0\uFF0C\u52FE\u9009\u8981\u8FC1\u79FB\u7684\u9879\u76EE\uFF1B\u8FC1\u79FB\u53EA\u6539\u9879\u76EE\u540D\u79F0\uFF0C\u78C1\u76D8\u76EE\u5F55\u4E0D\u53D7\u5F71\u54CD\u3002",
+    aliasMigrateItemHint: "\u8FC1\u79FB\u540E\u5C06\u4F5C\u4E3A\u9879\u76EE\u540D\u79F0\u4FDD\u5B58\uFF08\u53EF\u968F\u65F6\u5728\u201C\u7F16\u8F91\u9879\u76EE\u201D\u4E2D\u518D\u6539\uFF09\u3002\u4EC5\u65E0\u6807\u8BB0\u7684\u6761\u76EE\u53EF\u52FE\u9009\uFF1B\u5DF2\u8FC1\u79FB\u3001\u5DF2\u5E76\u5165\u3001\u9879\u76EE\u5DF2\u5220\u9664\u3001\u672C\u673A\u4E0D\u5B58\u5728\uFF08\u65E7\u673A\u5668\u8DEF\u5F84\uFF09\u4EE5\u53CA\u9879\u76EE\u5DF2\u91CD\u547D\u540D\u7684\u90FD\u4E0D\u53EF\u52FE\u9009\u2014\u2014\u8981\u6539\u8FD9\u4E9B\u9879\u76EE\u7684\u540D\u5B57\uFF0C\u76F4\u63A5\u7528\u9879\u76EE\u201C\u66F4\u591A\u201D\u83DC\u5355\u91CC\u7684\u201C\u7F16\u8F91\u9879\u76EE\u201D\u3002",
+    aliasMigrateStateDone: "\u5DF2\u8FC1\u79FB",
+    aliasMigrateStateMerged: "\u5DF2\u5E76\u5165\u300C{name}\u300D",
+    aliasMigrateStateDeleted: "\u9879\u76EE\u5DF2\u5220\u9664",
+    aliasMigrateStateMissing: "\u672C\u673A\u4E0D\u5B58\u5728",
+    aliasMigrateStateRenamed: "\u9879\u76EE\u5DF2\u91CD\u547D\u540D",
+    aliasMigrateDeadSummary: "\u5DF2\u5931\u6548 {n} \u6761\uFF08\u672C\u673A\u4E0D\u5B58\u5728 / \u9879\u76EE\u5DF2\u5220\u9664\uFF0C\u591A\u4E3A\u8BBE\u7F6E\u540C\u6B65\u5E26\u6765\u7684\u65E7\u673A\u5668\u8DEF\u5F84\uFF09",
+    aliasMigrateClearDead: "\u6E05\u9664\u5931\u6548\u6761\u76EE",
+    aliasMigrateDeadCleared: "\u5DF2\u6E05\u9664 {n} \u6761\u5931\u6548\u522B\u540D",
+    aliasMigrateDeadClearFailed: "\u90E8\u5206\u5931\u6548\u522B\u540D\u672A\u80FD\u6E05\u9664\uFF0C\u8BF7\u91CD\u8BD5",
+    aliasMigrateGo: "\u8FC1\u79FB\u6240\u9009",
+    aliasMigrateRunning: "\u8FC1\u79FB\u4E2D\u2026",
+    aliasMigrateProgress: "\u6B63\u5728\u8FC1\u79FB {i}/{n}\uFF1A{name}",
+    aliasMigrateStateFailed: "\u5931\u8D25",
+    aliasMigrateSkip: "\u6682\u4E0D\u8FC1\u79FB",
+    aliasMigrateDone: "\u5DF2\u8FC1\u79FB {n} \u4E2A\u522B\u540D",
+    aliasMigratePartial: "{n} \u4E2A\u5DF2\u8FC1\u79FB\uFF0C{m} \u4E2A\u672A\u6210\u529F\uFF1B\u672A\u6210\u529F\u7684\u53EF\u7A0D\u540E\u5728 ZCode Pro \u8BBE\u7F6E\u4E2D\u91CD\u8BD5",
+    aliasMigrateAllFailed: "\u522B\u540D\u8FC1\u79FB\u672A\u6210\u529F\uFF0C\u53EF\u7A0D\u540E\u5728 ZCode Pro \u8BBE\u7F6E\u4E2D\u91CD\u8BD5",
+    aliasMigrateCardName: "\u522B\u540D\u8FC1\u79FB",
+    aliasMigrateCardDesc: "\u5B98\u65B9\u5DF2\u652F\u6301\u4FEE\u6539\u9879\u76EE\u540D\u79F0\uFF0C\u8FD8\u6709 {n} \u4E2A\u81EA\u5B9A\u4E49\u522B\u540D\u672A\u8FC1\u79FB\u3002",
+    aliasMigrateRun: "\u8FC1\u79FB",
     taskOrderSaved: "\u987A\u5E8F\u5DF2\u66F4\u65B0",
     qqGroupTitle: "QQ \u7FA4\uFF1A428403354",
     qqGroupDesc: "\u95EE\u9898\u53CD\u9988\u4E0E\u4EA4\u6D41",
@@ -441,7 +495,7 @@
     syncRecLink: "Jianguoyun WebDAV",
     syncRecSuffix: " \u2014 use the app password, not your account password.",
     syncIncludeZcp: "ZCode Pro settings",
-    syncIncludeZcpDesc: "Feature toggles, style adjustments, project aliases and the proxy setting; the sync config and credentials themselves are never synced.",
+    syncIncludeZcpDesc: "Feature toggles, style adjustments and the proxy setting; the sync config and credentials themselves are never synced. Project aliases are not synced (renaming is built in now).",
     syncIncludeModel: "Model settings",
     syncIncludeModelDesc: "Custom providers and model config (config.json and provider_config.json, API keys included). Account sign-in credentials (e.g. the BigModel subscription) are not synced; each computer signs in with its own account.",
     syncUpload: "Upload",
@@ -541,8 +595,8 @@
     titleGenTesting: "Generating\u2026",
     titleGenTestOk: "Result: ",
     titleGenTestFailed: "Generation failed",
-    featureWsRunning: "Running indicator on collapsed projects (experimental)",
-    featureWsRunningDesc: "Spins a collapsed project's icon while any of its sessions is still running; stops when they all finish or the project is expanded. While spinning, the project is briefly re-expanded in the background every 60 s to re-check and then collapsed \u2014 rows stay hidden, with only a subtle quarter-second height ripple at the project.",
+    featureWsRunning: "Running indicator when collapsed",
+    featureWsRunningDesc: "Shows the same spinning loader as running tasks on collapsed projects and on section headers (\u201CTasks\u201D, \u201CPinned\u201D) while any session is running; clears when they all finish. Before ZCode 3.16.1 the project is briefly re-expanded in the background every 60 s to re-check.",
     tabPerformance: "Performance",
     perfDesc: "ZCode keeps a session process resident for every project you have opened and never reclaims it, so memory grows with projects. When enabled, projects unused for a while with nothing running release their memory automatically: sessions are untouched and reload when reopened, with a few seconds wait on the first reply. The project in use, running sessions, background commands and scheduled tasks are never reclaimed. Background-command detection reads system process info via built-in tools (Linux / macOS / Windows); when unavailable, the feature disables itself.",
     featureIdleReclaim: "Idle project memory reclaim",
@@ -582,17 +636,16 @@
     imageCopied: "Image copied to the clipboard.",
     imageCopyFailed: "Failed to copy the image.",
     openFolderItem: "Open folder",
+    openFolderPrimary: "primary",
     copyPathItem: "Copy path",
     pathCopied: "Path copied to the clipboard.",
     pathCopyFailed: "Failed to copy the path.",
     fileOpenDefault: "Open with default app",
     fileReveal: "Reveal in file manager",
-    featurePinnedExpand: "Keep projects collapsed for pinned sessions (experimental)",
-    featurePinnedExpandDesc: "Keeps the project collapsed after clicking a pinned session. Note: it briefly expands first, then collapses.",
-    featureAutoUpdatePlugins: "Auto-update zcode-plugins plugins",
-    featureAutoUpdatePluginsDesc: "Checks and updates installed zcode-plugins plugins on startup (updates only \u2014 never installs; uninstalled plugins stay uninstalled). Updates apply to new sessions.",
-    pluginsUpdateTitle: "Plugin updates \xB7 zcode-plugins",
-    pluginsCheckNow: "Check & update",
+    featureAutoUpdatePlugins: "Auto-update",
+    featureAutoUpdatePluginsRepo: "duanluan/zcode-plugins",
+    featureAutoUpdatePluginsDesc: "",
+    pluginsCheckNow: "Check for updates",
     pluginsUpdating: "Updating plugins\u2026",
     pluginsUpToDate: "Plugins are up to date",
     pluginsUpdatesFound: "{n} plugin(s) can be updated",
@@ -670,6 +723,8 @@
     hrUsageNone: "No providers route through headroom; nothing changed",
     headroomLoadFailed: "Failed to load the Headroom config",
     headroomStatusTitle: "Status",
+    hrInstRunning: "running",
+    hrInstStopped: "down",
     headroomStatusLoadFailed: "Failed to load the status",
     headroomProxyUp: "Proxy running",
     headroomProxyDown: "Proxy down",
@@ -735,6 +790,30 @@
     aliasSaved: "Alias updated.",
     aliasCleared: "Real name restored.",
     aliasHint: "The directory name on disk is unchanged: terminals, file managers and other path-based UI still show the real name.",
+    featureProjectMenuDescNew: 'Switch folder, open folder and copy path in the project "More" menu. Renaming is built in since ZCode 3.16.1 ("Edit project"), so the custom alias is retired.',
+    aliasMigrateTitle: "Migrate project aliases",
+    aliasMigrateDesc: 'This ZCode supports renaming projects (project "More" menu \u2192 Edit project), so the custom alias feature is retired. Write your saved aliases into the official project names by picking the projects below; only the project name changes, folders on disk are untouched.',
+    aliasMigrateItemHint: 'The alias becomes the project name (re-editable anytime via "Edit project"). Only unmarked entries can be checked; migrated, merged, deleted, not-on-this-machine and manually-renamed ones cannot \u2014 to rename those projects, use "Edit project" in the project "More" menu directly.',
+    aliasMigrateStateDone: "Migrated",
+    aliasMigrateStateMerged: 'Merged into "{name}"',
+    aliasMigrateStateDeleted: "Project deleted",
+    aliasMigrateStateMissing: "Not on this machine",
+    aliasMigrateStateRenamed: "Project renamed",
+    aliasMigrateDeadSummary: "{n} stale entries (not on this machine / project deleted \u2014 usually old-machine paths from settings sync)",
+    aliasMigrateClearDead: "Clear stale entries",
+    aliasMigrateDeadCleared: "Removed {n} stale alias(es)",
+    aliasMigrateDeadClearFailed: "Some stale aliases could not be removed; please retry",
+    aliasMigrateGo: "Migrate selected",
+    aliasMigrateRunning: "Migrating\u2026",
+    aliasMigrateProgress: "Migrating {i}/{n}: {name}",
+    aliasMigrateStateFailed: "Failed",
+    aliasMigrateSkip: "Not now",
+    aliasMigrateDone: "Migrated {n} alias(es)",
+    aliasMigratePartial: "{n} migrated, {m} failed; retry the rest later in ZCode Pro settings",
+    aliasMigrateAllFailed: "Alias migration failed; retry later in ZCode Pro settings",
+    aliasMigrateCardName: "Alias migration",
+    aliasMigrateCardDesc: "Project renaming is built in now; {n} custom alias(es) are not migrated yet.",
+    aliasMigrateRun: "Migrate",
     taskOrderSaved: "Order updated.",
     qqGroupTitle: "QQ group: 428403354",
     qqGroupDesc: "Feedback & discussion",
@@ -918,7 +997,7 @@
   var overlayClassBare = "fixed inset-0 isolate z-50 flex items-center justify-center duration-100 p-4 platform-linux-desktop:top-12";
   var contentClass = "w-full sm:max-w-md rounded-2xl border-none bg-popover/98 p-5 text-ui-base/relaxed text-foreground ring-border shadow-2xl";
   var dialogStack = [];
-  function openDialog({ title, description, onMount, onClose, width = "sm:max-w-md", overlay = "dim", draggable = false, posKey = "", dismissOnOutside = true, bodyClass = "" }) {
+  function openDialog({ title, description, onMount, onClose, width = "sm:max-w-md", overlay = "dim", draggable = false, posKey = "", dismissOnOutside = true, bodyClass = "", closable = false }) {
     const L = t();
     const prevActive = document.activeElement;
     let cleanupDrag = null;
@@ -958,8 +1037,25 @@
       content.style.pointerEvents = "auto";
     }
     const titleEl = h("h2", { class: "text-lg font-semibold leading-none tracking-tight text-foreground" }, title);
-    content.append(
+    const titleRow = closable ? h(
+      "div",
+      { class: "flex items-start justify-between gap-2" },
       titleEl,
+      h("button", {
+        type: "button",
+        class: "zcodepro-close",
+        title: L.close,
+        "aria-label": L.close,
+        onMousedown: (e) => {
+          e.stopPropagation();
+        },
+        onClick: () => {
+          close();
+        }
+      }, "\u2715")
+    ) : titleEl;
+    content.append(
+      titleRow,
       ...description ? [h("p", { class: "mt-2 text-ui-sm/relaxed text-foreground-subtle" }, description)] : []
     );
     const body = h("div", { class: "zcodepro-dialog-body " + (bodyClass || "mt-4") });
@@ -1154,13 +1250,13 @@
   }
   function unitField({ value = null, fallback = { value: 100, unit: "%" }, step = { px: 10, "%": 1 }, onCommit }) {
     const RANGES = { px: [320, 3840], "%": [20, 100] };
-    const norm2 = (v) => {
+    const norm3 = (v) => {
       if (!v || !RANGES[v.unit]) return null;
       const [min, max] = RANGES[v.unit];
       const n = v.unit === "px" ? Math.round(v.value) : Math.round(v.value * 10) / 10;
       return Number.isFinite(n) ? { value: Math.min(max, Math.max(min, n)), unit: v.unit } : null;
     };
-    let current2 = norm2(value) || norm2(fallback) || { value: 100, unit: "%" };
+    let current2 = norm3(value) || norm3(fallback) || { value: 100, unit: "%" };
     const input = h("input", {
       type: "text",
       inputmode: "decimal",
@@ -1171,7 +1267,7 @@
       input.value = `${current2.value}${current2.unit}`;
     };
     const commit = (v) => {
-      const next = norm2(v);
+      const next = norm3(v);
       if (!next || next.value === current2.value && next.unit === current2.unit) {
         display();
         return;
@@ -1208,7 +1304,7 @@
     return {
       el: input,
       reset() {
-        current2 = norm2(fallback) || current2;
+        current2 = norm3(fallback) || current2;
         display();
       },
       get() {
@@ -1247,7 +1343,7 @@
         "div",
         { class: "min-w-0 flex-1" },
         h("div", { class: "text-ui-sm font-medium text-foreground" }, name),
-        ...desc ? [h("div", { class: "mt-0.5 text-ui-xs/relaxed text-foreground-subtle" }, desc)] : []
+        h("div", { class: "mt-0.5 text-ui-xs/relaxed text-foreground-subtle", "data-zcodepro-row-desc": "" }, desc ?? "")
       ),
       ...extraEl ? [extraEl] : [],
       h("button", {
@@ -1525,13 +1621,9 @@
     .zcodepro-imgmenu-item:hover {
       background-color: var(--color-accent, color-mix(in oklab, var(--color-foreground, #888) 10%, transparent));
     }
-    /* \u6298\u53E0\u9879\u76EE\u8FD0\u884C\u63D0\u793A\uFF08ws-running.js\uFF09\uFF1A\u9879\u76EE\u56FE\u6807\u65CB\u8F6C\u3002\u52A8\u753B\u7C7B\u6302\u5728\u56FE\u6807\u5916\u5C42\u7684
-       \u7A33\u5B9A span \u4E0A\uFF0C\u5C55\u5F00/\u6536\u8D77\u65F6\u5E94\u7528\u91CD\u5EFA svg \u4E5F\u4E0D\u53D7\u5F71\u54CD\uFF1B\u65F6\u957F\u4E0E\u5E94\u7528 loader \u4E00\u81F4 */
-    @keyframes zcodepro-ws-spin { to { transform: rotate(360deg); } }
-    span.zcodepro-ws-running > svg {
-      animation: zcodepro-ws-spin 1s linear infinite;
-      transform-origin: center;
-    }
+    /* \u6298\u53E0\u9879\u76EE\u8FD0\u884C\u63D0\u793A\uFF1Afolder \u56FE\u6807\u8BA9\u4F4D\u7ED9 loader\uFF08loader \u7531\u811A\u672C\u63D2\u5165\uFF0C
+       folder \u53EF\u80FD\u88AB React \u968F\u65F6\u91CD\u5EFA\uFF0C\u9760\u7C7B\u9009\u62E9\u5668\u7EDF\u4E00\u9690\u85CF\uFF0C\u540E\u4EE3\u5199\u6CD5\u517C\u5BB9\u5305\u88C5\u5C42\uFF09 */
+    span.zcodepro-ws-running svg:not(.zcodepro-ws-loader) { display: none !important; }
     /* \u65E0\u611F\u63A2\u67E5\u671F\u95F4\u76D6\u5728\u9879\u76EE\u884C\u4E0A\u7684\u51BB\u7ED3\u514B\u9686\uFF1A\u56FA\u5B9A\u5B9A\u4F4D\u3001\u4E0D\u54CD\u5E94\u6307\u9488 */
     .zcodepro-ws-frozen {
       position: fixed;
@@ -1645,12 +1737,82 @@
     }
     .zcodepro-pin-head:hover .zcodepro-pin-chevron svg { opacity: 1; }
     .zcodepro-pin-collapsed .zcodepro-pin-chevron svg { transform: rotate(-90deg); }
-    .zcodepro-pin-collapsed > ul { display: none !important; }
+    .zcodepro-pin-collapsed > :is(ul, div):has(li[data-task-item-key]) { display: none !important; }
     /* \u6298\u53E0\u540E\u53BB\u6389\u6807\u9898\u81EA\u5E26\u7684\u5E95\u90E8\u7559\u767D\uFF0C\u4E0E\u4E0B\u4E00\u5206\u533A\u7684\u95F4\u9694\u548C\u5176\u4ED6\u5206\u533A\u8282\u594F\u4E00\u81F4 */
     .zcodepro-pin-collapsed .zcodepro-pin-head { padding-bottom: 0; }
   `));
   }
 
+  // src/inject/features/copy-path.js
+  async function appendCopyPathItem(menu, anchorItem, project) {
+    if (menu.querySelector('[data-zcodepro-item="copy-path"]')) return;
+    const L = t();
+    const item = anchorItem.cloneNode(true);
+    item.removeAttribute("data-testid");
+    item.removeAttribute("data-highlighted");
+    item.setAttribute("data-zcodepro-item", "copy-path");
+    for (const child of [...item.childNodes]) child.remove();
+    const origIcon = anchorItem.querySelector("svg");
+    const iconClass = origIcon ? origIcon.getAttribute("class") : "h-3.5 w-3.5";
+    item.append(hCopyIcon(iconClass), document.createTextNode(L.copyPathItem));
+    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"));
+    item.addEventListener("click", () => {
+      closeRadixMenu(menu);
+      void copyText(project.path);
+    });
+    anchorItem.before(item);
+  }
+  async function copyText(text) {
+    const L = t();
+    if (await copyToClipboard(text)) showToast(L.pathCopied);
+    else showToast(L.pathCopyFailed, "error");
+  }
+  async function copyToClipboard(text) {
+    try {
+      await navigator.clipboard.writeText(text);
+      return true;
+    } catch {
+      return copyViaHiddenInput(text);
+    }
+  }
+  function copyViaHiddenInput(text) {
+    try {
+      const input = h("input", { type: "text", style: "position:fixed;left:-9999px;top:0;opacity:0" });
+      input.value = text;
+      document.body.append(input);
+      input.select();
+      const ok = document.execCommand("copy");
+      input.remove();
+      return ok;
+    } catch {
+      return false;
+    }
+  }
+  function hCopyIcon(cls) {
+    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", cls);
+    for (const d of [
+      "M8 8h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2Z",
+      "M4 16c-1.1 0-2-.9-2-2V4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2"
+    ]) {
+      const p = document.createElementNS(ns, "path");
+      p.setAttribute("d", d);
+      svg.append(p);
+    }
+    return svg;
+  }
+
   // src/inject/features/alias.js
   var norm = (p) => String(p || "").replace(/[\\/]+$/, "");
   var basenameOf = (p) => norm(p).split(/[\\/]/).pop() || "";
@@ -1679,6 +1841,7 @@
     return false;
   }
   async function startAliasWatcher() {
+    if (isNewProjectSidebar()) return;
     await syncFromConfig();
     if (observer) return;
     observer = new MutationObserver((muts) => {
@@ -2053,76 +2216,6 @@
     return svg;
   }
 
-  // src/inject/features/copy-path.js
-  async function appendCopyPathItem(menu, anchorItem, project) {
-    if (menu.querySelector('[data-zcodepro-item="copy-path"]')) return;
-    const L = t();
-    const item = anchorItem.cloneNode(true);
-    item.removeAttribute("data-testid");
-    item.removeAttribute("data-highlighted");
-    item.setAttribute("data-zcodepro-item", "copy-path");
-    for (const child of [...item.childNodes]) child.remove();
-    const origIcon = anchorItem.querySelector("svg");
-    const iconClass = origIcon ? origIcon.getAttribute("class") : "h-3.5 w-3.5";
-    item.append(hCopyIcon(iconClass), document.createTextNode(L.copyPathItem));
-    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"));
-    item.addEventListener("click", () => {
-      closeRadixMenu(menu);
-      void copyText(project.path);
-    });
-    anchorItem.before(item);
-  }
-  async function copyText(text) {
-    const L = t();
-    if (await copyToClipboard(text)) showToast(L.pathCopied);
-    else showToast(L.pathCopyFailed, "error");
-  }
-  async function copyToClipboard(text) {
-    try {
-      await navigator.clipboard.writeText(text);
-      return true;
-    } catch {
-      return copyViaHiddenInput(text);
-    }
-  }
-  function copyViaHiddenInput(text) {
-    try {
-      const input = h("input", { type: "text", style: "position:fixed;left:-9999px;top:0;opacity:0" });
-      input.value = text;
-      document.body.append(input);
-      input.select();
-      const ok = document.execCommand("copy");
-      input.remove();
-      return ok;
-    } catch {
-      return false;
-    }
-  }
-  function hCopyIcon(cls) {
-    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", cls);
-    for (const d of [
-      "M8 8h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2Z",
-      "M4 16c-1.1 0-2-.9-2-2V4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2"
-    ]) {
-      const p = document.createElementNS(ns, "path");
-      p.setAttribute("d", d);
-      svg.append(p);
-    }
-    return svg;
-  }
-
   // src/inject/features/project-menu.js
   var REMOVE_TEXTS = ["\u79FB\u9664", "Remove"];
   function extractPathFromTestId2(testid) {
@@ -2131,37 +2224,213 @@
     m = testid.match(/[-:=,|]([A-Za-z]:\\.*)$/);
     return m ? m[1] : null;
   }
-  function basenameOf2(p) {
-    return String(p || "").replace(/[\\/]+$/, "").split(/[\\/]/).pop() || "";
+  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 = extractPathFromTestId2(testid);
+    const extracted = extractPathFromTestId2(removeItem.getAttribute("data-testid") || "");
     if (!extracted) return null;
     const res = await rpc("/projects");
     if (res.ok && Array.isArray(res.projects)) {
-      const norm2 = (p) => String(p).replace(/[\\/]+$/, "");
-      const hit = res.projects.find((p) => norm2(p.path) === norm2(extracted));
+      const norm3 = (p) => String(p).replace(/[\\/]+$/, "");
+      const hit = res.projects.find((p) => norm3(p.path) === norm3(extracted));
       if (hit) return hit;
     }
-    return { path: extracted, name: basenameOf2(extracted) };
+    return { path: extracted, name: String(extracted).replace(/[\\/]+$/, "").split(/[\\/]/).pop() || "" };
+  }
+  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"));
+  }
+  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 ? ` \xB7 ${L.openFolderPrimary}` : "")));
+        row.addEventListener("click", () => {
+          try {
+            menu.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", code: "Escape", bubbles: true, cancelable: true }));
+          } catch {
+          }
+          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();
+      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);
+    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();
+    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 {
+        }
+        void rpc("/open-folder", { method: "POST", body: { path: primary.path } });
+      });
+    } else {
+      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 {
+      }
+      void copyToClipboard(primary.path).then((ok) => showToast(ok ? L.pathCopied : L.pathCopyFailed, ok ? void 0 : "error"));
+    });
+    openItem.after(copyItem);
   }
   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(
+    const newUi = isNewProjectSidebar();
+    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 (!removeItem) return;
+    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);
     })();
   }
 
@@ -2554,6 +2823,489 @@
     return v === "" || v !== "session" && !providers.some((p) => p.id === v);
   }
 
+  // src/inject/features/ws-rows.js
+  var norm2 = (p) => String(p || "").replace(/[\\/]+$/, "");
+  var NEW_ROW_SEL = "section[data-project-id]";
+  var OLD_ROW_SEL = '[data-testid^="workspace-item-"]';
+  var pathByProjectId = /* @__PURE__ */ new Map();
+  function projectRowSelector() {
+    return isNewProjectSidebar() ? NEW_ROW_SEL : OLD_ROW_SEL;
+  }
+  function projectRows(root = document) {
+    return [...root.querySelectorAll(projectRowSelector())];
+  }
+  function rowPath(row) {
+    if (!row) return null;
+    if (row.hasAttribute && row.hasAttribute("data-project-id")) {
+      const host = row.getAttribute("data-project-host");
+      if (host !== null && host !== "local") return null;
+      const id = row.getAttribute("data-project-id");
+      let found = null;
+      for (const el of row.querySelectorAll("[data-task-item-key]")) {
+        const key = el.getAttribute("data-task-item-key") || "";
+        const cut = key.lastIndexOf(":");
+        if (cut > 1) {
+          found = key.slice(0, cut);
+          break;
+        }
+      }
+      if (found) pathByProjectId.set(id, found);
+      return found || pathByProjectId.get(id) || null;
+    }
+    const testid = row.getAttribute && row.getAttribute("data-testid");
+    if (!testid || !testid.startsWith("workspace-item-")) return null;
+    return norm2(testid.slice("workspace-item-".length)) || null;
+  }
+  function findProjectRow(path) {
+    const want = norm2(path);
+    if (!want) return null;
+    for (const row of projectRows()) {
+      const p = rowPath(row);
+      if (p && norm2(p) === want) return row;
+    }
+    return null;
+  }
+
+  // src/inject/features/alias-migration.js
+  var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+  var basenameOf2 = (p) => String(p || "").replace(/[\\/]+$/, "").split(/[\\/]/).pop() || "";
+  function waitFor(getter, timeoutMs, step) {
+    const start = Date.now();
+    return new Promise((resolve, reject) => {
+      const tick2 = () => {
+        let v = null;
+        try {
+          v = getter();
+        } catch {
+        }
+        if (v) {
+          resolve(v);
+          return;
+        }
+        if (Date.now() - start >= timeoutMs) {
+          reject(new Error(step));
+          return;
+        }
+        setTimeout(tick2, 120);
+      };
+      tick2();
+    });
+  }
+  function setReactInputValue(input, value) {
+    const setter = Object.getOwnPropertyDescriptor(input.constructor.prototype, "value")?.set || Object.getOwnPropertyDescriptor(window.HTMLInputElement.prototype, "value")?.set;
+    if (!setter) throw new Error("input-setter");
+    setter.call(input, value);
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+  }
+  function pressEscape() {
+    try {
+      document.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", code: "Escape", bubbles: true, cancelable: true }));
+    } catch {
+    }
+  }
+  async function markDismissed() {
+    await rpc("/config", { method: "POST", body: { migrations: { aliasRenameDismissed: true } } });
+    clearConfigCache();
+  }
+  var MIGRATE_LOCK_KEY = "zcodepro:alias-migrate-lock";
+  var MIGRATE_LOCK_MS = 5 * 6e4;
+  function migrateLockFresh() {
+    try {
+      const at = Number(localStorage.getItem(MIGRATE_LOCK_KEY));
+      return Number.isFinite(at) && Date.now() - at < MIGRATE_LOCK_MS;
+    } catch {
+      return false;
+    }
+  }
+  function touchMigrateLock() {
+    try {
+      localStorage.setItem(MIGRATE_LOCK_KEY, String(Date.now()));
+    } catch {
+    }
+  }
+  async function migrateOne(path, alias) {
+    if (document.querySelector('[data-testid="virtual-project-name"], [role="menu"]')) {
+      pressEscape();
+      await sleep(300);
+    }
+    let row = findProjectRow(path);
+    if (!row) {
+      const byName = [...document.querySelectorAll("section[data-project-id]")].filter((el) => {
+        const host = el.getAttribute("data-project-host");
+        return (host === null || host === "local") && el.getAttribute("data-project-name") === basenameOf2(path);
+      });
+      if (byName.length === 1) row = byName[0];
+    }
+    if (!row) throw new Error("project-row");
+    const projectId = row.getAttribute("data-project-id");
+    const rowById = () => document.querySelector(`section[data-project-id="${CSS.escape(projectId)}"]`);
+    try {
+      row.scrollIntoView({ block: "center" });
+    } catch {
+    }
+    const trigger = await waitFor(
+      () => rowById()?.querySelector('[data-testid="virtual-project-menu"]'),
+      4e3,
+      "menu-trigger"
+    );
+    trigger.dispatchEvent(new PointerEvent("pointerdown", { bubbles: true, cancelable: true, pointerId: 1, isPrimary: true, button: 0 }));
+    trigger.dispatchEvent(new PointerEvent("pointerup", { bubbles: true, cancelable: true, pointerId: 1, isPrimary: true, button: 0 }));
+    trigger.click();
+    const menu = await waitFor(() => {
+      for (const m of document.querySelectorAll('[role="menu"]')) {
+        if (m.querySelector('[data-testid="virtual-project-edit"]')) return m;
+      }
+      return null;
+    }, 4e3, "menu-open");
+    menu.querySelector('[data-testid="virtual-project-edit"]').click();
+    const input = await waitFor(
+      () => document.querySelector('[data-testid="virtual-project-name"]'),
+      5e3,
+      "editor-open"
+    );
+    const wantName = alias.trim();
+    setReactInputValue(input, wantName);
+    const save = await waitFor(
+      () => {
+        const btn = document.querySelector('[data-testid="virtual-project-save"]');
+        return btn && !btn.disabled ? btn : null;
+      },
+      4e3,
+      "save-ready"
+    );
+    save.click();
+    await waitFor(() => {
+      const r = rowById();
+      return r && r.getAttribute("data-project-name") === wantName ? r : null;
+    }, 8e3, "name-updated");
+    await sleep(250);
+    if (document.querySelector('[data-testid="virtual-project-name"]')) pressEscape();
+    const res = await rpc("/project/alias", { method: "POST", body: { path, alias: "" } });
+    if (!res.ok) throw new Error("alias-clear");
+  }
+  async function classifyEntry(path, alias, db) {
+    const want = norm0(path);
+    if (db) {
+      let alsoDeleted = false;
+      for (const proj of db.projects || []) {
+        const hit = (proj.roots || []).find((r) => norm0(r.path) === want);
+        if (!hit) continue;
+        if (hit.primary) {
+          if (proj.name === alias) return { state: "done", note: "" };
+          return { state: "", note: "", overridden: !!proj.overridden };
+        }
+        alsoDeleted = (db.deletedRoots || []).some((p) => norm0(p) === want);
+        return { state: "merged", note: proj.name, alsoDeleted };
+      }
+      if ((db.deletedRoots || []).some((p) => norm0(p) === want)) return { state: "deleted", note: "" };
+      return { state: "missing", note: "" };
+    }
+    const localRows = [...document.querySelectorAll("section[data-project-id]")].filter((el) => {
+      const host = el.getAttribute("data-project-host");
+      return host === null || host === "local";
+    });
+    const byPath = localRows.find((el) => norm0(rowPath(el)) === want);
+    if (byPath) {
+      return (byPath.getAttribute("data-project-name") || "") === alias ? { state: "done", note: "" } : { state: "", note: "" };
+    }
+    const byName = localRows.filter((el) => el.getAttribute("data-project-name") === alias);
+    if (byName.length === 1) return { state: "done", note: "" };
+    for (const task of document.querySelectorAll("[data-task-item-key]")) {
+      const key = task.getAttribute("data-task-item-key") || "";
+      const cut = key.lastIndexOf(":");
+      if (cut <= 1 || norm0(key.slice(0, cut)) !== want) continue;
+      const owner = task.closest("section[data-project-id]");
+      const ownerName = owner ? owner.getAttribute("data-project-name") || "" : "";
+      if (ownerName) return { state: "merged", note: ownerName };
+    }
+    return { state: "missing", note: "" };
+  }
+  async function fetchProjectDb() {
+    const res = await rpc("/projects-v2");
+    return res.ok && res.available ? res : null;
+  }
+  var norm0 = (p) => String(p || "").replace(/[\\/]+$/, "");
+  function openMigrationDialog() {
+    ensureStyle();
+    const L = t();
+    let running = false;
+    let decided = false;
+    const decide = () => {
+      if (decided) return;
+      decided = true;
+      void markDismissed();
+    };
+    touchMigrateLock();
+    openDialog({
+      title: L.aliasMigrateTitle,
+      description: L.aliasMigrateDesc,
+      width: "sm:max-w-md",
+      // 迁移不可中途撤销且过程可见：点遮罩不关闭（防误触），右上角 ✕ 关闭
+      dismissOnOutside: false,
+      closable: true,
+      onClose: () => {
+        decide();
+        window.dispatchEvent(new CustomEvent("zcodepro:aliases-changed"));
+      },
+      onMount: ({ body, close }) => {
+        void (async () => {
+          const config = await getConfig(true);
+          const db = await fetchProjectDb();
+          const entries = [];
+          for (const [path, aliasRaw] of Object.entries(config.aliases || {})) {
+            const alias = String(aliasRaw || "").trim();
+            if (!alias) continue;
+            const cls = await classifyEntry(path, alias, db);
+            entries.push({
+              path,
+              alias,
+              checked: cls.state === "" && !cls.overridden,
+              state: cls.state,
+              note: cls.note || "",
+              overridden: !!cls.overridden,
+              alsoDeleted: !!cls.alsoDeleted
+            });
+          }
+          if (!entries.length) {
+            close();
+            return;
+          }
+          const badgesOf = (e) => {
+            const out = [];
+            if (e.state === "run") out.push({ text: L.aliasMigrateRunning, cls: "text-amber-500" });
+            if (e.state === "ok") out.push({ text: L.aliasMigrateStateDone, cls: "text-emerald-600" });
+            if (e.state === "fail") out.push({ text: L.aliasMigrateStateFailed, cls: "text-destructive" });
+            if (e.state === "done") out.push({ text: L.aliasMigrateStateDone, cls: "text-emerald-600" });
+            if (e.state === "merged") out.push({ text: L.aliasMigrateStateMerged.replace("{name}", e.note), cls: "text-amber-500" });
+            if (e.state === "deleted" || e.state === "merged" && e.alsoDeleted) out.push({ text: L.aliasMigrateStateDeleted, cls: "text-foreground-subtle/70" });
+            if (e.state === "missing") out.push({ text: L.aliasMigrateStateMissing, cls: "text-foreground-subtle/70" });
+            if (e.state === "" && e.overridden) out.push({ text: L.aliasMigrateStateRenamed, cls: "text-foreground-subtle/70" });
+            return out;
+          };
+          const progressEl = h("div", { class: "mb-1 text-ui-xs text-foreground-subtle", style: "display:none" });
+          const listEl = h("div", { class: "max-h-[50vh] space-y-1.5 overflow-y-auto" });
+          let deadOpen = false;
+          const renderList = () => {
+            const alive = entries.filter((e) => e.state !== "missing" && e.state !== "deleted");
+            const dead = entries.filter((e) => e.state === "missing" || e.state === "deleted");
+            const rowOf = (e, deadRow) => {
+              const cb = h("input", { type: "checkbox" });
+              cb.checked = e.checked;
+              cb.disabled = running || e.state !== "" && e.state !== "fail" || e.overridden;
+              cb.addEventListener("change", () => {
+                e.checked = cb.checked;
+              });
+              const badges = badgesOf(e);
+              const dim = deadRow || e.state !== "" && e.state !== "fail" && e.state !== "run" || e.overridden;
+              return h(
+                "label",
+                { class: "flex cursor-pointer items-start gap-2 rounded-lg p-2 transition-colors hover:bg-surface-hover" + (dim ? " opacity-60" : "") },
+                h("span", { class: "mt-0.5" }, cb),
+                h(
+                  "span",
+                  { class: "min-w-0 flex-1" },
+                  h("span", { class: "block truncate text-ui-sm font-medium text-foreground" }, e.alias),
+                  h("span", { class: "block truncate font-mono text-ui-xs text-foreground-subtle" }, e.path)
+                ),
+                ...badges.map((b) => h("span", { class: "shrink-0 self-center text-ui-xs " + b.cls }, b.text))
+              );
+            };
+            const parts = alive.map((e) => rowOf(e, false));
+            if (dead.length) {
+              const deadRows = h(
+                "div",
+                { class: "space-y-1", style: deadOpen ? "" : "display:none" },
+                ...dead.map((e) => rowOf(e, true))
+              );
+              const toggle2 = h("button", {
+                type: "button",
+                class: "flex w-full items-center gap-1 rounded-lg p-2 text-left text-ui-xs text-foreground-subtle transition-colors hover:bg-surface-hover",
+                onClick: () => {
+                  deadOpen = !deadOpen;
+                  renderList();
+                }
+              }, (deadOpen ? "\u25BE " : "\u25B8 ") + L.aliasMigrateDeadSummary.replace("{n}", String(dead.length)));
+              parts.push(toggle2, deadRows);
+            }
+            listEl.replaceChildren(...parts);
+          };
+          renderList();
+          const clearDead = async () => {
+            if (running) return;
+            const dead = entries.filter((e) => e.state === "missing" || e.state === "deleted");
+            if (!dead.length) return;
+            running = true;
+            goBtn.setAttribute("disabled", "true");
+            let ok = 0;
+            for (const e of dead) {
+              const r = await rpc("/project/alias", { method: "POST", body: { path: e.path, alias: "" } });
+              if (r.ok) {
+                ok++;
+                entries.splice(entries.indexOf(e), 1);
+              }
+            }
+            running = false;
+            goBtn.removeAttribute("disabled");
+            goBtn.textContent = L.aliasMigrateGo;
+            clearConfigCache();
+            renderList();
+            window.dispatchEvent(new CustomEvent("zcodepro:aliases-changed"));
+            if (ok === dead.length) showToast(L.aliasMigrateDeadCleared.replace("{n}", String(ok)));
+            else showToast(L.aliasMigrateDeadClearFailed, "error");
+          };
+          const goBtn = btnPrimary(L.aliasMigrateGo, () => {
+            void run();
+          }, "min-w-24");
+          const run = async () => {
+            if (running) return;
+            const todo = entries.filter((e) => e.checked);
+            if (!todo.length) return;
+            running = true;
+            goBtn.setAttribute("disabled", "true");
+            goBtn.textContent = L.aliasMigrateRunning;
+            let ok = 0;
+            const failed = [];
+            for (let i = 0; i < todo.length; i++) {
+              const e = todo[i];
+              progressEl.style.display = "";
+              progressEl.textContent = L.aliasMigrateProgress.replace("{i}", String(i + 1)).replace("{n}", String(todo.length)).replace("{name}", e.alias);
+              e.state = "run";
+              renderList();
+              try {
+                await migrateOne(e.path, e.alias);
+                e.state = "ok";
+                e.checked = false;
+                ok++;
+              } catch (err) {
+                console.warn("[zcodepro] alias-migrate: " + e.path + " \u5931\u8D25\u4E8E " + (err && err.message));
+                e.state = "fail";
+                failed.push(e);
+              }
+              renderList();
+            }
+            running = false;
+            progressEl.style.display = "none";
+            goBtn.removeAttribute("disabled");
+            goBtn.textContent = L.aliasMigrateGo;
+            decide();
+            close();
+            if (!failed.length) {
+              showToast(L.aliasMigrateDone.replace("{n}", String(ok)), "ok");
+            } else if (ok) {
+              showToast(L.aliasMigratePartial.replace("{n}", String(ok)).replace("{m}", String(failed.length)), "error");
+            } else {
+              showToast(L.aliasMigrateAllFailed, "error");
+            }
+          };
+          body.append(
+            progressEl,
+            listEl,
+            h("p", { class: "text-ui-xs/relaxed text-foreground-subtle" }, L.aliasMigrateItemHint),
+            (() => {
+              const footer = document.createElement("div");
+              footer.className = "mt-6 flex flex-col-reverse gap-2 sm:flex-row sm:justify-end";
+              const hasDead = entries.some((e) => e.state === "missing" || e.state === "deleted");
+              if (hasDead) {
+                const clearBtn = btnSecondary(L.aliasMigrateClearDead, () => {
+                  void clearDead().then(() => {
+                    if (!entries.some((e) => e.state === "missing" || e.state === "deleted")) clearBtn.style.display = "none";
+                  });
+                });
+                footer.append(clearBtn);
+              }
+              footer.append(
+                btnSecondary(L.aliasMigrateSkip, () => {
+                  if (running) return;
+                  decide();
+                  close();
+                }),
+                goBtn
+              );
+              return footer;
+            })()
+          );
+        })();
+      }
+    });
+  }
+  function migrationCard() {
+    const L = t();
+    const card = h("div", {
+      class: "flex items-center gap-2 rounded-lg p-2",
+      "data-zcodepro-migration-card": ""
+    });
+    const render = (count) => {
+      card.replaceChildren(
+        h(
+          "div",
+          { class: "min-w-0 flex-1" },
+          h("div", { class: "text-ui-sm font-medium text-foreground" }, L.aliasMigrateCardName),
+          h(
+            "div",
+            { class: "mt-0.5 text-ui-xs/relaxed text-foreground-subtle" },
+            count === null ? "\u2026" : L.aliasMigrateCardDesc.replace("{n}", String(count))
+          )
+        ),
+        btnSmall(L.aliasMigrateRun, () => {
+          openMigrationDialog();
+        })
+      );
+    };
+    render(null);
+    const refresh = async () => {
+      const config = await getConfig(true);
+      const db = await fetchProjectDb();
+      let count = 0;
+      for (const [p, a] of Object.entries(config.aliases || {})) {
+        if (!String(a || "").trim()) continue;
+        const cls = await classifyEntry(p, String(a).trim(), db);
+        if (cls.state === "" && !cls.overridden) count++;
+      }
+      if (!count) {
+        card.remove();
+        return;
+      }
+      render(count);
+    };
+    const onAliasesChanged = () => {
+      if (!card.isConnected) {
+        window.removeEventListener("zcodepro:aliases-changed", onAliasesChanged);
+        return;
+      }
+      void refresh();
+    };
+    window.addEventListener("zcodepro:aliases-changed", onAliasesChanged);
+    void refresh();
+    return card;
+  }
+  function startAliasMigrationWatcher() {
+    if (!officialRenameSupported() && !isNewProjectSidebar()) return;
+    void (async () => {
+      try {
+        const config = await getConfig();
+        const hasAliases = Object.values(config.aliases || {}).some((a) => String(a || "").trim());
+        if (!hasAliases) return;
+        if (config.migrations && config.migrations.aliasRenameDismissed) return;
+        await waitFor(() => document.querySelector("section[data-project-id]"), 45e3, "sidebar");
+        let focused = false;
+        for (let i = 0; i < 600; i++) {
+          if (document.visibilityState === "visible" && document.hasFocus()) {
+            focused = true;
+            break;
+          }
+          await sleep(500);
+        }
+        if (!focused) return;
+        if (migrateLockFresh()) return;
+        await waitFor(() => document.querySelector(".zcodepro-overlay") ? null : true, 12e4, "dialog-busy");
+        const fresh = await getConfig(true);
+        const still = Object.values(fresh.aliases || {}).some((a) => String(a || "").trim());
+        if (still && !(fresh.migrations && fresh.migrations.aliasRenameDismissed)) openMigrationDialog();
+      } catch {
+      }
+    })();
+  }
+
   // src/inject/features/styles.js
   var STYLE_DEFAULTS = {
     rowGap: 20,
@@ -2728,7 +3480,10 @@
         `${LIST} [data-testid^="workspace-item-"]{height:auto !important;min-height:${28 + 2 * pad}px !important;padding-block:${pad}px !important;padding-top:${pad}px !important;padding-bottom:${pad}px !important;}`,
         `${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;}`
+        `${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;
@@ -2739,7 +3494,10 @@
         `ul.space-y-0\\.5:has(> li[data-task-item-key]) > :not(:last-child){margin-block-end:${m}px !important;margin-bottom:${m}px !important;}`,
         `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;}`
+        `${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("");
@@ -2780,7 +3538,8 @@
     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]"
   };
   var HL_MARGIN = {
@@ -2824,6 +3583,7 @@
     } catch {
     }
   }
+  var PLUGINS_REPO_URL = "https://github.com/duanluan/zcode-plugins";
   function makeUpgradeControls({ endpoint, metaRefresh, idleText }) {
     const L = t();
     const state = h("span", { class: "min-w-0 flex-1 truncate text-left text-ui-xs/relaxed text-foreground-subtle" });
@@ -3050,10 +3810,46 @@
           h("span", { class: "text-foreground-subtle/70" }, `${health.version} \xB7 ${HELPER_URL}`)
         );
         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" }, "\u2026");
+        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 () => {
+          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 () => {
+            ...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();
@@ -3094,16 +3890,32 @@
               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();
-            })
+            (() => {
+              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(" \u63D2\u4EF6")
+                );
+              }
+              const descEl = row.querySelector("[data-zcodepro-row-desc]");
+              if (descEl) descEl.replaceChildren(pluginsStatusLine);
+              return row;
+            })()
           );
         };
         refreshRows();
@@ -3148,70 +3960,16 @@
             L.wechatGroupTitle,
             L.wechatGroupDesc.replaceAll("{id}", WECHAT_ID),
             () => hCopyIcon("size-4 shrink-0 text-foreground-subtle"),
-            async () => {
-              if (await copyToClipboard(WECHAT_ID)) showToast(L.wechatIdCopied);
-            }
-          )
-        );
-        let activeTab = "features";
-        const pluginsStatusLine = h("span", { class: "text-ui-xs/relaxed text-foreground-subtle" }, "\u2026");
-        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;
-        })();
-        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
+            async () => {
+              if (await copyToClipboard(WECHAT_ID)) showToast(L.wechatIdCopied);
+            }
+          )
         );
+        let activeTab = "features";
         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" });
@@ -3349,6 +4107,7 @@
           )
         };
         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,
@@ -4868,6 +5627,7 @@
             h("span", { class: "text-ui-sm text-foreground-subtle/70" }, "\u2026")
           );
           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");
@@ -4876,6 +5636,8 @@
                 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;
             }
@@ -4895,9 +5657,23 @@
               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 ? "\u2014" : 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} \u2192 ${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";
           };
@@ -5085,6 +5861,7 @@
               ),
               hrStatusLine,
               hrFacts,
+              hrInstList,
               hrHintLine
             ),
             h(
@@ -5462,7 +6239,7 @@
     let item = find();
     if (!item) {
       const ws = workspaceOf(key);
-      const header = document.querySelector(`[data-testid="workspace-item-${CSS.escape(ws)}"]`);
+      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 }));
@@ -5608,7 +6385,7 @@
           return;
         }
         if (!popupEl) await openPopup();
-        moveHighlight(k === "x" ? 1 : -1);
+        moveHighlight(k === "x" ? -1 : 1);
       })();
     }, true);
     document.addEventListener("keyup", (e) => {
@@ -5626,6 +6403,7 @@
   var REVERIFY_MS = 3e3;
   var MAP_REFRESH_MS = 6e4;
   var installed2 = false;
+  var seenRows = /* @__PURE__ */ new WeakSet();
   var enabled2 = true;
   var pinned = null;
   var resolved = false;
@@ -5682,7 +6460,17 @@
     if (first && !walker.nextNode()) first.nodeValue = text;
     else el.textContent = text;
   }
-  function scheduleEnforce(key) {
+  function scheduleEnforce(key, { immediate = false } = {}) {
+    if (immediate) {
+      if (enabled2 && pinned) {
+        const want = pinned.get(sessIdOf(key));
+        if (want !== void 0) {
+          for (const item of findRows(key)) {
+            for (const el of titleElsOf(item)) writeTitle(el, want);
+          }
+        }
+      }
+    }
     if (pendingKeys.has(key)) return;
     pendingKeys.add(key);
     setTimeout(() => {
@@ -5718,7 +6506,13 @@
     if (!enabled2 || !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;
+      }
+      const fresh = !seenRows.has(item);
+      seenRows.add(item);
+      scheduleEnforce(key, { immediate: fresh });
     }
   }
   var inTaskRow2 = (node) => !!(node instanceof Element && node.closest && node.closest(TASK_SEL));
@@ -5875,7 +6669,7 @@
   var installed3 = false;
   var knownKeys = /* @__PURE__ */ new Set();
   var attempted = /* @__PURE__ */ new Set();
-  var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+  var sleep2 = (ms) => new Promise((r) => setTimeout(r, ms));
   function sessIdOf2(key) {
     const i = key.indexOf(":sess_");
     return i > 0 ? key.slice(i + 1) : "";
@@ -5908,7 +6702,7 @@
   }
   async function onNewTaskRow(key) {
     const selDeadline = Date.now() + SELECT_WAIT_MS;
-    while (currentKey() !== key && Date.now() < selDeadline) await sleep(200);
+    while (currentKey() !== key && Date.now() < selDeadline) await sleep2(200);
     if (currentKey() !== key) return;
     const cfg = await getConfig().catch(() => null);
     if (!cfg || !cfg.titleGen || cfg.titleGen.enabled !== true) return;
@@ -5920,7 +6714,7 @@
     while (Date.now() < msgDeadline) {
       texts = userTexts();
       if (texts.length) break;
-      await sleep(400);
+      await sleep2(400);
     }
     if (!texts.length) return;
     let assistantSeen = false;
@@ -5943,7 +6737,7 @@
     let lastChange = Date.now();
     try {
       while (Date.now() - startAt < COLLECT_MAX_MS) {
-        await sleep(500);
+        await sleep2(500);
         if (currentKey() !== key) {
           lastChange = Date.now();
           continue;
@@ -5963,7 +6757,7 @@
     if (linkDominant(texts.join("\n"))) {
       const deadline = Date.now() + 6e4;
       while (Date.now() < deadline) {
-        await sleep(2e3);
+        await sleep2(2e3);
         if (currentKey() !== key) continue;
         const a = assistantText();
         if (a && a.length > 80) {
@@ -5976,7 +6770,7 @@
     let res = await callTitleGen();
     for (const delay of [5e3, 2e4]) {
       if (res && res.ok) break;
-      await sleep(delay);
+      await sleep2(delay);
       res = await callTitleGen();
     }
     if (res && res.ok && res.written && res.title) {
@@ -6033,115 +6827,8 @@
     });
   }
 
-  // src/inject/features/pinned-expand.js
-  var installed4 = false;
-  var keepCollapsed = false;
-  var CONFIG_POLL_MIN_MS = 5e3;
-  var CONFIG_POLL_MAX_MS = 6e4;
-  var pollMs = CONFIG_POLL_MIN_MS;
-  async function refreshConfig() {
-    try {
-      const res = await rpc("/config");
-      if (res && res.ok && res.config && res.config.features) {
-        const next = res.config.features.pinnedKeepCollapsed !== false;
-        if (next !== keepCollapsed) {
-          keepCollapsed = next;
-          return true;
-        }
-      }
-    } catch {
-    }
-    return false;
-  }
-  function pollConfig() {
-    setTimeout(async () => {
-      if (document.hidden) pollMs = CONFIG_POLL_MAX_MS;
-      else pollMs = await refreshConfig() ? CONFIG_POLL_MIN_MS : Math.min(Math.round(pollMs * 1.5), CONFIG_POLL_MAX_MS);
-      pollConfig();
-    }, pollMs);
-  }
-  function startPinnedExpandSuppression() {
-    if (installed4 || typeof document === "undefined") return;
-    installed4 = true;
-    void refreshConfig();
-    pollConfig();
-    document.addEventListener("visibilitychange", () => {
-      if (!document.hidden) void refreshConfig();
-    });
-    document.addEventListener("click", (e) => {
-      if (!keepCollapsed) return;
-      const taskRow = e.target.closest && e.target.closest('[data-testid^="task-item-"]');
-      if (!taskRow) return;
-      const key = taskRow.getAttribute("data-task-item-key") || "";
-      const sep = key.lastIndexOf(":");
-      if (sep <= 0) return;
-      const wsKey = key.slice(0, sep);
-      const wsRow = document.querySelector(`[data-testid="workspace-item-${cssEscape(wsKey)}"]`);
-      if (!wsRow || wsRow.getAttribute("aria-expanded") !== "false") return;
-      const head = wsRow.matches("[aria-expanded]") ? wsRow : wsRow.querySelector("[aria-expanded]");
-      if (!head) return;
-      collapseAfterContentLoaded(wsRow);
-    }, true);
-    document.addEventListener("click", (e) => {
-      const row = e.target.closest && e.target.closest('[data-testid^="workspace-item-"]');
-      if (row) row.__zcodeproUserTouched = Date.now();
-    }, true);
-  }
-  function currentTaskRow() {
-    for (const el of document.querySelectorAll("[data-task-item-key]")) {
-      if ((el.className + "").includes("bg-selected")) return el;
-    }
-    return null;
-  }
-  function collapseNavSafe(head) {
-    const cur = currentTaskRow();
-    const backKey = cur ? cur.getAttribute("data-task-item-key") : "";
-    head.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true }));
-    if (!backKey) return;
-    const back = cur && cur.isConnected ? cur : document.querySelector(`[data-task-item-key="${cssEscape(backKey)}"]`);
-    if (back) back.dispatchEvent(new MouseEvent("click", { bubbles: true, cancelable: true }));
-  }
-  function collapseAfterContentLoaded(wsRow) {
-    const deadline = Date.now() + 25e3;
-    let lastLen = (document.querySelector("main") || document.body).innerText.length;
-    let grewAt = 0;
-    let settledAt = 0;
-    const headOf = () => {
-      const h2 = wsRow.matches("[aria-expanded]") ? wsRow : wsRow.querySelector("[aria-expanded]");
-      return h2 || null;
-    };
-    const userTouched2 = () => wsRow.__zcodeproUserTouched && Date.now() - wsRow.__zcodeproUserTouched < 800;
-    const tick2 = () => {
-      if (!keepCollapsed || Date.now() > deadline || !wsRow.isConnected) return done();
-      const len = (document.querySelector("main") || document.body).innerText.length;
-      if (len > lastLen) grewAt = Date.now();
-      if (grewAt && Date.now() - grewAt >= 1e3) settledAt = settledAt || Date.now();
-      lastLen = len;
-      const head = headOf();
-      if (head && head.getAttribute("aria-expanded") === "true" && !userTouched2()) {
-        collapseNavSafe(head);
-      }
-      if (settledAt && Date.now() - settledAt >= 1e3) {
-        const h2 = headOf();
-        if (h2 && h2.getAttribute("aria-expanded") === "true" && !userTouched2()) {
-          collapseNavSafe(h2);
-        }
-        return done();
-      }
-      setTimeout(tick2, 200);
-    };
-    const done = () => {
-      wsRow.__zcodeproSuppending = false;
-    };
-    wsRow.__zcodeproSuppending = true;
-    setTimeout(tick2, 400);
-  }
-  function cssEscape(s) {
-    return String(s).replace(/(["\\\]])/g, "\\$1");
-  }
-
   // src/inject/features/ws-running.js
-  var installed5 = false;
+  var installed4 = false;
   var enabled3 = true;
   var SCAN_DEBOUNCE_MS4 = 150;
   var SCAN_FALLBACK_MS4 = 5e3;
@@ -6150,34 +6837,148 @@
   var PEEK_SETTLE_MS = 160;
   var PEEK_MAX_MS = 1500;
   var PEEK_UNMOUNT_WAIT_MS = 800;
-  var CONFIG_POLL_MIN_MS2 = 5e3;
-  var CONFIG_POLL_MAX_MS2 = 6e4;
+  var CONFIG_POLL_MIN_MS = 5e3;
+  var CONFIG_POLL_MAX_MS = 6e4;
   var TASK_SEL3 = "[data-task-item-key]";
-  var WS_SEL = '[data-testid^="workspace-item-"]';
+  var WS_SEL = () => projectRowSelector();
+  function findWsRow(ws) {
+    return findProjectRow(ws);
+  }
+  var LOADER_FALLBACK_PATHS = [
+    "M12 2v4",
+    "m16.2 7.8 2.9-2.9",
+    "M18 12h4",
+    "m19.8 16.2-2.9 2.9",
+    "M12 18v4",
+    "m7.8 19.8-2.9-2.9",
+    "M6 12H2",
+    "m4.2 7.8 2.9-2.9"
+  ];
+  function makeLoaderSvg(baseClass) {
+    const ns = "http://www.w3.org/2000/svg";
+    const proto = document.querySelector("svg.lucide-loader");
+    if (proto) {
+      const clone = proto.cloneNode(true);
+      const origClass = proto.getAttribute("class") || "";
+      const keep = origClass.split(/\s+/).filter((c) => /^(size-|text-)/.test(c)).join(" ");
+      clone.setAttribute("class", ((keep || baseClass) + " animate-spin zcodepro-ws-loader").trim());
+      return clone;
+    }
+    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", (baseClass + " animate-spin zcodepro-ws-loader").trim());
+    for (const d of LOADER_FALLBACK_PATHS) {
+      const path = document.createElementNS(ns, "path");
+      path.setAttribute("d", d);
+      svg.append(path);
+    }
+    return svg;
+  }
+  function setRunningIcon(holder, on) {
+    if (!holder) return;
+    if (on) {
+      if (holder.querySelector(":scope > svg.zcodepro-ws-loader")) return;
+      const orig0 = holder.querySelector(":scope > svg:not(.zcodepro-ws-loader)");
+      const base = (orig0 ? orig0.getAttribute("class") || "" : "size-4").replace(/lucide-[a-z-]*/g, "").trim() || "size-4";
+      holder.append(makeLoaderSvg(base));
+    } else {
+      holder.querySelectorAll(":scope > svg.zcodepro-ws-loader").forEach((el) => el.remove());
+    }
+  }
+  function iconHolderOf(row) {
+    if (row.hasAttribute && row.hasAttribute("data-project-id")) {
+      const toggle2 = row.querySelector('[data-testid="virtual-project-toggle"]');
+      return toggle2 ? toggle2.querySelector(":scope > span") : null;
+    }
+    return row.firstElementChild && row.firstElementChild.querySelector(":scope > span");
+  }
+  function isRunningRow(el) {
+    const scope = el.firstElementChild;
+    if (!scope) return false;
+    const svg = scope.querySelector('svg[class*="lucide-loader"]');
+    return !!svg;
+  }
   var runningByWs = /* @__PURE__ */ new Map();
   var peekTimers = /* @__PURE__ */ new Map();
   var activePeeks = /* @__PURE__ */ new Set();
   var peekedWs = /* @__PURE__ */ new Set();
   var wsWithRows = /* @__PURE__ */ new Set();
+  var servicesRef = null;
+  function findServices() {
+    if (servicesRef) return servicesRef;
+    try {
+      const rootEl = document.getElementById("root");
+      const containerKey = rootEl && Object.keys(rootEl).find((k) => k.startsWith("__reactContainer$"));
+      if (!containerKey) return null;
+      const seen = /* @__PURE__ */ new Set();
+      let found = null;
+      const scanObj = (o) => {
+        if (!o || typeof o !== "object" || seen.has(o) || found) return;
+        seen.add(o);
+        const ts = o.zcodeTaskService;
+        if (ts && typeof ts === "object" && typeof ts.releaseWorkspacePreparation === "function") found = o;
+      };
+      let visited = 0;
+      const visit = (f) => {
+        if (!f || found || visited > 6e4) return;
+        visited++;
+        for (const holder of [f.memoizedProps, f.memoizedState]) {
+          if (!holder || typeof holder !== "object") continue;
+          scanObj(holder);
+          for (const v of Object.values(holder)) {
+            if (v && typeof v === "object") scanObj(v);
+          }
+        }
+        visit(f.child);
+        visit(f.sibling);
+      };
+      visit(rootEl[containerKey]);
+      if (found) servicesRef = found;
+      return found;
+    } catch {
+      return null;
+    }
+  }
+  async function authoritativeIdle(ws) {
+    const services = findServices();
+    const ts = services && services.zcodeTaskService;
+    if (!ts || typeof ts.listActiveTaskIds !== "function") return null;
+    try {
+      const base = String(ws).replace(/[\\/]+$/, "");
+      const a = await ts.listActiveTaskIds({ workspacePath: base });
+      const b = await ts.listActiveTaskIds({ workspacePath: base + "/" });
+      const ids = [...Array.isArray(a) ? a : [], ...Array.isArray(b) ? b : []].map(String);
+      if (!Array.isArray(a) || !Array.isArray(b)) return null;
+      if (!ids.length) return true;
+      const st = await rpc("/task-statuses?ids=" + encodeURIComponent(ids.join(","))).catch(() => null);
+      const TERMINAL = /* @__PURE__ */ new Set(["completed", "error", "interrupted"]);
+      const live = (id) => {
+        const rec = st && st.ok && st.available ? st.statuses[id] : void 0;
+        if (rec === void 0) return true;
+        if (!TERMINAL.has(rec.status)) return true;
+        return Date.now() - rec.updatedAt < 3e5;
+      };
+      return !ids.some(live);
+    } catch {
+      return null;
+    }
+  }
   function workspaceOf2(key) {
     const i = key.indexOf(":sess_");
     return i > 0 ? key.slice(0, i) : key;
   }
-  function findWsRow(ws) {
-    return document.querySelector(`[data-testid="workspace-item-${CSS.escape(ws)}"]`);
-  }
   function wsHead(row) {
     return row.matches("[aria-expanded]") ? row : row.querySelector("[aria-expanded]");
   }
-  function isRunningRow(el) {
-    const holder = el.firstElementChild && el.firstElementChild.querySelector(":scope > span");
-    if (!holder) return false;
-    return [...holder.children].some((c) => c.tagName === "svg" && (c.getAttribute("class") || "").includes("lucide-loader"));
-  }
   function domRowsOf(ws) {
     return [...document.querySelectorAll(TASK_SEL3)].filter((e) => workspaceOf2(e.getAttribute("data-task-item-key") || "") === ws);
   }
-  function currentTaskRow2() {
+  function currentTaskRow() {
     for (const el of document.querySelectorAll(TASK_SEL3)) {
       if ((el.className + "").includes("bg-selected")) return el;
     }
@@ -6190,7 +6991,7 @@
     }
   };
   function toggleNavSafe(head) {
-    const cur = currentTaskRow2();
+    const cur = currentTaskRow();
     const backKey = cur ? cur.getAttribute("data-task-item-key") : "";
     synthClick(head);
     if (!backKey) return;
@@ -6258,17 +7059,169 @@
   }
   function apply() {
     const seen = /* @__PURE__ */ new Set();
-    for (const row of document.querySelectorAll(WS_SEL)) {
-      const path = row.getAttribute("data-testid").slice("workspace-item-".length);
+    for (const row of document.querySelectorAll(WS_SEL())) {
+      const path = rowPath(row);
+      if (!path) continue;
       seen.add(path);
       const head = wsHead(row);
       const collapsed = !head || head.getAttribute("aria-expanded") === "false";
-      const running = !!(enabled3 && collapsed && runningByWs.get(path) && runningByWs.get(path).size);
-      const icon = row.firstElementChild && row.firstElementChild.querySelector(":scope > span");
-      if (icon) icon.classList.toggle("zcodepro-ws-running", running);
-    }
+      const domRunning = !!(runningByWs.get(path) && runningByWs.get(path).size);
+      const normP = (v) => String(v || "").replace(/[\\/]+$/, "");
+      const running = enabled3 && collapsed && (activeProjectPaths.size ? [...activeProjectPaths].some((p2) => normP(p2) === normP(path)) : domRunning);
+      const icon = iconHolderOf(row);
+      icon?.classList.toggle("zcodepro-ws-running", running);
+      setRunningIcon(icon, running);
+    }
+    applySectionSpin();
     for (const ws of [...runningByWs.keys()]) if (!seen.has(ws)) runningByWs.delete(ws);
   }
+  var headInfoCache = /* @__PURE__ */ new WeakMap();
+  var PROJECT_HEAD_TEXTS = /* @__PURE__ */ new Set(["\u9879\u76EE", "projects"]);
+  var TASK_HEAD_TEXTS = /* @__PURE__ */ new Set(["\u4EFB\u52A1", "tasks"]);
+  function kindFromHeadText(head) {
+    const text = (head.textContent || "").trim().toLowerCase();
+    if (PROJECT_HEAD_TEXTS.has(text)) return "project";
+    if (TASK_HEAD_TEXTS.has(text)) return "task";
+    return null;
+  }
+  function sectionHeads() {
+    const heads = [];
+    for (const sv of document.querySelectorAll("svg[data-purpose-section-chevron]")) {
+      const btn = sv.closest("button");
+      if (btn) heads.push(btn);
+    }
+    for (const h3 of document.querySelectorAll("h3")) heads.push(h3);
+    return heads.map((head) => {
+      const cached = headInfoCache.get(head);
+      if (cached) return { head, cont: cached.cont, kind: cached.kind };
+      const textKind = head.tagName === "BUTTON" ? kindFromHeadText(head) : "task";
+      let cont = head.parentElement;
+      while (cont && !cont.querySelector("li[data-task-item-key]") && cont !== document.body) cont = cont.parentElement;
+      const contOk = cont && cont !== document.body;
+      const kind = textKind || (contOk ? cont.querySelector("section[data-project-id]") ? "project" : "task" : null);
+      headInfoCache.set(head, { cont: contOk ? cont : null, kind });
+      return { head, cont: contOk ? cont : null, kind };
+    }).filter((x) => x.head);
+  }
+  var SEC_SPIN_CLASS = "zcodepro-ws-sec-spin";
+  var anyActiveCache = { at: 0, value: null, busy: false };
+  var sectionActive = { task: false, project: false };
+  var activeProjectPaths = /* @__PURE__ */ new Set();
+  setInterval(() => {
+    if (!anyActiveCache.busy && Date.now() - anyActiveCache.at >= 1e4) globalAnyActive();
+  }, 1e4);
+  function globalAnyActive() {
+    if (anyActiveCache.value !== null && Date.now() - anyActiveCache.at < 1e4) return anyActiveCache.value;
+    if (anyActiveCache.busy) return anyActiveCache.value === true;
+    anyActiveCache.busy = true;
+    sectionActive.task = false;
+    sectionActive.project = false;
+    activeProjectPaths = /* @__PURE__ */ new Set();
+    void (async () => {
+      let hit = null;
+      try {
+        const res = await rpc("/projects-v2").catch(() => null);
+        const services = findServices();
+        const ts = services && services.zcodeTaskService;
+        if (res && res.ok && res.available && ts && typeof ts.listActiveTaskIds === "function") {
+          hit = false;
+          const projPaths = /* @__PURE__ */ new Set();
+          for (const proj of res.projects || []) {
+            for (const r of proj.roots || []) {
+              const b = String(r.path || "").replace(/[\\/]+$/, "");
+              if (b) projPaths.add(b);
+            }
+          }
+          const taskSidePaths = /* @__PURE__ */ new Set();
+          for (const el of document.querySelectorAll("[data-task-item-key]")) {
+            const sec = el.closest("section[data-project-id]");
+            if (sec) continue;
+            const k = el.getAttribute("data-task-item-key") || "";
+            const cut = k.lastIndexOf(":");
+            if (cut > 1) taskSidePaths.add(k.slice(0, cut).replace(/[\\/]+$/, ""));
+          }
+          const scanPaths = /* @__PURE__ */ new Set([...projPaths, ...taskSidePaths]);
+          const byKind = { task: /* @__PURE__ */ new Set(), project: /* @__PURE__ */ new Set() };
+          const byKindByPath = /* @__PURE__ */ new Map();
+          const rootToProject = /* @__PURE__ */ new Map();
+          const projectPaths = /* @__PURE__ */ new Map();
+          for (const proj of res.projects || []) {
+            const names = [];
+            for (const r of proj.roots || []) {
+              const b = String(r.path || "").replace(/[\\/]+$/, "");
+              if (b) {
+                rootToProject.set(b, proj.name);
+                names.push(b);
+              }
+            }
+            projectPaths.set(proj.name, names);
+          }
+          for (const base of scanPaths) {
+            const a = await ts.listActiveTaskIds({ workspacePath: base });
+            const b = await ts.listActiveTaskIds({ workspacePath: base + "/" });
+            const ids = [...Array.isArray(a) ? a : [], ...Array.isArray(b) ? b : []].map(String);
+            if (!ids.length) continue;
+            byKindByPath.set(base, ids);
+            const kind = projPaths.has(base) ? "project" : "task";
+            for (const id of ids) byKind[kind].add(id);
+          }
+          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 live = (id) => {
+            const rec = st && st.ok && st.available ? st.statuses[id] : void 0;
+            if (rec === void 0) return true;
+            if (!TERMINAL.has(rec.status)) return true;
+            return Date.now() - rec.updatedAt < 3e5;
+          };
+          activeProjectPaths = /* @__PURE__ */ new Set();
+          for (const [base, ids] of byKindByPath) {
+            if (!projPaths.has(base)) continue;
+            if (ids.some(live)) {
+              const projName = rootToProject.get(base);
+              if (projName) for (const p2 of projectPaths.get(projName) || []) activeProjectPaths.add(p2);
+            }
+          }
+          const taskDomRunning = !!document.querySelector('[data-task-item-key]:not(section[data-project-id] *) svg[class*="lucide-loader"]');
+          if (taskDomRunning && [...byKind.task].some(live)) sectionActive.task = true;
+          if ([...byKind.project].some(live)) sectionActive.project = true;
+          hit = sectionActive.task || sectionActive.project;
+        }
+      } catch {
+      }
+      if (hit !== null) anyActiveCache = { at: Date.now(), value: hit, busy: false };
+      else anyActiveCache.busy = false;
+      apply();
+    })();
+    return anyActiveCache.value === true;
+  }
+  function applySectionSpin() {
+    if (!enabled3) {
+      document.querySelectorAll("." + SEC_SPIN_CLASS).forEach((el) => el.remove());
+      return;
+    }
+    for (const { head, cont, kind } of sectionHeads()) {
+      const running = !!(cont && cont.querySelector('li[data-task-item-key] svg[class*="lucide-loader"]'));
+      let expanded = true;
+      if (head.tagName === "BUTTON") expanded = head.getAttribute("aria-expanded") !== "false";
+      else {
+        const list = head.nextElementSibling;
+        expanded = !list || list.offsetHeight > 0;
+      }
+      if (!kind) return;
+      const scoped = kind === "project" ? sectionActive.project : sectionActive.task;
+      const want = !expanded && scoped;
+      const existing = head.querySelector(":scope > ." + SEC_SPIN_CLASS);
+      if (want && !existing) {
+        const span = document.createElement("span");
+        span.className = "flex size-4 shrink-0 items-center justify-center " + SEC_SPIN_CLASS;
+        span.append(makeLoaderSvg("size-4"));
+        head.prepend(span);
+      } else if (!want && existing) {
+        existing.remove();
+      }
+    }
+  }
   function schedulePeek(ws, delay) {
     clearTimeout(peekTimers.get(ws));
     peekTimers.set(ws, setTimeout(() => {
@@ -6300,6 +7253,24 @@
   }
   var peekChain = Promise.resolve();
   async function peek(ws, opts) {
+    if (!opts?.manual) {
+      const auth = await authoritativeIdle(ws);
+      if (auth !== null) {
+        if (auth) {
+          runningByWs.delete(ws);
+        } else {
+          let set = runningByWs.get(ws);
+          if (!set) {
+            set = /* @__PURE__ */ new Set();
+            runningByWs.set(ws, set);
+          }
+          set.add(ws + ":active");
+          schedulePeek(ws, PEEK_REPEAT_MS);
+        }
+        apply();
+        return true;
+      }
+    }
     const run = () => peekInner(ws, opts);
     const p = peekChain.then(run, run);
     peekChain = p.catch(() => {
@@ -6311,7 +7282,7 @@
     const row = findWsRow(ws);
     const head = row && wsHead(row);
     if (!row || !head || head.getAttribute("aria-expanded") !== "false") return false;
-    if (!currentTaskRow2()) {
+    if (!currentTaskRow()) {
       schedulePeek(ws, PEEK_REPEAT_MS);
       return false;
     }
@@ -6327,9 +7298,10 @@
     document.body.append(frozen);
     row.style.visibility = "hidden";
     const hider = installPeekHider(ws);
+    let readOk = false;
     try {
       toggleNavSafe(head);
-      await settleAndRead(ws);
+      readOk = await settleAndRead(ws);
       const rowNow = findWsRow(ws) || row;
       const headNow = wsHead(rowNow);
       if (headNow && headNow.getAttribute("aria-expanded") === "true" && !userTouched(rowNow)) {
@@ -6345,10 +7317,10 @@
     apply();
     const set = runningByWs.get(ws);
     if (set && set.size && enabled3) schedulePeek(ws, PEEK_REPEAT_MS);
-    return true;
+    return readOk;
   }
   function wsRunningSnapshot() {
-    const curKey = currentTaskRow2()?.getAttribute("data-task-item-key") || "";
+    const curKey = currentTaskRow()?.getAttribute("data-task-item-key") || "";
     return {
       running: [...runningByWs.entries()].filter(([, set]) => set.size > 0).map(([ws]) => ws),
       current: curKey ? workspaceOf2(curKey) || null : null
@@ -6378,6 +7350,7 @@
       const t0 = Date.now();
       let lastCount = -1;
       let stableAt = 0;
+      let zeroRows = false;
       const timer = setInterval(() => {
         const rows = domRowsOf(ws);
         const elapsed = Date.now() - t0;
@@ -6389,7 +7362,7 @@
         if (!settled && elapsed < PEEK_MAX_MS) return;
         clearInterval(timer);
         if (lastCount === 0) {
-          runningByWs.delete(ws);
+          zeroRows = true;
         } else {
           let set = runningByWs.get(ws);
           if (!set) {
@@ -6402,7 +7375,7 @@
             else set.delete(key);
           }
         }
-        resolve();
+        resolve(!zeroRows);
       }, 80);
     });
   }
@@ -6443,18 +7416,18 @@
   }
   function relevant(muts) {
     for (const m of muts) {
-      if (inSel(m.target, TASK_SEL3) || inSel(m.target, WS_SEL)) return true;
+      if (inSel(m.target, TASK_SEL3) || inSel(m.target, WS_SEL())) return true;
       for (const n of m.addedNodes) {
-        if (n instanceof Element && (n.matches(TASK_SEL3) || n.matches(WS_SEL) || n.querySelector(TASK_SEL3) || n.querySelector(WS_SEL))) return true;
+        if (n instanceof Element && (n.matches(TASK_SEL3) || n.matches(WS_SEL()) || n.querySelector(TASK_SEL3) || n.querySelector(WS_SEL()))) return true;
       }
       for (const n of m.removedNodes) {
-        if (n instanceof Element && (n.matches(TASK_SEL3) || n.matches(WS_SEL) || n.querySelector(TASK_SEL3))) return true;
+        if (n instanceof Element && (n.matches(TASK_SEL3) || n.matches(WS_SEL()) || n.querySelector(TASK_SEL3))) return true;
       }
     }
     return false;
   }
-  var pollMs2 = CONFIG_POLL_MIN_MS2;
-  async function refreshConfig2() {
+  var pollMs = CONFIG_POLL_MIN_MS;
+  async function refreshConfig() {
     try {
       const res = await rpc("/config");
       if (res && res.ok && res.config && res.config.features) {
@@ -6472,19 +7445,19 @@
     }
     return false;
   }
-  function pollConfig2() {
+  function pollConfig() {
     setTimeout(async () => {
-      if (document.hidden) pollMs2 = CONFIG_POLL_MAX_MS2;
-      else pollMs2 = await refreshConfig2() ? CONFIG_POLL_MIN_MS2 : Math.min(Math.round(pollMs2 * 1.5), CONFIG_POLL_MAX_MS2);
-      pollConfig2();
-    }, pollMs2);
+      if (document.hidden) pollMs = CONFIG_POLL_MAX_MS;
+      else pollMs = await refreshConfig() ? CONFIG_POLL_MIN_MS : Math.min(Math.round(pollMs * 1.5), CONFIG_POLL_MAX_MS);
+      pollConfig();
+    }, pollMs);
   }
   var scanDebounce4 = 0;
   function startWsRunningSpin() {
-    if (installed5 || typeof document === "undefined") return;
-    installed5 = true;
-    void refreshConfig2();
-    pollConfig2();
+    if (installed4 || typeof document === "undefined") return;
+    installed4 = true;
+    void refreshConfig();
+    pollConfig();
     const observer2 = new MutationObserver((muts) => {
       if (!relevant(muts)) return;
       handleRemovals(muts);
@@ -6505,14 +7478,13 @@
     });
     document.addEventListener("click", (e) => {
       if (!e.isTrusted) return;
-      const row = e.target instanceof Element && e.target.closest(WS_SEL);
+      const row = e.target instanceof Element && e.target.closest(WS_SEL());
       if (row) wsTouchAt.set(row, Date.now());
     }, true);
   }
 
   // src/inject/features/idle-reclaim.js
   var CHECK_MS = 3e4;
-  var WS_SEL2 = '[data-testid^="workspace-item-"]';
   var MIN_MINUTES = 1;
   var MAX_MINUTES = 1440;
   var idleSince = /* @__PURE__ */ new Map();
@@ -6520,46 +7492,16 @@
   var scanDisabledLogged = false;
   var bootAt = Date.now();
   var startupSweepDone = false;
-  var servicesRef = null;
-  function findServices() {
-    if (servicesRef) return servicesRef;
-    try {
-      const rootEl = document.getElementById("root");
-      const containerKey = rootEl && Object.keys(rootEl).find((k) => k.startsWith("__reactContainer$"));
-      if (!containerKey) return null;
-      const seen = /* @__PURE__ */ new Set();
-      let found = null;
-      const scanObj = (o) => {
-        if (!o || typeof o !== "object" || seen.has(o) || found) return;
-        seen.add(o);
-        const ts = o.zcodeTaskService;
-        if (ts && typeof ts === "object" && typeof ts.releaseWorkspacePreparation === "function") found = o;
-      };
-      let visited = 0;
-      const visit = (f) => {
-        if (!f || found || visited > 6e4) return;
-        visited++;
-        for (const holder of [f.memoizedProps, f.memoizedState]) {
-          if (!holder || typeof holder !== "object") continue;
-          scanObj(holder);
-          for (const v of Object.values(holder)) {
-            if (v && typeof v === "object") scanObj(v);
-          }
-        }
-        visit(f.child);
-        visit(f.sibling);
-      };
-      visit(rootEl[containerKey]);
-      if (found) servicesRef = found;
-      return found;
-    } catch {
-      return null;
-    }
-  }
-  function sidebarWorkspaces() {
+  async function sidebarWorkspaces() {
     const out = /* @__PURE__ */ new Set();
-    for (const el of document.querySelectorAll(WS_SEL2)) {
-      out.add(el.getAttribute("data-testid").slice("workspace-item-".length));
+    const res = await rpc("/projects-v2").catch(() => null);
+    if (res && res.ok && res.available) {
+      for (const proj of res.projects || []) {
+        for (const r of proj.roots || []) {
+          const p = String(r.path || "").replace(/[\/]+$/, "");
+          if (p) out.add(p);
+        }
+      }
     }
     return out;
   }
@@ -6578,8 +7520,14 @@
     }
   }
   async function tryReclaim(ws, cooldownMs) {
-    const verifiedIdle = await verifyWorkspaceNotRunning(ws);
-    if (!verifiedIdle) {
+    const auth = await authoritativeIdle(ws);
+    if (auth === null) {
+      const verifiedIdle = await verifyWorkspaceNotRunning(ws);
+      if (!verifiedIdle) {
+        blockUntil.set(ws, Date.now() + cooldownMs);
+        return;
+      }
+    } else if (!auth) {
       blockUntil.set(ws, Date.now() + cooldownMs);
       return;
     }
@@ -6609,7 +7557,7 @@
     }
     const busy = new Set(snap.running);
     busy.add(snap.current);
-    const workspaces = sidebarWorkspaces();
+    const workspaces = await sidebarWorkspaces();
     for (const ws of [...idleSince.keys(), ...blockUntil.keys()]) {
       if (!workspaces.has(ws)) {
         idleSince.delete(ws);
@@ -6665,24 +7613,34 @@
   var SYNC_DEBOUNCE_MS = 150;
   var SCAN_FALLBACK_MS5 = 5e3;
   var ROW_SEL = "[data-task-item-key]";
-  var MENU_SEL = '[data-testid="task-new-button"], [data-testid="automations-open"], [data-testid="plugin-store-sidebar-open"], [data-slot="command"], [data-testid="desktop-top-nav-back"]';
+  var MENU_SEL = '[data-testid="task-new-button"], [data-testid="automations-open"], [data-testid="plugin-store-sidebar-open"], [data-testid="sidebar-search-open"], [data-slot="command"], [data-testid="desktop-top-nav-back"]';
   var enabled4 = true;
   var rowEl = null;
   var origs = null;
   var syncTimer = 0;
   var widthObserver = null;
   var widthObserved = null;
-  function findMenu() {
-    const nt = document.querySelector('[data-testid="task-new-button"]');
-    const menu = nt?.parentElement;
-    return menu && menu.querySelector('[data-testid="automations-open"]') ? menu : null;
-  }
-  function originalsOf(menu) {
-    const newTask = menu.querySelector('[data-testid="task-new-button"]');
-    const search = newTask && menu.querySelector('button [class*="lucide-search"]')?.closest("button");
-    const auto = menu.querySelector('[data-testid="automations-open"]');
-    const plugin = menu.querySelector('[data-testid="plugin-store-sidebar-open"]');
-    return newTask && search && auto && plugin ? { menu, newTask, search, auto, plugin } : null;
+  function findParts() {
+    const newTask = document.querySelector('[data-testid="task-new-button"]');
+    if (!newTask) return null;
+    if (!isNewProjectSidebar()) {
+      const menu = newTask.parentElement;
+      if (!menu || !menu.querySelector('[data-testid="automations-open"]')) return null;
+      const search2 = menu.querySelector('button [class*="lucide-search"]')?.closest("button");
+      const auto2 = menu.querySelector('[data-testid="automations-open"]');
+      const plugin2 = menu.querySelector('[data-testid="plugin-store-sidebar-open"]');
+      return search2 && auto2 && plugin2 ? { newTask, search: search2, auto: auto2, plugin: plugin2, hideEls: [menu] } : null;
+    }
+    const search = document.querySelector('[data-testid="sidebar-search-open"]');
+    const auto = document.querySelector('[data-testid="automations-open"]');
+    const plugin = document.querySelector('[data-testid="plugin-store-sidebar-open"]');
+    if (!search || !auto || !plugin) return null;
+    const hideEls = [.../* @__PURE__ */ new Set([
+      newTask.closest('[data-testid="sidebar-primary-navigation"]'),
+      auto.closest('[data-testid="sidebar-primary-navigation"]'),
+      search.closest('[data-testid="sidebar-search-toolbar"]')
+    ])].filter(Boolean);
+    return hideEls.length ? { newTask, search, auto, plugin, hideEls } : null;
   }
   function nameOf(orig, nameSel, fallback) {
     let name = nameSel && (orig.querySelector(nameSel)?.textContent || "").trim();
@@ -6708,6 +7666,7 @@
     else btn.removeAttribute("data-active");
     if (kind === "auto" || kind === "plugin") btn.setAttribute("aria-pressed", on ? "true" : "false");
   }
+  var lastSelectedKey = "";
   function syncActive() {
     if (!origs || !rowEl) return;
     const auto = origs.auto.getAttribute("aria-pressed") === "true";
@@ -6717,23 +7676,37 @@
     for (const el of document.querySelectorAll(ROW_SEL)) {
       if ((el.className + "").includes("bg-selected")) {
         selected = true;
+        lastSelectedKey = el.getAttribute("data-task-item-key") || lastSelectedKey;
         break;
       }
     }
-    setActive("newTask", !selected && !auto && !plugin);
+    let newTaskOn = false;
+    if (!selected && lastSelectedKey) {
+      const stillMounted = document.querySelector(`${ROW_SEL}[data-task-item-key="${CSS.escape(lastSelectedKey)}"]`);
+      if (stillMounted) {
+        newTaskOn = !auto && !plugin;
+        lastSelectedKey = "";
+      } else {
+        const btn = rowEl?.querySelector('[data-kind="newTask"]');
+        newTaskOn = btn ? btn.getAttribute("data-active") === "1" : false;
+      }
+    } else if (!selected) {
+      newTaskOn = !auto && !plugin;
+    }
+    setActive("newTask", newTaskOn);
     setActive("search", palette);
     setActive("auto", auto);
     setActive("plugin", plugin);
   }
   function rebuild() {
-    const menu = findMenu();
-    if (!menu) return false;
-    const next = originalsOf(menu);
+    const parts = findParts();
     const navRow = document.querySelector('[data-testid="desktop-top-nav-back"]')?.parentElement;
-    if (!next || !navRow) return false;
-    if (origs && origs.menu !== menu) origs.menu.classList.remove(HIDE_CLASS);
-    menu.classList.add(HIDE_CLASS);
-    origs = next;
+    if (!parts || !navRow) return false;
+    if (origs && origs.hideEls[0] !== parts.hideEls[0]) {
+      for (const el of origs.hideEls) el.classList.remove(HIDE_CLASS);
+    }
+    for (const el of parts.hideEls) el.classList.add(HIDE_CLASS);
+    origs = parts;
     rowEl?.remove();
     navRow.classList.add("zcodepro-tb-hidden-native");
     const L = t();
@@ -6748,17 +7721,17 @@
         setTimeout(syncActive, 150);
       }
     });
-    const newBtn = mk("newTask", next.newTask, "span.truncate", L.tbNewTask);
-    const icon = iconOf(next.newTask);
+    const newBtn = mk("newTask", parts.newTask, "span.truncate", L.tbNewTask);
+    const icon = iconOf(parts.newTask);
     if (icon) newBtn.append(icon);
-    const searchBtn = mk("search", next.search, "span.truncate", L.tbSearch);
-    const sIcon = iconOf(next.search);
+    const searchBtn = mk("search", parts.search, "span.truncate", L.tbSearch);
+    const sIcon = iconOf(parts.search);
     if (sIcon) searchBtn.append(sIcon);
-    const autoBtn = mk("auto", next.auto, null, L.tbAutomations);
-    const aIcon = iconOf(next.auto);
+    const autoBtn = mk("auto", parts.auto, null, L.tbAutomations);
+    const aIcon = iconOf(parts.auto);
     if (aIcon) autoBtn.append(aIcon);
-    const pluginBtn = mk("plugin", next.plugin, null, L.tbPluginStore);
-    const pIcon = iconOf(next.plugin);
+    const pluginBtn = mk("plugin", parts.plugin, null, L.tbPluginStore);
+    const pIcon = iconOf(parts.plugin);
     if (pIcon) pluginBtn.append(pIcon);
     rowEl = h("div", { class: "zcodepro-tb-row" }, newBtn, searchBtn, autoBtn, pluginBtn);
     const updBtn = [...navRow.querySelectorAll("button")].find((b) => /bg-(success|emerald)/.test(b.className || ""));
@@ -6773,7 +7746,7 @@
   }
   var NARROW_SIDEBAR_PX = 260;
   function sidebarTooNarrow() {
-    const scroll = document.querySelector(".flex.flex-1.min-h-0.flex-col.gap-3.overflow-y-auto");
+    const scroll = document.querySelector(".flex.flex-1.min-h-0.flex-col.gap-3.overflow-y-auto") || document.querySelector("aside .min-h-0.flex-1.overflow-y-auto");
     if (!scroll) return false;
     if (!widthObserver) widthObserver = new ResizeObserver(() => scheduleSync());
     if (widthObserved !== scroll) {
@@ -6785,18 +7758,18 @@
   }
   function sync() {
     if (!enabled4) return;
-    const menu = findMenu();
-    if (!menu) {
+    const parts = findParts();
+    if (!parts) {
       if (rowEl) rowEl.style.display = "none";
       return;
     }
     if (sidebarCollapsed() || sidebarTooNarrow()) {
       if (rowEl) rowEl.style.display = "none";
-      menu.classList.remove(HIDE_CLASS);
+      for (const el of parts.hideEls) el.classList.remove(HIDE_CLASS);
       document.querySelectorAll(".zcodepro-tb-hidden-native").forEach((el) => el.classList.remove("zcodepro-tb-hidden-native"));
       return;
     }
-    const alive = origs && origs.menu === menu && origs.newTask.isConnected && origs.search.isConnected && origs.auto.isConnected && origs.plugin.isConnected && rowEl && rowEl.isConnected;
+    const alive = origs && origs.hideEls[0] === parts.hideEls[0] && origs.newTask.isConnected && origs.search.isConnected && origs.auto.isConnected && origs.plugin.isConnected && rowEl && rowEl.isConnected;
     if (!alive && !rebuild()) {
       if (rowEl) rowEl.style.display = "none";
       setTimeout(scheduleSync, 400);
@@ -6805,7 +7778,7 @@
     }
     const navRow = document.querySelector('[data-testid="desktop-top-nav-back"]')?.parentElement;
     if (navRow) navRow.classList.add("zcodepro-tb-hidden-native");
-    menu.classList.add(HIDE_CLASS);
+    for (const el of parts.hideEls) el.classList.add(HIDE_CLASS);
     if (rowEl) rowEl.style.display = "";
     syncActive();
   }
@@ -6839,12 +7812,12 @@
     rowEl?.remove();
     rowEl = null;
     if (origs) {
-      origs.menu.classList.remove(HIDE_CLASS);
+      for (const el of origs.hideEls) el.classList.remove(HIDE_CLASS);
       document.querySelectorAll(".zcodepro-tb-hidden-native").forEach((el) => el.classList.remove("zcodepro-tb-hidden-native"));
       origs = null;
     }
   }
-  async function refreshConfig3() {
+  async function refreshConfig2() {
     const cfg = await getConfig(true).catch(() => null);
     enabled4 = !cfg || !cfg.features || cfg.features.toolbarIcons !== false;
     if (enabled4) sync();
@@ -6853,9 +7826,9 @@
   function startToolbarIcons() {
     ensureStyle();
     window.addEventListener("zcodepro:config-changed", () => {
-      void refreshConfig3();
+      void refreshConfig2();
     });
-    void refreshConfig3();
+    void refreshConfig2();
     new MutationObserver((muts) => {
       if (relevantMutations(muts)) scheduleSync();
     }).observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ["class", "aria-pressed"] });
@@ -6877,8 +7850,8 @@
   var syncTimer2 = 0;
   function findPinnedHeader() {
     for (const h3 of document.querySelectorAll("h3")) {
-      const ul = h3.nextElementSibling;
-      if (ul && ul.tagName === "UL" && ul.querySelector("li[data-task-item-key]")) return h3;
+      const list = h3.nextElementSibling;
+      if (list && list.querySelector("li[data-task-item-key]")) return h3;
     }
     return null;
   }
@@ -6974,7 +7947,7 @@
       h3.parentElement?.classList.remove(COLLAPSED_CLASS);
     }
   }
-  async function refreshConfig4() {
+  async function refreshConfig3() {
     const cfg = await getConfig(true).catch(() => null);
     enabled5 = !cfg || !cfg.features || cfg.features.pinnedCollapse !== false;
     if (enabled5) sync2();
@@ -6983,9 +7956,9 @@
   function startPinnedCollapse() {
     ensureStyle();
     window.addEventListener("zcodepro:config-changed", () => {
-      void refreshConfig4();
+      void refreshConfig3();
     });
-    void refreshConfig4();
+    void refreshConfig3();
     new MutationObserver((muts) => {
       if (relevantMutations2(muts)) scheduleSync2();
     }).observe(document.body, { childList: true, subtree: true });
@@ -7060,6 +8033,10 @@
         void startAliasWatcher();
       } catch {
       }
+      try {
+        startAliasMigrationWatcher();
+      } catch {
+      }
       try {
         startTaskOrderWatcher();
       } catch {
@@ -7080,10 +8057,6 @@
         startImageMenu();
       } catch {
       }
-      try {
-        startPinnedExpandSuppression();
-      } catch {
-      }
       try {
         startWsRunningSpin();
       } catch {