@possumtech/rummy 0.5.0 → 2.0.1

package/src/agent/ProjectAgent.js

@@ -1,40 +1,35 @@
 import LlmProvider from "../llm/LlmProvider.js";
 import AgentLoop from "./AgentLoop.js";
-import KnownStore from "./KnownStore.js";
+import Entries from "./Entries.js";
 import TurnExecutor from "./TurnExecutor.js";
 
 export default class ProjectAgent {
 	#db;
 	#hooks;
 	#agentLoop;
-	#knownStore;
+	#entries;
 	#llm;
 
 	constructor(db, hooks) {
 		this.#db = db;
 		this.#hooks = hooks;
-		this.#llm = new LlmProvider(db);
-		this.#knownStore = new KnownStore(db, {
-			onChanged: (event) => hooks.entry.changed.emit(event).catch(() => {}),
+		this.#llm = new LlmProvider(db, hooks);
+		this.#entries = new Entries(db, {
+			onChanged: (event) => hooks.entry.changed.emit(event),
 		});
-		this.#knownStore.loadSchemes(db);
+		this.#entries.loadSchemes(db);
 
-		const turnExecutor = new TurnExecutor(
-			db,
-			this.#llm,
-			hooks,
-			this.#knownStore,
-		);
+		const turnExecutor = new TurnExecutor(db, this.#llm, hooks, this.#entries);
 		this.#agentLoop = new AgentLoop(
 			db,
 			this.#llm,
 			hooks,
 			turnExecutor,
-			this.#knownStore,
+			this.#entries,
 		);
 	}
 
-	async init(projectName, projectRoot, configPath) {
+	async init(projectName, projectRoot, configPath = null) {
 		await this.#hooks.project.init.started.emit({
 			projectName,
 			projectRoot,
@@ -43,7 +38,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,
 		});
 		const projectId = projectRow.id;
 
@@ -57,7 +52,7 @@ export default class ProjectAgent {
 	}
 
 	get entries() {
-		return this.#knownStore;
+		return this.#entries;
 	}
 
 	async ask(projectId, model, prompt, run = null, options = {}) {
@@ -88,8 +83,16 @@ export default class ProjectAgent {
 		return this.#agentLoop.resolve(run, resolution);
 	}
 
-	async inject(run, message) {
-		return this.#agentLoop.inject(run, message);
+	async inject(run, message, mode, options = {}) {
+		return this.#agentLoop.inject(run, message, mode, options);
+	}
+
+	// Synchronously create (or fork) a run row and return the alias.
+	// Caller is expected to follow up with a kickoff (ask/act) that
+	// operates on the returned alias. Lets RPC respond with the real
+	// alias before the long-running loop starts.
+	async ensureRun(projectId, model, run, prompt, options = {}) {
+		return this.#agentLoop.ensureRun(projectId, model, run, prompt, options);
 	}
 
 	async getRunHistory(run) {
@@ -99,4 +102,13 @@ export default class ProjectAgent {
 	abortRun(runId) {
 		this.#agentLoop.abort(runId);
 	}
+
+	/**
+	 * Abort every in-flight run and wait for them to settle. Called
+	 * from the server's close path so the Node event loop isn't held
+	 * open by detached kickoff Promises after shutdown.
+	 */
+	async shutdown() {
+		await this.#agentLoop.abortAll();
+	}
 }