The open-source agent harness - the runtime layer that turns an LLM into a working agent.
Pass tenantName on SandboxOptions instead of TFY_TENANT_NAME (#323)
Bhavesh Patelc54635077dc7
diff --git a/.changeset/sandbox-tenant-name-option.md b/.changeset/sandbox-tenant-name-option.mdnew file mode 100644index 000000000..d64c29d24--- /dev/null+++ b/.changeset/sandbox-tenant-name-option.md@@ -0,0 +1,6 @@+---+'@truefoundry/trueforge-core': patch+'@truefoundry/trueforge': patch+---++Pass `tenantName` on `SandboxOptions` instead of injecting `TFY_TENANT_NAME` via exec env.diff --git a/packages/trueforge-core/src/core/sandbox/Sandbox.ts b/packages/trueforge-core/src/core/sandbox/Sandbox.tsindex fa4696cae..65c80646b 100644--- a/packages/trueforge-core/src/core/sandbox/Sandbox.ts+++ b/packages/trueforge-core/src/core/sandbox/Sandbox.ts@@ -94,7 +94,7 @@ export interface SandboxOptions {/** Used to derive the Code Mode NATS wait as request + connect. */mcpRequestTimeoutMs: number;mcpConnectTimeoutMs: number;- execExtraEnv?: Readonly<Record<string, string>> | undefined;+ tenantName: string;tracing: AgentTracing;logger: Logger;}@@ -143,13 +143,11 @@ function injectTraceContextEnv(): Record<string, string> {function injectMCPClientEnv(params: {env?: Record<string, string> | undefined;mcpServers: Record<string, SandboxMcpServerConfig>;- execExtraEnv?: Readonly<Record<string, string>> | undefined;codeModeEnv?: Record<string, string> | undefined;}): Record<string, string> {const codeModeEnv = params.codeModeEnv ?? {};const hasCodeModeTransport = Object.keys(codeModeEnv).length > 0;return {- ...(params.execExtraEnv ?? {}),...(params.env ?? {}),PYTHONPATH: MCP_CLIENT_DIR,...(Object.keys(params.mcpServers).length > 0 && {@@ -207,7 +205,6 @@ export class Sandbox extends LocalToolMCP {private codeExecToolSets: readonly IToolSet[] = [];private readonly fileDownloadEnabled: boolean;private readonly requestTimeoutSeconds: number;- private readonly execExtraEnv?: Readonly<Record<string, string>> | undefined;private readonly skillMounter?: ISkillMounter | undefined;private cachedSkillsSection?: string | undefined;private readonly mcpClientScriptBase64: string;@@ -230,12 +227,11 @@ export class Sandbox extends LocalToolMCP {super({ tracing: options.tracing });this.provider = options.provider;this.existingSandboxId = options.existingSandboxId;- this.tenantName = options.execExtraEnv?.['TFY_TENANT_NAME'] ?? '';+ this.tenantName = options.tenantName;this.skillMounter = options.skillMounter;this.fileDownloadEnabled = options.fileDownloadEnabled ?? false;const mcpBoundTimeoutMs = options.mcpRequestTimeoutMs + options.mcpConnectTimeoutMs;this.requestTimeoutSeconds = Math.ceil(mcpBoundTimeoutMs / 1000) + NATS_REQUEST_TIMEOUT_BUFFER_SECONDS;- this.execExtraEnv = options.execExtraEnv;// Scripts are internal to Sandbox: the upload paths, env contract, and prompt// text are all hardcoded here, so injecting different content was never a// real extension point. Consumers don't see or provide them.@@ -490,7 +486,6 @@ export class Sandbox extends LocalToolMCP {const mcpClientEnv = injectMCPClientEnv({env: input.env,mcpServers: this.buildMcpServersEnvelope(),- execExtraEnv: this.execExtraEnv,codeModeEnv,});const gitAuthEnv =diff --git a/packages/trueforge-core/tests/core/harnessMocks.ts b/packages/trueforge-core/tests/core/harnessMocks.tsindex 65cc0b19c..ef12abd41 100644--- a/packages/trueforge-core/tests/core/harnessMocks.ts+++ b/packages/trueforge-core/tests/core/harnessMocks.ts@@ -73,7 +73,7 @@ export function makeStubPublicSandbox(tenantName = 'test-tenant'): Sandbox {blockDestructiveToolsInCodeMode: true,mcpRequestTimeoutMs: 60_000,mcpConnectTimeoutMs: 5_000,- execExtraEnv: { TFY_TENANT_NAME: tenantName },+ tenantName,logger: makeSilentLogger(),tracing: NOOP_AGENT_TRACING,});diff --git a/packages/trueforge-core/tests/core/sandbox/sandboxBridgeTimeout.test.ts b/packages/trueforge-core/tests/core/sandbox/sandboxBridgeTimeout.test.tsindex 94209fcee..8a9ecce97 100644--- a/packages/trueforge-core/tests/core/sandbox/sandboxBridgeTimeout.test.ts+++ b/packages/trueforge-core/tests/core/sandbox/sandboxBridgeTimeout.test.ts@@ -42,7 +42,7 @@ function makeSandbox(options: {blockDestructiveToolsInCodeMode: true,mcpRequestTimeoutMs: options.mcpRequestTimeoutMs,mcpConnectTimeoutMs: options.mcpConnectTimeoutMs,- execExtraEnv: { TFY_TENANT_NAME: 'test-tenant' },+ tenantName: 'test-tenant',logger: makeSilentLogger(),tracing: NOOP_AGENT_TRACING,}),diff --git a/packages/trueforge/src/runtime/sessionResources.ts b/packages/trueforge/src/runtime/sessionResources.tsindex ec0b4dd47..6ba8600bd 100644--- a/packages/trueforge/src/runtime/sessionResources.ts+++ b/packages/trueforge/src/runtime/sessionResources.ts@@ -252,9 +252,7 @@ export function buildTurnSandbox(input: {blockDestructiveToolsInCodeMode: true,mcpRequestTimeoutMs: configuration.MCP_REQUEST_TIMEOUT_MS,mcpConnectTimeoutMs: configuration.MCP_CONNECT_TIMEOUT_MS,- // Sandbox reads its tenant from TFY_TENANT_NAME for the ownership check- // against provider-created sandbox ids (`<tenant>.<uuid>`).- execExtraEnv: { TFY_TENANT_NAME: input.tenantName },+ tenantName: input.tenantName,...(skillMounter ? { skillMounter } : {}),tracing: input.tracing,logger: input.logger,