@deepseek-ai/dsh-client-ui-sidebar-right 0.2.0-rc.2 → 0.2.1-alpha.2

package/README.i18n.yaml

@@ -51,5 +51,5 @@
   en: 76a763b4dd71babd
   zh: fdc966dd427a82fb
 /deepseek-ai-dsh-client-ui-sidebar-right/known-limitations-and-deferred-work/dev-note:
-  en: 9fcbcccf09b43c5d
-  zh: 224b8a0881ab6890
+  en: e67f633dc6fe7773
+  zh: e88aeb617ffb74ea

package/README.md

@@ -155,5 +155,3 @@ None; this package neither assembles nor sends a provider request.
 None.
 
 </details>
-
-**Runtime invariant:** No companion is published. The two services (`sidebarRight`, `sidebarRightTabs`) are provided through `ctx.reflect.provide` inside one effect and torn down with it; the on-screen Session and the Tab domain's occurrence lifetimes are asserted directly by this package's specs, and no independent observation exists to diverge from them.

package/README.zh.md

@@ -155,5 +155,3 @@ Tab 域按（Session，Tab id）保留品牌化 occurrence id、导航、中止
 无。
 
 </details>
-
-**运行时不变量：** 不发布 companion。两个服务（`sidebarRight`、`sidebarRightTabs`）在同一个 effect 内经 `ctx.reflect.provide` 提供并随之拆除；屏幕上的会话与 Tab 域 occurrence 的生命周期由本包的 spec 直接断言，不存在会与之分歧的独立观察。

package/lib/client.js

@@ -5557,12 +5557,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				"data-sidebar-right-tab": tab.id,
 				"data-sidebar-right-occurrence": id,
 				children: content
-			}) : (0, react_jsx_runtime.jsx)("div", {
+			}, id) : (0, react_jsx_runtime.jsx)("div", {
 				className: SidebarRight_module_css_default.tabBody,
 				"data-sidebar-right-tab": tab.id,
 				"data-sidebar-right-occurrence": id,
 				children: content
-			});
+			}, id);
 		}
 		/**
 		* Dispatch a tab's body to its registered type.
@@ -5680,7 +5680,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				"data-sidebar-right-session": sessionId,
 				"data-sidebar-right-panel": fullscreen ? "fullscreen" : "push",
 				"data-sidebar-right-open": expanded || void 0,
-				"aria-hidden": !expanded || void 0,
+				"aria-hidden": !expanded && surface.layout.floats.length === 0 || void 0,
 				children: (0, react_jsx_runtime.jsx)("div", {
 					className: SidebarRight_module_css_default.panelBody,
 					children: (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_dockkit.DockLayout, {
@@ -6480,7 +6480,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 				const layout = surface?.layout;
 				const replaced = placement.replaceTab === void 0 ? void 0 : layout?.tabs[placement.replaceTab];
-				const revealed = layout === void 0 || placement.revealIfOpened === false ? void 0 : (0, _deepseek_ai_dsh_client_ui_dockkit.findContentTab)(layout, claim.contentId, claim.kind);
+				const replacementPane = replaced === void 0 || layout === void 0 ? void 0 : (0, _deepseek_ai_dsh_client_ui_dockkit.findTabPane)(layout, replaced.id);
+				const revealed = layout === void 0 ? void 0 : claim.contentId === pageAddress(claim.kind) ? (0, _deepseek_ai_dsh_client_ui_dockkit.findPaneContentTab)(layout, replacementPane?.host === "dock" ? replacementPane.id : placement.paneId ?? (0, _deepseek_ai_dsh_client_ui_dockkit.activeDockPaneId)(layout), claim.contentId, claim.kind) : placement.revealIfOpened === false ? void 0 : (0, _deepseek_ai_dsh_client_ui_dockkit.findContentTab)(layout, claim.contentId, claim.kind);
 				if (replaced === void 0 || replaced.id === revealed) {
 					commit();
 					return;
@@ -6752,7 +6753,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}
 		};
 		//#endregion
-		//#region ../../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/constants.js
+		//#region ../../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/constants.js
 		var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			const WIN_SLASH = "\\\\/";
 			const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
@@ -6921,7 +6922,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			};
 		}));
 		//#endregion
-		//#region ../../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/utils.js
+		//#region ../../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/utils.js
 		var require_utils = /* @__PURE__ */ __commonJSMin(((exports) => {
 			const { REGEX_BACKSLASH, REGEX_REMOVE_BACKSLASH, REGEX_SPECIAL_CHARS, REGEX_SPECIAL_CHARS_GLOBAL } = require_constants();
 			exports.isObject = (val) => val !== null && typeof val === "object" && !Array.isArray(val);
@@ -6969,7 +6970,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			};
 		}));
 		//#endregion
-		//#region ../../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/scan.js
+		//#region ../../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/scan.js
 		var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			const utils = require_utils();
 			const { CHAR_ASTERISK, CHAR_AT, CHAR_BACKWARD_SLASH, CHAR_COMMA, CHAR_DOT, CHAR_EXCLAMATION_MARK, CHAR_FORWARD_SLASH, CHAR_LEFT_CURLY_BRACE, CHAR_LEFT_PARENTHESES, CHAR_LEFT_SQUARE_BRACKET, CHAR_PLUS, CHAR_QUESTION_MARK, CHAR_RIGHT_CURLY_BRACE, CHAR_RIGHT_PARENTHESES, CHAR_RIGHT_SQUARE_BRACKET } = require_constants();
@@ -6998,7 +6999,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const scan = (input, options) => {
 				const opts = options || {};
 				const length = input.length - 1;
-				const scanToEnd = opts.parts === true || opts.scanToEnd === true;
+				const scanToEnd = opts.parts === true || opts.tokens === true || opts.scanToEnd === true;
 				const slashes = [];
 				const tokens = [];
 				const parts = [];
@@ -7101,14 +7102,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							finished = true;
 							if (code === CHAR_EXCLAMATION_MARK && index === start) negatedExtglob = true;
 							if (scanToEnd === true) {
+								let parens = 0;
 								while (eos() !== true && (code = advance())) {
 									if (code === CHAR_BACKWARD_SLASH) {
 										backslashes = token.backslashes = true;
-										code = advance();
+										advance();
+										continue;
+									}
+									if (code === CHAR_LEFT_PARENTHESES) {
+										parens++;
 										continue;
 									}
-									if (code === CHAR_RIGHT_PARENTHESES) {
-										isGlob = token.isGlob = true;
+									if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
 										finished = true;
 										break;
 									}
@@ -7156,13 +7161,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
 						isGlob = token.isGlob = true;
 						if (scanToEnd === true) {
+							let parens = 1;
 							while (eos() !== true && (code = advance())) {
-								if (code === CHAR_LEFT_PARENTHESES) {
+								if (code === CHAR_BACKWARD_SLASH) {
 									backslashes = token.backslashes = true;
-									code = advance();
+									advance();
 									continue;
 								}
-								if (code === CHAR_RIGHT_PARENTHESES) {
+								if (code === CHAR_LEFT_PARENTHESES) {
+									parens++;
+									continue;
+								}
+								if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
 									finished = true;
 									break;
 								}
@@ -7225,7 +7235,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				if (opts.parts === true || opts.tokens === true) {
 					let prevIndex;
 					for (let idx = 0; idx < slashes.length; idx++) {
-						const n = prevIndex ? prevIndex + 1 : start;
+						const n = prevIndex !== void 0 ? prevIndex + 1 : start;
 						const i = slashes[idx];
 						const value = input.slice(n, i);
 						if (opts.tokens) {
@@ -7236,18 +7246,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							depth(tokens[idx]);
 							state.maxDepth += tokens[idx].depth;
 						}
-						if (idx !== 0 || value !== "") parts.push(value);
-						prevIndex = i;
-					}
-					if (prevIndex && prevIndex + 1 < input.length) {
-						const value = input.slice(prevIndex + 1);
-						parts.push(value);
-						if (opts.tokens) {
-							tokens[tokens.length - 1].value = value;
-							depth(tokens[tokens.length - 1]);
-							state.maxDepth += tokens[tokens.length - 1].depth;
+						if (i >= start) {
+							parts.push(value);
+							prevIndex = i;
 						}
 					}
+					const n = prevIndex !== void 0 ? prevIndex + 1 : start;
+					const value = input.slice(n);
+					parts.push(value);
+					if (opts.tokens && prevIndex && prevIndex + 1 < input.length) {
+						tokens[tokens.length - 1].value = value;
+						depth(tokens[tokens.length - 1]);
+						state.maxDepth += tokens[tokens.length - 1].depth;
+					}
 					state.slashes = slashes;
 					state.parts = parts;
 				}
@@ -7256,7 +7267,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			module.exports = scan;
 		}));
 		//#endregion
-		//#region ../../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/parse.js
+		//#region ../../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/parse.js
 		var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			const constants = require_constants();
 			const utils = require_utils();
@@ -7411,7 +7422,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					}
 				}
 			};
-			const getStarExtglobSequenceOutput = (pattern) => {
+			const buildCharClassStar = (chars) => {
+				return `${chars.length === 1 ? utils.escapeRegex(chars[0]) : `[${chars.map((ch) => utils.escapeRegex(ch)).join("")}]`}*`;
+			};
+			const getStarExtglobSequenceChars = (pattern) => {
 				let index = 0;
 				const chars = [];
 				while (index < pattern.length) {
@@ -7425,7 +7439,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					index += match.end + 1;
 				}
 				if (chars.length < 1) return;
-				return `${chars.length === 1 ? utils.escapeRegex(chars[0]) : `[${chars.map((ch) => utils.escapeRegex(ch)).join("")}]`}*`;
+				return chars;
 			};
 			const repeatedExtglobRecursion = (pattern) => {
 				let depth = 0;
@@ -7445,14 +7459,28 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				if (branches.length > 1) {
 					if (branches.some((branch) => branch === "") || branches.some((branch) => /^[*?]+$/.test(branch)) || hasRepeatedCharPrefixOverlap(branches)) return { risky: true };
 				}
+				const safeChars = [];
+				let sawStarSequence = false;
+				let combinable = true;
 				for (const branch of branches) {
-					const safeOutput = getStarExtglobSequenceOutput(branch);
-					if (safeOutput) return {
-						risky: true,
-						safeOutput
-					};
+					const chars = getStarExtglobSequenceChars(branch);
+					if (chars) {
+						sawStarSequence = true;
+						safeChars.push(...chars);
+						continue;
+					}
+					const literal = normalizeSimpleBranch(branch);
+					if (literal && literal.length === 1) {
+						safeChars.push(literal);
+						continue;
+					}
+					combinable = false;
 					if (repeatedExtglobRecursion(branch) > max) return { risky: true };
 				}
+				if (sawStarSequence) return combinable ? {
+					risky: true,
+					safeOutput: buildCharClassStar([...new Set(safeChars)])
+				} : { risky: true };
 				return { risky: false };
 			};
 			/**
@@ -8137,6 +8165,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							rest = rest.slice(3);
 							consume("/**", 3);
 						}
+						const isEnd = eos() || state.parens > 0 && rest === ")".repeat(state.parens) && !extglobs.some((extglob) => extglob.type === "negate");
 						if (prior.type === "bos" && eos()) {
 							prev.type = "globstar";
 							prev.value += value;
@@ -8146,7 +8175,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							consume(value);
 							continue;
 						}
-						if (prior.type === "slash" && prior.prev.type !== "bos" && !afterStar && eos()) {
+						if (prior.type === "slash" && prior.prev.type !== "bos" && !afterStar && isEnd) {
 							state.output = state.output.slice(0, -(prior.output + prev.output).length);
 							prior.output = `(?:${prior.output}`;
 							prev.type = "globstar";
@@ -8311,7 +8340,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			module.exports = parse;
 		}));
 		//#endregion
-		//#region ../../../node_modules/.pnpm/picomatch@4.0.4/node_modules/picomatch/lib/picomatch.js
+		//#region ../../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/picomatch.js
 		var require_picomatch = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			const scan = require_scan();
 			const parse = require_parse();
@@ -8332,6 +8361,18 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			* const isMatch = picomatch('*.!(*a)');
 			* console.log(isMatch('a.a')); //=> false
 			* console.log(isMatch('a.b')); //=> true
+			*
+			* // For environments without `node.js`, `picomatch/posix` provides you a dependency-free matcher, without automatic OS detection.
+			* const picomatch = require('picomatch/posix');
+			* // the same API, defaulting to posix paths
+			* const isMatch = picomatch('a/*');
+			* console.log(isMatch('a\\b')); //=> false
+			* console.log(isMatch('a/b')); //=> true
+			*
+			* // you can still configure the matcher function to accept windows paths
+			* const isMatch = picomatch('a/*', { options: windows });
+			* console.log(isMatch('a\\b')); //=> true
+			* console.log(isMatch('a/b')); //=> true
 			* ```
 			* @name picomatch
 			* @param {String|Array} `globs` One or more glob patterns.
@@ -8450,8 +8491,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			* @return {Boolean}
 			* @api public
 			*/
-			picomatch.matchBase = (input, glob, options) => {
-				return (glob instanceof RegExp ? glob : picomatch.makeRe(glob, options)).test(utils.basename(input));
+			picomatch.matchBase = (input, glob, options, posix = options && options.windows) => {
+				return (glob instanceof RegExp ? glob : picomatch.makeRe(glob, options)).test(utils.basename(input, { windows: posix }));
 			};
 			/**
 			* Returns true if **any** of the given glob `patterns` match the specified `string`.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-client-ui-sidebar-right",
   "description": "Right Sidebar: the docking surface's session-bound state, its panel and header expand control, and the navigation service over it",
-  "version": "0.2.0-rc.2",
+  "version": "0.2.1-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -40,35 +40,35 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/cordis": "~4.0.4"
+    "@deepseek-ai/cordis": "~4.0.5-alpha.1"
   },
   "devDependencies": {
-    "@testing-library/react": "^16.1.0",
-    "@types/picomatch": "^4.0.2",
+    "@deepseek-ai/cordis": "~4.0.5-alpha.1",
+    "@deepseek-ai/dsh-api-session-controller": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-resources": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-store": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-test-runtime": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-dockkit": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-layout": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-session": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-session": "0.2.1-alpha.2",
+    "@testing-library/react": "^16.3.3",
+    "@types/picomatch": "^4.0.3",
     "@types/react": "~18.3.1",
     "@types/react-dom": "~18.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "picomatch": "^4.0.4",
+    "picomatch": "^4.0.7",
     "clsx": "^2.0.0",
+    "@deepseek-ai/dsh-util-crypto": "0.2.1-alpha.2",
     "zod": "^4.4.3",
-    "@deepseek-ai/dsh-api-session-controller": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-resources": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-test-runtime": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-store": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-dockkit": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-session": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-session": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-util-crypto": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-shortcuts": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-brand": "0.2.0-rc.2",
-    "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-client-ui-layout": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2"
+    "@deepseek-ai/dsh-client-shortcuts": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-brand": "0.2.1-alpha.2"
   },
   "files": [
     "lib/index.js",