codex-relay 1.5.0 → 1.5.2

package/README.md

@@ -20,7 +20,12 @@ npx codex-relay@latest
 
 The CLI prints a QR code, a mobile URL, and a `codex-relay://pair...` pairing payload. Scan the QR code from the mobile app. If the relay detects multiple possible network addresses, the QR includes them and the app automatically uses the first address it can reach. If scanning is not available, paste the full pairing payload into the app.
 
-When the app shows an approval code, approve it on the computer:
+When the app shows an approval code, the interactive relay terminal shows the
+same code and asks `Approve? [y/N]`. Check that the codes match, then type `y`
+and press Enter in that terminal. Other input leaves the request unapproved.
+No second terminal is needed.
+
+For background relays or non-interactive output, use the approval command:
 
 ```sh
 npx codex-relay@latest approve XXXX-XXXX
@@ -28,6 +33,14 @@ npx codex-relay@latest approve XXXX-XXXX
 
 After approval, the phone can list Codex threads, start new work, stream messages, and handle approval prompts from the local Codex runtime.
 
+The thread list shows the 20 most recently active, non-archived root sessions across
+workspaces. This does not delete or archive older sessions. Set
+`CODEX_RELAY_THREAD_LIST_LIMIT=100` before starting the relay to show more history.
+The relay reads Codex's session index so refreshing the list does not repeatedly
+parse large legacy rollout files. An empty index triggers a bounded history lookup;
+legacy files copied into a partially populated index may need to be discovered by
+Codex before they appear in the relay.
+
 ## Shared Terminal and Mobile Sessions
 
 On macOS, Codex Relay prefers Codex's shared Unix socket so terminal and mobile clients can follow the same live sessions. If the shared app-server cannot start or initialize, the relay prints a warning and continues with a private app-server.

package/dist/src.js

@@ -188,34 +188,32 @@ var CodexAppServerClient = class {
 	initialize() {
 		return this.ensureInitialized();
 	}
-	async listThreads(limit = 80) {
-		const threads = [];
-		const seenCursors = /* @__PURE__ */ new Set();
-		let cursor;
-		do {
-			const response = await this.request("thread/list", {
-				archived: false,
-				limit,
-				sortDirection: "desc",
-				sortKey: "recency_at",
-				sourceKinds: [
-					"cli",
-					"vscode",
-					"exec",
-					"appServer"
-				],
-				...cursor ? {
-					cursor,
-					useStateDbOnly: true
-				} : {}
-			});
-			threads.push(...response.data);
-			const nextCursor = response.nextCursor ?? void 0;
-			if (!nextCursor || seenCursors.has(nextCursor)) break;
-			seenCursors.add(nextCursor);
-			cursor = nextCursor;
-		} while (cursor);
-		return threads;
+	async listThreads(limit = Number(process.env.CODEX_RELAY_THREAD_LIST_LIMIT ?? 20)) {
+		if (!Number.isSafeInteger(limit) || limit < 1) throw new Error("CODEX_RELAY_THREAD_LIST_LIMIT must be a positive integer.");
+		const startedAt = Date.now();
+		const params = {
+			archived: false,
+			limit,
+			sortDirection: "desc",
+			sortKey: "recency_at",
+			sourceKinds: [
+				"cli",
+				"vscode",
+				"exec",
+				"appServer"
+			]
+		};
+		let response = await this.request("thread/list", {
+			...params,
+			useStateDbOnly: true
+		});
+		if (response.data.length === 0) response = await this.request("thread/list", params);
+		relayDebugLog("thread.list.completed", {
+			durationMs: Date.now() - startedAt,
+			limit,
+			count: response.data.length
+		});
+		return response.data.slice(0, limit);
 	}
 	async readThread(threadId, options = {}) {
 		return (await this.request("thread/read", {
@@ -7431,8 +7429,91 @@ function errorMessage(error) {
 	return error instanceof Error ? error.message : "Codex run failed.";
 }
 //#endregion
+//#region src/terminal-pairing.ts
+function createTerminalPairingApprover(options) {
+	const queue = [];
+	let active;
+	let reader;
+	let expiry;
+	let answering = false;
+	let closed = false;
+	function print(message) {
+		options.output.write(`${message}\n`);
+	}
+	function close() {
+		closed = true;
+		queue.length = 0;
+		active = void 0;
+		clearTimeout(expiry);
+		reader?.close();
+	}
+	function next() {
+		if (closed || active || answering) return;
+		clearTimeout(expiry);
+		active = queue.shift();
+		while (active && active.expiresAt <= Date.now()) active = queue.shift();
+		if (!active) return;
+		print(`\nPairing request from ${(active.clientName ?? "mobile device").replace(/[\p{Cc}\p{Cf}]/gu, "").slice(0, 80)}. Code: ${active.approvalCode}`);
+		print("Check that this code matches your phone. Approve? [y/N] (then Enter)");
+		expiry = setTimeout(() => {
+			print("Pairing request expired. Open the pairing link again to retry.");
+			active = void 0;
+			next();
+		}, Math.max(1, active.expiresAt - Date.now()));
+	}
+	async function answer(line) {
+		if (!active || answering || closed) return;
+		const pairing = active;
+		active = void 0;
+		answering = true;
+		clearTimeout(expiry);
+		try {
+			if (!/^(y|yes)$/i.test(line.trim())) {
+				print("Not approved. You can still use the approve command for this request.");
+				return;
+			}
+			const approved = await options.sessions.approvePendingPairing(pairing.approvalCode, Date.now());
+			if (approved) options.onApproved(approved);
+			else print("This pairing request expired or was already completed. Open the pairing link again.");
+		} catch {
+			print("Could not approve pairing. Try the approve command or open the pairing link again.");
+		} finally {
+			answering = false;
+			next();
+		}
+	}
+	return {
+		close,
+		async request(approvalCode) {
+			if (closed || !options.input.isTTY || !options.output.isTTY) return;
+			try {
+				const pairing = await options.sessions.getPendingPairing(approvalCode, Date.now());
+				if (!pairing || pairing.approved || closed) return;
+				if (active?.approvalCode === approvalCode || queue.some((item) => item.approvalCode === approvalCode)) return;
+				if (queue.length >= 10) {
+					print("More pairing requests are waiting. Use the approve command for this request.");
+					return;
+				}
+				if (!reader) {
+					reader = createInterface({
+						input: options.input,
+						terminal: false
+					});
+					reader.on("line", (line) => void answer(line));
+					reader.on("close", close);
+				}
+				queue.push(pairing);
+				next();
+			} catch {
+				print("Could not show pairing approval. Use the approve command instead.");
+			}
+		}
+	};
+}
+//#endregion
 //#region src/index.ts
 const port = Number(process.env.PORT ?? 8787);
+let activePort = port;
 const hostname$1 = process.env.HOST ?? "0.0.0.0";
 const dangerouslyAutoApprove = process.env.CODEX_RELAY_DANGEROUSLY_AUTO_APPROVE === "1";
 const serverIdentity = await getServerIdentity();
@@ -7457,6 +7538,12 @@ const color = {
 };
 const npxCommand = "npx codex-relay@latest";
 const sessionStore = await createTursoPairingSessionStore(process.env.CODEX_RELAY_AUTH_DB_PATH ?? await prepareCodexRelayDataPath("auth.db", ["auth.db-shm", "auth.db-wal"]));
+const terminalPairing = createTerminalPairingApprover({
+	input: process.stdin,
+	output: process.stdout,
+	sessions: sessionStore,
+	onApproved: () => logRuntimeEvent("Approved", "Pairing approved. Waiting for your phone to finish connecting.")
+});
 const preferencesStore = createFileRuntimePreferencesStore(process.env.CODEX_RELAY_PREFERENCES_PATH ?? await prepareCodexRelayDataPath("preferences.json"));
 const appServerMode = resolveCodexAppServerMode();
 const relayAppServer = appServerMode.mode === "socket" ? new CodexAppServerClient({
@@ -7487,8 +7574,9 @@ serve({
 			onPairAttempt: ({ remoteAddress }) => {
 				logRuntimeEvent("Pairing", `Handshake received${remoteAddress ? ` from ${remoteAddress}` : ""}.`);
 			},
-			onPairApprovalRequested: ({ clientName }) => {
-				logRuntimeEvent("Approval", `Pairing approval requested${clientName ? ` from ${clientName}` : ""}. Use the code shown in the mobile app to approve locally.`);
+			onPairApprovalRequested: ({ approvalCode, clientName }) => {
+				logRuntimeEvent("Approval", `Pairing approval requested${clientName ? ` from ${clientName}` : ""}. Command: ${formatApprovalCommand(approvalCode, activePort)}`);
+				terminalPairing.request(approvalCode);
 			},
 			onPairApproved: ({ clientName }) => {
 				logRuntimeEvent("Approved", `Pairing request approved${clientName ? ` for ${clientName}` : ""}. Waiting for secure session pickup.`);
@@ -7505,6 +7593,7 @@ serve({
 	hostname: hostname$1,
 	port
 }, (info) => {
+	activePort = info.port;
 	const listenUrl = `http://${info.address}:${info.port}`;
 	const connectUrlCandidates = getConnectUrlCandidates({
 		listenUrl,
@@ -7546,6 +7635,18 @@ serve({
 		port: info.port,
 		sharedAppServerRemoteAddress: relayAppServer?.appServerMode === "socket" ? resolveCodexSharedAppServerRemoteAddress() : void 0
 	}));
+}).on("error", (error) => {
+	if (error.code !== "EADDRINUSE") throw error;
+	console.error(`Codex Relay could not start: ${hostname$1}:${port} is already in use.`);
+	console.error("Another Codex Relay instance or another application may be listening there.");
+	console.error("If it is your existing relay, print its pairing QR with:");
+	console.error(`  ${npxCommand} qr`);
+	console.error("To stop a background relay using this data directory:");
+	console.error(`  ${npxCommand} stop`);
+	console.error("Otherwise, identify the listener before stopping it:");
+	console.error(`  lsof -nP -iTCP:${port} -sTCP:LISTEN`);
+	console.error("To run a separate relay, use a free PORT and a separate CODEX_RELAY_HOME.");
+	stopRelayAppServer(1);
 });
 function stopRelayAppServer(exitCode) {
 	relayAppServer?.close();
@@ -7577,7 +7678,7 @@ function formatStartupInstructions(details) {
 			`  ${color.command(`${npxCommand} approve <code>`)} Approve a device`,
 			"",
 			details.dangerouslyAutoApprove ? `${color.prompt("›")} Pairing requests will be auto-approved.` : `${color.prompt("›")} Waiting for pairing requests`,
-			details.dangerouslyAutoApprove ? `${color.prompt("›")} Disable this for normal use.` : `${color.prompt("›")} Approve a device with ${color.command(formatApprovalCommand("<code>", details.port))}`
+			details.dangerouslyAutoApprove ? `${color.prompt("›")} Disable this for normal use.` : process.stdin.isTTY && process.stdout.isTTY ? `${color.prompt("›")} Approve a device here when prompted: type y and press Enter.` : `${color.prompt("›")} Approve a device with ${color.command(formatApprovalCommand("<code>", details.port))}`
 		],
 		""
 	].join("\n");

package/package.json

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