@agent-vm/secret-management 0.0.94 → 0.0.96

package/dist/index.d.ts

@@ -6,6 +6,17 @@ import { ResolveAllResponse } from "@1password/sdk";
 type SecretEnvironment = Readonly<Record<string, string | undefined>>;
 declare function createCompositeSecretResolver(onePasswordResolver: SecretResolver | null, env?: SecretEnvironment): SecretResolver;
 //#endregion
+//#region src/redacted-exec-file.d.ts
+interface ExecFileOptions {
+  readonly env?: Readonly<Record<string, string | undefined>>;
+  readonly input?: string | undefined;
+  readonly redactErrorOutput?: boolean | undefined;
+}
+interface ExecFileResult {
+  readonly stdout: string;
+  readonly stderr: string;
+}
+//#endregion
 //#region src/onepassword-secret-resolver.d.ts
 interface SecretResolverClient {
   readonly secrets: {
@@ -13,10 +24,11 @@ interface SecretResolverClient {
     resolveAll(secretReferences: readonly string[]): Promise<ResolveAllResponse>;
   };
 }
+interface OnePasswordServiceAccountHeadlessAuthProbeResult {
+  readonly hint: string;
+  readonly ok: boolean;
+}
 type TokenSource = {
-  readonly type: 'op-cli';
-  readonly ref: string;
-} | {
   readonly type: 'env';
   readonly envVar?: string | undefined;
 } | {
@@ -24,15 +36,6 @@ type TokenSource = {
   readonly service: string;
   readonly account: string;
 };
-interface ExecFileOptions {
-  readonly env?: Readonly<Record<string, string | undefined>>;
-  readonly input?: string | undefined;
-  readonly redactErrorOutput?: boolean | undefined;
-}
-interface ExecFileResult {
-  readonly stdout: string;
-  readonly stderr: string;
-}
 declare function resolveServiceAccountToken(source: TokenSource, dependencies?: {
   readonly execFileAsync?: (command: string, args: readonly string[], options?: ExecFileOptions) => Promise<ExecFileResult>;
 }): Promise<string>;
@@ -46,6 +49,11 @@ interface CreateSecretResolverDependencies {
   readonly integrationName?: string;
   readonly integrationVersion?: string;
 }
+declare function probeOnePasswordServiceAccountHeadlessAuth(options: {
+  readonly serviceAccountToken: string;
+}, dependencies?: {
+  readonly execFileAsync?: (command: string, args: readonly string[], options?: ExecFileOptions) => Promise<ExecFileResult>;
+}): Promise<OnePasswordServiceAccountHeadlessAuthProbeResult>;
 declare function createSecretResolver(options: {
   readonly serviceAccountToken: string;
 }, dependencies?: CreateSecretResolverDependencies): Promise<SecretResolver>;
@@ -63,4 +71,7 @@ type OnePasswordE2eTestEnvironment = Partial<Record<'AGENT_VM_TEST_OP_REFS' | 'A
 declare const defaultOnePasswordE2eVaultPrefix = "op://agent-vm-testing/";
 declare function readOnePasswordE2eTestConfig(env?: OnePasswordE2eTestEnvironment): OnePasswordE2eTestConfig;
 //#endregion
-export { CreateSecretResolverDependencies, ExecFileOptions, ExecFileResult, MediatedSecretSpec, OnePasswordE2eTestConfig, OnePasswordE2eTestEnvironment, SecretRef, SecretResolver, SecretResolverClient, type TokenSource, createCompositeSecretResolver, createOpCliSecretResolver, createSecretResolver, createStaticSecretResolver, defaultOnePasswordE2eVaultPrefix, readOnePasswordE2eTestConfig, resolveServiceAccountToken };
+//#region src/secret-redaction.d.ts
+declare function redactOnePasswordReferences(text: string): string;
+//#endregion
+export { CreateSecretResolverDependencies, type ExecFileOptions, type ExecFileResult, MediatedSecretSpec, OnePasswordE2eTestConfig, OnePasswordE2eTestEnvironment, OnePasswordServiceAccountHeadlessAuthProbeResult, SecretRef, SecretResolver, SecretResolverClient, type TokenSource, createCompositeSecretResolver, createOpCliSecretResolver, createSecretResolver, createStaticSecretResolver, defaultOnePasswordE2eVaultPrefix, probeOnePasswordServiceAccountHeadlessAuth, readOnePasswordE2eTestConfig, redactOnePasswordReferences, resolveServiceAccountToken };

package/dist/index.js

@@ -1,8 +1,21 @@
 import "./contracts.js";
 import { createStaticSecretResolver } from "./testing.js";
-import { execFile } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { createClient } from "@1password/sdk";
+import { mkdir, mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import { execFile } from "node:child_process";
+//#region src/secret-redaction.ts
+const quotedOnePasswordReferencePattern = /(["'`])(?:(?!\1)[\s\S])*?op:\/\/(?:(?!\1)[\s\S])*?\1/giu;
+const unquotedOnePasswordReferencePattern = /op:\/\/[^\r\n]*/giu;
+function redactOnePasswordReferences(text) {
+	return text.replaceAll(quotedOnePasswordReferencePattern, (quotedReference) => {
+		const quote = quotedReference.slice(0, 1);
+		return `${quote}<1password-ref>${quote}`;
+	}).replaceAll(unquotedOnePasswordReferencePattern, "<1password-ref>");
+}
+//#endregion
 //#region src/composite-secret-resolver.ts
 function resolveEnvironmentSecret(ref, env) {
 	const value = env[ref.ref];
@@ -14,25 +27,25 @@ function resolveConfigSecret(ref) {
 	if (ref.value.trim().length === 0) throw new Error("Config secret value is empty.");
 	return ref.value;
 }
-function formatUnknownError$1(error) {
-	return error instanceof Error ? error.message : String(error);
+function formatUnknownError$2(error) {
+	return redactOnePasswordReferences(error instanceof Error ? error.message : String(error));
 }
 function describeSecretRef(ref) {
 	switch (ref.source) {
-		case "1password":
+		case "1password": return "<1password-ref>";
 		case "environment": return ref.ref;
 		case "config": return "<config>";
 		default: return JSON.stringify(ref);
 	}
 }
 function createSecretResolutionError(options) {
-	return new Error(`Failed to resolve secret '${options.secretName}' from '${describeSecretRef(options.ref)}': ${formatUnknownError$1(options.cause)}`, { cause: options.cause });
+	return new Error(`Failed to resolve secret '${options.secretName}' from '${describeSecretRef(options.ref)}': ${formatUnknownError$2(options.cause)}`, { cause: options.cause });
 }
 function throwAggregateSecretResolutionError(failures) {
 	if (failures.length > 0) throw new AggregateError(failures, `Failed to resolve ${String(failures.length)} secret(s).`);
 }
 function extractAggregateErrors(error) {
-	return (Array.isArray(error.errors) ? error.errors : [error]).map((failure) => failure instanceof Error ? failure : new Error(formatUnknownError$1(failure), { cause: failure }));
+	return (Array.isArray(error.errors) ? error.errors : [error]).map((failure) => new Error(formatUnknownError$2(failure)));
 }
 function createCompositeSecretResolver(onePasswordResolver, env = process.env) {
 	return {
@@ -102,16 +115,74 @@ function createCompositeSecretResolver(onePasswordResolver, env = process.env) {
 	};
 }
 //#endregion
-//#region src/onepassword-secret-resolver.ts
-function formatUnknownError(error) {
+//#region src/op-cli-service-account-env.ts
+const opCliProcessPlumbingEnvNames = [
+	"APPDATA",
+	"ALL_PROXY",
+	"all_proxy",
+	"COMSPEC",
+	"HOME",
+	"HTTP_PROXY",
+	"http_proxy",
+	"HTTPS_PROXY",
+	"https_proxy",
+	"LANG",
+	"LC_ALL",
+	"LC_CTYPE",
+	"LOCALAPPDATA",
+	"NO_PROXY",
+	"no_proxy",
+	"PATH",
+	"SSL_CERT_DIR",
+	"SSL_CERT_FILE",
+	"TEMP",
+	"TMP",
+	"TMPDIR",
+	"TZ",
+	"USERPROFILE",
+	"WINDIR",
+	"XDG_RUNTIME_DIR"
+];
+function createOpCliServiceAccountEnv(serviceAccountToken, opConfigDir) {
+	const env = {};
+	for (const envName of opCliProcessPlumbingEnvNames) {
+		const envValue = process.env[envName];
+		if (envValue !== void 0) env[envName] = envValue;
+	}
+	env.OP_BIOMETRIC_UNLOCK_ENABLED = "false";
+	env.OP_CACHE = "false";
+	env.OP_CONFIG_DIR = opConfigDir;
+	env.OP_SERVICE_ACCOUNT_TOKEN = serviceAccountToken;
+	return env;
+}
+async function withOpCliServiceAccountEnv(serviceAccountToken, callback) {
+	const opConfigDirParent = tmpdir();
+	await mkdir(opConfigDirParent, { recursive: true });
+	const opConfigDir = await mkdtemp(path.join(opConfigDirParent, "agent-vm-op-config-"));
+	try {
+		return await callback(createOpCliServiceAccountEnv(serviceAccountToken, opConfigDir));
+	} finally {
+		await rm(opConfigDir, {
+			force: true,
+			recursive: true
+		});
+	}
+}
+//#endregion
+//#region src/redacted-exec-file.ts
+function formatUnknownError$1(error) {
 	if (error instanceof AggregateError) {
-		const childMessages = readAggregateErrorChildren(error).map(formatUnknownError);
+		const childMessages = readAggregateErrorChildren$1(error).map(formatUnknownError$1);
 		if (childMessages.length === 0) return error.message;
 		const separator = error.message.endsWith(".") ? "" : ".";
 		return `${error.message}${separator} Details: ${childMessages.join("; ")}`;
 	}
 	return error instanceof Error ? error.message : String(error);
 }
+function readAggregateErrorChildren$1(error) {
+	const errorChildren = error.errors;
+	return Array.isArray(errorChildren) ? errorChildren : [];
+}
 var RedactedExecFileError = class extends Error {
 	safeDetail;
 	constructor(message, safeDetail, options) {
@@ -120,12 +191,6 @@ var RedactedExecFileError = class extends Error {
 		this.name = "RedactedExecFileError";
 	}
 };
-var OpInjectOutputError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "OpInjectOutputError";
-	}
-};
 function formatErrorMetadataValue(value) {
 	if (typeof value === "number" || typeof value === "string") return String(value);
 }
@@ -137,14 +202,48 @@ function readErrorSignal(error) {
 	if (!("signal" in error)) return;
 	return formatErrorMetadataValue(error.signal);
 }
-function formatRedactedExecErrorDetail(error) {
+function readErrorKilled(error) {
+	if (!("killed" in error) || typeof error.killed !== "boolean") return;
+	return error.killed;
+}
+function hasEnvironmentPrefix(env, prefix) {
+	return Object.keys(env).some((envName) => envName.startsWith(prefix));
+}
+function formatOpCliAuthContext(env) {
+	if (env === void 0) return ["opEnvIsolation=disabled", "opAuth=ambient-process"];
+	return [
+		"opEnvIsolation=enabled",
+		`opAuth=${env.OP_SERVICE_ACCOUNT_TOKEN === void 0 ? "missing" : "service-account-token"}`,
+		`opConfig=${env.OP_CONFIG_DIR === void 0 ? "default" : "isolated"}`,
+		`opBiometricUnlock=${env.OP_BIOMETRIC_UNLOCK_ENABLED ?? "unset"}`,
+		`opCache=${env.OP_CACHE ?? "unset"}`,
+		`opConnectEnv=${env.OP_CONNECT_HOST !== void 0 || env.OP_CONNECT_TOKEN !== void 0 ? "present" : "absent"}`,
+		`opSessionEnv=${hasEnvironmentPrefix(env, "OP_SESSION") ? "present" : "absent"}`,
+		`opAccountEnv=${env.OP_ACCOUNT === void 0 ? "absent" : "present"}`
+	];
+}
+function formatRedactedExecErrorDetail(options) {
+	const error = options.error;
 	const exitCode = readErrorCode(error) ?? "unknown";
 	const signal = readErrorSignal(error);
-	return signal === void 0 ? `exit code ${exitCode}` : `exit code ${exitCode}, signal ${signal}`;
+	const details = [
+		signal === void 0 ? `exit code ${exitCode}` : `exit code ${exitCode}, signal ${signal}`,
+		`elapsedMs=${String(options.elapsedMs)}`,
+		"output=redacted"
+	];
+	const killed = readErrorKilled(error);
+	if (killed !== void 0) details.push(`killed=${String(killed)}`);
+	if (options.command === "op") details.push(...formatOpCliAuthContext(options.env));
+	return details.join("; ");
 }
 function createExecFileError(options) {
 	if (options.redactErrorOutput) {
-		const safeDetail = formatRedactedExecErrorDetail(options.error);
+		const safeDetail = formatRedactedExecErrorDetail({
+			command: options.command,
+			elapsedMs: options.elapsedMs,
+			...options.env ? { env: options.env } : {},
+			error: options.error
+		});
 		return new RedactedExecFileError(`${options.command} failed: ${safeDetail}`, safeDetail);
 	}
 	const errorDetail = options.stderr.trim() || options.error.message;
@@ -157,15 +256,13 @@ function formatStdinWriteErrorDetail(error) {
 function createStdinWriteError(command, error, redactErrorOutput) {
 	if (redactErrorOutput) {
 		const safeDetail = formatStdinWriteErrorDetail(error);
-		return new RedactedExecFileError(`${command} failed writing stdin: ${safeDetail}`, safeDetail, { cause: error });
+		return new RedactedExecFileError(`${command} failed writing stdin: ${safeDetail}`, safeDetail);
 	}
-	return new Error(`${command} failed writing stdin: ${formatUnknownError(error)}`, { cause: error });
-}
-function ensureMacOsForKeychain() {
-	if (process.platform !== "darwin") throw new Error("Keychain token source is only supported on macOS. Use an env or op-cli token source on this platform so cmd-ts can surface a clear startup error.");
+	return new Error(`${command} failed writing stdin: ${formatUnknownError$1(error)}`, { cause: error });
 }
 function execFileAsync(command, args, options) {
 	return new Promise((resolve, reject) => {
+		const startedAtMs = Date.now();
 		let hasSettled = false;
 		const rejectOnce = (error) => {
 			if (hasSettled) return;
@@ -184,6 +281,8 @@ function execFileAsync(command, args, options) {
 			if (error) {
 				rejectOnce(createExecFileError({
 					command,
+					elapsedMs: Date.now() - startedAtMs,
+					env: options?.env,
 					error,
 					redactErrorOutput: options?.redactErrorOutput,
 					stderr
@@ -209,15 +308,39 @@ function execFileAsync(command, args, options) {
 		}
 	});
 }
+//#endregion
+//#region src/onepassword-secret-resolver.ts
+function formatUnknownError(error) {
+	if (error instanceof AggregateError) {
+		const childMessages = readAggregateErrorChildren(error).map(formatUnknownError);
+		if (childMessages.length === 0) return error.message;
+		const separator = error.message.endsWith(".") ? "" : ".";
+		return `${error.message}${separator} Details: ${childMessages.join("; ")}`;
+	}
+	return error instanceof Error ? error.message : String(error);
+}
+function redactKnownSecretValues(message, secretValues) {
+	return secretValues.reduce((redactedMessage, secretValue) => {
+		if (secretValue.length === 0) return redactedMessage;
+		return redactedMessage.replaceAll(secretValue, "<redacted>");
+	}, message);
+}
+function formatUnknownErrorWithRedactions(error, secretValues) {
+	return redactOnePasswordReferences(redactKnownSecretValues(formatUnknownError(error), secretValues));
+}
+var OpInjectOutputError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "OpInjectOutputError";
+	}
+};
+function ensureMacOsForKeychain() {
+	if (process.platform !== "darwin") throw new Error("Keychain token source is only supported on macOS. Use an env token source on this platform so cmd-ts can surface a clear startup error.");
+}
 const SAFE_IDENTIFIER_PATTERN = /^[\w.@-]+$/u;
 async function resolveServiceAccountToken(source, dependencies) {
 	const exec = dependencies?.execFileAsync ?? execFileAsync;
 	switch (source.type) {
-		case "op-cli": {
-			const token = (await exec("op", ["read", source.ref], { redactErrorOutput: true })).stdout.trim();
-			if (token.length === 0) throw new Error("op-cli token resolution returned empty value");
-			return token;
-		}
 		case "env": {
 			const envVar = source.envVar ?? "OP_SERVICE_ACCOUNT_TOKEN";
 			const token = process.env[envVar]?.trim();
@@ -277,54 +400,43 @@ function mergeResolvedSecrets(resolvedSecrets, onePasswordSecrets) {
 	};
 }
 async function resolveSecretWithOpCli(serviceAccountToken, secretReference, exec) {
-	return stripOpReadStdoutTerminator((await exec("op", ["read", secretReference], {
-		env: createOpCliServiceAccountEnv(serviceAccountToken),
-		redactErrorOutput: true
-	})).stdout);
+	return await withOpCliServiceAccountEnv(serviceAccountToken, async (env) => {
+		return stripOpReadStdoutTerminator((await exec("op", ["read", secretReference], {
+			env,
+			redactErrorOutput: true
+		})).stdout);
+	});
 }
 function stripOpReadStdoutTerminator(stdout) {
 	if (stdout.endsWith("\r\n")) return stdout.slice(0, -2);
 	if (stdout.endsWith("\n")) return stdout.slice(0, -1);
 	return stdout;
 }
-const opCliProcessPlumbingEnvNames = [
-	"APPDATA",
-	"ALL_PROXY",
-	"all_proxy",
-	"COMSPEC",
-	"HOME",
-	"HTTP_PROXY",
-	"http_proxy",
-	"HTTPS_PROXY",
-	"https_proxy",
-	"LANG",
-	"LC_ALL",
-	"LC_CTYPE",
-	"LOCALAPPDATA",
-	"NO_PROXY",
-	"no_proxy",
-	"PATH",
-	"SSL_CERT_DIR",
-	"SSL_CERT_FILE",
-	"TEMP",
-	"TMP",
-	"TMPDIR",
-	"TZ",
-	"USERPROFILE",
-	"WINDIR",
-	"XDG_CACHE_HOME",
-	"XDG_CONFIG_HOME",
-	"XDG_DATA_HOME",
-	"XDG_RUNTIME_DIR"
-];
-function createOpCliServiceAccountEnv(serviceAccountToken) {
-	const env = {};
-	for (const envName of opCliProcessPlumbingEnvNames) {
-		const envValue = process.env[envName];
-		if (envValue !== void 0) env[envName] = envValue;
+function opWhoamiReportsServiceAccount(stdout) {
+	return /^User Type:\s*SERVICE_ACCOUNT\s*$/imu.test(stdout);
+}
+async function probeOnePasswordServiceAccountHeadlessAuth(options, dependencies = {}) {
+	const exec = dependencies.execFileAsync ?? execFileAsync;
+	try {
+		return await withOpCliServiceAccountEnv(options.serviceAccountToken, async (env) => {
+			if (opWhoamiReportsServiceAccount((await exec("op", ["whoami"], {
+				env,
+				redactErrorOutput: true
+			})).stdout)) return {
+				hint: "op whoami returned SERVICE_ACCOUNT with isolated service-account env",
+				ok: true
+			};
+			return {
+				hint: "op whoami did not report SERVICE_ACCOUNT with isolated service-account env",
+				ok: false
+			};
+		});
+	} catch (error) {
+		return {
+			hint: `op whoami failed with isolated service-account env: ${formatUnknownErrorWithRedactions(error, [options.serviceAccountToken])}`,
+			ok: false
+		};
 	}
-	env.OP_SERVICE_ACCOUNT_TOKEN = serviceAccountToken;
-	return env;
 }
 const opInjectTemplateDelimiterPattern = /(?:\{\{|\}\})/u;
 function assertOpInjectTemplateSafeReference(entry) {
@@ -343,18 +455,21 @@ function createAggregateErrorWithCause(options) {
 	aggregateError.cause = options.cause;
 	return aggregateError;
 }
-function createFallbackStageError(stage, error) {
-	return new Error(`${stage} failed before op CLI fallback: ${formatUnknownError(error)}`, { cause: error });
+function createFallbackStageError(stage, error, secretValues = []) {
+	const message = `${stage} failed before op CLI fallback: ${formatUnknownErrorWithRedactions(error, secretValues)}`;
+	return secretValues.length === 0 ? new Error(message, { cause: error }) : new Error(message);
 }
 function createFallbackFailureError(options) {
+	const fallbackMessage = formatUnknownErrorWithRedactions(options.fallbackError, options.secretValues ?? []);
+	const redactedFallbackError = options.secretValues === void 0 || options.secretValues.length === 0 ? new Error(fallbackMessage, { cause: options.fallbackError }) : new Error(fallbackMessage);
 	if (options.fallbackError instanceof AggregateError) return createAggregateErrorWithCause({
-		cause: options.fallbackError,
-		errors: [options.stageError, ...readAggregateErrorChildren(options.fallbackError)],
-		message: options.fallbackError.message
+		cause: redactedFallbackError,
+		errors: [options.stageError, redactedFallbackError],
+		message: fallbackMessage
 	});
 	return createAggregateErrorWithCause({
-		cause: options.fallbackError,
-		errors: [options.stageError, options.fallbackError],
+		cause: redactedFallbackError,
+		errors: [options.stageError, redactedFallbackError],
 		message: options.message
 	});
 }
@@ -383,8 +498,8 @@ function buildOpInjectTemplate(entries) {
 }
 function findUniqueOpInjectMarker(options) {
 	const markerIndex = options.output.indexOf(options.marker);
-	if (markerIndex === -1) throw new OpInjectOutputError(`op inject output omitted ${options.markerDescription} marker for secret '${options.secretName}' (${options.secretReference}).`);
-	if (options.output.indexOf(options.marker, markerIndex + options.marker.length) !== -1) throw new OpInjectOutputError(`op inject output for secret '${options.secretName}' (${options.secretReference}) contained repeated ${options.markerDescription} marker.`);
+	if (markerIndex === -1) throw new OpInjectOutputError(`op inject output omitted ${options.markerDescription} marker for secret '${options.secretName}'.`);
+	if (options.output.indexOf(options.marker, markerIndex + options.marker.length) !== -1) throw new OpInjectOutputError(`op inject output for secret '${options.secretName}' contained repeated ${options.markerDescription} marker.`);
 	return markerIndex;
 }
 function extractInjectedSecret(options) {
@@ -394,15 +509,13 @@ function extractInjectedSecret(options) {
 		marker: startToken,
 		markerDescription: "start",
 		output: options.output,
-		secretName: options.entry.secretName,
-		secretReference: options.entry.secretRef.ref
+		secretName: options.entry.secretName
 	}) + startToken.length;
 	const secretEndIndex = findUniqueOpInjectMarker({
 		marker: endToken,
 		markerDescription: "end",
 		output: options.output,
-		secretName: options.entry.secretName,
-		secretReference: options.entry.secretRef.ref
+		secretName: options.entry.secretName
 	});
 	return options.output.slice(secretStartIndex, secretEndIndex);
 }
@@ -415,25 +528,27 @@ function mapOpInjectOutput(entries, output) {
 async function resolveAllSecretsWithOpInject(serviceAccountToken, refs, exec) {
 	const entries = createOpInjectEntries(refs);
 	if (entries.length === 0) return {};
-	return mapOpInjectOutput(entries, (await exec("op", [
-		"inject",
-		"--in-file",
-		"/dev/stdin"
-	], {
-		env: createOpCliServiceAccountEnv(serviceAccountToken),
-		input: buildOpInjectTemplate(entries),
-		redactErrorOutput: true
-	})).stdout);
+	return await withOpCliServiceAccountEnv(serviceAccountToken, async (env) => {
+		return mapOpInjectOutput(entries, (await exec("op", [
+			"inject",
+			"--in-file",
+			"/dev/stdin"
+		], {
+			env,
+			input: buildOpInjectTemplate(entries),
+			redactErrorOutput: true
+		})).stdout);
+	});
 }
 function formatResolveReferenceError(error) {
 	return "message" in error && typeof error.message === "string" ? `${error.type}: ${error.message}` : error.type;
 }
 function readSdkBatchSecret(options) {
 	const individualResponse = options.response.individualResponses[options.secretReference];
-	if (!individualResponse) throw new Error(`1Password SDK resolveAll response omitted '${options.secretName}' (${options.secretReference}).`);
+	if (!individualResponse) throw new Error(`1Password SDK resolveAll response omitted '${options.secretName}'.`);
 	if (individualResponse.content !== void 0) return individualResponse.content.secret;
-	if (individualResponse.error !== void 0) throw new Error(`1Password SDK resolveAll failed for '${options.secretName}' (${options.secretReference}): ${formatResolveReferenceError(individualResponse.error)}`);
-	throw new Error(`1Password SDK resolveAll returned neither content nor error for '${options.secretName}' (${options.secretReference}).`);
+	if (individualResponse.error !== void 0) throw new Error(`1Password SDK resolveAll failed for '${options.secretName}': ${formatResolveReferenceError(individualResponse.error)}`);
+	throw new Error(`1Password SDK resolveAll returned neither content nor error for '${options.secretName}'.`);
 }
 function mapSdkResolveAllResponse(refs, response) {
 	return Object.fromEntries(Object.entries(refs).map(([secretName, secretRef]) => [secretName, readSdkBatchSecret({
@@ -461,13 +576,14 @@ async function createSecretResolver(options, dependencies = {}) {
 				try {
 					return await client.secrets.resolve(ref.ref);
 				} catch (error) {
-					const sdkResolveError = createFallbackStageError("1Password SDK resolve", error);
+					const sdkResolveError = createFallbackStageError("1Password SDK resolve", error, [options.serviceAccountToken]);
 					try {
 						return await resolveSecretWithOpCli(options.serviceAccountToken, ref.ref, exec);
 					} catch (fallbackError) {
 						throw createFallbackFailureError({
 							fallbackError,
 							message: "1Password SDK resolve and op CLI fallback both failed.",
+							secretValues: [options.serviceAccountToken],
 							stageError: sdkResolveError
 						});
 					}
@@ -480,13 +596,14 @@ async function createSecretResolver(options, dependencies = {}) {
 					const response = await client.secrets.resolveAll(Object.values(splitRefs.onePasswordRefs).map((secretRef) => secretRef.ref));
 					return mergeResolvedSecrets(splitRefs.resolvedSecrets, mapSdkResolveAllResponse(splitRefs.onePasswordRefs, response));
 				} catch (error) {
-					const sdkResolveAllError = createFallbackStageError("1Password SDK resolveAll", error);
+					const sdkResolveAllError = createFallbackStageError("1Password SDK resolveAll", error, [options.serviceAccountToken]);
 					try {
 						return mergeResolvedSecrets(splitRefs.resolvedSecrets, await resolveAllSecretsWithOpCli(options.serviceAccountToken, splitRefs.onePasswordRefs, exec));
 					} catch (fallbackError) {
 						throw createFallbackFailureError({
 							fallbackError,
 							message: "1Password SDK resolveAll and op CLI fallback both failed.",
+							secretValues: [options.serviceAccountToken],
 							stageError: sdkResolveAllError
 						});
 					}
@@ -494,7 +611,7 @@ async function createSecretResolver(options, dependencies = {}) {
 			}
 		};
 	} catch (error) {
-		const sdkClientCreationError = createFallbackStageError("1Password SDK client creation", error);
+		const sdkClientCreationError = createFallbackStageError("1Password SDK client creation", error, [options.serviceAccountToken]);
 		return {
 			resolve: async (ref) => {
 				switch (ref.source) {
@@ -509,6 +626,7 @@ async function createSecretResolver(options, dependencies = {}) {
 					throw createFallbackFailureError({
 						fallbackError,
 						message: "1Password SDK client creation and op CLI fallback both failed.",
+						secretValues: [options.serviceAccountToken],
 						stageError: sdkClientCreationError
 					});
 				}
@@ -522,6 +640,7 @@ async function createSecretResolver(options, dependencies = {}) {
 					throw createFallbackFailureError({
 						fallbackError,
 						message: "1Password SDK client creation and op CLI fallback both failed.",
+						secretValues: [options.serviceAccountToken],
 						stageError: sdkClientCreationError
 					});
 				}
@@ -571,4 +690,4 @@ function readOnePasswordE2eTestConfig(env = process.env) {
 	};
 }
 //#endregion
-export { createCompositeSecretResolver, createOpCliSecretResolver, createSecretResolver, createStaticSecretResolver, defaultOnePasswordE2eVaultPrefix, readOnePasswordE2eTestConfig, resolveServiceAccountToken };
+export { createCompositeSecretResolver, createOpCliSecretResolver, createSecretResolver, createStaticSecretResolver, defaultOnePasswordE2eVaultPrefix, probeOnePasswordServiceAccountHeadlessAuth, readOnePasswordE2eTestConfig, redactOnePasswordReferences, resolveServiceAccountToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-vm/secret-management",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "description": "Shared secret reference contracts and resolvers for agent-vm packages.",
   "homepage": "https://github.com/ShravanSunder/agent-vm#readme",
   "bugs": {