diff --git a/apps/factory/agent/lib/sandbox-ssh.ts b/apps/factory/agent/lib/sandbox-ssh.ts
index 4856cfd483c5c..830e0341d26f2 100644
--- a/apps/factory/agent/lib/sandbox-ssh.ts
+++ b/apps/factory/agent/lib/sandbox-ssh.ts
@@ -1,3 +1,9 @@
 export function sandboxSshCommand(name: string): string {
   return `sandbox ssh ${name}`;
 }
+
+const SSHABLE_STATUSES = new Set(["running", "stopped"]);
+
+export function isSandboxSSHable(status: string): boolean {
+  return SSHABLE_STATUSES.has(status);
+}
diff --git a/apps/factory/app/api/sandbox/terminal/route.ts b/apps/factory/app/api/sandbox/terminal/route.ts
index d7fbfa54cb01a..6c7fd3f72c81c 100644
--- a/apps/factory/app/api/sandbox/terminal/route.ts
+++ b/apps/factory/app/api/sandbox/terminal/route.ts
@@ -3,5 +3,14 @@ import { handleTerminalRequest } from "@/agent/lib/sandbox-terminal";
 export const dynamic = "force-dynamic";
 
 export async function POST(request: Request): Promise<Response> {
+  if (
+    request.headers.get("origin") !== new URL(request.url).origin ||
+    request.headers.get("content-type")?.split(";", 1)[0] !== "application/json"
+  )
+    return Response.json(
+      { error: "Invalid terminal request." },
+      { status: 403 }
+    );
+
   return handleTerminalRequest(request);
 }
diff --git a/apps/factory/app/run-observatory.tsx b/apps/factory/app/run-observatory.tsx
index 9c239f852f58e..7983674155e15 100644
--- a/apps/factory/app/run-observatory.tsx
+++ b/apps/factory/app/run-observatory.tsx
@@ -9,7 +9,7 @@ import {
   useState
 } from "react";
 
-import { sandboxSshCommand } from "../agent/lib/sandbox-ssh";
+import { isSandboxSSHable, sandboxSshCommand } from "../agent/lib/sandbox-ssh";
 import type {
   AgentRunRecord,
   ControlPlaneSnapshot,
@@ -68,8 +68,16 @@ function duration(run: AgentRunRecord): string {
   return `${Math.round(milliseconds / 60_000)}m`;
 }
 
-function RunTicket({ run }: { readonly run: AgentRunRecord }) {
+function RunTicket({
+  run,
+  onTerminal
+}: {
+  readonly run: AgentRunRecord;
+  readonly onTerminal: (name: string) => void;
+}) {
   const detailsUrl = run.source === "eve" ? AGENT_RUNS_URL : WORKFLOW_RUNS_URL;
+  const sandbox = run.sandbox;
+  const sshable = sandbox ? isSandboxSSHable(sandbox.status) : false;
   return (
     <li className={`runTicket runTicket-${run.status}`}>
       <article aria-label={`${run.title}, ${run.status}`}>
@@ -112,11 +120,28 @@ function RunTicket({ run }: { readonly run: AgentRunRecord }) {
           <span aria-hidden="true">→</span>
           <span>{run.sandbox?.status ?? run.status}</span>
         </div>
-        {run.sandbox && run.sandbox.provider !== "eve" ? (
-          <CopyCommand
-            command={sandboxSshCommand(run.sandbox.id)}
-            label="SSH command for this sandbox"
-          />
+        {sandbox && sandbox.provider !== "eve" ? (
+          <>
+            <CopyCommand
+              command={sandboxSshCommand(sandbox.id)}
+              label="SSH command for this sandbox"
+            />
+            <Button
+              className="sandboxTerminalButton"
+              disabled={!sshable}
+              onClick={() => onTerminal(sandbox.id)}
+              size="sm"
+              title={
+                sshable
+                  ? "Open a terminal session for this sandbox"
+                  : "This sandbox is not currently reachable for a terminal session"
+              }
+              type="button"
+              variant="outline"
+            >
+              Terminal
+            </Button>
+          </>
         ) : null}
         <a
           className="runDetails"
@@ -168,9 +193,14 @@ function SandboxCard({
       />
       <Button
         className="sandboxTerminalButton"
-        disabled={sandbox.status === "failed"}
+        disabled={!isSandboxSSHable(sandbox.status)}
         onClick={() => onTerminal(sandbox.name)}
         size="sm"
+        title={
+          isSandboxSSHable(sandbox.status)
+            ? "Open a terminal session for this sandbox"
+            : "This sandbox is not currently reachable for a terminal session"
+        }
         type="button"
         variant="outline"
       >
@@ -304,7 +334,11 @@ export function RunObservatory({
                 {runs.length > 0 ? (
                   <ol className="runList">
                     {runs.map((run) => (
-                      <RunTicket key={run.id} run={run} />
+                      <RunTicket
+                        key={run.id}
+                        run={run}
+                        onTerminal={setActiveTerminal}
+                      />
                     ))}
                   </ol>
                 ) : (
diff --git a/apps/factory/app/sandbox-terminal.tsx b/apps/factory/app/sandbox-terminal.tsx
index 4a608103c736b..050d6cf271b4c 100644
--- a/apps/factory/app/sandbox-terminal.tsx
+++ b/apps/factory/app/sandbox-terminal.tsx
@@ -166,7 +166,7 @@ export function SandboxTerminal({ sandboxName, onExit }: SandboxTerminalProps) {
       terminalRef.current = null;
       fitAddonRef.current = null;
       socketRef.current = null;
-      void cleanupPromise;
+      void cleanupPromise.then((cleanup) => cleanup?.());
     };
   }, [sandboxName]);
 
diff --git a/apps/factory/tests/sandbox-ssh.test.mjs b/apps/factory/tests/sandbox-ssh.test.mjs
index 03557009b59dd..9040a545386dd 100644
--- a/apps/factory/tests/sandbox-ssh.test.mjs
+++ b/apps/factory/tests/sandbox-ssh.test.mjs
@@ -1,7 +1,10 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { sandboxSshCommand } from "../agent/lib/sandbox-ssh.ts";
+import {
+  isSandboxSSHable,
+  sandboxSshCommand
+} from "../agent/lib/sandbox-ssh.ts";
 
 test("produces a sandbox ssh command for a given sandbox name", () => {
   assert.equal(sandboxSshCommand("my-sandbox"), "sandbox ssh my-sandbox");
@@ -14,3 +17,13 @@ test("produces a sandbox ssh command for a given sandbox name", () => {
 test("preserves special characters in sandbox names", () => {
   assert.equal(sandboxSshCommand("a-b_c.d"), "sandbox ssh a-b_c.d");
 });
+
+test("isSandboxSSHable recognizes running and stopped sandboxes", () => {
+  assert.equal(isSandboxSSHable("running"), true);
+  assert.equal(isSandboxSSHable("stopped"), true);
+  assert.equal(isSandboxSSHable("provisioning"), false);
+  assert.equal(isSandboxSSHable("pending"), false);
+  assert.equal(isSandboxSSHable("failed"), false);
+  assert.equal(isSandboxSSHable("aborted"), false);
+  assert.equal(isSandboxSSHable("snapshotting"), false);
+});