codex-relay 1.4.4 → 1.4.6

package/dist/api-schema.js

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

package/dist/api-schema2.js

@@ -553,6 +553,9 @@ const ArchiveThreadResponseSchema = z.object({
 	threads: z.array(ThreadSummarySchema),
 	source: z.enum(["app-server", "memory"]).default("memory")
 });
+const RenameThreadRequestSchema = z.object({ title: z.string().trim().min(1).max(120) });
+const RenameThreadResponseSchema = z.object({ thread: ThreadSummarySchema });
+const RewindThreadRequestSchema = z.object({ turnId: z.string().trim().min(1) });
 const ListModelsResponseSchema = z.object({ models: z.array(CodexModelSchema) });
 const ListSkillsResponseSchema = z.object({ skills: z.array(AgentSkillSchema) });
 const ThreadDetailResponseSchema = z.object({
@@ -758,6 +761,8 @@ const apiPaths = {
 	threads: "/v1/threads",
 	thread: (threadId) => `/v1/threads/${encodeURIComponent(threadId)}`,
 	threadArchive: (threadId) => `/v1/threads/${encodeURIComponent(threadId)}`,
+	threadName: (threadId) => `/v1/threads/${encodeURIComponent(threadId)}/name`,
+	threadRollback: (threadId) => `/v1/threads/${encodeURIComponent(threadId)}/rollback`,
 	threadContextWindow: (threadId) => `/v1/threads/${encodeURIComponent(threadId)}/context-window`,
 	threadGoal: (threadId) => `/v1/threads/${encodeURIComponent(threadId)}/goal`,
 	threadMessageDetail: (threadId, messageId, field) => `/v1/threads/${encodeURIComponent(threadId)}/messages/${encodeURIComponent(messageId)}/details/${encodeURIComponent(field)}`,
@@ -840,6 +845,10 @@ function createOpenApiDocument() {
 						in: "path",
 						required: true,
 						schema: { type: "string" }
+					}, {
+						name: "refresh",
+						in: "query",
+						schema: { type: "boolean" }
 					}],
 					responses: {
 						"200": jsonResponse("ThreadDetailResponse"),
@@ -861,6 +870,40 @@ function createOpenApiDocument() {
 					}
 				}
 			},
+			"/v1/threads/{threadId}/name": { post: {
+				summary: "Rename a Codex app-server thread",
+				parameters: [{
+					name: "threadId",
+					in: "path",
+					required: true,
+					schema: { type: "string" }
+				}],
+				requestBody: jsonRequest("RenameThreadRequest"),
+				responses: {
+					"200": jsonResponse("RenameThreadResponse"),
+					"400": jsonResponse("ErrorResponse"),
+					"404": jsonResponse("ErrorResponse"),
+					"409": jsonResponse("ErrorResponse"),
+					"502": jsonResponse("ErrorResponse")
+				}
+			} },
+			"/v1/threads/{threadId}/rollback": { post: {
+				summary: "Rewind a Codex app-server thread to before a selected turn",
+				parameters: [{
+					name: "threadId",
+					in: "path",
+					required: true,
+					schema: { type: "string" }
+				}],
+				requestBody: jsonRequest("RewindThreadRequest"),
+				responses: {
+					"200": jsonResponse("ThreadDetailResponse"),
+					"400": jsonResponse("ErrorResponse"),
+					"404": jsonResponse("ErrorResponse"),
+					"409": jsonResponse("ErrorResponse"),
+					"502": jsonResponse("ErrorResponse")
+				}
+			} },
 			"/v1/workspace-directories": { get: {
 				summary: "List directories under the configured workspace",
 				responses: {
@@ -1160,6 +1203,28 @@ function createOpenApiDocument() {
 					}, { type: "null" }] }
 				}
 			},
+			RenameThreadRequest: {
+				type: "object",
+				required: ["title"],
+				properties: { title: {
+					type: "string",
+					minLength: 1,
+					maxLength: 120
+				} }
+			},
+			RenameThreadResponse: {
+				type: "object",
+				required: ["thread"],
+				properties: { thread: { $ref: "#/components/schemas/ThreadSummary" } }
+			},
+			RewindThreadRequest: {
+				type: "object",
+				required: ["turnId"],
+				properties: { turnId: {
+					type: "string",
+					minLength: 1
+				} }
+			},
 			ThreadGoalResponse: {
 				type: "object",
 				required: ["goal", "thread"],
@@ -1801,4 +1866,4 @@ function jsonResponse(schemaName) {
 	};
 }
 //#endregion
-export { RunThreadResponseSchema as $, promptSkillMentionTextCandidates as $t, PairRequestSchema as A, WorkspaceFileMentionSchema as At, PushNotificationIntentSchema as B, WorkspaceTerminalOutputResponseSchema as Bt, ListModelsResponseSchema as C, VersionResponseSchema as Ct, ListWorkspaceDirectoriesResponseSchema as D, WorkspaceChangesResponseSchema as Dt, ListThreadsResponseSchema as E, WebPreviewTargetSchema as Et, PromptAttachmentSchema as F, WorkspaceSelectionRequestSchema as Ft, RateLimitBucketSchema as G, chatMessageDetailsFromPromptContext as Gt, PushNotificationSettingsResponseSchema as H, WorkspaceTerminalSessionResponseSchema as Ht, PromptAttachmentSummarySchema as I, WorkspaceTailscaleServeRequestSchema as It, ReasoningEffortSchema as J, normalizePromptContext as Jt, RateLimitWindowSchema as K, createOpenApiDocument as Kt, PromptContextInputSchema as L, WorkspaceTailscaleServeResponseSchema as Lt, PendingInputRequestOptionSchema as M, WorkspaceMarkdownPreviewTargetSchema as Mt, PendingInputRequestQuestionSchema as N, WorkspacePreviewNavigationRequestSchema as Nt, ListWorkspaceFilesResponseSchema as O, WorkspaceDirectoryEntrySchema as Ot, PendingInputRequestSchema as P, WorkspacePreviewTabSchema as Pt, RunThreadRequestSchema as Q, promptSkillMentionMarkdown as Qt, PromptContextSchema as R, WorkspaceTerminalInputRequestSchema as Rt, KnownReasoningEffortSchema as S, UpdateWorkspaceFileContentRequestSchema as St, ListSkillsResponseSchema as T, WORKSPACE_PREVIEW_TAB_VALUES as Tt, QueuedThreadInputActionResponseSchema as U, WorkspaceTerminalStartRequestSchema as Ut, PushNotificationPreferencesSchema as V, WorkspaceTerminalResizeRequestSchema as Vt, QueuedThreadInputSchema as W, apiPaths as Wt, ResolveApprovalRequestSchema as X, promptSkillDisplayName as Xt, RegisterPushNotificationRequestSchema as Y, promptMarkdownWithSkills as Yt, ResolveApprovalResponseSchema as Z, promptSkillMentionLabel as Zt, EncryptedPayloadSchema as _, ThreadRunOptionsSchema as _t, ArchiveThreadResponseSchema as a, StatusResponseSchema as at, InterruptThreadRunResponseSchema as b, UpdateRuntimePreferencesRequestSchema as bt, ChatMessageRoleSchema as c, SubmitThreadInputResponseSchema as ct, CheckoutWorkspaceBranchRequestSchema as d, ThreadDetailResponseSchema as dt, stripPromptSkillMentions as en, RuntimeModeSchema as et, CodexModelSchema as f, ThreadGoalResponseSchema as ft, CreateThreadResponseSchema as g, ThreadMessageDetailResponseSchema as gt, CreateThreadRequestSchema as h, ThreadMessageDetailFieldSchema as ht, ApprovalModeSchema as i, SandboxModeSchema as it, PairResponseSchema as j, WorkspaceGitActionResponseSchema as jt, PairEncryptedPayloadSchema as k, WorkspaceFileContentResponseSchema as kt, ChatMessageSchema as l, ThreadCollaborationModeSchema as lt, ContextWindowUsageSchema as m, ThreadGoalStatusSchema as mt, AgentSkillSourceSchema as n, RuntimePreferencesResponseSchema as nt, ChatMessageKindSchema as o, StreamThreadRunEventSchema as ot, CommitPushWorkspaceRequestSchema as p, ThreadGoalSchema as pt, RateLimitsResponseSchema as q, isPromptSkillMarkdownMention as qt, ApprovalDecisionSchema as r, RuntimePreferencesSchema as rt, ChatMessagePromptDetailsSchema as s, StreamThreadRunRequestSchema as st, AgentSkillSchema as t, RuntimePreferencesByWorkspacePathSchema as tt, ChatMessageStateSchema as u, ThreadContextWindowResponseSchema as ut, ErrorResponseSchema as v, ThreadStateSchema as vt, ListQueuedThreadInputsResponseSchema as w, WORKSPACE_PREVIEW_OPEN_PROTOCOL as wt, IsoDateTimeSchema as x, UpdateThreadGoalRequestSchema as xt, ImageAttachmentUploadResponseSchema as y, ThreadSummarySchema as yt, PromptSkillSchema as z, WorkspaceTerminalOutputChunkSchema as zt };
+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 };

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Wt as apiPaths } from "./api-schema2.js";
+import { qt as apiPaths } from "./api-schema2.js";
 import { n as codexRelayHome, o as getConnectUrlGuidance, r as legacyCodexRelayDataPath, s as createTursoPairingSessionStore, t as codexRelayDataPath } from "./paths.js";
 import { Command } from "@commander-js/extra-typings";
 import qrcode from "qrcode-terminal";

package/dist/paths.js

@@ -92,6 +92,7 @@ function createQueryableDatabase(executor) {
 }
 //#endregion
 //#region src/pairing-store.ts
+const permanentClientSessionExpiresAt = Date.parse("9999-12-31T23:59:59.999Z");
 async function createTursoPairingSessionStore(path) {
 	if (path !== ":memory:") await mkdir(dirname(path), { recursive: true });
 	const db = await connect(path);
@@ -134,8 +135,8 @@ async function createTursoPairingSessionStore(path) {
     );
   `);
 	await ensurePairingSessionColumns();
-	async function countActive(now) {
-		const row = await db.prepare("SELECT COUNT(DISTINCT COALESCE(client_session_id, token_hash)) AS count FROM pairing_sessions WHERE expires_at > ?").get(now);
+	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);
 	}
 	async function deleteSession(tokenHash) {
@@ -238,8 +239,8 @@ async function createTursoPairingSessionStore(path) {
              created_at,
              updated_at
            )
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(tokenHash, session.clientSessionId ?? null, session.clientName ?? null, session.expiresAt, secure?.keyEpoch ?? null, secure?.mobileToServerKey ?? null, secure?.serverToMobileKey ?? null, secure?.lastMobileCounter ?? null, secure?.nextServerCounter ?? null, now, now);
-			return countActive(now);
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(tokenHash, session.clientSessionId ?? null, session.clientName ?? null, session.expiresAt ?? permanentClientSessionExpiresAt, secure?.keyEpoch ?? null, secure?.mobileToServerKey ?? null, secure?.serverToMobileKey ?? null, secure?.lastMobileCounter ?? null, secure?.nextServerCounter ?? null, now, now);
+			return countActive();
 		},
 		deleteSession,
 		deletePendingPairing,
@@ -254,7 +255,7 @@ async function createTursoPairingSessionStore(path) {
            WHERE client_session_id = ?`).get(clientSessionId);
 			return row ? pushNotificationSubscriptionFromRow(row) : void 0;
 		},
-		async getValidSession(tokenHash, now) {
+		async getValidSession(tokenHash) {
 			const row = await db.prepare(`SELECT client_name AS clientName,
                   client_session_id AS clientSessionId,
                   expires_at AS expiresAt,
@@ -266,19 +267,14 @@ async function createTursoPairingSessionStore(path) {
            FROM pairing_sessions
            WHERE token_hash = ?`).get(tokenHash);
 			if (!row) return;
-			const expiresAt = Number(row.expiresAt);
-			if (now > expiresAt) {
-				await deleteSession(tokenHash);
-				return;
-			}
 			return {
 				clientSessionId: typeof row.clientSessionId === "string" ? row.clientSessionId : void 0,
 				clientName: typeof row.clientName === "string" ? row.clientName : void 0,
-				expiresAt,
+				expiresAt: Number(row.expiresAt),
 				secureSession: decodeSecureSession(row)
 			};
 		},
-		async listActivePushNotificationSubscriptions(now) {
+		async listActivePushNotificationSubscriptions() {
 			return resultRows(await db.prepare(`SELECT subscriptions.client_session_id AS clientSessionId,
                   subscriptions.expo_push_token AS expoPushToken,
                   subscriptions.platform,
@@ -287,14 +283,12 @@ async function createTursoPairingSessionStore(path) {
            FROM push_notification_subscriptions AS subscriptions
            INNER JOIN pairing_sessions AS sessions
              ON sessions.client_session_id = subscriptions.client_session_id
-           WHERE sessions.expires_at > ?
-           GROUP BY subscriptions.client_session_id`).all(now)).flatMap((row) => {
+           GROUP BY subscriptions.client_session_id`).all()).flatMap((row) => {
 				const subscription = pushNotificationSubscriptionFromRow(row);
 				return subscription ? [subscription] : [];
 			});
 		},
-		async pruneExpired(now) {
-			await db.prepare("DELETE FROM pairing_sessions WHERE expires_at <= ?").run(now);
+		async pruneExpiredPendingPairings(now) {
 			await db.prepare("DELETE FROM pending_pairings WHERE expires_at <= ?").run(now);
 			await db.prepare(`DELETE FROM push_notification_subscriptions
            WHERE NOT EXISTS (
@@ -325,9 +319,9 @@ async function createTursoPairingSessionStore(path) {
                created_at,
                updated_at
              )
-             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(newTokenHash, session.clientSessionId ?? null, session.clientName ?? null, session.expiresAt, secure?.keyEpoch ?? null, secure?.mobileToServerKey ?? null, secure?.serverToMobileKey ?? null, secure?.lastMobileCounter ?? null, secure?.nextServerCounter ?? null, now, now);
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(newTokenHash, session.clientSessionId ?? null, session.clientName ?? null, session.expiresAt ?? permanentClientSessionExpiresAt, secure?.keyEpoch ?? null, secure?.mobileToServerKey ?? null, secure?.serverToMobileKey ?? null, secure?.lastMobileCounter ?? null, secure?.nextServerCounter ?? null, now, now);
 			})();
-			return countActive(now);
+			return countActive();
 		},
 		async updateSecureSession(tokenHash, secureSession) {
 			const secure = encodeSecureSession(secureSession);
@@ -601,4 +595,4 @@ function defaultCodexRelayHome() {
 	}
 }
 //#endregion
-export { getConnectUrlCandidates as a, createPairingQrPayload as i, codexRelayHome as n, getConnectUrlGuidance as o, legacyCodexRelayDataPath as r, createTursoPairingSessionStore as s, codexRelayDataPath as t };
+export { getConnectUrlCandidates as a, permanentClientSessionExpiresAt as c, createPairingQrPayload as i, codexRelayHome as n, getConnectUrlGuidance as o, legacyCodexRelayDataPath as r, createTursoPairingSessionStore as s, codexRelayDataPath as t };

package/dist/src.js

@@ -1,5 +1,5 @@
-import { A as PairRequestSchema, Bt as WorkspaceTerminalOutputResponseSchema, C as ListModelsResponseSchema, Ct as VersionResponseSchema, D as ListWorkspaceDirectoriesResponseSchema, Dt as WorkspaceChangesResponseSchema, E as ListThreadsResponseSchema, Gt as chatMessageDetailsFromPromptContext, H as PushNotificationSettingsResponseSchema, Ht as WorkspaceTerminalSessionResponseSchema, It as WorkspaceTailscaleServeRequestSchema, J as ReasoningEffortSchema, Jt as normalizePromptContext, Kt as createOpenApiDocument, Lt as WorkspaceTailscaleServeResponseSchema, O as ListWorkspaceFilesResponseSchema, Q as RunThreadRequestSchema, Rt as WorkspaceTerminalInputRequestSchema, S as KnownReasoningEffortSchema, St as UpdateWorkspaceFileContentRequestSchema, T as ListSkillsResponseSchema, U as QueuedThreadInputActionResponseSchema, Ut as WorkspaceTerminalStartRequestSchema, Vt as WorkspaceTerminalResizeRequestSchema, Wt as apiPaths, X as ResolveApprovalRequestSchema, Y as RegisterPushNotificationRequestSchema, Yt as promptMarkdownWithSkills, Z as ResolveApprovalResponseSchema, _ as EncryptedPayloadSchema, a as ArchiveThreadResponseSchema, at as StatusResponseSchema, b as InterruptThreadRunResponseSchema, bt as UpdateRuntimePreferencesRequestSchema, ct as SubmitThreadInputResponseSchema, d as CheckoutWorkspaceBranchRequestSchema, dt as ThreadDetailResponseSchema, en as stripPromptSkillMentions, ft as ThreadGoalResponseSchema, gt as ThreadMessageDetailResponseSchema, h as CreateThreadRequestSchema, ht as ThreadMessageDetailFieldSchema, j as PairResponseSchema, jt as WorkspaceGitActionResponseSchema, kt as WorkspaceFileContentResponseSchema, l as ChatMessageSchema, m as ContextWindowUsageSchema, mt as ThreadGoalStatusSchema, nt as RuntimePreferencesResponseSchema, ot as StreamThreadRunEventSchema, p as CommitPushWorkspaceRequestSchema, pt as ThreadGoalSchema, q as RateLimitsResponseSchema, rt as RuntimePreferencesSchema, st as StreamThreadRunRequestSchema, ut as ThreadContextWindowResponseSchema, w as ListQueuedThreadInputsResponseSchema, xt as UpdateThreadGoalRequestSchema, y as ImageAttachmentUploadResponseSchema, yt as ThreadSummarySchema } from "./api-schema2.js";
-import { a as getConnectUrlCandidates, i as createPairingQrPayload, o as getConnectUrlGuidance, r as legacyCodexRelayDataPath, s as createTursoPairingSessionStore, t as codexRelayDataPath } from "./paths.js";
+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 { 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";
 import { execFile, spawn } from "node:child_process";
@@ -209,6 +209,12 @@ var CodexAppServerClient = class {
 	async archiveThread(params) {
 		await this.request("thread/archive", params);
 	}
+	async setThreadName(params) {
+		await this.request("thread/name/set", params);
+	}
+	async rollbackThread(params) {
+		return (await this.request("thread/rollback", params)).thread;
+	}
 	async getThreadGoal(params) {
 		return (await this.request("thread/goal/get", params)).goal;
 	}
@@ -866,7 +872,7 @@ function createExpoPushNotificationSender(fetchImpl = fetch) {
 }
 function createPushNotificationDispatcher(input) {
 	return { async dispatch(event) {
-		const subscriptions = await input.sessions.listActivePushNotificationSubscriptions(Date.now());
+		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)));
@@ -1463,6 +1469,7 @@ function createApp(options = {}) {
 	const resolvedApprovals = /* @__PURE__ */ new Map();
 	const queuedInputsByThreadId = /* @__PURE__ */ new Map();
 	const threadOperationTails = /* @__PURE__ */ new Map();
+	const appServerMutationTails = /* @__PURE__ */ new Map();
 	const workspaceTerminalSessions = /* @__PURE__ */ new Map();
 	const activeAppServerTurnIdsByThreadId = /* @__PURE__ */ new Map();
 	const appServerHistoryLoadsByThreadId = /* @__PURE__ */ new Map();
@@ -1479,6 +1486,15 @@ function createApp(options = {}) {
 		});
 		return result;
 	}
+	function runAppServerMutation(threadId, operation) {
+		const result = (appServerMutationTails.get(threadId) ?? Promise.resolve()).then(operation, operation);
+		const tail = result.then(() => void 0, () => void 0);
+		appServerMutationTails.set(threadId, tail);
+		tail.finally(() => {
+			if (appServerMutationTails.get(threadId) === tail) appServerMutationTails.delete(threadId);
+		});
+		return result;
+	}
 	const pushNotificationDispatcher = options.pairing ? createPushNotificationDispatcher({
 		sender: options.pushNotificationSender ?? createExpoPushNotificationSender(),
 		sessions: options.pairing.sessions
@@ -1492,7 +1508,7 @@ function createApp(options = {}) {
 			threadId
 		});
 		const load = appServer.readThread(threadId, { includeTurns: true }).then((threadWithTurns) => {
-			const mappedThread = rememberAppServerThread(threads, threadWithTurns);
+			const mappedThread = rememberAppServerThread(threads, threadWithTurns, { authoritativeMessageCount: true });
 			const messages = mergeAppServerMessagesWithLocalStatus(mapAppServerMessages(threadWithTurns), messagesByThreadId.get(threadId) ?? cachedMessages);
 			messagesByThreadId.set(threadId, messages);
 			relayDebugLog("thread.detail.history.background_completed", {
@@ -1520,7 +1536,7 @@ function createApp(options = {}) {
 		}
 		const token = parseBearerToken(c.req.header("authorization"));
 		const tokenHash = token ? options.pairing.hashClientToken(token) : void 0;
-		const validSession = tokenHash ? await options.pairing.sessions.getValidSession(tokenHash, Date.now()) : void 0;
+		const validSession = tokenHash ? await options.pairing.sessions.getValidSession(tokenHash) : void 0;
 		if (!tokenHash || !validSession) return c.json(apiError("unauthorized", "Pair this device with the Codex Relay server."), 401);
 		if (options.pairing.serverIdentity && !secureSessionsByTokenHash.has(tokenHash)) if (validSession.secureSession) secureSessionsByTokenHash.set(tokenHash, validSession.secureSession);
 		else return c.json(apiError("secure_session_required", "Secure session expired. Pair this device again."), 401);
@@ -1541,7 +1557,7 @@ function createApp(options = {}) {
 		const parsed = await parsePlainJson(c.req.raw, PairRequestSchema);
 		if (!parsed.success) return c.json(validationError(parsed.error), 400);
 		if (!parsed.data.secure || !options.pairing.serverIdentity) return c.json(apiError("secure_pairing_required", "Pairing requires the secure QR approval flow."), 400);
-		await options.pairing.sessions.pruneExpired(Date.now());
+		await options.pairing.sessions.pruneExpiredPendingPairings(Date.now());
 		const approvalCode = await createApprovalCode(options.pairing.sessions);
 		const expiresAt = Date.now() + (options.pairing.approvalTtlMs ?? 300 * 1e3);
 		const requestOrigin = externalRequestOrigin(c.req.url, (name) => c.req.header(name));
@@ -1579,11 +1595,10 @@ function createApp(options = {}) {
 			approvalCode,
 			approvalExpiresAt: new Date(pending.expiresAt).toISOString()
 		}), 202);
-		await options.pairing.sessions.pruneExpired(Date.now());
+		await options.pairing.sessions.pruneExpiredPendingPairings(Date.now());
 		const clientToken = options.pairing.createClientToken();
-		const expiresAt = Date.now() + options.pairing.tokenTtlMs;
 		const tokenHash = options.pairing.hashClientToken(clientToken);
-		const clientTokenExpiresAt = new Date(expiresAt).toISOString();
+		const clientTokenExpiresAt = new Date(permanentClientSessionExpiresAt).toISOString();
 		const pairing = createSecurePairing({
 			approvalCode,
 			clientEphemeralPublicKey: pending.clientEphemeralPublicKey,
@@ -1597,7 +1612,6 @@ function createApp(options = {}) {
 		const tokenCount = await options.pairing.sessions.createSession(tokenHash, {
 			clientSessionId: pending.clientSessionId,
 			clientName: pending.clientName,
-			expiresAt,
 			secureSession: pairing.session
 		});
 		await options.pairing.sessions.deletePendingPairing(approvalCode);
@@ -1640,14 +1654,12 @@ function createApp(options = {}) {
 		const oldSession = oldToken ? await getValidClientSession(options.pairing, oldToken) : void 0;
 		if (!oldToken || !oldSession) return c.json(apiError("unauthorized", "Pair this device with the Codex Relay server."), 401);
 		const clientToken = options.pairing.createClientToken();
-		const expiresAt = Date.now() + options.pairing.tokenTtlMs;
 		const oldTokenHash = options.pairing.hashClientToken(oldToken);
 		const newTokenHash = options.pairing.hashClientToken(clientToken);
 		const clientSessionId = normalizeClientSessionId(c.req.header("x-codex-relay-client-session-id")) ?? oldSession.clientSessionId;
 		const tokenCount = await options.pairing.sessions.rotateSession(oldTokenHash, newTokenHash, {
 			clientSessionId,
 			clientName: oldSession.clientName,
-			expiresAt,
 			secureSession: secureSessionsByTokenHash.get(oldTokenHash) ?? oldSession.secureSession
 		});
 		const secureSession = secureSessionsByTokenHash.get(oldTokenHash) ?? oldSession.secureSession;
@@ -1658,7 +1670,7 @@ function createApp(options = {}) {
 		});
 		const response = PairResponseSchema.parse({
 			clientToken,
-			clientTokenExpiresAt: new Date(expiresAt).toISOString()
+			clientTokenExpiresAt: new Date(permanentClientSessionExpiresAt).toISOString()
 		});
 		const jsonResponse = await secureJson(c, options.pairing, secureSessionsByTokenHash, response, 201);
 		if (secureSession) {
@@ -2151,8 +2163,73 @@ function createApp(options = {}) {
 		});
 		return secureJson(c, options.pairing, secureSessionsByTokenHash, response);
 	});
+	app.post("/v1/threads/:threadId/name", async (c) => {
+		const threadId = c.req.param("threadId");
+		if (!appServer) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("unsupported", "Renaming threads requires the Codex app-server."), 409);
+		if (!await ensureKnownThread({
+			appServer,
+			threadId,
+			messagesByThreadId,
+			threads
+		})) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("not_found", `Thread ${threadId} is not known to this server.`), 404);
+		const parsed = await parseRequestJson(c, options.pairing, secureSessionsByTokenHash, RenameThreadRequestSchema);
+		if (!parsed.success) return secureJson(c, options.pairing, secureSessionsByTokenHash, validationError(parsed.error), 400);
+		try {
+			const body = parsed.data;
+			const thread = await runAppServerMutation(threadId, async () => {
+				await appServer.setThreadName({
+					name: body.title,
+					threadId
+				});
+				return rememberAppServerThread(threads, await appServer.readThread(threadId, { includeTurns: false }));
+			});
+			return secureJson(c, options.pairing, secureSessionsByTokenHash, RenameThreadResponseSchema.parse({ thread }));
+		} catch (error) {
+			const message = errorMessage(error);
+			const status = /not found|no rollout found/i.test(message) ? 404 : 502;
+			return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError(status === 404 ? "not_found" : "rename_unavailable", message), status);
+		}
+	});
+	app.post("/v1/threads/:threadId/rollback", async (c) => {
+		const threadId = c.req.param("threadId");
+		if (!appServer) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("unsupported", "Rewinding threads requires the Codex app-server."), 409);
+		const parsed = await parseRequestJson(c, options.pairing, secureSessionsByTokenHash, RewindThreadRequestSchema);
+		if (!parsed.success) return secureJson(c, options.pairing, secureSessionsByTokenHash, validationError(parsed.error), 400);
+		return runThreadOperation(threadId, () => runAppServerMutation(threadId, async () => {
+			try {
+				const threadBeforeRewind = await appServer.readThread(threadId, { includeTurns: true });
+				if (isSubagentThread(threadBeforeRewind)) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("not_found", `Thread ${threadId} is not known to this server.`), 404);
+				if (mapAppServerThreadState(threadBeforeRewind.status, threadBeforeRewind.turns) === "running" || activeAppServerTurnIdsByThreadId.has(threadId)) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("thread_running", "Stop the current turn before rewinding this chat."), 409);
+				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);
+				const rolledBackThread = await appServer.rollbackThread({
+					threadId,
+					numTurns: turns.length - turnIndex
+				});
+				const threadWithTurns = rolledBackThread.turns === void 0 ? await appServer.readThread(threadId, { includeTurns: true }) : rolledBackThread;
+				const thread = rememberAppServerThread(threads, threadWithTurns, { authoritativeMessageCount: true });
+				const messages = mapAppServerMessages(threadWithTurns);
+				messagesByThreadId.set(threadId, messages);
+				liveThreads.delete(threadId);
+				activeAppServerTurnIdsByThreadId.delete(threadId);
+				queuedInputsByThreadId.delete(threadId);
+				steeringThreads.delete(threadId);
+				return secureJson(c, options.pairing, secureSessionsByTokenHash, threadDetailResponse({
+					thread,
+					messages,
+					pendingInputRequests: []
+				}));
+			} catch (error) {
+				const message = errorMessage(error);
+				const status = /not found|no rollout found/i.test(message) ? 404 : 502;
+				return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError(status === 404 ? "not_found" : "rewind_unavailable", message), status);
+			}
+		}));
+	});
 	app.get("/v1/threads/:threadId", async (c) => {
 		const threadId = c.req.param("threadId");
+		const forceRefresh = c.req.query("refresh") === "true";
 		const detailStartedAt = Date.now();
 		relayDebugLog("thread.detail.requested", { threadId });
 		const knownThread = threads.get(threadId);
@@ -2166,21 +2243,29 @@ function createApp(options = {}) {
 			let loadedMessages = false;
 			let messages = cachedMessages;
 			let responseThread = preserveKnownRunningThreadState(mappedThread, wasKnownRunning);
-			const rolloutHistory = readRolloutThreadMessages(threadId, workspacePath);
-			if (rolloutHistory.messages.length > 0) {
-				messages = mergeThreadMessagePages(rolloutHistory.messages, cachedMessages);
-				responseThread = rememberRolloutThreadMessages(threads, responseThread, messages, rolloutHistory.messageCountLowerBound);
-				responseThread = preserveKnownRunningThreadState(responseThread, wasKnownRunning);
+			if (forceRefresh && responseThread.state !== "running") {
+				const threadWithTurns = await appServer.readThread(threadId, { includeTurns: true });
+				responseThread = rememberAppServerThread(threads, threadWithTurns, { authoritativeMessageCount: true });
+				messages = mapAppServerMessages(threadWithTurns);
 				messagesByThreadId.set(threadId, messages);
 				loadedMessages = true;
-			} else if (cachedMessages.length > 0) {
-				messages = dedupeThreadMessages(cachedMessages);
-				if (messages.length !== cachedMessages.length) messagesByThreadId.set(threadId, messages);
-				loadedMessages = true;
+			} else {
+				const rolloutHistory = readRolloutThreadMessages(threadId, workspacePath);
+				if (rolloutHistory.messages.length > 0) {
+					messages = mergeThreadMessagePages(rolloutHistory.messages, cachedMessages);
+					responseThread = rememberRolloutThreadMessages(threads, responseThread, messages, rolloutHistory.messageCountLowerBound);
+					responseThread = preserveKnownRunningThreadState(responseThread, wasKnownRunning);
+					messagesByThreadId.set(threadId, messages);
+					loadedMessages = true;
+				} else if (cachedMessages.length > 0) {
+					messages = dedupeThreadMessages(cachedMessages);
+					if (messages.length !== cachedMessages.length) messagesByThreadId.set(threadId, messages);
+					loadedMessages = true;
+				}
 			}
 			if (!loadedMessages && responseThread.state !== "running") {
 				const threadWithTurns = await appServer.readThread(threadId, { includeTurns: true });
-				responseThread = rememberAppServerThread(threads, threadWithTurns);
+				responseThread = rememberAppServerThread(threads, threadWithTurns, { authoritativeMessageCount: true });
 				messages = mergeAppServerMessagesWithLocalStatus(mapAppServerMessages(threadWithTurns), cachedMessages);
 				messagesByThreadId.set(threadId, messages);
 				loadedMessages = true;
@@ -2507,30 +2592,32 @@ function createApp(options = {}) {
 	app.post("/v1/threads/:threadId/input/:inputId/steer", async (c) => {
 		const threadId = c.req.param("threadId");
 		const inputId = c.req.param("inputId");
-		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 queuedInput = removeQueuedInput(queuedInputsByThreadId, threadId, inputId);
-		if (!queuedInput) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("not_found", `Queued input ${inputId} is not known to this thread.`), 404);
-		steeringThreads.add(threadId);
-		await startAppServerTurn(appServer, threadId, queuedInput);
-		const thread = updateThread(threads, messagesByThreadId, threadId, {
-			state: "running",
-			lastPrompt: promptWithAttachmentReferences(queuedInput.prompt, queuedInput.attachments),
-			lastError: void 0
-		});
-		const response = QueuedThreadInputActionResponseSchema.parse({
-			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 queuedInput = removeQueuedInput(queuedInputsByThreadId, threadId, inputId);
+			if (!queuedInput) return secureJson(c, options.pairing, secureSessionsByTokenHash, apiError("not_found", `Queued input ${inputId} is not known to this thread.`), 404);
+			steeringThreads.add(threadId);
+			await runAppServerMutation(threadId, () => startAppServerTurn(appServer, threadId, queuedInput));
+			const thread = updateThread(threads, messagesByThreadId, threadId, {
+				state: "running",
+				lastPrompt: promptWithAttachmentReferences(queuedInput.prompt, queuedInput.attachments),
+				lastError: void 0
+			});
+			const response = QueuedThreadInputActionResponseSchema.parse({
+				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.post("/v1/threads/:threadId/runs/interrupt", async (c) => {
 		const threadId = c.req.param("threadId");
@@ -2717,6 +2804,7 @@ function createApp(options = {}) {
 					messagesByThreadId,
 					pendingApprovals,
 					queuedInputsByThreadId,
+					runAppServerMutation,
 					runThreadOperation,
 					prompt: rawPrompt,
 					attachments: runOptions.attachments ?? [],
@@ -2763,7 +2851,7 @@ async function pairedClientSessionIdForAuthorization(authorization, pairing) {
 	if (!pairing) return;
 	const token = parseBearerToken(authorization);
 	if (!token) return;
-	return (await pairing.sessions.getValidSession(pairing.hashClientToken(token), Date.now()))?.clientSessionId;
+	return (await pairing.sessions.getValidSession(pairing.hashClientToken(token)))?.clientSessionId;
 }
 function defaultPushNotificationPreferences() {
 	return {
@@ -2805,7 +2893,7 @@ async function createApprovalCode(sessions) {
 	throw new Error("Unable to allocate a pairing approval code.");
 }
 async function getValidClientSession(pairing, token) {
-	return pairing.sessions.getValidSession(pairing.hashClientToken(token), Date.now());
+	return pairing.sessions.getValidSession(pairing.hashClientToken(token));
 }
 function externalRequestOrigin(requestUrl, header) {
 	const request = new URL(requestUrl);
@@ -2929,6 +3017,7 @@ async function runPromptStreamed(input) {
 			messagesByThreadId: input.messagesByThreadId,
 			pendingApprovals: input.pendingApprovals,
 			queuedInputsByThreadId: input.queuedInputsByThreadId,
+			runAppServerMutation: input.runAppServerMutation,
 			runThreadOperation: input.runThreadOperation,
 			prompt: input.prompt,
 			runOptions: input.runOptions,
@@ -3549,7 +3638,7 @@ async function runAppServerPromptStreamed(input) {
 		observedInputRequest = false;
 		producedTurnOutput = false;
 	}
-	function finishTerminalTurn(options) {
+	async function finishTerminalTurn(options) {
 		const terminalTurnId = options.turnId ?? activeTurnId;
 		if (terminalTurnId && finalizedTurnIds.has(terminalTurnId)) return;
 		if (terminalTurnId) {
@@ -3627,25 +3716,36 @@ async function runAppServerPromptStreamed(input) {
 			handedOffToQueuedTurn = true;
 			resetTurnTracking();
 			input.steeringThreads.add(activeThreadId);
-			startAppServerTurn(input.appServer, activeThreadId, nextQueuedInput).then(processReturnedTurn).catch((error) => {
-				cleanupNotificationHandler();
-				rejectCompleted(error);
-			});
+			await processReturnedTurn(await startAppServerTurn(input.appServer, activeThreadId, nextQueuedInput));
 			return;
 		}
 		input.steeringThreads.delete(activeThreadId);
 		cleanupNotificationHandler();
 		resolveCompleted();
 	}
-	function processReturnedTurn(turn) {
+	async function processReturnedTurn(turn) {
 		if (finalizedTurnIds.has(turn.id)) return;
 		activeTurnId = turn.id;
 		input.activeAppServerTurnIdsByThreadId.set(activeThreadId, turn.id);
 		const turnIsRunning = isAppServerTurnRunning(turn);
 		for (const item of turn.items) {
+			const previousUserMessage = userMessage;
 			const canonicalUserMessage = replaceDuplicateInitialUserMessage(input.messagesByThreadId, activeThreadId, turn.id, item, userMessage.id, displayPrompt);
 			if (canonicalUserMessage) {
 				userMessage = canonicalUserMessage;
+				if (canonicalUserMessage.id !== previousUserMessage.id || canonicalUserMessage.turnId !== previousUserMessage.turnId) {
+					relayDebugLog("app_server.user_message.canonicalized", {
+						messageId: canonicalUserMessage.id,
+						previousMessageId: previousUserMessage.id,
+						threadId: activeThreadId,
+						turnId: canonicalUserMessage.turnId
+					});
+					sendSse(input.controller, input.encoder, input.secureSession, {
+						type: "thread.message.created",
+						thread: threadSummary,
+						message: canonicalUserMessage
+					});
+				}
 				continue;
 			}
 			const message = upsertAppServerItemMessage(input.messagesByThreadId, activeThreadId, turn.id, item);
@@ -3665,13 +3765,20 @@ async function runAppServerPromptStreamed(input) {
 		if (turnIsRunning) return;
 		const params = { turn };
 		const state = terminalTurnState("turn/completed", params);
-		finishTerminalTurn({
+		await finishTerminalTurn({
 			lastError: state === "failed" ? turnErrorMessage(params) : void 0,
 			method: "turn/returned",
 			state,
 			turnId: turn.id
 		});
 	}
+	function startAndProcessAppServerTurn(threadId, queuedInput) {
+		return input.runAppServerMutation(threadId, async () => {
+			const turn = await startAppServerTurn(input.appServer, threadId, queuedInput);
+			await processReturnedTurn(turn);
+			return turn;
+		});
+	}
 	const completed = new Promise((resolve, reject) => {
 		resolveCompleted = resolve;
 		rejectCompleted = reject;
@@ -3711,9 +3818,23 @@ async function runAppServerPromptStreamed(input) {
 					case "item/completed": {
 						const item = params?.item;
 						if (!item || typeof item !== "object") return;
+						const previousUserMessage = userMessage;
 						const canonicalUserMessage = replaceDuplicateInitialUserMessage(input.messagesByThreadId, activeThreadId, firstString(params, ["turnId"]) ?? activeTurnId, item, userMessage.id, displayPrompt);
 						if (canonicalUserMessage) {
 							userMessage = canonicalUserMessage;
+							if (canonicalUserMessage.id !== previousUserMessage.id || canonicalUserMessage.turnId !== previousUserMessage.turnId) {
+								relayDebugLog("app_server.user_message.canonicalized", {
+									messageId: canonicalUserMessage.id,
+									previousMessageId: previousUserMessage.id,
+									threadId: activeThreadId,
+									turnId: canonicalUserMessage.turnId
+								});
+								sendSse(input.controller, input.encoder, input.secureSession, {
+									type: "thread.message.created",
+									thread: threadSummary,
+									message: canonicalUserMessage
+								});
+							}
 							return;
 						}
 						const turnId = firstString(params, ["turnId"]) ?? activeTurnId;
@@ -3784,12 +3905,12 @@ async function runAppServerPromptStreamed(input) {
 						const state = terminalTurnState(notification.method, params);
 						const terminalTurnId = firstString(params, ["turnId"]) ?? turnIdFromParams(params) ?? activeTurnId;
 						input.runThreadOperation(activeThreadId, async () => {
-							finishTerminalTurn({
+							await input.runAppServerMutation(activeThreadId, () => finishTerminalTurn({
 								lastError: state === "failed" ? turnErrorMessage(params) : void 0,
 								method: notification.method,
 								state,
 								turnId: terminalTurnId
-							});
+							}));
 						}).catch((error) => {
 							cleanupNotificationHandler();
 							rejectCompleted(error);
@@ -3850,7 +3971,7 @@ async function runAppServerPromptStreamed(input) {
 		debugStream("start turn begin", activeThreadId);
 		let turn;
 		try {
-			turn = await startAppServerTurn(input.appServer, activeThreadId, {
+			turn = await startAndProcessAppServerTurn(activeThreadId, {
 				attachments: input.attachments,
 				id: randomUUID(),
 				prompt,
@@ -3884,7 +4005,7 @@ async function runAppServerPromptStreamed(input) {
 				thread: threadSummary,
 				message: userMessage
 			});
-			turn = await startAppServerTurn(input.appServer, activeThreadId, {
+			turn = await startAndProcessAppServerTurn(activeThreadId, {
 				attachments: input.attachments,
 				id: randomUUID(),
 				prompt,
@@ -3894,7 +4015,6 @@ async function runAppServerPromptStreamed(input) {
 			});
 		}
 		debugStream("start turn complete", activeThreadId, turn.id);
-		processReturnedTurn(turn);
 		await completed;
 	} catch (error) {
 		debugStream(`failed ${errorMessage(error)}`, activeThreadId, activeTurnId);
@@ -4862,9 +4982,9 @@ function mapAppServerThread(thread, fallbackMessageCount) {
 		lastActivityAt: updatedAt
 	});
 }
-function rememberAppServerThread(threads, thread) {
+function rememberAppServerThread(threads, thread, options = {}) {
 	const existingThread = threads.get(thread.id);
-	const mappedThread = mapAppServerThread(thread, existingThread?.messageCount);
+	const mappedThread = mapAppServerThread(thread, options.authoritativeMessageCount ? void 0 : existingThread?.messageCount);
 	const threadWithLocalRuntime = ThreadSummarySchema.parse({
 		...mappedThread,
 		goal: existingThread?.goal ?? mappedThread.goal,
@@ -5053,6 +5173,7 @@ function readRolloutThreadMessages(threadId, workspacePath = defaultWorkspacePat
 	const applyPatchInputs = /* @__PURE__ */ new Map();
 	const handledApplyPatchCallIds = /* @__PURE__ */ new Set();
 	const pendingApplyPatchChanges = [];
+	let activeTurnId;
 	const lines = readFileSync(rolloutPath, "utf8").split("\n");
 	for (let index = 0; index < lines.length; index += 1) {
 		const line = lines[index];
@@ -5061,14 +5182,17 @@ function readRolloutThreadMessages(threadId, workspacePath = defaultWorkspacePat
 		if (!isRolloutMessageLine(line)) continue;
 		try {
 			const record = JSON.parse(line);
+			activeTurnId = firstString(record.payload, ["turn_id", "turnId"]) ?? activeTurnId;
 			rememberRolloutApplyPatchInput(record, applyPatchInputs);
 			collectRolloutApplyPatchOutput(record, workspacePath, applyPatchInputs, handledApplyPatchCallIds, pendingApplyPatchChanges);
 			if (isRolloutTaskComplete(record) && pendingApplyPatchChanges.length > 0) {
 				collected.push(rolloutApplyPatchSummaryMessage(threadId, record, `rollout:${lineNumber}:apply_patch`, pendingApplyPatchChanges));
 				pendingApplyPatchChanges.length = 0;
+				activeTurnId = void 0;
 				continue;
 			}
-			const message = rolloutRecordMessage(threadId, record, `rollout:${lineNumber}`, workspacePath);
+			const message = rolloutRecordMessage(threadId, record, `rollout:${lineNumber}`, workspacePath, activeTurnId);
+			if (isRolloutTaskComplete(record)) activeTurnId = void 0;
 			if (!message) continue;
 			collected.push(message);
 			const patchApplyEndCallId = rolloutPatchApplyEndCallId(record);
@@ -5103,7 +5227,7 @@ function findRolloutFileForThread(threadId) {
 function isRolloutTaskComplete(record) {
 	return record.type === "event_msg" && record.payload?.type === "task_complete";
 }
-function rolloutRecordMessage(threadId, record, messageKey, workspacePath = defaultWorkspacePath) {
+function rolloutRecordMessage(threadId, record, messageKey, workspacePath = defaultWorkspacePath, turnId) {
 	const timestamp = typeof record.timestamp === "string" ? record.timestamp : (/* @__PURE__ */ new Date()).toISOString();
 	const payload = record.payload;
 	if (!payload) return;
@@ -5117,7 +5241,8 @@ function rolloutRecordMessage(threadId, record, messageKey, workspacePath = defa
 			content,
 			details: rolloutUserMessageDetails(payload),
 			createdAt: timestamp,
-			state: "completed"
+			state: "completed",
+			turnId
 		});
 	}
 	if (record.type === "event_msg" && payload.type === "agent_message") {
@@ -5131,7 +5256,8 @@ function rolloutRecordMessage(threadId, record, messageKey, workspacePath = defa
 			content: messageParts.content,
 			details: messageParts.details,
 			createdAt: timestamp,
-			state: "completed"
+			state: "completed",
+			turnId
 		});
 	}
 	if (record.type === "event_msg" && payload.type === "patch_apply_end") {
@@ -5339,7 +5465,7 @@ function fileUrlPath(value) {
 	}
 }
 function isRolloutMessageLine(line) {
-	return line.includes("\"type\":\"event_msg\"") && (line.includes("\"type\":\"user_message\"") || line.includes("\"type\":\"agent_message\"") || line.includes("\"type\":\"patch_apply_end\"") || line.includes("\"type\":\"task_complete\"") || line.includes("\"type\":\"exec_command_end\"") || line.includes("\"type\":\"mcp_tool_call_end\"")) || line.includes("\"type\":\"response_item\"") && (line.includes("\"type\":\"custom_tool_call\"") || line.includes("\"type\":\"custom_tool_call_output\""));
+	return line.includes("\"type\":\"event_msg\"") && (line.includes("\"type\":\"user_message\"") || line.includes("\"type\":\"agent_message\"") || line.includes("\"type\":\"patch_apply_end\"") || line.includes("\"type\":\"task_started\"") || line.includes("\"type\":\"task_complete\"") || line.includes("\"type\":\"exec_command_end\"") || line.includes("\"type\":\"mcp_tool_call_end\"")) || line.includes("\"type\":\"response_item\"") && (line.includes("\"type\":\"custom_tool_call\"") || line.includes("\"type\":\"custom_tool_call_output\""));
 }
 function threadDetailResponse(input) {
 	return ThreadDetailResponseSchema.parse({
@@ -5836,7 +5962,6 @@ function isApprovalServerRequest(method) {
 }
 function observeAppServerPushNotifications(appServer, dispatcher) {
 	const dispatchedEventIds = /* @__PURE__ */ new Set();
-	const subagentThreadIds = /* @__PURE__ */ new Set();
 	const rememberEventId = (eventId) => {
 		if (dispatchedEventIds.size >= 1e3) dispatchedEventIds.clear();
 		dispatchedEventIds.add(eventId);
@@ -5844,7 +5969,9 @@ function observeAppServerPushNotifications(appServer, dispatcher) {
 	const dispatch = (event, eventId) => {
 		if (dispatchedEventIds.has(eventId)) return;
 		rememberEventId(eventId);
-		dispatcher.dispatch(event).catch((error) => {
+		appServer.readThread(event.threadId, { includeTurns: false }).then((thread) => {
+			if (!isSubagentThread(thread)) return dispatcher.dispatch(event);
+		}).catch((error) => {
 			relayDebugLog("push_notification.dispatch_failed", {
 				error: errorMessage(error),
 				intent: event.intent,
@@ -5854,36 +5981,16 @@ function observeAppServerPushNotifications(appServer, dispatcher) {
 		});
 	};
 	appServer.onNotification((notification) => {
-		rememberSubagentThreadIds(notification, subagentThreadIds);
 		const event = pushNotificationEventFromTerminalNotification(notification);
 		if (!event) return;
-		const eventId = `${event.intent}:${event.threadId}:${event.turnId ?? ""}`;
-		if (subagentThreadIds.delete(event.threadId)) {
-			rememberEventId(eventId);
-			return;
-		}
-		dispatch(event, eventId);
+		dispatch(event, `${event.intent}:${event.threadId}:${event.turnId ?? ""}`);
 	});
 	appServer.onRequest((request) => {
 		const event = pushNotificationEventFromApprovalRequest(request);
 		if (!event) return;
-		const eventId = `${event.intent}:${event.threadId}:${event.turnId ?? ""}:${request.id}`;
-		if (subagentThreadIds.has(event.threadId)) {
-			rememberEventId(eventId);
-			return;
-		}
-		dispatch(event, eventId);
+		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);
@@ -6859,7 +6966,6 @@ function errorMessage(error) {
 //#region src/index.ts
 const port = Number(process.env.PORT ?? 8787);
 const hostname$1 = process.env.HOST ?? "0.0.0.0";
-const clientTokenTtlMs = 10080 * 60 * 1e3;
 const dangerouslyAutoApprove = process.env.CODEX_RELAY_DANGEROUSLY_AUTO_APPROVE === "1";
 const serverIdentity = await getServerIdentity();
 const approvalSecret = await getApprovalSecret();
@@ -6907,7 +7013,6 @@ serve({
 			createClientToken: () => randomBytes(32).toString("base64url"),
 			hashClientToken,
 			sessions: sessionStore,
-			tokenTtlMs: clientTokenTtlMs,
 			onPaired: ({ clientName, tokenCount }) => {
 				logRuntimeEvent("Paired", `Mobile client connected${clientName ? ` from ${clientName}` : ""}; ${formatClientCount(tokenCount)} active.`);
 			},

package/package.json

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

package/src/api-schema.ts

@@ -681,6 +681,18 @@ export const ArchiveThreadResponseSchema = z.object({
   source: z.enum(["app-server", "memory"]).default("memory"),
 });
 
+export const RenameThreadRequestSchema = z.object({
+  title: z.string().trim().min(1).max(120),
+});
+
+export const RenameThreadResponseSchema = z.object({
+  thread: ThreadSummarySchema,
+});
+
+export const RewindThreadRequestSchema = z.object({
+  turnId: z.string().trim().min(1),
+});
+
 export const ListModelsResponseSchema = z.object({
   models: z.array(CodexModelSchema),
 });
@@ -844,6 +856,9 @@ export type UpdateRuntimePreferencesRequest = z.infer<typeof UpdateRuntimePrefer
 export type VersionResponse = z.infer<typeof VersionResponseSchema>;
 export type ListThreadsResponse = z.infer<typeof ListThreadsResponseSchema>;
 export type ArchiveThreadResponse = z.infer<typeof ArchiveThreadResponseSchema>;
+export type RenameThreadRequest = z.infer<typeof RenameThreadRequestSchema>;
+export type RenameThreadResponse = z.infer<typeof RenameThreadResponseSchema>;
+export type RewindThreadRequest = z.infer<typeof RewindThreadRequestSchema>;
 export type ListModelsResponse = z.infer<typeof ListModelsResponseSchema>;
 export type ListSkillsResponse = z.infer<typeof ListSkillsResponseSchema>;
 export type ListWorkspaceFilesResponse = z.infer<typeof ListWorkspaceFilesResponseSchema>;
@@ -1089,6 +1104,8 @@ export const apiPaths = {
   threads: "/v1/threads",
   thread: (threadId: string) => `/v1/threads/${encodeURIComponent(threadId)}`,
   threadArchive: (threadId: string) => `/v1/threads/${encodeURIComponent(threadId)}`,
+  threadName: (threadId: string) => `/v1/threads/${encodeURIComponent(threadId)}/name`,
+  threadRollback: (threadId: string) => `/v1/threads/${encodeURIComponent(threadId)}/rollback`,
   threadContextWindow: (threadId: string) =>
     `/v1/threads/${encodeURIComponent(threadId)}/context-window`,
   threadGoal: (threadId: string) => `/v1/threads/${encodeURIComponent(threadId)}/goal`,
@@ -1191,6 +1208,11 @@ export function createOpenApiDocument() {
               required: true,
               schema: { type: "string" },
             },
+            {
+              name: "refresh",
+              in: "query",
+              schema: { type: "boolean" },
+            },
           ],
           responses: {
             "200": jsonResponse("ThreadDetailResponse"),
@@ -1214,6 +1236,48 @@ export function createOpenApiDocument() {
           },
         },
       },
+      "/v1/threads/{threadId}/name": {
+        post: {
+          summary: "Rename a Codex app-server thread",
+          parameters: [
+            {
+              name: "threadId",
+              in: "path",
+              required: true,
+              schema: { type: "string" },
+            },
+          ],
+          requestBody: jsonRequest("RenameThreadRequest"),
+          responses: {
+            "200": jsonResponse("RenameThreadResponse"),
+            "400": jsonResponse("ErrorResponse"),
+            "404": jsonResponse("ErrorResponse"),
+            "409": jsonResponse("ErrorResponse"),
+            "502": jsonResponse("ErrorResponse"),
+          },
+        },
+      },
+      "/v1/threads/{threadId}/rollback": {
+        post: {
+          summary: "Rewind a Codex app-server thread to before a selected turn",
+          parameters: [
+            {
+              name: "threadId",
+              in: "path",
+              required: true,
+              schema: { type: "string" },
+            },
+          ],
+          requestBody: jsonRequest("RewindThreadRequest"),
+          responses: {
+            "200": jsonResponse("ThreadDetailResponse"),
+            "400": jsonResponse("ErrorResponse"),
+            "404": jsonResponse("ErrorResponse"),
+            "409": jsonResponse("ErrorResponse"),
+            "502": jsonResponse("ErrorResponse"),
+          },
+        },
+      },
       "/v1/workspace-directories": {
         get: {
           summary: "List directories under the configured workspace",
@@ -1452,6 +1516,27 @@ export function createOpenApiDocument() {
             tokenBudget: { anyOf: [{ type: "integer", minimum: 1 }, { type: "null" }] },
           },
         },
+        RenameThreadRequest: {
+          type: "object",
+          required: ["title"],
+          properties: {
+            title: { type: "string", minLength: 1, maxLength: 120 },
+          },
+        },
+        RenameThreadResponse: {
+          type: "object",
+          required: ["thread"],
+          properties: {
+            thread: { $ref: "#/components/schemas/ThreadSummary" },
+          },
+        },
+        RewindThreadRequest: {
+          type: "object",
+          required: ["turnId"],
+          properties: {
+            turnId: { type: "string", minLength: 1 },
+          },
+        },
         ThreadGoalResponse: {
           type: "object",
           required: ["goal", "thread"],