e2b-dev · beran-t · Mar 18, 2026 · Mar 18, 2026 · Mar 18, 2026 · Mar 18, 2026
diff --git a/docs.json b/docs.json
diff --git a/docs/agents/amp.mdx b/docs/agents/amp.mdx
@@ -8,7 +8,7 @@
 
 ## CLI
 
-Create a sandbox with the [E2B CLI](/docs/cli).
+Create a sandbox with the [E2B CLI](/docs/sandbox/cli).
 
 ```bash
 e2b sbx create amp
@@ -64,7 +64,7 @@

 const sandbox = await Sandbox.create('amp', {
  envs: { AMP_API_KEY: process.env.AMP_API_KEY },
  timeoutMs: 600_000,
 })

 await sandbox.git.clone('https://github.com/your-org/your-repo.git', {
@@ -180,7 +180,7 @@

 const sandbox = await Sandbox.create('amp', {
  envs: { AMP_API_KEY: process.env.AMP_API_KEY },
  timeoutMs: 600_000,
 })

 // Start a new thread
@@ -191,7 +191,7 @@

 // List threads and get the most recent thread ID
 const threads = await sandbox.commands.run('amp threads list --json')
 const threadId = JSON.parse(threads.stdout)[0].id

 // Continue the thread with a follow-up task
 const followUp = await sandbox.commands.run(
@@ -288,7 +288,7 @@

 <CodeGroup>
 ```bash JavaScript & TypeScript
 npx tsx build.ts
 ```
 ```bash Python
 python build.py
@@ -302,9 +302,9 @@
    Auto-pause, resume, and manage sandbox lifecycle
  </Card>
   <Card title="Git integration" icon="code-branch" href="/docs/sandbox/git-integration">
     Clone repos, manage branches, and push changes
   </Card>
-  <Card title="SSH access" icon="terminal" href="/docs/sandbox/ssh-access">
+  <Card title="SSH access" icon="terminal" href="/docs/sandbox/commands#ssh-access">
     Connect to the sandbox via SSH for interactive sessions
   </Card>
 </CardGroup>
diff --git a/docs/agents/claude-code.mdx b/docs/agents/claude-code.mdx
@@ -4,11 +4,11 @@
 icon: "/images/icons/claude-code.svg"
 ---

 [Claude Code](https://docs.anthropic.com/en/docs/claude-code) is Anthropic's agentic coding tool. E2B provides a pre-built `claude` template with Claude Code already installed.
 
 ## CLI
 
-Create a sandbox with the [E2B CLI](/docs/cli).
+Create a sandbox with the [E2B CLI](/docs/sandbox/cli).
 
 ```bash
 e2b sbx create claude
@@ -64,7 +64,7 @@

 const sandbox = await Sandbox.create('claude', {
  envs: { ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY },
  timeoutMs: 600_000,
 })

 await sandbox.git.clone('https://github.com/your-org/your-repo.git', {
@@ -220,7 +220,7 @@

 const sandbox = await Sandbox.create('claude', {
  envs: { ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY },
  timeoutMs: 600_000,
 })

 // Start a new session
@@ -230,7 +230,7 @@

 // Extract session ID from the JSON response
 const response = JSON.parse(initial.stdout)
 const sessionId = response.session_id

 // Continue with a follow-up task
 const followUp = await sandbox.commands.run(
@@ -326,7 +326,7 @@
 
 ## Connect MCP tools
 
-Claude Code has built-in support for [MCP](https://modelcontextprotocol.io/). E2B provides an [MCP gateway](/docs/mcp) that gives Claude access to 200+ tools from the [Docker MCP Catalog](https://hub.docker.com/mcp).
+Claude Code has built-in support for [MCP](https://modelcontextprotocol.io/). E2B provides an [MCP gateway](/docs/sandbox/mcp) that gives Claude access to 200+ tools from the [Docker MCP Catalog](https://hub.docker.com/mcp).
 
 <CodeGroup>
 ```typescript JavaScript & TypeScript
@@ -334,7 +334,7 @@

 const sandbox = await Sandbox.create('claude', {
  envs: { ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY },
  mcp: {
    browserbase: {
      apiKey: process.env.BROWSERBASE_API_KEY,
      projectId: process.env.BROWSERBASE_PROJECT_ID,
@@ -342,8 +342,8 @@
  },
 })

 const mcpUrl = sandbox.getMcpUrl()
 const mcpToken = await sandbox.getMcpToken()

 await sandbox.commands.run(
  `claude mcp add --transport http e2b-mcp-gateway ${mcpUrl} --header "Authorization: Bearer ${mcpToken}"`
@@ -437,7 +437,7 @@

 <CodeGroup>
 ```bash JavaScript & TypeScript
 npx tsx build.ts
 ```
 ```bash Python
 python build.py
@@ -447,13 +447,13 @@
 ## Related guides
 
 <CardGroup cols={3}>
-  <Card title="MCP tools" icon="plug" href="/docs/mcp">
+  <Card title="MCP tools" icon="plug" href="/docs/sandbox/mcp">
     Connect Claude Code to 200+ MCP tools
   </Card>
   <Card title="Sandbox persistence" icon="clock" href="/docs/sandbox/persistence">
    Auto-pause, resume, and manage sandbox lifecycle
  </Card>
  <Card title="Git integration" icon="code-branch" href="/docs/sandbox/git-integration">
    Clone repos, manage branches, and push changes
  </Card>
 </CardGroup>
diff --git a/docs/agents/codex.mdx b/docs/agents/codex.mdx
@@ -8,7 +8,7 @@
 
 ## CLI
 
-Create a sandbox with the [E2B CLI](/docs/cli).
+Create a sandbox with the [E2B CLI](/docs/sandbox/cli).
 
 ```bash
 e2b sbx create codex
@@ -66,7 +66,7 @@

 const sandbox = await Sandbox.create('codex', {
  envs: { CODEX_API_KEY: process.env.CODEX_API_KEY },
  timeoutMs: 600_000,
 })

 await sandbox.git.clone('https://github.com/your-org/your-repo.git', {
@@ -246,19 +246,19 @@

 ## Image input

 Pass screenshots or design mockups with `--image` to give Codex visual context alongside the prompt.

 <CodeGroup>
 ```typescript JavaScript & TypeScript
 import fs from 'fs'
 import { Sandbox } from 'e2b'

 const sandbox = await Sandbox.create('codex', {
  envs: { CODEX_API_KEY: process.env.CODEX_API_KEY },
  timeoutMs: 600_000,
 })

 // Upload a design mockup to the sandbox
 await sandbox.files.write(
  '/home/user/mockup.png',
  fs.readFileSync('./mockup.png')
@@ -344,7 +344,7 @@

 <CodeGroup>
 ```bash JavaScript & TypeScript
 npx tsx build.ts
 ```
 ```bash Python
 python build.py
@@ -358,9 +358,9 @@
    Auto-pause, resume, and manage sandbox lifecycle
  </Card>
   <Card title="Git integration" icon="code-branch" href="/docs/sandbox/git-integration">
     Clone repos, manage branches, and push changes
   </Card>
-  <Card title="SSH access" icon="terminal" href="/docs/sandbox/ssh-access">
+  <Card title="SSH access" icon="terminal" href="/docs/sandbox/commands#ssh-access">
     Connect to the sandbox via SSH for interactive sessions
   </Card>
 </CardGroup>
diff --git a/docs/agents/openclaw.mdx b/docs/agents/openclaw.mdx
@@ -8,7 +8,7 @@
 
 ## CLI
 
-Create a sandbox with the [E2B CLI](/docs/cli).
+Create a sandbox with the [E2B CLI](/docs/sandbox/cli).
 
 ```bash
 e2b sbx create openclaw
@@ -64,7 +64,7 @@

 const sandbox = await Sandbox.create('openclaw', {
  envs: { ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY },
  timeoutMs: 600_000,
 })

 await sandbox.git.clone('https://github.com/your-org/your-repo.git', {
@@ -168,7 +168,7 @@
 # Soul

 ## Core Truths
 - Be genuinely helpful, not performatively helpful
 - Be resourceful before asking — check the workspace, search the web, read docs

 ## Boundaries
@@ -399,7 +399,7 @@
  lifecycle: {
    onTimeout: 'pause',
  },
  timeoutMs: 10 * 60 * 1000,
 })

 // Start the gateway
@@ -438,7 +438,7 @@
 import { Template, waitForPort } from 'e2b'

 export const template = Template()
  .fromTemplate('openclaw')
  // Optional - start the OpenClaw gateway on sandbox start
  .setStartCmd(
    'openclaw gateway --port 18789 --verbose',
@@ -490,7 +490,7 @@

 <CodeGroup>
 ```bash JavaScript & TypeScript
 npx tsx build.ts
 ```
 ```bash Python
 python build.py
@@ -504,9 +504,9 @@
    Auto-pause, resume, and manage sandbox lifecycle
  </Card>
   <Card title="Git integration" icon="code-branch" href="/docs/sandbox/git-integration">
     Clone repos, manage branches, and push changes
   </Card>
-  <Card title="SSH access" icon="terminal" href="/docs/sandbox/ssh-access">
+  <Card title="SSH access" icon="terminal" href="/docs/sandbox/commands#ssh-access">
     Connect to the sandbox via SSH for interactive sessions
   </Card>
 </CardGroup>
diff --git a/docs/agents/opencode.mdx b/docs/agents/opencode.mdx
@@ -8,7 +8,7 @@
 
 ## CLI
 
-Create a sandbox with the [E2B CLI](/docs/cli).
+Create a sandbox with the [E2B CLI](/docs/sandbox/cli).
 
 ```bash
 e2b sbx create opencode
@@ -64,7 +64,7 @@

 const sandbox = await Sandbox.create('opencode', {
  envs: { ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY },
  timeoutMs: 600_000,
 })

 await sandbox.git.clone('https://github.com/your-org/your-repo.git', {
@@ -125,7 +125,7 @@
  lifecycle: {
    onTimeout: 'pause', // "pause" | "kill"
  },
  timeoutMs: 10 * 60 * 1000,
 })

 // Start the OpenCode server
@@ -135,7 +135,7 @@

 // Wait for the server to be ready
 const host = sandbox.getHost(4096)
 const baseUrl = `https://${host}`
 while (true) {
  try {
    await fetch(`${baseUrl}/global/health`)
@@ -210,7 +210,7 @@
 import { Template, waitForPort } from 'e2b'

 export const template = Template()
  .fromTemplate('opencode')
  .setEnvs({
    OPENCODE_SERVER_PASSWORD: 'your-password',
  })
@@ -268,7 +268,7 @@

 <CodeGroup>
 ```bash JavaScript & TypeScript
 npx tsx build.ts
 ```
 ```bash Python
 python build.py
@@ -282,9 +282,9 @@
    Auto-pause, resume, and manage sandbox lifecycle
  </Card>
   <Card title="Git integration" icon="code-branch" href="/docs/sandbox/git-integration">
     Clone repos, manage branches, and push changes
   </Card>
-  <Card title="SSH access" icon="terminal" href="/docs/sandbox/ssh-access">
+  <Card title="SSH access" icon="terminal" href="/docs/sandbox/commands#ssh-access">
     Connect to the sandbox via SSH for interactive sessions
   </Card>
 </CardGroup>
diff --git a/docs/billing.mdx b/docs/billing.mdx
@@ -21,7 +21,7 @@ E2B uses [usage-based pricing](#usage-based-pricing) - you pay only for what you
 Pro plan includes 100 concurrent sandboxes. Higher concurrency up to 1,100 is available as a purchasable [add-on](https://e2b.dev/dashboard?tab=billing).
 </Note>
 
-Plans have different [API rate limits](/docs/sandbox/rate-limits).
+Plans have different [API rate limits](/docs/sandbox/security#rate-limits).
 
 To upgrade your plan or purchase add-ons, visit the [dashboard billing tab](https://e2b.dev/dashboard?tab=billing). For Enterprise plans, [contact sales](mailto:enterprise@e2b.dev).
 
@@ -96,8 +96,8 @@ Check your usage and costs in the [dashboard usage tab](https://e2b.dev/dashboar
     - **Pause sandboxes when idle** - Use `sbx.pause()` to stop billing while keeping state available for later
     - **Kill sandboxes you no longer need** - Use `sbx.kill()` to stop billing and release resources permanently
     - **Allocate only what you need** - Start with default resources (2 vCPU, 1 GB RAM) and increase only if necessary
-    - **Monitor actively running sandboxes** - Use the [CLI](/docs/cli/list-sandboxes) or [dashboard](https://e2b.dev/dashboard?tab=usage) to track active sandboxes
-    - **Use lifecycle events** - Set up [webhooks](/docs/sandbox/lifecycle-events-webhooks) to get notified when sandboxes are created
+    - **Monitor actively running sandboxes** - Use the [CLI](/docs/sandbox/cli#list-sandboxes) or [dashboard](https://e2b.dev/dashboard?tab=usage) to track active sandboxes
+    - **Use lifecycle events** - Set up [webhooks](/docs/sandbox/observability#lifecycle-webhooks) to get notified when sandboxes are created
   </Accordion>
 
   <Accordion title="Do I pay for stopped sandboxes?">

diff --git a/docs/cli.mdx b/docs/cli.mdx
diff --git a/docs/cli/auth.mdx b/docs/cli/auth.mdx
diff --git a/docs/cli/connect-to-sandbox.mdx b/docs/cli/connect-to-sandbox.mdx
diff --git a/docs/cli/create-sandbox.mdx b/docs/cli/create-sandbox.mdx
diff --git a/docs/cli/exec-command.mdx b/docs/cli/exec-command.mdx
diff --git a/docs/cli/list-sandboxes.mdx b/docs/cli/list-sandboxes.mdx
diff --git a/docs/cli/shutdown-sandboxes.mdx b/docs/cli/shutdown-sandboxes.mdx