dsh-better-display 0.3.8 → 0.3.10

package/lib/dsh-better-display.js

@@ -1,10 +1,328 @@
-import { access, readdir } from "node:fs/promises";
-import { existsSync } from "node:fs";
-import { homedir } from "node:os";
+import { existsSync, readFileSync } from "node:fs";
 import { dirname, isAbsolute, join, posix, resolve, win32 } from "node:path";
 import { fileURLToPath } from "node:url";
+import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
-//#region src/skill-status.ts
+import { access, readdir } from "node:fs/promises";
+import { homedir } from "node:os";
+// src/flags.ts
+const defaultFlags = { readerEnabled: true };
+function locateFlags(start = dirname(fileURLToPath(import.meta.url))) {
+	let dir = start;
+	for (let depth = 0; depth < 6; depth += 1) {
+		const candidate = resolve(dir, "flags.json");
+		if (existsSync(candidate)) return candidate;
+		const parent = dirname(dir);
+		if (parent === dir) return void 0;
+		dir = parent;
+	}
+}
+function normalize(value) {
+	const record = value !== null && typeof value === "object" ? value : {};
+	return { readerEnabled: typeof record.readerEnabled === "boolean" ? record.readerEnabled : defaultFlags.readerEnabled };
+}
+function loadFlags(source) {
+	if (source !== void 0 && typeof source !== "string") return normalize(source);
+	try {
+		const path = typeof source === "string" ? source : locateFlags();
+		if (path === void 0 || !existsSync(path)) return { ...defaultFlags };
+		return normalize(JSON.parse(readFileSync(path, "utf8")));
+	} catch {
+		return { ...defaultFlags };
+	}
+}
+// src/log.ts
+const REDACTED = "[REDACTED]";
+const REQUEST_ID_HEADER = "x-request-id";
+const REQUEST_ID_PATTERN = /^[A-Za-z0-9._:-]{1,200}$/;
+const SECRET_KEYS = /* @__PURE__ */ new Set([
+	"authorization",
+	"proxyauthorization",
+	"cookie",
+	"setcookie",
+	"token",
+	"accesstoken",
+	"refreshtoken",
+	"idtoken",
+	"apikey",
+	"apisecret",
+	"secret",
+	"clientsecret",
+	"password",
+	"passwd",
+	"credential",
+	"credentials",
+	"signature",
+	"sig",
+	"jwt",
+	"bearer",
+	"privatekey",
+	"xapikey",
+	"xauthtoken",
+	"xaccesstoken",
+	"auth"
+]);
+function normalizeKey(key) {
+	return key.toLowerCase().replace(/[^a-z0-9]/g, "");
+}
+function isSecretKey(key) {
+	const normalized = normalizeKey(key);
+	if (SECRET_KEYS.has(normalized)) return true;
+	if (normalized === "requestid" || normalized === "xrequestid") return false;
+	return /(?:^|[^a-z])(?:token|secret|password|api[-_]?key)$/i.test(key);
+}
+function redactString(value) {
+	return value.replace(/([?&#])([^&#=]+)=([^&#]*)/g, (match, sep, rawKey) => {
+		let key;
+		try {
+			key = decodeURIComponent(rawKey.replace(/\+/g, " "));
+		} catch {
+			key = rawKey;
+		}
+		return isSecretKey(key) ? `${sep}${rawKey}=${REDACTED}` : match;
+	}).replace(/\b(Bearer|Basic)\s+\S+/gi, `$1 ${REDACTED}`).replace(/\b((?:access[_-]?token|refresh[_-]?token|id[_-]?token|api[_-]?key|client[_-]?secret|password|passwd|authorization|token|secret))(\s*[:=]\s*)([^\s&]+)/gi, `$1$2${REDACTED}`);
+}
+function redact(value) {
+	return redactValue(void 0, value, 0, /* @__PURE__ */ new WeakSet());
+}
+function redactValue(key, value, depth, seen) {
+	if (key !== void 0 && isSecretKey(key)) return REDACTED;
+	if (depth > 8) return REDACTED;
+	if (typeof value === "string") return redactString(value);
+	if (typeof value === "number" || typeof value === "boolean" || value === null || value === void 0) return value;
+	if (typeof value !== "object") return REDACTED;
+	if (value instanceof Date) return value.toISOString();
+	if (value instanceof Error) return redactValue(void 0, {
+		name: value.name,
+		message: value.message
+	}, depth + 1, seen);
+	if (seen.has(value)) return REDACTED;
+	seen.add(value);
+	if (Array.isArray(value)) return value.map((item) => redactValue(void 0, item, depth + 1, seen));
+	const output = {};
+	for (const [childKey, childValue] of Object.entries(value)) output[childKey] = redactValue(childKey, childValue, depth + 1, seen);
+	return output;
+}
+function createLogger(options = {}) {
+	const write = options.write ?? ((line) => {
+		console.log(line);
+	});
+	const clock = options.clock ?? (() => /* @__PURE__ */ new Date());
+	const emit = (level, msg, fields) => {
+		const details = redact({
+			...options.base,
+			...fields
+		});
+		const record = {
+			...details !== null && typeof details === "object" ? details : {},
+			time: clock().toISOString(),
+			level,
+			msg: redactString(msg)
+		};
+		try {
+			write(JSON.stringify(record));
+		} catch {
+			write(JSON.stringify({
+				time: record.time,
+				level,
+				msg: record.msg,
+				error: "log record was not serializable"
+			}));
+		}
+	};
+	return {
+		info: (msg, fields) => emit("info", msg, fields),
+		warn: (msg, fields) => emit("warn", msg, fields),
+		error: (msg, fields) => emit("error", msg, fields)
+	};
+}
+function requestIdOf(req) {
+	const raw = req.headers[REQUEST_ID_HEADER];
+	const value = Array.isArray(raw) ? raw[0] : raw;
+	if (typeof value === "string" && REQUEST_ID_PATTERN.test(value)) return value;
+	return randomUUID();
+}
+// src/metrics.ts
+const ROUTE_REVEAL = "/better-display/reveal";
+const ROUTE_SKILL_STATUS = "/better-display/skill-status";
+const ROUTE_METRICS = "/better-display/metrics";
+const ROUTE_HITS = [
+	ROUTE_REVEAL,
+	ROUTE_SKILL_STATUS,
+	ROUTE_METRICS
+];
+const hits = new Map(ROUTE_HITS.map((route) => [route, 0]));
+const timings = new Map(ROUTE_HITS.map((route) => [route, {
+	count: 0,
+	totalMs: 0,
+	maxMs: 0
+}]));
+function snapshotHits() {
+	return Object.fromEntries(hits);
+}
+function snapshotTimings() {
+	return Object.fromEntries([...timings].map(([route, timing]) => [route, { ...timing }]));
+}
+function recordRouteHit(route) {
+	const next = (hits.get(route) ?? 0) + 1;
+	hits.set(route, next);
+	return next;
+}
+function recordRouteDuration(route, elapsedMs) {
+	const ms = Number.isFinite(elapsedMs) && elapsedMs > 0 ? Math.round(elapsedMs) : 0;
+	const current = timings.get(route) ?? {
+		count: 0,
+		totalMs: 0,
+		maxMs: 0
+	};
+	const next = {
+		count: current.count + 1,
+		totalMs: current.totalMs + ms,
+		maxMs: Math.max(current.maxMs, ms)
+	};
+	timings.set(route, next);
+	return next;
+}
+function metricsPayload() {
+	return {
+		counters: { dsh_better_display_route_hits_total: snapshotHits() },
+		timingsMs: snapshotTimings()
+	};
+}
+// src/workspace-path.ts
+/** Absolute paths accepted by both POSIX and Windows hosts. */
+function isAbsoluteWorkspacePath(path) {
+	return /^(?:\/|[A-Za-z]:[/\\]|\\\\)/.test(path);
+}
+// \0@oxc-project+runtime@0.156.0/helpers/esm/usingCtx.js
+function _usingCtx() {
+	var r = "function" == typeof SuppressedError ? SuppressedError : function(r, e) {
+		var n = Error();
+		return n.name = "SuppressedError", n.error = r, n.suppressed = e, n;
+	}, e = {}, n = [];
+	function using(r, e) {
+		if (null != e) {
+			if (Object(e) !== e) throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
+			if (r) var o = e[Symbol.asyncDispose || Symbol["for"]("Symbol.asyncDispose")];
+			if (void 0 === o && (o = e[Symbol.dispose || Symbol["for"]("Symbol.dispose")], r)) var t = o;
+			if ("function" != typeof o) throw new TypeError("Object is not disposable.");
+			t && (o = function o() {
+				try {
+					t.call(e);
+				} catch (r) {
+					return Promise.reject(r);
+				}
+			}), n.push({
+				v: e,
+				d: o,
+				a: r
+			});
+		} else r && n.push({
+			d: e,
+			a: r
+		});
+		return e;
+	}
+	return {
+		e,
+		u: using.bind(null, !1),
+		a: using.bind(null, !0),
+		d: function d() {
+			var o, t = this.e, s = 0;
+			function next() {
+				for (; o = n.pop();) try {
+					if (!o.a && 1 === s) return s = 0, n.push(o), Promise.resolve().then(next);
+					if (o.d) {
+						var r = o.d.call(o.v);
+						if (o.a) return s |= 2, Promise.resolve(r).then(next, err);
+					} else s |= 1;
+				} catch (r) {
+					return err(r);
+				}
+				if (1 === s) return t !== e ? Promise.reject(t) : Promise.resolve();
+				if (t !== e) throw t;
+			}
+			function err(n) {
+				return t = t !== e ? new r(n, t) : n, next();
+			}
+			return next();
+		}
+	};
+}
+// src/reveal.ts
+async function revealRoots(ctx, sessionId) {
+	if (sessionId !== void 0) {
+		const cwd = (ctx.get?.("sessions"))?.get(sessionId)?.header.cwd;
+		if (cwd) return [cwd];
+		const query = ctx.get?.("sessionQuery");
+		if (query) try {
+			var _usingCtx$1 = _usingCtx();
+			const observation = _usingCtx$1.u(await query.observeSession(sessionId, { projectionMode: "none" }));
+			if (observation.header.cwd) return [observation.header.cwd];
+		} catch (_) {
+			_usingCtx$1.e = _;
+		} finally {
+			_usingCtx$1.d();
+		}
+	}
+	return ((ctx.get?.("workspaceRegistry"))?.list() ?? []).filter((workspace) => sessionId === void 0 || workspace.sessionIds.includes(sessionId)).map((workspace) => workspace.path);
+}
+function resolveRevealPath(path, roots, exists = existsSync) {
+	if (isAbsoluteWorkspacePath(path)) return path;
+	if (/^[A-Za-z]:|^\\/.test(path)) throw new Error("Path is not workspace-relative");
+	const matches = /* @__PURE__ */ new Set();
+	for (const root of roots) {
+		if (!isAbsoluteWorkspacePath(root)) continue;
+		const candidate = (/^[A-Za-z]:[/\\]|^\\\\/.test(root) ? win32 : posix).resolve(root, path);
+		if (exists(candidate)) matches.add(candidate);
+	}
+	if (matches.size !== 1) throw new Error(matches.size === 0 ? "Workspace path not found" : "Workspace path is ambiguous");
+	return [...matches][0];
+}
+function revealPath(path, platform = process.platform, spawnProcess = spawn) {
+	const options = {
+		detached: true,
+		stdio: "ignore"
+	};
+	if (platform === "darwin") spawnProcess("open", ["-R", path], options);
+	else if (platform === "win32") spawnProcess("explorer.exe", [`/select,"${path}"`], {
+		...options,
+		windowsVerbatimArguments: true
+	});
+	else spawnProcess("xdg-open", [path], options);
+}
+function createRevealHandler({ roots, reveal = revealPath }) {
+	return (req, res) => {
+		if (req.method !== "POST") {
+			res.statusCode = 405;
+			res.end();
+			return;
+		}
+		let body = "";
+		req.on("data", (chunk) => {
+			body += chunk;
+		});
+		req.on("end", async () => {
+			res.setHeader("Content-Type", "application/json");
+			try {
+				const data = JSON.parse(body);
+				const path = typeof data === "object" && data !== null && "path" in data && typeof data.path === "string" ? data.path.trim() : "";
+				if (!path) throw new Error("Empty path");
+				const sessionId = typeof data === "object" && data !== null && "sessionId" in data && typeof data.sessionId === "string" ? data.sessionId : void 0;
+				reveal(resolveRevealPath(path, isAbsoluteWorkspacePath(path) ? [] : await roots(sessionId)));
+				res.statusCode = 200;
+				res.end(JSON.stringify({ ok: true }));
+			} catch (err) {
+				res.statusCode = 400;
+				res.end(JSON.stringify({
+					ok: false,
+					error: String(err)
+				}));
+			}
+		});
+	};
+}
+// src/skill-status.ts
 /** Shared generative-mcpapps identity. Plugin-tree presence is not installation. */
 const GENERATIVE_MCPAPPS_SKILL = "generative-mcpapps";
 /** Conventional relative roots only. Never expand $HOME or dump host `root.path`. */
@@ -50,8 +368,7 @@ function toPublicSkillStatus(status) {
 		roots: publicSkillRoots()
 	};
 }
-//#endregion
-//#region src/skill-roots.ts
+// src/skill-roots.ts
 function expandHomePath(path, home = homedir()) {
 	if (path === "~") return home;
 	if (path.startsWith("~/") || path.startsWith("~\\")) return join(home, path.slice(2));
@@ -155,146 +472,10 @@ async function scanGenerativeMcpappsStatus(options = {}) {
 		...packPath !== void 0 ? { packPath } : {}
 	};
 }
-//#endregion
-//#region src/workspace-path.ts
-/** Absolute paths accepted by both POSIX and Windows hosts. */
-function isAbsoluteWorkspacePath(path) {
-	return /^(?:\/|[A-Za-z]:[/\\]|\\\\)/.test(path);
-}
-//#endregion
-//#region \0@oxc-project+runtime@0.153.0/helpers/esm/usingCtx.js
-function _usingCtx() {
-	var r = "function" == typeof SuppressedError ? SuppressedError : function(r, e) {
-		var n = Error();
-		return n.name = "SuppressedError", n.error = r, n.suppressed = e, n;
-	}, e = {}, n = [];
-	function using(r, e) {
-		if (null != e) {
-			if (Object(e) !== e) throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-			if (r) var o = e[Symbol.asyncDispose || Symbol["for"]("Symbol.asyncDispose")];
-			if (void 0 === o && (o = e[Symbol.dispose || Symbol["for"]("Symbol.dispose")], r)) var t = o;
-			if ("function" != typeof o) throw new TypeError("Object is not disposable.");
-			t && (o = function o() {
-				try {
-					t.call(e);
-				} catch (r) {
-					return Promise.reject(r);
-				}
-			}), n.push({
-				v: e,
-				d: o,
-				a: r
-			});
-		} else r && n.push({
-			d: e,
-			a: r
-		});
-		return e;
-	}
-	return {
-		e,
-		u: using.bind(null, !1),
-		a: using.bind(null, !0),
-		d: function d() {
-			var o, t = this.e, s = 0;
-			function next() {
-				for (; o = n.pop();) try {
-					if (!o.a && 1 === s) return s = 0, n.push(o), Promise.resolve().then(next);
-					if (o.d) {
-						var r = o.d.call(o.v);
-						if (o.a) return s |= 2, Promise.resolve(r).then(next, err);
-					} else s |= 1;
-				} catch (r) {
-					return err(r);
-				}
-				if (1 === s) return t !== e ? Promise.reject(t) : Promise.resolve();
-				if (t !== e) throw t;
-			}
-			function err(n) {
-				return t = t !== e ? new r(n, t) : n, next();
-			}
-			return next();
-		}
-	};
-}
-//#endregion
-//#region src/reveal.ts
-async function revealRoots(ctx, sessionId) {
-	if (sessionId !== void 0) {
-		const cwd = (ctx.get?.("sessions"))?.get(sessionId)?.header.cwd;
-		if (cwd) return [cwd];
-		const query = ctx.get?.("sessionQuery");
-		if (query) try {
-			var _usingCtx$1 = _usingCtx();
-			const observation = _usingCtx$1.u(await query.observeSession(sessionId, { projectionMode: "none" }));
-			if (observation.header.cwd) return [observation.header.cwd];
-		} catch (_) {
-			_usingCtx$1.e = _;
-		} finally {
-			_usingCtx$1.d();
-		}
-	}
-	return ((ctx.get?.("workspaceRegistry"))?.list() ?? []).filter((workspace) => sessionId === void 0 || workspace.sessionIds.includes(sessionId)).map((workspace) => workspace.path);
-}
-function resolveRevealPath(path, roots, exists = existsSync) {
-	if (isAbsoluteWorkspacePath(path)) return path;
-	if (/^[A-Za-z]:|^\\/.test(path)) throw new Error("Path is not workspace-relative");
-	const matches = /* @__PURE__ */ new Set();
-	for (const root of roots) {
-		if (!isAbsoluteWorkspacePath(root)) continue;
-		const candidate = (/^[A-Za-z]:[/\\]|^\\\\/.test(root) ? win32 : posix).resolve(root, path);
-		if (exists(candidate)) matches.add(candidate);
-	}
-	if (matches.size !== 1) throw new Error(matches.size === 0 ? "Workspace path not found" : "Workspace path is ambiguous");
-	return [...matches][0];
-}
-function revealPath(path, platform = process.platform, spawnProcess = spawn) {
-	const options = {
-		detached: true,
-		stdio: "ignore"
-	};
-	if (platform === "darwin") spawnProcess("open", ["-R", path], options);
-	else if (platform === "win32") spawnProcess("explorer.exe", [`/select,"${path}"`], {
-		...options,
-		windowsVerbatimArguments: true
-	});
-	else spawnProcess("xdg-open", [path], options);
-}
-function createRevealHandler({ roots, reveal = revealPath }) {
-	return (req, res) => {
-		if (req.method !== "POST") {
-			res.statusCode = 405;
-			res.end();
-			return;
-		}
-		let body = "";
-		req.on("data", (chunk) => {
-			body += chunk;
-		});
-		req.on("end", async () => {
-			res.setHeader("Content-Type", "application/json");
-			try {
-				const data = JSON.parse(body);
-				const path = typeof data === "object" && data !== null && "path" in data && typeof data.path === "string" ? data.path.trim() : "";
-				if (!path) throw new Error("Empty path");
-				const sessionId = typeof data === "object" && data !== null && "sessionId" in data && typeof data.sessionId === "string" ? data.sessionId : void 0;
-				reveal(resolveRevealPath(path, isAbsoluteWorkspacePath(path) ? [] : await roots(sessionId)));
-				res.statusCode = 200;
-				res.end(JSON.stringify({ ok: true }));
-			} catch (err) {
-				res.statusCode = 400;
-				res.end(JSON.stringify({
-					ok: false,
-					error: String(err)
-				}));
-			}
-		});
-	};
-}
-//#endregion
-//#region src/dsh-better-display.ts
+// src/dsh-better-display.ts
 const name = "dsh-better-display";
 const inject = ["webServer"];
+const log = createLogger({ base: { plugin: name } });
 function writeJson(res, status, body) {
 	res.setHeader("Content-Type", "application/json");
 	res.statusCode = status;
@@ -305,18 +486,45 @@ function skillLister(ctx) {
 	if (typeof skills?.list !== "function") return void 0;
 	return async () => skillsFromListResult(await skills.list({}));
 }
-function apply(ctx) {
-	console.log("[my-plugins/dsh-better-display] loaded");
+function beginRequest(req, res, route) {
+	const requestId = requestIdOf(req);
+	res.setHeader("X-Request-ID", requestId);
+	recordRouteHit(route);
+	const started = performance.now();
+	res.on("finish", () => {
+		recordRouteDuration(route, performance.now() - started);
+	});
+	log.info("http request", {
+		requestId,
+		route,
+		method: req.method ?? "",
+		url: req.url ?? "",
+		headers: req.headers
+	});
+	return requestId;
+}
+function apply(ctx, options) {
+	const flags = options?.flags ?? loadFlags();
+	log.info("[my-plugins/dsh-better-display] loaded", { readerEnabled: flags.readerEnabled });
+	if (!flags.readerEnabled) {
+		log.info("route registration skipped", { readerEnabled: false });
+		return;
+	}
 	if (ctx.webServer) ctx.effect(() => {
+		const reveal = createRevealHandler({ roots: (sessionId) => revealRoots(ctx, sessionId) });
 		const disposeReveal = ctx.webServer.register({
 			kind: "exact",
-			path: "/better-display/reveal",
-			handler: createRevealHandler({ roots: (sessionId) => revealRoots(ctx, sessionId) })
+			path: ROUTE_REVEAL,
+			handler: (req, res) => {
+				beginRequest(req, res, ROUTE_REVEAL);
+				reveal(req, res);
+			}
 		});
 		const disposeSkill = ctx.webServer.register({
 			kind: "exact",
-			path: "/better-display/skill-status",
+			path: ROUTE_SKILL_STATUS,
 			handler: async (req, res) => {
+				const requestId = beginRequest(req, res, ROUTE_SKILL_STATUS);
 				if (req.method !== "GET") {
 					res.statusCode = 405;
 					res.end();
@@ -328,6 +536,10 @@ function apply(ctx) {
 						listSkills: skillLister(ctx)
 					})));
 				} catch (err) {
+					log.error("skill-status failed", {
+						requestId,
+						error: err instanceof Error ? err.message : String(err)
+					});
 					writeJson(res, 500, {
 						ok: false,
 						error: String(err)
@@ -335,11 +547,24 @@ function apply(ctx) {
 				}
 			}
 		});
+		const disposeMetrics = ctx.webServer.register({
+			kind: "exact",
+			path: ROUTE_METRICS,
+			handler: (req, res) => {
+				beginRequest(req, res, ROUTE_METRICS);
+				if (req.method !== "GET") {
+					res.statusCode = 405;
+					res.end();
+					return;
+				}
+				writeJson(res, 200, metricsPayload());
+			}
+		});
 		return () => {
 			disposeReveal();
 			disposeSkill();
+			disposeMetrics();
 		};
-	}, "dsh-better-display: reveal and skill-status routes");
+	}, "dsh-better-display: reveal, skill-status, and metrics routes");
 }
-//#endregion
 export { apply, inject, name };

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

@@ -0,0 +1,20 @@
+import type { RefObject } from 'react';
+import type { TurnBoundary } from './projection.js';
+import type { BlockRenderProps, ReaderProps } from './types.js';
+type SeatProps = BlockRenderProps & Pick<ReaderProps, 'useChat' | 'sessionId'> & {
+    nodeKey: string;
+    boundary: TurnBoundary;
+    pinned?: boolean;
+    processOpen?: boolean;
+};
+export declare const AssistantNode: import("react").MemoExoticComponent<({ useChat, nodeKey, boundary, processOpen, pinned, folded, partStart, seamSummary, seamAfter, motion, onRead, returnFocusTo, ...render }: SeatProps & {
+    motion: boolean;
+    onRead: () => void;
+    returnFocusTo: RefObject<HTMLButtonElement>;
+    partStart?: number;
+    folded?: boolean;
+    seamSummary?: string;
+    seamAfter?: boolean;
+}) => import("react").JSX.Element | null>;
+export {};
+//# sourceMappingURL=AssistantNode.d.ts.map

package/lib/types/client/AssistantNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AssistantNode.d.ts","sourceRoot":"","sources":["../../../src/client/AssistantNode.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAQvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAOhE,KAAK,SAAS,GAAG,gBAAgB,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,WAAW,CAAC,GAAG;IAC/E,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAC;CAClF,CAAC;AAEF,eAAO,MAAM,aAAa,iLAAyM,SAAS,GAAG;IAC7O,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAAC,aAAa,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IACvH,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;CAC3C,wCA+CC,CAAC"}

package/lib/types/client/AssistantNode.js

@@ -0,0 +1,46 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Fragment, memo } from 'react';
+import { Blocks, CopyAnswer } from './Blocks.js';
+import { ReasoningCard } from './ReasoningCard.js';
+import { OfficialActions, OfficialAssistantBody } from './OfficialContent.js';
+import { Disclosure, ProcessFragment } from './motion.js';
+import { FoldSummaryText } from './LiveFold.js';
+import { assistantSegments, forkAnchorSeq, hasVisibleBody, isEarlierNarration } from './projection.js';
+import css from './Reader.module.css';
+function isNode(node, kind) {
+    return node.kind === kind;
+}
+export const AssistantNode = memo(function AssistantNode({ useChat, nodeKey, boundary, processOpen = false, pinned = false, folded = false, partStart, seamSummary, seamAfter = false, motion, onRead, returnFocusTo, ...render }) {
+    const node = useChat(snapshot => snapshot.nodes.get(nodeKey));
+    if (!node || node.visibility === 'hidden' || !isNode(node, 'assistant-step'))
+        return null;
+    const data = node.data;
+    const parts = assistantSegments(data.blocks);
+    const earlier = isEarlierNarration(data, boundary);
+    const hasToolCalls = data.blocks.some(block => block.kind === 'tool-call');
+    const isProcessStep = earlier || folded || hasToolCalls || (boundary.latestStep > 0 && data.step < boundary.latestStep);
+    const body = data.blocks.filter(block => block.kind !== 'reasoning' && block.kind !== 'tool-call');
+    const visible = partStart === undefined ? parts : parts.filter(part => part.start === partStart);
+    const bodyProps = { streaming: data.status === 'running', holdFormatting: pinned, startedAt: data.time, interrupted: data.status === 'interrupted', liveText: true };
+    return _jsx(_Fragment, { children: visible.map(part => {
+            const index = parts.findIndex(item => item.start === part.start);
+            const last = index === parts.length - 1;
+            if (part.kind === 'reasoning')
+                return _jsx(ProcessFragment, { open: processOpen, motion: motion, onRead: onRead, returnFocusTo: returnFocusTo, nodeKey: nodeKey, framed: true, children: _jsx(ReasoningCard, { step: data.step, active: processOpen && boundary.status === 'open' && data.step === boundary.latestStep, motion: motion, selected: pinned, onRead: onRead, children: _jsx(Blocks, { ...render, blocks: part.blocks, streaming: data.status === 'running' && last && data.blocks.at(-1)?.kind === 'reasoning', holdFormatting: pinned, startedAt: data.time, interrupted: data.status === 'interrupted', liveText: true }) }) }, part.start);
+            if (!hasVisibleBody(part.blocks))
+                return null;
+            // Narration stays body prose and never enters a disclosure. The seam in
+            // the gap summarises folded process between two body blocks. A foreign
+            // assistant-step renderer receives these original blocks; Reader markdown,
+            // including the text transform, is only the fallback.
+            const isFinalAnswer = !isProcessStep;
+            return _jsxs(Fragment, { children: [seamSummary && _jsx("div", { className: css.processSeamRow, "data-reader-process-seam": true, "data-reader-process-seam-summary": seamSummary, children: _jsx(Disclosure, { open: false, onChange: () => onRead(), ariaLabel: "\u88AB\u6298\u53E0\u7684\u8FC7\u7A0B", label: _jsx(FoldSummaryText, { summary: seamSummary, motion: false }) }) }), _jsxs("article", { className: css.answer, "data-reader-body": true, "data-reader-anchor": true, "data-reader-key": nodeKey, "data-reader-source-start": part.start, "data-reader-seam-after": seamAfter || undefined, "data-answer-status": data.status, "data-answer-phase": isFinalAnswer ? 'body' : 'process', children: [_jsx(OfficialAssistantBody, { ...render, node: node, blocks: part.blocks, ...bodyProps }), isFinalAnswer && last && data.status === 'interrupted' && _jsx("span", { className: css.stopped, children: "\u5DF2\u505C\u6B62" }), isFinalAnswer && last && data.status !== 'running' && boundary.status === 'closed' && (_jsx(CopyAnswer, { blocks: body, onFork: (() => {
+                                    // The fork anchor must be the durable closing message seq (same as
+                                    // the official turn-tail branch). AssistantChatData carries no seq
+                                    // of its own; passing it would fork the whole session instead.
+                                    const anchor = forkAnchorSeq([data.finalNode, { seq: render.forkSeq }]);
+                                    return render.forkAt && anchor !== undefined ? () => render.forkAt(anchor) : undefined;
+                                })(), metrics: render.metrics, extraActions: _jsx(OfficialActions, { official: render.official, messageId: data.finalNode?.messageId }) }))] })] }, part.start);
+        }) });
+});
+//# sourceMappingURL=AssistantNode.js.map

package/lib/types/client/AssistantNode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AssistantNode.js","sourceRoot":"","sources":["../../../src/client/AssistantNode.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGvG,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAEtC,SAAS,MAAM,CAAyB,IAA8B,EAAE,IAAO;IAC7E,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;AAC5B,CAAC;AAMD,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,aAAa,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,EAG9N;IACC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1F,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;IAC3E,MAAM,aAAa,GAAG,OAAO,IAAI,MAAM,IAAI,YAAY,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;IACxH,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;IACnG,MAAM,OAAO,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;IACjG,MAAM,SAAS,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,KAAK,aAAa,EAAE,QAAQ,EAAE,IAAa,EAAE,CAAC;IAC9K,OAAO,4BAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC;YACjE,MAAM,IAAI,GAAG,KAAK,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;YACxC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO,KAAC,eAAe,IAAkB,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAC/K,KAAC,aAAa,IAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,YACtK,KAAC,MAAM,OAAK,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,WAAW,EAC/H,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,KAAK,aAAa,EAAE,QAAQ,SAAG,GACzF,IAJ0C,IAAI,CAAC,KAAK,CAKpD,CAAC;YACnB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC9C,wEAAwE;YACxE,uEAAuE;YACvE,2EAA2E;YAC3E,sDAAsD;YACtD,MAAM,aAAa,GAAG,CAAC,aAAa,CAAC;YACrC,OAAO,MAAC,QAAQ,eACb,WAAW,IAAI,cAAK,SAAS,EAAE,GAAG,CAAC,cAAc,wEAA6D,WAAW,YACxH,KAAC,UAAU,IAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,SAAS,EAAC,sCAAQ,EACnE,KAAK,EAAE,KAAC,eAAe,IAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,GAAI,GAAI,GACjE,EACN,mBAAS,SAAS,EAAE,GAAG,CAAC,MAAM,2EAAuD,OAAO,8BAA4B,IAAI,CAAC,KAAK,4BACxG,SAAS,IAAI,SAAS,wBAAsB,IAAI,CAAC,MAAM,uBAAqB,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,aACtI,KAAC,qBAAqB,OAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,KAAM,SAAS,GAAI,EACpF,aAAa,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa,IAAI,eAAM,SAAS,EAAE,GAAG,CAAC,OAAO,mCAAY,EAClG,aAAa,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,IAAI,CACrF,KAAC,UAAU,IAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE;oCACtC,mEAAmE;oCACnE,mEAAmE;oCACnE,+DAA+D;oCAC/D,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;oCACxE,OAAO,MAAM,CAAC,MAAM,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gCAC1F,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,KAAC,eAAe,IAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAI,GAAI,CACtI,IACO,KAlBU,IAAI,CAAC,KAAK,CAmBrB,CAAC;QACd,CAAC,CAAC,GAAI,CAAC;AACT,CAAC,CAAC,CAAC"}

package/lib/types/client/Blocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Blocks.d.ts","sourceRoot":"","sources":["../../../src/client/Blocks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgE,MAAM,OAAO,CAAC;AAChG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAKtG,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAOrE,qBAAa,aAAc,SAAQ,SAAS,CAAC;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;IACxG,KAAK;;;MAAiC;IAGtC,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO;;;;IAI9C,MAAM;CAKP;AAED,eAAO,MAAM,UAAU,kEAAuD;IAC5E,UAAU,EAAE,kBAAkB,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;CAC1E,iCAwCC,CAAC;AAEH,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,cAAc,EAAE,CAMnF;AAED,KAAK,gBAAgB,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AA+C1F,eAAO,MAAM,MAAM,gLAA+L,gBAAgB,GAAG,gBAAgB,GAAG;IACtP,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;CACvH,iCAQC,CAAC;AAyBH,wBAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;IAAE,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAAC,YAAY,CAAC,EAAE,SAAS,CAAA;CAAE,sCAiChM;AAED,wBAAgB,kBAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,sCAajF"}
+{"version":3,"file":"Blocks.d.ts","sourceRoot":"","sources":["../../../src/client/Blocks.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAuE,MAAM,OAAO,CAAC;AACvG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAKtG,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AASrE,qBAAa,aAAc,SAAQ,SAAS,CAAC;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;IACxG,KAAK;;;MAAiC;IAGtC,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO;;;;IAI9C,MAAM;CAKP;AAED,eAAO,MAAM,UAAU,kEAAuD;IAC5E,UAAU,EAAE,kBAAkB,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;CAC1E,iCAwCC,CAAC;AAEH,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,cAAc,EAAE,CAMnF;AAED,KAAK,gBAAgB,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAkF1F,eAAO,MAAM,MAAM,gLAA+L,gBAAgB,GAAG,gBAAgB,GAAG;IACtP,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;CACvH,iCASC,CAAC;AAyBH,wBAAgB,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE;IAAE,MAAM,EAAE,SAAS,cAAc,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAAC,YAAY,CAAC,EAAE,SAAS,CAAA;CAAE,sCAkChM;AAED,wBAAgB,kBAAkB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,sCAajF"}