@possumtech/rummy 0.3.0 → 0.4.0

package/src/agent/AgentLoop.js

@@ -1,3 +1,4 @@
+import { advanceRecovery } from "../plugins/budget/recovery.js";
 import KnownStore from "./KnownStore.js";
 import msg from "./messages.js";
 import ResponseHealer from "./ResponseHealer.js";
@@ -70,14 +71,15 @@ export default class AgentLoop {
 			const existing = this.#activeRuns.get(existingRun.id);
 			if (existing) existing.abort();
 
+			// Clean up stale proposals from interrupted runs
 			const unresolved = await this.#knownStore.getUnresolved(existingRun.id);
-			if (unresolved.length > 0) {
-				return {
-					runId: existingRun.id,
-					alias: existingRun.alias,
-					blocked: true,
-					proposed: unresolved,
-				};
+			for (const u of unresolved) {
+				await this.#knownStore.resolve(
+					existingRun.id,
+					u.path,
+					499,
+					"Stale proposal from interrupted run",
+				);
 			}
 			return { runId: existingRun.id, alias: existingRun.alias };
 		}
@@ -121,18 +123,10 @@ export default class AgentLoop {
 		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);
-		if (runInfo.blocked) {
-			return {
-				run: runInfo.alias,
-				status: 202,
-				remainingCount: runInfo.proposed.length,
-				proposed: runInfo.proposed,
-			};
-		}
-
 		const { runId: currentRunId, alias: currentAlias } = runInfo;
 
 		const loopSeq = await this.#db.next_loop.get({ run_id: currentRunId });
@@ -146,6 +140,7 @@ export default class AgentLoop {
 				noRepo,
 				noInteraction,
 				noWeb,
+				noProposals,
 				temperature: options?.temperature,
 			}),
 		});
@@ -164,100 +159,74 @@ export default class AgentLoop {
 	}
 
 	async #drainQueue(currentRunId, currentAlias, projectId, project, options) {
-		let panicAttempted = false;
-
-		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 === "panic"
-					? this.#hooks.panic
-					: loop.mode === "ask"
-						? this.#hooks.ask
-						: this.#hooks.act;
-
-			const 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,
-				options: { ...options, temperature: loopConfig.temperature },
-				hook,
-			});
+		const controller = new AbortController();
+		this.#activeRuns.set(currentRunId, controller);
 
-			if (result.status === 413) {
-				await this.#db.complete_loop.run({
-					id: loop.id,
-					status: 413,
-					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;
+				}
 
-				// One panic attempt per drain cycle
-				if (loop.mode === "panic" || panicAttempted) {
+				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:
-							loop.mode === "panic"
-								? `Panic mode failed to free enough space (${result.overflow} tokens over).`
-								: `Context full (${result.overflow} tokens over).`,
+						error: `Context full (${result.overflow} tokens over).`,
 					};
 				}
 
-				panicAttempted = true;
-
-				const panicPrompt = this.#hooks.budget.panicPrompt({
-					assembledTokens: result.assembledTokens,
-					contextSize: result.contextSize,
-				});
-
-				// Enqueue panic loop
-				const panicSeq = await this.#db.next_loop.get({ run_id: currentRunId });
-				await this.#db.enqueue_loop.get({
-					run_id: currentRunId,
-					sequence: panicSeq.sequence,
-					mode: "panic",
-					model: loop.model,
-					prompt: panicPrompt,
-					config: JSON.stringify({ noRepo: true }),
-				});
-
-				// Re-enqueue the original loop to retry after panic
-				const retrySeq = await this.#db.next_loop.get({ run_id: currentRunId });
-				await this.#db.enqueue_loop.get({
-					run_id: currentRunId,
-					sequence: retrySeq.sequence,
-					mode: loop.mode,
-					model: loop.model,
-					prompt: loop.prompt,
-					config: loop.config,
+				await this.#db.complete_loop.run({
+					id: loop.id,
+					status: result.status,
+					result: JSON.stringify(result),
 				});
-
-				continue;
 			}
 
-			await this.#db.complete_loop.run({
-				id: loop.id,
-				status: result.status === 202 ? 202 : result.status,
-				result: JSON.stringify(result),
+			const runRow = await this.#db.get_run_by_alias.get({
+				alias: currentAlias,
 			});
-
-			if (result.status === 202) return result;
+			return { run: currentAlias, status: runRow?.status ?? 200 };
+		} finally {
+			this.#activeRuns.delete(currentRunId);
 		}
-
-		const runRow = await this.#db.get_run_by_alias.get({ alias: currentAlias });
-		return { run: currentAlias, status: runRow?.status ?? 200 };
 	}
 
 	async #executeLoop({
@@ -272,8 +241,10 @@ export default class AgentLoop {
 		noRepo,
 		noInteraction,
 		noWeb,
+		noProposals,
 		options,
 		hook,
+		signal,
 	}) {
 		const runRow = await this.#db.get_run_by_id.get({ id: currentRunId });
 		if (runRow.status !== 102) {
@@ -292,18 +263,24 @@ export default class AgentLoop {
 		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 _panicStrikes = 0;
-		let _lastPanicTokens = null;
+		let recovery = null; // { target, promptPath, strikes, lastTokens }
+
+		// Previous loop entries stay at full fidelity — the model is
+		// instructed to summarize and demote them. Budget enforcement
+		// catches overflow if the model fails to manage context.
+
+		// 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,
@@ -314,7 +291,7 @@ export default class AgentLoop {
 
 		try {
 			while (loopIteration < MAX_LOOP_ITERATIONS) {
-				if (controller.signal.aborted) {
+				if (signal.aborted) {
 					await this.#db.update_run_status.run({
 						id: currentRunId,
 						status: 499,
@@ -332,8 +309,6 @@ export default class AgentLoop {
 				let turnPrompt;
 				if (loopIteration === 1) {
 					turnPrompt = prompt;
-				} else if (mode === "panic") {
-					turnPrompt = "Continue freeing space. Check <knowns> token counts.";
 				} else {
 					turnPrompt = this.#buildContinuationPrompt(
 						loopIteration,
@@ -350,16 +325,26 @@ export default class AgentLoop {
 					currentLoopId,
 					requestedModel,
 					loopPrompt: turnPrompt,
+					loopIteration,
 					noRepo,
 					toolSet,
+					inRecovery: recovery !== null,
 					contextSize,
 					options: { ...options, isContinuation: loopIteration > 1 },
-					signal: controller.signal,
+					signal,
 				});
 
-				// Budget overflow — return 413 to drainQueue for panic mode
 				if (result.status === 413) {
-					return {
+					await this.#db.complete_loop.run({
+						id: currentLoopId,
+						status: 413,
+						result: null,
+					});
+					await this.#db.update_run_status.run({
+						id: currentRunId,
+						status: 200,
+					});
+					const out = {
 						run: currentAlias,
 						status: 413,
 						overflow: result.overflow,
@@ -367,48 +352,34 @@ export default class AgentLoop {
 						contextSize: result.contextSize,
 						turn: result.turn,
 					};
+					await hook.completed.emit({ projectId, ...out });
+					return out;
 				}
 
 				_lastAssembledTokens = result.assembledTokens;
 
-				// Panic mode: target check + strike counting
-				if (mode === "panic") {
-					const panicTarget = Math.floor(contextSize * 0.75);
-					if (result.assembledTokens <= panicTarget) {
-						await this.#db.update_run_status.run({
-							id: currentRunId,
-							status: 200,
-						});
-						const out = {
-							run: currentAlias,
-							status: 200,
-							turn: result.turn,
-						};
-						await hook.completed.emit({ projectId, ...out });
-						return out;
-					}
-					if (_lastPanicTokens !== null) {
-						if (result.assembledTokens < _lastPanicTokens) {
-							_panicStrikes = 0;
-						} else {
-							_panicStrikes++;
-							if (_panicStrikes >= 3) {
-								await this.#db.update_run_status.run({
-									id: currentRunId,
-									status: 200,
-								});
-								return {
-									run: currentAlias,
-									status: 413,
-									overflow: result.assembledTokens - contextSize,
-									assembledTokens: result.assembledTokens,
-									contextSize,
-									turn: result.turn,
-								};
-							}
-						}
-					}
-					_lastPanicTokens = 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({
@@ -418,8 +389,6 @@ export default class AgentLoop {
 				const unknowns = await this.#db.get_unknowns.all({
 					run_id: currentRunId,
 				});
-				const unresolved = await this.#knownStore.getUnresolved(currentRunId);
-
 				const latestSummary = history
 					.filter((e) => e.status === 200 && e.path?.startsWith("summarize://"))
 					.at(-1);
@@ -428,26 +397,22 @@ export default class AgentLoop {
 					projectId,
 					run: currentAlias,
 					turn: result.turn,
-					status: unresolved.length > 0 ? 202 : 102,
+					status: 102,
 					summary: latestSummary?.body || "",
 					history,
 					unknowns: unknowns.map((u) => ({ path: u.path, body: u.body })),
-					proposed: unresolved.map((p) => ({
-						path: p.path,
-						type: KnownStore.toolFromPath(p.path) || "unknown",
-						attributes: p.attributes ? JSON.parse(p.attributes) : null,
-					})),
 					telemetry: {
 						modelAlias: result.modelAlias,
 						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,
@@ -460,21 +425,6 @@ export default class AgentLoop {
 						}),
 					},
 				});
-				if (unresolved.length > 0) {
-					await this.#db.update_run_status.run({
-						id: currentRunId,
-						status: 202,
-					});
-					const out = {
-						run: currentAlias,
-						status: 202,
-						turn: result.turn,
-						proposed: unresolved,
-					};
-					await hook.completed.emit({ projectId, ...out });
-					return out;
-				}
-
 				await this.#hooks.run.step.completed.emit({
 					projectId,
 					run: currentAlias,
@@ -482,6 +432,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({
@@ -526,7 +479,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,
@@ -558,7 +511,6 @@ 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,
@@ -599,9 +551,51 @@ export default class AgentLoop {
 			}
 
 			if (action === "accept") {
+				const projectId = runRow.project_id;
+				const project = await this.#db.get_project_by_id.get({
+					id: projectId,
+				});
+				const projectRoot = project?.project_root;
+
+				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,
+						);
+						// Write patched content to disk
+						if (projectRoot) {
+							const { writeFile } = await import("node:fs/promises");
+							const { join } = await import("node:path");
+							await writeFile(join(projectRoot, attrs.file), patched).catch(
+								() => {},
+							);
+						}
+					}
+				}
+
 				if (path.startsWith("rm://")) {
 					if (attrs?.path) {
 						await this.#knownStore.remove(runId, attrs.path);
+						if (projectRoot) {
+							const { unlink } = await import("node:fs/promises");
+							const { join } = await import("node:path");
+							await unlink(join(projectRoot, attrs.path)).catch(() => {});
+						}
 					}
 				}
 
@@ -617,68 +611,9 @@ export default class AgentLoop {
 			throw new Error(msg("error.resolution_invalid", { action }));
 		}
 
-		const unresolved = await this.#knownStore.getUnresolved(runId);
-		if (unresolved.length > 0) {
-			return {
-				run: runAlias,
-				status: 202,
-				remainingCount: unresolved.length,
-				proposed: unresolved,
-			};
-		}
-
-		// 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,
-			loop_id: loopId,
-		});
-		if (hasSummary?.body) {
-			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,
-		});
-		const resumeMode = latestPrompt?.attributes
-			? JSON.parse(latestPrompt.attributes).mode
-			: "ask";
-
-		// 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: "",
-			config: "{}",
-		});
-		return this.#drainQueue(runId, runAlias, projectId, project, {});
+		// The dispatch loop is awaiting resolution. This unblocks it.
+		// Dispatch continuation is handled by the loop, not here.
+		return { run: runAlias, status: 200 };
 	}
 
 	async #composeResolvedContent(runId, path, _attrs, output) {
@@ -735,3 +670,13 @@ 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 }}
+ */
+// Re-export for backward compatibility with tests
+export { advanceRecovery } from "../plugins/budget/recovery.js";

package/src/agent/ContextAssembler.js

@@ -13,6 +13,7 @@ export default class ContextAssembler {
 			demoted = [],
 			toolSet = null,
 			lastContextTokens = 0,
+			turn = 1,
 		} = {},
 		hooks,
 	) {
@@ -30,6 +31,7 @@ export default class ContextAssembler {
 			lastContextTokens,
 			demoted,
 			toolSet,
+			turn,
 		};
 
 		const system = await hooks.assembly.system.filter(systemPrompt, ctx);