dsh-m 0.9.80 → 0.9.82

package/CHANGELOG.md

@@ -8,6 +8,12 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## 中文
 
+### 0.9.82 功能：外部操作记录 failed 行单条移除——红点死锁解除（ADR-0018 修订）
+
+- **问题（红点死锁 + 操作层与展示层不对齐）**：外部记录（CLI / Agent 工具通道）失败后点亮设置 tab 红点，但外部行没有单条 ✕——0.9.79 的原裁决因服务端只有 list/clear 而不给出 ✕ 出口；唯一消除手段「清除已结束」连带清空全部终态记录（含成功历史），行为上等同永久亮灯，警报疲劳会让红点彻底失效。展示层（渠道徽标、按日分组、计数）0.9.79 起已与本地记录同构，唯独操作层掉队。
+- **方案（服务端 per-id 删除链路 + 客户端分流接线）**：core 新增 `removeExternalOperation(id)`（整文件读-改-写原子替换，幂等——id 不存在静默 no-op，保留记录原样透写不改写历史字段）；host-api 新增 `external-operations-remove` method（body.id string 校验 400，鉴权同 list/clear 零新增特例）；store 新增 `removeExternal(id)`（overlay 剔除 + **墓碑** `removedIds`——拦截在途 fetch 迟到响应把已删行并回，`clearExternal` 重置）；`canRemoveRow` 对外部记录放行 `failed`（done 仍不给 ✕，与面板「问题态才有 ✕」语义精确对齐）；`onOpsRemove` 按渠道分流——本地路径逐字节不变（R0 红线），外部路径**先 api 成功再动 overlay**（事务顺序强于「清除已结束」的 fire-and-forget），失败行保留 + err toast（`op.remove.failed` 新键，{err} 插值带出服务端错误线索，zh/en 同步）。单条 ✕ 无二次确认（与面板一致）。ADR-0018 文末追加修订注记，原裁决原文保留。
+- **验证**：1435 项测试全绿（0.9.80 基线 1425 + 净增 10：journal 存储 3、host-api method 4、store removeExternal+墓碑 2、canRemoveRow 改写与接线锚 2，含一处既有用例标题改写）、typecheck 零错误；实施计划经独立评审 Agent 三轮评审收敛（探针路径/链接期报错形态/墓碑兜底/断言保全/401 惯例/插值链路/回退口径 11 条意见全部闭环）。
+
 ### 0.9.80 修复：已装页开关抖动根治 + 社区开关定位恒定 + 「已实测」徽章退役（三项 UX 修复，client-only）
 
 - **① 已装页开关抖动根治（主人实拍：点开关整页抖、开关原地失踪、鼠标不再命中）**：CDP 实测每次点击开关发生 47px×2 卡片栅格位移 + 0.6–1.3s 命中丢失窗口（原点落到上方卡片 `.dshm-links` 外链行，误触即开浏览器标签）。根因三件：`ProgressLine`（install 专用 pnpm 进度条）对 toggle 也挂载（35px 行 + body 12px gap，插入/拔出即位移）；toast/重启横幅是面板 column flex 的流内子元素（出现/消失压缩 body 39px×2）；开关视觉翻转要等 5 个刷新请求落地（1.5–2.3s「点了没反应」真空期，且期间开关 `locked` 灰态）。修复：新增 `progressTarget`（仅 install/upgrade/self-upgrade 挂进度条；`activeMutateTarget` 语义不动，仍管逐行禁用）；toast/横幅包进 `.dshm-banner-stack`（absolute 底部浮层，pointer-events 穿透）；`pendingToggles` 乐观翻转（点击 42ms 即变，`finally` 摘除＝成功收敛/失败回滚）；toggle 只重取已装视图（installed+market×2+updates+external-operations → installed×1，`view-refresh.js` 未动、单测原样）；`.dshm-switch::before` 热区 34×19 → 46×31（视觉不变）。CDP 回测四断言全过：位移 0、命中零丢失、翻转 42ms、body 底缘 0 位移。
@@ -579,6 +585,12 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## English
 
+### 0.9.82 Feature — per-row dismiss for failed external operation records: the red-dot deadlock is broken (ADR-0018 revision)
+
+- **Problem (red-dot deadlock + ops layer lagging behind the display layer)**: a failed external record (CLI / agent-tool channel) lights the settings-tab red dot but had no per-row dismiss — the 0.9.79 ruling withheld the ✕ because the server only exposed list/clear. The only way to clear the dot, "Clear ended", also wipes every finished record (successful history included) — behaviorally a permanent alert, and alert fatigue defeats the dot entirely. The display layer (channel badge, day grouping, counts) has been isomorphic with local records since 0.9.79; only the operations layer lagged.
+- **Fix (server per-id delete chain + client channel branching)**: core gains `removeExternalOperation(id)` (whole-file read-modify-write atomic replace, idempotent — silent no-op for missing ids, surviving records written back verbatim); host-api gains the `external-operations-remove` method (body.id string-validated with 400, auth identical to list/clear — zero new special cases); the store gains `removeExternal(id)` (overlay removal + a **tombstone** set `removedIds` that intercepts in-flight fetch responses from re-adding just-deleted rows, reset by `clearExternal`); `canRemoveRow` lets external `failed` rows through (done still has no ✕, precisely matching the panel's problem-status-only rule); `onOpsRemove` branches by channel — the local path is byte-for-byte unchanged (R0 red line), the external path **awaits the server delete before touching the overlay**, and on failure keeps the row and toasts with the new `op.remove.failed` key ({err} interpolation carries the server error, zh/en). No confirmation dialog (same as the panel ✕). ADR-0018 gains a revision note; the original ruling text is preserved.
+- **Verification**: 1435 tests green (0.9.80 baseline 1425 + 10 net new: journal storage 3, host-api method 4, store removeExternal+tombstone 2, canRemoveRow rewrite and wiring anchors 2, incl. one retitled existing case), typecheck clean; the implementation plan converged through three independent review-agent rounds (probe path / link-time error shape / tombstone backstop / assertion preservation / 401 convention / interpolation chain / rollback stance — 11 findings all closed).
+
 ### Fixes in 0.9.80 — installed-tab toggle jitter eliminated + community switch pinned to its title row + 已实测 badge retired (three UX fixes, client-only)
 
 - **① Installed-tab toggle jitter eliminated (user report: clicking the switch shook the whole page, the switch vanished in place, and the cursor no longer hit it)**: CDP measurement showed a 47px×2 card-grid shift per click plus a 0.6–1.3s hit-test loss window (the cursor's fixed point landed on the card above's `.dshm-links` external-links row — a mis-click opens a browser tab). Three root causes: `ProgressLine` (the install-only pnpm progress bar) mounted for toggles too (35px row + 12px body gap — inserting/unmounting it is the shift itself); the toast/restart banners were in-flow flex children of the panel column (mount/dismiss compressed the body by 39px×2); the switch visually flipped only after five refresh requests landed (a 1.5–2.3s "nothing happened" dead window, with the switch greyed to `locked`). Fixes: a new `progressTarget` gates ProgressLine to install/upgrade/self-upgrade (`activeMutateTarget` semantics untouched — it still drives per-row disabling); toasts/banners are wrapped in `.dshm-banner-stack` (absolute bottom overlay, pointer-events pass-through); optimistic `pendingToggles` flips the switch in 42ms (cleared in `finally` — converges on success, reverts to server state on failure); toggle refreshes the installed view only (installed+market×2+updates+external-operations → installed×1; `view-refresh.js` untouched, its unit tests unchanged); `.dshm-switch::before` grows the hit area 34×19 → 46×31 (visuals unchanged). CDP re-probe passes all four assertions: zero drift, zero hit-loss, 42ms flip, stable body bottom edge.

package/lib/client.js

@@ -1404,6 +1404,7 @@ function createOperationsStore(storage) {
   let records = safeParse(s.read());
   let persistDegraded = false;
   let externalOverlay = [];
+  const removedIds = /* @__PURE__ */ new Set();
   const persist = () => {
     if (persistDegraded) return;
     try {
@@ -1421,13 +1422,24 @@ function createOperationsStore(storage) {
     setExternal(next) {
       const incoming = (Array.isArray(next) ? next : []).filter((r) => r && typeof r === "object" && typeof r.id === "string");
       const byId = new Map(externalOverlay.map((r) => [r.id, r]));
-      for (const r of incoming) byId.set(r.id, { ...byId.get(r.id) || {}, ...r });
+      for (const r of incoming) {
+        if (removedIds.has(r.id)) continue;
+        byId.set(r.id, { ...byId.get(r.id) || {}, ...r });
+      }
       externalOverlay = [...byId.values()];
       return this.listMerged();
     },
     /** 清空外部 overlay（「清除已结束」联动 external-operations-clear 成功后调用）。 */
     clearExternal() {
       externalOverlay = [];
+      removedIds.clear();
+      return this.listMerged();
+    },
+    /** 按 id 剔除外部 overlay（0.9.82 修订 R2-3）：仅内存视图——调用方必须已在服务端
+     *  删除成功后调用（external-operations-remove）；墓碑拦住在途 fetch 迟到响应的复活。 */
+    removeExternal(id) {
+      removedIds.add(id);
+      externalOverlay = externalOverlay.filter((r) => r.id !== id);
       return this.listMerged();
     },
     /** @returns {OperationRecord[]} 外部 overlay 当前快照（原始形态，浅拷贝）。 */
@@ -1730,13 +1742,14 @@ function opRowVm(r) {
     dir: isToggle && typeof meta.on === "boolean" ? meta.on ? "on" : "off" : null,
     version,
     target: typeof rec.target === "string" ? rec.target : "",
-    // 外部记录渠道标记（0.9.79 ADR-0018）：非空 = 渠道徽标渲染 + 无单条 ✕ 出口
+    // 外部记录渠道标记（0.9.79 ADR-0018）：非空 = 渠道徽标渲染 + 单条移除出口判定
+    // （0.9.82 修订 R2-3：failed 放行，见 canRemoveRow）
     channel: typeof rec.channel === "string" && rec.channel !== "" ? rec.channel : null
   };
 }
 function canRemoveRow(r) {
   if (!r || typeof r !== "object") return false;
-  if (r.channel) return false;
+  if (r.channel) return r.status === "failed";
   return r.status === "input" || r.status === "failed" || r.status === "superseded";
 }
 function channelLabelKey(channel) {
@@ -1997,6 +2010,7 @@ var ZH = {
   "op.superseded.note": "{target} \u5DF2\u8DF3\u8FC7\uFF08\u524D\u63D0\u5DF2\u4E0D\u6210\u7ACB\u6216\u5DF2\u624B\u52A8\u5904\u7406\uFF09",
   "op.cancelled": "\u7528\u6237\u653E\u5F03\u786E\u8BA4",
   "op.remove": "\u79FB\u9664\u8BB0\u5F55",
+  "op.remove.failed": "\u8BB0\u5F55\u79FB\u9664\u5931\u8D25\uFF1A{err}",
   "op.panel.jump": "\u67E5\u770B\u64CD\u4F5C\u8BB0\u5F55",
   "op.kind.install": "\u5B89\u88C5",
   "op.kind.upgrade": "\u5347\u7EA7",
@@ -2296,6 +2310,7 @@ var EN = {
   "op.superseded.note": "{target} skipped (precondition gone or already handled)",
   "op.cancelled": "user cancelled",
   "op.remove": "Dismiss",
+  "op.remove.failed": "Failed to dismiss record: {err}",
   "op.panel.jump": "Open operations card",
   "op.kind.install": "Install",
   "op.kind.upgrade": "Upgrade",
@@ -2907,8 +2922,12 @@ button.dshm-badge:hover{filter:brightness(.95)}
 .dshm-entry svg{flex:none;width:16px;height:16px}
 .dshm-entry span{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
 /* \u6536\u8D77\uFF08rail\uFF09\u6001\uFF1A\u4E0E\u5BBF\u4E3B\u8BBE\u7F6E\u5165\u53E3 / dsh-skins \u540C\u51E0\u4F55\u2014\u201436\xD736 \u5706\u5F62\u3001margin 8/10\u3001
-   \u56FE\u6807 18\u3001\u5185\u5BB9\u6C34\u5E73\u5C45\u4E2D\u3002\u7F3A\u8FD9\u5957\u4F1A\u5BFC\u81F4\u6536\u8D77\u65F6\u56FE\u6807\u504F\u79BB\u8F74\u7EBF\u4E14\u884C\u8DDD\u4E0D\u9F50\uFF08\u5B9E\u6D4B\u5DE6\u504F ~4px\uFF09\u3002 */
-.dshm-entry.rail{width:36px;height:36px;margin:8px 0 10px;padding:0;justify-content:center;border-radius:50%;gap:0}
+   \u56FE\u6807 18\u3001\u5185\u5BB9\u6C34\u5E73\u5C45\u4E2D\u3002\u7F3A\u8FD9\u5957\u4F1A\u5BFC\u81F4\u6536\u8D77\u65F6\u56FE\u6807\u504F\u79BB\u8F74\u7EBF\u4E14\u884C\u8DDD\u4E0D\u9F50\uFF08\u5B9E\u6D4B\u5DE6\u504F ~4px\uFF09\u3002
+   2026-10-14\uFF1A\u5DE6\u53F3 margin \u6539 auto\u2014\u2014\u69FD\u4F4D\u51FA\u53E3\u662F\u5217\u5411 flex\uFF0C36px \u5B9A\u5BBD\u6309\u94AE\u9ED8\u8BA4\u8D34\u4EA4\u53C9\u8F74
+   \u8D77\u70B9\uFF08\u5DE6\u4FA7\uFF09\uFF1B\u684C\u9762 rail \u7A84\u53EA\u6709 ~4px \u53EF\u611F\u77E5\uFF0C\u624B\u673A\u5BBD rail \u5DE6\u504F ~22px\uFF08\u624B\u673A\u622A\u56FE\u50CF\u7D20
+   \u5B9E\u6D4B\uFF1A\u9F7F\u8F6E/\u8C03\u8272\u76D8/\u9CB8\u9C7C cx\u224899-100\uFF0C\u5E02\u573A\u56DB\u5BAB\u683C cx=77.5\uFF0Crail \u4E2D\u7EBF\u2248100\uFF09\u3002auto
+   margin \u4E0E dsh-skins rail \u5305\u88C5\u5C42 justify-content:center \u7B49\u6548\uFF08palette cx=100.5\uFF09\u3002 */
+.dshm-entry.rail{width:36px;height:36px;margin:8px auto 10px;padding:0;justify-content:center;border-radius:50%;gap:0}
 .dshm-entry.rail svg{width:18px;height:18px}
 [data-slot="sidebar.footer.action"]{display:flex!important;flex-direction:column;width:100%;min-width:0}
 [data-slot="sidebar.footer.action"]>*{flex:none;min-width:0}
@@ -4963,10 +4982,10 @@ function OperationsCard({ records, onClearFinished, onRemove }) {
       r.status === "running" ? Spin() : null,
       r.error ? h("span", { className: "dsvm-opnote" }, r.error) : null,
       r.warning ? h("span", { className: "dsvm-opnote" }, r.warning) : null,
-      // 单条移除（终审·新伤2 → 0.9.79 R3-1/R2-3）：出口判定下沉 canRemoveRow——
-      // 本地 input/failed/superseded 保留 ✕；外部记录（channel 非空）不给单条 ✕（防按 id 复活），
-      // 移除出口仅「清除已结束」。
-      canRemoveRow2(r) && onRemove ? h("button", { className: "dshm-xbtn", title: lookup("op.remove"), onClick: () => onRemove(r.id) }, h(XIcon)) : null
+      // 单条移除（终审·新伤2 → 0.9.79 R3-1/R2-3 → 0.9.82 修订 R2-3）：出口判定下沉 canRemoveRow——
+      // 本地 input/failed/superseded 保留 ✕；外部记录 failed 放行（服务端 per-id delete 已建），
+      // done 仍不给 ✕。onRemove 收整行 record，onOpsRemove 按 channel 分流（本地 remove / 外部 api）。
+      canRemoveRow2(r) && onRemove ? h("button", { className: "dshm-xbtn", title: lookup("op.remove"), onClick: () => onRemove(r) }, h(XIcon)) : null
     );
   };
   return h(
@@ -5553,9 +5572,18 @@ function MarketPanel({ onClose }) {
             void api("external-operations-clear").catch(() => {
             });
           },
-          onOpsRemove: (id) => {
-            opsStore.remove(id);
-            syncOps();
+          onOpsRemove: (rec) => {
+            if (rec && rec.channel) {
+              api("external-operations-remove", { id: rec.id }).then(() => {
+                opsStore.removeExternal(rec.id);
+                syncOps();
+              }).catch((err) => {
+                notify({ kind: "err", text: lookup("op.remove.failed", { err: err && err.message || "unknown" }) });
+              });
+            } else {
+              opsStore.remove(rec.id);
+              syncOps();
+            }
           }
         }) : null
         // 操作记录已整体搬迁至设置 tab 末位通宽卡（0.9.x 布局重构·第二批）：底部不再常驻
@@ -5616,8 +5644,17 @@ function MarketIcon() {
     h("rect", { x: "14", y: "14", width: "7", height: "7", rx: "1", stroke: "currentColor", strokeWidth: "2" })
   );
 }
+var dshmSlotsRef = null;
+var shellTakeover = () => {
+  try {
+    return ((dshmSlotsRef && dshmSlotsRef.entries ? dshmSlotsRef.entries("sidebar.workspaces") : []) || []).some((entry) => (entry.options.priority ?? 0) < 0);
+  } catch {
+    return false;
+  }
+};
 function MarketEntry(props) {
   useEffect(() => ensureCss(), []);
+  if (shellTakeover()) return null;
   const rail = !(props && props.wide);
   return h(
     "button",
@@ -5636,11 +5673,22 @@ function MarketEntry(props) {
     props && props.wide ? h("span", null, lookup("market.title")) : null
   );
 }
+function safeRegister(slots, options, component) {
+  const label = `${options.name}${options.key != null ? `:${options.key}` : options.id != null ? `#${options.id}` : ""}`;
+  try {
+    return slots.register(options, component);
+  } catch (error) {
+    if (!/already has a registration|already has an entry/.test(String(error && error.message || error))) throw error;
+    console.warn(`[dsh-m] slot "${label}" is contested; dsh-m yields it and keeps running`, error);
+    return () => {
+    };
+  }
+}
 function registerSlot(slots, options, component) {
   const next = { ...options };
   if (next.id == null && next.key != null) next.id = String(next.key);
   if (next.key == null && next.id != null) next.key = next.id;
-  return slots.register(next, component);
+  return safeRegister(slots, next, component);
 }
 function ToolCardRow({ it, onInstalled }) {
   const [busy, setBusy] = useState(false);
@@ -5754,6 +5802,7 @@ var inject = ["slots"];
 function apply(ctx) {
   const slots = ctx.slots;
   if (!slots) return;
+  dshmSlotsRef = slots;
   ctx.effect(() => ensureCss(), "dshm-style");
   ctx.inject(["locale"], (c) => {
     if (!c.locale || typeof c.locale.register !== "function") return;
@@ -5768,7 +5817,13 @@ function apply(ctx) {
   });
   slots.inject(
     "sidebar.footer.action",
-    () => slots.register(
+    () => safeRegister(
+      slots,
+      // 页脚 order 维持正数工具位（9）：bot 视图的让位由壳接管哨兵负责（该视图
+      // 下 MarketEntry 整行不渲染），order 只影响官方 harness 页脚的排序——那里
+      // DS Bot 入口（-200）应在本工具行之上。2026-10-13 曾试装深负 order
+      // （-400/-500）让 ds-bot 集群贴底，哨兵上线后该做法只剩 harness 视图副作用
+      // （DS Bot 入口沉底），已回撤（裁定：哨兵管让位，order 管排序，各司其职）。
       { name: "sidebar.footer.action", id: "dshm-market", key: "dshm-market", order: 9, locale: "dshm", label: () => lookup("market.title") },
       function DshmMarketEntry(actionProps) {
         return h(MarketEntry, actionProps);

package/lib/core/external-journal.js

@@ -105,6 +105,18 @@ export async function clearExternalOperations() {
     await mkdir(dirname(file), { recursive: true });
     await atomicWrite(file, '[]\n');
 }
+/** 按 id 删除单条外部记录（0.9.82 修订 R2-3）：幂等——id 不存在静默 no-op；
+ *  整文件读-改-写与 append 同款并发纪律（ADR-0018 Consequences 既有明示局限）；
+ *  保留记录原样透写，不做 normalize 重写（删除不改写历史字段）。 */
+export async function removeExternalOperation(id) {
+    const file = journalFile();
+    const records = await readAll(file);
+    const kept = records.filter((r) => r.id !== id);
+    if (kept.length === records.length)
+        return;
+    await mkdir(dirname(file), { recursive: true });
+    await atomicWrite(file, `${JSON.stringify(kept, null, 2)}\n`);
+}
 /**
  * 九个公共变更入口共用的终态直落钩子（0.9.79，ADR-0018）：
  * - channel 缺省 'external'（审计上漏报更糟，未知调用方落兜底而非丢弃）；

package/lib/core/host-api.js

@@ -12,7 +12,7 @@ import { resolveDshVersion, readLauncherPackageVersion } from './dsh-version.js'
 import { runDoctor } from './doctor.js';
 import { listInstalledWithMeta, listMarket, installFromRegistry, selfUpgrade, uninstallPlugin, upgradePlugin, InstallGuardError, } from './market.js';
 import { runProfileTransaction, TransactionError } from './profile-transaction.js';
-import { listExternalOperations, clearExternalOperations } from './external-journal.js';
+import { listExternalOperations, clearExternalOperations, removeExternalOperation } from './external-journal.js';
 import { readInstalledPluginReadme } from './installed.js';
 import { loadPrimaryScreenshots } from './primary-screenshots.js';
 import { isNewerVersion, npmLatest, npmPackumentReadme } from './versions.js';
@@ -234,6 +234,7 @@ export function createApiDispatcher(ctx) {
         ensureService: ctx.deps?.ensureService,
         listExternalOperations: ctx.deps?.listExternalOperations ?? listExternalOperations,
         clearExternalOperations: ctx.deps?.clearExternalOperations ?? clearExternalOperations,
+        removeExternalOperation: ctx.deps?.removeExternalOperation ?? removeExternalOperation,
     };
     const cfg = () => ctx.controller.config;
     // 0.9.0：宿主信任检查委派（含 ping 与未知 method，fail-closed）；
@@ -589,6 +590,14 @@ export function createApiDispatcher(ctx) {
                     payload = {};
                     break;
                 }
+                case 'external-operations-remove': {
+                    // 0.9.82 修订 R2-3：外部 failed 行单条 ✕ 的服务端出口；鉴权同 list/clear（零新增特例）
+                    if (typeof body.id !== 'string' || body.id === '')
+                        throw new ApiProtocolError(400, '缺少 id');
+                    await d.removeExternalOperation(body.id);
+                    payload = {};
+                    break;
+                }
                 case 'restart': {
                     // 0.9.0：Desktop 不触发旧 helper（Electron 生命周期归官方；杀子进程=红线）
                     assertWriteAllowed(profile, 'restart');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.9.80",
+  "version": "0.9.82",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",

package/registry.json

@@ -205,15 +205,15 @@
       "homepage": "https://github.com/meyaomiao/dsh-server-deck"
     },
     {
-      "id": "dsh-flowglass",
-      "name": "DSH Flowglass",
-      "description": "流镜：把当前会话画成三列泳道流程图，展示工具调用、并行分组与子代理分支；可选集成 better-sidebar。",
+      "id": "ds-bot",
+      "name": "DS Bot",
+      "description": "多 Bot 协作：把 DSH 变成常驻 Bot 团队，支持主 Bot、Bot 间消息与群聊。",
       "category": "watchlist",
-      "tags": ["可视化", "流程图", "会话", "界面"],
+      "tags": ["Bot", "群聊", "多 Agent", "协作"],
       "source": "npm",
-      "npm": "dsh-flowglass",
-      "github": "Iwctwbh/dsh-flowglass",
-      "homepage": "https://github.com/Iwctwbh/dsh-flowglass"
+      "npm": "ds-bot",
+      "github": "Fei2411/DeepSeek-Bot",
+      "homepage": "https://github.com/Fei2411/DeepSeek-Bot"
     },
     {
       "id": "dsh-chat-manager",