acpx 0.20.0 → 0.21.0

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

@@ -1293,6 +1293,91 @@ function resolveClaudeCodeExecutable(platform = process.platform, env = process.
 	return resolveWindowsExecutablePath("claude", env, cwd);
 }
 //#endregion
+//#region 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;
+}
+//#endregion
 //#region src/acp/auth-env.ts
 const AUTH_ENV_PREFIX = "ACPX_AUTH_";
 function toEnvToken(value) {
@@ -1344,9 +1429,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 +1481,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",
@@ -1896,14 +1981,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 +2040,7 @@ function waitMs(ms) {
 function onStreamError() {}
 var TerminalManager = class {
 	cwd;
+	inheritedEnv;
 	permissionMode;
 	nonInteractivePermissions;
 	onOperation;
@@ -1968,6 +2054,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 +2091,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 +2362,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);
@@ -2543,6 +2633,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 +2656,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 +2818,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 +3620,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;
 	}
@@ -8120,6 +8219,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-CNrWkR8J.js.map