@lamplitisles/codex-for-love 0.4.2 → 0.5.0

package/vendor/runtime/cli.mjs

@@ -3,6 +3,7 @@ import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { access, copyFile, lstat, mkdir, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
+import { isIP } from "node:net";
 import { zstdDecompressSync } from "node:zlib";
 import { spawn } from "child_process";
 import { once } from "events";
@@ -12,13 +13,12 @@ import { delimiter, dirname as dirname$1, isAbsolute as isAbsolute$1, join as jo
 import { randomUUID as randomUUID$1 } from "crypto";
 import { createInterface } from "readline";
 import { homedir } from "os";
-import { createConnection, isIP } from "net";
-import * as fs from "node:fs";
-import { constants, createReadStream } from "node:fs";
+import { createConnection, isIP as isIP$1 } from "net";
 import { DatabaseSync } from "node:sqlite";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { createServer } from "node:http";
+import * as fs from "node:fs";
 import * as qs from "node:querystring";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -6197,12 +6197,12 @@ const schema = object({
 		user: string().min(1)
 	}).strict().optional(),
 	port: number$1().int().min(1024).max(65535).default(3082),
+	listen_host: string().refine((value) => isIP(value) === 4, "Listen host must be an IPv4 address").default("127.0.0.1"),
 	codex: object({
 		command: string().min(1).default("codex-app-server"),
 		model: string().min(1).default(DEFAULT_CODEX_MODEL),
 		version: literal(SUPPORTED_CODEX_VERSION).default(SUPPORTED_CODEX_VERSION),
 		home: string().min(1).optional(),
-		provenance: string().min(1).optional(),
 		local_compaction: boolean().default(false),
 		context_round_limit: number$1().int().min(0).default(10)
 	}).strict().default({
@@ -6237,8 +6237,7 @@ async function loadConfig(path) {
 		} : void 0,
 		codex: {
 			...config.codex,
-			home: config.codex.home ? resolve(base, config.codex.home) : void 0,
-			provenance: config.codex.provenance ? resolve(base, config.codex.provenance) : void 0
+			home: config.codex.home ? resolve(base, config.codex.home) : void 0
 		},
 		keet: config.keet ? {
 			...config.keet.endpoint ? { endpoint: keetEndpoint(config.keet.endpoint) } : {},
@@ -61940,7 +61939,7 @@ function validateBearerToken(value) {
 function isLoopbackHostname(hostname) {
 	const normalized = hostname.replace(/^\[|\]$/g, "").replace(/\.$/, "").toLowerCase();
 	if (normalized === "localhost") return true;
-	const family = isIP(normalized);
+	const family = isIP$1(normalized);
 	if (family === 4) return normalized.startsWith("127.");
 	if (family === 6) return normalized === "::1" || normalized.startsWith("::ffff:127.");
 	return false;
@@ -62600,7 +62599,8 @@ function partnerPaths(workspace) {
 		database: join(managedRoot, "session.sqlite"),
 		relationshipJournal: join(managedRoot, "relationship.jsonl"),
 		attachments: join(managedRoot, "attachments"),
-		audio: join(managedRoot, "audio")
+		audio: join(managedRoot, "audio"),
+		conversationImages: join(managedRoot, "conversation-images.json")
 	};
 }
 //#endregion
@@ -62890,72 +62890,6 @@ const compactionPrompt = [
 	"- Output checkpoint text only. Do not call Tools, take actions, or mention compaction."
 ].join("\n");
 //#endregion
-//#region apps/partner/runtime/provenance.ts
-const CFL_FORK_REPOSITORY = "https://github.com/lamplitisles/codex";
-const CFL_FORK_SOURCE_REVISION = "445477b6a83514611ac206d2ab04b79374555a4c";
-const provenanceSchema = object({
-	schemaVersion: literal(1),
-	forkRepository: literal(CFL_FORK_REPOSITORY),
-	sourceRevision: string(),
-	releaseTag: string(),
-	codexVersion: literal(SUPPORTED_CODEX_VERSION),
-	target: _enum(["x86_64-unknown-linux-musl", "aarch64-apple-darwin"]),
-	executables: object({
-		"bin/codex-app-server": string().regex(/^[a-f0-9]{64}$/u),
-		"bin/codex-code-mode-host": string().regex(/^[a-f0-9]{64}$/u)
-	}).strict()
-}).strict().superRefine((value, context) => {
-	const mac = value.target === "aarch64-apple-darwin";
-	const revision = mac ? "c1139f7b2793e94c14243689d756b09c0186708d" : CFL_FORK_SOURCE_REVISION;
-	const tag = mac ? /^cfl\/v0\.154\.0-app-server-darwin\.[0-9]+$/u : /^cfl\/v0\.154\.0-app-server-musl\.[0-9]+$/u;
-	if (value.sourceRevision !== revision || !tag.test(value.releaseTag)) context.addIssue({
-		code: "custom",
-		message: "Source revision/release identity does not match the selected platform"
-	});
-});
-async function sha256(path) {
-	const hash = createHash("sha256");
-	for await (const chunk of createReadStream(path)) hash.update(chunk);
-	return hash.digest("hex");
-}
-function provenanceError(path, message) {
-	return /* @__PURE__ */ new Error(`Invalid Codex provenance at ${path}: ${message}`);
-}
-/**
-* Verifies the exact executable selected for local compaction before the SDK
-* starts it. The app-server handshake still verifies the runtime version;
-* this sidecar binds the selected path to the pinned source and patch set.
-*/
-async function verifyCodexArtifact(command, provenancePath) {
-	if (!isAbsolute(command)) throw new Error("Local compaction requires an absolute codex.command so the selected build can be verified");
-	const selectedPath = resolve(command);
-	let raw;
-	try {
-		raw = await readFile(provenancePath, "utf8");
-	} catch (error) {
-		throw new Error(`Codex provenance is required and could not be read at ${provenancePath}: ${String(error)}`);
-	}
-	let provenance;
-	try {
-		provenance = provenanceSchema.parse(JSON.parse(raw));
-	} catch (error) {
-		throw provenanceError(provenancePath, error instanceof Error ? error.message : String(error));
-	}
-	await verifyExecutableHashes(selectedPath, provenancePath, provenance.executables["bin/codex-app-server"], provenance.executables["bin/codex-code-mode-host"]);
-}
-async function verifyExecutableHashes(selectedPath, provenancePath, expectedBinaryHash, expectedHelperHash) {
-	try {
-		if (!(await stat(selectedPath)).isFile()) throw new Error("selected path is not a regular file");
-		await access(selectedPath, constants.X_OK);
-	} catch (error) {
-		throw new Error(`Configured Codex executable cannot be verified at ${selectedPath}: ${String(error)}`);
-	}
-	if (await sha256(selectedPath) !== expectedBinaryHash) throw provenanceError(provenancePath, `binary hash mismatch for ${selectedPath}`);
-	const helper = join(dirname(selectedPath), "codex-code-mode-host");
-	await access(helper, constants.X_OK);
-	if (await sha256(helper) !== expectedHelperHash) throw provenanceError(provenancePath, "code-mode host hash does not match");
-}
-//#endregion
 //#region apps/partner/runtime/store.ts
 function identityConflict() {
 	return Object.assign(/* @__PURE__ */ new Error("Message ID already belongs to different content"), { code: "MESSAGE_IDENTITY_CONFLICT" });
@@ -64723,8 +64657,6 @@ async function convertDshSession(config, inputPath, companionStatePath, attachme
 		});
 		const injected = dependencies.appServer ?? {};
 		const selectedCodexPath = injected.codexPath ?? config.codex.command;
-		if (config.codex.local_compaction && !config.codex.provenance) throw new Error("Local compaction requires codex.provenance for the selected custom Codex build");
-		if (config.codex.provenance) await verifyCodexArtifact(selectedCodexPath, config.codex.provenance);
 		const environment = {
 			...config.codex.home ? { CODEX_HOME: config.codex.home } : {},
 			...injected.env ?? {}
@@ -65549,6 +65481,80 @@ async function readClip(root, name, frameCount) {
 		return;
 	}
 }
+//#endregion
+//#region apps/partner/runtime/conversation-images.ts
+const CURSOR_BYTES = 40;
+const CURSOR_TOKEN = /^[A-Za-z0-9_-]{54}$/u;
+const IMAGE_ID = /^[a-f0-9]{64}$/u;
+function cursorFor(image) {
+	if (!Number.isSafeInteger(image.created) || image.created < 0 || !IMAGE_ID.test(image.id)) throw new Error("Invalid conversation image cursor data");
+	const value = Buffer.alloc(CURSOR_BYTES);
+	value.writeBigUInt64BE(BigInt(image.created));
+	Buffer.from(image.id, "hex").copy(value, 8);
+	return value.toString("base64url");
+}
+function readCursor(cursor) {
+	if (!cursor) return void 0;
+	if (!CURSOR_TOKEN.test(cursor)) return void 0;
+	try {
+		const value = Buffer.from(cursor, "base64url");
+		if (value.length !== CURSOR_BYTES) return void 0;
+		const created = Number(value.readBigUInt64BE());
+		if (!Number.isSafeInteger(created)) return void 0;
+		return [created, value.subarray(8).toString("hex")];
+	} catch {
+		return;
+	}
+}
+function conversationImageId(origin, source) {
+	return createHash("sha256").update(`${origin}:${source}`).digest("hex");
+}
+function pageConversationImages(images, limit = 5, cursor) {
+	const after = readCursor(cursor);
+	if (cursor && !after) throw new Error("Invalid conversation image cursor");
+	const ordered = images.filter((image) => !after || image.created < after[0] || image.created === after[0] && image.id < after[1]).sort((a, b) => b.created - a.created || b.id.localeCompare(a.id));
+	const page = ordered.slice(0, limit);
+	return {
+		images: page,
+		...ordered.length > page.length ? { nextCursor: cursorFor(page.at(-1)) } : {}
+	};
+}
+async function readConversationImages(path) {
+	try {
+		const value = JSON.parse(await readFile(path, "utf8"));
+		return Array.isArray(value) ? value : [];
+	} catch (error) {
+		if (error.code === "ENOENT") return [];
+		throw error;
+	}
+}
+async function withAvailability(images) {
+	return Promise.all(images.map(async (image) => {
+		try {
+			await access(image.path);
+			return {
+				...image,
+				available: true
+			};
+		} catch {
+			return {
+				...image,
+				available: false
+			};
+		}
+	}));
+}
+/** Atomic metadata projection shared by the HTTP host and the standalone MCP. */
+async function writeConversationImages(path, images) {
+	await mkdir(dirname(path), {
+		recursive: true,
+		mode: 448
+	});
+	const target = resolve(path);
+	const temporary = `${target}.${process.pid}.${randomUUID()}.tmp`;
+	await writeFile(temporary, `${JSON.stringify(images)}\n`, { mode: 384 });
+	await rename(temporary, target);
+}
 const HISTORY_PAGE_MESSAGES = 50;
 /** Match DSH's 50-message history window against CFL's rendered projection. */
 function visibleHistoryPage(messages, results, before) {
@@ -65725,6 +65731,9 @@ function historyImage(path, operationId, index) {
 function noHistoryYet(error) {
 	return error instanceof AppServerInvalidRequestError && error.rpcMessage.includes("thread/turns/list is unavailable before first user message");
 }
+function noRolloutForThread(error) {
+	return error instanceof AppServerInvalidRequestError && error.rpcMessage.startsWith("no rollout found for thread id ");
+}
 function rpcMessage(error) {
 	return error instanceof AppServerInvalidRequestError ? error.rpcMessage : void 0;
 }
@@ -65841,6 +65850,24 @@ async function createPartner(config, credentials, dependencies = {}) {
 		recursive: true,
 		mode: 448
 	});
+	const catalogue = new Map((await readConversationImages(paths.conversationImages)).map((image) => [image.id, image]));
+	let reconcilingCatalogue = false;
+	let reconciledCatalogueIds = /* @__PURE__ */ new Set();
+	async function catalogueImage(origin, image, created) {
+		const id = conversationImageId(origin, `${image.operation_id}:${image.id}`);
+		const previous = catalogue.get(id);
+		catalogue.set(id, {
+			id,
+			filename: image.name,
+			path: resolve(image.path),
+			mediaType: image.media_type,
+			created: reconcilingCatalogue ? created : previous?.created ?? created,
+			origin,
+			available: true
+		});
+		reconciledCatalogueIds.add(id);
+		if (!reconcilingCatalogue) await writeConversationImages(paths.conversationImages, await withAvailability([...catalogue.values()]));
+	}
 	const store = new Store(paths.database);
 	const now = dependencies.now ?? Date.now;
 	const listeners = /* @__PURE__ */ new Set();
@@ -65872,7 +65899,6 @@ async function createPartner(config, credentials, dependencies = {}) {
 	let unsubscribeAppServer = [];
 	let startupPending = false;
 	let compacting = false;
-	let compactWaiter;
 	let eventChain = Promise.resolve();
 	let admission = Promise.resolve();
 	let closePromise;
@@ -66048,7 +66074,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 		if (previous?.status === "replaced") return;
 		if (previous?.status !== "attachment-error" || previous.error !== error) await store.markOutcome(owner, "attachment-error", error);
 	}
-	async function projectGeneratedImage(operationId, sourceIds, item) {
+	async function projectGeneratedImage(operationId, sourceIds, item, created) {
 		if (item.type !== "imageGeneration") return void 0;
 		if (item.status === "failed") {
 			processError("image.generation_failed", new Error(imageFailure("failed")), {
@@ -66063,6 +66089,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 		const existing = await store.generatedImageForItem(operationId, itemId);
 		if (existing) try {
 			await access(existing.path);
+			await catalogueImage("partner", existing, created);
 			return existing.id;
 		} catch {
 			storageError = true;
@@ -66085,6 +66112,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 				return;
 			}
 			await store.saveGeneratedImage(generated, itemId);
+			await catalogueImage("partner", generated, created);
 			return generated.id;
 		} catch (error) {
 			storageError = true;
@@ -66175,6 +66203,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 				await store.ensureMessage(sourceId, turnTime(turn.startedAt, now()), source.input, source.images);
 				messageIds.add(sourceId);
 			}
+			if (!sourceId.startsWith("keet:")) for (const image of source.images) await catalogueImage(isUnder(join(paths.managedRoot, "historical-media"), image.path) ? "historical" : "owner", image, turnTime(turn.startedAt, now()));
 			await store.markObserved(sourceId, segment);
 		}
 		acknowledgeInputIds(officialIds);
@@ -66187,7 +66216,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 		const completedAt = status === "completed" ? completedTurnTime(turn.completedAt) : void 0;
 		for (const item of turn.items ?? []) {
 			if (item.type !== "imageGeneration") continue;
-			const generatedId = await projectGeneratedImage(resultOperationId(turn.id), sourceIds, item);
+			const generatedId = await projectGeneratedImage(resultOperationId(turn.id), sourceIds, item, completedTurnTime(turn.completedAt) ?? turnTime(turn.startedAt, now()));
 			if (generatedId) generatedIds.push(generatedId);
 			else if (item.status === "failed") {
 				resultStatus = "failed";
@@ -66217,15 +66246,23 @@ async function createPartner(config, credentials, dependencies = {}) {
 	}
 	/** Full history is hydrated once at startup/resume; events update one turn thereafter. */
 	async function hydrateHistory() {
+		reconcilingCatalogue = true;
+		reconciledCatalogueIds = /* @__PURE__ */ new Set();
 		const nextTurns = await listTurns();
 		turns.clear();
 		turnInputs.clear();
 		turnResults.clear();
 		presentationFingerprints.clear();
-		for (const turn of nextTurns) {
-			registerTurn(turn);
-			const complete = await reconcileTurn(turn.id, turn);
-			if (complete) await projectTurn(complete, false);
+		try {
+			for (const turn of nextTurns) {
+				registerTurn(turn);
+				const complete = await reconcileTurn(turn.id, turn);
+				if (complete) await projectTurn(complete, false);
+			}
+		} finally {
+			reconcilingCatalogue = false;
+			for (const id of catalogue.keys()) if (!reconciledCatalogueIds.has(id)) catalogue.delete(id);
+			await writeConversationImages(paths.conversationImages, await withAvailability([...catalogue.values()]));
 		}
 		const unresolved = await unresolvedMessages();
 		for (const message of unresolved) unresolvedInputIds.add(message.id);
@@ -66378,7 +66415,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 		}
 	}
 	function drainRejectedSteers() {
-		if (closing || activeTurnId || recoveryPromise || !rejectedSteers.length) return recoveryPromise;
+		if (closing || compacting || activeTurnId || recoveryPromise || !rejectedSteers.length) return recoveryPromise;
 		const intents = rejectedSteers.splice(0);
 		const ids = intents.flatMap((intent) => intent.ids);
 		const merged = {
@@ -66402,7 +66439,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 	}
 	function drainKeet() {
 		admission = admission.then(async () => {
-			if (closing || activeTurnId || recoveryPromise || !keetEnabled) return;
+			if (closing || compacting || activeTurnId || recoveryPromise || !keetEnabled) return;
 			const pending = (await store.pendingMessages()).filter((item) => item.id.startsWith("keet:") && !observedInputIds.has(item.id));
 			if (!pending.length || activeTurnId || closing) return;
 			const first = pending[0];
@@ -66504,11 +66541,11 @@ async function createPartner(config, credentials, dependencies = {}) {
 			scheduleKeetReconnect();
 		});
 	}
-	async function restoreUnconsumed(turnId) {
+	async function restoreUnconsumed(turnId, preserveQueued = false) {
 		const ids = turnId ? [...sourceIdsForTurn(turnId)] : [];
 		const selectedSteers = pendingSteers.filter((intent) => turnId === void 0 || intent.turnId === turnId);
 		const selectedStarts = [...pendingStarts.values()].filter((intent) => turnId === void 0 || intent.turnId === turnId);
-		const selectedRejected = rejectedSteers.filter((intent) => turnId === void 0 || intent.turnId === turnId);
+		const selectedRejected = preserveQueued ? [] : rejectedSteers.filter((intent) => turnId === void 0 || intent.turnId === turnId);
 		for (const intent of selectedSteers) ids.push(...intent.ids);
 		for (const intent of selectedStarts) ids.push(...intent.ids);
 		for (const intent of selectedRejected) ids.push(...intent.ids);
@@ -66576,18 +66613,14 @@ async function createPartner(config, credentials, dependencies = {}) {
 			endedAt: boundary.time
 		};
 		await refreshBootstrap();
-		compactWaiter?.resolve();
-		compactWaiter = void 0;
 	}
-	function failCompaction(error) {
+	function failCompaction() {
 		if (lifecycle?.status === "running") lifecycle = {
 			...lifecycle,
 			status: "failed",
 			endSeq: eventSequence,
 			endedAt: now()
 		};
-		compactWaiter?.reject(error instanceof Error ? error : new Error(String(error)));
-		compactWaiter = void 0;
 	}
 	async function handleServerEvent(notification) {
 		if (closing) return;
@@ -66669,11 +66702,14 @@ async function createPartner(config, credentials, dependencies = {}) {
 					turnControllers.delete(turn.id);
 				}
 				if (reconciled && (turnStatus(reconciled) === "interrupted" || turnStatus(reconciled) === "cancelled")) await restoreUnconsumed(completedTurnId);
-				else if (reconciled && !userItems(reconciled).length && completedTurnId) await restoreUnconsumed(completedTurnId);
+				else if (reconciled && !userItems(reconciled).length && completedTurnId) await restoreUnconsumed(completedTurnId, turnStatus(reconciled) === "completed");
 				syncActiveTurn();
 				if (compacting) {
 					compacting = false;
-					if (lifecycle?.status === "running") await finishCompaction(reconciled?.id);
+					if (lifecycle?.status === "running") {
+						if (turnStatus(reconciled) === "completed") await finishCompaction(reconciled?.id);
+						else failCompaction();
+					}
 				}
 				await refreshBootstrap();
 				if (!activeTurnId) {
@@ -66697,6 +66733,9 @@ async function createPartner(config, credentials, dependencies = {}) {
 		if (notification.method === "turn/started") {
 			const turn = registerTurn(record(notification.params).turn);
 			if (turn) {
+				if (compacting) {
+					for (const intent of rejectedSteers) if (!intent.turnId) intent.turnId = turn.id;
+				}
 				activeTurnId = turn.id;
 				activeOperationId = sourceIdsForTurn(turn.id)[0] ?? activeOperationId;
 				if (!turnControllers.has(turn.id)) turnControllers.set(turn.id, new AbortController());
@@ -66727,8 +66766,6 @@ async function createPartner(config, credentials, dependencies = {}) {
 		await refreshBootstrap();
 		const injected = dependencies.appServer ?? {};
 		const selectedCodexPath = injected.codexPath ?? config.codex.command;
-		if (config.codex.local_compaction && !config.codex.provenance) throw new Error("Local compaction requires codex.provenance for the selected custom Codex build");
-		if (config.codex.provenance) await verifyCodexArtifact(selectedCodexPath, config.codex.provenance);
 		const environment = {
 			...config.codex.home ? { CODEX_HOME: config.codex.home } : {},
 			...keetEnabled ? { CFL_KEET_TOKEN: credentials.keet } : {},
@@ -66796,29 +66833,44 @@ async function createPartner(config, credentials, dependencies = {}) {
 				} : {}
 			}
 		};
+		const connectedAppServer = appServer;
+		if (!connectedAppServer) throw new Error("Codex app-server connection was not initialized");
 		let response;
-		if (marker?.threadId) {
-			const resume = {
-				...shared,
-				threadId: marker.threadId,
-				excludeTurns: true
-			};
-			response = await appServer.call("thread/resume", resume);
-			threadId = response.thread.id;
-		} else {
+		let resumed = false;
+		const startThread = async () => {
 			const start = {
 				...shared,
 				historyMode: "paginated",
 				sessionStartSource: "startup"
 			};
-			response = await appServer.call("thread/start", start);
-			threadId = response.thread.id;
+			const started = await connectedAppServer.call("thread/start", start);
+			threadId = started.thread.id;
 			if (!threadId) throw new Error("Codex app-server did not return a thread id");
 			await writeFile(markerPath, JSON.stringify({
 				threadId,
 				model: config.codex.model
 			}), { mode: 384 });
-		}
+			return started;
+		};
+		if (marker?.threadId) {
+			const resume = {
+				...shared,
+				threadId: marker.threadId,
+				excludeTurns: true
+			};
+			try {
+				response = await connectedAppServer.call("thread/resume", resume);
+				threadId = response.thread.id;
+				resumed = true;
+			} catch (error) {
+				if (!noRolloutForThread(error) || messageIds.size) throw error;
+				await unlink(markerPath);
+				marker = void 0;
+				startupPending = true;
+				await refreshBootstrap();
+				response = await startThread();
+			}
+		} else response = await startThread();
 		const readinessDeadline = Date.now() + 1e4;
 		for (;;) {
 			const mcpStatuses = [];
@@ -66838,7 +66890,7 @@ async function createPartner(config, credentials, dependencies = {}) {
 			await new Promise((resolve) => setTimeout(resolve, 100));
 		}
 		if (response.model !== void 0 && response.model !== config.codex.model) throw new Error(`Codex selected ${String(response.model)} instead of configured ${config.codex.model}`);
-		if (marker?.threadId && marker.model !== config.codex.model) await writeFile(markerPath, JSON.stringify({
+		if (resumed && marker?.threadId && marker.model !== config.codex.model) await writeFile(markerPath, JSON.stringify({
 			threadId,
 			model: config.codex.model
 		}), { mode: 384 });
@@ -66851,7 +66903,6 @@ async function createPartner(config, credentials, dependencies = {}) {
 		closing = true;
 		for (const unsubscribe of unsubscribeAppServer.splice(0)) unsubscribe();
 		for (const controller of turnControllers.values()) controller.abort();
-		compactWaiter?.reject(error instanceof Error ? error : new Error(String(error)));
 		await appServer?.close().catch(() => void 0);
 		await store.close().catch(() => void 0);
 		throw error;
@@ -66914,6 +66965,34 @@ async function createPartner(config, credentials, dependencies = {}) {
 				return;
 			}
 		},
+		async conversationImages(options = {}) {
+			await eventChain;
+			const page = pageConversationImages(await withAvailability([...catalogue.values()]), options.limit ?? 5, options.cursor);
+			return {
+				images: page.images.map(({ id, filename, mediaType, created, origin, available }) => ({
+					id,
+					filename,
+					mediaType,
+					created,
+					origin,
+					available,
+					url: `/api/conversation-images/${id}`
+				})),
+				...page.nextCursor ? { nextCursor: page.nextCursor } : {}
+			};
+		},
+		async conversationImage(id) {
+			const image = catalogue.get(id);
+			if (!image) return void 0;
+			try {
+				return {
+					media_type: image.mediaType,
+					data: await readFile(image.path)
+				};
+			} catch {
+				return;
+			}
+		},
 		avatar: (kind) => avatars[kind],
 		async petAsset(activity) {
 			return pet ? localPetClip(config.state, activity) : void 0;
@@ -67041,7 +67120,6 @@ async function createPartner(config, credentials, dependencies = {}) {
 				if (replaces.length) await setRestoredDraft([...unresolvedInputIds]);
 				await eventChain;
 				syncActiveTurn();
-				if (rejectedSteers.length) await (drainRejectedSteers() ?? Promise.resolve());
 				const intent = {
 					ids: [id],
 					input,
@@ -67049,6 +67127,12 @@ async function createPartner(config, credentials, dependencies = {}) {
 					transportId: id,
 					source: "owner"
 				};
+				if (compacting && !activeTurnId) {
+					rejectedSteers.push(intent);
+					notify();
+					return;
+				}
+				if (rejectedSteers.length) await (drainRejectedSteers() ?? Promise.resolve());
 				if (activeTurnId) await steerIntent(intent, activeTurnId);
 				else await startIntent(intent);
 				notify();
@@ -67082,27 +67166,15 @@ async function createPartner(config, credentials, dependencies = {}) {
 					startedAt: now()
 				};
 				compacting = true;
-				const wait = new Promise((resolveWait, rejectWait) => {
-					compactWaiter = {
-						resolve: resolveWait,
-						reject: rejectWait
-					};
-				});
-				let timeout;
+				notify();
 				try {
 					await appServer.call("thread/compact/start", { threadId });
-					await Promise.race([wait, new Promise((_, reject) => {
-						timeout = setTimeout(() => reject(/* @__PURE__ */ new Error("Codex compaction timed out")), 6e4);
-					})]);
 				} catch (error) {
 					compacting = false;
-					failCompaction(error);
+					failCompaction();
 					processError("compaction.failed", error);
 					notify();
 					throw error;
-				} finally {
-					if (timeout) clearTimeout(timeout);
-					compactWaiter = void 0;
 				}
 				notify();
 			});
@@ -67125,8 +67197,6 @@ async function createPartner(config, credentials, dependencies = {}) {
 			keetFeed?.close();
 			for (const unsubscribe of unsubscribeAppServer.splice(0)) unsubscribe();
 			for (const controller of turnControllers.values()) controller.abort();
-			compactWaiter?.reject(/* @__PURE__ */ new Error("Partner is closing"));
-			compactWaiter = void 0;
 			compacting = false;
 			const serverClose = appServer?.close() ?? Promise.resolve();
 			closePromise = (async () => {
@@ -67896,6 +67966,25 @@ function createWebServer(partner, assets, options = {}) {
 				response.end(image.data);
 				return;
 			}
+			if (path === "/api/conversation-images" && request.method === "GET") {
+				const params = Object.fromEntries(new URL(request.url, "http://localhost").searchParams);
+				const options = object({
+					limit: number().int().min(1).max(50).optional(),
+					cursor: string().min(1).max(500).optional()
+				}).strict().parse(params);
+				return json(response, await partner.conversationImages(options));
+			}
+			if (path.startsWith("/api/conversation-images/") && request.method === "GET") {
+				const id = string().regex(/^[a-f0-9]{64}$/u).parse(path.slice(25));
+				const image = await partner.conversationImage(id);
+				if (!image) return json(response, { error: "Image not found" }, 404);
+				response.writeHead(200, {
+					"content-type": image.media_type,
+					"cache-control": "private, max-age=31536000, immutable"
+				});
+				response.end(image.data);
+				return;
+			}
 			if (path.startsWith("/api/audio/") && request.method === "GET") {
 				const id = string().regex(/^[a-f0-9]{64}\.mp3$/u).parse(path.slice(11));
 				const audio = await partner.audio(id.slice(0, -4));
@@ -67951,7 +68040,7 @@ function createWebServer(partner, assets, options = {}) {
 			}
 			if (path === "/api/compact" && request.method === "POST") {
 				await partner.compact();
-				return json(response, { ok: true });
+				return json(response, { ok: true }, 202);
 			}
 			if (path === "/api/cancel" && request.method === "POST") {
 				const { id } = object({ id: string().min(1).max(300) }).strict().parse(await body(request));
@@ -68052,8 +68141,7 @@ if (nativePackageRoot) {
 		...config,
 		codex: {
 			...config.codex,
-			command: join(root, "bin", "codex-app-server"),
-			provenance: join(root, "provenance.json")
+			command: join(root, "bin", "codex-app-server")
 		}
 	};
 }
@@ -68111,7 +68199,7 @@ if (command === "credential") {
 		await partner.close();
 		process.exitCode = 1;
 	});
-	app.server.listen(config.port, "127.0.0.1", () => console.log(`Companion: http://127.0.0.1:${config.port}`));
+	app.server.listen(config.port, config.listen_host, () => console.log(`Companion: http://${config.listen_host}:${config.port}`));
 	let stopping = false;
 	const stop = async () => {
 		if (stopping) return;