ds-bot 0.1.0 → 0.1.1

package/src/host/update.js

@@ -7,10 +7,10 @@ import { join } from 'node:path'
 
 const PKG = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8'))
 export const OFFICIAL_REGISTRY = 'https://registry.npmjs.org/'
-const MIRROR_REGISTRY = 'https://registry.npmmirror.com/'
+export const MIRROR_REGISTRY = 'https://registry.npmmirror.com/'
 // Every window that opens asks; within this long the last answer stands.
-const CHECK_TTL_MS = 10 * 60_000
-const FETCH_TIMEOUT_MS = 8000
+export const CHECK_TTL_MS = 10 * 60_000
+export const FETCH_TIMEOUT_MS = 8000
 // The first check waits until the host has settled its own start.
 const STARTUP_DELAY_MS = 15_000
 const VERSION = /^v?(\d+\.\d+\.\d+(?:-[\w.]+)?)(?:\+[\w.]+)?$/
@@ -60,10 +60,47 @@ export function sourceOf(spec) {
 }
 
 const normalizeRegistry = url => `${String(url).trim().replace(/\/+$/, '')}/`
-const encodeName = name => (name.startsWith('@') ? `@${encodeURIComponent(name.slice(1))}` : encodeURIComponent(name))
-// The project page of the releases, for the "what's new" link.
+export const encodeName = name => (name.startsWith('@') ? `@${encodeURIComponent(name.slice(1))}` : encodeURIComponent(name))
+
+export const fetchJson = async (url, headers = {}) => {
+  const response = await fetch(url, { headers: { accept: 'application/json', ...headers }, signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) })
+  if (!response.ok) throw new Error(`${url} answered ${response.status}`)
+  return response.json()
+}
+
+// The registries the plugin manager installs from, in its order: its configured
+// first one (else pnpm's own), then the fallbacks, unless that first one is private.
+export async function registryPlan(config, manager) {
+  if (typeof config.updateRegistry === 'string' && config.updateRegistry !== '') return [normalizeRegistry(config.updateRegistry)]
+  const configured = await Promise.resolve(manager?.registries?.()).catch(() => null)
+  if (!configured) return [OFFICIAL_REGISTRY, MIRROR_REGISTRY]
+  const fallbacks = (configured.fallbackRegistries ?? []).map(normalizeRegistry)
+  const own = configured.resolved ? normalizeRegistry(configured.resolved) : null
+  const first = configured.registry ? normalizeRegistry(configured.registry) : own ?? OFFICIAL_REGISTRY
+  const isPublic = first === OFFICIAL_REGISTRY || fallbacks.includes(first)
+  return isPublic ? [...new Set([first, ...fallbacks])] : [first]
+}
+
+// The plugin manager's `source` for this package; DSH releases before it reported
+// one leave the profile's own dependency entry to say the same.
+export async function installSpecOf(ctx) {
+  const manager = ctx.get?.('pluginManager')
+  const bundles = await Promise.resolve(manager?.listBundles?.()).catch(() => null)
+  const own = Array.isArray(bundles) ? bundles.find(bundle => bundle.name === PKG.name) : undefined
+  if (typeof own?.source === 'string') return own.source
+  const dir = ctx.get?.('profileContext')?.dir
+  if (typeof dir !== 'string') return undefined
+  try {
+    return JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')).dependencies?.[PKG.name]
+  } catch { return undefined }
+}
+
+// The public repository the releases live in, for tags and the "what's new" link.
+export const repoSlug = () =>
+  /github\.com[/:]([\w.-]+\/[\w.-]+?)(?:\.git)?$/i.exec(String(PKG.repository?.url ?? PKG.repository ?? ''))?.[1] ?? null
+
 const releasesUrl = () => {
-  const repo = /github\.com[/:]([\w.-]+\/[\w.-]+?)(?:\.git)?$/i.exec(String(PKG.repository?.url ?? PKG.repository ?? ''))?.[1]
+  const repo = repoSlug()
   return repo ? `https://github.com/${repo}/releases` : (PKG.homepage ?? null)
 }
 
@@ -86,27 +123,8 @@ export function install(rt) {
     available: status.phase !== 'installed' && target !== null && status.latest !== null && newer(status.latest, status.current),
   })
 
-  const fetchJson = async (url, headers = {}) => {
-    const response = await fetch(url, { headers: { accept: 'application/json', ...headers }, signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) })
-    if (!response.ok) throw new Error(`${url} answered ${response.status}`)
-    return response.json()
-  }
-
-  // The registries the plugin manager installs from, in its order: its configured
-  // first one (else pnpm's own), then the fallbacks, unless that first one is private.
-  async function registryPlan() {
-    if (typeof config.updateRegistry === 'string' && config.updateRegistry !== '') return [normalizeRegistry(config.updateRegistry)]
-    const configured = await Promise.resolve(manager()?.registries?.()).catch(() => null)
-    if (!configured) return [OFFICIAL_REGISTRY, MIRROR_REGISTRY]
-    const fallbacks = (configured.fallbackRegistries ?? []).map(normalizeRegistry)
-    const own = configured.resolved ? normalizeRegistry(configured.resolved) : null
-    const first = configured.registry ? normalizeRegistry(configured.registry) : own ?? OFFICIAL_REGISTRY
-    const isPublic = first === OFFICIAL_REGISTRY || fallbacks.includes(first)
-    return isPublic ? [...new Set([first, ...fallbacks])] : [first]
-  }
-
   async function newestFromRegistry() {
-    for (const registry of await registryPlan()) {
+    for (const registry of await registryPlan(config, manager())) {
       try {
         const version = cleanVersion((await fetchJson(`${registry}${encodeName(PKG.name)}/latest`)).version)
         if (version) return { version, spec: `${PKG.name}@${version}`, registry }
@@ -124,21 +142,8 @@ export function install(rt) {
     return { version, spec: `github:${source.owner}/${source.repo}#${fragment}` }
   }
 
-  // The plugin manager's `source` for this package; DSH releases before it reported
-  // one leave the profile's own dependency entry to say the same.
-  async function installSpec() {
-    const bundles = await Promise.resolve(manager()?.listBundles?.()).catch(() => null)
-    const own = Array.isArray(bundles) ? bundles.find(bundle => bundle.name === PKG.name) : undefined
-    if (typeof own?.source === 'string') return own.source
-    const dir = ctx.get?.('profileContext')?.dir
-    if (typeof dir !== 'string') return undefined
-    try {
-      return JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')).dependencies?.[PKG.name]
-    } catch { return undefined }
-  }
-
   async function runCheck() {
-    const source = sourceOf(await installSpec())
+    const source = sourceOf(await installSpecOf(ctx))
     status.source = source.kind
     let found = null
     try {

package/src/host/usage.js

@@ -320,7 +320,18 @@ export function install(rt) {
     ...Object.values(room.segments ?? {}).flat().map(segment => segment.sessionId),
   ]))
 
-  async function scanSession(ledger, sessionId, asOfSeq, sealable, signal) {
+  // DSH reads a subagent Session only through its parent's address; the parent
+  // need not exist any more. One with no parent on record cannot be read.
+  const addressOf = item => (item.origin !== 'subagent'
+    ? { kind: 'session', sessionId: item.sessionId }
+    : item.parentSessionId === undefined
+      ? undefined
+      : { kind: 'subagent', parentSessionId: item.parentSessionId, childSessionId: item.sessionId, mode: 'unknown' })
+  // Sessions that already failed to read, so each one warns once, not every scan.
+  const unreadable = new Set()
+
+  async function scanSession(ledger, address, asOfSeq, sealable, signal) {
+    const sessionId = address.kind === 'session' ? address.sessionId : address.childSessionId
     const mark = ledger.mark(sessionId)
     if (mark?.sealed) return
     let through = asOfSeq
@@ -338,7 +349,7 @@ export function install(rt) {
     let beforeSeq
     for (let reached = false; !reached;) {
       const page = await ctx.sessionController.page({
-        address: { kind: 'session', sessionId },
+        address,
         throughSeq: through,
         ...(beforeSeq === undefined ? {} : { beforeSeq }),
         maxMessages: PAGE_MESSAGES,
@@ -397,8 +408,19 @@ export function install(rt) {
       const targets = new Map()
       for (const item of listed) if (item.blank !== true) targets.set(item.sessionId, item.projections?.asOfSeq)
       for (const sessionId of owners.keys()) if (!targets.has(sessionId)) targets.set(sessionId, undefined)
-      await eachLimited([...targets], SCAN_PARALLEL, ([sessionId, asOfSeq]) => scanSession(ledger, sessionId, asOfSeq, ended.has(sessionId), signal)
-        .catch(error => rt.warn('ds-bot: usage could not read %s: %s', sessionId, error)))
+      const addresses = new Map(listed.map(item => [item.sessionId, addressOf(item)]))
+      await eachLimited([...targets], SCAN_PARALLEL, async ([sessionId, asOfSeq]) => {
+        const address = addresses.has(sessionId) ? addresses.get(sessionId) : { kind: 'session', sessionId }
+        if (address === undefined) return
+        try {
+          await scanSession(ledger, address, asOfSeq, ended.has(sessionId), signal)
+          unreadable.delete(sessionId)
+        } catch (error) {
+          if (unreadable.has(sessionId)) return
+          unreadable.add(sessionId)
+          rt.warn('ds-bot: usage could not read %s: %s', sessionId, error)
+        }
+      })
     })().finally(() => {
       scannedAt = Date.now()
       scanning = undefined