@possumtech/rummy 0.3.0 → 0.3.1

package/src/server/ClientConnection.js

@@ -21,53 +21,66 @@ export default class ClientConnection {
 		this.#projectAgent = new ProjectAgent(db, hooks);
 
 		this.#ws.on("message", (data) => this.#handleMessage(data));
+		this.#ws.on("close", () => this.#teardown());
 
 		this.#setupNotifications();
 	}
 
-	#setupNotifications() {
-		this.#hooks.run.progress.on((payload) => {
-			if (payload.projectId === this.#context.projectId) {
-				this.#sendNotification("run/progress", {
-					run: payload.run,
-					turn: payload.turn,
-					status: payload.status,
-				});
-			}
-		});
+	#onProgress = (payload) => {
+		if (payload.projectId === this.#context.projectId) {
+			this.#sendNotification("run/progress", {
+				run: payload.run,
+				turn: payload.turn,
+				status: payload.status,
+			});
+		}
+	};
 
-		this.#hooks.ui.render.on((payload) => {
-			if (payload.projectId === this.#context.projectId) {
-				this.#sendNotification("ui/render", {
-					text: payload.text,
-					append: payload.append,
-				});
-			}
-		});
+	#onRender = (payload) => {
+		if (payload.projectId === this.#context.projectId) {
+			this.#sendNotification("ui/render", {
+				text: payload.text,
+				append: payload.append,
+			});
+		}
+	};
 
-		this.#hooks.ui.notify.on((payload) => {
-			if (payload.projectId === this.#context.projectId) {
-				this.#sendNotification("ui/notify", {
-					text: payload.text,
-					level: payload.level,
-				});
-			}
-		});
+	#onNotify = (payload) => {
+		if (payload.projectId === this.#context.projectId) {
+			this.#sendNotification("ui/notify", {
+				text: payload.text,
+				level: payload.level,
+			});
+		}
+	};
 
-		this.#hooks.run.state.on((payload) => {
-			if (payload.projectId === this.#context.projectId) {
-				this.#sendNotification("run/state", {
-					run: payload.run,
-					turn: payload.turn,
-					status: payload.status,
-					summary: payload.summary,
-					history: payload.history,
-					unknowns: payload.unknowns,
-					proposed: payload.proposed,
-					telemetry: payload.telemetry,
-				});
-			}
-		});
+	#onState = (payload) => {
+		if (payload.projectId === this.#context.projectId) {
+			this.#sendNotification("run/state", {
+				run: payload.run,
+				turn: payload.turn,
+				status: payload.status,
+				summary: payload.summary,
+				history: payload.history,
+				unknowns: payload.unknowns,
+				proposed: payload.proposed,
+				telemetry: payload.telemetry,
+			});
+		}
+	};
+
+	#setupNotifications() {
+		this.#hooks.run.progress.on(this.#onProgress);
+		this.#hooks.ui.render.on(this.#onRender);
+		this.#hooks.ui.notify.on(this.#onNotify);
+		this.#hooks.run.state.on(this.#onState);
+	}
+
+	#teardown() {
+		this.#hooks.run.progress.off(this.#onProgress);
+		this.#hooks.ui.render.off(this.#onRender);
+		this.#hooks.ui.notify.off(this.#onNotify);
+		this.#hooks.run.state.off(this.#onState);
 	}
 
 	#buildHandlerContext() {
@@ -135,10 +148,11 @@ export default class ClientConnection {
 				);
 			} else {
 				const timeout = Number(process.env.RUMMY_RPC_TIMEOUT) || 10_000;
+				let timer;
 				result = await Promise.race([
 					registration.handler(params || {}, this.#buildHandlerContext()),
-					new Promise((_, reject) =>
-						setTimeout(
+					new Promise((_, reject) => {
+						timer = setTimeout(
 							() =>
 								reject(
 									new Error(
@@ -149,9 +163,9 @@ export default class ClientConnection {
 									),
 								),
 							timeout,
-						),
-					),
-				]);
+						);
+					}),
+				]).finally(() => clearTimeout(timer));
 			}
 
 			const finalResult = await this.#hooks.rpc.response.result.filter(result, {

package/src/sql/v_model_context.sql

@@ -14,6 +14,7 @@ visible AS (
 		, ke.updated_at
 		, ke.attributes
 		, ke.tokens AS tokens_full
+		, COALESCE(s.category, 'logging') AS category
 		, CASE
 			-- Archived entries not in context
 			WHEN ke.fidelity = 'archive' THEN NULL
@@ -38,23 +39,12 @@ projected AS (
 		, turn
 		, updated_at
 		, attributes
+		-- Category comes from schemes table — plugins declare it via registerScheme().
+		, category
 		, CASE
 			WHEN visible_fidelity IN ('full', 'summary') THEN body
 			ELSE ''
 		END AS body
-		-- Four roles: data, logging, unknown, prompt.
-		-- These are structural — see PluginContext.CATEGORIES.
-		-- 'tool' is internal (model_visible=0 in practice).
-		-- Default is 'logging' — plugins opt into 'data' explicitly.
-		, CASE
-			WHEN scheme IS NULL THEN 'data'
-			WHEN scheme IN ('http', 'https') THEN 'data'
-			WHEN scheme IN ('known', 'skill') THEN 'data'
-			WHEN scheme = 'unknown' THEN 'unknown'
-			WHEN scheme = 'prompt' THEN 'prompt'
-			WHEN scheme = 'tool' THEN 'tool'
-			ELSE 'logging'
-		END AS category
 	FROM visible
 	WHERE visible_fidelity IS NOT NULL
 )

package/src/plugins/budget/BudgetGuard.js

@@ -1,74 +0,0 @@
-import { countTokens } from "../../agent/tokens.js";
-
-export class BudgetExceeded extends Error {
-	constructor(path, requested, remaining) {
-		super(
-			`Budget exceeded: ${path} needs ${requested} tokens, ${remaining} remaining`,
-		);
-		this.name = "BudgetExceeded";
-		this.status = 413;
-		this.path = path;
-		this.requested = requested;
-		this.remaining = remaining;
-	}
-}
-
-export default class BudgetGuard {
-	#ceiling;
-	#baseline;
-	#spent;
-	#tripped;
-	#tripSource;
-
-	constructor(ceiling, baseline) {
-		this.#ceiling = ceiling ?? null;
-		this.#baseline = baseline;
-		this.#spent = 0;
-		this.#tripped = false;
-		this.#tripSource = null;
-	}
-
-	get isTripped() {
-		return this.#tripped;
-	}
-
-	get tripSource() {
-		return this.#tripSource;
-	}
-
-	get remaining() {
-		if (this.#ceiling === null) return Infinity;
-		return this.#ceiling - this.#baseline - this.#spent;
-	}
-
-	get spent() {
-		return this.#spent;
-	}
-
-	check(tokens, path) {
-		if (this.#ceiling === null) return;
-		if (this.#tripped) throw new BudgetExceeded(path, tokens, 0);
-		if (tokens <= 0) return;
-		const remaining = this.remaining;
-		if (tokens > remaining) throw new BudgetExceeded(path, tokens, remaining);
-	}
-
-	charge(tokens) {
-		if (tokens > 0) this.#spent += tokens;
-	}
-
-	trip(source) {
-		this.#tripped = true;
-		this.#tripSource = source;
-	}
-
-	/**
-	 * Compute the token delta for an upsert. New entry = full cost.
-	 * Update = difference between new and old body.
-	 */
-	static delta(newBody, existingBody) {
-		const newTokens = countTokens(newBody);
-		const oldTokens = existingBody ? countTokens(existingBody) : 0;
-		return newTokens - oldTokens;
-	}
-}