@linxin666/dsh-usage 0.4.2 → 0.4.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-usage",
   "description": "Usage statistics plugin for the dsh web GUI: per-provider balance and coding-plan quota detection plus a live token usage ledger, with a compact price glance card above the sidebar's Settings row",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "icon": "icon.svg",
   "type": "module",
   "engines": {
@@ -33,7 +33,7 @@
   "license": "Apache-2.0",
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.7-rc.2"
+      "dsh": ">=0.2.0-rc.1"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -50,25 +50,25 @@
     }
   },
   "dependencies": {
-    "schemastery": "^3.18.0"
+    "@deepseek-ai/schemastery": "^3.18.4"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh": ">=0.2.0-rc.1",
     "react": "^18.2.0"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-store": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-credentials": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-connection": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-store": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-session": "^0.2.0-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.2.0-rc.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.20.0",

package/src/client/body-mutations.ts

@@ -4,10 +4,10 @@
  * plugin bundle.
  *
  * Family plugins that inject at the DOM level must notice when the shell
- * re-renders around their injected node: the sidebar entry rows
- * (sidebar-entry-core), the center-column panel containers
- * (panel-mount-core), and the aggregate shell's column shims. Each consumer
- * used to install its OWN `MutationObserver` on `document.body` with
+ * re-renders around their injected node: the aggregate shell's column shims
+ * and any plugin surface still extending the shell from outside the official
+ * slot seats. Each consumer used to install its OWN `MutationObserver` on
+ * `document.body` with
  * `{ childList: true, subtree: true }`, so a page carrying N family plugins
  * paid N native observers and N callback invocations for EVERY mutation batch
  * the app produced — chat token streaming alone produces many per second, and

package/src/client/index.ts

@@ -21,6 +21,7 @@ import { createUsageStore, type UsageStoreInstance } from './usage-store.ts'
 import { UsageSectionCard, type UsageSectionFace, type UsageSettings } from './UsageSectionCard.tsx'
 import { mountUsageFootCard, openUsageSettings } from './foot-card-mount.tsx'
 import { NS, en, zh, t } from './locales.ts'
+import { createServedEntryForm } from './settings-entry-form.ts'
 import type { UsageOverviewView } from '../core/types.ts'
 
 /** The host usage API as the browser sees it (same-origin JSON endpoints). */
@@ -49,9 +50,18 @@ const usageApi: UsageHttpApi = {
   refresh: () => usageFetch('api/dsh-usage/refresh', 'POST'),
 }
 
-/** Settings namespace the section edits (dsh-web-settings maps it onto this row's profile entry id). */
+/**
+ * Settings namespace the section edits: the family identity of this plugin's
+ * own settings form, and the row id a standalone bundle install carries.
+ */
 const USAGE_SETTINGS_NS = 'dsh-usage'
 
+/** Profile entry id the family aggregate's generated row carries. */
+const AGGREGATE_ENTRY_ID = 'web-ui-usage'
+
+/** Profile entry ids this package's patch rows carry, most likely first. */
+const USAGE_ENTRY_IDS: readonly string[] = [AGGREGATE_ENTRY_ID, 'usage', USAGE_SETTINGS_NS]
+
 /** First-level nav position: directly below the Workshop section (order 150). */
 const SECTION_ORDER = 151
 
@@ -101,15 +111,15 @@ export function apply(ctx: ClientContext): void {
   }, 'dsh-usage: dictionaries')
 
   // The family binder is what maps this namespace onto the row's profile entry
-  // id and hands back the native form. Without the group plugin the client can
-  // only address an entry id it already knows: the namespace itself is one when
-  // the profile keeps the family spelling. Any other entry id leaves the form
-  // unavailable, which renders the row's controls disabled — the Host's own
-  // generated page for the row still edits the same Config.
+  // id and hands back the native form. Without the group plugin the shared forms
+  // service is addressed on the entry id the describe mirror justifies, rebound
+  // as soon as the mirror answers: the namespace itself is only an entry id on a
+  // standalone install, so binding it on the aggregate left the form unavailable
+  // and the row's controls disabled.
   const binder = ctx.get('webUiSettings')
   const settingsForm = binder !== undefined
     ? binder.bind<UsageSettings>({ namespace: USAGE_SETTINGS_NS })
-    : ctx.configForms.get<UsageSettings>(USAGE_SETTINGS_NS)
+    : createServedEntryForm<UsageSettings>({ forms: ctx.configForms, entryIds: USAGE_ENTRY_IDS })
 
   // One store instance per apply body; the section mounts and unmounts with
   // the settings page, and the store survives between visits so the last

package/src/client/settings-entry-form.ts

@@ -0,0 +1,142 @@
+// Generated by scripts/sync-shared.mjs from shared/client/settings/settings-entry-form.ts. Do not edit this copy; edit the shared source and run "node scripts/sync-shared.mjs".
+// Generated by scripts/sync-shared.mjs from shared/client/settings/settings-entry-form.ts. Do not edit this copy; edit the shared source and run "node scripts/sync-shared.mjs".
+/**
+ * Family settings form bound to the profile entry id a Host actually serves.
+ *
+ * Under the 0.1.7 settings model a form is addressed by PROFILE ENTRY ID, while
+ * a family card knows only its own settings namespace. The family binder
+ * (`ctx.get('webUiSettings')`, published by dsh-web-settings) resolves one onto
+ * the other and is the preferred transport; this module is the fallback for a
+ * page that serves no binder — the group plugin is not installed, or its client
+ * half has not applied yet (the aggregate mounts its children in order, and a
+ * child still waiting on its own injects publishes nothing).
+ *
+ * The shared describe mirror is the only local evidence of which row id this
+ * profile serves, but it answers asynchronously: at plugin activation it usually
+ * holds nothing yet. A one-shot guess therefore cannot be right for every
+ * deployment, and the form is bound once per session:
+ *
+ * - binding the bare namespace made every save answer `No configurable plugin
+ *   entry "<namespace>"` on an aggregate install (the namespace is not an entry
+ *   id there), which the card reported as "the deployment did not accept these
+ *   values";
+ * - binding the aggregate row id would break a standalone install, whose row id
+ *   is the namespace or the package's own `ui-*` row.
+ *
+ * So the fallback starts on the most likely row and REBINDS the moment the
+ * mirror names one of this package's rows. Until the mirror answers, the form
+ * reports the binding it holds (usually `loading`), which the card renders as an
+ * unavailable form rather than a doomed one.
+ */
+import type { ConfigForm, ConfigFormSnapshot, ConfigForms } from '@deepseek-ai/dsh-client-ui-settings/client'
+
+/** Options of {@link createServedEntryForm}. */
+export interface ServedEntryFormOptions<T> {
+  /** The shared configuration forms service (`ctx.configForms`). */
+  forms: ConfigForms
+  /**
+   * Profile entry ids this package's rows carry, most likely first: the
+   * aggregate's generated row, the package's own standalone row, then the bare
+   * namespace. The first is the fallback while the mirror has no answer; the
+   * last is the answer when the mirror serves none of them.
+   */
+  entryIds: readonly string[]
+}
+
+/** The snapshot a form reports before the Host has answered with this entry. */
+function pendingSnapshot<T>(): ConfigFormSnapshot<T> {
+  return {
+    status: 'loading',
+    value: undefined,
+    base: undefined,
+    user: undefined,
+    revision: undefined,
+    writable: false,
+    mode: 'host',
+  }
+}
+
+/**
+ * Create a settings form bound to the profile entry id this Host serves, and
+ * rebound whenever the shared describe mirror names a different one of this
+ * package's rows.
+ * @param options - the shared forms service and this package's candidate row ids.
+ * @returns a form delegating to the currently resolved entry's own form.
+ */
+export function createServedEntryForm<T>(options: ServedEntryFormOptions<T>): ConfigForm<T> {
+  const { forms, entryIds } = options
+  const fallbackId = entryIds[0]
+  const namespaceId = entryIds[entryIds.length - 1]
+  const listeners = new Set<() => void>()
+  let boundId: string | undefined
+  let bound: ConfigForm<T> | undefined
+  let offBound: (() => void) | undefined
+  let snapshot: ConfigFormSnapshot<T> = pendingSnapshot<T>()
+
+  /** Republish: the delegated snapshot when one is bound, the pending one otherwise. */
+  const publish = (): void => {
+    if (bound !== undefined) snapshot = bound.getSnapshot()
+    for (const listener of [...listeners]) listener()
+  }
+
+  /**
+   * The entry id the mirror currently justifies. An unanswered or empty mirror
+   * is not evidence of absence, so it keeps the first candidate; a mirror that
+   * answers without any of this package's rows leaves the namespace itself.
+   * @returns the entry id to bind.
+   */
+  const resolve = (): string => {
+    let served: readonly string[] | undefined
+    try {
+      served = forms.describe().getSnapshot().view?.namespaces.map(row => row.ns)
+    } catch {
+      // A mirror that refuses the read is unanswered too, not absent.
+      served = undefined
+    }
+    if (served === undefined || served.length === 0) return fallbackId
+    return entryIds.find(id => served.includes(id)) ?? namespaceId
+  }
+
+  /** Bind (or rebind) the resolved entry's form; a no-op while it is unchanged. */
+  const bind = (): void => {
+    const target = resolve()
+    if (target === boundId) return
+    offBound?.()
+    offBound = undefined
+    let form: ConfigForm<T>
+    try {
+      form = forms.get<T>(target)
+    } catch {
+      // A service that refuses the id stays unbound; the next mirror answer
+      // retries rather than pinning a wrong entry for the session.
+      boundId = undefined
+      return
+    }
+    boundId = target
+    bound = form
+    offBound = form.subscribe(() => { publish() })
+    publish()
+  }
+
+  // The mirror subscription lives for the page: the card owns its form for the
+  // session, and the ConfigForm contract carries no disposer to hang it on. The
+  // callback is cheap (a resolve plus a no-op while the id is unchanged). A
+  // mirror without a subscription seat keeps the initial binding.
+  try {
+    forms.describe().subscribe(() => { bind() })
+  } catch {
+    // A describe face that refuses the subscription: the initial binding stands.
+  }
+  bind()
+
+  return {
+    getSnapshot: () => snapshot,
+    subscribe: (listener) => {
+      listeners.add(listener)
+      return () => { listeners.delete(listener) }
+    },
+    set: (field, value) => bound?.set(field, value) ?? Promise.resolve(false),
+    unset: (field) => bound?.unset(field) ?? Promise.resolve(false),
+    mutate: (ops, expectedRevision) => bound?.mutate(ops, expectedRevision) ?? Promise.resolve(false),
+  }
+}

package/src/host/usage-service.ts

@@ -103,19 +103,129 @@ async function writeJsonAtomic(path: string, value: unknown): Promise<void> {
   }
 }
 
+function unwrapVolatiles(value: unknown): unknown {
+  if (value === null || value === undefined) return value
+  if (typeof value === 'object') {
+    if (typeof (value as { get?: unknown }).get === 'function') {
+      return unwrapVolatiles((value as { get(): unknown }).get())
+    }
+    if (Array.isArray(value)) {
+      return value.map(unwrapVolatiles)
+    }
+    const result: Record<string, unknown> = {}
+    for (const [k, v] of Object.entries(value)) {
+      result[k] = unwrapVolatiles(v)
+    }
+    return result
+  }
+  return value
+}
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function deepMerge(base: unknown, patch: unknown): unknown {
+  if (!isPlainObject(base) || !isPlainObject(patch)) return patch !== undefined ? patch : base
+  const result: Record<string, unknown> = { ...base }
+  for (const [key, value] of Object.entries(patch)) {
+    if (value === undefined) continue
+    result[key] = isPlainObject(value) && isPlainObject(result[key]) ? deepMerge(result[key], value) : value
+  }
+  return result
+}
+
 /**
  * Read a foreign settings namespace's resolved value (the llm adapter
- * profiles, the agent default model). Unregistered namespaces read as
- * undefined; nothing here throws into the poll loop.
+ * profiles, the agent default model). Resolves across pre-0.1.7 settings.get(),
+ * 0.1.7 SettingsForms.describe(), live loader entries, and configEditor.
+ * Unregistered namespaces read as undefined; nothing here throws into the poll loop.
  */
 function readNamespace(ctx: Context, ns: string): unknown {
   try {
-    const settings = service<{ get(ns: unknown): unknown }>(ctx, 'settings')
-    if (settings === undefined) return undefined
-    return settings.get(ns)
+    // 1. Try legacy settings.get(ns) or 0.1.7 settings.describe()
+    const settings = service<{
+      get?(ns: unknown): unknown
+      describe?(options?: unknown): Array<{ ns: string; value: unknown }>
+    }>(ctx, 'settings')
+    if (settings !== undefined) {
+      if (typeof settings.get === 'function') {
+        const value = settings.get(ns)
+        if (value !== undefined) return unwrapVolatiles(value)
+      }
+      if (typeof settings.describe === 'function') {
+        const descriptors = settings.describe({ redactSecrets: false })
+        if (Array.isArray(descriptors)) {
+          const match = descriptors.find((d) =>
+            d.ns === ns
+            || (ns === 'llm-pi-ai' && (d.ns === 'llm' || isPlainObject((d.value as { providers?: unknown })?.providers)))
+            || (ns === 'llm-deepseek' && (d.ns === 'llm-deepseek' || d.ns === 'llm-deepseek-api-key'))
+          )
+          if (match !== undefined && match.value !== undefined) {
+            return unwrapVolatiles(match.value)
+          }
+        }
+      }
+    }
+
+    // 2. Try ctx.root.loader or ctx.loader entries
+    const loader = (ctx as unknown as {
+      root?: { loader?: { entries(): Iterable<{ options: { id: string; name?: string }; fiber?: { config?: unknown } }> } }
+      loader?: { entries(): Iterable<{ options: { id: string; name?: string }; fiber?: { config?: unknown } }> }
+    }).root?.loader
+      ?? (ctx as unknown as {
+        loader?: { entries(): Iterable<{ options: { id: string; name?: string }; fiber?: { config?: unknown } }> }
+      }).loader
+    if (loader !== undefined && typeof loader.entries === 'function') {
+      for (const entry of loader.entries()) {
+        const id = entry.options?.id
+        const name = entry.options?.name
+        if (
+          id === ns
+          || name === `@deepseek-ai/dsh-${ns}`
+          || name?.endsWith(`/${ns}`)
+          || (ns === 'llm-pi-ai' && (id === 'llm' || name === '@deepseek-ai/dsh-llm-pi-ai'))
+          || (ns === 'llm-deepseek' && (id === 'llm-deepseek-api-key' || name === '@deepseek-ai/dsh-llm-deepseek-api-key'))
+        ) {
+          if (entry.fiber?.config !== undefined) {
+            return unwrapVolatiles(entry.fiber.config)
+          }
+        }
+      }
+    }
+
+    // 3. Try configEditor service
+    const editor = service<{
+      configuration?(): Array<{
+        entry: { options: { id: string; name?: string }; fiber?: { config?: unknown } }
+        inherited: Record<string, unknown>
+        override: Record<string, unknown>
+      }>
+    }>(ctx, 'configEditor')
+    if (editor !== undefined && typeof editor.configuration === 'function') {
+      const rows = editor.configuration()
+      const match = rows.find((r) => {
+        const id = r.entry.options.id
+        const name = r.entry.options.name
+        return (
+          id === ns
+          || name === `@deepseek-ai/dsh-${ns}`
+          || name?.endsWith(`/${ns}`)
+          || (ns === 'llm-pi-ai' && (id === 'llm' || name === '@deepseek-ai/dsh-llm-pi-ai'))
+          || (ns === 'llm-deepseek' && (id === 'llm-deepseek-api-key' || name === '@deepseek-ai/dsh-llm-deepseek-api-key'))
+        )
+      })
+      if (match !== undefined) {
+        if (match.entry.fiber?.config !== undefined) {
+          return unwrapVolatiles(match.entry.fiber.config)
+        }
+        return unwrapVolatiles(deepMerge(match.inherited, match.override))
+      }
+    }
   } catch {
     return undefined
   }
+  return undefined
 }
 
 export class UsageService {
@@ -206,10 +316,10 @@ export class UsageService {
         // THIS route's account: it is supported by the adapter but not
         // applicable here, and the UI renders it as unsupported rather than
         // showing the other account's number (issue #1688).
-        ...(adapter?.balance !== undefined && balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL)
+        ...(adapter?.balance !== undefined && balanceAppliesToRoute(adapter, this.routeBaseUrl(route.id))
           ? { balanceSupported: true }
           : {}),
-        ...(adapter?.balance !== undefined && !balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL)
+        ...(adapter?.balance !== undefined && !balanceAppliesToRoute(adapter, this.routeBaseUrl(route.id))
           ? { balanceSupported: false }
           : {}),
         ...(adapter?.plan !== undefined ? { planSupported: true } : {}),
@@ -587,7 +697,7 @@ export class UsageService {
     // account, and probing the official endpoint would print this account's
     // money under that route's name (issue #1688). Such a route reports the
     // balance as unsupported instead.
-    const balanceApplies = balanceAppliesToRoute(adapter, this.piAiProfile(route.id)?.baseURL)
+    const balanceApplies = balanceAppliesToRoute(adapter, this.routeBaseUrl(route.id))
     if (credential.key === undefined) {
       // Nothing to probe with (oauth grant, no credential): retained facts
       // would never refresh again, so the row resets to its credential
@@ -705,4 +815,15 @@ export class UsageService {
     return section?.apiKeyEnv ?? 'DEEPSEEK_API_KEY'
   }
 
+  /** The DeepSeek official adapter's configured baseURL. */
+  private deepseekBaseUrl(): string | undefined {
+    const section = readNamespace(this.ctx, 'llm-deepseek') as { baseURL?: string } | undefined
+    return section?.baseURL
+  }
+
+  /** The effective base URL for a provider route (pi-ai or deepseek). */
+  private routeBaseUrl(provider: string): string | undefined {
+    return this.piAiProfile(provider)?.baseURL ?? (isDeepSeekProviderRoute(provider) ? this.deepseekBaseUrl() : undefined)
+  }
+
 }