ryco-cli 0.1.30 → 0.1.31

package/dist/{CodexDriver-Bi49RIL4.mjs → CodexDriver-DJoTky7Z.mjs}

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
-import { Dt as ServerConfig, Gt as normalizeModelSlug, Rt as getModelSelectionBooleanOptionValue, X as ServerSettingsService, at as expandHomePath, zt as getModelSelectionStringOptionValue } from "./Metrics-CnmjpbWk.mjs";
-import { Aa as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, Ba as ProviderApprovalDecision, Do as ThreadGoal, Du as EventId, Fu as RuntimeRequestId, Lu as RuntimeSubagentId, Nu as ProviderItemId, Pu as RuntimeItemId, Qo as ProviderInstanceId, Ru as RuntimeTaskId, Vu as TurnId, Zo as ProviderDriverKind, _i as UserInputQuestion, ku as MessageId, qr as CodexSettings, vi as isToolLifecycleItemType, yu as ApprovalRequestId } from "./src-CtsgPPhb.mjs";
-import { $t as ServerRequest__CommandExecutionRequestApprovalParams, A as makeEventNdjsonLogger, An as V2ThreadRealtimeStartedNotification, B as buildTokenReductionInstructions, Bn as V2TurnSteerParams, Bt as ProviderAdapterSessionNotFoundError, Cn as V2ThreadGoalClearedNotification, Dn as V2ThreadRealtimeErrorNotification, En as V2ThreadRealtimeClosedNotification, Fn as V2TurnDiffUpdatedNotification, Gn as materializeCodexShadowHome, Gt as layerCommand, Hn as V2WindowsSandboxSetupCompletedNotification, Ht as ProviderDriverError, In as V2TurnPlanUpdatedNotification, It as createProcessDeviceToolBinding, Jt as CodexAppServerRequestError, Kn as resolveCodexHomeLayout, Kt as CodexAppServerProcessExitedError, Ln as V2TurnStartParams, Lt as ProviderAdapterProcessError, Mn as V2ThreadStatusChangedNotification, Nn as V2ThreadTokenUsageUpdatedNotification, On as V2ThreadRealtimeItemAddedNotification, Pn as V2TurnCompletedNotification, Pt as installAgentControlNativeHttp, Q as enrichProviderSnapshotWithVersionAdvisory, Qt as ServerRequest__ApplyPatchApprovalParams, Rn as V2TurnStartParams__CollaborationMode, Rt as ProviderAdapterRequestError, Sn as V2ServerRequestResolvedNotification, Tn as V2ThreadNameUpdatedNotification, Un as V2WindowsWorldWritableWarningNotification, Ut as CodexAppServerClient, V as checkRtkAvailability, Vn as V2TurnSteerResponse, Vt as ProviderAdapterValidationError, Wn as codexContinuationIdentity, Wt as layerChildProcess, Xt as CodexAppServerTransportError, Yt as CodexAppServerSpawnError, Zt as SERVER_NOTIFICATION_METHODS, _n as V2McpToolCallProgressNotification, _t as checkCodexProviderStatus, an as ToolRequestUserInputResponse, bn as V2ReasoningSummaryTextDeltaNotification, cn as V2AgentMessageDeltaNotification, ct as resolveAttachmentPath, dn as V2DeprecationNoticeNotification, en as ServerRequest__DynamicToolCallParams, et as makePackageManagedProviderMaintenanceResolver, fn as V2ErrorNotification, gn as V2McpServerOauthLoginCompletedNotification, gt as buildCodexInitializeParams, hn as V2ItemStartedNotification, ht as normalizeProviderHomeEnvironment, in as ToolRequestUserInputParams, it as resolveProviderMaintenanceCapabilitiesEffect, jn as V2ThreadStartedNotification, k as ProviderEventLoggers, kn as V2ThreadRealtimeOutputAudioDeltaNotification, ln as V2CommandExecutionOutputDeltaNotification, mn as V2ItemCompletedNotification, mt as mergeProviderInstanceEnvironment, n as AgentControlSessionRegistry, nn as ServerRequest__FileChangeRequestApprovalParams, on as V2AccountRateLimitsUpdatedNotification, pn as V2FileChangeOutputDeltaNotification, qt as CodexAppServerProtocolParseError, rn as ServerRequest__ToolRequestUserInputParams, sn as V2AccountUpdatedNotification, t as makeServerQueueMetrics, tn as ServerRequest__ExecCommandApprovalParams, un as V2ConfigWarningNotification, vn as V2ModelReroutedNotification, vt as makePendingCodexProvider, wn as V2ThreadGoalUpdatedNotification, xn as V2ReasoningTextDeltaNotification, yn as V2PlanDeltaNotification, zn as V2TurnStartResponse, zt as ProviderAdapterSessionClosedError } from "./bin.mjs";
-import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-V3RIy8Ao.mjs";
+import { Kt as getModelSelectionStringOptionValue, Nt as ServerConfig, Qt as normalizeModelSlug, X as ServerSettingsService, ot as expandHomePath } from "./Metrics-C3vLS9rz.mjs";
+import { Ad as ProviderItemId, Ed as MessageId, Fd as RuntimeTaskId, Ji as UserInputQuestion, Ks as ProviderDriverKind, Md as RuntimeRequestId, Pd as RuntimeSubagentId, Rd as TurnId, Si as CodexSettings, To as ProviderApprovalDecision, Yi as isToolLifecycleItemType, bs as ThreadGoal, gd as ApprovalRequestId, jd as RuntimeItemId, mo as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, qs as ProviderInstanceId, wd as EventId } from "./src-VTj60bUm.mjs";
+import { $t as CodexAppServerRequestError, A as ProviderEventLoggers, An as V2ThreadNameUpdatedNotification, Bn as V2TurnDiffUpdatedNotification, Bt as createProcessDeviceToolBinding, Cn as V2ModelReroutedNotification, Ct as codexServiceTierForSelection, Dn as V2ServerRequestResolvedNotification, En as V2ReasoningTextDeltaNotification, Fn as V2ThreadRealtimeStartedNotification, Gn as V2TurnSteerParams, Gt as ProviderAdapterValidationError, H as checkRtkAvailability, Hn as V2TurnStartParams, Ht as ProviderAdapterRequestError, In as V2ThreadStartedNotification, It as agentControlHostContext, Jn as V2WindowsWorldWritableWarningNotification, Jt as CodexAppServerClient, Kn as V2TurnSteerResponse, Kt as ProviderDriverError, Ln as V2ThreadStatusChangedNotification, Mn as V2ThreadRealtimeErrorNotification, Nn as V2ThreadRealtimeItemAddedNotification, On as V2ThreadGoalClearedNotification, Pn as V2ThreadRealtimeOutputAudioDeltaNotification, Qt as CodexAppServerProtocolParseError, Rn as V2ThreadTokenUsageUpdatedNotification, Rt as installAgentControlNativeHttp, Sn as V2McpToolCallProgressNotification, Tn as V2ReasoningSummaryTextDeltaNotification, Un as V2TurnStartParams__CollaborationMode, Ut as ProviderAdapterSessionClosedError, V as buildTokenReductionInstructions, Vn as V2TurnPlanUpdatedNotification, Vt as ProviderAdapterProcessError, Wn as V2TurnStartResponse, Wt as ProviderAdapterSessionNotFoundError, X as withoutHtmlRenderMarkup, Xn as materializeCodexShadowHome, Xt as layerCommand, Y as resolveHtmlRenderToolPresentation, Yn as codexContinuationIdentity, Yt as layerChildProcess, Zn as resolveCodexHomeLayout, Zt as CodexAppServerProcessExitedError, _n as V2ErrorNotification, _t as mergeProviderInstanceEnvironment, an as ServerRequest__DynamicToolCallParams, at as enrichProviderSnapshotWithVersionAdvisory, bn as V2ItemStartedNotification, bt as checkCodexProviderStatus, cn as ServerRequest__ToolRequestUserInputParams, dn as V2AccountRateLimitsUpdatedNotification, dt as resolveProviderMaintenanceCapabilitiesEffect, en as CodexAppServerSpawnError, er as resolveAttachmentPath, fn as V2AccountUpdatedNotification, gn as V2DeprecationNoticeNotification, hn as V2ConfigWarningNotification, i as AgentControlSessionRegistry, in as ServerRequest__CommandExecutionRequestApprovalParams, j as makeEventNdjsonLogger, jn as V2ThreadRealtimeClosedNotification, kn as V2ThreadGoalUpdatedNotification, ln as ToolRequestUserInputParams, mn as V2CommandExecutionOutputDeltaNotification, n as usageLimitStateFromWindows, nn as SERVER_NOTIFICATION_METHODS, on as ServerRequest__ExecCommandApprovalParams, pn as V2AgentMessageDeltaNotification, qn as V2WindowsSandboxSetupCompletedNotification, qt as ProviderTurnNotSteerableError, r as makeServerQueueMetrics, rn as ServerRequest__ApplyPatchApprovalParams, sn as ServerRequest__FileChangeRequestApprovalParams, st as makePackageManagedProviderMaintenanceResolver, tn as CodexAppServerTransportError, un as ToolRequestUserInputResponse, vn as V2FileChangeOutputDeltaNotification, vt as normalizeProviderHomeEnvironment, wn as V2PlanDeltaNotification, xn as V2McpServerOauthLoginCompletedNotification, xt as makePendingCodexProvider, yn as V2ItemCompletedNotification, yt as buildCodexInitializeParams, zn as V2TurnCompletedNotification } from "./bin.mjs";
+import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-D_BZ-wRH.mjs";
 import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
 import { t as appendProjectCustomSystemPrompt } from "./ProjectCustomSystemPrompt-CS1nulhL.mjs";
-import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B90UKjnv.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-C5TIspJA.mjs";
-import { Cause, Deferred, Effect, Exit, Fiber, FileSystem, Layer, Option, Queue, Redacted, Ref, Schedule, Schema, Scope, Stream } from "effect";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider-B65ipCxM.mjs";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-BSgNgfZv.mjs";
+import { Cause, Clock, Deferred, Effect, Exit, Fiber, FileSystem, Layer, Option, Queue, Redacted, Ref, Schedule, Schema, Scope, Stream } from "effect";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 import * as SchemaIssue$1 from "effect/SchemaIssue";
@@ -417,6 +417,7 @@ function buildTurnStartParams(input) {
 		...input.model ? { model: input.model } : {},
 		...input.serviceTier ? { serviceTier: input.serviceTier } : {},
 		...input.effort ? { effort: input.effort } : {},
+		summary: "auto",
 		...collaborationMode ? { collaborationMode } : {}
 	}).pipe(Effect.mapError((error) => toProtocolParseError("Invalid turn/start request payload", error)));
 }
@@ -476,6 +477,35 @@ const openCodexThread = (input) => {
 		errorMessage: "This Codex thread already has an active writer in another process. Its history can still be recovered. Release the thread in that process before continuing it here."
 	}) : error));
 };
+const CodexThreadRevertResponse = Schema.Struct({ thread: Schema.Struct({ id: Schema.String }) });
+function isUnknownCodexMethod(error) {
+	return Schema.is(CodexAppServerRequestError)(error) && (error.code === -32601 || error.code === -32600 && /unknown variant/i.test(error.errorMessage));
+}
+/**
+* Makes a Codex thread forget its newest turns. Current binaries replace the
+* durable history with the prefix before `beforeTurnId` (`thread/revert`); old
+* binaries only know the deprecated `thread/rollback`. Neither touches files.
+*/
+const revertCodexThread = (client, input) => {
+	const legacyRollback = (revertError) => client.request("thread/rollback", {
+		threadId: input.threadId,
+		numTurns: input.numTurns
+	}).pipe(Effect.as({
+		threadId: input.threadId,
+		turns: []
+	}), Effect.catch((rollbackError) => !isUnknownCodexMethod(rollbackError) ? Effect.fail(rollbackError) : Effect.fail(revertError ?? new CodexAppServerRequestError({
+		code: -32601,
+		errorMessage: "This Codex version can't rewind threads."
+	}))));
+	if (input.beforeTurnId === void 0) return legacyRollback(void 0);
+	return client.raw.request("thread/revert", {
+		threadId: input.threadId,
+		beforeTurnId: input.beforeTurnId
+	}).pipe(Effect.flatMap((raw) => Schema.decodeUnknownEffect(CodexThreadRevertResponse)(raw).pipe(Effect.mapError((error) => toProtocolParseError("Invalid thread/revert response payload", error)))), Effect.as({
+		threadId: input.threadId,
+		turns: []
+	}), Effect.catch((error) => Schema.is(CodexAppServerRequestError)(error) ? legacyRollback(error) : Effect.fail(error)));
+};
 function readNotificationThreadId(notification) {
 	switch (notification.method) {
 		case "thread/started": return notification.params.thread.id;
@@ -1440,17 +1470,18 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 			}
 			return parseThreadSnapshot(response);
 		}),
-		rollbackThread: (numTurns) => Effect.gen(function* () {
+		rollbackThread: (input) => Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
-			const response = yield* client.request("thread/rollback", {
+			const snapshot = yield* revertCodexThread(client, {
 				threadId: providerThreadId,
-				numTurns
+				numTurns: input.numTurns,
+				beforeTurnId: input.beforeTurnId
 			});
 			yield* updateSession(sessionRef, {
 				status: "ready",
 				activeTurnId: void 0
 			});
-			return parseThreadSnapshot(response);
+			return snapshot;
 		}),
 		setGoal: (input) => Effect.gen(function* () {
 			const providerThreadId = yield* readProviderThreadId;
@@ -1536,6 +1567,131 @@ const makeCodexSessionRuntime = (options) => Effect.gen(function* () {
 		close
 	};
 });
+function asRecord(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+/**
+* Codex's rolling update is sparse: a present value overrides the previous one, while
+* null or absent never clears it. Window objects merge the same way one level down.
+*/
+function mergeCodexRateLimitSnapshot(previous, update) {
+	const next = asRecord(update);
+	if (!next) return previous;
+	const merged = { ...previous };
+	for (const [key, value] of Object.entries(next)) {
+		if (value === null || value === void 0) continue;
+		const before = asRecord(merged[key]);
+		const after = asRecord(value);
+		if (before && after) {
+			const window = { ...before };
+			for (const [field, fieldValue] of Object.entries(after)) if (fieldValue !== null && fieldValue !== void 0) window[field] = fieldValue;
+			merged[key] = window;
+		} else merged[key] = value;
+	}
+	return merged;
+}
+function readWindow(value) {
+	const window = asRecord(value);
+	const usedPercent = window?.usedPercent;
+	if (typeof usedPercent !== "number" || !Number.isFinite(usedPercent)) return void 0;
+	const resetsAt = window?.resetsAt;
+	return {
+		exhausted: usedPercent >= 100,
+		resetAtMs: typeof resetsAt === "number" && Number.isFinite(resetsAt) ? resetsAt * 1e3 : null
+	};
+}
+function codexUsageLimitState(snapshot, nowMs) {
+	const windows = [readWindow(snapshot?.primary), readWindow(snapshot?.secondary)].filter((window) => window !== void 0);
+	return usageLimitStateFromWindows(windows, nowMs);
+}
+/** `"usageLimitExceeded"` → itself; `{ httpConnectionFailed: {...} }` → its single key. */
+function codexErrorInfoCode(info) {
+	if (typeof info === "string") return info.length > 0 ? info : void 0;
+	const record = asRecord(info);
+	if (!record) return void 0;
+	const keys = Object.keys(record);
+	return keys.length === 1 ? keys[0] : void 0;
+}
+/**
+* `usageLimitExceeded` is a limit. `rateLimitExceeded` is not in the pinned schema; it
+* counts only while the account snapshot is exhausted, so a transient 429 stays an error.
+*/
+function isCodexUsageLimitError(code, state) {
+	if (code === "usageLimitExceeded") return true;
+	if (code === "rateLimitExceeded") return state.exhausted;
+	return false;
+}
+function readTurnError(payload) {
+	const error = asRecord(asRecord(asRecord(payload)?.turn)?.error);
+	if (!error) return {};
+	const message = typeof error.message === "string" ? error.message.trim() : "";
+	const code = codexErrorInfoCode(error.codexErrorInfo);
+	return {
+		...code !== void 0 ? { code } : {},
+		...message.length > 0 ? { message } : {}
+	};
+}
+/** Per-session state: the merged rate-limit snapshot and turns already reported as limited. */
+function makeCodexUsageLimitTracker() {
+	let snapshot;
+	const announcedTurnIds = /* @__PURE__ */ new Set();
+	const annotate = (event, mapped, nowMs = Date.now()) => {
+		if (event.method === "account/rateLimits/updated") {
+			snapshot = mergeCodexRateLimitSnapshot(snapshot, asRecord(event.payload)?.rateLimits);
+			const usageLimitState = codexUsageLimitState(snapshot, nowMs);
+			return mapped.map((runtimeEvent) => runtimeEvent.type === "account.rate-limits.updated" ? {
+				...runtimeEvent,
+				payload: {
+					...runtimeEvent.payload,
+					usageLimitState
+				}
+			} : runtimeEvent);
+		}
+		if (event.method === "error") {
+			const payload = asRecord(event.payload);
+			if (payload?.willRetry === true) return mapped;
+			const code = codexErrorInfoCode(asRecord(payload?.error)?.codexErrorInfo);
+			const state = codexUsageLimitState(snapshot, nowMs);
+			if (!isCodexUsageLimitError(code, state)) return mapped;
+			return mapped.map((runtimeEvent) => {
+				if (runtimeEvent.type !== "runtime.error") return runtimeEvent;
+				if (runtimeEvent.turnId !== void 0) announcedTurnIds.add(runtimeEvent.turnId);
+				return {
+					...runtimeEvent,
+					payload: {
+						...runtimeEvent.payload,
+						class: "usage_limit",
+						resetAt: state.exhausted ? state.resetAt : null
+					}
+				};
+			});
+		}
+		if (event.method === "turn/completed") {
+			const completed = mapped.find((runtimeEvent) => runtimeEvent.type === "turn.completed");
+			if (!completed) return mapped;
+			const turnId = completed.turnId;
+			const alreadyAnnounced = turnId !== void 0 && announcedTurnIds.has(turnId);
+			if (turnId !== void 0) announcedTurnIds.delete(turnId);
+			if (completed.payload.state !== "failed" || alreadyAnnounced) return mapped;
+			const turnError = readTurnError(event.payload);
+			const state = codexUsageLimitState(snapshot, nowMs);
+			if (!isCodexUsageLimitError(turnError.code, state)) return mapped;
+			const { type: _type, payload: _payload, ...base } = completed;
+			return [{
+				...base,
+				eventId: EventId.make(`${completed.eventId}:usage-limit`),
+				type: "runtime.error",
+				payload: {
+					message: turnError.message ?? "Codex usage limit reached.",
+					class: "usage_limit",
+					resetAt: state.exhausted ? state.resetAt : null
+				}
+			}, ...mapped];
+		}
+		return mapped;
+	};
+	return { annotate };
+}
 //#endregion
 //#region src/provider/Layers/CodexAdapter.ts
 /**
@@ -1555,9 +1711,10 @@ const PROVIDER_SEND_TURN_MAX_ATTACHMENT_TOTAL_BYTES = 8 * PROVIDER_SEND_TURN_MAX
 * The revocation sentence keeps the note truthful for the runtime's whole
 * lifetime: instructions are fixed at session start, but the lease can be
 * revoked mid-session (feature disabled, listener stopped), after which
-* every request is rejected as unauthorized.
+* every request is rejected as unauthorized. Built on the shared host
+* context so Codex hears the same guidance as every other provider.
 */
-const CODEX_AGENT_CONTROL_INSTRUCTIONS = `Ryco Agent Control tools (ryco_*) are available through the '${CODEX_AGENT_CONTROL_SERVER_NAME}' MCP server on a private local connection. They can inspect Ryco projects, threads, transcripts, and request status. During an active turn, the four thread-action tools create immutable requests that require user approval in Ryco; they never mutate immediately. If the server is unreachable or rejects requests as unauthorized, Ryco has revoked this session's access — treat the tools as unavailable instead of retrying.`;
+const CODEX_AGENT_CONTROL_INSTRUCTIONS = `${agentControlHostContext(true)} The server is '${CODEX_AGENT_CONTROL_SERVER_NAME}' on a private local connection; if it becomes unreachable, Ryco has revoked this session's access.`;
 function formatCodexRuntimeErrorDetail(error) {
 	if (!(error.message.includes("Expected \"fast\" | \"flex\"") && error.message.includes("[\"serviceTier\"]"))) return error.message;
 	return `${error.message}. This usually means the installed Codex CLI returned a newer service tier name than Ryco's generated app-server schema knows about. Rebuild effect-codex-app-server before rebuilding the server bundle.`;
@@ -1619,7 +1776,7 @@ function readTokenReductionInstructions(tokenMode) {
 		rtkInstalled: availability.installed
 	})));
 }
-function normalizeCodexTokenUsage(usage) {
+function normalizeCodexTokenUsage(usage, sessionId) {
 	const totalProcessedTokens = usage.total.totalTokens;
 	const usedTokens = usage.last.totalTokens;
 	if (usedTokens === void 0 || usedTokens < 0) return;
@@ -1629,6 +1786,15 @@ function normalizeCodexTokenUsage(usage) {
 	const outputTokens = usage.last.outputTokens;
 	const reasoningOutputTokens = usage.last.reasoningOutputTokens;
 	return {
+		processedUsage: {
+			scope: "session",
+			sessionId,
+			inputTokens: usage.total.inputTokens,
+			cachedInputTokens: usage.total.cachedInputTokens,
+			outputTokens: usage.total.outputTokens,
+			reasoningOutputTokens: usage.total.reasoningOutputTokens,
+			totalTokens: usage.total.totalTokens
+		},
 		usedTokens,
 		...totalProcessedTokens !== void 0 && totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {},
 		...maxTokens !== void 0 ? { maxTokens } : {},
@@ -1653,6 +1819,22 @@ function toTurnStatus(value) {
 		default: return "completed";
 	}
 }
+/**
+* Fallback for a `turn/completed` that strict decoding rejects (for example a
+* `codexErrorInfo` literal newer than the pinned schema). Dropping it would leave the
+* turn running and its Agent Control authority bound.
+*/
+function readTurnCompletedStructurally(payload) {
+	const turn = payload !== null && typeof payload === "object" ? payload.turn : void 0;
+	if (turn === null || typeof turn !== "object") return void 0;
+	const { status, error } = turn;
+	const errorRecord = error !== null && typeof error === "object" ? error : null;
+	const errorMessage = trimText(typeof errorRecord?.message === "string" ? errorRecord.message : void 0);
+	return {
+		status: status === "completed" || status === "failed" || status === "cancelled" || status === "interrupted" ? status : errorRecord !== null ? "failed" : "completed",
+		...errorMessage ? { errorMessage } : {}
+	};
+}
 function normalizeItemType(raw) {
 	const type = trimText(raw);
 	if (!type) return "item";
@@ -1810,12 +1992,39 @@ function runtimeEventBase(event, canonicalThreadId) {
 		}
 	};
 }
+/**
+* A call to one of Ryco's HTML tools: shown by page title or viewport, and
+* carried without the page markup its arguments hold.
+*/
+function htmlRenderToolItem(payload) {
+	const { item } = payload;
+	if (item.type !== "mcpToolCall") return void 0;
+	const presentation = resolveHtmlRenderToolPresentation({
+		toolName: item.tool,
+		serverName: item.server,
+		input: item.arguments
+	});
+	if (!presentation) return void 0;
+	return {
+		...presentation,
+		payload: {
+			...payload,
+			item: {
+				...item,
+				arguments: withoutHtmlRenderMarkup(item.arguments)
+			}
+		}
+	};
+}
 function mapItemLifecycle(event, canonicalThreadId, lifecycle) {
-	const item = (readPayload(V2ItemStartedNotification, event.payload) ?? readPayload(V2ItemCompletedNotification, event.payload))?.item;
+	const payload = readPayload(V2ItemStartedNotification, event.payload) ?? readPayload(V2ItemCompletedNotification, event.payload);
+	const item = payload?.item;
 	if (!item) return;
 	const itemType = toCanonicalItemType(item.type);
 	if (itemType === "unknown" && lifecycle !== "item.updated") return;
-	const detail = itemDetail(item);
+	const htmlRender = htmlRenderToolItem(payload);
+	const title = htmlRender?.title ?? itemTitle(itemType);
+	const detail = htmlRender ? htmlRender.detail : itemDetail(item);
 	const status = lifecycle === "item.started" ? "inProgress" : lifecycle === "item.completed" ? "completed" : void 0;
 	return {
 		...runtimeEventBase(event, canonicalThreadId),
@@ -1823,9 +2032,9 @@ function mapItemLifecycle(event, canonicalThreadId, lifecycle) {
 		payload: {
 			itemType,
 			...status ? { status } : {},
-			...itemTitle(itemType) ? { title: itemTitle(itemType) } : {},
+			...title ? { title } : {},
 			...detail ? { detail } : {},
-			...event.payload !== void 0 ? { data: event.payload } : {}
+			...htmlRender ? { data: htmlRender.payload } : event.payload !== void 0 ? { data: event.payload } : {}
 		}
 	};
 }
@@ -2187,7 +2396,7 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 	}
 	if (event.method === "thread/tokenUsage/updated") {
 		const payload = readPayload(V2ThreadTokenUsageUpdatedNotification, event.payload);
-		const normalizedUsage = payload ? normalizeCodexTokenUsage(payload.tokenUsage) : void 0;
+		const normalizedUsage = payload ? normalizeCodexTokenUsage(payload.tokenUsage, payload.threadId) : void 0;
 		if (!normalizedUsage) return [];
 		return [{
 			type: "thread.token-usage.updated",
@@ -2225,14 +2434,17 @@ function mapToRuntimeEvents(event, canonicalThreadId) {
 	}
 	if (event.method === "turn/completed") {
 		const payload = readPayload(V2TurnCompletedNotification, event.payload);
-		if (!payload) return [];
-		const errorMessage = trimText(payload.turn.error?.message);
+		const completed = payload ? {
+			status: toTurnStatus(payload.turn.status),
+			errorMessage: trimText(payload.turn.error?.message)
+		} : readTurnCompletedStructurally(event.payload);
+		if (!completed) return [];
 		return [{
 			...runtimeEventBase(event, canonicalThreadId),
 			type: "turn.completed",
 			payload: {
-				state: toTurnStatus(payload.turn.status),
-				...errorMessage ? { errorMessage } : {}
+				state: completed.status,
+				...completed.errorMessage ? { errorMessage: completed.errorMessage } : {}
 			}
 		}];
 	}
@@ -2642,6 +2854,7 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			authorization: agentControlLease.value.credential,
 			instructions: CODEX_AGENT_CONTROL_INSTRUCTIONS
 		} : void 0;
+		const startServiceTier = input.modelSelection?.instanceId === boundInstanceId ? codexServiceTierForSelection(input.modelSelection) : void 0;
 		const runtimeInput = {
 			threadId: input.threadId,
 			providerInstanceId: boundInstanceId,
@@ -2656,7 +2869,7 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			runtimeMode: input.runtimeMode,
 			tokenMode,
 			...input.modelSelection?.instanceId === boundInstanceId ? { model: input.modelSelection.model } : {},
-			...input.modelSelection?.instanceId === boundInstanceId && getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") === true ? { serviceTier: "fast" } : {}
+			...startServiceTier ? { serviceTier: startServiceTier } : {}
 		};
 		const agentControl = Option.getOrUndefined(agentControlLease);
 		const sessionScope = yield* Scope.make("sequential");
@@ -2674,9 +2887,10 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			const current = sessions.get(input.threadId);
 			if (current?.runtime === runtime) yield* stopSessionInternal(current);
 		});
+		const usageLimits = makeCodexUsageLimitTracker();
 		const eventFiber = yield* Stream.runForEach(runtime.events, (event) => Effect.gen(function* () {
 			yield* writeNativeEvent(event);
-			const runtimeEvents = mapToRuntimeEvents(event, event.threadId).map((runtimeEvent) => stampRuntimeEvent(runtimeEvent, {
+			const runtimeEvents = usageLimits.annotate(event, mapToRuntimeEvents(event, event.threadId), yield* Clock.currentTimeMillis).map((runtimeEvent) => stampRuntimeEvent(runtimeEvent, {
 				providerInstanceId: boundInstanceId,
 				runtimeSessionId
 			}));
@@ -2849,14 +3063,14 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 		const codexAttachments = yield* Effect.forEach(native, (attachment) => toCodexAttachment(attachment, "turn/start"), { concurrency: 1 });
 		const session = yield* requireSession(input.threadId);
 		const reasoningEffort = input.modelSelection?.instanceId === boundInstanceId ? getModelSelectionStringOptionValue(input.modelSelection, "reasoningEffort") : void 0;
-		const fastMode = input.modelSelection?.instanceId === boundInstanceId ? getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") : void 0;
+		const serviceTier = input.modelSelection?.instanceId === boundInstanceId ? codexServiceTierForSelection(input.modelSelection) : void 0;
 		const formatted = formatSourceControlContextsForAgent(input.sourceControlContexts ?? []);
 		const codexInput = appendAttachmentPathLines(formatted ? formatted + "\n\n" + (input.input ?? "") : input.input, pathLines);
 		const result = yield* session.runtime.sendTurn({
 			...codexInput !== void 0 ? { input: codexInput } : {},
 			...input.modelSelection?.instanceId === boundInstanceId ? { model: input.modelSelection.model } : {},
 			...reasoningEffort ? { effort: reasoningEffort } : {},
-			...fastMode === true ? { serviceTier: "fast" } : {},
+			...serviceTier ? { serviceTier } : {},
 			...input.interactionMode !== void 0 ? { interactionMode: input.interactionMode } : {},
 			...input.customSystemPrompt !== void 0 ? { customSystemPrompt: input.customSystemPrompt } : {},
 			...codexAttachments.length > 0 ? { attachments: codexAttachments } : {}
@@ -2878,7 +3092,17 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			messageId: input.messageId,
 			...steerInput !== void 0 ? { input: steerInput } : {},
 			...codexAttachments.length > 0 ? { attachments: codexAttachments } : {}
-		}).pipe(Effect.mapError((cause) => mapCodexRuntimeError(input.threadId, "turn/steer", cause)));
+		}).pipe(Effect.mapError((cause) => mapCodexRuntimeError(input.threadId, "turn/steer", cause)), Effect.catchTag("ProviderAdapterRequestError", (error) => Effect.gen(function* () {
+			if ((yield* session.runtime.getSession).activeTurnId === input.expectedTurnId) return yield* error;
+			return yield* new ProviderTurnNotSteerableError({
+				provider: PROVIDER,
+				threadId: input.threadId,
+				turnId: input.expectedTurnId,
+				reason: "turn-ended",
+				detail: "The turn finished before this message could be steered. It stays queued and is sent next.",
+				cause: error
+			});
+		})));
 	});
 	const requireSession = Effect.fn("requireSession")(function* (threadId) {
 		const session = sessions.get(threadId);
@@ -2981,13 +3205,17 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 			failedTurnIds
 		};
 	});
-	const rollbackThread = (threadId, numTurns) => {
+	const rollbackThread = (threadId, input) => {
+		const numTurns = input.numTurns;
 		if (!Number.isInteger(numTurns) || numTurns < 1) return Effect.fail(new ProviderAdapterValidationError({
 			provider: PROVIDER,
 			operation: "rollbackThread",
 			issue: "numTurns must be an integer >= 1."
 		}));
-		return requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.rollbackThread(numTurns)), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "thread/rollback", cause)), Effect.map((snapshot) => ({
+		return requireSession(threadId).pipe(Effect.flatMap((session) => session.runtime.rollbackThread({
+			numTurns,
+			beforeTurnId: input.droppedTurnIds[0]
+		})), Effect.mapError((cause) => cause._tag === "ProviderAdapterSessionNotFoundError" ? cause : mapCodexRuntimeError(threadId, "thread/rollback", cause)), Effect.map((snapshot) => ({
 			threadId,
 			turns: snapshot.turns
 		})));
@@ -3043,7 +3271,9 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 		provider: PROVIDER,
 		capabilities: {
 			sessionModelSwitch: "in-session",
-			turnSteering: "native"
+			turnSteering: "native",
+			conversationRollback: "native",
+			resumeSurvivesCwdChange: true
 		},
 		startSession,
 		sendTurn,

package/dist/{CodexTextGeneration-C5TIspJA.mjs → CodexTextGeneration-BSgNgfZv.mjs}

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 
-import { Dt as ServerConfig, Rt as getModelSelectionBooleanOptionValue, at as expandHomePath, zt as getModelSelectionStringOptionValue } from "./Metrics-CnmjpbWk.mjs";
-import { Dr as TextGenerationError } from "./src-CtsgPPhb.mjs";
-import { m as sanitizeFeatureBranchName, p as sanitizeBranchFragment } from "./git-9xWsJYIH.mjs";
-import { Cr as sanitizePrTitle, Sr as sanitizeCommitSubject, Tr as toJsonSchemaObject, _r as buildSideQuestionPrompt, ct as resolveAttachmentPath, dr as validateRankInboxThreadsResult, fr as buildBranchNamePrompt, gr as buildPrContentPrompt, hr as buildIssueContentTitlePrompt, mr as buildIssueContentPolishPrompt, pr as buildCommitMessagePrompt, vr as buildThreadPriorityPrompt, wr as sanitizeThreadTitle, xr as normalizeCliError, yr as buildThreadTitlePrompt } from "./bin.mjs";
-import { n as sideQuestionEnvironment, t as sideQuestionDirectory } from "./SideQuestionIsolation-B-aE6aBz.mjs";
+import { Kt as getModelSelectionStringOptionValue, Nt as ServerConfig, ot as expandHomePath } from "./Metrics-C3vLS9rz.mjs";
+import { ei as TextGenerationError } from "./src-VTj60bUm.mjs";
+import { Ci as sanitizeFeatureBranchName, Ct as codexServiceTierForSelection, Si as sanitizeBranchFragment, _i as normalizeCliError, bi as sanitizeThreadTitle, ci as buildBranchNamePrompt, di as buildIssueContentTitlePrompt, er as resolveAttachmentPath, fi as buildPrContentPrompt, hi as buildThreadTitlePrompt, li as buildCommitMessagePrompt, mi as buildThreadPriorityPrompt, pi as buildSideQuestionPrompt, si as validateRankInboxThreadsResult, ui as buildIssueContentPolishPrompt, vi as sanitizeCommitSubject, xi as toJsonSchemaObject, yi as sanitizePrTitle } from "./bin.mjs";
+import { n as sideQuestionEnvironment, t as sideQuestionDirectory } from "./SideQuestionIsolation-B1T-DsR0.mjs";
 import { Effect, FileSystem, Option, Path, Schema, Stream } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 //#region src/textGeneration/CodexTextGeneration.ts
@@ -52,6 +51,7 @@ const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(function* (
 		const outputPath = yield* writeTempFile(operation, "codex-output", "");
 		const runCodexCommand = Effect.fn("runCodexJson.runCodexCommand")(function* () {
 			const reasoningEffort = getModelSelectionStringOptionValue(modelSelection, "reasoningEffort") ?? CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;
+			const serviceTier = codexServiceTierForSelection(modelSelection);
 			const command = ChildProcess.make(codexConfig.binaryPath || "codex", [
 				"exec",
 				"--ephemeral",
@@ -89,7 +89,7 @@ const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(function* (
 				modelSelection.model,
 				"--config",
 				`model_reasoning_effort="${reasoningEffort}"`,
-				...getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true ? ["--config", `service_tier="fast"`] : [],
+				...serviceTier ? ["--config", `service_tier="${serviceTier}"`] : [],
 				"--output-schema",
 				schemaPath,
 				"--output-last-message",

package/dist/{CodexTextGeneration-sXPR9eld.cjs → CodexTextGeneration-C9MDQmZm.cjs}

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 
-const require_Metrics = require("./Metrics-C0LSU8s7.cjs");
-const require_src = require("./src-CARHuYkT.cjs");
-const require_git = require("./git-xIkXFy_l.cjs");
+const require_Metrics = require("./Metrics-DjRPLE98.cjs");
+const require_src = require("./src-FmeCeBJ9.cjs");
 const require_bin = require("./bin.cjs");
-const require_SideQuestionIsolation = require("./SideQuestionIsolation-CtJ4wX83.cjs");
+const require_SideQuestionIsolation = require("./SideQuestionIsolation-BPC-Bxsz.cjs");
 let effect = require("effect");
 let effect_unstable_process = require("effect/unstable/process");
 //#region src/textGeneration/CodexTextGeneration.ts
@@ -52,6 +51,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 		const outputPath = yield* writeTempFile(operation, "codex-output", "");
 		const runCodexCommand = effect.Effect.fn("runCodexJson.runCodexCommand")(function* () {
 			const reasoningEffort = require_Metrics.getModelSelectionStringOptionValue(modelSelection, "reasoningEffort") ?? CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;
+			const serviceTier = require_bin.codexServiceTierForSelection(modelSelection);
 			const command = effect_unstable_process.ChildProcess.make(codexConfig.binaryPath || "codex", [
 				"exec",
 				"--ephemeral",
@@ -89,7 +89,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 				modelSelection.model,
 				"--config",
 				`model_reasoning_effort="${reasoningEffort}"`,
-				...require_Metrics.getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true ? ["--config", `service_tier="fast"`] : [],
+				...serviceTier ? ["--config", `service_tier="${serviceTier}"`] : [],
 				"--output-schema",
 				schemaPath,
 				"--output-last-message",
@@ -162,7 +162,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 		return {
 			subject: require_bin.sanitizeCommitSubject(generated.subject),
 			body: generated.body.trim(),
-			..."branch" in generated && typeof generated.branch === "string" ? { branch: require_git.sanitizeFeatureBranchName(generated.branch) } : {}
+			..."branch" in generated && typeof generated.branch === "string" ? { branch: require_bin.sanitizeFeatureBranchName(generated.branch) } : {}
 		};
 	});
 	const generatePrContent = effect.Effect.fn("CodexTextGeneration.generatePrContent")(function* (input) {
@@ -199,7 +199,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 			imagePaths,
 			modelSelection: input.modelSelection
 		});
-		return { branch: require_git.sanitizeBranchFragment(generated.branch) };
+		return { branch: require_bin.sanitizeBranchFragment(generated.branch) };
 	});
 	const generateThreadTitle = effect.Effect.fn("CodexTextGeneration.generateThreadTitle")(function* (input) {
 		const { imagePaths } = yield* materializeImageAttachments("generateThreadTitle", input.attachments);