dsh-global-todo 0.3.2 → 0.4.0

package/lib/service.js

@@ -38,7 +38,10 @@ export const FILTERS = Object.freeze(['all', 'active', 'open', 'doing', 'done',
 /** Sort keys the panel and the tools may ask for. */
 export const SORTS = Object.freeze(['created', 'updated', 'due', 'priority'])
 
-const PRIORITY_RANK = { high: 0, normal: 1, low: 2 }
+// Every level the record can hold, or the comparator silently produces NaN for
+// the missing one and the highest-priority items sort last. `urgent` was added
+// to the model without this table, so `sort=priority` put P0 at the bottom.
+const PRIORITY_RANK = { urgent: 0, high: 1, normal: 2, low: 3 }
 
 /**
  * Fold imported records into the current list: a known id wins, a new one appends.
@@ -111,7 +114,7 @@ export function createService(options) {
   /**
    * @param {object[]} todos
    * @param {{ status?: string, query?: string, tag?: string, sort?: string, limit?: number }} [query]
-   * @returns {object[]}
+   * @returns {{ todos: object[], matched: number }} the page and how many matched before it
    */
   /** Friendly level aliases, so search can be written the way the panel talks. */
   const LEVEL_ALIAS = Object.freeze({ p0: 'urgent', p1: 'high', p2: 'normal', p3: 'low' })
@@ -230,17 +233,25 @@ export function createService(options) {
     })
 
     const limit = Number.isInteger(query.limit) && query.limit > 0 ? Math.min(query.limit, 1000) : 200
-    return out.slice(0, limit)
+    // matched is the count before the page is cut. Returning only the page made the
+    // panel show 200 for a list of 350 with no way to tell -- the caller now has
+    // enough to say 'showing 200 of 350' instead of quietly lying.
+    return { todos: out.slice(0, limit), matched: out.length }
   }
 
   /**
    * @param {{ status?: string, query?: string, tag?: string, sort?: string, limit?: number }} [query]
-   * @returns {Promise<{ todos: object[], counts: object, matched: number }>}
+   * @returns {Promise<{ todos: object[], counts: object, matched: number, truncated: boolean }>}
    */
   async function list(query = {}) {
     const todos = await store.all()
     const selected = select(todos, query)
-    return { todos: selected, counts: counts(todos, now()), matched: selected.length }
+    return {
+      todos: selected.todos,
+      counts: counts(todos, now()),
+      matched: selected.matched,
+      truncated: selected.matched > selected.todos.length,
+    }
   }
 
   /**

package/lib/settings.js

@@ -13,6 +13,21 @@ import { readFile, writeFile } from 'node:fs/promises'
 /** How many sessions the cooldown bookkeeping remembers. */
 const ASKED_LIMIT = 50
 
+/**
+ * Backoff after a failed question, in order. A failed resume is often transient, so the
+ * first retry is a minute away; three failures mean the conversation is not reachable now.
+ */
+export const RETRY_DELAYS_MS = Object.freeze([60_000, 300_000, 1_500_000])
+
+/**
+ * @param {number} attempts - 1-based failure count
+ * @returns {number} milliseconds to wait before the next attempt
+ */
+export function retryDelayMs(attempts) {
+  const index = Math.min(Math.max(Number(attempts) || 1, 1), RETRY_DELAYS_MS.length) - 1
+  return RETRY_DELAYS_MS[index]
+}
+
 /** How many exempt workspaces are remembered. */
 const EXEMPT_LIMIT = 50
 
@@ -100,6 +115,9 @@ export function isExemptWorkspace(sessionDir, exemptWorkspaces) {
  */
 export function createSettings(options) {
   let state = normalizeSettings(SETTINGS_DEFAULTS)
+  // How the file arrived. An off switch and a broken file look identical from the panel,
+  // and that ambiguity is exactly what made a silent failure to load invisible.
+  let loadInfo = { file: options.file ?? '', source: 'default', at: 0, error: null }
   // The startup read is kicked off without being awaited (the plugin cannot block its own
   // mount on a file), and it replaces the *whole* state. A write that lands while it is
   // still in flight is therefore undone by it — the panel's toggle would flip back and the
@@ -118,10 +136,25 @@ export function createSettings(options) {
     /** Read once at startup; a missing or broken file means the defaults. */
     async load() {
       startup = (async () => {
+        let text = null
         try {
-          state = normalizeSettings(JSON.parse(await readFile(options.file, 'utf8')))
-        } catch {
+          text = await readFile(options.file, 'utf8')
+        } catch (error) {
           state = normalizeSettings(SETTINGS_DEFAULTS)
+          loadInfo = {
+            file: options.file ?? '',
+            source: error?.code === 'ENOENT' ? 'missing' : 'unreadable',
+            at: Date.now(),
+            error: error?.code === 'ENOENT' ? null : String(error?.message ?? error),
+          }
+          return
+        }
+        try {
+          state = normalizeSettings(JSON.parse(text))
+          loadInfo = { file: options.file ?? '', source: 'file', at: Date.now(), error: null }
+        } catch (error) {
+          state = normalizeSettings(SETTINGS_DEFAULTS)
+          loadInfo = { file: options.file ?? '', source: 'corrupt', at: Date.now(), error: String(error?.message ?? error) }
         }
       })()
       await startup
@@ -131,6 +164,10 @@ export function createSettings(options) {
     get() {
       return { ...state, asked: { ...state.asked } }
     },
+    /** Where the settings came from and whether the file was readable, for /health. */
+    info() {
+      return { ...loadInfo }
+    },
     /** A patch a route or a test can send; unknown fields are ignored. */
     async update(patch) {
       await startup
@@ -146,6 +183,22 @@ export function createSettings(options) {
       await persist()
       return this.get()
     },
+    /**
+     * Undo a booking whose question never arrived.
+     *
+     * A failed ask used to leave the booking behind, and `awaiting-human` then kept the
+     * conversation silent until a person spoke again — one transient resume failure turned
+     * the feature off for that conversation.
+     */
+    async forgetAsked(sessionId) {
+      await startup
+      if (typeof sessionId !== 'string' || sessionId === '' || !(sessionId in state.asked)) return this.get()
+      const asked = { ...state.asked }
+      delete asked[sessionId]
+      state = normalizeSettings({ ...state, asked })
+      await persist()
+      return this.get()
+    },
   }
 }
 
@@ -166,11 +219,29 @@ export function createSettings(options) {
  * @returns {{ sessionId: string, idleMs: number }[]}
  */
 export function dueAutoCollect(input) {
-  const due = []
+  return explainAutoCollect(input)
+    .filter((decision) => decision.ask)
+    .map((decision) => ({ sessionId: decision.sessionId, idleMs: decision.idleMs }))
+}
+
+/**
+ * The same decisions, with the reason kept.
+ *
+ * `dueAutoCollect` used to compute the reason and throw it away, which is why "why was this
+ * conversation not asked?" had no answer anywhere. `/health` reads this list.
+ *
+ * @param {object} input - the same shape `dueAutoCollect` takes, plus optional `retryAt`
+ * @returns {{ sessionId: string, ask: boolean, reason: string, idleMs: number }[]}
+ */
+export function explainAutoCollect(input) {
+  const out = []
   for (const sessionId of Object.keys(input.pending ?? {})) {
     const lastAt = input.activityAt?.[sessionId]
     // Fail closed: without a known "went quiet at", there is nothing to wait for.
-    if (!Number.isFinite(lastAt) || lastAt <= 0) continue
+    if (!Number.isFinite(lastAt) || lastAt <= 0) {
+      out.push({ sessionId, ask: false, reason: 'no-activity', idleMs: 0 })
+      continue
+    }
     const idleMs = input.now - lastAt
     const decision = decideAutoCollect({
       settings: input.settings,
@@ -180,11 +251,12 @@ export function dueAutoCollect(input) {
       idleMs,
       humanAt: input.humanAt,
       sessionDir: input.dirAt?.[sessionId],
+      retryAt: input.retryAt,
       now: input.now,
     })
-    if (decision.ask) due.push({ sessionId, idleMs })
+    out.push({ sessionId, idleMs, ask: decision.ask, reason: decision.reason })
   }
-  return due
+  return out
 }
 
 /**
@@ -228,6 +300,7 @@ export function idleSessions(input) {
  * @param {number} [input.idleMs]
  * @param {Record<string, number>} [input.humanAt] - when a person last wrote, per session
  * @param {string} [input.sessionDir] - the conversation's working directory, when known
+ * @param {Record<string, number>} [input.retryAt] - next retry time per session after a failure
  * @param {number} input.now
  * @returns {{ ask: boolean, reason: string }}
  */
@@ -240,12 +313,24 @@ export function decideAutoCollect(input) {
   if (isExemptWorkspace(input.sessionDir ?? '', input.settings.exemptWorkspaces)) {
     return { ask: false, reason: 'exempt-workspace' }
   }
+  // Fail closed on an unknown directory. The exemption is keyed on where the conversation
+  // works, and a place nobody can name cannot be checked against it -- asking there would
+  // volunteer a question where the person may well have meant to exclude. The cost is a
+  // conversation whose cwd the Host never reported, and the event tracker normally supplies
+  // it on the first message.
+  if (typeof input.sessionDir !== 'string' || input.sessionDir === '') {
+    return { ask: false, reason: 'unknown-dir' }
+  }
   if (input.turnReason !== 'completed') return { ask: false, reason: `turn-${input.turnReason ?? 'unknown'}` }
   // Only where a person actually is: a hand-off, a subagent or a background run must
   // not be interrupted with "anything to follow up on?".
   if (input.recentSessionId === '' || input.sessionId !== input.recentSessionId) {
     return { ask: false, reason: 'not-the-users-conversation' }
   }
+  // A failed question backs off instead of retrying on the next tick. The booking is cleared
+  // on failure (see index.js), so without this the retry would be immediate.
+  const retryAt = input.retryAt?.[input.sessionId]
+  if (Number.isFinite(retryAt) && retryAt > input.now) return { ask: false, reason: 'retry-wait' }
   // One question per person-turn — and the rule that ends the loop.
   //
   // The question is itself a message in the conversation: it restarted the quiet clock

package/lib/tools.js

@@ -416,7 +416,8 @@ export function createTools(service, options = {}) {
       name: 'global_todo_list',
       description:
         '查「全局待办」。默认返回未完成（active = open + doing）的条目，按加入时间倒序。'
-        + '每条都会带上加入时间；带附件的会列出附件标题。',
+        + '每条都会带上加入时间；带附件的会列出附件标题。'
+        + '结果超过 limit 时 truncated=true，matched 说明一共匹配了多少条。',
       parameters: {
         type: 'object',
         properties: {
@@ -442,6 +443,10 @@ export function createTools(service, options = {}) {
             count: { type: 'integer' },
             counts: { type: 'object' },
             todos: { type: 'array', items: TODO_SHAPE },
+            // Present only when the page was cut; the model should know it is not
+            // looking at the whole match set before it concludes anything.
+            matched: { type: 'integer' },
+            truncated: { type: 'boolean' },
           },
           required: ['count', 'counts', 'todos'],
         },
@@ -452,8 +457,12 @@ export function createTools(service, options = {}) {
             )
           }
           const lines = value.todos.map((todo) => todoLine(todo))
+          const cut =
+            value.truncated === true
+              ? `\n（只显示前 ${value.count} 条，共 ${value.matched} 条匹配；用 status / query / limit 缩小范围）`
+              : ''
           return text(
-            `${value.count} 条待办（全库 ${value.counts.total} 条，逾期 ${value.counts.overdue} 条）：\n${lines.join('\n')}`,
+            `${value.count} 条待办（全库 ${value.counts.total} 条，逾期 ${value.counts.overdue} 条）：\n${lines.join('\n')}${cut}`,
           )
         },
       },
@@ -473,6 +482,8 @@ export function createTools(service, options = {}) {
           count: outcome.value.todos.length,
           counts: outcome.value.counts,
           todos: outcome.value.todos.map((todo) => presentTodo(todo, now())),
+          matched: outcome.value.matched,
+          truncated: outcome.value.truncated,
         }
       },
     },

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "dsh-global-todo",
-  "version": "0.3.2",
+  "version": "0.4.0",
+  "icon": "./docs/icon.svg",
   "description": "Global, cross-session todos for DeepSeek Harness: one list owned by the human and the agent together, with creation time, attached documents and links, and one-click hand-off to an agent session. 全局待办：跨会话一份清单，记录加入时间，可挂文档与地址，可一键交给 Agent 继续干。",
   "type": "module",
   "license": "MIT",
@@ -41,6 +42,7 @@
     "cordis.patch.yml",
     "docs/DESIGN.md",
     "docs/ROADMAP.md",
+    "docs/icon.svg",
     "docs/screenshots",
     "LICENSE",
     "README.md",
@@ -58,7 +60,8 @@
     "screenshots": "npm run preview && node tools/screenshot.mjs",
     "prepack": "npm run verify",
     "check:render": "node tools/preview.mjs --check",
-    "check:live": "node tools/live-check.mjs"
+    "check:live": "node tools/live-check.mjs",
+    "check:matrix": "node scripts/matrix.mjs"
   },
   "dsh": {
     "manifestVersion": 1,