@goodandready/dsh-dsml-artifact-guard 0.2.8 → 0.2.10

package/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [0.2.10] - 2026-10-07
+
+### Removed
+- **Dead `settings.register` Fallback**: removed dead legacy registration path in `apply()` and eliminated potential un-unwrapped volatile box leak on host settings delivery (#54, #55, #59).
+- **Dead `settings.plugin.item` Slot**: removed dead slot registration in client bundle, routing exclusively through active `plugins.row.config` and `plugins.item` seats (#59).
+
+### Optimized
+- **Single-Pass Config Unwrapping**: optimized `unwrapConfig` error fallback to evaluate raw plain config in a single pass instead of three recursive walks (#56).
+
+## [0.2.9] - 2026-10-07
+
+### Fixed
+- **Settings Card Locale Snapshot Extraction**: safely extract active locale string from `LocaleSnapshot` object (`snap?.active`) returned by `ctx.locale.getLocale()` / `getSnapshot()`, eliminating fatal `TypeError: rawLang.startsWith is not a function` during settings card mount (#50, #57).
+- **Russian Language Registration & Ownership**: removed embedded `ru` dictionary from the plugin bundle to prevent `(namespace, 'ru')` duplicate registration collisions in core; delegate Russian translations to `dsh-russian-lang` via `props.t` and `ctx.locale.bind(NS)` (#58).
+- **Volatile Per-Field Settings Schema**: marked configuration fields volatile individually, enabling DSH to discover and generate settings form controls (#52).
+
 ## [0.2.8] - 2026-09-26
 
 ### Added

package/README.md

@@ -119,8 +119,8 @@ The guard retains a minimal 96-byte window until the next chunk or `finish` even
 * **`disabled`**: Bypasses processing entirely.
 
 ### 5. Native Web UI Settings Card
-Registered directly in the DeepSeek Harness `settings.plugin.item` slot (`lib/client.js`):
-* **Reactive Configuration**: Adjust `mode`, `providerId`, and `modelId` on the fly without restarting the harness, powered by reactive `scope.watch`.
+Registered directly in DeepSeek Harness `plugins.row.config` and `plugins.item` slots (`lib/client.js`):
+* **Reactive Configuration**: Adjust `mode`, `providers`, and `modelPattern` on the fly without restarting the harness.
 * **Snapshot State Awareness**: Gracefully handles snapshot loading, ready, and unavailable states.
 * **Protection Bypass Warning**: Displays a prominent `OFF` badge and warning banner when the guard is set to `disabled`.
 

package/lib/client.js

@@ -91,38 +91,6 @@ window.__ModuleLoader__.load({
       saveError: '保存失败: {msg}',
     };
 
-    const ru = {
-      title: 'Защита от артефактов DSML',
-      sub: 'Фильтрация утекших замыкающих тегов протокола DSML из потоков моделей DeepSeek',
-      version: 'Версия',
-      updateChecking: 'Проверка обновлений…',
-      updateAvailable: 'Доступно обновление: v{v}',
-      upToDate: 'Установлена последняя версия',
-      updateNow: 'Обновить сейчас',
-      updating: 'Обновление…',
-      updateSuccess: 'Обновлено до v{v}. Перезапустите службу DSH для применения изменений.',
-      updateFailed: 'Ошибка обновления: {msg}',
-      checkUpdateFailed: 'Не удалось проверить обновления',
-      mode: 'Режим работы',
-      modeSanitize: 'Санация (вырезать утекшие замыкающие теги)',
-      modeAudit: 'Аудит (только логировать предупреждения в журнал)',
-      modeDisabled: 'Отключено (пропускать все потоки без изменений)',
-      modelPattern: 'Шаблон модели (RegExp)',
-      modelPatternHint: 'Регулярное выражение без учёта регистра для ID модели (по умолчанию: deepseek).',
-      providers: 'Целевые провайдеры (опционально)',
-      providersPlaceholder: 'все провайдеры (через запятую, напр. commandcode, deepseek-official)',
-      providersHint: 'Список ID провайдеров через запятую. Оставьте пустым для защиты всех провайдеров.',
-      legacyDetected: 'Обнаружены устаревшие параметры providerId / modelId (действуют как дополнительное правило).',
-      legacyClear: 'Очистить устаревшие поля',
-      providerId: 'Целевой провайдер (устаревшее)',
-      modelId: 'Целевая модель (устаревшее)',
-      disabledNotice: '⚠️ Защита отключена. Замыкающие теги DSML будут попадать в интерфейс чата.',
-      statusUnavailable: 'Служба настроек недоступна.',
-      saving: 'Сохранение…',
-      ready: 'Сохранить настройки',
-      saved: 'Настройки сохранены',
-      saveError: 'Ошибка сохранения: {msg}',
-    };
 
     const DEFAULTS = {
       mode: 'sanitize',
@@ -164,11 +132,38 @@ window.__ModuleLoader__.load({
       }
       const scope = scopeRef.current;
 
-      const rawLang = ((typeof _ctx?.locale?.getLocale === 'function' ? _ctx.locale.getLocale() : null) || (typeof navigator !== 'undefined' && navigator.language) || 'en');
-      const currentLang = rawLang.startsWith('ru') ? 'ru' : (rawLang.startsWith('zh') ? 'zh' : 'en');
-      const dict = currentLang === 'ru' ? ru : (currentLang === 'zh' ? zh : en);
+      const rawLang = (() => {
+        try {
+          const snap = typeof _ctx?.locale?.getLocale === 'function'
+            ? _ctx.locale.getLocale()
+            : (typeof _ctx?.locale?.getSnapshot === 'function' ? _ctx.locale.getSnapshot() : null);
+          if (typeof snap?.active === 'string' && snap.active) return snap.active;
+          if (typeof snap === 'string' && snap) return snap;
+        } catch (err) {
+          /* Fallback if locale service getter fails */
+        }
+        if (typeof navigator !== 'undefined' && typeof navigator.language === 'string' && navigator.language) {
+          return navigator.language;
+        }
+        return 'en';
+      })();
+      const currentLang = rawLang.startsWith('zh') ? 'zh' : 'en';
+      const dict = currentLang === 'zh' ? zh : en;
+
+      const tBound = React.useMemo(() => {
+        if (typeof t === 'function') return t;
+        if (typeof _ctx?.locale?.bind === 'function') {
+          try {
+            return _ctx.locale.bind(NS);
+          } catch (err) {
+            /* Locale bind fallback */
+          }
+        }
+        return null;
+      }, [t, _ctx]);
+
       const tt = (k, params) => {
-        let str = (typeof t === 'function' ? t(k) : null) || dict[k] || en[k] || k;
+        let str = (typeof tBound === 'function' ? tBound(k) : null) || dict[k] || en[k] || k;
         if (params && typeof params === 'object') {
           for (const [pk, pv] of Object.entries(params)) {
             str = str.replace(new RegExp('\\{' + pk + '\\}', 'g'), String(pv));
@@ -675,7 +670,7 @@ window.__ModuleLoader__.load({
       if (typeof ctx.locale?.register === 'function') {
         const registerLocale = () => {
           try {
-            return ctx.locale.register(NS, { en, zh, ru });
+            return ctx.locale.register(NS, { en, zh });
           } catch (err) {
             /* Locale namespace already registered or unavailable */
           }
@@ -712,9 +707,8 @@ window.__ModuleLoader__.load({
         }
       }
 
-      // Newest seat first: the Plugins page renders a row's own configuration
-      // page from 'plugins.row.config'. Keep 'settings.plugin.item' below as the
-      // fallback for cores that still render the old card slot.
+      // Plugins page row configuration: the Plugins page renders a row's own configuration
+      // page from 'plugins.row.config'.
       registerSlotWhenReady('plugins.row.config', () =>
         ctx.slots.register(
           {
@@ -747,18 +741,6 @@ window.__ModuleLoader__.load({
         )
       );
 
-      registerSlotWhenReady('settings.plugin.item', () =>
-        ctx.slots.register(
-          {
-            name: 'settings.plugin.item',
-            key: NS,
-            order: 95,
-            locale: NS,
-            inject: () => ({ ctx }),
-          },
-          (props) => React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx })
-        )
-      );
     };
 
     return module.exports;

package/lib/index.js

@@ -9,17 +9,24 @@ const KEEP = 96;
 export const name = '@goodandready/dsh-dsml-artifact-guard';
 export const inject = ['llm', 'settings', 'webServer'];
 
-const rawConfig = Schema.object({
-  mode: Schema.string().default('sanitize'),
-  modelPattern: Schema.string().default('deepseek'),
-  providers: Schema.array(Schema.string()).default([]),
-  providerId: Schema.string(),
-  modelId: Schema.string(),
+// DSH builds a namespace's settings form from the PER-FIELD volatile markers of the
+// entry schema. Wrapping the object in .volatile() produced none of them, so no form was
+// ever generated. Mark each user-editable field instead.
+export const Config = Schema.object({
+  mode: Schema.string().default('sanitize').volatile().description('How to handle detected artifact markup'),
+  modelPattern: Schema.string().default('deepseek').volatile().description('Model name substring this plugin guards'),
+  providers: Schema.array(Schema.string()).default([]).volatile().description('Restrict guarding to these providers; empty means all'),
+  providerId: Schema.string().volatile().description('Legacy exact provider id match'),
+  modelId: Schema.string().volatile().description('Legacy exact model id match'),
 });
 
-export const Config = typeof rawConfig.volatile === 'function'
-  ? rawConfig.volatile()
-  : rawConfig.extra('volatile', true);
+// Unwrap Volatile boxes before any caller reads a value.
+export function plainConfig(value) {
+  if (value === null || typeof value !== 'object') return value;
+  if (Array.isArray(value)) return value.map(plainConfig);
+  if (typeof value.get === 'function') return plainConfig(value.get());
+  return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, plainConfig(v)]));
+}
 
 export function matchesScope(o, c) {
   if (!c || c.mode === 'disabled') return false;
@@ -139,30 +146,28 @@ export async function* sanitizeDsmlArtifacts(s, { mode = 'sanitize', onArtifact
 
 export function unwrapConfig(conf) {
   if (!conf) return {};
+  // A Volatile reference (any field is now volatile) resolves through .get().
   if (typeof conf.get === 'function') {
     try {
-      const val = conf.get();
-      return (val && typeof val === 'object') ? val : {};
+      const inner = conf.get();
+      const plain = plainConfig(inner);
+      return plain && typeof plain === 'object' ? plain : {};
     } catch (err) {
-      /* Volatile getter failed */
+      /* Getter threw; return safe empty object fallback */
       return {};
     }
   }
   try {
-    const res = Config(conf);
-    if (res && typeof res.get === 'function') {
-      const val = res.get();
-      return (val && typeof val === 'object') ? val : {};
-    }
-    return (res && typeof res === 'object') ? res : {};
+    // Config() returns volatile boxes now, so unwrap them; a plain input stays plain.
+    return plainConfig(Config(conf));
   } catch (err) {
-    /* Config validation fallback to object */
-    return (conf && typeof conf === 'object') ? conf : {};
+    /* Schema validation threw; fallback to single-pass unwrapped raw config */
+    const plain = plainConfig(conf);
+    return plain && typeof plain === 'object' ? plain : {};
   }
 }
 
 export function apply(ctx, initialConfig = {}) {
-  const NS = '@goodandready/dsh-dsml-artifact-guard';
   let activeConfig = unwrapConfig(initialConfig);
 
   let getConfig = () => (typeof initialConfig?.get === 'function' ? unwrapConfig(initialConfig) : activeConfig);
@@ -177,25 +182,7 @@ export function apply(ctx, initialConfig = {}) {
   // DSH 0.1.7 SettingsForms: suppress generic duplicate form, custom card mounts in plugins seat
   if (ctx.settings && typeof ctx.settings.configure === 'function') {
     ctx.effect(() => ctx.settings.configure({ auto: false }), 'dsh-dsml-artifact-guard: settings policy');
-  } else if (typeof ctx.inject === 'function') {
-    // Legacy settings service fallback
-    ctx.inject(['settings'], (sctx) => {
-      if (typeof sctx.settings?.register === 'function') {
-        try {
-          const scope = sctx.settings.register(NS, Config, { base: initialConfig });
-          getConfig = () => Config(scope?.get() ?? initialConfig) ?? {};
-          if (typeof scope?.watch === 'function') {
-            sctx.effect(() => scope.watch(() => {
-              activeConfig = getConfig();
-            }));
-          }
-        } catch (err) {
-          /* Legacy settings service registration unavailable */
-        }
-      }
-    });
   }
-
   // Register one-click updater endpoint
   if (ctx.webServer && typeof ctx.webServer.register === 'function') {
     const mountUpdater = () => registerPluginUpdater(ctx, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-dsml-artifact-guard",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Sanitizes leaked DeepSeek DSML closing tags from model text streams",
   "type": "module",
   "main": "lib/index.js",
@@ -33,12 +33,15 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/schemastery": "^3.18.4"
   },
   "exports": {
     ".": "./lib/index.js",
     "./client": "./lib/client.js",
     "./cordis.patch.yml": "./cordis.patch.yml",
     "./package.json": "./package.json"
+  },
+  "devDependencies": {
+    "@deepseek-ai/schemastery": "^3.18.4"
   }
 }