@qilin-agent/client-ui-permission-presets 3.1.5 → 3.1.6

package/README.i18n.yaml

@@ -18,8 +18,8 @@
   en: 91606bff7da02253
   zh: ef68e813d64c89be
 /qilin-agent-client-ui-permission-presets/use-this-package/the-picker:
-  en: d851eab85fe002bd
-  zh: 0fdf6eeb1cbd609b
+  en: d330757a5562d174
+  zh: d4cc99873fa3b699
 /qilin-agent-client-ui-permission-presets/use-this-package/the-settings-row:
   en: 5067f6aa12496225
   zh: cfa6796684f97535

package/README.md

@@ -29,7 +29,7 @@ Mount this plugin alongside the settings, commands, and conversation packages. G
 
 ### The picker
 
-A pick submits the `/permission <preset>` command line. The argument-bearing form (`/permission <preset>` typed directly) still switches directly; the decoration replaces only the bare invocation. The built-in labels are `Read Only`, `Workspace Write`, `Full access`, and `Auto review` in English and `仅可查看`, `工作区内修改`, `完全权限`, and `Auto review` in Chinese. Explicit host labels remain unchanged, unknown kebab-case names render in title case, and `auto` carries an `EXP` badge plus an experimental-risk confirmation. `custom` is display state, never a target.
+A pick submits the `/permission <preset>` command line. The argument-bearing form (`/permission <preset>` typed directly) still switches directly; the decoration replaces only the bare invocation. The built-in labels are `Read Only`, `Workspace Write`, `Full access`, and `Auto review` in English and `仅可查看`, `工作区内修改`, `完全权限`, and `Auto review` in Chinese. Explicit host labels remain unchanged, unknown kebab-case names render in title case, and `auto` carries an `EXP` badge in menu options plus an experimental-risk confirmation. The selected composer control shows the mode without the badge. `custom` is display state, never a target.
 
 When the live catalog withdraws a preset, the composer closes its pending confirmation and shows the Session's current value instead of an unavailable optimistic pick. Every catalog invalidation — the payload-free notification or a connection-generation change — closes an open slash picker or its confirmation without consuming the draft, while publishing the result of a read the picker waits for leaves it open with its failure and retry state; reopening reads the current catalog. A submitted command remains busy until its response settles.
 

package/README.zh.md

@@ -29,7 +29,7 @@ kind: "package-reference"
 
 ### 选择器
 
-选中即提交 `/permission <preset>` 命令行。带参形式（直接键入 `/permission <preset>`）仍直接切换；装饰只替换裸调用。内置标签在英文界面中是 `Read Only`、`Workspace Write`、`Full access` 和 `Auto review`，在中文界面中是「仅可查看」「工作区内修改」「完全权限」和 `Auto review`。显式 host 标签保持原样，未知 kebab-case 名称渲染为 Title Case；`auto` 带有 `EXP` badge，并在可见选择时要求实验风险确认。`custom` 只是显示状态，绝非目标。
+选中即提交 `/permission <preset>` 命令行。带参形式（直接键入 `/permission <preset>`）仍直接切换；装饰只替换裸调用。内置标签在英文界面中是 `Read Only`、`Workspace Write`、`Full access` 和 `Auto review`，在中文界面中是「仅可查看」「工作区内修改」「完全权限」和 `Auto review`。显式 host 标签保持原样，未知 kebab-case 名称渲染为 Title Case；`auto` 在菜单选项中带有 `EXP` 标记，并在可见选择时要求实验风险确认。选中后的 composer 控件显示模式，不展示该标记。`custom` 只是显示状态，绝非目标。
 
 实时目录撤销某个预设时，composer 关闭对应的待确认对话框，并用 Session 的当前值替代已不可用的乐观选择。每次目录失效（无 payload 的通知或连接代际变更）会关闭已打开的 slash 选择器或其确认对话框，不消费草稿；而发布某个 picker 正在等待的读取结果时，该 picker 保持打开并保留失败与重试状态；重新打开时读取当前目录。已经提交的命令在响应结束前继续保持忙碌状态。
 

package/lib/client.js

@@ -159,6 +159,8 @@ window.__ModuleLoader__.load({
 		const zh = {
 			"title": "权限",
 			"description": "选择新会话的默认权限模式",
+			"unset": "未设定",
+			"unsetDescription": "尚未设定；新会话先使用主机默认，可在此选择一个预设固定下来",
 			"loading": "加载中",
 			"unavailable": "不可用",
 			"preset.readOnly": "仅可查看",
@@ -174,6 +176,8 @@ window.__ModuleLoader__.load({
 		const en = {
 			"title": "Permission",
 			"description": "Choose the default permission mode for new sessions",
+			"unset": "Not set",
+			"unsetDescription": "Not set yet; new sessions use the host default. Pick a preset here to pin it.",
 			"loading": "Loading",
 			"unavailable": "Unavailable",
 			"preset.readOnly": "Read Only",
@@ -262,7 +266,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region \0qilin-css:/home/runner/work/QiLin/QiLin/packages/client/ui-permission-presets/src/client/PermissionSelect.module.css.mjs
-		const css$1 = ".OiI-WW_trigger{min-width:0;max-width:220px;height:28px;color:var(--qilin-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-radius:24px;outline:none;align-items:center;gap:4px;padding:0 4px 0 8px;font-size:13px;font-weight:500;line-height:20px;display:inline-flex}.OiI-WW_trigger:hover:not(:disabled){background:var(--qilin-alias-interactive-bg-hover)}.OiI-WW_trigger:focus-visible{box-shadow:0 0 0 2px var(--qilin-focus-ring-color,var(--qilin-alias-state-business-primary))}.OiI-WW_trigger:disabled{color:var(--qilin-alias-label-dimmed);cursor:default}.OiI-WW_triggerIcon{flex:none;display:inline-flex}.OiI-WW_triggerIcon svg{width:14px;height:14px}.OiI-WW_triggerLabel{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.OiI-WW_optionLabel{align-items:baseline;gap:4px;min-width:0;max-width:100%;display:inline-flex}.OiI-WW_optionLabelText{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.OiI-WW_badge{color:var(--qilin-alias-label-tertiary);letter-spacing:.2px;flex:none;align-self:flex-start;margin-top:-1px;font-size:8px;font-weight:600;line-height:10px}.OiI-WW_chevron{color:var(--qilin-alias-label-caption);flex:none;transition:transform .12s;display:inline-flex}@container (width<=460px){.OiI-WW_trigger:has(.OiI-WW_triggerIcon) .OiI-WW_triggerLabel{display:none}}.OiI-WW_chevronOpen{transform:rotate(180deg)}";
+		const css$1 = ".OiI-WW_trigger{min-width:0;max-width:220px;height:28px;color:var(--qilin-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-radius:24px;outline:none;align-items:center;gap:4px;padding:0 4px 0 8px;font-size:13px;font-weight:500;line-height:20px;display:inline-flex}.OiI-WW_trigger:hover:not(:disabled){background:var(--qilin-alias-interactive-bg-hover)}.OiI-WW_trigger:focus-visible{box-shadow:0 0 0 2px var(--qilin-focus-ring-color,var(--qilin-alias-state-business-primary))}.OiI-WW_trigger:disabled{color:var(--qilin-alias-label-dimmed);cursor:default}.OiI-WW_triggerIcon{flex:none;display:inline-flex}.OiI-WW_triggerIcon svg{width:14px;height:14px}.OiI-WW_triggerLabel{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.OiI-WW_optionLabel{align-items:center;gap:4px;min-width:0;max-width:100%;display:inline-flex}.OiI-WW_optionLabelText{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}.OiI-WW_badge{color:var(--qilin-alias-label-tertiary);letter-spacing:.2px;flex:none;font-size:8px;font-weight:500;line-height:10px}.OiI-WW_chevron{color:var(--qilin-alias-label-caption);flex:none;transition:transform .12s;display:inline-flex}@container (width<=460px){.OiI-WW_trigger:has(.OiI-WW_triggerIcon) .OiI-WW_triggerLabel{display:none}}.OiI-WW_chevronOpen{transform:rotate(180deg)}";
 		const tagId$1 = "@qilin-agent/client-ui-permission-presets/PermissionSelect.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
 			const tag = document.createElement("style");
@@ -403,7 +407,7 @@ window.__ModuleLoader__.load({
 						children: [(0, react_jsx_runtime.jsx)("span", {
 							className: PermissionSelect_module_css_default.optionLabelText,
 							children: label
-						}), (0, react_jsx_runtime.jsx)("sup", {
+						}), (0, react_jsx_runtime.jsx)("span", {
 							className: PermissionSelect_module_css_default.badge,
 							children: badge
 						})]
@@ -439,8 +443,6 @@ window.__ModuleLoader__.load({
 			const confirmationDescription = confirmation === "auto" ? t("auto.confirm.description") : t("confirm.description");
 			const confirmationAcknowledge = confirmation === "auto" ? t("auto.confirm.acknowledge") : t("confirm.acknowledge");
 			const confirmationEnable = confirmation === "auto" ? t("auto.confirm.enable") : t("confirm.enable");
-			const currentBadge = optionBadge(currentValue, t);
-			const currentAccessibleLabel = currentBadge === void 0 ? currentLabel : `${currentLabel} ${currentBadge}`;
 			return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.Menu, {
 				open,
 				items,
@@ -454,7 +456,7 @@ window.__ModuleLoader__.load({
 				anchor: (0, react_jsx_runtime.jsxs)("button", {
 					type: "button",
 					className: PermissionSelect_module_css_default.trigger,
-					"aria-label": t("mode", { name: currentAccessibleLabel }),
+					"aria-label": t("mode", { name: currentLabel }),
 					title: current === void 0 ? void 0 : optionDescription(current, t),
 					disabled: locked || busy,
 					onClick: () => {
@@ -470,10 +472,6 @@ window.__ModuleLoader__.load({
 							className: PermissionSelect_module_css_default.triggerLabel,
 							children: currentLabel
 						}),
-						currentBadge !== void 0 && (0, react_jsx_runtime.jsx)("sup", {
-							className: PermissionSelect_module_css_default.badge,
-							children: currentBadge
-						}),
 						(0, react_jsx_runtime.jsx)("span", {
 							className: clsx(PermissionSelect_module_css_default.chevron, open && PermissionSelect_module_css_default.chevronOpen),
 							"aria-hidden": true,
@@ -547,8 +545,9 @@ window.__ModuleLoader__.load({
 			const selected = state.options.find((option) => option.id === state.currentValue);
 			const busy = state.status === "loading" || state.status === "saving" || confirmingFullAccess;
 			const optionLabel = (option) => displayPermissionPreset(option.id, option.label, t);
-			const label = selected !== void 0 ? optionLabel(selected) : busy ? t("loading") : t("unavailable");
-			const description = state.error ?? t("description");
+			const unset = state.currentValue === "" && state.error === null;
+			const label = selected !== void 0 ? optionLabel(selected) : busy ? t("loading") : t("unset");
+			const description = state.error ?? (unset ? t("unsetDescription") : t("description"));
 			return (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsxs)("div", {
 				className: PermissionRow_module_css_default.row,
 				children: [(0, react_jsx_runtime.jsxs)("div", {
@@ -621,34 +620,33 @@ window.__ModuleLoader__.load({
 		//#region lib/types/client/settings-store.js
 		/**
 		* Permission default-settings controller. The permission descriptor comes
-		* from the shared describe mirror (the dynamic preset enum lives in the
-		* namespace schema, which per-namespace scopes do not carry); writes target
-		* only `defaultPreset`, carry the descriptor revision, and fold their answer
-		* back into the mirror.
+		* from the shared describe mirror and the selectable presets from the shared
+		* permission catalog directory (the namespace schema carries a plain string,
+		* so it cannot enumerate the presets); writes target only `defaultPreset`,
+		* carry the descriptor revision, and fold their answer back into the mirror.
 		*/
 		/** Permission's settings namespace on the host wire. */
 		const PERMISSION_SETTINGS_NS = "permission";
 		/**
-		* Read the dynamic preset enum encoded by the host's `defaultPreset` schema.
+		* Read the new-session default and its selectable presets from the shared
+		* catalog.
 		* @param view - permission namespace descriptor.
-		* @param schema - settings schema operations.
-		* @returns current value and selectable options.
+		* @param catalog - the host's permission catalog.
+		* @returns current value (empty when never set) and selectable options.
 		*/
-		function permissionDefaultOf(view, schema) {
+		function permissionDefaultOf(view, catalog) {
 			const value = view.value?.defaultPreset;
-			if (typeof value !== "string") throw new Error("permission settings has no defaultPreset value");
-			const node = schema.nodeAtPath(schema.rehydrate(view.schema), ["defaultPreset"]);
-			if (node === void 0) throw new Error("permission settings schema has no defaultPreset field");
-			const options = (node.type === "union" ? node.list ?? [] : [node]).flatMap((candidate) => {
-				const choice = candidate;
-				if (choice.type !== "const" || typeof choice.value !== "string") return [];
-				const described = choice.meta?.description;
-				return [{
-					id: choice.value,
-					label: typeof described === "string" && described.length > 0 ? displayPermissionPreset(choice.value, described) : displayPermissionPreset(choice.value, choice.value)
-				}];
-			});
-			if (options.length === 0 || !options.some((option) => option.id === value)) throw new Error("permission settings schema does not advertise its current preset");
+			if (value !== void 0 && typeof value !== "string") throw new Error("permission settings has a non-string defaultPreset value");
+			const options = catalog.defaultOptions.map((option) => ({
+				id: option.value,
+				label: displayPermissionPreset(option.value, option.name)
+			}));
+			if (options.length === 0) throw new Error("permission catalog advertises no default presets");
+			if (value === void 0) return {
+				currentValue: "",
+				options
+			};
+			if (!options.some((option) => option.id === value)) throw new Error("permission settings value does not match any default preset");
 			return {
 				currentValue: value,
 				options
@@ -657,8 +655,8 @@ window.__ModuleLoader__.load({
 		/** Controller deriving the row from the shared mirror and writing the default through it. */
 		var PermissionPresetSettingsController = class {
 			describeFace;
+			catalogFace;
 			ctx;
-			schema;
 			/** Row snapshot consumed through a bound selector hook. */
 			store = (0, _qilin_agent_client_store.createSnapshotStore)({
 				status: "idle",
@@ -672,25 +670,35 @@ window.__ModuleLoader__.load({
 			saving = false;
 			disposed = false;
 			/**
-			* @param describeFace - the shared mirror's read/fold face (descriptor and schema source).
+			* @param describeFace - the shared mirror's read/fold face (descriptor source).
+			* @param catalogFace - the shared catalog directory's store, narrowed.
 			* @param ctx - the row plugin's context, whose `remote.settings` namespace
 			* carries the `defaultPreset` write.
-			* @param schema - settings-owned schema operations.
 			*/
-			constructor(describeFace, ctx, schema) {
+			constructor(describeFace, catalogFace, ctx) {
 				this.describeFace = describeFace;
+				this.catalogFace = catalogFace;
 				this.ctx = ctx;
-				this.schema = schema;
 			}
 			/**
-			* Begin following the mirror (idempotent) and reflect its current answer.
+			* Begin following the mirror and the catalog (idempotent) and reflect their
+			* current answer.
 			* @returns settlement once the snapshot reflects the mirror.
 			*/
 			async load() {
 				if (this.disposed) return;
-				this.following ??= this.describeFace.subscribe(() => {
-					this.derive();
-				});
+				this.following ??= (() => {
+					const stopDescriptor = this.describeFace.subscribe(() => {
+						this.derive();
+					});
+					const stopCatalog = this.catalogFace.subscribe(() => {
+						this.derive();
+					});
+					return () => {
+						stopDescriptor();
+						stopCatalog();
+					};
+				})();
 				this.store.update((state) => {
 					state.status = "loading";
 					state.error = null;
@@ -765,7 +773,9 @@ window.__ModuleLoader__.load({
 					return;
 				}
 				try {
-					const resolved = permissionDefaultOf(view, this.schema);
+					const catalog = this.catalogFace.snapshot();
+					if (catalog === null) return;
+					const resolved = permissionDefaultOf(view, catalog);
 					const { writable } = mirrored.view;
 					this.store.update((state) => {
 						state.status = "ready";
@@ -855,7 +865,10 @@ window.__ModuleLoader__.load({
 				zh,
 				en
 			}), "ui-permission: settings row dictionaries");
-			const controller = new PermissionPresetSettingsController(ctx.configForms.describe(), ctx, ctx.settingsSchema);
+			const controller = new PermissionPresetSettingsController(ctx.configForms.describe(), {
+				snapshot: () => catalog.store.getSnapshot().value,
+				subscribe: (listener) => catalog.store.subscribe(listener)
+			}, ctx);
 			const load = () => controller.load();
 			const select = (preset) => controller.select(preset);
 			const injected = () => ({

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

@@ -5,6 +5,8 @@ export declare const PERMISSION_ACCESS_NS = "permission.access";
 export declare const zh: {
     title: string;
     description: string;
+    unset: string;
+    unsetDescription: string;
     loading: string;
     unavailable: string;
     'preset.readOnly': string;
@@ -22,6 +24,8 @@ export type PermissionSettingsKey = keyof typeof zh;
 export declare const en: {
     title: string;
     description: string;
+    unset: string;
+    unsetDescription: string;
     loading: string;
     unavailable: string;
     'preset.readOnly': string;

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

@@ -1,14 +1,15 @@
 /**
  * Permission default-settings controller. The permission descriptor comes
- * from the shared describe mirror (the dynamic preset enum lives in the
- * namespace schema, which per-namespace scopes do not carry); writes target
- * only `defaultPreset`, carry the descriptor revision, and fold their answer
- * back into the mirror.
+ * from the shared describe mirror and the selectable presets from the shared
+ * permission catalog directory (the namespace schema carries a plain string,
+ * so it cannot enumerate the presets); writes target only `defaultPreset`,
+ * carry the descriptor revision, and fold their answer back into the mirror.
  */
 import type { Context as ClientContext } from '@qilin-agent/kylin';
 import type { SettingsNamespaceView } from '@qilin-agent/api-remotes/client';
 import { type SnapshotStore } from '@qilin-agent/client-store';
-import type { SettingsDescribeFace, SettingsSchemaService } from '@qilin-agent/client-ui-settings/client';
+import type { PermissionCatalog } from '@qilin-agent/permission-presets/client';
+import type { SettingsDescribeFace } from '@qilin-agent/client-ui-settings/client';
 /** Permission's settings namespace on the host wire. */
 export declare const PERMISSION_SETTINGS_NS = "permission";
 /** One selectable new-session default. */
@@ -27,35 +28,44 @@ export interface PermissionSettingsState {
     options: readonly PermissionDefaultOption[];
     revision: number;
 }
+/** Catalog face the row follows: the shared directory's store, narrowed. */
+export interface PermissionCatalogFace {
+    /** Latest complete catalog, or null before the first read settles. */
+    snapshot(): PermissionCatalog | null;
+    /** Subscribe to catalog publications; returns the disposer. */
+    subscribe(listener: () => void): () => void;
+}
 /**
- * Read the dynamic preset enum encoded by the host's `defaultPreset` schema.
+ * Read the new-session default and its selectable presets from the shared
+ * catalog.
  * @param view - permission namespace descriptor.
- * @param schema - settings schema operations.
- * @returns current value and selectable options.
+ * @param catalog - the host's permission catalog.
+ * @returns current value (empty when never set) and selectable options.
  */
-export declare function permissionDefaultOf(view: SettingsNamespaceView, schema: SettingsSchemaService): {
+export declare function permissionDefaultOf(view: SettingsNamespaceView, catalog: PermissionCatalog): {
     currentValue: string;
     options: PermissionDefaultOption[];
 };
 /** Controller deriving the row from the shared mirror and writing the default through it. */
 export declare class PermissionPresetSettingsController {
     private readonly describeFace;
+    private readonly catalogFace;
     private readonly ctx;
-    private readonly schema;
     /** Row snapshot consumed through a bound selector hook. */
     readonly store: SnapshotStore<PermissionSettingsState>;
     private following;
     private saving;
     private disposed;
     /**
-     * @param describeFace - the shared mirror's read/fold face (descriptor and schema source).
+     * @param describeFace - the shared mirror's read/fold face (descriptor source).
+     * @param catalogFace - the shared catalog directory's store, narrowed.
      * @param ctx - the row plugin's context, whose `remote.settings` namespace
      * carries the `defaultPreset` write.
-     * @param schema - settings-owned schema operations.
      */
-    constructor(describeFace: SettingsDescribeFace, ctx: ClientContext, schema: SettingsSchemaService);
+    constructor(describeFace: SettingsDescribeFace, catalogFace: PermissionCatalogFace, ctx: ClientContext);
     /**
-     * Begin following the mirror (idempotent) and reflect its current answer.
+     * Begin following the mirror and the catalog (idempotent) and reflect their
+     * current answer.
      * @returns settlement once the snapshot reflects the mirror.
      */
     load(): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qilin-agent/client-ui-permission-presets",
   "description": "Permission surfaces: a new-session default in General settings and a current-session /permission popup over the permissions projection",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "publishConfig": {
     "access": "public"
   },
@@ -44,29 +44,29 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@qilin-agent/kylin": "~4.0.3"
+    "@qilin-agent/kylin": "~4.0.5"
   },
   "devDependencies": {
     "@types/react": "~18.3.1",
     "clsx": "^2.0.0",
     "react": "^18.2.0",
-    "@qilin-agent/remote-mock": "3.1.5",
-    "@qilin-agent/kylin": "~4.0.3",
-    "@qilin-agent/api-remotes": "3.1.5",
-    "@qilin-agent/api-session-controller": "3.1.5",
-    "@qilin-agent/client-connection": "3.1.5",
-    "@qilin-agent/client-store": "3.1.5",
-    "@qilin-agent/client-locale": "3.1.5",
-    "@qilin-agent/client-test-runtime": "3.1.5",
-    "@qilin-agent/client-ui-conversation": "3.1.5",
-    "@qilin-agent/client-ui-commands": "3.1.5",
-    "@qilin-agent/client-ui-primitives": "3.1.5",
-    "@qilin-agent/client-ui-settings": "3.1.5",
-    "@qilin-agent/client-ui-slots": "3.1.5",
-    "@qilin-agent/client-ui-input-trigger": "3.1.5",
-    "@qilin-agent/permission-presets": "3.1.5",
-    "@qilin-agent/client-ui-renderer": "3.1.5",
-    "@qilin-agent/client-ui-session": "3.1.5"
+    "@qilin-agent/kylin": "~4.0.5",
+    "@qilin-agent/api-session-controller": "3.1.6",
+    "@qilin-agent/remote-mock": "3.1.6",
+    "@qilin-agent/client-connection": "3.1.6",
+    "@qilin-agent/api-remotes": "3.1.6",
+    "@qilin-agent/client-locale": "3.1.6",
+    "@qilin-agent/client-store": "3.1.6",
+    "@qilin-agent/client-test-runtime": "3.1.6",
+    "@qilin-agent/client-ui-commands": "3.1.6",
+    "@qilin-agent/client-ui-primitives": "3.1.6",
+    "@qilin-agent/client-ui-input-trigger": "3.1.6",
+    "@qilin-agent/permission-presets": "3.1.6",
+    "@qilin-agent/client-ui-renderer": "3.1.6",
+    "@qilin-agent/client-ui-session": "3.1.6",
+    "@qilin-agent/client-ui-settings": "3.1.6",
+    "@qilin-agent/client-ui-slots": "3.1.6",
+    "@qilin-agent/client-ui-conversation": "3.1.6"
   },
   "files": [
     "lib/index.js",