dsh-group-status 0.2.2 → 0.4.0

package/lib/types/client/group-status.d.ts

@@ -5,30 +5,19 @@
  * vendored file only needs one import line and one field assignment to wire
  * the badge aggregation in. Everything fork-specific lives here.
  *
+ * ## 本模块不认识任何具体状态源
+ *
+ * 它只统计宿主自己的行级事实（进行中 / 待审批 / 计划待审 / 等待回答 / 已完成 /
+ * 子智能体）；外部状态一律经 `./facets.ts` 的协议折成 {@link FacetFold}。
+ *
+ * 这不是洁癖：此前这里为定时任务与等待评审各写了一组具名字段和一套查表，于是提供方
+ * 新增字段时本插件的本地类型一无所知，信息**静默丢失**（不报错、测试也不红，见
+ * CHANGELOG 0.2.3 第一条）。把语义留在拥有它的那一侧，这类漂移才结构上不可能发生。
+ *
  * @module
  */
-import type { SessionNode } from './tree.ts';
-/**
- * One session's waiting-review fact, as published by dsh-gitea-dispatch's
- * `useWaitingSummary()` (issue: dsh-gitea-dispatch#16).
- */
-export interface WaitingReviewSummaryEntry {
-    readonly prNumber: number;
-    readonly state: 'waiting' | 'overdue';
-}
-/** Session id → that session's waiting-review fact (no entry = not waiting). */
-export type WaitingReviewSummaryMap = ReadonlyMap<string, WaitingReviewSummaryEntry>;
-/**
- * One session's schedule fact, as published by dsh-later's `useScheduleSummary()`.
- */
-export interface ScheduleSummaryEntry {
-    readonly count: number;
-    readonly pausedCount: number;
-    readonly nextAt?: number;
-    readonly state: 'scheduled' | 'urgent' | 'overdue';
-}
-/** Session id → that session's schedule fact (no entry = no scheduled tasks). */
-export type ScheduleSummaryMap = ReadonlyMap<string, ScheduleSummaryEntry>;
+import type { AnyFacet, AnyFacetFold, RegisteredFacet } from './facets.ts';
+import type { GroupNode, SessionNode } from './tree.ts';
 /**
  * Aggregated live-session counts for one group, computed over all members so a
  * folded folder row can hint at hidden activity.
@@ -46,33 +35,38 @@ export interface GroupLiveStatus {
     done: number;
     /** Running direct children across members. */
     subagents: number;
-    /** Members with scheduled tasks (from dsh-later). */
-    scheduledSessions: number;
-    /** Total scheduled tasks across members (including paused). */
-    scheduledCount: number;
-    /** Highest-priority schedule state: overdue > urgent > scheduled. */
-    scheduleState: 'scheduled' | 'urgent' | 'overdue' | undefined;
-    /** Members waiting for CI review of their PR (from dsh-gitea-dispatch). */
-    waitingReviewCount: number;
-    /** Highest-priority waiting state across members: overdue > waiting. */
-    waitingReviewState: 'waiting' | 'overdue' | undefined;
+    /**
+     * 外部状态源的折果，按 facet id 索引，只含**有贡献**的来源（`count > 0`）。
+     *
+     * 这里刻意没有 `scheduled*` / `waitingReview*` 这类具名字段：徽标一旦为某个来源开
+     * 一个字段，就等于把别人家的语义焊进自己的类型，新增来源就得改本插件。
+     * `FacetFold.data` 的形状只有该来源自己读。
+     */
+    facets: ReadonlyMap<string, FacetEntry>;
+}
+/**
+ * 一个来源在**这一组**上的折果，连同它自己的 facet。
+ *
+ * 带上 facet 是为了让渲染（文案、图标、脉冲）与多层合并（`facet.merge`）都不必再回
+ * 登记面查表——也就不需要任何模块级状态。
+ */
+export interface FacetEntry {
+    facet: AnyFacet;
+    fold: AnyFacetFold;
 }
 /**
  * Zero-valued sentinel for {@link GroupLiveStatus}.
  *
- * Used when a group is expanded (badge is hidden, so aggregation is wasted
- * work) or when no cross-plugin data is available. Kept as a frozen constant
- * so the reference is stable across renders — `Object.is` comparisons in
- * React selectors never trigger spurious re-renders on it.
+ * Used when a group has nothing to report. Kept as a frozen constant so the
+ * reference is stable across renders — `Object.is` comparisons in React selectors
+ * never trigger spurious re-renders on it.
  */
 export declare const EMPTY_LIVE_STATUS: GroupLiveStatus;
 /**
- * Merge two {@link GroupLiveStatus} objects by summing counters and taking the
- * highest-priority state (overdue > urgent > scheduled for schedule; overdue > waiting
- * for waiting-review).
+ * 合并两份分组折果：本插件自己的计数相加，外部状态来源**按 facet 各自合并**。
  *
- * Used for multi-level aggregation: when a parent group is collapsed, its badge
- * must reflect all descendant sessions, not just direct members.
+ * 用于多层聚合：折叠的父文件夹要覆盖整棵子树，而子树里每一层都已各自折过一遍。
+ * `FacetFold.data` 怎么合归该 facet 自己决定，本模块从不解释。
  */
 export declare function mergeLiveStatus(a: GroupLiveStatus, b: GroupLiveStatus): GroupLiveStatus;
 /**
@@ -80,10 +74,68 @@ export declare function mergeLiveStatus(a: GroupLiveStatus, b: GroupLiveStatus):
  * hidden live sessions. Mirrors the session-row status priority (pending
  * outranks running outranks completed) at the counting level; labels resolve with
  * locale at render time.
+ *
  * @param nodes - member rows of the group.
- * @param sessionIds - the same members' Session ids (schedule and waiting facts are keyed by id).
- * @param waitingReviewSummary - dsh-gitea-dispatch waiting map, when that plugin is loaded.
- * @param scheduleSummary - dsh-later schedule map, when that plugin is loaded.
+ * @param sessionIds - the same members' Session ids (facets address their own data by id).
+ * @param facets - the registered status sources to fold over this group.
+ * @param now - one clock reading for the whole pass, so sibling facets cannot disagree
+ *   about which deadlines are still ahead.
+ */
+export declare function summarizeGroupStatus(nodes: readonly SessionNode[], sessionIds: readonly string[], facets?: readonly RegisteredFacet[], now?: number): GroupLiveStatus;
+/**
+ * Measure each group's own members, as the input to {@link aggregateGroupStatuses}.
+ *
+ * Every group is measured, expanded ones included. A folder row shows no badge while
+ * it is expanded, but its sessions still need attention and a collapsed ancestor must
+ * keep counting them — so expansion is a rendering fact, never an input to the
+ * aggregation. Short-circuiting expanded groups to `EMPTY_LIVE_STATUS` (the shape this
+ * had before the tree-wide aggregator existed, harmless while nothing aggregated) makes
+ * every collapsed parent undercount by the size of its expanded descendants.
+ *
+ * @param groups - derived groups, each with its member rows already populated.
+ * @param facets - registered sources, already filtered by the visibility settings.
+ * @param now - one clock reading shared by every group in the pass.
+ */
+export declare function directStatusesForGroups(groups: readonly {
+    key: string;
+    sessions: readonly SessionNode[];
+}[], facets?: readonly RegisteredFacet[], now?: number): Map<string, GroupLiveStatus>;
+/**
+ * Fold every group's DIRECT status up the workspace tree, so a collapsed folder
+ * counts every descendant session. A group's own row shows no badge while it is
+ * expanded, but its sessions still need attention and its collapsed ancestor must
+ * keep counting them — so the walk never depends on a group's expanded state.
+ *
+ * @param direct - each group's own-member status, keyed by group key.
+ * @param childrenByParent - the rendered tree: parent key (`undefined` = roots) → children.
+ * @returns aggregated status per group key: own members plus the whole subtree.
+ */
+export declare function aggregateGroupStatuses(direct: ReadonlyMap<string, GroupLiveStatus>, childrenByParent: ReadonlyMap<string | undefined, readonly {
+    key: string;
+}[]>): Map<string, GroupLiveStatus>;
+/**
+ * A group row whose badge input is resolved: its own members plus its whole subtree.
+ *
+ * `GroupNode.liveStatus` is optional only because upstream never fills it — this
+ * package's aggregator is the sole producer. Typing a rendered row as
+ * `StatusedGroupNode` is what turns "a row that skipped the aggregator" into a compile
+ * error instead of a folder that silently lost its badge, which is how the PR #10
+ * regression reached main.
+ */
+export interface StatusedGroupNode extends GroupNode {
+    liveStatus: GroupLiveStatus;
+}
+/**
+ * Attach each group's subtree-wide status, in derivation order. This is the producer
+ * the sidebar renders from.
+ *
+ * Expanded groups carry their status too: their own row draws no badge (a decision
+ * inside `groupLiveBadge`), but a collapsed ancestor still has to count them, so
+ * expansion never suppresses the measurement.
+ *
+ * @param groups - derived rows, in the order they render.
+ * @param direct - each group's own-member status, from {@link directStatusesForGroups}.
+ * @param childrenByParent - the rendered tree: parent key (`undefined` = roots) → children.
  */
-export declare function summarizeGroupStatus(nodes: readonly SessionNode[], sessionIds: readonly string[], waitingReviewSummary?: WaitingReviewSummaryMap, scheduleSummary?: ScheduleSummaryMap): GroupLiveStatus;
+export declare function withAggregatedStatus(groups: readonly GroupNode[], direct: ReadonlyMap<string, GroupLiveStatus>, childrenByParent: ReadonlyMap<string | undefined, readonly GroupNode[]>): StatusedGroupNode[];
 //# sourceMappingURL=group-status.d.ts.map

package/lib/types/client/group-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"group-status.d.ts","sourceRoot":"","sources":["../../../src/client/group-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAI5C;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAAA;CACtC;AAED,gFAAgF;AAChF,MAAM,MAAM,uBAAuB,GAAG,WAAW,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAA;AAEpF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;CACnD;AAED,iFAAiF;AACjF,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;AAI1E;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,sCAAsC;IACtC,QAAQ,EAAE,MAAM,CAAA;IAChB,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAA;IAChB,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAA;IACZ,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAA;IACjB,qDAAqD;IACrD,iBAAiB,EAAE,MAAM,CAAA;IACzB,+DAA+D;IAC/D,cAAc,EAAE,MAAM,CAAA;IACtB,qEAAqE;IACrE,aAAa,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;IAC7D,2EAA2E;IAC3E,kBAAkB,EAAE,MAAM,CAAA;IAC1B,wEAAwE;IACxE,kBAAkB,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAA;CACtD;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,EAAE,eAIX,CAAA;AAErB;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,eAAe,CA0BvF;AAkBD;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,UAAU,EAAE,SAAS,MAAM,EAAE,EAC7B,oBAAoB,CAAC,EAAE,uBAAuB,EAC9C,eAAe,CAAC,EAAE,kBAAkB,GACnC,eAAe,CAgEjB"}
+{"version":3,"file":"group-status.d.ts","sourceRoot":"","sources":["../../../src/client/group-status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAIvD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,iCAAiC;IACjC,OAAO,EAAE,MAAM,CAAA;IACf,sCAAsC;IACtC,QAAQ,EAAE,MAAM,CAAA;IAChB,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAA;IAChB,uEAAuE;IACvE,IAAI,EAAE,MAAM,CAAA;IACZ,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAA;IACjB;;;;;;OAMG;IACH,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;CACxC;AAED;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,QAAQ,CAAA;IACf,IAAI,EAAE,YAAY,CAAA;CACnB;AAKD;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,EAAE,eAGX,CAAA;AAErB;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,eAAe,CAUvF;AAuBD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,SAAS,WAAW,EAAE,EAC7B,UAAU,EAAE,SAAS,MAAM,EAAE,EAC7B,MAAM,GAAE,SAAS,eAAe,EAAO,EACvC,GAAG,GAAE,MAAmB,GACvB,eAAe,CA6CjB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,CAAA;CAAE,EAAE,EACpE,MAAM,GAAE,SAAS,eAAe,EAAO,EACvC,GAAG,GAAE,MAAmB,GACvB,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAQ9B;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,EAC5C,gBAAgB,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,EAAE,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,GAC5E,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAwB9B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,UAAU,EAAE,eAAe,CAAA;CAC5B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,SAAS,EAAE,EAC5B,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,EAC5C,gBAAgB,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,EAAE,SAAS,SAAS,EAAE,CAAC,GACtE,iBAAiB,EAAE,CAKrB"}

package/lib/types/client/group-status.js

@@ -1,34 +1,24 @@
+import { defaultMergeFold } from "./facets.js";
+/** 空折果表：让哨兵的引用跨渲染稳定。 */
+const EMPTY_FACETS = new Map();
 /**
  * Zero-valued sentinel for {@link GroupLiveStatus}.
  *
- * Used when a group is expanded (badge is hidden, so aggregation is wasted
- * work) or when no cross-plugin data is available. Kept as a frozen constant
- * so the reference is stable across renders — `Object.is` comparisons in
- * React selectors never trigger spurious re-renders on it.
+ * Used when a group has nothing to report. Kept as a frozen constant so the
+ * reference is stable across renders — `Object.is` comparisons in React selectors
+ * never trigger spurious re-renders on it.
  */
 export const EMPTY_LIVE_STATUS = Object.freeze({
     running: 0, approval: 0, planReview: 0, question: 0, done: 0, subagents: 0,
-    scheduledSessions: 0, scheduledCount: 0, scheduleState: undefined,
-    waitingReviewCount: 0, waitingReviewState: undefined,
+    facets: EMPTY_FACETS,
 });
 /**
- * Merge two {@link GroupLiveStatus} objects by summing counters and taking the
- * highest-priority state (overdue > urgent > scheduled for schedule; overdue > waiting
- * for waiting-review).
+ * 合并两份分组折果：本插件自己的计数相加，外部状态来源**按 facet 各自合并**。
  *
- * Used for multi-level aggregation: when a parent group is collapsed, its badge
- * must reflect all descendant sessions, not just direct members.
+ * 用于多层聚合：折叠的父文件夹要覆盖整棵子树，而子树里每一层都已各自折过一遍。
+ * `FacetFold.data` 怎么合归该 facet 自己决定，本模块从不解释。
  */
 export function mergeLiveStatus(a, b) {
-    // Schedule state: overdue (3) > urgent (2) > scheduled (1) > undefined (0)
-    const priorityOf = (s) => s === 'overdue' ? 3 : s === 'urgent' ? 2 : s === 'scheduled' ? 1 : 0;
-    const schedulePriorityA = priorityOf(a.scheduleState);
-    const schedulePriorityB = priorityOf(b.scheduleState);
-    const scheduleState = schedulePriorityA >= schedulePriorityB ? a.scheduleState : b.scheduleState;
-    // Waiting-review state: overdue > waiting > undefined
-    const waitingPriorityA = a.waitingReviewState === 'overdue' ? 2 : a.waitingReviewState === 'waiting' ? 1 : 0;
-    const waitingPriorityB = b.waitingReviewState === 'overdue' ? 2 : b.waitingReviewState === 'waiting' ? 1 : 0;
-    const waitingReviewState = waitingPriorityA >= waitingPriorityB ? a.waitingReviewState : b.waitingReviewState;
     return {
         running: a.running + b.running,
         approval: a.approval + b.approval,
@@ -36,24 +26,25 @@ export function mergeLiveStatus(a, b) {
         question: a.question + b.question,
         done: a.done + b.done,
         subagents: a.subagents + b.subagents,
-        scheduledSessions: a.scheduledSessions + b.scheduledSessions,
-        scheduledCount: a.scheduledCount + b.scheduledCount,
-        scheduleState,
-        waitingReviewCount: a.waitingReviewCount + b.waitingReviewCount,
-        waitingReviewState,
+        facets: mergeFacets(a.facets, b.facets),
     };
 }
-// ── Helpers ──
-/**
- * Strip the `session-` / `webhook-` prefix from a Session id.
- *
- * dsh-gitea-dispatch publishes its waiting map keyed by the host SessionId, but
- * its HTTP endpoints key by this normalized form. Accepting both here keeps the
- * badge working across that publisher's conventions without knowing which is in
- * play.
- */
-function stripSessionPrefix(id) {
-    return id.replace(/^(?:session|webhook)-/, '');
+/** 按 facet id 合并两侧折果；只有一侧有的来源原样带过。 */
+function mergeFacets(a, b) {
+    if (a.size === 0)
+        return b;
+    if (b.size === 0)
+        return a;
+    const merged = new Map(a);
+    for (const [id, entry] of b) {
+        const own = merged.get(id);
+        // 合并规则由该来源自己声明；缺省只加数量、取更紧急的色档、脉冲取或。
+        // 合并后仍沿用先登记那一份的 facet 引用：两侧本就是同一个来源。
+        merged.set(id, own === undefined
+            ? entry
+            : { facet: own.facet, fold: own.facet.merge?.(own.fold, entry.fold) ?? defaultMergeFold(own.fold, entry.fold) });
+    }
+    return merged;
 }
 // ── Main computation ──
 /**
@@ -61,84 +52,156 @@ function stripSessionPrefix(id) {
  * hidden live sessions. Mirrors the session-row status priority (pending
  * outranks running outranks completed) at the counting level; labels resolve with
  * locale at render time.
+ *
  * @param nodes - member rows of the group.
- * @param sessionIds - the same members' Session ids (schedule and waiting facts are keyed by id).
- * @param waitingReviewSummary - dsh-gitea-dispatch waiting map, when that plugin is loaded.
- * @param scheduleSummary - dsh-later schedule map, when that plugin is loaded.
+ * @param sessionIds - the same members' Session ids (facets address their own data by id).
+ * @param facets - the registered status sources to fold over this group.
+ * @param now - one clock reading for the whole pass, so sibling facets cannot disagree
+ *   about which deadlines are still ahead.
  */
-export function summarizeGroupStatus(nodes, sessionIds, waitingReviewSummary, scheduleSummary) {
+export function summarizeGroupStatus(nodes, sessionIds, facets = [], now = Date.now()) {
     let running = 0;
     let approval = 0;
     let planReview = 0;
     let question = 0;
     let done = 0;
     let subagents = 0;
+    // #25②：这一段曾与 `rows/Rows.tsx` 的 `sessionStatuses()` 各写一份优先级，两处结果不同
+    // （pending 会话漏算子智能体；未运行但已完成 + 有运行中子智能体时两处判断相反）。计数
+    // 判据仍在本模块（徽标只需要五个数字），但**语义以行内为准**：行内 pending 会同时给出
+    // subagents，未运行且有 subagents 时不承认 completed。下面的分支刻意照抄那两条规则，
+    // 不是另立一套「徽标自己的优先级」。
     for (const n of nodes) {
         if (n.blank || n.archived)
             continue;
+        const hasSubagents = n.runningSubagentCount > 0;
+        // 行内：pending 与 subagents 可并存（Rows.tsx `[pending, subagents]`），故不 `continue`。
         if (n.pendingInteraction === 'approval') {
             approval += 1;
+            subagents += n.runningSubagentCount;
             continue;
         }
         if (n.pendingInteraction === 'plan-review') {
             planReview += 1;
+            subagents += n.runningSubagentCount;
             continue;
         }
         if (n.pendingInteraction === 'question') {
             question += 1;
+            subagents += n.runningSubagentCount;
             continue;
         }
-        if (n.running)
+        if (n.running) {
             running += 1;
-        else if (n.completed)
+            subagents += n.runningSubagentCount;
+            continue;
+        }
+        // 行内：subagents 优先于 completed（`if (subagents !== undefined) return [subagents]`）。
+        if (hasSubagents) {
+            subagents += n.runningSubagentCount;
+            continue;
+        }
+        if (n.completed)
             done += 1;
-        subagents += n.runningSubagentCount;
     }
-    // Aggregate schedule summary from dsh-later
-    let scheduledSessions = 0;
-    let scheduledCount = 0;
-    let scheduleState = undefined;
-    if (scheduleSummary && sessionIds.length > 0) {
-        let totalSessions = 0;
-        let totalCount = 0;
-        let highestPriority = 0; // 0=none, 1=scheduled, 2=urgent, 3=overdue
-        for (const id of sessionIds) {
-            const entry = scheduleSummary.get(id);
-            if (entry) {
-                totalSessions += 1;
-                totalCount += entry.count;
-                const priority = entry.state === 'overdue' ? 3 : entry.state === 'urgent' ? 2 : 1;
-                if (priority > highestPriority)
-                    highestPriority = priority;
-            }
+    // 外部来源逐个折。一个来源坏了不该带塌整只徽标：快照读失败按「此刻没有数据」处理，
+    // 折叠抛错则跳过该来源——两者都不往渲染管线里扩散。
+    const folded = new Map();
+    for (const { facet } of facets) {
+        let snapshot;
+        try {
+            snapshot = facet.getSnapshot();
         }
-        scheduledSessions = totalSessions;
-        scheduledCount = totalCount;
-        scheduleState = highestPriority === 3 ? 'overdue' : highestPriority === 2 ? 'urgent' : highestPriority === 1 ? 'scheduled' : undefined;
-    }
-    // Aggregate waiting-review summary from dsh-gitea-dispatch (its #16).
-    //
-    // Counts **members**, not PRs: one session waits on exactly one PR, and the
-    // badge's number must mean "how many sessions in this folder need attention".
-    // `overdue` outranks `waiting` for the dot color, mirroring the schedule rule.
-    let waitingReviewCount = 0;
-    let waitingReviewState = undefined;
-    if (waitingReviewSummary && sessionIds.length > 0) {
-        for (const id of sessionIds) {
-            const entry = waitingReviewSummary.get(id) ?? waitingReviewSummary.get(stripSessionPrefix(id));
-            if (entry === undefined)
-                continue;
-            waitingReviewCount += 1;
-            if (entry.state === 'overdue')
-                waitingReviewState = 'overdue';
-            else if (waitingReviewState === undefined)
-                waitingReviewState = 'waiting';
+        catch {
+            snapshot = undefined;
+        }
+        try {
+            const result = facet.fold(snapshot, sessionIds, now);
+            // `count <= 0` 的来源不进表：数字、图标、文案、显隐判定都当它不存在。
+            if (result !== undefined && result.count > 0)
+                folded.set(facet.id, { facet, fold: result });
+        }
+        catch {
+            /* 同上：这个来源此刻不参与徽标 */
         }
     }
-    return {
-        running, approval, planReview, question, done, subagents,
-        scheduledSessions, scheduledCount, scheduleState,
-        waitingReviewCount, waitingReviewState,
+    return { running, approval, planReview, question, done, subagents, facets: folded };
+}
+/**
+ * Measure each group's own members, as the input to {@link aggregateGroupStatuses}.
+ *
+ * Every group is measured, expanded ones included. A folder row shows no badge while
+ * it is expanded, but its sessions still need attention and a collapsed ancestor must
+ * keep counting them — so expansion is a rendering fact, never an input to the
+ * aggregation. Short-circuiting expanded groups to `EMPTY_LIVE_STATUS` (the shape this
+ * had before the tree-wide aggregator existed, harmless while nothing aggregated) makes
+ * every collapsed parent undercount by the size of its expanded descendants.
+ *
+ * @param groups - derived groups, each with its member rows already populated.
+ * @param facets - registered sources, already filtered by the visibility settings.
+ * @param now - one clock reading shared by every group in the pass.
+ */
+export function directStatusesForGroups(groups, facets = [], now = Date.now()) {
+    const map = new Map();
+    for (const group of groups) {
+        map.set(group.key, summarizeGroupStatus(group.sessions, group.sessions.map(s => s.id), facets, now));
+    }
+    return map;
+}
+/**
+ * Fold every group's DIRECT status up the workspace tree, so a collapsed folder
+ * counts every descendant session. A group's own row shows no badge while it is
+ * expanded, but its sessions still need attention and its collapsed ancestor must
+ * keep counting them — so the walk never depends on a group's expanded state.
+ *
+ * @param direct - each group's own-member status, keyed by group key.
+ * @param childrenByParent - the rendered tree: parent key (`undefined` = roots) → children.
+ * @returns aggregated status per group key: own members plus the whole subtree.
+ */
+export function aggregateGroupStatuses(direct, childrenByParent) {
+    const aggregated = new Map();
+    // Parentage comes from path-prefix matching, so a self- or mutual-parent edge is
+    // representable; without this guard the fold would recurse forever and hang the sidebar.
+    const visiting = new Set();
+    const fold = (key) => {
+        const cached = aggregated.get(key);
+        if (cached !== undefined)
+            return cached;
+        if (visiting.has(key))
+            return direct.get(key) ?? EMPTY_LIVE_STATUS;
+        visiting.add(key);
+        let total = direct.get(key) ?? EMPTY_LIVE_STATUS;
+        for (const child of childrenByParent.get(key) ?? []) {
+            total = mergeLiveStatus(total, fold(child.key));
+        }
+        visiting.delete(key);
+        aggregated.set(key, total);
+        return total;
     };
+    // Every listed child is folded, not just the roots: an unreachable group would
+    // otherwise be missing from the map and lose its badge.
+    for (const children of childrenByParent.values()) {
+        for (const child of children)
+            fold(child.key);
+    }
+    return aggregated;
+}
+/**
+ * Attach each group's subtree-wide status, in derivation order. This is the producer
+ * the sidebar renders from.
+ *
+ * Expanded groups carry their status too: their own row draws no badge (a decision
+ * inside `groupLiveBadge`), but a collapsed ancestor still has to count them, so
+ * expansion never suppresses the measurement.
+ *
+ * @param groups - derived rows, in the order they render.
+ * @param direct - each group's own-member status, from {@link directStatusesForGroups}.
+ * @param childrenByParent - the rendered tree: parent key (`undefined` = roots) → children.
+ */
+export function withAggregatedStatus(groups, direct, childrenByParent) {
+    const aggregated = aggregateGroupStatuses(direct, childrenByParent);
+    // A group missing from the fold has neither measured members nor listed children,
+    // so it is idle rather than unknown.
+    return groups.map(group => ({ ...group, liveStatus: aggregated.get(group.key) ?? EMPTY_LIVE_STATUS }));
 }
 //# sourceMappingURL=group-status.js.map

package/lib/types/client/group-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"group-status.js","sourceRoot":"","sources":["../../../src/client/group-status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"group-status.js","sourceRoot":"","sources":["../../../src/client/group-status.ts"],"names":[],"mappings":"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"}

package/lib/types/client/index.d.ts

@@ -1,15 +1,18 @@
 import type { Context } from '@deepseek-ai/cordis';
-import type { WorkspaceSnapshot } from '@deepseek-ai/dsh-api-workspace-controller/client';
+import type { RemoteEndpoint } from '@deepseek-ai/dsh-api-remote-access/client';
+import type { WorkspaceId, WorkspaceSnapshot } from '@deepseek-ai/dsh-api-workspace-controller/client';
 import type { SnapshotSelectorHook } from '@deepseek-ai/dsh-client-ui-slots';
 import { type ResolvedBadgeSettings } from './badge-settings.ts';
 import { type WorkspaceKey } from './locales.ts';
-export type { UiWorkspace } from './navigation.ts';
-export type { DirectoryFlowOwnerProps, DirectoryFlowSlotName, DirectoryPickingHooks, DirectoryPickingInjected, MenuOpenState, RowToast, SessionRenameTarget, SessionRowOwnerProps, UseMenuOpenState, WorkspaceBrowserInjected, SessionRowScheduleOwnerProps, WorkspaceBrowserProps, WorkspacePickerInjected, WorkspacePickerProps, } from './contract/slots.ts';
+export type { StartSessionOptions, UiWorkspace } from './navigation.ts';
+export type { DirectoryFlowOwnerProps, DirectoryFlowSlotName, DirectoryPickingHooks, DirectoryPickingInjected, MenuOpenState, RowToast, RowToastActions, SessionIdInjected, SessionRenameTarget, SessionRowOwnerProps, UseMenuOpenState, WorkspaceBrowserInjected, SessionRowScheduleOwnerProps, WorkspaceBrowserProps, WorkspacePickerInjected, WorkspacePickerProps, } from './contract/slots.ts';
 export type { WorkspaceKey } from './locales.ts';
 declare module '@deepseek-ai/dsh-client-ui-slots' {
     interface GlobalStandardProps {
         /** Selector hook over the pure Workspace Controller snapshot. */
         useWorkspaces: SnapshotSelectorHook<WorkspaceSnapshot>;
+        /** Whether the current Peer may call `action` on one Workspace resource. */
+        useWorkspaceAccess: (workspaceId: WorkspaceId, action: RemoteEndpoint) => boolean;
         /** Selector hook over this plugin's own settings face (badge preferences). */
         useBadgeSettings: SnapshotSelectorHook<ResolvedBadgeSettings>;
     }
@@ -31,6 +34,31 @@ declare module '@deepseek-ai/dsh-api-session-controller/client' {
  * provides a waitable service. apply therefore depends on each slot
  * declaration through `slots.inject()` instead of assuming order.
  */
+/**
+ * ── 跨插件公共 API：分组状态 facet 协议 ─────────────────────────────
+ *
+ * 任何插件想让自己的状态进**折叠分组**的徽标，就 `require('dsh-group-status/client')`
+ * 拿这三个符号注册一个 facet；本插件不认识它，也不为它改代码：
+ *
+ * ```ts
+ * const gs = require('dsh-group-status/client')
+ * const unregister = gs?.registerGroupStatusFacet?.({
+ *   protocol: gs.GROUP_STATUS_FACET_PROTOCOL_VERSION,
+ *   id: 'my-plugin.review',                  // '<包名>.<状态名>'，全局唯一
+ *   subscribe: store.subscribe,               // 外部存储面，不要求 React hook
+ *   getSnapshot: store.getSnapshot,
+ *   fold: (snapshot, sessionIds, now) => ({ count, tone, pulse, data }),
+ *   merge: (a, b) => ({ ... }),              // 多层文件夹怎么合并你的折果
+ *   label: (fold, { now }) => '等待评审（剩 3分钟） · #15',
+ *   renderIcon: (fold) => h('svg', …),        // 图标归你，本插件只负责摆放
+ * })
+ * ctx.effect(() => () => unregister?.(), 'my-plugin: group-status facet')
+ * ```
+ *
+ * 完整契约、版本规则与为什么是这个方向见 `docs/facet-protocol.md`。
+ */
+export { GROUP_STATUS_FACET_PROTOCOL_VERSION, FACET_TONE_RANK, registerGroupStatusFacet, registry as groupStatusFacetRegistry, } from './facets.ts';
+export type { AnyFacet, AnyFacetFold, FacetFold, FacetOrigin, FacetRenderContext, FacetRegistration, FacetRejection, FacetTone, GroupStatusFacet, Unregister, } from './facets.ts';
 export declare const inject: string[];
 /**
  * Register the browser and picker once their slot declarations are on the

package/lib/types/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAC2C,iBAAiB,EACvE,MAAM,kDAAkD,CAAA;AAEzD,OAAO,KAAK,EAAkB,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAqB5F,OAAO,EAAuC,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAYrG,OAAO,EAAU,KAAK,YAAY,EAAE,MAAM,cAAc,CAAA;AAExD,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAClD,YAAY,EACV,uBAAuB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,wBAAwB,EAC/F,aAAa,EAAE,QAAQ,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,wBAAwB,EAC9G,4BAA4B,EAC5B,qBAAqB,EACrB,uBAAuB,EAAE,oBAAoB,GAC9C,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,mBAAmB;QAC3B,iEAAiE;QACjE,aAAa,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;QACtD,8EAA8E;QAC9E,gBAAgB,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;KAC9D;IAED,UAAU,kBAAkB;QAC1B,+DAA+D;QAC/D,SAAS,EAAE,YAAY,CAAA;KACxB;CACF;AAED,OAAO,QAAQ,gDAAgD,CAAC;IAC9D,UAAU,yBAAyB;QACjC,kBAAkB,EAAE,OAAO,CAAA;KAC5B;CACF;AAkCD;;;;;;;GAOG;AACH,eAAO,MAAM,MAAM,UAElB,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CA0QxC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAA;AAE/E,OAAO,KAAK,EAC2C,WAAW,EAAE,iBAAiB,EACpF,MAAM,kDAAkD,CAAA;AAGzD,OAAO,KAAK,EAAkB,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAsB5F,OAAO,EAAuC,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAerG,OAAO,EAAU,KAAK,YAAY,EAAE,MAAM,cAAc,CAAA;AAExD,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AACvE,YAAY,EACV,uBAAuB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,wBAAwB,EAC/F,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EACtG,gBAAgB,EAAE,wBAAwB,EAC1C,4BAA4B,EAC5B,qBAAqB,EACrB,uBAAuB,EAAE,oBAAoB,GAC9C,MAAM,qBAAqB,CAAA;AAC5B,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,mBAAmB;QAC3B,iEAAiE;QACjE,aAAa,EAAE,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;QACtD,4EAA4E;QAC5E,kBAAkB,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,KAAK,OAAO,CAAA;QACjF,8EAA8E;QAC9E,gBAAgB,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;KAC9D;IAED,UAAU,kBAAkB;QAC1B,+DAA+D;QAC/D,SAAS,EAAE,YAAY,CAAA;KACxB;CACF;AAED,OAAO,QAAQ,gDAAgD,CAAC;IAC9D,UAAU,yBAAyB;QACjC,kBAAkB,EAAE,OAAO,CAAA;KAC5B;CACF;AAkCD;;;;;;;GAOG;AACH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EACL,mCAAmC,EAAE,eAAe,EAAE,wBAAwB,EAC9E,QAAQ,IAAI,wBAAwB,GACrC,MAAM,aAAa,CAAA;AACpB,YAAY,EACV,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAClE,iBAAiB,EAAE,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,GAC3E,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,MAAM,UAElB,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAiTxC"}