@psnext/slingcli 2.5.20260615-2 → 2.5.20260617-2

package/node_modules/@aws-sdk/nested-clients/node_modules/@smithy/node-http-handler/dist-cjs/index.js

@@ -1,9 +1,7 @@
-'use strict';
-
-var protocols = require('@smithy/core/protocols');
-var node_https = require('node:https');
-var node_stream = require('node:stream');
-var http2 = require('node:http2');
+const { buildQueryString, HttpResponse } = require("@smithy/core/protocols");
+const node_https = require("node:https");
+const { Readable, Writable } = require("node:stream");
+const http2 = require("node:http2");
 
 function buildAbortError(abortSignal) {
     const reason = abortSignal && typeof abortSignal === "object" && "reason" in abortSignal
@@ -175,7 +173,7 @@ async function writeRequestBody(httpRequest, request, maxContinueTimeoutMs = MIN
     }
 }
 function writeBody(httpRequest, body) {
-    if (body instanceof node_stream.Readable) {
+    if (body instanceof Readable) {
         body.pipe(httpRequest);
         return;
     }
@@ -311,7 +309,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
             socketWarningTimeoutId = timing.setTimeout(() => {
                 this.socketWarningTimestamp = NodeHttpHandler.checkSocketUsage(agent, this.socketWarningTimestamp, config.logger);
             }, config.socketAcquisitionWarningTimeout ?? (config.requestTimeout ?? 2000) + (config.connectionTimeout ?? 1000));
-            const queryString = request.query ? protocols.buildQueryString(request.query) : "";
+            const queryString = request.query ? buildQueryString(request.query) : "";
             let auth = undefined;
             if (request.username != null || request.password != null) {
                 const username = request.username ?? "";
@@ -343,7 +341,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
             };
             const requestFunc = isSSL ? node_https.request : hRequest;
             const req = requestFunc(nodeHttpsOptions, (res) => {
-                const httpResponse = new protocols.HttpResponse({
+                const httpResponse = new HttpResponse({
                     statusCode: res.statusCode || -1,
                     reason: res.statusMessage,
                     headers: getTransformedHeaders(res.headers),
@@ -414,7 +412,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
             socketAcquisitionWarningTimeout,
             throwOnRequestTimeout,
             httpAgentProvider: async () => {
-                const node_http = await import('node:http');
+                const node_http = require('node:http');
                 const { Agent, request } = node_http.default ?? node_http;
                 hRequest = request;
                 hAgent = Agent;
@@ -752,7 +750,7 @@ class NodeHttp2Handler {
                 fulfilled = true;
                 reject(err);
             };
-            const queryString = query ? protocols.buildQueryString(query) : "";
+            const queryString = query ? buildQueryString(query) : "";
             let path = request.path;
             if (queryString) {
                 path += `?${queryString}`;
@@ -796,7 +794,7 @@ class NodeHttp2Handler {
                 rejectWithDestroy(new Error(`HTTP/2 stream is abnormally aborted in mid-communication with result code ${clientHttp2Stream.rstCode}.`));
             });
             clientHttp2Stream.on("response", (headers) => {
-                const httpResponse = new protocols.HttpResponse({
+                const httpResponse = new HttpResponse({
                     statusCode: headers[":status"] ?? -1,
                     headers: getTransformedHeaders(headers),
                     body: clientHttp2Stream,
@@ -835,7 +833,7 @@ class NodeHttp2Handler {
     }
 }
 
-class Collector extends node_stream.Writable {
+class Collector extends Writable {
     bufferedBytes = [];
     _write(chunk, encoding, callback) {
         this.bufferedBytes.push(chunk);

package/node_modules/@aws-sdk/nested-clients/node_modules/@smithy/node-http-handler/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@smithy/node-http-handler",
-  "version": "4.7.8",
+  "version": "4.8.0",
   "description": "Provides a way to make requests",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es:cjs'",
-    "build:es:cjs": "yarn g:tsc -p tsconfig.es.json && node ../../scripts/inline",
-    "build:types": "yarn g:tsc -p tsconfig.types.json",
+    "build:es:cjs": "premove dist-es && yarn g:tsc -p tsconfig.es.json && node ../../scripts/inline",
+    "build:types": "premove dist-types && yarn g:tsc -p tsconfig.types.json",
     "build:types:downlevel": "premove dist-types/ts3.4 && downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types *.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "extract:docs": "api-extractor run --local",
     "format": "prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write \"**/*.{ts,md,json}\"",
     "lint": "eslint -c ../../.eslintrc.js \"src/**/*.ts\"",
@@ -26,12 +26,12 @@
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "dependencies": {
-    "@smithy/core": "^3.24.7",
-    "@smithy/types": "^4.14.4",
+    "@smithy/core": "^3.25.0",
+    "@smithy/types": "^4.15.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@smithy/abort-controller": "^4.2.17",
+    "@smithy/abort-controller": "^4.3.0",
     "@types/node": "^18.11.9",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",

package/node_modules/@aws-sdk/nested-clients/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@aws-sdk/nested-clients",
-  "version": "3.997.20",
+  "version": "3.997.21",
   "description": "Nested clients for AWS SDK packages.",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "scripts": {
-    "build": "yarn lint && concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
+    "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline",
-    "build:es": "tsc -p tsconfig.es.json",
+    "build:es": "premove dist-es && tsc -p tsconfig.es.json",
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
-    "build:types": "tsc -p tsconfig.types.json",
+    "build:types": "premove dist-types && tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "lint": "node ../../scripts/validation/submodules-linter.js",
+    "prebuild": "yarn lint",
     "test": "yarn g:vitest run",
     "test:watch": "yarn g:vitest watch"
   },
@@ -29,9 +30,9 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "5.2.0",
-    "@aws-sdk/core": "^3.974.20",
-    "@aws-sdk/signature-v4-multi-region": "^3.996.34",
-    "@aws-sdk/types": "^3.973.12",
+    "@aws-sdk/core": "^3.974.21",
+    "@aws-sdk/signature-v4-multi-region": "^3.996.35",
+    "@aws-sdk/types": "^3.973.13",
     "@smithy/core": "^3.24.6",
     "@smithy/fetch-http-handler": "^5.4.6",
     "@smithy/node-http-handler": "^4.7.6",

package/node_modules/@aws-sdk/signature-v4-multi-region/dist-cjs/index.js

@@ -1,6 +1,4 @@
-'use strict';
-
-var signatureV4 = require('@smithy/signature-v4');
+const { SignatureV4, signatureV4aContainer } = require("@smithy/signature-v4");
 
 const signatureV4CrtContainer = {
     CrtSignerV4: null,
@@ -8,7 +6,7 @@ const signatureV4CrtContainer = {
 
 const SESSION_TOKEN_QUERY_PARAM = "X-Amz-S3session-Token";
 const SESSION_TOKEN_HEADER = SESSION_TOKEN_QUERY_PARAM.toLowerCase();
-class SignatureV4SignWithCredentials extends signatureV4.SignatureV4 {
+class SignatureV4SignWithCredentials extends SignatureV4 {
     async signWithCredentials(requestToSign, credentials, options) {
         const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
         requestToSign.headers[SESSION_TOKEN_HEADER] = credentials.sessionToken;
@@ -50,7 +48,7 @@ class SignatureV4MultiRegion {
         if (typeof signatureV4CrtContainer.CrtSignerV4 === "function") {
             return "crt";
         }
-        else if (typeof signatureV4.signatureV4aContainer.SignatureV4a === "function") {
+        else if (typeof signatureV4aContainer.SignatureV4a === "function") {
             return "js";
         }
         return "none";
@@ -108,7 +106,7 @@ class SignatureV4MultiRegion {
     getSigv4aSigner() {
         if (!this.sigv4aSigner) {
             const CrtSignerV4 = signatureV4CrtContainer.CrtSignerV4;
-            const JsSigV4aSigner = signatureV4.signatureV4aContainer.SignatureV4a;
+            const JsSigV4aSigner = signatureV4aContainer.SignatureV4a;
             if (this.signerOptions.runtime === "node") {
                 if (!CrtSignerV4 && !JsSigV4aSigner) {
                     throw new Error("Neither CRT nor JS SigV4a implementation is available. " +

package/node_modules/@aws-sdk/signature-v4-multi-region/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@aws-sdk/signature-v4-multi-region",
-  "version": "3.996.34",
+  "version": "3.996.35",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:browser": "node ./test-browser/browser-build/esbuild",
     "build:cjs": "node ../../scripts/compilation/inline",
-    "build:es": "tsc -p tsconfig.es.json",
+    "build:es": "premove dist-es && tsc -p tsconfig.es.json",
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
-    "build:types": "tsc -p tsconfig.types.json",
+    "build:types": "premove dist-types && tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "test": "yarn g:vitest run",
     "test:watch": "yarn g:vitest watch",
     "test:e2e": "yarn g:vitest run -c vitest.config.e2e.mts",
@@ -26,7 +26,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/types": "^3.973.12",
+    "@aws-sdk/types": "^3.973.13",
     "@smithy/signature-v4": "^5.4.6",
     "@smithy/types": "^4.14.3",
     "tslib": "^2.6.2"

package/node_modules/@aws-sdk/types/dist-cjs/index.js

@@ -1,13 +1,12 @@
-'use strict';
+const { EndpointURLScheme, HttpAuthLocation, RequestHandlerProtocol } = require("@smithy/types");
+exports.EndpointURLScheme = EndpointURLScheme;
+exports.HttpAuthLocation = HttpAuthLocation;
+exports.RequestHandlerProtocol = RequestHandlerProtocol;
 
-var types = require('@smithy/types');
-
-exports.HostAddressType = void 0;
+var HostAddressType;
 (function (HostAddressType) {
     HostAddressType["AAAA"] = "AAAA";
     HostAddressType["A"] = "A";
-})(exports.HostAddressType || (exports.HostAddressType = {}));
+})(HostAddressType || (HostAddressType = {}));
 
-exports.EndpointURLScheme = types.EndpointURLScheme;
-exports.HttpAuthLocation = types.HttpAuthLocation;
-exports.RequestHandlerProtocol = types.RequestHandlerProtocol;
+exports.HostAddressType = HostAddressType;

package/node_modules/@aws-sdk/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/types",
-  "version": "3.973.12",
+  "version": "3.973.13",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
@@ -8,11 +8,11 @@
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline",
-    "build:es": "tsc -p tsconfig.es.json",
+    "build:es": "premove dist-es && tsc -p tsconfig.es.json",
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
-    "build:types": "tsc -p tsconfig.types.json",
+    "build:types": "premove dist-types && tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "extract:docs": "api-extractor run --local",
     "test": "tsc -p tsconfig.test.json"
   },

package/node_modules/@aws-sdk/util-locate-window/dist-cjs/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const fallbackWindow = {};
 function locateWindow() {
     if (typeof window !== "undefined") {

package/node_modules/@aws-sdk/util-locate-window/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@aws-sdk/util-locate-window",
-  "version": "3.965.7",
+  "version": "3.965.8",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline",
-    "build:es": "tsc -p tsconfig.es.json",
+    "build:es": "premove dist-es && tsc -p tsconfig.es.json",
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
-    "build:types": "tsc -p tsconfig.types.json",
+    "build:types": "premove dist-types && tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "test": "yarn g:vitest run",
     "test:watch": "yarn g:vitest watch"
   },

package/node_modules/@aws-sdk/xml-builder/dist-cjs/index.js

@@ -1,6 +1,5 @@
-'use strict';
-
-var xmlParser = require('./xml-parser');
+const { parseXML } = require("./xml-parser");
+exports.parseXML = parseXML;
 
 const ATTR_ESCAPE_RE = /[&<>"]/g;
 const ATTR_ESCAPE_MAP = {
@@ -126,6 +125,5 @@ class XmlNode {
     }
 }
 
-exports.parseXML = xmlParser.parseXML;
 exports.XmlNode = XmlNode;
 exports.XmlText = XmlText;

package/node_modules/@aws-sdk/xml-builder/dist-cjs/xml-external/nodable_entities.js

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityDecoderImpl = exports.CURRENCY = exports.COMMON_HTML = exports.XML = void 0;
-exports.XML = {
+const XML = {
     amp: "&",
     apos: "'",
     gt: ">",
     lt: "<",
     quot: '"',
 };
+exports.XML = XML;
 exports.COMMON_HTML = {
     nbsp: "\u00a0",
     copy: "\u00a9",
@@ -110,7 +108,7 @@ function parseNCRConfig(ncr) {
     const clampedNull = Math.max(nullLevel, NCR_LEVEL.remove);
     return { xmlVersion, onLevel, nullLevel: clampedNull };
 }
-const EntityDecoderImpl = class EntityDecoderImpl {
+exports.EntityDecoderImpl = class EntityDecoderImpl {
     _limit;
     _maxTotalExpansions;
     _maxExpandedLength;
@@ -134,7 +132,7 @@ const EntityDecoderImpl = class EntityDecoderImpl {
         this._postCheck = typeof options.postCheck === "function" ? options.postCheck : (r) => r;
         this._limitTiers = parseLimitTiers(this._limit.applyLimitsTo ?? LIMIT_TIER_EXTERNAL);
         this._numericAllowed = options.numericAllowed ?? true;
-        this._baseMap = mergeEntityMaps(exports.XML, options.namedEntities || null);
+        this._baseMap = mergeEntityMaps(XML, options.namedEntities || null);
         this._externalMap = Object.create(null);
         this._inputMap = Object.create(null);
         this._totalExpansions = 0;
@@ -333,4 +331,3 @@ const EntityDecoderImpl = class EntityDecoderImpl {
         return this._applyNCRAction(effective, token, cp);
     }
 };
-exports.EntityDecoderImpl = EntityDecoderImpl;

package/node_modules/@aws-sdk/xml-builder/dist-cjs/xml-parser.browser.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseXML = parseXML;
 let parser;
-function parseXML(xmlString) {
+exports.parseXML = function parseXML(xmlString) {
     if (!parser) {
         parser = new DOMParser();
     }
@@ -57,4 +54,4 @@ function parseXML(xmlString) {
     return {
         [xmlDocument.documentElement.nodeName]: xmlToObj(xmlDocument.documentElement),
     };
-}
+};

package/node_modules/@aws-sdk/xml-builder/dist-cjs/xml-parser.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseXML = parseXML;
-const fast_xml_parser_1 = require("fast-xml-parser");
-const nodable_entities_1 = require("./xml-external/nodable_entities");
-const entityDecoder = new nodable_entities_1.EntityDecoderImpl({
-    namedEntities: { ...nodable_entities_1.XML, ...nodable_entities_1.COMMON_HTML, ...nodable_entities_1.CURRENCY },
+const { XMLParser } = require("fast-xml-parser");
+const { COMMON_HTML, CURRENCY, EntityDecoderImpl, XML } = require("./xml-external/nodable_entities");
+const entityDecoder = new EntityDecoderImpl({
+    namedEntities: { ...XML, ...COMMON_HTML, ...CURRENCY },
     numericAllowed: true,
     limit: {
         maxTotalExpansions: Infinity,
@@ -13,7 +10,7 @@ const entityDecoder = new nodable_entities_1.EntityDecoderImpl({
         xmlVersion: 1.1,
     },
 });
-const parser = new fast_xml_parser_1.XMLParser({
+const parser = new XMLParser({
     attributeNamePrefix: "",
     processEntities: {
         enabled: true,
@@ -42,6 +39,6 @@ const parser = new fast_xml_parser_1.XMLParser({
     tagValueProcessor: (_, val) => (val.trim() === "" && val.includes("\n") ? "" : undefined),
     maxNestedTags: Infinity,
 });
-function parseXML(xmlString) {
+exports.parseXML = function parseXML(xmlString) {
     return parser.parse(xmlString, true);
-}
+};

package/node_modules/@aws-sdk/xml-builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/xml-builder",
-  "version": "3.972.29",
+  "version": "3.972.30",
   "description": "XML utilities for the AWS SDK",
   "dependencies": {
     "@smithy/types": "^4.14.3",
@@ -10,11 +10,11 @@
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:cjs": "node ../../scripts/compilation/inline",
-    "build:es": "tsc -p tsconfig.es.json",
+    "build:es": "premove dist-es && tsc -p tsconfig.es.json",
     "build:include:deps": "yarn g:turbo run build -F=\"$npm_package_name\"",
-    "build:types": "tsc -p tsconfig.types.json",
+    "build:types": "premove dist-types && tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
-    "clean": "premove dist-cjs dist-es dist-types tsconfig.cjs.tsbuildinfo tsconfig.es.tsbuildinfo tsconfig.types.tsbuildinfo",
+    "clean": "premove dist-cjs dist-es dist-types",
     "test": "yarn g:vitest run",
     "test:watch": "yarn g:vitest watch"
   },

package/node_modules/@earendil-works/pi-agent-core/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@earendil-works/pi-agent-core",
-	"version": "0.79.3",
+	"version": "0.79.6",
 	"description": "General-purpose agent with transport abstraction, state management, and attachment support",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -29,7 +29,7 @@
 		"prepublishOnly": "npm run clean && npm run build"
 	},
 	"dependencies": {
-		"@earendil-works/pi-ai": "^0.79.3",
+		"@earendil-works/pi-ai": "^0.79.6",
 		"ignore": "7.0.5",
 		"typebox": "1.1.38",
 		"yaml": "2.9.0"

package/node_modules/@earendil-works/pi-ai/dist/env-api-keys.js

@@ -26,40 +26,13 @@ if (typeof process !== "undefined" && (process.versions?.node || process.version
         _join = m.join;
     });
 }
-let _procEnvCache = null;
-/**
- * Fallback for https://github.com/oven-sh/bun/issues/27802
- * Bun compiled binaries have an empty `process.env` inside sandbox
- * environments on Linux. We can recover the env from `/proc/self/environ`.
- */
-function getProcEnv(key) {
-    if (!process.versions?.bun)
-        return undefined;
-    if (typeof process === "undefined")
-        return undefined;
-    // If process.env already has entries, the bug is not triggered.
-    if (Object.keys(process.env).length > 0)
-        return undefined;
-    if (_procEnvCache === null) {
-        _procEnvCache = new Map();
-        try {
-            const { readFileSync } = require("node:fs");
-            const data = readFileSync("/proc/self/environ", "utf-8");
-            for (const entry of data.split("\0")) {
-                const idx = entry.indexOf("=");
-                if (idx > 0) {
-                    _procEnvCache.set(entry.slice(0, idx), entry.slice(idx + 1));
-                }
-            }
-        }
-        catch {
-            // /proc/self/environ may not be readable.
-        }
-    }
-    return _procEnvCache.get(key);
-}
+import { getProviderEnvValue } from "./utils/provider-env.js";
 let cachedVertexAdcCredentialsExists = null;
-function hasVertexAdcCredentials() {
+function hasVertexAdcCredentials(env) {
+    const explicitCredentialsPath = env?.GOOGLE_APPLICATION_CREDENTIALS;
+    if (explicitCredentialsPath) {
+        return _existsSync ? _existsSync(explicitCredentialsPath) : false;
+    }
     if (cachedVertexAdcCredentialsExists === null) {
         // If node modules haven't loaded yet (async import race at startup),
         // return false WITHOUT caching so the next call retries once they're ready.
@@ -73,7 +46,7 @@ function hasVertexAdcCredentials() {
             return false;
         }
         // Check GOOGLE_APPLICATION_CREDENTIALS env var first (standard way)
-        const gacPath = process.env.GOOGLE_APPLICATION_CREDENTIALS || getProcEnv("GOOGLE_APPLICATION_CREDENTIALS");
+        const gacPath = getProviderEnvValue("GOOGLE_APPLICATION_CREDENTIALS", env);
         if (gacPath) {
             cachedVertexAdcCredentialsExists = _existsSync(gacPath);
         }
@@ -128,27 +101,24 @@ function getApiKeyEnvVars(provider) {
     const envVar = envMap[provider];
     return envVar ? [envVar] : undefined;
 }
-export function findEnvKeys(provider) {
+export function findEnvKeys(provider, env) {
     const envVars = getApiKeyEnvVars(provider);
     if (!envVars)
         return undefined;
-    const found = envVars.filter((envVar) => !!process.env[envVar] || !!getProcEnv(envVar));
+    const found = envVars.filter((envVar) => !!getProviderEnvValue(envVar, env));
     return found.length > 0 ? found : undefined;
 }
-export function getEnvApiKey(provider) {
-    const envKeys = findEnvKeys(provider);
+export function getEnvApiKey(provider, env) {
+    const envKeys = findEnvKeys(provider, env);
     if (envKeys?.[0]) {
-        return process.env[envKeys[0]] || getProcEnv(envKeys[0]);
+        return getProviderEnvValue(envKeys[0], env);
     }
     // Vertex AI supports either an explicit API key or Application Default Credentials.
     // Auth is configured via `gcloud auth application-default login`.
     if (provider === "google-vertex") {
-        const hasCredentials = hasVertexAdcCredentials();
-        const hasProject = !!(process.env.GOOGLE_CLOUD_PROJECT ||
-            process.env.GCLOUD_PROJECT ||
-            getProcEnv("GOOGLE_CLOUD_PROJECT") ||
-            getProcEnv("GCLOUD_PROJECT"));
-        const hasLocation = !!(process.env.GOOGLE_CLOUD_LOCATION || getProcEnv("GOOGLE_CLOUD_LOCATION"));
+        const hasCredentials = hasVertexAdcCredentials(env);
+        const hasProject = !!(getProviderEnvValue("GOOGLE_CLOUD_PROJECT", env) || getProviderEnvValue("GCLOUD_PROJECT", env));
+        const hasLocation = !!getProviderEnvValue("GOOGLE_CLOUD_LOCATION", env);
         if (hasCredentials && hasProject && hasLocation) {
             return "<authenticated>";
         }
@@ -161,18 +131,12 @@ export function getEnvApiKey(provider) {
         // 4. AWS_CONTAINER_CREDENTIALS_RELATIVE_URI - ECS task roles
         // 5. AWS_CONTAINER_CREDENTIALS_FULL_URI - ECS task roles (full URI)
         // 6. AWS_WEB_IDENTITY_TOKEN_FILE - IRSA (IAM Roles for Service Accounts)
-        if (process.env.AWS_PROFILE ||
-            (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) ||
-            process.env.AWS_BEARER_TOKEN_BEDROCK ||
-            process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI ||
-            process.env.AWS_CONTAINER_CREDENTIALS_FULL_URI ||
-            process.env.AWS_WEB_IDENTITY_TOKEN_FILE ||
-            getProcEnv("AWS_PROFILE") ||
-            (getProcEnv("AWS_ACCESS_KEY_ID") && getProcEnv("AWS_SECRET_ACCESS_KEY")) ||
-            getProcEnv("AWS_BEARER_TOKEN_BEDROCK") ||
-            getProcEnv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI") ||
-            getProcEnv("AWS_CONTAINER_CREDENTIALS_FULL_URI") ||
-            getProcEnv("AWS_WEB_IDENTITY_TOKEN_FILE")) {
+        if (getProviderEnvValue("AWS_PROFILE", env) ||
+            (getProviderEnvValue("AWS_ACCESS_KEY_ID", env) && getProviderEnvValue("AWS_SECRET_ACCESS_KEY", env)) ||
+            getProviderEnvValue("AWS_BEARER_TOKEN_BEDROCK", env) ||
+            getProviderEnvValue("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", env) ||
+            getProviderEnvValue("AWS_CONTAINER_CREDENTIALS_FULL_URI", env) ||
+            getProviderEnvValue("AWS_WEB_IDENTITY_TOKEN_FILE", env)) {
             return "<authenticated>";
         }
     }