dsh-notify-yimit 0.2.1 → 0.2.3

package/README.en.md

@@ -17,7 +17,7 @@
 A notification plugin for DeepSeek Harness: alerts you on **task completed / task failed / running (live activity) / awaiting approval / awaiting answer**.
 
 - **Two notification styles**, switchable in Settings: **Windows system notifications** (native browser notifications) or **custom in-app notifications** (a toast at the bottom-right of the desktop, independent of the browser page); or turn everything **off** (default).
-- **The notification title is the conversation title** (updated in place once the LLM generates it; the workspace directory name is never used). Toasts offer **Ignore**, and on the web also **Jump to session** (see below).
+- **The notification title is the conversation title** (updated in place once the LLM generates it; the workspace directory name is never used). Toasts offer **Ignore**, on the web also **Jump to session**, and on the desktop also **Go to app** (see below).
 - **One codebase for desktop and web**: the host detects its platform from the runtime and hides only browser-facing entry points — notification behavior is identical.
 - **Settings-page integration**: DSH Settings → "Notifications" section with a master switch, notification style, toast count/duration, and per-type background/text colors (done = green, failed = red, running = blue, approval = yellow, question = purple).
 
@@ -38,11 +38,12 @@ A notification plugin for DeepSeek Harness: alerts you on **task completed / tas
   - Custom notifications: **max simultaneously visible**, **display duration**, and a **per-type background/text color** list
     (done = green, failed = red, running = blue, approval = yellow, question = purple; each customizable);
   - The custom-settings block animates open/closed; system notifications offer one-click permission request.
-- **Custom notification = desktop toast (independent of the browser)**: the host plugin spawns a **resident PowerShell + WPF host process** that pops borderless, always-on-top toasts at the **bottom-right** of the screen (multiple toasts stack upward without overlapping). Each toast has a title, body, and an **Ignore** button (**web only: plus a "Jump to session" button**; 10px rounded-rect buttons), colored per type from the config. Done/failed toasts auto-dismiss after the display duration; **running/approval/question toasts stay until their state ends** (turn end / decision made / answer given). Running content is **updated in place** (400ms throttle — no re-spawn, no flicker); approval/question are stateful and **not debounced** (multiple approvals/questions within 2s are never swallowed). Whether the browser page is open or minimized does not matter. Until the session title arrives (LLM-generated asynchronously — first-turn events precede the title event), toasts show a localized placeholder ("(Unnamed session)"); when the `session/title` event lands, **the titles of already-shown toasts are updated in place** — the workspace directory name is never used.
+- **Custom notification = desktop toast (independent of the browser)**: the host plugin spawns a **resident PowerShell + WPF host process** that pops borderless, always-on-top toasts at the **bottom-right** of the screen (multiple toasts stack upward without overlapping). Each toast has a title, body, and an **Ignore** button (**web only: plus a "Jump to session" button**; **desktop only: plus a "Go to app" button**; 10px rounded-rect buttons), colored per type from the config. Done/failed toasts auto-dismiss after the display duration; **running/approval/question toasts stay until their state ends** (turn end / decision made / answer given). Running content is **updated in place** (400ms throttle — no re-spawn, no flicker); approval/question are stateful and **not debounced** (multiple approvals/questions within 2s are never swallowed). Whether the browser page is open or minimized does not matter. Until the session title arrives (LLM-generated asynchronously — first-turn events precede the title event), toasts show a localized placeholder ("(Unnamed session)"); when the `session/title` event lands, **the titles of already-shown toasts are updated in place** — the workspace directory name is never used.
 - **Resident host architecture**: the plugin starts one `powershell` host process (`toast-host.ps1`) on load; WPF is loaded only once and every toast is created inside that process — toast creation latency drops from ~1s cold start to ~10ms. The host receives one JSON command per line on **stdin** (`show`/`text`/`title`/`move`/`close`/`shutdown`) and reports `pos`/`exit` on **stdout**; no per-toast process spawn and no ctl/pos file polling.
 - **Jump to session (web only)**: clicking a system notification or the toast's "Jump to session" button opens the browser and navigates to the session (via the URL hash convention `#dsh-notify-yimit/session=<id>`, listened to by the client; optionally with a specific browser). **The desktop app does not show that button** — opening a browser from inside the desktop app is redundant.
+- **Go to app (desktop only)**: the "Go to app" button (right of "Ignore") brings the running desktop window to the foreground. The **host process enumerates windows and activates it itself** (locating PIDs by the app executable path, picking that process's top-level window, then `ShowWindow(SW_RESTORE)` + `SetForegroundWindow`). It deliberately does **not** use the app's registered `dsh://open` protocol: the app only handles that URL in its **macOS `open-url`** event, while on Windows a protocol URL arrives as an argv argument and the app's `second-instance` handler neither reads argv nor checks the URL — that path is dead code on Windows. Window selection is tiered (visible + titled + unowned → titled + unowned → titled), so it still finds the main window when the app is **minimized to tray or covered**. The host is the foreground process at click time, so the "only the foreground process may steal focus" restriction does not apply. **Clicking it does not dismiss the toast** (unlike the other buttons); if no window can be located it silently does nothing.
 - **Runtime-aware UI**: the host detects its platform from the runtime (Electron runtime = desktop, plain Node = web) and adapts the UI:
-  - desktop: toasts omit the "Jump to session" button; the settings page hides the jump browser picker and the "system notifications come from the browser / custom toasts sit at the bottom-right" explainer;
+  - desktop: toasts omit the "Jump to session" button and show "Go to app" instead; the settings page hides the jump browser picker and the "system notifications come from the browser / custom toasts sit at the bottom-right" explainer;
   - web: everything stays visible.
 - **System notifications**: native browser notifications; clicking one focuses the window and opens the session.
 - **Requirements**: Windows (PowerShell 5.1+, built-in); custom desktop toasts need no extra dependencies.

package/README.md

@@ -45,7 +45,8 @@ DeepSeek Harness 通知插件:在 **任务完成 / 任务出错 / 运行中(实
   - 自定义设置区块显隐带过渡动画;系统通知可一键申请浏览器通知权限。
 - **自定义通知 = 桌面浮窗(不依赖浏览器)**:宿主插件通过**常驻 PowerShell + WPF 宿主进程**
   在屏幕**右下角**弹出无边框置顶浮窗(多浮窗自动向上堆叠不重叠),标题、内容、**忽略**按钮
-  (**web 端另有「跳转会话」按钮**,按钮为圆角矩形 10px);按通知类型使用对应配置的背景/文字色。完成/出错
+  (**web 端另有「跳转会话」按钮**,**桌面端另有「返回应用」按钮**,按钮为圆角矩形 10px);
+  按通知类型使用对应配置的背景/文字色。完成/出错
   按显示时长后自动消失;**运行中/待审批/待回答在状态结束前不会消失**(任务结束/审批决定/
   回答完成后自动关闭)。运行中内容**原地更新文本**(400ms 节流,不重弹、不闪烁);
   待审批/待回答为状态性通知,**不做防抖**(2s 内多条审批/提问不会被吞)。浏览器页面是否
@@ -59,9 +60,18 @@ DeepSeek Harness 通知插件:在 **任务完成 / 任务出错 / 运行中(实
 - **跳转会话(仅 web 端)**:系统通知点击 / 自定义浮窗「跳转会话」按钮 → **打开浏览器**并定位到该会话
   (通过 URL hash 约定 `#dsh-notify-yimit/session=<id>`,客户端监听后切换;可用所选浏览器打开)。
   **桌面端(App)不显示该按钮**——在桌面应用里再打开浏览器属于多余动作。
+- **返回应用(仅桌面端)**:浮窗「忽略」右侧的「返回应用」按钮把已运行的桌面窗口切到前台。
+  实现是**宿主进程自己枚举窗口并激活**(按应用可执行文件路径定位 PID,再挑出该进程的顶层窗口,
+  `ShowWindow(SW_RESTORE)` + `SetForegroundWindow`)。之所以不用应用已注册的 `dsh://open` 协议:
+  应用只在 **macOS 的 `open-url` 事件**里处理该 URL,Windows 上协议 URL 是作为 argv 交给新进程的,
+  而它的 `second-instance` 处理器不读 argv、也不校验 URL —— 那条路在 Windows 上是死代码。
+  窗口挑选分三级(可见+有标题+非 owner → 有标题+非 owner → 有标题),因此**最小化到托盘、
+  被其他窗口遮挡**时同样能找到主窗口。宿主被点击的那一刻本就是前台进程,所以不受
+  "仅前台进程可抢占前台"的限制。**点击后不关闭该通知**,浮窗保留(与其他按钮不同);
+  定位不到窗口时静默无动作。
 - **运行环境自适应**:宿主按运行时自动判定平台(Electron 运行时 = 桌面端,普通 Node = web 端),
   并据此调整界面:
-  - 桌面端:浮窗隐藏「跳转会话」按钮;设置页隐藏「跳转浏览器选择器」与"系统通知由浏览器弹出/
+  - 桌面端:浮窗隐藏「跳转会话」按钮、改为显示「返回应用」按钮;设置页隐藏「跳转浏览器选择器」与"系统通知由浏览器弹出/
     自定义为桌面右下角浮窗"那段说明;
   - web 端:全部保留。
 - **系统通知**:浏览器原生通知,点击通知即聚焦窗口并打开对应会话。

package/lib/client.js

@@ -78,6 +78,17 @@ window.__ModuleLoader__.load({
 			'.dn-msg.ok{color:var(--dsw-alias-state-success-primary)}',
 			'.dn-msg.err{color:var(--dsw-alias-state-error-primary)}',
 			'.dn-divider{height:1px;background:var(--dsw-alias-border-l1)}',
+			// ④ 宿主故障横幅:让"通知不显示"从静默失败变成可见、可解释。
+			//    颜色走 --dsw-alias-state-* 令牌,深/浅色模式都能自适应。
+			'.dn-host{display:flex;flex-direction:column;gap:8px;border:1px solid var(--dsw-alias-state-error-primary);border-radius:8px;padding:10px 12px;background:color-mix(in srgb,var(--dsw-alias-state-error-primary) 10%,transparent)}',
+			'.dn-host-line{display:flex;align-items:flex-start;gap:8px;font-size:12px;line-height:18px}',
+			'.dn-host-icon{flex:none;font-size:13px;line-height:18px;color:var(--dsw-alias-state-error-primary)}',
+			'.dn-host-title{font-weight:600;color:var(--dsw-alias-state-error-primary)}',
+			'.dn-host-body{color:var(--dsw-alias-label-secondary);flex:1;min-width:0}',
+			'.dn-host-actions{display:flex;align-items:center;gap:8px;padding-left:21px}',
+			'.dn-host-detail{font-size:11px;line-height:16px;font-family:var(--dsw-font-mono);color:var(--dsw-alias-label-tertiary);background:var(--dsw-alias-bg-base);border:1px solid var(--dsw-alias-border-l1);border-radius:6px;padding:6px 8px;margin-left:21px;max-height:88px;overflow:auto;white-space:pre-wrap;word-break:break-all}',
+			'.dn-host[data-tone="ok"]{border-color:var(--dsw-alias-state-success-primary);background:color-mix(in srgb,var(--dsw-alias-state-success-primary) 10%,transparent)}',
+			'.dn-host[data-tone="ok"] .dn-host-icon,.dn-host[data-tone="ok"] .dn-host-title{color:var(--dsw-alias-state-success-primary)}',
 			'.dn-layer{position:fixed;top:16px;right:16px;z-index:9999;display:flex;flex-direction:column;align-items:flex-end;gap:10px;pointer-events:none}',
 			'.dn-card{pointer-events:auto;width:320px;max-width:calc(100vw - 32px);border-radius:12px;box-shadow:var(--dsw-shadow-lv3);border:1px solid var(--dsw-alias-border-l2);background:var(--dn-bg,#20272f);color:var(--dn-fg,#e6edf3);overflow:hidden;animation:dn-in .18s ease}',
 			'@keyframes dn-in{from{opacity:0;transform:translateX(24px)}to{opacity:1;transform:translateX(0)}}',
@@ -131,6 +142,20 @@ window.__ModuleLoader__.load({
 			permissionDefault: '系统通知需要浏览器通知权限',
 			requestPermission: '申请通知权限',
 			triggerNote: '触发场景:任务完成、任务出错、运行中(实时内容)、等待审批、等待回答。通知标题为对话标题;点击通知或跳转按钮可打开对应会话。',
+			// ④ 宿主故障横幅
+			hostErrTitle: '通知宿主异常退出',
+			hostErrBody: '自定义通知当前无法显示{detail}。',
+			hostErrPending: ' —— 已积压 {n} 条通知',
+			hostErrRetryIn: ';正在退避,约 {s} 秒后自动重试',
+			hostErrRetryNow: '立即重试',
+			hostErrRetry: '重新拉起宿主',
+			hostErrDetail: '查看详情',
+			hostErrDetailHide: '收起详情',
+			hostErrDetailText: '退出码 {code},连续失败 {n} 次',
+			hostErrSignal: '退出码 {code}(信号 {signal}),连续失败 {n} 次',
+			hostErrOkTitle: '通知宿主已恢复',
+			hostErrOkBody: '自定义通知已恢复正常。',
+			hostErrOkBodyPending: '已补发 {n} 条积压通知。',
 			toastStyleTitle: '通知窗口样式',
 			toastGapLabel: '通知间距(px)',
 			enterEdit: '进入编辑模式',
@@ -177,6 +202,20 @@ window.__ModuleLoader__.load({
 			permissionDefault: 'System notifications need browser notification permission',
 			requestPermission: 'Request permission',
 			triggerNote: 'Triggers: task completed, task failed, running (live activity), awaiting approval, awaiting answer. The title is the conversation title; clicking the notification or the jump button opens the session.',
+			// ④ host-failure banner
+			hostErrTitle: 'Notification host exited unexpectedly',
+			hostErrBody: 'Custom notifications cannot be shown right now{detail}.',
+			hostErrPending: ' — {n} notification(s) queued',
+			hostErrRetryIn: '; backing off, retrying in about {s}s',
+			hostErrRetryNow: 'Retry now',
+			hostErrRetry: 'Restart host',
+			hostErrDetail: 'Show details',
+			hostErrDetailHide: 'Hide details',
+			hostErrDetailText: 'exit code {code}, {n} consecutive failure(s)',
+			hostErrSignal: 'exit code {code} (signal {signal}), {n} consecutive failure(s)',
+			hostErrOkTitle: 'Notification host recovered',
+			hostErrOkBody: 'Custom notifications are working again.',
+			hostErrOkBodyPending: '{n} queued notification(s) delivered.',
 			toastStyleTitle: 'Toast window style',
 			toastGapLabel: 'Toast gap (px)',
 			enterEdit: 'Enter edit mode',
@@ -356,10 +395,27 @@ window.__ModuleLoader__.load({
 
 		function parseState(v, path) {
 			if (v === null || typeof v !== 'object' || Array.isArray(v)) fail(path)
+			// ④ 宿主故障状态。旧宿主没有该字段 → null(不显示横幅)。
+			// 手写 codec 是"只取已知字段"的宽容解析,多余字段会被忽略,
+			// 但宿主侧 typert 的 z.object 会**丢弃**未声明字段,所以那边也必须声明。
+			let hostError = null
+			const he = v.hostError
+			if (he !== null && he !== undefined && typeof he === 'object' && !Array.isArray(he)) {
+				hostError = {
+					code: typeof he.code === 'number' ? he.code : null,
+					signal: typeof he.signal === 'string' ? he.signal : null,
+					at: typeof he.at === 'number' ? he.at : 0,
+					count: typeof he.count === 'number' ? he.count : 1,
+					retryAt: typeof he.retryAt === 'number' ? he.retryAt : 0,
+				}
+			}
 			return {
 				config: parseConfig(v.config, path + '.config'),
 				// 宿主运行环境:true = 桌面端。缺省按 web 端处理(旧宿主无该字段)。
 				desktop: v.desktop === true,
+				hostError,
+				pendingCount: typeof v.pendingCount === 'number' && v.pendingCount >= 0 ? Math.floor(v
+					.pendingCount) : 0,
 				events: Array.isArray(v.events) ? v.events.map((e, i) => parseEvent(e, path + '.events[' +
 					i + ']')) : []
 			}
@@ -474,6 +530,16 @@ window.__ModuleLoader__.load({
 				},
 				parameters: [],
 				result: strictResult('dsh-notify-yimit#AckResult', ackCodec)
+			}, {
+				id: 'dsh-notify-yimit#notify/retryHost',
+				service: 'notify',
+				namespace: 'notify',
+				method: 'retryHost',
+				invocation: {
+					kind: 'direct'
+				},
+				parameters: [],
+				result: strictResult('dsh-notify-yimit#AckResult', ackCodec)
 			}]
 		}
 
@@ -714,6 +780,22 @@ window.__ModuleLoader__.load({
 				.permission : 'unsupported')
 			// 通知窗口编辑模式(样板窗拖拽/缩放)
 			const [editing, setEditing] = useState(false)
+			// ④ 横幅里的「查看详情」折叠状态
+			const [hostDetail, setHostDetail] = useState(false)
+			// ④ 宿主故障横幅:退避倒计时每秒重算一次(依赖的 retryAt 是稳定数字,
+			//    所以这个 effect 不会因为轮询重渲染而反复重建定时器)。
+			const hostError = state?.hostError ?? null
+			const pendingCount = state?.pendingCount ?? 0
+			const retryAt = hostError !== null && typeof hostError.retryAt === 'number' ? hostError.retryAt : 0
+			const [nowTick, setNowTick] = useState(0)
+			useEffect(() => {
+				if (retryAt <= 0) return undefined
+				const timer = setInterval(() => setNowTick((n) => n + 1), 1000)
+				return () => clearInterval(timer)
+			}, [retryAt])
+			// 倒计时秒数(取整);nowTick 参与依赖以触发重算
+			void nowTick
+			const retryInSec = retryAt > 0 ? Math.max(0, Math.round((retryAt - Date.now()) / 1000)) : 0
 			// 最新值镜像:卸载清理时读取(避免空依赖闭包拿到陈旧值)。
 			const editingRef = useRef(false)
 			editingRef.current = editing
@@ -1084,6 +1166,52 @@ window.__ModuleLoader__.load({
 				el('p', {
 					className: 'dn-note'
 				}, t('saveHint')),
+				// ④ 宿主故障横幅:让"自定义通知不显示"从静默失败变成可见、可解释。
+				//    仅在宿主确实异常退出时出现(hostError 由宿主侧置上)。
+				hostError !== null ? el('div', {
+						className: 'dn-host',
+						'data-tone': 'err'
+					},
+					el('div', {
+							className: 'dn-host-line'
+						},
+						el('span', {
+							className: 'dn-host-icon'
+						}, '✕'),
+						el('span', {
+								className: 'dn-host-body'
+							},
+							el('span', {
+								className: 'dn-host-title'
+							}, t('hostErrTitle')),
+							t('hostErrBody', {
+								detail: (pendingCount > 0 ? t('hostErrPending', {
+									n: pendingCount
+								}) : '') + (retryInSec > 0 ? t('hostErrRetryIn', {
+									s: retryInSec
+								}) : '')
+							}))),
+					el('div', {
+							className: 'dn-host-actions'
+						},
+						el('button', {
+							className: 'dn-btn primary',
+							onClick: () => void api.retryHost()
+						}, retryInSec > 0 ? t('hostErrRetryNow') : t('hostErrRetry')),
+						el('button', {
+							className: 'dn-btn',
+							onClick: () => setHostDetail(!hostDetail)
+						}, hostDetail ? t('hostErrDetailHide') : t('hostErrDetail'))),
+					hostDetail ? el('div', {
+						className: 'dn-host-detail'
+					}, hostError.signal !== null && hostError.signal !== undefined ? t('hostErrSignal', {
+						code: hostError.code === null ? '-' : hostError.code,
+						signal: hostError.signal,
+						n: hostError.count
+					}) : t('hostErrDetailText', {
+						code: hostError.code === null ? '-' : hostError.code,
+						n: hostError.count
+					})) : null) : null,
 				msg !== null ? el('div', {
 					className: 'dn-msg ' + msg.kind
 				}, msg.text) : null,
@@ -1111,6 +1239,8 @@ window.__ModuleLoader__.load({
 			const store = makeStore({
 				config: null,
 				desktop: false,
+				hostError: null,
+				pendingCount: 0,
 				events: [],
 				browsers: []
 			})
@@ -1125,6 +1255,8 @@ window.__ModuleLoader__.load({
 						store.set({
 							config: state.config,
 							desktop: state.desktop,
+							hostError: state.hostError ?? null,
+							pendingCount: state.pendingCount ?? 0,
 							events: state.events,
 							browsers: parsed.browsers
 						})
@@ -1162,6 +1294,9 @@ window.__ModuleLoader__.load({
 						store.set({
 							config: parseConfig(result.value, 'config'),
 							desktop: state.desktop,
+							// ④ 保留宿主故障状态与积压数,否则改一次配置横幅就被抹掉
+							hostError: state.hostError ?? null,
+							pendingCount: state.pendingCount ?? 0,
 							events: state.events,
 							browsers: state.browsers
 						})
@@ -1186,6 +1321,17 @@ window.__ModuleLoader__.load({
 					} catch {
 						/* 静默 */ }
 				},
+				// ④ 横幅上的「重新拉起宿主」:清退避并立刻重试,然后重新拉一次状态。
+				retryHost: async () => {
+					try {
+						await notify.retryHost()
+					} catch {
+						/* 静默 */ }
+					try {
+						await reload()
+					} catch {
+						/* 静默 */ }
+				},
 			}
 
 			// ===== 现在设置 __localeService 并使用 api =====