acpx 0.20.0 → 0.21.1

package/dist/{queue-owner-runtime-Be8sr9L5.js → queue-owner-runtime-B0mPqOu4.js}

@@ -1,5 +1,5 @@
-import { $ as measurePerf, $t as UnsupportedPromptContentError, Bt as AgentStartupError, C as textPrompt, Dt as normalizeOutputError, Et as isRetryablePromptError, F as normalizeName, G as normalizeAgentSessionId, Gt as PermissionDeniedError, H as canonicalAgentCommand, Ht as ClaudeAcpSessionCreateTimeoutError, Jt as SessionConfigOptionReplayError, K as SESSION_JOURNAL_SCHEMA, Kt as PermissionPromptUnavailableError, L as readSessionRecord, Lt as AcpxOperationalError, M as isoNow$1, O as absolutePath, Ot as extractAcpError, Q as incrementPerfCounter, Qt as SessionResumeRequiredError, R as resolveSessionRecord, Rt as AgentDisconnectedError, S as promptToDisplayText, St as isProcessAlive, T as lockOwnerPid, Tt as isAcpQueryClosedBeforeResponseError, Ut as CopilotAcpUnsupportedError, Vt as AuthPolicyError, W as extractAgentSessionId, Wt as GeminiAcpStartupTimeoutError, X as formatPerfMetric, Xt as SessionModelReplayError, Yt as SessionModeReplayError, Z as getPerfMetricsSnapshot, _ as ProcessDescendants, _t as sessionEventLockPath, a as trySetModelOnRunningOwner, at as isAcpMessageObject, d as releaseQueueOwnerLease, et as resetPerfMetrics, f as terminateProcess, ft as defaultSessionEventLog, g as QueueLeaseGuardSettlementError, gt as sessionEventActivePath, h as waitMs$1, ht as sessionBaseDir, i as trySetModeOnRunningOwner, it as isAcpJsonRpcMessage, j as findSessionByDirectoryWalk, k as findGitRepositoryRoot, kt as isAcpResourceNotFoundError, m as tryAcquireQueueOwnerLease, mt as retainedEventMaxSegments, n as tryCloseSessionOnRunningOwner, nt as startPerfTimer, o as trySubmitToRunningOwner, ot as isSessionUpdateNotification, p as terminateQueueOwnerForSession, pt as existingEventSegmentIndices, q as SessionJournalReader, qt as QueueConnectionError, r as trySetConfigOptionOnRunningOwner, s as SessionQueueOwner, t as tryCancelOnRunningOwner, tt as setPerfGauge, u as refreshQueueOwnerLease, vt as sessionEventSegmentPath, w as createLockOwner, wt as formatErrorMessage, y as getUnsupportedPromptContentMessage, z as writeSessionRecord, zt as AgentSpawnError } from "./ipc-D2BC99hf.js";
-import { A as requireAgentStdio, C as PROCESS_HELPER_TIMEOUT_MS, D as isoNow$2, E as isChildProcessRunning, F as waitForChildExit, I as waitForSpawn, M as resolveAgentSessionCwd, N as runTimedExecFile, P as splitCommandLine, T as basenameToken, _ as buildSpawnCommandOptions, b as readWindowsEnvValue, f as resolveBuiltInAgentLaunch, g as buildAgentSpawnCommand, j as resolveAgentCommandParts, v as buildTerminalShellSpawnCommand, w as asAbsoluteCwd, x as resolveWindowsExecutablePath, y as buildTerminalSpawnCommand } from "./agent-registry-Gtwn7nMp.js";
+import { $ as measurePerf, $t as UnsupportedPromptContentError, Bt as AgentStartupError, C as textPrompt, Dt as normalizeOutputError, Et as isRetryablePromptError, F as normalizeName, G as normalizeAgentSessionId, Gt as PermissionDeniedError, H as canonicalAgentCommand, Ht as ClaudeAcpSessionCreateTimeoutError, Jt as SessionConfigOptionReplayError, K as SESSION_JOURNAL_SCHEMA, Kt as PermissionPromptUnavailableError, L as readSessionRecord, Lt as AcpxOperationalError, M as isoNow$1, O as absolutePath, Ot as extractAcpError, Q as incrementPerfCounter, Qt as SessionResumeRequiredError, R as resolveSessionRecord, Rt as AgentDisconnectedError, S as promptToDisplayText, St as isProcessAlive, T as lockOwnerPid, Tt as isAcpQueryClosedBeforeResponseError, Ut as CopilotAcpUnsupportedError, Vt as AuthPolicyError, W as extractAgentSessionId, Wt as GeminiAcpStartupTimeoutError, X as formatPerfMetric, Xt as SessionModelReplayError, Yt as SessionModeReplayError, Z as getPerfMetricsSnapshot, _ as ProcessDescendants, _t as sessionEventLockPath, a as trySetModelOnRunningOwner, at as isAcpMessageObject, d as releaseQueueOwnerLease, et as resetPerfMetrics, f as terminateProcess, ft as defaultSessionEventLog, g as QueueLeaseGuardSettlementError, gt as sessionEventActivePath, h as waitMs$1, ht as sessionBaseDir, i as trySetModeOnRunningOwner, it as isAcpJsonRpcMessage, j as findSessionByDirectoryWalk, k as findGitRepositoryRoot, kt as isAcpResourceNotFoundError, m as tryAcquireQueueOwnerLease, mt as retainedEventMaxSegments, n as tryCloseSessionOnRunningOwner, nt as startPerfTimer, o as trySubmitToRunningOwner, ot as isSessionUpdateNotification, p as terminateQueueOwnerForSession, pt as existingEventSegmentIndices, q as SessionJournalReader, qt as QueueConnectionError, r as trySetConfigOptionOnRunningOwner, s as SessionQueueOwner, t as tryCancelOnRunningOwner, tt as setPerfGauge, u as refreshQueueOwnerLease, vt as sessionEventSegmentPath, w as createLockOwner, wt as formatErrorMessage, y as getUnsupportedPromptContentMessage, z as writeSessionRecord, zt as AgentSpawnError } from "./ipc-BbYFsKOj.js";
+import { A as requireAgentStdio, C as PROCESS_HELPER_TIMEOUT_MS, D as isoNow$2, E as isChildProcessRunning, F as waitForChildExit, I as waitForSpawn, M as resolveAgentSessionCwd, N as runTimedExecFile, P as splitCommandLine, T as basenameToken, _ as buildSpawnCommandOptions, b as readWindowsEnvValue, f as resolveBuiltInAgentLaunch, g as buildAgentSpawnCommand, j as resolveAgentCommandParts, v as buildTerminalShellSpawnCommand, w as asAbsoluteCwd, x as resolveWindowsExecutablePath, y as buildTerminalSpawnCommand } from "./agent-registry-Cz9fD9H1.js";
 import fs, { readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
@@ -16,7 +16,7 @@ import { FsSafeError } from "@openclaw/fs-safe/errors";
 import { isPathInside } from "@openclaw/fs-safe/path";
 import { root } from "@openclaw/fs-safe/root";
 import readline from "node:readline/promises";
-//#region src/async-control.ts
+// src/async-control.ts
 var TimeoutError = class extends Error {
 	constructor(timeoutMs) {
 		super(`Timed out after ${timeoutMs}ms`);
@@ -76,8 +76,7 @@ async function withInterrupt(run, onInterrupt) {
 		run().then((result) => finish(() => resolve(result)), (error) => finish(() => reject(error)));
 	});
 }
-//#endregion
-//#region src/acp/codex-compat.ts
+// src/acp/codex-compat.ts
 function isLegacyZedCodexAcpInvocation(agentCommand) {
 	return /@zed-industries\/codex-acp\b/u.test(agentCommand);
 }
@@ -95,8 +94,7 @@ function codexPermissionNotice(request, response, agentName) {
 	const selectedId = response.outcome.optionId;
 	return request.options.find((option) => option.optionId === selectedId)?.kind === "reject_once" && selectedId === "cancel" ? "Permission refused using Codex's cancellation option; this can end the current turn. The operation was not approved." : void 0;
 }
-//#endregion
-//#region src/session/events.ts
+// src/session/events.ts
 async function ensureSessionDir() {
 	await fs$1.mkdir(sessionBaseDir(), {
 		recursive: true,
@@ -359,8 +357,7 @@ async function listSessionEvents(sessionId, maxSegments) {
 		eventLog: { max_segments: maxSegments }
 	}).readAcpMessages();
 }
-//#endregion
-//#region src/session/turn-ownership.ts
+// src/session/turn-ownership.ts
 const LOCK_RETRY_MS = 15;
 const INCOMPLETE_RESERVATION_GRACE_MS = 15e3;
 let lastCreatedAt = 0;
@@ -599,16 +596,14 @@ async function acquireSessionOwnership(requestedPath, signal) {
 		await setTimeout$1(LOCK_RETRY_MS, void 0, { signal });
 	}
 }
-//#endregion
-//#region src/session/execution/contracts.ts
+// src/session/execution/contracts.ts
 const DEFAULT_QUEUE_OWNER_TTL_MS = 3e5;
 function normalizeQueueOwnerTtlMs(ttlMs) {
 	if (ttlMs == null) return DEFAULT_QUEUE_OWNER_TTL_MS;
 	if (!Number.isFinite(ttlMs) || ttlMs < 0) return DEFAULT_QUEUE_OWNER_TTL_MS;
 	return Math.round(ttlMs);
 }
-//#endregion
-//#region src/file-read-window.ts
+// src/file-read-window.ts
 function sliceReadWindow(content, line, limit) {
 	if (line == null && limit == null) return content;
 	const lines = content.split("\n");
@@ -618,8 +613,7 @@ function sliceReadWindow(content, line, limit) {
 	const endIndex = maxLines == null ? lines.length : Math.min(lines.length, startIndex + maxLines);
 	return lines.slice(startIndex, endIndex).join("\n");
 }
-//#endregion
-//#region src/permission-prompt.ts
+// src/permission-prompt.ts
 function visiblePromptText(value) {
 	let rendered = "";
 	for (const character of value) {
@@ -687,8 +681,7 @@ function writePromptDetails(options) {
 	if (options.header) process.stderr.write(`\n${visiblePromptText(options.header)}\n`);
 	if (options.details && options.details.trim().length > 0) process.stderr.write(`${options.details.split("\n").map(visiblePromptText).join("\n")}\n`);
 }
-//#endregion
-//#region src/filesystem.ts
+// src/filesystem.ts
 const WRITE_PREVIEW_MAX_LINES = 16;
 const WRITE_PREVIEW_MAX_CHARS = 1200;
 function nowIso$1() {
@@ -844,8 +837,7 @@ var FileSystemHandlers = class {
 		this.onOperation?.(operation);
 	}
 };
-//#endregion
-//#region src/permissions.ts
+// src/permissions.ts
 const PERMISSION_MODE_RANK = {
 	"deny-all": 0,
 	"approve-reads": 1,
@@ -1115,8 +1107,7 @@ function classifyPermissionDecision(params, response) {
 	if (selectedOption.kind === "allow_once" || selectedOption.kind === "allow_always") return "approved";
 	return "denied";
 }
-//#endregion
-//#region src/acp/agent-command.ts
+// src/acp/agent-command.ts
 const DEFAULT_AGENT_CLOSE_AFTER_STDIN_END_MS = 100;
 const QODER_AGENT_CLOSE_AFTER_STDIN_END_MS = 750;
 const GEMINI_ACP_STARTUP_TIMEOUT_MS = 15e3;
@@ -1292,8 +1283,91 @@ function resolveClaudeCodeExecutable(platform = process.platform, env = process.
 	if (readWindowsEnvValue(env, "CLAUDE_CODE_EXECUTABLE")) return;
 	return resolveWindowsExecutablePath("claude", env, cwd);
 }
-//#endregion
-//#region src/acp/auth-env.ts
+// src/acp/inherited-env.ts
+const AUTH_GRANT_PREFIX = "ACPX_AUTH_";
+const POSIX_ESSENTIAL_NAMES = [
+	"PATH",
+	"HOME",
+	"USER",
+	"LOGNAME",
+	"SHELL",
+	"LANG",
+	"LANGUAGE",
+	"TZ",
+	"TMPDIR",
+	"TMP",
+	"TEMP"
+];
+const WINDOWS_ESSENTIAL_NAMES = [
+	"SYSTEMROOT",
+	"WINDIR",
+	"SYSTEMDRIVE",
+	"COMSPEC",
+	"PATHEXT",
+	"USERPROFILE",
+	"HOMEDRIVE",
+	"HOMEPATH",
+	"USERNAME",
+	"USERDOMAIN",
+	"APPDATA",
+	"LOCALAPPDATA",
+	"PROGRAMDATA",
+	"ALLUSERSPROFILE",
+	"PROGRAMFILES",
+	"PROGRAMFILES(X86)",
+	"PROGRAMW6432",
+	"COMMONPROGRAMFILES",
+	"COMMONPROGRAMFILES(X86)",
+	"COMMONPROGRAMW6432"
+];
+const ESSENTIAL_PREFIXES = ["LC_", "XDG_"];
+/** Environment name as compared on this platform: Windows names are case-insensitive. */
+function envNameKey(name) {
+	return process.platform === "win32" ? name.toUpperCase() : name;
+}
+function essentialNames() {
+	return process.platform === "win32" ? [...POSIX_ESSENTIAL_NAMES, ...WINDOWS_ESSENTIAL_NAMES] : POSIX_ESSENTIAL_NAMES;
+}
+function isEnvName(name) {
+	return typeof name === "string" && name.length > 0 && !name.includes("=") && !name.includes("\0");
+}
+function validateEnvNames(option, names) {
+	if (!Array.isArray(names) || !names.every(isEnvName)) throw new Error(`Invalid ${option}: expected an array of non-empty names without NUL or '='`);
+	return names;
+}
+/** Validate and copy an embedder's name list once, when a client or runtime is constructed. */
+function snapshotEnvNames(option, names) {
+	return names === void 0 ? void 0 : [...validateEnvNames(option, names)];
+}
+function inheritedNameFilter(policy) {
+	const blocked = new Set((policy?.block ?? []).map(envNameKey));
+	const allowed = policy?.allow ? new Set([...essentialNames(), ...policy.allow].map(envNameKey)) : void 0;
+	return (name) => {
+		const key = envNameKey(name);
+		if (key.startsWith(AUTH_GRANT_PREFIX)) return true;
+		if (blocked.has(key)) return false;
+		return !allowed || allowed.has(key) || ESSENTIAL_PREFIXES.some((p) => key.startsWith(p));
+	};
+}
+/** Whether a parent environment name reaches agent children under this policy. */
+function isInheritedEnvName(policy, name) {
+	return inheritedNameFilter(policy)(name);
+}
+/** Whether the policy changes inheritance at all; with neither list set it does not. */
+function hasInheritedEnvPolicy(policy) {
+	return policy?.allow !== void 0 || (policy?.block?.length ?? 0) > 0;
+}
+/** Copy the parent environment, keeping only the names this policy lets children inherit. */
+function inheritParentEnvironment(policy) {
+	const env = { ...process.env };
+	if (!hasInheritedEnvPolicy(policy)) return env;
+	validateEnvNames("agentProcessEnvAllow", policy?.allow ?? []);
+	validateEnvNames("agentProcessEnvBlock", policy?.block ?? []);
+	const inherits = inheritedNameFilter(policy);
+	for (const name of Object.keys(env)) if (!inherits(name)) delete env[name];
+	return env;
+}
+// src/acp/auth-env.ts
 const AUTH_ENV_PREFIX = "ACPX_AUTH_";
 function toEnvToken(value) {
 	return value.trim().replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
@@ -1344,9 +1418,9 @@ function promotePrefixedAuthEnvironment(env) {
 function validateAgentProcessEnv(agentProcessEnv) {
 	for (const [key, value] of Object.entries(agentProcessEnv ?? {})) if (typeof value !== "string" || key.includes("=") || key.includes("\0") || value.includes("\0")) throw new Error("Invalid agentProcessEnv: environment entries cannot contain NUL or names with '='");
 }
-function buildAgentEnvironment(authCredentials, sessionEnv, agentProcessEnv) {
+function buildAgentEnvironment(authCredentials, sessionEnv, agentProcessEnv, inheritedEnv) {
 	validateAgentProcessEnv(agentProcessEnv);
-	const env = { ...process.env };
+	const env = inheritParentEnvironment(inheritedEnv);
 	const protectedAuthEnvKeys = promotePrefixedAuthEnvironment(env);
 	if (authCredentials) for (const [methodId, credential] of Object.entries(authCredentials)) {
 		addAuthCredentialEnvKeys(protectedAuthEnvKeys, methodId, credential);
@@ -1396,10 +1470,10 @@ function resolveConfiguredAuthCredential(methodId, authCredentials) {
 	const configCredentials = authCredentials ?? {};
 	return configCredentials[methodId] ?? configCredentials[toEnvToken(methodId)];
 }
-function buildAgentSpawnOptions(cwd, authCredentials, sessionEnv, agentProcessEnv) {
+function buildAgentSpawnOptions(cwd, authCredentials, sessionEnv, agentProcessEnv, inheritedEnv) {
 	return {
 		cwd,
-		env: buildAgentEnvironment(authCredentials, sessionEnv, agentProcessEnv),
+		env: buildAgentEnvironment(authCredentials, sessionEnv, agentProcessEnv, inheritedEnv),
 		stdio: [
 			"pipe",
 			"pipe",
@@ -1408,8 +1482,7 @@ function buildAgentSpawnOptions(cwd, authCredentials, sessionEnv, agentProcessEn
 		windowsHide: true
 	};
 }
-//#endregion
-//#region src/version.ts
+// src/version.ts
 const UNKNOWN_VERSION = "0.0.0-unknown";
 const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 let cachedVersion = null;
@@ -1451,8 +1524,7 @@ function getAcpxVersion() {
 	cachedVersion = resolveAcpxVersion();
 	return cachedVersion;
 }
-//#endregion
-//#region src/acp/client-protocol.ts
+// src/acp/client-protocol.ts
 const DEVIN_COMPATIBILITY_CLIENT_CAPABILITIES_META = Object.freeze({ "cognition.ai/requestDiagnostics": true });
 const DEVIN_COMPATIBILITY_CLIENT_NAME = "windsurf";
 const DEFAULT_DEVIN_COMPATIBILITY_CLIENT_VERSION = "1.110.1";
@@ -1484,8 +1556,7 @@ function resolveClientCapabilities(params) {
 		_meta: DEVIN_COMPATIBILITY_CLIENT_CAPABILITIES_META
 	};
 }
-//#endregion
-//#region src/acp/command-probe.ts
+// src/acp/command-probe.ts
 var CommandProbeAdmissionError = class extends Error {
 	reason;
 	constructor(reason) {
@@ -1551,8 +1622,7 @@ function captureCommandProbeOutput(child, timeoutMs, retire) {
 		}
 	};
 }
-//#endregion
-//#region src/acp/model-config-state.ts
+// src/acp/model-config-state.ts
 function asRecord$2(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
@@ -1611,8 +1681,7 @@ function modelStateFromConfigOptions(configOptions) {
 	}
 	return selected;
 }
-//#endregion
-//#region src/acp/model-support.ts
+// src/acp/model-support.ts
 const REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE = "ACP_MODEL_UNSUPPORTED";
 const REQUESTED_MODEL_UNSUPPORTED_REASONS = ["missing-capability", "unadvertised-model"];
 var RequestedModelUnsupportedError = class extends Error {
@@ -1698,8 +1767,7 @@ function assertRequestedModelSupported(params) {
 		throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise that model. Available models: ${formatAvailableModelIds(params.models)}.`, "unadvertised-model");
 	}
 }
-//#endregion
-//#region src/acp/ndjson-stream.ts
+// src/acp/ndjson-stream.ts
 const DEFAULT_MAX_ACP_MESSAGE_BYTES = 67108864;
 var AcpMessageLimitError = class extends AcpxOperationalError {
 	constructor(limit) {
@@ -1790,8 +1858,7 @@ function createNdJsonMessageStream(agentCommand, output, input, maxMessageBytes,
 		} })
 	};
 }
-//#endregion
-//#region src/acp/observed-stream.ts
+// src/acp/observed-stream.ts
 function observeAcpStream(base, options) {
 	const elicitationRequestIds = /* @__PURE__ */ new Set();
 	const shouldSuppressInboundReplaySessionUpdate = (message) => {
@@ -1858,8 +1925,7 @@ function promptRequestOwner(message) {
 		sessionId
 	} : void 0;
 }
-//#endregion
-//#region src/acp/session-control-errors.ts
+// src/acp/session-control-errors.ts
 const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function asRecord$1(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
@@ -1885,8 +1951,7 @@ function maybeWrapSessionControlError(method, error, context) {
 	wrapped.acp = acp;
 	return wrapped;
 }
-//#endregion
-//#region src/acp/terminal-manager.ts
+// src/acp/terminal-manager.ts
 const DEFAULT_TERMINAL_OUTPUT_LIMIT_BYTES = 65536;
 const DEFAULT_KILL_GRACE_MS = 1500;
 function nowIso() {
@@ -1896,14 +1961,14 @@ function toCommandLine(command, args) {
 	const renderedArgs = (args ?? []).map((arg) => JSON.stringify(arg)).join(" ");
 	return renderedArgs.length > 0 ? `${command} ${renderedArgs}` : command;
 }
-function toEnvObject(env) {
-	if (!env || env.length === 0) return;
-	const merged = { ...process.env };
-	for (const entry of env) merged[entry.name] = entry.value;
+function toEnvObject(env, inheritedEnv) {
+	if (!env?.length && !hasInheritedEnvPolicy(inheritedEnv)) return;
+	const merged = inheritParentEnvironment(inheritedEnv);
+	for (const entry of env ?? []) merged[entry.name] = entry.value;
 	return merged;
 }
-function buildTerminalSpawnOptions(command, cwd, env, platform = process.platform) {
-	const resolvedEnv = toEnvObject(env);
+function buildTerminalSpawnOptions(command, cwd, env, platform = process.platform, inheritedEnv) {
+	const resolvedEnv = toEnvObject(env, inheritedEnv);
 	return buildSpawnCommandOptions(command, {
 		cwd,
 		env: resolvedEnv,
@@ -1955,6 +2020,7 @@ function waitMs(ms) {
 function onStreamError() {}
 var TerminalManager = class {
 	cwd;
+	inheritedEnv;
 	permissionMode;
 	nonInteractivePermissions;
 	onOperation;
@@ -1968,6 +2034,7 @@ var TerminalManager = class {
 	constructor(options) {
 		this.outputCeilingBytes = readTerminalOutputCeiling();
 		this.cwd = options.cwd;
+		this.inheritedEnv = options.inheritedEnv;
 		this.permissionMode = options.permissionMode;
 		this.nonInteractivePermissions = options.nonInteractivePermissions ?? "deny";
 		this.onOperation = options.onOperation;
@@ -2004,7 +2071,10 @@ var TerminalManager = class {
 			assertControlAuthority(authority);
 			if (!approved) throw new PermissionDeniedError("Permission denied for terminal/create");
 			const outputByteLimit = resolveTerminalOutputLimit(params.outputByteLimit, this.outputCeilingBytes);
-			const { proc, spawnCommand } = await spawnTerminalProcess(params, this.cwd, authority);
+			const { proc, spawnCommand } = await spawnTerminalProcess(params, {
+				cwd: this.cwd,
+				inheritedEnv: this.inheritedEnv
+			}, authority);
 			let resolveExit = () => {};
 			const exitPromise = new Promise((resolve) => {
 				resolveExit = resolve;
@@ -2272,24 +2342,24 @@ var TerminalManager = class {
 		return true;
 	}
 };
-async function spawnTerminalProcess(params, defaultCwd, authority) {
+async function spawnTerminalProcess(params, context, authority) {
 	const directCommand = buildTerminalSpawnCommand(params.command, params.args);
 	try {
 		return {
-			proc: await spawnAndWait(directCommand, params, defaultCwd, authority),
+			proc: await spawnAndWait(directCommand, params, context, authority),
 			spawnCommand: directCommand
 		};
 	} catch (error) {
-		const fallbackCommand = params.args === void 0 && isNotFoundSpawnError(error) ? buildTerminalFallbackSpawnCommand(params.command, params.cwd ?? defaultCwd) : void 0;
+		const fallbackCommand = params.args === void 0 && isNotFoundSpawnError(error) ? buildTerminalFallbackSpawnCommand(params.command, params.cwd ?? context.cwd) : void 0;
 		if (!fallbackCommand) throw error;
 		return {
-			proc: await spawnAndWait(fallbackCommand, params, defaultCwd, authority),
+			proc: await spawnAndWait(fallbackCommand, params, context, authority),
 			spawnCommand: fallbackCommand
 		};
 	}
 }
-async function spawnAndWait(spawnCommand, params, defaultCwd, authority) {
-	const spawnOptions = buildTerminalSpawnOptions(spawnCommand.command, params.cwd ?? defaultCwd, params.env);
+async function spawnAndWait(spawnCommand, params, context, authority) {
+	const spawnOptions = buildTerminalSpawnOptions(spawnCommand.command, params.cwd ?? context.cwd, params.env, process.platform, context.inheritedEnv);
 	if (process.platform !== "win32") spawnOptions.detached = true;
 	assertControlAuthority(authority);
 	const proc = spawn(spawnCommand.command, spawnCommand.args, spawnOptions);
@@ -2397,8 +2467,7 @@ function hasLivePid(pids) {
 	}
 	return false;
 }
-//#endregion
-//#region src/acp/client.ts
+// src/acp/client.ts
 const REPLAY_IDLE_MS = 80;
 const REPLAY_DRAIN_TIMEOUT_MS = 5e3;
 const DRAIN_POLL_INTERVAL_MS = 20;
@@ -2543,6 +2612,8 @@ var AcpClient = class {
 			...options,
 			cwd: asAbsoluteCwd(options.cwd),
 			agentProcessEnv: options.agentProcessEnv ? { ...options.agentProcessEnv } : void 0,
+			agentProcessEnvAllow: snapshotEnvNames("agentProcessEnvAllow", options.agentProcessEnvAllow),
+			agentProcessEnvBlock: snapshotEnvNames("agentProcessEnvBlock", options.agentProcessEnvBlock),
 			authPolicy: options.authPolicy ?? "skip",
 			permissionPolicy: snapshotPermissionPolicy(options.permissionPolicy),
 			elicitationModes: normalizeElicitationModes(options.elicitationModes)
@@ -2564,6 +2635,7 @@ var AcpClient = class {
 		});
 		this.terminalManager = new TerminalManager({
 			cwd: this.options.cwd,
+			inheritedEnv: this.inheritedEnvPolicy(),
 			permissionMode: this.options.permissionMode,
 			nonInteractivePermissions: this.options.nonInteractivePermissions,
 			onOperation: (operation) => {
@@ -2725,7 +2797,7 @@ var AcpClient = class {
 		const configuredCommand = resolveAgentCommandParts(this.options.agentCommand, this.options.agentArgv);
 		const resolvedBuiltInLaunch = resolveBuiltInAgentLaunch(this.options.agentCommand);
 		const spawnCommand = resolvedBuiltInLaunch?.command ?? configuredCommand.command;
-		const spawnOptions = buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials, this.options.sessionOptions?.env, this.options.agentProcessEnv);
+		const spawnOptions = buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials, this.options.sessionOptions?.env, this.options.agentProcessEnv, this.inheritedEnvPolicy());
 		const commandContext = {
 			env: spawnOptions.env,
 			readOutput: async (command, args, timeoutMs, diagnostic = false) => {
@@ -3527,8 +3599,14 @@ var AcpClient = class {
 			if (agentManagedSelection) return agentManagedSelection;
 		}
 	}
+	inheritedEnvPolicy() {
+		return {
+			allow: this.options.agentProcessEnvAllow,
+			block: this.options.agentProcessEnvBlock
+		};
+	}
 	readAgentSpecificEnvCredential(methodId) {
-		if (!this.isGrokBuildAcpCommand() || methodId !== "xai.api_key") return;
+		if (!this.isGrokBuildAcpCommand() || methodId !== "xai.api_key" || !isInheritedEnvName(this.inheritedEnvPolicy(), "XAI_API_KEY")) return;
 		const value = process.env.XAI_API_KEY;
 		return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 	}
@@ -3941,8 +4019,7 @@ var AcpClient = class {
 		await this.waitForSessionUpdateDrain(options?.idleMs ?? 0, options?.timeoutMs ?? 0);
 	}
 };
-//#endregion
-//#region src/session/model-state.ts
+// src/session/model-state.ts
 function configOptionsAreAuthoritative(state) {
 	return state.model_control === "config_option";
 }
@@ -3989,8 +4066,7 @@ function applyConfigOptionsModelState(state, configOptions) {
 	else if (preservesLegacyControl) state.model_control = "legacy_set_model";
 	else clearAdvertisedModelState(state);
 }
-//#endregion
-//#region src/session/conversation-reducer.ts
+// src/session/conversation-reducer.ts
 function resolveUserMessageId(value) {
 	return typeof value === "string" ? value : value();
 }
@@ -4437,8 +4513,7 @@ function applySessionInfoUpdate(conversation, update) {
 	if (hasOwn(update, "title")) conversation.title = update.title ?? null;
 	if (hasOwn(update, "updatedAt")) conversation.updated_at = update.updatedAt ?? conversation.updated_at;
 }
-//#endregion
-//#region src/session/conversation-retention.ts
+// src/session/conversation-retention.ts
 const MAX_RUNTIME_MESSAGES = 200;
 const MAX_RUNTIME_AGENT_TEXT_CHARS = 8e3;
 const MAX_RUNTIME_THINKING_CHARS = 4e3;
@@ -4483,8 +4558,7 @@ function trimRuntimeToolResult(result) {
 	if ("Text" in result.content) result.content.Text = trimRuntimeText(result.content.Text, MAX_RUNTIME_TOOL_IO_CHARS);
 	if (typeof result.output === "string") result.output = trimRuntimeText(result.output, MAX_RUNTIME_TOOL_IO_CHARS);
 }
-//#endregion
-//#region src/session/conversation-model.ts
+// src/session/conversation-model.ts
 function isoNow() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -4516,8 +4590,7 @@ function recordClientOperation(conversation, state, _operation, timestamp = isoN
 	trimConversationForRuntime(conversation);
 	return acpx;
 }
-//#endregion
-//#region src/runtime/engine/lifecycle.ts
+// src/runtime/engine/lifecycle.ts
 function createInitialSessionRecord(params) {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
 	return {
@@ -4582,8 +4655,7 @@ function applyConversation(record, conversation) {
 	record.cumulative_cost = conversation.cumulative_cost;
 	record.request_token_usage = conversation.request_token_usage;
 }
-//#endregion
-//#region src/runtime/engine/session-options.ts
+// src/runtime/engine/session-options.ts
 function mergeSessionOptions(preferred, fallback) {
 	const merged = { ...fallback };
 	assignDefinedOption(merged, "model", preferred?.model);
@@ -4681,8 +4753,7 @@ function storedMaxTurns(value) {
 function nonEmptyString(value) {
 	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
-//#endregion
-//#region src/session/mode-preference.ts
+// src/session/mode-preference.ts
 function ensureAcpxState(state) {
 	return state ?? {};
 }
@@ -4727,8 +4798,7 @@ function syncAdvertisedModelState(record, models) {
 	applyAdvertisedModelState(acpx, models);
 	record.acpx = acpx;
 }
-//#endregion
-//#region src/session/model-application.ts
+// src/session/model-application.ts
 function currentModelIdFromSetModelResponse(response, fallbackModelId) {
 	return modelStateFromConfigOptions(response?.configOptions)?.currentModelId ?? fallbackModelId;
 }
@@ -4759,8 +4829,7 @@ async function applyRequestedModelIfAdvertised(params) {
 		response: await withTimeout(params.client.setSessionModel(params.sessionId, requestedModel, params.models, params.authority), params.timeoutMs)
 	};
 }
-//#endregion
-//#region src/session/config-options.ts
+// src/session/config-options.ts
 function applyConfigOptionsToState(state, configOptions) {
 	const acpxState = cloneSessionAcpxState(state) ?? {};
 	applyConfigOptionsModelState(acpxState, configOptions);
@@ -4824,8 +4893,7 @@ function applyConfigOptionSelection(state, configId, value, response, modelConfi
 		value
 	});
 }
-//#endregion
-//#region src/session/execution/direct-lifetime.ts
+// src/session/execution/direct-lifetime.ts
 function ownDirectClient(client, signal) {
 	let closing;
 	const cancel = async () => {
@@ -4848,8 +4916,7 @@ function ownDirectClient(client, signal) {
 function directExecutionError(error, signal) {
 	return signal?.aborted && error instanceof AgentDisconnectedError ? signal.reason : error;
 }
-//#endregion
-//#region src/runtime/engine/reconnect.ts
+// src/runtime/engine/reconnect.ts
 const SESSION_LOAD_UNSUPPORTED_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function createReplayState(authority) {
 	let failure;
@@ -5249,8 +5316,7 @@ async function createFreshRuntimeSession(client, record, timeoutMs, authority) {
 		createdFreshSession: true
 	};
 }
-//#endregion
-//#region src/runtime/engine/connected-session.ts
+// src/runtime/engine/connected-session.ts
 function createActiveSessionController(params) {
 	const getActiveSessionId = () => params.getActiveSessionId();
 	return {
@@ -5360,8 +5426,7 @@ async function withConnectedSession(options) {
 		await options.saveRecord(record).catch(() => {});
 	}
 }
-//#endregion
-//#region src/session/execution/prompt-runner.ts
+// src/session/execution/prompt-runner.ts
 function buildDirectConnectedSessionOptions(options, run) {
 	return {
 		sessionRecordId: options.sessionRecordId,
@@ -5467,8 +5532,7 @@ async function runSessionSetConfigOptionDirect(options) {
 		loadError: result.loadError
 	};
 }
-//#endregion
-//#region src/session/execution/windows-process-command.ts
+// src/session/execution/windows-process-command.ts
 function skipSeparators(value) {
 	return value.replace(/^[ \t]+/u, "");
 }
@@ -5550,8 +5614,7 @@ function splitWindowsProcessCommandLine(commandLine) {
 	}
 	return argv;
 }
-//#endregion
-//#region src/session/execution/session-control.ts
+// src/session/execution/session-control.ts
 async function cancelSessionPrompt(options) {
 	const cancelled = await tryCancelOnRunningOwner(options);
 	return {
@@ -5761,8 +5824,7 @@ async function closeSession(sessionId) {
 		await ownership[Symbol.asyncDispose]();
 	}
 }
-//#endregion
-//#region src/session/execution/session-management.ts
+// src/session/execution/session-management.ts
 async function createSessionRecordWithClient(client, options, resumedRecordId) {
 	const cwd = absolutePath(options.cwd);
 	await withTimeout(client.start({ signal: options.signal }), options.timeoutMs);
@@ -6013,8 +6075,7 @@ async function ensureSessionWithOwnership(options, cwd) {
 		created: true
 	};
 }
-//#endregion
-//#region src/perf-metrics-capture.ts
+// src/perf-metrics-capture.ts
 const PERF_METRICS_FILE_ENV = "ACPX_PERF_METRICS_FILE";
 let installed = false;
 let flushed = false;
@@ -6098,8 +6159,7 @@ function installPerfMetricsCapture(options = {}) {
 		process.once(signal, handler);
 	}
 }
-//#endregion
-//#region src/session/queue/control-admission.ts
+// src/session/queue/control-admission.ts
 var QueueControlDeadline = class {
 	controller = new AbortController();
 	admissionSignal;
@@ -6268,8 +6328,7 @@ var QueueOwnerControlAdmission = class {
 		return operation;
 	}
 };
-//#endregion
-//#region src/session/queue/owner-turn-controller.ts
+// src/session/queue/owner-turn-controller.ts
 var QueueOwnerTurnController = class {
 	state = "idle";
 	pendingCancel = false;
@@ -6330,8 +6389,7 @@ var QueueOwnerTurnController = class {
 		return cancelled;
 	}
 };
-//#endregion
-//#region src/session/execution/owned-controls.ts
+// src/session/execution/owned-controls.ts
 async function acceptControl(options, invoke, apply, deadline = new QueueControlDeadline()) {
 	deadline.assertActive();
 	const raw = invoke(deadline.authority).then(async (response) => {
@@ -6462,8 +6520,7 @@ async function runIdleOwnerControl(options, invoke) {
 		await ownership[Symbol.asyncDispose]();
 	}
 }
-//#endregion
-//#region src/session/execution/queue-owner-process.ts
+// src/session/execution/queue-owner-process.ts
 function isNonEmptyStringArray(value) {
 	return Array.isArray(value) && value.length > 0 && value.every((entry) => typeof entry === "string" && entry.length > 0);
 }
@@ -6635,8 +6692,7 @@ function spawnQueueOwnerProcess(options, queueOwnerArgs) {
 		stopStartupCapture
 	};
 }
-//#endregion
-//#region src/runtime/engine/prompt-turn.ts
+// src/runtime/engine/prompt-turn.ts
 const SESSION_REPLY_IDLE_MS = 1e3;
 const SESSION_REPLY_DRAIN_TIMEOUT_MS = 5e3;
 function responseMetaField(meta) {
@@ -6692,8 +6748,7 @@ async function runPromptTurn(params) {
 		lifetime.abort();
 	}
 }
-//#endregion
-//#region src/session/live-checkpoint.ts
+// src/session/live-checkpoint.ts
 const DEFAULT_LIVE_CHECKPOINT_INTERVAL_MS = 500;
 var LiveSessionCheckpoint = class {
 	save;
@@ -6750,8 +6805,7 @@ var LiveSessionCheckpoint = class {
 		}
 	}
 };
-//#endregion
-//#region src/session/execution/discard-output.ts
+// src/session/execution/discard-output.ts
 const DISCARD_OUTPUT_FORMATTER = {
 	setContext() {},
 	onAcpMessage() {},
@@ -6759,8 +6813,7 @@ const DISCARD_OUTPUT_FORMATTER = {
 	onPermissionEscalation() {},
 	flush() {}
 };
-//#endregion
-//#region src/session/execution/runtime.ts
+// src/session/execution/runtime.ts
 const INTERRUPT_CANCEL_WAIT_MS = 2500;
 var QueueTaskOutputFormatter = class {
 	requestId;
@@ -7709,8 +7762,7 @@ async function sendSessionDirect(options, control) {
 		await closeProvidedClient?.();
 	}
 }
-//#endregion
-//#region src/session/execution/queue-owner-runtime.ts
+// src/session/execution/queue-owner-runtime.ts
 const QUEUE_OWNER_STARTUP_MAX_ATTEMPTS = 120;
 const QUEUE_OWNER_HEARTBEAT_INTERVAL_MS = 5e3;
 const QUEUE_OWNER_ACTIVE_TURN_CANCEL_GRACE_MS = 750;
@@ -8119,7 +8171,6 @@ async function sendSession(options) {
 	}
 }
 const queueOwnerRuntimeTestInternals = { queueOwnerExitIsFatal };
-//#endregion
-export { isRequestedModelUnsupportedError as $, applyInitialModelSelection as A, reconcileAgentSessionId as B, setSessionModeOnOwner as C, connectAndLoadSession as D, withConnectedSession as E, persistSessionOptions as F, recordSessionUpdate as G, createSessionConversation as H, sessionOptionsFromRecord as I, advertisedModelState as J, trimConversationForRuntime as K, applyConversation as L, applyRequestedModelIfAdvertised as M, setDesiredModeId as N, applyConfigOptionSelection as O, normalizeSessionOptionShape as P, RequestedModelUnsupportedError as Q, applyLifecycleSnapshotToRecord as R, setSessionMode as S, setSessionModelOnOwner as T, recordClientOperation as U, cloneSessionConversation as V, recordPromptSubmission as W, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as X, AcpClient as Y, REQUESTED_MODEL_UNSUPPORTED_REASONS as Z, cancelSessionPrompt as _, runQueuedTask as a, normalizeQueueOwnerTtlMs as at, setSessionConfigOption as b, LiveSessionCheckpoint as c, listSessionEvents as ct, flushPerfMetricsCapture as d, TimeoutError as dt, resolveRequestedConfigOption as et, installPerfMetricsCapture as f, assertControlAuthority as ft, listAgentSessions as g, ensureSession as h, runOnce as i, DEFAULT_QUEUE_OWNER_TTL_MS as it, applyModelSelection as j, applyConfigOptionsToRecord as k, runPromptTurn as l, isLegacyZedCodexAcpInvocation as lt, createSessionWithClient as m, withTimeout as mt, runSessionQueueOwner as n, getAcpxVersion as nt, sendSessionDirect as o, acquireSessionImport as ot, createSession as p, withInterrupt as pt, cloneSessionAcpxState as q, sendSession as r, permissionModeSatisfies as rt, DISCARD_OUTPUT_FORMATTER as s, acquireSessionScope as st, queueOwnerRuntimeTestInternals as t, resolveRequestedModelId as tt, buildQueueOwnerArgOverride as u, InterruptedError as ut, closeSession as v, setSessionModel as w, setSessionConfigOptionOnOwner as x, sessionControlTestInternals as y, createInitialSessionRecord as z };
+export { isRequestedModelUnsupportedError as $, applyInitialModelSelection as A, reconcileAgentSessionId as B, setSessionModeOnOwner as C, connectAndLoadSession as D, withConnectedSession as E, persistSessionOptions as F, recordSessionUpdate as G, createSessionConversation as H, sessionOptionsFromRecord as I, advertisedModelState as J, trimConversationForRuntime as K, applyConversation as L, applyRequestedModelIfAdvertised as M, setDesiredModeId as N, applyConfigOptionSelection as O, normalizeSessionOptionShape as P, RequestedModelUnsupportedError as Q, applyLifecycleSnapshotToRecord as R, setSessionMode as S, setSessionModelOnOwner as T, recordClientOperation as U, cloneSessionConversation as V, recordPromptSubmission as W, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as X, AcpClient as Y, REQUESTED_MODEL_UNSUPPORTED_REASONS as Z, cancelSessionPrompt as _, runQueuedTask as a, DEFAULT_QUEUE_OWNER_TTL_MS as at, setSessionConfigOption as b, LiveSessionCheckpoint as c, acquireSessionScope as ct, flushPerfMetricsCapture as d, InterruptedError as dt, resolveRequestedConfigOption as et, installPerfMetricsCapture as f, TimeoutError as ft, listAgentSessions as g, ensureSession as h, withTimeout as ht, runOnce as i, permissionModeSatisfies as it, applyModelSelection as j, applyConfigOptionsToRecord as k, runPromptTurn as l, listSessionEvents as lt, createSessionWithClient as m, withInterrupt as mt, runSessionQueueOwner as n, getAcpxVersion as nt, sendSessionDirect as o, normalizeQueueOwnerTtlMs as ot, createSession as p, assertControlAuthority as pt, cloneSessionAcpxState as q, sendSession as r, snapshotEnvNames as rt, DISCARD_OUTPUT_FORMATTER as s, acquireSessionImport as st, queueOwnerRuntimeTestInternals as t, resolveRequestedModelId as tt, buildQueueOwnerArgOverride as u, isLegacyZedCodexAcpInvocation as ut, closeSession as v, setSessionModel as w, setSessionConfigOptionOnOwner as x, sessionControlTestInternals as y, createInitialSessionRecord as z };
 
-//# sourceMappingURL=queue-owner-runtime-Be8sr9L5.js.map
+//# sourceMappingURL=queue-owner-runtime-B0mPqOu4.js.map