dsh-all-usage 1.1.9 → 1.1.12

package/lib/http.js

@@ -249,6 +249,38 @@ export function registerRoutes(host) {
         sendJson(res, 200, statusSnapshot())
       },
     }))
+    ctx.effect(() => webServer.register({
+      kind: 'exact',
+      path: '/api/all-usage/client-env',
+      handler: (req, res) => {
+        if (req.method !== 'GET') { res.statusCode = 405; res.end(); return }
+        if (!isTrustedLocalApiRequest(req, false)) { rejectRequest(res); return }
+        // Diagnostics only: the client reports what the host exposes (user agent,
+        // window-controls-overlay geometry, the strip it reserved). Truncated and
+        // kept in memory for the life of the process.
+        try {
+          const url = new URL(req.url ?? '/', 'http://x')
+          const read = (name, limit) => {
+            const value = url.searchParams.get(name)
+            return value === null ? null : value.slice(0, limit)
+          }
+          state.clientEnv = {
+            reportedAt: Date.now(),
+            ua: read('ua', 200),
+            wco: read('wco', 40),
+            inset: read('inset', 12),
+            insetSource: read('src', 24),
+            titlebar: read('tb', 24),
+            viewport: read('vp', 24),
+            modalRect: read('modal', 40),
+            dialogRect: read('dlg', 40),
+            headRect: read('head', 40),
+            closeRect: read('close', 40),
+          }
+        } catch (err) { /* ignore a malformed diagnostic */ }
+        sendJson(res, 200, { ok: true })
+      },
+    }))
     ctx.effect(() => webServer.register({
       kind: 'exact',
       path: '/api/all-usage',

package/lib/plugin.js

@@ -24,6 +24,9 @@ function apply(ctx) {
     // shared "deleted" bucket; the bucket row is only advertised when it holds
     // something.
     retiredBucketUsed: false,
+    // Last client-side environment report (diagnostics only): the desktop host
+    // cannot be inspected from outside the app.
+    clientEnv: null,
     pathIndex: new Map(),
     memberOf: new Map(),
     byDay: new Map(),
@@ -70,6 +73,14 @@ function apply(ctx) {
       sessionsSkippedByRevision: 0,
       sessionsRestoredFromLedger: 0,
       sessionsFailed: 0,
+      // Cumulative registry-probe diagnostics. They deliberately survive a
+      // baseline reset so the status endpoint can show whether the
+      // `domain/changed` fast path fires at all on this host.
+      workspaceProbeEvents: 0,
+      workspaceSyncRuns: 0,
+      workspaceSyncAdded: 0,
+      workspaceSyncRemoved: 0,
+      workspaceSyncDeferred: 0,
     },
     ledgerRecords: new Map(),
     queryCache: new Map(),
@@ -105,6 +116,8 @@ function apply(ctx) {
     reconcileInFlight: false,
     reconcileTimer: null,
     workspaceSyncTimer: null,
+    workspaceSyncDeferred: false,
+    workspaceProbeTimer: null,
     workspaceSyncInFlight: false,
     workspaceSyncPending: false,
   }
@@ -172,6 +185,11 @@ function apply(ctx) {
       sessionsSkippedByRevision: state.sync.sessionsSkippedByRevision,
       sessionsRestoredFromLedger: state.sync.sessionsRestoredFromLedger,
       sessionsFailed: state.sync.sessionsFailed,
+      workspaceProbeEvents: state.sync.workspaceProbeEvents,
+      workspaceSyncRuns: state.sync.workspaceSyncRuns,
+      workspaceSyncAdded: state.sync.workspaceSyncAdded,
+      workspaceSyncRemoved: state.sync.workspaceSyncRemoved,
+      workspaceSyncDeferred: state.sync.workspaceSyncDeferred,
     }
   }
   Object.assign(host, { commitPendingStats, markStatsChanged, resetSyncState, beginSync, noteSyncError, syncSnapshot })
@@ -277,6 +295,7 @@ function apply(ctx) {
   state.pricingReady = host.pricing.loadPricing().then(() => { host.pricing.schedulePricingSync() })
   void host.sessionSync.runBaseline()
   host.sessionSync.scheduleReconcileTimer()
+  host.sessionSync.scheduleWorkspaceProbeTimer()
   state.aliasesReady = loadAliases()
 }
 

package/lib/session-sync.js

@@ -4,6 +4,10 @@ import { contextTimeKey, extractUsageEvent, pickPricingTime, touchContextTimes,
 const RECONCILE_INTERVAL_MS = 120000
 const RECONCILE_HINT_DELAY_MS = 3000
 const WORKSPACE_SYNC_DEBOUNCE_MS = 300
+// The registry event is a fast path, not a guarantee: a change that lands while a
+// baseline runs used to be dropped outright, and a missed event left the plugin
+// stale until the next restart. The (in-memory) registry list is polled as well.
+const WORKSPACE_PROBE_INTERVAL_MS = 30000
 
 export function createSessionSync(host) {
   const { ctx, state } = host
@@ -154,6 +158,25 @@ export function createSessionSync(host) {
     if (typeof cwd !== 'string' || cwd === '') return undefined
     return state.pathIndex.get(workspacePathKey(cwd))
   }
+  // DSH 0.1.5 replaced \`sessionPersistence.listSnapshots()\` with \`list()\`; both
+  // return per-session \`{ header, revision }\` rows. Without a revision the
+  // ledger-reuse fast path never fires, so every baseline re-reads every log.
+  async function loadSessionRevisions() {
+    const source = sessionPersistence
+    if (source === undefined || source === null) return null
+    const read = typeof source.list === 'function'
+      ? () => source.list()
+      : (typeof source.listSnapshots === 'function' ? () => source.listSnapshots() : null)
+    if (read === null) return null
+    const rows = await read()
+    if (!Array.isArray(rows)) return null
+    const revisions = new Map()
+    for (const row of rows) {
+      const rid = row && row.header && typeof row.header.id === 'string' ? row.header.id : undefined
+      if (rid !== undefined && row && typeof row.revision === 'string') revisions.set(rid, row.revision)
+    }
+    return revisions
+  }
   function wsForLiveSession(session, sid) {
     let wsId = state.memberOf.get(sid)
     if (wsId !== undefined) return wsId
@@ -406,24 +429,18 @@ export function createSessionSync(host) {
     if (state.disposed || generation !== state.aggregationGeneration) return
     // v1.0.8: cheap per-session change signal (header line + stat, no full-log read)
     let snapshots = null
-    if (sessionPersistence !== undefined && typeof sessionPersistence.listSnapshots === 'function') {
-      try {
-        const rows = await sessionPersistence.listSnapshots()
-        if (state.disposed || generation !== state.aggregationGeneration) return
-        if (Array.isArray(rows)) {
-          state.sync.persistenceSnapshotsAvailable = true
-          snapshots = new Map()
-          for (const row of rows) {
-            const rid = row && row.header && typeof row.header.id === 'string' ? row.header.id : undefined
-            if (rid !== undefined && row && typeof row.revision === 'string') snapshots.set(rid, row.revision)
-          }
-        }
-      } catch (err) {
-        console.error('[all-usage] session persistence snapshots unavailable:', err)
-        if (state.disposed || generation !== state.aggregationGeneration) return
-        state.sync.persistenceSnapshotsAvailable = false
-        markStatsChanged('scan')
+    try {
+      const revisions = await loadSessionRevisions()
+      if (state.disposed || generation !== state.aggregationGeneration) return
+      if (revisions !== null) {
+        state.sync.persistenceSnapshotsAvailable = true
+        snapshots = revisions
       }
+    } catch (err) {
+      console.error('[all-usage] session persistence snapshots unavailable:', err)
+      if (state.disposed || generation !== state.aggregationGeneration) return
+      state.sync.persistenceSnapshotsAvailable = false
+      markStatsChanged('scan')
     }
     if (state.disposed || generation !== state.aggregationGeneration) return
     if (setupFailed || !Array.isArray(records)) {
@@ -504,6 +521,10 @@ export function createSessionSync(host) {
     state.knownSessionIds.clear()
     for (const sid of listedSessionIds) state.knownSessionIds.add(sid)
     state.scan.done = true
+    if (state.workspaceSyncDeferred) {
+      state.workspaceSyncDeferred = false
+      scheduleWorkspaceSync()
+    }
     state.sync.lastCompletedAt = Date.now()
     if (state.sync.sessionsFailed === 0) {
       state.sync.lastErrorAt = 0
@@ -529,6 +550,7 @@ export function createSessionSync(host) {
       return
     }
     state.workspaceSyncInFlight = true
+    state.sync.workspaceSyncRuns += 1
     try {
       await synchronizeWorkspaceRegistry()
     } catch (err) {
@@ -543,9 +565,15 @@ export function createSessionSync(host) {
     }
   }
   async function synchronizeWorkspaceRegistry() {
-    // The first baseline reads the registry with the latest list, so a probe
-    // arriving before it completes has nothing to add.
-    if (state.disposed || !state.scan.done) return
+    if (state.disposed) return
+    // A registry change that lands while a baseline is running used to be
+    // dropped outright, which is why a new workspace could stay invisible until
+    // the next restart. Remember it and re-run once the scan settles.
+    if (!state.scan.done) {
+      state.workspaceSyncDeferred = true
+      state.sync.workspaceSyncDeferred += 1
+      return
+    }
     let workspaces
     try {
       workspaces = ctx.workspaceRegistry.list()
@@ -559,6 +587,8 @@ export function createSessionSync(host) {
     for (const id of state.wsMeta.keys()) if (!next.wsMeta.has(id)) removedWs.add(id)
     const addedWs = new Set()
     for (const id of next.wsMeta.keys()) if (!state.wsMeta.has(id)) addedWs.add(id)
+    state.sync.workspaceSyncAdded += addedWs.size
+    state.sync.workspaceSyncRemoved += removedWs.size
     // Reuse path: no membership change — metadata only, zero rescan.
     if (removedWs.size === 0 && addedWs.size === 0) {
       installWorkspaceSnapshot(next)
@@ -606,20 +636,10 @@ export function createSessionSync(host) {
     state.sync.sessionsTotal = records.length
     markStatsChanged('scan')
     let snapshots = null
-    if (sessionPersistence !== undefined && typeof sessionPersistence.listSnapshots === 'function') {
-      try {
-        const rows = await sessionPersistence.listSnapshots()
-        if (Array.isArray(rows)) {
-          snapshots = new Map()
-          for (const row of rows) {
-            const rid = row && row.header && typeof row.header.id === 'string' ? row.header.id : undefined
-            if (rid !== undefined && row && typeof row.revision === 'string') snapshots.set(rid, row.revision)
-          }
-        }
-      } catch (err) {
-        console.error('[all-usage] session persistence snapshots unavailable:', err)
-        markStatsChanged('scan')
-      }
+    try {
+      snapshots = await loadSessionRevisions()
+    } catch (err) {
+      console.error('[all-usage] session persistence snapshots unavailable:', err)
     }
     for (const record of records) {
       if (state.disposed) return
@@ -698,6 +718,20 @@ export function createSessionSync(host) {
     }, RECONCILE_INTERVAL_MS)
     if (state.reconcileTimer && typeof state.reconcileTimer.unref === 'function') state.reconcileTimer.unref()
   }
+  // Belt and braces for the registry probe: the event fast path can be missed
+  // (dropped while scanning, or never delivered), and unlike the event this
+  // cannot silently leave the workspace list stale until a restart.
+  function scheduleWorkspaceProbeTimer() {
+    if (state.disposed || state.workspaceProbeTimer !== null) return
+    state.workspaceProbeTimer = setTimeout(() => {
+      state.workspaceProbeTimer = null
+      if (!state.disposed) {
+        void runWorkspaceSync()
+        scheduleWorkspaceProbeTimer()
+      }
+    }, WORKSPACE_PROBE_INTERVAL_MS)
+    if (state.workspaceProbeTimer && typeof state.workspaceProbeTimer.unref === 'function') state.workspaceProbeTimer.unref()
+  }
 
   // ---------- live feed ----------
   ctx.on('session/event', (session, event) => {
@@ -775,6 +809,7 @@ export function createSessionSync(host) {
     if (change === undefined || change === null) return
     if (change.domain !== 'workspace') return
     if (change.table !== 'workspaces' && change.table !== '') return
+    state.sync.workspaceProbeEvents += 1
     scheduleWorkspaceSync()
   })
 
@@ -800,6 +835,7 @@ export function createSessionSync(host) {
     reconcileSessions,
     scheduleReconcileHint,
     scheduleReconcileTimer,
+    scheduleWorkspaceProbeTimer,
     markLedgerDirty
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-all-usage",
-  "version": "1.1.9",
+  "version": "1.1.12",
   "description": "DeepSeek Harness usage dashboard with model, provider, workspace, cache, balance, and CSV insights",
   "repository": {
     "type": "git",