Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

fix: allow using all sandbox environments within a tenant (#1050)

Heer Ambavi9208cc843930
diff --git a/.changeset/share-sandbox-environments.md b/.changeset/share-sandbox-environments.md
new file mode 100644
index 000000000..5cdc945da
--- /dev/null
+++ b/.changeset/share-sandbox-environments.md
@@ -0,0 +1,6 @@
+---
+'@truefoundry/trueforge': patch
+'@truefoundry/trueforge-ui': patch
+---
+
+Allow tenant members to use sandbox environments created by other members while keeping update and delete actions restricted to the creator.
diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.json
index f390510d9..e99bf663c 100644
--- a/.github/fern/openapi/openapi.json
+++ b/.github/fern/openapi/openapi.json
@@ -7902,7 +7902,7 @@
},
"/api/v1/sandbox-environments": {
"get": {
- "description": "List the tenant default environment plus sandbox environments created by the authenticated subject.",
+ "description": "List available sandbox environments",
"parameters": [
{
"description": "Page size. Defaults to 25, max 1000.",
@@ -8058,7 +8058,7 @@
"x-fern-sdk-method-name": "create"
},
"put": {
- "description": "Create or replace by `manifest.name`. Requires a configured sandbox provider.",
+ "description": "Create a new sandbox environment or update an existing one.",
"requestBody": {
"content": {
"application/json": {
@@ -8100,6 +8100,16 @@
},
"description": "Unauthenticated."
},
+ "404": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/RequestErrorResponse"
+ }
+ }
+ },
+ "description": "Sandbox environment not found."
+ },
"409": {
"content": {
"application/json": {
@@ -8143,7 +8153,7 @@
},
"/api/v1/sandbox-environments/{name}": {
"delete": {
- "description": "Delete by name. Fails if any agent still references the environment.",
+ "description": "Delete a sandbox environment, fails if any agent still references it.",
"parameters": [
{
"description": "Sandbox environment name.",
@@ -8191,7 +8201,7 @@
}
}
},
- "description": "Sandbox environment not found."
+ "description": "Sandbox environment not found or not owned by the caller."
},
"409": {
"content": {
@@ -8234,7 +8244,6 @@
"x-fern-sdk-method-name": "delete"
},
"get": {
- "description": "Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.",
"parameters": [
{
"description": "Sandbox environment name.",
diff --git a/docs/openapi.json b/docs/openapi.json
index f390510d9..e99bf663c 100644
--- a/docs/openapi.json
+++ b/docs/openapi.json
@@ -7902,7 +7902,7 @@
},
"/api/v1/sandbox-environments": {
"get": {
- "description": "List the tenant default environment plus sandbox environments created by the authenticated subject.",
+ "description": "List available sandbox environments",
"parameters": [
{
"description": "Page size. Defaults to 25, max 1000.",
@@ -8058,7 +8058,7 @@
"x-fern-sdk-method-name": "create"
},
"put": {
- "description": "Create or replace by `manifest.name`. Requires a configured sandbox provider.",
+ "description": "Create a new sandbox environment or update an existing one.",
"requestBody": {
"content": {
"application/json": {
@@ -8100,6 +8100,16 @@
},
"description": "Unauthenticated."
},
+ "404": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/RequestErrorResponse"
+ }
+ }
+ },
+ "description": "Sandbox environment not found."
+ },
"409": {
"content": {
"application/json": {
@@ -8143,7 +8153,7 @@
},
"/api/v1/sandbox-environments/{name}": {
"delete": {
- "description": "Delete by name. Fails if any agent still references the environment.",
+ "description": "Delete a sandbox environment, fails if any agent still references it.",
"parameters": [
{
"description": "Sandbox environment name.",
@@ -8191,7 +8201,7 @@
}
}
},
- "description": "Sandbox environment not found."
+ "description": "Sandbox environment not found or not owned by the caller."
},
"409": {
"content": {
@@ -8234,7 +8244,6 @@
"x-fern-sdk-method-name": "delete"
},
"get": {
- "description": "Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.",
"parameters": [
{
"description": "Sandbox environment name.",
diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx
index a71ccfd21..65e7c7b70 100644
--- a/packages/frontend/src/App.tsx
+++ b/packages/frontend/src/App.tsx
@@ -249,7 +249,7 @@ export function App() {
defaultAgentSpec: boot.defaultAgentSpec,
}}
initialSettingsOpen={boot.openSettings}
- currentUser={{ displayName: session.displayName }}
+ currentUser={{ subjectId: session.subjectId, displayName: session.displayName }}
overrides={overrides}
theme={appTheme}
className="app-assistant"
diff --git a/packages/frontend/src/authSession.ts b/packages/frontend/src/authSession.ts
index 0380737b4..e419bcc31 100644
--- a/packages/frontend/src/authSession.ts
+++ b/packages/frontend/src/authSession.ts
@@ -23,7 +23,7 @@ const probeClient = new TrueForgeClient({
/** Result of the pre-boot session probe. */
export type SessionState =
- { status: 'authenticated'; displayName: string; tenantId: string } | { status: 'unauthenticated' };
+ { status: 'authenticated'; subjectId: string; displayName: string; tenantId: string } | { status: 'unauthenticated' };
/** Last successful me() OIDC check β€” survives remounts of host chrome. */
let cachedIsOidcConnected: boolean | undefined;
@@ -66,6 +66,7 @@ export async function probeSession(client: TrueForge = probeClient): Promise<Ses
const { data } = await client.auth.me();
return {
status: 'authenticated',
+ subjectId: data.subject.id,
displayName: data.subject.displayName,
tenantId: data.tenantId,
};
diff --git a/packages/frontend/tests/authSession.test.ts b/packages/frontend/tests/authSession.test.ts
index 9823a4955..2a220be4f 100644
--- a/packages/frontend/tests/authSession.test.ts
+++ b/packages/frontend/tests/authSession.test.ts
@@ -60,11 +60,13 @@ describe('authSession', () => {
it('probeSession reports authenticated when me() resolves', async () => {
assert.deepEqual(await probeSession(createClient({ type: 'default' })), {
status: 'authenticated',
+ subjectId: 'user-1',
displayName: 'user-1',
tenantId: 'default',
});
assert.deepEqual(await probeSession(createClient({ type: 'oidc-connected' })), {
status: 'authenticated',
+ subjectId: 'user-1',
displayName: 'user-1',
tenantId: 'default',
});
diff --git a/packages/trueforge-sdk/reference.md b/packages/trueforge-sdk/reference.md
index 0ff033d2d..185a73c8b 100644
--- a/packages/trueforge-sdk/reference.md
+++ b/packages/trueforge-sdk/reference.md
@@ -913,7 +913,7 @@ await client.models.list();
<dl>
<dd>
-List the tenant default environment plus sandbox environments created by the authenticated subject.
+List available sandbox environments
</dd>
</dl>
</dd>
@@ -1055,7 +1055,7 @@ await client.sandboxEnvironments.create({
<dl>
<dd>
-Create or replace by `manifest.name`. Requires a configured sandbox provider.
+Create a new sandbox environment or update an existing one.
</dd>
</dl>
</dd>
@@ -1114,20 +1114,6 @@ await client.sandboxEnvironments.createOrUpdate({
<dl>
<dd>
-#### πŸ“ Description
-
-<dl>
-<dd>
-
-<dl>
-<dd>
-
-Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.
-</dd>
-</dl>
-</dd>
-</dl>
-
#### πŸ”Œ Usage
<dl>
@@ -1185,7 +1171,7 @@ await client.sandboxEnvironments.get("name");
<dl>
<dd>
-Delete by name. Fails if any agent still references the environment.
+Delete a sandbox environment, fails if any agent still references it.
</dd>
</dl>
</dd>
diff --git a/packages/trueforge-sdk/src/api/resources/sandboxEnvironments/client/Client.ts b/packages/trueforge-sdk/src/api/resources/sandboxEnvironments/client/Client.ts
index 8d72f37b0..bb69f8758 100644
--- a/packages/trueforge-sdk/src/api/resources/sandboxEnvironments/client/Client.ts
+++ b/packages/trueforge-sdk/src/api/resources/sandboxEnvironments/client/Client.ts
@@ -24,7 +24,7 @@ export class SandboxEnvironmentsClient {
}
/**
- * List the tenant default environment plus sandbox environments created by the authenticated subject.
+ * List available sandbox environments
*
* @param {TrueForge.ListSandboxEnvironmentsRequest} request
* @param {SandboxEnvironmentsClient.RequestOptions} requestOptions - Request-specific configuration.
@@ -288,13 +288,14 @@ export class SandboxEnvironmentsClient {
}
/**
- * Create or replace by `manifest.name`. Requires a configured sandbox provider.
+ * Create a new sandbox environment or update an existing one.
*
* @param {TrueForge.UpdateSandboxEnvironmentRequest} request
* @param {SandboxEnvironmentsClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link TrueForge.BadRequestError}
* @throws {@link TrueForge.UnauthorizedError}
+ * @throws {@link TrueForge.NotFoundError}
* @throws {@link TrueForge.ConflictError}
* @throws {@link TrueForge.UnprocessableEntityError}
* @throws {@link TrueForge.BadGatewayError}
@@ -388,6 +389,17 @@ export class SandboxEnvironmentsClient {
}),
_response.rawResponse,
);
+ case 404:
+ throw new TrueForge.NotFoundError(
+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ skipValidation: true,
+ breadcrumbsPrefix: ["response"],
+ }),
+ _response.rawResponse,
+ );
case 409:
throw new TrueForge.ConflictError(
serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
@@ -434,8 +446,6 @@ export class SandboxEnvironmentsClient {
}
/**
- * Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.
- *
* @param {string} name - Sandbox environment name.
* @param {SandboxEnvironmentsClient.RequestOptions} requestOptions - Request-specific configuration.
*
@@ -534,7 +544,7 @@ export class SandboxEnvironmentsClient {
}
/**
- * Delete by name. Fails if any agent still references the environment.
+ * Delete a sandbox environment, fails if any agent still references it.
*
* @param {string} name - Sandbox environment name.
* @param {SandboxEnvironmentsClient.RequestOptions} requestOptions - Request-specific configuration.
diff --git a/packages/trueforge-sdk/src/api/types/ModelMessageEvent.ts b/packages/trueforge-sdk/src/api/types/ModelMessageEvent.ts
index cfbb973ca..111babd64 100644
--- a/packages/trueforge-sdk/src/api/types/ModelMessageEvent.ts
+++ b/packages/trueforge-sdk/src/api/types/ModelMessageEvent.ts
@@ -11,8 +11,7 @@ export interface ModelMessageEvent {
finishReason?: TrueForge.FinishReason | null;
/** Unique identifier for the event (monotonic ULID). */
id: string;
- /** Catalog model FQN (`provider/model`) that produced this message. */
- model?: TrueForge.ModelMessageEventModel;
+ model?: TrueForge.Model;
/** Optional participant name. */
name?: string;
reasoningContent?: string;
diff --git a/packages/trueforge-sdk/src/api/types/ModelMessageEventModel.ts b/packages/trueforge-sdk/src/api/types/ModelMessageEventModel.ts
deleted file mode 100644
index 2498b4a0d..000000000
--- a/packages/trueforge-sdk/src/api/types/ModelMessageEventModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-import type * as TrueForge from "../index.js";
-
-/**
- * Catalog model FQN (`provider/model`) that produced this message.
- */
-export interface ModelMessageEventModel {
- /** Model FQN: `provider/model`, e.g. `openai/gpt-5.2`. */
- name: string;
- params?: TrueForge.ModelParams;
-}
diff --git a/packages/trueforge-sdk/src/api/types/index.ts b/packages/trueforge-sdk/src/api/types/index.ts
index a4895e9ea..e05a49b08 100644
--- a/packages/trueforge-sdk/src/api/types/index.ts
+++ b/packages/trueforge-sdk/src/api/types/index.ts
@@ -141,7 +141,6 @@ export * from "./ModelMessageDeltaEvent.js";
export * from "./ModelMessageEvent.js";
export * from "./ModelMessageEventContent.js";
export * from "./ModelMessageEventContentOneItem.js";
-export * from "./ModelMessageEventModel.js";
export * from "./ModelMessageUsage.js";
export * from "./ModelMessageUsageInputTokensBreakdown.js";
export * from "./ModelParams.js";
diff --git a/packages/trueforge-sdk/src/serialization/types/ModelMessageEvent.ts b/packages/trueforge-sdk/src/serialization/types/ModelMessageEvent.ts
index 1b526a487..c91c3e432 100644
--- a/packages/trueforge-sdk/src/serialization/types/ModelMessageEvent.ts
+++ b/packages/trueforge-sdk/src/serialization/types/ModelMessageEvent.ts
@@ -4,8 +4,8 @@ import type * as TrueForge from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
import { FinishReason } from "./FinishReason.js";
+import { Model } from "./Model.js";
import { ModelMessageEventContent } from "./ModelMessageEventContent.js";
-import { ModelMessageEventModel } from "./ModelMessageEventModel.js";
import { ModelMessageUsage } from "./ModelMessageUsage.js";
import { ToolCall } from "./ToolCall.js";
@@ -17,7 +17,7 @@ export const ModelMessageEvent: core.serialization.ObjectSchema<
createdAt: core.serialization.property("created_at", core.serialization.string()),
finishReason: core.serialization.property("finish_reason", FinishReason.optionalNullable()),
id: core.serialization.string(),
- model: ModelMessageEventModel.optional(),
+ model: Model.optional(),
name: core.serialization.string().optional(),
reasoningContent: core.serialization.property("reasoning_content", core.serialization.string().optional()),
refusal: core.serialization.string().optionalNullable(),
@@ -33,7 +33,7 @@ export declare namespace ModelMessageEvent {
created_at: string;
finish_reason?: (FinishReason.Raw | null | undefined) | null;
id: string;
- model?: ModelMessageEventModel.Raw | null;
+ model?: Model.Raw | null;
name?: string | null;
reasoning_content?: string | null;
refusal?: (string | null | undefined) | null;
diff --git a/packages/trueforge-sdk/src/serialization/types/ModelMessageEventModel.ts b/packages/trueforge-sdk/src/serialization/types/ModelMessageEventModel.ts
deleted file mode 100644
index 5f0111fb5..000000000
--- a/packages/trueforge-sdk/src/serialization/types/ModelMessageEventModel.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-import type * as TrueForge from "../../api/index.js";
-import * as core from "../../core/index.js";
-import type * as serializers from "../index.js";
-import { ModelParams } from "./ModelParams.js";
-
-export const ModelMessageEventModel: core.serialization.ObjectSchema<
- serializers.ModelMessageEventModel.Raw,
- TrueForge.ModelMessageEventModel
-> = core.serialization.object({
- name: core.serialization.string(),
- params: ModelParams.optional(),
-});
-
-export declare namespace ModelMessageEventModel {
- export interface Raw {
- name: string;
- params?: ModelParams.Raw | null;
- }
-}
diff --git a/packages/trueforge-sdk/src/serialization/types/index.ts b/packages/trueforge-sdk/src/serialization/types/index.ts
index a4895e9ea..e05a49b08 100644
--- a/packages/trueforge-sdk/src/serialization/types/index.ts
+++ b/packages/trueforge-sdk/src/serialization/types/index.ts
@@ -141,7 +141,6 @@ export * from "./ModelMessageDeltaEvent.js";
export * from "./ModelMessageEvent.js";
export * from "./ModelMessageEventContent.js";
export * from "./ModelMessageEventContentOneItem.js";
-export * from "./ModelMessageEventModel.js";
export * from "./ModelMessageUsage.js";
export * from "./ModelMessageUsageInputTokensBreakdown.js";
export * from "./ModelParams.js";
diff --git a/packages/trueforge-sdk/tests/wire/sandboxEnvironments.test.ts b/packages/trueforge-sdk/tests/wire/sandboxEnvironments.test.ts
index caf67b14f..46a75554c 100644
--- a/packages/trueforge-sdk/tests/wire/sandboxEnvironments.test.ts
+++ b/packages/trueforge-sdk/tests/wire/sandboxEnvironments.test.ts
@@ -434,6 +434,30 @@ describe("SandboxEnvironmentsClient", () => {
const rawRequestBody = { manifest: { name: "xy" } };
const rawResponseBody = { error: { message: "message" } };
+ server
+ .mockEndpoint()
+ .put("/api/v1/sandbox-environments")
+ .jsonBody(rawRequestBody)
+ .respondWith()
+ .statusCode(404)
+ .jsonBody(rawResponseBody)
+ .build();
+
+ await expect(async () => {
+ return await client.sandboxEnvironments.createOrUpdate({
+ manifest: {
+ name: "xy",
+ },
+ });
+ }).rejects.toThrow(TrueForgeTypes.NotFoundError);
+ });
+
+ test("create_or_update (5)", async () => {
+ const server = mockServerPool.createServer();
+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
+ const rawRequestBody = { manifest: { name: "xy" } };
+ const rawResponseBody = { error: { message: "message" } };
+
server
.mockEndpoint()
.put("/api/v1/sandbox-environments")
@@ -452,7 +476,7 @@ describe("SandboxEnvironmentsClient", () => {
}).rejects.toThrow(TrueForgeTypes.ConflictError);
});
- test("create_or_update (5)", async () => {
+ test("create_or_update (6)", async () => {
const server = mockServerPool.createServer();
const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
const rawRequestBody = { manifest: { name: "xy" } };
@@ -476,7 +500,7 @@ describe("SandboxEnvironmentsClient", () => {
}).rejects.toThrow(TrueForgeTypes.UnprocessableEntityError);
});
- test("create_or_update (6)", async () => {
+ test("create_or_update (7)", async () => {
const server = mockServerPool.createServer();
const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });
const rawRequestBody = { manifest: { name: "xy" } };
diff --git a/packages/trueforge-ui/src/atoms/environments/EnvironmentsPage.tsx b/packages/trueforge-ui/src/atoms/environments/EnvironmentsPage.tsx
index 17a8cef20..0a9a483a9 100644
--- a/packages/trueforge-ui/src/atoms/environments/EnvironmentsPage.tsx
+++ b/packages/trueforge-ui/src/atoms/environments/EnvironmentsPage.tsx
@@ -5,6 +5,7 @@ import { useCallback, useEffect, useMemo, useRef, useState, type ComponentType }
import { useTrackAnalytics } from '../../analytics/AnalyticsProvider.js';
import { AnalyticsEvents } from '../../analytics/events.js';
import { useToasterOptional } from '../../containers/ToasterContainer.js';
+import { useOptionalCurrentUser } from '../../contexts/CurrentUserContext.js';
import { Icon } from '../../icons/Icon.js';
import { useSandboxEnvironmentServer } from '../../server/ServerContext.js';
import { useOptionalShellMode } from '../../server/ShellModeContext.js';
@@ -57,6 +58,7 @@ export type EnvironmentsPageProps = Record<string, never>;
export function EnvironmentsPage(_props: EnvironmentsPageProps) {
const environmentServer = useSandboxEnvironmentServer();
const shell = useOptionalShellMode();
+ const currentUser = useOptionalCurrentUser();
const toaster = useToasterOptional();
const track = useTrackAnalytics();
@@ -269,7 +271,7 @@ export function EnvironmentsPage(_props: EnvironmentsPageProps) {
</TableHeader>
<TableBody>
{filtered.map(env => {
- const readOnly = isEnvironmentReadOnly(env);
+ const readOnly = isEnvironmentReadOnly(env, currentUser?.subjectId);
return (
<TableRow
key={env.id}
diff --git a/packages/trueforge-ui/src/atoms/environments/environmentDisplay.ts b/packages/trueforge-ui/src/atoms/environments/environmentDisplay.ts
index 1b8e958ff..dbbb5dba3 100644
--- a/packages/trueforge-ui/src/atoms/environments/environmentDisplay.ts
+++ b/packages/trueforge-ui/src/atoms/environments/environmentDisplay.ts
@@ -10,8 +10,15 @@ export function isReservedEnvironmentName(name: string): boolean {
return name.trim() === RESERVED_ENVIRONMENT_NAME;
}
-export function isEnvironmentReadOnly(env: Pick<SandboxEnvironment, 'name'>): boolean {
- return isReservedEnvironmentName(env.name);
+export function isEnvironmentReadOnly(
+ env: Pick<SandboxEnvironment, 'name' | 'createdBySubject'>,
+ currentSubjectId?: string,
+): boolean {
+ return (
+ isReservedEnvironmentName(env.name) ||
+ currentSubjectId === undefined ||
+ env.createdBySubject.subjectId !== currentSubjectId
+ );
}
export function formatResourcesSummary(resources: SandboxEnvironmentManifest['resources']): string {
diff --git a/packages/trueforge-ui/src/contexts/CurrentUserContext.tsx b/packages/trueforge-ui/src/contexts/CurrentUserContext.tsx
index 25da6e642..4840d8a9c 100644
--- a/packages/trueforge-ui/src/contexts/CurrentUserContext.tsx
+++ b/packages/trueforge-ui/src/contexts/CurrentUserContext.tsx
@@ -2,6 +2,8 @@ import { createContext, useContext, type ReactNode } from 'react';
export type CurrentUser = {
displayName: string;
+ /** Stable subject identifier used for owner-only UI actions when available. */
+ subjectId?: string;
};
const CurrentUserContext = createContext<CurrentUser | undefined>(undefined);
diff --git a/packages/trueforge-ui/test/atoms/environments/EnvironmentsPage.test.tsx b/packages/trueforge-ui/test/atoms/environments/EnvironmentsPage.test.tsx
index 2c8473c1c..8565c4e0f 100644
--- a/packages/trueforge-ui/test/atoms/environments/EnvironmentsPage.test.tsx
+++ b/packages/trueforge-ui/test/atoms/environments/EnvironmentsPage.test.tsx
@@ -8,6 +8,7 @@ import type { TrackAnalytics } from '@/analytics/types.js';
import { EnvironmentsButton } from '@/atoms/EnvironmentsButton.js';
import { EnvironmentsPage, PENDING_ENVIRONMENTS_POLL_INTERVAL_MS } from '@/atoms/environments/EnvironmentsPage.js';
import { ToasterProvider } from '@/containers/ToasterContainer.js';
+import { CurrentUserProvider, type CurrentUser } from '@/contexts/CurrentUserContext.js';
import { ServerProvider } from '@/server/ServerContext.js';
import { ShellModeProvider } from '@/server/ShellModeContext.js';
import type { SandboxEnvironment, SandboxEnvironmentServer } from '@/server/types.js';
@@ -71,10 +72,12 @@ afterEach(() => {
function renderPage({
environments = sampleEnvironments,
environmentOverrides = {},
+ currentUser = { subjectId: 'user-1', displayName: 'alice' },
track,
}: {
environments?: SandboxEnvironment[];
environmentOverrides?: Partial<SandboxEnvironmentServer>;
+ currentUser?: CurrentUser;
track?: TrackAnalytics;
} = {}) {
const environmentServer = createMockSandboxEnvironmentServer({
@@ -88,11 +91,13 @@ function renderPage({
const tree = (
<ServerProvider server={server}>
- <ShellModeProvider agentConfig={{ mode: 'AgentLibraryWithComposer' }}>
- <ToasterProvider>
- <EnvironmentsPage />
- </ToasterProvider>
- </ShellModeProvider>
+ <CurrentUserProvider currentUser={currentUser}>
+ <ShellModeProvider agentConfig={{ mode: 'AgentLibraryWithComposer' }}>
+ <ToasterProvider>
+ <EnvironmentsPage />
+ </ToasterProvider>
+ </ShellModeProvider>
+ </CurrentUserProvider>
</ServerProvider>
);
return render(track != null ? <AnalyticsProvider track={track}>{tree}</AnalyticsProvider> : tree);
@@ -136,6 +141,35 @@ describe('EnvironmentsPage', () => {
});
});
+ it('does not offer edit or delete actions for another subject’s environment', async () => {
+ renderPage({
+ environments: [
+ {
+ ...sampleEnvironments[0]!,
+ createdBySubject: {
+ subjectId: 'user-2',
+ subjectType: 'user',
+ subjectDisplayName: 'bob',
+ },
+ },
+ ],
+ });
+
+ const name = await screen.findByText('python-data');
+ expect(screen.queryByRole('button', { name: 'Delete python-data' })).not.toBeInTheDocument();
+ fireEvent.click(name);
+ expect(screen.queryByText('Save')).not.toBeInTheDocument();
+ });
+
+ it('does not offer owner actions when the current subject id is unavailable', async () => {
+ renderPage({ currentUser: { displayName: 'alice' } });
+
+ const name = await screen.findByText('python-data');
+ expect(screen.queryByRole('button', { name: 'Delete python-data' })).not.toBeInTheDocument();
+ fireEvent.click(name);
+ expect(screen.queryByText('Save')).not.toBeInTheDocument();
+ });
+
it('polls pending environments using getEnvironment in the background', async () => {
vi.useFakeTimers({ shouldAdvanceTime: true });
const pendingEnv = {
diff --git a/packages/trueforge/src/apis/sandboxEnvironments.ts b/packages/trueforge/src/apis/sandboxEnvironments.ts
index 549ee31c1..fd7f20e85 100644
--- a/packages/trueforge/src/apis/sandboxEnvironments.ts
+++ b/packages/trueforge/src/apis/sandboxEnvironments.ts
@@ -97,12 +97,11 @@ export function createSandboxEnvironmentsRouter<TTransaction>(
const { sandboxEnvironmentStore: store, resolveAgentStore, resolveRequestContext, logger } = deps;
const listHandler: RouteHandler<typeof listSandboxEnvironmentsRoute> = async c => {
- const { tenant_id, subject } = resolveRequestContext(c);
+ const { tenant_id } = resolveRequestContext(c);
const { limit, page_token: pageToken } = c.req.valid('query');
try {
const listed = await store.listEnvironments({
tenant_id,
- created_by_subject_id: subject.id,
limit,
page_token: pageToken,
});
@@ -116,13 +115,11 @@ export function createSandboxEnvironmentsRouter<TTransaction>(
};
const getHandler: RouteHandler<typeof getSandboxEnvironmentRoute> = async c => {
- const { tenant_id, subject } = resolveRequestContext(c);
+ const { tenant_id } = resolveRequestContext(c);
const { name } = c.req.valid('param');
- // System default is tenant-wide; custom envs stay owner-scoped.
const loaded = await store.getEnvironment({
tenant_id,
name,
- ...(name === DEFAULT_SANDBOX_ENVIRONMENT_NAME ? {} : { created_by_subject_id: subject.id }),
});
if (!loaded) {
return c.json({ error: { message: `Sandbox environment not found: ${name}` } }, 404);
@@ -137,41 +134,25 @@ export function createSandboxEnvironmentsRouter<TTransaction>(
c,
body,
mode,
+ existing,
}: {
c: Context;
body: CreateSandboxEnvironmentRequest | UpdateSandboxEnvironmentRequest;
mode: 'create' | 'upsert';
+ existing: SandboxEnvironmentWithVersion | undefined;
}): Promise<WriteSandboxEnvironmentOutcome> {
const requestContext = resolveRequestContext(c);
const { manifest } = body;
- const provider = await resolveSandboxProviderRecord(deps.resolveSandboxProviderStore(c), requestContext.tenant_id);
- if (provider === undefined) {
- return { kind: 'error', status: 422, message: 'No sandbox provider configured' };
- }
-
const created_by_subject = createdBySubjectFromRequestContext(requestContext);
try {
- // Tenant-wide name check before secret sync so create cannot mutate another env's secrets.
- if (mode === 'create') {
- const taken = await store.getEnvironment({
- tenant_id: requestContext.tenant_id,
- name: manifest.name,
- });
- if (taken) {
- return {
- kind: 'error',
- status: 409,
- message: `Sandbox environment with name ${manifest.name} already exists`,
- };
- }
+ const provider = await resolveSandboxProviderRecord(
+ deps.resolveSandboxProviderStore(c),
+ requestContext.tenant_id,
+ );
+ if (provider === undefined) {
+ return { kind: 'error', status: 422, message: 'No sandbox provider configured' };
}
-
- const existing = await store.getEnvironment({
- tenant_id: requestContext.tenant_id,
- name: manifest.name,
- created_by_subject_id: requestContext.subject.id,
- });
const existingSecrets = existing
? await store.listSecretsByEnvironment({ environment_id: existing.environment.id })
: [];
@@ -232,7 +213,13 @@ export function createSandboxEnvironmentsRouter<TTransaction>(
}
const createHandler: RouteHandler<typeof createSandboxEnvironmentRoute> = async c => {
- const outcome = await writeSandboxEnvironment({ c, body: c.req.valid('json'), mode: 'create' });
+ const body = c.req.valid('json');
+ const { tenant_id } = resolveRequestContext(c);
+ const existing = await store.getEnvironment({ tenant_id, name: body.manifest.name });
+ if (existing) {
+ return c.json({ error: { message: `Sandbox environment with name ${body.manifest.name} already exists` } }, 409);
+ }
+ const outcome = await writeSandboxEnvironment({ c, body, mode: 'create', existing });
if (outcome.kind === 'error') {
return c.json({ error: { message: outcome.message } }, outcome.status);
}
@@ -241,7 +228,13 @@ export function createSandboxEnvironmentsRouter<TTransaction>(
// Create-or-update keyed by manifest.name.
const putHandler: RouteHandler<typeof putSandboxEnvironmentRoute> = async c => {
- const outcome = await writeSandboxEnvironment({ c, body: c.req.valid('json'), mode: 'upsert' });
+ const body = c.req.valid('json');
+ const { tenant_id, subject } = resolveRequestContext(c);
+ const existing = await store.getEnvironment({ tenant_id, name: body.manifest.name });
+ if (existing && existing.environment.created_by_subject.subject_id !== subject.id) {
+ return c.json({ error: { message: `Sandbox environment not found: ${body.manifest.name}` } }, 404);
+ }
+ const outcome = await writeSandboxEnvironment({ c, body, mode: 'upsert', existing });
if (outcome.kind === 'error') {
return c.json({ error: { message: outcome.message } }, outcome.status);
}
@@ -257,11 +250,13 @@ export function createSandboxEnvironmentsRouter<TTransaction>(
const existing = await store.getEnvironment({
tenant_id,
name,
- created_by_subject_id: subject.id,
});
if (!existing) {
return c.json({ error: { message: `Sandbox environment not found: ${name}` } }, 404);
}
+ if (existing.environment.created_by_subject.subject_id !== subject.id) {
+ return c.json({ error: { message: `Sandbox environment not found: ${name}` } }, 404);
+ }
const agentNames = await resolveAgentStore(c).listAgentNamesUsingSandboxEnvironment({
tenant_id,
environment_name: name,
diff --git a/packages/trueforge/src/db/postgres/sandbox-environment-store/PostgresSandboxEnvironmentStore.ts b/packages/trueforge/src/db/postgres/sandbox-environment-store/PostgresSandboxEnvironmentStore.ts
index 2eef94574..bb3d28490 100644
--- a/packages/trueforge/src/db/postgres/sandbox-environment-store/PostgresSandboxEnvironmentStore.ts
+++ b/packages/trueforge/src/db/postgres/sandbox-environment-store/PostgresSandboxEnvironmentStore.ts
@@ -184,15 +184,6 @@ export class PostgresSandboxEnvironmentStore implements ISandboxEnvironmentStore
const query = latestVersionJoin(db)
.where('env.tenant_id', '=', input.tenant_id)
.where('env.lifecycle_stage', '=', 'active')
- .where(eb =>
- eb.or([
- eb('env.name', '=', DEFAULT_SANDBOX_ENVIRONMENT_NAME),
- eb.and([
- eb('env.name', '!=', DEFAULT_SANDBOX_ENVIRONMENT_NAME),
- eb(sql`env.created_by_subject->>'subject_id'`, '=', input.created_by_subject_id),
- ]),
- ]),
- )
.orderBy('env.name');
if (!input.limit) {
const rows = await query.execute();
diff --git a/packages/trueforge/src/db/sandboxEnvironmentStore.ts b/packages/trueforge/src/db/sandboxEnvironmentStore.ts
index 788ef7dde..c874ce306 100644
--- a/packages/trueforge/src/db/sandboxEnvironmentStore.ts
+++ b/packages/trueforge/src/db/sandboxEnvironmentStore.ts
@@ -77,8 +77,6 @@ export function parseStoredSandboxEnvironmentManifest(manifest: unknown): Stored
export interface ListSandboxEnvironmentsInput {
tenant_id: string;
- /** Only environments created by this subject (tenant `"default"` is always included). */
- created_by_subject_id: string;
limit: number | undefined;
page_token: string | undefined;
}
@@ -87,7 +85,7 @@ export interface GetSandboxEnvironmentInput {
tenant_id: string;
name: string;
/**
- * When set (CRUD / agent attach), only return if this subject created the environment.
+ * When set, only return if this subject created the environment.
* Ignored for the tenant `"default"`. Omit when resolving an env during agent execution.
*/
created_by_subject_id?: string;
@@ -193,8 +191,6 @@ export interface ISandboxEnvironmentStore<TTransaction = never> {
): Promise<{ data: SandboxEnvironmentWithVersion[]; pagination: TokenPagination }>;
/**
* Active environment by name, joined to its latest version for management APIs.
- * Pass `created_by_subject_id` for owner-scoped CRUD/attach on custom envs; the tenant
- * `"default"` ignores ownership.
*/
getEnvironment(
input: GetSandboxEnvironmentInput,
diff --git a/packages/trueforge/src/db/sqlite/sandbox-environment-store/SqliteSandboxEnvironmentStore.ts b/packages/trueforge/src/db/sqlite/sandbox-environment-store/SqliteSandboxEnvironmentStore.ts
index 707566344..5834759a0 100644
--- a/packages/trueforge/src/db/sqlite/sandbox-environment-store/SqliteSandboxEnvironmentStore.ts
+++ b/packages/trueforge/src/db/sqlite/sandbox-environment-store/SqliteSandboxEnvironmentStore.ts
@@ -256,15 +256,6 @@ export class SqliteSandboxEnvironmentStore implements ISandboxEnvironmentStore<T
const query = latestVersionJoin(db)
.where('env.tenant_id', '=', input.tenant_id)
.where('env.lifecycle_stage', '=', 'active')
- .where(eb =>
- eb.or([
- eb('env.name', '=', DEFAULT_SANDBOX_ENVIRONMENT_NAME),
- eb.and([
- eb('env.name', '!=', DEFAULT_SANDBOX_ENVIRONMENT_NAME),
- eb(sql`json_extract(env.created_by_subject, '$.subject_id')`, '=', input.created_by_subject_id),
- ]),
- ]),
- )
.orderBy('env.name');
if (!input.limit) {
const rows = await query.execute();
diff --git a/packages/trueforge/src/routes/sandboxEnvironmentRoutes.ts b/packages/trueforge/src/routes/sandboxEnvironmentRoutes.ts
index ba901a7bf..4ba8a4b54 100644
--- a/packages/trueforge/src/routes/sandboxEnvironmentRoutes.ts
+++ b/packages/trueforge/src/routes/sandboxEnvironmentRoutes.ts
@@ -40,7 +40,7 @@ export const listSandboxEnvironmentsRoute = createRoute({
path: '/',
tags: [OpenApiTag.SANDBOXES],
summary: 'List sandbox environments',
- description: 'List the tenant default environment plus sandbox environments created by the authenticated subject.',
+ description: 'List available sandbox environments',
'x-fern-sdk-group-name': ['sandboxEnvironments'],
'x-fern-sdk-method-name': 'list',
'x-fern-pagination': TOKEN_PAGINATION,
@@ -68,8 +68,6 @@ export const getSandboxEnvironmentRoute = createRoute({
path: '/{name}',
tags: [OpenApiTag.SANDBOXES],
summary: 'Get a sandbox environment',
- description:
- 'Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.',
'x-fern-sdk-group-name': ['sandboxEnvironments'],
'x-fern-sdk-method-name': 'get',
request: {
@@ -139,7 +137,7 @@ export const putSandboxEnvironmentRoute = createRoute({
path: '/',
tags: [OpenApiTag.SANDBOXES],
summary: 'Create or update a sandbox environment',
- description: 'Create or replace by `manifest.name`. Requires a configured sandbox provider.',
+ description: 'Create a new sandbox environment or update an existing one.',
'x-fern-sdk-group-name': ['sandboxEnvironments'],
'x-fern-sdk-method-name': 'create_or_update',
request: {
@@ -161,6 +159,10 @@ export const putSandboxEnvironmentRoute = createRoute({
content: { 'application/json': { schema: RequestErrorResponseSchema } },
description: 'Unauthenticated.',
},
+ 404: {
+ content: { 'application/json': { schema: RequestErrorResponseSchema } },
+ description: 'Sandbox environment not found.',
+ },
409: {
content: { 'application/json': { schema: RequestErrorResponseSchema } },
description: 'Name conflict or concurrent update.',
@@ -181,7 +183,7 @@ export const deleteSandboxEnvironmentRoute = createRoute({
path: '/{name}',
tags: [OpenApiTag.SANDBOXES],
summary: 'Delete a sandbox environment',
- description: 'Delete by name. Fails if any agent still references the environment.',
+ description: 'Delete a sandbox environment, fails if any agent still references it.',
'x-fern-sdk-group-name': ['sandboxEnvironments'],
'x-fern-sdk-method-name': 'delete',
request: {
@@ -198,7 +200,7 @@ export const deleteSandboxEnvironmentRoute = createRoute({
},
404: {
content: { 'application/json': { schema: RequestErrorResponseSchema } },
- description: 'Sandbox environment not found.',
+ description: 'Sandbox environment not found or not owned by the caller.',
},
409: {
content: { 'application/json': { schema: RequestErrorResponseSchema } },
diff --git a/packages/trueforge/src/runtime/sessionResources.ts b/packages/trueforge/src/runtime/sessionResources.ts
index 9edd2281c..20562d6aa 100644
--- a/packages/trueforge/src/runtime/sessionResources.ts
+++ b/packages/trueforge/src/runtime/sessionResources.ts
@@ -265,7 +265,6 @@ export function buildTurnSandbox<TEnvironment = undefined>(input: {
export async function validateAgentSpec({
spec,
tenant_id,
- created_by_subject_id,
modelProviderStore,
mcpServerStore,
skillStore,
@@ -342,7 +341,6 @@ export async function validateAgentSpec({
const environment = await sandboxEnvironmentStore.getEnvironment({
tenant_id,
name: environmentName,
- created_by_subject_id,
});
if (environment === undefined) {
throw new HTTPException(422, {
diff --git a/packages/trueforge/tests/unit/apis/sandboxEnvironments.test.ts b/packages/trueforge/tests/unit/apis/sandboxEnvironments.test.ts
index a387aaf79..c51953cec 100644
--- a/packages/trueforge/tests/unit/apis/sandboxEnvironments.test.ts
+++ b/packages/trueforge/tests/unit/apis/sandboxEnvironments.test.ts
@@ -2,7 +2,7 @@ import { DAYTONA_SNAPSHOT_NOT_STARTED_REASON } from '@truefoundry/trueforge-core
import { createLogger } from 'winston';
import { createSandboxEnvironmentBuildRouter } from '../../../src/apis/sandboxEnvironmentBuild';
import { createSandboxEnvironmentsRouter } from '../../../src/apis/sandboxEnvironments';
-import { STANDALONE_REQUEST_CONTEXT } from '../../../src/auth/identity';
+import { STANDALONE_REQUEST_CONTEXT, type RequestContext } from '../../../src/auth/identity';
import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';
import { createSqliteDb } from '../../../src/db/sqlite/client';
import { SqliteSandboxEnvironmentStore } from '../../../src/db/sqlite/sandbox-environment-store/SqliteSandboxEnvironmentStore';
@@ -38,6 +38,7 @@ describe('sandbox environments API β†’ build controller path', () => {
async function setup() {
const db = createSqliteDb(':memory:');
await migrateSqliteToLatest(db);
+ let requestContext: RequestContext = STANDALONE_REQUEST_CONTEXT;
const sandboxEnvironmentStore = new SqliteSandboxEnvironmentStore(db);
const sandboxProviderStore = new SqliteSandboxProviderStore(db);
await sandboxProviderStore.upsertSandboxProvider({
@@ -52,7 +53,7 @@ describe('sandbox environments API β†’ build controller path', () => {
listAgentNamesUsingSandboxEnvironment: jest.fn().mockResolvedValue([]),
}) as never,
resolveSandboxProviderStore: () => sandboxProviderStore,
- resolveRequestContext: () => STANDALONE_REQUEST_CONTEXT,
+ resolveRequestContext: () => requestContext,
logger,
});
const buildRouter = createSandboxEnvironmentBuildRouter({
@@ -60,7 +61,17 @@ describe('sandbox environments API β†’ build controller path', () => {
sandboxProviderStore,
logger,
});
- return { publicRouter, buildRouter, sandboxEnvironmentStore };
+ return {
+ publicRouter,
+ buildRouter,
+ sandboxEnvironmentStore,
+ setSubject(subjectId: string) {
+ requestContext = {
+ ...STANDALONE_REQUEST_CONTEXT,
+ subject: { id: subjectId, type: 'user', display_name: subjectId },
+ };
+ },
+ };
}
it('PUT custom env lands pending; internal progress marks ready after build', async () => {
@@ -223,4 +234,54 @@ describe('sandbox environments API β†’ build controller path', () => {
const listBody = (await listRes.json()) as { data: unknown[] };
expect(Array.isArray(listBody.data)).toBe(true);
});
+
+ it('shares tenant environments for reads and use while restricting writes to the creator', async () => {
+ const { publicRouter, setSubject } = await setup();
+ jest.mocked(providerUtils.toDaytonaSandboxProvider).mockReturnValue({
+ createSecret: jest.fn(),
+ updateSecret: jest.fn(),
+ deleteSecret: jest.fn(),
+ getBuildStatus: jest.fn(),
+ build: jest.fn(),
+ } as never);
+
+ setSubject('alice');
+ const body = {
+ manifest: {
+ name: 'shared-env',
+ description: 'created by alice',
+ image: { type: 'build', build_script: 'pip install httpx' },
+ },
+ };
+ expect(
+ (
+ await publicRouter.request('/', {
+ method: 'POST',
+ headers: { 'content-type': 'application/json' },
+ body: JSON.stringify(body),
+ })
+ ).status,
+ ).toBe(201);
+
+ setSubject('bob');
+ const listed = (await (await publicRouter.request('/')).json()) as { data: { name: string }[] };
+ expect(listed.data.map(environment => environment.name)).toContain('shared-env');
+ expect((await publicRouter.request('/shared-env')).status).toBe(200);
+
+ const update = await publicRouter.request('/', {
+ method: 'PUT',
+ headers: { 'content-type': 'application/json' },
+ body: JSON.stringify(body),
+ });
+ expect(update.status).toBe(404);
+ expect(await update.json()).toEqual({
+ error: { message: 'Sandbox environment not found: shared-env' },
+ });
+
+ const remove = await publicRouter.request('/shared-env', { method: 'DELETE' });
+ expect(remove.status).toBe(404);
+ expect(await remove.json()).toEqual({
+ error: { message: 'Sandbox environment not found: shared-env' },
+ });
+ });
});
diff --git a/packages/trueforge/tests/unit/runtime/sessionResources.test.ts b/packages/trueforge/tests/unit/runtime/sessionResources.test.ts
index 4739ab751..f69a001e7 100644
--- a/packages/trueforge/tests/unit/runtime/sessionResources.test.ts
+++ b/packages/trueforge/tests/unit/runtime/sessionResources.test.ts
@@ -317,6 +317,39 @@ describe('validateAgentSpec', () => {
).resolves.toBeUndefined();
});
+ it('allows an agent to use a sandbox environment created by another tenant subject', async () => {
+ const stores = await setup();
+ await stores.sandboxProviderStore.upsertSandboxProvider({
+ tenant_id: 'default',
+ manifest: {
+ type: 'daytona',
+ auth: { api_key: 'dtn-test' },
+ exec_timeout_ms: 60_000,
+ auto_stop_interval_in_minutes: 5,
+ auto_archive_interval_in_minutes: 60,
+ auto_delete_interval_in_minutes: 7200,
+ },
+ });
+ const getEnvironment = jest.spyOn(stores.sandboxEnvironmentStore, 'getEnvironment').mockResolvedValue({} as never);
+
+ await expect(
+ validateAgentSpec({
+ spec: AgentSpecSchema.parse({
+ model: { name: 'test-provider/test-model' },
+ instructions: 'test',
+ config: { sandbox: { enabled: true, environment_name: 'shared-env' } },
+ }),
+ tenant_id: 'default',
+ created_by_subject_id: 'agent-author',
+ ...stores,
+ }),
+ ).resolves.toBeUndefined();
+ expect(getEnvironment).toHaveBeenCalledWith({
+ tenant_id: 'default',
+ name: 'shared-env',
+ });
+ });
+
it('admits sandbox.enabled when local fallback is cached and the store is empty', async () => {
const stores = await setup();
setCachedLocalSandboxSupport({
diff --git a/packages/trueforge/tests/unit/truefoundry/TrueFoundrySandboxEnvironmentStore.test.ts b/packages/trueforge/tests/unit/truefoundry/TrueFoundrySandboxEnvironmentStore.test.ts
index 3eb4fafcf..5b8026982 100644
--- a/packages/trueforge/tests/unit/truefoundry/TrueFoundrySandboxEnvironmentStore.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/TrueFoundrySandboxEnvironmentStore.test.ts
@@ -90,7 +90,6 @@ describe('TrueFoundrySandboxEnvironmentStore', () => {
const listed = await store.listEnvironments({
tenant_id: TENANT,
- created_by_subject_id: SUBJECT_ID,
limit: 25,
page_token: undefined,
});
@@ -108,7 +107,6 @@ describe('TrueFoundrySandboxEnvironmentStore', () => {
const listed = await store.listEnvironments({
tenant_id: TENANT,
- created_by_subject_id: SUBJECT_ID,
limit: 25,
page_token: undefined,
});
diff --git a/python/trueforge_sdk/reference.md b/python/trueforge_sdk/reference.md
index 7ebef4ab3..46fef12c4 100644
--- a/python/trueforge_sdk/reference.md
+++ b/python/trueforge_sdk/reference.md
@@ -1062,7 +1062,7 @@ client.models.list()
<dl>
<dd>
-List the tenant default environment plus sandbox environments created by the authenticated subject.
+List available sandbox environments
</dd>
</dl>
</dd>
@@ -1214,7 +1214,7 @@ client.sandbox_environments.create(
<dl>
<dd>
-Create or replace by `manifest.name`. Requires a configured sandbox provider.
+Create a new sandbox environment or update an existing one.
</dd>
</dl>
</dd>
@@ -1280,20 +1280,6 @@ client.sandbox_environments.create_or_update(
<dl>
<dd>
-#### πŸ“ Description
-
-<dl>
-<dd>
-
-<dl>
-<dd>
-
-Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.
-</dd>
-</dl>
-</dd>
-</dl>
-
#### πŸ”Œ Usage
<dl>
@@ -1360,7 +1346,7 @@ client.sandbox_environments.get(
<dl>
<dd>
-Delete by name. Fails if any agent still references the environment.
+Delete a sandbox environment, fails if any agent still references it.
</dd>
</dl>
</dd>
diff --git a/python/trueforge_sdk/src/trueforge_sdk/__init__.py b/python/trueforge_sdk/src/trueforge_sdk/__init__.py
index 76e9965d5..c4ccacf02 100644
--- a/python/trueforge_sdk/src/trueforge_sdk/__init__.py
+++ b/python/trueforge_sdk/src/trueforge_sdk/__init__.py
@@ -150,7 +150,6 @@ if typing.TYPE_CHECKING:
ModelMessageEvent,
ModelMessageEventContent,
ModelMessageEventContentOneItem,
- ModelMessageEventModel,
ModelMessageUsage,
ModelMessageUsageInputTokensBreakdown,
ModelParams,
@@ -464,7 +463,6 @@ _dynamic_imports: typing.Dict[str, str] = {
"ModelMessageEvent": ".types",
"ModelMessageEventContent": ".types",
"ModelMessageEventContentOneItem": ".types",
- "ModelMessageEventModel": ".types",
"ModelMessageUsage": ".types",
"ModelMessageUsageInputTokensBreakdown": ".types",
"ModelParams": ".types",
@@ -788,7 +786,6 @@ __all__ = [
"ModelMessageEvent",
"ModelMessageEventContent",
"ModelMessageEventContentOneItem",
- "ModelMessageEventModel",
"ModelMessageUsage",
"ModelMessageUsageInputTokensBreakdown",
"ModelParams",
diff --git a/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/client.py b/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/client.py
index 85188dad1..995c66f88 100644
--- a/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/client.py
+++ b/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/client.py
@@ -39,7 +39,7 @@ class SandboxEnvironmentsClient:
request_options: typing.Optional[RequestOptions] = None,
) -> SyncPager[SandboxEnvironment, ListSandboxEnvironmentsResponse]:
"""
- List the tenant default environment plus sandbox environments created by the authenticated subject.
+ List available sandbox environments
Parameters
----------
@@ -113,7 +113,7 @@ class SandboxEnvironmentsClient:
self, *, manifest: SandboxEnvironmentManifestRequest, request_options: typing.Optional[RequestOptions] = None
) -> GetSandboxEnvironmentResponse:
"""
- Create or replace by `manifest.name`. Requires a configured sandbox provider.
+ Create a new sandbox environment or update an existing one.
Parameters
----------
@@ -148,8 +148,6 @@ class SandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> GetSandboxEnvironmentResponse:
"""
- Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.
-
Parameters
----------
name : str
@@ -182,7 +180,7 @@ class SandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> DeleteSandboxEnvironmentResponse:
"""
- Delete by name. Fails if any agent still references the environment.
+ Delete a sandbox environment, fails if any agent still references it.
Parameters
----------
@@ -236,7 +234,7 @@ class AsyncSandboxEnvironmentsClient:
request_options: typing.Optional[RequestOptions] = None,
) -> AsyncPager[SandboxEnvironment, ListSandboxEnvironmentsResponse]:
"""
- List the tenant default environment plus sandbox environments created by the authenticated subject.
+ List available sandbox environments
Parameters
----------
@@ -327,7 +325,7 @@ class AsyncSandboxEnvironmentsClient:
self, *, manifest: SandboxEnvironmentManifestRequest, request_options: typing.Optional[RequestOptions] = None
) -> GetSandboxEnvironmentResponse:
"""
- Create or replace by `manifest.name`. Requires a configured sandbox provider.
+ Create a new sandbox environment or update an existing one.
Parameters
----------
@@ -370,8 +368,6 @@ class AsyncSandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> GetSandboxEnvironmentResponse:
"""
- Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.
-
Parameters
----------
name : str
@@ -412,7 +408,7 @@ class AsyncSandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> DeleteSandboxEnvironmentResponse:
"""
- Delete by name. Fails if any agent still references the environment.
+ Delete a sandbox environment, fails if any agent still references it.
Parameters
----------
diff --git a/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/raw_client.py b/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/raw_client.py
index d899d072f..258990e88 100644
--- a/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/raw_client.py
+++ b/python/trueforge_sdk/src/trueforge_sdk/sandbox_environments/raw_client.py
@@ -42,7 +42,7 @@ class RawSandboxEnvironmentsClient:
request_options: typing.Optional[RequestOptions] = None,
) -> SyncPager[SandboxEnvironment, ListSandboxEnvironmentsResponse]:
"""
- List the tenant default environment plus sandbox environments created by the authenticated subject.
+ List available sandbox environments
Parameters
----------
@@ -231,7 +231,7 @@ class RawSandboxEnvironmentsClient:
self, *, manifest: SandboxEnvironmentManifestRequest, request_options: typing.Optional[RequestOptions] = None
) -> HttpResponse[GetSandboxEnvironmentResponse]:
"""
- Create or replace by `manifest.name`. Requires a configured sandbox provider.
+ Create a new sandbox environment or update an existing one.
Parameters
----------
@@ -291,6 +291,17 @@ class RawSandboxEnvironmentsClient:
),
),
)
+ if _response.status_code == 404:
+ raise NotFoundError(
+ headers=dict(_response.headers),
+ body=typing.cast(
+ RequestErrorResponse,
+ construct_type(
+ type_=RequestErrorResponse, # type: ignore
+ object_=_response.json(),
+ ),
+ ),
+ )
if _response.status_code == 409:
raise ConflictError(
headers=dict(_response.headers),
@@ -337,8 +348,6 @@ class RawSandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> HttpResponse[GetSandboxEnvironmentResponse]:
"""
- Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.
-
Parameters
----------
name : str
@@ -402,7 +411,7 @@ class RawSandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> HttpResponse[DeleteSandboxEnvironmentResponse]:
"""
- Delete by name. Fails if any agent still references the environment.
+ Delete a sandbox environment, fails if any agent still references it.
Parameters
----------
@@ -509,7 +518,7 @@ class AsyncRawSandboxEnvironmentsClient:
request_options: typing.Optional[RequestOptions] = None,
) -> AsyncPager[SandboxEnvironment, ListSandboxEnvironmentsResponse]:
"""
- List the tenant default environment plus sandbox environments created by the authenticated subject.
+ List available sandbox environments
Parameters
----------
@@ -701,7 +710,7 @@ class AsyncRawSandboxEnvironmentsClient:
self, *, manifest: SandboxEnvironmentManifestRequest, request_options: typing.Optional[RequestOptions] = None
) -> AsyncHttpResponse[GetSandboxEnvironmentResponse]:
"""
- Create or replace by `manifest.name`. Requires a configured sandbox provider.
+ Create a new sandbox environment or update an existing one.
Parameters
----------
@@ -761,6 +770,17 @@ class AsyncRawSandboxEnvironmentsClient:
),
),
)
+ if _response.status_code == 404:
+ raise NotFoundError(
+ headers=dict(_response.headers),
+ body=typing.cast(
+ RequestErrorResponse,
+ construct_type(
+ type_=RequestErrorResponse, # type: ignore
+ object_=_response.json(),
+ ),
+ ),
+ )
if _response.status_code == 409:
raise ConflictError(
headers=dict(_response.headers),
@@ -807,8 +827,6 @@ class AsyncRawSandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> AsyncHttpResponse[GetSandboxEnvironmentResponse]:
"""
- Get a sandbox environment by name. The tenant default is readable by any tenant member; custom environments are owner-scoped.
-
Parameters
----------
name : str
@@ -872,7 +890,7 @@ class AsyncRawSandboxEnvironmentsClient:
self, *, name: str, request_options: typing.Optional[RequestOptions] = None
) -> AsyncHttpResponse[DeleteSandboxEnvironmentResponse]:
"""
- Delete by name. Fails if any agent still references the environment.
+ Delete a sandbox environment, fails if any agent still references it.
Parameters
----------
diff --git a/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py b/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py
index f7bd9bb6a..6a92da596 100644
--- a/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py
+++ b/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py
@@ -149,7 +149,6 @@ if typing.TYPE_CHECKING:
from .model_message_event import ModelMessageEvent
from .model_message_event_content import ModelMessageEventContent
from .model_message_event_content_one_item import ModelMessageEventContentOneItem
- from .model_message_event_model import ModelMessageEventModel
from .model_message_usage import ModelMessageUsage
from .model_message_usage_input_tokens_breakdown import ModelMessageUsageInputTokensBreakdown
from .model_params import ModelParams
@@ -420,7 +419,6 @@ _dynamic_imports: typing.Dict[str, str] = {
"ModelMessageEvent": ".model_message_event",
"ModelMessageEventContent": ".model_message_event_content",
"ModelMessageEventContentOneItem": ".model_message_event_content_one_item",
- "ModelMessageEventModel": ".model_message_event_model",
"ModelMessageUsage": ".model_message_usage",
"ModelMessageUsageInputTokensBreakdown": ".model_message_usage_input_tokens_breakdown",
"ModelParams": ".model_params",
@@ -715,7 +713,6 @@ __all__ = [
"ModelMessageEvent",
"ModelMessageEventContent",
"ModelMessageEventContentOneItem",
- "ModelMessageEventModel",
"ModelMessageUsage",
"ModelMessageUsageInputTokensBreakdown",
"ModelParams",
diff --git a/python/trueforge_sdk/src/trueforge_sdk/types/model_message_event.py b/python/trueforge_sdk/src/trueforge_sdk/types/model_message_event.py
index 7ae8f5b39..b539e9438 100644
--- a/python/trueforge_sdk/src/trueforge_sdk/types/model_message_event.py
+++ b/python/trueforge_sdk/src/trueforge_sdk/types/model_message_event.py
@@ -6,8 +6,8 @@ import pydantic
from ..core.pydantic_utilities import IS_PYDANTIC_V2
from ..core.unchecked_base_model import UncheckedBaseModel
from .finish_reason import FinishReason
+from .model import Model
from .model_message_event_content import ModelMessageEventContent
-from .model_message_event_model import ModelMessageEventModel
from .model_message_usage import ModelMessageUsage
from .tool_call import ToolCall
@@ -33,11 +33,7 @@ class ModelMessageEvent(UncheckedBaseModel):
Unique identifier for the event (monotonic ULID).
"""
- model: typing.Optional[ModelMessageEventModel] = pydantic.Field(default=None)
- """
- Catalog model FQN (`provider/model`) that produced this message.
- """
-
+ model: typing.Optional[Model] = None
name: typing.Optional[str] = pydantic.Field(default=None)
"""
Optional participant name.
diff --git a/python/trueforge_sdk/src/trueforge_sdk/types/model_message_event_model.py b/python/trueforge_sdk/src/trueforge_sdk/types/model_message_event_model.py
deleted file mode 100644
index c376a505e..000000000
--- a/python/trueforge_sdk/src/trueforge_sdk/types/model_message_event_model.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import typing
-
-import pydantic
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .model_params import ModelParams
-
-
-class ModelMessageEventModel(UncheckedBaseModel):
- """
- Catalog model FQN (`provider/model`) that produced this message.
- """
-
- name: str = pydantic.Field()
- """
- Model FQN: `provider/model`, e.g. `openai/gpt-5.2`.
- """
-
- params: typing.Optional[ModelParams] = None
-
- if IS_PYDANTIC_V2:
- model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow") # type: ignore # Pydantic v2
- else:
-
- class Config:
- smart_union = True
- extra = pydantic.Extra.allow