@possumtech/rummy 0.3.0 → 0.4.0

package/src/plugins/update/update.js

@@ -7,6 +7,7 @@ export default class Update {
 		this.#core = core;
 		core.ensureTool();
 		core.registerScheme({ category: "logging" });
+		core.on("handler", this.handler.bind(this));
 		core.on("full", this.full.bind(this));
 		core.on("summary", this.summary.bind(this));
 		core.filter("instructions.toolDocs", async (docsMap) => {
@@ -15,6 +16,12 @@ export default class Update {
 		});
 	}
 
+	async handler(entry, rummy) {
+		const { entries: store, sequence: turn, runId, loopId } = rummy;
+		const statusPath = await store.slugPath(runId, "update", entry.body);
+		await store.upsert(runId, turn, statusPath, entry.body, 200, { loopId });
+	}
+
 	full(entry) {
 		return `# update\n${entry.body}`;
 	}

package/src/plugins/update/updateDoc.js

@@ -2,31 +2,26 @@
 // Text goes to the model. Rationale stays in source.
 // Changing ANY line requires reading ALL rationales first.
 const LINES = [
-	// --- Syntax
 	["## <update>[brief status]</update> - Signal continuation"],
-
-	// --- Examples: research progress and multi-step work
 	[
 		"Example: <update>Reading config files</update>",
-		"Progress checkpoint. Shows update as a status signal, not a log entry.",
+		"Progress checkpoint. Status signal, not a log entry.",
 	],
 	[
 		"Example: <update>Found 3 issues, fixing first</update>",
-		"Multi-step progress. Shows update for ongoing work.",
+		"Multi-step progress. Ongoing work.",
 	],
-
-	// --- Constraints: RFC-style MUST/MUST NOT
 	[
-		"* YOU MUST use <update> if still working — describes the current state",
-		"Continuation signal. Triggers the next turn in the loop.",
+		"* YOU MUST use <update></update> if still working — describes the current state",
+		"Continuation signal. Triggers the next turn.",
 	],
 	[
 		"* YOU MUST NOT use <update> if done — use <summarize/> instead",
-		"Mutual exclusion with summarize. Prevents infinite loops.",
+		"Mutual exclusion with summarize.",
 	],
 	[
 		"* YOU MUST keep <update> to <= 80 characters",
-		"Length cap. Prevents models from writing essays in status updates.",
+		"Length cap.",
 	],
 ];
 

package/src/server/ClientConnection.js

@@ -21,53 +21,76 @@ 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,
-				});
-			}
-		});
+	#onProposal = (payload) => {
+		if (payload.projectId === this.#context.projectId) {
+			this.#sendNotification("run/proposal", {
+				run: payload.run,
+				proposed: payload.proposed,
+			});
+		}
+	};
 
-		this.#hooks.ui.notify.on((payload) => {
-			if (payload.projectId === this.#context.projectId) {
-				this.#sendNotification("ui/notify", {
-					text: payload.text,
-					level: payload.level,
-				});
-			}
-		});
+	#onRender = (payload) => {
+		if (payload.projectId === this.#context.projectId) {
+			this.#sendNotification("ui/render", {
+				text: payload.text,
+				append: payload.append,
+			});
+		}
+	};
 
-		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,
-				});
-			}
-		});
+	#onNotify = (payload) => {
+		if (payload.projectId === this.#context.projectId) {
+			this.#sendNotification("ui/notify", {
+				text: payload.text,
+				level: payload.level,
+			});
+		}
+	};
+
+	#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,
+				telemetry: payload.telemetry,
+			});
+		}
+	};
+
+	#setupNotifications() {
+		this.#hooks.run.progress.on(this.#onProgress);
+		this.#hooks.turn.proposal.on(this.#onProposal);
+		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.turn.proposal.off(this.#onProposal);
+		this.#hooks.ui.render.off(this.#onRender);
+		this.#hooks.ui.notify.off(this.#onNotify);
+		this.#hooks.run.state.off(this.#onState);
 	}
 
 	#buildHandlerContext() {
@@ -135,10 +158,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 +173,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

@@ -13,7 +13,8 @@ visible AS (
 		, ke.turn
 		, ke.updated_at
 		, ke.attributes
-		, ke.tokens AS tokens_full
+		, ke.tokens
+		, COALESCE(s.category, 'logging') AS category
 		, CASE
 			-- Archived entries not in context
 			WHEN ke.fidelity = 'archive' THEN NULL
@@ -38,23 +39,13 @@ projected AS (
 		, turn
 		, updated_at
 		, attributes
+		-- Category comes from schemes table — plugins declare it via registerScheme().
+		, category
+		, tokens
 		, 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
 )
@@ -81,9 +72,8 @@ SELECT
 			END
 			, CASE scheme WHEN 'skill' THEN 0 ELSE 1 END
 			, CASE fidelity
-				WHEN 'index' THEN 0
-				WHEN 'summary' THEN 1
-				ELSE 2
+				WHEN 'summary' THEN 0
+				ELSE 1
 			END
 			, turn
 			, updated_at

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;
-	}
-}