@possumtech/rummy 0.2.7 → 0.3.0

package/src/agent/KnownStore.js

@@ -1,10 +1,42 @@
 import slugify from "../sql/functions/slugify.js";
+import { countTokens } from "./tokens.js";
 
 export default class KnownStore {
 	#db;
+	#onChanged;
+	#budgetGuard = null;
+	#schemes = new Map();
 
-	constructor(db) {
+	constructor(db, { onChanged } = {}) {
 		this.#db = db;
+		this.#onChanged = onChanged || null;
+	}
+
+	get budgetGuard() {
+		return this.#budgetGuard;
+	}
+
+	set budgetGuard(guard) {
+		this.#budgetGuard = guard;
+	}
+
+	async loadSchemes(db) {
+		const rows = await (db || this.#db).get_all_schemes.all();
+		this.#schemes.clear();
+		for (const row of rows) {
+			this.#schemes.set(row.name, row);
+		}
+	}
+
+	#isVisible(path, fidelity) {
+		if (fidelity === "archive") return false;
+		const scheme = KnownStore.scheme(path) ?? "file";
+		const meta = this.#schemes.get(scheme);
+		return meta ? meta.model_visible !== 0 : true;
+	}
+
+	#emitChanged(runId, path, changeType) {
+		if (this.#onChanged) this.#onChanged({ runId, path, changeType });
 	}
 
 	static scheme(path) {
@@ -30,18 +62,21 @@ export default class KnownStore {
 		return row.turn;
 	}
 
-	async dedup(runId, scheme, target) {
-		const candidate = `${scheme}://${target}`;
+	async dedup(runId, scheme, target, turn) {
+		const encodedTarget = encodeURIComponent(target);
+		const turnPrefix = turn ? `turn_${turn}/` : "";
+		const candidate = `${scheme}://${turnPrefix}${encodedTarget}`;
 		const existing = await this.#db.get_entry_body.get({
 			run_id: runId,
-			path: KnownStore.normalizePath(candidate),
+			path: candidate,
 		});
 		if (!existing) return candidate;
 		return `${candidate}_${Date.now()}`;
 	}
 
-	async slugPath(runId, scheme, content) {
-		const base = slugify(content || "");
+	async slugPath(runId, scheme, content, summary) {
+		const source = summary ? summary.replace(/,\s*/g, "/") : content || "";
+		const base = slugify(source);
 		const prefix = `${scheme}://`;
 
 		if (!base) return `${prefix}${Date.now()}`;
@@ -61,52 +96,97 @@ 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,
+		} = {},
 	) {
+		const normalized = KnownStore.normalizePath(path);
+		let delta = 0;
+
+		if (
+			this.#budgetGuard &&
+			status < 400 &&
+			this.#isVisible(normalized, fidelity)
+		) {
+			const existing = await this.#db.get_entry_body.get({
+				run_id: runId,
+				path: normalized,
+			});
+			delta =
+				countTokens(body) - (existing?.body ? countTokens(existing.body) : 0);
+			this.#budgetGuard.check(delta, normalized);
+		}
+
 		await this.#db.upsert_known_entry.run({
 			run_id: runId,
+			loop_id: loopId,
 			turn,
-			path: KnownStore.normalizePath(path),
+			path: normalized,
 			body,
-			state,
+			status,
+			fidelity,
 			hash,
 			attributes: attributes ? JSON.stringify(attributes) : null,
 			updated_at: updatedAt,
 		});
+		this.#emitChanged(runId, normalized, "upsert");
+
+		if (delta > 0) this.#budgetGuard?.charge(delta);
 	}
 
 	async promote(runId, path, turn) {
+		const normalized = KnownStore.normalizePath(path);
 		await this.#db.promote_path.run({
 			run_id: runId,
-			path: KnownStore.normalizePath(path),
+			path: normalized,
 			turn,
 		});
+		this.#emitChanged(runId, normalized, "promote");
 	}
 
-	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 });
 		}
+		this.#emitChanged(runId, pattern, "fidelity");
+	}
+
+	async setFidelity(runId, path, fidelity) {
+		const normalized = KnownStore.normalizePath(path);
+		await this.#db.set_fidelity.run({
+			run_id: runId,
+			path: normalized,
+			fidelity,
+		});
+		this.#emitChanged(runId, normalized, "fidelity");
 	}
 
 	async demote(runId, path) {
+		const normalized = KnownStore.normalizePath(path);
 		await this.#db.demote_path.run({
 			run_id: runId,
-			path: KnownStore.normalizePath(path),
+			path: normalized,
 		});
+		this.#emitChanged(runId, normalized, "demote");
 	}
 
 	async remove(runId, path) {
+		const normalized = KnownStore.normalizePath(path);
 		await this.#db.delete_known_entry.run({
 			run_id: runId,
-			path: KnownStore.normalizePath(path),
+			path: normalized,
 		});
+		this.#emitChanged(runId, normalized, "remove");
 	}
 
 	async removeFilesByPattern(runId, pattern) {
@@ -114,6 +194,7 @@ export default class KnownStore {
 			run_id: runId,
 			pattern,
 		});
+		this.#emitChanged(runId, pattern, "remove");
 	}
 
 	static #bodyPattern(body) {
@@ -121,12 +202,30 @@ export default class KnownStore {
 	}
 
 	async promoteByPattern(runId, path, body, turn) {
+		let cost = 0;
+		if (this.#budgetGuard) {
+			const entries = await this.#db.get_entries_by_pattern.all({
+				run_id: runId,
+				path,
+				body: KnownStore.#bodyPattern(body),
+				limit: null,
+				offset: null,
+			});
+			cost = entries
+				.filter((e) => e.fidelity === "archive" || e.fidelity === "index")
+				.reduce((sum, e) => sum + (e.tokens_full || 0), 0);
+			if (cost > 0) this.#budgetGuard.check(cost, path);
+		}
+
 		await this.#db.promote_by_pattern.run({
 			run_id: runId,
 			path,
 			body: KnownStore.#bodyPattern(body),
 			turn,
 		});
+		this.#emitChanged(runId, path, "promote");
+
+		if (cost > 0) this.#budgetGuard?.charge(cost);
 	}
 
 	async demoteByPattern(runId, path, body) {
@@ -135,6 +234,7 @@ export default class KnownStore {
 			path,
 			body: KnownStore.#bodyPattern(body),
 		});
+		this.#emitChanged(runId, path, "demote");
 	}
 
 	async getEntriesByPattern(runId, path, body, { limit, offset } = {}) {
@@ -153,30 +253,58 @@ export default class KnownStore {
 			path,
 			body: KnownStore.#bodyPattern(body),
 		});
+		this.#emitChanged(runId, path, "remove");
 	}
 
 	async updateBodyByPattern(runId, path, body, newBody) {
+		let delta = 0;
+		if (this.#budgetGuard) {
+			const entries = await this.#db.get_entries_by_pattern.all({
+				run_id: runId,
+				path,
+				body: KnownStore.#bodyPattern(body),
+				limit: null,
+				offset: null,
+			});
+			const visible = entries.filter((e) =>
+				this.#isVisible(e.path, e.fidelity),
+			);
+			const oldTotal = visible.reduce((sum, e) => sum + (e.tokens || 0), 0);
+			const newTokensPer = countTokens(newBody);
+			delta = newTokensPer * visible.length - oldTotal;
+			if (delta > 0) this.#budgetGuard.check(delta, path);
+		}
+
 		await this.#db.update_body_by_pattern.run({
 			run_id: runId,
 			path,
 			body: KnownStore.#bodyPattern(body),
 			new_body: newBody,
 		});
+		this.#emitChanged(runId, path, "body");
+
+		if (delta > 0) this.#budgetGuard?.charge(delta);
 	}
 
-	async resolve(runId, path, state, body) {
+	async resolve(runId, path, status, body) {
+		const normalized = KnownStore.normalizePath(path);
 		await this.#db.resolve_known_entry.run({
 			run_id: runId,
-			path: KnownStore.normalizePath(path),
-			state,
+			path: normalized,
+			status,
 			body,
 		});
+		this.#emitChanged(runId, normalized, "resolve");
 	}
 
 	async getLog(runId) {
 		return this.#db.get_results.all({ run_id: runId });
 	}
 
+	async getEntries(runId) {
+		return this.#db.get_known_entries.all({ run_id: runId });
+	}
+
 	async getFileEntries(runId) {
 		return this.#db.get_file_entries.all({ run_id: runId });
 	}
@@ -185,8 +313,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;
 	}
 
@@ -218,11 +349,13 @@ export default class KnownStore {
 	}
 
 	async setAttributes(runId, path, attrs) {
+		const normalized = KnownStore.normalizePath(path);
 		await this.#db.update_entry_attributes.run({
 			run_id: runId,
-			path: KnownStore.normalizePath(path),
+			path: normalized,
 			attributes: JSON.stringify(attrs),
 		});
+		this.#emitChanged(runId, normalized, "attributes");
 	}
 
 	async getState(runId, path) {

package/src/agent/ProjectAgent.js

@@ -14,7 +14,10 @@ export default class ProjectAgent {
 		this.#db = db;
 		this.#hooks = hooks;
 		this.#llm = new LlmProvider(db);
-		this.#knownStore = new KnownStore(db);
+		this.#knownStore = new KnownStore(db, {
+			onChanged: (event) => hooks.entry.changed.emit(event).catch(() => {}),
+		});
+		this.#knownStore.loadSchemes(db);
 
 		const turnExecutor = new TurnExecutor(
 			db,
@@ -40,7 +43,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 +60,6 @@ export default class ProjectAgent {
 		return this.#knownStore;
 	}
 
-	// --- Run operations ---
-
 	async ask(projectId, model, prompt, run = null, options = {}) {
 		return this.#agentLoop.run(
 			"ask",

package/src/agent/ResponseHealer.js

@@ -1,10 +1,13 @@
 const MAX_STALLS = Number(process.env.RUMMY_MAX_STALLS) || 3;
 const MAX_REPETITIONS = Number(process.env.RUMMY_MAX_REPETITIONS) || 3;
+const MAX_UPDATE_REPEATS = Number(process.env.RUMMY_MAX_UPDATE_REPEATS) || 3;
 
 export default class ResponseHealer {
 	#stallCount = 0;
 	#lastFingerprint = null;
 	#repetitionCount = 0;
+	#lastUpdateText = null;
+	#updateRepeatCount = 0;
 
 	/**
 	 * Heal a missing status tag. Called when the model emits
@@ -97,7 +100,7 @@ export default class ResponseHealer {
 	 *   neither present    → warn, increment stall counter, continue
 	 *   stall counter hits MAX_STALLS → force-complete
 	 */
-	assessProgress({ summaryText, updateText, statusHealed }) {
+	assessProgress({ summaryText, updateText, statusHealed, flags }) {
 		if (summaryText) {
 			this.#stallCount = 0;
 			return { continue: false };
@@ -105,6 +108,21 @@ export default class ResponseHealer {
 
 		if (updateText && !statusHealed) {
 			this.#stallCount = 0;
+			// Track repeated update text — model stuck declaring readiness
+			// But if the model created new entries this turn, it's making
+			// progress even if the update text is the same.
+			const madeProgress = flags?.hasWrites || flags?.hasReads;
+			if (updateText === this.#lastUpdateText && !madeProgress) {
+				this.#updateRepeatCount++;
+				if (this.#updateRepeatCount >= MAX_UPDATE_REPEATS) {
+					const reason = `Same <update/> repeated ${this.#updateRepeatCount} turns: "${updateText.slice(0, 60)}"`;
+					console.warn(`[RUMMY] Stalled: ${reason}. Force-completing.`);
+					return { continue: false, reason };
+				}
+			} else {
+				this.#lastUpdateText = updateText;
+				this.#updateRepeatCount = 1;
+			}
 			return { continue: true };
 		}
 
@@ -130,5 +148,7 @@ export default class ResponseHealer {
 		this.#stallCount = 0;
 		this.#lastFingerprint = null;
 		this.#repetitionCount = 0;
+		this.#lastUpdateText = null;
+		this.#updateRepeatCount = 0;
 	}
 }