langsmith 0.7.9 → 0.7.11

package/dist/sandbox/index.cjs

@@ -29,7 +29,7 @@
  * @packageDocumentation
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LangSmithDataplaneNotConfiguredError = exports.LangSmithCommandTimeoutError = exports.LangSmithSandboxOperationError = exports.LangSmithSandboxNotReadyError = exports.LangSmithSandboxCreationError = exports.LangSmithResourceCreationError = exports.LangSmithQuotaExceededError = exports.LangSmithValidationError = exports.LangSmithResourceNameConflictError = exports.LangSmithResourceAlreadyExistsError = exports.LangSmithResourceInUseError = exports.LangSmithResourceTimeoutError = exports.LangSmithResourceNotFoundError = exports.LangSmithSandboxServerReloadError = exports.LangSmithSandboxConnectionError = exports.LangSmithSandboxAuthenticationError = exports.LangSmithSandboxAPIError = exports.LangSmithSandboxError = exports.s3Mount = exports.mountConfig = exports.gcsMount = exports.workspaceSecret = exports.proxyConfig = exports.opaqueSecret = exports.gcpAuth = exports.awsAuth = exports.CommandHandle = exports.Sandbox = exports.SandboxClient = void 0;
+exports.LangSmithDataplaneNotConfiguredError = exports.LangSmithCommandTimeoutError = exports.LangSmithSandboxOperationError = exports.LangSmithSandboxNotReadyError = exports.LangSmithSandboxCreationError = exports.LangSmithResourceCreationError = exports.LangSmithQuotaExceededError = exports.LangSmithValidationError = exports.LangSmithResourceNameConflictError = exports.LangSmithResourceAlreadyExistsError = exports.LangSmithResourceInUseError = exports.LangSmithResourceTimeoutError = exports.LangSmithResourceNotFoundError = exports.LangSmithSandboxServerReloadError = exports.LangSmithSandboxConnectionError = exports.LangSmithSandboxAuthenticationError = exports.LangSmithSandboxAPIError = exports.LangSmithSandboxError = exports.s3Mount = exports.mountConfig = exports.gitMount = exports.gcsMount = exports.workspaceSecret = exports.proxyConfig = exports.opaqueSecret = exports.gcpAuth = exports.awsAuth = exports.CommandHandle = exports.Sandbox = exports.SandboxClient = void 0;
 // Main classes
 var client_js_1 = require("./client.cjs");
 Object.defineProperty(exports, "SandboxClient", { enumerable: true, get: function () { return client_js_1.SandboxClient; } });
@@ -45,6 +45,7 @@ Object.defineProperty(exports, "proxyConfig", { enumerable: true, get: function
 Object.defineProperty(exports, "workspaceSecret", { enumerable: true, get: function () { return proxy_config_js_1.workspaceSecret; } });
 var mounts_js_1 = require("./mounts.cjs");
 Object.defineProperty(exports, "gcsMount", { enumerable: true, get: function () { return mounts_js_1.gcsMount; } });
+Object.defineProperty(exports, "gitMount", { enumerable: true, get: function () { return mounts_js_1.gitMount; } });
 Object.defineProperty(exports, "mountConfig", { enumerable: true, get: function () { return mounts_js_1.mountConfig; } });
 Object.defineProperty(exports, "s3Mount", { enumerable: true, get: function () { return mounts_js_1.s3Mount; } });
 // Errors

package/dist/sandbox/index.d.ts

@@ -31,6 +31,6 @@ export { SandboxClient } from "./client.js";
 export { Sandbox } from "./sandbox.js";
 export { CommandHandle } from "./command_handle.js";
 export { awsAuth, gcpAuth, opaqueSecret, proxyConfig, workspaceSecret, } from "./proxy_config.js";
-export { gcsMount, mountConfig, s3Mount } from "./mounts.js";
-export type { ExecutionResult, OutputChunk, WsMessage, WsRunOptions, ResourceStatus, Snapshot, SandboxData, SandboxClientConfig, RunOptions, CreateSandboxOptions, SandboxAccessControl, SandboxAwsAuthRule, SandboxGcpAuthRule, SandboxMountConfig, SandboxProxyConfig, SandboxProxyRule, SandboxProxySecret, SandboxMount, MountCacheConfig, GCSMountConfig, GCSMountSpec, S3MountConfig, S3MountSpec, CreateSnapshotOptions, CreateDockerfileSnapshotOptions, CaptureSnapshotOptions, ListSnapshotsOptions, WaitForSnapshotOptions, StartSandboxOptions, UpdateSandboxOptions, WaitForSandboxOptions, } from "./types.js";
+export { gcsMount, gitMount, mountConfig, s3Mount } from "./mounts.js";
+export type { ExecutionResult, OutputChunk, WsMessage, WsRunOptions, ResourceStatus, Snapshot, SandboxData, SandboxClientConfig, RunOptions, CreateSandboxOptions, SandboxAccessControl, SandboxAwsAuthRule, SandboxAwsMountAuthConfig, SandboxGcpAuthRule, SandboxGcpMountAuthConfig, SandboxMountAuth, SandboxMountAuthConfig, SandboxMountConfig, SandboxProxyConfig, SandboxProxyRule, SandboxProxySecret, SandboxMount, MountCacheConfig, GCSMountConfig, GCSMountSpec, GitMountConfig, GitMountRefSpec, GitMountSpec, S3MountConfig, S3MountSpec, CreateSnapshotOptions, CreateDockerfileSnapshotOptions, CaptureSnapshotOptions, ListSnapshotsOptions, WaitForSnapshotOptions, StartSandboxOptions, UpdateSandboxOptions, WaitForSandboxOptions, } from "./types.js";
 export { LangSmithSandboxError, LangSmithSandboxAPIError, LangSmithSandboxAuthenticationError, LangSmithSandboxConnectionError, LangSmithSandboxServerReloadError, LangSmithResourceNotFoundError, LangSmithResourceTimeoutError, LangSmithResourceInUseError, LangSmithResourceAlreadyExistsError, LangSmithResourceNameConflictError, LangSmithValidationError, LangSmithQuotaExceededError, LangSmithResourceCreationError, LangSmithSandboxCreationError, LangSmithSandboxNotReadyError, LangSmithSandboxOperationError, LangSmithCommandTimeoutError, LangSmithDataplaneNotConfiguredError, } from "./errors.js";

package/dist/sandbox/index.js

@@ -32,7 +32,7 @@ export { SandboxClient } from "./client.js";
 export { Sandbox } from "./sandbox.js";
 export { CommandHandle } from "./command_handle.js";
 export { awsAuth, gcpAuth, opaqueSecret, proxyConfig, workspaceSecret, } from "./proxy_config.js";
-export { gcsMount, mountConfig, s3Mount } from "./mounts.js";
+export { gcsMount, gitMount, mountConfig, s3Mount } from "./mounts.js";
 // Errors
 export { 
 // Base and connection errors

package/dist/sandbox/mounts.cjs

@@ -1,15 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.s3Mount = s3Mount;
+exports.gitMount = gitMount;
 exports.gcsMount = gcsMount;
 exports.mountConfig = mountConfig;
-const proxy_config_js_1 = require("./proxy_config.cjs");
+exports.validateMountConfigProxyConfig = validateMountConfigProxyConfig;
 function requireNonEmptyString(value, field) {
     if (typeof value !== "string" || value.trim() === "") {
         throw new Error(`${field} must be a non-empty string`);
     }
     return value.trim();
 }
+function copyMountSecret(secret, field) {
+    if (secret === null || typeof secret !== "object" || Array.isArray(secret)) {
+        throw new Error(`${field} must be a sandbox secret`);
+    }
+    const candidate = secret;
+    if (candidate.type !== "workspace_secret" && candidate.type !== "opaque") {
+        throw new Error(`${field} must use workspace_secret or opaque`);
+    }
+    if (typeof candidate.value !== "string" || candidate.value.trim() === "") {
+        throw new Error(`${field}.value must be a non-empty string`);
+    }
+    return {
+        type: candidate.type,
+        value: candidate.value,
+    };
+}
+function requireGitRemoteUrl(remoteUrl) {
+    if (typeof remoteUrl !== "string" || remoteUrl === "") {
+        throw new Error("remoteUrl must be a non-empty string");
+    }
+    if (remoteUrl.trim() !== remoteUrl ||
+        /\s/u.test(remoteUrl) ||
+        remoteUrl.includes(String.fromCharCode(0))) {
+        throw new Error("remoteUrl must not contain whitespace or NUL bytes");
+    }
+    let parsed;
+    try {
+        parsed = new URL(remoteUrl);
+    }
+    catch {
+        throw new Error("remoteUrl must be an absolute HTTPS URL");
+    }
+    if (parsed.protocol !== "https:" || parsed.host === "") {
+        throw new Error("remoteUrl must be an absolute HTTPS URL");
+    }
+    if (parsed.username !== "" || parsed.password !== "") {
+        throw new Error("remoteUrl must not include embedded credentials");
+    }
+    if (parsed.pathname === "" || parsed.pathname === "/") {
+        throw new Error("remoteUrl must include a repository path");
+    }
+    if (parsed.search !== "" || parsed.hash !== "") {
+        throw new Error("remoteUrl must not include query or fragment");
+    }
+    return remoteUrl;
+}
+function copyGitRef(ref) {
+    if (ref === null || typeof ref !== "object" || Array.isArray(ref)) {
+        throw new Error("ref must be an object");
+    }
+    if (ref.type !== "branch" && ref.type !== "tag") {
+        throw new Error("ref.type must be branch or tag");
+    }
+    return {
+        type: ref.type,
+        name: requireNonEmptyString(ref.name, "ref.name"),
+    };
+}
 function s3Mount({ id, mountPath, bucket, region = "us-east-1", prefix, endpointUrl = "https://s3.amazonaws.com", pathStyle = false, readOnly, cache, }) {
     const mount = {
         id: requireNonEmptyString(id, "id"),
@@ -33,6 +92,26 @@ function s3Mount({ id, mountPath, bucket, region = "us-east-1", prefix, endpoint
     }
     return mount;
 }
+function gitMount({ id, mountPath, remoteUrl, ref, refreshIntervalSeconds, }) {
+    const mount = {
+        id: requireNonEmptyString(id, "id"),
+        type: "git",
+        mount_path: requireNonEmptyString(mountPath, "mountPath"),
+        git: {
+            remote_url: requireGitRemoteUrl(remoteUrl),
+        },
+    };
+    if (ref !== undefined) {
+        mount.git.ref = copyGitRef(ref);
+    }
+    if (refreshIntervalSeconds !== undefined) {
+        if (refreshIntervalSeconds < 1) {
+            throw new Error("refreshIntervalSeconds must be at least 1");
+        }
+        mount.git.refresh_interval_seconds = refreshIntervalSeconds;
+    }
+    return mount;
+}
 function gcsMount({ id, mountPath, bucket, prefix, readOnly, cache, }) {
     const mount = {
         id: requireNonEmptyString(id, "id"),
@@ -61,35 +140,80 @@ function normalizeMounts(mounts) {
         if (mount === null || typeof mount !== "object" || Array.isArray(mount)) {
             throw new Error("mounts must be a non-empty array of mount objects");
         }
-        if (mount.type !== "s3" && mount.type !== "gcs") {
-            throw new Error("mountConfig only supports s3 and gcs mounts");
+        if (mount.type !== "s3" && mount.type !== "gcs" && mount.type !== "git") {
+            throw new Error("mountConfig only supports s3, gcs, and git mounts");
         }
+        rejectProviderCredentialsInMount(mount);
         return mount;
     });
 }
-function normalizeAuthRules(auth) {
+const FORBIDDEN_MOUNT_CREDENTIAL_FIELDS = new Set([
+    "access_key_id",
+    "secret_access_key",
+    "session_token",
+    "service_account_json",
+    "access_token",
+    "refresh_token",
+    "credentials",
+    "credential",
+]);
+function rejectProviderCredentialsInMount(value) {
+    if (Array.isArray(value)) {
+        for (const child of value) {
+            rejectProviderCredentialsInMount(child);
+        }
+        return;
+    }
+    if (value !== null && typeof value === "object") {
+        for (const [key, child] of Object.entries(value)) {
+            if (FORBIDDEN_MOUNT_CREDENTIAL_FIELDS.has(key)) {
+                throw new Error("provider credentials must be supplied in mountConfig.auth, not individual mount specs");
+            }
+            rejectProviderCredentialsInMount(child);
+        }
+    }
+}
+function normalizeMountAuth(auth) {
     if (!Array.isArray(auth)) {
-        throw new Error("auth must be an array of provider auth rules");
+        throw new Error("auth must be an array of provider auth blocks");
     }
     const byProvider = {};
-    for (const rule of auth) {
-        if (rule === null || typeof rule !== "object" || Array.isArray(rule)) {
-            throw new Error("auth must be an array of provider auth rules");
+    for (const block of auth) {
+        if (block === null || typeof block !== "object" || Array.isArray(block)) {
+            throw new Error("auth must be an array of provider auth blocks");
         }
-        const provider = rule.type;
+        const provider = block.type;
         if (provider !== "aws" && provider !== "gcp") {
-            throw new Error("mountConfig auth only supports aws and gcp rules");
+            throw new Error("mountConfig auth only supports aws and gcp blocks");
         }
         if (byProvider[provider] !== undefined) {
             throw new Error(`duplicate ${provider} auth rule in mountConfig`);
         }
-        byProvider[provider] = rule;
+        if (provider === "aws") {
+            const aws = block.aws;
+            if (aws === undefined) {
+                throw new Error("aws mount auth must include an aws block");
+            }
+            byProvider.aws = {
+                access_key_id: copyMountSecret(aws.access_key_id, "accessKeyId"),
+                secret_access_key: copyMountSecret(aws.secret_access_key, "secretAccessKey"),
+            };
+        }
+        else {
+            const gcp = block.gcp;
+            if (gcp === undefined) {
+                throw new Error("gcp mount auth must include a gcp block");
+            }
+            byProvider.gcp = {
+                service_account_json: copyMountSecret(gcp.service_account_json, "serviceAccountJson"),
+            };
+        }
     }
     return byProvider;
 }
-function mountConfig({ auth, mounts, }) {
+function mountConfig({ auth = [], mounts, }) {
     const normalizedMounts = normalizeMounts(mounts);
-    const authByProvider = normalizeAuthRules(auth);
+    const authByProvider = normalizeMountAuth(auth);
     const mountProviders = new Set(normalizedMounts.map((mount) => mount.type));
     if (mountProviders.has("s3") && authByProvider.aws === undefined) {
         throw new Error("s3 mounts require aws auth in mountConfig");
@@ -104,11 +228,26 @@ function mountConfig({ auth, mounts, }) {
         throw new Error("gcp auth requires at least one gcs mount in mountConfig");
     }
     return {
+        auth: authByProvider,
         mounts: normalizedMounts,
-        proxyConfig: (0, proxy_config_js_1.proxyConfig)({
-            rules: ["aws", "gcp"]
-                .map((provider) => authByProvider[provider])
-                .filter((rule) => rule !== undefined),
-        }),
     };
 }
+function validateMountConfigProxyConfig(mountConfig, proxyConfig) {
+    if (proxyConfig === undefined) {
+        return;
+    }
+    const rules = proxyConfig.rules ?? [];
+    if (!Array.isArray(rules)) {
+        throw new Error("proxyConfig rules must be an array");
+    }
+    for (const rule of rules) {
+        if (rule === null || typeof rule !== "object" || Array.isArray(rule)) {
+            continue;
+        }
+        const ruleType = rule.type;
+        if ((ruleType === "aws" || ruleType === "gcp") &&
+            mountConfig.auth[ruleType] !== undefined) {
+            throw new Error(`${ruleType} auth cannot be provided in both mountConfig and proxyConfig`);
+        }
+    }
+}

package/dist/sandbox/mounts.d.ts

@@ -1,4 +1,4 @@
-import type { GCSMountSpec, MountCacheConfig, S3MountSpec, SandboxMount, SandboxMountConfig, SandboxProxyRule } from "./types.js";
+import type { GCSMountSpec, GitMountRefSpec, GitMountSpec, MountCacheConfig, S3MountSpec, SandboxMount, SandboxMountAuth, SandboxMountConfig, SandboxProxyConfig } from "./types.js";
 export declare function s3Mount({ id, mountPath, bucket, region, prefix, endpointUrl, pathStyle, readOnly, cache, }: {
     id: string;
     mountPath: string;
@@ -10,6 +10,13 @@ export declare function s3Mount({ id, mountPath, bucket, region, prefix, endpoin
     readOnly?: boolean;
     cache?: MountCacheConfig;
 }): S3MountSpec;
+export declare function gitMount({ id, mountPath, remoteUrl, ref, refreshIntervalSeconds, }: {
+    id: string;
+    mountPath: string;
+    remoteUrl: string;
+    ref?: GitMountRefSpec;
+    refreshIntervalSeconds?: number;
+}): GitMountSpec;
 export declare function gcsMount({ id, mountPath, bucket, prefix, readOnly, cache, }: {
     id: string;
     mountPath: string;
@@ -19,6 +26,7 @@ export declare function gcsMount({ id, mountPath, bucket, prefix, readOnly, cach
     cache?: MountCacheConfig;
 }): GCSMountSpec;
 export declare function mountConfig({ auth, mounts, }: {
-    auth: SandboxProxyRule[];
+    auth?: SandboxMountAuth[];
     mounts: SandboxMount[];
 }): SandboxMountConfig;
+export declare function validateMountConfigProxyConfig(mountConfig: SandboxMountConfig, proxyConfig: SandboxProxyConfig | undefined): void;

package/dist/sandbox/mounts.js

@@ -1,10 +1,67 @@
-import { proxyConfig } from "./proxy_config.js";
 function requireNonEmptyString(value, field) {
     if (typeof value !== "string" || value.trim() === "") {
         throw new Error(`${field} must be a non-empty string`);
     }
     return value.trim();
 }
+function copyMountSecret(secret, field) {
+    if (secret === null || typeof secret !== "object" || Array.isArray(secret)) {
+        throw new Error(`${field} must be a sandbox secret`);
+    }
+    const candidate = secret;
+    if (candidate.type !== "workspace_secret" && candidate.type !== "opaque") {
+        throw new Error(`${field} must use workspace_secret or opaque`);
+    }
+    if (typeof candidate.value !== "string" || candidate.value.trim() === "") {
+        throw new Error(`${field}.value must be a non-empty string`);
+    }
+    return {
+        type: candidate.type,
+        value: candidate.value,
+    };
+}
+function requireGitRemoteUrl(remoteUrl) {
+    if (typeof remoteUrl !== "string" || remoteUrl === "") {
+        throw new Error("remoteUrl must be a non-empty string");
+    }
+    if (remoteUrl.trim() !== remoteUrl ||
+        /\s/u.test(remoteUrl) ||
+        remoteUrl.includes(String.fromCharCode(0))) {
+        throw new Error("remoteUrl must not contain whitespace or NUL bytes");
+    }
+    let parsed;
+    try {
+        parsed = new URL(remoteUrl);
+    }
+    catch {
+        throw new Error("remoteUrl must be an absolute HTTPS URL");
+    }
+    if (parsed.protocol !== "https:" || parsed.host === "") {
+        throw new Error("remoteUrl must be an absolute HTTPS URL");
+    }
+    if (parsed.username !== "" || parsed.password !== "") {
+        throw new Error("remoteUrl must not include embedded credentials");
+    }
+    if (parsed.pathname === "" || parsed.pathname === "/") {
+        throw new Error("remoteUrl must include a repository path");
+    }
+    if (parsed.search !== "" || parsed.hash !== "") {
+        throw new Error("remoteUrl must not include query or fragment");
+    }
+    return remoteUrl;
+}
+function copyGitRef(ref) {
+    if (ref === null || typeof ref !== "object" || Array.isArray(ref)) {
+        throw new Error("ref must be an object");
+    }
+    if (ref.type !== "branch" && ref.type !== "tag") {
+        throw new Error("ref.type must be branch or tag");
+    }
+    return {
+        type: ref.type,
+        name: requireNonEmptyString(ref.name, "ref.name"),
+    };
+}
 export function s3Mount({ id, mountPath, bucket, region = "us-east-1", prefix, endpointUrl = "https://s3.amazonaws.com", pathStyle = false, readOnly, cache, }) {
     const mount = {
         id: requireNonEmptyString(id, "id"),
@@ -28,6 +85,26 @@ export function s3Mount({ id, mountPath, bucket, region = "us-east-1", prefix, e
     }
     return mount;
 }
+export function gitMount({ id, mountPath, remoteUrl, ref, refreshIntervalSeconds, }) {
+    const mount = {
+        id: requireNonEmptyString(id, "id"),
+        type: "git",
+        mount_path: requireNonEmptyString(mountPath, "mountPath"),
+        git: {
+            remote_url: requireGitRemoteUrl(remoteUrl),
+        },
+    };
+    if (ref !== undefined) {
+        mount.git.ref = copyGitRef(ref);
+    }
+    if (refreshIntervalSeconds !== undefined) {
+        if (refreshIntervalSeconds < 1) {
+            throw new Error("refreshIntervalSeconds must be at least 1");
+        }
+        mount.git.refresh_interval_seconds = refreshIntervalSeconds;
+    }
+    return mount;
+}
 export function gcsMount({ id, mountPath, bucket, prefix, readOnly, cache, }) {
     const mount = {
         id: requireNonEmptyString(id, "id"),
@@ -56,35 +133,80 @@ function normalizeMounts(mounts) {
         if (mount === null || typeof mount !== "object" || Array.isArray(mount)) {
             throw new Error("mounts must be a non-empty array of mount objects");
         }
-        if (mount.type !== "s3" && mount.type !== "gcs") {
-            throw new Error("mountConfig only supports s3 and gcs mounts");
+        if (mount.type !== "s3" && mount.type !== "gcs" && mount.type !== "git") {
+            throw new Error("mountConfig only supports s3, gcs, and git mounts");
         }
+        rejectProviderCredentialsInMount(mount);
         return mount;
     });
 }
-function normalizeAuthRules(auth) {
+const FORBIDDEN_MOUNT_CREDENTIAL_FIELDS = new Set([
+    "access_key_id",
+    "secret_access_key",
+    "session_token",
+    "service_account_json",
+    "access_token",
+    "refresh_token",
+    "credentials",
+    "credential",
+]);
+function rejectProviderCredentialsInMount(value) {
+    if (Array.isArray(value)) {
+        for (const child of value) {
+            rejectProviderCredentialsInMount(child);
+        }
+        return;
+    }
+    if (value !== null && typeof value === "object") {
+        for (const [key, child] of Object.entries(value)) {
+            if (FORBIDDEN_MOUNT_CREDENTIAL_FIELDS.has(key)) {
+                throw new Error("provider credentials must be supplied in mountConfig.auth, not individual mount specs");
+            }
+            rejectProviderCredentialsInMount(child);
+        }
+    }
+}
+function normalizeMountAuth(auth) {
     if (!Array.isArray(auth)) {
-        throw new Error("auth must be an array of provider auth rules");
+        throw new Error("auth must be an array of provider auth blocks");
     }
     const byProvider = {};
-    for (const rule of auth) {
-        if (rule === null || typeof rule !== "object" || Array.isArray(rule)) {
-            throw new Error("auth must be an array of provider auth rules");
+    for (const block of auth) {
+        if (block === null || typeof block !== "object" || Array.isArray(block)) {
+            throw new Error("auth must be an array of provider auth blocks");
         }
-        const provider = rule.type;
+        const provider = block.type;
         if (provider !== "aws" && provider !== "gcp") {
-            throw new Error("mountConfig auth only supports aws and gcp rules");
+            throw new Error("mountConfig auth only supports aws and gcp blocks");
         }
         if (byProvider[provider] !== undefined) {
             throw new Error(`duplicate ${provider} auth rule in mountConfig`);
         }
-        byProvider[provider] = rule;
+        if (provider === "aws") {
+            const aws = block.aws;
+            if (aws === undefined) {
+                throw new Error("aws mount auth must include an aws block");
+            }
+            byProvider.aws = {
+                access_key_id: copyMountSecret(aws.access_key_id, "accessKeyId"),
+                secret_access_key: copyMountSecret(aws.secret_access_key, "secretAccessKey"),
+            };
+        }
+        else {
+            const gcp = block.gcp;
+            if (gcp === undefined) {
+                throw new Error("gcp mount auth must include a gcp block");
+            }
+            byProvider.gcp = {
+                service_account_json: copyMountSecret(gcp.service_account_json, "serviceAccountJson"),
+            };
+        }
     }
     return byProvider;
 }
-export function mountConfig({ auth, mounts, }) {
+export function mountConfig({ auth = [], mounts, }) {
     const normalizedMounts = normalizeMounts(mounts);
-    const authByProvider = normalizeAuthRules(auth);
+    const authByProvider = normalizeMountAuth(auth);
     const mountProviders = new Set(normalizedMounts.map((mount) => mount.type));
     if (mountProviders.has("s3") && authByProvider.aws === undefined) {
         throw new Error("s3 mounts require aws auth in mountConfig");
@@ -99,11 +221,26 @@ export function mountConfig({ auth, mounts, }) {
         throw new Error("gcp auth requires at least one gcs mount in mountConfig");
     }
     return {
+        auth: authByProvider,
         mounts: normalizedMounts,
-        proxyConfig: proxyConfig({
-            rules: ["aws", "gcp"]
-                .map((provider) => authByProvider[provider])
-                .filter((rule) => rule !== undefined),
-        }),
     };
 }
+export function validateMountConfigProxyConfig(mountConfig, proxyConfig) {
+    if (proxyConfig === undefined) {
+        return;
+    }
+    const rules = proxyConfig.rules ?? [];
+    if (!Array.isArray(rules)) {
+        throw new Error("proxyConfig rules must be an array");
+    }
+    for (const rule of rules) {
+        if (rule === null || typeof rule !== "object" || Array.isArray(rule)) {
+            continue;
+        }
+        const ruleType = rule.type;
+        if ((ruleType === "aws" || ruleType === "gcp") &&
+            mountConfig.auth[ruleType] !== undefined) {
+            throw new Error(`${ruleType} auth cannot be provided in both mountConfig and proxyConfig`);
+        }
+    }
+}

package/dist/sandbox/proxy_config.cjs

@@ -3,14 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.workspaceSecret = workspaceSecret;
 exports.opaqueSecret = opaqueSecret;
 exports.proxyConfig = proxyConfig;
-exports.mergeProxyConfigs = mergeProxyConfigs;
 exports.awsAuth = awsAuth;
 exports.gcpAuth = gcpAuth;
-const DEFAULT_GCP_AUTH_MATCH_HOSTS = [
-    "storage.googleapis.com",
-    "www.googleapis.com",
-];
-const PROVIDER_RULE_TYPES = new Set(["aws", "gcp"]);
 function requireNonEmptyString(value, field) {
     if (typeof value !== "string" || value.trim() === "") {
         throw new Error(`${field} must be a non-empty string`);
@@ -34,9 +28,20 @@ function requireProxyRules(rules) {
         if (rule === null || typeof rule !== "object" || Array.isArray(rule)) {
             throw new Error("rules must be an array of proxy rule objects");
         }
+        validateProxyProviderRule(rule);
         return rule;
     });
 }
+function validateProxyProviderRule(rule) {
+    if (rule.type !== "gcp") {
+        return;
+    }
+    const gcp = rule.gcp;
+    if (gcp === undefined || gcp.scopes === undefined) {
+        throw new Error("gcp proxy auth rules require scopes");
+    }
+    requireNonEmptyStringArray(gcp.scopes, "scopes");
+}
 /** Reference a LangSmith workspace secret in a sandbox proxy configuration. */
 function workspaceSecret(name) {
     const normalized = requireNonEmptyString(name, "name");
@@ -73,38 +78,6 @@ function proxyConfig({ rules, noProxy, accessControl, } = {}) {
     }
     return config;
 }
-function providerRuleTypes(config) {
-    const providers = new Set();
-    for (const rule of config.rules ?? []) {
-        if (rule === null || typeof rule !== "object" || Array.isArray(rule)) {
-            continue;
-        }
-        const ruleType = rule.type;
-        if (typeof ruleType === "string" && PROVIDER_RULE_TYPES.has(ruleType)) {
-            providers.add(ruleType);
-        }
-    }
-    return providers;
-}
-function mergeProxyConfigs(generatedConfig, explicitConfig) {
-    if (generatedConfig === undefined) {
-        return explicitConfig;
-    }
-    if (explicitConfig === undefined) {
-        return generatedConfig;
-    }
-    const generatedProviders = providerRuleTypes(generatedConfig);
-    for (const provider of providerRuleTypes(explicitConfig)) {
-        if (generatedProviders.has(provider)) {
-            throw new Error(`${provider} auth cannot be provided in both mountConfig and proxyConfig`);
-        }
-    }
-    return {
-        ...generatedConfig,
-        ...explicitConfig,
-        rules: [...(generatedConfig.rules ?? []), ...(explicitConfig.rules ?? [])],
-    };
-}
 /** Build a sandbox proxy rule that signs AWS HTTPS requests with SigV4. */
 function awsAuth({ accessKeyId, secretAccessKey, name = "aws", enabled = true, }) {
     return {
@@ -118,15 +91,17 @@ function awsAuth({ accessKeyId, secretAccessKey, name = "aws", enabled = true, }
     };
 }
 /** Build a sandbox proxy rule that injects GCP OAuth bearer auth. */
-function gcpAuth({ serviceAccountJson, scopes, matchHosts = DEFAULT_GCP_AUTH_MATCH_HOSTS, name = "gcp", enabled = true, }) {
+function gcpAuth({ serviceAccountJson, scopes, name = "gcp", enabled = true, }) {
+    const gcp = {
+        service_account_json: serviceAccountJson,
+    };
+    if (scopes !== undefined) {
+        gcp.scopes = requireNonEmptyStringArray(scopes, "scopes");
+    }
     return {
         name: requireNonEmptyString(name, "name"),
         type: "gcp",
         enabled,
-        match_hosts: requireNonEmptyStringArray(matchHosts, "matchHosts"),
-        gcp: {
-            service_account_json: serviceAccountJson,
-            scopes: requireNonEmptyStringArray(scopes, "scopes"),
-        },
+        gcp,
     };
 }

package/dist/sandbox/proxy_config.d.ts

@@ -9,7 +9,6 @@ export declare function proxyConfig({ rules, noProxy, accessControl, }?: {
     noProxy?: string[];
     accessControl?: SandboxAccessControl;
 }): SandboxProxyConfig;
-export declare function mergeProxyConfigs(generatedConfig: SandboxProxyConfig | undefined, explicitConfig: SandboxProxyConfig | undefined): SandboxProxyConfig | undefined;
 /** Build a sandbox proxy rule that signs AWS HTTPS requests with SigV4. */
 export declare function awsAuth({ accessKeyId, secretAccessKey, name, enabled, }: {
     accessKeyId: SandboxProxySecret;
@@ -18,10 +17,9 @@ export declare function awsAuth({ accessKeyId, secretAccessKey, name, enabled, }
     enabled?: boolean;
 }): SandboxAwsAuthRule;
 /** Build a sandbox proxy rule that injects GCP OAuth bearer auth. */
-export declare function gcpAuth({ serviceAccountJson, scopes, matchHosts, name, enabled, }: {
+export declare function gcpAuth({ serviceAccountJson, scopes, name, enabled, }: {
     serviceAccountJson: SandboxProxySecret;
-    scopes: string[];
-    matchHosts?: string[];
+    scopes?: string[];
     name?: string;
     enabled?: boolean;
 }): SandboxGcpAuthRule;