codex-relay 1.4.0 → 1.4.1

package/dist/src.js

@@ -1418,6 +1418,7 @@ function createApp(options = {}) {
 	const pendingApprovals = /* @__PURE__ */ new Map();
 	const resolvedApprovals = /* @__PURE__ */ new Map();
 	const queuedInputsByThreadId = /* @__PURE__ */ new Map();
+	const threadOperationTails = /* @__PURE__ */ new Map();
 	const workspaceTerminalSessions = /* @__PURE__ */ new Map();
 	const activeAppServerTurnIdsByThreadId = /* @__PURE__ */ new Map();
 	const appServerHistoryLoadsByThreadId = /* @__PURE__ */ new Map();
@@ -1425,6 +1426,15 @@ function createApp(options = {}) {
 	const secureSessionsByTokenHash = /* @__PURE__ */ new Map();
 	const activeStreamControllers = /* @__PURE__ */ new Set();
 	const threadOptions = { workingDirectory: workspacePath };
+	function runThreadOperation(threadId, operation) {
+		const result = (threadOperationTails.get(threadId) ?? Promise.resolve()).then(operation, operation);
+		const tail = result.then(() => void 0, () => void 0);
+		threadOperationTails.set(threadId, tail);
+		tail.finally(() => {
+			if (threadOperationTails.get(threadId) === tail) threadOperationTails.delete(threadId);
+		});
+		return result;
+	}
 	const pushNotificationDispatcher = options.pairing ? createPushNotificationDispatcher({
 		sender: options.pushNotificationSender ?? createExpoPushNotificationSender(),
 		sessions: options.pairing.sessions
@@ -2392,44 +2402,46 @@ function createApp(options = {}) {
 	});
 	app.post("/v1/threads/:threadId/input", async (c) => {
 		const threadId = c.req.param("threadId");
-		const knownThread = await ensureKnownThread({
-			appServer,
-			threadId,
-			messagesByThreadId,
-			threads
-		});
-		if (!knownThread) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("not_found", `Thread ${threadId} is not known to this server.`), 404);
-		if (!appServer) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("unsupported", "Running-thread input requires the Codex app-server."), 409);
-		if (knownThread.state !== "running") return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("thread_not_running", `Thread ${threadId} is not currently running.`), 409);
-		const parsed = await parseRequestJson(c, options.pairing, secureSessionsByTokenHash, RunThreadRequestSchema);
-		if (!parsed.success) return secureJson(c, options.pairing, secureSessionsByTokenHash, validationError(parsed.error), 400);
-		const runOptions = withRuntimePreferences(await preferences.read(knownThread.cwd ?? workspacePath), parsed.data);
-		const skills = runOptions.skills ?? [];
-		const prompt = runOptions.prompt;
-		const queuedInputs = queuedInputsByThreadId.get(threadId) ?? [];
-		const queuedInput = {
-			attachments: runOptions.attachments ?? [],
-			id: randomUUID(),
-			prompt,
-			runOptions,
-			skills,
-			workspacePath: knownThread.cwd ?? workspacePath
-		};
-		queuedInputs.push(queuedInput);
-		queuedInputsByThreadId.set(threadId, queuedInputs);
-		const thread = updateThread(threads, messagesByThreadId, threadId, {
-			state: "running",
-			lastPrompt: promptWithAttachmentReferences(prompt, runOptions.attachments ?? []),
-			lastError: void 0,
-			...runtimeMetadataFromOptions(runOptions)
-		});
-		const response = SubmitThreadInputResponseSchema.parse({
-			acceptedAs: "queued",
-			input: queuedThreadInputSummary(queuedInput),
-			queueLength: queuedInputsByThreadId.get(threadId)?.length ?? 0,
-			thread
+		return runThreadOperation(threadId, async () => {
+			const knownThread = await ensureKnownThread({
+				appServer,
+				threadId,
+				messagesByThreadId,
+				threads
+			});
+			if (!knownThread) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("not_found", `Thread ${threadId} is not known to this server.`), 404);
+			if (!appServer) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("unsupported", "Running-thread input requires the Codex app-server."), 409);
+			if (knownThread.state !== "running") return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("thread_not_running", `Thread ${threadId} is not currently running.`), 409);
+			const parsed = await parseRequestJson(c, options.pairing, secureSessionsByTokenHash, RunThreadRequestSchema);
+			if (!parsed.success) return secureJson(c, options.pairing, secureSessionsByTokenHash, validationError(parsed.error), 400);
+			const runOptions = withRuntimePreferences(await preferences.read(knownThread.cwd ?? workspacePath), parsed.data);
+			const skills = runOptions.skills ?? [];
+			const prompt = runOptions.prompt;
+			const queuedInputs = queuedInputsByThreadId.get(threadId) ?? [];
+			const queuedInput = {
+				attachments: runOptions.attachments ?? [],
+				id: randomUUID(),
+				prompt,
+				runOptions,
+				skills,
+				workspacePath: knownThread.cwd ?? workspacePath
+			};
+			queuedInputs.push(queuedInput);
+			queuedInputsByThreadId.set(threadId, queuedInputs);
+			const thread = updateThread(threads, messagesByThreadId, threadId, {
+				state: "running",
+				lastPrompt: promptWithAttachmentReferences(prompt, runOptions.attachments ?? []),
+				lastError: void 0,
+				...runtimeMetadataFromOptions(runOptions)
+			});
+			const response = SubmitThreadInputResponseSchema.parse({
+				acceptedAs: "queued",
+				input: queuedThreadInputSummary(queuedInput),
+				queueLength: queuedInputsByThreadId.get(threadId)?.length ?? 0,
+				thread
+			});
+			return secureJson(c, options.pairing, secureSessionsByTokenHash, response, 202);
 		});
-		return secureJson(c, options.pairing, secureSessionsByTokenHash, response, 202);
 	});
 	app.delete("/v1/threads/:threadId/input/:inputId", async (c) => {
 		const threadId = c.req.param("threadId");
@@ -2650,6 +2662,7 @@ function createApp(options = {}) {
 					messagesByThreadId,
 					pendingApprovals,
 					queuedInputsByThreadId,
+					runThreadOperation,
 					prompt: rawPrompt,
 					attachments: runOptions.attachments ?? [],
 					secureSession,
@@ -2862,6 +2875,7 @@ async function runPromptStreamed(input) {
 			messagesByThreadId: input.messagesByThreadId,
 			pendingApprovals: input.pendingApprovals,
 			queuedInputsByThreadId: input.queuedInputsByThreadId,
+			runThreadOperation: input.runThreadOperation,
 			prompt: input.prompt,
 			runOptions: input.runOptions,
 			secureSession: input.secureSession,
@@ -3693,11 +3707,16 @@ async function runAppServerPromptStreamed(input) {
 					case "turn/failed": {
 						const state = terminalTurnState(notification.method, params);
 						const terminalTurnId = firstString(params, ["turnId"]) ?? turnIdFromParams(params) ?? activeTurnId;
-						finishTerminalTurn({
-							lastError: state === "failed" ? turnErrorMessage(params) : void 0,
-							method: notification.method,
-							state,
-							turnId: terminalTurnId
+						input.runThreadOperation(activeThreadId, async () => {
+							finishTerminalTurn({
+								lastError: state === "failed" ? turnErrorMessage(params) : void 0,
+								method: notification.method,
+								state,
+								turnId: terminalTurnId
+							});
+						}).catch((error) => {
+							cleanupNotificationHandler();
+							rejectCompleted(error);
 						});
 						return;
 					}
@@ -5721,10 +5740,14 @@ function isApprovalServerRequest(method) {
 }
 function observeAppServerPushNotifications(appServer, dispatcher) {
 	const dispatchedEventIds = /* @__PURE__ */ new Set();
-	const dispatch = (event, eventId) => {
-		if (dispatchedEventIds.has(eventId)) return;
+	const subagentThreadIds = /* @__PURE__ */ new Set();
+	const rememberEventId = (eventId) => {
 		if (dispatchedEventIds.size >= 1e3) dispatchedEventIds.clear();
 		dispatchedEventIds.add(eventId);
+	};
+	const dispatch = (event, eventId) => {
+		if (dispatchedEventIds.has(eventId)) return;
+		rememberEventId(eventId);
 		dispatcher.dispatch(event).catch((error) => {
 			relayDebugLog("push_notification.dispatch_failed", {
 				error: errorMessage(error),
@@ -5735,9 +5758,15 @@ function observeAppServerPushNotifications(appServer, dispatcher) {
 		});
 	};
 	appServer.onNotification((notification) => {
+		rememberSubagentThreadIds(notification, subagentThreadIds);
 		const event = pushNotificationEventFromTerminalNotification(notification);
 		if (!event) return;
-		dispatch(event, `${event.intent}:${event.threadId}:${event.turnId ?? ""}`);
+		const eventId = `${event.intent}:${event.threadId}:${event.turnId ?? ""}`;
+		if (subagentThreadIds.delete(event.threadId)) {
+			rememberEventId(eventId);
+			return;
+		}
+		dispatch(event, eventId);
 	});
 	appServer.onRequest((request) => {
 		const event = pushNotificationEventFromApprovalRequest(request);
@@ -5745,6 +5774,15 @@ function observeAppServerPushNotifications(appServer, dispatcher) {
 		dispatch(event, `${event.intent}:${event.threadId}:${event.turnId ?? ""}:${request.id}`);
 	});
 }
+function rememberSubagentThreadIds(notification, subagentThreadIds) {
+	const item = objectRecord(recordParams(notification)?.item);
+	if (item?.type !== "collabAgentToolCall" || ![
+		"spawnAgent",
+		"sendInput",
+		"resumeAgent"
+	].includes(String(item.tool))) return;
+	for (const threadId of stringArray(item.receiverThreadIds)) subagentThreadIds.add(threadId);
+}
 function pushNotificationEventFromTerminalNotification(notification) {
 	if (notification.method !== "turn/completed" && notification.method !== "turn/failed") return;
 	const params = recordParams(notification);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-relay",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Local Codex Relay CLI bridge for the Codex Relay mobile app.",
   "license": "Apache-2.0",
   "repository": {