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

package/lib/client.js

@@ -516,7 +516,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region \0dsh-css:/home/runner/work/dsh-publisher/dsh-publisher/upstream/packages/client/ui-settings-plugins/src/client/SubagentModelSelectionCard.module.css.mjs
-		const css = ".zWjHyq_permission{gap:6px;padding:12px 0;display:grid}.zWjHyq_toggleRow{color:var(--dsw-alias-label-secondary);justify-content:space-between;align-items:flex-start;gap:16px;font-size:13px;line-height:1.5;display:flex}.zWjHyq_toggleLabel{flex:1;min-width:0}.zWjHyq_switch{box-sizing:border-box;background:var(--dsw-alias-border-l3);cursor:pointer;border:0;border-radius:10px;flex:none;width:36px;height:20px;padding:2px;position:relative}.zWjHyq_switchOn{background:var(--dsw-alias-brand-primary)}.zWjHyq_switch:disabled{cursor:default;opacity:.5}.zWjHyq_switch:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}.zWjHyq_thumb{background:var(--dsw-alias-label-primary-foreground);border-radius:50%;width:16px;height:16px;transition:transform .12s;display:block}.zWjHyq_switchOn .zWjHyq_thumb{transform:translate(16px)}.zWjHyq_selection{gap:10px;display:grid}.zWjHyq_hint,.zWjHyq_notice,.zWjHyq_invalid,.zWjHyq_conflict{margin:0;font-size:12px;line-height:1.5}.zWjHyq_hint,.zWjHyq_notice{color:var(--dsw-alias-label-tertiary)}.zWjHyq_invalid,.zWjHyq_conflict{color:var(--dsw-alias-label-error)}.zWjHyq_catalogError{color:var(--dsw-alias-label-error);justify-content:space-between;align-items:center;gap:12px;font-size:12px;display:flex}.zWjHyq_catalogError button{color:var(--dsw-alias-brand-primary);cursor:pointer;background:0 0;border:0;padding:0}.zWjHyq_models{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;gap:6px;min-width:0;max-height:280px;margin:0;padding:10px;display:grid;overflow:auto}.zWjHyq_models legend{color:var(--dsw-alias-label-secondary);padding:0 4px;font-size:12px}.zWjHyq_modelGroup{gap:6px;display:grid}.zWjHyq_modelGroup+.zWjHyq_modelGroup{border-top:1px solid var(--dsw-alias-border-l3);margin-top:4px;padding-top:10px}.zWjHyq_providerName{color:var(--dsw-alias-label-tertiary);padding:0 6px;font-size:11px;font-weight:500}.zWjHyq_model{cursor:pointer;border-radius:6px;grid-template-columns:auto minmax(0,1fr) auto;align-items:center;gap:8px;min-width:0;padding:6px;display:grid}.zWjHyq_model:hover{background:var(--dsw-alias-bg-layer-4)}.zWjHyq_modelName,.zWjHyq_route{text-overflow:ellipsis;white-space:nowrap;display:block;overflow:hidden}.zWjHyq_modelName{color:var(--dsw-alias-label-primary);font-size:13px}.zWjHyq_route{color:var(--dsw-alias-label-tertiary);margin-top:2px;font-size:11px}.zWjHyq_unavailable{color:var(--dsw-alias-label-tertiary);font-size:11px}";
+		const css = ".zWjHyq_permission{gap:6px;padding:12px 0;display:grid}.zWjHyq_toggleRow{color:var(--dsw-alias-label-primary);justify-content:space-between;align-items:flex-start;gap:16px;font-size:13px;line-height:1.5;display:flex}.zWjHyq_toggleLabel{flex:1;min-width:0}.zWjHyq_switch{box-sizing:border-box;background:var(--dsw-alias-border-l3);cursor:pointer;border:0;border-radius:10px;flex:none;width:36px;height:20px;padding:2px;position:relative}.zWjHyq_switchOn{background:var(--dsw-alias-brand-primary)}.zWjHyq_switch:disabled{cursor:default;opacity:.5}.zWjHyq_switch:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:2px}.zWjHyq_thumb{background:var(--dsw-alias-label-primary-foreground);border-radius:50%;width:16px;height:16px;transition:transform .12s;display:block}.zWjHyq_switchOn .zWjHyq_thumb{transform:translate(16px)}.zWjHyq_selection{gap:10px;display:grid}.zWjHyq_hint,.zWjHyq_notice,.zWjHyq_invalid,.zWjHyq_conflict{margin:0;font-size:12px;line-height:1.5}.zWjHyq_hint,.zWjHyq_notice{color:var(--dsw-alias-label-tertiary)}.zWjHyq_invalid,.zWjHyq_conflict{color:var(--dsw-alias-label-error)}.zWjHyq_catalogError{color:var(--dsw-alias-label-error);justify-content:space-between;align-items:center;gap:12px;font-size:12px;display:flex}.zWjHyq_catalogError button{color:var(--dsw-alias-brand-primary);cursor:pointer;background:0 0;border:0;padding:0}.zWjHyq_models{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;gap:6px;min-width:0;max-height:280px;margin:0;padding:10px;display:grid;overflow:auto}.zWjHyq_models legend{color:var(--dsw-alias-label-secondary);padding:0 4px;font-size:12px}.zWjHyq_modelGroup{gap:6px;display:grid}.zWjHyq_modelGroup+.zWjHyq_modelGroup{border-top:1px solid var(--dsw-alias-border-l3);margin-top:4px;padding-top:10px}.zWjHyq_providerName{color:var(--dsw-alias-label-tertiary);padding:0 6px;font-size:11px;font-weight:500}.zWjHyq_model{cursor:pointer;border-radius:6px;grid-template-columns:auto minmax(0,1fr) auto;align-items:center;gap:8px;min-width:0;padding:6px;display:grid}.zWjHyq_model:hover{background:var(--dsw-alias-bg-layer-4)}.zWjHyq_modelName,.zWjHyq_route{text-overflow:ellipsis;white-space:nowrap;display:block;overflow:hidden}.zWjHyq_modelName{color:var(--dsw-alias-label-primary);font-size:13px}.zWjHyq_route{color:var(--dsw-alias-label-tertiary);margin-top:2px;font-size:11px}.zWjHyq_unavailable{color:var(--dsw-alias-label-tertiary);font-size:11px}";
 		const tagId = "@prettier-ai/dsh-client-ui-settings-plugins/SubagentModelSelectionCard.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
 			const tag = document.createElement("style");
@@ -1218,7 +1218,7 @@ window.__ModuleLoader__.load({
 		/** Bridges one settings scope and the live adapter directory onto a staged card. */
 		var SubagentModelSelectionCardController = class {
 			scope;
-			session;
+			ctx;
 			catalogGroups = [];
 			catalogPartial = false;
 			catalogStatus = "idle";
@@ -1235,11 +1235,12 @@ window.__ModuleLoader__.load({
 			unsubscribe;
 			/**
 			* @param scope - bound `subagent-model-selection` settings scope.
-			* @param session - Host Session model-catalog face.
+			* @param ctx - the card plugin's context, whose `remote.session` namespace
+			* answers the Host model catalog.
 			*/
-			constructor(scope, session) {
+			constructor(scope, ctx) {
 				this.scope = scope;
-				this.session = session;
+				this.ctx = ctx;
 				this.store = (0, _prettier_ai_dsh_client_store.createSnapshotStore)(this.projection());
 				this.unsubscribe = scope.subscribe(() => {
 					if (!this.saving && this.draftRoutes !== void 0 && this.scope.getSnapshot().revision !== this.draftRevision) if (this.currentEnabled() === this.enabled() && sameRoutes(this.currentRoutes(), this.desiredRoutes())) this.clearDraft();
@@ -1401,17 +1402,13 @@ window.__ModuleLoader__.load({
 				this.catalogStatus = "loading";
 				this.catalogPartial = false;
 				this.publish();
-				try {
-					const response = await this.session.modelCatalog();
-					if (generation !== this.catalogGeneration) return;
-					if (!response.ok) throw new Error(response.error.message);
+				const response = await this.ctx.remote.session.modelCatalog();
+				if (generation !== this.catalogGeneration) return;
+				if (response.ok) {
 					this.catalogGroups = response.value.groups;
 					this.catalogPartial = response.value.failures.length > 0;
 					this.catalogStatus = "ready";
-				} catch {
-					if (generation !== this.catalogGeneration) return;
-					this.catalogStatus = "error";
-				}
+				} else this.catalogStatus = "error";
 				this.publish();
 			}
 			projection() {
@@ -1461,7 +1458,7 @@ window.__ModuleLoader__.load({
 		/** Bridges the `web-search-deepseek` scope and the credentials domain onto the card. */
 		var WebSearchCardController = class {
 			scope;
-			credentials;
+			ctx;
 			form;
 			store;
 			credential = {
@@ -1471,11 +1468,12 @@ window.__ModuleLoader__.load({
 			};
 			/**
 			* @param scope - the bound settings scope for the `web-search-deepseek` namespace.
-			* @param credentials - Remote face used for the credential the section references.
+			* @param ctx - the card plugin's context, whose `remote.credentials` namespace
+			* answers for the credential the section references.
 			*/
-			constructor(scope, credentials) {
+			constructor(scope, ctx) {
 				this.scope = scope;
-				this.credentials = credentials;
+				this.ctx = ctx;
 				this.form = new CardForm(scope, [textField("baseURL"), numberField("maxUses")], [{
 					field: API_KEY_FIELD,
 					write: (text) => this.writeKey(text)
@@ -1514,12 +1512,7 @@ window.__ModuleLoader__.load({
 					};
 					this.store.set(this.projection());
 				}
-				let response;
-				try {
-					response = await this.credentials.describe([ref]);
-				} catch (_credentialReadFailure) {
-					return;
-				}
+				const response = await this.ctx.remote.credentials.describe([ref]);
 				if (!response.ok || ref !== refOf(this.scope.getSnapshot())) return;
 				const view = response.value[ref];
 				const next = {
@@ -1559,9 +1552,7 @@ window.__ModuleLoader__.load({
 			* @returns whether the Host reports a configured credential afterwards.
 			*/
 			async writeKey(value) {
-				try {
-					await this.credentials.set(refOf(this.scope.getSnapshot()), value);
-				} catch (_credentialWriteFailure) {}
+				await this.ctx.remote.credentials.set(refOf(this.scope.getSnapshot()), value);
 				await this.readCredential();
 				return this.credential.configured;
 			}
@@ -1706,7 +1697,6 @@ window.__ModuleLoader__.load({
 		const inject = [
 			"slots",
 			"locale",
-			"connection",
 			"remote",
 			"remote.credentials",
 			"remote.session",
@@ -1724,8 +1714,8 @@ window.__ModuleLoader__.load({
 			}), "ui-settings-plugins: section dictionaries");
 			const bash = new BashCardController(ctx.settingsScope.bind({ namespace: SHELL_NS }));
 			const agentLoop = new AgentLoopCardController(ctx.settingsScope.bind({ namespace: AGENT_LOOP_NS }));
-			const webSearch = new WebSearchCardController(ctx.settingsScope.bind({ namespace: WEB_SEARCH_NS }), ctx.remote.credentials);
-			const subagentModelSelection = new SubagentModelSelectionCardController(ctx.settingsScope.bind({ namespace: SUBAGENT_MODEL_SELECTION_NS }), ctx.remote.session);
+			const webSearch = new WebSearchCardController(ctx.settingsScope.bind({ namespace: WEB_SEARCH_NS }), ctx);
+			const subagentModelSelection = new SubagentModelSelectionCardController(ctx.settingsScope.bind({ namespace: SUBAGENT_MODEL_SELECTION_NS }), ctx);
 			ctx.effect(() => ctx.remote.$on("credentials/reference-updated", (ref) => {
 				webSearch.refreshCredential(ref);
 			}), "ui-settings-plugins: credential invalidations");

package/lib/types/client/subagent-model-selection-card-controller.d.ts

@@ -1,5 +1,6 @@
 /** Staged editor for the Host-owned subagent model allowlist. */
-import type { ClientRemote, ModelProviderGroup } from '@prettier-ai/dsh-api-remotes/client';
+import type { Context as ClientContext } from '@prettier-ai/cordis';
+import type { ModelProviderGroup } from '@prettier-ai/dsh-api-remotes/client';
 import { type SnapshotStore } from '@prettier-ai/dsh-client-store';
 import type { SettingsScope } from '@prettier-ai/dsh-client-ui-settings/client';
 import type { CardShell } from './card-form.ts';
@@ -77,7 +78,7 @@ export declare function subagentModelCandidates(groups: readonly ModelProviderGr
 /** Bridges one settings scope and the live adapter directory onto a staged card. */
 export declare class SubagentModelSelectionCardController {
     private readonly scope;
-    private readonly session;
+    private readonly ctx;
     private catalogGroups;
     private catalogPartial;
     private catalogStatus;
@@ -94,9 +95,10 @@ export declare class SubagentModelSelectionCardController {
     private readonly unsubscribe;
     /**
      * @param scope - bound `subagent-model-selection` settings scope.
-     * @param session - Host Session model-catalog face.
+     * @param ctx - the card plugin's context, whose `remote.session` namespace
+     * answers the Host model catalog.
      */
-    constructor(scope: SettingsScope<SubagentModelSelectionSettings>, session: Pick<ClientRemote['session'], 'modelCatalog'>);
+    constructor(scope: SettingsScope<SubagentModelSelectionSettings>, ctx: ClientContext);
     /** Stop observing settings and suppress late directory/write settlements. */
     dispose(): void;
     /**

package/lib/types/client/web-search-card-controller.d.ts

@@ -8,7 +8,7 @@
  * section names. It is still staged with the rest of the form, so one save
  * covers everything the card shows.
  */
-import type { ClientRemote } from '@prettier-ai/dsh-api-remotes/client';
+import type { Context as ClientContext } from '@prettier-ai/cordis';
 import type { SnapshotStore } from '@prettier-ai/dsh-client-store';
 import type { SettingsScope } from '@prettier-ai/dsh-client-ui-settings/client';
 import { type CardActions, type CardFieldState, type CardShell } from './card-form.ts';
@@ -26,8 +26,6 @@ export interface WebSearchSettings {
     /** Maximum searches served within one request. */
     maxUses?: number;
 }
-/** The credentials Remote methods this card reads and writes through. */
-export type WebSearchCredentials = Pick<ClientRemote['credentials'], 'describe' | 'set'>;
 /** What the web-search card renders. */
 export interface WebSearchCardState extends CardShell {
     /** Provider endpoint. */
@@ -51,15 +49,16 @@ export interface WebSearchCardFace extends CardActions {
 /** Bridges the `web-search-deepseek` scope and the credentials domain onto the card. */
 export declare class WebSearchCardController {
     private readonly scope;
-    private readonly credentials;
+    private readonly ctx;
     private readonly form;
     private readonly store;
     private credential;
     /**
      * @param scope - the bound settings scope for the `web-search-deepseek` namespace.
-     * @param credentials - Remote face used for the credential the section references.
+     * @param ctx - the card plugin's context, whose `remote.credentials` namespace
+     * answers for the credential the section references.
      */
-    constructor(scope: SettingsScope<WebSearchSettings>, credentials: WebSearchCredentials);
+    constructor(scope: SettingsScope<WebSearchSettings>, ctx: ClientContext);
     private projection;
     /**
      * Ask the credentials domain about the reference the section currently names.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prettier-ai/dsh-client-ui-settings-plugins",
   "description": "Plugins settings section with feature-owned tabs and configurable host-plane plugin cards",
-  "version": "0.1.2-alpha.1",
+  "version": "0.1.2-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -32,7 +32,6 @@
   "dsh": {
     "client": {
       "inject": [
-        "@prettier-ai/dsh-client-connection",
         "@prettier-ai/dsh-client-locale",
         "@prettier-ai/dsh-client-ui-settings",
         "@prettier-ai/dsh-api-remotes"
@@ -42,28 +41,21 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@prettier-ai/cordis": "^4.0.1",
-    "@prettier-ai/dsh-api-remotes": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-connection": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-locale": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-invariants": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-ui-settings": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-ui-renderer": "^0.1.2-alpha.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-connection": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-api-remotes": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-locale": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-store": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-test-runtime": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-ui-primitives": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-ui-settings": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-invariants": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-ui-renderer": "^0.1.2-alpha.1",
-    "@prettier-ai/dsh-client-ui-slots": "^0.1.2-alpha.1"
+    "@prettier-ai/cordis": "^4.0.2",
+    "@prettier-ai/dsh-api-remotes": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-locale": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-store": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-test-runtime": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-ui-primitives": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-ui-settings": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-ui-slots": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-client-ui-renderer": "^0.1.2-alpha.2",
+    "@prettier-ai/dsh-invariants": "^0.1.2-alpha.2"
   },
   "files": [
     "lib/index.js",