dsh-context-fold 0.1.1 → 0.1.3

package/lib/client.js

@@ -12,16 +12,31 @@ const zh = { "tab.contextFold": "上下文折叠" };
 /** Dictionary: keep keys aligned with `locale/*.json`. */
 const en = { "tab.contextFold": "Context fold" };
 const react = require("react");
-/** Fetch the report for one session. */
+/**
+* Fetch the report for one session.
+*
+* Failures are reported rather than swallowed: before the routes existed the
+* tab rendered "no report available", which reads like "this session folded
+* nothing" instead of "the request never landed".
+*
+* @param sessionId - session to report on.
+* @returns the payload, or a message describing why there is none.
+*/
 async function fetchReport(sessionId) {
-	const response = await fetch("/api/context-fold/report", {
-		method: "POST",
-		headers: { "content-type": "application/json" },
-		body: JSON.stringify({ sessionId })
-	});
-	if (!response.ok) return void 0;
-	const body = await response.json();
-	return body.ok === true ? body.value : void 0;
+	let response;
+	try {
+		response = await fetch("/api/context-fold/report", {
+			method: "POST",
+			headers: { "content-type": "application/json" },
+			body: JSON.stringify({ sessionId })
+		});
+	} catch (error) {
+		return { error: `request failed: ${error instanceof Error ? error.message : String(error)}` };
+	}
+	const body = await response.json().catch(() => void 0);
+	if (!response.ok) return { error: body?.error ?? `HTTP ${String(response.status)}` };
+	if (body?.ok !== true || body.value === void 0) return { error: body?.error ?? "the server returned no value" };
+	return { report: body.value };
 }
 /** Fetch the full text behind one fold. */
 async function fetchOriginal(sessionId, locator) {
@@ -83,6 +98,10 @@ const styles = {
 		marginTop: "6px",
 		color: "#facc15"
 	},
+	error: {
+		marginTop: "6px",
+		color: "#f87171"
+	},
 	reread: {
 		marginTop: "6px",
 		color: "#f87171"
@@ -231,11 +250,14 @@ function ContextFoldTab(props) {
 		}
 		let cancelled = false;
 		setState({ status: "loading" });
-		fetchReport(sessionId).then((report) => {
+		fetchReport(sessionId).then((result) => {
 			if (cancelled) return;
-			setState(report === void 0 ? { status: "empty" } : {
+			setState("report" in result ? {
 				status: "ready",
-				report
+				report: result.report
+			} : {
+				status: "error",
+				error: result.error
 			});
 		});
 		return () => {
@@ -254,10 +276,14 @@ function ContextFoldTab(props) {
 		style: styles.muted,
 		key: "m"
 	}, "Loading…"));
+	else if (state.status === "error") children.push(react.createElement("div", {
+		style: styles.error,
+		key: "e"
+	}, `Could not load the report: ${state.error ?? "unknown"}`));
 	else if (state.status !== "ready" || state.report === void 0) children.push(react.createElement("div", {
 		style: styles.muted,
 		key: "m"
-	}, "No report available for this session."));
+	}, "This session has no folds to report."));
 	else {
 		children.push(react.createElement(Summary, {
 			key: "summary",

package/lib/index.js

@@ -1407,7 +1407,7 @@ function buildReport(session, deps) {
 		const event = session.eventAt(fold.seq);
 		const message = event === void 0 ? null : session.deriveEventMessage(event);
 		const content = message !== null && message.role === "tool" ? message.content : void 0;
-		const tokensAfter = content === void 0 ? 0 : deps.estimateMessage(content);
+		const tokensAfter = message === null ? 0 : deps.estimateMessage(message);
 		const inline = inlineTextOf(content) ?? "";
 		const locator = locatorOf(inline);
 		folds.push({
@@ -1444,10 +1444,7 @@ function buildReport(session, deps) {
 				charsBefore: target.chars?.[position] ?? 0,
 				charsAfter: Array.from(block.text).length,
 				tokensBefore: estimateFromChars(target.chars?.[position] ?? 0),
-				tokensAfter: deps.estimateMessage([{
-					type: "text",
-					text: block.text
-				}]),
+				tokensAfter: estimateFromChars(Array.from(block.text).length),
 				inline: block.text,
 				recoverable: locator !== void 0,
 				...locator === void 0 ? {} : { locator }
@@ -1525,11 +1522,12 @@ function json(value, status = 200) {
 /**
 * Register the two read-only routes the tab uses.
 *
-* @param register - the host route registrar.
+* @param connection - the host `connection` service (its `fetch.register` is the route registrar).
 * @param deps - session and spill access.
 * @returns a disposer for both routes.
 */
-function registerRoutes(register, deps) {
+function registerRoutes(connection, deps) {
+	const register = connection.fetch.register.bind(connection.fetch);
 	const report = register({
 		path: "/api/context-fold/report",
 		methods: ["POST"],
@@ -1720,18 +1718,18 @@ function apply(ctx, rawConfig = {}) {
 	});
 	ctx.inject(["connection"], (scope) => {
 		const connection = scope.connection;
-		if (connection === void 0) {
-			ctx.logger.warn("context-fold: no ctx.connection service; the conversation tab has no data source");
+		if (connection === void 0 || typeof connection.fetch?.register !== "function") {
+			ctx.logger.warn("context-fold: no ctx.connection.fetch.register; the conversation tab has no data source");
 			return;
 		}
 		const tokenMeter = ctx.get("tokenMeter");
-		registerRoutes(connection, {
+		ctx.effect(() => registerRoutes(connection, {
 			sessionOf: (id) => {
 				return ctx.get("sessions")?.get(id);
 			},
 			estimateMessage: (message) => tokenMeter === void 0 ? 0 : tokenMeter.estimateMessage(message),
 			...ctx.get("spillStore") === void 0 ? {} : { spillStore: ctx.get("spillStore") }
-		});
+		}), "context-fold: conversation tab routes");
 	});
 	ctx.on("session/disposed", (session) => {
 		states.delete(session.header.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-context-fold",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "dsh-context-fold: stage-boundary folding of completed tool results into a conclusion plus a spill path, deterministic and replay-safe.",
   "type": "module",
   "main": "lib/index.js",