ryco-cli 0.1.6 → 0.1.8

package/dist/{ClaudeDriver-C6tQNEWO.cjs → ClaudeDriver-ScqmbPKW.cjs}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 const require_chunk = require("./chunk-jM1PLTSZ.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-TCG6xW_P.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-B-GW3u_2.cjs");
 const require_Metrics = require("./Metrics-CIW1QH7M.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-DPFw9gV_.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-DTsQ87HL.cjs");
 const require_sourceControlContextFormatter = require("./sourceControlContextFormatter-BDZqn-4T.cjs");
 const require_ProjectCustomSystemPrompt = require("./ProjectCustomSystemPrompt-B8SUlNGa.cjs");
 const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
@@ -46,10 +46,12 @@ const DEFAULT_CLAUDE_MODEL_CAPABILITIES = require_bin.createModelCapabilities({
 const PROVIDER$1 = require_collectUint8StreamText.ProviderDriverKind.make("claudeAgent");
 const CLAUDE_PRESENTATION = {
 	displayName: "Claude",
-	showInteractionModeToggle: true
+	showInteractionModeToggle: true,
+	supportsAskMode: true
 };
 const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
 const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
+const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.194";
 function buildClaudeEffortOption(value, defaultEffort) {
 	const label = value === "xhigh" ? "Extra High" : value[0].toUpperCase() + value.slice(1).toLowerCase();
 	return value === defaultEffort ? {
@@ -121,6 +123,18 @@ const CLAUDE_OPUS_LEGACY_EFFORT_LEVELS = [
 	"max"
 ];
 const BUILT_IN_MODELS = [
+	{
+		slug: "claude-fable-5",
+		name: "Claude Fable 5",
+		shortName: "Fable 5",
+		isCustom: false,
+		capabilities: buildClaudeOpusCapabilities({
+			effortLevels: CLAUDE_OPUS_ADAPTIVE_EFFORT_LEVELS,
+			defaultEffort: "high",
+			supportsFastMode: false,
+			supportsContextWindow: false
+		})
+	},
 	{
 		slug: "claude-opus-4-8",
 		name: "Claude Opus 4.8",
@@ -165,10 +179,22 @@ const BUILT_IN_MODELS = [
 		capabilities: buildClaudeOpusCapabilities({
 			effortLevels: CLAUDE_OPUS_LEGACY_EFFORT_LEVELS,
 			defaultEffort: "high",
-			supportsFastMode: true,
+			supportsFastMode: false,
 			supportsContextWindow: false
 		})
 	},
+	{
+		slug: "claude-sonnet-5",
+		name: "Claude Sonnet 5",
+		shortName: "Sonnet 5",
+		isCustom: false,
+		capabilities: buildClaudeOpusCapabilities({
+			effortLevels: CLAUDE_OPUS_ADAPTIVE_EFFORT_LEVELS,
+			defaultEffort: "high",
+			supportsFastMode: false,
+			supportsContextWindow: true
+		})
+	},
 	{
 		slug: "claude-sonnet-4-6",
 		name: "Claude Sonnet 4.6",
@@ -230,8 +256,12 @@ function supportsClaudeOpus48(version) {
 function supportsClaudeOpus47(version) {
 	return supportsMinimumClaudeVersion(version, MINIMUM_CLAUDE_OPUS_4_7_VERSION);
 }
+function supportsClaudeFable5(version) {
+	return supportsMinimumClaudeVersion(version, MINIMUM_CLAUDE_FABLE_5_VERSION);
+}
 function getBuiltInClaudeModelsForVersion(version) {
 	return BUILT_IN_MODELS.filter((model) => {
+		if (model.slug === "claude-fable-5") return supportsClaudeFable5(version);
 		if (model.slug === "claude-opus-4-8") return supportsClaudeOpus48(version);
 		if (model.slug === "claude-opus-4-7") return supportsClaudeOpus47(version);
 		return true;
@@ -903,7 +933,10 @@ function maxClaudeContextWindowFromModelUsage(modelUsage) {
 function normalizeClaudeTokenUsage(value, contextWindow) {
 	if (!value || typeof value !== "object") return;
 	const usage = value;
-	const inputTokens = (typeof usage.input_tokens === "number" && Number.isFinite(usage.input_tokens) ? usage.input_tokens : 0) + (typeof usage.cache_creation_input_tokens === "number" && Number.isFinite(usage.cache_creation_input_tokens) ? usage.cache_creation_input_tokens : 0) + (typeof usage.cache_read_input_tokens === "number" && Number.isFinite(usage.cache_read_input_tokens) ? usage.cache_read_input_tokens : 0);
+	const directInputTokens = typeof usage.input_tokens === "number" && Number.isFinite(usage.input_tokens) ? usage.input_tokens : 0;
+	const cacheCreationInputTokens = typeof usage.cache_creation_input_tokens === "number" && Number.isFinite(usage.cache_creation_input_tokens) ? usage.cache_creation_input_tokens : 0;
+	const cachedInputTokens = typeof usage.cache_read_input_tokens === "number" && Number.isFinite(usage.cache_read_input_tokens) ? usage.cache_read_input_tokens : 0;
+	const inputTokens = directInputTokens + cacheCreationInputTokens + cachedInputTokens;
 	const outputTokens = typeof usage.output_tokens === "number" && Number.isFinite(usage.output_tokens) ? usage.output_tokens : 0;
 	const derivedTotalProcessedTokens = inputTokens + outputTokens;
 	const totalProcessedTokens = (typeof usage.total_tokens === "number" && Number.isFinite(usage.total_tokens) ? usage.total_tokens : void 0) ?? (derivedTotalProcessedTokens > 0 ? derivedTotalProcessedTokens : void 0);
@@ -915,6 +948,7 @@ function normalizeClaudeTokenUsage(value, contextWindow) {
 		lastUsedTokens: usedTokens,
 		...totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {},
 		...inputTokens > 0 ? { inputTokens } : {},
+		...cachedInputTokens > 0 ? { cachedInputTokens } : {},
 		...outputTokens > 0 ? { outputTokens } : {},
 		...maxTokens !== void 0 ? { maxTokens } : {},
 		...typeof usage.tool_uses === "number" && Number.isFinite(usage.tool_uses) ? { toolUses: usage.tool_uses } : {},
@@ -943,6 +977,54 @@ function readClaudeResumeState(resumeCursor) {
 		...turnCountValue !== void 0 && Number.isInteger(turnCountValue) && turnCountValue >= 0 ? { turnCount: turnCountValue } : {}
 	};
 }
+function trimmedClaudeString(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+function claudeTaskField(message, field) {
+	return trimmedClaudeString(message[field]);
+}
+function hasClaudeSubagentNameSignal(value) {
+	return value !== void 0 && /\b(?:sub[-\s]?agent|agent|subtask|task)\b/i.test(value);
+}
+function hasClaudeSubagentDescriptionSignal(value) {
+	return value !== void 0 && /\b(?:sub[-\s]?agent|agent|teammate|worker|delegate[sd]?|reviewer)\b/i.test(value);
+}
+function isClaudeSubagentTaskMessage(message) {
+	return hasClaudeSubagentNameSignal(claudeTaskField(message, "task_type")) || hasClaudeSubagentNameSignal(claudeTaskField(message, "last_tool_name")) || hasClaudeSubagentDescriptionSignal(claudeTaskField(message, "description")) || hasClaudeSubagentDescriptionSignal(claudeTaskField(message, "summary"));
+}
+function claudeTaskSubagentStatus(status) {
+	return status;
+}
+function claudeTaskCompletionStatus(status) {
+	return status;
+}
+function claudeTaskMetadata(message) {
+	const metadata = Object.fromEntries([
+		["source", "claude.task"],
+		["taskType", claudeTaskField(message, "task_type")],
+		["lastToolName", claudeTaskField(message, "last_tool_name")]
+	].filter(([, value]) => value !== void 0));
+	return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+function makeClaudeTaskSubagentRef(existing, message) {
+	const taskType = claudeTaskField(message, "task_type");
+	const lastToolName = claudeTaskField(message, "last_tool_name");
+	const description = claudeTaskField(message, "description") ?? existing?.description;
+	const label = taskType ?? lastToolName ?? existing?.label ?? "Claude task";
+	const taskMetadata = claudeTaskMetadata(message);
+	const metadata = {};
+	if (existing?.metadata) Object.assign(metadata, existing.metadata);
+	if (taskMetadata) Object.assign(metadata, taskMetadata);
+	return {
+		subagentId: existing?.subagentId ?? require_collectUint8StreamText.RuntimeSubagentId.make(`claude-task:${message.task_id}`),
+		origin: "native",
+		capability: "summary",
+		label,
+		...description && { description },
+		providerTaskId: require_collectUint8StreamText.RuntimeTaskId.make(message.task_id),
+		...Object.keys(metadata).length > 0 && { metadata }
+	};
+}
 function classifyToolItemType(toolName) {
 	const normalized = toolName.toLowerCase();
 	if (normalized.includes("agent")) return "collab_agent_tool_call";
@@ -1248,6 +1330,82 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 		createdAt: nowIso
 	});
 	const offerRuntimeEvent = (event) => effect.Queue.offer(runtimeEventQueue, event).pipe(effect.Effect.andThen(runtimeEventQueueMetrics.recordEnqueued()), effect.Effect.asVoid);
+	const emitClaudeSubagentStarted = effect.Effect.fn("emitClaudeSubagentStarted")(function* (context, subagent, raw) {
+		const key = String(subagent.subagentId);
+		if (context.startedSubagentIds.has(key)) return;
+		context.startedSubagentIds.add(key);
+		const stamp = yield* makeEventStamp();
+		yield* offerRuntimeEvent({
+			type: "subagent.started",
+			eventId: stamp.eventId,
+			provider: PROVIDER,
+			createdAt: stamp.createdAt,
+			threadId: context.session.threadId,
+			...context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {},
+			payload: { subagent },
+			providerRefs: nativeProviderRefs(context),
+			raw: {
+				source: "claude.sdk.message",
+				method: sdkNativeMethod(raw),
+				messageType: `${raw.type}:${sdkMessageSubtype(raw) ?? ""}`,
+				payload: raw
+			}
+		});
+	});
+	const emitClaudeSubagentUpdated = effect.Effect.fn("emitClaudeSubagentUpdated")(function* (context, input) {
+		yield* emitClaudeSubagentStarted(context, input.subagent, input.raw);
+		const stamp = yield* makeEventStamp();
+		yield* offerRuntimeEvent({
+			type: "subagent.updated",
+			eventId: stamp.eventId,
+			provider: PROVIDER,
+			createdAt: stamp.createdAt,
+			threadId: context.session.threadId,
+			...context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {},
+			payload: {
+				subagent: input.subagent,
+				...input.status ? { status: input.status } : {},
+				...input.summary ? { summary: input.summary } : {},
+				...input.detail ? { detail: input.detail } : {},
+				...input.usage !== void 0 ? { usage: input.usage } : {}
+			},
+			providerRefs: nativeProviderRefs(context),
+			raw: {
+				source: "claude.sdk.message",
+				method: sdkNativeMethod(input.raw),
+				messageType: `${input.raw.type}:${sdkMessageSubtype(input.raw) ?? ""}`,
+				payload: input.raw
+			}
+		});
+	});
+	const emitClaudeSubagentCompleted = effect.Effect.fn("emitClaudeSubagentCompleted")(function* (context, input) {
+		const key = String(input.subagent.subagentId);
+		if (context.completedSubagentIds.has(key)) return;
+		yield* emitClaudeSubagentStarted(context, input.subagent, input.raw);
+		context.completedSubagentIds.add(key);
+		const stamp = yield* makeEventStamp();
+		yield* offerRuntimeEvent({
+			type: "subagent.completed",
+			eventId: stamp.eventId,
+			provider: PROVIDER,
+			createdAt: stamp.createdAt,
+			threadId: context.session.threadId,
+			...context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {},
+			payload: {
+				subagent: input.subagent,
+				status: input.status,
+				...input.summary ? { summary: input.summary } : {},
+				...input.usage !== void 0 ? { usage: input.usage } : {}
+			},
+			providerRefs: nativeProviderRefs(context),
+			raw: {
+				source: "claude.sdk.message",
+				method: sdkNativeMethod(input.raw),
+				messageType: `${input.raw.type}:${sdkMessageSubtype(input.raw) ?? ""}`,
+				payload: input.raw
+			}
+		});
+	});
 	const logNativeSdkMessage = effect.Effect.fn("logNativeSdkMessage")(function* (context, message) {
 		if (!nativeEventLogger) return;
 		const observedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -2035,6 +2193,11 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 						...message.task_type ? { taskType: message.task_type } : {}
 					}
 				});
+				if (isClaudeSubagentTaskMessage(message)) {
+					const subagent = makeClaudeTaskSubagentRef(context.subagentByTaskId.get(message.task_id), message);
+					context.subagentByTaskId.set(message.task_id, subagent);
+					yield* emitClaudeSubagentStarted(context, subagent, message);
+				}
 				return;
 			case "task_progress":
 				if (message.usage) {
@@ -2062,6 +2225,18 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 						...message.last_tool_name ? { lastToolName: message.last_tool_name } : {}
 					}
 				});
+				if (isClaudeSubagentTaskMessage(message) || context.subagentByTaskId.has(message.task_id)) {
+					const subagent = makeClaudeTaskSubagentRef(context.subagentByTaskId.get(message.task_id), message);
+					context.subagentByTaskId.set(message.task_id, subagent);
+					yield* emitClaudeSubagentUpdated(context, {
+						subagent,
+						status: claudeTaskSubagentStatus("running"),
+						...message.summary ? { summary: message.summary } : {},
+						detail: message.description,
+						...message.usage ? { usage: message.usage } : {},
+						raw: message
+					});
+				}
 				return;
 			case "task_notification":
 				if (message.usage) {
@@ -2088,6 +2263,17 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 						...message.usage ? { usage: message.usage } : {}
 					}
 				});
+				if (isClaudeSubagentTaskMessage(message) || context.subagentByTaskId.has(message.task_id)) {
+					const subagent = makeClaudeTaskSubagentRef(context.subagentByTaskId.get(message.task_id), message);
+					context.subagentByTaskId.set(message.task_id, subagent);
+					yield* emitClaudeSubagentCompleted(context, {
+						subagent,
+						status: claudeTaskCompletionStatus(message.status),
+						...message.summary ? { summary: message.summary } : {},
+						...message.usage ? { usage: message.usage } : {},
+						raw: message
+					});
+				}
 				return;
 			case "files_persisted":
 				yield* offerRuntimeEvent({
@@ -2636,6 +2822,9 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 			lastKnownTokenUsage: void 0,
 			lastAssistantUuid: resumeState?.resumeSessionAt,
 			lastThreadStartedId: void 0,
+			subagentByTaskId: /* @__PURE__ */ new Map(),
+			startedSubagentIds: /* @__PURE__ */ new Set(),
+			completedSubagentIds: /* @__PURE__ */ new Set(),
 			stopped: false
 		};
 		yield* effect.Ref.set(contextRef, context);
@@ -2706,7 +2895,7 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 				model: modelSelection.model
 			};
 		}
-		if (input.interactionMode === "plan") yield* effect.Effect.tryPromise({
+		if (input.interactionMode === "plan" || input.interactionMode === "ask") yield* effect.Effect.tryPromise({
 			try: () => context.query.setPermissionMode("plan"),
 			catch: (cause) => toRequestError(input.threadId, "turn/setPermissionMode", cause)
 		});
@@ -3072,6 +3261,7 @@ const ClaudeDriver = {
 		const spawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
 		const path = yield* effect.Path.Path;
 		const httpClient = yield* effect_unstable_http.HttpClient.HttpClient;
+		const serverSettings = yield* require_bin.ServerSettingsService;
 		const eventLoggers = yield* require_bin.ProviderEventLoggers;
 		const processEnv = require_bin.mergeProviderInstanceEnvironment(environment);
 		const fallbackContinuationIdentity = require_ProviderDriver.defaultProviderContinuationIdentity({
@@ -3118,7 +3308,7 @@ const ClaudeDriver = {
 			haveSettingsChanged: () => false,
 			initialSnapshot: (settings) => stampIdentity(makePendingClaudeProvider(settings)),
 			checkProvider,
-			enrichSnapshot: ({ snapshot, publishSnapshot }) => require_bin.enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(effect.Effect.provideService(effect_unstable_http.HttpClient.HttpClient, httpClient), effect.Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
+			enrichSnapshot: ({ snapshot, publishSnapshot }) => require_bin.enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(effect.Effect.provideService(effect_unstable_http.HttpClient.HttpClient, httpClient), effect.Effect.provideService(require_bin.ServerSettingsService, serverSettings), effect.Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
 			refreshInterval: null
 		}).pipe(effect.Effect.mapError((cause) => new require_bin.ProviderDriverError({
 			driver: DRIVER_KIND,

package/dist/{CodexDriver-ms_YgFD7.cjs → CodexDriver-CtCCc3CC.cjs}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const require_chunk = require("./chunk-jM1PLTSZ.cjs");
-const require_collectUint8StreamText = require("./collectUint8StreamText-TCG6xW_P.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-B-GW3u_2.cjs");
 const require_Metrics = require("./Metrics-CIW1QH7M.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-DPFw9gV_.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-DTsQ87HL.cjs");
 const require_sourceControlContextFormatter = require("./sourceControlContextFormatter-BDZqn-4T.cjs");
 const require_ProjectCustomSystemPrompt = require("./ProjectCustomSystemPrompt-B8SUlNGa.cjs");
-const require_CodexTextGeneration = require("./CodexTextGeneration-CHEgoANm.cjs");
+const require_CodexTextGeneration = require("./CodexTextGeneration-Db2hn8Qz.cjs");
 let effect = require("effect");
 let effect_unstable_http = require("effect/unstable/http");
 let effect_unstable_process = require("effect/unstable/process");
@@ -135,11 +135,37 @@ Do not ask "should I proceed?" in the final output. The user can easily switch o
 
 Only produce at most one \`<proposed_plan>\` block per turn, and only when you are presenting a complete spec.
 </collaboration_mode>`;
+const CODEX_ASK_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Collaboration Mode: Ask (Read-Only)
+
+You are now in Ask mode. Any previous instructions for other modes (e.g. Plan mode) are no longer active.
+
+Your active mode changes only when new developer instructions with a different \`<collaboration_mode>...</collaboration_mode>\` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default, Plan, and Ask.
+
+## Mode rules (strict)
+
+Ask mode is a read-only question-answering mode. Answer the user's questions by exploring and inspecting the environment; do not carry out changes.
+
+You are in Ask mode until a developer message explicitly ends it. Ask mode is not changed by user intent, tone, or imperative language. If a user asks for execution while still in Ask mode, explain what you would do and note that they can switch out of Ask mode to have it done.
+
+### Allowed (non-mutating)
+
+* Reading or searching files, configs, schemas, types, manifests, and docs
+* Static analysis, inspection, and repo exploration
+* Non-mutating commands that gather information without changing repo-tracked state
+
+### Not allowed (mutating)
+
+* Editing or writing files
+* Running formatters, linters, patches, migrations, or codegen that rewrite files
+* Side-effectful commands that change repo-tracked or system state
+
+Your sandbox is read-only in this mode; mutating actions will fail. Do not attempt to work around the sandbox.
+</collaboration_mode>`;
 const CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Collaboration Mode: Default
 
 You are now in Default mode. Any previous instructions for other modes (e.g. Plan mode) are no longer active.
 
-Your active mode changes only when new developer instructions with a different \`<collaboration_mode>...</collaboration_mode>\` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default and Plan.
+Your active mode changes only when new developer instructions with a different \`<collaboration_mode>...</collaboration_mode>\` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default, Plan, and Ask.
 
 ## request_user_input availability
 
@@ -235,9 +261,9 @@ function runtimeModeToTurnSandboxPolicy(input) {
 function buildCodexCollaborationMode(input) {
 	if (input.interactionMode === void 0) return;
 	const model = normalizeCodexModelSlug(input.model) ?? "gpt-5.4";
-	const developerInstructions = require_ProjectCustomSystemPrompt.appendProjectCustomSystemPrompt(require_ProjectCustomSystemPrompt.appendProjectCustomSystemPrompt(input.interactionMode === "plan" ? CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS : CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS, input.tokenReductionInstructions), input.customSystemPrompt);
+	const developerInstructions = require_ProjectCustomSystemPrompt.appendProjectCustomSystemPrompt(require_ProjectCustomSystemPrompt.appendProjectCustomSystemPrompt(input.interactionMode === "plan" ? CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS : input.interactionMode === "ask" ? CODEX_ASK_MODE_DEVELOPER_INSTRUCTIONS : CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS, input.tokenReductionInstructions), input.customSystemPrompt);
 	return {
-		mode: input.interactionMode,
+		mode: input.interactionMode === "plan" ? "plan" : "default",
 		settings: {
 			model,
 			reasoning_effort: input.effort ?? "medium",
@@ -260,11 +286,12 @@ function buildTurnStartParams(input) {
 		...input.customSystemPrompt ? { customSystemPrompt: input.customSystemPrompt } : {},
 		...input.tokenReductionInstructions ? { tokenReductionInstructions: input.tokenReductionInstructions } : {}
 	});
+	const sandboxPolicy = input.interactionMode === "ask" ? { type: "readOnly" } : runtimeModeToTurnSandboxPolicy(input.runtimeMode);
 	return effect.Schema.decodeUnknownEffect(CodexTurnStartParamsWithCollaborationMode)({
 		threadId: input.threadId,
 		input: turnInput,
 		approvalPolicy: config.approvalPolicy,
-		sandboxPolicy: runtimeModeToTurnSandboxPolicy(input.runtimeMode),
+		sandboxPolicy,
 		...input.model ? { model: input.model } : {},
 		...input.serviceTier ? { serviceTier: input.serviceTier } : {},
 		...input.effort ? { effort: input.effort } : {},
@@ -1961,6 +1988,7 @@ const CodexDriver = {
 	create: ({ instanceId, displayName, accentColor, environment, enabled, config }) => effect.Effect.gen(function* () {
 		const spawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
 		const httpClient = yield* effect_unstable_http.HttpClient.HttpClient;
+		const serverSettings = yield* require_bin.ServerSettingsService;
 		const eventLoggers = yield* require_bin.ProviderEventLoggers;
 		const processEnv = require_bin.mergeProviderInstanceEnvironment(environment);
 		const homeLayout = yield* require_bin.resolveCodexHomeLayout(config);
@@ -2007,7 +2035,7 @@ const CodexDriver = {
 				haveSettingsChanged: () => false,
 				initialSnapshot: (settings) => stampIdentity(require_bin.makePendingCodexProvider(settings)),
 				checkProvider,
-				enrichSnapshot: ({ snapshot, publishSnapshot }) => require_bin.enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(effect.Effect.provideService(effect_unstable_http.HttpClient.HttpClient, httpClient), effect.Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
+				enrichSnapshot: ({ snapshot, publishSnapshot }) => require_bin.enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(effect.Effect.provideService(effect_unstable_http.HttpClient.HttpClient, httpClient), effect.Effect.provideService(require_bin.ServerSettingsService, serverSettings), effect.Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
 				refreshInterval: null
 			}).pipe(effect.Effect.mapError((cause) => new require_bin.ProviderDriverError({
 				driver: DRIVER_KIND,

package/dist/{CodexDriver-BILrJG8o.mjs → CodexDriver-DH7vqku4.mjs}

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
-import { $n as ApprovalRequestId, Ht as ProviderApprovalDecision, In as ProviderDriverKind, Ln as ProviderInstanceId, Nt as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, P as CodexSettings, fr as ProviderItemId, mr as RuntimeRequestId, or as EventId, pr as RuntimeItemId, vr as TurnId } from "./collectUint8StreamText-C2z5Y8tF.mjs";
+import { Bn as ProviderInstanceId, Gt as ProviderApprovalDecision, It as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, L as CodexSettings, Sr as TurnId, _r as RuntimeRequestId, gr as RuntimeItemId, hr as ProviderItemId, lr as EventId, nr as ApprovalRequestId, zn as ProviderDriverKind } from "./collectUint8StreamText-COE2_gie.mjs";
 import { Y as ServerConfig } from "./Metrics-6Xj17Se3.mjs";
-import { $ as ServerRequest__CommandExecutionRequestApprovalParams, At as V2ThreadStatusChangedNotification, B as codexContinuationIdentity, Ct as V2ThreadNameUpdatedNotification, Dt as V2ThreadRealtimeOutputAudioDeltaNotification, Et as V2ThreadRealtimeItemAddedNotification, F as ProviderAdapterRequestError, Ft as V2TurnStartParams, G as layerChildProcess, H as resolveCodexHomeLayout, I as ProviderAdapterSessionClosedError, It as V2TurnStartParams__CollaborationMode, J as CodexAppServerRequestError, K as CodexAppServerProcessExitedError, L as ProviderAdapterSessionNotFoundError, Lt as V2TurnStartResponse, Mt as V2TurnCompletedNotification, Nt as V2TurnDiffUpdatedNotification, Ot as V2ThreadRealtimeStartedNotification, P as ProviderAdapterProcessError, Pt as V2TurnPlanUpdatedNotification, Q as ServerRequest__ApplyPatchApprovalParams, Qt as makePackageManagedProviderMaintenanceResolver, R as ProviderAdapterValidationError, Rt as V2WindowsSandboxSetupCompletedNotification, S as makePendingCodexProvider, St as V2ServerRequestResolvedNotification, Tt as V2ThreadRealtimeErrorNotification, U as expandHomePath, V as materializeCodexShadowHome, W as CodexAppServerClient, X as CodexAppServerTransportError, Xt as enrichProviderSnapshotWithVersionAdvisory, Y as CodexAppServerSpawnError, Z as SERVER_NOTIFICATION_METHODS, _ as buildTokenReductionInstructions, _t as V2McpToolCallProgressNotification, at as ToolRequestUserInputResponse, b as buildCodexInitializeParams, bt as V2ReasoningSummaryTextDeltaNotification, cn as getModelSelectionBooleanOptionValue, ct as V2AgentMessageDeltaNotification, dt as V2DeprecationNoticeNotification, et as ServerRequest__DynamicToolCallParams, ft as V2ErrorNotification, g as makeEventNdjsonLogger, gt as V2McpServerOauthLoginCompletedNotification, h as ProviderEventLoggers, ht as V2ItemStartedNotification, in as resolveAttachmentPath, it as ToolRequestUserInputParams, jt as V2ThreadTokenUsageUpdatedNotification, kt as V2ThreadStartedNotification, ln as getModelSelectionStringOptionValue, lt as V2CommandExecutionOutputDeltaNotification, mn as normalizeModelSlug, mt as V2ItemCompletedNotification, nn as resolveProviderMaintenanceCapabilitiesEffect, nt as ServerRequest__FileChangeRequestApprovalParams, ot as V2AccountRateLimitsUpdatedNotification, pt as V2FileChangeOutputDeltaNotification, q as CodexAppServerProtocolParseError, rt as ServerRequest__ToolRequestUserInputParams, st as V2AccountUpdatedNotification, t as makeServerQueueMetrics, tt as ServerRequest__ExecCommandApprovalParams, ut as V2ConfigWarningNotification, v as checkRtkAvailability, vt as V2ModelReroutedNotification, wt as V2ThreadRealtimeClosedNotification, x as checkCodexProviderStatus, xt as V2ReasoningTextDeltaNotification, y as mergeProviderInstanceEnvironment, yt as V2PlanDeltaNotification, z as ProviderDriverError, zt as V2WindowsWorldWritableWarningNotification } from "./bin.mjs";
-import { t as makeManagedServerProvider } from "./makeManagedServerProvider-BXO8QvzC.mjs";
+import { $ as ServerRequest__CommandExecutionRequestApprovalParams, At as V2ThreadStatusChangedNotification, B as codexContinuationIdentity, Ct as V2ThreadNameUpdatedNotification, Dt as V2ThreadRealtimeOutputAudioDeltaNotification, Et as V2ThreadRealtimeItemAddedNotification, F as ProviderAdapterRequestError, Ft as V2TurnStartParams, G as layerChildProcess, H as resolveCodexHomeLayout, I as ProviderAdapterSessionClosedError, It as V2TurnStartParams__CollaborationMode, J as CodexAppServerRequestError, K as CodexAppServerProcessExitedError, L as ProviderAdapterSessionNotFoundError, Lt as V2TurnStartResponse, Mt as V2TurnCompletedNotification, Nt as V2TurnDiffUpdatedNotification, Ot as V2ThreadRealtimeStartedNotification, P as ProviderAdapterProcessError, Pt as V2TurnPlanUpdatedNotification, Q as ServerRequest__ApplyPatchApprovalParams, Qt as makePackageManagedProviderMaintenanceResolver, R as ProviderAdapterValidationError, Rt as V2WindowsSandboxSetupCompletedNotification, S as makePendingCodexProvider, St as V2ServerRequestResolvedNotification, Tt as V2ThreadRealtimeErrorNotification, U as expandHomePath, V as materializeCodexShadowHome, W as CodexAppServerClient, X as CodexAppServerTransportError, Xt as enrichProviderSnapshotWithVersionAdvisory, Y as CodexAppServerSpawnError, Z as SERVER_NOTIFICATION_METHODS, _ as buildTokenReductionInstructions, _t as V2McpToolCallProgressNotification, an as resolveAttachmentPath, at as ToolRequestUserInputResponse, b as buildCodexInitializeParams, bt as V2ReasoningSummaryTextDeltaNotification, ct as V2AgentMessageDeltaNotification, dt as V2DeprecationNoticeNotification, et as ServerRequest__DynamicToolCallParams, ft as V2ErrorNotification, g as makeEventNdjsonLogger, gt as V2McpServerOauthLoginCompletedNotification, h as ProviderEventLoggers, hn as normalizeModelSlug, ht as V2ItemStartedNotification, in as ServerSettingsService, it as ToolRequestUserInputParams, jt as V2ThreadTokenUsageUpdatedNotification, kt as V2ThreadStartedNotification, ln as getModelSelectionBooleanOptionValue, lt as V2CommandExecutionOutputDeltaNotification, mt as V2ItemCompletedNotification, nn as resolveProviderMaintenanceCapabilitiesEffect, nt as ServerRequest__FileChangeRequestApprovalParams, ot as V2AccountRateLimitsUpdatedNotification, pt as V2FileChangeOutputDeltaNotification, q as CodexAppServerProtocolParseError, rt as ServerRequest__ToolRequestUserInputParams, st as V2AccountUpdatedNotification, t as makeServerQueueMetrics, tt as ServerRequest__ExecCommandApprovalParams, un as getModelSelectionStringOptionValue, ut as V2ConfigWarningNotification, v as checkRtkAvailability, vt as V2ModelReroutedNotification, wt as V2ThreadRealtimeClosedNotification, x as checkCodexProviderStatus, xt as V2ReasoningTextDeltaNotification, y as mergeProviderInstanceEnvironment, yt as V2PlanDeltaNotification, z as ProviderDriverError, zt as V2WindowsWorldWritableWarningNotification } from "./bin.mjs";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider-D1_iEWGi.mjs";
 import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
 import { t as appendProjectCustomSystemPrompt } from "./ProjectCustomSystemPrompt-CS1nulhL.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-BIKHl7E3.mjs";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-CJV1jPda.mjs";
 import { Deferred, Effect, Exit, Fiber, FileSystem, Layer, Queue, Random, Ref, Schema, Scope, Stream } from "effect";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
@@ -133,11 +133,37 @@ Do not ask "should I proceed?" in the final output. The user can easily switch o
 
 Only produce at most one \`<proposed_plan>\` block per turn, and only when you are presenting a complete spec.
 </collaboration_mode>`;
+const CODEX_ASK_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Collaboration Mode: Ask (Read-Only)
+
+You are now in Ask mode. Any previous instructions for other modes (e.g. Plan mode) are no longer active.
+
+Your active mode changes only when new developer instructions with a different \`<collaboration_mode>...</collaboration_mode>\` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default, Plan, and Ask.
+
+## Mode rules (strict)
+
+Ask mode is a read-only question-answering mode. Answer the user's questions by exploring and inspecting the environment; do not carry out changes.
+
+You are in Ask mode until a developer message explicitly ends it. Ask mode is not changed by user intent, tone, or imperative language. If a user asks for execution while still in Ask mode, explain what you would do and note that they can switch out of Ask mode to have it done.
+
+### Allowed (non-mutating)
+
+* Reading or searching files, configs, schemas, types, manifests, and docs
+* Static analysis, inspection, and repo exploration
+* Non-mutating commands that gather information without changing repo-tracked state
+
+### Not allowed (mutating)
+
+* Editing or writing files
+* Running formatters, linters, patches, migrations, or codegen that rewrite files
+* Side-effectful commands that change repo-tracked or system state
+
+Your sandbox is read-only in this mode; mutating actions will fail. Do not attempt to work around the sandbox.
+</collaboration_mode>`;
 const CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Collaboration Mode: Default
 
 You are now in Default mode. Any previous instructions for other modes (e.g. Plan mode) are no longer active.
 
-Your active mode changes only when new developer instructions with a different \`<collaboration_mode>...</collaboration_mode>\` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default and Plan.
+Your active mode changes only when new developer instructions with a different \`<collaboration_mode>...</collaboration_mode>\` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default, Plan, and Ask.
 
 ## request_user_input availability
 
@@ -233,9 +259,9 @@ function runtimeModeToTurnSandboxPolicy(input) {
 function buildCodexCollaborationMode(input) {
 	if (input.interactionMode === void 0) return;
 	const model = normalizeCodexModelSlug(input.model) ?? "gpt-5.4";
-	const developerInstructions = appendProjectCustomSystemPrompt(appendProjectCustomSystemPrompt(input.interactionMode === "plan" ? CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS : CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS, input.tokenReductionInstructions), input.customSystemPrompt);
+	const developerInstructions = appendProjectCustomSystemPrompt(appendProjectCustomSystemPrompt(input.interactionMode === "plan" ? CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS : input.interactionMode === "ask" ? CODEX_ASK_MODE_DEVELOPER_INSTRUCTIONS : CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS, input.tokenReductionInstructions), input.customSystemPrompt);
 	return {
-		mode: input.interactionMode,
+		mode: input.interactionMode === "plan" ? "plan" : "default",
 		settings: {
 			model,
 			reasoning_effort: input.effort ?? "medium",
@@ -258,11 +284,12 @@ function buildTurnStartParams(input) {
 		...input.customSystemPrompt ? { customSystemPrompt: input.customSystemPrompt } : {},
 		...input.tokenReductionInstructions ? { tokenReductionInstructions: input.tokenReductionInstructions } : {}
 	});
+	const sandboxPolicy = input.interactionMode === "ask" ? { type: "readOnly" } : runtimeModeToTurnSandboxPolicy(input.runtimeMode);
 	return Schema.decodeUnknownEffect(CodexTurnStartParamsWithCollaborationMode)({
 		threadId: input.threadId,
 		input: turnInput,
 		approvalPolicy: config.approvalPolicy,
-		sandboxPolicy: runtimeModeToTurnSandboxPolicy(input.runtimeMode),
+		sandboxPolicy,
 		...input.model ? { model: input.model } : {},
 		...input.serviceTier ? { serviceTier: input.serviceTier } : {},
 		...input.effort ? { effort: input.effort } : {},
@@ -1959,6 +1986,7 @@ const CodexDriver = {
 	create: ({ instanceId, displayName, accentColor, environment, enabled, config }) => Effect.gen(function* () {
 		const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
 		const httpClient = yield* HttpClient.HttpClient;
+		const serverSettings = yield* ServerSettingsService;
 		const eventLoggers = yield* ProviderEventLoggers;
 		const processEnv = mergeProviderInstanceEnvironment(environment);
 		const homeLayout = yield* resolveCodexHomeLayout(config);
@@ -2005,7 +2033,7 @@ const CodexDriver = {
 				haveSettingsChanged: () => false,
 				initialSnapshot: (settings) => stampIdentity(makePendingCodexProvider(settings)),
 				checkProvider,
-				enrichSnapshot: ({ snapshot, publishSnapshot }) => enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
+				enrichSnapshot: ({ snapshot, publishSnapshot }) => enrichProviderSnapshotWithVersionAdvisory(snapshot, maintenanceCapabilities).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.provideService(ServerSettingsService, serverSettings), Effect.flatMap((enrichedSnapshot) => publishSnapshot(enrichedSnapshot))),
 				refreshInterval: null
 			}).pipe(Effect.mapError((cause) => new ProviderDriverError({
 				driver: DRIVER_KIND,

package/dist/{CodexTextGeneration-BIKHl7E3.mjs → CodexTextGeneration-CJV1jPda.mjs}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-import { v as TextGenerationError } from "./collectUint8StreamText-C2z5Y8tF.mjs";
+import { x as TextGenerationError } from "./collectUint8StreamText-COE2_gie.mjs";
 import { U as sanitizeBranchFragment, W as sanitizeFeatureBranchName, Y as ServerConfig } from "./Metrics-6Xj17Se3.mjs";
-import { U as expandHomePath, cn as getModelSelectionBooleanOptionValue, in as resolveAttachmentPath, ln as getModelSelectionStringOptionValue } from "./bin.mjs";
-import { a as buildIssueContentTitlePrompt, d as sanitizePrTitle, f as sanitizeThreadTitle, i as buildIssueContentPolishPrompt, l as normalizeCliError, n as buildBranchNamePrompt, o as buildPrContentPrompt, p as toJsonSchemaObject, r as buildCommitMessagePrompt, s as buildThreadTitlePrompt, u as sanitizeCommitSubject } from "./makeManagedServerProvider-BXO8QvzC.mjs";
+import { U as expandHomePath, an as resolveAttachmentPath, ln as getModelSelectionBooleanOptionValue, un as getModelSelectionStringOptionValue } from "./bin.mjs";
+import { a as buildIssueContentTitlePrompt, d as sanitizePrTitle, f as sanitizeThreadTitle, i as buildIssueContentPolishPrompt, l as normalizeCliError, n as buildBranchNamePrompt, o as buildPrContentPrompt, p as toJsonSchemaObject, r as buildCommitMessagePrompt, s as buildThreadTitlePrompt, u as sanitizeCommitSubject } from "./makeManagedServerProvider-D1_iEWGi.mjs";
 import { Effect, FileSystem, Option, Path, Random, Schema, Stream } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 //#region src/textGeneration/CodexTextGeneration.ts

package/dist/{CodexTextGeneration-CHEgoANm.cjs → CodexTextGeneration-Db2hn8Qz.cjs}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-TCG6xW_P.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-B-GW3u_2.cjs");
 const require_Metrics = require("./Metrics-CIW1QH7M.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-DPFw9gV_.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-DTsQ87HL.cjs");
 let effect = require("effect");
 let effect_unstable_process = require("effect/unstable/process");
 //#region src/textGeneration/CodexTextGeneration.ts

package/dist/{CopilotDriver-CmD3Ffyl.mjs → CopilotDriver-CFCF68Te.mjs}

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
-import { F as CopilotSettings, In as ProviderDriverKind, Ln as ProviderInstanceId, Nn as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, P as CodexSettings, fr as ProviderItemId, mr as RuntimeRequestId, or as EventId, pr as RuntimeItemId, v as TextGenerationError, vr as TurnId } from "./collectUint8StreamText-C2z5Y8tF.mjs";
+import { Bn as ProviderInstanceId, In as DEFAULT_GIT_TEXT_GENERATION_MODEL_BY_PROVIDER, L as CodexSettings, R as CopilotSettings, Sr as TurnId, _r as RuntimeRequestId, gr as RuntimeItemId, hr as ProviderItemId, lr as EventId, x as TextGenerationError, zn as ProviderDriverKind } from "./collectUint8StreamText-COE2_gie.mjs";
 import { Y as ServerConfig } from "./Metrics-6Xj17Se3.mjs";
-import { E as buildServerProvider, F as ProviderAdapterRequestError, L as ProviderAdapterSessionNotFoundError, M as providerModelsFromSettings, P as ProviderAdapterProcessError, R as ProviderAdapterValidationError, T as buildSelectOptionDescriptor, Zt as makeManualOnlyProviderMaintenanceCapabilities, an as resolveCommandPath, g as makeEventNdjsonLogger, h as ProviderEventLoggers, in as resolveAttachmentPath, k as isCommandMissingCause, ln as getModelSelectionStringOptionValue, pn as getProviderOptionStringSelectionValue, sn as createModelCapabilities, t as makeServerQueueMetrics, y as mergeProviderInstanceEnvironment, z as ProviderDriverError } from "./bin.mjs";
-import { c as extractJsonObject, f as sanitizeThreadTitle, s as buildThreadTitlePrompt, t as makeManagedServerProvider } from "./makeManagedServerProvider-BXO8QvzC.mjs";
+import { E as buildServerProvider, F as ProviderAdapterRequestError, L as ProviderAdapterSessionNotFoundError, M as providerModelsFromSettings, P as ProviderAdapterProcessError, R as ProviderAdapterValidationError, T as buildSelectOptionDescriptor, Zt as makeManualOnlyProviderMaintenanceCapabilities, an as resolveAttachmentPath, cn as createModelCapabilities, g as makeEventNdjsonLogger, h as ProviderEventLoggers, k as isCommandMissingCause, mn as getProviderOptionStringSelectionValue, on as resolveCommandPath, t as makeServerQueueMetrics, un as getModelSelectionStringOptionValue, y as mergeProviderInstanceEnvironment, z as ProviderDriverError } from "./bin.mjs";
+import { c as extractJsonObject, f as sanitizeThreadTitle, s as buildThreadTitlePrompt, t as makeManagedServerProvider } from "./makeManagedServerProvider-D1_iEWGi.mjs";
 import { t as defaultProviderContinuationIdentity } from "./ProviderDriver-kCV60GKk.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-BIKHl7E3.mjs";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-CJV1jPda.mjs";
 import { Effect, Queue, Random, Result, Schema, Stream } from "effect";
 import { randomUUID } from "node:crypto";
 import "effect/unstable/process";
@@ -39,11 +39,12 @@ function toProviderItemId(value) {
 	return value ? ProviderItemId.make(value) : void 0;
 }
 function normalizeUsage(event) {
-	const inputTokens = event.data.inputTokens ?? 0;
+	const directInputTokens = event.data.inputTokens ?? 0;
 	const outputTokens = event.data.outputTokens ?? 0;
 	const cachedInputTokens = event.data.cacheReadTokens ?? 0;
 	const reasoningOutputTokens = event.data.reasoningTokens ?? 0;
-	const usedTokens = inputTokens + outputTokens + cachedInputTokens;
+	const inputTokens = directInputTokens + cachedInputTokens;
+	const usedTokens = inputTokens + outputTokens;
 	return {
 		usedTokens,
 		totalProcessedTokens: usedTokens,

package/dist/{CopilotDriver-B0--ZwIK.cjs → CopilotDriver-DLN2KEoc.cjs}

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
-const require_collectUint8StreamText = require("./collectUint8StreamText-TCG6xW_P.cjs");
+const require_collectUint8StreamText = require("./collectUint8StreamText-B-GW3u_2.cjs");
 const require_Metrics = require("./Metrics-CIW1QH7M.cjs");
 const require_bin = require("./bin.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-DPFw9gV_.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-DTsQ87HL.cjs");
 const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
-const require_CodexTextGeneration = require("./CodexTextGeneration-CHEgoANm.cjs");
+const require_CodexTextGeneration = require("./CodexTextGeneration-Db2hn8Qz.cjs");
 let effect = require("effect");
 let node_crypto = require("node:crypto");
 require("effect/unstable/process");
@@ -39,11 +39,12 @@ function toProviderItemId(value) {
 	return value ? require_collectUint8StreamText.ProviderItemId.make(value) : void 0;
 }
 function normalizeUsage(event) {
-	const inputTokens = event.data.inputTokens ?? 0;
+	const directInputTokens = event.data.inputTokens ?? 0;
 	const outputTokens = event.data.outputTokens ?? 0;
 	const cachedInputTokens = event.data.cacheReadTokens ?? 0;
 	const reasoningOutputTokens = event.data.reasoningTokens ?? 0;
-	const usedTokens = inputTokens + outputTokens + cachedInputTokens;
+	const inputTokens = directInputTokens + cachedInputTokens;
+	const usedTokens = inputTokens + outputTokens;
 	return {
 		usedTokens,
 		totalProcessedTokens: usedTokens,