@dsh-plus/subagent-model 0.2.1 → 0.3.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dsh-plus/subagent-model",
-  "version": "0.2.1",
-  "description": "dsh-plus service plugin: 为 subagent/subagent_fork 等子代理按 provider 配置模型与思考程度（或继承主代理）",
+  "version": "0.3.1",
+  "description": "dsh-plus service+ui plugin: 为 subagent/subagent_fork 等子代理按提供商配置模型与思考程度（或继承主代理）",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -10,6 +10,7 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
+    "./client": "./lib/client.js",
     "./src/*": "./src/*",
     "./package.json": "./package.json"
   },
@@ -17,21 +18,41 @@
     "lib",
     "src"
   ],
+  "dependencies": {
+    "@dsh-plus/shared": "0.1.11"
+  },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-settings": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-subagent": "^0.1.3-alpha.2",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-host-webserver": "*",
+    "@deepseek-ai/dsh-llm": "*",
+    "@deepseek-ai/dsh-settings": "*",
+    "@deepseek-ai/dsh-subagent": "*",
+    "@deepseek-ai/schemastery": "^3.18.2"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-settings": "0.1.3-alpha.2",
-    "@deepseek-ai/dsh-subagent": "0.1.3-alpha.2",
-    "@deepseek-ai/schemastery": "3.18.2"
+    "@deepseek-ai/dsh-host-webserver": "0.1.5-alpha.1",
+    "@deepseek-ai/dsh-llm": "0.1.5-alpha.1",
+    "@deepseek-ai/dsh-settings": "0.1.5-alpha.1",
+    "@deepseek-ai/dsh-subagent": "0.1.5-alpha.1",
+    "@deepseek-ai/schemastery": "3.18.2",
+    "@types/node": "26.4.0",
+    "@types/react": "~18.3.31",
+    "react": "^18.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
+  "dsh": {
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-renderer",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-api-remotes"
+      ],
+      "platform": "web"
+    }
+  },
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/catalog.ts

@@ -0,0 +1,127 @@
+/**
+ * 提供商/模型/思考档位目录：配置卡片的下拉数据源。
+ * 镜像官方 api-proxy `buildModelCatalog`（session.models RPC）的构建方式：
+ * `ctx.llm.listProviders()` → `listModels()` → `resolveModelInfo()`，
+ * 附 `ctx.subagents.list()` 的已注册子代理 provider 名（卡片按此行合成空行）。
+ * 目录仅作建议性数据源，不参与运行期路由。
+ * @module subagent-model/catalog
+ */
+import type { Context } from '@deepseek-ai/cordis'
+import type { LlmReasoningEffortInfo } from '@deepseek-ai/dsh-llm'
+
+export interface CatalogEffort {
+  id: string
+  name: string
+  description?: string
+}
+
+export interface CatalogModel {
+  id: string
+  name: string
+  description?: string
+  reasoning?: {
+    defaultEffort?: string
+    efforts: CatalogEffort[]
+  }
+}
+
+export interface CatalogProvider {
+  id: string
+  name: string
+  models: CatalogModel[]
+}
+
+export interface CatalogFailure {
+  id: string
+  name: string
+  message: string
+}
+
+export interface ModelCatalog {
+  providers: CatalogProvider[]
+  failures: CatalogFailure[]
+  /** 已注册的子代理 provider 名（spawn/fork/…），卡片据此合成配置行。 */
+  subagentProviders: string[]
+}
+
+function toEffort(effort: LlmReasoningEffortInfo): CatalogEffort {
+  return {
+    id: String(effort.id),
+    name: effort.name,
+    ...(effort.description === undefined ? {} : { description: effort.description }),
+  }
+}
+
+/**
+ * 构建目录。单个提供商失败只进入 failures，不拖垮其余组；
+ * 无模型的组被丢弃（与官方 buildModelCatalog 同语义）。
+ */
+export async function buildModelCatalog(ctx: Context): Promise<ModelCatalog> {
+  const llm = ctx.get('llm')
+  if (llm === undefined) {
+    return {
+      providers: [],
+      failures: [],
+      subagentProviders: subagentProvidersOf(ctx),
+    }
+  }
+  const catalog = await Promise.all(
+    llm.listProviders().map(async (provider) => {
+      try {
+        const models = await llm.listModels(provider.id)
+        const entries = await Promise.all(
+          models.map(async (model) => {
+            const resolved = await llm.resolveModelInfo(provider.id, model.id)
+            const reasoning =
+              resolved.reasoning === undefined
+                ? undefined
+                : {
+                    efforts: resolved.reasoning.efforts.map(toEffort),
+                    ...(resolved.reasoning.defaultEffort === undefined
+                      ? {}
+                      : {
+                          defaultEffort: String(resolved.reasoning.defaultEffort),
+                        }),
+                  }
+            return {
+              id: model.id,
+              name: model.name,
+              ...(model.description === undefined ? {} : { description: model.description }),
+              ...(reasoning === undefined ? {} : { reasoning }),
+            }
+          }),
+        )
+        return {
+          kind: 'group' as const,
+          group: { id: provider.id, name: provider.name, models: entries },
+        }
+      } catch (error) {
+        return {
+          kind: 'failure' as const,
+          failure: {
+            id: provider.id,
+            name: provider.name,
+            message: error instanceof Error ? error.message : String(error),
+          },
+        }
+      }
+    }),
+  )
+  return {
+    providers: catalog
+      .filter((item) => item.kind === 'group' && item.group.models.length > 0)
+      .map((item) => (item.kind === 'group' ? item.group : undefined))
+      .filter((group): group is CatalogProvider => group !== undefined),
+    failures: catalog
+      .filter((item) => item.kind === 'failure')
+      .map((item) => (item.kind === 'failure' ? item.failure : undefined))
+      .filter((failure): failure is CatalogFailure => failure !== undefined),
+    subagentProviders: subagentProvidersOf(ctx),
+  }
+}
+
+/** 已注册的子代理 provider 名（llm 服务缺失时同样返回，卡片仍可渲染）。 */
+function subagentProvidersOf(ctx: Context): string[] {
+  const subagents = ctx.get('subagents')
+  return subagents === undefined ? [] : [...subagents.list()]
+}

package/src/client/api.ts

@@ -0,0 +1,45 @@
+/**
+ * 自定义端点通道：仅剩「模型目录」（配置读写已迁移到官方 settingsScope
+ * 传输，见 scope.ts 与 card.tsx）。
+ * @module subagent-model/client/api
+ */
+
+export interface CatalogEffort {
+  id: string
+  name: string
+  description?: string
+}
+
+export interface CatalogModel {
+  id: string
+  name: string
+  description?: string
+  reasoning?: {
+    defaultEffort?: string
+    efforts: CatalogEffort[]
+  }
+}
+
+export interface CatalogProvider {
+  id: string
+  name: string
+  models: CatalogModel[]
+}
+
+export interface ModelCatalog {
+  providers: CatalogProvider[]
+  failures: { id: string; name: string; message: string }[]
+  subagentProviders: string[]
+}
+
+const ROUTE_CATALOG = '/dsh-plus/subagent-model/catalog'
+
+async function parse<T>(res: Response): Promise<T> {
+  const body = (await res.json()) as T & { error?: string }
+  if (!res.ok) throw new Error(body.error ?? `HTTP ${res.status}`)
+  return body
+}
+
+export async function fetchCatalog(): Promise<ModelCatalog> {
+  return parse<ModelCatalog>(await fetch(ROUTE_CATALOG, { credentials: 'same-origin' }))
+}

package/src/client/card.tsx

@@ -0,0 +1,332 @@
+/**
+ * 「子代理模型配置」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
+ * 外壳与基础控件走 @dsh-plus/shared/client 套件（CardChrome/CheckRow/SelectField）。
+ * 配置读写走官方 settingsScope 传输：value 为 schema 解析后的命名空间值
+ * （enabled + entries），行集合 = 目录返回的已注册子代理 provider
+ * ∪ 已配置条目，保存时全量写回 entries（未配置的新 provider 行以默认空值
+ * 落盘，自文档化）；「模型目录」为唯一保留的自定义端点。
+ * @module subagent-model/client/card
+ */
+
+import {
+  CardChrome,
+  type CardStatusState,
+  CheckRow,
+  IDLE_STATUS,
+  type NamespaceSettingsApi,
+  type Scope,
+  SelectField,
+  type SelectOption,
+} from '@dsh-plus/shared/client'
+import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
+import { type CatalogProvider, fetchCatalog, type ModelCatalog } from './api.ts'
+import {
+  type ConfigValue,
+  type Draft,
+  type DraftRow,
+  draftFrom,
+  EMPTY_ROW,
+  toPatch,
+} from './draft.ts'
+
+export interface CardProps {
+  t(key: string): string
+  scope: Scope
+  api: NamespaceSettingsApi
+}
+
+const EFFORT_INHERIT = 'inherit'
+const EFFORT_DEFAULT = 'default'
+
+function unknownOption(value: string, label: string): SelectOption {
+  return { value, label: `${value}（${label}）` }
+}
+
+function providerOptions(
+  catalog: ModelCatalog | null,
+  row: DraftRow,
+  t: (k: string) => string,
+): SelectOption[] {
+  const options: SelectOption[] = [{ value: '', label: t('inheritProvider') }]
+  for (const provider of catalog?.providers ?? [])
+    options.push({ value: provider.id, label: provider.name })
+  if (row.provider.length > 0 && !options.some((o) => o.value === row.provider)) {
+    options.push(unknownOption(row.provider, t('unknownValue')))
+  }
+  return options
+}
+
+function modelOptions(
+  catalog: ModelCatalog | null,
+  row: DraftRow,
+  t: (k: string) => string,
+): SelectOption[] {
+  const options: SelectOption[] = [{ value: '', label: t('inheritModel') }]
+  const provider = catalog?.providers.find((p) => p.id === row.provider)
+  for (const model of provider?.models ?? []) options.push({ value: model.id, label: model.name })
+  if (row.model.length > 0 && !options.some((o) => o.value === row.model)) {
+    options.push(unknownOption(row.model, t('unknownValue')))
+  }
+  return options
+}
+
+function effortOptions(
+  catalog: ModelCatalog | null,
+  row: DraftRow,
+  t: (k: string) => string,
+): SelectOption[] {
+  const options: SelectOption[] = [
+    { value: EFFORT_INHERIT, label: t('effortInherit') },
+    { value: EFFORT_DEFAULT, label: t('effortDefault') },
+  ]
+  const provider = catalog?.providers.find((p) => p.id === row.provider)
+  const model = provider?.models.find((m) => m.id === row.model)
+  for (const effort of model?.reasoning?.efforts ?? [])
+    options.push({ value: effort.id, label: effort.name })
+  if (row.reasoningEffort.length > 0 && !options.some((o) => o.value === row.reasoningEffort)) {
+    options.push(unknownOption(row.reasoningEffort, t('unknownValue')))
+  }
+  return options
+}
+
+interface RowBlockProps {
+  name: string
+  row: DraftRow
+  catalog: ModelCatalog | null
+  disabled: boolean
+  t(key: string): string
+  onEdit(row: DraftRow): void
+}
+
+function RowBlock(props: RowBlockProps): ReactElement {
+  const { name, row, catalog, disabled, t, onEdit } = props
+  const invalidModel = row.model.length > 0 && row.provider.length === 0
+  return (
+    <div className="dsm-row">
+      <div className="dsm-rowHead">
+        <span className="dsm-rowName">{name}</span>
+        <CheckRow
+          prefix="dsm"
+          id={`dsm-row-${name}`}
+          label={t('rowEnabled')}
+          checked={row.enabled}
+          disabled={disabled}
+          onEdit={(v) => onEdit({ ...row, enabled: v })}
+        />
+      </div>
+      <p className="dsm-rowHint">{t('rowHint')}</p>
+      <SelectField
+        prefix="dsm"
+        id={`dsm-provider-${name}`}
+        label={t('provider')}
+        hint={t('providerHint')}
+        value={row.provider}
+        options={providerOptions(catalog, row, t)}
+        disabled={disabled}
+        onEdit={(v) => onEdit({ ...row, provider: v })}
+      />
+      <SelectField
+        prefix="dsm"
+        id={`dsm-model-${name}`}
+        label={t('model')}
+        hint={t('modelHint')}
+        value={row.model}
+        options={modelOptions(catalog, row, t)}
+        disabled={disabled || row.provider.length === 0}
+        invalid={invalidModel}
+        invalidLabel={t('invalidModel')}
+        onEdit={(v) => onEdit({ ...row, model: v })}
+      />
+      <SelectField
+        prefix="dsm"
+        id={`dsm-effort-${name}`}
+        label={t('effort')}
+        hint={t('effortHint')}
+        value={row.reasoningEffort}
+        options={effortOptions(catalog, row, t)}
+        disabled={disabled}
+        onEdit={(v) => onEdit({ ...row, reasoningEffort: v })}
+      />
+    </div>
+  )
+}
+
+export function SubagentModelCard(props: CardProps): ReactElement | null {
+  const { t, scope, api } = props
+  const snapshot = useSyncExternalStore(
+    (listener: () => void) => scope.subscribe(listener),
+    () => scope.getSnapshot(),
+  )
+  const value = snapshot.value as ConfigValue | undefined
+  const [open, setOpen] = useState(false)
+  const [draft, setDraft] = useState<Draft | null>(null)
+  const [catalog, setCatalog] = useState<ModelCatalog | null>(null)
+  const [catalogFailed, setCatalogFailed] = useState(false)
+  const [saving, setSaving] = useState(false)
+  const [status, setStatus] = useState<CardStatusState>(IDLE_STATUS)
+
+  // 播种草稿（行集 = 已配置条目）；catalog 到达后只补缺失的 provider 空行，
+  // 不覆盖在途编辑；后续 Host 更新同样不覆盖。
+  useEffect(() => {
+    if (value === undefined) return
+    setDraft((current) => {
+      if (current === null) return draftFrom(value, catalog)
+      if (catalog === null) return current
+      const rows = { ...current.rows }
+      let changed = false
+      for (const name of catalog.subagentProviders) {
+        if (name in rows) continue
+        rows[name] = { ...EMPTY_ROW }
+        changed = true
+      }
+      return changed ? { ...current, rows } : current
+    })
+  }, [value, catalog])
+
+  useEffect(() => {
+    if (!open || catalog !== null) return
+    let alive = true
+    fetchCatalog()
+      .then((loaded) => {
+        if (!alive) return
+        setCatalog(loaded)
+        setCatalogFailed(false)
+      })
+      .catch(() => {
+        if (alive) setCatalogFailed(true)
+      })
+    return () => {
+      alive = false
+    }
+  }, [open, catalog])
+
+  const dirty = useMemo(
+    () =>
+      value !== undefined &&
+      draft !== null &&
+      JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFrom(value, catalog))),
+    [value, draft, catalog],
+  )
+  const invalid = useMemo(
+    () =>
+      draft !== null &&
+      Object.values(draft.rows).some((row) => row.model.length > 0 && row.provider.length === 0),
+    [draft],
+  )
+
+  if (value === undefined || draft === null) {
+    return (
+      <li className="dsm-card">
+        <p className="dsm-empty">{t('loading')}</p>
+      </li>
+    )
+  }
+  const edit = <K extends keyof Draft>(key: K, editValue: Draft[K]): void => {
+    setDraft({ ...draft, [key]: editValue })
+    setStatus(IDLE_STATUS)
+  }
+  const editRow = (name: string, row: DraftRow): void => {
+    setDraft({ ...draft, rows: { ...draft.rows, [name]: row } })
+    setStatus(IDLE_STATUS)
+  }
+  const onSave = (): void => {
+    setSaving(true)
+    const revision = scope.getSnapshot().revision
+    api
+      .update(toPatch(draft), revision)
+      .then(async () => {
+        await scope.load()
+        const next = scope.getSnapshot().value as ConfigValue | undefined
+        if (next !== undefined) setDraft(draftFrom(next, catalog))
+        setStatus(IDLE_STATUS)
+      })
+      .catch((error: unknown) => {
+        setStatus({
+          kind: 'error',
+          text: `${t('saveFailed')}${error instanceof Error ? error.message : ''}`,
+        })
+      })
+      .finally(() => setSaving(false))
+  }
+  const onRetryCatalog = (): void => {
+    setCatalog(null)
+    setCatalogFailed(false)
+  }
+
+  const disabled = !snapshot.writable
+  const rowNames = Object.keys(draft.rows).sort()
+  const providerCount = (catalog?.providers ?? []).length
+  return (
+    <CardChrome
+      prefix="dsm"
+      title={t('title')}
+      description={t('description')}
+      open={open}
+      onToggle={setOpen}
+      statusBadge={{ text: t(draft.enabled ? 'enabledOn' : 'enabledOff'), on: draft.enabled }}
+      dirty={dirty}
+      dirtyLabel={t('unsaved')}
+      readOnlyNotice={disabled ? t('readOnly') : undefined}
+      status={status}
+      actions={[
+        {
+          key: 'discard',
+          label: t('discard'),
+          disabled: !dirty || saving,
+          onClick: () => {
+            setDraft(draftFrom(value, catalog))
+            setStatus(IDLE_STATUS)
+          },
+        },
+        {
+          key: 'save',
+          label: t(saving ? 'saving' : 'save'),
+          variant: 'primary',
+          disabled: !dirty || invalid || saving || disabled,
+          onClick: onSave,
+        },
+      ]}
+    >
+      <CheckRow
+        prefix="dsm"
+        id="dsm-enabled"
+        label={t('enabled')}
+        checked={draft.enabled}
+        disabled={disabled}
+        onEdit={(v) => edit('enabled', v)}
+      />
+      {catalogFailed ? (
+        <div className="dsm-banner" role="status">
+          <span>{t('catalogError')}</span>
+          <button type="button" className="dsm-bannerRetry" onClick={onRetryCatalog}>
+            {t('catalogRetry')}
+          </button>
+        </div>
+      ) : null}
+      {catalog === null && !catalogFailed ? (
+        <p className="dsm-empty" role="status">
+          {t('catalogLoading')}
+        </p>
+      ) : null}
+      {rowNames.length === 0 ? (
+        <p className="dsm-empty" role="status">
+          {t('noRows')}
+        </p>
+      ) : null}
+      {rowNames.map((name) => (
+        <RowBlock
+          key={name}
+          name={name}
+          row={draft.rows[name] ?? { ...EMPTY_ROW }}
+          catalog={catalog}
+          disabled={disabled}
+          t={t}
+          onEdit={(row) => editRow(name, row)}
+        />
+      ))}
+      <p className="dsm-hint dsm-rowHint">{providerCount > 0 ? t('rowDesc') : ''}</p>
+    </CardChrome>
+  )
+}
+
+export type { CatalogProvider }

package/src/client/client.ts

@@ -0,0 +1,79 @@
+/**
+ * 浏览器半入口：注册 locale 字典 + 向 settings.plugin.item 插槽注册「子代理模型配置」卡片。
+ * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
+ * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
+ *
+ * 类型说明：浏览器半只用到 slots/locale/remote 的很窄一面，
+ * scope 与基础控件走 @dsh-plus/shared/client 套件（收编自本插件原实现）。
+ * 0.1.2-alpha.1 起配置读写统一走 ctx.remote.settings 直连
+ * （connection.api.settings RPC 面已移除；不复用 settingsScope 服务——
+ * 非 loopback 页面下它固定 memory 模式无数据）；自定义端点仅剩「模型目录」（api.ts）。
+ * 插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
+ * （即服务端 SETTINGS_NS 注册的同一字面量，见 ../ns.ts），
+ * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
+ * @module @dsh-plus/subagent-model/client
+ */
+import type { Context } from '@deepseek-ai/cordis'
+
+import {
+  createNamespaceApi,
+  createSettingsScope,
+  type SettingsRemoteFace,
+} from '@dsh-plus/shared/client'
+import { SETTINGS_NS } from '../ns.ts'
+import { SubagentModelCard } from './card.tsx'
+import { en, NS, zh } from './i18n.ts'
+import { injectStyle } from './styles.ts'
+
+export const name = 'dsh-plus-subagent-model'
+
+/** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
+export const inject = ['slots', 'locale', 'remote', 'remote.settings'] as const
+
+interface SlotsLike {
+  inject(key: string, callback: () => unknown): unknown
+  register(options: Record<string, unknown>, component: unknown): () => void
+}
+
+interface LocaleLike {
+  register(ns: string, dict: { zh: Record<string, string>; en: Record<string, string> }): () => void
+  bind(ns: string): (key: string) => string
+}
+
+interface RemoteLike {
+  settings: SettingsRemoteFace
+  $on(event: string, listener: (payload?: unknown) => void): () => void
+}
+
+interface ClientContext {
+  slots: SlotsLike
+  locale: LocaleLike
+  get(key: 'remote'): RemoteLike
+  on(event: string, listener: () => void): () => void
+  effect(execute: () => () => void, label?: string): unknown
+}
+
+export function apply(ctx: Context): void {
+  const c = ctx as unknown as ClientContext
+  const tag = injectStyle()
+  c.effect(
+    () => () => {
+      tag?.remove()
+    },
+    'subagent-model: style',
+  )
+  c.effect(() => c.locale.register(NS, { zh, en }), 'subagent-model: locale')
+  const scope = createSettingsScope(c, SETTINGS_NS, 'subagent-model: settings scope')
+  const api = createNamespaceApi(c.get('remote').settings, SETTINGS_NS)
+  c.slots.inject('settings.plugin.item', () =>
+    c.slots.register(
+      {
+        name: 'settings.plugin.item',
+        key: SETTINGS_NS,
+        locale: NS,
+        inject: () => ({ t: c.locale.bind(NS), scope, api }),
+      },
+      SubagentModelCard,
+    ),
+  )
+}