acpx 0.1.16 → 0.2.0

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

@@ -99,6 +99,150 @@ var PermissionPromptUnavailableError = class extends AcpxOperationalError {
 	}
 };
 
+//#endregion
+//#region src/prompt-content.ts
+function asRecord$3(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function isTextBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "text" && typeof record.text === "string";
+}
+function isImageBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "image" && typeof record.mimeType === "string" && typeof record.data === "string";
+}
+function isResourceLinkBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "resource_link" && typeof record.uri === "string" && (record.title === void 0 || typeof record.title === "string") && (record.name === void 0 || typeof record.name === "string");
+}
+function isResourcePayload(value) {
+	const record = asRecord$3(value);
+	if (!record || typeof record.uri !== "string") return false;
+	return record.text === void 0 || typeof record.text === "string";
+}
+function isResourceBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "resource" && isResourcePayload(record.resource);
+}
+function isContentBlock(value) {
+	return isTextBlock(value) || isImageBlock(value) || isResourceLinkBlock(value) || isResourceBlock(value);
+}
+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);
+		return isPromptInput(parsed) ? parsed : void 0;
+	} catch {
+		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/acp-error-shapes.ts
+const RESOURCE_NOT_FOUND_ACP_CODES = new Set([-32001, -32002]);
+function asRecord$2(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function toAcpErrorPayload(value) {
+	const record = asRecord$2(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$2(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 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$2(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/types.ts
 const EXIT_CODES = {
@@ -135,7 +279,6 @@ 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 +317,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)
-	};
-}
-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
+		acp: extractAcpError(record.acp)
 	};
 }
-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 +331,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);
@@ -595,12 +697,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,
@@ -862,6 +966,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 +1022,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,
@@ -1115,27 +1210,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 +1256,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 +1337,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 +1347,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 +1361,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 +1380,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 +1410,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 +1419,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) {
@@ -1515,5 +1567,5 @@ async function trySetConfigOptionOnRunningOwner(sessionId, configId, value, time
 }
 
 //#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, ClaudeAcpSessionCreateTimeoutError as B, exitCodeForOutputErrorCode as C, AUTH_POLICIES as D, normalizeOutputError as E, parsePromptSource as F, QueueConnectionError as G, GeminiAcpStartupTimeoutError as H, promptToDisplayText as I, SessionResolutionError as J, SessionModeReplayError as K, textPrompt as L, extractAcpError as M, isAcpResourceNotFoundError as N, EXIT_CODES as O, mergePromptSourceWithText as P, AgentSpawnError as R, startPerfTimer as S, isAcpQueryClosedBeforeResponseError as T, PermissionDeniedError as U, CopilotAcpUnsupportedError as V, PermissionPromptUnavailableError 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, 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, SessionNotFoundError 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, AuthPolicyError as z };
+//# sourceMappingURL=queue-ipc-C8StWiZt.js.map