ryco-cli 0.1.26 → 0.1.27

package/dist/{ClaudeDriver-BSTxNNGO.cjs → ClaudeDriver-CyPp-Fs3.cjs}

@@ -1,27 +1,29 @@
 #!/usr/bin/env node
 
 const require_rolldown_runtime = require("./rolldown-runtime-LGfotAqq.cjs");
-const require_src = require("./src-BlzIcnVG.cjs");
-const require_Metrics = require("./Metrics-DCKbdeoH.cjs");
-const require_git = require("./git-irmB8_k7.cjs");
+const require_src = require("./src-CBu69HDR.cjs");
+const require_serverSettings = require("./serverSettings-_fgQZNIb.cjs");
+const require_git = require("./git-VPCnunmz.cjs");
 const require_bin = require("./bin.cjs");
 const require_runtimeSession = require("./runtimeSession-Bj0OUcNJ.cjs");
 const require_ProviderDriver = require("./ProviderDriver--rNeAi3B.cjs");
-const require_SideQuestionIsolation = require("./SideQuestionIsolation-DvVKZWxi.cjs");
+const require_SideQuestionIsolation = require("./SideQuestionIsolation-pW7UQKVD.cjs");
 const require_sourceControlContextFormatter = require("./sourceControlContextFormatter-BDZqn-4T.cjs");
 const require_ProjectCustomSystemPrompt = require("./ProjectCustomSystemPrompt-B8SUlNGa.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-DGbd8BhM.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-A3NSgBwN.cjs");
 let effect = require("effect");
 let effect_unstable_http = require("effect/unstable/http");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
+let node_os = require("node:os");
+node_os = require_rolldown_runtime.__toESM(node_os, 1);
 let node_child_process = require("node:child_process");
+let effect_unstable_process = require("effect/unstable/process");
 let node_fs_promises = require("node:fs/promises");
 node_fs_promises = require_rolldown_runtime.__toESM(node_fs_promises, 1);
-let effect_unstable_process = require("effect/unstable/process");
 let _anthropic_ai_claude_agent_sdk = require("@anthropic-ai/claude-agent-sdk");
 //#region src/provider/Layers/ClaudeProvider.ts
-const DEFAULT_CLAUDE_MODEL_CAPABILITIES = require_bin.createModelCapabilities({ optionDescriptors: [] });
+const DEFAULT_CLAUDE_MODEL_CAPABILITIES = require_serverSettings.createModelCapabilities({ optionDescriptors: [] });
 const PROVIDER$1 = require_src.ProviderDriverKind.make("claudeAgent");
 const CLAUDE_PRESENTATION = {
 	displayName: "Claude",
@@ -33,14 +35,14 @@ function getClaudeModelCapabilities(model) {
 	return capabilities.optionDescriptors?.length ? capabilities : DEFAULT_CLAUDE_MODEL_CAPABILITIES;
 }
 function resolveClaudeEffort(caps, raw) {
-	const effortDescriptor = require_bin.getProviderOptionDescriptors({
+	const effortDescriptor = require_serverSettings.getProviderOptionDescriptors({
 		caps,
 		...raw ? { selections: [{
 			id: "effort",
 			value: raw
 		}] } : {}
 	}).find((descriptor) => descriptor.id === "effort");
-	const value = require_bin.getProviderOptionCurrentValue(effortDescriptor);
+	const value = require_serverSettings.getProviderOptionCurrentValue(effortDescriptor);
 	return typeof value === "string" ? value : void 0;
 }
 /**
@@ -385,12 +387,12 @@ const makeClaudeTextGeneration = effect.Effect.fn("makeClaudeTextGeneration")(fu
 	const runClaudeJson = effect.Effect.fn("runClaudeJson")(function* ({ operation, cwd, prompt, outputSchemaJson, modelSelection, toolsEnabled = true }) {
 		const jsonSchemaStr = JSON.stringify(require_bin.toJsonSchemaObject(outputSchemaJson));
 		const caps = getClaudeModelCapabilities(modelSelection.model);
-		const descriptors = require_bin.getProviderOptionDescriptors({
+		const descriptors = require_serverSettings.getProviderOptionDescriptors({
 			caps,
 			selections: modelSelection.options
 		});
 		const findDescriptor = (id) => descriptors.find((descriptor) => descriptor.id === id);
-		const resolvedEffort = resolveClaudeEffort(caps, require_bin.getModelSelectionStringOptionValue(modelSelection, "effort"));
+		const resolvedEffort = resolveClaudeEffort(caps, require_serverSettings.getModelSelectionStringOptionValue(modelSelection, "effort"));
 		const cliEffort = normalizeClaudeCliEffort(resolvedEffort, modelSelection.model);
 		const ultracode = isClaudeUltracodeEffort(resolvedEffort);
 		const thinkingDescriptor = findDescriptor("thinking");
@@ -952,6 +954,7 @@ function taskLinkageFor(agents, taskId) {
 	const agent = agents.get(taskId);
 	if (!agent) return {};
 	return {
+		...agent.backgroundAttempt !== void 0 ? { attempt: agent.backgroundAttempt } : {},
 		...agent.taskType ? { taskType: agent.taskType } : {},
 		...agent.owningAgentId ? { agentId: agent.owningAgentId } : {},
 		...agent.description ? { title: agent.description } : {},
@@ -1164,11 +1167,11 @@ const CLAUDE_SETTING_SOURCES = [
 	"local"
 ];
 function buildPromptText(input, boundInstanceId) {
-	const rawEffort = input.modelSelection?.instanceId === boundInstanceId ? require_bin.getModelSelectionStringOptionValue(input.modelSelection, "effort") : null;
+	const rawEffort = input.modelSelection?.instanceId === boundInstanceId ? require_serverSettings.getModelSelectionStringOptionValue(input.modelSelection, "effort") : null;
 	const caps = getClaudeModelCapabilities(input.modelSelection?.instanceId === boundInstanceId ? input.modelSelection.model : void 0);
-	const promptEffort = require_bin.resolvePromptInjectedEffort(caps, rawEffort);
+	const promptEffort = require_serverSettings.resolvePromptInjectedEffort(caps, rawEffort);
 	const formatted = require_sourceControlContextFormatter.formatSourceControlContextsForAgent(input.sourceControlContexts ?? []);
-	return require_bin.applyClaudePromptEffortPrefix(formatted ? formatted + "\n\n" + (input.input?.trim() ?? "") : input.input?.trim() ?? "", promptEffort);
+	return require_serverSettings.applyClaudePromptEffortPrefix(formatted ? formatted + "\n\n" + (input.input?.trim() ?? "") : input.input?.trim() ?? "", promptEffort);
 }
 function buildUserMessage(input) {
 	return {
@@ -1404,7 +1407,7 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 	const boundInstanceId = options?.instanceId ?? require_src.ProviderInstanceId.make("claudeAgent");
 	const fileSystem = yield* effect.FileSystem.FileSystem;
 	const path = yield* effect.Path.Path;
-	const serverConfig = yield* require_Metrics.ServerConfig;
+	const serverConfig = yield* require_serverSettings.ServerConfig;
 	const claudeEnvironment = yield* require_bin.makeClaudeEnvironment(claudeSettings, options?.environment).pipe(effect.Effect.provideService(effect.Path.Path, path));
 	const nativeEventLogger = options?.nativeEventLogger ?? (options?.nativeEventLogPath !== void 0 ? yield* require_bin.makeEventNdjsonLogger(options.nativeEventLogPath, { stream: "native" }) : void 0);
 	const createQuery = options?.createQuery ?? ((input) => (0, _anthropic_ai_claude_agent_sdk.query)({
@@ -1428,6 +1431,16 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 	});
 	const offerRuntimeEventForContext = (context, event) => {
 		if (context.session.runtimeSessionId === void 0) return effect.Effect.die(/* @__PURE__ */ new Error(`ClaudeAdapter emitted '${event.type}' without a runtime session for thread '${event.threadId}'.`));
+		if (event.type === "task.started" || event.type === "task.progress" || event.type === "task.updated" || event.type === "task.completed") event = {
+			...event,
+			payload: {
+				...event.payload,
+				...!event.payload.taskType && context.taskAgents.get(event.payload.taskId)?.taskType ? { taskType: context.taskAgents.get(event.payload.taskId).taskType } : {},
+				...context.taskAgents.get(event.payload.taskId)?.backgroundAttempt !== void 0 ? { attempt: context.taskAgents.get(event.payload.taskId).backgroundAttempt } : {},
+				...context.backgroundedTaskIds.has(event.payload.taskId) ? { isBackgrounded: true } : {},
+				canStop: context.query.stopTask !== void 0
+			}
+		};
 		const safeEvent = require_bin.redactAgentControlSecrets(event);
 		return effect.Queue.offer(runtimeEventQueue, require_runtimeSession.stampRuntimeEvent(safeEvent, {
 			providerInstanceId: boundInstanceId,
@@ -2401,7 +2414,43 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 					...description !== void 0 ? { description } : {}
 				});
 			}
-			for (const [taskId] of liveSet) context.backgroundedTaskIds.add(taskId);
+			for (const [taskId, info] of liveSet) {
+				const previous = context.taskAgents.get(taskId);
+				const descriptionChanged = info.description !== void 0 && info.description !== previous?.description;
+				const typeChanged = info.taskType !== void 0 && info.taskType !== previous?.taskType;
+				context.taskAgents.set(taskId, {
+					taskId,
+					backgroundAttempt: require_bin.classifyTaskAgentKind({
+						taskType: info.taskType ?? previous?.taskType,
+						agentId: previous?.owningAgentId
+					}) === "background" ? previous?.backgroundAttempt === void 0 ? 0 : previous.backgroundAttempt + (context.liveTaskIds.has(taskId) ? 0 : 1) : previous?.backgroundAttempt,
+					toolUseId: previous?.toolUseId,
+					description: info.description ?? previous?.description,
+					subagentType: previous?.subagentType,
+					taskType: info.taskType ?? previous?.taskType,
+					workflowName: previous?.workflowName,
+					skipTranscript: previous?.skipTranscript ?? false,
+					runHandles: previous?.runHandles,
+					owningAgentId: previous?.owningAgentId,
+					model: previous?.model,
+					effort: previous?.effort
+				});
+				const newlyBackgrounded = !context.backgroundedTaskIds.has(taskId);
+				context.backgroundedTaskIds.add(taskId);
+				if ((newlyBackgrounded || descriptionChanged || typeChanged) && context.liveTaskIds.has(taskId)) {
+					const stamp = yield* makeEventStamp();
+					yield* offerRuntimeEventForContext(context, {
+						...base,
+						...stamp,
+						type: "task.updated",
+						payload: {
+							taskId: require_src.RuntimeTaskId.make(taskId),
+							isBackgrounded: true,
+							...taskLinkageFor(context.taskAgents, taskId)
+						}
+					});
+				}
+			}
 			for (const taskId of context.liveTaskIds) {
 				if (liveSet.has(taskId) || !context.backgroundedTaskIds.has(taskId)) continue;
 				context.liveTaskIds.delete(taskId);
@@ -2522,17 +2571,25 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 				const launchingTool = message.tool_use_id ? Array.from(context.inFlightTools.values()).find((tool) => tool.itemId === message.tool_use_id) : void 0;
 				const owningAgentId = launchingTool?.agentId;
 				const launchInput = launchingTool?.input ?? (message.tool_use_id ? context.subagentLaunchInputByToolUseId.get(message.tool_use_id) : void 0);
+				const backgroundFlag = message.is_backgrounded;
+				if (backgroundFlag === true || backgroundFlag === void 0 && launchInput?.run_in_background === true) context.backgroundedTaskIds.add(message.task_id);
+				else if (backgroundFlag === false) context.backgroundedTaskIds.delete(message.task_id);
 				if (message.tool_use_id) context.subagentLaunchInputByToolUseId.delete(message.tool_use_id);
 				const model = (message.tool_use_id ? context.subagentModelByToolUseId.get(message.tool_use_id) : void 0) ?? claudeSubagentLaunchModel(launchInput);
 				if (message.tool_use_id) context.subagentModelByToolUseId.delete(message.tool_use_id);
 				const rawLaunchEffort = launchInput?.effort;
 				const effort = trimmedClaudeString(rawLaunchEffort) ?? (typeof rawLaunchEffort === "number" && Number.isFinite(rawLaunchEffort) ? String(rawLaunchEffort) : context.currentEffort);
+				const previousTask = context.taskAgents.get(message.task_id);
 				context.taskAgents.set(message.task_id, {
 					taskId: message.task_id,
+					...require_bin.classifyTaskAgentKind({
+						taskType: message.task_type ?? previousTask?.taskType,
+						agentId: owningAgentId
+					}) === "background" ? { backgroundAttempt: previousTask?.backgroundAttempt === void 0 ? 0 : previousTask.backgroundAttempt + (context.liveTaskIds.has(message.task_id) ? 0 : 1) } : {},
 					toolUseId: message.tool_use_id,
 					description: message.description,
 					subagentType: message.subagent_type,
-					taskType: message.task_type,
+					taskType: message.task_type ?? previousTask?.taskType,
 					workflowName: message.workflow_name,
 					skipTranscript: message.skip_transcript === true,
 					runHandles: context.taskAgents.get(message.task_id)?.runHandles,
@@ -2546,6 +2603,7 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 					type: "task.started",
 					payload: {
 						taskId: require_src.RuntimeTaskId.make(message.task_id),
+						...typeof backgroundFlag === "boolean" ? { isBackgrounded: backgroundFlag } : {},
 						description: message.description,
 						...message.task_type ? { taskType: message.task_type } : {},
 						...owningAgentId ? { agentId: owningAgentId } : {},
@@ -2949,6 +3007,10 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 		* runtime event and waiting for the user to respond via `respondToUserInput`.
 		*/
 		const handleAskUserQuestion = effect.Effect.fn("handleAskUserQuestion")(function* (context, toolInput, callbackOptions) {
+			if (callbackOptions.signal.aborted || context.stopped) return {
+				behavior: "deny",
+				message: "User cancelled tool execution."
+			};
 			const requestId = require_src.ApprovalRequestId.make(callbackOptions.requestId);
 			const questions = (Array.isArray(toolInput.questions) ? toolInput.questions : []).map((q, idx) => ({
 				id: typeof q.question === "string" && q.question.length > 0 ? q.question : `q-${idx}`,
@@ -2963,7 +3025,7 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 			const answersDeferred = yield* effect.Deferred.make();
 			let aborted = false;
 			const settleAsAborted = effect.Effect.suspend(() => {
-				if (!pendingUserInputs.has(requestId)) return effect.Effect.void;
+				if (pendingUserInputs.get(requestId) !== pendingInput) return effect.Effect.void;
 				aborted = true;
 				pendingUserInputs.delete(requestId);
 				return effect.Deferred.succeed(answersDeferred, {}).pipe(effect.Effect.ignore);
@@ -2974,6 +3036,11 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 				cancel: settleAsAborted
 			};
 			const requestedStamp = yield* makeEventStamp();
+			if (pendingUserInputs.has(requestId)) return {
+				behavior: "deny",
+				message: "A question with this request ID is already pending."
+			};
+			pendingUserInputs.set(requestId, pendingInput);
 			yield* offerRuntimeEventForContext(context, {
 				type: "user-input.requested",
 				eventId: requestedStamp.eventId,
@@ -2993,13 +3060,15 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 					}
 				}
 			});
-			pendingUserInputs.set(requestId, pendingInput);
 			const onAbort = () => {
 				runFork(settleAsAborted);
 			};
 			callbackOptions.signal.addEventListener("abort", onAbort, { once: true });
-			const answers = yield* effect.Deferred.await(answersDeferred);
-			pendingUserInputs.delete(requestId);
+			if (callbackOptions.signal.aborted || context.stopped) yield* settleAsAborted;
+			const answers = yield* effect.Deferred.await(answersDeferred).pipe(effect.Effect.ensuring(effect.Effect.sync(() => {
+				callbackOptions.signal.removeEventListener("abort", onAbort);
+				if (pendingUserInputs.get(requestId) === pendingInput) pendingUserInputs.delete(requestId);
+			})));
 			const resolvedStamp = yield* makeEventStamp();
 			yield* offerRuntimeEventForContext(context, {
 				type: "user-input.resolved",
@@ -3009,7 +3078,14 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 				threadId: context.session.threadId,
 				...context.turnState ? { turnId: asCanonicalTurnId(context.turnState.turnId) } : {},
 				requestId: asRuntimeRequestId(requestId),
-				payload: { answers },
+				payload: {
+					answers,
+					cancelled: aborted,
+					userInputIdentity: {
+						requestEventId: requestedStamp.eventId,
+						...context.session.runtimeSessionId ? { runtimeSessionId: context.session.runtimeSessionId } : {}
+					}
+				},
 				providerRefs: nativeProviderRefs(context, { providerItemId: callbackOptions.toolUseID }),
 				raw: {
 					source: "claude.sdk.permission",
@@ -3139,13 +3215,13 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 		const extraArgs = parseCliArgs(claudeSettings.launchArgs).flags;
 		const modelSelection = input.modelSelection?.instanceId === boundInstanceId ? input.modelSelection : void 0;
 		const caps = getClaudeModelCapabilities(modelSelection?.model);
-		const descriptors = require_bin.getProviderOptionDescriptors({ caps });
+		const descriptors = require_serverSettings.getProviderOptionDescriptors({ caps });
 		const apiModelId = modelSelection ? resolveClaudeApiModelId(modelSelection) : void 0;
-		const effort = resolveClaudeEffort(caps, require_bin.getModelSelectionStringOptionValue(modelSelection, "effort")) ?? null;
+		const effort = resolveClaudeEffort(caps, require_serverSettings.getModelSelectionStringOptionValue(modelSelection, "effort")) ?? null;
 		const fastModeSupported = descriptors.some((descriptor) => descriptor.type === "boolean" && descriptor.id === "fastMode");
 		const thinkingSupported = descriptors.some((descriptor) => descriptor.type === "boolean" && descriptor.id === "thinking");
-		const fastMode = require_bin.getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true && fastModeSupported;
-		const thinking = thinkingSupported ? require_bin.getModelSelectionBooleanOptionValue(modelSelection, "thinking") : void 0;
+		const fastMode = require_serverSettings.getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true && fastModeSupported;
+		const thinking = thinkingSupported ? require_serverSettings.getModelSelectionBooleanOptionValue(modelSelection, "thinking") : void 0;
 		const ultracode = isClaudeUltracodeEffort(effort);
 		const effectiveEffort = getEffectiveClaudeAgentEffort(effort, modelSelection?.model);
 		const permissionMode = {
@@ -3158,7 +3234,7 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 			...fastMode ? { fastMode: true } : {},
 			...ultracode ? { ultracode: true } : {}
 		};
-		const tokenMode = input.tokenMode ?? "balanced";
+		const tokenMode = input.tokenMode ?? "off";
 		const appendSystemPrompt = [yield* readTokenReductionInstructions(tokenMode), require_ProjectCustomSystemPrompt.formatProjectCustomSystemPrompt(input.customSystemPrompt)].map((part) => part?.trim()).filter((part) => part !== void 0 && part.length > 0).join("\n\n");
 		let agentControl = effect.Option.getOrUndefined(yield* require_bin.installAgentControlNativeHttp(options?.agentControl, {
 			threadId,
@@ -3381,7 +3457,7 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 				...context.session,
 				model: modelSelection.model
 			};
-			context.currentEffort = getEffectiveClaudeAgentEffort(resolveClaudeEffort(getClaudeModelCapabilities(modelSelection.model), require_bin.getModelSelectionStringOptionValue(modelSelection, "effort")) ?? null, modelSelection.model) ?? void 0;
+			context.currentEffort = getEffectiveClaudeAgentEffort(resolveClaudeEffort(getClaudeModelCapabilities(modelSelection.model), require_serverSettings.getModelSelectionStringOptionValue(modelSelection, "effort")) ?? null, modelSelection.model) ?? void 0;
 		}
 		if (input.interactionMode === "plan" || input.interactionMode === "ask") yield* effect.Effect.tryPromise({
 			try: () => context.query.setPermissionMode("plan"),
@@ -3481,8 +3557,15 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 			catch: (cause) => toRequestError(threadId, "turn/interrupt", cause)
 		});
 	});
-	const stopBackgroundTask = effect.Effect.fn("stopBackgroundTask")(function* (threadId, taskId) {
+	const stopBackgroundTask = effect.Effect.fn("stopBackgroundTask")(function* (threadId, taskId, expected) {
 		const context = yield* requireSession(threadId);
+		const staleIdentity = () => expected !== void 0 && (sessions.get(threadId) !== context || context.stopped || expected.runtimeSessionId !== context.session.runtimeSessionId || expected.attempt !== (context.taskAgents.get(taskId)?.backgroundAttempt ?? 0));
+		const staleError = () => new require_bin.ProviderAdapterValidationError({
+			provider: PROVIDER,
+			operation: "task/stop",
+			issue: "The displayed background task activation is no longer current."
+		});
+		if (staleIdentity()) return yield* staleError();
 		if (!context.query.stopTask) return yield* new require_bin.ProviderAdapterRequestError({
 			provider: PROVIDER,
 			method: "task/stop",
@@ -3490,7 +3573,11 @@ const makeClaudeAdapter = effect.Effect.fn("makeClaudeAdapter")(function* (claud
 		});
 		if (!context.liveTaskIds.has(taskId)) return;
 		const outcome = yield* effect.Effect.tryPromise({
-			try: () => context.query.stopTask(taskId),
+			try: () => {
+				if (staleIdentity()) throw staleError();
+				if (!context.liveTaskIds.has(taskId)) return Promise.resolve();
+				return context.query.stopTask(taskId);
+			},
 			catch: (cause) => toRequestError(threadId, "task/stop", cause)
 		}).pipe(effect.Effect.timeoutOption("5 seconds"));
 		if (effect.Option.isNone(outcome)) return yield* new require_bin.ProviderAdapterRequestError({
@@ -3625,10 +3712,19 @@ async function writeCredentialsFile(credentialsPath, credentials) {
 		await node_fs_promises.writeFile(credentialsPath, JSON.stringify(credentials, null, 2), "utf8");
 	} catch {}
 }
-async function readClaudeCredentials(credentialsPath) {
-	const keychainCredentials = await keychainRead();
-	if (keychainCredentials?.claudeAiOauth?.accessToken) return keychainCredentials;
-	return readCredentialsFile(credentialsPath);
+async function readClaudeCredentials(credentialsPath, useKeychain) {
+	if (useKeychain) {
+		const credentials = await keychainRead();
+		if (credentials?.claudeAiOauth?.accessToken) return {
+			credentials,
+			fromKeychain: true
+		};
+	}
+	const credentials = await readCredentialsFile(credentialsPath);
+	return credentials ? {
+		credentials,
+		fromKeychain: false
+	} : null;
 }
 function parseExpiresAtMs(value) {
 	if (typeof value === "number" && Number.isFinite(value)) return value < 0xe8d4a51000 ? value * 1e3 : value;
@@ -3668,7 +3764,8 @@ async function refreshAndPersistToken(input) {
 				...typeof data.expires_in === "number" && Number.isFinite(data.expires_in) ? { expiresAt: Date.now() + data.expires_in * 1e3 } : {}
 			}
 		};
-		await Promise.all([keychainWrite(updated), writeCredentialsFile(input.credentialsPath, updated)]);
+		if (input.fromKeychain) await keychainWrite(updated);
+		else await writeCredentialsFile(input.credentialsPath, updated);
 		return data.access_token;
 	} catch {
 		return null;
@@ -3721,20 +3818,25 @@ function parseClaudeUsageRateLimits(data, plan) {
 	};
 }
 async function fetchClaudeUsageRateLimits(input) {
-	const credentials = await readClaudeCredentials(input.credentialsPath);
-	if (!credentials?.claudeAiOauth?.accessToken) return;
-	let accessToken = credentials.claudeAiOauth.accessToken;
-	const plan = credentials.claudeAiOauth.subscriptionType ?? credentials.claudeAiOauth.rateLimitTier ?? null;
-	const expiresAt = parseExpiresAtMs(credentials.claudeAiOauth.expiresAt);
+	const selected = await readClaudeCredentials(input.credentialsPath, input.useKeychain);
+	if (!selected) return void 0;
+	const { credentials, fromKeychain } = selected;
+	const oauth = credentials.claudeAiOauth;
+	if (!oauth?.accessToken) return void 0;
+	let accessToken = oauth.accessToken;
+	const plan = oauth.subscriptionType ?? oauth.rateLimitTier ?? null;
+	const expiresAt = parseExpiresAtMs(oauth.expiresAt);
 	if (expiresAt !== void 0 && Date.now() > expiresAt - TOKEN_REFRESH_SKEW_MS) accessToken = await refreshAndPersistToken({
 		credentials,
-		credentialsPath: input.credentialsPath
+		credentialsPath: input.credentialsPath,
+		fromKeychain
 	}) ?? accessToken;
 	let response = await callUsageApi(accessToken, input.version);
-	if (response.status === 429 && credentials.claudeAiOauth.refreshToken) {
+	if (response.status === 429 && oauth.refreshToken) {
 		const refreshedAccessToken = await refreshAndPersistToken({
 			credentials,
-			credentialsPath: input.credentialsPath
+			credentialsPath: input.credentialsPath,
+			fromKeychain
 		});
 		if (refreshedAccessToken) {
 			accessToken = refreshedAccessToken;
@@ -3750,6 +3852,7 @@ const probeClaudeUsageRateLimits = effect.Effect.fn("probeClaudeUsageRateLimits"
 	return yield* effect.Effect.tryPromise({
 		try: () => fetchClaudeUsageRateLimits({
 			credentialsPath,
+			useKeychain: claudeHome === node_path.resolve(node_os.homedir()),
 			...version !== void 0 ? { version } : {}
 		}),
 		catch: () => void 0
@@ -3809,7 +3912,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 serverSettings = yield* require_serverSettings.ServerSettingsService;
 		const eventLoggers = yield* require_bin.ProviderEventLoggers;
 		const modelManifest = yield* effect.Effect.serviceOption(require_bin.ModelManifest);
 		const agentControl = yield* effect.Effect.serviceOption(require_bin.AgentControlSessionRegistry);
@@ -3860,7 +3963,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.provideService(require_bin.ServerSettingsService, serverSettings), 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_serverSettings.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-BK4HVNV4.cjs → CodexDriver-BP3EtJ0S.cjs}

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
 const require_rolldown_runtime = require("./rolldown-runtime-LGfotAqq.cjs");
-const require_src = require("./src-BlzIcnVG.cjs");
-const require_Metrics = require("./Metrics-DCKbdeoH.cjs");
+const require_src = require("./src-CBu69HDR.cjs");
+const require_serverSettings = require("./serverSettings-_fgQZNIb.cjs");
 const require_bin = require("./bin.cjs");
 const require_runtimeSession = require("./runtimeSession-Bj0OUcNJ.cjs");
 const require_sourceControlContextFormatter = require("./sourceControlContextFormatter-BDZqn-4T.cjs");
 const require_ProjectCustomSystemPrompt = require("./ProjectCustomSystemPrompt-B8SUlNGa.cjs");
-const require_makeManagedServerProvider = require("./makeManagedServerProvider-DGbd8BhM.cjs");
-const require_CodexTextGeneration = require("./CodexTextGeneration-Y2GSS7f1.cjs");
+const require_makeManagedServerProvider = require("./makeManagedServerProvider-A3NSgBwN.cjs");
+const require_CodexTextGeneration = require("./CodexTextGeneration-B1kQOBKx.cjs");
 let effect = require("effect");
 let effect_unstable_http = require("effect/unstable/http");
 let effect_unstable_process = require("effect/unstable/process");
@@ -225,7 +225,7 @@ function makeCodexServerNotification(method, params) {
 	};
 }
 function normalizeCodexModelSlug(model, preferredId) {
-	const normalized = require_bin.normalizeModelSlug(model);
+	const normalized = require_serverSettings.normalizeModelSlug(model);
 	if (!normalized) return;
 	if (preferredId?.endsWith("-codex") && preferredId !== normalized) return preferredId;
 	return normalized;
@@ -573,7 +573,7 @@ const readStoredCodexThread = (input) => effect.Effect.scoped(effect.Effect.gen(
 		cwd: input.cwd,
 		env: {
 			...input.environment ?? process.env,
-			...input.homePath ? { CODEX_HOME: require_bin.expandHomePath(input.homePath) } : {}
+			...input.homePath ? { CODEX_HOME: require_serverSettings.expandHomePath(input.homePath) } : {}
 		},
 		requestTimeoutMs: 2e4
 	}));
@@ -606,7 +606,7 @@ const makeCodexSessionRuntime = (options) => effect.Effect.gen(function* () {
 	const unsettledChildren = /* @__PURE__ */ new Set();
 	const reconciledChildStatuses = /* @__PURE__ */ new Map();
 	const closedRef = yield* effect.Ref.make(false);
-	const resolvedHomePath = options.homePath ? require_bin.expandHomePath(options.homePath) : void 0;
+	const resolvedHomePath = options.homePath ? require_serverSettings.expandHomePath(options.homePath) : void 0;
 	const env = {
 		...options.environment ?? process.env,
 		...resolvedHomePath ? { CODEX_HOME: resolvedHomePath } : {}
@@ -2425,7 +2425,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 	const adapterScope = yield* effect.Scope.Scope;
 	const fileSystem = yield* effect.FileSystem.FileSystem;
 	const childProcessSpawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
-	const serverConfig = yield* effect.Effect.service(require_Metrics.ServerConfig);
+	const serverConfig = yield* effect.Effect.service(require_serverSettings.ServerConfig);
 	const nativeEventLogger = options?.nativeEventLogger ?? (options?.nativeEventLogPath !== void 0 ? yield* require_bin.makeEventNdjsonLogger(options.nativeEventLogPath, { stream: "native" }) : void 0);
 	const managedNativeEventLogger = options?.nativeEventLogger === void 0 ? nativeEventLogger : void 0;
 	const runtimeEventQueue = yield* effect.Queue.bounded(2048);
@@ -2461,7 +2461,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 				issue: `Thread '${input.threadId}' still has runtime '${existing.runtimeSessionId}'; stop it before starting '${runtimeSessionId}'.`
 			});
 		}
-		const tokenMode = input.tokenMode ?? "balanced";
+		const tokenMode = input.tokenMode ?? "off";
 		const tokenReductionInstructions = yield* readTokenReductionInstructions(tokenMode);
 		const agentControlLease = yield* require_bin.installAgentControlNativeHttp(options?.agentControl, {
 			threadId: input.threadId,
@@ -2489,7 +2489,7 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 			runtimeMode: input.runtimeMode,
 			tokenMode,
 			...input.modelSelection?.instanceId === boundInstanceId ? { model: input.modelSelection.model } : {},
-			...input.modelSelection?.instanceId === boundInstanceId && require_bin.getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") === true ? { serviceTier: "fast" } : {}
+			...input.modelSelection?.instanceId === boundInstanceId && require_serverSettings.getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") === true ? { serviceTier: "fast" } : {}
 		};
 		const agentControl = effect.Option.getOrUndefined(agentControlLease);
 		const sessionScope = yield* effect.Scope.make("sequential");
@@ -2681,8 +2681,8 @@ const makeCodexAdapter = effect.Effect.fn("makeCodexAdapter")(function* (codexCo
 		const { native, pathLines } = yield* preflightAttachments(input, "turn/start");
 		const codexAttachments = yield* effect.Effect.forEach(native, (attachment) => toCodexAttachment(attachment, "turn/start"), { concurrency: 1 });
 		const session = yield* requireSession(input.threadId);
-		const reasoningEffort = input.modelSelection?.instanceId === boundInstanceId ? require_bin.getModelSelectionStringOptionValue(input.modelSelection, "reasoningEffort") : void 0;
-		const fastMode = input.modelSelection?.instanceId === boundInstanceId ? require_bin.getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") : void 0;
+		const reasoningEffort = input.modelSelection?.instanceId === boundInstanceId ? require_serverSettings.getModelSelectionStringOptionValue(input.modelSelection, "reasoningEffort") : void 0;
+		const fastMode = input.modelSelection?.instanceId === boundInstanceId ? require_serverSettings.getModelSelectionBooleanOptionValue(input.modelSelection, "fastMode") : void 0;
 		const formatted = require_sourceControlContextFormatter.formatSourceControlContextsForAgent(input.sourceControlContexts ?? []);
 		const codexInput = require_runtimeSession.appendAttachmentPathLines(formatted ? formatted + "\n\n" + (input.input ?? "") : input.input, pathLines);
 		const result = yield* session.runtime.sendTurn({
@@ -2956,7 +2956,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 serverSettings = yield* require_serverSettings.ServerSettingsService;
 		const eventLoggers = yield* require_bin.ProviderEventLoggers;
 		const processEnv = require_bin.mergeProviderInstanceEnvironment(environment);
 		const homeLayout = yield* require_bin.resolveCodexHomeLayout(config);
@@ -2999,7 +2999,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.provideService(require_bin.ServerSettingsService, serverSettings), 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_serverSettings.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-fwcV84hX.mjs → CodexDriver-CN6idmnS.mjs}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
-import { As as EventId, Bs as RuntimeSubagentId, Eo as ProviderInstanceId, Is as ProviderItemId, Kr as isToolLifecycleItemType, Ls as RuntimeItemId, Ms as MessageId, Or as CodexSettings, Rs as RuntimeRequestId, Ss as ApprovalRequestId, To as ProviderDriverKind, Vs as RuntimeTaskId, Ws as TurnId, ia as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES, ma as ProviderApprovalDecision, to as ThreadGoal } from "./src-DtEOcXdl.mjs";
-import { Z as ServerConfig } from "./Metrics-C-3MahDy.mjs";
-import { $t as CodexAppServerRequestError, A as makeEventNdjsonLogger, An as V2ThreadNameUpdatedNotification, B as buildTokenReductionInstructions, Bn as V2TurnDiffUpdatedNotification, Bt as ProviderAdapterSessionClosedError, Cn as V2ModelReroutedNotification, Dn as V2ServerRequestResolvedNotification, Dr as normalizeModelSlug, En as V2ReasoningTextDeltaNotification, Fn as V2ThreadRealtimeStartedNotification, Ft as installAgentControlNativeHttp, Gn as V2TurnSteerParams, Gt as materializeCodexShadowHome, Hn as V2TurnStartParams, Ht as ProviderAdapterValidationError, In as V2ThreadStartedNotification, Jn as V2WindowsWorldWritableWarningNotification, Jt as CodexAppServerClient, Kn as V2TurnSteerResponse, Kt as resolveCodexHomeLayout, Ln as V2ThreadStatusChangedNotification, Lt as createProcessDeviceToolBinding, Mn as V2ThreadRealtimeErrorNotification, Nn as V2ThreadRealtimeItemAddedNotification, On as V2ThreadGoalClearedNotification, Pn as V2ThreadRealtimeOutputAudioDeltaNotification, Qt as CodexAppServerProtocolParseError, Rn as V2ThreadTokenUsageUpdatedNotification, Rt as ProviderAdapterProcessError, Sn as V2McpToolCallProgressNotification, Sr as getModelSelectionStringOptionValue, Tn as V2ReasoningSummaryTextDeltaNotification, Un as V2TurnStartParams__CollaborationMode, Ut as ProviderDriverError, V as checkRtkAvailability, Vn as V2TurnPlanUpdatedNotification, Vt as ProviderAdapterSessionNotFoundError, Wn as V2TurnStartResponse, Wt as codexContinuationIdentity, Xt as layerCommand, Yt as layerChildProcess, Zt as CodexAppServerProcessExitedError, _n as V2ErrorNotification, _r as resolveAttachmentPath, _t as buildCodexInitializeParams, an as ServerRequest__DynamicToolCallParams, bn as V2ItemStartedNotification, cn as ServerRequest__ToolRequestUserInputParams, cr as makePackageManagedProviderMaintenanceResolver, dn as V2AccountRateLimitsUpdatedNotification, en as CodexAppServerSpawnError, fn as V2AccountUpdatedNotification, fr as resolveProviderMaintenanceCapabilitiesEffect, gn as V2DeprecationNoticeNotification, gt as mergeProviderInstanceEnvironment, hn as V2ConfigWarningNotification, in as ServerRequest__CommandExecutionRequestApprovalParams, jn as V2ThreadRealtimeClosedNotification, k as ProviderEventLoggers, kn as V2ThreadGoalUpdatedNotification, ln as ToolRequestUserInputParams, mn as V2CommandExecutionOutputDeltaNotification, mr as ServerSettingsService, n as AgentControlSessionRegistry, nn as SERVER_NOTIFICATION_METHODS, on as ServerRequest__ExecCommandApprovalParams, or as enrichProviderSnapshotWithVersionAdvisory, pn as V2AgentMessageDeltaNotification, qn as V2WindowsSandboxSetupCompletedNotification, qt as expandHomePath, rn as ServerRequest__ApplyPatchApprovalParams, sn as ServerRequest__FileChangeRequestApprovalParams, t as makeServerQueueMetrics, tn as CodexAppServerTransportError, un as ToolRequestUserInputResponse, vn as V2FileChangeOutputDeltaNotification, vt as checkCodexProviderStatus, wn as V2PlanDeltaNotification, xn as V2McpServerOauthLoginCompletedNotification, xr as getModelSelectionBooleanOptionValue, yn as V2ItemCompletedNotification, yt as makePendingCodexProvider, zn as V2TurnCompletedNotification, zt as ProviderAdapterRequestError } from "./bin.mjs";
+import { $r as isToolLifecycleItemType, As as ApprovalRequestId, Bs as MessageId, Fr as CodexSettings, Gs as RuntimeItemId, Js as RuntimeSubagentId, Ks as RuntimeRequestId, Mo as ProviderInstanceId, Qs as TurnId, Rs as EventId, Ws as ProviderItemId, Ys as RuntimeTaskId, ba as ProviderApprovalDecision, jo as ProviderDriverKind, so as ThreadGoal, ua as PROVIDER_SEND_TURN_MAX_IMAGE_BYTES } from "./src-D8uCtoDZ.mjs";
+import { Ft as getModelSelectionStringOptionValue, Pt as getModelSelectionBooleanOptionValue, Vt as normalizeModelSlug, l as expandHomePath, n as ServerSettingsService, ut as ServerConfig } from "./serverSettings-C7N2cm7C.mjs";
+import { $t as CodexAppServerSpawnError, An as V2ThreadRealtimeClosedNotification, B as checkRtkAvailability, Bn as V2TurnPlanUpdatedNotification, Bt as ProviderAdapterSessionClosedError, Cn as V2PlanDeltaNotification, Dn as V2ThreadGoalClearedNotification, En as V2ServerRequestResolvedNotification, Fn as V2ThreadStartedNotification, Ft as installAgentControlNativeHttp, Gn as V2TurnSteerResponse, Gt as materializeCodexShadowHome, Hn as V2TurnStartParams__CollaborationMode, Ht as ProviderAdapterValidationError, In as V2ThreadStatusChangedNotification, Jt as layerChildProcess, Kn as V2WindowsSandboxSetupCompletedNotification, Kt as resolveCodexHomeLayout, Ln as V2ThreadTokenUsageUpdatedNotification, Lt as createProcessDeviceToolBinding, Mn as V2ThreadRealtimeItemAddedNotification, Nn as V2ThreadRealtimeOutputAudioDeltaNotification, O as ProviderEventLoggers, On as V2ThreadGoalUpdatedNotification, Pn as V2ThreadRealtimeStartedNotification, Qt as CodexAppServerRequestError, Rn as V2TurnCompletedNotification, Rt as ProviderAdapterProcessError, Sn as V2ModelReroutedNotification, Sr as resolveAttachmentPath, Tn as V2ReasoningTextDeltaNotification, Un as V2TurnStartResponse, Ut as ProviderDriverError, Vn as V2TurnStartParams, Vt as ProviderAdapterSessionNotFoundError, Wn as V2TurnSteerParams, Wt as codexContinuationIdentity, Xt as CodexAppServerProcessExitedError, Yt as layerCommand, Zt as CodexAppServerProtocolParseError, _n as V2FileChangeOutputDeltaNotification, _t as buildCodexInitializeParams, an as ServerRequest__ExecCommandApprovalParams, bn as V2McpServerOauthLoginCompletedNotification, cn as ToolRequestUserInputParams, dn as V2AccountUpdatedNotification, en as CodexAppServerTransportError, fn as V2AgentMessageDeltaNotification, fr as enrichProviderSnapshotWithVersionAdvisory, gn as V2ErrorNotification, gt as mergeProviderInstanceEnvironment, hn as V2DeprecationNoticeNotification, in as ServerRequest__DynamicToolCallParams, jn as V2ThreadRealtimeErrorNotification, k as makeEventNdjsonLogger, kn as V2ThreadNameUpdatedNotification, ln as ToolRequestUserInputResponse, mn as V2ConfigWarningNotification, mr as makePackageManagedProviderMaintenanceResolver, n as AgentControlSessionRegistry, nn as ServerRequest__ApplyPatchApprovalParams, on as ServerRequest__FileChangeRequestApprovalParams, pn as V2CommandExecutionOutputDeltaNotification, qn as V2WindowsWorldWritableWarningNotification, qt as CodexAppServerClient, rn as ServerRequest__CommandExecutionRequestApprovalParams, sn as ServerRequest__ToolRequestUserInputParams, t as makeServerQueueMetrics, tn as SERVER_NOTIFICATION_METHODS, un as V2AccountRateLimitsUpdatedNotification, vn as V2ItemCompletedNotification, vr as resolveProviderMaintenanceCapabilitiesEffect, vt as checkCodexProviderStatus, wn as V2ReasoningSummaryTextDeltaNotification, xn as V2McpToolCallProgressNotification, yn as V2ItemStartedNotification, yt as makePendingCodexProvider, z as buildTokenReductionInstructions, zn as V2TurnDiffUpdatedNotification, zt as ProviderAdapterRequestError } from "./bin.mjs";
 import { i as formatAttachmentPathLines, n as stampRuntimeEvent, r as appendAttachmentPathLines, t as requireRuntimeSessionId } from "./runtimeSession-CA6cLWg0.mjs";
 import { t as formatSourceControlContextsForAgent } from "./sourceControlContextFormatter-DEwpnVAH.mjs";
 import { t as appendProjectCustomSystemPrompt } from "./ProjectCustomSystemPrompt-CS1nulhL.mjs";
-import { t as makeManagedServerProvider } from "./makeManagedServerProvider-BINne1KE.mjs";
-import { t as makeCodexTextGeneration } from "./CodexTextGeneration-_4aT5BHa.mjs";
+import { t as makeManagedServerProvider } from "./makeManagedServerProvider--SPw3bxe.mjs";
+import { t as makeCodexTextGeneration } from "./CodexTextGeneration-zuVszBVZ.mjs";
 import { Cause, 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";
@@ -2459,7 +2459,7 @@ const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (codexConfig, o
 				issue: `Thread '${input.threadId}' still has runtime '${existing.runtimeSessionId}'; stop it before starting '${runtimeSessionId}'.`
 			});
 		}
-		const tokenMode = input.tokenMode ?? "balanced";
+		const tokenMode = input.tokenMode ?? "off";
 		const tokenReductionInstructions = yield* readTokenReductionInstructions(tokenMode);
 		const agentControlLease = yield* installAgentControlNativeHttp(options?.agentControl, {
 			threadId: input.threadId,

package/dist/{CodexTextGeneration-Y2GSS7f1.cjs → CodexTextGeneration-B1kQOBKx.cjs}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-const require_src = require("./src-BlzIcnVG.cjs");
-const require_Metrics = require("./Metrics-DCKbdeoH.cjs");
-const require_git = require("./git-irmB8_k7.cjs");
+const require_src = require("./src-CBu69HDR.cjs");
+const require_serverSettings = require("./serverSettings-_fgQZNIb.cjs");
+const require_git = require("./git-VPCnunmz.cjs");
 const require_bin = require("./bin.cjs");
-const require_SideQuestionIsolation = require("./SideQuestionIsolation-DvVKZWxi.cjs");
+const require_SideQuestionIsolation = require("./SideQuestionIsolation-pW7UQKVD.cjs");
 let effect = require("effect");
 let effect_unstable_process = require("effect/unstable/process");
 //#region src/textGeneration/CodexTextGeneration.ts
@@ -18,7 +18,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 	const fileSystem = yield* effect.FileSystem.FileSystem;
 	const path = yield* effect.Path.Path;
 	const commandSpawner = yield* effect_unstable_process.ChildProcessSpawner.ChildProcessSpawner;
-	const serverConfig = yield* effect.Effect.service(require_Metrics.ServerConfig);
+	const serverConfig = yield* effect.Effect.service(require_serverSettings.ServerConfig);
 	const readStreamAsString = (operation, stream) => stream.pipe(effect.Stream.decodeText(), effect.Stream.runFold(() => "", (acc, chunk) => acc + chunk), effect.Effect.mapError((cause) => require_bin.normalizeCliError("codex", operation, cause, "Failed to collect process output")));
 	const writeTempFile = (operation, prefix, content) => {
 		return effect.Effect.gen(function* () {
@@ -51,7 +51,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 		const schemaPath = yield* writeTempFile(operation, "codex-schema", JSON.stringify(require_bin.toJsonSchemaObject(outputSchemaJson)));
 		const outputPath = yield* writeTempFile(operation, "codex-output", "");
 		const runCodexCommand = effect.Effect.fn("runCodexJson.runCodexCommand")(function* () {
-			const reasoningEffort = require_bin.getModelSelectionStringOptionValue(modelSelection, "reasoningEffort") ?? CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;
+			const reasoningEffort = require_serverSettings.getModelSelectionStringOptionValue(modelSelection, "reasoningEffort") ?? CODEX_GIT_TEXT_GENERATION_REASONING_EFFORT;
 			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_bin.getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true ? ["--config", `service_tier="fast"`] : [],
+				...require_serverSettings.getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true ? ["--config", `service_tier="fast"`] : [],
 				"--output-schema",
 				schemaPath,
 				"--output-last-message",
@@ -99,7 +99,7 @@ const makeCodexTextGeneration = effect.Effect.fn("makeCodexTextGeneration")(func
 			], {
 				env: {
 					...operation === "answerSideQuestion" ? require_SideQuestionIsolation.sideQuestionEnvironment(environment) : environment,
-					...codexConfig.homePath ? { CODEX_HOME: require_bin.expandHomePath(codexConfig.homePath) } : {}
+					...codexConfig.homePath ? { CODEX_HOME: require_serverSettings.expandHomePath(codexConfig.homePath) } : {}
 				},
 				cwd,
 				shell: process.platform === "win32",