codex-relay 1.0.2 → 1.0.3

package/dist/src.js

@@ -1217,14 +1217,24 @@ function createApp(options = {}) {
 			return c.json(apiError("not_found", "Image attachment not found."), 404);
 		}
 		const fileStat = statSync(filePath);
+		if (!fileStat.isFile() || fileStat.size === 0) {
+			relayDebugLog("image_attachment.rejected", {
+				attachmentId,
+				reason: fileStat.isFile() ? "empty_file" : "not_file",
+				userAgent: c.req.header("user-agent")
+			});
+			return c.json(apiError("not_found", "Image attachment not found."), 404);
+		}
+		const imageBytes = await readFile(filePath);
 		relayDebugLog("image_attachment.served", {
 			attachmentId,
 			mimeType: imageMimeType(filePath),
-			size: fileStat.size,
+			size: imageBytes.length,
 			userAgent: c.req.header("user-agent")
 		});
-		return new Response(await readFile(filePath), { headers: {
+		return new Response(imageBytes, { headers: {
 			"cache-control": "private, max-age=31536000, immutable",
+			"content-length": String(imageBytes.length),
 			"content-type": imageMimeType(filePath)
 		} });
 	});
@@ -2517,7 +2527,11 @@ async function runAppServerPromptStreamed(input) {
 					case "item/completed": {
 						const item = params?.item;
 						if (!item || typeof item !== "object") return;
-						if (isDuplicateInitialUserMessage(input.messagesByThreadId, activeThreadId, item, userMessage.id, prompt)) return;
+						const canonicalUserMessage = replaceDuplicateInitialUserMessage(input.messagesByThreadId, activeThreadId, firstString(params, ["turnId"]) ?? activeTurnId, item, userMessage.id, prompt);
+						if (canonicalUserMessage) {
+							userMessage = canonicalUserMessage;
+							return;
+						}
 						const turnId = firstString(params, ["turnId"]) ?? activeTurnId;
 						const message = upsertAppServerItemMessage(input.messagesByThreadId, activeThreadId, turnId, item);
 						if (!message) return;
@@ -2750,7 +2764,11 @@ async function runAppServerPromptStreamed(input) {
 		debugStream("start turn complete", activeThreadId, activeTurnId);
 		let streamedReturnedItem = false;
 		for (const item of turn.items) {
-			if (isDuplicateInitialUserMessage(input.messagesByThreadId, activeThreadId, item, userMessage.id, displayPrompt)) continue;
+			const canonicalUserMessage = replaceDuplicateInitialUserMessage(input.messagesByThreadId, activeThreadId, activeTurnId, item, userMessage.id, displayPrompt);
+			if (canonicalUserMessage) {
+				userMessage = canonicalUserMessage;
+				continue;
+			}
 			const message = upsertAppServerItemMessage(input.messagesByThreadId, activeThreadId, activeTurnId, item);
 			if (!message) continue;
 			streamedReturnedItem = true;
@@ -3062,6 +3080,12 @@ function upsertAppServerItemMessage(messagesByThreadId, threadId, turnId, item)
 		turnId: message.turnId
 	});
 }
+function replaceDuplicateInitialUserMessage(messagesByThreadId, threadId, turnId, item, localMessageId, prompt) {
+	if (!isDuplicateInitialUserMessage(messagesByThreadId, threadId, item, localMessageId, prompt)) return;
+	const message = mapAppServerItem(threadId, appServerTurnShell(turnId), item);
+	if (!message) return;
+	return replaceMessage(messagesByThreadId, threadId, localMessageId, messageWithReplacementDetail(message, localMessageId));
+}
 function isDuplicateInitialUserMessage(messagesByThreadId, threadId, item, localMessageId, prompt) {
 	if (item.type !== "userMessage" || !("content" in item) || !Array.isArray(item.content)) return false;
 	const localMessage = messagesByThreadId.get(threadId)?.find((message) => message.id === localMessageId);
@@ -3069,6 +3093,15 @@ function isDuplicateInitialUserMessage(messagesByThreadId, threadId, item, local
 	const normalizedPrompt = stripPromptSkillMentions(prompt, skills);
 	return stripPromptSkillMentions(localMessage?.content ?? "", skills) === normalizedPrompt && stripPromptSkillMentions(appServerUserMessageText(item), skills) === normalizedPrompt;
 }
+function messageWithReplacementDetail(message, replacesMessageId) {
+	return ChatMessageSchema.parse({
+		...message,
+		details: {
+			...message.details,
+			replacesMessageId
+		}
+	});
+}
 function appServerUserMessageText(item) {
 	const skills = appServerUserMessageSkills(item);
 	return promptMarkdownWithSkills(promptWithAppServerImageReferences(item.content.map((content) => {
@@ -3102,6 +3135,7 @@ function appServerUserMessageDetails(item) {
 async function saveUploadedImageAttachment(file) {
 	if (!file.type.startsWith("image/")) throw new Error(`Unsupported attachment type: ${file.type || "unknown"}`);
 	if (file.size > IMAGE_ATTACHMENT_MAX_BYTES) throw new Error(`Image ${file.name || "attachment"} is too large.`);
+	if (file.size === 0) throw new Error(`Image ${file.name || "attachment"} is empty.`);
 	const attachmentId = `${Date.now()}-${randomUUID()}${imageExtension(file.name, file.type)}`;
 	const filePath = resolve(imageAttachmentDirectory, attachmentId);
 	await mkdir(imageAttachmentDirectory, { recursive: true });
@@ -3152,7 +3186,7 @@ function materializeLocalImageFile(path, name = basename(path)) {
 	const filePath = localImageFilePath(path);
 	if (!filePath || !existsSync(filePath)) return;
 	const fileStat = statSync(filePath);
-	if (!fileStat.isFile() || fileStat.size > IMAGE_ATTACHMENT_MAX_BYTES) return;
+	if (!fileStat.isFile() || fileStat.size === 0 || fileStat.size > IMAGE_ATTACHMENT_MAX_BYTES) return;
 	const buffer = readFileSync(filePath);
 	const mimeType = imageMimeType(filePath);
 	const attachmentId = `${createHash("sha256").update(buffer).digest("hex").slice(0, 24)}${imageExtension(name, mimeType)}`;
@@ -3268,6 +3302,17 @@ function updateMessage(messagesByThreadId, threadId, messageId, update) {
 	messages[index] = next;
 	return next;
 }
+function replaceMessage(messagesByThreadId, threadId, messageId, replacement) {
+	const messages = messagesByThreadId.get(threadId) ?? [];
+	const index = messages.findIndex((message) => message.id === messageId);
+	if (index === -1) throw new Error(`Unknown message: ${messageId}`);
+	const next = ChatMessageSchema.parse({
+		...replacement,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+	});
+	messages[index] = next;
+	return next;
+}
 function replaceLocalThreadId(threads, messagesByThreadId, liveThreads, currentThreadId, sdkThreadId) {
 	if (!sdkThreadId || sdkThreadId === currentThreadId) return currentThreadId;
 	const metadata = threads.get(currentThreadId);
@@ -3628,26 +3673,58 @@ function mergeThreadMessagePages(incomingMessages, cachedMessages) {
 	return dedupeThreadMessages(Array.from(byId.values()));
 }
 function dedupeThreadMessages(messages) {
+	const byCrossSourceKey = /* @__PURE__ */ new Map();
 	const byImageKey = /* @__PURE__ */ new Map();
 	const deduped = [];
 	const sortedMessages = [...messages].sort((left, right) => left.createdAt.localeCompare(right.createdAt));
 	for (const message of sortedMessages) {
+		const crossSourceKey = crossSourceMessageKey(message);
+		const crossSourceIndex = crossSourceKey ? byCrossSourceKey.get(crossSourceKey) : void 0;
+		if (crossSourceIndex !== void 0) {
+			const existingMessage = deduped[crossSourceIndex];
+			if (existingMessage && shouldPreferDuplicateThreadMessage(message, existingMessage)) deduped[crossSourceIndex] = message;
+			continue;
+		}
+		const previous = deduped[deduped.length - 1];
+		if (previous && isDuplicateCrossSourceMessage(previous, message)) {
+			if (shouldPreferDuplicateThreadMessage(message, previous)) deduped[deduped.length - 1] = message;
+			continue;
+		}
 		const imageKey = userImageMessageKey(message);
 		if (!imageKey) {
+			if (crossSourceKey) byCrossSourceKey.set(crossSourceKey, deduped.length);
 			deduped.push(message);
 			continue;
 		}
 		const existingIndex = byImageKey.get(imageKey);
 		if (existingIndex === void 0) {
 			byImageKey.set(imageKey, deduped.length);
+			if (crossSourceKey) byCrossSourceKey.set(crossSourceKey, deduped.length);
 			deduped.push(message);
 			continue;
 		}
 		const existingMessage = deduped[existingIndex];
-		if (existingMessage && shouldPreferDuplicateImageMessage(message, existingMessage)) deduped[existingIndex] = message;
+		if (existingMessage && shouldPreferDuplicateThreadMessage(message, existingMessage)) deduped[existingIndex] = message;
 	}
 	return deduped;
 }
+function crossSourceMessageKey(message) {
+	if (!isSyntheticHistoryMessageId(message.id)) return;
+	if (message.role !== "user" && message.role !== "assistant") return;
+	return [
+		message.threadId,
+		message.createdAt.slice(0, 19),
+		message.role,
+		message.kind,
+		message.content
+	].join("\n");
+}
+function isDuplicateCrossSourceMessage(previous, next) {
+	return previous.id !== next.id && (isSyntheticHistoryMessageId(previous.id) || isSyntheticHistoryMessageId(next.id)) && previous.threadId === next.threadId && previous.role === next.role && previous.kind === next.kind && previous.content === next.content;
+}
+function isSyntheticHistoryMessageId(id) {
+	return id.startsWith("msg-") || id.startsWith("rollout:");
+}
 function userImageMessageKey(message) {
 	if (message.role !== "user") return;
 	const imageUris = imageAttachmentUris(message);
@@ -3665,9 +3742,11 @@ function imageAttachmentUris(message) {
 		return ["url" in attachment ? attachment.url : void 0, "path" in attachment ? attachment.path : void 0].filter((value) => typeof value === "string" && value.length > 0);
 	});
 }
-function shouldPreferDuplicateImageMessage(candidate, existing) {
+function shouldPreferDuplicateThreadMessage(candidate, existing) {
 	if (existing.id.startsWith("rollout") && !candidate.id.startsWith("rollout")) return true;
 	if (!existing.id.startsWith("rollout") && candidate.id.startsWith("rollout")) return false;
+	if (!existing.turnId && candidate.turnId) return true;
+	if (existing.turnId && !candidate.turnId) return false;
 	return candidate.content.length < existing.content.length;
 }
 function rememberRolloutThreadMessages(threads, thread, messages, messageCountLowerBound = messages.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-relay",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Local Codex Relay CLI bridge for the Codex Relay mobile app.",
   "repository": {
     "type": "git",