codex-relay 1.5.1 → 1.6.0

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/api-schema.js

@@ -1,2 +1,2 @@
-import { $ as ResolveApprovalResponseSchema, $t as promptSkillDisplayName, A as PairRequestSchema, At as WorkspaceChangesResponseSchema, B as PushNotificationIntentSchema, Bt as WorkspaceTailscaleServeResponseSchema, C as ListModelsResponseSchema, Ct as UpdateRuntimePreferencesRequestSchema, D as ListWorkspaceDirectoriesResponseSchema, Dt as WORKSPACE_PREVIEW_OPEN_PROTOCOL, E as ListThreadsResponseSchema, Et as VersionResponseSchema, F as PromptAttachmentSchema, Ft as WorkspaceMarkdownPreviewTargetSchema, G as RateLimitBucketSchema, Gt as WorkspaceTerminalSessionResponseSchema, H as PushNotificationSettingsResponseSchema, Ht as WorkspaceTerminalOutputChunkSchema, I as PromptAttachmentSummarySchema, It as WorkspacePreviewNavigationRequestSchema, J as ReasoningEffortSchema, Jt as chatMessageDetailsFromPromptContext, K as RateLimitWindowSchema, Kt as WorkspaceTerminalStartRequestSchema, L as PromptContextInputSchema, Lt as WorkspacePreviewTabSchema, M as PendingInputRequestOptionSchema, Mt as WorkspaceFileContentResponseSchema, N as PendingInputRequestQuestionSchema, Nt as WorkspaceFileMentionSchema, O as ListWorkspaceFilesResponseSchema, Ot as WORKSPACE_PREVIEW_TAB_VALUES, P as PendingInputRequestSchema, Pt as WorkspaceGitActionResponseSchema, Q as ResolveApprovalRequestSchema, Qt as promptMarkdownWithSkills, R as PromptContextSchema, Rt as WorkspaceSelectionRequestSchema, S as KnownReasoningEffortSchema, St as ThreadSummarySchema, T as ListSkillsResponseSchema, Tt as UpdateWorkspaceFileContentRequestSchema, U as QueuedThreadInputActionResponseSchema, Ut as WorkspaceTerminalOutputResponseSchema, V as PushNotificationPreferencesSchema, Vt as WorkspaceTerminalInputRequestSchema, W as QueuedThreadInputSchema, Wt as WorkspaceTerminalResizeRequestSchema, X as RenameThreadRequestSchema, Xt as isPromptSkillMarkdownMention, Y as RegisterPushNotificationRequestSchema, Yt as createOpenApiDocument, Z as RenameThreadResponseSchema, Zt as normalizePromptContext, _ as EncryptedPayloadSchema, _t as ThreadGoalStatusSchema, a as ArchiveThreadResponseSchema, at as RuntimePreferencesResponseSchema, b as InterruptThreadRunResponseSchema, bt as ThreadRunOptionsSchema, c as ChatMessageRoleSchema, ct as StatusResponseSchema, d as CheckoutWorkspaceBranchRequestSchema, dt as SubmitThreadInputResponseSchema, en as promptSkillMentionLabel, et as RewindThreadRequestSchema, f as CodexModelSchema, ft as ThreadCollaborationModeSchema, g as CreateThreadResponseSchema, gt as ThreadGoalSchema, h as CreateThreadRequestSchema, ht as ThreadGoalResponseSchema, i as ApprovalModeSchema, it as RuntimePreferencesByWorkspacePathSchema, j as PairResponseSchema, jt as WorkspaceDirectoryEntrySchema, k as PairEncryptedPayloadSchema, kt as WebPreviewTargetSchema, l as ChatMessageSchema, lt as StreamThreadRunEventSchema, m as ContextWindowUsageSchema, mt as ThreadDetailResponseSchema, n as AgentSkillSourceSchema, nn as promptSkillMentionTextCandidates, nt as RunThreadResponseSchema, o as ChatMessageKindSchema, ot as RuntimePreferencesSchema, p as CommitPushWorkspaceRequestSchema, pt as ThreadContextWindowResponseSchema, q as RateLimitsResponseSchema, qt as apiPaths, r as ApprovalDecisionSchema, rn as stripPromptSkillMentions, rt as RuntimeModeSchema, s as ChatMessagePromptDetailsSchema, st as SandboxModeSchema, t as AgentSkillSchema, tn as promptSkillMentionMarkdown, tt as RunThreadRequestSchema, u as ChatMessageStateSchema, ut as StreamThreadRunRequestSchema, v as ErrorResponseSchema, vt as ThreadMessageDetailFieldSchema, w as ListQueuedThreadInputsResponseSchema, wt as UpdateThreadGoalRequestSchema, x as IsoDateTimeSchema, xt as ThreadStateSchema, y as ImageAttachmentUploadResponseSchema, yt as ThreadMessageDetailResponseSchema, z as PromptSkillSchema, zt as WorkspaceTailscaleServeRequestSchema } from "./api-schema2.js";
-export { AgentSkillSchema, AgentSkillSourceSchema, ApprovalDecisionSchema, ApprovalModeSchema, ArchiveThreadResponseSchema, ChatMessageKindSchema, ChatMessagePromptDetailsSchema, ChatMessageRoleSchema, ChatMessageSchema, ChatMessageStateSchema, CheckoutWorkspaceBranchRequestSchema, CodexModelSchema, CommitPushWorkspaceRequestSchema, ContextWindowUsageSchema, CreateThreadRequestSchema, CreateThreadResponseSchema, EncryptedPayloadSchema, ErrorResponseSchema, ImageAttachmentUploadResponseSchema, InterruptThreadRunResponseSchema, IsoDateTimeSchema, KnownReasoningEffortSchema, ListModelsResponseSchema, ListQueuedThreadInputsResponseSchema, ListSkillsResponseSchema, ListThreadsResponseSchema, ListWorkspaceDirectoriesResponseSchema, ListWorkspaceFilesResponseSchema, PairEncryptedPayloadSchema, PairRequestSchema, PairResponseSchema, PendingInputRequestOptionSchema, PendingInputRequestQuestionSchema, PendingInputRequestSchema, PromptAttachmentSchema, PromptAttachmentSummarySchema, PromptContextInputSchema, PromptContextSchema, PromptSkillSchema, PushNotificationIntentSchema, PushNotificationPreferencesSchema, PushNotificationSettingsResponseSchema, QueuedThreadInputActionResponseSchema, QueuedThreadInputSchema, RateLimitBucketSchema, RateLimitWindowSchema, RateLimitsResponseSchema, ReasoningEffortSchema, RegisterPushNotificationRequestSchema, RenameThreadRequestSchema, RenameThreadResponseSchema, ResolveApprovalRequestSchema, ResolveApprovalResponseSchema, RewindThreadRequestSchema, RunThreadRequestSchema, RunThreadResponseSchema, RuntimeModeSchema, RuntimePreferencesByWorkspacePathSchema, RuntimePreferencesResponseSchema, RuntimePreferencesSchema, SandboxModeSchema, StatusResponseSchema, StreamThreadRunEventSchema, StreamThreadRunRequestSchema, SubmitThreadInputResponseSchema, ThreadCollaborationModeSchema, ThreadContextWindowResponseSchema, ThreadDetailResponseSchema, ThreadGoalResponseSchema, ThreadGoalSchema, ThreadGoalStatusSchema, ThreadMessageDetailFieldSchema, ThreadMessageDetailResponseSchema, ThreadRunOptionsSchema, ThreadStateSchema, ThreadSummarySchema, UpdateRuntimePreferencesRequestSchema, UpdateThreadGoalRequestSchema, UpdateWorkspaceFileContentRequestSchema, VersionResponseSchema, WORKSPACE_PREVIEW_OPEN_PROTOCOL, WORKSPACE_PREVIEW_TAB_VALUES, WebPreviewTargetSchema, WorkspaceChangesResponseSchema, WorkspaceDirectoryEntrySchema, WorkspaceFileContentResponseSchema, WorkspaceFileMentionSchema, WorkspaceGitActionResponseSchema, WorkspaceMarkdownPreviewTargetSchema, WorkspacePreviewNavigationRequestSchema, WorkspacePreviewTabSchema, WorkspaceSelectionRequestSchema, WorkspaceTailscaleServeRequestSchema, WorkspaceTailscaleServeResponseSchema, WorkspaceTerminalInputRequestSchema, WorkspaceTerminalOutputChunkSchema, WorkspaceTerminalOutputResponseSchema, WorkspaceTerminalResizeRequestSchema, WorkspaceTerminalSessionResponseSchema, WorkspaceTerminalStartRequestSchema, apiPaths, chatMessageDetailsFromPromptContext, createOpenApiDocument, isPromptSkillMarkdownMention, normalizePromptContext, promptMarkdownWithSkills, promptSkillDisplayName, promptSkillMentionLabel, promptSkillMentionMarkdown, promptSkillMentionTextCandidates, stripPromptSkillMentions };
+import { $ as ResolveApprovalResponseSchema, $t as promptMarkdownWithSkills, A as PairRequestSchema, At as WorkspaceChangesResponseSchema, B as PushNotificationIntentSchema, Bt as WorkspaceTailscaleServeResponseSchema, C as ListModelsResponseSchema, Ct as UpdateRuntimePreferencesRequestSchema, D as ListWorkspaceDirectoriesResponseSchema, Dt as WORKSPACE_PREVIEW_OPEN_PROTOCOL, E as ListThreadsResponseSchema, Et as VersionResponseSchema, F as PromptAttachmentSchema, Ft as WorkspaceMarkdownPreviewTargetSchema, G as RateLimitBucketSchema, Gt as WorkspaceTerminalSessionResponseSchema, H as PushNotificationSettingsResponseSchema, Ht as WorkspaceTerminalOutputChunkSchema, I as PromptAttachmentSummarySchema, It as WorkspacePreviewNavigationRequestSchema, J as ReasoningEffortSchema, Jt as chatMessageDetailsFromPromptContext, K as RateLimitWindowSchema, Kt as WorkspaceTerminalStartRequestSchema, L as PromptContextInputSchema, Lt as WorkspacePreviewTabSchema, M as PendingInputRequestOptionSchema, Mt as WorkspaceFileContentResponseSchema, N as PendingInputRequestQuestionSchema, Nt as WorkspaceFileMentionSchema, O as ListWorkspaceFilesResponseSchema, Ot as WORKSPACE_PREVIEW_TAB_VALUES, P as PendingInputRequestSchema, Pt as WorkspaceGitActionResponseSchema, Q as ResolveApprovalRequestSchema, Qt as normalizePromptContext, R as PromptContextSchema, Rt as WorkspaceSelectionRequestSchema, S as KnownReasoningEffortSchema, St as ThreadSummarySchema, T as ListSkillsResponseSchema, Tt as UpdateWorkspaceFileContentRequestSchema, U as QueuedThreadInputActionResponseSchema, Ut as WorkspaceTerminalOutputResponseSchema, V as PushNotificationPreferencesSchema, Vt as WorkspaceTerminalInputRequestSchema, W as QueuedThreadInputSchema, Wt as WorkspaceTerminalResizeRequestSchema, X as RenameThreadRequestSchema, Xt as isPromptSkillMarkdownMention, Y as RegisterPushNotificationRequestSchema, Yt as createOpenApiDocument, Z as RenameThreadResponseSchema, Zt as lowestRateLimitRemainingPercent, _ as EncryptedPayloadSchema, _t as ThreadGoalStatusSchema, a as ArchiveThreadResponseSchema, an as stripPromptSkillMentions, at as RuntimePreferencesResponseSchema, b as InterruptThreadRunResponseSchema, bt as ThreadRunOptionsSchema, c as ChatMessageRoleSchema, ct as StatusResponseSchema, d as CheckoutWorkspaceBranchRequestSchema, dt as SubmitThreadInputResponseSchema, en as promptSkillDisplayName, et as RewindThreadRequestSchema, f as CodexModelSchema, ft as ThreadCollaborationModeSchema, g as CreateThreadResponseSchema, gt as ThreadGoalSchema, h as CreateThreadRequestSchema, ht as ThreadGoalResponseSchema, i as ApprovalModeSchema, in as rateLimitRemainingPercent, it as RuntimePreferencesByWorkspacePathSchema, j as PairResponseSchema, jt as WorkspaceDirectoryEntrySchema, k as PairEncryptedPayloadSchema, kt as WebPreviewTargetSchema, l as ChatMessageSchema, lt as StreamThreadRunEventSchema, m as ContextWindowUsageSchema, mt as ThreadDetailResponseSchema, n as AgentSkillSourceSchema, nn as promptSkillMentionMarkdown, nt as RunThreadResponseSchema, o as ChatMessageKindSchema, ot as RuntimePreferencesSchema, p as CommitPushWorkspaceRequestSchema, pt as ThreadContextWindowResponseSchema, q as RateLimitsResponseSchema, qt as apiPaths, r as ApprovalDecisionSchema, rn as promptSkillMentionTextCandidates, rt as RuntimeModeSchema, s as ChatMessagePromptDetailsSchema, st as SandboxModeSchema, t as AgentSkillSchema, tn as promptSkillMentionLabel, tt as RunThreadRequestSchema, u as ChatMessageStateSchema, ut as StreamThreadRunRequestSchema, v as ErrorResponseSchema, vt as ThreadMessageDetailFieldSchema, w as ListQueuedThreadInputsResponseSchema, wt as UpdateThreadGoalRequestSchema, x as IsoDateTimeSchema, xt as ThreadStateSchema, y as ImageAttachmentUploadResponseSchema, yt as ThreadMessageDetailResponseSchema, z as PromptSkillSchema, zt as WorkspaceTailscaleServeRequestSchema } from "./api-schema2.js";
+export { AgentSkillSchema, AgentSkillSourceSchema, ApprovalDecisionSchema, ApprovalModeSchema, ArchiveThreadResponseSchema, ChatMessageKindSchema, ChatMessagePromptDetailsSchema, ChatMessageRoleSchema, ChatMessageSchema, ChatMessageStateSchema, CheckoutWorkspaceBranchRequestSchema, CodexModelSchema, CommitPushWorkspaceRequestSchema, ContextWindowUsageSchema, CreateThreadRequestSchema, CreateThreadResponseSchema, EncryptedPayloadSchema, ErrorResponseSchema, ImageAttachmentUploadResponseSchema, InterruptThreadRunResponseSchema, IsoDateTimeSchema, KnownReasoningEffortSchema, ListModelsResponseSchema, ListQueuedThreadInputsResponseSchema, ListSkillsResponseSchema, ListThreadsResponseSchema, ListWorkspaceDirectoriesResponseSchema, ListWorkspaceFilesResponseSchema, PairEncryptedPayloadSchema, PairRequestSchema, PairResponseSchema, PendingInputRequestOptionSchema, PendingInputRequestQuestionSchema, PendingInputRequestSchema, PromptAttachmentSchema, PromptAttachmentSummarySchema, PromptContextInputSchema, PromptContextSchema, PromptSkillSchema, PushNotificationIntentSchema, PushNotificationPreferencesSchema, PushNotificationSettingsResponseSchema, QueuedThreadInputActionResponseSchema, QueuedThreadInputSchema, RateLimitBucketSchema, RateLimitWindowSchema, RateLimitsResponseSchema, ReasoningEffortSchema, RegisterPushNotificationRequestSchema, RenameThreadRequestSchema, RenameThreadResponseSchema, ResolveApprovalRequestSchema, ResolveApprovalResponseSchema, RewindThreadRequestSchema, RunThreadRequestSchema, RunThreadResponseSchema, RuntimeModeSchema, RuntimePreferencesByWorkspacePathSchema, RuntimePreferencesResponseSchema, RuntimePreferencesSchema, SandboxModeSchema, StatusResponseSchema, StreamThreadRunEventSchema, StreamThreadRunRequestSchema, SubmitThreadInputResponseSchema, ThreadCollaborationModeSchema, ThreadContextWindowResponseSchema, ThreadDetailResponseSchema, ThreadGoalResponseSchema, ThreadGoalSchema, ThreadGoalStatusSchema, ThreadMessageDetailFieldSchema, ThreadMessageDetailResponseSchema, ThreadRunOptionsSchema, ThreadStateSchema, ThreadSummarySchema, UpdateRuntimePreferencesRequestSchema, UpdateThreadGoalRequestSchema, UpdateWorkspaceFileContentRequestSchema, VersionResponseSchema, WORKSPACE_PREVIEW_OPEN_PROTOCOL, WORKSPACE_PREVIEW_TAB_VALUES, WebPreviewTargetSchema, WorkspaceChangesResponseSchema, WorkspaceDirectoryEntrySchema, WorkspaceFileContentResponseSchema, WorkspaceFileMentionSchema, WorkspaceGitActionResponseSchema, WorkspaceMarkdownPreviewTargetSchema, WorkspacePreviewNavigationRequestSchema, WorkspacePreviewTabSchema, WorkspaceSelectionRequestSchema, WorkspaceTailscaleServeRequestSchema, WorkspaceTailscaleServeResponseSchema, WorkspaceTerminalInputRequestSchema, WorkspaceTerminalOutputChunkSchema, WorkspaceTerminalOutputResponseSchema, WorkspaceTerminalResizeRequestSchema, WorkspaceTerminalSessionResponseSchema, WorkspaceTerminalStartRequestSchema, apiPaths, chatMessageDetailsFromPromptContext, createOpenApiDocument, isPromptSkillMarkdownMention, lowestRateLimitRemainingPercent, normalizePromptContext, promptMarkdownWithSkills, promptSkillDisplayName, promptSkillMentionLabel, promptSkillMentionMarkdown, promptSkillMentionTextCandidates, rateLimitRemainingPercent, stripPromptSkillMentions };

package/dist/api-schema2.js

@@ -107,6 +107,7 @@ const RuntimePreferencesResponseSchema = z.object({
 const PushNotificationIntentSchema = z.enum(["turn_terminal", "action_required"]);
 const PushNotificationPreferencesSchema = z.object({
 	actionRequired: z.boolean(),
+	includeRemainingUsage: z.boolean().default(false),
 	turnTerminal: z.boolean()
 });
 const RegisterPushNotificationRequestSchema = z.object({
@@ -169,6 +170,13 @@ const RateLimitBucketSchema = z.object({
 	rateLimitReachedType: z.string().nullable().optional()
 });
 const RateLimitsResponseSchema = z.object({ buckets: z.array(RateLimitBucketSchema) });
+function rateLimitRemainingPercent(usedPercent) {
+	return 100 - Math.max(0, Math.min(100, usedPercent));
+}
+function lowestRateLimitRemainingPercent(buckets) {
+	const remaining = buckets.flatMap((bucket) => [bucket.primary, bucket.secondary].flatMap((window) => window ? [rateLimitRemainingPercent(window.usedPercent)] : []));
+	return remaining.length > 0 ? Math.min(...remaining) : void 0;
+}
 const ThreadContextWindowResponseSchema = z.object({
 	threadId: z.string().min(1),
 	usage: ContextWindowUsageSchema.nullable(),
@@ -1355,6 +1363,10 @@ function createOpenApiDocument() {
 				required: ["actionRequired", "turnTerminal"],
 				properties: {
 					actionRequired: { type: "boolean" },
+					includeRemainingUsage: {
+						type: "boolean",
+						default: false
+					},
 					turnTerminal: { type: "boolean" }
 				}
 			},
@@ -1867,4 +1879,4 @@ function jsonResponse(schemaName) {
 	};
 }
 //#endregion
-export { ResolveApprovalResponseSchema as $, promptSkillDisplayName as $t, PairRequestSchema as A, WorkspaceChangesResponseSchema as At, PushNotificationIntentSchema as B, WorkspaceTailscaleServeResponseSchema as Bt, ListModelsResponseSchema as C, UpdateRuntimePreferencesRequestSchema as Ct, ListWorkspaceDirectoriesResponseSchema as D, WORKSPACE_PREVIEW_OPEN_PROTOCOL as Dt, ListThreadsResponseSchema as E, VersionResponseSchema as Et, PromptAttachmentSchema as F, WorkspaceMarkdownPreviewTargetSchema as Ft, RateLimitBucketSchema as G, WorkspaceTerminalSessionResponseSchema as Gt, PushNotificationSettingsResponseSchema as H, WorkspaceTerminalOutputChunkSchema as Ht, PromptAttachmentSummarySchema as I, WorkspacePreviewNavigationRequestSchema as It, ReasoningEffortSchema as J, chatMessageDetailsFromPromptContext as Jt, RateLimitWindowSchema as K, WorkspaceTerminalStartRequestSchema as Kt, PromptContextInputSchema as L, WorkspacePreviewTabSchema as Lt, PendingInputRequestOptionSchema as M, WorkspaceFileContentResponseSchema as Mt, PendingInputRequestQuestionSchema as N, WorkspaceFileMentionSchema as Nt, ListWorkspaceFilesResponseSchema as O, WORKSPACE_PREVIEW_TAB_VALUES as Ot, PendingInputRequestSchema as P, WorkspaceGitActionResponseSchema as Pt, ResolveApprovalRequestSchema as Q, promptMarkdownWithSkills as Qt, PromptContextSchema as R, WorkspaceSelectionRequestSchema as Rt, KnownReasoningEffortSchema as S, ThreadSummarySchema as St, ListSkillsResponseSchema as T, UpdateWorkspaceFileContentRequestSchema as Tt, QueuedThreadInputActionResponseSchema as U, WorkspaceTerminalOutputResponseSchema as Ut, PushNotificationPreferencesSchema as V, WorkspaceTerminalInputRequestSchema as Vt, QueuedThreadInputSchema as W, WorkspaceTerminalResizeRequestSchema as Wt, RenameThreadRequestSchema as X, isPromptSkillMarkdownMention as Xt, RegisterPushNotificationRequestSchema as Y, createOpenApiDocument as Yt, RenameThreadResponseSchema as Z, normalizePromptContext as Zt, EncryptedPayloadSchema as _, ThreadGoalStatusSchema as _t, ArchiveThreadResponseSchema as a, RuntimePreferencesResponseSchema as at, InterruptThreadRunResponseSchema as b, ThreadRunOptionsSchema as bt, ChatMessageRoleSchema as c, StatusResponseSchema as ct, CheckoutWorkspaceBranchRequestSchema as d, SubmitThreadInputResponseSchema as dt, promptSkillMentionLabel as en, RewindThreadRequestSchema as et, CodexModelSchema as f, ThreadCollaborationModeSchema as ft, CreateThreadResponseSchema as g, ThreadGoalSchema as gt, CreateThreadRequestSchema as h, ThreadGoalResponseSchema as ht, ApprovalModeSchema as i, RuntimePreferencesByWorkspacePathSchema as it, PairResponseSchema as j, WorkspaceDirectoryEntrySchema as jt, PairEncryptedPayloadSchema as k, WebPreviewTargetSchema as kt, ChatMessageSchema as l, StreamThreadRunEventSchema as lt, ContextWindowUsageSchema as m, ThreadDetailResponseSchema as mt, AgentSkillSourceSchema as n, promptSkillMentionTextCandidates as nn, RunThreadResponseSchema as nt, ChatMessageKindSchema as o, RuntimePreferencesSchema as ot, CommitPushWorkspaceRequestSchema as p, ThreadContextWindowResponseSchema as pt, RateLimitsResponseSchema as q, apiPaths as qt, ApprovalDecisionSchema as r, stripPromptSkillMentions as rn, RuntimeModeSchema as rt, ChatMessagePromptDetailsSchema as s, SandboxModeSchema as st, AgentSkillSchema as t, promptSkillMentionMarkdown as tn, RunThreadRequestSchema as tt, ChatMessageStateSchema as u, StreamThreadRunRequestSchema as ut, ErrorResponseSchema as v, ThreadMessageDetailFieldSchema as vt, ListQueuedThreadInputsResponseSchema as w, UpdateThreadGoalRequestSchema as wt, IsoDateTimeSchema as x, ThreadStateSchema as xt, ImageAttachmentUploadResponseSchema as y, ThreadMessageDetailResponseSchema as yt, PromptSkillSchema as z, WorkspaceTailscaleServeRequestSchema as zt };
+export { ResolveApprovalResponseSchema as $, promptMarkdownWithSkills as $t, PairRequestSchema as A, WorkspaceChangesResponseSchema as At, PushNotificationIntentSchema as B, WorkspaceTailscaleServeResponseSchema as Bt, ListModelsResponseSchema as C, UpdateRuntimePreferencesRequestSchema as Ct, ListWorkspaceDirectoriesResponseSchema as D, WORKSPACE_PREVIEW_OPEN_PROTOCOL as Dt, ListThreadsResponseSchema as E, VersionResponseSchema as Et, PromptAttachmentSchema as F, WorkspaceMarkdownPreviewTargetSchema as Ft, RateLimitBucketSchema as G, WorkspaceTerminalSessionResponseSchema as Gt, PushNotificationSettingsResponseSchema as H, WorkspaceTerminalOutputChunkSchema as Ht, PromptAttachmentSummarySchema as I, WorkspacePreviewNavigationRequestSchema as It, ReasoningEffortSchema as J, chatMessageDetailsFromPromptContext as Jt, RateLimitWindowSchema as K, WorkspaceTerminalStartRequestSchema as Kt, PromptContextInputSchema as L, WorkspacePreviewTabSchema as Lt, PendingInputRequestOptionSchema as M, WorkspaceFileContentResponseSchema as Mt, PendingInputRequestQuestionSchema as N, WorkspaceFileMentionSchema as Nt, ListWorkspaceFilesResponseSchema as O, WORKSPACE_PREVIEW_TAB_VALUES as Ot, PendingInputRequestSchema as P, WorkspaceGitActionResponseSchema as Pt, ResolveApprovalRequestSchema as Q, normalizePromptContext as Qt, PromptContextSchema as R, WorkspaceSelectionRequestSchema as Rt, KnownReasoningEffortSchema as S, ThreadSummarySchema as St, ListSkillsResponseSchema as T, UpdateWorkspaceFileContentRequestSchema as Tt, QueuedThreadInputActionResponseSchema as U, WorkspaceTerminalOutputResponseSchema as Ut, PushNotificationPreferencesSchema as V, WorkspaceTerminalInputRequestSchema as Vt, QueuedThreadInputSchema as W, WorkspaceTerminalResizeRequestSchema as Wt, RenameThreadRequestSchema as X, isPromptSkillMarkdownMention as Xt, RegisterPushNotificationRequestSchema as Y, createOpenApiDocument as Yt, RenameThreadResponseSchema as Z, lowestRateLimitRemainingPercent as Zt, EncryptedPayloadSchema as _, ThreadGoalStatusSchema as _t, ArchiveThreadResponseSchema as a, stripPromptSkillMentions as an, RuntimePreferencesResponseSchema as at, InterruptThreadRunResponseSchema as b, ThreadRunOptionsSchema as bt, ChatMessageRoleSchema as c, StatusResponseSchema as ct, CheckoutWorkspaceBranchRequestSchema as d, SubmitThreadInputResponseSchema as dt, promptSkillDisplayName as en, RewindThreadRequestSchema as et, CodexModelSchema as f, ThreadCollaborationModeSchema as ft, CreateThreadResponseSchema as g, ThreadGoalSchema as gt, CreateThreadRequestSchema as h, ThreadGoalResponseSchema as ht, ApprovalModeSchema as i, rateLimitRemainingPercent as in, RuntimePreferencesByWorkspacePathSchema as it, PairResponseSchema as j, WorkspaceDirectoryEntrySchema as jt, PairEncryptedPayloadSchema as k, WebPreviewTargetSchema as kt, ChatMessageSchema as l, StreamThreadRunEventSchema as lt, ContextWindowUsageSchema as m, ThreadDetailResponseSchema as mt, AgentSkillSourceSchema as n, promptSkillMentionMarkdown as nn, RunThreadResponseSchema as nt, ChatMessageKindSchema as o, RuntimePreferencesSchema as ot, CommitPushWorkspaceRequestSchema as p, ThreadContextWindowResponseSchema as pt, RateLimitsResponseSchema as q, apiPaths as qt, ApprovalDecisionSchema as r, promptSkillMentionTextCandidates as rn, RuntimeModeSchema as rt, ChatMessagePromptDetailsSchema as s, SandboxModeSchema as st, AgentSkillSchema as t, promptSkillMentionLabel as tn, RunThreadRequestSchema as tt, ChatMessageStateSchema as u, StreamThreadRunRequestSchema as ut, ErrorResponseSchema as v, ThreadMessageDetailFieldSchema as vt, ListQueuedThreadInputsResponseSchema as w, UpdateThreadGoalRequestSchema as wt, IsoDateTimeSchema as x, ThreadStateSchema as xt, ImageAttachmentUploadResponseSchema as y, ThreadMessageDetailResponseSchema as yt, PromptSkillSchema as z, WorkspaceTailscaleServeRequestSchema as zt };

package/dist/paths.js

@@ -130,11 +130,13 @@ async function createTursoPairingSessionStore(path) {
       platform TEXT NOT NULL,
       turn_terminal_enabled INTEGER NOT NULL,
       action_required_enabled INTEGER NOT NULL,
+      include_remaining_usage_enabled INTEGER NOT NULL DEFAULT 0,
       created_at INTEGER NOT NULL,
       updated_at INTEGER NOT NULL
     );
   `);
 	await ensurePairingSessionColumns();
+	await ensurePushNotificationSubscriptionColumns();
 	async function countActive() {
 		const row = await db.prepare("SELECT COUNT(DISTINCT COALESCE(client_session_id, token_hash)) AS count FROM pairing_sessions").get();
 		return Number(row?.count ?? 0);
@@ -250,7 +252,8 @@ async function createTursoPairingSessionStore(path) {
                   expo_push_token AS expoPushToken,
                   platform,
                   turn_terminal_enabled AS turnTerminal,
-                  action_required_enabled AS actionRequired
+                  action_required_enabled AS actionRequired,
+                  include_remaining_usage_enabled AS includeRemainingUsage
            FROM push_notification_subscriptions
            WHERE client_session_id = ?`).get(clientSessionId);
 			return row ? pushNotificationSubscriptionFromRow(row) : void 0;
@@ -279,7 +282,8 @@ async function createTursoPairingSessionStore(path) {
                   subscriptions.expo_push_token AS expoPushToken,
                   subscriptions.platform,
                   subscriptions.turn_terminal_enabled AS turnTerminal,
-                  subscriptions.action_required_enabled AS actionRequired
+                  subscriptions.action_required_enabled AS actionRequired,
+                  subscriptions.include_remaining_usage_enabled AS includeRemainingUsage
            FROM push_notification_subscriptions AS subscriptions
            INNER JOIN pairing_sessions AS sessions
              ON sessions.client_session_id = subscriptions.client_session_id
@@ -343,16 +347,18 @@ async function createTursoPairingSessionStore(path) {
              platform,
              turn_terminal_enabled,
              action_required_enabled,
+             include_remaining_usage_enabled,
              created_at,
              updated_at
            )
-           VALUES (?, ?, ?, ?, ?, ?, ?)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT(client_session_id) DO UPDATE SET
              expo_push_token = excluded.expo_push_token,
              platform = excluded.platform,
              turn_terminal_enabled = excluded.turn_terminal_enabled,
              action_required_enabled = excluded.action_required_enabled,
-             updated_at = excluded.updated_at`).run(subscription.clientSessionId, subscription.expoPushToken, subscription.platform, subscription.turnTerminal ? 1 : 0, subscription.actionRequired ? 1 : 0, now, now);
+             include_remaining_usage_enabled = excluded.include_remaining_usage_enabled,
+             updated_at = excluded.updated_at`).run(subscription.clientSessionId, subscription.expoPushToken, subscription.platform, subscription.turnTerminal ? 1 : 0, subscription.actionRequired ? 1 : 0, subscription.includeRemainingUsage ? 1 : 0, now, now);
 		}
 	};
 	async function ensurePairingSessionColumns() {
@@ -369,6 +375,10 @@ async function createTursoPairingSessionStore(path) {
 		const pendingRows = await db.prepare("PRAGMA table_info(pending_pairings)").all();
 		if (!new Set(resultRows(pendingRows).map((row) => String(row.name))).has("client_session_id")) await db.exec("ALTER TABLE pending_pairings ADD COLUMN client_session_id TEXT");
 	}
+	async function ensurePushNotificationSubscriptionColumns() {
+		const rows = await db.prepare("PRAGMA table_info(push_notification_subscriptions)").all();
+		if (!new Set(resultRows(rows).map((row) => String(row.name))).has("include_remaining_usage_enabled")) await db.exec("ALTER TABLE push_notification_subscriptions ADD COLUMN include_remaining_usage_enabled INTEGER NOT NULL DEFAULT 0");
+	}
 }
 function encodeSecureSession(session) {
 	if (!session) return;
@@ -397,6 +407,7 @@ function pushNotificationSubscriptionFromRow(row) {
 		actionRequired: Number(row.actionRequired) === 1,
 		clientSessionId: row.clientSessionId,
 		expoPushToken: row.expoPushToken,
+		includeRemainingUsage: Number(row.includeRemainingUsage) === 1,
 		platform,
 		turnTerminal: Number(row.turnTerminal) === 1
 	};

package/dist/src.js

@@ -1,4 +1,4 @@
-import { $ as ResolveApprovalResponseSchema, A as PairRequestSchema, At as WorkspaceChangesResponseSchema, Bt as WorkspaceTailscaleServeResponseSchema, C as ListModelsResponseSchema, Ct as UpdateRuntimePreferencesRequestSchema, D as ListWorkspaceDirectoriesResponseSchema, E as ListThreadsResponseSchema, Et as VersionResponseSchema, Gt as WorkspaceTerminalSessionResponseSchema, H as PushNotificationSettingsResponseSchema, J as ReasoningEffortSchema, Jt as chatMessageDetailsFromPromptContext, Kt as WorkspaceTerminalStartRequestSchema, Mt as WorkspaceFileContentResponseSchema, O as ListWorkspaceFilesResponseSchema, Pt as WorkspaceGitActionResponseSchema, Q as ResolveApprovalRequestSchema, Qt as promptMarkdownWithSkills, S as KnownReasoningEffortSchema, St as ThreadSummarySchema, T as ListSkillsResponseSchema, Tt as UpdateWorkspaceFileContentRequestSchema, U as QueuedThreadInputActionResponseSchema, Ut as WorkspaceTerminalOutputResponseSchema, Vt as WorkspaceTerminalInputRequestSchema, Wt as WorkspaceTerminalResizeRequestSchema, X as RenameThreadRequestSchema, Y as RegisterPushNotificationRequestSchema, Yt as createOpenApiDocument, Z as RenameThreadResponseSchema, Zt as normalizePromptContext, _ as EncryptedPayloadSchema, _t as ThreadGoalStatusSchema, a as ArchiveThreadResponseSchema, at as RuntimePreferencesResponseSchema, b as InterruptThreadRunResponseSchema, ct as StatusResponseSchema, d as CheckoutWorkspaceBranchRequestSchema, dt as SubmitThreadInputResponseSchema, et as RewindThreadRequestSchema, gt as ThreadGoalSchema, h as CreateThreadRequestSchema, ht as ThreadGoalResponseSchema, j as PairResponseSchema, l as ChatMessageSchema, lt as StreamThreadRunEventSchema, m as ContextWindowUsageSchema, mt as ThreadDetailResponseSchema, ot as RuntimePreferencesSchema, p as CommitPushWorkspaceRequestSchema, pt as ThreadContextWindowResponseSchema, q as RateLimitsResponseSchema, qt as apiPaths, rn as stripPromptSkillMentions, tt as RunThreadRequestSchema, ut as StreamThreadRunRequestSchema, vt as ThreadMessageDetailFieldSchema, w as ListQueuedThreadInputsResponseSchema, wt as UpdateThreadGoalRequestSchema, y as ImageAttachmentUploadResponseSchema, yt as ThreadMessageDetailResponseSchema, zt as WorkspaceTailscaleServeRequestSchema } from "./api-schema2.js";
+import { $ as ResolveApprovalResponseSchema, $t as promptMarkdownWithSkills, A as PairRequestSchema, At as WorkspaceChangesResponseSchema, Bt as WorkspaceTailscaleServeResponseSchema, C as ListModelsResponseSchema, Ct as UpdateRuntimePreferencesRequestSchema, D as ListWorkspaceDirectoriesResponseSchema, E as ListThreadsResponseSchema, Et as VersionResponseSchema, Gt as WorkspaceTerminalSessionResponseSchema, H as PushNotificationSettingsResponseSchema, J as ReasoningEffortSchema, Jt as chatMessageDetailsFromPromptContext, Kt as WorkspaceTerminalStartRequestSchema, Mt as WorkspaceFileContentResponseSchema, O as ListWorkspaceFilesResponseSchema, Pt as WorkspaceGitActionResponseSchema, Q as ResolveApprovalRequestSchema, Qt as normalizePromptContext, S as KnownReasoningEffortSchema, St as ThreadSummarySchema, T as ListSkillsResponseSchema, Tt as UpdateWorkspaceFileContentRequestSchema, U as QueuedThreadInputActionResponseSchema, Ut as WorkspaceTerminalOutputResponseSchema, Vt as WorkspaceTerminalInputRequestSchema, Wt as WorkspaceTerminalResizeRequestSchema, X as RenameThreadRequestSchema, Y as RegisterPushNotificationRequestSchema, Yt as createOpenApiDocument, Z as RenameThreadResponseSchema, Zt as lowestRateLimitRemainingPercent, _ as EncryptedPayloadSchema, _t as ThreadGoalStatusSchema, a as ArchiveThreadResponseSchema, an as stripPromptSkillMentions, at as RuntimePreferencesResponseSchema, b as InterruptThreadRunResponseSchema, ct as StatusResponseSchema, d as CheckoutWorkspaceBranchRequestSchema, dt as SubmitThreadInputResponseSchema, et as RewindThreadRequestSchema, gt as ThreadGoalSchema, h as CreateThreadRequestSchema, ht as ThreadGoalResponseSchema, j as PairResponseSchema, l as ChatMessageSchema, lt as StreamThreadRunEventSchema, m as ContextWindowUsageSchema, mt as ThreadDetailResponseSchema, ot as RuntimePreferencesSchema, p as CommitPushWorkspaceRequestSchema, pt as ThreadContextWindowResponseSchema, q as RateLimitsResponseSchema, qt as apiPaths, tt as RunThreadRequestSchema, ut as StreamThreadRunRequestSchema, vt as ThreadMessageDetailFieldSchema, w as ListQueuedThreadInputsResponseSchema, wt as UpdateThreadGoalRequestSchema, y as ImageAttachmentUploadResponseSchema, yt as ThreadMessageDetailResponseSchema, zt as WorkspaceTailscaleServeRequestSchema } from "./api-schema2.js";
 import { a as getConnectUrlCandidates, c as permanentClientSessionExpiresAt, i as createPairingQrPayload, o as getConnectUrlGuidance, r as legacyCodexRelayDataPath, s as createTursoPairingSessionStore, t as codexRelayDataPath } from "./paths.js";
 import { createRequire } from "node:module";
 import qrcode from "qrcode-terminal";
@@ -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", {
@@ -1029,24 +1027,25 @@ function createExpoPushNotificationSender(fetchImpl = fetch) {
 function createPushNotificationDispatcher(input) {
 	return { async dispatch(event) {
 		const subscriptions = await input.sessions.listActivePushNotificationSubscriptions();
-		const selectedTokens = new Set(subscriptions.filter((subscription) => notificationEnabled(subscription, event.intent)).map((subscription) => subscription.expoPushToken));
-		if (selectedTokens.size === 0) return;
-		const delivery = await input.sender.send([...selectedTokens].map((expoPushToken) => notificationForEvent(expoPushToken, event)));
+		const selectedSubscriptions = new Map(subscriptions.filter((subscription) => notificationEnabled(subscription, event.intent)).map((subscription) => [subscription.expoPushToken, subscription]));
+		if (selectedSubscriptions.size === 0) return;
+		const remainingUsagePercent = event.intent === "turn_terminal" && [...selectedSubscriptions.values()].some((subscription) => subscription.includeRemainingUsage) ? await input.readRemainingUsagePercent?.().catch(() => void 0) : void 0;
+		const delivery = await input.sender.send([...selectedSubscriptions.values()].map((subscription) => notificationForEvent(subscription.expoPushToken, event, subscription.includeRemainingUsage ? remainingUsagePercent : void 0)));
 		await Promise.all(delivery.invalidExpoPushTokens.map((expoPushToken) => input.sessions.deletePushNotificationSubscriptionsByExpoPushToken(expoPushToken)));
 	} };
 }
 function notificationEnabled(subscription, intent) {
 	return intent === "action_required" ? subscription.actionRequired : subscription.turnTerminal;
 }
-function notificationForEvent(expoPushToken, event) {
+function notificationForEvent(expoPushToken, event, remainingUsagePercent) {
 	return {
-		body: event.intent === "action_required" ? "Codex needs your attention." : "A Codex turn has finished.",
+		body: event.intent === "action_required" ? "Codex needs your attention." : remainingUsagePercent === void 0 ? "Finished working." : `Finished working. Remaining usage: ${remainingUsagePercent}%`,
 		data: {
 			intent: event.intent,
 			threadId: event.threadId,
 			...event.turnId ? { turnId: event.turnId } : {}
 		},
-		title: "Codex Relay",
+		title: event.threadTitle?.trim() || event.threadId,
 		to: expoPushToken
 	};
 }
@@ -1575,7 +1574,7 @@ function shellEnvValue(value) {
 //#endregion
 //#region src/app.ts
 const defaultWorkspacePath = process.cwd();
-const defaultCodexModel = "gpt-5.5";
+const defaultCodexModel = "gpt-6-astra";
 const execFileAsync = promisify(execFile);
 const IMAGE_ATTACHMENT_MAX_BYTES = 8 * 1024 * 1024;
 const WORKSPACE_FILE_PREVIEW_MAX_BYTES = 256 * 1024;
@@ -1688,6 +1687,7 @@ function createApp(options = {}) {
 		return result;
 	}
 	const pushNotificationDispatcher = options.pairing ? createPushNotificationDispatcher({
+		readRemainingUsagePercent: appServer ? async () => lowestRateLimitRemainingPercent(normalizeRateLimitBuckets(await appServer.readRateLimits())) : void 0,
 		sender: options.pushNotificationSender ?? createExpoPushNotificationSender(),
 		sessions: options.pairing.sessions
 	}) : void 0;
@@ -1924,6 +1924,7 @@ function createApp(options = {}) {
 		const response = PushNotificationSettingsResponseSchema.parse({
 			preferences: subscription ? {
 				actionRequired: subscription.actionRequired,
+				includeRemainingUsage: subscription.includeRemainingUsage,
 				turnTerminal: subscription.turnTerminal
 			} : defaultPushNotificationPreferences(),
 			registered: Boolean(subscription)
@@ -1940,6 +1941,7 @@ function createApp(options = {}) {
 			actionRequired: parsed.data.preferences.actionRequired,
 			clientSessionId,
 			expoPushToken: parsed.data.expoPushToken,
+			includeRemainingUsage: parsed.data.preferences.includeRemainingUsage,
 			platform: parsed.data.platform,
 			turnTerminal: parsed.data.preferences.turnTerminal
 		});
@@ -2173,7 +2175,11 @@ function createApp(options = {}) {
 	app.get(apiPaths.models, async (c) => {
 		try {
 			const models = appServer ? await appServer.listModels() : fallbackModels();
-			return secureJson(c, options.pairing, secureSessionsByTokenHash, ListModelsResponseSchema.parse({ models: models.map(mapAppServerModel) }));
+			const hasAstra = models.some((model) => model.model === defaultCodexModel);
+			return secureJson(c, options.pairing, secureSessionsByTokenHash, ListModelsResponseSchema.parse({ models: models.map((model) => mapAppServerModel(hasAstra ? {
+				...model,
+				isDefault: model.model === defaultCodexModel
+			} : model)) }));
 		} catch {
 			return secureJson(c, options.pairing, secureSessionsByTokenHash, ListModelsResponseSchema.parse({ models: fallbackModels().map(mapAppServerModel) }));
 		}
@@ -2400,23 +2406,26 @@ function createApp(options = {}) {
 				const turns = threadBeforeRewind.turns ?? [];
 				const turnIndex = turns.findIndex((turn) => turn.id === parsed.data.turnId);
 				if (turnIndex < 0) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("not_found", "The selected message is no longer available to rewind."), 404);
-				let rolledBackThread;
-				if (threadBeforeRewind.historyMode === "paginated" && typeof appServer.revertThread === "function") try {
-					rolledBackThread = await appServer.revertThread({
-						beforeTurnId: parsed.data.turnId,
-						threadId
-					});
-				} catch (error) {
-					if (!/method not found|unsupported|-32601/i.test(errorMessage(error))) throw error;
-					rolledBackThread = await appServer.rollbackThread({
-						threadId,
-						numTurns: turns.length - turnIndex
-					});
-				}
-				else rolledBackThread = await appServer.rollbackThread({
+				const rollbackThread = () => appServer.rollbackThread({
 					threadId,
 					numTurns: turns.length - turnIndex
 				});
+				let rolledBackThread;
+				try {
+					if (threadBeforeRewind.historyMode === "paginated" && typeof appServer.revertThread === "function") try {
+						rolledBackThread = await appServer.revertThread({
+							beforeTurnId: parsed.data.turnId,
+							threadId
+						});
+					} catch (error) {
+						if (!isMissingAppServerMethodError(error, "thread/revert")) throw error;
+						rolledBackThread = await rollbackThread();
+					}
+					else rolledBackThread = await rollbackThread();
+				} catch (error) {
+					if (!isMissingAppServerMethodError(error, "thread/rollback")) throw error;
+					return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("rewind_unsupported", "This chat uses Codex's legacy history format, which this Codex version can no longer rewind. Chats started after the update can be rewound."), 409);
+				}
 				const threadWithTurns = rolledBackThread.turns === void 0 ? await appServer.readThread(threadId, { includeTurns: true }) : rolledBackThread;
 				const thread = rememberAppServerThread(threads, threadWithTurns, { authoritativeMessageCount: true });
 				const messages = mapAppServerMessages(threadWithTurns);
@@ -3080,6 +3089,7 @@ async function pairedClientSessionIdForAuthorization(authorization, pairing) {
 function defaultPushNotificationPreferences() {
 	return {
 		actionRequired: false,
+		includeRemainingUsage: false,
 		turnTerminal: false
 	};
 }
@@ -4685,6 +4695,7 @@ function appServerUserMessageDetails(item) {
 	const attachments = item.content.flatMap((content) => {
 		switch (content.type) {
 			case "image":
+				if (!content.url) return [];
 				if (content.url.startsWith("data:image/")) {
 					const materialized = materializeDataUriImage(content.url);
 					return materialized ? [materialized] : [];
@@ -5328,7 +5339,7 @@ function mapAppServerThread(thread, fallbackMessageCount) {
 	return ThreadSummarySchema.parse({
 		id: thread.id,
 		parentThreadId: thread.parentThreadId ?? void 0,
-		title: thread.name ?? preview(thread.preview || "Untitled thread"),
+		title: appServerThreadTitle(thread),
 		createdAt,
 		updatedAt,
 		state: mappedState,
@@ -5339,6 +5350,9 @@ function mapAppServerThread(thread, fallbackMessageCount) {
 		lastActivityAt
 	});
 }
+function appServerThreadTitle(thread) {
+	return thread.name ?? preview(thread.preview || "Untitled thread");
+}
 function rememberAppServerThread(threads, thread, options = {}) {
 	const existingThread = threads.get(thread.id);
 	const mappedThread = mapAppServerThread(thread, options.authoritativeMessageCount ? void 0 : existingThread?.messageCount);
@@ -6202,26 +6216,54 @@ function objectRecord(value) {
 	return value && typeof value === "object" ? value : void 0;
 }
 function fallbackModels() {
-	return [{
-		id: defaultCodexModel,
-		model: defaultCodexModel,
-		displayName: "GPT-5.5",
-		description: "Default Codex model",
-		isDefault: true,
+	const efforts = [
+		"low",
+		"medium",
+		"high",
+		"xhigh",
+		"max"
+	];
+	return [
+		fallbackModel({
+			description: "Frontier intelligence for the most demanding work.",
+			displayName: "GPT-6-Astra",
+			efforts: [...efforts, "ultra"],
+			fastDescription: "2x speed, increased usage",
+			isDefault: true,
+			model: defaultCodexModel
+		}),
+		fallbackModel({
+			description: "Workhorse model for coding and everyday work.",
+			displayName: "GPT-6-Sol",
+			efforts: [...efforts, "ultra"],
+			fastDescription: "1.5x speed",
+			model: "gpt-6-sol"
+		}),
+		fallbackModel({
+			description: "Fast and affordable model for easier tasks.",
+			displayName: "GPT-6-Luna",
+			efforts,
+			fastDescription: "1.5x speed",
+			model: "gpt-6-luna"
+		})
+	];
+}
+function fallbackModel({ description, displayName, efforts, fastDescription, isDefault = false, model }) {
+	return {
+		id: model,
+		model,
+		displayName,
+		description,
+		isDefault,
 		defaultReasoningEffort: "medium",
-		supportedReasoningEfforts: [
-			{ reasoningEffort: "low" },
-			{ reasoningEffort: "medium" },
-			{ reasoningEffort: "high" },
-			{ reasoningEffort: "xhigh" }
-		],
+		supportedReasoningEfforts: efforts.map((reasoningEffort) => ({ reasoningEffort })),
 		additionalSpeedTiers: ["fast"],
 		serviceTiers: [{
 			id: "priority",
 			name: "Fast",
-			description: "1.5x speed, increased usage"
+			description: fastDescription
 		}]
-	}];
+	};
 }
 function mapAppServerThreadState(status, turns) {
 	if (turns?.some(isAppServerTurnRunning)) return "running";
@@ -6417,7 +6459,10 @@ function observeAppServerPushNotifications(appServer, dispatcher) {
 		if (dispatchedEventIds.has(eventId)) return;
 		rememberEventId(eventId);
 		appServer.readThread(event.threadId, { includeTurns: false }).then((thread) => {
-			if (!isSubagentThread(thread)) return dispatcher.dispatch(event);
+			if (!isSubagentThread(thread)) return dispatcher.dispatch({
+				...event,
+				threadTitle: appServerThreadTitle(thread)
+			});
 		}).catch((error) => {
 			relayDebugLog("push_notification.dispatch_failed", {
 				error: errorMessage(error),
@@ -7430,9 +7475,96 @@ function apiError(code, message, issues) {
 function errorMessage(error) {
 	return error instanceof Error ? error.message : "Codex run failed.";
 }
+function isMissingAppServerMethodError(error, method) {
+	const message = errorMessage(error);
+	return /method not found|-32601/i.test(message) || message.includes(`unknown variant \`${method}\``);
+}
+//#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 +7589,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 +7625,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 +7644,7 @@ serve({
 	hostname: hostname$1,
 	port
 }, (info) => {
+	activePort = info.port;
 	const listenUrl = `http://${info.address}:${info.port}`;
 	const connectUrlCandidates = getConnectUrlCandidates({
 		listenUrl,
@@ -7589,7 +7729,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.1",
+  "version": "1.6.0",
   "description": "Local Codex Relay CLI bridge for the Codex Relay mobile app.",
   "license": "Apache-2.0",
   "repository": {
@@ -41,8 +41,8 @@
     "@noble/ciphers": "2.2.0",
     "@noble/curves": "2.2.0",
     "@noble/hashes": "2.2.0",
-    "@openai/codex": "0.153.4",
-    "@openai/codex-sdk": "0.153.4",
+    "@openai/codex": "0.156.1",
+    "@openai/codex-sdk": "0.156.1",
     "base64-js": "1.5.1",
     "commander": "^14.0.3",
     "es-git": "^0.6.0",

package/src/api-schema.ts

@@ -99,6 +99,7 @@ export const PushNotificationIntentSchema = z.enum(["turn_terminal", "action_req
 
 export const PushNotificationPreferencesSchema = z.object({
   actionRequired: z.boolean(),
+  includeRemainingUsage: z.boolean().default(false),
   turnTerminal: z.boolean(),
 });
 
@@ -179,6 +180,19 @@ export const RateLimitsResponseSchema = z.object({
   buckets: z.array(RateLimitBucketSchema),
 });
 
+export function rateLimitRemainingPercent(usedPercent: number) {
+  return 100 - Math.max(0, Math.min(100, usedPercent));
+}
+
+export function lowestRateLimitRemainingPercent(buckets: readonly RateLimitBucket[]) {
+  const remaining = buckets.flatMap((bucket) =>
+    [bucket.primary, bucket.secondary].flatMap((window) =>
+      window ? [rateLimitRemainingPercent(window.usedPercent)] : [],
+    ),
+  );
+  return remaining.length > 0 ? Math.min(...remaining) : undefined;
+}
+
 export const ThreadContextWindowResponseSchema = z.object({
   threadId: z.string().min(1),
   usage: ContextWindowUsageSchema.nullable(),
@@ -1636,6 +1650,7 @@ export function createOpenApiDocument() {
           required: ["actionRequired", "turnTerminal"],
           properties: {
             actionRequired: { type: "boolean" },
+            includeRemainingUsage: { type: "boolean", default: false },
             turnTerminal: { type: "boolean" },
           },
         },