dsh-qoder-connect 0.1.8 → 0.1.9

package/lib/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { B as qoderCredentialIdentity, D as FALLBACK_QODER_MODELS, E as qoderCatalogPath, R as QoderCredentialStore, T as QoderCatalogStore, b as createQoderTransport, f as QODER_CONNECT_VERSION, i as variantFor, l as qoderHostHeartbeatPath, m as QoderUpstreamClient, r as QODER_VARIANTS, s as isHeartbeatProcessAlive, t as CHINA_VARIANT, u as readHostHeartbeat, y as validateApiKey } from "./variants-DE76gF0Y.js";
+import { D as FALLBACK_QODER_MODELS, E as qoderCatalogPath, T as QoderCatalogStore, V as qoderCredentialIdentity, b as createQoderTransport, f as QODER_CONNECT_VERSION, i as variantFor, l as qoderHostHeartbeatPath, m as QoderUpstreamClient, r as QODER_VARIANTS, s as isHeartbeatProcessAlive, t as CHINA_VARIANT, u as readHostHeartbeat, y as validateApiKey, z as QoderCredentialStore } from "./variants-C8ezztjV.js";
 import { readFile } from "node:fs/promises";
 import { realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";

package/lib/client.js

@@ -213,9 +213,9 @@ window.__ModuleLoader__.load({
 		* The shared quota-settings card: one card above the two variant cards that
 		* configures both sidebar quota widgets.
 		*
-		* Like the built-in plugin cards, it registers into `settings.plugin.item`
-		* keyed by its own settings namespace (`qoder-quota`), binds that
-		* namespace through the client settings scope, and writes through the scope's
+		* Like the built-in plugin cards, it registers into the Plugins tab's card
+		* list — `settings.plugin.item` on DSH 0.1.5, the shared 《插件设置》 block on
+		* 0.1.7, where that list is gone — and writes through the settings face's
 		* revision-fenced `set` — the same durable-write path every preference row
 		* uses. A toggle commits on click: each click is one explicit user choice,
 		* and the scope's ordering makes the last one win, so no staged-draft form is
@@ -2793,6 +2793,115 @@ window.__ModuleLoader__.load({
 			return t("probeNoteUnknown");
 		}
 		//#endregion
+		//#region src/client/http-settings-scope.ts
+		/** Base path of the host half's settings face. */
+		const ROUTE_BASE = "/plugins/dsh-qoder-connect";
+		/**
+		* Fetch one settings face document.
+		* @param init - the request init (method, headers, body).
+		* @returns the parsed document.
+		* @throws when the transport or the host refuses the request.
+		*/
+		async function request(init) {
+			const response = await fetch(`${ROUTE_BASE}/settings`, {
+				credentials: "same-origin",
+				...init
+			});
+			const value = await response.json().catch(() => void 0);
+			if (!response.ok) {
+				const error = typeof value === "object" && value !== null && "error" in value ? String(value["error"]) : `HTTP ${response.status}`;
+				throw new Error(error);
+			}
+			if (typeof value !== "object" || value === null || !("value" in value)) throw new Error("qoder: settings face answered an invalid document");
+			return value;
+		}
+		/**
+		* The scope the card was written against, backed by this plugin's own file.
+		*
+		* A write optimistically adopts the value it just sent, then confirms with the
+		* host's answer (which re-reads the file it wrote), so the card never renders a
+		* value the host does not hold.
+		*/
+		var OwnQuotaSettingsScope = class {
+			document;
+			listeners = /* @__PURE__ */ new Set();
+			snapshot = {
+				status: "loading",
+				value: void 0,
+				writable: true
+			};
+			/**
+			* Load the current document. Call once before the card binds; repeated calls
+			* are harmless and re-read the host.
+			* @returns the effective values.
+			*/
+			async load() {
+				try {
+					this.document = await request({ headers: { accept: "application/json" } });
+				} catch {
+					return;
+				}
+				this.publish();
+				return this.document.value;
+			}
+			/** @returns the stable snapshot the card reads (ready once loaded). */
+			getSnapshot() {
+				return this.snapshot;
+			}
+			/** @param listener - invoked after every snapshot change. @returns the disposer. */
+			subscribe(listener) {
+				this.listeners.add(listener);
+				return () => {
+					this.listeners.delete(listener);
+				};
+			}
+			/**
+			* Write one field.
+			* @param field - field name inside the settings document.
+			* @param value - the JSON-shaped value to store.
+			* @returns whether the host accepted the write.
+			*/
+			async set(field, value) {
+				return this.patch({ [field]: value });
+			}
+			/**
+			* Clear one field: the value falls back to the schema default.
+			* @param field - field name inside the settings document.
+			* @returns whether the host accepted the clear.
+			*/
+			async unset(field) {
+				return this.patch({ [field]: null });
+			}
+			/** Send one patch and adopt the host's answer. */
+			async patch(patch) {
+				const key = this.document?.key;
+				if (key === void 0) return false;
+				try {
+					this.document = await request({
+						method: "POST",
+						headers: {
+							"Content-Type": "application/json",
+							"X-Qoder-Settings-Key": key
+						},
+						body: JSON.stringify(patch)
+					});
+					this.publish();
+					return true;
+				} catch {
+					return false;
+				}
+			}
+			/** Rebuild the cached snapshot and notify the subscribers. */
+			publish() {
+				this.snapshot = {
+					status: this.document === void 0 ? "loading" : "ready",
+					value: this.document?.value,
+					writable: true
+				};
+				for (const listener of this.listeners) listener();
+			}
+		};
+		//#endregion
 		//#region src/client/quota-merge.ts
 		/**
 		* Group credit accounts by (packageName, packageEndTime) and sum each group.
@@ -3928,23 +4037,29 @@ window.__ModuleLoader__.load({
 		/** Stable browser-plugin name. */
 		const name = "dsh-qoder-connect-client";
 		/**
-		* Client services required by the Plugin configuration contribution.
+		* Client services this bundle requires BEFORE it activates.
 		*
 		* DSH 0.1.2 removed `@deepseek-ai/dsh-client-runtime` (the package that used to
 		* hold the browser `ClientContext` alias and the `slots` service). The services
 		* this card relies on now come from narrower packages: the `slots` registry
 		* moved to `@deepseek-ai/dsh-client-ui-renderer`, `locale` stayed in
-		* `@deepseek-ai/dsh-client-locale`, and the `settings.plugin.item` slot is
-		* declared by `@deepseek-ai/dsh-client-ui-settings-plugins`. All three are
-		* named in the package's `dsh.client.inject` list, so cordis has activated
-		* them before this plugin's fiber starts.
+		* `@deepseek-ai/dsh-client-locale`, and the Plugins tab's card list
+		* (`settings.plugin.item`) is declared by
+		* `@deepseek-ai/dsh-client-ui-settings-plugins`. Those packages are named in
+		* the package's `dsh.client.inject` list.
+		*
+		* NOT declared here: the settings services. `settingsScope` (0.1.5) does not
+		* exist at all on 0.1.7 — a static service dependency on it is what left this
+		* plugin's client activation pending forever — and `configForms` (0.1.7) does
+		* not exist on 0.1.5. Both are waited for with `ctx.inject([...], callback)`
+		* below, where a missing service simply never calls back instead of holding
+		* activation.
 		*/
 		const inject = [
 			"slots",
 			"locale",
 			"remote",
-			"remote.session",
-			"settingsScope"
+			"remote.session"
 		];
 		/** The status routes per variant id (mirrors the host's locked route table). */
 		const VARIANT_STATUS = {
@@ -3952,6 +4067,47 @@ window.__ModuleLoader__.load({
 			"qoder-global": QODER_GLOBAL_STATUS_PATH
 		};
 		/**
+		* The shared 《插件设置》 block's slot and entry ids.
+		*
+		* The three connect plugins must agree on these exactly: `settings.section` is
+		* a `list` slot, so many blocks may coexist, but a child slot name may be
+		* declared once and a list entry id may be registered once. The first plugin to
+		* arrive registers the container (declaring the child slot); the others detect
+		* it and attach their own entry, which is why the ids are fixed constants
+		* rather than per-plugin names.
+		*/
+		const SHARED_SECTION_SLOT = "settings.section";
+		const SHARED_SECTION_ID = "plugin-settings";
+		const SHARED_SECTION_ORDER = 900;
+		const SHARED_ITEM_SLOT = "plugin-settings.item";
+		/** This plugin's entry id inside the shared block: its package name (unique). */
+		const SHARED_ITEM_ID = "dsh-qoder-connect";
+		/** The shared block's title, fixed by the contract so all three plugins agree. */
+		const SHARED_SECTION_LABEL = "插件设置";
+		/**
+		* The shared 《插件设置》 section the 0.1.7 card list lives in.
+		*
+		* It renders nothing but its child slot: every connect plugin contributes its
+		* own card as one `plugin-settings.item` entry. The list wrapper mirrors the
+		* list the removed Plugins tab used for the same cards (`gap: 10`, no markers),
+		* so the cards keep the spacing they had on 0.1.5.
+		*
+		* @param props - the section's slot props (owner share plus `renderSlot`).
+		* @returns the ordered card list.
+		*/
+		function PluginSettingsSection(props) {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+				style: {
+					display: "flex",
+					flexDirection: "column",
+					gap: 6,
+					padding: 0,
+					listStyle: "none"
+				},
+				children: props.renderSlot(SHARED_ITEM_SLOT, {})
+			});
+		}
+		/**
 		* Register card copy, the shared quota-settings card, the two variant cards,
 		* and the sidebar quota cards.
 		*
@@ -3983,9 +4139,22 @@ window.__ModuleLoader__.load({
 					en
 				}), "dsh-qoder-connect: settings copy");
 				const t = ctx.locale.bind(namespace);
+				/**
+				* The bound quota settings face, filled in as soon as a host configuration
+				* service becomes available (see the two `ctx.inject` callbacks below).
+				*
+				* It is bound as a SERVICE ARRIVES rather than when the settings card's
+				* inject factory first runs: the factory only executes while the settings
+				* page renders, so a fresh page load read no toggles and rendered no sidebar
+				* card until the user opened settings — the exact regression the
+				* commandcode card avoids by reading its STORED fact independently of the
+				* settings page. The face's subscription mirrors every accepted snapshot
+				* (toggles + interval) into the shared store the sidebar cards and the
+				* dashboard read; a deployment with no configuration service never binds,
+				* and the sidebar cards stay hidden.
+				*/
 				let quotaScope;
-				try {
-					const scope = ctx.settingsScope.bind({ namespace: "qoder-quota" });
+				const adoptQuotaScope = (scope) => {
 					quotaScope = scope;
 					const applySnapshot = () => {
 						const value = scope.getSnapshot().value;
@@ -3994,20 +4163,76 @@ window.__ModuleLoader__.load({
 					};
 					applySnapshot();
 					scope.subscribe(applySnapshot);
-				} catch (error) {
-					console.error("[dsh-qoder-connect] quota settings scope unavailable (sidebar cards stay hidden):", error);
-				}
-				ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
-					name: "settings.plugin.item",
-					key: "qoder",
-					priority: 50,
-					inject: () => ({
+				};
+				const registerUnifiedCard = (slot) => {
+					const inject = () => ({
 						t,
 						scope: quotaScope,
 						signedIn: () => quotaSignInState(),
 						unified: true
-					})
-				}, QoderPluginCard));
+					});
+					if (slot === "settings.plugin.item") return ctx.slots.inject(slot, () => ctx.slots.register({
+						name: slot,
+						key: "qoder",
+						priority: 50,
+						inject
+					}, QoderPluginCard));
+					return ctx.slots.inject(slot, () => ctx.slots.register({
+						name: slot,
+						id: SHARED_ITEM_ID,
+						order: 30,
+						inject
+					}, QoderPluginCard));
+				};
+				/**
+				* Attach this plugin's card to the shared 《插件设置》 block, building the
+				* block first if nobody has.
+				*
+				* Backoff protocol (identical in all three connect plugins, on purpose: a
+				* `list` slot takes many entries but only ONE registration per id, and a
+				* child slot name may be declared once, so the container is a rendezvous
+				* rather than a race to be won):
+				*   1. wait for the host to declare `settings.section`;
+				*   2. if an entry with the shared id is already there, only attach;
+				*   3. otherwise register the container — and if a sibling won the race and
+				*      the registration throws, fall back to attaching to theirs.
+				*/
+				const joinSharedSettingsBlock = () => {
+					ctx.slots.inject(SHARED_SECTION_SLOT, () => {
+						let disposeContainer;
+						if (!ctx.slots.entries(SHARED_SECTION_SLOT).some((entry) => entry.options?.id === SHARED_SECTION_ID)) try {
+							disposeContainer = ctx.slots.register({
+								name: SHARED_SECTION_SLOT,
+								id: SHARED_SECTION_ID,
+								order: SHARED_SECTION_ORDER,
+								label: () => SHARED_SECTION_LABEL,
+								children: { [SHARED_ITEM_SLOT]: {
+									kind: "list",
+									scope: "root"
+								} }
+							}, PluginSettingsSection);
+						} catch (error) {
+							console.error("[dsh-qoder-connect] shared plugin-settings block lost the race; attaching to the winner:", error);
+						}
+						const disposeItem = registerUnifiedCard(SHARED_ITEM_SLOT);
+						return () => {
+							disposeItem();
+							disposeContainer?.();
+						};
+					});
+				};
+				/**
+				* 插件自有配置（`<profile>/.dsh-qoder-connect/settings.json`）：两条宿主线的
+				* 读写都走宿主半的 settings face，不再经过 settingsScope / configForms。
+				*
+				* 0.1.7 的 configForms 写入会整树 reconcile + fiber 热重载（每次约
+				* 1~1.5 秒，且每次保存都刷新所有客户端镜像）；自有文件写入是本地毫秒级
+				* 原子写。卡片注册无条件进行：scope 在启动时载入，迟到也不会漏掉 UI。
+				*/
+				const ownQuotaScope = new OwnQuotaSettingsScope();
+				ownQuotaScope.load();
+				adoptQuotaScope(ownQuotaScope);
+				joinSharedSettingsBlock();
 				const QUOTA_PANEL_ID = "qoder-quota-panel";
 				const CONVERSATION_PANEL_ID = "conversation";
 				const dashboardDocuments = {