@cowwo/dsh-icon-custom 0.16.0 → 0.19.0

package/lib/index.js

@@ -40,6 +40,7 @@ import {
 	normalizeUnreadConfig,
 	pruneSeen
 } from './unread.js'
+import { normalizeRunningConfig } from './running.js'
 
 const MAX_BYTES = 10 * 1024 * 1024 // 10 MB
 // Normalized mime -> safe extension. CUR (mouse cursor) is accepted as ICO.
@@ -338,6 +339,11 @@ export class FaviconCustomService extends TypertRemoteService {
 		// survives a cleared browser profile and means the same thing on every
 		// device, while each browser keeps its own copy as cache + offline queue.
 		this.seenPath = join(this.storageDir, 'unread-seen.json')
+		// The "show a yellow mark for every session that is running" switch. Its own
+		// file and its own endpoint pair: the running FACT is official (the browser
+		// list already carries each session's `running`), so nothing about it is
+		// stored here — only whether to show the projection of it.
+		this.runningPath = join(this.storageDir, 'running.json')
 		// { activeId, icons: { [id]: { id, mime, ext, name, size, savedAt, rev, pwa, logo } } }
 		this.library = { activeId: null, icons: {} }
 		// The active icon's loaded state: { rev, mime, ext, name, size, savedAt, pwa, logo, bytes } | null
@@ -346,12 +352,16 @@ export class FaviconCustomService extends TypertRemoteService {
 		// Kept in its own file so a settings change can never corrupt the icon
 		// library index.
 		this.unread = normalizeUnreadConfig(null)
+		// Running-mark switch: whether the yellow projection of the official
+		// `running` fact is drawn. See lib/running.js.
+		this.running = normalizeRunningConfig(null)
 		// Host-side watermark: { [sessionId]: endAt } — see lib/unread.js.
 		this.seen = {}
 		// Platform PWA manifest (raw + parsed), read once at startup.
 		this.baseManifest = loadBaseManifest()
 		this._load()
 		this._loadUnread()
+		this._loadRunning()
 		this._loadUnreadSeen()
 		// "How did this session's last turn end" as an official session
 		// projection. Optional registration on purpose: this plugin is a display
@@ -450,6 +460,19 @@ export class FaviconCustomService extends TypertRemoteService {
 		return writeFile(this.unreadPath, JSON.stringify(this.unread, null, 2))
 	}
 
+	/** Load the running-mark switch (missing or corrupt file = default: on). */
+	_loadRunning() {
+		try {
+			const raw = JSON.parse(readFileSync(this.runningPath).toString('utf8'))
+			this.running = normalizeRunningConfig(raw)
+		} catch { /* no persisted switch yet: keep the default */ }
+	}
+
+	/** Persist the running-mark switch (best effort, advisory file). */
+	_saveRunning() {
+		return writeFile(this.runningPath, JSON.stringify(this.running, null, 2))
+	}
+
 	/**
 	 * Load the host-side watermark.
 	 *
@@ -516,6 +539,35 @@ export class FaviconCustomService extends TypertRemoteService {
 		return this._unreadRuleView()
 	}
 
+	/**
+	 * typert endpoint: read the running-mark switch.
+	 *
+	 * Its own endpoint pair, not a field on the unread rule: the two features are
+	 * independent (a red dot says "something ended and you have not looked", a
+	 * yellow mark says "something is running right now"), and neither switch may
+	 * 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 }`.
+	 */
+	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.
+	 */
+	async setRunningRule(request) {
+		if (request === null || typeof request !== 'object') {
+			throw new Error('缺少 enabled 参数')
+		}
+		this.running = normalizeRunningConfig(request)
+		await this._saveRunning().catch(() => {}) // switch file is advisory
+		return { ...this.running }
+	}
+
 	/**
 	 * typert endpoint: merge this browser's "seen" watermarks into the Host's copy.
 	 *

package/lib/running.js

@@ -0,0 +1,32 @@
+/**
+ * dsh-icon-custom · 「进行中黄点」的开关(宿主半,纯函数)
+ *
+ * 这里**没有**任何"谁在跑"的事实,一条也没有——那是官方的:
+ * 宿主 `ctx.agents.get(id)?.status === 'running'` 经 `api-session/status`
+ * 事件实时推到浏览器,客户端会话列表里本来就带着每个会话的 `running`。
+ * 这个插件只把那件事**多投影几次**(黄点/黄数字/黄 favicon 角标)。
+ *
+ * 所以这个文件只有一个布尔开关,和一条纪律:
+ * **不落盘"进行中",只落盘"要不要显示"。** 进程重启后冷会话按官方口径
+ * 永远是 `running:false`,不会留下一个永远亮着的假黄点;而开关是偏好,
+ * 应该跨设备、跨重启跟着你,所以它归宿主,和红点规则并列但互不牵连
+ * (见 docs/adr/0010-running-mark-is-a-second-projection.md)。
+ */
+
+/** 默认:显示黄点。 */
+export const RUNNING_MARK_DEFAULT = true
+
+/**
+ * 把任意输入夹成 `{ enabled }`。
+ *
+ * 只认严格的 `true`/`false`;缺项、脏值、null 一律回落默认——一个读不懂的
+ * 开关值不该把一整套标记的可见性变成猜谜。
+ * @param input - `{ enabled? }`,可以是脏的、缺项的、null
+ * @returns `{ enabled }` —— 永远完整
+ */
+export function normalizeRunningConfig(input) {
+	const source = input !== null && typeof input === 'object' ? input : {}
+	return {
+		enabled: typeof source.enabled === 'boolean' ? source.enabled : RUNNING_MARK_DEFAULT
+	}
+}

package/lib/typert.host.js

@@ -57,6 +57,8 @@ const unreadRuleSchema = z.object({
 	appBadge: z.boolean(),
 	/** 进入会话后要连续待满多少秒才算"看过";0 = 进入即已读。上限 10 分钟。 */
 	clearDelaySec: z.number().int().nonnegative().max(600),
+	/** 实验项:点清单条目时在侧栏定位到该会话(展开工作区 + 滚动 + 闪一下;贴产品 DOM,可一键关闭)。 */
+	revealOnOpen: z.boolean(),
 	/**
 	 * 宿主此刻的 `Date.now()`。
 	 * 客户端用它把"看过"水位换算进宿主时钟域(`turn/end.time` 也是宿主时钟):
@@ -77,7 +79,8 @@ const setUnreadRuleRequestSchema = z.object({
 	pending: z.boolean().optional(),
 	workspaceDot: z.boolean().optional(),
 	appBadge: z.boolean().optional(),
-	clearDelaySec: z.number().int().nonnegative().max(600).optional()
+	clearDelaySec: z.number().int().nonnegative().max(600).optional(),
+	revealOnOpen: z.boolean().optional()
 })
 
 /** 一次水位线同步:浏览器把自己那份交上来,宿主逐会话取 max 后回权威表。 */
@@ -89,6 +92,21 @@ const unreadSeenSchema = z.object({
 	seen: z.record(z.string(), z.number())
 })
 
+/**
+ * 进行中黄点的开关。
+ *
+ * 这里**没有**"谁在跑"的字段,一条都没有:那是官方的 `SessionSummary.running`,
+ * 由官方宿主实时推给浏览器,插件只读不存。宿主这一侧只有"要不要显示"这一个偏好,
+ * 和红点规则并列、互不牵连(自己的端点对、自己的文件)。
+ */
+const runningRuleSchema = z.object({
+	enabled: z.boolean()
+})
+
+const setRunningRuleRequestSchema = z.object({
+	enabled: z.boolean().optional()
+})
+
 const setIconResultSchema = statusSchema
 
 export const TYPERT = {
@@ -238,6 +256,45 @@ export const TYPERT = {
 			},
 			sourceLocation: { file: 'lib/index.js', line: 1, column: 1 }
 		},
+		{
+			id: 'dsh-icon-custom#iconCustom/getRunningRule',
+			service: 'iconCustom',
+			namespace: 'iconCustom',
+			method: 'getRunningRule',
+			invocation: { kind: 'direct' },
+			parameters: [],
+			result: {
+				mode: 'strict',
+				typeSymbol: 'dsh-icon-custom#iconCustom/getRunningRule:result',
+				create: () => runningRuleSchema
+			},
+			sourceLocation: { file: 'lib/index.js', line: 1, column: 1 }
+		},
+		{
+			id: 'dsh-icon-custom#iconCustom/setRunningRule',
+			service: 'iconCustom',
+			namespace: 'iconCustom',
+			method: 'setRunningRule',
+			invocation: { kind: 'direct' },
+			parameters: [
+				{
+					name: 'request',
+					wire: 'request',
+					source: 'json',
+					codec: {
+						mode: 'strict',
+						typeSymbol: 'dsh-icon-custom#iconCustom/setRunningRule:request',
+						create: () => setRunningRuleRequestSchema
+					}
+				}
+			],
+			result: {
+				mode: 'strict',
+				typeSymbol: 'dsh-icon-custom#iconCustom/setRunningRule:result',
+				create: () => runningRuleSchema
+			},
+			sourceLocation: { file: 'lib/index.js', line: 1, column: 1 }
+		},
 		{
 			id: 'dsh-icon-custom#iconCustom/setUnreadSeen',
 			service: 'iconCustom',
@@ -322,7 +379,7 @@ export const TYPERT = {
 					{
 						kind: 'method',
 						name: 'getUnreadRule',
-						signature: 'async getUnreadRule(): Promise<{ reasons: Record<string, boolean>; pending: boolean; workspaceDot: boolean; appBadge: boolean; clearDelaySec: number; hostNow: number; seen: Record<string, number> }>',
+						signature: 'async getUnreadRule(): Promise<{ reasons: Record<string, boolean>; pending: boolean; workspaceDot: boolean; appBadge: boolean; clearDelaySec: number; revealOnOpen: 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. */",
@@ -331,7 +388,7 @@ export const TYPERT = {
 					{
 						kind: 'method',
 						name: 'setUnreadRule',
-						signature: 'async setUnreadRule(request: { reasons: Record<string, boolean>; pending?: boolean; workspaceDot?: boolean; appBadge?: boolean; clearDelaySec?: number }): Promise<{ reasons: Record<string, boolean>; pending: boolean; workspaceDot: boolean; appBadge: boolean; clearDelaySec: number; hostNow: number; seen: Record<string, number> }>',
+						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> }>',
 						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. */",
@@ -345,6 +402,24 @@ export const TYPERT = {
 						summary: "Merge the seen watermark.",
 						jsDoc: "/** Merge the seen watermark. */",
 						tags: []
+					},
+					{
+						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).",
+						summary: "Read the running-mark switch.",
+						jsDoc: "/** Read the running-mark switch. */",
+						tags: []
+					},
+					{
+						kind: 'method',
+						name: 'setRunningRule',
+						signature: 'async setRunningRule(request: { enabled?: boolean }): Promise<{ enabled: 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. */",
+						tags: []
 					}
 				],
 				types: []

package/lib/unread.js

@@ -46,12 +46,25 @@ export const UNREAD_PENDING_DEFAULT = true
 /**
  * 默认:在工作区那一行的文件夹图标上画红点。
  *
- * 这是全套功能里**唯一贴着产品 DOM 走**的部分(侧栏那片没有插槽),
+ * 这是全套功能里**贴着产品 DOM 走**的两处之一(另一处见下面的 `UNREAD_REVEAL_DEFAULT`),
  * 所以它有自己的开关:一旦 DSH 升级改了结构导致它失效或画歪,
  * 关掉它就行,红点数字/清单/跳转那些稳的部分完全不受影响。
  */
 export const UNREAD_WORKSPACE_DOT_DEFAULT = true
 
+/**
+ * 默认:点清单条目时,顺带在侧栏定位到那个会话(展开它所在的工作区、滚到那一行并闪一下)。
+ *
+ * 这是第二处贴着产品 DOM 走的部分。官方的"展开 + 滚动"只服务于它自己的搜索结果
+ * (内部状态,没有对外的 Service),所以插件只能**模拟点击**官方的工作区行与
+ * "显示更多"按钮。DSH 升级改结构时它会失效,失效的表现只有一个:
+ * **点进去照常打开会话,只是侧栏不动**。不想让它动侧栏就关掉这一项。
+ *
+ * 还有一件事要说清:展开是**官方自己记住**的状态(存在浏览器里),不会自己收回去 ——
+ * 官方搜索跳转也是这个行为。
+ */
+export const UNREAD_REVEAL_DEFAULT = true
+
 /**
  * 默认:在系统应用图标上显示角标(安装为应用后生效)。
  *
@@ -97,8 +110,8 @@ export function normalizeReasons(input) {
 
 /**
  * 把任意输入夹成完整设置。
- * @param input - `{ reasons?, pending?, workspaceDot?, appBadge?, clearDelaySec? }`,可以是脏的、缺项的、null
- * @returns `{ reasons, pending, workspaceDot, appBadge, clearDelaySec }` —— 每一项都完整
+ * @param input - `{ reasons?, pending?, workspaceDot?, appBadge?, clearDelaySec?, revealOnOpen? }`,可以是脏的、缺项的、null
+ * @returns `{ reasons, pending, workspaceDot, appBadge, clearDelaySec, revealOnOpen }` —— 每一项都完整
  */
 export function normalizeUnreadConfig(input) {
 	const source = input !== null && typeof input === 'object' ? input : {}
@@ -107,7 +120,8 @@ export function normalizeUnreadConfig(input) {
 		pending: typeof source.pending === 'boolean' ? source.pending : UNREAD_PENDING_DEFAULT,
 		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)
+		clearDelaySec: normalizeClearDelay(source.clearDelaySec),
+		revealOnOpen: typeof source.revealOnOpen === 'boolean' ? source.revealOnOpen : UNREAD_REVEAL_DEFAULT
 	}
 }
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@cowwo/dsh-icon-custom",
-  "version": "0.16.0",
-  "description": "自定义浏览器标签页图标:在设置页上传 SVG/PNG/ICO,立即生效并持久保存,自动适配安卓/iOS/平板 PWA 图标,并可把未读数字显示为系统应用图标角标(Windows 任务栏)。· Custom browser tab favicon: upload SVG/PNG/ICO from the settings page, applies instantly and persists, auto-sizes PWA icons for Android/iOS/tablets, and projects the unread count onto the system app-icon badge (Windows taskbar).",
+  "version": "0.19.0",
+  "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/unread-panel.mjs && node test/unread-clear.mjs && node test/unread-rows.mjs && node test/unread-seen.mjs && node test/unread-host-sync.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/reveal.mjs"
   },
   "dependencies": {
     "jimp": "^1.6.1",