@wenaixi/dsh-superpower 7.5.1 → 7.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -2
- package/README.zh.md +5 -1
- package/lib/client.js +33 -34
- package/lib/superpowers.d.ts +2 -2
- package/lib/superpowers.d.ts.map +1 -1
- package/lib/superpowers.js +27 -3
- package/lib/superpowers.js.map +1 -1
- package/lib/switches.d.ts +2 -2
- package/lib/switches.d.ts.map +1 -1
- package/lib/switches.js +8 -4
- package/lib/switches.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -28,7 +28,7 @@ dsh --profile web --dump-config | grep -A2 "@wenaixi/dsh-superpower"
|
|
|
28
28
|
dsh --profile web # skills are available immediately
|
|
29
29
|
```
|
|
30
30
|
|
|
31
|
-
Pin a version by appending `@<version>` (`@wenaixi/dsh-superpower@7.5.
|
|
31
|
+
Pin a version by appending `@<version>` (`@wenaixi/dsh-superpower@7.5.3`) or `#v7.5.3`.
|
|
32
32
|
|
|
33
33
|
The old unscoped package name `dsh-superpower` is deprecated (`npm deprecate`); use the scoped one.
|
|
34
34
|
|
|
@@ -82,7 +82,7 @@ The official registry arbitrates same-layer name collisions by ascending `rank`.
|
|
|
82
82
|
Open the `@wenaixi/dsh-superpower` card in the plugin manager; the panel sits at the bottom of its detail page.
|
|
83
83
|
|
|
84
84
|
- One switch per skill. Off means both sides lose it: the model no longer sees it in the available-skill catalog and `skill` tool calls are rejected; you can no longer reach it from slash-command completion or the CLI skill list.
|
|
85
|
-
- `中文 / English`
|
|
85
|
+
- A single `中文 / English` button sits at the top of the panel, under the intro line, and switches the display language of all 15 skills' names and descriptions (English `description` vs Chinese `description_zh`) at once. The body is always the English original. Both descriptions start with `Superpower Skill:` / `Superpower Skill：`. The choice is per-language (a single `language` preference) and stored in the profile. Until you touch it, descriptions follow the Host UI language (settings language); once you switch it in the panel, the language stays fixed.
|
|
86
86
|
- The panel header also carries enable-all, disable-all, restore-defaults, and a search box. The head line shows this bundle's `provider`, `rank`, `source`, and panel build.
|
|
87
87
|
- Changes take effect immediately; the running turn is unaffected and the next turn sees the new catalog and language.
|
|
88
88
|
- State lives in the profile's `cordis.patch.yml` (`disabled` and `language` tables) and travels with the profile.
|
|
@@ -190,6 +190,10 @@ Since `v7.0.0` skill names follow upstream naming (no `superpower-` prefix) and
|
|
|
190
190
|
|
|
191
191
|
`v7.5.0` shipped every skill with an English body (`SKILL.en.md`, upstream original adapted for DSH) beside the Chinese one, added a per-skill `中文 / English` switch, made English descriptions always start with `Superpower Skill: `, routed the same language preference to the model-side catalog and body, and made README.md English by default with a Chinese twin.
|
|
192
192
|
|
|
193
|
+
`v7.5.3` fixed the language button label: it now shows the target language based on the effective language (falling back to the Host language when the preference is unset), so an untouched panel correctly offers `English` and clicking it actually switches.
|
|
194
|
+
|
|
195
|
+
`v7.5.2` moved the language switch to a single button at the top of the panel: it now controls all 15 skills at once, and while the `language` preference is unset the descriptions follow the Host UI language (settings language); once set, they stay fixed.
|
|
196
|
+
|
|
193
197
|
`v7.5.1` makes skill bodies the official English originals (single `SKILL.md` per skill, DSH-adapted), keeps Chinese as the panel language via `description_zh`, so the language switch changes only the description the model sees. The `中文 / English` switch, the `Superpower Skill: ` prefixes, and the bilingual README remain.
|
|
194
198
|
|
|
195
199
|
Full history in [CHANGELOG.md](./CHANGELOG.md).
|
package/README.zh.md
CHANGED
|
@@ -87,7 +87,7 @@ dsh plugin --profile web remove @wenaixi/dsh-superpower
|
|
|
87
87
|
- 拨动后立即生效，模型的下一轮对话就能看到新目录；当前这一轮不受影响。
|
|
88
88
|
- 状态写在 profile 的 `cordis.patch.yml` 的 `disabled` 字段里，跟着 profile 一起备份迁移，重装插件不丢。
|
|
89
89
|
- 只影响本包这 15 个技能，不碰官方和第三方插件提供的技能。
|
|
90
|
-
-
|
|
90
|
+
- 语言切换：面板顶部（说明文案之下）一个「中文 / English」按钮，一次切换全部 15 个技能的名称与描述显示语言（英文 `description` 与中文 `description_zh`）。正文一律为英文原版。两种描述分别以 `Superpower Skill: ` / `Superpower Skill：` 开头。未在面板调过语言时，描述跟随宿主界面语言（设置里选的语言）；调过后固定为该语言。
|
|
91
91
|
- 面板 UI 文案（标题、按钮、提示、meta 标签）跟随宿主界面语言（设置里切换语言即生效）。
|
|
92
92
|
|
|
93
93
|
7.3.0 及更早版本用过两个开关（模型可调用 / 用户可调用），对应 `modelDisabled` 与 `userDisabled` 两张表。这两个字段已废弃：升级后旧值继续生效，你第一次拨动开关时它们会被清空，配置收敛到 `disabled` 一张表。
|
|
@@ -190,6 +190,10 @@ scripts/build-client.mjs # 复制客户端产物后校验内联清单与 sk
|
|
|
190
190
|
|
|
191
191
|
`v7.5.0` 每个技能新增英文正文（`SKILL.en.md`，取自上游原版并做 DSH 专属化），与中文 `SKILL.md` 并存；面板每行新增「中文 / English」切换，英文描述一律以 `Superpower Skill: ` 开头；同一语言偏好同时决定模型侧目录描述与加载正文；README.md 改为默认英文并新增中文版 README.zh.md。
|
|
192
192
|
|
|
193
|
+
`v7.5.3` 修复语言按钮显示：按钮按生效语言（未调过时取宿主语言）显示目标语言，未调过时正确显示 English、点击真正切换。
|
|
194
|
+
|
|
195
|
+
`v7.5.2` 语言切换按钮上移到面板顶部、全局一个；未调过时描述跟随宿主界面语言，调过后固定。
|
|
196
|
+
|
|
193
197
|
`v7.5.1` 技能正文统一为上游英文原版（单份 `SKILL.md`，DSH 专属化），中文描述移入 frontmatter `description_zh`，面板语言切换只改变模型看到的描述、正文恒英文。`中文 / English` 切换、`Superpower Skill:` 前缀与双语 README 保持不变。
|
|
194
198
|
|
|
195
199
|
`v7.4.1` 修复开关保存失败：`dsh-settings` 的写入闸门逐条校验 `op.path` 是否落在 volatile 节点下，两个旧字段去掉 `.volatile()` 会让整批 `mutate` 被拒，恢复标注即可；面板页头补「面板版本」标注。
|
package/lib/client.js
CHANGED
|
@@ -34,7 +34,7 @@ window.__ModuleLoader__.load({
|
|
|
34
34
|
var SKILL_SOURCE = 'bundled';
|
|
35
35
|
/* 面板所在的包版本。写死而非从宿主取：浏览器侧读不到 package.json，
|
|
36
36
|
而版本号正是排查「装的是哪一版、界面是不是这一版」时唯一能直接看到的东西。 */
|
|
37
|
-
var PACKAGE_VERSION = '7.5.
|
|
37
|
+
var PACKAGE_VERSION = '7.5.3';
|
|
38
38
|
var NS = 'dsh-superpower';
|
|
39
39
|
var DISABLED_FIELD = 'disabled';
|
|
40
40
|
/* v7.3.0 及之前的双侧禁言表。面板写入成功后会把它们 unset，
|
|
@@ -83,9 +83,7 @@ window.__ModuleLoader__.load({
|
|
|
83
83
|
rank: '优先级',
|
|
84
84
|
source: '来源',
|
|
85
85
|
build: '面板版本',
|
|
86
|
-
|
|
87
|
-
langEn: 'English',
|
|
88
|
-
langTitle: '切换技能名称与描述的显示语言（中文/English）',
|
|
86
|
+
langTitle: '切换描述显示语言：中文 / English',
|
|
89
87
|
};
|
|
90
88
|
|
|
91
89
|
var en = {
|
|
@@ -106,9 +104,7 @@ window.__ModuleLoader__.load({
|
|
|
106
104
|
rank: 'Priority',
|
|
107
105
|
build: 'Panel build',
|
|
108
106
|
source: 'Source',
|
|
109
|
-
|
|
110
|
-
langEn: 'English',
|
|
111
|
-
langTitle: 'Switch the display language of skill names and descriptions (Chinese/English)',
|
|
107
|
+
langTitle: 'Switch description language: Chinese / English',
|
|
112
108
|
};
|
|
113
109
|
|
|
114
110
|
/* 官方样式注入契约：style[data-plugin-css="<包名>/<文件名>"]，宿主据此在
|
|
@@ -137,9 +133,11 @@ window.__ModuleLoader__.load({
|
|
|
137
133
|
'.spSwErr{margin:4px 0 0;font:var(--dsw-font-xxxs-11);color:var(--dsw-alias-state-error-primary)}',
|
|
138
134
|
/* 右侧单开关：标签在左、开关在右 */
|
|
139
135
|
'.spSwSwitch{flex:none;display:flex;align-items:center;gap:10px}',
|
|
140
|
-
/*
|
|
141
|
-
'.
|
|
142
|
-
'.
|
|
136
|
+
/* 语言切换单按钮：面板顶部全局一个，显示目标语言，点击切换 */
|
|
137
|
+
'.spSwLangBar{display:flex;align-items:center;gap:8px;margin-top:2px}',
|
|
138
|
+
'.spSwLangBtn{margin:0;padding:2px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-xs);background:transparent;color:var(--dsw-alias-label-secondary);font:var(--dsw-font-xxs-12);cursor:pointer}',
|
|
139
|
+
'.spSwLangBtn:hover{border-color:var(--dsw-alias-border-l1);color:var(--dsw-alias-label-primary)}',
|
|
140
|
+
'.spSwLangBtn:disabled{opacity:.5;cursor:default}',
|
|
143
141
|
'.spSwSwitchLabel{white-space:nowrap;font:var(--dsw-font-xxs-12);color:var(--dsw-alias-label-secondary)}',
|
|
144
142
|
'.spSwEmpty{margin:0;padding:24px 0;font:var(--dsw-font-xs-13);color:var(--dsw-alias-label-tertiary);text-align:center}',
|
|
145
143
|
/* 窄屏：开关区落到文字下方 */
|
|
@@ -162,8 +160,11 @@ window.__ModuleLoader__.load({
|
|
|
162
160
|
* 「新表写了一部分、旧表还留着」的中间态，也省掉每技能一次额外往返。
|
|
163
161
|
* op 为 enable 时 unset 路径即恢复继承的默认值。
|
|
164
162
|
*/
|
|
165
|
-
/*
|
|
163
|
+
/* 语言偏好字段：'zh' | 'en' 显式固定；缺失时跟随宿主界面语言（locale active）。 */
|
|
166
164
|
var LANGUAGE_FIELD = 'language';
|
|
165
|
+
/* 目标语言字面量：单按钮显示「点击后变成的语言」，刻意不随宿主词典。 */
|
|
166
|
+
var SP_LANG_ZH = '中文';
|
|
167
|
+
var SP_LANG_EN = 'English';
|
|
167
168
|
|
|
168
169
|
/**
|
|
169
170
|
* 读取当前语言偏好。缺项与非 en 值一律回退中文（与宿主侧 readSwitches 同规则）。
|
|
@@ -228,6 +229,7 @@ window.__ModuleLoader__.load({
|
|
|
228
229
|
var t = props.t;
|
|
229
230
|
var form = props.actions.form;
|
|
230
231
|
var state = props.useSwitches(function (value) { return value; });
|
|
232
|
+
var hostActive = props.useLocaleActive(function (v) { return v && v.preference === 'en' ? 'en' : 'zh'; });
|
|
231
233
|
|
|
232
234
|
var keywordState = React.useState('');
|
|
233
235
|
var keyword = keywordState[0];
|
|
@@ -255,7 +257,8 @@ window.__ModuleLoader__.load({
|
|
|
255
257
|
var lower = keyword.trim().toLowerCase();
|
|
256
258
|
/* 描述取词：按当前语言偏好取对应语言文本，两侧都参与搜索过滤。 */
|
|
257
259
|
var skillText = function (skill) {
|
|
258
|
-
|
|
260
|
+
var effective = language === undefined ? hostActive : language;
|
|
261
|
+
return effective === 'en' && skill.descriptionEn ? skill.descriptionEn : skill.description;
|
|
259
262
|
};
|
|
260
263
|
var shown = lower === ''
|
|
261
264
|
? SKILL_CATALOG
|
|
@@ -278,27 +281,6 @@ window.__ModuleLoader__.load({
|
|
|
278
281
|
h('p', { className: 'spSwDesc' }, skillText(skill)),
|
|
279
282
|
failure ? h('p', { className: 'spSwErr', role: 'alert' }, failure) : null),
|
|
280
283
|
h('div', { className: 'spSwSwitch' },
|
|
281
|
-
h('div', { className: 'spSwLang', role: 'group', 'aria-label': t('langTitle'), title: t('langTitle') },
|
|
282
|
-
h(P.Button, {
|
|
283
|
-
variant: language === 'zh' ? 'solid' : 'ghost',
|
|
284
|
-
size: 'sm',
|
|
285
|
-
disabled: busy,
|
|
286
|
-
'aria-pressed': language === 'zh',
|
|
287
|
-
onClick: function () {
|
|
288
|
-
submit(form, t, ['language'], 'enable', setPending, setFailures,
|
|
289
|
-
[{ op: 'set', path: [LANGUAGE_FIELD], value: 'zh' }]);
|
|
290
|
-
},
|
|
291
|
-
}, t('langZh')),
|
|
292
|
-
h(P.Button, {
|
|
293
|
-
variant: language === 'en' ? 'solid' : 'ghost',
|
|
294
|
-
size: 'sm',
|
|
295
|
-
disabled: busy,
|
|
296
|
-
'aria-pressed': language === 'en',
|
|
297
|
-
onClick: function () {
|
|
298
|
-
submit(form, t, ['language'], 'enable', setPending, setFailures,
|
|
299
|
-
[{ op: 'set', path: [LANGUAGE_FIELD], value: 'en' }]);
|
|
300
|
-
},
|
|
301
|
-
}, t('langEn'))),
|
|
302
284
|
h('span', { className: 'spSwSwitchLabel' }, t('invocable')),
|
|
303
285
|
h(P.Switch, {
|
|
304
286
|
checked: on,
|
|
@@ -314,6 +296,18 @@ window.__ModuleLoader__.load({
|
|
|
314
296
|
return h('div', { className: 'spSw' },
|
|
315
297
|
h('h4', { className: 'spSwTitle' }, t('title')),
|
|
316
298
|
h('p', { className: 'spSwIntro' }, t('intro')),
|
|
299
|
+
h('div', { className: 'spSwLangBar' },
|
|
300
|
+
h('button', {
|
|
301
|
+
className: 'spSwLangBtn',
|
|
302
|
+
type: 'button',
|
|
303
|
+
disabled: !writable,
|
|
304
|
+
title: t('langTitle'),
|
|
305
|
+
onClick: function () {
|
|
306
|
+
var effective = language === undefined ? hostActive : language;
|
|
307
|
+
submit(form, t, ['language'], 'enable', setPending, setFailures,
|
|
308
|
+
[{ op: 'set', path: [LANGUAGE_FIELD], value: effective === 'zh' ? 'en' : 'zh' }]);
|
|
309
|
+
},
|
|
310
|
+
}, (language === undefined ? hostActive : language) === 'zh' ? SP_LANG_EN : SP_LANG_ZH)),
|
|
317
311
|
h('ul', { className: 'spSwMeta' },
|
|
318
312
|
h('li', { className: 'spSwMetaItem' }, t('provider'), h('code', null, PROVIDER_NAME)),
|
|
319
313
|
h('li', { className: 'spSwMetaItem' }, t('rank'), h('code', null, String(PROVIDER_RANK))),
|
|
@@ -381,13 +375,18 @@ window.__ModuleLoader__.load({
|
|
|
381
375
|
|
|
382
376
|
var form = ctx.configForms.get(SETTINGS_NAMESPACE);
|
|
383
377
|
|
|
378
|
+
/* 宿主语言选择器：读 locale 命名空间的 preference（volatile）。
|
|
379
|
+
ConfigForm 自带 subscribe/getSnapshot，渲染器把它包成 useLocaleActive(selector) hook，
|
|
380
|
+
面板侧只做 selector 映射（en -> 'en'，其余 -> 'zh'）。 */
|
|
381
|
+
var localeForm = ctx.configForms.get('locale');
|
|
382
|
+
|
|
384
383
|
ctx.slots.inject('plugins.bundle.config', () =>
|
|
385
384
|
ctx.slots.register(
|
|
386
385
|
{
|
|
387
386
|
name: 'plugins.bundle.config',
|
|
388
387
|
key: PACKAGE_NAME,
|
|
389
388
|
locale: NS,
|
|
390
|
-
inject: () => ({ hooks: { switches: form }, actions: { form } }),
|
|
389
|
+
inject: () => ({ hooks: { switches: form, localeActive: localeForm }, actions: { form } }),
|
|
391
390
|
},
|
|
392
391
|
SkillSwitchPanel,
|
|
393
392
|
),
|
package/lib/superpowers.d.ts
CHANGED
|
@@ -26,8 +26,8 @@ export declare const Config: Schema<Config>;
|
|
|
26
26
|
export interface Config {
|
|
27
27
|
providerName: string;
|
|
28
28
|
skillDir?: string;
|
|
29
|
-
/**
|
|
30
|
-
language: Volatile<'zh' | 'en'>;
|
|
29
|
+
/** 技能描述显示语言偏好：'zh'/'en' 显式固定；缺失（undefined）时跟随宿主界面语言。 */
|
|
30
|
+
language: Volatile<'zh' | 'en' | undefined>;
|
|
31
31
|
/** 唯一的开关写入目标：键为技能名，值为 true 时模型与用户两侧同时关闭 */
|
|
32
32
|
disabled: Volatile<Record<string, boolean>>;
|
|
33
33
|
/** 已废弃的历史禁言表，面板不再写入，只在迁移批里被 unset 清空 */
|
package/lib/superpowers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"superpowers.d.ts","sourceRoot":"","sources":["../src/superpowers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAQ5D,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAI7C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAC3F,OAAO,EAAE,aAAa,EAAE,KAAK,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAQ1E,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,MAAM;QACd;;;;WAIG;QACH,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;KACtE;CACF;AAMD,eAAO,MAAM,MAAM,EAmC0C,MAAM,CAAC,MAAM,CAAC,CAAA;AAa3E,MAAM,WAAW,MAAM;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,
|
|
1
|
+
{"version":3,"file":"superpowers.d.ts","sourceRoot":"","sources":["../src/superpowers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAQ5D,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAI7C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAC3F,OAAO,EAAE,aAAa,EAAE,KAAK,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAQ1E,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,MAAM;QACd;;;;WAIG;QACH,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;KACtE;CACF;AAMD,eAAO,MAAM,MAAM,EAmC0C,MAAM,CAAC,MAAM,CAAC,CAAA;AAa3E,MAAM,WAAW,MAAM;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,wDAAwD;IACxD,QAAQ,EAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IAC3C,2CAA2C;IAC3C,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAC3C,wCAAwC;IACxC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IAChD,kCAAkC;IAClC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CAChD;AAMD,eAAO,MAAM,IAAI,gBAAgB,CAAA;AACjC,eAAO,MAAM,MAAM,qBAAsB,CAAA;AAyGzC,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAmCxD;;;;;;;;;AAED,wBAA2E"}
|
package/lib/superpowers.js
CHANGED
|
@@ -35,7 +35,7 @@ export const Config = Schema.object({
|
|
|
35
35
|
* volatile 字段：面板可经 ConfigForm 通道写入，改后随 loader/volatile-update 事件
|
|
36
36
|
* 让 Provider 在下轮 list/get 读到新语言。
|
|
37
37
|
*/
|
|
38
|
-
language: Schema.union(['zh', 'en']).
|
|
38
|
+
language: Schema.union(['zh', 'en']).required(false).volatile(),
|
|
39
39
|
/**
|
|
40
40
|
* 已废弃的模型侧禁言表，面板不再写入，只在迁移批里被 unset 清空。
|
|
41
41
|
*
|
|
@@ -88,6 +88,7 @@ class SuperpowersProvider {
|
|
|
88
88
|
ctx;
|
|
89
89
|
control;
|
|
90
90
|
currentSwitches;
|
|
91
|
+
hostLanguageCache;
|
|
91
92
|
constructor(ctx, control, config) {
|
|
92
93
|
assertNotRuntimeProvider(config.providerName);
|
|
93
94
|
this.ctx = ctx;
|
|
@@ -98,6 +99,28 @@ class SuperpowersProvider {
|
|
|
98
99
|
// 每次调用重新解包 volatile 引用，保证开关在运行中被改后立即可见
|
|
99
100
|
this.currentSwitches = () => readSwitches(config);
|
|
100
101
|
}
|
|
102
|
+
/**
|
|
103
|
+
* 宿主界面语言：读 dsh-settings 的 locale 条目 preference（volatile）。
|
|
104
|
+
* settings 服务缺失（端到端 mock、纯 Registry 上下文）或 preference 缺省时返回 undefined，
|
|
105
|
+
* 由调用方回退到 zh。结果缓存，locale preference 变更经 loader/volatile-update 清空。
|
|
106
|
+
*/
|
|
107
|
+
hostLanguage() {
|
|
108
|
+
if (this.hostLanguageCache !== undefined)
|
|
109
|
+
return this.hostLanguageCache;
|
|
110
|
+
let locale;
|
|
111
|
+
try {
|
|
112
|
+
const forms = (this.ctx.get('settings')?.describe() ?? []);
|
|
113
|
+
const entry = forms.find((d) => d.ns === 'locale');
|
|
114
|
+
const preference = entry?.value?.preference;
|
|
115
|
+
locale = preference === 'en' ? 'en' : preference === 'zh' ? 'zh' : undefined;
|
|
116
|
+
}
|
|
117
|
+
catch {
|
|
118
|
+
locale = undefined;
|
|
119
|
+
}
|
|
120
|
+
// ponytail: 结果缓存 + volatile-update 失效；describe 每次全量扫描，缓存避免每轮 list 重扫
|
|
121
|
+
this.hostLanguageCache = locale;
|
|
122
|
+
return locale;
|
|
123
|
+
}
|
|
101
124
|
/**
|
|
102
125
|
* 让宿主注册表丢弃本 provider 的编目缓存并广播 skills/change，
|
|
103
126
|
* 同时让本包自己的候选快照重算。缺任一方都会导致开关显示已更新而模型侧目录不变。
|
|
@@ -105,13 +128,14 @@ class SuperpowersProvider {
|
|
|
105
128
|
invalidate() {
|
|
106
129
|
this.control.invalidate();
|
|
107
130
|
this.catalog.invalidate();
|
|
131
|
+
this.hostLanguageCache = undefined;
|
|
108
132
|
}
|
|
109
133
|
async list(options) {
|
|
110
134
|
const switches = this.currentSwitches();
|
|
111
135
|
const candidates = await this.catalog.listCandidates(this.name, SUPERPOWERS_RANK, {
|
|
112
136
|
signal: options.signal,
|
|
113
137
|
logger: this.ctx.logger,
|
|
114
|
-
language: switches.language,
|
|
138
|
+
language: switches.language ?? this.hostLanguage(),
|
|
115
139
|
});
|
|
116
140
|
return candidates.map((candidate) => applySwitches(candidate, switches));
|
|
117
141
|
}
|
|
@@ -119,7 +143,7 @@ class SuperpowersProvider {
|
|
|
119
143
|
const definition = await this.catalog.getDefinition(candidate, this.name, {
|
|
120
144
|
signal: options.signal,
|
|
121
145
|
logger: this.ctx.logger,
|
|
122
|
-
language: this.currentSwitches().language,
|
|
146
|
+
language: this.currentSwitches().language ?? this.hostLanguage(),
|
|
123
147
|
});
|
|
124
148
|
// 加载路径同样套用：skill 工具在 get 之后二次校验 isModelInvocable，
|
|
125
149
|
// 只改 list 的候选会让模型目录消失但工具调用仍成功，语义撕裂。
|
package/lib/superpowers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"superpowers.js","sourceRoot":"","sources":["../src/superpowers.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AASxC,OAAO,MAAM,MAAM,0BAA0B,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAsB,MAAM,eAAe,CAAA;AAE/E,8BAA8B;AAC9B,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAA4B,MAAM,cAAc,CAAA;AAC3F,OAAO,EAAE,aAAa,EAAgC,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAmB1E,8EAA8E;AAC9E,sCAAsC;AACtC,8EAA8E;AAE9E,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,kEAAkE;IAClE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;IACpD,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;IACzB;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC9D;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"superpowers.js","sourceRoot":"","sources":["../src/superpowers.ts"],"names":[],"mappings":"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"}
|
package/lib/switches.d.ts
CHANGED
|
@@ -24,8 +24,8 @@ import type { SkillInvocationPolicy } from '@deepseek-ai/dsh-skill';
|
|
|
24
24
|
export interface SkillSwitches {
|
|
25
25
|
/** 关闭的技能名集合，映射为 modelInvocable = userInvocable = false。 */
|
|
26
26
|
disabled: Record<string, boolean>;
|
|
27
|
-
/**
|
|
28
|
-
language: 'zh' | 'en';
|
|
27
|
+
/** 技能描述显示语言偏好：'zh'/'en' 显式固定；undefined 表示跟随宿主界面语言。 */
|
|
28
|
+
language: 'zh' | 'en' | undefined;
|
|
29
29
|
}
|
|
30
30
|
export declare function readSwitches(config: unknown): SkillSwitches;
|
|
31
31
|
/**
|
package/lib/switches.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switches.d.ts","sourceRoot":"","sources":["../src/switches.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAEnE,uCAAuC;AACvC,MAAM,WAAW,aAAa;IAC5B,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,
|
|
1
|
+
{"version":3,"file":"switches.d.ts","sourceRoot":"","sources":["../src/switches.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAEnE,uCAAuC;AACvC,MAAM,WAAW,aAAa;IAC5B,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,sDAAsD;IACtD,QAAQ,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,CAAA;CAClC;AA8BD,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,aAAa,CAS3D;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,qBAAqB,CAAA;CAAE,EACzF,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,aAAa,GACtB,CAAC,CAMH;AAiBD;;GAEG;AACH,eAAO,MAAM,aAAa;IACxB;;;;OAIG;gBACe,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CA4E3E,CAAA"}
|
package/lib/switches.js
CHANGED
|
@@ -32,7 +32,11 @@
|
|
|
32
32
|
function readLanguage(config) {
|
|
33
33
|
const source = (config ?? {});
|
|
34
34
|
const raw = unwrapValue(source['language']);
|
|
35
|
-
|
|
35
|
+
if (raw === 'en')
|
|
36
|
+
return 'en';
|
|
37
|
+
if (raw === 'zh')
|
|
38
|
+
return 'zh';
|
|
39
|
+
return undefined;
|
|
36
40
|
}
|
|
37
41
|
/** 解包单值 volatile 字段。 */
|
|
38
42
|
function unwrapValue(value) {
|
|
@@ -133,10 +137,10 @@ export const SkillSwitches = {
|
|
|
133
137
|
throw new Error('disabled 非空却仍读到了旧表的键');
|
|
134
138
|
}
|
|
135
139
|
});
|
|
136
|
-
await run('
|
|
140
|
+
await run('默认语言为 undefined（跟随宿主）', () => {
|
|
137
141
|
const out = readSwitches({});
|
|
138
|
-
if (out.language !==
|
|
139
|
-
throw new Error('
|
|
142
|
+
if (out.language !== undefined)
|
|
143
|
+
throw new Error('默认语言应为 undefined: ' + out.language);
|
|
140
144
|
});
|
|
141
145
|
await run('language=en 时正确返回', () => {
|
|
142
146
|
const out = readSwitches({ language: 'en' });
|
package/lib/switches.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switches.js","sourceRoot":"","sources":["../src/switches.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAiBH;;;;;;;;;GASG;AACH,SAAS,YAAY,CAAC,MAAe;IACnC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,EAAE,CAA4B,CAAA;IACxD,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;IAC3C,
|
|
1
|
+
{"version":3,"file":"switches.js","sourceRoot":"","sources":["../src/switches.ts"],"names":[],"mappings":"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"}
|