@huanlin/dsh-plugin-interpreters 0.2.2 → 0.3.0

package/lib/client.js

@@ -38,69 +38,80 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
-// ../dsh/node_modules/.pnpm/use-sync-external-store@1.2.0_react@18.3.1/node_modules/use-sync-external-store/cjs/use-sync-external-store-with-selector.production.min.js
-var require_use_sync_external_store_with_selector_production_min = __commonJS({
-  "../dsh/node_modules/.pnpm/use-sync-external-store@1.2.0_react@18.3.1/node_modules/use-sync-external-store/cjs/use-sync-external-store-with-selector.production.min.js"(exports) {
+// node_modules/.pnpm/use-sync-external-store@1.6.0/node_modules/use-sync-external-store/cjs/use-sync-external-store-with-selector.production.js
+var require_use_sync_external_store_with_selector_production = __commonJS({
+  "node_modules/.pnpm/use-sync-external-store@1.6.0/node_modules/use-sync-external-store/cjs/use-sync-external-store-with-selector.production.js"(exports) {
     "use strict";
-    var g = require("react");
-    function n(a, b) {
-      return a === b && (0 !== a || 1 / a === 1 / b) || a !== a && b !== b;
+    var React = require("react");
+    function is(x, y) {
+      return x === y && (0 !== x || 1 / x === 1 / y) || x !== x && y !== y;
     }
-    var p = "function" === typeof Object.is ? Object.is : n;
-    var q = g.useSyncExternalStore;
-    var r = g.useRef;
-    var t = g.useEffect;
-    var u = g.useMemo;
-    var v = g.useDebugValue;
-    exports.useSyncExternalStoreWithSelector = function(a, b, e, l, h) {
-      var c = r(null);
-      if (null === c.current) {
-        var f = { hasValue: false, value: null };
-        c.current = f;
-      } else f = c.current;
-      c = u(function() {
-        function a2(a3) {
-          if (!c2) {
-            c2 = true;
-            d2 = a3;
-            a3 = l(a3);
-            if (void 0 !== h && f.hasValue) {
-              var b2 = f.value;
-              if (h(b2, a3)) return k = b2;
+    var objectIs = "function" === typeof Object.is ? Object.is : is;
+    var useSyncExternalStore = React.useSyncExternalStore;
+    var useRef = React.useRef;
+    var useEffect = React.useEffect;
+    var useMemo = React.useMemo;
+    var useDebugValue = React.useDebugValue;
+    exports.useSyncExternalStoreWithSelector = function(subscribe, getSnapshot, getServerSnapshot, selector, isEqual) {
+      var instRef = useRef(null);
+      if (null === instRef.current) {
+        var inst = { hasValue: false, value: null };
+        instRef.current = inst;
+      } else inst = instRef.current;
+      instRef = useMemo(
+        function() {
+          function memoizedSelector(nextSnapshot) {
+            if (!hasMemo) {
+              hasMemo = true;
+              memoizedSnapshot = nextSnapshot;
+              nextSnapshot = selector(nextSnapshot);
+              if (void 0 !== isEqual && inst.hasValue) {
+                var currentSelection = inst.value;
+                if (isEqual(currentSelection, nextSnapshot))
+                  return memoizedSelection = currentSelection;
+              }
+              return memoizedSelection = nextSnapshot;
             }
-            return k = a3;
+            currentSelection = memoizedSelection;
+            if (objectIs(memoizedSnapshot, nextSnapshot)) return currentSelection;
+            var nextSelection = selector(nextSnapshot);
+            if (void 0 !== isEqual && isEqual(currentSelection, nextSelection))
+              return memoizedSnapshot = nextSnapshot, currentSelection;
+            memoizedSnapshot = nextSnapshot;
+            return memoizedSelection = nextSelection;
           }
-          b2 = k;
-          if (p(d2, a3)) return b2;
-          var e2 = l(a3);
-          if (void 0 !== h && h(b2, e2)) return b2;
-          d2 = a3;
-          return k = e2;
-        }
-        var c2 = false, d2, k, m = void 0 === e ? null : e;
-        return [function() {
-          return a2(b());
-        }, null === m ? void 0 : function() {
-          return a2(m());
-        }];
-      }, [b, e, l, h]);
-      var d = q(a, c[0], c[1]);
-      t(function() {
-        f.hasValue = true;
-        f.value = d;
-      }, [d]);
-      v(d);
-      return d;
+          var hasMemo = false, memoizedSnapshot, memoizedSelection, maybeGetServerSnapshot = void 0 === getServerSnapshot ? null : getServerSnapshot;
+          return [
+            function() {
+              return memoizedSelector(getSnapshot());
+            },
+            null === maybeGetServerSnapshot ? void 0 : function() {
+              return memoizedSelector(maybeGetServerSnapshot());
+            }
+          ];
+        },
+        [getSnapshot, getServerSnapshot, selector, isEqual]
+      );
+      var value = useSyncExternalStore(subscribe, instRef[0], instRef[1]);
+      useEffect(
+        function() {
+          inst.hasValue = true;
+          inst.value = value;
+        },
+        [value]
+      );
+      useDebugValue(value);
+      return value;
     };
   }
 });
 
-// ../dsh/node_modules/.pnpm/use-sync-external-store@1.2.0_react@18.3.1/node_modules/use-sync-external-store/with-selector.js
+// node_modules/.pnpm/use-sync-external-store@1.6.0/node_modules/use-sync-external-store/with-selector.js
 var require_with_selector = __commonJS({
-  "../dsh/node_modules/.pnpm/use-sync-external-store@1.2.0_react@18.3.1/node_modules/use-sync-external-store/with-selector.js"(exports, module2) {
+  "node_modules/.pnpm/use-sync-external-store@1.6.0/node_modules/use-sync-external-store/with-selector.js"(exports, module2) {
     "use strict";
     if (true) {
-      module2.exports = require_use_sync_external_store_with_selector_production_min();
+      module2.exports = require_use_sync_external_store_with_selector_production();
     } else {
       module2.exports = null;
     }
@@ -130,7 +141,7 @@ var import_react = require("react");
 var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 
 // src/client/store.ts
-var import_client = require("@deepseek-ai/dsh-client-runtime/client");
+var import_dsh_client_store = require("@deepseek-ai/dsh-client-store");
 function initialState() {
   return {
     status: "idle",
@@ -155,7 +166,7 @@ var InterpretersCardController = class {
     __publicField(this, "loaded", false);
     __publicField(this, "generation", 0);
     __publicField(this, "staged", /* @__PURE__ */ new Map());
-    this.store = (0, import_client.createSnapshotStore)(initialState());
+    this.store = (0, import_dsh_client_store.createSnapshotStore)(initialState());
     void this.load();
   }
   /**
@@ -905,13 +916,23 @@ var dicts = {
 var inject = ["slots", "locale", "connection"];
 function apply(ctx) {
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), "dsh-interpreters: dictionaries");
-  const betterLocale = ctx.get("betterLocale");
-  if (betterLocale) {
-    ctx.effect(
-      () => betterLocale.register(NS, dicts),
-      "interpreters: better-locale override dicts"
-    );
-  }
+  ctx.effect(() => {
+    let dispose;
+    const sync = () => {
+      dispose?.();
+      dispose = void 0;
+      const store = ctx.get("betterLocale");
+      if (store !== void 0) {
+        dispose = store.register(NS, dicts);
+      }
+    };
+    sync();
+    const unsubscribe = ctx.locale.subscribe(sync);
+    return () => {
+      unsubscribe();
+      dispose?.();
+    };
+  }, "interpreters: better-locale override dicts");
   const controller = new InterpretersCardController();
   const useSnapshot = bindSnapshotSelector(controller.store);
   ctx.effect(() => {
@@ -940,12 +961,12 @@ function apply(ctx) {
 }
 /*! Bundled license information:
 
-use-sync-external-store/cjs/use-sync-external-store-with-selector.production.min.js:
+use-sync-external-store/cjs/use-sync-external-store-with-selector.production.js:
   (**
    * @license React
-   * use-sync-external-store-with-selector.production.min.js
+   * use-sync-external-store-with-selector.production.js
    *
-   * Copyright (c) Facebook, Inc. and its affiliates.
+   * Copyright (c) Meta Platforms, Inc. and affiliates.
    *
    * This source code is licensed under the MIT license found in the
    * LICENSE file in the root directory of this source tree.

package/lib/settings.js

@@ -16,10 +16,9 @@
  *
  * @module dsh-interpreters/settings
  */
-import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { Config } from './config.js';
 /** Settings namespace under which interpreter paths persist. */
-export const SETTINGS_NAMESPACE = settingsNamespace('interpreters');
+export const SETTINGS_NAMESPACE = 'interpreters';
 /**
  * Mirror of the dsh-settings internal `isUnloading` guard. The cordis const
  * enum for fiber state is erased at compile time, so the literal states are

package/lib/types/client/bindSnapshotSelector.js

@@ -1,7 +1,7 @@
 /**
  * uSES bridge: turns any bare observable snapshot source into a typed
  * selector hook. Inlined from dsh-client-ui-renderer/src/client/bind.ts
- * (shell-only glue; business plugins depend on runtime + ui-slots only).
+ * (shell-only glue; business plugins depend on client-store + ui-slots only).
  *
  * @module dsh-interpreters/client/bindSnapshotSelector
  */

package/lib/types/client/index.d.ts

@@ -15,7 +15,7 @@
  *
  * @module @huanlin/dsh-plugin-interpreters/client
  */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
 import { type InterpretersKey } from './locales.ts';
 export type { InterpretersCardInjected, InterpretersCardProps } from './InterpretersCard.tsx';
 export type { InterpretersKey } from './locales.ts';

package/lib/types/client/index.js

@@ -32,21 +32,35 @@ export const inject = ['slots', 'locale', 'connection'];
  */
 export function apply(ctx) {
     ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'dsh-interpreters: dictionaries');
-    // Opt-in third-language overrides through @huanlin/dsh-plugin-better-locale:
-    // when installed it publishes `ctx.betterLocale` (the override store) and
-    // patches LocaleRuntime.lookup to consult it. `ctx.get` is a non-reactive
-    // read of an optional service, so an absent plugin is a plain no-op.
-    const betterLocale = ctx.get('betterLocale');
-    if (betterLocale) {
-        ctx.effect(() => betterLocale.register(NS, dicts), 'interpreters: better-locale override dicts');
-    }
+    // Opt-in third-language overrides through @huanlin/dsh-plugin-better-locale.
+    // Activation-order-safe: ctx.get('betterLocale') is a non-reactive read, so
+    // if better-locale activates after us, the initial read returns undefined.
+    // We subscribe to ctx.locale — better-locale bumps its revision on activation
+    // (persisted override) and on every override switch — and re-check on each bump.
+    ctx.effect(() => {
+        let dispose;
+        const sync = () => {
+            dispose?.();
+            dispose = undefined;
+            const store = ctx.get('betterLocale');
+            if (store !== undefined) {
+                dispose = store.register(NS, dicts);
+            }
+        };
+        sync();
+        const unsubscribe = ctx.locale.subscribe(sync);
+        return () => {
+            unsubscribe();
+            dispose?.();
+        };
+    }, 'interpreters: better-locale override dicts');
     // The store reads/writes the interpreters config over the plugin's
     // self-hosted HTTP route (`/interpreters/api/get` + `/interpreters/api/set`).
     const controller = new InterpretersCardController();
     const useSnapshot = bindSnapshotSelector(controller.store);
     // Pushed invalidations converge the open surface without polling. The dsh
-    // snapshot removed the `settings/changed` host passthrough from the client
-    // runtime Events vocabulary, so convergence rides `connection/reset` — a
+    // client Events vocabulary has no `settings/changed` host passthrough, so
+    // convergence rides `connection/reset` — a
     // connection reset invalidates the whole client state. A burst of resets
     // coalesces into a single refetch via the microtask debounce, and
     // `refreshIfLoaded` keeps an unopened card idle.

package/lib/types/client/store.d.ts

@@ -12,7 +12,7 @@
  *
  * @module dsh-interpreters/client/store
  */
-import { type SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
+import { type SnapshotStore } from '@deepseek-ai/dsh-client-store';
 /** The persisted shape of the `interpreters` namespace. */
 export interface InterpretersSettings {
     pythonPath?: string;

package/lib/types/client/store.js

@@ -12,7 +12,7 @@
  *
  * @module dsh-interpreters/client/store
  */
-import { createSnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
+import { createSnapshotStore } from '@deepseek-ai/dsh-client-store';
 /** Initial empty state. */
 function initialState() {
     return {

package/lib/types/gateway.d.ts

@@ -20,7 +20,7 @@
  * @module dsh-interpreters/gateway
  */
 import type { Context } from '@deepseek-ai/cordis';
-import type { Settings } from '@deepseek-ai/dsh-settings';
+import type { SettingsProvider } from '@deepseek-ai/dsh-settings';
 import { type Config as ConfigType, type ResolvedConfig } from './config.js';
 import { type InterpretersSettingsBridge } from './settings.js';
 /** Wire view returned by both `get` and `set`: the fully-resolved config. */
@@ -49,7 +49,7 @@ export declare function registerHttpGateway(ctx: Context, bridge: InterpretersSe
  * @returns the new resolved config view.
  * @throws when the settings service is unavailable.
  */
-export declare function handleSet(body: unknown, settings: Settings | undefined, bridge: InterpretersSettingsBridge): Promise<InterpretersConfigView>;
+export declare function handleSet(body: unknown, settings: SettingsProvider | undefined, bridge: InterpretersSettingsBridge): Promise<InterpretersConfigView>;
 /**
  * Extract and validate the patch from the request body.
  *

package/lib/types/settings.d.ts

@@ -19,7 +19,7 @@
 import type { Context } from '@deepseek-ai/cordis';
 import { type Config as ConfigType } from './config.js';
 /** Settings namespace under which interpreter paths persist. */
-export declare const SETTINGS_NAMESPACE: import("@deepseek-ai/dsh-settings").SettingsNamespace;
+export declare const SETTINGS_NAMESPACE: "interpreters";
 /** Read face the gateway and tool re-registration consume. */
 export interface InterpretersSettingsBridge {
     /** The current resolved config (composition seed while settings is absent). */

package/lib/types/settings.js

@@ -16,10 +16,9 @@
  *
  * @module dsh-interpreters/settings
  */
-import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { Config } from './config.js';
 /** Settings namespace under which interpreter paths persist. */
-export const SETTINGS_NAMESPACE = settingsNamespace('interpreters');
+export const SETTINGS_NAMESPACE = 'interpreters';
 /**
  * Mirror of the dsh-settings internal `isUnloading` guard. The cordis const
  * enum for fiber state is erased at compile time, so the literal states are

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huanlin/dsh-plugin-interpreters",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -33,26 +33,26 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-connection",
-        "@deepseek-ai/dsh-client-ui-settings-plugins",
-        "@deepseek-ai/dsh-client-ui-slots"
+        "@deepseek-ai/dsh-client-ui-renderer",
+        "@deepseek-ai/dsh-client-ui-settings-plugins"
       ],
       "platform": "web"
     }
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1-rc.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.8",
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-client-connection": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-store": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.1.2-rc.1",
     "react": "^18.2.0",
     "schemastery": "^3.18.0"
   },
@@ -66,7 +66,10 @@
     "@deepseek-ai/dsh-client-locale": {
       "optional": true
     },
-    "@deepseek-ai/dsh-client-runtime": {
+    "@deepseek-ai/dsh-client-store": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-renderer": {
       "optional": true
     },
     "@deepseek-ai/dsh-client-ui-settings-plugins": {
@@ -95,20 +98,11 @@
     }
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1-rc.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.8",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "esbuild": "^0.28.2",
     "lightningcss": "^1.29.2",
+    "schemastery": "^3.18.0",
     "tsdown": "^0.22.2",
     "typescript": "^5.9.0",
     "use-sync-external-store": "^1.2.0",