@agimon-ai/doompi-core 0.0.1-alpha.111 → 0.0.1-alpha.113

package/dist/src/server/directHarnessRuntime.mjs

@@ -493,7 +493,8 @@ async function createDirectHarnessRuntime(options) {
 		}, context);
 		const storedFastMode = await harness.snapshot(FastModeDoc, context);
 		fastMode = storedFastMode?.enabled ?? options.initialFastMode ?? false;
-		const sessionId = (await harness.snapshot(SessionIdentityDoc, context))?.id || options.sessionId || randomUUID();
+		const storedIdentity = await harness.snapshot(SessionIdentityDoc, context);
+		const sessionId = storedIdentity?.id || options.sessionId || randomUUID();
 		await writable(() => harness.commit(async (tx) => {
 			const identity = await tx.doc(SessionIdentityDoc);
 			if (!identity.id) {
@@ -515,7 +516,7 @@ async function createDirectHarnessRuntime(options) {
 			const metadata = await tx.doc(SessionMetadataDoc);
 			metadata.workspaceRoot ||= options.cwd;
 			if (options.lane !== void 0) metadata.laneName = options.lane;
-			if (options.sessionName !== void 0) metadata.name = options.sessionName;
+			if (!storedIdentity?.id && options.sessionName !== void 0) metadata.name = options.sessionName;
 		}, context));
 		const laneName = options.lane ?? "main";
 		let resolveExited;
@@ -565,7 +566,7 @@ async function createDirectHarnessRuntime(options) {
 			return {
 				revision: record.revision,
 				paused: record.paused,
-				queue: record.queue.filter((item) => item.disposition !== "consumed" && item.disposition !== "removed").map(({ submissionId: _s, conversationId: _c, message: _m, operationId: _o, attempt: _a, ...item }) => item),
+				queue: record.queue.filter((item) => item.explicitQueue === true && item.disposition !== "consumed" && item.disposition !== "removed").map(({ explicitQueue: _q, submissionId: _s, conversationId: _c, message: _m, operationId: _o, attempt: _a, ...item }) => item),
 				operation: await execution()
 			};
 		};
@@ -1051,13 +1052,13 @@ async function createDirectHarnessRuntime(options) {
 				}
 			});
 		};
-		const handoff = async (item, mode, recovering = false) => {
+		const handoff = async (item, mode, recovering = false, allowPaused = false) => {
 			if (handingOff.has(item.id)) return void 0;
 			handingOff.add(item.id);
 			try {
 				const claimed = await changeRecord((r) => {
 					const q = r.queue.find((q) => q.id === item.id);
-					if (!q || r.paused && !recovering) return void 0;
+					if (!q || r.paused && !recovering && !allowPaused) return void 0;
 					if (recovering ? q.disposition !== "handoff" || q.submissionId !== void 0 : q.disposition !== "pending") return void 0;
 					q.disposition = "handoff";
 					q.conversationId = conversation.id;
@@ -1118,7 +1119,7 @@ async function createDirectHarnessRuntime(options) {
 				text: message
 			}, ...images] : message;
 		};
-		const enqueue = async (message, images, delivery, scheduling) => {
+		const enqueue = async (message, images, delivery, scheduling, explicitQueue = false) => {
 			const id = randomUUID();
 			await changeRecord((r) => {
 				r.queue.push({
@@ -1128,6 +1129,7 @@ async function createDirectHarnessRuntime(options) {
 					...typeof message === "string" ? {} : { message },
 					delivery,
 					scheduling,
+					explicitQueue,
 					disposition: "pending"
 				});
 			});
@@ -1151,17 +1153,9 @@ async function createDirectHarnessRuntime(options) {
 				handledCommand: true
 			};
 			const record = await readRecord();
-			if (record.paused) {
-				if (record.queue.some((q) => q.disposition !== "consumed" && q.disposition !== "removed")) throw new Error("The queue is paused");
-				await changeRecord((r) => {
-					r.paused = false;
-					delete r.abortOperationId;
-					delete r.abortTaskId;
-				});
-			}
 			await flushNextTurn();
 			const { id } = await enqueue(message, images, mode ?? "nextRun", "automatic");
-			const submission = await handoff((await readRecord()).queue.find((q) => q.id === id), mode ?? "reject");
+			const submission = await handoff((await readRecord()).queue.find((q) => q.id === id), mode ?? "reject", false, record.paused);
 			if (!submission) return { settled: Promise.resolve() };
 			let resolveDelivery;
 			const delivered = new Promise((resolve) => {
@@ -1220,7 +1214,7 @@ async function createDirectHarnessRuntime(options) {
 			const doc = await tx.doc(LifecycleDoc);
 			const record = JSON.parse(doc.json);
 			const q = record.queue.find((q) => q.id === selection.id);
-			if (!q) return "not_found";
+			if (!q || q.explicitQueue !== true) return "not_found";
 			const requestId = `${q.id}:${q.attempt ?? 0}`;
 			const accepted = await tx.submissionByRequest(conversation.id, requestId);
 			if (accepted && accepted.type !== "input") throw new Error(`Request ${requestId} already identifies a submission of type ${accepted.type}`);
@@ -1385,7 +1379,7 @@ async function createDirectHarnessRuntime(options) {
 				if (selection) {
 					const outcome = await changeRecord((r) => {
 						const q = r.queue.find((q) => q.id === selection.id);
-						if (!q || q.disposition === "removed" || q.disposition === "consumed") return "not_found";
+						if (!q || q.explicitQueue !== true || q.disposition === "removed" || q.disposition === "consumed") return "not_found";
 						if (q.disposition !== "pending") return "in_flight";
 						if (current?.id !== selection.operationId || current?.status === "aborting") return "target_changed";
 						if (q.message && q.message.role !== "user") throw new Error("Only user input can interrupt and respond");
@@ -1602,6 +1596,31 @@ async function createDirectHarnessRuntime(options) {
 			}, context));
 			return entryId;
 		};
+		const removeQueued = async (id) => {
+			const item = (await readRecord()).queue.find((q) => q.id === id);
+			if (!item || item.explicitQueue !== true) return "not_found";
+			if (item.disposition === "consumed") return "already_consumed";
+			if (item.disposition === "removed") return "removed";
+			if (item.submissionId) {
+				const result = await harness.abortSubmission(item.submissionId, context, conversation.id);
+				if (result === "already_placed") return "in_flight";
+				if (result === "settled") return "already_consumed";
+			} else if (item.disposition !== "pending") return "in_flight";
+			const result = await changeRecord((r) => {
+				const q = r.queue.find((q) => q.id === id);
+				if (!q || q.explicitQueue !== true) return "not_found";
+				if (q.disposition === "consumed") return "already_consumed";
+				if (q.disposition === "removed") return "removed";
+				if (q.submissionId !== item.submissionId || item.submissionId === void 0 && q.disposition !== "pending") return "in_flight";
+				q.disposition = "removed";
+				q.text = "";
+				delete q.message;
+				delete q.images;
+				return "removed";
+			});
+			await publish();
+			return result;
+		};
 		return {
 			sessionId,
 			sessionFile: storage.sessionFile,
@@ -1641,7 +1660,8 @@ async function createDirectHarnessRuntime(options) {
 				const metadata = await harness.snapshot(SessionMetadataDoc, context);
 				const stats = await getSessionStats();
 				const inbox = await harness.snapshot(InboxDoc, conversation.id, context);
-				const retainedSubmissions = new Set((await readRecord()).queue.map((item) => item.submissionId));
+				const retained = (await readRecord()).queue;
+				const retainedSubmissions = new Set(retained.map((item) => item.submissionId));
 				const nativePending = inbox?.items.filter((item) => item.mode !== "write" && !retainedSubmissions.has(item.id)).length ?? 0;
 				return json({
 					sessionId,
@@ -1663,42 +1683,18 @@ async function createDirectHarnessRuntime(options) {
 					followUpMode: settings.followUpMode ?? "one-at-a-time",
 					autoCompactionEnabled: settings.compaction?.enabled ?? true,
 					messageCount: stats.messageCount,
-					pendingMessageCount: lifecycle.queue.length + nativePending + nextTurnMessages.length + deferredInternalCount
+					pendingMessageCount: retained.filter((item) => item.disposition !== "consumed" && item.disposition !== "removed").length + nativePending + nextTurnMessages.length + deferredInternalCount
 				});
 			},
 			enqueueAutomatic: async (value, images) => {
-				const result = await enqueue(value, images, "nextRun", "automatic");
+				const result = await enqueue(value, images, "nextRun", "automatic", true);
 				drain().catch((error) => emit({
 					type: "error",
 					error: String(error)
 				}));
 				return result;
 			},
-			async removeQueued(id) {
-				const item = (await readRecord()).queue.find((q) => q.id === id);
-				if (!item) return "not_found";
-				if (item.disposition === "consumed") return "already_consumed";
-				if (item.disposition === "removed") return "removed";
-				if (item.submissionId) {
-					const result = await harness.abortSubmission(item.submissionId, context, conversation.id);
-					if (result === "already_placed") return "in_flight";
-					if (result === "settled") return "already_consumed";
-				} else if (item.disposition !== "pending") return "in_flight";
-				const result = await changeRecord((r) => {
-					const q = r.queue.find((q) => q.id === id);
-					if (!q) return "not_found";
-					if (q.disposition === "consumed") return "already_consumed";
-					if (q.disposition === "removed") return "removed";
-					if (q.submissionId !== item.submissionId || item.submissionId === void 0 && q.disposition !== "pending") return "in_flight";
-					q.disposition = "removed";
-					q.text = "";
-					delete q.message;
-					delete q.images;
-					return "removed";
-				});
-				await publish();
-				return result;
-			},
+			removeQueued,
 			async promoteQueued(id, operationId) {
 				return (await submitUserPrompt("", void 0, {
 					id,
@@ -1921,19 +1917,23 @@ async function createDirectHarnessRuntime(options) {
 				}
 			}),
 			async clearQueue() {
-				for (const item of (await readRecord()).queue) if (item.submissionId) await harness.abortSubmission(item.submissionId, context);
-				await changeRecord((r) => {
-					r.queue = [];
-				});
+				const selected = (await readRecord()).queue.filter((item) => item.explicitQueue === true && item.disposition !== "consumed" && item.disposition !== "removed");
+				for (const item of selected) await removeQueued(item.id);
 				await publish();
 				return {
 					steering: [],
 					followUp: []
 				};
 			},
-			setName: (name) => writable(() => harness.commit(async (tx) => {
-				(await tx.doc(SessionMetadataDoc)).name = name;
-			}, context)),
+			async setName(name) {
+				await writable(() => harness.commit(async (tx) => {
+					(await tx.doc(SessionMetadataDoc)).name = name;
+				}, context));
+				emit({
+					type: "session_info_changed",
+					name
+				});
+			},
 			getSessionStats,
 			async replaceTools(replacement) {
 				tools = replacement;