dsh-reminding 1.0.0 → 1.0.1

package/client.js

@@ -183,8 +183,18 @@ window.__ModuleLoader__.load({
       }
     }
 
+    /** Ask the Host to restore the desktop window; a browser Host has no window to restore. */
+    function requestWindowFocus() {
+      try {
+        void fetch('reminding/focus', { method: 'POST', cache: 'no-store' }).catch(() => {})
+      } catch {
+        // The Host route is an enhancement; window.focus() remains the fallback.
+      }
+    }
+
     /** Open the conversation that produced one reminder. */
     function openConversation(sessionId) {
+      requestWindowFocus()
       try {
         window.focus()
       } catch {
@@ -278,6 +288,9 @@ window.__ModuleLoader__.load({
     /** Live toasts by feed key, so a resolved approval/question can close its own toast. */
     const liveToasts = new Map()
 
+    /** TEMPORARY: last showReminder decision, reported through the next poll for diagnosis. */
+    let lastDecision = ''
+
     /** Close one toast by its feed key. */
     function closeToast(key) {
       const entry = liveToasts.get(key)
@@ -299,23 +312,26 @@ window.__ModuleLoader__.load({
      */
     function showReminder(t, item, options = {}) {
       if (options.force !== true) {
-        if (!enabled) return false
-        if (pageFocused() && viewingSession(item?.sessionId)) return false
+        if (!enabled) { lastDecision = `${item?.kind}:off`; return false }
+        if (pageFocused() && viewingSession(item?.sessionId)) { lastDecision = `${item?.kind}:focus`; return false }
       }
-      if (permissionState() !== 'granted') return false
+      if (permissionState() !== 'granted') { lastDecision = `${item?.kind}:perm=${permissionState()}`; return false }
       const copy = describe(t, item)
-      if (copy === null) return false
+      if (copy === null) { lastDecision = `${item?.kind}:nokind`; return false }
       try {
         const notification = new Notification(copy.title, {
           body: copy.body,
-          tag: typeof item.key === 'string' ? item.key : undefined,
+          tag: item?.kind === 'completed' ? undefined : typeof item.key === 'string' ? item.key : undefined,
         })
+        lastDecision = `${item?.kind}:ok`
+        notification.onshow = () => { lastDecision = `${item?.kind}:shown` }
         const key = typeof item.key === 'string' ? item.key : ''
         if (key !== '') {
           closeToast(key)
           liveToasts.set(key, notification)
         }
         notification.onclick = () => {
+          lastDecision = `click:${item?.sessionId ?? ''}`
           openConversation(item?.sessionId)
           try {
             notification.close()
@@ -328,10 +344,12 @@ window.__ModuleLoader__.load({
           if (key !== '') liveToasts.delete(key)
         }
         notification.onerror = () => {
+          lastDecision = `${item?.kind}:onerror`
           if (key !== '') liveToasts.delete(key)
         }
         return true
       } catch (err) {
+        lastDecision = `${item?.kind}:error=${err?.message ?? String(err)}`
         console.warn('[dsh-reminding] could not show the notification:', err)
         return false
       }
@@ -370,9 +388,18 @@ window.__ModuleLoader__.load({
         while (!stopped) {
           controller = typeof AbortController === 'function' ? new AbortController() : null
           try {
-            const response = await fetch(`${ROUTE_POLL}?since=${since}&wait=1`, {
+            const diag = `&page=${encodeURIComponent(window.location.href)}&perm=${encodeURIComponent(permissionState())}&on=${enabled ? 1 : 0}&focus=${pageFocused() ? 1 : 0}&dec=${encodeURIComponent(lastDecision)}`
+            // A poll the Host never answers (for example while its plugin
+            // reloads) must not freeze the feed: give every request a bound,
+            // above the Host's own 25s hold, and retry after it.
+            const timeout = typeof AbortSignal?.timeout === 'function' ? AbortSignal.timeout(30_000) : null
+            let signal
+            if (controller === null) signal = timeout ?? undefined
+            else if (timeout !== null && typeof AbortSignal?.any === 'function') signal = AbortSignal.any([controller.signal, timeout])
+            else signal = controller.signal
+            const response = await fetch(`${ROUTE_POLL}?since=${since}&wait=1${diag}`, {
               cache: 'no-store',
-              ...(controller === null ? {} : { signal: controller.signal }),
+              ...(signal === undefined ? {} : { signal }),
             })
             if (!response.ok) throw new Error(`HTTP ${response.status}`)
             const payload = await response.json()

package/index.js

@@ -25,10 +25,37 @@
  * starts a fresh baseline and never replays old reminders.
  */
 
+import { spawn } from 'node:child_process'
+import { appendFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { fileURLToPath } from 'node:url'
+
 export const inject = ['webServer']
 
+/** Resolves Electron's main-process module when the Host runs inside the desktop shell. */
+const requireFromHost = createRequire(import.meta.url)
+
+/** TEMPORARY diagnostic log used while tracking a missing-notification report. */
+const DEBUG_LOG = fileURLToPath(new URL('./dsh-reminding-debug.log', import.meta.url))
+
+/**
+ * Append one diagnostic line to the temporary log; never fails the plugin.
+ * @param parts - values joined into the line.
+ */
+function debug(...parts) {
+  try {
+    appendFileSync(DEBUG_LOG, `${new Date().toISOString()} ${parts.join(' ')}\n`)
+  } catch {
+    // Diagnostics must never disturb the plugin.
+  }
+}
+
+debug('module loaded')
+
 /** Loopback route the browser half long-polls. */
 const ROUTE_POLL = '/reminding/poll'
+/** Route the browser half calls when a toast is clicked, to restore the desktop window. */
+const ROUTE_FOCUS = '/reminding/focus'
 /** How many feed items stay available for a briefly disconnected page. */
 const MAX_FEED = 80
 /** How long one poll is held open before an empty answer releases it. */
@@ -99,17 +126,71 @@ function rejected(ctx, req, res) {
   } catch {
     rejection = undefined
   }
-  if (rejection === undefined) return false
+  if (rejection === undefined) {
+    debug('poll admitted', req.method ?? '', req.url ?? '', 'referer=' + String(req.headers?.referer ?? '-'))
+    return false
+  }
+  debug('poll rejected', String(rejection), req.method ?? '', req.url ?? '')
   res.statusCode = rejection
   res.end()
   return true
 }
 
+/**
+ * Restore and raise the desktop window after a toast click. The renderer's
+ * `window.focus()` cannot un-minimize an Electron window, and the desktop Host
+ * runs the Electron binary as Node (`ELECTRON_RUN_AS_NODE=1`), so it owns no
+ * windows. Launching the shell once more is the desktop's own focus path: the
+ * new process fails the single-instance lock and exits, and the running
+ * instance's `second-instance` handler restores and focuses its primary window.
+ * When the Host itself is the Electron main process, the window objects are
+ * used directly. A plain `dsh web` Host answers false without side effects.
+ * @returns true when a focus request was issued.
+ */
+async function focusDesktopWindow() {
+  // The desktop Host runs inside Electron with ELECTRON_RUN_AS_NODE=1, where
+  // `process.versions.electron` is still set but `require('electron')` is only
+  // the executable path, so the Node-mode branch must come first.
+  if (process.env.ELECTRON_RUN_AS_NODE === '1') {
+    try {
+      const env = { ...process.env }
+      delete env.ELECTRON_RUN_AS_NODE
+      debug('focus mode', 'relaunch', process.execPath)
+      const child = spawn(process.execPath, [], { env, detached: true, stdio: 'ignore' })
+      child.unref()
+      return true
+    } catch {
+      return false
+    }
+  }
+  if (process.versions?.electron === undefined) return false
+  try {
+    const { BrowserWindow } = requireFromHost('electron')
+    if (typeof BrowserWindow?.getAllWindows !== 'function') return false
+    const windows = BrowserWindow.getAllWindows().filter((window) => !window.isDestroyed())
+    const target = windows.find((window) => {
+      try {
+        return String(window.webContents?.getURL?.() ?? '').startsWith('dsh-app://app/')
+      } catch {
+        return false
+      }
+    }) ?? windows[0]
+    if (target === undefined) return false
+    if (target.isMinimized()) target.restore()
+    target.show()
+    target.focus()
+    return true
+  } catch {
+    return false
+  }
+}
+
 /**
  * Mount the reminder feed.
  * @param ctx - host context with `webServer`.
  */
 export function apply(ctx) {
+  debug('apply', 'pid=' + String(process.pid))
   let seq = 0
   let disposed = false
   /** Published feed items, oldest first. */
@@ -127,6 +208,7 @@ export function apply(ctx) {
    */
   function publish(item) {
     if (disposed) return
+    debug('publish', item.kind ?? '', String(item.sessionId ?? ''), String(item.key ?? ''))
     seq += 1
     const entry = { seq, at: Date.now(), ...item }
     feed.push(entry)
@@ -174,6 +256,9 @@ export function apply(ctx) {
       clearTimeout(timer)
       waiters.delete(waiter)
     }
+    // A retiring Host answers instead of leaving the page's request hanging, so
+    // the browser half re-polls the replacement instance immediately.
+    waiter.end = () => finish([])
     waiters.add(waiter)
     req.once('close', waiter.cancel)
     res.once('close', waiter.cancel)
@@ -183,6 +268,7 @@ export function apply(ctx) {
   function cancelCompletion(sessionId) {
     const timer = completionTimers.get(sessionId)
     if (timer === undefined) return
+    debug('cancelCompletion', sessionId)
     clearTimeout(timer)
     completionTimers.delete(sessionId)
   }
@@ -213,6 +299,14 @@ export function apply(ctx) {
   function onSessionEvent(session, event) {
     try {
       if (disposed) return
+      const header = session?.header
+      debug(
+        'event',
+        String(event?.type ?? ''),
+        String(header?.id ?? session?.id ?? ''),
+        'origin=' + String(header?.origin ?? '-'),
+        'depth=' + String(header?.delegationDepth ?? 0),
+      )
       if (!shouldNotifySession(session)) return
       const sessionId = String(session?.header?.id ?? session?.id ?? '')
       if (sessionId === '') return
@@ -311,6 +405,7 @@ export function apply(ctx) {
   ctx.on('session/event', onSessionEvent)
   ctx.on('agent/disposed', (payload) => {
     const id = payload?.agent?.id
+    debug('agent/disposed', String(id ?? ''))
     if (id !== undefined) cancelCompletion(String(id))
   })
 
@@ -322,7 +417,10 @@ export function apply(ctx) {
       completionTimers.clear()
       for (const timer of approvalTimers.values()) clearTimeout(timer)
       approvalTimers.clear()
-      for (const waiter of [...waiters]) waiter.cancel()
+      for (const waiter of [...waiters]) {
+        if (typeof waiter.end === 'function') waiter.end()
+        else waiter.cancel()
+      }
       waiters.clear()
     }
   }, 'dsh-reminding: lifecycle')
@@ -353,4 +451,18 @@ export function apply(ctx) {
       hold(req, res, since)
     },
   }), 'dsh-reminding: /reminding/poll')
+
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: ROUTE_FOCUS,
+    handler: (req, res) => {
+      if (rejected(ctx, req, res)) return
+      debug('focus requested', req.method ?? '')
+      void focusDesktopWindow().then((focused) => {
+        debug('focus result', String(focused))
+        res.statusCode = 204
+        res.end()
+      })
+    },
+  }), 'dsh-reminding: /reminding/focus')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-reminding",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "System reminders for DeepSeek Harness: OS notifications when a step needs your approval, the model asks a question, or a turn finishes; click a toast to jump back to that conversation. Works on Windows, macOS and Linux.",
   "license": "MIT",
   "author": "liuchaoxu <ischaoxu@163.com>",