acpx 0.1.16 → 0.3.0

package/dist/{queue-ipc-CEetz4_7.js → queue-ipc-EQLpBMKv.js}

@@ -1,11 +1,83 @@
-import { t as __exportAll } from "./rolldown-runtime-CjeV3_4I.js";
-import { t as isAcpJsonRpcMessage } from "./acp-jsonrpc-CGT_1Mel.js";
+import { t as __exportAll } from "./rolldown-runtime-CiIaOW0V.js";
+import { t as isAcpJsonRpcMessage } from "./acp-jsonrpc-BNHXq7qK.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { createHash, randomUUID } from "node:crypto";
 import os from "node:os";
 import net from "node:net";
-
+//#region src/acp-error-shapes.ts
+const RESOURCE_NOT_FOUND_ACP_CODES = new Set([-32001, -32002]);
+function asRecord$3(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function toAcpErrorPayload(value) {
+	const record = asRecord$3(value);
+	if (!record) return;
+	if (typeof record.code !== "number" || !Number.isFinite(record.code)) return;
+	if (typeof record.message !== "string" || record.message.length === 0) return;
+	return {
+		code: record.code,
+		message: record.message,
+		data: record.data
+	};
+}
+function extractAcpErrorInternal(value, depth) {
+	if (depth > 5) return;
+	const direct = toAcpErrorPayload(value);
+	if (direct) return direct;
+	const record = asRecord$3(value);
+	if (!record) return;
+	if ("error" in record) {
+		const nested = extractAcpErrorInternal(record.error, depth + 1);
+		if (nested) return nested;
+	}
+	if ("acp" in record) {
+		const nested = extractAcpErrorInternal(record.acp, depth + 1);
+		if (nested) return nested;
+	}
+	if ("cause" in record) {
+		const nested = extractAcpErrorInternal(record.cause, depth + 1);
+		if (nested) return nested;
+	}
+}
+function formatUnknownErrorMessage(error) {
+	if (error instanceof Error) return error.message;
+	if (error && typeof error === "object") {
+		const maybeMessage = error.message;
+		if (typeof maybeMessage === "string" && maybeMessage.length > 0) return maybeMessage;
+		try {
+			return JSON.stringify(error);
+		} catch {}
+	}
+	return String(error);
+}
+function isSessionNotFoundText(value) {
+	if (typeof value !== "string") return false;
+	const normalized = value.toLowerCase();
+	return normalized.includes("resource_not_found") || normalized.includes("resource not found") || normalized.includes("session not found") || normalized.includes("unknown session") || normalized.includes("invalid session identifier");
+}
+function hasSessionNotFoundHint(value, depth = 0) {
+	if (depth > 4) return false;
+	if (isSessionNotFoundText(value)) return true;
+	if (Array.isArray(value)) return value.some((entry) => hasSessionNotFoundHint(entry, depth + 1));
+	const record = asRecord$3(value);
+	if (!record) return false;
+	return Object.values(record).some((entry) => hasSessionNotFoundHint(entry, depth + 1));
+}
+function extractAcpError(error) {
+	return extractAcpErrorInternal(error, 0);
+}
+function isAcpResourceNotFoundError(error) {
+	const acp = extractAcpError(error);
+	if (acp && RESOURCE_NOT_FOUND_ACP_CODES.has(acp.code)) return true;
+	if (acp) {
+		if (isSessionNotFoundText(acp.message)) return true;
+		if (hasSessionNotFoundHint(acp.data)) return true;
+	}
+	return isSessionNotFoundText(formatUnknownErrorMessage(error));
+}
+//#endregion
 //#region src/errors.ts
 var AcpxOperationalError = class extends Error {
 	outputCode;
@@ -98,7 +170,121 @@ var PermissionPromptUnavailableError = class extends AcpxOperationalError {
 		super("Permission prompt unavailable in non-interactive mode");
 	}
 };
-
+//#endregion
+//#region src/prompt-content.ts
+var PromptInputValidationError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "PromptInputValidationError";
+	}
+};
+function asRecord$2(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0;
+}
+function isBase64Data(value) {
+	if (value.length === 0 || value.length % 4 !== 0) return false;
+	return /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(value);
+}
+function isImageMimeType(value) {
+	return /^image\/[A-Za-z0-9.+-]+$/i.test(value);
+}
+function isTextBlock(value) {
+	const record = asRecord$2(value);
+	return record?.type === "text" && typeof record.text === "string";
+}
+function isImageBlock(value) {
+	const record = asRecord$2(value);
+	return record?.type === "image" && isNonEmptyString(record.mimeType) && isImageMimeType(record.mimeType) && typeof record.data === "string" && isBase64Data(record.data);
+}
+function isResourceLinkBlock(value) {
+	const record = asRecord$2(value);
+	return record?.type === "resource_link" && isNonEmptyString(record.uri) && (record.title === void 0 || typeof record.title === "string") && (record.name === void 0 || typeof record.name === "string");
+}
+function isResourcePayload(value) {
+	const record = asRecord$2(value);
+	if (!record || !isNonEmptyString(record.uri)) return false;
+	return record.text === void 0 || typeof record.text === "string";
+}
+function isResourceBlock(value) {
+	const record = asRecord$2(value);
+	return record?.type === "resource" && isResourcePayload(record.resource);
+}
+function isContentBlock(value) {
+	return isTextBlock(value) || isImageBlock(value) || isResourceLinkBlock(value) || isResourceBlock(value);
+}
+function getContentBlockValidationError(value, index) {
+	const record = asRecord$2(value);
+	if (!record || typeof record.type !== "string") return `prompt[${index}] must be an ACP content block object`;
+	switch (record.type) {
+		case "text": return typeof record.text === "string" ? void 0 : `prompt[${index}] text block must include a string text field`;
+		case "image":
+			if (!isNonEmptyString(record.mimeType)) return `prompt[${index}] image block must include a non-empty mimeType`;
+			if (!isImageMimeType(record.mimeType)) return `prompt[${index}] image block mimeType must start with image/`;
+			if (typeof record.data !== "string" || record.data.length === 0) return `prompt[${index}] image block must include non-empty base64 data`;
+			if (!isBase64Data(record.data)) return `prompt[${index}] image block data must be valid base64`;
+			return;
+		case "resource_link":
+			if (!isNonEmptyString(record.uri)) return `prompt[${index}] resource_link block must include a non-empty uri`;
+			if (record.title !== void 0 && typeof record.title !== "string") return `prompt[${index}] resource_link block title must be a string when present`;
+			if (record.name !== void 0 && typeof record.name !== "string") return `prompt[${index}] resource_link block name must be a string when present`;
+			return;
+		case "resource":
+			if (!asRecord$2(record.resource)) return `prompt[${index}] resource block must include a resource object`;
+			if (!isResourcePayload(record.resource)) return `prompt[${index}] resource block resource must include a non-empty uri and optional text`;
+			return;
+		default: return `prompt[${index}] has unsupported content block type ${JSON.stringify(record.type)}`;
+	}
+}
+function isPromptInput(value) {
+	return Array.isArray(value) && value.every((entry) => isContentBlock(entry));
+}
+function textPrompt(text) {
+	return [{
+		type: "text",
+		text
+	}];
+}
+function parseStructuredPrompt(source) {
+	if (!source.startsWith("[")) return;
+	try {
+		const parsed = JSON.parse(source);
+		if (isPromptInput(parsed)) return parsed;
+		if (Array.isArray(parsed)) throw new PromptInputValidationError(parsed.map((entry, index) => getContentBlockValidationError(entry, index)).find((message) => message !== void 0) ?? "Structured prompt JSON must be an array of valid ACP content blocks");
+		return;
+	} catch (error) {
+		if (error instanceof PromptInputValidationError) throw error;
+		return;
+	}
+}
+function parsePromptSource(source) {
+	const trimmed = source.trim();
+	const structured = parseStructuredPrompt(trimmed);
+	if (structured) return structured;
+	if (!trimmed) return [];
+	return textPrompt(trimmed);
+}
+function mergePromptSourceWithText(source, suffixText) {
+	const prompt = parsePromptSource(source);
+	const appended = suffixText.trim();
+	if (!appended) return prompt;
+	if (prompt.length === 0) return textPrompt(appended);
+	return [...prompt, ...textPrompt(appended)];
+}
+function promptToDisplayText(prompt) {
+	return prompt.map((block) => {
+		switch (block.type) {
+			case "text": return block.text;
+			case "resource_link": return block.title ?? block.name ?? block.uri;
+			case "resource": return "text" in block.resource && typeof block.resource.text === "string" ? block.resource.text : block.resource.uri;
+			case "image": return `[image] ${block.mimeType}`;
+			default: return "";
+		}
+	}).filter((entry) => entry.trim().length > 0).join("\n\n").trim();
+}
 //#endregion
 //#region src/types.ts
 const EXIT_CODES = {
@@ -132,10 +318,8 @@ const OUTPUT_ERROR_ORIGINS = [
 	"acp"
 ];
 const SESSION_RECORD_SCHEMA = "acpx.session.v1";
-
 //#endregion
 //#region src/error-normalization.ts
-const RESOURCE_NOT_FOUND_ACP_CODES = new Set([-32002]);
 const AUTH_REQUIRED_ACP_CODES = new Set([-32e3]);
 const QUERY_CLOSED_BEFORE_RESPONSE_DETAIL = "query closed before response received";
 function asRecord$1(value) {
@@ -174,35 +358,9 @@ function readOutputErrorMeta(error) {
 		detailCode: typeof record.detailCode === "string" && record.detailCode.trim().length > 0 ? record.detailCode : void 0,
 		origin: isOutputErrorOrigin$1(record.origin) ? record.origin : void 0,
 		retryable: typeof record.retryable === "boolean" ? record.retryable : void 0,
-		acp: toAcpErrorPayload(record.acp)
+		acp: extractAcpError(record.acp)
 	};
 }
-function toAcpErrorPayload(value) {
-	const record = asRecord$1(value);
-	if (!record) return;
-	if (typeof record.code !== "number" || !Number.isFinite(record.code)) return;
-	if (typeof record.message !== "string" || record.message.length === 0) return;
-	return {
-		code: record.code,
-		message: record.message,
-		data: record.data
-	};
-}
-function extractAcpErrorInternal(value, depth) {
-	if (depth > 5) return;
-	const direct = toAcpErrorPayload(value);
-	if (direct) return direct;
-	const record = asRecord$1(value);
-	if (!record) return;
-	if ("error" in record) {
-		const nested = extractAcpErrorInternal(record.error, depth + 1);
-		if (nested) return nested;
-	}
-	if ("cause" in record) {
-		const nested = extractAcpErrorInternal(record.cause, depth + 1);
-		if (nested) return nested;
-	}
-}
 function isTimeoutLike(error) {
 	return error instanceof Error && error.name === "TimeoutError";
 }
@@ -214,22 +372,7 @@ function isUsageLike(error) {
 	return error.name === "CommanderError" || error.name === "InvalidArgumentError" || asRecord$1(error)?.code === "commander.invalidArgument";
 }
 function formatErrorMessage(error) {
-	if (error instanceof Error) return error.message;
-	if (error && typeof error === "object") {
-		const maybeMessage = error.message;
-		if (typeof maybeMessage === "string" && maybeMessage.length > 0) return maybeMessage;
-		try {
-			return JSON.stringify(error);
-		} catch {}
-	}
-	return String(error);
-}
-function extractAcpError(error) {
-	return extractAcpErrorInternal(error, 0);
-}
-function isAcpResourceNotFoundError(error) {
-	const acp = extractAcpError(error);
-	return Boolean(acp && RESOURCE_NOT_FOUND_ACP_CODES.has(acp.code));
+	return formatUnknownErrorMessage(error);
 }
 function isAcpQueryClosedBeforeResponseError(error) {
 	const acp = extractAcpError(error);
@@ -271,7 +414,6 @@ function exitCodeForOutputErrorCode(code) {
 		default: return EXIT_CODES.ERROR;
 	}
 }
-
 //#endregion
 //#region src/perf-metrics.ts
 const counters = /* @__PURE__ */ new Map();
@@ -338,7 +480,6 @@ function resetPerfMetrics() {
 function formatPerfMetric(name, durationMsValue) {
 	return `${name}=${roundMetric(durationMsValue)}ms`;
 }
-
 //#endregion
 //#region src/queue-paths.ts
 function shortHash(value, length) {
@@ -362,7 +503,6 @@ function queueSocketPath(sessionId, homeDir = os.homedir()) {
 	if (process.platform === "win32") return `\\\\.\\pipe\\acpx-${key}`;
 	return path.join(queueSocketBaseDir(homeDir) ?? "/tmp", `${key}.sock`);
 }
-
 //#endregion
 //#region src/queue-lease-store.ts
 const PROCESS_EXIT_GRACE_MS = 1500;
@@ -549,7 +689,6 @@ async function waitMs(ms) {
 		setTimeout(resolve, ms);
 	});
 }
-
 //#endregion
 //#region src/queue-messages.ts
 function asRecord(value) {
@@ -595,12 +734,14 @@ function parseQueueRequest(raw) {
 	if (request.type === "submit_prompt") {
 		const nonInteractivePermissions = request.nonInteractivePermissions == null ? void 0 : isNonInteractivePermissionPolicy(request.nonInteractivePermissions) ? request.nonInteractivePermissions : null;
 		const suppressSdkConsoleErrors = request.suppressSdkConsoleErrors == null ? void 0 : typeof request.suppressSdkConsoleErrors === "boolean" ? request.suppressSdkConsoleErrors : null;
-		if (typeof request.message !== "string" || !isPermissionMode(request.permissionMode) || nonInteractivePermissions === null || suppressSdkConsoleErrors === null || typeof request.waitForCompletion !== "boolean") return null;
+		const prompt = request.prompt == null ? void 0 : isPromptInput(request.prompt) ? request.prompt : null;
+		if (typeof request.message !== "string" || !isPermissionMode(request.permissionMode) || prompt === null || nonInteractivePermissions === null || suppressSdkConsoleErrors === null || typeof request.waitForCompletion !== "boolean") return null;
 		return {
 			type: "submit_prompt",
 			requestId: request.requestId,
 			ownerGeneration,
 			message: request.message,
+			prompt: prompt ?? textPrompt(request.message),
 			permissionMode: request.permissionMode,
 			nonInteractivePermissions,
 			timeoutMs,
@@ -726,7 +867,6 @@ function parseQueueOwnerMessage(raw) {
 	}
 	return null;
 }
-
 //#endregion
 //#region src/queue-ipc-server.ts
 function makeQueueOwnerError(requestId, message, detailCode, options = {}) {
@@ -862,6 +1002,26 @@ var SessionQueueOwner = class SessionQueueOwner {
 		this.pending.push(task);
 		this.emitQueueDepth();
 	}
+	handleControlRequest(options) {
+		writeQueueMessage(options.socket, {
+			type: "accepted",
+			requestId: options.requestId,
+			ownerGeneration: this.ownerGeneration
+		});
+		options.run().then((message) => {
+			writeQueueMessage(options.socket, {
+				...message,
+				ownerGeneration: this.ownerGeneration
+			});
+		}).catch((error) => {
+			writeQueueMessage(options.socket, {
+				...makeQueueOwnerErrorFromUnknown(options.requestId, error, "QUEUE_CONTROL_REQUEST_FAILED"),
+				ownerGeneration: this.ownerGeneration
+			});
+		}).finally(() => {
+			if (!options.socket.destroyed) options.socket.end();
+		});
+	}
 	handleConnection(socket) {
 		socket.setEncoding("utf8");
 		if (this.closed) {
@@ -898,77 +1058,48 @@ var SessionQueueOwner = class SessionQueueOwner {
 				return;
 			}
 			if (request.type === "cancel_prompt") {
-				writeQueueMessage(socket, {
-					type: "accepted",
+				this.handleControlRequest({
+					socket,
 					requestId: request.requestId,
-					ownerGeneration: this.ownerGeneration
-				});
-				this.controlHandlers.cancelPrompt().then((cancelled) => {
-					writeQueueMessage(socket, {
+					run: async () => ({
 						type: "cancel_result",
 						requestId: request.requestId,
-						ownerGeneration: this.ownerGeneration,
-						cancelled
-					});
-				}).catch((error) => {
-					writeQueueMessage(socket, {
-						...makeQueueOwnerErrorFromUnknown(request.requestId, error, "QUEUE_CONTROL_REQUEST_FAILED"),
-						ownerGeneration: this.ownerGeneration
-					});
-				}).finally(() => {
-					if (!socket.destroyed) socket.end();
+						cancelled: await this.controlHandlers.cancelPrompt()
+					})
 				});
 				return;
 			}
 			if (request.type === "set_mode") {
-				writeQueueMessage(socket, {
-					type: "accepted",
+				this.handleControlRequest({
+					socket,
 					requestId: request.requestId,
-					ownerGeneration: this.ownerGeneration
-				});
-				this.controlHandlers.setSessionMode(request.modeId, request.timeoutMs).then(() => {
-					writeQueueMessage(socket, {
-						type: "set_mode_result",
-						requestId: request.requestId,
-						ownerGeneration: this.ownerGeneration,
-						modeId: request.modeId
-					});
-				}).catch((error) => {
-					writeQueueMessage(socket, {
-						...makeQueueOwnerErrorFromUnknown(request.requestId, error, "QUEUE_CONTROL_REQUEST_FAILED"),
-						ownerGeneration: this.ownerGeneration
-					});
-				}).finally(() => {
-					if (!socket.destroyed) socket.end();
+					run: async () => {
+						await this.controlHandlers.setSessionMode(request.modeId, request.timeoutMs);
+						return {
+							type: "set_mode_result",
+							requestId: request.requestId,
+							modeId: request.modeId
+						};
+					}
 				});
 				return;
 			}
 			if (request.type === "set_config_option") {
-				writeQueueMessage(socket, {
-					type: "accepted",
+				this.handleControlRequest({
+					socket,
 					requestId: request.requestId,
-					ownerGeneration: this.ownerGeneration
-				});
-				this.controlHandlers.setSessionConfigOption(request.configId, request.value, request.timeoutMs).then((response) => {
-					writeQueueMessage(socket, {
+					run: async () => ({
 						type: "set_config_option_result",
 						requestId: request.requestId,
-						ownerGeneration: this.ownerGeneration,
-						response
-					});
-				}).catch((error) => {
-					writeQueueMessage(socket, {
-						...makeQueueOwnerErrorFromUnknown(request.requestId, error, "QUEUE_CONTROL_REQUEST_FAILED"),
-						ownerGeneration: this.ownerGeneration
-					});
-				}).finally(() => {
-					if (!socket.destroyed) socket.end();
+						response: await this.controlHandlers.setSessionConfigOption(request.configId, request.value, request.timeoutMs)
+					})
 				});
 				return;
 			}
 			const task = {
 				requestId: request.requestId,
 				message: request.message,
+				prompt: request.prompt ?? textPrompt(request.message),
 				permissionMode: request.permissionMode,
 				nonInteractivePermissions: request.nonInteractivePermissions,
 				timeoutMs: request.timeoutMs,
@@ -1006,11 +1137,10 @@ var SessionQueueOwner = class SessionQueueOwner {
 		socket.on("error", () => {});
 	}
 };
-
 //#endregion
 //#region src/queue-ipc.ts
 var queue_ipc_exports = /* @__PURE__ */ __exportAll({
-	QUEUE_CONNECT_RETRY_MS: () => QUEUE_CONNECT_RETRY_MS,
+	QUEUE_CONNECT_RETRY_MS: () => 50,
 	SessionQueueOwner: () => SessionQueueOwner,
 	isProcessAlive: () => isProcessAlive,
 	probeQueueOwnerHealth: () => probeQueueOwnerHealth,
@@ -1063,7 +1193,7 @@ async function connectToQueueOwner(owner, maxAttempts = QUEUE_CONNECT_ATTEMPTS)
 	} catch (error) {
 		lastError = error;
 		if (!shouldRetryQueueConnect(error)) throw error;
-		await waitMs(QUEUE_CONNECT_RETRY_MS);
+		await waitMs(50);
 	}
 	if (lastError && !shouldRetryQueueConnect(lastError)) throw lastError;
 }
@@ -1115,27 +1245,38 @@ function assertOwnerGeneration(owner, message) {
 	});
 	return message;
 }
-async function submitToQueueOwner(owner, options) {
-	const socket = await connectToQueueOwner(owner);
+function makeMalformedQueueMessageError() {
+	return new QueueProtocolError("Queue owner sent malformed message", {
+		detailCode: "QUEUE_PROTOCOL_MALFORMED_MESSAGE",
+		origin: "queue",
+		retryable: true
+	});
+}
+function parseQueueOwnerResponseLine(owner, requestId, line) {
+	let parsed;
+	try {
+		parsed = JSON.parse(line);
+	} catch {
+		throw new QueueProtocolError("Queue owner sent invalid JSON payload", {
+			detailCode: "QUEUE_PROTOCOL_INVALID_JSON",
+			origin: "queue",
+			retryable: true
+		});
+	}
+	const parsedMessage = parseQueueOwnerMessage(parsed);
+	if (!parsedMessage) throw makeMalformedQueueMessageError();
+	const message = assertOwnerGeneration(owner, parsedMessage);
+	if (message.requestId !== requestId) throw makeMalformedQueueMessageError();
+	return message;
+}
+async function runQueueOwnerRequest(options) {
+	const socket = await connectToQueueOwner(options.owner);
 	if (!socket) return;
 	socket.setEncoding("utf8");
-	const requestId = randomUUID();
-	const request = {
-		type: "submit_prompt",
-		requestId,
-		ownerGeneration: owner.ownerGeneration,
-		message: options.message,
-		permissionMode: options.permissionMode,
-		nonInteractivePermissions: options.nonInteractivePermissions,
-		timeoutMs: options.timeoutMs,
-		suppressSdkConsoleErrors: options.suppressSdkConsoleErrors,
-		waitForCompletion: options.waitForCompletion
-	};
-	options.outputFormatter.setContext({ sessionId: options.sessionId });
 	return await new Promise((resolve, reject) => {
 		let settled = false;
-		let acknowledged = false;
 		let buffer = "";
+		const state = { acknowledged: false };
 		const finishResolve = (result) => {
 			if (settled) return;
 			settled = true;
@@ -1150,46 +1291,73 @@ async function submitToQueueOwner(owner, options) {
 			if (!socket.destroyed) socket.destroy();
 			reject(error);
 		};
+		const controls = {
+			state,
+			resolve: finishResolve,
+			reject: finishReject
+		};
 		const processLine = (line) => {
-			let parsed;
+			let message;
 			try {
-				parsed = JSON.parse(line);
-			} catch {
-				finishReject(new QueueProtocolError("Queue owner sent invalid JSON payload", {
-					detailCode: "QUEUE_PROTOCOL_INVALID_JSON",
-					origin: "queue",
-					retryable: true
-				}));
-				return;
-			}
-			const parsedMessage = parseQueueOwnerMessage(parsed);
-			if (!parsedMessage) {
-				finishReject(new QueueProtocolError("Queue owner sent malformed message", {
-					detailCode: "QUEUE_PROTOCOL_MALFORMED_MESSAGE",
-					origin: "queue",
-					retryable: true
-				}));
-				return;
-			}
-			const message = assertOwnerGeneration(owner, parsedMessage);
-			if (message.requestId !== requestId) {
-				finishReject(new QueueProtocolError("Queue owner sent malformed message", {
-					detailCode: "QUEUE_PROTOCOL_MALFORMED_MESSAGE",
-					origin: "queue",
-					retryable: true
-				}));
+				message = parseQueueOwnerResponseLine(options.owner, options.request.requestId, line);
+			} catch (error) {
+				finishReject(error);
 				return;
 			}
 			if (message.type === "accepted") {
-				acknowledged = true;
-				options.outputFormatter.setContext({ sessionId: options.sessionId });
-				if (!options.waitForCompletion) finishResolve({
-					queued: true,
-					sessionId: options.sessionId,
-					requestId
-				});
+				state.acknowledged = true;
+				options.onAccepted?.(controls);
 				return;
 			}
+			options.onMessage(message, controls);
+		};
+		socket.on("data", (chunk) => {
+			buffer += chunk;
+			let index = buffer.indexOf("\n");
+			while (index >= 0) {
+				const line = buffer.slice(0, index).trim();
+				buffer = buffer.slice(index + 1);
+				if (line.length > 0) processLine(line);
+				index = buffer.indexOf("\n");
+			}
+		});
+		socket.once("error", (error) => {
+			finishReject(error);
+		});
+		socket.once("close", () => {
+			if (settled) return;
+			options.onClose(controls);
+		});
+		socket.write(`${JSON.stringify(options.request)}\n`);
+	});
+}
+async function submitToQueueOwner(owner, options) {
+	const requestId = randomUUID();
+	const request = {
+		type: "submit_prompt",
+		requestId,
+		ownerGeneration: owner.ownerGeneration,
+		message: options.message,
+		prompt: options.prompt,
+		permissionMode: options.permissionMode,
+		nonInteractivePermissions: options.nonInteractivePermissions,
+		timeoutMs: options.timeoutMs,
+		suppressSdkConsoleErrors: options.suppressSdkConsoleErrors,
+		waitForCompletion: options.waitForCompletion
+	};
+	options.outputFormatter.setContext({ sessionId: options.sessionId });
+	return await runQueueOwnerRequest({
+		owner,
+		request,
+		onAccepted: ({ resolve }) => {
+			options.outputFormatter.setContext({ sessionId: options.sessionId });
+			if (!options.waitForCompletion) resolve({
+				queued: true,
+				sessionId: options.sessionId,
+				requestId
+			});
+		},
+		onMessage: (message, { state, resolve, reject }) => {
 			if (message.type === "error") {
 				options.outputFormatter.setContext({ sessionId: options.sessionId });
 				const queueErrorAlreadyEmitted = options.errorEmissionPolicy?.queueErrorAlreadyEmitted ?? true;
@@ -1204,7 +1372,7 @@ async function submitToQueueOwner(owner, options) {
 					});
 					options.outputFormatter.flush();
 				}
-				finishReject(new QueueConnectionError(message.message, {
+				reject(new QueueConnectionError(message.message, {
 					outputCode: message.code,
 					detailCode: message.detailCode,
 					origin: message.origin ?? "queue",
@@ -1214,8 +1382,8 @@ async function submitToQueueOwner(owner, options) {
 				}));
 				return;
 			}
-			if (!acknowledged) {
-				finishReject(new QueueConnectionError("Queue owner did not acknowledge request", {
+			if (!state.acknowledged) {
+				reject(new QueueConnectionError("Queue owner did not acknowledge request", {
 					detailCode: "QUEUE_ACK_MISSING",
 					origin: "queue",
 					retryable: true
@@ -1228,32 +1396,18 @@ async function submitToQueueOwner(owner, options) {
 			}
 			if (message.type === "result") {
 				options.outputFormatter.flush();
-				finishResolve(message.result);
+				resolve(message.result);
 				return;
 			}
-			finishReject(new QueueProtocolError("Queue owner returned unexpected response", {
+			reject(new QueueProtocolError("Queue owner returned unexpected response", {
 				detailCode: "QUEUE_PROTOCOL_UNEXPECTED_RESPONSE",
 				origin: "queue",
 				retryable: true
 			}));
-		};
-		socket.on("data", (chunk) => {
-			buffer += chunk;
-			let index = buffer.indexOf("\n");
-			while (index >= 0) {
-				const line = buffer.slice(0, index).trim();
-				buffer = buffer.slice(index + 1);
-				if (line.length > 0) processLine(line);
-				index = buffer.indexOf("\n");
-			}
-		});
-		socket.once("error", (error) => {
-			finishReject(error);
-		});
-		socket.once("close", () => {
-			if (settled) return;
-			if (!acknowledged) {
-				finishReject(new QueueConnectionError("Queue owner disconnected before acknowledging request", {
+		},
+		onClose: ({ state, resolve, reject }) => {
+			if (!state.acknowledged) {
+				reject(new QueueConnectionError("Queue owner disconnected before acknowledging request", {
 					detailCode: "QUEUE_DISCONNECTED_BEFORE_ACK",
 					origin: "queue",
 					retryable: true
@@ -1261,80 +1415,28 @@ async function submitToQueueOwner(owner, options) {
 				return;
 			}
 			if (!options.waitForCompletion) {
-				finishResolve({
+				resolve({
 					queued: true,
 					sessionId: options.sessionId,
 					requestId
 				});
 				return;
 			}
-			finishReject(new QueueConnectionError("Queue owner disconnected before prompt completion", {
+			reject(new QueueConnectionError("Queue owner disconnected before prompt completion", {
 				detailCode: "QUEUE_DISCONNECTED_BEFORE_COMPLETION",
 				origin: "queue",
 				retryable: true
 			}));
-		});
-		socket.write(`${JSON.stringify(request)}\n`);
+		}
 	});
 }
 async function submitControlToQueueOwner(owner, request, isExpectedResponse) {
-	const socket = await connectToQueueOwner(owner);
-	if (!socket) return;
-	socket.setEncoding("utf8");
-	return await new Promise((resolve, reject) => {
-		let settled = false;
-		let acknowledged = false;
-		let buffer = "";
-		const finishResolve = (result) => {
-			if (settled) return;
-			settled = true;
-			socket.removeAllListeners();
-			if (!socket.destroyed) socket.end();
-			resolve(result);
-		};
-		const finishReject = (error) => {
-			if (settled) return;
-			settled = true;
-			socket.removeAllListeners();
-			if (!socket.destroyed) socket.destroy();
-			reject(error);
-		};
-		const processLine = (line) => {
-			let parsed;
-			try {
-				parsed = JSON.parse(line);
-			} catch {
-				finishReject(new QueueProtocolError("Queue owner sent invalid JSON payload", {
-					detailCode: "QUEUE_PROTOCOL_INVALID_JSON",
-					origin: "queue",
-					retryable: true
-				}));
-				return;
-			}
-			const parsedMessage = parseQueueOwnerMessage(parsed);
-			if (!parsedMessage) {
-				finishReject(new QueueProtocolError("Queue owner sent malformed message", {
-					detailCode: "QUEUE_PROTOCOL_MALFORMED_MESSAGE",
-					origin: "queue",
-					retryable: true
-				}));
-				return;
-			}
-			const message = assertOwnerGeneration(owner, parsedMessage);
-			if (message.requestId !== request.requestId) {
-				finishReject(new QueueProtocolError("Queue owner sent malformed message", {
-					detailCode: "QUEUE_PROTOCOL_MALFORMED_MESSAGE",
-					origin: "queue",
-					retryable: true
-				}));
-				return;
-			}
-			if (message.type === "accepted") {
-				acknowledged = true;
-				return;
-			}
+	return await runQueueOwnerRequest({
+		owner,
+		request,
+		onMessage: (message, { state, resolve, reject }) => {
 			if (message.type === "error") {
-				finishReject(new QueueConnectionError(message.message, {
+				reject(new QueueConnectionError(message.message, {
 					outputCode: message.code,
 					detailCode: message.detailCode,
 					origin: message.origin ?? "queue",
@@ -1343,8 +1445,8 @@ async function submitControlToQueueOwner(owner, request, isExpectedResponse) {
 				}));
 				return;
 			}
-			if (!acknowledged) {
-				finishReject(new QueueConnectionError("Queue owner did not acknowledge request", {
+			if (!state.acknowledged) {
+				reject(new QueueConnectionError("Queue owner did not acknowledge request", {
 					detailCode: "QUEUE_ACK_MISSING",
 					origin: "queue",
 					retryable: true
@@ -1352,45 +1454,30 @@ async function submitControlToQueueOwner(owner, request, isExpectedResponse) {
 				return;
 			}
 			if (!isExpectedResponse(message)) {
-				finishReject(new QueueProtocolError("Queue owner returned unexpected response", {
+				reject(new QueueProtocolError("Queue owner returned unexpected response", {
 					detailCode: "QUEUE_PROTOCOL_UNEXPECTED_RESPONSE",
 					origin: "queue",
 					retryable: true
 				}));
 				return;
 			}
-			finishResolve(message);
-		};
-		socket.on("data", (chunk) => {
-			buffer += chunk;
-			let index = buffer.indexOf("\n");
-			while (index >= 0) {
-				const line = buffer.slice(0, index).trim();
-				buffer = buffer.slice(index + 1);
-				if (line.length > 0) processLine(line);
-				index = buffer.indexOf("\n");
-			}
-		});
-		socket.once("error", (error) => {
-			finishReject(error);
-		});
-		socket.once("close", () => {
-			if (settled) return;
-			if (!acknowledged) {
-				finishReject(new QueueConnectionError("Queue owner disconnected before acknowledging request", {
+			resolve(message);
+		},
+		onClose: ({ state, reject }) => {
+			if (!state.acknowledged) {
+				reject(new QueueConnectionError("Queue owner disconnected before acknowledging request", {
 					detailCode: "QUEUE_DISCONNECTED_BEFORE_ACK",
 					origin: "queue",
 					retryable: true
 				}));
 				return;
 			}
-			finishReject(new QueueConnectionError("Queue owner disconnected before responding", {
+			reject(new QueueConnectionError("Queue owner disconnected before responding", {
 				detailCode: "QUEUE_DISCONNECTED_BEFORE_COMPLETION",
 				origin: "queue",
 				retryable: true
 			}));
-		});
-		socket.write(`${JSON.stringify(request)}\n`);
+		}
 	});
 }
 async function submitCancelToQueueOwner(owner) {
@@ -1513,7 +1600,7 @@ async function trySetConfigOptionOnRunningOwner(sessionId, configId, value, time
 		retryable: true
 	});
 }
-
 //#endregion
-export { EXIT_CODES as A, PermissionPromptUnavailableError as B, exitCodeForOutputErrorCode as C, isAcpResourceNotFoundError as D, isAcpQueryClosedBeforeResponseError as E, AuthPolicyError as F, SessionModeReplayError as H, ClaudeAcpSessionCreateTimeoutError as I, CopilotAcpUnsupportedError as L, OUTPUT_FORMATS as M, SESSION_RECORD_SCHEMA as N, normalizeOutputError as O, AgentSpawnError as P, GeminiAcpStartupTimeoutError as R, startPerfTimer as S, formatErrorMessage as T, SessionNotFoundError as U, QueueConnectionError as V, SessionResolutionError as W, getPerfMetricsSnapshot as _, trySetConfigOptionOnRunningOwner as a, resetPerfMetrics as b, SessionQueueOwner as c, releaseQueueOwnerLease as d, terminateProcess as f, formatPerfMetric as g, waitMs as h, tryCancelOnRunningOwner as i, NON_INTERACTIVE_PERMISSION_POLICIES as j, AUTH_POLICIES as k, isProcessAlive as l, tryAcquireQueueOwnerLease as m, probeQueueOwnerHealth as n, trySetModeOnRunningOwner as o, terminateQueueOwnerForSession as p, queue_ipc_exports as r, trySubmitToRunningOwner as s, QUEUE_CONNECT_RETRY_MS as t, refreshQueueOwnerLease as u, incrementPerfCounter as v, extractAcpError as w, setPerfGauge as x, measurePerf as y, PermissionDeniedError as z };
-//# sourceMappingURL=queue-ipc-CEetz4_7.js.map
+export { OUTPUT_FORMATS as A, CopilotAcpUnsupportedError as B, exitCodeForOutputErrorCode as C, AUTH_POLICIES as D, normalizeOutputError as E, promptToDisplayText as F, SessionModeReplayError as G, PermissionDeniedError as H, textPrompt as I, extractAcpError as J, SessionNotFoundError as K, AgentSpawnError as L, PromptInputValidationError as M, mergePromptSourceWithText as N, EXIT_CODES as O, parsePromptSource as P, AuthPolicyError as R, startPerfTimer as S, isAcpQueryClosedBeforeResponseError as T, PermissionPromptUnavailableError as U, GeminiAcpStartupTimeoutError as V, QueueConnectionError as W, isAcpResourceNotFoundError as Y, getPerfMetricsSnapshot as _, trySetConfigOptionOnRunningOwner as a, resetPerfMetrics as b, SessionQueueOwner as c, releaseQueueOwnerLease as d, terminateProcess as f, formatPerfMetric as g, waitMs as h, tryCancelOnRunningOwner as i, SESSION_RECORD_SCHEMA as j, NON_INTERACTIVE_PERMISSION_POLICIES as k, isProcessAlive as l, tryAcquireQueueOwnerLease as m, probeQueueOwnerHealth as n, trySetModeOnRunningOwner as o, terminateQueueOwnerForSession as p, SessionResolutionError as q, queue_ipc_exports as r, trySubmitToRunningOwner as s, QUEUE_CONNECT_RETRY_MS as t, refreshQueueOwnerLease as u, incrementPerfCounter as v, formatErrorMessage as w, setPerfGauge as x, measurePerf as y, ClaudeAcpSessionCreateTimeoutError as z };
+
+//# sourceMappingURL=queue-ipc-EQLpBMKv.js.map