@prettier-ai/dsh-client-ui-settings 0.1.2-alpha.1 → 0.1.2-alpha.2

package/README.i18n.yaml

@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write packages/client/ui-settings/README.md
-README.md: 3e4970bff9784a80716a073bf6d7f9f3e62889e5
-README.zh.md: a527dfe21a5c756183ffb4022ea0a8f3290f9dc5
+README.md: 1dbefefe51086a68d1f2afd36d098a118337f0b9
+README.zh.md: 7009b4a7f156a613a7a1ef4e38b14c11d40fa85a

package/README.md

@@ -25,7 +25,7 @@ English | [中文](README.zh.md)
 <a id="use-this-package"></a>
 ## Use this package
 
-Feature plugins use this package to store and edit their preferences without re-implementing transport or schema handling. Mount it once per composition; it injects `connection` and `remote` and owns the single `settings.describe` reader in the browser.
+Feature plugins use this package to store and edit their preferences without re-implementing transport or schema handling. Mount it once per composition; it injects the `remote` service with its `settings` namespace and owns the single `settings.describe` reader in the browser.
 
 ### Binding a namespace
 
@@ -51,7 +51,7 @@ The package realizes one ownership rule: the browser keeps one shared mirror of
 
 ### The describe mirror
 
-The plugin injects `connection` and `remote` and owns the one `settings.describe` reader in the browser: a shared mirror refreshed on every forwarded `settings/document-updated` event and on `connection/reset` (the first connection included, closing the window where a commit lands between the eager read and the SSE subscription). Cross-namespace surfaces read it through `ctx.settingsScope.describe()`, a read/fold face (`getSnapshot`/`subscribe`/`ensure`, plus `acceptView` folding a write answer in).
+The plugin injects `remote` with its `settings` namespace, resolves Host persistence once from the fixed `remote.$host` facts, and owns the one `settings.describe` reader in the browser: a shared mirror refreshed on every forwarded `settings/document-updated` event and on `connection/reset` (the first connection included, closing the window where a commit lands between the eager read and the SSE subscription). Cross-namespace surfaces read it through `ctx.settingsScope.describe()`, a read/fold face (`getSnapshot`/`subscribe`/`ensure`, plus `acceptView` folding a write answer in).
 
 ### Scope derivation
 

package/README.zh.md

@@ -25,7 +25,7 @@ kind: "package-reference"
 <a id="use-this-package"></a>
 ## 使用本包
 
-功能插件用本包存储与编辑自己的偏好设置，而无需重新实现传输层或 schema 处理。每个组合挂载一次即可；它注入 `connection` 与 `remote`，并持有浏览器中唯一的 `settings.describe` 读取方。
+功能插件用本包存储与编辑自己的偏好设置，而无需重新实现传输层或 schema 处理。每个组合挂载一次即可；它注入 `remote` 服务及其 `settings` 命名空间，并持有浏览器中唯一的 `settings.describe` 读取方。
 
 ### 绑定命名空间
 
@@ -51,7 +51,7 @@ kind: "package-reference"
 
 ### Describe 镜像
 
-插件注入 `connection` 与 `remote`，并持有浏览器中唯一的 `settings.describe` 读取方：一面共享镜像，在每次转发的 `settings/document-updated` 事件与 `connection/reset` 时刷新（首次连接也包含在内，关闭「提交落在急切读取与 SSE 订阅之间」的窗口）。跨命名空间表面通过 `ctx.settingsScope.describe()` 读它，这是一个读取/折叠面（`getSnapshot`/`subscribe`/`ensure`，另有把写应答折入的 `acceptView`）。
+插件注入 `remote` 及其 `settings` 命名空间，从固定的 `remote.$host` 事实一次性解析 Host 持久化模式，并持有浏览器中唯一的 `settings.describe` 读取方：一面共享镜像，在每次转发的 `settings/document-updated` 事件与 `connection/reset` 时刷新（首次连接也包含在内，关闭「提交落在急切读取与 SSE 订阅之间」的窗口）。跨命名空间表面通过 `ctx.settingsScope.describe()` 读它，这是一个读取/折叠面（`getSnapshot`/`subscribe`/`ensure`，另有把写应答折入的 `acceptView`）。
 
 ### Scope 派生
 

package/lib/client.js

@@ -947,7 +947,7 @@ window.__ModuleLoader__.load({
 		* the operation already crossing the wire.
 		*/
 		var SettingsScopeController = class {
-			api;
+			ctx;
 			spec;
 			mirror;
 			persistence;
@@ -964,14 +964,15 @@ window.__ModuleLoader__.load({
 			*/
 			pendingRevision;
 			/**
-			* @param api - settings wire face (writes only; reads ride the mirror).
+			* @param ctx - the providing plugin's context, whose `remote.settings`
+			* namespace carries this scope's writes (reads ride the mirror).
 			* @param spec - namespace identity and optional narrowing decoder.
 			* @param mirror - the shared describe mirror this scope derives from.
 			* @param persistence - client-selected Host persistence; non-loopback pages may remain process-local.
 			* @param schema - settings-owned schema operations.
 			*/
-			constructor(api, spec, mirror, persistence, schema) {
-				this.api = api;
+			constructor(ctx, spec, mirror, persistence, schema) {
+				this.ctx = ctx;
 				this.spec = spec;
 				this.mirror = mirror;
 				this.persistence = persistence;
@@ -1041,13 +1042,7 @@ window.__ModuleLoader__.load({
 				const generation = ++this.writeGeneration;
 				return this.enqueue(async () => {
 					const revision = expectedRevision ?? this.pendingRevision ?? this.getSnapshot().revision;
-					let response;
-					try {
-						response = await this.api.settings.mutate(this.spec.namespace, ownedOps, revision);
-					} catch (_settingsWriteFailure) {
-						await this.recover(generation);
-						return;
-					}
+					const response = await this.ctx.remote.settings.mutate(this.spec.namespace, ownedOps, revision);
 					if (!response.ok) {
 						await this.recover(generation);
 						return;
@@ -1131,21 +1126,25 @@ window.__ModuleLoader__.load({
 		var SettingsScopeBinder = class extends _prettier_ai_cordis.Service {
 			mirror;
 			schema;
-			wire;
+			persistence;
+			/**
+			* The PROVIDING fiber, kept because a Service reads `ctx` as its *consumer's*
+			* fiber: letting a bound scope write through the caller's context would make
+			* every caller declare `remote.settings` in its own `inject`.
+			*/
+			owner;
 			/**
 			* @param ctx - the providing plugin's context.
 			* @param config - the shared describe mirror every bound scope derives from,
-			* the settings-owned schema operations, and the settings Remote namespace the
-			* bound scopes write through. The namespace is captured here rather than read
-			* inside {@link bind}, because a Service reads `ctx` as its *consumer's*
-			* fiber: reading it there would make every caller declare `remote.settings`
-			* in its own `inject`.
+			* the settings-owned schema operations, and the Host persistence the provider
+			* resolved from `remote.$host`.
 			*/
 			constructor(ctx, config) {
 				super(ctx, "settingsScope");
 				this.mirror = config.mirror;
 				this.schema = config.schema;
-				this.wire = config.wire;
+				this.persistence = config.persistence;
+				this.owner = ctx;
 			}
 			/**
 			* The shared mirror's read/fold face for cross-namespace surfaces (schema
@@ -1169,8 +1168,7 @@ window.__ModuleLoader__.load({
 			*/
 			bind(spec) {
 				const ctx = this.ctx;
-				const connection = ctx.get("connection");
-				const controller = new SettingsScopeController(this.wire, spec, this.mirror, connection.isLoopback ? "host" : "memory", this.schema);
+				const controller = new SettingsScopeController(this.owner, spec, this.mirror, this.persistence, this.schema);
 				ctx.effect(() => {
 					this.mirror.ensure();
 					return async () => {
@@ -1198,18 +1196,19 @@ window.__ModuleLoader__.load({
 		* so an invalidation arriving mid-read is never lost and never duplicated.
 		*/
 		var SettingsDescribeMirror = class {
-			api;
+			ctx;
 			persistence;
 			store;
 			inFlight;
 			rerun = false;
 			generation = 0;
 			/**
-			* @param api - settings wire face.
+			* @param ctx - the providing plugin's context, whose `remote.settings`
+			* namespace answers the describe read.
 			* @param persistence - client-selected Host persistence; non-loopback pages may remain process-local.
 			*/
-			constructor(api, persistence = "host") {
-				this.api = api;
+			constructor(ctx, persistence = "host") {
+				this.ctx = ctx;
 				this.persistence = persistence;
 				this.store = (0, _prettier_ai_dsh_client_store.createSnapshotStore)({
 					status: persistence === "host" ? "idle" : "unavailable",
@@ -1297,7 +1296,7 @@ window.__ModuleLoader__.load({
 						const generation = ++this.generation;
 						let outcome;
 						try {
-							const response = await this.api.settings.describe();
+							const response = await this.ctx.remote.settings.describe();
 							outcome = response.ok ? { view: response.value } : { failure: response.error.message };
 						} catch (error) {
 							outcome = { failure: error instanceof Error ? error.message : String(error) };
@@ -1328,14 +1327,10 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region lib/types/client/index.js
 		/**
-		* Required services: the wire handle for the mirror's reads and the forwarded
-		* settings invalidation the mirror refreshes on.
+		* Required services: the Remote namespace the mirror reads through and the
+		* forwarded settings invalidation it refreshes on.
 		*/
-		const inject = [
-			"connection",
-			"remote",
-			"remote.settings"
-		];
+		const inject = ["remote", "remote.settings"];
 		/**
 		* Provide the settings-namespace scope service over one shared describe
 		* mirror, and keep that mirror fresh on the two signals that can move the
@@ -1347,9 +1342,8 @@ window.__ModuleLoader__.load({
 		*/
 		function apply(ctx) {
 			const schema = new SettingsSchemaService(ctx);
-			const connection = ctx.get("connection");
-			const wire = { settings: ctx.remote.settings };
-			const mirror = new SettingsDescribeMirror(wire, connection.isLoopback ? "host" : "memory");
+			const persistence = ctx.remote.$host.isLoopback ? "host" : "memory";
+			const mirror = new SettingsDescribeMirror(ctx, persistence);
 			ctx.effect(() => {
 				const disposers = [ctx.remote.$on("settings/document-updated", () => {
 					mirror.load();
@@ -1364,7 +1358,7 @@ window.__ModuleLoader__.load({
 			new SettingsScopeBinder(ctx, {
 				mirror,
 				schema,
-				wire
+				persistence
 			});
 		}
 		//#endregion

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

@@ -17,10 +17,10 @@ export type { SettingsScopeController, SettingsScopeBinder } from './settings-sc
 export type { SettingsScope, SettingsScopeSnapshot, SettingsScopeSpec } from './settings-contract.ts';
 export type { SettingsSchemaService } from './schema.ts';
 export type { SchemaNode } from './schema.ts';
-export type { SettingsDescribeFace, SettingsDescribeView, SettingsMirrorSnapshot, SettingsRemote, SettingsWireFace, } from './settings-mirror.ts';
+export type { SettingsDescribeFace, SettingsDescribeView, SettingsMirrorSnapshot, } from './settings-mirror.ts';
 /**
- * Required services: the wire handle for the mirror's reads and the forwarded
- * settings invalidation the mirror refreshes on.
+ * Required services: the Remote namespace the mirror reads through and the
+ * forwarded settings invalidation it refreshes on.
  */
 export declare const inject: string[];
 /**

package/lib/types/client/settings-mirror.d.ts

@@ -8,20 +8,8 @@
  * invalidations its owning plugin subscribes to and folds write answers in
  * through {@link SettingsDescribeMirror.acceptView}.
  */
-import type { ClientRemote, SettingsNamespaceView } from '@prettier-ai/dsh-api-remotes/client';
-/**
- * The settings Remote methods browser configuration surfaces may reach: the
- * redacted read plus merge, replacement, and path-addressed writes.
- * Named once here so the consumers share one face instead of each re-deriving
- * it from the namespace.
- */
-export type SettingsRemote = Pick<ClientRemote['settings'], 'describe' | 'update' | 'replace' | 'mutate'>;
-/** Wire face carrying the settings Remote namespace. */
-export interface SettingsWireFace {
-    /** The settings Remote namespace. */
-    settings: SettingsRemote;
-}
-type SettingsFace = SettingsWireFace;
+import type { Context as ClientContext } from '@prettier-ai/cordis';
+import type { SettingsNamespaceView } from '@prettier-ai/dsh-api-remotes/client';
 /** The full `settings.describe` answer the mirror serves. */
 export interface SettingsDescribeView {
     /** Every namespace a live Host plugin registered, as the Host reported it. */
@@ -77,17 +65,18 @@ export interface SettingsDescribeFace {
  * so an invalidation arriving mid-read is never lost and never duplicated.
  */
 export declare class SettingsDescribeMirror implements SettingsDescribeFace {
-    private readonly api;
+    private readonly ctx;
     private readonly persistence;
     private readonly store;
     private inFlight;
     private rerun;
     private generation;
     /**
-     * @param api - settings wire face.
+     * @param ctx - the providing plugin's context, whose `remote.settings`
+     * namespace answers the describe read.
      * @param persistence - client-selected Host persistence; non-loopback pages may remain process-local.
      */
-    constructor(api: SettingsFace, persistence?: 'host' | 'memory');
+    constructor(ctx: ClientContext, persistence?: 'host' | 'memory');
     /** @returns the current sync snapshot (stable reference until the next change). */
     getSnapshot(): SettingsMirrorSnapshot;
     /**
@@ -126,5 +115,4 @@ export declare class SettingsDescribeMirror implements SettingsDescribeFace {
     private run;
     private shouldRerun;
 }
-export {};
 //# sourceMappingURL=settings-mirror.d.ts.map

package/lib/types/client/settings-scope.d.ts

@@ -10,8 +10,7 @@ import type { Context } from '@prettier-ai/cordis';
 import type { SettingsPathOpView } from '@prettier-ai/dsh-api-remotes/client';
 import type { SettingsSchemaService } from './schema.ts';
 import type { SettingsScope, SettingsScopeSnapshot, SettingsScopeSpec } from './settings-contract.ts';
-import { SettingsDescribeMirror, type SettingsDescribeFace, type SettingsWireFace } from './settings-mirror.ts';
-type SettingsFace = SettingsWireFace;
+import { SettingsDescribeMirror, type SettingsDescribeFace } from './settings-mirror.ts';
 /**
  * One namespace's derived view over the shared describe mirror, plus that
  * namespace's serialized Host writes. Writes carry the latest known namespace
@@ -19,7 +18,7 @@ type SettingsFace = SettingsWireFace;
  * the operation already crossing the wire.
  */
 export declare class SettingsScopeController<T> implements SettingsScope<T> {
-    private readonly api;
+    private readonly ctx;
     private readonly spec;
     private readonly mirror;
     private readonly persistence;
@@ -36,13 +35,14 @@ export declare class SettingsScopeController<T> implements SettingsScope<T> {
      */
     private pendingRevision;
     /**
-     * @param api - settings wire face (writes only; reads ride the mirror).
+     * @param ctx - the providing plugin's context, whose `remote.settings`
+     * namespace carries this scope's writes (reads ride the mirror).
      * @param spec - namespace identity and optional narrowing decoder.
      * @param mirror - the shared describe mirror this scope derives from.
      * @param persistence - client-selected Host persistence; non-loopback pages may remain process-local.
      * @param schema - settings-owned schema operations.
      */
-    constructor(api: SettingsFace, spec: SettingsScopeSpec<T>, mirror: SettingsDescribeMirror, persistence: 'host' | 'memory', schema: SettingsSchemaService);
+    constructor(ctx: Context, spec: SettingsScopeSpec<T>, mirror: SettingsDescribeMirror, persistence: 'host' | 'memory', schema: SettingsSchemaService);
     /** @returns the current sync snapshot (stable reference until the next change). */
     getSnapshot(): SettingsScopeSnapshot<T>;
     /**
@@ -100,20 +100,23 @@ declare module '@prettier-ai/cordis' {
 export declare class SettingsScopeBinder extends Service {
     private readonly mirror;
     private readonly schema;
-    private readonly wire;
+    private readonly persistence;
+    /**
+     * The PROVIDING fiber, kept because a Service reads `ctx` as its *consumer's*
+     * fiber: letting a bound scope write through the caller's context would make
+     * every caller declare `remote.settings` in its own `inject`.
+     */
+    private readonly owner;
     /**
      * @param ctx - the providing plugin's context.
      * @param config - the shared describe mirror every bound scope derives from,
-     * the settings-owned schema operations, and the settings Remote namespace the
-     * bound scopes write through. The namespace is captured here rather than read
-     * inside {@link bind}, because a Service reads `ctx` as its *consumer's*
-     * fiber: reading it there would make every caller declare `remote.settings`
-     * in its own `inject`.
+     * the settings-owned schema operations, and the Host persistence the provider
+     * resolved from `remote.$host`.
      */
     constructor(ctx: Context, config: {
         mirror: SettingsDescribeMirror;
         schema: SettingsSchemaService;
-        wire: SettingsWireFace;
+        persistence: 'host' | 'memory';
     });
     /**
      * The shared mirror's read/fold face for cross-namespace surfaces (schema
@@ -135,5 +138,4 @@ export declare class SettingsScopeBinder extends Service {
      */
     bind<T>(spec: SettingsScopeSpec<T>): SettingsScope<T>;
 }
-export {};
 //# sourceMappingURL=settings-scope.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prettier-ai/dsh-client-ui-settings",
   "description": "Settings domain base plugin: the settings-namespace scope service and the canonical settings slot-type contract",
-  "version": "0.1.2-alpha.1",
+  "version": "0.1.2-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -32,34 +32,27 @@
   "dsh": {
     "client": {
       "inject": [
-        "@prettier-ai/dsh-client-connection",
         "@prettier-ai/dsh-api-remotes"
       ],
       "platform": "web"
     }
   },
   "license": "MIT",
-  "dependencies": {
-    "@prettier-ai/schemastery": "^3.18.1"
-  },
   "peerDependencies": {
-    "@prettier-ai/dsh-api-remotes": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-connection": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-invariants": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-settings": "^0.1.2-alpha.1",
-    "@prettier-ai/cordis": "^4.0.1"
+    "@prettier-ai/cordis": "^4.0.2"
   },
   "devDependencies": {
     "@types/react": "~18.3.1",
     "react": "^18.2.0",
-    "@prettier-ai/cordis": "^4.0.1",
-    "@prettier-ai/dsh-client-test-runtime": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-ui-slots": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-store": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-api-remotes": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-invariants": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-connection": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-settings": "^0.1.2-alpha.1"
+    "@prettier-ai/dsh-api-remotes": "^0.1.2-alpha.2",
+    "@prettier-ai/cordis": "^4.0.2",
+    "@prettier-ai/dsh-client-store": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-ui-slots": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-test-runtime": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-invariants": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-settings": "^0.1.2-alpha.2",
+    "@prettier-ai/schemastery": "^3.18.2",
+    "@prettier-ai/dsh-util-values": "^0.1.2-alpha.2"
   },
   "files": [
     "lib/index.js",