@possumtech/rummy 0.2.7 → 0.2.8

package/src/agent/AgentLoop.js

@@ -119,7 +119,7 @@ export default class AgentLoop {
 		if (runInfo.blocked) {
 			return {
 				run: runInfo.alias,
-				status: "proposed",
+				status: 202,
 				remainingCount: runInfo.proposed.length,
 				proposed: runInfo.proposed,
 			};
@@ -127,8 +127,10 @@ export default class AgentLoop {
 
 		const { runId: currentRunId, alias: currentAlias } = runInfo;
 
-		await this.#db.enqueue_prompt.get({
+		const loopSeq = await this.#db.next_loop.get({ run_id: currentRunId });
+		await this.#db.enqueue_loop.get({
 			run_id: currentRunId,
+			sequence: loopSeq.sequence,
 			mode,
 			model: requestedModel,
 			prompt: prompt || "",
@@ -136,7 +138,7 @@ export default class AgentLoop {
 		});
 
 		if (this.#activeRuns.has(currentRunId)) {
-			return { run: currentAlias, status: "queued" };
+			return { run: currentAlias, status: 100 };
 		}
 
 		return this.#drainQueue(
@@ -150,35 +152,37 @@ export default class AgentLoop {
 
 	async #drainQueue(currentRunId, currentAlias, projectId, project, options) {
 		while (true) {
-			const queued = await this.#db.claim_next_prompt.get({
+			const loop = await this.#db.claim_next_loop.get({
 				run_id: currentRunId,
 			});
-			if (!queued) break;
+			if (!loop) break;
 
-			const promptConfig = queued.config ? JSON.parse(queued.config) : {};
+			const loopConfig = loop.config ? JSON.parse(loop.config) : {};
 			const result = await this.#executeLoop({
-				mode: queued.mode,
+				mode: loop.mode,
 				project,
 				projectId,
 				currentRunId,
 				currentAlias,
-				requestedModel: queued.model,
-				prompt: queued.prompt,
-				noContext: promptConfig.noContext || false,
-				options: { ...options, temperature: promptConfig.temperature },
-				hook: queued.mode === "ask" ? this.#hooks.ask : this.#hooks.act,
+				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,
 			});
 
-			await this.#db.complete_prompt.run({
-				id: queued.id,
+			await this.#db.complete_loop.run({
+				id: loop.id,
+				status: result.status === 202 ? 202 : result.status,
 				result: JSON.stringify(result),
 			});
 
-			if (result.status === "proposed") return 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 || "completed" };
+		return { run: currentAlias, status: runRow?.status ?? 200 };
 	}
 
 	async #executeLoop({
@@ -187,6 +191,7 @@ export default class AgentLoop {
 		projectId,
 		currentRunId,
 		currentAlias,
+		currentLoopId,
 		requestedModel,
 		prompt,
 		noContext,
@@ -194,10 +199,10 @@ export default class AgentLoop {
 		hook,
 	}) {
 		const runRow = await this.#db.get_run_by_id.get({ id: currentRunId });
-		if (runRow.status !== "running") {
+		if (runRow.status !== 102) {
 			await this.#db.update_run_status.run({
 				id: currentRunId,
-				status: "running",
+				status: 102,
 			});
 		}
 
@@ -219,11 +224,11 @@ export default class AgentLoop {
 				if (controller.signal.aborted) {
 					await this.#db.update_run_status.run({
 						id: currentRunId,
-						status: "aborted",
+						status: 499,
 					});
 					const out = {
 						run: currentAlias,
-						status: "aborted",
+						status: 499,
 						turn: loopIteration,
 					};
 					await hook.completed.emit({ projectId, ...out });
@@ -247,6 +252,7 @@ export default class AgentLoop {
 					projectId,
 					currentRunId,
 					currentAlias,
+					currentLoopId,
 					requestedModel,
 					loopPrompt: turnPrompt,
 					noContext,
@@ -265,14 +271,14 @@ export default class AgentLoop {
 				const unresolved = await this.#knownStore.getUnresolved(currentRunId);
 
 				const latestSummary = history
-					.filter((e) => e.status === "summary")
+					.filter((e) => e.status === 200 && e.path?.startsWith("summarize://"))
 					.at(-1);
 
 				await this.#hooks.run.state.emit({
 					projectId,
 					run: currentAlias,
 					turn: result.turn,
-					status: unresolved.length > 0 ? "proposed" : "running",
+					status: unresolved.length > 0 ? 202 : 102,
 					summary: latestSummary?.body || "",
 					history,
 					unknowns: unknowns.map((u) => ({ path: u.path, body: u.body })),
@@ -286,6 +292,12 @@ 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,
 						prompt_tokens: runUsage.prompt_tokens,
 						cached_tokens: runUsage.cached_tokens,
 						completion_tokens: runUsage.completion_tokens,
@@ -301,11 +313,11 @@ export default class AgentLoop {
 				if (unresolved.length > 0) {
 					await this.#db.update_run_status.run({
 						id: currentRunId,
-						status: "proposed",
+						status: 202,
 					});
 					const out = {
 						run: currentAlias,
-						status: "proposed",
+						status: 202,
 						turn: result.turn,
 						proposed: unresolved,
 					};
@@ -324,11 +336,11 @@ export default class AgentLoop {
 				if (!repetition.continue) {
 					await this.#db.update_run_status.run({
 						id: currentRunId,
-						status: "completed",
+						status: 200,
 					});
 					const out = {
 						run: currentAlias,
-						status: "completed",
+						status: 200,
 						turn: result.turn,
 						reason: repetition.reason,
 					};
@@ -341,11 +353,11 @@ export default class AgentLoop {
 
 				await this.#db.update_run_status.run({
 					id: currentRunId,
-					status: "completed",
+					status: 200,
 				});
 				const out = {
 					run: currentAlias,
-					status: "completed",
+					status: 200,
 					turn: result.turn,
 				};
 				await hook.completed.emit({ projectId, ...out });
@@ -354,11 +366,11 @@ export default class AgentLoop {
 
 			await this.#db.update_run_status.run({
 				id: currentRunId,
-				status: "completed",
+				status: 200,
 			});
 			const out = {
 				run: currentAlias,
-				status: "completed",
+				status: 200,
 				turn: loopIteration,
 			};
 			await hook.completed.emit({ projectId, ...out });
@@ -367,15 +379,15 @@ export default class AgentLoop {
 			if (controller.signal.aborted) {
 				await this.#db.update_run_status.run({
 					id: currentRunId,
-					status: "aborted",
+					status: 499,
 				});
-				return { run: currentAlias, status: "aborted", turn: loopIteration };
+				return { run: currentAlias, status: 499, turn: loopIteration };
 			}
 			console.warn(`[RUMMY] Run failed: ${err.message}`);
 			console.warn(`[RUMMY] Stack: ${err.stack}`);
 			await this.#db.update_run_status.run({
 				id: currentRunId,
-				status: "failed",
+				status: 500,
 			});
 			try {
 				await this.#knownStore.upsert(
@@ -383,12 +395,13 @@ export default class AgentLoop {
 					loopIteration,
 					`error://${loopIteration}`,
 					`${err.message}\n${err.stack}`,
-					"info",
+					500,
+					{ loopId: currentLoopId },
 				);
 			} catch {}
 			const out = {
 				run: currentAlias,
-				status: "failed",
+				status: 500,
 				turn: loopIteration,
 				error: err.message,
 			};
@@ -415,14 +428,14 @@ export default class AgentLoop {
 				attrs,
 				output,
 			);
-			const state = action === "error" ? "error" : "pass";
-			await this.#knownStore.resolve(runId, path, state, resolvedBody);
+			const status = action === "error" ? 500 : 200;
+			await this.#knownStore.resolve(runId, path, status, resolvedBody);
 
 			// Store answer in attributes for ask_user
 			if (path.startsWith("ask_user://") && output) {
 				const turn = (await this.#db.get_run_by_id.get({ id: runId }))
 					.next_turn;
-				await this.#knownStore.upsert(runId, turn, path, resolvedBody, state, {
+				await this.#knownStore.upsert(runId, turn, path, resolvedBody, status, {
 					attributes: { ...attrs, answer: output },
 				});
 			}
@@ -441,12 +454,7 @@ export default class AgentLoop {
 				}
 			}
 		} else if (action === "reject") {
-			await this.#knownStore.resolve(
-				runId,
-				path,
-				"rejected",
-				output || "rejected",
-			);
+			await this.#knownStore.resolve(runId, path, 403, output || "rejected");
 		} else {
 			throw new Error(msg("error.resolution_invalid", { action }));
 		}
@@ -455,23 +463,46 @@ export default class AgentLoop {
 		if (unresolved.length > 0) {
 			return {
 				run: runAlias,
-				status: "proposed",
+				status: 202,
 				remainingCount: unresolved.length,
 				proposed: unresolved,
 			};
 		}
 
-		if (await this.#knownStore.hasRejections(runId)) {
-			await this.#db.update_run_status.run({ id: runId, status: "completed" });
-			return { run: runAlias, status: "completed" };
+		// Scope completion checks to the current loop
+		const currentLoop = await this.#db.get_current_loop.get({ run_id: runId });
+		const loopId = currentLoop?.id ?? null;
+
+		if (await this.#knownStore.hasRejections(runId, loopId)) {
+			if (currentLoop)
+				await this.#db.complete_loop.run({
+					id: loopId,
+					status: 200,
+					result: null,
+				});
+			await this.#db.update_run_status.run({ id: runId, status: 200 });
+			return { run: runAlias, status: 200 };
 		}
 
-		const hasSummary = await this.#db.get_latest_summary.get({ run_id: runId });
+		const hasSummary = await this.#db.get_latest_summary.get({
+			run_id: runId,
+			loop_id: loopId,
+		});
 		if (hasSummary?.body) {
-			await this.#db.update_run_status.run({ id: runId, status: "completed" });
-			return { run: runAlias, status: "completed" };
+			if (currentLoop)
+				await this.#db.complete_loop.run({
+					id: loopId,
+					status: 200,
+					result: null,
+				});
+			await this.#db.update_run_status.run({ id: runId, status: 200 });
+			return { run: runAlias, status: 200 };
 		}
 
+		// No summary and no rejections in this loop — resume it
+		const projectId = runRow.project_id;
+		const project = await this.#db.get_project_by_id.get({ id: projectId });
+
 		const latestPrompt = await this.#db.get_latest_prompt.get({
 			run_id: runId,
 		});
@@ -479,11 +510,11 @@ export default class AgentLoop {
 			? JSON.parse(latestPrompt.attributes).mode
 			: "ask";
 
-		const projectId = runRow.project_id;
-		const project = await this.#db.get_project_by_id.get({ id: projectId });
-
-		await this.#db.enqueue_prompt.get({
+		// Re-enqueue the current loop's prompt to continue it
+		const loopSeq = await this.#db.next_loop.get({ run_id: runId });
+		await this.#db.enqueue_loop.get({
 			run_id: runId,
+			sequence: loopSeq.sequence,
 			mode: resumeMode,
 			model: runRow.model,
 			prompt: "",
@@ -516,7 +547,7 @@ export default class AgentLoop {
 			nextTurn,
 			`prompt://${nextTurn}`,
 			"",
-			"info",
+			200,
 			{ attributes: { mode: "ask" } },
 		);
 		await this.#knownStore.upsert(
@@ -524,15 +555,17 @@ export default class AgentLoop {
 			nextTurn,
 			`ask://${nextTurn}`,
 			message,
-			"info",
+			200,
 		);
 
 		if (this.#activeRuns.has(runRow.id)) {
 			return { run: runAlias, status: runRow.status, injected: "next_turn" };
 		}
 
-		await this.#db.enqueue_prompt.get({
+		const injectLoopSeq = await this.#db.next_loop.get({ run_id: runRow.id });
+		await this.#db.enqueue_loop.get({
 			run_id: runRow.id,
+			sequence: injectLoopSeq.sequence,
 			mode: "ask",
 			model: runRow.model,
 			prompt: message,

package/src/agent/ContextAssembler.js

@@ -6,7 +6,7 @@
 export default class ContextAssembler {
 	static async assembleFromTurnContext(
 		rows,
-		{ type = "ask", systemPrompt = "", contextSize = 0 } = {},
+		{ type = "ask", systemPrompt = "", contextSize = 0, demoted = [] } = {},
 		hooks,
 	) {
 		// Find loop boundary from active prompt
@@ -16,7 +16,7 @@ export default class ContextAssembler {
 		);
 		const loopStartTurn = promptEntry?.source_turn ?? 0;
 
-		const ctx = { rows, loopStartTurn, type, contextSize };
+		const ctx = { rows, loopStartTurn, type, contextSize, demoted };
 
 		const system = await hooks.assembly.system.filter(systemPrompt, ctx);
 		const user = await hooks.assembly.user.filter("", ctx);

package/src/agent/KnownStore.js

@@ -61,15 +61,23 @@ export default class KnownStore {
 		turn,
 		path,
 		body,
-		state,
-		{ attributes = null, hash = null, updatedAt = null } = {},
+		status,
+		{
+			fidelity = "full",
+			attributes = null,
+			hash = null,
+			updatedAt = null,
+			loopId = null,
+		} = {},
 	) {
 		await this.#db.upsert_known_entry.run({
 			run_id: runId,
+			loop_id: loopId,
 			turn,
 			path: KnownStore.normalizePath(path),
 			body,
-			state,
+			status,
+			fidelity,
 			hash,
 			attributes: attributes ? JSON.stringify(attributes) : null,
 			updated_at: updatedAt,
@@ -84,17 +92,25 @@ export default class KnownStore {
 		});
 	}
 
-	async setFileState(runId, pattern, state) {
-		const result = await this.#db.set_file_state.run({
+	async setFileFidelity(runId, pattern, fidelity) {
+		const result = await this.#db.set_file_fidelity.run({
 			run_id: runId,
 			pattern,
-			state,
+			fidelity,
 		});
 		if (result.changes === 0) {
-			await this.upsert(runId, 0, pattern, "", state);
+			await this.upsert(runId, 0, pattern, "", 200, { fidelity });
 		}
 	}
 
+	async setFidelity(runId, path, fidelity) {
+		await this.#db.set_fidelity.run({
+			run_id: runId,
+			path: KnownStore.normalizePath(path),
+			fidelity,
+		});
+	}
+
 	async demote(runId, path) {
 		await this.#db.demote_path.run({
 			run_id: runId,
@@ -164,11 +180,11 @@ export default class KnownStore {
 		});
 	}
 
-	async resolve(runId, path, state, body) {
+	async resolve(runId, path, status, body) {
 		await this.#db.resolve_known_entry.run({
 			run_id: runId,
 			path: KnownStore.normalizePath(path),
-			state,
+			status,
 			body,
 		});
 	}
@@ -185,8 +201,11 @@ export default class KnownStore {
 		return this.#db.get_file_states_by_pattern.all({ run_id: runId, pattern });
 	}
 
-	async hasRejections(runId) {
-		const row = await this.#db.has_rejections.get({ run_id: runId });
+	async hasRejections(runId, loopId) {
+		const row = await this.#db.has_rejections.get({
+			run_id: runId,
+			loop_id: loopId,
+		});
 		return row.count > 0;
 	}
 

package/src/agent/ProjectAgent.js

@@ -40,7 +40,7 @@ export default class ProjectAgent {
 		const projectRow = await this.#db.upsert_project.get({
 			name: projectName,
 			project_root: projectRoot,
-			config_path: configPath || null,
+			config_path: configPath ?? null,
 		});
 		const projectId = projectRow.id;
 
@@ -57,8 +57,6 @@ export default class ProjectAgent {
 		return this.#knownStore;
 	}
 
-	// --- Run operations ---
-
 	async ask(projectId, model, prompt, run = null, options = {}) {
 		return this.#agentLoop.run(
 			"ask",