@jingyi0605/codingns4dsh 0.2.2-beta.4 → 0.2.2-beta.5

package/README.en.md

@@ -11,7 +11,7 @@
 
 [简体中文](README.md) · **English**
 
-**Current release `@jingyi0605/codingns4dsh@0.2.2-beta.4`** · DSH minimum **`0.2.1-alpha.2`** (tested with `0.2.2-rc.1`; newer versions warn but do not block installation or operation) · Node **`>= 24.9`** · macOS / Linux / Windows
+**Current release `@jingyi0605/codingns4dsh@0.2.2-beta.5`** · DSH minimum **`0.2.1-alpha.2`** (tested with `0.2.2-rc.1`; newer versions warn but do not block installation or operation) · Node **`>= 24.9`** · macOS / Linux / Windows
 
 **[GitHub](https://github.com/jingyi0605/Codingns4DSH)** · **[npm](https://www.npmjs.com/package/@jingyi0605/codingns4dsh)** · **QQ group 1092985965** · **[WeChat / QQ QR codes](#community)**
 
@@ -225,7 +225,7 @@ The account menu shows login status, access method, connection latency and Host
 ### Use the Built-in Web Profile
 
 ```bash
-dsh plugin --profile web add @jingyi0605/codingns4dsh@0.2.2-beta.4
+dsh plugin --profile web add @jingyi0605/codingns4dsh@0.2.2-beta.5
 dsh web
 ```
 
@@ -235,7 +235,7 @@ Create a separate environment from the built-in Web profile:
 
 ```bash
 dsh codingns --from-default-profile web --dump-config
-dsh plugin --profile codingns add @jingyi0605/codingns4dsh@0.2.2-beta.4
+dsh plugin --profile codingns add @jingyi0605/codingns4dsh@0.2.2-beta.5
 dsh codingns
 ```
 

package/README.md

@@ -11,7 +11,7 @@
 
 **简体中文** · [English](README.en.md)
 
-**当前版本 `@jingyi0605/codingns4dsh@0.2.2-beta.4`** · DSH 最低版本 **`0.2.1-alpha.2`**（已验证 `0.2.2-rc.1`；更新版本仅告警，不阻止安装或运行）· Node **`>= 24.9`** · macOS / Linux / Windows
+**当前版本 `@jingyi0605/codingns4dsh@0.2.2-beta.5`** · DSH 最低版本 **`0.2.1-alpha.2`**（已验证 `0.2.2-rc.1`；更新版本仅告警，不阻止安装或运行）· Node **`>= 24.9`** · macOS / Linux / Windows
 
 **[GitHub](https://github.com/jingyi0605/Codingns4DSH)** · **[npm](https://www.npmjs.com/package/@jingyi0605/codingns4dsh)** · **QQ 群 1092985965** · **[微信群 / QQ 群二维码](#交流群)**
 
@@ -244,7 +244,7 @@ DSH 原生会话的翻译默认关闭，可在会话模型选择菜单中开启
 ### 使用内置 Web 配置
 
 ```bash
-dsh plugin --profile web add @jingyi0605/codingns4dsh@0.2.2-beta.4
+dsh plugin --profile web add @jingyi0605/codingns4dsh@0.2.2-beta.5
 dsh web
 ```
 
@@ -254,7 +254,7 @@ dsh web
 
 ```bash
 dsh codingns --from-default-profile web --dump-config
-dsh plugin --profile codingns add @jingyi0605/codingns4dsh@0.2.2-beta.4
+dsh plugin --profile codingns add @jingyi0605/codingns4dsh@0.2.2-beta.5
 dsh codingns
 ```
 

package/data/build/dist/client/bundle.js

@@ -5704,7 +5704,7 @@ window.__ModuleLoader__.load({
 			return /^0\.1\.5(?:-|$)/u.test(version);
 		}
 		/** Codingns4DSH 插件自身的 npm 版本。 */
-		const CODINGNS_VERSION = "0.2.2-beta.4";
+		const CODINGNS_VERSION = "0.2.2-beta.5";
 		/** Accept any valid host version at or above the supported minimum. */
 		function isDshVersionCompatible(version) {
 			return isDshVersionAtLeast(version, minimumSupportedDshVersion());
@@ -21288,6 +21288,7 @@ window.__ModuleLoader__.load({
 			return {
 				kind: "legacy",
 				mount: (register) => register(),
+				mountAssistant: (register) => register(),
 				projectText: exports.projectUserText,
 				userContent: () => null,
 				images: (owner, props) => owner.renderMessageImages(props)
@@ -21299,6 +21300,11 @@ window.__ModuleLoader__.load({
 			return {
 				kind: "factory",
 				mount: (register) => slots.inject("conversation.user.text.node", () => slots.inject("conversation.chat.user.images", register)),
+				mountAssistant: (register) => {
+					const registry = slots;
+					if (typeof registry.entries !== "function" || typeof registry.subscribe !== "function") return register();
+					return followPresentationEntry(registry, "conversation.chat.node", (entry) => entry.options.key === "assistant-step" && (entry.options.priority ?? 0) >= 0, (entry) => register(entry.inject));
+				},
 				projectText: () => null,
 				userContent: (owner, content, facts) => owner.renderFactorySlot("conversation.chat.user.content", {
 					content,
@@ -21859,6 +21865,7 @@ window.__ModuleLoader__.load({
 		const CLAUDE_PERFORMANCE_PROJECTION = "codingnsClaudeStats";
 		const GROK_PERFORMANCE_PROJECTION = "codingnsGrokStats";
 		const GROK_CONTEXT_PROJECTION = "codingnsGrokContext";
+		const PI_PERFORMANCE_PROJECTION = "codingnsPiStats";
 		// src/dsh-capabilities/client/composer-slot-selectors.ts
 		/** Keep DOM consumers aligned with the context presentation's owned child slots. */
 		function contextComposerSlotName(name) {
@@ -21960,8 +21967,8 @@ window.__ModuleLoader__.load({
 							useProjection: (key, ...args) => {
 								const original = props.useProjection(key, ...args);
 								if (key !== "sessionStats") return original;
-								const value = props.useProjection(adapter === "grok" ? GROK_PERFORMANCE_PROJECTION : adapter === "claude-code" ? CLAUDE_PERFORMANCE_PROJECTION : CODEX_PERFORMANCE_PROJECTION, ...args);
-								if (adapter !== "codex" && adapter !== "grok" && adapter !== "claude-code") return original;
+								const value = props.useProjection(adapter === "grok" ? GROK_PERFORMANCE_PROJECTION : adapter === "claude-code" ? CLAUDE_PERFORMANCE_PROJECTION : adapter === "pi" ? PI_PERFORMANCE_PROJECTION : CODEX_PERFORMANCE_PROJECTION, ...args);
+								if (adapter !== "codex" && adapter !== "grok" && adapter !== "claude-code" && adapter !== "pi") return original;
 								return value ?? {
 									turns: 0,
 									steps: 0,
@@ -29239,7 +29246,14 @@ window.__ModuleLoader__.load({
 .codingns-magpie-page{--mp-topbar-pad-x:16px;--mp-topbar-pad-y:0px;--mp-leading-inset:0px;padding-left:var(--dsh-frame-leading-clearance,0px)}
 .codingns-magpie-topbar{padding-right:var(--mp-topbar-pad-x);padding-left:calc(var(--mp-topbar-pad-x) + var(--mp-leading-inset))}
 html[data-codingns-mobile-sidebar="on"] .codingns-magpie-page{padding-left:0;--mp-leading-inset:max(0px,calc(var(--dsh-frame-leading-clearance,0px) - 20px))}
-@media(max-width:900px){.codingns-magpie-topbar{--mp-topbar-pad-x:14px;--mp-topbar-pad-y:9px}.codingns-magpie-topbar-left{margin-left:calc(-1 * var(--mp-leading-inset))}}
+/* DSH 0.2.2 narrow-screen drawer mode: the sidebar is an overlay drawer, and DSH pads a
+   global panel's top by 48px (minus the window top clearance) so content starts below its
+   floating toggle button. Instead of leaving that strip empty, pull the page up into it so
+   the tab bar shares the toggle button's row, and start that row after the button via the
+   leading clearance DSH publishes (--mp-leading-inset = clearance - topbar padding). The
+   page is not indented as a whole. Kept after the rule above (same specificity) so it wins
+   when both modes are active. */
+html [data-sidebar-drawer] .codingns-magpie-page{--mp-pull:max(0px,calc(48px - var(--dsh-frame-top-clearance,0px)));--mp-leading-inset:max(0px,calc(var(--dsh-frame-leading-clearance,0px) - 12px));padding-left:0;margin-top:calc(-1 * var(--mp-pull));height:calc(100% + var(--mp-pull))}@media(max-width:900px){.codingns-magpie-topbar{--mp-topbar-pad-x:14px;--mp-topbar-pad-y:9px}.codingns-magpie-topbar-left{margin-left:calc(-1 * var(--mp-leading-inset))}}
 @media(max-width:650px){.codingns-magpie-topbar{--mp-topbar-pad-x:12px;--mp-topbar-pad-y:8px}.codingns-magpie-icon-button{width:36px;height:36px}.codingns-magpie-toolbar:not(.has-tabs){display:none}.codingns-magpie-view{padding:14px 12px 30px}.codingns-magpie-statstrip{grid-template-columns:repeat(2,minmax(0,1fr))}.codingns-magpie-statcell{padding:13px;border-left:0}.codingns-magpie-statcell:nth-child(2n){border-left:.5px solid var(--mp-line)}.codingns-magpie-statcell:nth-child(n+3){border-top:.5px solid var(--mp-line)}.codingns-magpie-statcell:last-child:nth-child(odd){grid-column:1/-1}.codingns-magpie-statcell-value{font-size:${uiFontSize(22)}}.codingns-magpie-barchart-plot{height:132px}.codingns-magpie-barchart-axis{display:grid;grid-auto-flow:column;grid-auto-columns:minmax(0,1fr);gap:0;overflow:hidden;font-size:${uiFontSize(9)}}.codingns-magpie-barchart-tick{overflow:hidden;text-overflow:clip}}
 .codingns-magpie-reqlist{display:none}
 .codingns-magpie-reqcard{display:flex;flex-direction:column;gap:5px;padding:11px 14px;border-top:.5px solid var(--mp-line)}
@@ -32193,7 +32207,7 @@ html[data-codingns-mobile-sidebar="on"] .codingns-magpie-page{padding-left:0;--m
 							sessionId: props.sessionId?.trim() ?? "",
 							adapterId,
 							...providerId === null ? {} : { providerId }
-						}) : await require_magpie_model_tag.callCliRpc(props.rpc, "magpie/usage/reset", { user: resetTargetUser });
+						}) : await callMagpieRpc(props.rpc, "usage/reset", { user: resetTargetUser });
 						if (result === null) throw new Error(t("usage.resetFailed"));
 						setResetResult(result.outcome);
 						if (adapterId !== null) invalidateSubscriptionUsageCache(subscriptionUsageCache, adapterId, providerId);
@@ -32216,7 +32230,7 @@ html[data-codingns-mobile-sidebar="on"] .codingns-magpie-page{padding-left:0;--m
 				const key = `${user}:${policy}`;
 				if (magpiePolicyPending !== null) return;
 				setMagpiePolicyPending(key);
-				require_magpie_model_tag.callCliRpc(props.rpc, "magpie/usage/account/update", {
+				callMagpieRpc(props.rpc, "usage/account/update", {
 					user,
 					policy,
 					enabled
@@ -32417,7 +32431,7 @@ html[data-codingns-mobile-sidebar="on"] .codingns-magpie-page{padding-left:0;--m
 				[t("usage.magpieCacheReadTokens"), formatMagpieTokenCount(usage.aggregate.cacheReadTokens) ?? t("usage.upstreamNotProvided")],
 				[t("usage.magpieCacheWriteTokens"), formatMagpieTokenCount(usage.aggregate.cacheWriteTokens) ?? t("usage.upstreamNotProvided")],
 				[t("usage.magpieTotalTokens"), formatMagpieTokenCount(sumKnownCounts(usage.aggregate.inputTokens, usage.aggregate.outputTokens))],
-				[t("usage.magpieCacheHitRate"), formatMagpieCacheHitRate(usage.aggregate.inputTokens, usage.aggregate.cacheReadTokens) ?? t("usage.upstreamNotProvided")],
+				[t("usage.magpieCacheHitRate"), formatMagpieCacheHitRate(usage.aggregate.inputTokens, usage.aggregate.cacheReadTokens, usage.aggregate.cacheWriteTokens, usage.aggregate.cacheUnknownTokens) ?? t("usage.upstreamNotProvided")],
 				[t("usage.magpieCost"), formatMagpieCost(usage.aggregate.costUsd)]
 			];
 			const sessionRows = usage.session === null ? [] : [
@@ -32428,7 +32442,7 @@ html[data-codingns-mobile-sidebar="on"] .codingns-magpie-page{padding-left:0;--m
 				[t("usage.magpieCacheReadTokens"), formatMagpieTokenCount(usage.session.cacheReadTokens) ?? t("usage.upstreamNotProvided")],
 				[t("usage.magpieCacheWriteTokens"), formatMagpieTokenCount(usage.session.cacheWriteTokens) ?? t("usage.upstreamNotProvided")],
 				[t("usage.magpieTotalTokens"), formatMagpieTokenCount(sumKnownCounts(usage.session.inputTokens, usage.session.outputTokens))],
-				[t("usage.magpieCacheHitRate"), formatMagpieCacheHitRate(usage.session.inputTokens, usage.session.cacheReadTokens) ?? t("usage.upstreamNotProvided")],
+				[t("usage.magpieCacheHitRate"), formatMagpieCacheHitRate(usage.session.inputTokens, usage.session.cacheReadTokens, usage.session.cacheWriteTokens, usage.session.cacheUnknownTokens) ?? t("usage.upstreamNotProvided")],
 				[t("usage.magpieCost"), formatMagpieCost(usage.session.costUsd)]
 			];
 			const quotas = usage.quotas ?? [];
@@ -32845,9 +32859,9 @@ html[data-codingns-mobile-sidebar="on"] .codingns-magpie-page{padding-left:0;--m
 		function formatMagpieCost(value) {
 			return value === null ? null : `$${value.toFixed(value >= .01 ? 2 : 4)}`;
 		}
-		function formatMagpieCacheHitRate(inputTokens, cacheReadTokens) {
-			if (inputTokens === null || cacheReadTokens === null) return null;
-			const totalPromptTokens = inputTokens + cacheReadTokens;
+		function formatMagpieCacheHitRate(inputTokens, cacheReadTokens, cacheWriteTokens, cacheUnknownTokens) {
+			if (inputTokens === null || cacheReadTokens === null || cacheWriteTokens === null || cacheUnknownTokens === null) return null;
+			const totalPromptTokens = inputTokens + cacheReadTokens + cacheWriteTokens - (cacheUnknownTokens ?? 0);
 			return totalPromptTokens <= 0 ? null : formatSub2ApiPercent(cacheReadTokens / totalPromptTokens * 100);
 		}
 		function sumKnownCounts(left, right) {
@@ -64960,7 +64974,8 @@ button[${ACCOUNT_ATTRIBUTE}]:focus-visible{outline:2px solid ${dshThemeColor.lab
 			} : void 0;
 			const mentions = fileOwner === void 0 || typeof props.fileMentions !== "function" ? void 0 : props.fileMentions(fileOwner);
 			const turnProcess = props.turnProcess;
-			const reasoningHidden = turnProcess !== void 0 && turnProcess.foldable === true && turnProcess.spec?.answerStep === data.step && turnProcess.spec?.inlineReasoning === true && turnProcess.open !== true;
+			const keepReplies = props.usePresentation?.((policy) => policy.foldedReplies === "all") === true;
+			const reasoningHidden = turnProcess !== void 0 && turnProcess.foldable === true && (keepReplies ? props.groupPart !== "reasoning" : turnProcess.spec?.answerStep === data.step && turnProcess.spec?.inlineReasoning === true) && turnProcess.open !== true;
 			const rendered = [];
 			const last = blocks.length - 1;
 			const messageId = `turn-${data.turn}-step-${data.step}`;
@@ -65003,6 +65018,7 @@ button[${ACCOUNT_ATTRIBUTE}]:focus-visible{outline:2px solid ${dshThemeColor.lab
 						hidden: reasoningHidden,
 						reveal: () => turnProcess?.setOpen?.(true),
 						useGroupAction: props.useGroupAction,
+						useDisclosure: props.useDisclosure,
 						renderFactorySlot: props.renderFactorySlot,
 						markdownLabels,
 						pathImages,
@@ -65082,7 +65098,7 @@ button[${ACCOUNT_ATTRIBUTE}]:focus-visible{outline:2px solid ${dshThemeColor.lab
 			}));
 		}
 		function AssistantReasoningBlock(props) {
-			const [expanded, setExpanded] = (0, react.useState)(false);
+			const { expanded, toggle } = (props.useDisclosure ?? useReasoningDisclosure)();
 			const groupRef = props.useGroupAction?.(props.hidden, props.reveal);
 			const { record } = useOutputTranslation({
 				...props,
@@ -65101,7 +65117,7 @@ button[${ACCOUNT_ATTRIBUTE}]:focus-visible{outline:2px solid ${dshThemeColor.lab
 				expandable: true,
 				expandOnRowClick: true,
 				running: props.running,
-				onToggle: () => setExpanded((value) => !value),
+				onToggle: toggle,
 				collapsedContent: (0, react.createElement)("span", { style: {
 					minWidth: 0,
 					overflow: "hidden",
@@ -65127,6 +65143,13 @@ button[${ACCOUNT_ATTRIBUTE}]:focus-visible{outline:2px solid ${dshThemeColor.lab
 				...props.renderFactorySlot === void 0 ? {} : { renderFactorySlot: props.renderFactorySlot }
 			}) : null));
 		}
+		function useReasoningDisclosure() {
+			const [expanded, setExpanded] = (0, react.useState)(false);
+			return {
+				expanded,
+				toggle: () => setExpanded((value) => !value)
+			};
+		}
 		/**
 		* 思考块展开后的正文。
 		*
@@ -65220,20 +65243,13 @@ button[${ACCOUNT_ATTRIBUTE}]:focus-visible{outline:2px solid ${dshThemeColor.lab
 			};
 			const presentation = resolution.value;
 			const removeRenderers = presentation.mount(() => {
-				const renderers = [
-					["user", (props) => UserMessageNodeView({
-						...props,
-						presentation
-					})],
-					["steering", (props) => UserMessageNodeView({
-						...props,
-						presentation
-					})],
-					["assistant-step", (props) => AssistantTranslationNodeView({
-						...props,
-						presentation
-					})]
-				];
+				const renderers = [["user", (props) => UserMessageNodeView({
+					...props,
+					presentation
+				})], ["steering", (props) => UserMessageNodeView({
+					...props,
+					presentation
+				})]];
 				const removers = [];
 				try {
 					for (const [key, component] of renderers) removers.push(slots.inject("conversation.chat.node", () => slots.register({
@@ -65247,6 +65263,21 @@ button[${ACCOUNT_ATTRIBUTE}]:focus-visible{outline:2px solid ${dshThemeColor.lab
 							translationT
 						})
 					}, component)));
+					removers.push(presentation.mountAssistant((nativeInject) => slots.inject("conversation.chat.node", () => slots.register({
+						name: "conversation.chat.node",
+						key: "assistant-step",
+						priority: -100,
+						locale: "chat",
+						inject: (sessionId) => ({
+							hooks: nativeInject?.(sessionId).hooks,
+							services,
+							sessionId,
+							translationT
+						})
+					}, (props) => AssistantTranslationNodeView({
+						...props,
+						presentation
+					})))));
 				} catch (error) {
 					for (const remove of removers.reverse()) remove();
 					throw error;
@@ -67406,7 +67437,7 @@ button.${settingsPromoClass.version}:focus-visible{${focusRing}}
 			return (0, react.createElement)("aside", {
 				className: settingsPromoClass.root,
 				"aria-label": t("settings.promo.sectionLabel")
-			}, (0, react.createElement)("div", { className: settingsPromoClass.row }, (0, react.createElement)("div", { className: settingsPromoClass.brand }, (0, react.createElement)("div", { className: settingsPromoClass.headline }, (0, react.createElement)(StarBurstIcon, { className: settingsPromoClass.logo }), (0, react.createElement)("h3", { className: settingsPromoClass.title }, t("common.brand"))), versionControl ?? (0, react.createElement)("span", { className: settingsPromoClass.version }, t("settings.promo.version", { version: "0.2.2-beta.4" }))), (0, react.createElement)("p", { className: settingsPromoClass.text }, t("settings.promo.starHint"), (0, react.createElement)("span", {
+			}, (0, react.createElement)("div", { className: settingsPromoClass.row }, (0, react.createElement)("div", { className: settingsPromoClass.brand }, (0, react.createElement)("div", { className: settingsPromoClass.headline }, (0, react.createElement)(StarBurstIcon, { className: settingsPromoClass.logo }), (0, react.createElement)("h3", { className: settingsPromoClass.title }, t("common.brand"))), versionControl ?? (0, react.createElement)("span", { className: settingsPromoClass.version }, t("settings.promo.version", { version: "0.2.2-beta.5" }))), (0, react.createElement)("p", { className: settingsPromoClass.text }, t("settings.promo.starHint"), (0, react.createElement)("span", {
 				className: settingsPromoClass.hand,
 				"aria-hidden": true
 			}, "👉")), (0, react.createElement)("a", {
@@ -67463,7 +67494,7 @@ button.${settingsPromoClass.version}:focus-visible{${focusRing}}
 			};
 		}
 		// src/client/update-store.ts
-		const DEFAULT_PLUGIN_UPDATE_CHANNEL = "0.2.2-beta.4".includes("-") ? "next" : "latest";
+		const DEFAULT_PLUGIN_UPDATE_CHANNEL = "0.2.2-beta.5".includes("-") ? "next" : "latest";
 		var PluginUpdateStore = class {
 			rpc;
 			snapshot = {
@@ -80584,5 +80615,5 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 });
 
 })();
-// codingns-client-revision: a5839240dc9c264b1d1bc825a3ac287f298f6be2691b2401b13a229a7a51ea0d
+// codingns-client-revision: e627b9da29c6eef291a1bf042b69358125f84bfd58198b49aac81bead77fce87
 //# sourceMappingURL=bundle.js.map