@possumtech/rummy 0.2.7 → 0.3.0

package/src/plugins/rpc/rpc.js

@@ -1,4 +1,3 @@
-import KnownStore from "../../agent/KnownStore.js";
 import msg from "../../agent/messages.js";
 import RummyContext from "../../hooks/RummyContext.js";
 import File from "../file/file.js";
@@ -67,7 +66,7 @@ export default class Rpc {
 				const row = await ctx.db.upsert_model.get({
 					alias: params.alias,
 					actual: params.actual,
-					context_length: params.contextLength || null,
+					context_length: params.contextLength ?? null,
 				});
 				return { id: row.id, alias: params.alias };
 			},
@@ -90,15 +89,15 @@ export default class Rpc {
 
 		// --- Entry operations (same dispatch as model) ---
 
-		r.register("read", {
+		// Override: get has persist flag for file constraint management
+		r.register("get", {
 			handler: async (params, ctx) => {
 				if (!params.path) throw new Error("path is required");
 
 				if (params.persist) {
 					const visibility = params.readonly ? "readonly" : "active";
-					return File.activate(
+					await File.setConstraint(
 						ctx.db,
-						ctx.projectAgent.entries,
 						ctx.projectId,
 						params.path,
 						visibility,
@@ -115,105 +114,50 @@ export default class Rpc {
 			description: "Promote entry to full state.",
 			params: {
 				path: "string — file path or glob pattern",
-				run: "string? — run alias (required without persist)",
-				persist: "boolean? — create file constraint",
+				run: "string — run alias",
+				persist: "boolean? — also create file constraint",
 				readonly: "boolean? — with persist, set readonly instead of active",
 			},
 			requiresInit: true,
 		});
 
+		// store is not a tool — it manages file constraints
 		r.register("store", {
 			handler: async (params, ctx) => {
 				if (!params.path) throw new Error("path is required");
 
 				if (params.clear) {
-					return File.drop(ctx.db, ctx.projectId, params.path);
+					await File.dropConstraint(ctx.db, ctx.projectId, params.path);
+					return { status: "ok" };
 				}
 				if (params.persist) {
-					if (params.ignore) {
-						return File.ignore(
-							ctx.db,
-							ctx.projectAgent.entries,
-							ctx.projectId,
-							params.path,
-						);
-					}
-					return File.drop(ctx.db, ctx.projectId, params.path);
+					const visibility = params.ignore ? "ignore" : "active";
+					await File.setConstraint(
+						ctx.db,
+						ctx.projectId,
+						params.path,
+						visibility,
+					);
 				}
 
 				if (!params.run) throw new Error("run is required");
-				const { rummy } = await buildRunContext(hooks, ctx, params.run);
-				await dispatchTool(hooks, rummy, "store", params.path, "", {
-					path: params.path,
-				});
+				const runRow = await ctx.db.get_run_by_alias.get({ alias: params.run });
+				if (!runRow) throw new Error(`Run not found: ${params.run}`);
+				const store = ctx.projectAgent.entries;
+				await store.demoteByPattern(runRow.id, params.path, null);
 				return { status: "ok" };
 			},
 			description: "Demote entry to stored state.",
 			params: {
 				path: "string — file path or glob pattern",
 				run: "string? — run alias (required without persist)",
-				persist: "boolean? — create file constraint",
+				persist: "boolean? — also create file constraint",
 				ignore: "boolean? — with persist, exclude from scan",
 				clear: "boolean? — remove existing constraint",
 			},
 			requiresInit: true,
 		});
 
-		r.register("write", {
-			handler: async (params, ctx) => {
-				if (!params.path) throw new Error("path is required");
-				if (!params.run) throw new Error("run is required");
-				const { rummy } = await buildRunContext(hooks, ctx, params.run);
-
-				const scheme = KnownStore.scheme(params.path);
-				if (scheme) {
-					await rummy.set({
-						path: params.path,
-						body: params.body || "",
-						state: params.state || "full",
-						attributes: params.attributes,
-					});
-				} else {
-					await dispatchTool(
-						hooks,
-						rummy,
-						"set",
-						params.path,
-						params.body || "",
-						{ path: params.path, ...params.attributes },
-					);
-				}
-				return { status: "ok" };
-			},
-			description: "Create or update an entry.",
-			params: {
-				run: "string — run alias",
-				path: "string — entry path",
-				body: "string? — entry content",
-				state: "string? — entry state (default: full)",
-				attributes: "object? — JSON attributes",
-			},
-			requiresInit: true,
-		});
-
-		r.register("delete", {
-			handler: async (params, ctx) => {
-				if (!params.path) throw new Error("path is required");
-				if (!params.run) throw new Error("run is required");
-				const { rummy } = await buildRunContext(hooks, ctx, params.run);
-				await dispatchTool(hooks, rummy, "rm", params.path, "", {
-					path: params.path,
-				});
-				return { status: "ok" };
-			},
-			description: "Remove an entry.",
-			params: {
-				run: "string — run alias",
-				path: "string — entry path",
-			},
-			requiresInit: true,
-		});
-
 		r.register("getEntries", {
 			handler: async (params, ctx) => {
 				let run;
@@ -225,14 +169,15 @@ export default class Rpc {
 				if (!run) return [];
 				const entries = await ctx.projectAgent.entries.getEntriesByPattern(
 					run.id,
-					params.pattern || "*",
-					params.body || null,
-					{ limit: params.limit, offset: params.offset },
+					params.pattern ?? "*",
+					params.body ?? null,
+					{ limit: params.limit ?? null, offset: params.offset ?? null },
 				);
 				return entries.map((e) => ({
 					path: e.path,
 					scheme: e.scheme,
-					state: e.state,
+					status: e.status,
+					fidelity: e.fidelity,
 					tokens: e.tokens_full,
 				}));
 			},
@@ -256,7 +201,7 @@ export default class Rpc {
 				const runRow = await ctx.db.create_run.get({
 					project_id: ctx.projectId,
 					parent_run_id: null,
-					model: params.model,
+					model: params.model ?? null,
 					alias,
 					temperature: params.temperature ?? null,
 					persona: params.persona ?? null,
@@ -283,10 +228,12 @@ export default class Rpc {
 					params.prompt,
 					params.run,
 					{
-						temperature: params.temperature,
-						persona: params.persona,
+						temperature: params.temperature ?? null,
+						persona: params.persona ?? null,
 						contextLimit: params.contextLimit,
-						noContext: params.noContext,
+						noRepo: params.noRepo,
+						noInteraction: params.noInteraction,
+						noWeb: params.noWeb,
 						fork: params.fork,
 					},
 				);
@@ -300,7 +247,9 @@ export default class Rpc {
 				temperature: "number?",
 				persona: "string?",
 				contextLimit: "number?",
-				noContext: "boolean?",
+				noRepo: "boolean?",
+				noInteraction: "boolean? — disable ask_user tool",
+				noWeb: "boolean? — disable search and URL fetch",
 				fork: "boolean?",
 			},
 			requiresInit: true,
@@ -315,10 +264,12 @@ export default class Rpc {
 					params.prompt,
 					params.run,
 					{
-						temperature: params.temperature,
-						persona: params.persona,
+						temperature: params.temperature ?? null,
+						persona: params.persona ?? null,
 						contextLimit: params.contextLimit,
-						noContext: params.noContext,
+						noRepo: params.noRepo,
+						noInteraction: params.noInteraction,
+						noWeb: params.noWeb,
 						fork: params.fork,
 					},
 				);
@@ -332,7 +283,9 @@ export default class Rpc {
 				temperature: "number?",
 				persona: "string?",
 				contextLimit: "number?",
-				noContext: "boolean?",
+				noRepo: "boolean?",
+				noInteraction: "boolean? — disable ask_user tool",
+				noWeb: "boolean? — disable search and URL fetch",
 				fork: "boolean?",
 			},
 			requiresInit: true,
@@ -358,7 +311,7 @@ export default class Rpc {
 				ctx.projectAgent.abortRun(runRow.id);
 				await ctx.db.update_run_status.run({
 					id: runRow.id,
-					status: "aborted",
+					status: 499,
 				});
 				return { status: "ok" };
 			},
@@ -447,7 +400,7 @@ export default class Rpc {
 					run: row.alias,
 					status: row.status,
 					turn: row.turn,
-					summary: row.summary || "",
+					summary: row.summary,
 					created: row.created_at,
 				}));
 			},
@@ -512,8 +465,8 @@ export default class Rpc {
 							};
 						}),
 					},
-					last_user_prompt: promptRow?.body || "",
-					last_summary: summaryRow?.body || "",
+					last_user_prompt: promptRow?.body,
+					last_summary: summaryRow?.body,
 				};
 			},
 			description: "Full run detail.",
@@ -527,6 +480,10 @@ export default class Rpc {
 		r.registerNotification("run/progress", "Turn status.");
 		r.registerNotification("ui/render", "Streaming output.");
 		r.registerNotification("ui/notify", "Toast notification.");
+
+		// Auto-dispatch: any registered tool is callable via RPC.
+		// Checked at request time — no timing dependency on plugin load order.
+		r.setToolFallback(hooks, buildRunContext, dispatchTool);
 	}
 }
 
@@ -547,7 +504,7 @@ async function buildRunContext(hooks, ctx, runAlias) {
 				sequence: runRow.next_turn,
 				runId: runRow.id,
 				turnId: null,
-				noContext: false,
+				noRepo: false,
 				contextSize: null,
 				systemPrompt: "",
 				loopPrompt: "",
@@ -558,25 +515,24 @@ async function buildRunContext(hooks, ctx, runAlias) {
 
 async function dispatchTool(hooks, rummy, scheme, path, body, attributes) {
 	const store = rummy.entries;
-	const resultPath = await store.dedup(rummy.runId, scheme, path || "");
-
-	await store.upsert(
+	const resultPath = await store.dedup(
 		rummy.runId,
+		scheme,
+		path,
 		rummy.sequence,
-		resultPath,
-		body || "",
-		"full",
-		{
-			attributes: attributes || null,
-		},
 	);
 
+	await store.upsert(rummy.runId, rummy.sequence, resultPath, body, 200, {
+		attributes: attributes,
+		loopId: rummy.loopId,
+	});
+
 	const entry = {
 		scheme,
 		path: resultPath,
-		body: body || "",
-		attributes: attributes || {},
-		state: "full",
+		body: body,
+		attributes: attributes,
+		status: 200,
 		resultPath,
 	};
 

package/src/plugins/set/README.md

@@ -1,32 +1,33 @@
 # set
 
-Writes or edits entry content. Handles new files, full overwrites, SEARCH/REPLACE edits, and pattern updates.
+Writes or edits entry content. Handles new files, full overwrites,
+SEARCH/REPLACE edits, and pattern updates.
 
 ## Files
 
 - **set.js** — Plugin registration and edit dispatch logic.
-- **HeuristicMatcher.js** — Fuzzy SEARCH/REPLACE matching. Handles whitespace/indentation differences and escaped characters when literal match fails.
+- **HeuristicMatcher.js** — Fuzzy SEARCH/REPLACE matching.
 - **HeuristicMatcher.test.js** — Tests for HeuristicMatcher.
 
 ## Registration
 
 - **Tool**: `set`
-- **Modes**: ask, act
-- **Category**: act
-- **Handler**: Routes to different paths based on attributes:
+- **Category**: `logging`
+- **Handler**: Routes based on attributes:
   - `blocks` or `search` — SEARCH/REPLACE edit via `processEdit`.
   - `preview` — pattern preview (dry run).
-  - K/V path — direct upsert at `full` state.
-  - File path — produces `proposed` entry with udiff patch.
+  - Scheme path — direct upsert at status 200.
+  - File path — produces status 202 (proposed) with unified diff patch.
   - Glob/filter — bulk update via `updateBodyByPattern`.
 
 ## Projection
 
-Shows `set {file}` with token delta (`before→after tokens`). Includes the merge conflict block when a SEARCH/REPLACE was performed.
+Shows `set {file}` with token delta (`before→after tokens`). Includes
+the merge conflict block when a SEARCH/REPLACE was performed.
 
 ## Behavior
 
-- **Literal match first**: SEARCH text is matched literally against the entry body.
-- **Heuristic fallback**: On literal failure, `HeuristicMatcher.matchAndPatch` attempts fuzzy matching with warnings.
-- **Patch generation**: `generatePatch` produces unified diff format for client display.
-- File writes are always `proposed`; K/V writes resolve immediately.
+- **Literal match first**: SEARCH text is matched literally.
+- **Heuristic fallback**: On literal failure, fuzzy matching with warnings.
+- **Patch generation**: `generatePatch` produces unified diff for client display.
+- File writes are always status 202 (proposed); scheme writes resolve immediately.

package/src/plugins/set/set.js

@@ -1,7 +1,9 @@
-import { readFileSync } from "node:fs";
 import KnownStore from "../../agent/KnownStore.js";
 import Hedberg, { generatePatch } from "../hedberg/hedberg.js";
 import { storePatternResult } from "../helpers.js";
+import docs from "./setDoc.js";
+
+const VALID_FIDELITY = { archive: 1, summary: 1, index: 1, full: 1 };
 
 // biome-ignore lint/suspicious/noShadowRestrictedNames: tool name is "set"
 export default class Set {
@@ -9,23 +11,74 @@ export default class Set {
 
 	constructor(core) {
 		this.#core = core;
-		core.registerScheme({
-			validStates: ["full", "proposed", "pass", "rejected", "error", "pattern"],
-		});
+		core.registerScheme();
 		core.on("handler", this.handler.bind(this));
 		core.on("full", this.full.bind(this));
 		core.on("summary", this.summary.bind(this));
 		core.on("turn.proposing", this.#materializeRevisions.bind(this));
-		const docs = readFileSync(new URL("./docs.md", import.meta.url), "utf8");
-		core.filter("instructions.toolDocs", async (content) =>
-			content ? `${content}\n\n${docs}` : docs,
-		);
+		core.filter("instructions.toolDocs", async (docsMap) => {
+			docsMap.set = docs;
+			return docsMap;
+		});
 	}
 
 	async handler(entry, rummy) {
-		const { entries: store, sequence: turn, runId } = rummy;
+		const { entries: store, sequence: turn, runId, loopId } = rummy;
 		const attrs = entry.attributes;
 
+		// Fidelity control: <set path="..." fidelity="archive"/>
+		const fidelityAttr = VALID_FIDELITY[attrs.fidelity] ? attrs.fidelity : null;
+		if (fidelityAttr && attrs.path) {
+			const target = attrs.path;
+			const rawSummary =
+				typeof attrs.summary === "string" ? attrs.summary : null;
+			const summaryText = rawSummary ? rawSummary.slice(0, 80) : null;
+			const matches = await store.getEntriesByPattern(
+				runId,
+				target,
+				attrs.body,
+			);
+			if (entry.body) {
+				// Write content directly at specified fidelity
+				const entryAttrs = summaryText ? { summary: summaryText } : null;
+				for (const match of matches) {
+					await store.upsert(runId, turn, match.path, entry.body, 200, {
+						fidelity: fidelityAttr,
+						attributes: entryAttrs,
+						loopId,
+					});
+				}
+				if (matches.length === 0) {
+					await store.upsert(runId, turn, target, entry.body, 200, {
+						fidelity: fidelityAttr,
+						attributes: entryAttrs,
+						loopId,
+					});
+				}
+			} else {
+				// No body — change fidelity, attach summary if provided
+				for (const match of matches) {
+					await store.setFidelity(runId, match.path, fidelityAttr);
+					if (summaryText) {
+						await store.setAttributes(runId, match.path, {
+							summary: summaryText,
+						});
+					}
+				}
+			}
+			const label =
+				fidelityAttr === "archive" ? "archived" : `set to ${fidelityAttr}`;
+			const body =
+				matches.length > 0
+					? `${matches.map((m) => m.path).join(", ")} ${label}`
+					: `${target} not found`;
+			await store.upsert(runId, turn, entry.resultPath, body, 200, {
+				fidelity: "archive",
+				loopId,
+			});
+			return;
+		}
+
 		if (attrs.blocks || attrs.search != null) {
 			await this.#processEdit(rummy, entry, attrs);
 			return;
@@ -45,7 +98,7 @@ export default class Set {
 				attrs.path,
 				attrs.body,
 				matches,
-				true,
+				{ preview: true, loopId },
 			);
 			return;
 		}
@@ -57,8 +110,9 @@ export default class Set {
 		if (scheme === null) {
 			const udiff = generatePatch(target, "", entry.body || "");
 			const merge = `<<<<<<< SEARCH\n=======\n${entry.body || ""}\n>>>>>>> REPLACE`;
-			await store.upsert(runId, turn, entry.resultPath, "", "proposed", {
+			await store.upsert(runId, turn, entry.resultPath, "", 202, {
 				attributes: { file: target, patch: udiff, merge },
+				loopId,
 			});
 		} else if (attrs.filter || target.includes("*")) {
 			const matches = await store.getEntriesByPattern(
@@ -80,9 +134,10 @@ export default class Set {
 				target,
 				attrs.filter,
 				matches,
+				{ loopId },
 			);
 		} else {
-			await store.upsert(runId, turn, target, entry.body, "full");
+			await store.upsert(runId, turn, target, entry.body, 200, { loopId });
 		}
 	}
 
@@ -103,13 +158,14 @@ export default class Set {
 	}
 
 	async #processEdit(rummy, entry, attrs) {
-		const { entries: store, sequence: turn, runId } = rummy;
+		const { entries: store, sequence: turn, runId, loopId } = rummy;
 		const target = attrs.path;
 		const matches = await store.getEntriesByPattern(runId, target, attrs.body);
 
 		if (matches.length === 0) {
-			await store.upsert(runId, turn, entry.resultPath, "", "error", {
+			await store.upsert(runId, turn, entry.resultPath, "", 404, {
 				attributes: { file: target, error: `${target} not found in context` },
+				loopId,
 			});
 			return;
 		}
@@ -121,8 +177,9 @@ export default class Set {
 				const existingAttrs = await rummy.getAttributes(canonicalPath);
 				const revisions = existingAttrs?.revisions || [];
 				revisions.push(revision);
-				await store.upsert(runId, turn, canonicalPath, "", "full", {
+				await store.upsert(runId, turn, canonicalPath, "", 200, {
 					attributes: { file: match.path, revisions },
+					loopId,
 				});
 				if (KnownStore.normalizePath(entry.resultPath) !== canonicalPath) {
 					await store.remove(runId, entry.resultPath);
@@ -133,7 +190,7 @@ export default class Set {
 			const { patch, searchText, replaceText, warning, error } =
 				Set.#applyRevision(match.body, attrs);
 
-			const state = error ? "error" : "pass";
+			const status = error ? 409 : 200;
 			const resultPath = `set://${match.path}`;
 			const udiff = patch ? generatePatch(match.path, match.body, patch) : null;
 			const merge =
@@ -143,7 +200,7 @@ export default class Set {
 			const beforeTokens = match.tokens_full || 0;
 			const afterTokens = patch ? (patch.length / 4) | 0 : beforeTokens;
 
-			await store.upsert(runId, turn, resultPath, match.body, state, {
+			await store.upsert(runId, turn, resultPath, match.body, status, {
 				attributes: {
 					file: match.path,
 					patch: udiff,
@@ -153,16 +210,19 @@ export default class Set {
 					warning,
 					error,
 				},
+				loopId,
 			});
 
-			if (state === "pass" && patch) {
-				await store.upsert(runId, turn, match.path, patch, match.state);
+			if (status === 200 && patch) {
+				await store.upsert(runId, turn, match.path, patch, match.status, {
+					loopId,
+				});
 			}
 		}
 	}
 
 	async #materializeRevisions({ rummy }) {
-		const { entries: store, sequence: turn, runId } = rummy;
+		const { entries: store, sequence: turn, runId, loopId } = rummy;
 		const setEntries = await store.getEntriesByPattern(runId, "set://*");
 
 		for (const entry of setEntries) {
@@ -198,7 +258,7 @@ export default class Set {
 				}
 			}
 
-			const state = lastError ? "error" : "proposed";
+			const state = lastError ? 409 : 202;
 			const udiff =
 				current !== original
 					? generatePatch(filePath, original, current)
@@ -217,6 +277,7 @@ export default class Set {
 					warning: lastWarning,
 					error: lastError,
 				},
+				loopId,
 			});
 		}
 	}

package/src/plugins/set/setDoc.js

@@ -0,0 +1,45 @@
+// Tool doc for <set>. Each entry: [text, rationale].
+// Text goes to the model. Rationale stays in source.
+// Changing ANY line requires reading ALL rationales first.
+const LINES = [
+	// --- Syntax: path attr + body = edit content
+	['## <set path="[path/to/file]">[edit]</set> - Edit a file or entry'],
+
+	// --- Examples: sed, SEARCH/REPLACE, fidelity control
+	[
+		'Example: <set path="src/config.js">s/port = 3000/port = 8080/g</set>',
+		"Sed syntax: most common edit pattern. Shows s/old/new/ with g flag.",
+	],
+	[
+		`Example: <set path="src/app.js"><<<<<<< SEARCH
+// TODO: add error handling
+=======
+// error handler configured
+>>>>>>> REPLACE</set>`,
+		"SEARCH/REPLACE block: literal match and replace. Use when sed escaping is complex.",
+	],
+	[
+		'Example: <set path="known://plan" stored summary="Migration plan for Q2"/>',
+		"Fidelity + summary: archive an entry while preserving a description. Lifecycle endpoint.",
+	],
+
+	// --- Constraints
+	[
+		'* `fidelity="..."`: `archive`, `summary`, `index`, `full`',
+		"Fidelity control. Archive removes from context but preserves for retrieval.",
+	],
+	[
+		'* `summary="..."` (<= 80 chars) persists across fidelity changes',
+		"Model-authored descriptions survive demotion. No janitorial pass needed.",
+	],
+	[
+		"* YOU MUST NOT use <sh/> or <env/> to read, create, or edit files",
+		"Forces file operations through set/get. Prevents untracked mutations.",
+	],
+	[
+		"* Editing: s/old/new/ sed patterns and literal SEARCH/REPLACE blocks",
+		"Both syntaxes supported. Hedberg normalizes either form.",
+	],
+];
+
+export default LINES.map(([text]) => text).join("\n");

package/src/plugins/sh/README.md

@@ -5,9 +5,8 @@ Proposes shell command execution for client approval.
 ## Registration
 
 - **Tool**: `sh`
-- **Modes**: act only
-- **Category**: act
-- **Handler**: Upserts the entry as `proposed` state. The client must approve execution.
+- **Category**: `logging`
+- **Handler**: Upserts the entry at status 202 (proposed). The client must approve execution.
 
 ## Projection
 
@@ -15,4 +14,5 @@ Shows `sh {command}` followed by the entry body.
 
 ## Behavior
 
-All shell commands require client-side approval — nothing executes server-side. Act mode only; blocked in ask mode.
+All shell commands require client-side approval — nothing executes
+server-side. Act mode only; excluded in ask mode by `resolveForLoop`.

package/src/plugins/sh/sh.js

@@ -1,4 +1,4 @@
-import { readFileSync } from "node:fs";
+import docs from "./shDoc.js";
 
 export default class Sh {
 	#core;
@@ -9,16 +9,17 @@ export default class Sh {
 		core.on("handler", this.handler.bind(this));
 		core.on("full", this.full.bind(this));
 		core.on("summary", this.summary.bind(this));
-		const docs = readFileSync(new URL("./docs.md", import.meta.url), "utf8");
-		core.filter("instructions.toolDocs", async (content) =>
-			content ? `${content}\n\n${docs}` : docs,
-		);
+		core.filter("instructions.toolDocs", async (docsMap) => {
+			docsMap.sh = docs;
+			return docsMap;
+		});
 	}
 
 	async handler(entry, rummy) {
-		const { entries: store, sequence: turn, runId } = rummy;
-		await store.upsert(runId, turn, entry.resultPath, entry.body, "proposed", {
+		const { entries: store, sequence: turn, runId, loopId } = rummy;
+		await store.upsert(runId, turn, entry.resultPath, entry.body, 202, {
 			attributes: entry.attributes,
+			loopId,
 		});
 	}