dsh-ntr 0.3.2 → 0.3.4

package/lib/client.js

@@ -401,6 +401,7 @@ window.__ModuleLoader__.load({
 				probingModels: {},
 				probeErrors: {},
 				chatSessions: [],
+				burstStats: {},
 				tagHalo: { ...DEFAULT_TAG_HALO },
 				approvalDeadlines: void 0,
 				idleRelease: void 0,
@@ -1792,11 +1793,18 @@ window.__ModuleLoader__.load({
 						const closedTranscripts = { ...this.state.chatTranscripts };
 						delete closedTranscripts[event.sessionId];
 						const chatSessions = this.state.chatSessions.filter((s) => s.sessionId !== event.sessionId);
+						const hadBurst = this.state.burstStats[event.sessionId] !== void 0;
+						let burstStats = this.state.burstStats;
+						if (hadBurst) {
+							burstStats = { ...burstStats };
+							delete burstStats[event.sessionId];
+						}
 						this.mutate({
 							sessions,
 							activeSessionId: active,
 							chatTranscripts: closedTranscripts,
 							...chatSessions.length !== this.state.chatSessions.length ? { chatSessions } : {},
+							...hadBurst ? { burstStats } : {},
 							permissions: this.state.permissions.filter((p) => p.sessionId !== event.sessionId),
 							...event.reason === "agent-died" ? this.logPatch("error", this.locale("会话因 agent 进程退出而终止", "session ended: agent process died"), closingSession?.agentId) : {}
 						});
@@ -1918,6 +1926,20 @@ window.__ModuleLoader__.load({
 						});
 						return Promise.resolve();
 					}
+					case "turn/metrics": {
+						const prior = this.state.burstStats[event.sessionId];
+						if (event.final === false && prior !== void 0 && prior.final === true && prior.turnId === event.turnId) return Promise.resolve();
+						this.mutate({ burstStats: {
+							...this.state.burstStats,
+							[event.sessionId]: {
+								outputTokens: event.outputTokens,
+								burstMs: event.burstMs,
+								turnId: event.turnId,
+								final: event.final
+							}
+						} });
+						return Promise.resolve();
+					}
 					case "turn/start": {
 						this.openTurns.add(event.sessionId);
 						this.markWatchedRunning(event.sessionId, true);
@@ -8004,6 +8026,21 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 		* rather than risking a fork cut at a point the user is not looking at.
 		*/
 		/**
+		* Resolves the runtime's `sessions.fork` primitive, binding it to the service
+		* instance so that internal `this` accesses (such as `this.list.getSnapshot()`)
+		* resolve correctly when called through `face.fork(...)`.
+		* Returns `undefined` if the service or `fork` method is absent or not a function.
+		*/
+		function resolveHostFork(sessionsService) {
+			try {
+				const sessions = sessionsService;
+				const fork = sessions?.fork;
+				return typeof fork === "function" ? { fork: fork.bind(sessions) } : void 0;
+			} catch {
+				return;
+			}
+		}
+		/**
 		* The host's own branch-button icon, picked per host generation. The icon
 		* exports MOVED between shipped hosts — desktop 0.2.1-rc.2 has
 		* `IconBranchOutlineRegular` / `…Medium` but NOT `…16`, newer packages export
@@ -8132,7 +8169,7 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 		* `entriesOfSlot` and performing bounded retakes if displaced by later registrations.
 		*/
 		function createSeatClaim(options) {
-			const { slots, slotKey, basePriority, occupant, inject } = options;
+			const { slots, slotKey, basePriority, occupant, inject, entryId } = options;
 			const label = options.label ?? slotKey;
 			const onDiag = options.onDiag;
 			const maxClaims = options.maxClaims ?? 4;
@@ -8162,10 +8199,11 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 				};
 				try {
 					const heads = slots.entriesOfSlot(slotKey) ?? [];
+					const entry = entryId === void 0 ? heads[0] : heads.find((head) => head.options?.id === entryId);
 					return {
 						declared: isDeclared,
 						verified: true,
-						...heads[0] === void 0 ? {} : { entry: heads[0] }
+						...entry === void 0 ? {} : { entry }
 					};
 				} catch {
 					return {
@@ -8186,6 +8224,9 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 				try {
 					installed.push(slots.inject(slotKey, () => slots.register({
 						name: slotKey,
+						...entryId === void 0 ? {} : { id: entryId },
+						...options.order === void 0 ? {} : { order: options.order },
+						...options.locale === void 0 ? {} : { locale: options.locale },
 						priority: rank,
 						...inject ? { inject } : {}
 					}, component)));
@@ -8297,6 +8338,159 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 			});
 		}
 		//#endregion
+		//#region src/client/activity-pill.tsx
+		/**
+		* The composer dock's `x轮x步 · xx tok/s` pill on an ACP conversation.
+		*
+		* WHY SHADOW INSTEAD OF A SECOND PILL: the host's `ActivityPill` already states
+		* the two things this conversation has — turn/step counts and a whole-session
+		* decode speed — in the one place a speed belongs. Only its speed is wrong for
+		* ACP: the host divides the tokens a step emitted by `firstTokenTime →
+		* completedTime`, and that window contains every tool wait. Rendering a second
+		* speed beside it would leave two numbers on screen and no way to tell which
+		* is the honest one. So this module takes the host pill's own cell (`list` slot
+		* `conversation.composer.dock`, id `activity`) at a lower priority, renders the
+		* HOST's component, and hands it a patched `sessionStats` whose decode fields
+		* are the plugin's burst aggregate. Style, counts, dialog, aria and locale stay
+		* the host's; only the number changes.
+		*
+		* NON-ACP CONVERSATIONS PASS THROUGH. The shadow is installed only while the
+		* gate confirms the staged conversation runs the ACP preset, but a list entry
+		* is projected into EVERY session's composer. The wrapper therefore renders the
+		* host component with the ORIGINAL projection whenever `acpMode` is not
+		* affirmatively true, making the shadow visually indistinguishable from the
+		* shipped entry there.
+		*
+		* FAIL-OPEN IS STRUCTURAL: if the host entry, its inject face, its locale or
+		* its `performanceUsage` source is missing, no claim is created and the native
+		* pill stays exactly as shipped. If the host component rejects the patched
+		* projection, the slot's error boundary retires this entry and the native
+		* `activity` entry wins again. No CSS hiding and no DOM patching are involved.
+		*/
+		const DOCK_SLOT = "conversation.composer.dock";
+		const ACTIVITY_ENTRY_ID = "activity";
+		/**
+		* The aggregate the dock should show: the sum of every ACP session backing this
+		* chat (the host pill's counts are whole-chat too), with a live `turn/metrics`
+		* entry preferred per session over its persisted row. `undefined` means "no
+		* measurable burst yet" — the wrapper then hides the speed instead of showing
+		* the host's tool-inclusive number.
+		*/
+		function activityBurst(ui, dshSessionId) {
+			if (ui.chatSessionsFor !== dshSessionId) return void 0;
+			let outputTokens = 0;
+			let burstMs = 0;
+			for (const row of ui.chatSessions) {
+				const measured = ui.burstStats[row.sessionId] ?? row.burst;
+				if (measured === void 0) continue;
+				outputTokens += measured.outputTokens;
+				burstMs += measured.burstMs;
+			}
+			return outputTokens > 0 && burstMs > 0 ? {
+				outputTokens,
+				burstMs
+			} : void 0;
+		}
+		/**
+		* Replace ONLY the decode half of the host's session stats.
+		*
+		* `decodeTokens` and `decodeMs` are the two fields the host's `decodeSpeed`
+		* reads (`decodeTokens / (decodeMs / 1000)`), so writing the plugin's aggregate
+		* there makes the host's own formatter, dialog row and aria label display the
+		* plugin's burst rate. Every other field — turns, steps, LLM/tool/TTFT — stays
+		* host-native. With no measurable burst the two decode fields are zeroed: the
+		* host then hides the speed (`decodeMs > 0` guard) while keeping the counts.
+		*/
+		function patchedActivityStats(native, burst, acp) {
+			if (!acp || native === void 0) return native;
+			if (burst !== void 0 && burst.outputTokens > 0 && burst.burstMs > 0) return {
+				...native,
+				decodeTokens: burst.outputTokens,
+				decodeMs: burst.burstMs
+			};
+			return {
+				...native,
+				decodeTokens: 0,
+				decodeMs: 0
+			};
+		}
+		function ActivityPillOccupant({ host: Host, ...props }) {
+			const ui = useUi$2(props.acp);
+			const dshSessionId = String(props.sessionId);
+			const acpMode = ui.acpMode[dshSessionId] === true;
+			const native = props.useProjection("sessionStats");
+			const burst = acpMode ? activityBurst(ui, dshSessionId) : void 0;
+			const stats = (0, react.useMemo)(() => patchedActivityStats(native, burst, acpMode), [
+				native,
+				burst?.outputTokens,
+				burst?.burstMs,
+				acpMode
+			]);
+			const projection = (0, react.useMemo)(() => (key, selector) => {
+				if (key !== "sessionStats") return void 0;
+				return selector === void 0 ? stats : selector(stats);
+			}, [stats]);
+			return (0, react.createElement)(Host, {
+				useChat: props.useChat,
+				useProjection: acpMode ? projection : props.useProjection,
+				usePerformanceUsage: props.usePerformanceUsage,
+				t: props.t
+			});
+		}
+		function findHostActivity(slots) {
+			try {
+				if (slots.spec?.("conversation.composer.dock")?.kind !== "list") return void 0;
+				return (slots.entriesOfSlot?.("conversation.composer.dock") ?? []).find((entry) => entry.options?.id === ACTIVITY_ENTRY_ID);
+			} catch {
+				return;
+			}
+		}
+		/**
+		* Take the dock's `activity` cell for one ACP-mode spell.
+		*
+		* Returns `undefined` on any host shape this bundle cannot serve — an older
+		* host without the `activity` entry (0.1.5 ships `stats`), a slot kind change,
+		* a missing inject/locale, or no `performanceUsage` source. The native pill is
+		* then left untouched; that is the honest failure mode, not a hidden control.
+		*/
+		function createActivityPillClaim(options) {
+			const host = findHostActivity(options.slots);
+			if (host === void 0 || host.component === void 0 || typeof host.inject !== "function" || typeof host.locale !== "string" || host.locale === "") {
+				options.onDiag?.("activity pill: host entry not available");
+				return;
+			}
+			let performanceUsage;
+			try {
+				performanceUsage = host.inject()?.hooks?.performanceUsage;
+			} catch {
+				performanceUsage = void 0;
+			}
+			if (performanceUsage === void 0) {
+				options.onDiag?.("activity pill: host performance hook missing");
+				return;
+			}
+			const Host = host.component;
+			return createSeatClaim({
+				slots: options.slots,
+				slotKey: DOCK_SLOT,
+				entryId: ACTIVITY_ENTRY_ID,
+				order: host.options?.order ?? 0,
+				locale: host.locale,
+				basePriority: -1,
+				occupant: () => (props) => (0, react.createElement)(ActivityPillOccupant, {
+					...props,
+					host: Host
+				}),
+				inject: (sessionId, actions) => ({
+					...options.inject(sessionId, actions),
+					hooks: { performanceUsage }
+				}),
+				label: "activity pill",
+				onDiag: options.onDiag,
+				maxClaims: options.maxClaims ?? 1
+			});
+		}
+		//#endregion
 		//#region src/client/slash-isolation.ts
 		/**
 		* Cross-instance marker. `apply()` can run again over the same live sources (a
@@ -8771,8 +8965,7 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 			*/
 			const hostFork = () => {
 				try {
-					const fork = service("sessions")?.fork;
-					return typeof fork === "function" ? { fork } : void 0;
+					return resolveHostFork(service("sessions"));
 				} catch {
 					return;
 				}
@@ -8935,6 +9128,22 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 				*/
 				let permissionClaim;
 				/**
+				* Claim on the dock's `activity` cell (`conversation.composer.dock`, id
+				* `activity`), held for the same ACP-mode spell as the two seats. The
+				* occupant renders the HOST's ActivityPill with the plugin's burst speed
+				* patched into its `sessionStats`; it is a list cell, so the claim is
+				* identified by id rather than by the slot's heads[0]. If the host shape is
+				* not one this bundle knows, no claim is created and the native pill stays.
+				*/
+				let activityClaim;
+				let activityDiag = "idle";
+				const noteActivityDiag = (line) => {
+					if (line === activityDiag) return;
+					activityDiag = line;
+					if (!/failed|missing|taken|gave up|still held/.test(line)) return;
+					console.warn(`[dsh-ntr] ${line}`);
+				};
+				/**
 				* ACP-only auxiliary entries: the NTR view tab and the composer's context
 				* ring. Unlike the two seats these are `list` slots with no visibility
 				* predicate of their own, so "self-hide in the component" cannot remove a
@@ -9018,6 +9227,10 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 						permissionClaim.release();
 						permissionClaim = void 0;
 					}
+					if (activityClaim !== void 0) {
+						activityClaim.release();
+						activityClaim = void 0;
+					}
 				};
 				/**
 				* Re-ask timer for the staged session, armed while the row is silent and a
@@ -9095,6 +9308,12 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 						}
 					});
 					permissionClaim.sync();
+					activityClaim ??= createActivityPillClaim({
+						slots: ctx.slots,
+						inject: (sessionId) => chatFace(sessionId),
+						onDiag: noteActivityDiag
+					});
+					activityClaim?.sync();
 					holdAuxEntries();
 					if (rowAgentPreset(staged.row) === void 0) armVerdictReask();
 				};
@@ -9165,7 +9384,7 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 				attach();
 				const stopStore = store.subscribe(runGate);
 				const stopCell = ctx.on("slots/changed", (...args) => {
-					if (args[0] !== "conversation.input.model" && args[0] !== "conversation.input.permission") return;
+					if (args[0] !== "conversation.input.model" && args[0] !== "conversation.input.permission" && args[0] !== "conversation.composer.dock") return;
 					runGate();
 				});
 				const stopService = ctx.on("internal/service", attach);
@@ -9187,6 +9406,10 @@ html[data-ntr-acp] [data-turn-tail] button[aria-label="Remove rating"] {
 						permissionClaim.release();
 						permissionClaim = void 0;
 					}
+					if (activityClaim !== void 0) {
+						activityClaim.release();
+						activityClaim = void 0;
+					}
 					store.noteSeatDiag("gate disposed");
 					store.notePermissionSeatDiag("gate disposed");
 				};