@codeworksh/harness 0.4.0-dev.20261020131429 → 0.5.0-canary.55.1.g9147d546

package/effect.mjs

@@ -44,6 +44,7 @@ var schema_exports$8 = /* @__PURE__ */ __exportAll({
 	CompactionData: () => CompactionData,
 	Config: () => Config$1,
 	DEFAULT_TITLE: () => DEFAULT_TITLE,
+	Execution: () => Execution,
 	ID: () => ID$1,
 	IDFromDb: () => IDFromDb,
 	InterruptReason: () => InterruptReason,
@@ -88,6 +89,12 @@ const Config$1 = Schema.Struct({
 * different facts, and inspecting the cause cannot tell them apart.
 */
 const InterruptReason = Schema.Literals(["user", "shutdown"]);
+/**
+* A run left unfinished: `running` while one is in flight, and still after the process died during
+* it; `closed` once a shutdown stopped it. Either resumes when the server starts again; a run that
+* ended any other way leaves none.
+*/
+const Execution = Schema.Literals(["running", "closed"]);
 const JsonObject = Schema.fromJsonString(Schema.Record(Schema.String, Schema.Unknown));
 const MessageEnvelopeIdentity = Schema.fromJsonString(Schema.Struct({ messageId: Schema.String }));
 const CompactionData = Schema.fromJsonString(Schema.Struct({
@@ -368,6 +375,14 @@ const migrations = {
 	}),
 	"202609290001_session_config": Effect.gen(function* () {
 		yield* (yield* SqlClient.SqlClient)`ALTER TABLE session ADD COLUMN config TEXT`;
+	}),
+	"202610230001_session_input_cancel": Effect.gen(function* () {
+		yield* (yield* SqlClient.SqlClient)`ALTER TABLE session_input ADD COLUMN cancelled_seq INTEGER`;
+	}),
+	"202610240001_session_execution": Effect.gen(function* () {
+		const sql = yield* SqlClient.SqlClient;
+		yield* sql`ALTER TABLE session ADD COLUMN execution TEXT`;
+		yield* sql`ALTER TABLE session ADD COLUMN restarts INTEGER NOT NULL DEFAULT 0`;
 	})
 };
 //#endregion
@@ -591,6 +606,8 @@ var SessionRow = class extends Model$1.Class("SessionRow")({
 	tokensOutput: Model$1.GeneratedByDb(Schema.Int),
 	tokensCacheRead: Model$1.GeneratedByDb(Schema.Int),
 	tokensCacheWrite: Model$1.GeneratedByDb(Schema.Int),
+	execution: Model$1.FieldOption(Execution),
+	restarts: Model$1.GeneratedByDb(Schema.Int),
 	...Timestamps
 }) {};
 var SessionInputRow = class extends Model$1.Class("SessionInputRow")({
@@ -600,6 +617,7 @@ var SessionInputRow = class extends Model$1.Class("SessionInputRow")({
 	delivery: Schema.Literals(inputDeliveries),
 	admittedSeq: Schema.Int,
 	promotedSeq: Model$1.FieldOption(Schema.Int),
+	cancelledSeq: Model$1.FieldOption(Schema.Int),
 	createdAt: Model$1.DateTimeInsertFromNumber
 }) {};
 var SessionEntryRow = class extends Model$1.Class("SessionEntryRow")({
@@ -731,6 +749,8 @@ var list_exports = /* @__PURE__ */ __exportAll({
 	LLMThinkingStart: () => LLMThinkingStart,
 	PluginUpdated: () => PluginUpdated,
 	PromptAdmitted: () => PromptAdmitted,
+	PromptCancelled: () => PromptCancelled,
+	PromptUpdated: () => PromptUpdated,
 	Prompted: () => Prompted,
 	PublicDefinitions: () => PublicDefinitions,
 	RetryFinished: () => RetryFinished,
@@ -768,6 +788,29 @@ const Prompted = schema_exports$7.EventSchema.define({
 	...durableOptions,
 	schema: PromptFields
 });
+/** A pending prompt withdrawn before promotion; it never enters the conversation. */
+const PromptCancelled = schema_exports$7.EventSchema.define({
+	type: "session.prompt.cancelled",
+	...durableOptions,
+	schema: {
+		...baseOptions,
+		messageId: ID
+	}
+});
+/**
+* A pending prompt moved to the other lane or rewritten before promotion; it keeps its place. Only
+* what changed is carried, so two updates of different fields both stand.
+*/
+const PromptUpdated = schema_exports$7.EventSchema.define({
+	type: "session.prompt.updated",
+	...durableOptions,
+	schema: {
+		...baseOptions,
+		messageId: ID,
+		prompt: Prompt.pipe(schema_exports$9.optional),
+		delivery: Delivery.pipe(schema_exports$9.optional)
+	}
+});
 const ConfigChanged = schema_exports$7.EventSchema.define({
 	type: "session.config.changed",
 	...durableOptions,
@@ -1002,14 +1045,14 @@ const PluginUpdated = schema_exports$7.EventSchema.define({
 * Everything the kernel can publish. `PublicDefinitions` is the narrower set
 * that reaches clients -- adding an event here does not publish it.
 */
-const Definitions = schema_exports$7.EventSchema.inventory(ExecutionStarted, ExecutionSucceeded, ExecutionFailed, ExecutionInterrupted, PromptAdmitted, Prompted, ConfigChanged, SessionForked, TurnStarted, TurnEnded, TurnAborted, RetryScheduled, RetryFinished, LLMStarted, LLMTextStart, LLMTextDelta, LLMTextEnd, LLMThinkingStart, LLMThinkingDelta, LLMThinkingEnd, LLMEnded, LLMFailed, ToolStarted, ToolProgress$2, ToolSettled, PluginUpdated);
+const Definitions = schema_exports$7.EventSchema.inventory(ExecutionStarted, ExecutionSucceeded, ExecutionFailed, ExecutionInterrupted, PromptAdmitted, Prompted, PromptCancelled, PromptUpdated, ConfigChanged, SessionForked, TurnStarted, TurnEnded, TurnAborted, RetryScheduled, RetryFinished, LLMStarted, LLMTextStart, LLMTextDelta, LLMTextEnd, LLMThinkingStart, LLMThinkingDelta, LLMThinkingEnd, LLMEnded, LLMFailed, ToolStarted, ToolProgress$2, ToolSettled, PluginUpdated);
 /**
 * The wire contract: what a client is allowed to receive. Identical to
 * `Definitions` today, and separate so that adding a kernel event is not by
 * itself a decision to publish it.
 */
 const PublicDefinitions = Definitions;
-const DurableDefinitions = schema_exports$7.EventSchema.inventory(PromptAdmitted, Prompted, ConfigChanged, SessionForked, TurnEnded, LLMStarted, LLMEnded, LLMFailed, ToolSettled);
+const DurableDefinitions = schema_exports$7.EventSchema.inventory(PromptAdmitted, Prompted, PromptCancelled, PromptUpdated, ConfigChanged, SessionForked, TurnEnded, LLMStarted, LLMEnded, LLMFailed, ToolSettled);
 const Manifest$2 = {
 	definitions: schema_exports$7.EventSchema.durable([...DurableDefinitions]),
 	schema: Schema.Union([...DurableDefinitions], { mode: "oneOf" }).pipe(Schema.toTaggedUnion("type"))
@@ -1807,6 +1850,7 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 			directory: input.directory,
 			hostDir: Option.fromUndefinedOr(input.hostDir),
 			config: Option.none(),
+			execution: Option.none(),
 			title: input.title,
 			tag: Option.fromUndefinedOr(input.tag),
 			metadata: Option.fromUndefinedOr(input.metadata),
@@ -2160,6 +2204,7 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 				directory: source.value.directory,
 				hostDir: source.value.hostDir,
 				config: source.value.config,
+				execution: Option.none(),
 				title: input.title ?? source.value.title,
 				tag: input.tag === void 0 ? source.value.tag : Option.some(input.tag),
 				metadata: source.value.metadata,
@@ -2269,6 +2314,41 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 				WHERE id = ${sessionId}
 			`;
 	}, Effect.orDie);
+	const markRunning = Effect.fn("Session.markRunning")(function* (sessionId) {
+		yield* sql`UPDATE session SET execution = 'running' WHERE id = ${sessionId}`;
+	}, Effect.orDie);
+	const endExecution = Effect.fn("Session.endExecution")(function* (sessionId, end, stoppedAt) {
+		if (end === "closed") {
+			yield* sql`UPDATE session SET execution = 'closed' WHERE id = ${sessionId}`;
+			return;
+		}
+		const after = end === "stopped" ? stoppedAt ?? Number.MAX_SAFE_INTEGER : -1;
+		yield* sql`
+				UPDATE session SET execution = NULL, restarts = 0
+				WHERE id = ${sessionId} AND NOT EXISTS (
+					SELECT 1 FROM session_input
+					WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+						AND admitted_seq > ${after}
+				)
+			`;
+	}, Effect.orDie);
+	const claimRestart = Effect.fn("Session.claimRestart")(function* (sessionId) {
+		const rows = yield* sql`
+				UPDATE session
+				SET restarts = restarts + (CASE WHEN execution = 'running' THEN 1 ELSE 0 END), execution = 'running'
+				WHERE id = ${sessionId} AND execution IS NOT NULL
+				RETURNING restarts
+			`;
+		return Option.fromUndefinedOr(rows[0]?.restarts);
+	}, Effect.orDie);
+	const resetRestarts = Effect.fn("Session.resetRestarts")(function* (sessionId) {
+		yield* sql`UPDATE session SET restarts = 0 WHERE id = ${sessionId} AND restarts > 0`;
+	}, Effect.orDie);
+	const unfinished = SqlSchema.findAll({
+		Request: Schema.Void,
+		Result: SessionRow,
+		execute: () => sql`SELECT * FROM session WHERE execution IS NOT NULL ORDER BY updated_at`
+	})(void 0).pipe(Effect.orDie, Effect.withSpan("Session.unfinished"));
 	const relink = Effect.fn("Session.relink")(function* (input) {
 		const reject = (reason) => new RelinkError({
 			sessionId: input.sessionId,
@@ -2330,6 +2410,11 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 		link,
 		retitle,
 		configure,
+		markRunning,
+		endExecution,
+		claimRestart,
+		resetRestarts,
+		unfinished,
 		get,
 		space,
 		project,
@@ -4972,6 +5057,7 @@ var Service$6 = class extends Context.Service()("@codeworksh/harness/runner/exec
 Layer.succeed(Service$6, Service$6.of({
 	active: Effect.succeed(/* @__PURE__ */ new Set()),
 	resume: () => Effect.void,
+	recover: () => Effect.void,
 	wake: () => Effect.void,
 	interrupt: () => Effect.succeed(false),
 	awaitIdle: () => Effect.void
@@ -4985,7 +5071,8 @@ const Admitted = Schema.Struct({
 	prompt: Prompt,
 	delivery: Delivery,
 	timeCreated: schema_exports$9.DateTimeUtcFromMillis,
-	promotedSeq: schema_exports$9.NonNegativeInt.pipe(schema_exports$9.optional)
+	promotedSeq: schema_exports$9.NonNegativeInt.pipe(schema_exports$9.optional),
+	cancelledSeq: schema_exports$9.NonNegativeInt.pipe(schema_exports$9.optional)
 }).annotate({ identifier: "SessionInput.Admitted" });
 //#endregion
 //#region src/session/input/input.ts
@@ -5006,7 +5093,8 @@ const fromRow = (row) => Admitted.make({
 	prompt: row.prompt,
 	delivery: row.delivery,
 	timeCreated: row.createdAt,
-	...Option.isNone(row.promotedSeq) ? {} : { promotedSeq: row.promotedSeq.value }
+	...Option.isNone(row.promotedSeq) ? {} : { promotedSeq: row.promotedSeq.value },
+	...Option.isNone(row.cancelledSeq) ? {} : { cancelledSeq: row.cancelledSeq.value }
 });
 /**
 * Whether a stored input carries the prompt the caller believes it admitted.
@@ -5030,6 +5118,38 @@ const make$8 = Effect.gen(function* () {
       INSERT INTO session_input ${sql.insert(row)}
       ON CONFLICT(id) DO NOTHING
       RETURNING id
+    `
+	});
+	const updateRow = SqlSchema.findAll({
+		Request: Schema.Struct({
+			id: Schema.String,
+			sessionId: Schema.String,
+			prompt: Schema.NullOr(Schema.fromJsonString(Prompt)),
+			delivery: Schema.NullOr(Delivery)
+		}),
+		Result: Schema.Struct({ id: Schema.String }),
+		execute: ({ id, sessionId, prompt, delivery }) => sql`
+      UPDATE session_input SET prompt = COALESCE(${prompt}, prompt), delivery = COALESCE(${delivery}, delivery)
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+      RETURNING id
+    `
+	});
+	const reviveRow = SqlSchema.findAll({
+		Request: Schema.Struct({
+			id: Schema.String,
+			sessionId: Schema.String,
+			prompt: Schema.fromJsonString(Prompt),
+			delivery: Delivery,
+			admittedSeq: Schema.Int,
+			createdAt: schema_exports$9.DateTimeUtcFromMillis
+		}),
+		Result: Schema.Struct({ id: Schema.String }),
+		execute: ({ id, sessionId, prompt, delivery, admittedSeq, createdAt }) => sql`
+      UPDATE session_input
+      SET prompt = ${prompt}, delivery = ${delivery}, admitted_seq = ${admittedSeq}, created_at = ${createdAt},
+        cancelled_seq = NULL
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NOT NULL
+      RETURNING id
     `
 	});
 	const promoteRow = SqlSchema.findAll({
@@ -5041,8 +5161,21 @@ const make$8 = Effect.gen(function* () {
 		Result: SessionInputRow,
 		execute: ({ id, sessionId, promotedSeq }) => sql`
       UPDATE session_input SET promoted_seq = ${promotedSeq}
-      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
       RETURNING *
+    `
+	});
+	const cancelRow = SqlSchema.findAll({
+		Request: Schema.Struct({
+			id: Schema.String,
+			sessionId: Schema.String,
+			cancelledSeq: Schema.Int
+		}),
+		Result: Schema.Struct({ id: Schema.String }),
+		execute: ({ id, sessionId, cancelledSeq }) => sql`
+      UPDATE session_input SET cancelled_seq = ${cancelledSeq}
+      WHERE id = ${id} AND session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+      RETURNING id
     `
 	});
 	const selectEntry = SqlSchema.findAll({
@@ -5058,8 +5191,17 @@ const make$8 = Effect.gen(function* () {
 		Result: Schema.Struct({ id: Schema.String }),
 		execute: ({ sessionId, delivery }) => sql`
       SELECT id FROM session_input
-      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND delivery = ${delivery}
+      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL AND delivery = ${delivery}
       LIMIT 1
+    `
+	});
+	const selectPending = SqlSchema.findAll({
+		Request: Schema.String,
+		Result: SessionInputRow,
+		execute: (sessionId) => sql`
+      SELECT * FROM session_input
+      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL
+      ORDER BY admitted_seq
     `
 	});
 	const selectPendingSteers = SqlSchema.findAll({
@@ -5072,6 +5214,7 @@ const make$8 = Effect.gen(function* () {
       SELECT * FROM session_input
       WHERE session_id = ${sessionId}
         AND promoted_seq IS NULL
+        AND cancelled_seq IS NULL
         AND delivery = 'steer'
         AND admitted_seq <= ${cutoff}
       ORDER BY admitted_seq
@@ -5082,7 +5225,7 @@ const make$8 = Effect.gen(function* () {
 		Result: SessionInputRow,
 		execute: (sessionId) => sql`
       SELECT * FROM session_input
-      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND delivery = 'followUp'
+      WHERE session_id = ${sessionId} AND promoted_seq IS NULL AND cancelled_seq IS NULL AND delivery = 'followUp'
       ORDER BY admitted_seq
       LIMIT 1
     `
@@ -5092,7 +5235,7 @@ const make$8 = Effect.gen(function* () {
 	}, Effect.orDie);
 	const admit = Effect.fn("SessionInput.admit")(function* (input) {
 		const existing = yield* find(input.id);
-		if (Option.isSome(existing)) return existing.value;
+		if (Option.isSome(existing) && existing.value.cancelledSeq === void 0) return existing.value;
 		const timestamp = yield* DateTime.now;
 		return yield* events.publish(PromptAdmitted, {
 			messageId: input.id,
@@ -5107,10 +5250,7 @@ const make$8 = Effect.gen(function* () {
 			prompt: input.prompt,
 			delivery: input.delivery,
 			timeCreated: timestamp
-		}))), Effect.catchDefect((defect) => find(input.id).pipe(Effect.flatMap(Option.match({
-			onNone: () => Effect.die(defect),
-			onSome: (stored) => Effect.succeed(stored)
-		})))));
+		}))), Effect.catchDefect((defect) => find(input.id).pipe(Effect.flatMap((stored) => Option.isSome(stored) && stored.value.cancelledSeq === void 0 ? Effect.succeed(stored.value) : Effect.die(defect)))));
 	});
 	const projectAdmitted = Effect.fn("SessionInput.projectAdmitted")(function* (input) {
 		if ((yield* selectEntry(input.id)).length > 0) return yield* Effect.die(new LifecycleConflict({ id: input.id }));
@@ -5121,7 +5261,16 @@ const make$8 = Effect.gen(function* () {
 			delivery: input.delivery,
 			admittedSeq: input.admittedSeq,
 			promotedSeq: Option.none(),
+			cancelledSeq: Option.none(),
 			createdAt: VariantSchema.Override(input.timeCreated)
+		})).length > 0) return;
+		if ((yield* reviveRow({
+			id: input.id,
+			sessionId: input.sessionId,
+			prompt: input.prompt,
+			delivery: input.delivery,
+			admittedSeq: input.admittedSeq,
+			createdAt: input.timeCreated
 		})).length === 0) return yield* Effect.die(new LifecycleConflict({ id: input.id }));
 	}, Effect.orDie);
 	const projectPrompted = Effect.fn("SessionInput.projectPrompted")(function* (input) {
@@ -5136,7 +5285,7 @@ const make$8 = Effect.gen(function* () {
 		}
 		const stored = yield* find(input.id);
 		if (Option.isSome(stored)) {
-			if (!matchesProjection(stored.value, input) || stored.value.promotedSeq !== input.promotedSeq) return yield* Effect.die(new LifecycleConflict({ id: input.id }));
+			if (!matchesProjection(stored.value, input) || stored.value.promotedSeq !== input.promotedSeq || stored.value.cancelledSeq !== void 0) return yield* Effect.die(new LifecycleConflict({ id: input.id }));
 			return;
 		}
 		yield* insertRow({
@@ -5146,9 +5295,50 @@ const make$8 = Effect.gen(function* () {
 			delivery: input.delivery,
 			admittedSeq: input.promotedSeq,
 			promotedSeq: Option.some(input.promotedSeq),
+			cancelledSeq: Option.none(),
 			createdAt: VariantSchema.Override(input.timeCreated)
 		});
 	}, Effect.orDie);
+	const projectCancelled = Effect.fn("SessionInput.projectCancelled")(function* (input) {
+		if ((yield* cancelRow(input)).length > 0) return;
+		const stored = yield* find(input.id);
+		if (Option.isSome(stored) && stored.value.cancelledSeq === input.cancelledSeq) return;
+		return yield* Effect.die(new LifecycleConflict({ id: input.id }));
+	}, Effect.orDie);
+	const projectUpdated = Effect.fn("SessionInput.projectUpdated")(function* (input) {
+		if ((yield* updateRow({
+			id: input.id,
+			sessionId: input.sessionId,
+			prompt: input.prompt ?? null,
+			delivery: input.delivery ?? null
+		})).length > 0) return;
+		return yield* Effect.die(new LifecycleConflict({ id: input.id }));
+	}, Effect.orDie);
+	const update = Effect.fn("SessionInput.update")(function* (sessionId, id, patch) {
+		const stored = yield* find(id);
+		if (Option.isNone(stored) || stored.value.sessionId !== sessionId || stored.value.promotedSeq !== void 0 || stored.value.cancelledSeq !== void 0) return Option.none();
+		const prompt = patch.prompt === void 0 || Prompt.equivalence(patch.prompt, stored.value.prompt) ? void 0 : patch.prompt;
+		const delivery = patch.delivery === void 0 || patch.delivery === stored.value.delivery ? void 0 : patch.delivery;
+		if (prompt === void 0 && delivery === void 0) return stored;
+		const timestamp = yield* DateTime.now;
+		return yield* events.publish(PromptUpdated, {
+			sessionId,
+			messageId: id,
+			timestamp,
+			...prompt === void 0 ? {} : { prompt },
+			...delivery === void 0 ? {} : { delivery }
+		}).pipe(Effect.andThen(find(id)), Effect.catchDefect((defect) => isLifecycleConflict(defect) ? Effect.succeed(Option.none()) : Effect.die(defect)));
+	});
+	const cancel = Effect.fn("SessionInput.cancel")(function* (sessionId, id) {
+		const stored = yield* find(id);
+		if (Option.isNone(stored) || stored.value.sessionId !== sessionId || stored.value.promotedSeq !== void 0 || stored.value.cancelledSeq !== void 0) return false;
+		const timestamp = yield* DateTime.now;
+		return yield* events.publish(PromptCancelled, {
+			sessionId,
+			messageId: id,
+			timestamp
+		}).pipe(Effect.as(true), Effect.catchDefect((defect) => isLifecycleConflict(defect) ? Effect.succeed(false) : Effect.die(defect)));
+	});
 	const publishPrompted = Effect.fn("SessionInput.publishPrompted")(function* (sessionId, rows) {
 		let promoted = 0;
 		for (const row of rows) {
@@ -5159,7 +5349,7 @@ const make$8 = Effect.gen(function* () {
 				messageId: id,
 				prompt: row.prompt,
 				delivery: row.delivery
-			}).pipe(Effect.as(true), Effect.catchDefect((defect) => isLifecycleConflict(defect) ? find(id).pipe(Effect.flatMap((stored) => Option.isSome(stored) && stored.value.promotedSeq !== void 0 ? Effect.succeed(false) : Effect.die(defect))) : Effect.die(defect)))) promoted += 1;
+			}).pipe(Effect.as(true), Effect.catchDefect((defect) => isLifecycleConflict(defect) ? find(id).pipe(Effect.flatMap((stored) => Option.isSome(stored) && (stored.value.promotedSeq !== void 0 || stored.value.cancelledSeq !== void 0 || stored.value.admittedSeq !== row.admittedSeq || stored.value.delivery !== row.delivery || !Prompt.equivalence(stored.value.prompt, row.prompt)) ? Effect.succeed(false) : Effect.die(defect))) : Effect.die(defect)))) promoted += 1;
 		}
 		return promoted;
 	});
@@ -5168,6 +5358,13 @@ const make$8 = Effect.gen(function* () {
 		admit,
 		projectAdmitted,
 		projectPrompted,
+		projectCancelled,
+		projectUpdated,
+		update,
+		cancel,
+		pending: Effect.fn("SessionInput.pending")(function* (sessionId) {
+			return (yield* selectPending(sessionId)).map(fromRow);
+		}, Effect.orDie),
 		hasPending: Effect.fn("SessionInput.hasPending")(function* (sessionId, delivery) {
 			return (yield* selectPendingOne({
 				sessionId,
@@ -5193,6 +5390,7 @@ const make$8 = Effect.gen(function* () {
 var control_exports = /* @__PURE__ */ __exportAll({
 	Control: () => control_exports,
 	PromptConflictError: () => PromptConflictError,
+	RESTART_LIMIT: () => 5,
 	Service: () => Service$5,
 	layer: () => layer$10
 });
@@ -5211,6 +5409,7 @@ const layer$10 = Layer.effect(Service$5, Effect.gen(function* () {
 	const inputs = yield* make$8;
 	const execution = yield* Service$6;
 	const isLifecycleConflict = Schema.is(LifecycleConflict);
+	const wake = (sessionId) => sessions.markRunning(sessionId).pipe(Effect.andThen(execution.wake(sessionId)));
 	/**
 	* Uninterruptible end to end: a client that disconnects mid-call must not
 	* leave a prompt half-admitted. Everything durable happens inside `admit`,
@@ -5241,10 +5440,10 @@ const layer$10 = Layer.effect(Service$5, Effect.gen(function* () {
 		});
 		return admitted;
 	});
-	const prompt = Effect.fn("Control.prompt")((input) => Effect.uninterruptible(admit(input).pipe(Effect.tap((admitted) => execution.wake(admitted.sessionId)))));
+	const prompt = Effect.fn("Control.prompt")((input) => Effect.uninterruptible(admit(input).pipe(Effect.tap((admitted) => wake(admitted.sessionId)))));
 	const run = Effect.fn("Control.run")((input) => Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
 		const admitted = yield* admit(input);
-		yield* execution.wake(admitted.sessionId);
+		yield* wake(admitted.sessionId);
 		yield* restore(execution.awaitIdle(admitted.sessionId));
 		return admitted;
 	})));
@@ -5256,16 +5455,40 @@ const layer$10 = Layer.effect(Service$5, Effect.gen(function* () {
 	const resume = Effect.fn("Control.resume")(function* (sessionId) {
 		const session = yield* sessions.get(sessionId);
 		if (Option.isNone(session)) return yield* new SessionNotFoundError({ sessionId });
+		yield* sessions.markRunning(sessionId);
 		yield* execution.resume(sessionId);
 	});
 	const interrupt = Effect.fn("Control.interrupt")((sessionId, options) => Effect.uninterruptible(execution.interrupt(sessionId, options?.reason ?? "user", options)));
+	const update = Effect.fn("Control.update")((sessionId, id, patch) => Effect.uninterruptible(Effect.gen(function* () {
+		const updated = yield* inputs.update(sessionId, id, patch);
+		if (Option.isNone(updated)) return false;
+		if (patch.delivery === "steer") yield* wake(sessionId);
+		return true;
+	})));
+	const resumeUnfinished = Effect.gen(function* () {
+		const running = yield* execution.active;
+		const unfinished = (yield* sessions.unfinished).filter((row) => !running.has(row.id));
+		yield* Effect.forEach(unfinished, Effect.fnUntraced(function* (row) {
+			if ((yield* execution.active).has(row.id)) return;
+			const restarts = yield* sessions.claimRestart(row.id);
+			if (Option.isNone(restarts) || restarts.value >= 5) return;
+			yield* execution.recover(row.id).pipe(Effect.tapCause((cause) => Effect.logWarning("Resuming an unfinished session failed", cause).pipe(Effect.annotateLogs({ sessionId: row.id }))), Effect.ignore);
+		}), {
+			concurrency: "unbounded",
+			discard: true
+		});
+	}).pipe(Effect.withSpan("Control.resumeUnfinished"));
 	return Service$5.of({
 		prompt,
 		run,
 		wait,
 		resume,
 		interrupt,
-		active: execution.active
+		active: execution.active,
+		resumeUnfinished,
+		pending: inputs.pending,
+		cancel: inputs.cancel,
+		update
 	});
 }));
 //#endregion
@@ -7207,7 +7430,7 @@ const editDef = tool_exports.define({
 	})
 });
 const fail$4 = (message) => Effect.fail(new EditFailed({ message }));
-/** Filesystem failures name the backend's error code, as Pi's do. */
+/** Filesystem failures name the backend's error code. */
 const accessFailure = (path) => (error) => {
 	const code = error.cause?.code;
 	return fail$4(`Could not edit file: ${path}. Error code: ${typeof code === "string" ? code : "unknown"}.`);
@@ -9704,12 +9927,18 @@ const layer$6 = Layer.effect(Service$6, Effect.gen(function* () {
 	const runner = yield* Service$7;
 	const events = yield* Service$16;
 	const reportLifecycle = (sessionId, publish) => publish.pipe(Effect.tapCause((cause) => Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logError("Failed to publish session execution lifecycle", cause).pipe(Effect.annotateLogs({ sessionId }))), Effect.ignore);
+	const recovering = /* @__PURE__ */ new Set();
+	const stoppedAt = /* @__PURE__ */ new Map();
 	const coordinator = yield* make$7({
-		started: (sessionId) => reportLifecycle(sessionId, DateTime.now.pipe(Effect.andThen((timestamp) => events.publish(ExecutionStarted, {
+		started: (sessionId) => reportLifecycle(sessionId, (recovering.has(sessionId) ? Effect.void : store.markRunning(sessionId)).pipe(Effect.andThen(DateTime.now), Effect.andThen((timestamp) => events.publish(ExecutionStarted, {
 			sessionId,
 			timestamp
 		})))),
 		settled: (sessionId, exit, reason) => reportLifecycle(sessionId, Effect.gen(function* () {
+			const interrupted = Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause);
+			const stop = stoppedAt.get(sessionId);
+			stoppedAt.delete(sessionId);
+			yield* store.endExecution(sessionId, !interrupted ? "finished" : reason === "user" ? "stopped" : "closed", stop);
 			const timestamp = yield* DateTime.now;
 			if (Exit.isSuccess(exit)) return yield* events.publish(ExecutionSucceeded, {
 				sessionId,
@@ -9729,6 +9958,8 @@ const layer$6 = Layer.effect(Service$6, Effect.gen(function* () {
 		drain: Effect.fnUntraced(function* (sessionId, force) {
 			const session = yield* store.get(sessionId);
 			if (Option.isNone(session)) return yield* new SessionNotFoundError({ sessionId });
+			const recovered = recovering.delete(sessionId);
+			if (recovered && Option.isNone(session.value.execution)) return;
 			const space = yield* store.space(sessionId);
 			if (Option.isNone(space)) return yield* new SessionLinkedSpaceNotFoundError({ sessionId });
 			const instanceId = space.value.env;
@@ -9749,15 +9980,30 @@ const layer$6 = Layer.effect(Service$6, Effect.gen(function* () {
 				})));
 				return yield* runner.run({
 					sessionId,
-					force
+					force,
+					recovered
 				}).pipe(Effect.provideContext(Context.merge(locationContext, mountContext)));
 			}).pipe(Effect.scoped, Effect.tapCause((cause) => Cause.hasDies(cause) ? Effect.logError("defect", cause).pipe(Effect.annotateLogs({ sessionId })) : Effect.void));
 		})
 	});
+	const interrupt = (sessionId, reason, options) => Effect.gen(function* () {
+		const recorded = reason === "user" && !stoppedAt.has(sessionId);
+		if (recorded) stoppedAt.set(sessionId, yield* events.latestSequence(sessionId));
+		const accepted = yield* coordinator.interrupt(sessionId, reason, options);
+		if (recorded && !accepted) stoppedAt.delete(sessionId);
+		return accepted;
+	});
+	const recover = (sessionId) => Effect.suspend(() => {
+		recovering.add(sessionId);
+		return coordinator.run(sessionId);
+	}).pipe(Effect.ensuring(Effect.sync(() => {
+		recovering.delete(sessionId);
+	})));
 	return Service$6.of({
 		active: coordinator.active,
-		interrupt: coordinator.interrupt,
+		interrupt,
 		resume: coordinator.run,
+		recover,
 		wake: coordinator.wake,
 		awaitIdle: coordinator.awaitIdle
 	});
@@ -11283,12 +11529,13 @@ const layer$3 = (options = {}) => Layer.effect(Service$7, Effect.gen(function* (
 		}));
 		return interruptedCause;
 	});
-	const runTurnAttempt = Effect.fn("Loop.runTurnAttempt", { level: "Info" })(function* (promotion, snapshot) {
+	const runTurnAttempt = Effect.fn("Loop.runTurnAttempt", { level: "Info" })(function* (promotion, snapshot, continuing) {
 		const sessionId = snapshot.sessionId;
 		if (promotion !== void 0) {
 			const cutoff = yield* events.latestSequence(sessionId);
-			if (promotion === "followUp") yield* inputs.promoteFollowUp(sessionId);
-			yield* inputs.promoteSteers(sessionId, cutoff);
+			const followUp = promotion === "followUp" && (yield* inputs.promoteFollowUp(sessionId));
+			const steers = yield* inputs.promoteSteers(sessionId, cutoff);
+			if (!continuing && !followUp && steers === 0) return { needsContinuation: false };
 		}
 		const assembled = yield* context.assemble(sessionId);
 		const leaf = assembled.lastAssistant?.entryId === assembled.leafEntryId ? assembled.lastAssistant.message : void 0;
@@ -11387,8 +11634,9 @@ const layer$3 = (options = {}) => Layer.effect(Service$7, Effect.gen(function* (
 			});
 		}));
 	});
-	const runTurn = Effect.fn("Loop.runTurn", { level: "Info" })(function* (promotion, snapshot) {
-		return yield* runTurnAttempt(promotion, snapshot);
+	/** `continuing`: earlier work (tool results, a forced resume) needs a reply even when nothing is promoted. */
+	const runTurn = Effect.fn("Loop.runTurn", { level: "Info" })(function* (promotion, snapshot, continuing) {
+		return yield* runTurnAttempt(promotion, snapshot, continuing);
 	});
 	const run = Effect.fn("Loop.run", { level: "Info" })(function* (input) {
 		yield* healDanglingDraft(input.sessionId);
@@ -11400,17 +11648,24 @@ const layer$3 = (options = {}) => Layer.effect(Service$7, Effect.gen(function* (
 			"gen_ai.agent.name": "codework",
 			"gen_ai.conversation.id": input.sessionId
 		});
-		let promotion = hasSteer ? "steer" : hasFollowUp ? "followUp" : void 0;
+		const cutOff = input.recovered === true && !hasSteer && hasFollowUp && (yield* context.assemble(input.sessionId).pipe(Effect.map((assembled) => {
+			const leaf = assembled.lastAssistant?.entryId === assembled.leafEntryId ? assembled.lastAssistant.message : void 0;
+			return assembled.messages.length > 0 && leaf?.stopReason !== "stop" && leaf?.stopReason !== "length";
+		})));
+		let promotion = hasSteer ? "steer" : hasFollowUp && !cutOff ? "followUp" : void 0;
 		const drain = Effect.gen(function* () {
 			let shouldRun = true;
+			let continuing = input.force;
 			while (shouldRun) {
 				const snapshot = yield* state.snapshot(input.sessionId);
 				let needsContinuation = true;
 				while (needsContinuation) {
-					const result = yield* runTurn(promotion, snapshot);
+					const result = yield* runTurn(promotion, snapshot, continuing);
 					promotion = "steer";
+					continuing = result.needsContinuation;
 					needsContinuation = result.needsContinuation || (yield* inputs.hasPending(input.sessionId, "steer"));
 				}
+				continuing = false;
 				shouldRun = yield* inputs.hasPending(input.sessionId, "followUp");
 				promotion = shouldRun ? "followUp" : void 0;
 			}
@@ -11532,6 +11787,20 @@ const layer$2 = Layer.effectDiscard(Effect.gen(function* () {
 			timeCreated: event.data.timestamp
 		});
 	}));
+	yield* events.project(PromptCancelled, (event) => Effect.gen(function* () {
+		if (event.durable === void 0) return yield* Effect.die("PromptCancelled is missing its aggregate sequence");
+		yield* input.projectCancelled({
+			cancelledSeq: event.durable.seq,
+			id: event.data.messageId,
+			sessionId: event.data.sessionId
+		});
+	}));
+	yield* events.project(PromptUpdated, (event) => input.projectUpdated({
+		id: event.data.messageId,
+		sessionId: event.data.sessionId,
+		...event.data.prompt === void 0 ? {} : { prompt: event.data.prompt },
+		...event.data.delivery === void 0 ? {} : { delivery: event.data.delivery }
+	}));
 	yield* events.project(Prompted, (event) => Effect.gen(function* () {
 		if (event.durable === void 0) return yield* Effect.die("Prompted is missing its aggregate sequence");
 		yield* input.projectPrompted({
@@ -11617,7 +11886,7 @@ const layer$2 = Layer.effectDiscard(Effect.gen(function* () {
 		id: event.data.messageId,
 		sessionId: event.data.sessionId,
 		state: "committed"
-	}));
+	}).pipe(Effect.andThen(sessions.resetRestarts(event.data.sessionId))));
 }));
 //#endregion
 //#region src/session/live.ts
@@ -11896,6 +12165,7 @@ const makeHandle = Effect.fn("Session.makeHandle")(function* (id) {
 		const config = Option.getOrUndefined(row.config);
 		const model = config?.model;
 		const thinkingLevel = config?.thinkingLevel;
+		const parked = Option.isSome(row.execution) && row.restarts >= 5 && !(yield* control.active).has(id);
 		return {
 			id,
 			title: row.title,
@@ -11909,7 +12179,8 @@ const makeHandle = Effect.fn("Session.makeHandle")(function* (id) {
 			} },
 			updatedAt: DateTime.toEpochMillis(row.updatedAt),
 			...model === void 0 ? {} : { model },
-			...thinkingLevel === void 0 ? {} : { thinkingLevel }
+			...thinkingLevel === void 0 ? {} : { thinkingLevel },
+			parked
 		};
 	}).pipe(Effect.withSpan("Session.info"));
 	return {