sdk: restore high-level terminal session

This commit is contained in:
Nathan Flurry 2026-03-06 12:41:41 -08:00
parent 9e2e57b469
commit 396043a5b3
7 changed files with 354 additions and 184 deletions

View file

@ -35,6 +35,7 @@ console.log(url);
- Prompt testing - Prompt testing
- Request/response debugging - Request/response debugging
- Process management (create, stop, kill, delete, view logs) - Process management (create, stop, kill, delete, view logs)
- Interactive PTY terminal for tty processes
- One-shot command execution - One-shot command execution
## When to use ## When to use
@ -42,3 +43,9 @@ console.log(url);
- Development: validate session behavior quickly - Development: validate session behavior quickly
- Debugging: inspect raw event payloads - Debugging: inspect raw event payloads
- Integration work: compare UI behavior with SDK/API calls - Integration work: compare UI behavior with SDK/API calls
## Process terminal
The Inspector includes an embedded Ghostty-based terminal for interactive tty
processes. The UI uses the SDK's high-level `connectProcessTerminal(...)`
wrapper rather than wiring raw websocket frames directly.

View file

@ -10,7 +10,7 @@
"license": { "license": {
"name": "Apache-2.0" "name": "Apache-2.0"
}, },
"version": "0.2.1" "version": "0.2.2"
}, },
"servers": [ "servers": [
{ {

View file

@ -3,35 +3,6 @@ import { FitAddon, Terminal, init } from "ghostty-web";
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import type { SandboxAgent } from "sandbox-agent"; import type { SandboxAgent } from "sandbox-agent";
type ProcessTerminalClientFrame =
| {
type: "input";
data: string;
encoding?: string;
}
| {
type: "resize";
cols: number;
rows: number;
}
| {
type: "close";
};
type ProcessTerminalServerFrame =
| {
type: "ready";
processId: string;
}
| {
type: "exit";
exitCode?: number | null;
}
| {
type: "error";
message: string;
};
type ConnectionState = "connecting" | "ready" | "closed" | "error"; type ConnectionState = "connecting" | "ready" | "closed" | "error";
const terminalTheme = { const terminalTheme = {
@ -76,21 +47,19 @@ const GhosttyTerminal = ({
let cancelled = false; let cancelled = false;
let terminal: Terminal | null = null; let terminal: Terminal | null = null;
let fitAddon: FitAddon | null = null; let fitAddon: FitAddon | null = null;
let socket: WebSocket | null = null; let session: ReturnType<SandboxAgent["connectProcessTerminal"]> | null = null;
let resizeRaf = 0; let resizeRaf = 0;
let removeDataListener: { dispose(): void } | null = null; let removeDataListener: { dispose(): void } | null = null;
let removeResizeListener: { dispose(): void } | null = null; let removeResizeListener: { dispose(): void } | null = null;
const syncSize = () => { const syncSize = () => {
if (!terminal || !socket || socket.readyState !== WebSocket.OPEN) { if (!terminal || !session) {
return; return;
} }
const frame: ProcessTerminalClientFrame = { session.resize({
type: "resize",
cols: terminal.cols, cols: terminal.cols,
rows: terminal.rows, rows: terminal.rows,
}; });
socket.send(JSON.stringify(frame));
}; };
const connect = async () => { const connect = async () => {
@ -118,14 +87,7 @@ const GhosttyTerminal = ({
terminal.focus(); terminal.focus();
removeDataListener = terminal.onData((data) => { removeDataListener = terminal.onData((data) => {
if (!socket || socket.readyState !== WebSocket.OPEN) { session?.sendInput(data);
return;
}
const frame: ProcessTerminalClientFrame = {
type: "input",
data,
};
socket.send(JSON.stringify(frame));
}); });
removeResizeListener = terminal.onResize(() => { removeResizeListener = terminal.onResize(() => {
@ -135,30 +97,31 @@ const GhosttyTerminal = ({
resizeRaf = window.requestAnimationFrame(syncSize); resizeRaf = window.requestAnimationFrame(syncSize);
}); });
const nextSocket = client.connectProcessTerminalWebSocket(processId); const nextSession = client.connectProcessTerminal(processId);
nextSocket.binaryType = "arraybuffer"; session = nextSession;
socket = nextSocket;
nextSocket.addEventListener("message", async (event) => { nextSession.onReady((frame) => {
if (cancelled) { if (cancelled) {
return; return;
} }
if (typeof event.data === "string") {
const frame = parseServerFrame(event.data);
if (!frame) {
setConnectionState("error");
setStatusMessage("Received invalid terminal control frame.");
return;
}
if (frame.type === "ready") { if (frame.type === "ready") {
setConnectionState("ready"); setConnectionState("ready");
setStatusMessage("Connected"); setStatusMessage("Connected");
syncSize(); syncSize();
}
});
nextSession.onData((bytes) => {
if (cancelled || !terminal) {
return; return;
} }
terminal.write(bytes);
});
nextSession.onExit((frame) => {
if (cancelled) {
return;
}
if (frame.type === "exit") { if (frame.type === "exit") {
setConnectionState("closed"); setConnectionState("closed");
setExitCode(frame.exitCode ?? null); setExitCode(frame.exitCode ?? null);
@ -166,33 +129,18 @@ const GhosttyTerminal = ({
frame.exitCode == null ? "Process exited." : `Process exited with code ${frame.exitCode}.` frame.exitCode == null ? "Process exited." : `Process exited with code ${frame.exitCode}.`
); );
onExit?.(); onExit?.();
return;
}
setConnectionState("error");
setStatusMessage(frame.message);
return;
}
if (!terminal) {
return;
}
const bytes = await decodeBinaryFrame(event.data);
if (!cancelled) {
terminal.write(bytes);
} }
}); });
nextSocket.addEventListener("error", () => { nextSession.onError((error) => {
if (cancelled) { if (cancelled) {
return; return;
} }
setConnectionState("error"); setConnectionState("error");
setStatusMessage("Terminal websocket connection failed."); setStatusMessage(error instanceof Error ? error.message : error.message);
}); });
nextSocket.addEventListener("close", () => { nextSession.onClose(() => {
if (cancelled) { if (cancelled) {
return; return;
} }
@ -217,11 +165,7 @@ const GhosttyTerminal = ({
} }
removeDataListener?.dispose(); removeDataListener?.dispose();
removeResizeListener?.dispose(); removeResizeListener?.dispose();
if (socket?.readyState === WebSocket.OPEN) { session?.close();
const frame: ProcessTerminalClientFrame = { type: "close" };
socket.send(JSON.stringify(frame));
}
socket?.close();
terminal?.dispose(); terminal?.dispose();
}; };
}, [client, onExit, processId]); }, [client, onExit, processId]);
@ -253,58 +197,4 @@ const GhosttyTerminal = ({
); );
}; };
function parseServerFrame(payload: string): ProcessTerminalServerFrame | null {
try {
const parsed = JSON.parse(payload) as unknown;
if (!parsed || typeof parsed !== "object" || !("type" in parsed)) {
return null;
}
if (
parsed.type === "ready" &&
"processId" in parsed &&
typeof parsed.processId === "string"
) {
return parsed as ProcessTerminalServerFrame;
}
if (
parsed.type === "exit" &&
(!("exitCode" in parsed) ||
parsed.exitCode == null ||
typeof parsed.exitCode === "number")
) {
return parsed as ProcessTerminalServerFrame;
}
if (
parsed.type === "error" &&
"message" in parsed &&
typeof parsed.message === "string"
) {
return parsed as ProcessTerminalServerFrame;
}
} catch {
return null;
}
return null;
}
async function decodeBinaryFrame(data: unknown): Promise<Uint8Array> {
if (data instanceof ArrayBuffer) {
return new Uint8Array(data);
}
if (ArrayBuffer.isView(data)) {
return new Uint8Array(data.buffer, data.byteOffset, data.byteLength).slice();
}
if (typeof Blob !== "undefined" && data instanceof Blob) {
return new Uint8Array(await data.arrayBuffer());
}
throw new Error(`Unsupported terminal payload: ${String(data)}`);
}
export default GhosttyTerminal; export default GhosttyTerminal;

View file

@ -56,6 +56,8 @@ import {
type ProcessRunRequest, type ProcessRunRequest,
type ProcessRunResponse, type ProcessRunResponse,
type ProcessSignalQuery, type ProcessSignalQuery,
type ProcessTerminalClientFrame,
type ProcessTerminalServerFrame,
type ProcessTerminalResizeRequest, type ProcessTerminalResizeRequest,
type ProcessTerminalResizeResponse, type ProcessTerminalResizeResponse,
type SessionEvent, type SessionEvent,
@ -63,6 +65,10 @@ import {
type SessionRecord, type SessionRecord,
type SkillsConfig, type SkillsConfig,
type SkillsConfigQuery, type SkillsConfigQuery,
type TerminalErrorStatus,
type TerminalExitStatus,
type TerminalReadyStatus,
type TerminalResizePayload,
} from "./types.ts"; } from "./types.ts";
const API_PREFIX = "/v1"; const API_PREFIX = "/v1";
@ -158,6 +164,8 @@ export interface ProcessTerminalConnectOptions extends ProcessTerminalWebSocketU
WebSocket?: typeof WebSocket; WebSocket?: typeof WebSocket;
} }
export type ProcessTerminalSessionOptions = ProcessTerminalConnectOptions;
export class SandboxAgentError extends Error { export class SandboxAgentError extends Error {
readonly status: number; readonly status: number;
readonly problem?: ProblemDetails; readonly problem?: ProblemDetails;
@ -586,6 +594,169 @@ export class LiveAcpConnection {
} }
} }
export class ProcessTerminalSession {
readonly socket: WebSocket;
readonly closed: Promise<void>;
private readonly readyListeners = new Set<(status: TerminalReadyStatus) => void>();
private readonly dataListeners = new Set<(data: Uint8Array) => void>();
private readonly exitListeners = new Set<(status: TerminalExitStatus) => void>();
private readonly errorListeners = new Set<(error: TerminalErrorStatus | Error) => void>();
private readonly closeListeners = new Set<() => void>();
private closeSignalSent = false;
private closedResolve!: () => void;
constructor(socket: WebSocket) {
this.socket = socket;
this.socket.binaryType = "arraybuffer";
this.closed = new Promise<void>((resolve) => {
this.closedResolve = resolve;
});
this.socket.addEventListener("message", (event) => {
void this.handleMessage(event.data);
});
this.socket.addEventListener("error", () => {
this.emitError(new Error("Terminal websocket connection failed."));
});
this.socket.addEventListener("close", () => {
this.closedResolve();
for (const listener of this.closeListeners) {
listener();
}
});
}
onReady(listener: (status: TerminalReadyStatus) => void): () => void {
this.readyListeners.add(listener);
return () => {
this.readyListeners.delete(listener);
};
}
onData(listener: (data: Uint8Array) => void): () => void {
this.dataListeners.add(listener);
return () => {
this.dataListeners.delete(listener);
};
}
onExit(listener: (status: TerminalExitStatus) => void): () => void {
this.exitListeners.add(listener);
return () => {
this.exitListeners.delete(listener);
};
}
onError(listener: (error: TerminalErrorStatus | Error) => void): () => void {
this.errorListeners.add(listener);
return () => {
this.errorListeners.delete(listener);
};
}
onClose(listener: () => void): () => void {
this.closeListeners.add(listener);
return () => {
this.closeListeners.delete(listener);
};
}
sendInput(data: string | ArrayBuffer | ArrayBufferView): void {
const payload = encodeTerminalInput(data);
this.sendFrame({
type: "input",
data: payload.data,
encoding: payload.encoding,
});
}
resize(payload: TerminalResizePayload): void {
this.sendFrame({
type: "resize",
cols: payload.cols,
rows: payload.rows,
});
}
close(): void {
if (this.socket.readyState === WebSocket.CONNECTING) {
this.socket.addEventListener(
"open",
() => {
this.close();
},
{ once: true },
);
return;
}
if (this.socket.readyState === WebSocket.OPEN) {
if (!this.closeSignalSent) {
this.closeSignalSent = true;
this.sendFrame({ type: "close" });
}
this.socket.close();
return;
}
if (this.socket.readyState !== WebSocket.CLOSED) {
this.socket.close();
}
}
private async handleMessage(data: unknown): Promise<void> {
try {
if (typeof data === "string") {
const frame = parseProcessTerminalServerFrame(data);
if (!frame) {
this.emitError(new Error("Received invalid terminal control frame."));
return;
}
if (frame.type === "ready") {
for (const listener of this.readyListeners) {
listener(frame);
}
return;
}
if (frame.type === "exit") {
for (const listener of this.exitListeners) {
listener(frame);
}
return;
}
this.emitError(frame);
return;
}
const bytes = await decodeTerminalBytes(data);
for (const listener of this.dataListeners) {
listener(bytes);
}
} catch (error) {
this.emitError(error instanceof Error ? error : new Error(String(error)));
}
}
private sendFrame(frame: ProcessTerminalClientFrame): void {
if (this.socket.readyState !== WebSocket.OPEN) {
return;
}
this.socket.send(JSON.stringify(frame));
}
private emitError(error: TerminalErrorStatus | Error): void {
for (const listener of this.errorListeners) {
listener(error);
}
}
}
export class SandboxAgent { export class SandboxAgent {
private readonly baseUrl: string; private readonly baseUrl: string;
private readonly token?: string; private readonly token?: string;
@ -1344,6 +1515,13 @@ export class SandboxAgent {
); );
} }
connectProcessTerminal(
id: string,
options: ProcessTerminalSessionOptions = {},
): ProcessTerminalSession {
return new ProcessTerminalSession(this.connectProcessTerminalWebSocket(id, options));
}
private async getLiveConnection(agent: string): Promise<LiveAcpConnection> { private async getLiveConnection(agent: string): Promise<LiveAcpConnection> {
await this.awaitHealthy(); await this.awaitHealthy();
@ -1757,6 +1935,91 @@ type NormalizedHealthWaitOptions =
| { enabled: false; timeoutMs?: undefined; signal?: undefined } | { enabled: false; timeoutMs?: undefined; signal?: undefined }
| { enabled: true; timeoutMs?: number; signal?: AbortSignal }; | { enabled: true; timeoutMs?: number; signal?: AbortSignal };
function parseProcessTerminalServerFrame(payload: string): ProcessTerminalServerFrame | null {
try {
const parsed = JSON.parse(payload) as unknown;
if (!isRecord(parsed) || typeof parsed.type !== "string") {
return null;
}
if (parsed.type === "ready" && typeof parsed.processId === "string") {
return parsed as ProcessTerminalServerFrame;
}
if (
parsed.type === "exit" &&
(parsed.exitCode === undefined ||
parsed.exitCode === null ||
typeof parsed.exitCode === "number")
) {
return parsed as ProcessTerminalServerFrame;
}
if (parsed.type === "error" && typeof parsed.message === "string") {
return parsed as ProcessTerminalServerFrame;
}
} catch {
return null;
}
return null;
}
function encodeTerminalInput(
data: string | ArrayBuffer | ArrayBufferView,
): { data: string; encoding?: "base64" } {
if (typeof data === "string") {
return { data };
}
const bytes = encodeTerminalBytes(data);
return {
data: bytesToBase64(bytes),
encoding: "base64",
};
}
function encodeTerminalBytes(data: ArrayBuffer | ArrayBufferView): Uint8Array {
if (data instanceof ArrayBuffer) {
return new Uint8Array(data);
}
return new Uint8Array(data.buffer, data.byteOffset, data.byteLength).slice();
}
async function decodeTerminalBytes(data: unknown): Promise<Uint8Array> {
if (data instanceof ArrayBuffer) {
return new Uint8Array(data);
}
if (ArrayBuffer.isView(data)) {
return new Uint8Array(data.buffer, data.byteOffset, data.byteLength).slice();
}
if (typeof Blob !== "undefined" && data instanceof Blob) {
return new Uint8Array(await data.arrayBuffer());
}
throw new Error(`Unsupported terminal frame payload: ${String(data)}`);
}
function bytesToBase64(bytes: Uint8Array): string {
if (typeof Buffer !== "undefined") {
return Buffer.from(bytes).toString("base64");
}
if (typeof btoa === "function") {
let binary = "";
const chunkSize = 0x8000;
for (let index = 0; index < bytes.length; index += chunkSize) {
binary += String.fromCharCode(...bytes.subarray(index, index + chunkSize));
}
return btoa(binary);
}
throw new Error("Base64 encoding is not available in this environment.");
}
/** /**
* Auto-select and call `authenticate` based on the agent's advertised auth methods. * Auto-select and call `authenticate` based on the agent's advertised auth methods.
* Prefers env-var-based methods that the server process already has configured. * Prefers env-var-based methods that the server process already has configured.

View file

@ -1,5 +1,6 @@
export { export {
LiveAcpConnection, LiveAcpConnection,
ProcessTerminalSession,
SandboxAgent, SandboxAgent,
SandboxAgentError, SandboxAgentError,
Session, Session,
@ -19,6 +20,7 @@ export type {
ProcessLogListener, ProcessLogListener,
ProcessLogSubscription, ProcessLogSubscription,
ProcessTerminalConnectOptions, ProcessTerminalConnectOptions,
ProcessTerminalSessionOptions,
ProcessTerminalWebSocketUrlOptions, ProcessTerminalWebSocketUrlOptions,
SandboxAgentConnectOptions, SandboxAgentConnectOptions,
SandboxAgentStartOptions, SandboxAgentStartOptions,
@ -88,6 +90,11 @@ export type {
SessionRecord, SessionRecord,
SkillsConfig, SkillsConfig,
SkillsConfigQuery, SkillsConfigQuery,
TerminalErrorStatus,
TerminalExitStatus,
TerminalReadyStatus,
TerminalResizePayload,
TerminalStatusMessage,
} from "./types.ts"; } from "./types.ts";
export type { export type {

View file

@ -89,6 +89,16 @@ export type ProcessTerminalServerFrame =
| ProcessTerminalExitFrame | ProcessTerminalExitFrame
| ProcessTerminalErrorFrame; | ProcessTerminalErrorFrame;
export type TerminalReadyStatus = ProcessTerminalReadyFrame;
export type TerminalExitStatus = ProcessTerminalExitFrame;
export type TerminalErrorStatus = ProcessTerminalErrorFrame;
export type TerminalStatusMessage = ProcessTerminalServerFrame;
export interface TerminalResizePayload {
cols: number;
rows: number;
}
export interface SessionRecord { export interface SessionRecord {
id: string; id: string;
agent: string; agent: string;

View file

@ -136,22 +136,6 @@ function writeTarChecksum(buffer: Buffer, checksum: number): void {
buffer[155] = 0x20; buffer[155] = 0x20;
} }
function decodeSocketPayload(data: unknown): string {
if (typeof data === "string") {
return data;
}
if (data instanceof ArrayBuffer) {
return Buffer.from(data).toString("utf8");
}
if (ArrayBuffer.isView(data)) {
return Buffer.from(data.buffer, data.byteOffset, data.byteLength).toString("utf8");
}
if (typeof Blob !== "undefined" && data instanceof Blob) {
throw new Error("Blob socket payloads are not supported in this test");
}
throw new Error(`Unsupported socket payload type: ${typeof data}`);
}
function decodeProcessLogData(data: string, encoding: string): string { function decodeProcessLogData(data: string, encoding: string): string {
if (encoding === "base64") { if (encoding === "base64") {
return Buffer.from(data, "base64").toString("utf8"); return Buffer.from(data, "base64").toString("utf8");
@ -816,37 +800,46 @@ describe("Integration: TypeScript SDK flat session API", () => {
const wsUrl = sdk.buildProcessTerminalWebSocketUrl(ttyProcess.id); const wsUrl = sdk.buildProcessTerminalWebSocketUrl(ttyProcess.id);
expect(wsUrl.startsWith("ws://") || wsUrl.startsWith("wss://")).toBe(true); expect(wsUrl.startsWith("ws://") || wsUrl.startsWith("wss://")).toBe(true);
const ws = sdk.connectProcessTerminalWebSocket(ttyProcess.id, { const session = sdk.connectProcessTerminal(ttyProcess.id, {
WebSocket: WebSocket as unknown as typeof globalThis.WebSocket, WebSocket: WebSocket as unknown as typeof globalThis.WebSocket,
}); });
ws.binaryType = "arraybuffer"; const readyFrames: string[] = [];
const ttyOutput: string[] = [];
const exitFrames: Array<number | null | undefined> = [];
const terminalErrors: string[] = [];
let closeCount = 0;
const socketTextFrames: string[] = []; session.onReady((frame) => {
const socketBinaryFrames: string[] = []; readyFrames.push(frame.processId);
ws.addEventListener("message", (event) => { });
if (typeof event.data === "string") { session.onData((bytes) => {
socketTextFrames.push(event.data); ttyOutput.push(Buffer.from(bytes).toString("utf8"));
return; });
} session.onExit((frame) => {
socketBinaryFrames.push(decodeSocketPayload(event.data)); exitFrames.push(frame.exitCode);
});
session.onError((error) => {
terminalErrors.push(error instanceof Error ? error.message : error.message);
});
session.onClose(() => {
closeCount += 1;
}); });
await waitFor(() => { await waitFor(() => readyFrames[0]);
const ready = socketTextFrames.find((frame) => frame.includes('"type":"ready"'));
return ready;
});
ws.send(JSON.stringify({ session.sendInput("hello tty\n");
type: "input",
data: "hello tty\n",
}));
await waitFor(() => { await waitFor(() => {
const joined = socketBinaryFrames.join(""); const joined = ttyOutput.join("");
return joined.includes("hello tty") ? joined : undefined; return joined.includes("hello tty") ? joined : undefined;
}); });
ws.close(); session.close();
await session.closed;
expect(closeCount).toBeGreaterThan(0);
expect(exitFrames).toHaveLength(0);
expect(terminalErrors).toEqual([]);
await waitForAsync(async () => { await waitForAsync(async () => {
const processInfo = await sdk.getProcess(ttyProcess.id); const processInfo = await sdk.getProcess(ttyProcess.id);
return processInfo.status === "running" ? processInfo : undefined; return processInfo.status === "running" ? processInfo : undefined;