From 81aeb6e5e5a18e667f8b464b5e1bdcc512c5af49 Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 18:30:43 -0700
Subject: [PATCH 1/9] Allow dashboard terminal PTY settings

---
 .../sandboxes/[sandboxId]/terminal/page.tsx   |  19 ++-
 .../dashboard/[teamSlug]/terminal/page.tsx    |  14 +-
 src/app/dashboard/route.ts                    |   5 +-
 src/core/shared/create-envd-sandbox.ts        |  24 ++-
 .../dashboard/sandbox/terminal/view.tsx       |  10 +-
 src/features/dashboard/terminal/constants.ts  |   2 +-
 .../dashboard-terminal-command-dialog.tsx     |  78 ++++++---
 .../dashboard/terminal/dashboard-terminal.tsx | 124 ++++++++++++--
 .../dashboard/terminal/pty-options.ts         |  86 ++++++++++
 .../terminal/pty-settings-dialog.tsx          | 155 ++++++++++++++++++
 src/features/dashboard/terminal/storage.ts    |  62 ++++++-
 .../dashboard/terminal/terminal-panel.tsx     |  30 +++-
 src/features/dashboard/terminal/types.ts      |   5 +-
 tests/unit/dashboard-terminal.test.ts         |  58 +++++++
 tests/unit/sandbox-side-effects.test.ts       |  27 +++
 15 files changed, 652 insertions(+), 47 deletions(-)
 create mode 100644 src/features/dashboard/terminal/pty-options.ts
 create mode 100644 src/features/dashboard/terminal/pty-settings-dialog.tsx

diff --git a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx
index 4d7f78f1a..81eaa323c 100644
--- a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx
+++ b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx
@@ -2,6 +2,10 @@ import { redirect } from 'next/navigation'
 import { AUTH_URLS, PROTECTED_URLS } from '@/configs/urls'
 import { getAuthContext } from '@/core/server/auth'
 import { getTeamIdFromSlug } from '@/core/server/functions/team/get-team-id-from-slug'
+import {
+  hasPtyOptionsSearchParams,
+  parsePtyOptionsFromSearchParams,
+} from '@/features/dashboard/terminal/pty-options'
 import SandboxTerminalView from '@/features/dashboard/sandbox/terminal/view'
 
 interface SandboxTerminalPageProps {
@@ -10,6 +14,9 @@ interface SandboxTerminalPageProps {
   }>
   searchParams: Promise<{
     command?: string
+    cwd?: string
+    env?: string | string[]
+    user?: string
   }>
 }
 
@@ -17,11 +24,12 @@ export default async function SandboxTerminalPage({
   params,
   searchParams,
 }: SandboxTerminalPageProps) {
-  const [{ teamSlug }, { command = '' }, authContext] = await Promise.all([
+  const [{ teamSlug }, terminalSearchParams, authContext] = await Promise.all([
     params,
     searchParams,
     getAuthContext(),
   ])
+  const { command = '' } = terminalSearchParams
 
   if (!authContext) {
     redirect(AUTH_URLS.SIGN_IN)
@@ -35,5 +43,12 @@ export default async function SandboxTerminalPage({
     redirect(PROTECTED_URLS.DASHBOARD)
   }
 
-  return <SandboxTerminalView command={command} userId={authContext.user.id} />
+  return (
+    <SandboxTerminalView
+      command={command}
+      ptyOptions={parsePtyOptionsFromSearchParams(terminalSearchParams)}
+      requiresConfirmation={hasPtyOptionsSearchParams(terminalSearchParams)}
+      userId={authContext.user.id}
+    />
+  )
 }
diff --git a/src/app/dashboard/[teamSlug]/terminal/page.tsx b/src/app/dashboard/[teamSlug]/terminal/page.tsx
index 3054eddf1..040dd553d 100644
--- a/src/app/dashboard/[teamSlug]/terminal/page.tsx
+++ b/src/app/dashboard/[teamSlug]/terminal/page.tsx
@@ -8,6 +8,10 @@ import { infra } from '@/core/shared/clients/api'
 import type { components as InfraComponents } from '@/core/shared/contracts/infra-api.types'
 import { SandboxIdSchema } from '@/core/shared/schemas/api'
 import DashboardTerminal from '@/features/dashboard/terminal/dashboard-terminal'
+import {
+  hasPtyOptionsSearchParams,
+  parsePtyOptionsFromSearchParams,
+} from '@/features/dashboard/terminal/pty-options'
 import { normalizeTerminalTemplate } from '@/features/dashboard/terminal/template'
 import { Button } from '@/ui/primitives/button'
 
@@ -22,8 +26,11 @@ interface TeamTerminalPageProps {
   }>
   searchParams: Promise<{
     command?: string
+    cwd?: string
+    env?: string | string[]
     sandboxId?: string
     template?: string
+    user?: string
   }>
 }
 
@@ -31,13 +38,16 @@ export default async function TeamTerminalPage({
   params,
   searchParams,
 }: TeamTerminalPageProps) {
-  const [{ teamSlug }, { command = '', sandboxId, template }] =
+  const [{ teamSlug }, terminalSearchParams] =
     await Promise.all([params, searchParams])
+  const { command = '', sandboxId, template } = terminalSearchParams
   const hasTemplateOverride = template !== undefined
   const requestedTemplate = hasTemplateOverride
     ? normalizeTerminalTemplate(template)
     : undefined
   const terminalSandboxId = normalizeTerminalSandboxId(sandboxId)
+  const ptyOptions = parsePtyOptionsFromSearchParams(terminalSearchParams)
+  const requiresConfirmation = hasPtyOptionsSearchParams(terminalSearchParams)
 
   if (!terminalSandboxId && hasTemplateOverride && !requestedTemplate) {
     return <TerminalUnavailable message="The terminal template is invalid." />
@@ -106,6 +116,8 @@ export default async function TeamTerminalPage({
         launchTarget={{
           command,
           forceNewSandbox: !terminalSandboxId && hasTemplateOverride,
+          ptyOptions,
+          requiresConfirmation,
           sandboxId: terminalSandboxId,
           template: terminalSandboxId
             ? terminalTemplate
diff --git a/src/app/dashboard/route.ts b/src/app/dashboard/route.ts
index a450bb833..d437eadfc 100644
--- a/src/app/dashboard/route.ts
+++ b/src/app/dashboard/route.ts
@@ -69,13 +69,16 @@ export async function GET(request: NextRequest) {
 
   // send everything to terminal if it's terminal
   if (tab === 'terminal') {
-    const terminalParams = ['template', 'sandboxId', 'command']
+    const terminalParams = ['template', 'sandboxId', 'command', 'user', 'cwd']
     terminalParams.forEach((param) => {
       const value = searchParams.get(param)
       if (value) {
         redirectUrl.searchParams.set(param, value)
       }
     })
+    searchParams.getAll('env').forEach((value) => {
+      redirectUrl.searchParams.append('env', value)
+    })
   }
 
   return NextResponse.redirect(redirectUrl)
diff --git a/src/core/shared/create-envd-sandbox.ts b/src/core/shared/create-envd-sandbox.ts
index 7699b5870..6507e6515 100644
--- a/src/core/shared/create-envd-sandbox.ts
+++ b/src/core/shared/create-envd-sandbox.ts
@@ -1,5 +1,7 @@
 import Sandbox, { type SandboxConnectOpts } from 'e2b'
 
+const SDK_ENVD_PORT = 49983
+
 /**
  * Sandbox-scoped credentials needed to talk to a sandbox's envd daemon
  * (filesystem + PTY). These are safe to expose to the browser: they grant
@@ -49,6 +51,26 @@ export function createEnvdSandbox(params: EnvdSandboxParams): Sandbox {
     envdAccessToken: params.envdAccessToken,
     trafficAccessToken: params.trafficAccessToken,
     domain: params.domain,
-    sandboxUrl: params.sandboxUrl,
+    sandboxUrl: resolveBrowserSandboxUrl(params.sandboxUrl, params.sandboxId),
   })
 }
+
+export function resolveBrowserSandboxUrl(
+  sandboxUrl: string | undefined,
+  sandboxId: string
+) {
+  if (!sandboxUrl || typeof window === 'undefined') return sandboxUrl
+
+  try {
+    const url = new URL(sandboxUrl)
+    const sandboxHostPrefix = `${SDK_ENVD_PORT}-${sandboxId}.`
+
+    if (!url.hostname.startsWith(sandboxHostPrefix)) {
+      url.hostname = `${sandboxHostPrefix}${url.hostname}`
+    }
+
+    return url.toString()
+  } catch {
+    return sandboxUrl
+  }
+}
diff --git a/src/features/dashboard/sandbox/terminal/view.tsx b/src/features/dashboard/sandbox/terminal/view.tsx
index 4b7292377..7b65fb90d 100644
--- a/src/features/dashboard/sandbox/terminal/view.tsx
+++ b/src/features/dashboard/sandbox/terminal/view.tsx
@@ -3,6 +3,7 @@
 import { type ReactNode, useMemo, useState } from 'react'
 import LoadingLayout from '@/features/dashboard/loading-layout'
 import DashboardTerminal from '@/features/dashboard/terminal/dashboard-terminal'
+import type { TerminalPtyOptions } from '@/features/dashboard/terminal/pty-options'
 import { useRouteParams } from '@/lib/hooks/use-route-params'
 import { useDashboard } from '../../context'
 import { useSandboxContext } from '../context'
@@ -10,6 +11,8 @@ import SandboxInspectNotFound from '../inspect/not-found'
 
 interface SandboxTerminalViewProps {
   command?: string
+  ptyOptions?: TerminalPtyOptions
+  requiresConfirmation?: boolean
   userId: string
 }
 
@@ -17,6 +20,8 @@ const SANDBOX_TERMINAL_RESUME_TIMEOUT_MS = 70_000
 
 export default function SandboxTerminalView({
   command,
+  ptyOptions,
+  requiresConfirmation = false,
   userId,
 }: SandboxTerminalViewProps) {
   const [shouldResumeSandbox, setShouldResumeSandbox] = useState(false)
@@ -34,10 +39,12 @@ export default function SandboxTerminalView({
   const launchTarget = useMemo(
     () => ({
       command,
+      ptyOptions,
+      requiresConfirmation,
       sandboxId,
       template: sandboxTemplate,
     }),
-    [command, sandboxId, sandboxTemplate]
+    [command, ptyOptions, requiresConfirmation, sandboxId, sandboxTemplate]
   )
 
   const finishSandboxResume = async () => {
@@ -84,6 +91,7 @@ export default function SandboxTerminalView({
   return (
     <div className="flex min-h-0 flex-1 overflow-hidden p-3 md:p-6">
       <DashboardTerminal
+        allowPtySettings
         autoStart
         launchTarget={launchTarget}
         onSandboxAttached={() => {
diff --git a/src/features/dashboard/terminal/constants.ts b/src/features/dashboard/terminal/constants.ts
index 6382dc5c2..4d3b39871 100644
--- a/src/features/dashboard/terminal/constants.ts
+++ b/src/features/dashboard/terminal/constants.ts
@@ -3,7 +3,7 @@ export const DEFAULT_COLS = 100
 export const DEFAULT_ROWS = 28
 export const DEFAULT_PANEL_HEIGHT = 260
 export const MAX_TERMINAL_TRANSCRIPT_CHARS = 200_000
+export const TERMINAL_PTY_SETTINGS_STORAGE_PREFIX = 'dashboard-terminal-pty'
 export const TERMINAL_SESSION_STORAGE_PREFIX = 'dashboard-terminal-session'
-export const DEFAULT_CWD = '/home/user'
 export const TERMINAL_AUTOSTART_DEBOUNCE_MS = 300
 export const TERMINAL_ATTACH_ATTEMPT_TIMEOUT_MS = 15_000
diff --git a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
index 34c6e902d..3452549fd 100644
--- a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
@@ -17,7 +17,7 @@ import type { PendingTerminalLaunch } from './types'
 interface DashboardTerminalCommandDialogProps {
   launch: PendingTerminalLaunch | null
   onCancel: () => void
-  onConfirm: (command: string) => void
+  onConfirm: (command?: string) => void
 }
 
 export default function DashboardTerminalCommandDialog({
@@ -27,6 +27,7 @@ export default function DashboardTerminalCommandDialog({
 }: DashboardTerminalCommandDialogProps) {
   const commandInputId = useId()
   const [command, setCommand] = useState('')
+  const hasCommand = !!launch?.command?.trim()
   const normalizedCommand = command.trim()
 
   useEffect(() => {
@@ -40,10 +41,13 @@ export default function DashboardTerminalCommandDialog({
           <div className="mb-1 flex size-9 items-center justify-center border bg-bg">
             <WarningIcon className="size-5 text-icon-tertiary" />
           </div>
-          <DialogTitle>Review terminal command</DialogTitle>
+          <DialogTitle>
+            {hasCommand ? 'Review terminal command' : 'Review terminal launch'}
+          </DialogTitle>
           <DialogDescription>
-            This command will run inside a persistent E2B sandbox after the
-            terminal opens.
+            {hasCommand
+              ? 'This command will run inside a persistent E2B sandbox after the terminal opens.'
+              : 'This terminal will open with the connection settings from the URL.'}
           </DialogDescription>
         </DialogHeader>
 
@@ -63,21 +67,51 @@ export default function DashboardTerminalCommandDialog({
                 {launch.target?.template ?? 'base'}
               </code>
             </div>
-            <div className="space-y-1">
-              <label
-                className="prose-label text-fg-tertiary"
-                htmlFor={commandInputId}
-              >
-                Command
-              </label>
-              <Textarea
-                className="max-h-48 min-h-24 font-mono text-xs"
-                id={commandInputId}
-                onChange={(event) => setCommand(event.target.value)}
-                spellCheck={false}
-                value={command}
-              />
-            </div>
+            {launch.target?.ptyOptions?.user ? (
+              <div className="space-y-1">
+                <p className="prose-label text-fg-tertiary">User</p>
+                <code className="block border bg-bg px-3 py-2 font-mono text-xs text-fg">
+                  {launch.target.ptyOptions.user}
+                </code>
+              </div>
+            ) : null}
+            {launch.target?.ptyOptions?.cwd ? (
+              <div className="space-y-1">
+                <p className="prose-label text-fg-tertiary">
+                  Working directory
+                </p>
+                <code className="block border bg-bg px-3 py-2 font-mono text-xs text-fg">
+                  {launch.target.ptyOptions.cwd}
+                </code>
+              </div>
+            ) : null}
+            {launch.target?.ptyOptions?.envs ? (
+              <div className="space-y-1">
+                <p className="prose-label text-fg-tertiary">Environment</p>
+                <code className="block max-h-32 overflow-auto whitespace-pre-wrap border bg-bg px-3 py-2 font-mono text-xs text-fg">
+                  {Object.entries(launch.target.ptyOptions.envs)
+                    .map(([key, value]) => `${key}=${value}`)
+                    .join('\n')}
+                </code>
+              </div>
+            ) : null}
+            {hasCommand ? (
+              <div className="space-y-1">
+                <label
+                  className="prose-label text-fg-tertiary"
+                  htmlFor={commandInputId}
+                >
+                  Command
+                </label>
+                <Textarea
+                  className="max-h-48 min-h-24 font-mono text-xs"
+                  id={commandInputId}
+                  onChange={(event) => setCommand(event.target.value)}
+                  spellCheck={false}
+                  value={command}
+                />
+              </div>
+            ) : null}
           </div>
         ) : null}
 
@@ -87,10 +121,10 @@ export default function DashboardTerminalCommandDialog({
           </Button>
           <Button
             type="button"
-            disabled={!normalizedCommand}
-            onClick={() => onConfirm(normalizedCommand)}
+            disabled={hasCommand && !normalizedCommand}
+            onClick={() => onConfirm(hasCommand ? normalizedCommand : undefined)}
           >
-            Run command
+            {hasCommand ? 'Run command' : 'Start terminal'}
           </Button>
         </DialogFooter>
       </DialogContent>
diff --git a/src/features/dashboard/terminal/dashboard-terminal.tsx b/src/features/dashboard/terminal/dashboard-terminal.tsx
index f1a949a68..56033c1bb 100644
--- a/src/features/dashboard/terminal/dashboard-terminal.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal.tsx
@@ -1,15 +1,27 @@
 'use client'
 
 import type { CommandHandle, Sandbox } from 'e2b'
-import { useCallback, useEffect, useEffectEvent, useRef, useState } from 'react'
+import {
+  useCallback,
+  useEffect,
+  useEffectEvent,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
 import { useTRPCClient } from '@/trpc/client'
 import {
-  DEFAULT_CWD,
   TERMINAL_ATTACH_ATTEMPT_TIMEOUT_MS,
   TERMINAL_AUTOSTART_DEBOUNCE_MS,
 } from './constants'
 import DashboardTerminalCommandDialog from './dashboard-terminal-command-dialog'
+import { normalizePtyOptions, type TerminalPtyOptions } from './pty-options'
+import PtySettingsDialog from './pty-settings-dialog'
 import { openTerminalSandbox } from './sandbox-session'
+import {
+  readStoredTerminalPtyOptions,
+  writeStoredTerminalPtyOptions,
+} from './storage'
 import {
   normalizeTerminalTemplate,
   resolveTerminalTemplateOverride,
@@ -29,6 +41,7 @@ const FLUSH_INPUT_RETRY_INTERVAL_MS = 250
 const MAX_INPUT_FLUSH_RETRIES = 2
 
 interface DashboardTerminalProps {
+  allowPtySettings?: boolean
   autoStart?: boolean
   getSandbox?: TerminalSandboxResolver
   launchTarget?: TerminalLaunchTarget
@@ -41,6 +54,7 @@ interface DashboardTerminalProps {
 }
 
 export default function DashboardTerminal({
+  allowPtySettings = false,
   autoStart = false,
   getSandbox,
   launchTarget,
@@ -58,9 +72,20 @@ export default function DashboardTerminal({
   const [template, setTemplate] = useState(
     normalizeTerminalTemplate(launchTarget?.template) ?? 'base'
   )
+  const launchTargetPtyOptions = useMemo(
+    () => normalizePtyOptions(launchTarget?.ptyOptions ?? {}),
+    [launchTarget?.ptyOptions]
+  )
+  const [ptyOptions, setPtyOptions] =
+    useState<TerminalPtyOptions>(launchTargetPtyOptions)
+  const [arePtySettingsLoaded, setArePtySettingsLoaded] = useState(
+    !allowPtySettings
+  )
+  const [isPtySettingsOpen, setIsPtySettingsOpen] = useState(false)
   const [pendingLaunch, setPendingLaunch] =
     useState<PendingTerminalLaunch | null>(null)
 
+  const ptyOptionsRef = useRef<TerminalPtyOptions>(launchTargetPtyOptions)
   const sandboxRef = useRef<Sandbox | null>(null)
   const ptyRef = useRef<CommandHandle | null>(null)
   const pidRef = useRef<number | undefined>(undefined)
@@ -337,7 +362,7 @@ export default function DashboardTerminal({
           rows: terminalSize.rows,
           timeoutMs: 0,
           requestTimeoutMs: TERMINAL_ATTACH_ATTEMPT_TIMEOUT_MS,
-          cwd: DEFAULT_CWD,
+          ...normalizePtyOptions(ptyOptionsRef.current),
           onData: (data) => {
             appendOutput(data)
           },
@@ -445,11 +470,11 @@ export default function DashboardTerminal({
         return
       }
 
-      if (command.trim()) {
-        // Commands can come from links, so require an explicit click before
-        // sending anything into the PTY.
+      if (command.trim() || options.target?.requiresConfirmation) {
+        // Commands and PTY settings can come from links, so require an
+        // explicit click before using them to start or write to a terminal.
         setPendingLaunch({
-          command: command.trim(),
+          command: command.trim() || undefined,
           target: {
             ...options.target,
             template: nextTemplate,
@@ -472,11 +497,11 @@ export default function DashboardTerminal({
   )
 
   const confirmPendingLaunch = useCallback(
-    (command: string) => {
+    (command?: string) => {
       if (!pendingLaunch) return
 
-      const normalizedCommand = command.trim()
-      if (!normalizedCommand) return
+      const normalizedCommand = command?.trim() ?? ''
+      if (pendingLaunch.command && !normalizedCommand) return
 
       const { target: launchTarget } = pendingLaunch
       const launchTemplate = launchTarget?.template ?? 'base'
@@ -489,8 +514,10 @@ export default function DashboardTerminal({
         (!launchSandboxId || activeSandboxId === launchSandboxId)
       ) {
         setPendingLaunch(null)
-        runCommand(normalizedCommand)
-        if (activeSandboxId) {
+        if (normalizedCommand) {
+          runCommand(normalizedCommand)
+        }
+        if (activeSandboxId && normalizedCommand) {
           updateTerminalUrl({
             clearCommand: true,
             sandboxId: activeSandboxId,
@@ -504,10 +531,13 @@ export default function DashboardTerminal({
       }
 
       setPendingLaunch(null)
-      pendingCommandsRef.current = [normalizedCommand]
+      pendingCommandsRef.current = normalizedCommand ? [normalizedCommand] : []
       void startTerminal({
         forceNewSandbox: !launchSandboxId && template !== launchTemplate,
-        target: launchTarget,
+        target: {
+          ...launchTarget,
+          requiresConfirmation: false,
+        },
       })
     },
     [
@@ -555,7 +585,56 @@ export default function DashboardTerminal({
     startTerminal,
   ])
 
+  const applyPtyOptions = useCallback(
+    (
+      options: TerminalPtyOptions,
+      { makeDefault }: { makeDefault: boolean }
+    ) => {
+      ptyOptionsRef.current = options
+      setPtyOptions(options)
+      if (makeDefault) {
+        writeStoredTerminalPtyOptions(userId, options)
+      }
+
+      if (sandboxScoped) {
+        if (!reconnectSandboxId && !getSandbox) return
+
+        void startTerminal({
+          target: reconnectTarget,
+        })
+        return
+      }
+
+      if (status === 'ready') {
+        void startTerminal({ forceNewSandbox: true })
+      }
+    },
+    [
+      getSandbox,
+      reconnectTarget,
+      reconnectSandboxId,
+      sandboxScoped,
+      startTerminal,
+      status,
+      userId,
+    ]
+  )
+
+  useEffect(() => {
+    if (!allowPtySettings) return
+
+    const storedOptions = readStoredTerminalPtyOptions(userId)
+    const nextOptions = normalizePtyOptions({
+      ...storedOptions,
+      ...launchTargetPtyOptions,
+    })
+    ptyOptionsRef.current = nextOptions
+    setPtyOptions(nextOptions)
+    setArePtySettingsLoaded(true)
+  }, [allowPtySettings, launchTargetPtyOptions, userId])
+
   useEffect(() => {
+    if (!arePtySettingsLoaded) return
     if (!autoStart || status !== 'idle' || isStartingRef.current) return
 
     const autoStartTimer = window.setTimeout(() => {
@@ -569,7 +648,13 @@ export default function DashboardTerminal({
     return () => {
       window.clearTimeout(autoStartTimer)
     }
-  }, [autoStart, launchTarget, queueTerminalCommand, status])
+  }, [
+    arePtySettingsLoaded,
+    autoStart,
+    launchTarget,
+    queueTerminalCommand,
+    status,
+  ])
 
   const handlePageHide = useEffectEvent((event: PageTransitionEvent) => {
     if (event.persisted) return
@@ -606,6 +691,7 @@ export default function DashboardTerminal({
   return (
     <>
       <TerminalPanel
+        canConfigurePty={allowPtySettings}
         sandboxId={activeSandboxId}
         restartDisabled={restartDisabled}
         restartLabel={restartLabel}
@@ -613,9 +699,17 @@ export default function DashboardTerminal({
         terminalContainerRef={terminalContainerRef}
         onFocusTerminal={focusTerminal}
         onCopyTerminalText={() => void copyTerminalText()}
+        onConfigurePty={() => setIsPtySettingsOpen(true)}
         onRestartTerminal={restartTerminal}
       />
 
+      <PtySettingsDialog
+        open={isPtySettingsOpen}
+        options={ptyOptions}
+        onApply={applyPtyOptions}
+        onOpenChange={setIsPtySettingsOpen}
+      />
+
       <DashboardTerminalCommandDialog
         launch={pendingLaunch}
         onCancel={() => setPendingLaunch(null)}
diff --git a/src/features/dashboard/terminal/pty-options.ts b/src/features/dashboard/terminal/pty-options.ts
new file mode 100644
index 000000000..0d878bd58
--- /dev/null
+++ b/src/features/dashboard/terminal/pty-options.ts
@@ -0,0 +1,86 @@
+export interface TerminalPtyOptions {
+  cwd?: string
+  envs?: Record<string, string>
+  user?: string
+}
+
+type TerminalPtySearchParams = Record<string, string | string[] | undefined>
+
+export function normalizePtyOptions(options: TerminalPtyOptions) {
+  const user = options.user?.trim()
+  const cwd = options.cwd?.trim()
+  const envs = options.envs
+    ? Object.fromEntries(
+        Object.entries(options.envs).filter(
+          ([key, value]) => key.trim() && value !== undefined
+        )
+      )
+    : undefined
+
+  return {
+    ...(user ? { user } : {}),
+    ...(cwd ? { cwd } : {}),
+    ...(envs && Object.keys(envs).length > 0 ? { envs } : {}),
+  }
+}
+
+export function parsePtyOptionsFromSearchParams(
+  searchParams: TerminalPtySearchParams
+) {
+  return normalizePtyOptions({
+    user: readFirstSearchParam(searchParams, 'user'),
+    cwd: readFirstSearchParam(searchParams, 'cwd'),
+    envs: parseEnvSearchParams(searchParams),
+  })
+}
+
+export function hasPtyOptionsSearchParams(
+  searchParams: TerminalPtySearchParams
+) {
+  return ['user', 'cwd', 'env'].some((key) => {
+    const value = searchParams[key]
+    return Array.isArray(value) ? value.length > 0 : value !== undefined
+  })
+}
+
+function readFirstSearchParam(
+  searchParams: TerminalPtySearchParams,
+  ...keys: string[]
+) {
+  for (const key of keys) {
+    const value = searchParams[key]
+    if (Array.isArray(value)) {
+      const firstValue = value.find(Boolean)
+      if (firstValue) return firstValue
+      continue
+    }
+    if (value) return value
+  }
+}
+
+function parseEnvSearchParams(searchParams: TerminalPtySearchParams) {
+  const entries = readSearchParamValues(searchParams, 'env')
+  const envs: Record<string, string> = {}
+
+  for (const entry of entries) {
+    const separator = entry.indexOf('=')
+    if (separator <= 0) continue
+
+    const key = entry.slice(0, separator).trim()
+    if (!key) continue
+
+    envs[key] = entry.slice(separator + 1)
+  }
+
+  return Object.keys(envs).length > 0 ? envs : undefined
+}
+
+function readSearchParamValues(
+  searchParams: TerminalPtySearchParams,
+  key: string
+) {
+  const value = searchParams[key]
+  if (!value) return []
+
+  return Array.isArray(value) ? value : [value]
+}
diff --git a/src/features/dashboard/terminal/pty-settings-dialog.tsx b/src/features/dashboard/terminal/pty-settings-dialog.tsx
new file mode 100644
index 000000000..6499d67c2
--- /dev/null
+++ b/src/features/dashboard/terminal/pty-settings-dialog.tsx
@@ -0,0 +1,155 @@
+'use client'
+
+import { useEffect, useId, useState } from 'react'
+import { Button } from '@/ui/primitives/button'
+import { Checkbox } from '@/ui/primitives/checkbox'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/ui/primitives/dialog'
+import { Input } from '@/ui/primitives/input'
+import { Textarea } from '@/ui/primitives/textarea'
+import type { TerminalPtyOptions } from './pty-options'
+
+interface PtySettingsDialogProps {
+  open: boolean
+  options: TerminalPtyOptions
+  onApply: (
+    options: TerminalPtyOptions,
+    settings: { makeDefault: boolean }
+  ) => void
+  onOpenChange: (open: boolean) => void
+}
+
+export default function PtySettingsDialog({
+  open,
+  options,
+  onApply,
+  onOpenChange,
+}: PtySettingsDialogProps) {
+  const userId = useId()
+  const cwdId = useId()
+  const envsId = useId()
+  const [user, setUser] = useState(options.user ?? '')
+  const [cwd, setCwd] = useState(options.cwd ?? '')
+  const [envs, setEnvs] = useState(formatEnvVars(options.envs))
+  const [makeDefault, setMakeDefault] = useState(false)
+
+  useEffect(() => {
+    if (!open) return
+
+    setUser(options.user ?? '')
+    setCwd(options.cwd ?? '')
+    setEnvs(formatEnvVars(options.envs))
+    setMakeDefault(false)
+  }, [open, options])
+
+  const applySettings = () => {
+    onApply(
+      {
+        user,
+        cwd,
+        envs: parseEnvVars(envs),
+      },
+      { makeDefault }
+    )
+    onOpenChange(false)
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-[520px]">
+        <DialogHeader>
+          <DialogTitle>PTY settings</DialogTitle>
+          <DialogDescription className="sr-only">
+            Applied when the terminal opens a new PTY.
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="grid gap-3">
+          <label className="grid gap-1" htmlFor={userId}>
+            <span className="prose-label text-fg-tertiary uppercase">User</span>
+            <Input
+              id={userId}
+              value={user}
+              placeholder="template default"
+              onChange={(event) => setUser(event.target.value)}
+            />
+          </label>
+
+          <label className="grid gap-1" htmlFor={cwdId}>
+            <span className="prose-label text-fg-tertiary uppercase">
+              Working directory
+            </span>
+            <Input
+              id={cwdId}
+              value={cwd}
+              placeholder="user home or template workdir"
+              onChange={(event) => setCwd(event.target.value)}
+            />
+          </label>
+
+          <label className="grid gap-1" htmlFor={envsId}>
+            <span className="prose-label text-fg-tertiary uppercase">
+              Environment
+            </span>
+            <Textarea
+              id={envsId}
+              value={envs}
+              placeholder={'NAME=value\nDEBUG=1'}
+              className="min-h-24 font-mono text-xs"
+              onChange={(event) => setEnvs(event.target.value)}
+            />
+          </label>
+
+          <label className="flex items-center gap-2">
+            <Checkbox
+              checked={makeDefault}
+              onCheckedChange={(checked) => setMakeDefault(checked === true)}
+            />
+            <span className="prose-label text-fg-tertiary uppercase">
+              Make default
+            </span>
+          </label>
+        </div>
+
+        <DialogFooter>
+          <Button type="button" variant="secondary" onClick={applySettings}>
+            Apply and reconnect
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+function formatEnvVars(envs: TerminalPtyOptions['envs']) {
+  if (!envs) return ''
+
+  return Object.entries(envs)
+    .map(([key, value]) => `${key}=${value}`)
+    .join('\n')
+}
+
+export function parseEnvVars(value: string) {
+  const envs: Record<string, string> = {}
+
+  for (const line of value.split(/\r?\n/)) {
+    const trimmed = line.trim()
+    if (!trimmed) continue
+
+    const separator = trimmed.indexOf('=')
+    if (separator <= 0) continue
+
+    const key = trimmed.slice(0, separator).trim()
+    if (!key) continue
+
+    envs[key] = trimmed.slice(separator + 1)
+  }
+
+  return Object.keys(envs).length > 0 ? envs : undefined
+}
diff --git a/src/features/dashboard/terminal/storage.ts b/src/features/dashboard/terminal/storage.ts
index 11106ddef..408aa21c5 100644
--- a/src/features/dashboard/terminal/storage.ts
+++ b/src/features/dashboard/terminal/storage.ts
@@ -1,4 +1,8 @@
-import { TERMINAL_SESSION_STORAGE_PREFIX } from './constants'
+import {
+  TERMINAL_PTY_SETTINGS_STORAGE_PREFIX,
+  TERMINAL_SESSION_STORAGE_PREFIX,
+} from './constants'
+import type { TerminalPtyOptions } from './pty-options'
 import { normalizeTerminalTemplate } from './template'
 import type { StoredTerminalSession } from './types'
 
@@ -6,6 +10,10 @@ function getTerminalSessionStorageKey(userId: string) {
   return `${TERMINAL_SESSION_STORAGE_PREFIX}:${userId}`
 }
 
+function getTerminalPtySettingsStorageKey(userId: string) {
+  return `${TERMINAL_PTY_SETTINGS_STORAGE_PREFIX}:${userId}`
+}
+
 export function readStoredTerminalSession(userId: string) {
   try {
     const value = window.localStorage.getItem(
@@ -36,6 +44,58 @@ export function readStoredTerminalSession(userId: string) {
   }
 }
 
+export function readStoredTerminalPtyOptions(
+  userId: string
+): TerminalPtyOptions {
+  try {
+    const value = window.localStorage.getItem(
+      getTerminalPtySettingsStorageKey(userId)
+    )
+    if (!value) return {}
+
+    const options = JSON.parse(value) as Partial<TerminalPtyOptions>
+
+    return normalizeStoredPtyOptions(options)
+  } catch {
+    return {}
+  }
+}
+
+export function writeStoredTerminalPtyOptions(
+  userId: string,
+  options: TerminalPtyOptions
+) {
+  try {
+    window.localStorage.setItem(
+      getTerminalPtySettingsStorageKey(userId),
+      JSON.stringify(normalizeStoredPtyOptions(options))
+    )
+  } catch {
+    // Terminal launch should still succeed if browser storage is unavailable.
+  }
+}
+
+function normalizeStoredPtyOptions(
+  options: Partial<TerminalPtyOptions>
+): TerminalPtyOptions {
+  const user = typeof options.user === 'string' ? options.user : undefined
+  const cwd = typeof options.cwd === 'string' ? options.cwd : undefined
+  const envs =
+    options.envs && typeof options.envs === 'object'
+      ? Object.fromEntries(
+          Object.entries(options.envs).filter(
+            ([key, value]) => key && typeof value === 'string'
+          )
+        )
+      : undefined
+
+  return {
+    ...(user !== undefined ? { user } : {}),
+    ...(cwd !== undefined ? { cwd } : {}),
+    ...(envs && Object.keys(envs).length > 0 ? { envs } : {}),
+  }
+}
+
 export function writeStoredTerminalSession(
   userId: string,
   session: StoredTerminalSession
diff --git a/src/features/dashboard/terminal/terminal-panel.tsx b/src/features/dashboard/terminal/terminal-panel.tsx
index 3225f9b4e..c47277ac1 100644
--- a/src/features/dashboard/terminal/terminal-panel.tsx
+++ b/src/features/dashboard/terminal/terminal-panel.tsx
@@ -1,8 +1,14 @@
 import type { RefObject } from 'react'
 import { IconButton } from '@/ui/primitives/icon-button'
-import { CopyIcon, RefreshIcon, TerminalIcon } from '@/ui/primitives/icons'
+import {
+  CopyIcon,
+  RefreshIcon,
+  SettingsIcon,
+  TerminalIcon,
+} from '@/ui/primitives/icons'
 
 interface TerminalPanelProps {
+  canConfigurePty?: boolean
   sandboxId?: string
   template?: string
   restartDisabled: boolean
@@ -10,10 +16,12 @@ interface TerminalPanelProps {
   terminalContainerRef: RefObject<HTMLDivElement | null>
   onFocusTerminal: () => void
   onCopyTerminalText: () => void
+  onConfigurePty?: () => void
   onRestartTerminal: () => void
 }
 
 export default function TerminalPanel({
+  canConfigurePty = false,
   sandboxId,
   template,
   restartDisabled,
@@ -21,6 +29,7 @@ export default function TerminalPanel({
   terminalContainerRef,
   onFocusTerminal,
   onCopyTerminalText,
+  onConfigurePty,
   onRestartTerminal,
 }: TerminalPanelProps) {
   return (
@@ -31,7 +40,9 @@ export default function TerminalPanel({
           template={template}
           restartDisabled={restartDisabled}
           restartLabel={restartLabel}
+          canConfigurePty={canConfigurePty}
           onCopyTerminalText={onCopyTerminalText}
+          onConfigurePty={onConfigurePty}
           onRestartTerminal={onRestartTerminal}
         />
       </header>
@@ -53,12 +64,16 @@ function TerminalPanelHeader({
   restartLabel,
   onCopyTerminalText,
   onRestartTerminal,
+  canConfigurePty,
+  onConfigurePty,
 }: Pick<
   TerminalPanelProps,
+  | 'canConfigurePty'
   | 'sandboxId'
   | 'template'
   | 'restartDisabled'
   | 'restartLabel'
+  | 'onConfigurePty'
   | 'onCopyTerminalText'
   | 'onRestartTerminal'
 >) {
@@ -82,6 +97,19 @@ function TerminalPanelHeader({
       </div>
 
       <div className="flex items-center gap-1">
+        {canConfigurePty ? (
+          <IconButton
+            type="button"
+            variant="tertiary"
+            className="size-7"
+            aria-label="Configure PTY"
+            title="Configure PTY"
+            onMouseDown={(event) => event.preventDefault()}
+            onClick={onConfigurePty}
+          >
+            <SettingsIcon />
+          </IconButton>
+        ) : null}
         <IconButton
           type="button"
           variant="tertiary"
diff --git a/src/features/dashboard/terminal/types.ts b/src/features/dashboard/terminal/types.ts
index 9e941cdd9..f71ff255a 100644
--- a/src/features/dashboard/terminal/types.ts
+++ b/src/features/dashboard/terminal/types.ts
@@ -1,4 +1,5 @@
 import type { Sandbox } from 'e2b'
+import type { TerminalPtyOptions } from './pty-options'
 
 export type TerminalStatus = 'idle' | 'starting' | 'ready' | 'error'
 
@@ -13,13 +14,15 @@ export type StartTerminalOptions = {
 }
 
 export type PendingTerminalLaunch = {
-  command: string
+  command?: string
   target?: TerminalLaunchTarget
 }
 
 export type TerminalLaunchTarget = {
   command?: string
   forceNewSandbox?: boolean
+  ptyOptions?: TerminalPtyOptions
+  requiresConfirmation?: boolean
   sandboxId?: string
   template?: string
 }
diff --git a/tests/unit/dashboard-terminal.test.ts b/tests/unit/dashboard-terminal.test.ts
index 9c087cf0d..0abe1c5e6 100644
--- a/tests/unit/dashboard-terminal.test.ts
+++ b/tests/unit/dashboard-terminal.test.ts
@@ -1,5 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { TERMINAL_SESSION_STORAGE_PREFIX } from '@/features/dashboard/terminal/constants'
+import {
+  hasPtyOptionsSearchParams,
+  normalizePtyOptions,
+  parsePtyOptionsFromSearchParams,
+} from '@/features/dashboard/terminal/pty-options'
+import { parseEnvVars } from '@/features/dashboard/terminal/pty-settings-dialog'
 import { openTerminalSandbox } from '@/features/dashboard/terminal/sandbox-session'
 import {
   clearStoredTerminalSession,
@@ -98,6 +104,58 @@ describe('dashboard terminal helpers', () => {
     })
   })
 
+  describe('PTY settings', () => {
+    it('normalizes optional PTY create options', () => {
+      expect(
+        normalizePtyOptions({
+          user: ' root ',
+          cwd: ' /app ',
+          envs: {
+            DEBUG: '1',
+            '': 'ignored',
+          },
+        })
+      ).toEqual({
+        user: 'root',
+        cwd: '/app',
+        envs: {
+          DEBUG: '1',
+        },
+      })
+    })
+
+    it('parses newline-delimited environment variables', () => {
+      expect(parseEnvVars('DEBUG=1\nNAME=value=with-equals\n\nbad')).toEqual({
+        DEBUG: '1',
+        NAME: 'value=with-equals',
+      })
+      expect(parseEnvVars('')).toBeUndefined()
+    })
+
+    it('parses PTY options from terminal query params', () => {
+      expect(
+        parsePtyOptionsFromSearchParams({
+          user: ' root ',
+          cwd: ' /app ',
+          env: ['DEBUG=1', 'NAME=value=with-equals', 'bad'],
+        })
+      ).toEqual({
+        user: 'root',
+        cwd: '/app',
+        envs: {
+          DEBUG: '1',
+          NAME: 'value=with-equals',
+        },
+      })
+    })
+
+    it('detects PTY options in terminal query params', () => {
+      expect(hasPtyOptionsSearchParams({})).toBe(false)
+      expect(hasPtyOptionsSearchParams({ user: '' })).toBe(true)
+      expect(hasPtyOptionsSearchParams({ env: ['DEBUG=1'] })).toBe(true)
+    })
+  })
+
   describe('stored terminal session', () => {
     it('round-trips session data by user and ignores invalid stored values', () => {
       writeStoredTerminalSession('user-123', {
diff --git a/tests/unit/sandbox-side-effects.test.ts b/tests/unit/sandbox-side-effects.test.ts
index c455d4c61..cd7d8b242 100644
--- a/tests/unit/sandbox-side-effects.test.ts
+++ b/tests/unit/sandbox-side-effects.test.ts
@@ -2,6 +2,7 @@ import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createTRPCContext } from '@/core/server/trpc/init'
+import { resolveBrowserSandboxUrl } from '@/core/shared/create-envd-sandbox'
 import { SANDBOX_RESUME_TIMEOUT_MS } from '@/features/dashboard/sandbox/inspect/constants'
 import { TERMINAL_SANDBOX_TIMEOUT_MS } from '@/features/dashboard/terminal/constants'
 
@@ -23,6 +24,7 @@ const sdkMock = vi.hoisted(() => ({
 }))
 
 vi.mock('e2b', () => ({
+  default: class Sandbox {},
   Sandbox: {
     connect: sdkMock.connect,
     create: sdkMock.create,
@@ -145,4 +147,29 @@ describe('sandbox inspect/terminal client never calls the control plane', () =>
     expect(source).not.toMatch(/Sandbox\.connect\s*\(/)
     expect(source).not.toMatch(/Sandbox\.create\s*\(/)
   })
+
+  it('rewrites browser sandboxUrl values to the client-proxy sandbox host', () => {
+    Object.defineProperty(globalThis, 'window', {
+      configurable: true,
+      value: {},
+    })
+
+    expect(
+      resolveBrowserSandboxUrl('http://localhost:3002', 'sandbox-123')
+    ).toBe('http://49983-sandbox-123.localhost:3002/')
+    expect(
+      resolveBrowserSandboxUrl(
+        'http://49983-sandbox-123.localhost:3002',
+        'sandbox-123'
+      )
+    ).toBe('http://49983-sandbox-123.localhost:3002/')
+  })
+
+  it('dashboard terminal lets envd resolve the PTY working directory', () => {
+    const source = read(
+      'src/features/dashboard/terminal/dashboard-terminal.tsx'
+    )
+    expect(source).not.toMatch(/cwd\s*:/)
+    expect(source).not.toContain('/home/user')
+  })
 })

From af3d024e43e064aafc3d6132f67ee79e4001b908 Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 18:32:30 -0700
Subject: [PATCH 2/9] Allow editing terminal URL env vars

---
 .../dashboard-terminal-command-dialog.tsx     | 42 +++++++++++++++----
 .../dashboard/terminal/dashboard-terminal.tsx | 25 +++++++++--
 .../terminal/pty-settings-dialog.tsx          |  6 ++-
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
index 3452549fd..b00b797a8 100644
--- a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
@@ -12,12 +12,14 @@ import {
 } from '@/ui/primitives/dialog'
 import { WarningIcon } from '@/ui/primitives/icons'
 import { Textarea } from '@/ui/primitives/textarea'
+import type { TerminalPtyOptions } from './pty-options'
+import { formatEnvVars, parseEnvVars } from './pty-settings-dialog'
 import type { PendingTerminalLaunch } from './types'
 
 interface DashboardTerminalCommandDialogProps {
   launch: PendingTerminalLaunch | null
   onCancel: () => void
-  onConfirm: (command?: string) => void
+  onConfirm: (command?: string, ptyOptions?: TerminalPtyOptions) => void
 }
 
 export default function DashboardTerminalCommandDialog({
@@ -26,12 +28,16 @@ export default function DashboardTerminalCommandDialog({
   onConfirm,
 }: DashboardTerminalCommandDialogProps) {
   const commandInputId = useId()
+  const envInputId = useId()
   const [command, setCommand] = useState('')
+  const [envs, setEnvs] = useState('')
   const hasCommand = !!launch?.command?.trim()
   const normalizedCommand = command.trim()
+  const canEditEnv = !!launch?.target?.requiresConfirmation
 
   useEffect(() => {
     setCommand(launch?.command ?? '')
+    setEnvs(formatEnvVars(launch?.target?.ptyOptions?.envs))
   }, [launch])
 
   return (
@@ -85,14 +91,22 @@ export default function DashboardTerminalCommandDialog({
                 </code>
               </div>
             ) : null}
-            {launch.target?.ptyOptions?.envs ? (
+            {canEditEnv ? (
               <div className="space-y-1">
-                <p className="prose-label text-fg-tertiary">Environment</p>
-                <code className="block max-h-32 overflow-auto whitespace-pre-wrap border bg-bg px-3 py-2 font-mono text-xs text-fg">
-                  {Object.entries(launch.target.ptyOptions.envs)
-                    .map(([key, value]) => `${key}=${value}`)
-                    .join('\n')}
-                </code>
+                <label
+                  className="prose-label text-fg-tertiary"
+                  htmlFor={envInputId}
+                >
+                  Environment
+                </label>
+                <Textarea
+                  id={envInputId}
+                  value={envs}
+                  placeholder={'NAME=value\nDEBUG=1'}
+                  className="max-h-32 min-h-20 font-mono text-xs"
+                  onChange={(event) => setEnvs(event.target.value)}
+                  spellCheck={false}
+                />
               </div>
             ) : null}
             {hasCommand ? (
@@ -122,7 +136,17 @@ export default function DashboardTerminalCommandDialog({
           <Button
             type="button"
             disabled={hasCommand && !normalizedCommand}
-            onClick={() => onConfirm(hasCommand ? normalizedCommand : undefined)}
+            onClick={() =>
+              onConfirm(
+                hasCommand ? normalizedCommand : undefined,
+                canEditEnv
+                  ? {
+                      ...launch?.target?.ptyOptions,
+                      envs: parseEnvVars(envs),
+                    }
+                  : undefined
+              )
+            }
           >
             {hasCommand ? 'Run command' : 'Start terminal'}
           </Button>
diff --git a/src/features/dashboard/terminal/dashboard-terminal.tsx b/src/features/dashboard/terminal/dashboard-terminal.tsx
index 56033c1bb..beb0f7706 100644
--- a/src/features/dashboard/terminal/dashboard-terminal.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal.tsx
@@ -76,8 +76,9 @@ export default function DashboardTerminal({
     () => normalizePtyOptions(launchTarget?.ptyOptions ?? {}),
     [launchTarget?.ptyOptions]
   )
-  const [ptyOptions, setPtyOptions] =
-    useState<TerminalPtyOptions>(launchTargetPtyOptions)
+  const [ptyOptions, setPtyOptions] = useState<TerminalPtyOptions>(
+    launchTargetPtyOptions
+  )
   const [arePtySettingsLoaded, setArePtySettingsLoaded] = useState(
     !allowPtySettings
   )
@@ -497,19 +498,31 @@ export default function DashboardTerminal({
   )
 
   const confirmPendingLaunch = useCallback(
-    (command?: string) => {
+    (command?: string, confirmedPtyOptions?: TerminalPtyOptions) => {
       if (!pendingLaunch) return
 
       const normalizedCommand = command?.trim() ?? ''
       if (pendingLaunch.command && !normalizedCommand) return
 
       const { target: launchTarget } = pendingLaunch
+      const hasConfirmedPtyOptions = confirmedPtyOptions !== undefined
+      const nextPtyOptions = hasConfirmedPtyOptions
+        ? normalizePtyOptions({
+            ...launchTarget?.ptyOptions,
+            ...confirmedPtyOptions,
+          })
+        : ptyOptionsRef.current
+      const nextLaunchTarget = {
+        ...launchTarget,
+        ...(hasConfirmedPtyOptions ? { ptyOptions: nextPtyOptions } : {}),
+      }
       const launchTemplate = launchTarget?.template ?? 'base'
       const launchSandboxId = launchTarget?.sandboxId
 
       if (
         status === 'ready' &&
         template === launchTemplate &&
+        launchTarget?.requiresConfirmation !== true &&
         launchTarget?.forceNewSandbox !== true &&
         (!launchSandboxId || activeSandboxId === launchSandboxId)
       ) {
@@ -531,11 +544,15 @@ export default function DashboardTerminal({
       }
 
       setPendingLaunch(null)
+      if (hasConfirmedPtyOptions) {
+        ptyOptionsRef.current = nextPtyOptions
+        setPtyOptions(nextPtyOptions)
+      }
       pendingCommandsRef.current = normalizedCommand ? [normalizedCommand] : []
       void startTerminal({
         forceNewSandbox: !launchSandboxId && template !== launchTemplate,
         target: {
-          ...launchTarget,
+          ...nextLaunchTarget,
           requiresConfirmation: false,
         },
       })
diff --git a/src/features/dashboard/terminal/pty-settings-dialog.tsx b/src/features/dashboard/terminal/pty-settings-dialog.tsx
index 6499d67c2..925619b7b 100644
--- a/src/features/dashboard/terminal/pty-settings-dialog.tsx
+++ b/src/features/dashboard/terminal/pty-settings-dialog.tsx
@@ -34,6 +34,7 @@ export default function PtySettingsDialog({
   const userId = useId()
   const cwdId = useId()
   const envsId = useId()
+  const makeDefaultId = useId()
   const [user, setUser] = useState(options.user ?? '')
   const [cwd, setCwd] = useState(options.cwd ?? '')
   const [envs, setEnvs] = useState(formatEnvVars(options.envs))
@@ -106,8 +107,9 @@ export default function PtySettingsDialog({
             />
           </label>
 
-          <label className="flex items-center gap-2">
+          <label className="flex items-center gap-2" htmlFor={makeDefaultId}>
             <Checkbox
+              id={makeDefaultId}
               checked={makeDefault}
               onCheckedChange={(checked) => setMakeDefault(checked === true)}
             />
@@ -127,7 +129,7 @@ export default function PtySettingsDialog({
   )
 }
 
-function formatEnvVars(envs: TerminalPtyOptions['envs']) {
+export function formatEnvVars(envs: TerminalPtyOptions['envs']) {
   if (!envs) return ''
 
   return Object.entries(envs)

From ed05aa2559899bd90add3501233d54573014c2c1 Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 18:34:19 -0700
Subject: [PATCH 3/9] Clean up terminal env confirmation state

---
 .../dashboard-terminal-command-dialog.tsx     | 18 +++++-----
 .../dashboard/terminal/pty-options.ts         | 27 +++++++++++++++
 .../terminal/pty-settings-dialog.tsx          | 33 +++----------------
 tests/unit/dashboard-terminal.test.ts         |  2 +-
 4 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
index b00b797a8..94191c52c 100644
--- a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useId, useState } from 'react'
+import { useEffect, useId, useRef, useState } from 'react'
 import { Button } from '@/ui/primitives/button'
 import {
   Dialog,
@@ -12,8 +12,11 @@ import {
 } from '@/ui/primitives/dialog'
 import { WarningIcon } from '@/ui/primitives/icons'
 import { Textarea } from '@/ui/primitives/textarea'
-import type { TerminalPtyOptions } from './pty-options'
-import { formatEnvVars, parseEnvVars } from './pty-settings-dialog'
+import {
+  formatEnvVars,
+  parseEnvVars,
+  type TerminalPtyOptions,
+} from './pty-options'
 import type { PendingTerminalLaunch } from './types'
 
 interface DashboardTerminalCommandDialogProps {
@@ -29,15 +32,14 @@ export default function DashboardTerminalCommandDialog({
 }: DashboardTerminalCommandDialogProps) {
   const commandInputId = useId()
   const envInputId = useId()
+  const envInputRef = useRef<HTMLTextAreaElement | null>(null)
   const [command, setCommand] = useState('')
-  const [envs, setEnvs] = useState('')
   const hasCommand = !!launch?.command?.trim()
   const normalizedCommand = command.trim()
   const canEditEnv = !!launch?.target?.requiresConfirmation
 
   useEffect(() => {
     setCommand(launch?.command ?? '')
-    setEnvs(formatEnvVars(launch?.target?.ptyOptions?.envs))
   }, [launch])
 
   return (
@@ -101,10 +103,10 @@ export default function DashboardTerminalCommandDialog({
                 </label>
                 <Textarea
                   id={envInputId}
-                  value={envs}
+                  ref={envInputRef}
+                  defaultValue={formatEnvVars(launch.target?.ptyOptions?.envs)}
                   placeholder={'NAME=value\nDEBUG=1'}
                   className="max-h-32 min-h-20 font-mono text-xs"
-                  onChange={(event) => setEnvs(event.target.value)}
                   spellCheck={false}
                 />
               </div>
@@ -142,7 +144,7 @@ export default function DashboardTerminalCommandDialog({
                 canEditEnv
                   ? {
                       ...launch?.target?.ptyOptions,
-                      envs: parseEnvVars(envs),
+                      envs: parseEnvVars(envInputRef.current?.value ?? ''),
                     }
                   : undefined
               )
diff --git a/src/features/dashboard/terminal/pty-options.ts b/src/features/dashboard/terminal/pty-options.ts
index 0d878bd58..870ff6e67 100644
--- a/src/features/dashboard/terminal/pty-options.ts
+++ b/src/features/dashboard/terminal/pty-options.ts
@@ -24,6 +24,33 @@ export function normalizePtyOptions(options: TerminalPtyOptions) {
   }
 }
 
+export function formatEnvVars(envs: TerminalPtyOptions['envs']) {
+  if (!envs) return ''
+
+  return Object.entries(envs)
+    .map(([key, value]) => `${key}=${value}`)
+    .join('\n')
+}
+
+export function parseEnvVars(value: string) {
+  const envs: Record<string, string> = {}
+
+  for (const line of value.split(/\r?\n/)) {
+    const trimmed = line.trim()
+    if (!trimmed) continue
+
+    const separator = trimmed.indexOf('=')
+    if (separator <= 0) continue
+
+    const key = trimmed.slice(0, separator).trim()
+    if (!key) continue
+
+    envs[key] = trimmed.slice(separator + 1)
+  }
+
+  return Object.keys(envs).length > 0 ? envs : undefined
+}
+
 export function parsePtyOptionsFromSearchParams(
   searchParams: TerminalPtySearchParams
 ) {
diff --git a/src/features/dashboard/terminal/pty-settings-dialog.tsx b/src/features/dashboard/terminal/pty-settings-dialog.tsx
index 925619b7b..aa473a5f2 100644
--- a/src/features/dashboard/terminal/pty-settings-dialog.tsx
+++ b/src/features/dashboard/terminal/pty-settings-dialog.tsx
@@ -13,7 +13,11 @@ import {
 } from '@/ui/primitives/dialog'
 import { Input } from '@/ui/primitives/input'
 import { Textarea } from '@/ui/primitives/textarea'
-import type { TerminalPtyOptions } from './pty-options'
+import {
+  formatEnvVars,
+  parseEnvVars,
+  type TerminalPtyOptions,
+} from './pty-options'
 
 interface PtySettingsDialogProps {
   open: boolean
@@ -128,30 +132,3 @@ export default function PtySettingsDialog({
     </Dialog>
   )
 }
-
-export function formatEnvVars(envs: TerminalPtyOptions['envs']) {
-  if (!envs) return ''
-
-  return Object.entries(envs)
-    .map(([key, value]) => `${key}=${value}`)
-    .join('\n')
-}
-
-export function parseEnvVars(value: string) {
-  const envs: Record<string, string> = {}
-
-  for (const line of value.split(/\r?\n/)) {
-    const trimmed = line.trim()
-    if (!trimmed) continue
-
-    const separator = trimmed.indexOf('=')
-    if (separator <= 0) continue
-
-    const key = trimmed.slice(0, separator).trim()
-    if (!key) continue
-
-    envs[key] = trimmed.slice(separator + 1)
-  }
-
-  return Object.keys(envs).length > 0 ? envs : undefined
-}
diff --git a/tests/unit/dashboard-terminal.test.ts b/tests/unit/dashboard-terminal.test.ts
index 0abe1c5e6..b54ea31a8 100644
--- a/tests/unit/dashboard-terminal.test.ts
+++ b/tests/unit/dashboard-terminal.test.ts
@@ -3,9 +3,9 @@ import { TERMINAL_SESSION_STORAGE_PREFIX } from '@/features/dashboard/terminal/c
 import {
   hasPtyOptionsSearchParams,
   normalizePtyOptions,
+  parseEnvVars,
   parsePtyOptionsFromSearchParams,
 } from '@/features/dashboard/terminal/pty-options'
-import { parseEnvVars } from '@/features/dashboard/terminal/pty-settings-dialog'
 import { openTerminalSandbox } from '@/features/dashboard/terminal/sandbox-session'
 import {
   clearStoredTerminalSession,

From d5145bd64d5f25513225973a2905a8d69ed1b045 Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 18:38:49 -0700
Subject: [PATCH 4/9] Clean up terminal PTY settings state

---
 .../dashboard/terminal/dashboard-terminal.tsx | 174 ++++++++++--------
 .../terminal/pty-settings-dialog.tsx          | 151 ++++++++-------
 2 files changed, 177 insertions(+), 148 deletions(-)

diff --git a/src/features/dashboard/terminal/dashboard-terminal.tsx b/src/features/dashboard/terminal/dashboard-terminal.tsx
index beb0f7706..b537db1ca 100644
--- a/src/features/dashboard/terminal/dashboard-terminal.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal.tsx
@@ -5,7 +5,7 @@ import {
   useCallback,
   useEffect,
   useEffectEvent,
-  useMemo,
+  useReducer,
   useRef,
   useState,
 } from 'react'
@@ -53,6 +53,50 @@ interface DashboardTerminalProps {
   userId: string
 }
 
+type TerminalUiState = {
+  isPtySettingsOpen: boolean
+  pendingLaunch: PendingTerminalLaunch | null
+  ptyOptions: TerminalPtyOptions
+}
+
+type TerminalUiAction =
+  | { open: boolean; type: 'setPtySettingsOpen' }
+  | { launch: PendingTerminalLaunch | null; type: 'setPendingLaunch' }
+  | { options: TerminalPtyOptions; type: 'setPtyOptions' }
+
+function terminalUiReducer(
+  state: TerminalUiState,
+  action: TerminalUiAction
+): TerminalUiState {
+  switch (action.type) {
+    case 'setPtySettingsOpen':
+      return { ...state, isPtySettingsOpen: action.open }
+    case 'setPendingLaunch':
+      return { ...state, pendingLaunch: action.launch }
+    case 'setPtyOptions':
+      return { ...state, ptyOptions: action.options }
+  }
+}
+
+function getInitialPtyOptions({
+  allowPtySettings,
+  launchTargetPtyOptions,
+  userId,
+}: {
+  allowPtySettings: boolean
+  launchTargetPtyOptions: TerminalPtyOptions
+  userId: string
+}) {
+  if (!allowPtySettings || typeof window === 'undefined') {
+    return launchTargetPtyOptions
+  }
+
+  return normalizePtyOptions({
+    ...readStoredTerminalPtyOptions(userId),
+    ...launchTargetPtyOptions,
+  })
+}
+
 export default function DashboardTerminal({
   allowPtySettings = false,
   autoStart = false,
@@ -72,21 +116,21 @@ export default function DashboardTerminal({
   const [template, setTemplate] = useState(
     normalizeTerminalTemplate(launchTarget?.template) ?? 'base'
   )
-  const launchTargetPtyOptions = useMemo(
-    () => normalizePtyOptions(launchTarget?.ptyOptions ?? {}),
-    [launchTarget?.ptyOptions]
+  const launchTargetPtyOptions = normalizePtyOptions(
+    launchTarget?.ptyOptions ?? {}
   )
-  const [ptyOptions, setPtyOptions] = useState<TerminalPtyOptions>(
-    launchTargetPtyOptions
-  )
-  const [arePtySettingsLoaded, setArePtySettingsLoaded] = useState(
-    !allowPtySettings
-  )
-  const [isPtySettingsOpen, setIsPtySettingsOpen] = useState(false)
-  const [pendingLaunch, setPendingLaunch] =
-    useState<PendingTerminalLaunch | null>(null)
+  const [uiState, dispatchUi] = useReducer(terminalUiReducer, null, () => ({
+    isPtySettingsOpen: false,
+    pendingLaunch: null,
+    ptyOptions: getInitialPtyOptions({
+      allowPtySettings,
+      launchTargetPtyOptions,
+      userId,
+    }),
+  }))
+  const { isPtySettingsOpen, pendingLaunch, ptyOptions } = uiState
 
-  const ptyOptionsRef = useRef<TerminalPtyOptions>(launchTargetPtyOptions)
+  const ptyOptionsRef = useRef<TerminalPtyOptions>(ptyOptions)
   const sandboxRef = useRef<Sandbox | null>(null)
   const ptyRef = useRef<CommandHandle | null>(null)
   const pidRef = useRef<number | undefined>(undefined)
@@ -474,11 +518,14 @@ export default function DashboardTerminal({
       if (command.trim() || options.target?.requiresConfirmation) {
         // Commands and PTY settings can come from links, so require an
         // explicit click before using them to start or write to a terminal.
-        setPendingLaunch({
-          command: command.trim() || undefined,
-          target: {
-            ...options.target,
-            template: nextTemplate,
+        dispatchUi({
+          type: 'setPendingLaunch',
+          launch: {
+            command: command.trim() || undefined,
+            target: {
+              ...options.target,
+              template: nextTemplate,
+            },
           },
         })
         return
@@ -526,7 +573,7 @@ export default function DashboardTerminal({
         launchTarget?.forceNewSandbox !== true &&
         (!launchSandboxId || activeSandboxId === launchSandboxId)
       ) {
-        setPendingLaunch(null)
+        dispatchUi({ type: 'setPendingLaunch', launch: null })
         if (normalizedCommand) {
           runCommand(normalizedCommand)
         }
@@ -543,10 +590,10 @@ export default function DashboardTerminal({
         return
       }
 
-      setPendingLaunch(null)
+      dispatchUi({ type: 'setPendingLaunch', launch: null })
       if (hasConfirmedPtyOptions) {
         ptyOptionsRef.current = nextPtyOptions
-        setPtyOptions(nextPtyOptions)
+        dispatchUi({ type: 'setPtyOptions', options: nextPtyOptions })
       }
       pendingCommandsRef.current = normalizedCommand ? [normalizedCommand] : []
       void startTerminal({
@@ -602,56 +649,31 @@ export default function DashboardTerminal({
     startTerminal,
   ])
 
-  const applyPtyOptions = useCallback(
-    (
-      options: TerminalPtyOptions,
-      { makeDefault }: { makeDefault: boolean }
-    ) => {
-      ptyOptionsRef.current = options
-      setPtyOptions(options)
-      if (makeDefault) {
-        writeStoredTerminalPtyOptions(userId, options)
-      }
-
-      if (sandboxScoped) {
-        if (!reconnectSandboxId && !getSandbox) return
+  const applyPtyOptions = (
+    options: TerminalPtyOptions,
+    { makeDefault }: { makeDefault: boolean }
+  ) => {
+    ptyOptionsRef.current = options
+    dispatchUi({ type: 'setPtyOptions', options })
+    if (makeDefault) {
+      writeStoredTerminalPtyOptions(userId, options)
+    }
 
-        void startTerminal({
-          target: reconnectTarget,
-        })
-        return
-      }
+    if (sandboxScoped) {
+      if (!reconnectSandboxId && !getSandbox) return
 
-      if (status === 'ready') {
-        void startTerminal({ forceNewSandbox: true })
-      }
-    },
-    [
-      getSandbox,
-      reconnectTarget,
-      reconnectSandboxId,
-      sandboxScoped,
-      startTerminal,
-      status,
-      userId,
-    ]
-  )
+      void startTerminal({
+        target: reconnectTarget,
+      })
+      return
+    }
 
-  useEffect(() => {
-    if (!allowPtySettings) return
-
-    const storedOptions = readStoredTerminalPtyOptions(userId)
-    const nextOptions = normalizePtyOptions({
-      ...storedOptions,
-      ...launchTargetPtyOptions,
-    })
-    ptyOptionsRef.current = nextOptions
-    setPtyOptions(nextOptions)
-    setArePtySettingsLoaded(true)
-  }, [allowPtySettings, launchTargetPtyOptions, userId])
+    if (status === 'ready') {
+      void startTerminal({ forceNewSandbox: true })
+    }
+  }
 
   useEffect(() => {
-    if (!arePtySettingsLoaded) return
     if (!autoStart || status !== 'idle' || isStartingRef.current) return
 
     const autoStartTimer = window.setTimeout(() => {
@@ -665,13 +687,7 @@ export default function DashboardTerminal({
     return () => {
       window.clearTimeout(autoStartTimer)
     }
-  }, [
-    arePtySettingsLoaded,
-    autoStart,
-    launchTarget,
-    queueTerminalCommand,
-    status,
-  ])
+  }, [autoStart, launchTarget, queueTerminalCommand, status])
 
   const handlePageHide = useEffectEvent((event: PageTransitionEvent) => {
     if (event.persisted) return
@@ -716,7 +732,9 @@ export default function DashboardTerminal({
         terminalContainerRef={terminalContainerRef}
         onFocusTerminal={focusTerminal}
         onCopyTerminalText={() => void copyTerminalText()}
-        onConfigurePty={() => setIsPtySettingsOpen(true)}
+        onConfigurePty={() =>
+          dispatchUi({ type: 'setPtySettingsOpen', open: true })
+        }
         onRestartTerminal={restartTerminal}
       />
 
@@ -724,12 +742,14 @@ export default function DashboardTerminal({
         open={isPtySettingsOpen}
         options={ptyOptions}
         onApply={applyPtyOptions}
-        onOpenChange={setIsPtySettingsOpen}
+        onOpenChange={(open) =>
+          dispatchUi({ type: 'setPtySettingsOpen', open })
+        }
       />
 
       <DashboardTerminalCommandDialog
         launch={pendingLaunch}
-        onCancel={() => setPendingLaunch(null)}
+        onCancel={() => dispatchUi({ type: 'setPendingLaunch', launch: null })}
         onConfirm={confirmPendingLaunch}
       />
     </>
diff --git a/src/features/dashboard/terminal/pty-settings-dialog.tsx b/src/features/dashboard/terminal/pty-settings-dialog.tsx
index aa473a5f2..3a3773827 100644
--- a/src/features/dashboard/terminal/pty-settings-dialog.tsx
+++ b/src/features/dashboard/terminal/pty-settings-dialog.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useId, useState } from 'react'
+import { useId, useState } from 'react'
 import { Button } from '@/ui/primitives/button'
 import { Checkbox } from '@/ui/primitives/checkbox'
 import {
@@ -35,24 +35,42 @@ export default function PtySettingsDialog({
   onApply,
   onOpenChange,
 }: PtySettingsDialogProps) {
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-[520px]">
+        <DialogHeader>
+          <DialogTitle>PTY settings</DialogTitle>
+          <DialogDescription className="sr-only">
+            Applied when the terminal opens a new PTY.
+          </DialogDescription>
+        </DialogHeader>
+
+        {open ? (
+          <PtySettingsForm
+            options={options}
+            onApply={onApply}
+            onOpenChange={onOpenChange}
+          />
+        ) : null}
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+function PtySettingsForm({
+  options,
+  onApply,
+  onOpenChange,
+}: Omit<PtySettingsDialogProps, 'open'>) {
   const userId = useId()
   const cwdId = useId()
   const envsId = useId()
   const makeDefaultId = useId()
   const [user, setUser] = useState(options.user ?? '')
   const [cwd, setCwd] = useState(options.cwd ?? '')
-  const [envs, setEnvs] = useState(formatEnvVars(options.envs))
+  const [envs, setEnvs] = useState(() => formatEnvVars(options.envs))
   const [makeDefault, setMakeDefault] = useState(false)
 
-  useEffect(() => {
-    if (!open) return
-
-    setUser(options.user ?? '')
-    setCwd(options.cwd ?? '')
-    setEnvs(formatEnvVars(options.envs))
-    setMakeDefault(false)
-  }, [open, options])
-
   const applySettings = () => {
     onApply(
       {
@@ -66,69 +84,60 @@ export default function PtySettingsDialog({
   }
 
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-[520px]">
-        <DialogHeader>
-          <DialogTitle>PTY settings</DialogTitle>
-          <DialogDescription className="sr-only">
-            Applied when the terminal opens a new PTY.
-          </DialogDescription>
-        </DialogHeader>
+    <>
+      <div className="grid gap-3">
+        <label className="grid gap-1" htmlFor={userId}>
+          <span className="prose-label text-fg-tertiary uppercase">User</span>
+          <Input
+            id={userId}
+            value={user}
+            placeholder="template default"
+            onChange={(event) => setUser(event.target.value)}
+          />
+        </label>
 
-        <div className="grid gap-3">
-          <label className="grid gap-1" htmlFor={userId}>
-            <span className="prose-label text-fg-tertiary uppercase">User</span>
-            <Input
-              id={userId}
-              value={user}
-              placeholder="template default"
-              onChange={(event) => setUser(event.target.value)}
-            />
-          </label>
+        <label className="grid gap-1" htmlFor={cwdId}>
+          <span className="prose-label text-fg-tertiary uppercase">
+            Working directory
+          </span>
+          <Input
+            id={cwdId}
+            value={cwd}
+            placeholder="user home or template workdir"
+            onChange={(event) => setCwd(event.target.value)}
+          />
+        </label>
 
-          <label className="grid gap-1" htmlFor={cwdId}>
-            <span className="prose-label text-fg-tertiary uppercase">
-              Working directory
-            </span>
-            <Input
-              id={cwdId}
-              value={cwd}
-              placeholder="user home or template workdir"
-              onChange={(event) => setCwd(event.target.value)}
-            />
-          </label>
+        <label className="grid gap-1" htmlFor={envsId}>
+          <span className="prose-label text-fg-tertiary uppercase">
+            Environment
+          </span>
+          <Textarea
+            id={envsId}
+            value={envs}
+            placeholder={'NAME=value\nDEBUG=1'}
+            className="min-h-24 font-mono text-xs"
+            onChange={(event) => setEnvs(event.target.value)}
+          />
+        </label>
 
-          <label className="grid gap-1" htmlFor={envsId}>
-            <span className="prose-label text-fg-tertiary uppercase">
-              Environment
-            </span>
-            <Textarea
-              id={envsId}
-              value={envs}
-              placeholder={'NAME=value\nDEBUG=1'}
-              className="min-h-24 font-mono text-xs"
-              onChange={(event) => setEnvs(event.target.value)}
-            />
-          </label>
+        <label className="flex items-center gap-2" htmlFor={makeDefaultId}>
+          <Checkbox
+            id={makeDefaultId}
+            checked={makeDefault}
+            onCheckedChange={(checked) => setMakeDefault(checked === true)}
+          />
+          <span className="prose-label text-fg-tertiary uppercase">
+            Make default
+          </span>
+        </label>
+      </div>
 
-          <label className="flex items-center gap-2" htmlFor={makeDefaultId}>
-            <Checkbox
-              id={makeDefaultId}
-              checked={makeDefault}
-              onCheckedChange={(checked) => setMakeDefault(checked === true)}
-            />
-            <span className="prose-label text-fg-tertiary uppercase">
-              Make default
-            </span>
-          </label>
-        </div>
-
-        <DialogFooter>
-          <Button type="button" variant="secondary" onClick={applySettings}>
-            Apply and reconnect
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
+      <DialogFooter>
+        <Button type="button" variant="secondary" onClick={applySettings}>
+          Apply and reconnect
+        </Button>
+      </DialogFooter>
+    </>
   )
 }

From 5db7254c91d3f7ddf464c737124d219e9a7f79cb Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 18:40:38 -0700
Subject: [PATCH 5/9] Allow editing terminal URL user

---
 .../dashboard-terminal-command-dialog.tsx     | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
index 94191c52c..ea99e821e 100644
--- a/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal-command-dialog.tsx
@@ -11,6 +11,7 @@ import {
   DialogTitle,
 } from '@/ui/primitives/dialog'
 import { WarningIcon } from '@/ui/primitives/icons'
+import { Input } from '@/ui/primitives/input'
 import { Textarea } from '@/ui/primitives/textarea'
 import {
   formatEnvVars,
@@ -31,11 +32,15 @@ export default function DashboardTerminalCommandDialog({
   onConfirm,
 }: DashboardTerminalCommandDialogProps) {
   const commandInputId = useId()
+  const userInputId = useId()
   const envInputId = useId()
+  const userInputRef = useRef<HTMLInputElement | null>(null)
   const envInputRef = useRef<HTMLTextAreaElement | null>(null)
   const [command, setCommand] = useState('')
   const hasCommand = !!launch?.command?.trim()
   const normalizedCommand = command.trim()
+  const canEditUser =
+    !!launch?.target?.requiresConfirmation && !!launch.target.ptyOptions?.user
   const canEditEnv = !!launch?.target?.requiresConfirmation
 
   useEffect(() => {
@@ -75,12 +80,20 @@ export default function DashboardTerminalCommandDialog({
                 {launch.target?.template ?? 'base'}
               </code>
             </div>
-            {launch.target?.ptyOptions?.user ? (
+            {canEditUser ? (
               <div className="space-y-1">
-                <p className="prose-label text-fg-tertiary">User</p>
-                <code className="block border bg-bg px-3 py-2 font-mono text-xs text-fg">
-                  {launch.target.ptyOptions.user}
-                </code>
+                <label
+                  className="prose-label text-fg-tertiary"
+                  htmlFor={userInputId}
+                >
+                  User
+                </label>
+                <Input
+                  id={userInputId}
+                  ref={userInputRef}
+                  defaultValue={launch.target?.ptyOptions?.user}
+                  placeholder="template default"
+                />
               </div>
             ) : null}
             {launch.target?.ptyOptions?.cwd ? (
@@ -144,6 +157,9 @@ export default function DashboardTerminalCommandDialog({
                 canEditEnv
                   ? {
                       ...launch?.target?.ptyOptions,
+                      user: canEditUser
+                        ? userInputRef.current?.value
+                        : launch?.target?.ptyOptions?.user,
                       envs: parseEnvVars(envInputRef.current?.value ?? ''),
                     }
                   : undefined

From bcf89ca5b9ac5f1a4669c4c9fd09a72df358c568 Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 18:52:26 -0700
Subject: [PATCH 6/9] Store terminal PTY defaults in cookies

---
 src/features/dashboard/terminal/constants.ts |  2 +-
 src/features/dashboard/terminal/storage.ts   | 17 ++++----
 src/lib/utils/browser-cookies.ts             | 13 ++++++
 tests/unit/dashboard-terminal.test.ts        | 46 ++++++++++++++++++++
 4 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/src/features/dashboard/terminal/constants.ts b/src/features/dashboard/terminal/constants.ts
index 4d3b39871..458649595 100644
--- a/src/features/dashboard/terminal/constants.ts
+++ b/src/features/dashboard/terminal/constants.ts
@@ -3,7 +3,7 @@ export const DEFAULT_COLS = 100
 export const DEFAULT_ROWS = 28
 export const DEFAULT_PANEL_HEIGHT = 260
 export const MAX_TERMINAL_TRANSCRIPT_CHARS = 200_000
-export const TERMINAL_PTY_SETTINGS_STORAGE_PREFIX = 'dashboard-terminal-pty'
+export const TERMINAL_PTY_SETTINGS_COOKIE_PREFIX = 'dashboard-terminal-pty'
 export const TERMINAL_SESSION_STORAGE_PREFIX = 'dashboard-terminal-session'
 export const TERMINAL_AUTOSTART_DEBOUNCE_MS = 300
 export const TERMINAL_ATTACH_ATTEMPT_TIMEOUT_MS = 15_000
diff --git a/src/features/dashboard/terminal/storage.ts b/src/features/dashboard/terminal/storage.ts
index 408aa21c5..a9b676e6a 100644
--- a/src/features/dashboard/terminal/storage.ts
+++ b/src/features/dashboard/terminal/storage.ts
@@ -1,5 +1,6 @@
+import { getBrowserCookie, setBrowserCookie } from '@/lib/utils/browser-cookies'
 import {
-  TERMINAL_PTY_SETTINGS_STORAGE_PREFIX,
+  TERMINAL_PTY_SETTINGS_COOKIE_PREFIX,
   TERMINAL_SESSION_STORAGE_PREFIX,
 } from './constants'
 import type { TerminalPtyOptions } from './pty-options'
@@ -10,8 +11,8 @@ function getTerminalSessionStorageKey(userId: string) {
   return `${TERMINAL_SESSION_STORAGE_PREFIX}:${userId}`
 }
 
-function getTerminalPtySettingsStorageKey(userId: string) {
-  return `${TERMINAL_PTY_SETTINGS_STORAGE_PREFIX}:${userId}`
+function getTerminalPtySettingsCookieKey(userId: string) {
+  return `${TERMINAL_PTY_SETTINGS_COOKIE_PREFIX}:${userId}`
 }
 
 export function readStoredTerminalSession(userId: string) {
@@ -48,9 +49,7 @@ export function readStoredTerminalPtyOptions(
   userId: string
 ): TerminalPtyOptions {
   try {
-    const value = window.localStorage.getItem(
-      getTerminalPtySettingsStorageKey(userId)
-    )
+    const value = getBrowserCookie(getTerminalPtySettingsCookieKey(userId))
     if (!value) return {}
 
     const options = JSON.parse(value) as Partial<TerminalPtyOptions>
@@ -66,12 +65,12 @@ export function writeStoredTerminalPtyOptions(
   options: TerminalPtyOptions
 ) {
   try {
-    window.localStorage.setItem(
-      getTerminalPtySettingsStorageKey(userId),
+    setBrowserCookie(
+      getTerminalPtySettingsCookieKey(userId),
       JSON.stringify(normalizeStoredPtyOptions(options))
     )
   } catch {
-    // Terminal launch should still succeed if browser storage is unavailable.
+    // Terminal launch should still succeed if browser cookies are unavailable.
   }
 }
 
diff --git a/src/lib/utils/browser-cookies.ts b/src/lib/utils/browser-cookies.ts
index e1f256b2b..c5a615c64 100644
--- a/src/lib/utils/browser-cookies.ts
+++ b/src/lib/utils/browser-cookies.ts
@@ -16,3 +16,16 @@ export function setBrowserCookie(
   // biome-ignore lint/suspicious/noDocumentCookie: Cookie Store API is not consistently available in the browsers we support.
   document.cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}; Path=/; Max-Age=${maxAge}; SameSite=Lax${secure}`
 }
+
+export function getBrowserCookie(name: string): string | undefined {
+  const encodedName = `${encodeURIComponent(name)}=`
+
+  const cookie = document.cookie
+    .split(';')
+    .map((value) => value.trim())
+    .find((value) => value.startsWith(encodedName))
+
+  if (!cookie) return undefined
+
+  return decodeURIComponent(cookie.slice(encodedName.length))
+}
diff --git a/tests/unit/dashboard-terminal.test.ts b/tests/unit/dashboard-terminal.test.ts
index b54ea31a8..d7005d012 100644
--- a/tests/unit/dashboard-terminal.test.ts
+++ b/tests/unit/dashboard-terminal.test.ts
@@ -9,7 +9,9 @@ import {
 import { openTerminalSandbox } from '@/features/dashboard/terminal/sandbox-session'
 import {
   clearStoredTerminalSession,
+  readStoredTerminalPtyOptions,
   readStoredTerminalSession,
+  writeStoredTerminalPtyOptions,
   writeStoredTerminalSession,
 } from '@/features/dashboard/terminal/storage'
 import {
@@ -33,11 +35,15 @@ const mockOpenTerminal = vi.fn()
 
 function installLocalStorage() {
   const values = new Map<string, string>()
+  const cookies = new Map<string, string>()
 
   Object.defineProperty(globalThis, 'window', {
     configurable: true,
     value: {
       innerWidth: 1200,
+      location: {
+        protocol: 'http:',
+      },
       localStorage: {
         getItem: vi.fn((key: string) => values.get(key) ?? null),
         setItem: vi.fn((key: string, value: string) => {
@@ -50,6 +56,27 @@ function installLocalStorage() {
     },
   })
 
+  Object.defineProperty(globalThis, 'document', {
+    configurable: true,
+    value: {
+      get cookie() {
+        return Array.from(cookies)
+          .map(([key, value]) => `${key}=${value}`)
+          .join('; ')
+      },
+      set cookie(value: string) {
+        const [cookieValue] = value.split(';')
+        const separator = cookieValue.indexOf('=')
+        if (separator <= 0) return
+
+        cookies.set(
+          cookieValue.slice(0, separator),
+          cookieValue.slice(separator + 1)
+        )
+      },
+    },
+  })
+
   return values
 }
 
@@ -154,6 +181,25 @@ describe('dashboard terminal helpers', () => {
       expect(hasPtyOptionsSearchParams({ user: '' })).toBe(true)
       expect(hasPtyOptionsSearchParams({ env: ['DEBUG=1'] })).toBe(true)
     })
+
+    it('round-trips saved PTY options through a cookie', () => {
+      writeStoredTerminalPtyOptions('user-123', {
+        user: 'root',
+        cwd: '/app',
+        envs: {
+          DEBUG: '1',
+        },
+      })
+
+      expect(readStoredTerminalPtyOptions('user-123')).toEqual({
+        user: 'root',
+        cwd: '/app',
+        envs: {
+          DEBUG: '1',
+        },
+      })
+      expect(window.localStorage.setItem).not.toHaveBeenCalled()
+    })
   })
 
   describe('stored terminal session', () => {

From f553f1173d8b1e5a4a2222803ea4206324a5e0cb Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 18:56:44 -0700
Subject: [PATCH 7/9] Address terminal PTY review findings

---
 .../sandboxes/[sandboxId]/terminal/page.tsx   |  2 +-
 .../dashboard/[teamSlug]/terminal/page.tsx    | 26 ++++++++++++++++---
 .../terminal/pty-settings-dialog.tsx          |  2 +-
 src/features/dashboard/terminal/storage.ts    |  9 -------
 tests/unit/dashboard-terminal.test.ts         |  5 +---
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx
index 81eaa323c..c4cff1006 100644
--- a/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx
+++ b/src/app/dashboard/[teamSlug]/sandboxes/[sandboxId]/terminal/page.tsx
@@ -2,11 +2,11 @@ import { redirect } from 'next/navigation'
 import { AUTH_URLS, PROTECTED_URLS } from '@/configs/urls'
 import { getAuthContext } from '@/core/server/auth'
 import { getTeamIdFromSlug } from '@/core/server/functions/team/get-team-id-from-slug'
+import SandboxTerminalView from '@/features/dashboard/sandbox/terminal/view'
 import {
   hasPtyOptionsSearchParams,
   parsePtyOptionsFromSearchParams,
 } from '@/features/dashboard/terminal/pty-options'
-import SandboxTerminalView from '@/features/dashboard/sandbox/terminal/view'
 
 interface SandboxTerminalPageProps {
   params: Promise<{
diff --git a/src/app/dashboard/[teamSlug]/terminal/page.tsx b/src/app/dashboard/[teamSlug]/terminal/page.tsx
index 040dd553d..314fc32f8 100644
--- a/src/app/dashboard/[teamSlug]/terminal/page.tsx
+++ b/src/app/dashboard/[teamSlug]/terminal/page.tsx
@@ -38,8 +38,10 @@ export default async function TeamTerminalPage({
   params,
   searchParams,
 }: TeamTerminalPageProps) {
-  const [{ teamSlug }, terminalSearchParams] =
-    await Promise.all([params, searchParams])
+  const [{ teamSlug }, terminalSearchParams] = await Promise.all([
+    params,
+    searchParams,
+  ])
   const { command = '', sandboxId, template } = terminalSearchParams
   const hasTemplateOverride = template !== undefined
   const requestedTemplate = hasTemplateOverride
@@ -63,11 +65,14 @@ export default async function TeamTerminalPage({
     return (
       <TerminalSignIn
         command={command}
+        cwd={terminalSearchParams.cwd}
+        env={terminalSearchParams.env}
         sandboxId={terminalSandboxId}
         teamSlug={teamSlug}
         template={
           terminalSandboxId ? template : (requestedTemplate ?? undefined)
         }
+        user={terminalSearchParams.user}
       />
     )
   }
@@ -169,20 +174,33 @@ async function getSandboxInTeam({
 
 function TerminalSignIn({
   command,
+  cwd,
+  env,
   sandboxId,
   teamSlug,
   template,
+  user,
 }: {
   command?: string
+  cwd?: string
+  env?: string | string[]
   sandboxId?: string
   teamSlug: string
   template?: string
+  user?: string
 }) {
-  const returnToQuery = new URLSearchParams({
+  const returnToParams = new URLSearchParams({
     ...(command ? { command } : {}),
+    ...(cwd ? { cwd } : {}),
     ...(sandboxId ? { sandboxId } : {}),
     ...(template ? { template } : {}),
-  }).toString()
+    ...(user ? { user } : {}),
+  })
+  const envValues = Array.isArray(env) ? env : env ? [env] : []
+  for (const value of envValues) {
+    returnToParams.append('env', value)
+  }
+  const returnToQuery = returnToParams.toString()
   const returnTo = `${PROTECTED_URLS.TERMINAL(teamSlug)}${
     returnToQuery ? `?${returnToQuery}` : ''
   }`
diff --git a/src/features/dashboard/terminal/pty-settings-dialog.tsx b/src/features/dashboard/terminal/pty-settings-dialog.tsx
index 3a3773827..ffe4fa02b 100644
--- a/src/features/dashboard/terminal/pty-settings-dialog.tsx
+++ b/src/features/dashboard/terminal/pty-settings-dialog.tsx
@@ -128,7 +128,7 @@ function PtySettingsForm({
             onCheckedChange={(checked) => setMakeDefault(checked === true)}
           />
           <span className="prose-label text-fg-tertiary uppercase">
-            Make default
+            Make user and directory default
           </span>
         </label>
       </div>
diff --git a/src/features/dashboard/terminal/storage.ts b/src/features/dashboard/terminal/storage.ts
index a9b676e6a..e0dd175b8 100644
--- a/src/features/dashboard/terminal/storage.ts
+++ b/src/features/dashboard/terminal/storage.ts
@@ -79,19 +79,10 @@ function normalizeStoredPtyOptions(
 ): TerminalPtyOptions {
   const user = typeof options.user === 'string' ? options.user : undefined
   const cwd = typeof options.cwd === 'string' ? options.cwd : undefined
-  const envs =
-    options.envs && typeof options.envs === 'object'
-      ? Object.fromEntries(
-          Object.entries(options.envs).filter(
-            ([key, value]) => key && typeof value === 'string'
-          )
-        )
-      : undefined
 
   return {
     ...(user !== undefined ? { user } : {}),
     ...(cwd !== undefined ? { cwd } : {}),
-    ...(envs && Object.keys(envs).length > 0 ? { envs } : {}),
   }
 }
 
diff --git a/tests/unit/dashboard-terminal.test.ts b/tests/unit/dashboard-terminal.test.ts
index d7005d012..b8f2ea4bc 100644
--- a/tests/unit/dashboard-terminal.test.ts
+++ b/tests/unit/dashboard-terminal.test.ts
@@ -182,7 +182,7 @@ describe('dashboard terminal helpers', () => {
       expect(hasPtyOptionsSearchParams({ env: ['DEBUG=1'] })).toBe(true)
     })
 
-    it('round-trips saved PTY options through a cookie', () => {
+    it('round-trips saved PTY options through a cookie without envs', () => {
       writeStoredTerminalPtyOptions('user-123', {
         user: 'root',
         cwd: '/app',
@@ -194,9 +194,6 @@ describe('dashboard terminal helpers', () => {
       expect(readStoredTerminalPtyOptions('user-123')).toEqual({
         user: 'root',
         cwd: '/app',
-        envs: {
-          DEBUG: '1',
-        },
       })
       expect(window.localStorage.setItem).not.toHaveBeenCalled()
     })

From 0549cc66830faa4ad98de6656ea5fe07ca585b9c Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 19:11:11 -0700
Subject: [PATCH 8/9] Persist terminal env defaults

---
 src/features/dashboard/terminal/pty-settings-dialog.tsx | 2 +-
 src/features/dashboard/terminal/storage.ts              | 9 +++++++++
 tests/unit/dashboard-terminal.test.ts                   | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/features/dashboard/terminal/pty-settings-dialog.tsx b/src/features/dashboard/terminal/pty-settings-dialog.tsx
index ffe4fa02b..3a3773827 100644
--- a/src/features/dashboard/terminal/pty-settings-dialog.tsx
+++ b/src/features/dashboard/terminal/pty-settings-dialog.tsx
@@ -128,7 +128,7 @@ function PtySettingsForm({
             onCheckedChange={(checked) => setMakeDefault(checked === true)}
           />
           <span className="prose-label text-fg-tertiary uppercase">
-            Make user and directory default
+            Make default
           </span>
         </label>
       </div>
diff --git a/src/features/dashboard/terminal/storage.ts b/src/features/dashboard/terminal/storage.ts
index e0dd175b8..a9b676e6a 100644
--- a/src/features/dashboard/terminal/storage.ts
+++ b/src/features/dashboard/terminal/storage.ts
@@ -79,10 +79,19 @@ function normalizeStoredPtyOptions(
 ): TerminalPtyOptions {
   const user = typeof options.user === 'string' ? options.user : undefined
   const cwd = typeof options.cwd === 'string' ? options.cwd : undefined
+  const envs =
+    options.envs && typeof options.envs === 'object'
+      ? Object.fromEntries(
+          Object.entries(options.envs).filter(
+            ([key, value]) => key && typeof value === 'string'
+          )
+        )
+      : undefined
 
   return {
     ...(user !== undefined ? { user } : {}),
     ...(cwd !== undefined ? { cwd } : {}),
+    ...(envs && Object.keys(envs).length > 0 ? { envs } : {}),
   }
 }
 
diff --git a/tests/unit/dashboard-terminal.test.ts b/tests/unit/dashboard-terminal.test.ts
index b8f2ea4bc..d7005d012 100644
--- a/tests/unit/dashboard-terminal.test.ts
+++ b/tests/unit/dashboard-terminal.test.ts
@@ -182,7 +182,7 @@ describe('dashboard terminal helpers', () => {
       expect(hasPtyOptionsSearchParams({ env: ['DEBUG=1'] })).toBe(true)
     })
 
-    it('round-trips saved PTY options through a cookie without envs', () => {
+    it('round-trips saved PTY options through a cookie', () => {
       writeStoredTerminalPtyOptions('user-123', {
         user: 'root',
         cwd: '/app',
@@ -194,6 +194,9 @@ describe('dashboard terminal helpers', () => {
       expect(readStoredTerminalPtyOptions('user-123')).toEqual({
         user: 'root',
         cwd: '/app',
+        envs: {
+          DEBUG: '1',
+        },
       })
       expect(window.localStorage.setItem).not.toHaveBeenCalled()
     })

From 632be5bf08388f457a54d4ac6fbc4b61af70786f Mon Sep 17 00:00:00 2001
From: Matt Brockman <matt.brockman@e2b.dev>
Date: Mon, 29 Jun 2026 19:16:27 -0700
Subject: [PATCH 9/9] Fix terminal PTY confirmation lifecycle

---
 .../dashboard/terminal/dashboard-terminal.tsx | 72 ++++++++++++++-----
 1 file changed, 56 insertions(+), 16 deletions(-)

diff --git a/src/features/dashboard/terminal/dashboard-terminal.tsx b/src/features/dashboard/terminal/dashboard-terminal.tsx
index b537db1ca..47e8f1e92 100644
--- a/src/features/dashboard/terminal/dashboard-terminal.tsx
+++ b/src/features/dashboard/terminal/dashboard-terminal.tsx
@@ -54,12 +54,14 @@ interface DashboardTerminalProps {
 }
 
 type TerminalUiState = {
+  arePtySettingsLoaded: boolean
   isPtySettingsOpen: boolean
   pendingLaunch: PendingTerminalLaunch | null
   ptyOptions: TerminalPtyOptions
 }
 
 type TerminalUiAction =
+  | { options: TerminalPtyOptions; type: 'loadPtyOptions' }
   | { open: boolean; type: 'setPtySettingsOpen' }
   | { launch: PendingTerminalLaunch | null; type: 'setPendingLaunch' }
   | { options: TerminalPtyOptions; type: 'setPtyOptions' }
@@ -69,6 +71,12 @@ function terminalUiReducer(
   action: TerminalUiAction
 ): TerminalUiState {
   switch (action.type) {
+    case 'loadPtyOptions':
+      return {
+        ...state,
+        arePtySettingsLoaded: true,
+        ptyOptions: action.options,
+      }
     case 'setPtySettingsOpen':
       return { ...state, isPtySettingsOpen: action.open }
     case 'setPendingLaunch':
@@ -79,22 +87,21 @@ function terminalUiReducer(
 }
 
 function getInitialPtyOptions({
-  allowPtySettings,
   launchTargetPtyOptions,
-  userId,
+  requiresConfirmation,
 }: {
-  allowPtySettings: boolean
   launchTargetPtyOptions: TerminalPtyOptions
-  userId: string
+  requiresConfirmation: boolean
 }) {
-  if (!allowPtySettings || typeof window === 'undefined') {
-    return launchTargetPtyOptions
-  }
+  return requiresConfirmation ? {} : launchTargetPtyOptions
+}
 
-  return normalizePtyOptions({
-    ...readStoredTerminalPtyOptions(userId),
-    ...launchTargetPtyOptions,
-  })
+function parseSerializedPtyOptions(value: string): TerminalPtyOptions {
+  try {
+    return normalizePtyOptions(JSON.parse(value) as TerminalPtyOptions)
+  } catch {
+    return {}
+  }
 }
 
 export default function DashboardTerminal({
@@ -119,16 +126,20 @@ export default function DashboardTerminal({
   const launchTargetPtyOptions = normalizePtyOptions(
     launchTarget?.ptyOptions ?? {}
   )
+  const launchTargetPtyOptionsKey = JSON.stringify(launchTargetPtyOptions)
+  const launchTargetRequiresConfirmation =
+    launchTarget?.requiresConfirmation === true
   const [uiState, dispatchUi] = useReducer(terminalUiReducer, null, () => ({
+    arePtySettingsLoaded: !allowPtySettings,
     isPtySettingsOpen: false,
     pendingLaunch: null,
     ptyOptions: getInitialPtyOptions({
-      allowPtySettings,
       launchTargetPtyOptions,
-      userId,
+      requiresConfirmation: launchTargetRequiresConfirmation,
     }),
   }))
-  const { isPtySettingsOpen, pendingLaunch, ptyOptions } = uiState
+  const { arePtySettingsLoaded, isPtySettingsOpen, pendingLaunch, ptyOptions } =
+    uiState
 
   const ptyOptionsRef = useRef<TerminalPtyOptions>(ptyOptions)
   const sandboxRef = useRef<Sandbox | null>(null)
@@ -668,12 +679,35 @@ export default function DashboardTerminal({
       return
     }
 
-    if (status === 'ready') {
+    if (status === 'ready' || status === 'error') {
       void startTerminal({ forceNewSandbox: true })
     }
   }
 
   useEffect(() => {
+    if (!allowPtySettings) return
+
+    const storedOptions = readStoredTerminalPtyOptions(userId)
+    const currentLaunchTargetPtyOptions = parseSerializedPtyOptions(
+      launchTargetPtyOptionsKey
+    )
+    const nextOptions = normalizePtyOptions({
+      ...storedOptions,
+      ...(launchTargetRequiresConfirmation
+        ? {}
+        : currentLaunchTargetPtyOptions),
+    })
+    ptyOptionsRef.current = nextOptions
+    dispatchUi({ type: 'loadPtyOptions', options: nextOptions })
+  }, [
+    allowPtySettings,
+    launchTargetPtyOptionsKey,
+    launchTargetRequiresConfirmation,
+    userId,
+  ])
+
+  useEffect(() => {
+    if (!arePtySettingsLoaded) return
     if (!autoStart || status !== 'idle' || isStartingRef.current) return
 
     const autoStartTimer = window.setTimeout(() => {
@@ -687,7 +721,13 @@ export default function DashboardTerminal({
     return () => {
       window.clearTimeout(autoStartTimer)
     }
-  }, [autoStart, launchTarget, queueTerminalCommand, status])
+  }, [
+    arePtySettingsLoaded,
+    autoStart,
+    launchTarget,
+    queueTerminalCommand,
+    status,
+  ])
 
   const handlePageHide = useEffectEvent((event: PageTransitionEvent) => {
     if (event.persisted) return