@dsh-plus/subagent-model 0.3.6 → 0.3.7

package/lib/client.js

@@ -166,7 +166,10 @@ window.__ModuleLoader__.load({
 			confirm: "Confirm",
 			cancel: "Cancel"
 		};
-		/** own 覆盖同键合并（返回新对象，入参不可变）。 */
+		/**
+		* own 覆盖同键合并（返回新对象，入参不可变）。
+		* 返回类型保留两侧键集合，调用方据此派生 DictKey。
+		*/
 		function mergeDict(base, own) {
 			return {
 				...base,

package/lib/index.d.ts

@@ -47,7 +47,7 @@ declare class SubagentModelService extends Service {
 //#endregion
 //#region src/index.d.ts
 declare const name = "dsh-plus-subagent-model";
-declare const inject: readonly ["subagents", "llm"];
+declare const inject: readonly ['subagents', 'llm'];
 declare function apply(ctx: Context, config: SubagentModelConfig): void;
 //#endregion
 export { Config, type EntryConfig, type InjectedOptions, type SubagentModelConfig, SubagentModelService, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/subagent-model",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "dsh-plus service+ui plugin: 为 subagent/subagent_fork 等子代理按提供商配置模型与思考程度（或继承主代理）",
   "type": "module",
   "main": "lib/index.js",
@@ -19,7 +19,7 @@
     "src"
   ],
   "dependencies": {
-    "@dsh-plus/shared": "0.1.15"
+    "@dsh-plus/shared": "0.1.16"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",

package/src/client/card.tsx

@@ -28,9 +28,10 @@ import {
   EMPTY_ROW,
   toPatch,
 } from './draft.ts'
+import type { Translate } from './i18n.ts'
 
 export interface CardProps {
-  t(key: string): string
+  t: Translate
   scope: Scope
   api: NamespaceSettingsApi
 }
@@ -45,7 +46,7 @@ function unknownOption(value: string, label: string): SelectOption {
 function providerOptions(
   catalog: ModelCatalog | null,
   row: DraftRow,
-  t: (k: string) => string,
+  t: Translate,
 ): SelectOption[] {
   const options: SelectOption[] = [{ value: '', label: t('inheritProvider') }]
   for (const provider of catalog?.providers ?? [])
@@ -56,11 +57,7 @@ function providerOptions(
   return options
 }
 
-function modelOptions(
-  catalog: ModelCatalog | null,
-  row: DraftRow,
-  t: (k: string) => string,
-): SelectOption[] {
+function modelOptions(catalog: ModelCatalog | null, row: DraftRow, t: Translate): 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 })
@@ -70,11 +67,7 @@ function modelOptions(
   return options
 }
 
-function effortOptions(
-  catalog: ModelCatalog | null,
-  row: DraftRow,
-  t: (k: string) => string,
-): SelectOption[] {
+function effortOptions(catalog: ModelCatalog | null, row: DraftRow, t: Translate): SelectOption[] {
   const options: SelectOption[] = [
     { value: EFFORT_INHERIT, label: t('effortInherit') },
     { value: EFFORT_DEFAULT, label: t('effortDefault') },
@@ -94,7 +87,7 @@ interface RowBlockProps {
   row: DraftRow
   catalog: ModelCatalog | null
   disabled: boolean
-  t(key: string): string
+  t: Translate
   onEdit(row: DraftRow): void
 }
 

package/src/client/client.ts

@@ -18,11 +18,11 @@ import type { Context } from '@deepseek-ai/cordis'
 import {
   createNamespaceApi,
   createSettingsScope,
-  type SettingsRemoteFace,
+  type PluginClientContext,
 } from '@dsh-plus/shared/client'
 import { SETTINGS_NS } from '../ns.ts'
 import { SubagentModelCard } from './card.tsx'
-import { en, NS, zh } from './i18n.ts'
+import { type DictKey, en, NS, zh } from './i18n.ts'
 import { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-subagent-model'
@@ -30,28 +30,8 @@ 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
-}
+/** 宿主窄面收编在 @dsh-plus/shared/client；TKey 传入本包 DictKey 使键名受检。 */
+type ClientContext = PluginClientContext<DictKey>
 
 export function apply(ctx: Context): void {
   const c = ctx as unknown as ClientContext

package/src/client/i18n.ts

@@ -31,7 +31,7 @@ const ownZh = {
   catalogLoading: '目录加载中…',
   unknownValue: '目录外',
   invalidModel: '模型不能脱离提供商单独配置。',
-}
+} as const
 
 const ownEn = {
   title: 'Subagent model config',
@@ -59,7 +59,13 @@ const ownEn = {
   catalogLoading: 'Loading catalog\u2026',
   unknownValue: 'outside catalog',
   invalidModel: 'Model cannot be set without a provider.',
-}
+} as const
 
-export const zh: Record<string, string> = mergeDict(commonZh, ownZh)
-export const en: Record<string, string> = mergeDict(commonEn, ownEn)
+export type DictKey = keyof typeof commonZh | keyof typeof ownZh
+
+/** 卡片/面板共用的翻译函数类型（slot 注入的 bind 结果按此消费）。 */
+export type Translate = (key: DictKey) => string
+
+// 标注为 Record<DictKey, string>：en 缺任一键即编译期报错（中英强制对齐）。
+export const zh: Record<DictKey, string> = mergeDict(commonZh, ownZh)
+export const en: Record<DictKey, string> = mergeDict(commonEn, ownEn)