@codeworksh/harness 0.3.0 → 0.4.0-canary.52.1.ge7df22a4

package/effect.mjs

@@ -1,7 +1,7 @@
 import { n as __reExport, t as __exportAll } from "./rolldown-runtime-B4FMCO8f.mjs";
 import { a as io_exports, i as errors_exports, n as shell_exports, o as instance_exports, r as filesystem_exports, s as posix } from "./resource-DFZh0e-s.mjs";
 import { a as decode, c as importModule, d as share, l as lendResolve, n as dimensionNote, o as load$5, r as resize, s as load$4, u as resolveModule } from "./resize-D34zcVQl.mjs";
-import "./daytona-D4sNwzSr.mjs";
+import "./daytona-BqRoRhe7.mjs";
 import "./vercel-3GouQSJI.mjs";
 import { createRequire } from "node:module";
 import { Cause, Clock, Config, Context, Crypto, Data, DateTime, Deferred, Duration, Effect, Exit, Fiber, FiberSet, FileSystem, Layer, LayerMap, Metric, Option, Path, Predicate, PubSub, Queue, Random, Ref, Result, Schedule, Schema, SchemaIssue, Scope, Semaphore, Stream, String as String$1 } from "effect";
@@ -21,11 +21,13 @@ import { ChildProcess, ChildProcessSpawner } from "effect/process";
 import { Buffer as Buffer$1 } from "node:buffer";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { DirectoryNotFoundError, DirectoryNotFoundError as DirectoryNotFoundError$1, Info, Info as Info$1, NotDirectoryError, NotDirectoryError as NotDirectoryError$1, Service, Service as Service$8 } from "@codeworksh/plugin/location";
-import { generateModels } from "@codeworksh/aikit/modelgen";
+import { downloadCatalog } from "@codeworksh/aikit/modelgen";
 import { JsonGitHubCopilotAuthStorage, getGitHubCopilotApiKey } from "@codeworksh/aikit/oauth/github/copilot";
 import { JsonOpenAICodexAuthStorage, getOpenAICodexApiKey } from "@codeworksh/aikit/oauth/openai/codex";
 import { parse, printParseErrorCode } from "jsonc-parser";
 import * as Section from "@codeworksh/plugin/plugin/section";
+import ignore from "ignore";
+import { parse as parse$1 } from "yaml";
 import * as Diff from "diff";
 import { FetchHttpClient, HttpClient } from "effect/http";
 import npa from "npm-package-arg";
@@ -42,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,
@@ -86,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({
@@ -134,10 +143,10 @@ var global_exports = /* @__PURE__ */ __exportAll({
 	app: () => app,
 	appConfigDir: () => appConfigDir,
 	authFile: () => authFile,
-	defaultLayer: () => defaultLayer$2,
+	defaultLayer: () => defaultLayer$4,
 	homeConfig: () => homeConfig,
 	layer: () => layer$27,
-	layerWith: () => layerWith,
+	layerWith: () => layerWith$1,
 	make: () => make$18,
 	resolve: () => resolve$4
 });
@@ -184,8 +193,8 @@ const build = (input) => Effect.gen(function* () {
 	return Service$17.of(paths);
 });
 const layer$27 = Layer.effect(Service$17, build({}));
-const defaultLayer$2 = layer$27;
-const layerWith = (input) => Layer.effect(Service$17, build(input));
+const defaultLayer$4 = layer$27;
+const layerWith$1 = (input) => Layer.effect(Service$17, build(input));
 //#endregion
 //#region src/db/migrations.ts
 const migrations = {
@@ -366,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
@@ -374,7 +391,7 @@ var db_exports = /* @__PURE__ */ __exportAll({
 	Database: () => db_exports,
 	SqlClient: () => SqlClient$1,
 	SqlSchema: () => SqlSchema$1,
-	defaultLayer: () => defaultLayer$1,
+	defaultLayer: () => defaultLayer$3,
 	layer: () => layer$26,
 	locationConfig: () => locationConfig,
 	path: () => path$1,
@@ -408,7 +425,7 @@ const path$1 = Effect.fn("Database.path")(function* (data) {
 	const directory = data ?? (yield* resolve$4()).data;
 	return resolveDatabaseLocation(yield* locationConfig, directory);
 });
-const defaultLayer$1 = Layer.unwrap(path$1().pipe(Effect.map(layer$26)));
+const defaultLayer$3 = Layer.unwrap(path$1().pipe(Effect.map(layer$26)));
 //#endregion
 //#region src/event/schema.ts
 var schema_exports$7 = /* @__PURE__ */ __exportAll({});
@@ -589,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")({
@@ -598,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")({
@@ -729,6 +749,8 @@ var list_exports = /* @__PURE__ */ __exportAll({
 	LLMThinkingStart: () => LLMThinkingStart,
 	PluginUpdated: () => PluginUpdated,
 	PromptAdmitted: () => PromptAdmitted,
+	PromptCancelled: () => PromptCancelled,
+	PromptUpdated: () => PromptUpdated,
 	Prompted: () => Prompted,
 	PublicDefinitions: () => PublicDefinitions,
 	RetryFinished: () => RetryFinished,
@@ -766,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,
@@ -1000,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"))
@@ -1579,7 +1624,7 @@ var session_exports$1 = /* @__PURE__ */ __exportAll({
 	SessionNotLinkedError: () => SessionNotLinkedError,
 	SessionRow: () => SessionRow,
 	ToolCallNotFoundError: () => ToolCallNotFoundError,
-	defaultLayer: () => defaultLayer,
+	defaultLayer: () => defaultLayer$2,
 	entryStates: () => entryStates,
 	entryTypes: () => entryTypes,
 	layer: () => layer$23,
@@ -1663,6 +1708,16 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 				SELECT p.* FROM space p JOIN session s ON s.space_id = p.id WHERE s.id = ${sessionId}
 			`
 	});
+	const findProject = SqlSchema.findOneOption({
+		Request: Schema.String,
+		Result: ProjectRow,
+		execute: (sessionId) => sql`
+				SELECT p.* FROM project p
+				JOIN space sp ON sp.project_id = p.id
+				JOIN session s ON s.space_id = sp.id
+				WHERE s.id = ${sessionId}
+			`
+	});
 	const findSpaceById = SqlSchema.findOneOption({
 		Request: Schema.String,
 		Result: SpaceRow,
@@ -1795,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),
@@ -1811,6 +1867,13 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 	const space = Effect.fn("Session.space")(function* (sessionId) {
 		return Option.map(yield* findSpace(sessionId).pipe(Effect.orDie), fromRow$1);
 	});
+	const project = Effect.fn("Session.project")(function* (sessionId) {
+		return Option.map(yield* findProject(sessionId).pipe(Effect.orDie), (row) => new schema_exports$6.ProjectSchema.Info({
+			id: schema_exports$6.ProjectSchema.ID.make(row.id),
+			name: row.name,
+			status: row.status
+		}));
+	});
 	const list = Effect.fn("Session.list")(function* (input) {
 		return yield* (input === void 0 ? selectAll() : "spaceId" in input ? selectBySpace(input.spaceId) : selectByProject(input.projectId)).pipe(Effect.orDie);
 	});
@@ -2141,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,
@@ -2250,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,
@@ -2311,8 +2410,14 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 		link,
 		retitle,
 		configure,
+		markRunning,
+		endExecution,
+		claimRestart,
+		resetRestarts,
+		unfinished,
 		get,
 		space,
+		project,
 		list,
 		entry,
 		path,
@@ -2329,7 +2434,7 @@ const layer$23 = Layer.effect(Service$14, Effect.gen(function* () {
 		setLabel
 	});
 }));
-const defaultLayer = layer$23.pipe(Layer.provide(defaultLayer$1));
+const defaultLayer$2 = layer$23.pipe(Layer.provide(defaultLayer$3));
 //#endregion
 //#region src/context/errors.ts
 var ContextDecodeError = class extends Schema.TaggedError()("ContextDecodeError", {
@@ -4274,6 +4379,17 @@ const make$9 = () => {
 	}) };
 };
 //#endregion
+//#region src/sandbox/sandbox.ts
+/**
+* Assemble a local backend into a sandbox with a **real host shell** — the
+* right choice whenever commands must invoke actual binaries (`git`, package
+* managers). For a sandbox whose shell should stay inside the VFS, use
+* `EnvBash.services` instead, which wires just-bash over the same tree.
+*/
+const services = (backend, identity) => Layer.provideMerge(io_exports.SandboxIO.mount(identity), Layer.provideMerge(Layer.merge(layer$21, layer$18()), backend));
+/** Default sandbox: the real OS filesystem and processes, mounted at `cwd`. */
+const defaultLayer$1 = (cwd) => services(layer$20(), io_exports.SandboxIO.host(cwd));
+//#endregion
 //#region src/git/git.ts
 var AppProcessError = class extends Schema.TaggedError()("AppProcessError", {
 	command: Schema.String,
@@ -4464,7 +4580,8 @@ const up = Effect.fn("SandboxFileSystem.up")(function* (fs, options) {
 const isDirectory$1 = Effect.fn("SandboxFileSystem.isDirectory")(function* (fs, path) {
 	return yield* fs.stat(path).pipe(Effect.map((stat) => stat.isDirectory), Effect.orElseSucceed(() => false));
 });
-Effect.fn("SandboxFileSystem.isFile")(function* (fs, path) {
+/** True when `path` exists and is a regular file; false when it is absent or unreadable. */
+const isFile = Effect.fn("SandboxFileSystem.isFile")(function* (fs, path) {
 	return yield* fs.stat(path).pipe(Effect.map((stat) => stat.isFile), Effect.orElseSucceed(() => false));
 });
 /** Read a file, or `undefined` when it is missing or unreadable. */
@@ -4611,6 +4728,16 @@ const layer$13 = Layer.effect(Service$10, Effect.gen(function* () {
 }));
 //#endregion
 //#region src/project/project.ts
+var project_exports = /* @__PURE__ */ __exportAll({
+	Project: () => project_exports,
+	ProjectNotFoundError: () => ProjectNotFoundError,
+	Service: () => Service$9,
+	defaultLayer: () => defaultLayer,
+	layer: () => layer$12,
+	layerWith: () => layerWith,
+	provisional: () => provisional,
+	rename: () => rename
+});
 /** Deterministic, env-local id for a directory without a portable identity. Never written to a marker. */
 const provisional = (env, location) => schema_exports$6.ProjectSchema.ID.make(fast(JSON.stringify([
 	"dir",
@@ -4664,7 +4791,7 @@ const layer$12 = Layer.effect(Service$9, Effect.gen(function* () {
 			main: repo.gitDir === repo.store
 		}]).toSorted((a, b) => Number(b.main) - Number(a.main));
 	});
-	const resolveOrCreate = Effect.fn("Project.resolveOrCreate")(function* (cwd) {
+	const resolveOrCreate = Effect.fn("Project.resolveOrCreate")(function* (cwd, options) {
 		if (!(yield* fs.exists(cwd).pipe(Effect.orDie))) return yield* new DirectoryNotFoundError$1({
 			directory: cwd,
 			sandboxInstanceId: env
@@ -4678,7 +4805,7 @@ const layer$12 = Layer.effect(Service$9, Effect.gen(function* () {
 		const ident = repo === void 0 ? void 0 : yield* repos.identity(repo);
 		const worktree = repo?.directory ?? location;
 		const projectId = ident?.id === void 0 ? provisional(env, worktree) : schema_exports$6.ProjectSchema.ID.make(ident.id);
-		const name = ident?.name ?? posix.basename(worktree);
+		const name = options?.name ?? ident?.name ?? posix.basename(worktree);
 		const vcs = repo === void 0 ? void 0 : {
 			type: "git",
 			store: repo.store
@@ -4750,6 +4877,32 @@ const layer$12 = Layer.effect(Service$9, Effect.gen(function* () {
 		list
 	});
 }));
+var ProjectNotFoundError = class extends Schema.TaggedError()("ProjectNotFoundError", { projectId: Schema.String }) {};
+/** Renames a project. Needs only the database, not a mount: a name is the same in every env. */
+const rename = Effect.fn("Project.rename")(function* (input) {
+	const sql = yield* SqlClient.SqlClient;
+	const now = yield* Effect.clockWith((clock) => clock.currentTimeMillis);
+	const row = yield* SqlSchema.findOneOption({
+		Request: Schema.Struct({
+			id: Schema.String,
+			name: Schema.String
+		}),
+		Result: ProjectRow,
+		execute: ({ id, name }) => sql`UPDATE project SET name = ${name}, updated_at = ${now} WHERE id = ${id} RETURNING *`
+	})({
+		id: input.projectId,
+		name: input.name
+	}).pipe(Effect.orDie);
+	if (Option.isNone(row)) return yield* new ProjectNotFoundError({ projectId: input.projectId });
+	return new schema_exports$6.ProjectSchema.Info({
+		id: schema_exports$6.ProjectSchema.ID.make(row.value.id),
+		name: row.value.name,
+		status: row.value.status
+	});
+});
+/** Takes an assembled sandbox — local or remote — not a local backend. */
+const layerWith = (sandbox) => layer$12.pipe(Layer.provide(Layer.mergeAll(layer$14, layer$13, layer$24)), Layer.provide(layer$15), Layer.provide(sandbox), Layer.provide(defaultLayer$3));
+const defaultLayer = (path) => layerWith(defaultLayer$1(path));
 //#endregion
 //#region src/location/location.ts
 var location_exports = /* @__PURE__ */ __exportAll({
@@ -4761,10 +4914,10 @@ var location_exports = /* @__PURE__ */ __exportAll({
 	layer: () => layer$11,
 	layerMounted: () => layerMounted
 });
-const layer$11 = () => Layer.effect(Service, Effect.gen(function* () {
+const layer$11 = (options) => Layer.effect(Service, Effect.gen(function* () {
 	const instance = yield* io_exports.SandboxIO.Current;
 	const directory = schema_exports$9.AbsolutePath.make(instance.cwd);
-	const resolved = yield* (yield* Service$9).resolveOrCreate(directory);
+	const resolved = yield* (yield* Service$9).resolveOrCreate(directory, options);
 	return Service.of(new Info({
 		directory: resolved.directory,
 		space: resolved.space,
@@ -4776,7 +4929,7 @@ const layer$11 = () => Layer.effect(Service, Effect.gen(function* () {
 * folded in. What remains is exactly the mount and the database — for callers
 * that already hold both, such as the runner and `Session.create`.
 */
-const layerMounted = () => layer$11().pipe(Layer.provide(layer$12.pipe(Layer.provide(Layer.mergeAll(layer$14, layer$13, layer$24)), Layer.provide(layer$15))));
+const layerMounted = (options) => layer$11(options).pipe(Layer.provide(layer$12.pipe(Layer.provide(Layer.mergeAll(layer$14, layer$13, layer$24)), Layer.provide(layer$15))));
 //#endregion
 //#region src/runner/run.ts
 var run_exports = /* @__PURE__ */ __exportAll({
@@ -4871,7 +5024,6 @@ var ProviderError = class extends Schema.TaggedError()("Runner.ProviderError", {
 var ModelCatalogError = class extends Schema.TaggedError()("Runner.ModelCatalogError", {
 	path: Schema.String,
 	reason: Schema.Literals([
-		"missing",
 		"unreadable",
 		"empty",
 		"invalid"
@@ -4905,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
@@ -4918,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
@@ -4939,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.
@@ -4963,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({
@@ -4974,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({
@@ -4991,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({
@@ -5005,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
@@ -5015,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
     `
@@ -5025,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,
@@ -5040,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 }));
@@ -5054,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) {
@@ -5069,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({
@@ -5079,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) {
@@ -5092,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;
 	});
@@ -5101,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,
@@ -5126,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
 });
@@ -5144,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`,
@@ -5174,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;
 	})));
@@ -5189,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
@@ -5312,7 +5602,7 @@ var settings_exports = /* @__PURE__ */ __exportAll({
 	layer: () => layer$8,
 	load: () => load$3,
 	modules: () => modules,
-	parse: () => parse$4,
+	parse: () => parse$5,
 	paths: () => paths,
 	projectRoot: () => projectRoot,
 	userConfigDir: () => userConfigDir
@@ -5401,7 +5691,7 @@ const decodeFormatter = SchemaIssue.makeFormatterStandardSchemaV1({ leafHook: (i
 	const message = "annotations" in issue ? issue.annotations?.message : void 0;
 	return typeof message === "string" ? message.replaceAll(/\s*\n\s*/g, " ") : "invalid value";
 } });
-const parse$4 = Effect.fn("Settings.parse")(function* (path, source) {
+const parse$5 = Effect.fn("Settings.parse")(function* (path, source) {
 	const errors = [];
 	const json = parse(source, errors, {
 		allowTrailingComma: true,
@@ -5449,7 +5739,7 @@ const attempt = (path) => fileSystem.readFileString(path).pipe(Effect.mapError((
 	path,
 	reason: "read",
 	detail: error.reason._tag
-})), Effect.flatMap((source) => parse$4(path, source)));
+})), Effect.flatMap((source) => parse$5(path, source)));
 /**
 * One read of every layer. Exported for the harness constructor, which needs the plugin
 * selection before any layer is built; everything else goes through `Service`.
@@ -5563,8 +5853,13 @@ const stale = Effect.fn("ModelCatalog.stale")(function* (path) {
 	const ttl = yield* ttlConfig;
 	return (yield* Clock.currentTimeMillis) - mtime.value >= Duration.toMillis(ttl);
 });
+/** OpenRouter's catalog is narrowed to what the host's key may use, when one is set. */
+const openRouterKey = () => getEnvApiKey({ env: ["OPENROUTER_API_KEY"] });
 const download$1 = (path) => Effect.tryPromise({
-	try: () => generateModels({ path }),
+	try: () => downloadCatalog({
+		path,
+		openRouterKey: openRouterKey()
+	}),
 	catch: (cause) => new RefreshError({
 		path,
 		detail: cause instanceof Error ? cause.message : String(cause)
@@ -5585,8 +5880,7 @@ const refresh$1 = Effect.fn("ModelCatalog.refresh")(function* (home, options = {
 });
 /**
 * The automatic check: refresh a stale catalog unless it is pinned, and never fail. A failed
-* download leaves the old file in place; a missing one surfaces later as a
-* `Runner.ModelCatalogError` from whatever needed it.
+* download leaves the old file in place; without one, aikit's bundled baseline is read.
 */
 const check$1 = Effect.fn("ModelCatalog.check")(function* ({ path, pinned }) {
 	if (pinned || !(yield* stale(path))) return;
@@ -5622,7 +5916,7 @@ const loadError = (cause) => {
 	if (typeof cause !== "object" || cause === null || !("name" in cause) || cause.name !== "ModelCatalogLoadError") return;
 	if (!("data" in cause) || typeof cause.data !== "object" || cause.data === null) return void 0;
 	const data = cause.data;
-	if (!("path" in data) || typeof data.path !== "string" || !("message" in data) || typeof data.message !== "string" || !("reason" in data) || data.reason !== "missing" && data.reason !== "unreadable" && data.reason !== "empty" && data.reason !== "invalid") return;
+	if (!("path" in data) || typeof data.path !== "string" || !("message" in data) || typeof data.message !== "string" || !("reason" in data) || data.reason !== "unreadable" && data.reason !== "empty" && data.reason !== "invalid") return;
 	return new ModelCatalogError({
 		path: data.path,
 		reason: data.reason,
@@ -5755,6 +6049,22 @@ const defaultPromptPlugin = (0, plugin_exports$1.define)({
 	})
 });
 //#endregion
+//#region src/plugin/builtin/prompt/walk.ts
+const stripBom$1 = (raw) => raw.charCodeAt(0) === 65279 ? raw.slice(1) : raw;
+/** `directory` and every ancestor up to the sandbox root, closest first. */
+const ancestors = (directory) => {
+	const chain = [];
+	for (let current = directory;; current = posix.dirname(current)) {
+		chain.push(current);
+		if (posix.dirname(current) === current) return chain;
+	}
+};
+/**
+* Which of `paths` exist as the requested kind (`entry` takes either). Absence stays silent; any other failure
+* (permissions, a remote blip) is logged so a dropped entry is not a mystery, then counts as absent.
+*/
+const present$1 = (fs, paths, kind, label) => Effect.forEach(paths, (path) => fs.exists(path).pipe(Effect.filterOrElse((exists) => !exists || kind === "entry", () => fs.stat(path).pipe(Effect.map((stat) => kind === "file" ? stat.isFile : stat.isDirectory))), Effect.catch((error) => filesystem_exports.SandboxFileSystem.isNotFoundError(error.cause) ? Effect.succeed(false) : Effect.logWarning(`could not stat ${label} ${path}`, error.cause).pipe(Effect.as(false)))), { concurrency: "unbounded" }).pipe(Effect.map((hits) => new Set(paths.filter((_, index) => hits[index]))));
+//#endregion
 //#region src/plugin/builtin/prompt/instruction.ts
 /** First readable match per directory wins. */
 const names = [
@@ -5766,22 +6076,9 @@ const names = [
 	"CLAUDE.MD"
 ];
 const content = (raw) => {
-	const text = raw.charCodeAt(0) === 65279 ? raw.slice(1) : raw;
+	const text = stripBom$1(raw);
 	return text.trim().length === 0 ? void 0 : text;
 };
-/** `directory` and every ancestor up to the sandbox root, closest first. */
-const ancestors = (directory) => {
-	const chain = [];
-	for (let current = directory;; current = posix.dirname(current)) {
-		chain.push(current);
-		if (posix.dirname(current) === current) return chain;
-	}
-};
-/**
-* Which of `paths` are files. Absence is the expected answer and stays silent; any other failure
-* (permissions, a remote blip) is logged so a dropped file is not a mystery, then counts as absent.
-*/
-const present$1 = (fs, paths) => Effect.forEach(paths, (path) => fs.exists(path).pipe(Effect.flatMap((exists) => exists ? fs.stat(path).pipe(Effect.map((stat) => stat.isFile)) : Effect.succeed(false)), Effect.catch((error) => filesystem_exports.SandboxFileSystem.isNotFoundError(error.cause) ? Effect.succeed(false) : Effect.logWarning(`could not stat instruction file ${path}`, error.cause).pipe(Effect.as(false)))), { concurrency: "unbounded" }).pipe(Effect.map((hits) => new Set(paths.filter((_, index) => hits[index]))));
 /** A file that stats but does not read falls through to the next candidate. */
 const first = Effect.fnUntraced(function* (fs, directory, files) {
 	for (const name of names) {
@@ -5809,9 +6106,9 @@ const shadowing = (location) => {
 	return location.space.location.startsWith(`${main}/`) ? main : void 0;
 };
 /** One file per directory from the sandbox root down to the cwd, closest last so it has the final word. */
-const discover = Effect.fnUntraced(function* (fs, location) {
+const discover$1 = Effect.fnUntraced(function* (fs, location) {
 	const chain = ancestors(location.directory);
-	const files = yield* present$1(fs, chain.flatMap((directory) => names.map((name) => posix.join(directory, name))));
+	const files = yield* present$1(fs, chain.flatMap((directory) => names.map((name) => posix.join(directory, name))), "file", "instruction file");
 	const found = yield* Effect.forEach(chain, (directory) => first(fs, directory, files), { concurrency: "unbounded" });
 	const main = shadowing(location);
 	const worktree = main === void 0 ? void 0 : found[chain.indexOf(location.space.location)];
@@ -5827,7 +6124,7 @@ const instructionPlugin = (0, plugin_exports$1.define)({
 	kind: "prompt",
 	setup: Effect.fn("InstructionPlugin.setup")(function* (ctx) {
 		const fs = yield* io_exports.SandboxIO.FileSystem;
-		const files = (yield* discover(fs, ctx.location)).filter((file) => file.content !== void 0);
+		const files = (yield* discover$1(fs, ctx.location)).filter((file) => file.content !== void 0);
 		if (files.length === 0) return;
 		const prompt = ctx.plugin.prompt;
 		prompt.sections.append(Section.ProjectContext, "Project-Specific Instructions & Guidelines:");
@@ -5835,6 +6132,236 @@ const instructionPlugin = (0, plugin_exports$1.define)({
 	})
 });
 //#endregion
+//#region src/plugin/builtin/prompt/skill.ts
+/** Max name length per Agent Skills spec. */
+const MAX_NAME_LENGTH = 64;
+/** Max description length per Agent Skills spec. */
+const MAX_DESCRIPTION_LENGTH = 1024;
+const IGNORE_FILE_NAMES = [
+	".gitignore",
+	".ignore",
+	".fdignore"
+];
+const normalizeNewlines = (value) => value.replaceAll("\r\n", "\n").replaceAll("\r", "\n");
+const extractFrontmatter = (content) => {
+	const normalized = normalizeNewlines(stripBom$1(content));
+	if (!normalized.startsWith("---")) return void 0;
+	const endIndex = normalized.indexOf("\n---", 3);
+	if (endIndex === -1) return void 0;
+	return normalized.slice(4, endIndex);
+};
+const parseFrontmatter = (raw) => {
+	const yamlString = extractFrontmatter(raw);
+	if (yamlString === void 0) return { frontmatter: {} };
+	try {
+		const parsed = parse$1(yamlString);
+		return { frontmatter: typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : {} };
+	} catch (error) {
+		return {
+			frontmatter: {},
+			error
+		};
+	}
+};
+const validateName = (name) => {
+	const errors = [];
+	if (name.length > MAX_NAME_LENGTH) errors.push(`name exceeds ${MAX_NAME_LENGTH} characters (${name.length})`);
+	if (!/^[a-z0-9-]+$/.test(name)) errors.push("name contains invalid characters (must be lowercase a-z, 0-9, hyphens only)");
+	if (name.startsWith("-") || name.endsWith("-")) errors.push("name must not start or end with a hyphen");
+	if (name.includes("--")) errors.push("name must not contain consecutive hyphens");
+	return errors;
+};
+const validateDescription = (description) => {
+	const errors = [];
+	if (typeof description !== "string" || description.trim() === "") errors.push("description is required");
+	else if (description.length > MAX_DESCRIPTION_LENGTH) errors.push(`description exceeds ${MAX_DESCRIPTION_LENGTH} characters (${description.length})`);
+	return errors;
+};
+const prefixIgnorePattern = (line, prefix) => {
+	const trimmed = line.trim();
+	if (!trimmed) return void 0;
+	if (trimmed.startsWith("#") && !trimmed.startsWith("\\#")) return void 0;
+	let pattern = line;
+	let negated = false;
+	if (pattern.startsWith("!")) {
+		negated = true;
+		pattern = pattern.slice(1);
+	} else if (pattern.startsWith("\\!")) pattern = pattern.slice(1);
+	if (pattern.startsWith("/")) pattern = pattern.slice(1);
+	const prefixed = prefix ? `${prefix}${pattern}` : pattern;
+	return negated ? `!${prefixed}` : prefixed;
+};
+const addIgnoreRules = Effect.fnUntraced(function* (fs, ig, dir, root, entryNames) {
+	const relativeDir = posix.relative(root, dir);
+	const prefix = relativeDir && relativeDir !== "." ? `${relativeDir}/` : "";
+	const presentIgnoreFiles = IGNORE_FILE_NAMES.filter((name) => entryNames.has(name));
+	if (presentIgnoreFiles.length === 0) return;
+	const contents = yield* Effect.forEach(presentIgnoreFiles, (filename) => fs.readFile(posix.join(dir, filename)).pipe(Effect.option), { concurrency: "unbounded" });
+	for (const content of contents) {
+		if (Option.isNone(content)) continue;
+		const patterns = content.value.split(/\r?\n/).map((line) => prefixIgnorePattern(line, prefix)).filter((line) => line !== void 0);
+		if (patterns.length > 0) ig.add(patterns);
+	}
+});
+const loadSkillFromFile = Effect.fnUntraced(function* (fs, filePath) {
+	const isDeclaredSkill = posix.basename(filePath) === "SKILL.md";
+	const raw = yield* fs.readFile(filePath).pipe(Effect.tapError((error) => Effect.logWarning(`could not read skill file ${filePath}`, error.cause)), Effect.option);
+	if (Option.isNone(raw)) return void 0;
+	const { frontmatter, error } = parseFrontmatter(raw.value);
+	if (error !== void 0) {
+		if (isDeclaredSkill) yield* Effect.logWarning(`could not parse skill file ${filePath}`, error);
+		return;
+	}
+	const description = frontmatter.description;
+	const hasDescription = typeof description === "string" && description.trim() !== "";
+	if (!isDeclaredSkill && !hasDescription) return void 0;
+	const skillDir = posix.dirname(filePath);
+	const parentDirName = posix.basename(skillDir);
+	for (const error of validateDescription(description)) yield* Effect.logWarning(`skill ${filePath}: ${error}`);
+	const name = (typeof frontmatter.name === "string" ? frontmatter.name : void 0) || parentDirName;
+	for (const error of validateName(name)) yield* Effect.logWarning(`skill ${filePath}: ${error}`);
+	if (!hasDescription) return void 0;
+	return {
+		name,
+		description,
+		filePath,
+		baseDir: skillDir,
+		disableModelInvocation: frontmatter["disable-model-invocation"] === true
+	};
+});
+const scanDir = (fs, dir, mode, root, ig, visited) => Effect.gen(function* () {
+	const realDir = yield* realpath(fs, dir);
+	if (visited.has(realDir)) return [];
+	const nextVisited = /* @__PURE__ */ new Set([...visited, realDir]);
+	const listed = yield* fs.readdir(dir).pipe(Effect.tapError((error) => filesystem_exports.SandboxFileSystem.isNotFoundError(error.cause) ? Effect.void : Effect.logWarning(`could not read skill directory ${dir}`, error.cause)), Effect.option);
+	if (Option.isNone(listed)) return [];
+	const entries = [...listed.value].sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+	const entrySet = new Set(entries);
+	yield* addIgnoreRules(fs, ig, dir, root, entrySet);
+	if (entrySet.has("SKILL.md")) {
+		const fullPath = posix.join(dir, "SKILL.md");
+		const relPath = posix.relative(root, fullPath);
+		if ((yield* isFile(fs, fullPath)) && !ig.ignores(relPath)) {
+			const skill = yield* loadSkillFromFile(fs, fullPath);
+			return skill === void 0 ? [] : [skill];
+		}
+	}
+	const visible = entries.filter((name) => !name.startsWith(".") && name !== "node_modules");
+	const statted = yield* Effect.forEach(visible, (name) => {
+		const fullPath = posix.join(dir, name);
+		return fs.stat(fullPath).pipe(Effect.map((stat) => ({
+			name,
+			fullPath,
+			stat
+		})), Effect.option);
+	}, { concurrency: "unbounded" });
+	const skills = [];
+	for (const item of statted) {
+		if (Option.isNone(item)) continue;
+		const { name, fullPath, stat } = item.value;
+		const relPath = posix.relative(root, fullPath);
+		if (ig.ignores(stat.isDirectory ? `${relPath}/` : relPath)) continue;
+		if (stat.isDirectory) {
+			const nested = yield* scanDir(fs, fullPath, mode, root, ig, nextVisited);
+			skills.push(...nested);
+			continue;
+		}
+		if (stat.isFile && name.endsWith(".md") && (mode === "codework" && dir === root || mode === "agents" && dir !== root)) {
+			const skill = yield* loadSkillFromFile(fs, fullPath);
+			if (skill !== void 0) skills.push(skill);
+		}
+	}
+	return skills;
+});
+/**
+* Load skills from a single directory in the sandbox.
+*
+* Discovery rules:
+* - If a directory contains `SKILL.md`, treat it as a skill root and do not recurse further.
+* - In `"codework"` mode, direct `.md` children in the root are also loaded; in `"agents"` mode,
+*   `.md` files in subdirectories are loaded while root `.md` files are ignored.
+* - Recurse into subdirectories (skipping dotfiles, `node_modules`, and ignored paths).
+*/
+const loadSkillsFromDir = (fs, dir, mode) => scanDir(fs, dir, mode, dir, ignore(), /* @__PURE__ */ new Set());
+/**
+* Discover skills inside the sandbox: `.codework/skills` at the cwd, then
+* `.agents/skills` from the cwd up to the git root (the closest ancestor holding `.git`), or up to
+* the sandbox root outside a repository. Earlier skills win name collisions.
+*/
+const discover = Effect.fnUntraced(function* (fs, location) {
+	const chain = ancestors(location.directory);
+	const own = posix.join(location.directory, appConfigDir, "skills");
+	const agents = chain.map((directory) => posix.join(directory, ".agents", "skills"));
+	const [dirs, gits] = yield* Effect.all([present$1(fs, [own, ...agents], "directory", "skill directory"), present$1(fs, chain.map((directory) => posix.join(directory, ".git")), "entry", "git marker")], { concurrency: "unbounded" });
+	const root = chain.findIndex((directory) => gits.has(posix.join(directory, ".git")));
+	const walked = root === -1 ? agents : agents.slice(0, root + 1);
+	const sources = [{
+		dir: own,
+		mode: "codework"
+	}, ...walked.map((dir) => ({
+		dir,
+		mode: "agents"
+	}))].filter(({ dir }) => dirs.has(dir));
+	const found = yield* Effect.forEach(sources, ({ dir, mode }) => loadSkillsFromDir(fs, dir, mode), { concurrency: "unbounded" });
+	const skillMap = /* @__PURE__ */ new Map();
+	const realPathSet = /* @__PURE__ */ new Set();
+	for (const skill of found.flat()) {
+		const realPath = yield* realpath(fs, skill.filePath);
+		if (realPathSet.has(realPath)) continue;
+		const existing = skillMap.get(skill.name);
+		if (existing !== void 0) yield* Effect.logWarning(`skill ${skill.filePath}: name "${skill.name}" collision with ${existing.filePath}`);
+		else {
+			skillMap.set(skill.name, skill);
+			realPathSet.add(realPath);
+		}
+	}
+	return Array.from(skillMap.values());
+});
+const escapeXml = (str) => str.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;").replaceAll("'", "&apos;");
+/**
+* Format skills for inclusion in `Section.Skills` per the Agent Skills specification.
+* Skills with `disableModelInvocation: true` are excluded from the prompt.
+*/
+const formatSkillsForPrompt = (skills, fileReadTool = "read") => {
+	const visibleSkills = skills.filter((s) => !s.disableModelInvocation);
+	if (visibleSkills.length === 0) return "";
+	const lines = [
+		"The following skills provide specialized instructions for specific tasks.",
+		fileReadTool === "read" ? "Use the read tool to load a skill's file when the task matches its description." : fileReadTool === "bash" ? "Use bash to load a skill's file when the task matches its description." : "Load a skill's file when the task matches its description.",
+		"When a skill file references a relative path, resolve it against the skill directory (parent of SKILL.md / dirname of the path) and use that absolute path in tool commands.",
+		"",
+		"<available_skills>"
+	];
+	for (const skill of visibleSkills) {
+		lines.push("  <skill>");
+		lines.push(`    <name>${escapeXml(skill.name)}</name>`);
+		lines.push(`    <description>${escapeXml(skill.description)}</description>`);
+		lines.push(`    <location>${escapeXml(skill.filePath)}</location>`);
+		lines.push("  </skill>");
+	}
+	lines.push("</available_skills>");
+	return lines.join("\n");
+};
+const readers = ["read", "bash"];
+const skillPlugin = (0, plugin_exports$1.define)({
+	id: "codework.prompt.skill",
+	kind: "prompt",
+	setup: Effect.fn("SkillPlugin.setup")(function* (ctx) {
+		const tools = ctx.plugin.tools;
+		const visible = (name) => {
+			const tool = tools.get(name);
+			return tool !== void 0 && tool.promptSnippet !== void 0 && tool.promptSnippet.length > 0;
+		};
+		const fileReadTool = readers.find(visible) ?? (readers.some((name) => tools.has(name)) ? "indirect" : void 0);
+		if (fileReadTool === void 0) return;
+		const fs = yield* io_exports.SandboxIO.FileSystem;
+		const skills = yield* discover(fs, ctx.location);
+		const formatted = formatSkillsForPrompt(skills, fileReadTool);
+		if (formatted.length === 0) return;
+		ctx.plugin.prompt.sections.append(Section.Skills, formatted);
+	})
+});
+//#endregion
 //#region src/tool/truncate.ts
 /**
 * Shared truncation utilities for tool outputs.
@@ -6146,8 +6673,10 @@ const windowBytes = (limits) => limits.maxBytes * 2;
 */
 const script = (command, file, limits, pipeline, report) => [
 	`f=${(0, shell_exports.quote)(file)}`,
+	`c=${(0, shell_exports.quote)(command)}`,
+	"if command -v bash >/dev/null 2>&1; then s=bash; else s=sh; fi",
 	"run() (",
-	command,
+	"	if [ \"$s\" = bash ]; then bash -c \"$c\"; else eval \"$c\"; fi",
 	")",
 	`if mkdir -p ${(0, shell_exports.quote)(posix.dirname(file))} 2>/dev/null && (umask 077 2>/dev/null; set -C && : > "$f" && : > "$f.rc" && : > "$f.pid") 2>/dev/null; then`,
 	"	echo \"$$ $(ps -o pgid= -p $$ 2>/dev/null)\" > \"$f.pid\"",
@@ -6164,18 +6693,19 @@ const script = (command, file, limits, pipeline, report) => [
 	`printf '%s\\n' ${(0, shell_exports.quote)(unsaved(file))}`,
 	"run 2>&1"
 ].join("\n");
-const header = new RegExp(`^${HEADER} (\\d+) (\\d+) ([01])(?: (\\d+))?$`, "m");
-const parse$3 = (match) => ({
+const header = new RegExp(`^${HEADER} (\\d+) (\\d+) ([01]) (bash|sh)(?: (\\d+))?$`, "m");
+const parse$4 = (match) => ({
 	bytes: Number(match[1]),
 	newlines: Number(match[2]),
-	kept: match[3] === "1"
+	kept: match[3] === "1",
+	shell: match[4] === "sh" ? "sh" : "bash"
 });
 /**
 * For a backend that streams: all output still flows back as it is produced, and
 * a copy lands in the file. The report rides on stderr, the wrapper's own channel
 * since the command's is folded into stdout.
 */
-const streaming = (command, file, limits) => script(command, file, limits, (source) => `${source} | tee -a "$f"`, [`printf '${HEADER} %s %s %s\\n' "$b" "$n" "$keep" >&2`]);
+const streaming = (command, file, limits) => script(command, file, limits, (source) => `${source} | tee -a "$f"`, [`printf '${HEADER} %s %s %s %s\\n' "$b" "$n" "$keep" "$s" >&2`]);
 /** Read {@link streaming}'s stderr: the report, if it got that far, and anything else the wrapper said. */
 const report = (stderr) => {
 	const match = header.exec(stderr);
@@ -6184,7 +6714,7 @@ const report = (stderr) => {
 		rest: stderr
 	};
 	return {
-		report: parse$3(match),
+		report: parse$4(match),
 		rest: stderr.slice(0, match.index) + stderr.slice(match.index + match[0].length).replace(/^\n/, "")
 	};
 };
@@ -6197,7 +6727,7 @@ const buffered = (command, file, limits) => {
 	const tail = `tail -n ${limits.maxLines} "$f" | tail -c ${windowBytes(limits)}`;
 	return script(command, file, limits, (source) => `{ ${source} | cat; } >> "$f"`, [
 		`w=$(${tail} | wc -c | awk '{ print $1 }')`,
-		`printf '${HEADER} %s %s %s %s\\n' "$b" "$n" "$keep" "$w"`,
+		`printf '${HEADER} %s %s %s %s %s\\n' "$b" "$n" "$keep" "$s" "$w"`,
 		tail
 	]);
 };
@@ -6205,11 +6735,11 @@ const buffered = (command, file, limits) => {
 const window = (stdout) => {
 	const newline = stdout.indexOf("\n");
 	const match = header.exec(newline === -1 ? stdout : stdout.slice(0, newline));
-	if (match === null || match[4] === void 0) return void 0;
+	if (match === null || match[5] === void 0) return void 0;
 	return {
-		...parse$3(match),
+		...parse$4(match),
 		text: stdout.slice(newline + 1),
-		textBytes: Number(match[4])
+		textBytes: Number(match[5])
 	};
 };
 /**
@@ -6357,7 +6887,9 @@ const BashSuccess = Schema.Struct({
 /** Non-zero exit — expected, model-visible. Carries the same shape as success. */
 var BashFailed = class extends Schema.TaggedError()("BashFailed", {
 	...outputFields,
-	exitCode: Schema.Finite
+	exitCode: Schema.Finite,
+	/** The shell that ran the command, when the sandbox reported it. */
+	shell: Schema.optional(Schema.Literals(["bash", "sh"]))
 }) {};
 /** Deadline exceeded — expected, model-visible. Carries the partial output produced so far. */
 var BashTimedOut = class extends Schema.TaggedError()("BashTimedOut", {
@@ -6367,7 +6899,7 @@ var BashTimedOut = class extends Schema.TaggedError()("BashTimedOut", {
 const BashFailure = Schema.Union([BashFailed, BashTimedOut]);
 /** The reason for a failure, after any output: the model sees nothing else of `details`. */
 const withStatus = (failure) => {
-	const status = failure._tag === "BashTimedOut" ? `Command timed out after ${failure.timeoutSeconds} seconds` : failure.exitCode === -1 ? "Command terminated without an exit code" : `Command exited with code ${failure.exitCode}`;
+	const status = failure._tag === "BashTimedOut" ? `Command timed out after ${failure.timeoutSeconds} seconds` : failure.exitCode === -1 ? "Command terminated without an exit code" : `Command exited with code ${failure.exitCode}${failure.shell === "sh" ? " (ran under sh: bash is not on PATH in this sandbox)" : ""}`;
 	return failure.output ? `${failure.output.replace(/\n$/, "")}\n\n${status}` : status;
 };
 const bashDef = tool_exports.define({
@@ -6421,6 +6953,7 @@ const present = (snap, lastLineBytes, saved) => {
 	};
 };
 const utf8 = new TextEncoder();
+const shellOf = (report) => report !== void 0 ? { shell: report.shell } : {};
 /**
 * A command cut off by its deadline never reached the wrapper's own cleanup: kill
 * what is left of it and remove its side files, keeping the output file only when
@@ -6454,7 +6987,8 @@ const runBuffered = (shell, params, file) => Effect.gen(function* () {
 	const presented = present(acc.snapshot(), acc.getLastLineBytes(), window$1?.kept === true ? file : void 0);
 	if (result.exitCode !== 0) return yield* new BashFailed({
 		exitCode: result.exitCode,
-		...presented
+		...presented,
+		...shellOf(window$1)
 	});
 	return {
 		exitCode: result.exitCode,
@@ -6512,7 +7046,8 @@ const runStreaming = (shell, stream, params, file) => Effect.gen(function* () {
 	const code = yield* Ref.get(exitCode);
 	if (code === null || code !== 0) return yield* new BashFailed({
 		exitCode: code ?? -1,
-		...presented
+		...presented,
+		...shellOf(report$1)
 	});
 	return {
 		exitCode: code,
@@ -6895,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"}.`);
@@ -7282,7 +7817,7 @@ const pipeline = (argv, limit, errors) => [
 ].join("; ");
 const STATUS = /^\{"type":"rc","code":(\d+)\}$/;
 /** The pipeline's output: match events, ripgrep's status, and anything else, which is its stderr. */
-const parse$2 = (stdout, stderr) => {
+const parse$3 = (stdout, stderr) => {
 	const matches = [];
 	const errors = [];
 	let status;
@@ -7366,7 +7901,7 @@ const grepHandler = (params) => Effect.gen(function* () {
 		if (params.glob) argv.push("--glob", params.glob);
 		argv.push("-e", params.pattern, searchPath);
 		const result = yield* shell.exec(pipeline(argv, limit, errors));
-		const parsed = parse$2(result.stdout, result.stderr);
+		const parsed = parse$3(result.stdout, result.stderr);
 		return {
 			...parsed,
 			exitCode: parsed.status ?? result.exitCode
@@ -7931,7 +8466,8 @@ const builtins = Object.freeze([
 	findPlugin,
 	lsPlugin,
 	defaultPromptPlugin,
-	instructionPlugin
+	instructionPlugin,
+	skillPlugin
 ]);
 //#endregion
 //#region src/plugin/error.ts
@@ -8371,7 +8907,7 @@ const isPath = (reference) => reference.startsWith("file:") || reference.startsW
 * - a **CLI argument** anchors to the process's startup directory, because that is where the
 *   person typed it.
 */
-const parse$1 = (reference, from) => Effect.gen(function* () {
+const parse$2 = (reference, from) => Effect.gen(function* () {
 	const fail = (reason, message) => new SourceError({
 		reason,
 		reference,
@@ -9047,7 +9583,7 @@ const inspect = Effect.fn("PluginLoader.inspect")(function* (reference, options)
 		reference,
 		file: options.file
 	};
-	const target = yield* parse$1(reference, options.hostDir);
+	const target = yield* parse$2(reference, options.hostDir);
 	const loaded = yield* load$2(target, origin, options);
 	return {
 		id: loaded.plugin.id,
@@ -9073,7 +9609,7 @@ const load$2 = Effect.fn("PluginLoader.load")(function* (target, origin, options
 * are one package, and `./plugins/x.ts` is the file it resolves to from the directory that
 * declared it. Pure -- nothing is installed, imported or read.
 */
-const canonical = (reference, hostDir) => Effect.map(parse$1(reference, hostDir), canonical$1);
+const canonical = (reference, hostDir) => Effect.map(parse$2(reference, hostDir), canonical$1);
 //#endregion
 //#region src/plugin/catalog.ts
 /**
@@ -9135,7 +9671,7 @@ const load$1 = Effect.fn("PluginCatalog.load")(function* (references, options) {
 			remember(plugin, []);
 			continue;
 		}
-		const target = yield* parse$1(reference, options.hostDir);
+		const target = yield* parse$2(reference, options.hostDir);
 		const key = target.kind === "local" ? target.path : target.spec;
 		const already = seen.get(key);
 		if (already !== void 0) {
@@ -9391,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,
@@ -9416,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;
@@ -9436,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
 	});
@@ -10970,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;
@@ -11074,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);
@@ -11087,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;
 			}
@@ -11219,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({
@@ -11304,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
@@ -11318,7 +11900,7 @@ var harness_exports = /* @__PURE__ */ __exportAll({
 const layer = (options = {}) => Layer.unwrap(Effect.gen(function* () {
 	const hostCwd = options.hostCwd ?? process.cwd();
 	const paths = yield* resolve$4(options.home === void 0 ? {} : { home: hostPath.resolve(hostCwd, expandTilde(options.home, hostPath)) });
-	const global = layerWith(paths);
+	const global = layerWith$1(paths);
 	const settingsOptions = options.userConfigDir === void 0 ? {} : { userConfigDir: userConfigDir(options.userConfigDir, hostCwd) };
 	const config = yield* load$3({
 		...settingsOptions,
@@ -11337,7 +11919,7 @@ const layer = (options = {}) => Layer.unwrap(Effect.gen(function* () {
 	* `hostDir` led to; only the process view falls back to `hostCwd`.
 	*/
 	const hostDirOf = (root) => root ?? hostCwd;
-	const filed = (reference, from) => parse$1(reference, from).pipe(Effect.flatMap((target) => target.kind === "local" ? fileSystem.exists(target.path).pipe(Effect.map((there) => there ? Option.some({}) : Option.none())) : resolve$2(target, paths.cache, from).pipe(Effect.map((entry) => Option.fromUndefinedOr(entry)))), Effect.orElseSucceed(() => Option.none()));
+	const filed = (reference, from) => parse$2(reference, from).pipe(Effect.flatMap((target) => target.kind === "local" ? fileSystem.exists(target.path).pipe(Effect.map((there) => there ? Option.some({}) : Option.none())) : resolve$2(target, paths.cache, from).pipe(Effect.map((entry) => Option.fromUndefinedOr(entry)))), Effect.orElseSucceed(() => Option.none()));
 	const resolveOnly = {
 		...catalogOptions,
 		install: required
@@ -11579,13 +12161,26 @@ const makeHandle = Effect.fn("Session.makeHandle")(function* (id) {
 		const space = Option.getOrUndefined(yield* sessions.space(id));
 		const sandbox = space === void 0 || space.env === instance_exports.SandboxInstance.ID.local ? void 0 : Option.getOrUndefined(yield* sandboxes.get(space.env));
 		const hostDir = Option.getOrUndefined(row.hostDir);
+		const project = Option.getOrUndefined(yield* sessions.project(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,
 			directory: row.directory,
 			...hostDir === void 0 ? {} : { hostDir },
 			hasHostLink: hostDir !== void 0,
-			...sandbox === void 0 ? {} : { sandbox }
+			...sandbox === void 0 ? {} : { sandbox },
+			...project === void 0 ? {} : { project: {
+				id: project.id,
+				name: project.name
+			} },
+			updatedAt: DateTime.toEpochMillis(row.updatedAt),
+			...model === void 0 ? {} : { model },
+			...thinkingLevel === void 0 ? {} : { thinkingLevel },
+			parked
 		};
 	}).pipe(Effect.withSpan("Session.info"));
 	return {
@@ -11613,7 +12208,7 @@ const create$1 = Effect.fn("Session.create")(function* (input = {}) {
 	const sandboxes = yield* Controller;
 	const id = ID$1.create();
 	const sandboxId = input.sandbox?.id ?? instance_exports.SandboxInstance.ID.local;
-	const location = yield* sandboxes.withMount(sandboxId, Effect.provide(Service$8.use(Effect.succeed), layerMounted()), input.directory === void 0 ? void 0 : { cwd: input.directory });
+	const location = yield* sandboxes.withMount(sandboxId, Effect.provide(Service$8.use(Effect.succeed), layerMounted(input.project === void 0 ? void 0 : { name: input.project.name })), input.directory === void 0 ? void 0 : { cwd: input.directory });
 	yield* sessions.create({
 		id,
 		spaceId: location.space.id,
@@ -11727,7 +12322,7 @@ var plugin_exports = /* @__PURE__ */ __exportAll({
 	inspect: () => inspect,
 	lendResolve: () => lendResolve,
 	localName: () => localName,
-	parse: () => parse$1,
+	parse: () => parse$2,
 	probe: () => probe,
 	resolve: () => resolve$2,
 	resolveCached: () => required,
@@ -11740,6 +12335,6 @@ var DateTimeUtcFromMillis = schema_exports$9.DateTimeUtcFromMillis;
 var EventSchema = schema_exports$7.EventSchema;
 var SandboxError = errors_exports.SandboxError;
 var optional = schema_exports$9.optional;
-export { control_exports as Control, db_exports as Database, DateTimeUtcFromMillis, event_exports as Event, list_exports as EventList, registry_exports as EventRegistry, EventSchema, global_exports as Global, harness_exports as Harness, location_exports as Location, catalog_exports as ModelCatalog, plugin_exports as Plugin, schema_exports as PromptSchema, run_exports as Runner, sandbox_exports as Sandbox, SandboxError, session_exports as Session, session_exports$1 as SessionStore, settings_exports as Settings, state_exports as State, tool_exports as Tool, optional };
+export { control_exports as Control, db_exports as Database, DateTimeUtcFromMillis, event_exports as Event, list_exports as EventList, registry_exports as EventRegistry, EventSchema, global_exports as Global, harness_exports as Harness, location_exports as Location, catalog_exports as ModelCatalog, plugin_exports as Plugin, project_exports as Project, schema_exports as PromptSchema, run_exports as Runner, sandbox_exports as Sandbox, SandboxError, session_exports as Session, session_exports$1 as SessionStore, settings_exports as Settings, state_exports as State, tool_exports as Tool, optional };
 
 //# sourceMappingURL=effect.mjs.map