@cowwo/dsh-icon-custom 0.19.1 → 0.20.1

package/lib/index.js

@@ -371,7 +371,11 @@ export class FaviconCustomService extends TypertRemoteService {
 			projectionCtx.sessionProjections.register({
 				key: LAST_TURN_END_KEY,
 				stateSchema: lastTurnEndStateSchema,
-				stateVersion: 1,
+				// Bumped when the fold learned to attribute a turn to the sub-agent
+				// settlement that woke it (`user/message` could no longer be ignored).
+				// A cached row is keyed by this number, so an old one is re-folded
+				// instead of being read as "nobody caused this turn".
+				stateVersion: 2,
 				init: () => initLastTurnEnd(),
 				apply: applyLastTurnEnd,
 				wire: { viewSchema: lastTurnEndViewSchema, view: lastTurnEndView }
@@ -517,7 +521,7 @@ export class FaviconCustomService extends TypertRemoteService {
 	 * icon RPCs (`getStatus` / `setIcon` / `setPwa` / `setLogo` / `resetIcon`)
 	 * keep their EXACT pre-badge response shape, so a problem in this feature
 	 * can never break the icon itself.
-	 * @returns `{ reasons, pending, workspaceDot, appBadge, clearDelaySec, hostNow }`.
+	 * @returns `{ reasons, pending, workspaceDot, appBadge, clearDelaySec, revealOnOpen, unreadIncludeSubagents, hostNow }`.
 	 */
 	async getUnreadRule() {
 		return this._unreadRuleView()
@@ -527,7 +531,7 @@ export class FaviconCustomService extends TypertRemoteService {
 	 * typert endpoint: replace the unread-badge rule — which turn-end reasons
 	 * light the badge. The rule is applied on the client, so this takes effect
 	 * without re-folding any session log.
-	 * @param request - `{ reasons, pending?, workspaceDot?, appBadge?, clearDelaySec? }`; unknown or missing keys fall back to defaults.
+	 * @param request - `{ reasons, pending?, workspaceDot?, appBadge?, clearDelaySec?, revealOnOpen?, unreadIncludeSubagents? }`; unknown or missing keys fall back to defaults.
 	 * @returns the stored rule.
 	 */
 	async setUnreadRule(request) {
@@ -548,22 +552,35 @@ export class FaviconCustomService extends TypertRemoteService {
 	 * drag the other's storage or response shape along. There is deliberately no
 	 * `running` field here — who is running is the official host's answer and
 	 * travels in the ordinary session list.
-	 * @returns `{ enabled }`.
+	 *
+	 * Both switches are returned whole from the normalized copy — `enabled` (draw
+	 * the marks at all), `includeSubagents` (credit a running sub-agent to the
+	 * topmost non-sub-agent ancestor session) and `headerRing` (the yellow ring on
+	 * the conversation header's sub-agent count) — so a caller can never drop one by
+	 * copying only the field it happened to know about.
+	 * @returns `{ enabled, includeSubagents, headerRing }`.
 	 */
 	async getRunningRule() {
 		return { ...this.running }
 	}
 
 	/**
-	 * typert endpoint: flip the running-mark switch.
-	 * @param request - `{ enabled: boolean }`; anything else falls back to the default.
-	 * @returns the stored switch.
+	 * typert endpoint: flip a running-mark switch.
+	 *
+	 * A patch, not a replacement: `normalizeRunningConfig` fills whichever field is
+	 * absent from the current defaults, so `{ includeSubagents: false }` alone never
+	 * resets `enabled` and vice versa.
+	 * @param request - `{ enabled?: boolean, includeSubagents?: boolean }`; anything else falls back to the defaults.
+	 * @returns the stored switches.
 	 */
 	async setRunningRule(request) {
 		if (request === null || typeof request !== 'object') {
 			throw new Error('缺少 enabled 参数')
 		}
-		this.running = normalizeRunningConfig(request)
+		// Merged onto the stored copy, not swapped in wholesale: the two switches live
+		// in one record, so a caller that only knows about one of them must not reset
+		// the other to its default.
+		this.running = normalizeRunningConfig({ ...this.running, ...request })
 		await this._saveRunning().catch(() => {}) // switch file is advisory
 		return { ...this.running }
 	}
@@ -613,6 +630,8 @@ export class FaviconCustomService extends TypertRemoteService {
 			workspaceDot: this.unread.workspaceDot,
 			appBadge: this.unread.appBadge,
 			clearDelaySec: this.unread.clearDelaySec,
+			revealOnOpen: this.unread.revealOnOpen,
+			unreadIncludeSubagents: this.unread.unreadIncludeSubagents,
 			hostNow: Date.now(),
 			seen: { ...this.seen }
 		}

package/lib/running.js

@@ -6,7 +6,7 @@
  * 事件实时推到浏览器,客户端会话列表里本来就带着每个会话的 `running`。
  * 这个插件只把那件事**多投影几次**(黄点/黄数字/黄 favicon 角标)。
  *
- * 所以这个文件只有一个布尔开关,和一条纪律:
+ * 所以这个文件只有几个布尔开关,和一条纪律:
  * **不落盘"进行中",只落盘"要不要显示"。** 进程重启后冷会话按官方口径
  * 永远是 `running:false`,不会留下一个永远亮着的假黄点;而开关是偏好,
  * 应该跨设备、跨重启跟着你,所以它归宿主,和红点规则并列但互不牵连
@@ -17,16 +17,37 @@
 export const RUNNING_MARK_DEFAULT = true
 
 /**
- * 把任意输入夹成 `{ enabled }`。
+ * 默认:把子代理的「进行中」算到它所属的会话上。
+ *
+ * 和上面那个开关是**两个问题**:「要不要画黄点」与「子代理在跑,算不算它上面那个
+ * 会话在跑」。子代理自己没有会话行(官方侧栏根本不渲染),所以它跑得再欢,真正属于
+ * 用户的那个会话看上去也是空闲的;默认聚合上去,黄点才反映「有活正在干」。
+ * 聚合只影响计数归属:子代理自己的行照旧不画,等待你(琥珀色)的祖先也照旧不算。
+ */
+export const RUNNING_INCLUDE_SUBAGENTS_DEFAULT = true
+
+/**
+ * 默认:在会话头部那颗「N 个子智能体」计数上叠一个黄圈。
+ *
+ * 第三个问题,同样独立:前两个开关决定「黄点画不画」「子代理算不算到祖先」,
+ * 这一个只决定「会话头部那颗计数上要不要再叠一个运行数」。它不参与任何既有
+ * 计数(侧栏红黄点、左上角数字、favicon、系统角标),关掉它一个数字都不会动。
+ */
+export const RUNNING_HEADER_RING_DEFAULT = true
+
+/**
+ * 把任意输入夹成 `{ enabled, includeSubagents, headerRing }`。
  *
  * 只认严格的 `true`/`false`;缺项、脏值、null 一律回落默认——一个读不懂的
  * 开关值不该把一整套标记的可见性变成猜谜。
- * @param input - `{ enabled? }`,可以是脏的、缺项的、null
- * @returns `{ enabled }` —— 永远完整
+ * @param input - `{ enabled?, includeSubagents?, headerRing? }`,可以是脏的、缺项的、null
+ * @returns `{ enabled, includeSubagents, headerRing }` —— 永远完整
  */
 export function normalizeRunningConfig(input) {
 	const source = input !== null && typeof input === 'object' ? input : {}
 	return {
-		enabled: typeof source.enabled === 'boolean' ? source.enabled : RUNNING_MARK_DEFAULT
+		enabled: typeof source.enabled === 'boolean' ? source.enabled : RUNNING_MARK_DEFAULT,
+		includeSubagents: typeof source.includeSubagents === 'boolean' ? source.includeSubagents : RUNNING_INCLUDE_SUBAGENTS_DEFAULT,
+		headerRing: typeof source.headerRing === 'boolean' ? source.headerRing : RUNNING_HEADER_RING_DEFAULT
 	}
 }

package/lib/typert.host.js

@@ -59,6 +59,8 @@ const unreadRuleSchema = z.object({
 	clearDelaySec: z.number().int().nonnegative().max(600),
 	/** 实验项:点清单条目时在侧栏定位到该会话(展开工作区 + 滚动 + 闪一下;贴产品 DOM,可一键关闭)。 */
 	revealOnOpen: z.boolean(),
+	/** 子代理结算唤醒父会话跑出来的那一轮结束,算不算未读。默认 true(= 现状)。 */
+	unreadIncludeSubagents: z.boolean().optional(),
 	/**
 	 * 宿主此刻的 `Date.now()`。
 	 * 客户端用它把"看过"水位换算进宿主时钟域(`turn/end.time` 也是宿主时钟):
@@ -80,7 +82,8 @@ const setUnreadRuleRequestSchema = z.object({
 	workspaceDot: z.boolean().optional(),
 	appBadge: z.boolean().optional(),
 	clearDelaySec: z.number().int().nonnegative().max(600).optional(),
-	revealOnOpen: z.boolean().optional()
+	revealOnOpen: z.boolean().optional(),
+	unreadIncludeSubagents: z.boolean().optional()
 })
 
 /** 一次水位线同步:浏览器把自己那份交上来,宿主逐会话取 max 后回权威表。 */
@@ -96,15 +99,21 @@ const unreadSeenSchema = z.object({
  * 进行中黄点的开关。
  *
  * 这里**没有**"谁在跑"的字段,一条都没有:那是官方的 `SessionSummary.running`,
- * 由官方宿主实时推给浏览器,插件只读不存。宿主这一侧只有"要不要显示"这一个偏好,
- * 和红点规则并列、互不牵连(自己的端点对、自己的文件)。
+ * 由官方宿主实时推给浏览器,插件只读不存。宿主这一侧只有两个偏好——要不要显示、
+ * 子代理的进行中是否算到它所属的祖先会话上——和红点规则并列、互不牵连
+ * (自己的端点对、自己的文件)。
  */
 const runningRuleSchema = z.object({
-	enabled: z.boolean()
+	enabled: z.boolean(),
+	includeSubagents: z.boolean().optional(),
+	/** 会话头部「N 个子智能体」计数上那颗黄圈(独立开关,不并入任何既有计数)。 */
+	headerRing: z.boolean().optional()
 })
 
 const setRunningRuleRequestSchema = z.object({
-	enabled: z.boolean().optional()
+	enabled: z.boolean().optional(),
+	includeSubagents: z.boolean().optional(),
+	headerRing: z.boolean().optional()
 })
 
 const setIconResultSchema = statusSchema
@@ -379,7 +388,7 @@ export const TYPERT = {
 					{
 						kind: 'method',
 						name: 'getUnreadRule',
-						signature: 'async getUnreadRule(): Promise<{ reasons: Record<string, boolean>; pending: boolean; workspaceDot: boolean; appBadge: boolean; clearDelaySec: number; revealOnOpen: boolean; hostNow: number; seen: Record<string, number> }>',
+						signature: 'async getUnreadRule(): Promise<{ reasons: Record<string, boolean>; pending: boolean; workspaceDot: boolean; appBadge: boolean; clearDelaySec: number; revealOnOpen: boolean; unreadIncludeSubagents?: boolean; hostNow: number; seen: Record<string, number> }>',
 						description: "Read the unread-badge rule, the Host clock and the seen watermark.",
 						summary: "Read the unread-badge rule.",
 						jsDoc: "/** Read the unread-badge rule. */",
@@ -388,7 +397,7 @@ export const TYPERT = {
 					{
 						kind: 'method',
 						name: 'setUnreadRule',
-						signature: 'async setUnreadRule(request: { reasons: Record<string, boolean>; pending?: boolean; workspaceDot?: boolean; appBadge?: boolean; clearDelaySec?: number; revealOnOpen?: boolean }): Promise<{ reasons: Record<string, boolean>; pending: boolean; workspaceDot: boolean; appBadge: boolean; clearDelaySec: number; revealOnOpen: boolean; hostNow: number; seen: Record<string, number> }>',
+						signature: 'async setUnreadRule(request: { reasons: Record<string, boolean>; pending?: boolean; workspaceDot?: boolean; appBadge?: boolean; clearDelaySec?: number; revealOnOpen?: boolean; unreadIncludeSubagents?: boolean }): Promise<{ reasons: Record<string, boolean>; pending: boolean; workspaceDot: boolean; appBadge: boolean; clearDelaySec: number; revealOnOpen: boolean; unreadIncludeSubagents?: boolean; hostNow: number; seen: Record<string, number> }>',
 						description: "Replace the unread-badge rule: which turn-end reasons light the red dot.",
 						summary: "Set the unread-badge rule.",
 						jsDoc: "/** Set the unread-badge rule. */",
@@ -406,8 +415,8 @@ export const TYPERT = {
 					{
 						kind: 'method',
 						name: 'getRunningRule',
-						signature: 'async getRunningRule(): Promise<{ enabled: boolean }>',
-						description: "Read the running-mark switch (yellow mark for sessions that are running right now).",
+						signature: 'async getRunningRule(): Promise<{ enabled: boolean, includeSubagents?: boolean, headerRing?: boolean }>',
+						description: "Read the running-mark switches (show the yellow mark; roll a running sub-agent up to its ancestor session; draw the header count ring).",
 						summary: "Read the running-mark switch.",
 						jsDoc: "/** Read the running-mark switch. */",
 						tags: []
@@ -415,7 +424,7 @@ export const TYPERT = {
 					{
 						kind: 'method',
 						name: 'setRunningRule',
-						signature: 'async setRunningRule(request: { enabled?: boolean }): Promise<{ enabled: boolean }>',
+						signature: 'async setRunningRule(request: { enabled?: boolean, includeSubagents?: boolean, headerRing?: boolean }): Promise<{ enabled: boolean, includeSubagents?: boolean, headerRing?: boolean }>',
 						description: "Flip the running-mark switch. The running fact itself is official and is never stored here.",
 						summary: "Set the running-mark switch.",
 						jsDoc: "/** Set the running-mark switch. */",

package/lib/unread.js

@@ -75,6 +75,31 @@ export const UNREAD_REVEAL_DEFAULT = true
  */
 export const UNREAD_APP_BADGE_DEFAULT = true
 
+/**
+ * 默认:子代理引起的结束也算未读。
+ *
+ * 一个后台子代理结算时会**唤醒父会话跑一个回合**(官方把一条
+ * `source.kind === 'subagent-settled'` 的 user 消息投进父会话的日志),
+ * 父会话因此亮红点。这一项就是那个"我不关心子代理替我跑出来的结果"的开关:
+ * 关掉它,只屏蔽**由子代理唤醒**的那一轮结束,人自己发起的一轮照旧。
+ *
+ * 开关只改客户端的判定,折叠出来的**事实**里两样都在(见下面的
+ * `subagentCaused`),所以来回拨开关永远不需要重折日志。
+ */
+export const UNREAD_INCLUDE_SUBAGENTS_DEFAULT = true
+
+/**
+ * 一条 `user/message` 的 `source.kind` 里,哪些明确是"子代理在说话":
+ *   * `subagent-settled` —— 运行时替子代理交代它结束了(唤醒父会话的那一条);
+ *   * `agent-message`   —— 子代理自己用 `send_message` 发过来的话。
+ * 人在输入框里说话是 `user`,所以这两条之外都不算。
+ */
+export function isSubagentWakeSource(message) {
+	const source = message !== null && typeof message === 'object' && message.source !== null && typeof message.source === 'object' ? message.source : null
+	if (source === null) return false
+	return source.kind === 'subagent-settled' || source.kind === 'agent-message'
+}
+
 /**
  * 默认:进入会话即视为已读(0 秒)。
  * 大于 0 时,你必须在那个会话里**连续**待满这么多秒它才算"看过";中途切走会
@@ -110,8 +135,8 @@ export function normalizeReasons(input) {
 
 /**
  * 把任意输入夹成完整设置。
- * @param input - `{ reasons?, pending?, workspaceDot?, appBadge?, clearDelaySec?, revealOnOpen? }`,可以是脏的、缺项的、null
- * @returns `{ reasons, pending, workspaceDot, appBadge, clearDelaySec, revealOnOpen }` —— 每一项都完整
+ * @param input - `{ reasons?, pending?, workspaceDot?, appBadge?, clearDelaySec?, revealOnOpen?, unreadIncludeSubagents? }`,可以是脏的、缺项的、null
+ * @returns `{ reasons, pending, workspaceDot, appBadge, clearDelaySec, revealOnOpen, unreadIncludeSubagents }` —— 每一项都完整
  */
 export function normalizeUnreadConfig(input) {
 	const source = input !== null && typeof input === 'object' ? input : {}
@@ -121,7 +146,10 @@ export function normalizeUnreadConfig(input) {
 		workspaceDot: typeof source.workspaceDot === 'boolean' ? source.workspaceDot : UNREAD_WORKSPACE_DOT_DEFAULT,
 		appBadge: typeof source.appBadge === 'boolean' ? source.appBadge : UNREAD_APP_BADGE_DEFAULT,
 		clearDelaySec: normalizeClearDelay(source.clearDelaySec),
-		revealOnOpen: typeof source.revealOnOpen === 'boolean' ? source.revealOnOpen : UNREAD_REVEAL_DEFAULT
+		revealOnOpen: typeof source.revealOnOpen === 'boolean' ? source.revealOnOpen : UNREAD_REVEAL_DEFAULT,
+		// 缺项或非 boolean 一律回落 true(等于现状):一个没听懂这一项的旧客户端
+		// 不该因为宿主多了一个字段就少看见红点。
+		unreadIncludeSubagents: typeof source.unreadIncludeSubagents === 'boolean' ? source.unreadIncludeSubagents : UNREAD_INCLUDE_SUBAGENTS_DEFAULT
 	}
 }
 
@@ -140,43 +168,68 @@ export function reasonKey(reason) {
 
 /** 折叠初始态:还没有任何回合结束过。 */
 export function initLastTurnEnd() {
-	return { endAt: 0, reason: null }
+	return { endAt: 0, reason: null, subagentCaused: false, wakeSubagent: null }
 }
 
 /**
- * 纯转移:只有 `turn/end` 改动它,其余事件原样返回同一个引用
- * (契约要求 `Object.is` 不变以产生零下游工作)。
+ * 纯转移。
+ *
+ * 除了 `turn/end`,另有两类事件会改动它,因为"这一轮是谁叫醒的"必须先被记下来:
+ *   * `user/message` —— 观察到的**第一条** user 消息就是这一轮的起因
+ *     (`subagent-settled` / `agent-message` = 子代理,其余 = 人)。之后 steer
+ *     进来的消息不算:第一票定终身,人自己发起的一轮不会因为子代理在中途
+ *     插了句话就变成"子代理引起";
+ *   * `turn/start` —— 清掉上一轮的起因,新的一轮重新投票。
+ * 与折叠单元无关的事件仍原样返回同一个引用(契约要求 `Object.is` 不变以产生
+ * 零下游工作)。
  * @param state - 覆盖此前全部事件的状态
  * @param event - 下一个已提交的会话事件
  * @returns 下一个状态(事件与本单元无关时返回同一个引用)
  */
 export function applyLastTurnEnd(state, event) {
-	if (event === null || typeof event !== 'object' || event.type !== 'turn/end') return state
+	if (event === null || typeof event !== 'object') return state
+	const current = state !== null && typeof state === 'object' ? state : initLastTurnEnd()
+	const wake = typeof current.wakeSubagent === 'boolean' ? current.wakeSubagent : null
+	if (event.type === 'user/message') {
+		if (wake !== null) return state
+		return { ...current, wakeSubagent: isSubagentWakeSource(event.data) }
+	}
+	if (event.type === 'turn/start') {
+		if (wake === null) return state
+		return { ...current, wakeSubagent: null }
+	}
+	if (event.type !== 'turn/end') return state
 	const data = event.data !== null && typeof event.data === 'object' ? event.data : {}
 	const reason = reasonKey(data.reason)
 	const endAt = typeof event.time === 'number' ? event.time : 0
-	if (state.endAt === endAt && state.reason === reason) return state
-	return { endAt, reason }
+	const subagentCaused = wake === true
+	if (current.endAt === endAt && current.reason === reason && (current.subagentCaused === true) === subagentCaused && wake === null) return state
+	return { endAt, reason, subagentCaused, wakeSubagent: null }
 }
 
 /** 状态 → 上线载荷。 */
 export function lastTurnEndView(state) {
 	return {
 		endAt: typeof state.endAt === 'number' ? state.endAt : 0,
-		reason: typeof state.reason === 'string' && state.reason !== '' ? state.reason : null
+		reason: typeof state.reason === 'string' && state.reason !== '' ? state.reason : null,
+		// 这一轮是不是被"子代理结束"叫醒的。老检查点里没有这一项 → false(＝现状)。
+		subagentCaused: state !== null && typeof state === 'object' && state.subagentCaused === true
 	}
 }
 
-/** 持久化折叠状态(纯 JSON,供投影缓存检查点)。 */
+/** 持久化折叠状态(纯 JSON,供投影缓存检查点)。新增的字段可选:老检查点照样能读。 */
 export const lastTurnEndStateSchema = z.object({
 	endAt: z.number(),
-	reason: z.string().nullable()
+	reason: z.string().nullable(),
+	subagentCaused: z.boolean().optional(),
+	wakeSubagent: z.boolean().nullable().optional()
 })
 
 /** 上线载荷。 */
 export const lastTurnEndViewSchema = z.object({
 	endAt: z.number(),
-	reason: z.string().nullable()
+	reason: z.string().nullable(),
+	subagentCaused: z.boolean()
 })
 
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@cowwo/dsh-icon-custom",
-  "version": "0.19.1",
+  "version": "0.20.1",
   "description": "自定义浏览器标签页图标:在设置页上传 SVG/PNG/ICO,立即生效并持久保存,自动适配安卓/iOS/平板 PWA 图标,显示未读红点与进行中黄点(工作区数字/会话行/左上角/标签页,数字可点开清单、点条目定位到侧栏),并可把未读数显示为系统应用图标角标(Windows 任务栏 / macOS Dock,含通知权限申请)。· Custom browser tab favicon: upload SVG/PNG/ICO from the settings page, applies instantly and persists, auto-sizes PWA icons for Android/iOS/tablets, shows unread red dots and running yellow marks (workspace number / session row / top-left / tab icon, both counts open a list whose rows locate the session in the sidebar), and projects the unread count onto the system app-icon badge (Windows taskbar / macOS Dock, notifications permission included).",
   "type": "module",
   "main": "lib/index.js",
   "license": "MIT",
   "scripts": {
-    "test": "node test/app-badge.mjs && node test/notification-permission.mjs && node test/unread-panel.mjs && node test/unread-clear.mjs && node test/unread-rows.mjs && node test/unread-seen.mjs && node test/unread-host-sync.mjs && node test/running-mark.mjs && node test/running-panel.mjs && node test/reveal.mjs"
+    "test": "node test/app-badge.mjs && node test/notification-permission.mjs && node test/unread-panel.mjs && node test/unread-clear.mjs && node test/unread-rows.mjs && node test/unread-seen.mjs && node test/unread-host-sync.mjs && node test/running-mark.mjs && node test/running-panel.mjs && node test/running-subagents.mjs && node test/header-ring.mjs && node test/unread-subagents.mjs && node test/reveal.mjs && node test/reveal-persist.mjs && node test/hint-disclosure.mjs"
   },
   "dependencies": {
     "jimp": "^1.6.1",