@dsh-plus/subagent-model 0.1.5 → 0.1.7

package/lib/index.d.ts

@@ -1,9 +1,6 @@
 import z from "@deepseek-ai/schemastery";
-import "@deepseek-ai/dsh-settings";
 import { Context, Service } from "@deepseek-ai/cordis";
-
 //#region src/config.d.ts
-
 /** 一条条目的规范输出形态。 */
 interface EntryConfig {
   enabled: boolean;

package/lib/index.js

@@ -1,31 +1,33 @@
-import z from "@deepseek-ai/schemastery";
 import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
+import z from "@deepseek-ai/schemastery";
 import { Context, Service } from "@deepseek-ai/cordis";
-
-//#region src/ns.ts
-/**
-* settings 命名空间字面量（纯常量，零依赖，浏览器半可安全引入）。
-* 服务端经 settingsNamespace() 品牌化后使用（config.ts），浏览器半将其作为
-* settings.plugin.item keyed 槽位的 key —— 同一字面量两处共用，防止漂移。
-* 契约：dsh rc7 起该槽位按「卡片编辑的 settings 命名空间」作 key 分发，
-* 官方配置页只渲染 key 命中 Host 已注册命名空间的卡片。
-* @module subagent-model/ns
-*/
-const SETTINGS_NS$1 = "dsh-plus-subagent-model";
-
 //#endregion
 //#region src/config.ts
+/**
+* 配置单一事实源：cordis 行级 Config（组合默认值，dev/prod patch 层可覆盖）
+* 与 settings namespace（用户层，经 dsh-settings-file 持久化到 $DSH_HOME/settings.yaml）
+* 共用同一 schemastery schema。条目按【子代理 provider 名】键控
+* （standard preset 事实映射：subagent↔spawn、subagent_fork↔fork）。
+*
+* 运行时语义（详见 delegation.ts）：
+* - provider/model 显式时注入子代理 `agentOptions`（覆盖"继承主代理"快照）；
+* - reasoningEffort 显式时经私有字段随 agentOptions 抵达子代理，再由
+*   `agent/request` 瀑布监听器应用（dsh 原生 AgentOptions 不含 effort 字段）。
+*
+* 类型说明：z.dict 的推断类型引用 cosmokit 的 Dict，直接导出会触发
+* dts 的 TS2742（不可具名引用）；按官方 dsh-permission-presets 模式，
+* 显式声明输入/输出接口并注解 schema（输出为规范型，输入为可空宽松型）。
+* @module subagent-model/config
+*/
 /** settings 命名空间；webui 配置卡片与插件运行期读取同一份（字面量见 ./ns.ts）。 */
-const SETTINGS_NS = settingsNamespace(SETTINGS_NS$1);
+const SETTINGS_NS = settingsNamespace("dsh-plus-subagent-model");
 /** 思考程度哨兵值：继承主代理（不注入 effort 字段）。 */
 const EFFORT_INHERIT = "inherit";
-/** 思考程度哨兵值：跟随模型默认（显式剥离任何继承/推导出的 effort）。 */
-const EFFORT_DEFAULT = "default";
 const EntrySchema = z.object({
 	enabled: z.boolean().description("该子代理 provider 行的开关").default(false),
 	provider: z.string().description("LLM 提供商 id；留空 = 继承主代理").default(""),
 	model: z.string().description("模型 id；留空 = 继承主代理").default(""),
-	reasoningEffort: z.string().description(`思考程度：${EFFORT_INHERIT}（继承主代理）/ ${EFFORT_DEFAULT}（跟随模型默认）/ 提供商目录档位 id`).default(EFFORT_INHERIT)
+	reasoningEffort: z.string().description(`思考程度：${EFFORT_INHERIT}（继承主代理）/ default（跟随模型默认）/ 提供商目录档位 id`).default(EFFORT_INHERIT)
 });
 const Config = z.object({
 	enabled: z.boolean().description("总开关").default(false),
@@ -40,7 +42,7 @@ function resolveEntry(entry) {
 	const out = {};
 	if (entry.provider.length > 0) out.provider = entry.provider;
 	if (entry.model.length > 0) out.model = entry.model;
-	if (entry.reasoningEffort !== EFFORT_INHERIT) out.reasoningEffort = entry.reasoningEffort;
+	if (entry.reasoningEffort !== "inherit") out.reasoningEffort = entry.reasoningEffort;
 	return out.provider !== void 0 || out.model !== void 0 || out.reasoningEffort !== void 0 ? out : void 0;
 }
 /**
@@ -61,8 +63,8 @@ function mergeAgentOptions(injected, existing) {
 */
 function applyEffort(resolved, effort) {
 	if (effort === void 0) return resolved;
-	if (effort === EFFORT_DEFAULT) {
-		const { reasoningEffort: _dropped,...rest } = resolved;
+	if (effort === "default") {
+		const { reasoningEffort: _dropped, ...rest } = resolved;
 		return rest;
 	}
 	return {
@@ -81,13 +83,12 @@ function validateEntry(entry) {
 }
 /** 校验整组条目（settings 写入的 validate 钩子用）；返回首个错误消息，合法时返回 null。 */
 function validateEntries(entries) {
-	for (const [name$1, entry] of Object.entries(entries)) {
+	for (const [name, entry] of Object.entries(entries)) {
 		const error = validateEntry(entry);
-		if (error !== null) return `条目 ${name$1}: ${error}`;
+		if (error !== null) return `条目 ${name}: ${error}`;
 	}
 	return null;
 }
-
 //#endregion
 //#region src/catalog.ts
 function toEffort(effort) {
@@ -154,7 +155,6 @@ function subagentProvidersOf(ctx) {
 	const subagents = ctx.get("subagents");
 	return subagents === void 0 ? [] : [...subagents.list()];
 }
-
 //#endregion
 //#region src/config-api.ts
 const ROUTE_CATALOG = "/dsh-plus/subagent-model/catalog";
@@ -192,13 +192,12 @@ function registerCatalogApi(ctx) {
 		})
 	});
 }
-
 //#endregion
 //#region src/delegation.ts
 const WRAPPED = Symbol("dsh-plus-subagent-model.wrapped");
-function entryFor(current, name$1) {
-	if (name$1 === void 0) return void 0;
-	const entry = current().entries[name$1];
+function entryFor(current, name) {
+	if (name === void 0) return void 0;
+	const entry = current().entries[name];
 	return entry === void 0 ? void 0 : resolveEntry(entry);
 }
 /**
@@ -220,10 +219,10 @@ function installDelegationHook(ctx, current) {
 	}
 	const originalStart = subagents.start.bind(subagents);
 	const originalContinuable = subagents.startContinuable.bind(subagents);
-	subagents.start = async (name$1, request) => {
-		const injected = entryFor(current, name$1);
-		if (injected === void 0) return originalStart(name$1, request);
-		return originalStart(name$1, {
+	subagents.start = async (name, request) => {
+		const injected = entryFor(current, name);
+		if (injected === void 0) return originalStart(name, request);
+		return originalStart(name, {
 			...request,
 			agentOptions: mergeAgentOptions(injected, request.agentOptions)
 		});
@@ -268,9 +267,19 @@ function installChildRoute(ctx) {
 		return applyEffort(resolved, effort);
 	});
 }
-
 //#endregion
 //#region src/service.ts
+/**
+* SubagentModelService：子代理模型配置中枢。
+* - 配置：installSettingsSection 接入 settings 用户层（$DSH_HOME/settings.yaml，热生效），
+*   无 settings provider 时退化为 cordis 行级 config；写入经 validate 钩子
+*   走 validateEntries 规则（model 不能脱离 provider 等），非法即拒。
+* - 委托挂钩：包装 ctx.subagents.start/startContinuable，按 provider 名注入
+*   agentOptions（provider/model/effort 私有标记），未命中条目完全直通。
+* - 子代理路由：根 ctx 的 agent/request 瀑布监听，把条目 effort 应用到子代理请求。
+* - 自定义端点：ctx.webServer 仅注册模型目录路由（配置读写已走官方 settings RPC）。
+* @module @dsh-plus/subagent-model
+*/
 var SubagentModelService = class extends Service {
 	static [Context.inject] = ["subagents", "llm"];
 	current;
@@ -303,7 +312,6 @@ var SubagentModelService = class extends Service {
 		return subagents === void 0 ? [] : [...subagents.list()];
 	}
 };
-
 //#endregion
 //#region src/index.ts
 const name = "dsh-plus-subagent-model";
@@ -311,6 +319,5 @@ const inject = ["subagents", "llm"];
 function apply(ctx, config) {
 	ctx.plugin(SubagentModelService, config);
 }
-
 //#endregion
-export { Config, SubagentModelService, apply, inject, name };
+export { Config, SubagentModelService, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/subagent-model",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "dsh-plus service+ui plugin: 为 subagent/subagent_fork 等子代理按提供商配置模型与思考程度（或继承主代理）",
   "type": "module",
   "main": "lib/index.js",
@@ -40,12 +40,12 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
     "@deepseek-ai/cosmokit": "1.8.2",
-    "@deepseek-ai/dsh-agent": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-session": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-subagent": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-subagent": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
     "@types/react": "~18.3.1",
     "react": "^18.2.0"

package/src/catalog.ts

@@ -48,7 +48,7 @@ function toEffort(effort: LlmReasoningEffortInfo): CatalogEffort {
   return {
     id: String(effort.id),
     name: effort.name,
-    ...effort.description === undefined ? {} : { description: effort.description },
+    ...(effort.description === undefined ? {} : { description: effort.description }),
   }
 }
 
@@ -59,49 +59,62 @@ function toEffort(effort: LlmReasoningEffortInfo): CatalogEffort {
 export async function buildModelCatalog(ctx: Context): Promise<ModelCatalog> {
   const llm = ctx.get('llm')
   if (llm === undefined) {
-    return { providers: [], failures: [], subagentProviders: subagentProvidersOf(ctx) }
+    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) },
+  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 {
-          id: model.id,
-          name: model.name,
-          ...model.description === undefined ? {} : { description: model.description },
-          ...reasoning === undefined ? {} : { reasoning },
+          kind: 'failure' as const,
+          failure: {
+            id: provider.id,
+            name: provider.name,
+            message: error instanceof Error ? error.message : String(error),
+          },
         }
-      }))
-      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)
+      .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)
+      .map((item) => (item.kind === 'failure' ? item.failure : undefined))
       .filter((failure): failure is CatalogFailure => failure !== undefined),
     subagentProviders: subagentProvidersOf(ctx),
   }

package/src/client/card.tsx

@@ -7,12 +7,10 @@
  * 落盘，自文档化）；「模型目录」为唯一保留的自定义端点。
  * @module subagent-model/client/card
  */
-import { useEffect, useMemo, useSyncExternalStore, useState, type ReactElement } from 'react'
+import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
 
 import { SETTINGS_NS } from '../ns.ts'
-import {
-  fetchCatalog, type CatalogProvider, type ModelCatalog,
-} from './api.ts'
+import { type CatalogProvider, fetchCatalog, type ModelCatalog } from './api.ts'
 import { CheckRow, SelectField, type SelectOption } from './fields.tsx'
 import type { Scope, SettingsApi } from './scope.ts'
 
@@ -53,7 +51,12 @@ interface Status {
 }
 
 const IDLE_STATUS: Status = { kind: 'idle', text: '' }
-const EMPTY_ROW: DraftRow = { enabled: false, provider: '', model: '', reasoningEffort: 'inherit' }
+const EMPTY_ROW: DraftRow = {
+  enabled: false,
+  provider: '',
+  model: '',
+  reasoningEffort: 'inherit',
+}
 const EFFORT_INHERIT = 'inherit'
 const EFFORT_DEFAULT = 'default'
 
@@ -64,14 +67,15 @@ function draftFrom(value: ConfigValue, catalog: ModelCatalog | null): Draft {
   for (const name of Object.keys(value.entries).sort()) names.add(name)
   for (const name of names) {
     const entry = value.entries[name]
-    rows[name] = entry === undefined
-      ? { ...EMPTY_ROW }
-      : {
-          enabled: entry.enabled,
-          provider: entry.provider,
-          model: entry.model,
-          reasoningEffort: entry.reasoningEffort,
-        }
+    rows[name] =
+      entry === undefined
+        ? { ...EMPTY_ROW }
+        : {
+            enabled: entry.enabled,
+            provider: entry.provider,
+            model: entry.model,
+            reasoningEffort: entry.reasoningEffort,
+          }
   }
   return { enabled: value.enabled, rows }
 }
@@ -84,16 +88,25 @@ function unknownOption(value: string, label: string): SelectOption {
   return { value, label: `${value}（${label}）` }
 }
 
-function providerOptions(catalog: ModelCatalog | null, row: DraftRow, t: (k: string) => string): SelectOption[] {
+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 })
+  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[] {
+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 })
@@ -103,14 +116,19 @@ function modelOptions(catalog: ModelCatalog | null, row: DraftRow, t: (k: string
   return options
 }
 
-function effortOptions(catalog: ModelCatalog | null, row: DraftRow, t: (k: string) => string): SelectOption[] {
+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 })
+  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')))
   }
@@ -133,20 +151,44 @@ function RowBlock(props: RowBlockProps): ReactElement {
     <div className="dsm-row">
       <div className="dsm-rowHead">
         <span className="dsm-rowName">{name}</span>
-        <CheckRow id={`dsm-row-${name}`} label={t('rowEnabled')} checked={row.enabled}
-          disabled={disabled} onEdit={(v) => onEdit({ ...row, enabled: v })} />
+        <CheckRow
+          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 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 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 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 })} />
+      <SelectField
+        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
+        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
+        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>
   )
 }
@@ -202,18 +244,24 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
 
   const dirty = useMemo(
     () =>
-      value !== undefined && draft !== null &&
+      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 !== 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>
+    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 })
@@ -226,11 +274,12 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
   const onSave = (): void => {
     setSaving(true)
     const revision = scope.getSnapshot().revision
-    api.update({
-      ns: SETTINGS_NS,
-      patch: toPatch(draft),
-      ...(revision !== undefined ? { expectedRevision: revision } : {}),
-    })
+    api
+      .update({
+        ns: SETTINGS_NS,
+        patch: toPatch(draft),
+        ...(revision !== undefined ? { expectedRevision: revision } : {}),
+      })
       .then(async (response) => {
         if (!response.result.ok) {
           throw new Error(response.result.error?.message ?? t('saveFailed'))
@@ -241,7 +290,10 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
         setStatus(IDLE_STATUS)
       })
       .catch((error: unknown) => {
-        setStatus({ kind: 'error', text: `${t('saveFailed')}${error instanceof Error ? error.message : ''}` })
+        setStatus({
+          kind: 'error',
+          text: `${t('saveFailed')}${error instanceof Error ? error.message : ''}`,
+        })
       })
       .finally(() => setSaving(false))
   }
@@ -271,9 +323,18 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
       </button>
       {open ? (
         <div className="dsm-body">
-          {disabled ? <p className="dsm-empty" role="status">{t('readOnly')}</p> : null}
-          <CheckRow id="dsm-enabled" label={t('enabled')} checked={draft.enabled} disabled={disabled}
-            onEdit={(v) => edit('enabled', v)} />
+          {disabled ? (
+            <p className="dsm-empty" role="status">
+              {t('readOnly')}
+            </p>
+          ) : null}
+          <CheckRow
+            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>
@@ -283,31 +344,53 @@ export function SubagentModelCard(props: CardProps): ReactElement | null {
             </div>
           ) : null}
           {catalog === null && !catalogFailed ? (
-            <p className="dsm-empty" role="status">{t('catalogLoading')}</p>
+            <p className="dsm-empty" role="status">
+              {t('catalogLoading')}
+            </p>
           ) : null}
           {rowNames.length === 0 ? (
-            <p className="dsm-empty" role="status">{t('noRows')}</p>
+            <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)} />
+            <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>
+          <p className="dsm-hint dsm-rowHint">{providerCount > 0 ? t('rowDesc') : ''}</p>
           <div className="dsm-footer">
             {status.kind !== 'idle' ? (
-              <p className={`dsm-status${status.kind === 'error' ? ' dsm-statusError' : ''}`} role="status">
+              <p
+                className={`dsm-status${status.kind === 'error' ? ' dsm-statusError' : ''}`}
+                role="status"
+              >
                 {status.text}
               </p>
             ) : null}
-            <button type="button" className="dsm-btn dsm-btnGhost" disabled={!dirty || saving}
-              onClick={() => { setDraft(draftFrom(value, catalog)); setStatus(IDLE_STATUS) }}>
+            <button
+              type="button"
+              className="dsm-btn dsm-btnGhost"
+              disabled={!dirty || saving}
+              onClick={() => {
+                setDraft(draftFrom(value, catalog))
+                setStatus(IDLE_STATUS)
+              }}
+            >
               {t('discard')}
             </button>
-            <button type="button" className="dsm-btn dsm-btnPrimary" disabled={!dirty || invalid || saving || disabled}
-              onClick={onSave}>
+            <button
+              type="button"
+              className="dsm-btn dsm-btnPrimary"
+              disabled={!dirty || invalid || saving || disabled}
+              onClick={onSave}
+            >
               {t(saving ? 'saving' : 'save')}
             </button>
           </div>