@possumtech/rummy 0.3.0 → 0.4.0

package/src/plugins/{current/current.js → performed/performed.js}

@@ -1,25 +1,26 @@
-export default class Current {
+export default class Performed {
 	#core;
 
 	constructor(core) {
 		this.#core = core;
-		core.filter("assembly.user", this.assembleCurrent.bind(this), 100);
+		core.filter("assembly.user", this.assemblePerformed.bind(this), 100);
 	}
 
-	async assembleCurrent(content, ctx) {
+	async assemblePerformed(content, ctx) {
 		const entries = ctx.rows.filter(
-			(r) => r.category === "logging" && r.source_turn >= ctx.loopStartTurn,
+			(r) =>
+				r.category === "logging" &&
+				r.source_turn >= ctx.loopStartTurn &&
+				r.scheme !== "unknown",
 		);
 		if (entries.length === 0) return content;
 
-		const lines = await Promise.all(
-			entries.map((e) => renderToolTag(e, this.#core)),
-		);
-		return `${content}<current>\n${lines.join("\n")}\n</current>\n`;
+		const lines = entries.map((e) => renderToolTag(e));
+		return `${content}<performed>\n${lines.join("\n")}\n</performed>\n`;
 	}
 }
 
-async function renderToolTag(entry, core) {
+function renderToolTag(entry) {
 	const attrs =
 		typeof entry.attributes === "string"
 			? JSON.parse(entry.attributes)
@@ -28,23 +29,17 @@ async function renderToolTag(entry, core) {
 	const target = attrs?.path || attrs?.file || attrs?.command || "";
 	const turn = entry.source_turn ? ` turn="${entry.source_turn}"` : "";
 	const status = entry.status ? ` status="${entry.status}"` : "";
+	const fidelity = entry.fidelity ? ` fidelity="${entry.fidelity}"` : "";
+	const tokens = entry.tokens ? ` tokens="${entry.tokens}"` : "";
 	const summary =
 		typeof attrs?.summary === "string"
 			? ` summary="${attrs.summary.slice(0, 80)}"`
 			: "";
 
-	let body;
-	try {
-		body = await core.hooks.tools.view(entry.scheme, {
-			...entry,
-			attributes: attrs,
-		});
-	} catch {
-		body = entry.body;
-	}
+	const body = entry.body || null;
 
 	if (body) {
-		return `<${entry.scheme} path="${target}"${turn}${status}${summary}>${body}</${entry.scheme}>`;
+		return `<${entry.scheme} path="${target}"${turn}${status}${summary}${fidelity}${tokens}>${body}</${entry.scheme}>`;
 	}
-	return `<${entry.scheme} path="${target}"${turn}${status}${summary}/>`;
+	return `<${entry.scheme} path="${target}"${turn}${status}${summary}${fidelity}${tokens}/>`;
 }

package/src/plugins/policy/policy.js

@@ -0,0 +1,47 @@
+import KnownStore from "../../agent/KnownStore.js";
+
+export default class Policy {
+	constructor(core) {
+		core.filter("entry.recording", this.#enforceAskMode.bind(this), 1);
+	}
+
+	async #enforceAskMode(entry, ctx) {
+		if (ctx.mode !== "ask") return entry;
+
+		if (entry.scheme === "sh") {
+			console.warn("[RUMMY] Rejected <sh> in ask mode");
+			return { ...entry, status: 403 };
+		}
+
+		if (entry.scheme === "set" && entry.attributes?.path) {
+			const scheme = KnownStore.scheme(entry.attributes.path);
+			if (scheme === null && entry.body) {
+				console.warn(
+					`[RUMMY] Rejected file edit to ${entry.attributes.path} in ask mode`,
+				);
+				return { ...entry, status: 403 };
+			}
+		}
+
+		if (entry.scheme === "rm") {
+			const pathAttr = entry.attributes?.path || entry.path;
+			const scheme = KnownStore.scheme(pathAttr);
+			if (scheme === null) {
+				console.warn(`[RUMMY] Rejected file rm of ${pathAttr} in ask mode`);
+				return { ...entry, status: 403 };
+			}
+		}
+
+		if (entry.scheme === "mv" || entry.scheme === "cp") {
+			const destScheme = KnownStore.scheme(entry.attributes?.to);
+			if (destScheme === null) {
+				console.warn(
+					`[RUMMY] Rejected ${entry.scheme} to file ${entry.attributes?.to} in ask mode`,
+				);
+				return { ...entry, status: 403 };
+			}
+		}
+
+		return entry;
+	}
+}

package/src/plugins/previous/README.md

@@ -12,4 +12,5 @@ history from prior ask/act invocations on this run.
 
 Filters turn_context rows where `category` is `logging` or `prompt`
 and `source_turn < loopStartTurn`. Renders each entry chronologically
-with turn number and status.
+with turn, status, summary, fidelity, and tokens. The model can target
+these entries by path with `<set>` or `<rm>` to free context space.

package/src/plugins/previous/previous.js

@@ -9,11 +9,20 @@ export default class Previous {
 	async assemblePrevious(content, ctx) {
 		if (ctx.loopStartTurn <= 1) return content;
 
-		const entries = ctx.rows.filter(
-			(r) =>
-				(r.category === "logging" || r.category === "prompt") &&
-				r.source_turn < ctx.loopStartTurn,
-		);
+		const entries = ctx.rows
+			.filter(
+				(r) =>
+					(r.category === "logging" || r.category === "prompt") &&
+					r.source_turn < ctx.loopStartTurn,
+			)
+			.toSorted((a, b) => {
+				if (a.source_turn !== b.source_turn)
+					return a.source_turn - b.source_turn;
+				// Within the same turn: prompt first (cause before effect)
+				if (a.category === "prompt" && b.category !== "prompt") return -1;
+				if (b.category === "prompt" && a.category !== "prompt") return 1;
+				return 0;
+			});
 		if (entries.length === 0) return content;
 
 		const lines = await Promise.all(
@@ -23,7 +32,7 @@ export default class Previous {
 	}
 }
 
-async function renderToolTag(entry, core) {
+async function renderToolTag(entry, _core) {
 	const attrs =
 		typeof entry.attributes === "string"
 			? JSON.parse(entry.attributes)
@@ -32,23 +41,20 @@ async function renderToolTag(entry, core) {
 	const target = attrs?.path || attrs?.file || attrs?.command || "";
 	const turn = entry.source_turn ? ` turn="${entry.source_turn}"` : "";
 	const status = entry.status ? ` status="${entry.status}"` : "";
-	const summary =
-		typeof attrs?.summary === "string"
-			? ` summary="${attrs.summary.slice(0, 80)}"`
-			: "";
-
-	let body;
-	try {
-		body = await core.hooks.tools.view(entry.scheme, {
-			...entry,
-			attributes: attrs,
-		});
-	} catch {
-		body = entry.body;
-	}
-
-	if (body) {
-		return `<${entry.scheme} path="${target}"${turn}${status}${summary}>${body}</${entry.scheme}>`;
-	}
-	return `<${entry.scheme} path="${target}"${turn}${status}${summary}/>`;
+	const fidelity = entry.fidelity ? ` fidelity="${entry.fidelity}"` : "";
+	const tokens = entry.tokens ? ` tokens="${entry.tokens}"` : "";
+
+	// Previous entries render at summary. Prompts get 512 chars for orientation.
+	const limit = entry.scheme === "prompt" ? 512 : 80;
+	const rawSummary =
+		(typeof attrs?.summary === "string" ? attrs.summary : null) ||
+		entry.body?.slice(0, limit) ||
+		"";
+	// Strip internal dedup namespace prefixes (e.g. "get://turn_3/src/app.js" → "src/app.js")
+	const summaryText = rawSummary.replace(/\b\w+:\/\/turn_\d+\//g, "");
+	const summaryAttr = summaryText
+		? ` summary="${summaryText.replace(/"/g, "'").slice(0, limit)}"`
+		: "";
+
+	return `<${entry.scheme} path="${target}"${turn}${status}${summaryAttr}${fidelity}${tokens}/>`;
 }

package/src/plugins/progress/README.md

@@ -9,9 +9,8 @@ current work log to the active prompt.
 
 ## Behavior
 
-On first turn: "Begin."
+Emits `<progress turn="N">` carrying token budget and fidelity stats.
 On continuation turns with current entries: "The above actions were
 performed in response to the following prompt:"
-If a `progress://` entry exists, uses its body directly.
 
 Progress text is the tuning knob for model orientation between turns.

package/src/plugins/progress/progress.js

@@ -7,70 +7,20 @@ export default class Progress {
 	}
 
 	async assembleProgress(content, ctx) {
-		// Use last turn's real assembled token count when available.
-		// Falls back to row token sum (less accurate — missing system prompt overhead).
-		const rowTokens = ctx.rows.reduce((sum, r) => sum + (r.tokens || 0), 0);
-		const usedTokens = ctx.lastContextTokens || rowTokens;
-		const contextSize = ctx.contextSize || 0;
+		const { lastContextTokens: usedTokens, contextSize } = ctx;
 		const pct = contextSize ? Math.round((usedTokens / contextSize) * 100) : 0;
 
-		// Fidelity distribution across known/file entries
-		const entries = ctx.rows.filter((r) => r.category === "data");
-		const fullEntries = entries.filter((r) => r.fidelity === "full");
-		const summaryEntries = entries.filter((r) => r.fidelity === "summary");
-		const indexEntries = entries.filter((r) => r.fidelity === "index");
-		const fullTokens = fullEntries.reduce((s, r) => s + (r.tokens || 0), 0);
-		const summaryTokens = summaryEntries.reduce(
-			(s, r) => s + (r.tokens || 0),
-			0,
-		);
-		const indexTokens = indexEntries.reduce((s, r) => s + (r.tokens || 0), 0);
-
-		const unknownCount = ctx.rows.filter(
-			(r) => r.category === "unknown",
-		).length;
-
-		const hasCurrent = ctx.rows.some(
-			(r) => r.category === "logging" && r.source_turn >= ctx.loopStartTurn,
-		);
-
-		const parts = [];
-
-		const knownCount = entries.length;
-		const tokenLine = contextSize
-			? `${usedTokens} of ${contextSize} tokens (${pct}%) · ${knownCount} known${knownCount !== 1 ? "s" : ""} · ${unknownCount} unknown${unknownCount !== 1 ? "s" : ""}`
-			: "";
-		if (tokenLine) parts.push(tokenLine);
-
-		// Fidelity distribution
-		const fidelityParts = [];
-		if (fullEntries.length > 0)
-			fidelityParts.push(`${fullEntries.length} full (${fullTokens} tok)`);
-		if (summaryEntries.length > 0)
-			fidelityParts.push(
-				`${summaryEntries.length} summary (${summaryTokens} tok)`,
-			);
-		if (indexEntries.length > 0)
-			fidelityParts.push(`${indexEntries.length} index (${indexTokens} tok)`);
-		if (fidelityParts.length > 0)
-			parts.push(`Entries: ${fidelityParts.join(" · ")}`);
-
-		if (pct > 75) {
-			parts.push(
-				'Context above 75%. YOU MUST free space: <set fidelity="summary" summary="topic,detail,keyword"/>, <set fidelity="archive"/>, or <rm/>. Target the largest entries.',
-			);
-		} else if (pct > 50) {
-			parts.push(
-				'Context above 50%. You may free space: <set fidelity="summary" summary="topic,detail,keyword"/>, <set fidelity="archive"/>, or <rm/>.',
-			);
-		}
-
-		if (hasCurrent) {
-			parts.push(
-				"The above actions were performed in response to the following prompt:",
+		const lines = [];
+		if (contextSize) {
+			lines.push(
+				`Using ${usedTokens} tokens (${pct}%) of ${contextSize} token budget. Use <get/> or set entry fidelity to "full" to spend tokens. Set entry fidelity to "summary" to save tokens.`,
 			);
 		}
+		lines.push(
+			'Conclude with a brief <update></update> to continue or a brief <summarize></summarize> if done.',
+		);
+		const body = lines.join("\n");
 
-		return `${content}<progress>${parts.join("\n")}</progress>\n`;
+		return `${content}<progress turn="${ctx.turn}">${body}</progress>\n`;
 	}
 }

package/src/plugins/prompt/prompt.js

@@ -3,8 +3,16 @@ export default class Prompt {
 
 	constructor(core) {
 		this.#core = core;
-		core.hooks.tools.onView("prompt", (entry) => entry.body);
-		core.hooks.tools.onView("progress", (entry) => entry.body);
+		core.hooks.tools.onView("prompt", (entry) => {
+			if (entry.fidelity === "summary") {
+				const limit = 500;
+				const text = entry.body?.slice(0, limit) || "";
+				return text.length < (entry.body?.length || 0)
+					? `${text}\n[truncated — promote to full to see the complete prompt]`
+					: text;
+			}
+			return entry.body;
+		});
 		core.on("turn.started", this.onTurnStarted.bind(this));
 		core.filter("assembly.user", this.assemblePrompt.bind(this), 300);
 	}
@@ -17,10 +25,6 @@ export default class Prompt {
 				attributes: { mode },
 				loopId,
 			});
-		} else {
-			await store.upsert(runId, turn, `progress://${turn}`, prompt || "", 200, {
-				loopId,
-			});
 		}
 	}
 
@@ -41,8 +45,6 @@ export default class Prompt {
 		const tools = toolNames.join(",");
 		let warn = "";
 		if (mode === "ask") warn = ' warn="File editing disallowed."';
-		if (mode === "panic")
-			warn = ' warn="Context overflow. Free space to continue."';
 
 		return `${content}<prompt mode="${mode}" tools="${tools}"${warn}>${body}</prompt>`;
 	}

package/src/plugins/rm/rm.js

@@ -41,25 +41,37 @@ export default class Rm {
 			return;
 		}
 
-		for (const match of matches) {
-			const resultPath = `rm://${match.path}`;
-			if (match.scheme === null) {
-				await store.upsert(runId, turn, resultPath, match.path, 202, {
-					attributes: { path: match.path },
-					loopId,
-				});
-			} else {
-				await store.remove(runId, match.path);
-				await store.upsert(runId, turn, resultPath, match.path, 200, {
-					attributes: { path: match.path },
-					loopId,
-				});
-			}
+		const fileMatches = matches.filter((m) => m.scheme === null);
+		const schemeMatches = matches.filter((m) => m.scheme !== null);
+
+		// Scheme entries: remove all, write one aggregate result entry
+		for (const match of schemeMatches) await store.remove(runId, match.path);
+		if (schemeMatches.length > 0) {
+			const paths = schemeMatches.map((m) => m.path).join("\n");
+			await store.upsert(runId, turn, entry.resultPath, paths, 200, {
+				attributes: { path: target },
+				loopId,
+			});
+		}
+
+		// File entries: individual 202 proposals (require user resolution)
+		if (fileMatches.length > 0 && schemeMatches.length > 0)
+			await store.remove(runId, entry.resultPath);
+		for (const match of fileMatches) {
+			const resultPath =
+				schemeMatches.length === 0 && fileMatches.length === 1
+					? entry.resultPath
+					: await store.dedup(runId, "rm", match.path, turn);
+			await store.upsert(runId, turn, resultPath, match.path, 202, {
+				attributes: { path: match.path },
+				loopId,
+			});
 		}
 	}
 
 	full(entry) {
-		return `# rm ${entry.attributes.path || entry.path}`;
+		const header = `# rm ${entry.attributes.path || entry.path}`;
+		return entry.body ? `${header}\n${entry.body}` : header;
 	}
 
 	summary(entry) {

package/src/plugins/rm/rmDoc.js

@@ -2,28 +2,23 @@
 // Text goes to the model. Rationale stays in source.
 // Changing ANY line requires reading ALL rationales first.
 const LINES = [
-	// --- Syntax: path attr, self-closing
 	['## <rm path="[path]"/> - Remove a file or entry'],
-
-	// --- Examples: file, known (with slug path), preview safety
 	['Example: <rm path="src/config.js"/>', "File removal. Simplest form."],
 	[
-		'Example: <rm path="known://donald-rumsfeld-was-born-in-1932"/>',
-		"Shows the slugified path convention. Model sees these paths in <knowns> section.",
+		'Example: <rm path="known://config/deprecated_service"/>',
+		"Shows topic-hierarchy path convention.",
 	],
 	[
 		'Example: <rm path="known://temp_*" preview/>',
-		"Preview before deleting. Glob pattern. Safety pattern for bulk operations.",
+		"Preview before deleting. Safety pattern for bulk operations.",
 	],
-
-	// --- Constraints
 	[
 		'* Permanent. Prefer <set fidelity="archive"/> to preserve for later retrieval',
-		"Nudges toward archive over rm. Archive keeps the key; rm deletes permanently.",
+		"Nudges toward archive over rm.",
 	],
 	[
-		"* Paths accept globs — use `preview` to check matches first",
-		"Reinforces preview safety pattern. Prevents accidental bulk deletion.",
+		"* Use `preview` to check matches before pattern-based bulk deletion",
+		"Reinforces preview safety pattern.",
 	],
 ];
 

package/src/plugins/rpc/rpc.js

@@ -178,7 +178,7 @@ export default class Rpc {
 					scheme: e.scheme,
 					status: e.status,
 					fidelity: e.fidelity,
-					tokens: e.tokens_full,
+					tokens: e.tokens,
 				}));
 			},
 			description: "Query entries by pattern.",
@@ -233,6 +233,7 @@ export default class Rpc {
 						contextLimit: params.contextLimit,
 						noRepo: params.noRepo,
 						noInteraction: params.noInteraction,
+						noProposals: params.noProposals,
 						noWeb: params.noWeb,
 						fork: params.fork,
 					},
@@ -269,6 +270,7 @@ export default class Rpc {
 						contextLimit: params.contextLimit,
 						noRepo: params.noRepo,
 						noInteraction: params.noInteraction,
+						noProposals: params.noProposals,
 						noWeb: params.noWeb,
 						fork: params.fork,
 					},