@possumtech/rummy 0.2.8 → 0.3.1

package/migrations/001_initial_schema.sql

@@ -85,6 +85,8 @@ CREATE TABLE IF NOT EXISTS turns (
 	, run_id INTEGER NOT NULL REFERENCES runs (id) ON DELETE CASCADE
 	, loop_id INTEGER NOT NULL REFERENCES loops (id) ON DELETE CASCADE
 	, sequence INTEGER NOT NULL CHECK (sequence >= 1)
+	, context_tokens INTEGER NOT NULL DEFAULT 0 CHECK (context_tokens >= 0)
+	, reasoning_content TEXT
 	, prompt_tokens INTEGER NOT NULL DEFAULT 0 CHECK (prompt_tokens >= 0)
 	, cached_tokens INTEGER NOT NULL DEFAULT 0 CHECK (cached_tokens >= 0)
 	, completion_tokens INTEGER NOT NULL DEFAULT 0 CHECK (completion_tokens >= 0)
@@ -118,12 +120,12 @@ CREATE TABLE IF NOT EXISTS known_entries (
 	, run_id INTEGER NOT NULL REFERENCES runs (id) ON DELETE CASCADE
 	, loop_id INTEGER REFERENCES loops (id) ON DELETE CASCADE
 	, turn INTEGER NOT NULL DEFAULT 0 CHECK (turn >= 0)
-	, path TEXT NOT NULL
+	, path TEXT NOT NULL CHECK (length(path) <= 2048)
 	, body TEXT NOT NULL DEFAULT ''
 	, scheme TEXT GENERATED ALWAYS AS (schemeOf(path)) STORED
 	, status INTEGER NOT NULL DEFAULT 200 CHECK (status BETWEEN 100 AND 599)
 	, fidelity TEXT NOT NULL DEFAULT 'full' CHECK (
-		fidelity IN ('full', 'summary', 'index', 'stored')
+		fidelity IN ('full', 'summary', 'index', 'archive')
 	)
 	, hash TEXT
 	, attributes JSON NOT NULL DEFAULT '{}' CHECK (json_valid(attributes))
@@ -169,7 +171,7 @@ CREATE TABLE IF NOT EXISTS turn_context (
 	, body TEXT NOT NULL DEFAULT ''
 	, tokens INTEGER NOT NULL DEFAULT 0 CHECK (tokens >= 0)
 	, attributes JSON NOT NULL DEFAULT '{}' CHECK (json_valid(attributes))
-	, category TEXT NOT NULL DEFAULT 'result'
+	, category TEXT NOT NULL DEFAULT 'logging'
 	, source_turn INTEGER DEFAULT 0
 );
 CREATE INDEX IF NOT EXISTS idx_turn_context_run_turn

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@possumtech/rummy",
-	"version": "0.2.8",
+	"version": "0.3.1",
 	"description": "Relational Unknowns Memory Management Yoke",
 	"keywords": [
 		"llm"
@@ -37,10 +37,21 @@
 		"fix:sql": ". .venv/bin/activate && sqlfluff fix . --force",
 		"test": "npm run lint && npm run test:unit && npm run test:intg",
 		"test:all": "npm run lint && npm run test:unit && npm run test:intg && npm run test:e2e",
-		"test:unit": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --experimental-test-coverage --test-coverage-lines=70 --test-coverage-branches=70 --test-coverage-functions=70 --test-concurrency=1 --test $(find src -name '*.test.js')",
+		"test:unit": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --experimental-test-coverage --test-coverage-lines=50 --test-coverage-branches=50 --test-coverage-functions=50 --test-concurrency=1 --test-force-exit --test $(find src -name '*.test.js')",
 		"test:intg": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test-concurrency=1 --test $(find test/integration -name '*.test.js')",
-		"test:e2e": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test-concurrency=1 --test-force-exit --test-reporter=spec --test $(find test/e2e -name '*.test.js')",
-		"test:live": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test-concurrency=1 --test-force-exit --test-reporter=spec --test $(find test/live -name '*.test.js')"
+		"test:e2e": "mkdir -p /tmp/rummy_test_diag && node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test-concurrency=1 --test-force-exit --test-reporter=spec --test $(find test/e2e -name '*.test.js') 2>&1 | tee /tmp/rummy_test_diag/e2e_$(date +%Y%m%dT%H%M%S).log",
+		"test:live": "mkdir -p /tmp/rummy_test_diag && node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test-concurrency=1 --test-force-exit --test-reporter=spec --test $(find test/live -name '*.test.js') 2>&1 | tee /tmp/rummy_test_diag/live_$(date +%Y%m%dT%H%M%S).log",
+		"test:clean": "rm -rf test/lme/results test/mab/results test/tmp /tmp/rummy_test_diag /tmp/rummy_test_*.db /tmp/rummy_test_*.db-shm /tmp/rummy_test_*.db-wal && echo 'Test artifacts cleaned.'",
+		"test:mab:get": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test test/mab/download.js",
+		"test:mab": "bash -c 'mkdir -p /tmp/rummy_test_diag && node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test test/mab/runner.js \"$@\" 2>&1 | tee /tmp/rummy_test_diag/mab_$(date +%Y%m%dT%H%M%S).log' --",
+		"test:grok": "bash -c 'mkdir -p /tmp/rummy_test_diag && node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --env-file-if-exists=.env.grok test/mab/runner.js \"$@\" 2>&1 | tee /tmp/rummy_test_diag/mab_grok_$(date +%Y%m%dT%H%M%S).log' --",
+		"test:mab:taxonomy": "bash -c 'mkdir -p /tmp/rummy_test_diag && node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test test/mab/runner.js --split Conflict_Resolution --row 0 --no-questions 2>&1 | tee /tmp/rummy_test_diag/taxonomy_$(date +%Y%m%dT%H%M%S).log' --",
+		"test:grok:taxonomy": "bash -c 'mkdir -p /tmp/rummy_test_diag && node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --env-file-if-exists=.env.grok test/mab/runner.js --split Conflict_Resolution --row 0 --no-questions 2>&1 | tee /tmp/rummy_test_diag/taxonomy_grok_$(date +%Y%m%dT%H%M%S).log' --",
+		"test:lme:get": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test test/lme/download.js",
+		"test:lme": "bash -c 'mkdir -p /tmp/rummy_test_diag && node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test test/lme/runner.js \"$@\" 2>&1 | tee /tmp/rummy_test_diag/lme_$(date +%Y%m%dT%H%M%S).log' --",
+		"test:mab:clean": "rm -rf test/mab/results/*/",
+		"test:lme:clean": "rm -rf test/lme/results/*/",
+		"test:clear": "rm -rf /tmp/rummy_test_diag /tmp/rummy_test_*.db /tmp/rummy_test_*.db-shm /tmp/rummy_test_*.db-wal /tmp/rummy-stories-*"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.4.6"
@@ -48,8 +59,9 @@
 	"dependencies": {
 		"@possumtech/sqlrite": "^3.1.0",
 		"@xmldom/xmldom": "^0.9.9",
+		"diff": "^8.0.4",
 		"htmlparser2": "^12.0.0",
-		"tiktoken": "^1.0.22",
+		"picomatch": "^4.0.4",
 		"ws": "^8.19.0",
 		"xpath": "^0.0.34"
 	}

package/service.js

@@ -18,13 +18,13 @@ if (gitCheck.error || gitCheck.status !== 0) {
 	console.warn("[RUMMY] WARNING: 'git' not found. File tracking will use manual activation only.");
 }
 
-let SqlRite, SocketServer, registerPlugins, createHooks, RpcRegistry;
+let SqlRite, SocketServer, registerPlugins, initPlugins, createHooks, RpcRegistry;
 try {
 	SqlRite = (await import("@possumtech/sqlrite")).default;
 	SocketServer = (await import("./src/server/SocketServer.js")).default;
 	const pluginIndex = await import("./src/plugins/index.js");
 	registerPlugins = pluginIndex.registerPlugins;
-	var initPlugins = pluginIndex.initPlugins;
+	initPlugins = pluginIndex.initPlugins;
 	createHooks = (await import("./src/hooks/Hooks.js")).default;
 	RpcRegistry = (await import("./src/server/RpcRegistry.js")).default;
 } catch (err) {
@@ -81,10 +81,12 @@ async function main() {
 			if (!key.startsWith("RUMMY_MODEL_")) continue;
 			const alias = key.replace("RUMMY_MODEL_", "");
 			const actual = process.env[key];
+			const contextEnv = process.env[`RUMMY_CONTEXT_${alias}`];
+			const context_length = contextEnv ? Number.parseInt(contextEnv, 10) : null;
 			await db.upsert_model.get({
 				alias,
 				actual,
-				context_length: null,
+				context_length,
 			});
 			modelAliases.push(alias);
 		}

package/src/agent/AgentLoop.js

@@ -32,7 +32,7 @@ export default class AgentLoop {
 	}
 
 	async #ensureRun(projectId, model, run, options) {
-		const _noContext = options?.noContext === true;
+		const _noRepo = options?.noRepo === true;
 		const isFork = options?.fork === true;
 		const requestedModel = model;
 
@@ -54,6 +54,11 @@ export default class AgentLoop {
 				new_run_id: runRow.id,
 				parent_run_id: existingRun.id,
 			});
+			await this.#hooks.run.created.emit({
+				runId: runRow.id,
+				alias,
+				forkedFrom: existingRun.id,
+			});
 			return { runId: runRow.id, alias };
 		}
 
@@ -87,6 +92,7 @@ export default class AgentLoop {
 			persona: options?.persona ?? null,
 			context_limit: options?.contextLimit ?? null,
 		});
+		await this.#hooks.run.created.emit({ runId: runRow.id, alias });
 		return { runId: runRow.id, alias };
 	}
 
@@ -112,7 +118,10 @@ export default class AgentLoop {
 		if (!project)
 			throw new Error(msg("error.project_not_found", { projectId }));
 
-		const noContext = options?.noContext === true;
+		const noRepo = options?.noRepo === true;
+		const noInteraction = options?.noInteraction === true;
+		const noWeb = options?.noWeb === true;
+		const noProposals = options?.noProposals === true;
 		const requestedModel = model;
 
 		const runInfo = await this.#ensureRun(projectId, model, run, options);
@@ -134,7 +143,13 @@ export default class AgentLoop {
 			mode,
 			model: requestedModel,
 			prompt: prompt || "",
-			config: JSON.stringify({ noContext, temperature: options?.temperature }),
+			config: JSON.stringify({
+				noRepo,
+				noInteraction,
+				noWeb,
+				noProposals,
+				temperature: options?.temperature,
+			}),
 		});
 
 		if (this.#activeRuns.has(currentRunId)) {
@@ -151,38 +166,76 @@ export default class AgentLoop {
 	}
 
 	async #drainQueue(currentRunId, currentAlias, projectId, project, options) {
-		while (true) {
-			const loop = await this.#db.claim_next_loop.get({
-				run_id: currentRunId,
-			});
-			if (!loop) break;
-
-			const loopConfig = loop.config ? JSON.parse(loop.config) : {};
-			const result = await this.#executeLoop({
-				mode: loop.mode,
-				project,
-				projectId,
-				currentRunId,
-				currentAlias,
-				currentLoopId: loop.id,
-				requestedModel: loop.model,
-				prompt: loop.prompt,
-				noContext: loopConfig.noContext || false,
-				options: { ...options, temperature: loopConfig.temperature },
-				hook: loop.mode === "ask" ? this.#hooks.ask : this.#hooks.act,
-			});
+		const controller = new AbortController();
+		this.#activeRuns.set(currentRunId, controller);
 
-			await this.#db.complete_loop.run({
-				id: loop.id,
-				status: result.status === 202 ? 202 : result.status,
-				result: JSON.stringify(result),
-			});
+		try {
+			while (true) {
+				const loop = await this.#db.claim_next_loop.get({
+					run_id: currentRunId,
+				});
+				if (!loop) break;
+
+				const loopConfig = loop.config ? JSON.parse(loop.config) : {};
+				const hook = loop.mode === "ask" ? this.#hooks.ask : this.#hooks.act;
+
+				let result;
+				try {
+					result = await this.#executeLoop({
+						mode: loop.mode,
+						project,
+						projectId,
+						currentRunId,
+						currentAlias,
+						currentLoopId: loop.id,
+						requestedModel: loop.model,
+						prompt: loop.prompt,
+						noRepo: loopConfig.noRepo || false,
+						noInteraction: loopConfig.noInteraction || false,
+						noWeb: loopConfig.noWeb || false,
+						noProposals: loopConfig.noProposals || false,
+						options: { ...options, temperature: loopConfig.temperature },
+						hook,
+						signal: controller.signal,
+					});
+				} catch (err) {
+					await this.#db.complete_loop.run({
+						id: loop.id,
+						status: 500,
+						result: JSON.stringify({ error: err.message }),
+					});
+					throw err;
+				}
 
-			if (result.status === 202) return result;
-		}
+				if (result.status === 413) {
+					await this.#db.complete_loop.run({
+						id: loop.id,
+						status: 413,
+						result: JSON.stringify(result),
+					});
+					return {
+						run: currentAlias,
+						status: 413,
+						error: `Context full (${result.overflow} tokens over).`,
+					};
+				}
+
+				await this.#db.complete_loop.run({
+					id: loop.id,
+					status: result.status === 202 ? 202 : result.status,
+					result: JSON.stringify(result),
+				});
+
+				if (result.status === 202) return result;
+			}
 
-		const runRow = await this.#db.get_run_by_alias.get({ alias: currentAlias });
-		return { run: currentAlias, status: runRow?.status ?? 200 };
+			const runRow = await this.#db.get_run_by_alias.get({
+				alias: currentAlias,
+			});
+			return { run: currentAlias, status: runRow?.status ?? 200 };
+		} finally {
+			this.#activeRuns.delete(currentRunId);
+		}
 	}
 
 	async #executeLoop({
@@ -194,9 +247,13 @@ export default class AgentLoop {
 		currentLoopId,
 		requestedModel,
 		prompt,
-		noContext,
+		noRepo,
+		noInteraction,
+		noWeb,
+		noProposals,
 		options,
 		hook,
+		signal,
 	}) {
 		const runRow = await this.#db.get_run_by_id.get({ id: currentRunId });
 		if (runRow.status !== 102) {
@@ -212,16 +269,41 @@ export default class AgentLoop {
 			? Math.min(runRow.context_limit, modelContextSize)
 			: modelContextSize;
 
+		const toolSet = this.#hooks.tools.resolveForLoop(mode, {
+			noInteraction,
+			noWeb,
+			noProposals,
+		});
+
 		let loopIteration = 0;
 		const MAX_LOOP_ITERATIONS = Number(process.env.RUMMY_MAX_TURNS) || 15;
 		const healer = new ResponseHealer();
 
-		const controller = new AbortController();
-		this.#activeRuns.set(currentRunId, controller);
+		let _lastAssembledTokens = 0;
+		let recovery = null; // { target, promptPath, strikes, lastTokens }
+
+		// Demote full logging entries from previous loops to summary before
+		// they appear in <previous>. General policy: keep <previous> compact.
+		await this.#knownStore.demotePreviousLoopLogging(
+			currentRunId,
+			currentLoopId,
+		);
+
+		// Restore any prompt entries left at summary fidelity by a recovery
+		// phase that was interrupted (server crash, restart). If the full
+		// prompt would overflow, Prompt Demotion on turn 1 handles it.
+		await this.#knownStore.restoreSummarizedPrompts(currentRunId);
+
+		await this.#hooks.loop.started.emit({
+			runId: currentRunId,
+			loopId: currentLoopId,
+			mode,
+			prompt,
+		});
 
 		try {
 			while (loopIteration < MAX_LOOP_ITERATIONS) {
-				if (controller.signal.aborted) {
+				if (signal.aborted) {
 					await this.#db.update_run_status.run({
 						id: currentRunId,
 						status: 499,
@@ -255,12 +337,52 @@ export default class AgentLoop {
 					currentLoopId,
 					requestedModel,
 					loopPrompt: turnPrompt,
-					noContext,
+					loopIteration,
+					noRepo,
+					toolSet,
+					inRecovery: recovery !== null,
 					contextSize,
 					options: { ...options, isContinuation: loopIteration > 1 },
-					signal: controller.signal,
+					signal,
 				});
 
+				if (result.status === 413) {
+					return {
+						run: currentAlias,
+						status: 413,
+						overflow: result.overflow,
+						assembledTokens: result.assembledTokens,
+						contextSize: result.contextSize,
+						turn: result.turn,
+					};
+				}
+
+				_lastAssembledTokens = result.assembledTokens;
+
+				// Budget recovery: enforce progress toward context target.
+				const ra = advanceRecovery(recovery, result);
+				recovery = ra.next;
+				if (ra.action === "restore" && ra.promptPath) {
+					await this.#knownStore.setFidelity(
+						currentRunId,
+						ra.promptPath,
+						"full",
+					);
+				}
+				if (ra.action === "hard413") {
+					await this.#db.update_run_status.run({
+						id: currentRunId,
+						status: 413,
+					});
+					const out = {
+						run: currentAlias,
+						status: 413,
+						turn: result.turn,
+					};
+					await hook.completed.emit({ projectId, ...out });
+					return out;
+				}
+
 				const runUsage = await this.#db.get_run_usage.get({
 					run_id: currentRunId,
 				});
@@ -292,12 +414,13 @@ export default class AgentLoop {
 						model: result.model,
 						temperature: result.temperature,
 						context_size: result.contextSize,
-						context_tokens: (
-							await this.#db.get_turn_budget.get({
-								run_id: currentRunId,
-								turn: result.turn,
-							})
-						).total,
+						context_tokens:
+							(
+								await this.#db.get_turn_context_tokens.get({
+									run_id: currentRunId,
+									sequence: result.turn,
+								})
+							)?.context_tokens ?? 0,
 						prompt_tokens: runUsage.prompt_tokens,
 						cached_tokens: runUsage.cached_tokens,
 						completion_tokens: runUsage.completion_tokens,
@@ -332,6 +455,9 @@ export default class AgentLoop {
 					flags: result.flags,
 				});
 
+				// Don't exit while budget recovery is still active.
+				if (recovery !== null) continue;
+
 				const repetition = healer.assessRepetition(result);
 				if (!repetition.continue) {
 					await this.#db.update_run_status.run({
@@ -376,7 +502,7 @@ export default class AgentLoop {
 			await hook.completed.emit({ projectId, ...out });
 			return out;
 		} catch (err) {
-			if (controller.signal.aborted) {
+			if (signal.aborted) {
 				await this.#db.update_run_status.run({
 					id: currentRunId,
 					status: 499,
@@ -408,7 +534,14 @@ export default class AgentLoop {
 			await hook.completed.emit({ projectId, ...out });
 			return out;
 		} finally {
-			this.#activeRuns.delete(currentRunId);
+			await this.#hooks.loop.completed
+				.emit({
+					runId: currentRunId,
+					loopId: currentLoopId,
+					mode,
+					turns: loopIteration,
+				})
+				.catch(() => {});
 		}
 	}
 
@@ -441,6 +574,29 @@ export default class AgentLoop {
 			}
 
 			if (action === "accept") {
+				if (path.startsWith("set://") && attrs?.file && attrs?.merge) {
+					const fileBody = await this.#knownStore.getBody(runId, attrs.file);
+					if (fileBody != null) {
+						const blocks = attrs.merge.split(/(?=<<<<<<< SEARCH)/);
+						let patched = fileBody;
+						for (const block of blocks) {
+							const m = block.match(
+								/<<<<<<< SEARCH\n?([\s\S]*?)\n?=======\n?([\s\S]*?)\n?>>>>>>> REPLACE/,
+							);
+							if (m) patched = patched.replace(m[1], m[2]);
+						}
+						const turn = (await this.#db.get_run_by_id.get({ id: runId }))
+							.next_turn;
+						await this.#knownStore.upsert(
+							runId,
+							turn,
+							attrs.file,
+							patched,
+							200,
+						);
+					}
+				}
+
 				if (path.startsWith("rm://")) {
 					if (attrs?.path) {
 						await this.#knownStore.remove(runId, attrs.path);
@@ -518,7 +674,7 @@ export default class AgentLoop {
 			mode: resumeMode,
 			model: runRow.model,
 			prompt: "",
-			config: "{}",
+			config: currentLoop?.config || "{}",
 		});
 		return this.#drainQueue(runId, runAlias, projectId, project, {});
 	}
@@ -546,16 +702,9 @@ export default class AgentLoop {
 			runRow.id,
 			nextTurn,
 			`prompt://${nextTurn}`,
-			"",
-			200,
-			{ attributes: { mode: "ask" } },
-		);
-		await this.#knownStore.upsert(
-			runRow.id,
-			nextTurn,
-			`ask://${nextTurn}`,
 			message,
 			200,
+			{ attributes: { mode: "ask" } },
 		);
 
 		if (this.#activeRuns.has(runRow.id)) {
@@ -584,3 +733,51 @@ export default class AgentLoop {
 		return this.#knownStore.getLog(runRow.id);
 	}
 }
+
+/**
+ * Pure recovery state transition — exported for testing.
+ *
+ * @param {object|null} recovery  Current recovery state (mutated copy returned).
+ * @param {{ assembledTokens: number, budgetRecovery?: { target: number, promptPath: string|null } }} result
+ * @returns {{ next: object|null, action: null|'restore'|'hard413', promptPath: string|null }}
+ */
+export function advanceRecovery(recovery, result) {
+	// Initialise or update recovery state from a new Turn Demotion event.
+	if (result.budgetRecovery) {
+		if (!recovery) {
+			recovery = {
+				target: result.budgetRecovery.target,
+				promptPath: result.budgetRecovery.promptPath,
+				strikes: 0,
+				lastTokens: result.assembledTokens,
+			};
+		} else {
+			// Re-overflow during recovery: tighten target, don't count as strike.
+			recovery = {
+				...recovery,
+				target: Math.min(recovery.target, result.budgetRecovery.target),
+			};
+		}
+	}
+
+	if (recovery === null) return { next: null, action: null, promptPath: null };
+
+	const current = result.assembledTokens;
+
+	if (current <= recovery.target) {
+		return { next: null, action: "restore", promptPath: recovery.promptPath };
+	}
+
+	const noProgress = current >= recovery.lastTokens && !result.budgetRecovery;
+	const strikes = noProgress ? recovery.strikes + 1 : 0;
+
+	if (strikes >= 3) {
+		return { next: null, action: "hard413", promptPath: null };
+	}
+
+	return {
+		next: { ...recovery, strikes, lastTokens: current },
+		action: null,
+		promptPath: null,
+	};
+}

package/src/agent/ContextAssembler.js

@@ -6,17 +6,33 @@
 export default class ContextAssembler {
 	static async assembleFromTurnContext(
 		rows,
-		{ type = "ask", systemPrompt = "", contextSize = 0, demoted = [] } = {},
+		{
+			type = "ask",
+			systemPrompt = "",
+			contextSize = 0,
+			demoted = [],
+			toolSet = null,
+			lastContextTokens = 0,
+			turn = 1,
+		} = {},
 		hooks,
 	) {
 		// Find loop boundary from active prompt
 		const promptEntry = rows.findLast(
-			(r) =>
-				r.category === "prompt" && (r.scheme === "ask" || r.scheme === "act"),
+			(r) => r.category === "prompt" && r.scheme === "prompt",
 		);
 		const loopStartTurn = promptEntry?.source_turn ?? 0;
 
-		const ctx = { rows, loopStartTurn, type, contextSize, demoted };
+		const ctx = {
+			rows,
+			loopStartTurn,
+			type,
+			contextSize,
+			lastContextTokens,
+			demoted,
+			toolSet,
+			turn,
+		};
 
 		const system = await hooks.assembly.system.filter(systemPrompt, ctx);
 		const user = await hooks.assembly.user.filter("", ctx);