skydive-cli 0.1.0-beta.347 → 0.1.0-beta.353

package/dist/js/bin.mjs

@@ -16,7 +16,7 @@ import zlib from "node:zlib";
 import os from "node:os";
 
 //#region package.json
-var version$1 = "0.1.0-beta.347";
+var version$1 = "0.1.0-beta.353";
 
 //#endregion
 //#region src/types.ts
@@ -1033,15 +1033,6 @@ function createRestClient({ appUrl, sessionToken }) {
 			...input,
 			clientSurface
 		}, sendResultSchema),
-		activeRun: async ({ conversationId }) => {
-			const { run } = await get(`/api/v1/chat/active-run?${new URLSearchParams({ conversationId }).toString()}`, activeRunResponseSchema);
-			if (!run) return null;
-			return {
-				runId: run.runId,
-				agentId: run.agentId ?? "",
-				agentName: run.agentName ?? ""
-			};
-		},
 		cancelRun: async ({ runId }) => {
 			await post(`/api/v1/chat/runs/${encodeURIComponent(runId)}/cancel`, {}, z.object({ ok: z.boolean() }));
 		},
@@ -1236,11 +1227,6 @@ const finalizeResponseSchema = z.object({
 	mediaType: z.string(),
 	sizeBytes: z.number().nullable().optional()
 });
-const activeRunResponseSchema = z.object({ run: z.object({
-	runId: z.string(),
-	agentId: z.string().nullish(),
-	agentName: z.string().nullish()
-}).nullable() });
 const oauthConnectResponseSchema = z.object({ connectLink: z.string() }).passthrough();
 const externalOauthConnectResponseSchema = z.object({ authorizationUrl: z.string().optional() }).passthrough();
 const runStreamEventSchema = z.union([z.object({
@@ -1252,11 +1238,14 @@ const runStreamEventSchema = z.union([z.object({
 	error: z.string().nullish()
 })]);
 const streamErrorSchema = z.object({ error: z.string() });
-const conversationStreamEventSchema = z.object({
+const conversationStreamEventSchema = z.discriminatedUnion("kind", [z.object({
 	kind: z.literal("conversation"),
 	id: z.string(),
 	title: z.string().nullable()
-});
+}), z.object({
+	kind: z.literal("run"),
+	runId: z.string()
+})]);
 
 //#endregion
 //#region src/commands/session.ts
@@ -2622,7 +2611,7 @@ const chatCommand = {
 			printError(`Unknown theme "${themeId}". Valid themes: ${themes.map((t) => t.id).join(", ")}`);
 			process.exit(1);
 		}
-		const { runChat } = await import("./boot-BcuOicbb.mjs");
+		const { runChat } = await import("./boot-DLHvjtxn.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -3416,7 +3405,7 @@ const switchCommand = {
 				printError("The workspace picker needs the Bun runtime and it could not be set up automatically. Pass a workspace slug instead, or install Bun and retry.");
 				process.exit(1);
 			}
-			const { runWorkspacePicker } = await import("./boot-BcuOicbb.mjs");
+			const { runWorkspacePicker } = await import("./boot-DLHvjtxn.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}

package/dist/js/{boot-BcuOicbb.mjs → boot-DLHvjtxn.mjs}

@@ -5285,21 +5285,75 @@ function formatShellContext(command, output, exitCode) {
 }
 
 //#endregion
-//#region src/chat/sandbox/client.ts
-/**
-* Client for the api's `/api/v1/sandbox/stream` WebSocket: relays a `/sandbox`
-* session into the agent's own sandbox — a live interactive PTY or a one-shot
-* streamed exec. Mirrors the transport shape of `portal/client.ts`, but dials a
-* different endpoint and speaks the sandbox-stream frame protocol (see the
-* server's sandbox-stream-ws.ts).
-*/
-const T = {
+//#region ../sandbox-stream-protocol/src/index.ts
+const SANDBOX_STREAM_PATH = "/api/v1/sandbox/stream";
+const FRAME = {
 	DATA: 1,
 	EXIT: 2,
 	ERROR: 3,
 	INPUT: 16,
 	RESIZE: 17
 };
+const MAX_INPUT_BYTES = 1 * 1024 * 1024;
+/** Query params for the upgrade URL, from a spec. Inverse of {@link parseStreamSpec}. */
+function streamSpecToQuery(spec) {
+	if (spec.mode === "pty") return {
+		agentId: spec.agentId,
+		mode: "pty",
+		cols: String(spec.cols),
+		rows: String(spec.rows)
+	};
+	return {
+		agentId: spec.agentId,
+		mode: "exec",
+		command: spec.command
+	};
+}
+function withType(type, payload) {
+	const frame = new Uint8Array(1 + payload.length);
+	frame[0] = type;
+	frame.set(payload, 1);
+	return frame;
+}
+/** client → server: keystroke bytes for the pty stdin. */
+function encodeInput(data) {
+	return withType(FRAME.INPUT, data);
+}
+/** client → server: the client terminal was resized. */
+function encodeResize(cols, rows) {
+	const frame = new Uint8Array(5);
+	frame[0] = FRAME.RESIZE;
+	const view = new DataView(frame.buffer);
+	view.setUint16(1, cols & 65535);
+	view.setUint16(3, rows & 65535);
+	return frame;
+}
+const view = (frame) => new DataView(frame.buffer, frame.byteOffset, frame.byteLength);
+/**
+* Decode a frame the server sent. Returns null for an empty, unknown, or
+* truncated frame — a peer speaking a newer protocol must not crash us.
+*/
+function decodeServerFrame(frame) {
+	const payload = frame.subarray(1);
+	switch (frame[0]) {
+		case FRAME.DATA: return {
+			type: "data",
+			payload
+		};
+		case FRAME.EXIT: return {
+			type: "exit",
+			code: payload.length >= 4 ? view(frame).getInt32(1) : 0
+		};
+		case FRAME.ERROR: return {
+			type: "error",
+			message: new TextDecoder().decode(payload)
+		};
+		default: return null;
+	}
+}
+
+//#endregion
+//#region src/chat/sandbox/client.ts
 function wsBase(appUrl) {
 	const base = appUrl.replace(/\/+$/, "");
 	if (base.startsWith("https://")) return `wss://${base.slice(8)}`;
@@ -5317,26 +5371,25 @@ var SandboxStream = class SandboxStream {
 		this.ws = ws;
 		ws.on("message", (data, isBinary) => {
 			if (!isBinary) return;
-			const buf = toBuffer(data);
-			if (buf.length === 0) return;
-			const body = buf.subarray(1);
-			switch (buf[0]) {
-				case T.DATA:
+			const frame = decodeServerFrame(toBuffer(data));
+			if (!frame) return;
+			switch (frame.type) {
+				case "data":
 					onEvent({
 						type: "data",
-						bytes: new Uint8Array(body)
+						bytes: new Uint8Array(frame.payload)
 					});
 					break;
-				case T.EXIT:
+				case "exit":
 					onEvent({
 						type: "exit",
-						code: body.length >= 4 ? body.readInt32BE(0) : 0
+						code: frame.code
 					});
 					break;
-				case T.ERROR:
+				case "error":
 					onEvent({
 						type: "error",
-						message: body.toString("utf8")
+						message: frame.message
 					});
 					break;
 			}
@@ -5350,16 +5403,12 @@ var SandboxStream = class SandboxStream {
 	/** Feed keystroke bytes to the pty stdin. */
 	sendInput(data) {
 		if (this.closed || this.ws.readyState !== WebSocket.OPEN) return;
-		this.ws.send(Buffer.concat([Buffer.from([T.INPUT]), Buffer.from(data)]));
+		this.ws.send(encodeInput(data));
 	}
 	/** Notify the pty of a terminal resize. */
 	resize(cols, rows) {
 		if (this.closed || this.ws.readyState !== WebSocket.OPEN) return;
-		const b = Buffer.allocUnsafe(5);
-		b[0] = T.RESIZE;
-		b.writeUInt16BE(cols & 65535, 1);
-		b.writeUInt16BE(rows & 65535, 3);
-		this.ws.send(b);
+		this.ws.send(encodeResize(cols, rows));
 	}
 	close() {
 		this.closed = true;
@@ -5367,13 +5416,18 @@ var SandboxStream = class SandboxStream {
 	}
 	/** Open a stream. `mode` is 'pty' (interactive) or 'exec' (one-shot). */
 	static open(opts) {
-		const url = new URL(`${wsBase(opts.appUrl)}/api/v1/sandbox/stream`);
-		url.searchParams.set("agentId", opts.agentId);
-		url.searchParams.set("mode", opts.mode);
-		if (opts.mode === "pty") {
-			url.searchParams.set("cols", String(opts.cols));
-			url.searchParams.set("rows", String(opts.rows));
-		} else url.searchParams.set("command", opts.command);
+		const spec = opts.mode === "pty" ? {
+			mode: "pty",
+			agentId: opts.agentId,
+			cols: opts.cols,
+			rows: opts.rows
+		} : {
+			mode: "exec",
+			agentId: opts.agentId,
+			command: opts.command
+		};
+		const url = new URL(`${wsBase(opts.appUrl)}${SANDBOX_STREAM_PATH}`);
+		for (const [key, value] of Object.entries(streamSpecToQuery(spec))) url.searchParams.set(key, value);
 		return new SandboxStream(new WebSocket(url.toString(), { headers: { authorization: `Bearer ${opts.sessionToken}` } }), opts.onEvent);
 	}
 };
@@ -5594,6 +5648,7 @@ function ChatScreen({ agent, conversation }) {
 	inputRef.current = input;
 	const credPromptRef = useRef(credPrompt);
 	credPromptRef.current = credPrompt;
+	const seenRunsRef = useRef(/* @__PURE__ */ new Set());
 	const shellSessionRef = useRef(null);
 	const hostState = grantPrompt || credPrompt ? "blocked" : run.kind === "idle" ? "idle" : "working";
 	useEffect(() => {
@@ -5667,6 +5722,7 @@ function ChatScreen({ agent, conversation }) {
 	}, [rest, initialConversationId]);
 	const attachToRun = useCallback((runId, runAgentName) => {
 		if (!rest) return;
+		seenRunsRef.current.add(runId);
 		const abort = new AbortController();
 		const responsePreview = createResponsePreview();
 		const streamAgentName = runAgentName ?? agent.name;
@@ -5727,6 +5783,12 @@ function ChatScreen({ agent, conversation }) {
 			conversationId,
 			signal: abort.signal,
 			onEvent: (event) => {
+				if (event.kind === "run") {
+					if (seenRunsRef.current.has(event.runId)) return;
+					if (runRef.current.kind !== "idle") return;
+					attachToRun(event.runId);
+					return;
+				}
 				if (event.title) setChatTitle(event.title);
 			}
 		}).catch(() => {});
@@ -5734,22 +5796,9 @@ function ChatScreen({ agent, conversation }) {
 	}, [
 		rest,
 		conversationId,
-		setChatTitle
+		setChatTitle,
+		attachToRun
 	]);
-	useEffect(() => {
-		if (!rest || !conversationId) return;
-		let cancelled = false;
-		(async () => {
-			try {
-				const active = await rest.activeRun({ conversationId });
-				if (cancelled || !active) return;
-				attachToRun(active.runId, active.agentName || null);
-			} catch (_error) {}
-		})();
-		return () => {
-			cancelled = true;
-		};
-	}, []);
 	const sendContent = useCallback(async (content, staged, opts) => {
 		if (!rest) return;
 		const trimmed = content.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skydive-cli",
-  "version": "0.1.0-beta.347",
+  "version": "0.1.0-beta.353",
   "description": "Skydive CLI — manage AI agents from the command line",
   "homepage": "https://skydive.com",
   "license": "MIT",
@@ -46,6 +46,7 @@
   },
   "devDependencies": {
     "@createinc/anyone-portal-protocol": "0.0.0",
+    "@createinc/anyone-sandbox-stream-protocol": "0.0.0",
     "@createinc/tsconfig": "0.0.0",
     "@types/bun": "^1.3.14",
     "@types/node": "^24.0.0",