skydive-cli 0.4.1-beta.6 → 0.5.0-beta.10

package/dist/js/{client-mykp1DVb.mjs → client-DabRpc_T.mjs}

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
-import { t as HttpError } from "./http-error-DzyrsLAZ.mjs";
+import { a as mintPortalDeviceToken, c as unifyLegacyCliGrants, i as grantPortalAccess, n as fetchPortalDevices, r as findThisDevice } from "./api-DG5W6iwx.mjs";
 import os from "node:os";
 import { z } from "zod";
 import { execFile, spawn } from "node:child_process";
-import { WebSocket } from "ws";
+import net from "node:net";
+import { WebSocket, createWebSocketStream } from "ws";
 
 //#region ../portal-daemon/src/machine.ts
 /**
@@ -58,12 +59,18 @@ const INHERITED_ENV = [
 	"TERM",
 	"PATH"
 ];
+const DARWIN_PATH_PREPEND = ["/opt/homebrew/bin", "/usr/local/bin"];
 function buildEnv(extra) {
 	const env = {};
 	for (const key of INHERITED_ENV) {
 		const value = process.env[key];
 		if (value !== void 0) env[key] = value;
 	}
+	if (process.platform === "darwin") {
+		const current = env.PATH ? env.PATH.split(":") : [];
+		const missing = DARWIN_PATH_PREPEND.filter((dir) => !current.includes(dir));
+		if (missing.length > 0) env.PATH = [...missing, ...current].join(":");
+	}
 	if (extra) for (const [key, value] of Object.entries(extra)) env[key] = value;
 	return env;
 }
@@ -128,6 +135,18 @@ const ctrlMessageSchema = z.discriminatedUnion("t", [
 		conversationId: z.string().nullable().optional()
 	}),
 	z.object({ t: z.literal("stdin_eof") }),
+	z.object({
+		t: z.literal("reverse_listen"),
+		listenPort: z.number().int().positive(),
+		targetPort: z.number().int().positive(),
+		dialOrigin: z.string().min(1),
+		token: z.string().min(1)
+	}),
+	z.object({ t: z.literal("reverse_listening") }),
+	z.object({
+		t: z.literal("reverse_token"),
+		token: z.string().min(1)
+	}),
 	z.object({ t: z.literal("pause") }),
 	z.object({ t: z.literal("resume") }),
 	z.object({ t: z.literal("cancel") }),
@@ -163,6 +182,62 @@ function decodeFrame(frame) {
 	};
 }
 
+//#endregion
+//#region ../portal-daemon/src/reverse-listener.ts
+/**
+* The desktop half of an agent-initiated expose tunnel (`platform portal
+* expose`): listen on the local loopback and pipe each accepted TCP
+* connection to the agent sandbox's daemon (`/portal/tcp`) through the
+* agent-webserver edge Worker — the same per-connection dial-and-pipe as the
+* user-initiated `skydive portal forward`, just started from a directive
+* instead of a terminal. Tunnel bytes never touch the directive stream that
+* created this listener; it only anchors the lifetime and carries the token.
+*
+* `target()` is read per connection so a token refresh (or any future
+* retarget) applies to the next dial without touching established pipes.
+*/
+var ReverseListener = class {
+	server = null;
+	conns = /* @__PURE__ */ new Set();
+	constructor(opts) {
+		this.opts = opts;
+	}
+	start() {
+		const server = net.createServer((sock) => {
+			this.conns.add(sock);
+			sock.once("close", () => this.conns.delete(sock));
+			sock.pause();
+			const { dialOrigin, targetPort, token } = this.opts.target();
+			const ws = new WebSocket(`${dialOrigin.replace(/^http/, "ws")}/portal/tcp?port=${targetPort}`, { headers: { authorization: `Bearer ${token}` } });
+			ws.on("open", () => {
+				const stream = createWebSocketStream(ws);
+				stream.on("error", () => sock.destroy());
+				sock.on("error", () => stream.destroy());
+				sock.pipe(stream).pipe(sock);
+				sock.resume();
+			});
+			ws.on("error", (err) => {
+				this.opts.log(`expose: tunnel connect failed: ${err.message}`);
+				sock.destroy();
+			});
+			ws.on("unexpected-response", (_req, res) => {
+				this.opts.log(`expose: tunnel rejected (HTTP ${res.statusCode ?? "?"})`);
+				res.destroy();
+				sock.destroy();
+			});
+		});
+		server.once("error", (err) => this.opts.onListening(err));
+		server.listen(this.opts.listenPort, "127.0.0.1", () => this.opts.onListening(null));
+		this.server = server;
+	}
+	stop() {
+		this.server?.close();
+		this.server = null;
+		for (const sock of this.conns) sock.destroy();
+		this.conns.clear();
+	}
+};
+
 //#endregion
 //#region ../portal-daemon/src/exec.ts
 /**
@@ -175,6 +250,7 @@ function decodeFrame(frame) {
 */
 var JobManager = class {
 	jobs = /* @__PURE__ */ new Map();
+	reverse = /* @__PURE__ */ new Map();
 	constructor(opts) {
 		this.opts = opts;
 	}
@@ -194,12 +270,35 @@ var JobManager = class {
 			job.child.kill("SIGKILL");
 		}
 		this.jobs.clear();
+		for (const rev of this.reverse.values()) {
+			rev.settled = true;
+			rev.listener.stop();
+		}
+		this.reverse.clear();
 	}
 	handleCtrl(id, msg) {
 		switch (msg.t) {
 			case "open":
 				this.startJob(id, msg.argv, msg.env, msg.conversationId ?? null);
 				return;
+			case "reverse_listen":
+				this.startReverse(id, {
+					listenPort: msg.listenPort,
+					target: {
+						dialOrigin: msg.dialOrigin,
+						targetPort: msg.targetPort,
+						token: msg.token
+					}
+				});
+				return;
+			case "reverse_token": {
+				const rev = this.reverse.get(id);
+				if (rev) rev.target = {
+					...rev.target,
+					token: msg.token
+				};
+				return;
+			}
 			case "stdin_eof":
 				this.jobs.get(id)?.child.stdin.end();
 				return;
@@ -211,12 +310,51 @@ var JobManager = class {
 				return;
 			case "cancel":
 				this.jobs.get(id)?.child.kill("SIGKILL");
+				this.stopReverse(id);
 				return;
 			case "close":
-			case "error": return;
+			case "error":
+			case "reverse_listening": return;
 			default: return msg;
 		}
 	}
+	startReverse(id, { listenPort, target }) {
+		const rev = {
+			settled: false,
+			target,
+			seq: 0,
+			listener: new ReverseListener({
+				listenPort,
+				target: () => rev.target,
+				log: (msg) => {
+					if (rev.settled) return;
+					this.opts.send(encodeData(id, STREAM.stderr, rev.seq, Buffer.from(msg)));
+					rev.seq = rev.seq + 1 >>> 0;
+				},
+				onListening: (err) => {
+					if (err) {
+						rev.settled = true;
+						this.reverse.delete(id);
+						this.opts.send(encodeCtrl(id, {
+							t: "error",
+							message: `reverse listen failed: ${err.message}`
+						}));
+						return;
+					}
+					this.opts.send(encodeCtrl(id, { t: "reverse_listening" }));
+				}
+			})
+		};
+		this.reverse.set(id, rev);
+		rev.listener.start();
+	}
+	stopReverse(id) {
+		const rev = this.reverse.get(id);
+		if (!rev) return;
+		rev.settled = true;
+		this.reverse.delete(id);
+		rev.listener.stop();
+	}
 	setPaused(id, paused) {
 		const job = this.jobs.get(id);
 		if (!job) return;
@@ -290,111 +428,6 @@ var JobManager = class {
 	}
 };
 
-//#endregion
-//#region ../portal-daemon/src/api.ts
-/**
-* The portal's session-authed REST surface, shared by `PortalClient` (the
-* TUI/`portal open` connection) and the `skydive portal` management
-* commands, so the endpoint contracts and response schemas live in exactly
-* one place.
-*/
-const deviceSchema = z.object({
-	id: z.string(),
-	machineName: z.string(),
-	friendlyName: z.string(),
-	connected: z.boolean(),
-	lastSeen: z.string().nullable(),
-	grantedAgentIds: z.array(z.string())
-});
-const devicesResponseSchema = z.object({
-	devices: z.array(deviceSchema),
-	agents: z.array(z.object({
-		id: z.string(),
-		name: z.string()
-	}))
-});
-const deviceTokenSchema = z.object({ token: z.string().min(1) });
-async function portalFetch(auth, path, init) {
-	const res = await fetch(`${auth.appUrl}${path}`, {
-		method: init.method,
-		headers: {
-			authorization: `Bearer ${auth.sessionToken}`,
-			accept: "application/json",
-			...init.body ? { "content-type": "application/json" } : {}
-		},
-		...init.body ? { body: init.body } : {}
-	});
-	if (!res.ok) {
-		const body = await res.text().catch(() => "");
-		throw new HttpError(res.status, body);
-	}
-	return res.json();
-}
-async function fetchPortalDevices(auth) {
-	const json = await portalFetch(auth, "/api/v1/portal/devices", { method: "GET" });
-	return devicesResponseSchema.parse(json);
-}
-const registerResponseSchema = z.object({ device: z.object({ id: z.string() }) });
-/**
-* Register this machine's device row without connecting. Connecting registers
-* as a side effect; this covers granting an agent on a machine that has never
-* shared yet (the grant references the device row).
-*/
-async function registerPortalDevice(auth, { machineName, friendlyName }) {
-	const json = await portalFetch(auth, "/api/v1/portal/devices", {
-		method: "POST",
-		body: JSON.stringify({
-			machineName,
-			friendlyName
-		})
-	});
-	return registerResponseSchema.parse(json).device;
-}
-/** Short-lived token the machine presents when dialing the portal WebSocket. */
-async function mintPortalDeviceToken(auth) {
-	const json = await portalFetch(auth, "/api/v1/portal/device-token", { method: "POST" });
-	return deviceTokenSchema.parse(json).token;
-}
-async function grantPortalAccess(auth, { deviceId, agentId }) {
-	await portalFetch(auth, `/api/v1/portal/devices/${encodeURIComponent(deviceId)}/grants`, {
-		method: "POST",
-		body: JSON.stringify({ agentId })
-	});
-}
-async function revokePortalAccess(auth, { deviceId, agentId }) {
-	await portalFetch(auth, `/api/v1/portal/devices/${encodeURIComponent(deviceId)}/grants/${encodeURIComponent(agentId)}`, { method: "DELETE" });
-}
-/**
-* The device row for a given machine identity. Matching is by `machineName`
-* equality — the stable handle the machine registers under, not the display
-* label.
-*/
-function findThisDevice(devices, machineName) {
-	return devices.find((device) => device.machineName === machineName) ?? null;
-}
-/**
-* One-time grant migration onto the merged device. Earlier CLI builds
-* registered a separate `<machineName>-cli` device, so a user's existing
-* approvals hang off that row; the merged device would start with zero grants
-* and every already-authorized agent would ask again. Copy any grant the
-* merged device is missing (the grant endpoint upserts, so re-runs are
-* no-ops). The legacy row is left in place — an old CLI build may still
-* connect under it. Returns how many grants were copied.
-*/
-async function unifyLegacyCliGrants(auth, machineName) {
-	const { devices } = await fetchPortalDevices(auth);
-	const merged = findThisDevice(devices, machineName);
-	const legacy = findThisDevice(devices, `${machineName}-cli`);
-	if (!merged || !legacy) return 0;
-	const have = new Set(merged.grantedAgentIds);
-	const missing = legacy.grantedAgentIds.filter((id) => !have.has(id));
-	for (const agentId of missing) await grantPortalAccess(auth, {
-		deviceId: merged.id,
-		agentId
-	});
-	return missing.length;
-}
-
 //#endregion
 //#region ../portal-daemon/src/client.ts
 const INITIAL_BACKOFF_MS = 500;
@@ -430,6 +463,10 @@ var PortalClient = class {
 	isGranted(agentId) {
 		return this.granted.has(agentId);
 	}
+	/** Agents currently authorized on this machine (last known server state). */
+	grantedAgentIds() {
+		return [...this.granted];
+	}
 	enable() {
 		if (this.enabled || this.disposed) return;
 		this.enabled = true;
@@ -459,16 +496,44 @@ var PortalClient = class {
 		this.ws?.close();
 		this.ws = null;
 	}
-	/** Grant one agent access to this machine (default-deny; user-initiated). */
-	async grantAgent(agentId) {
-		const deviceId = await this.ensureDeviceId();
-		await grantPortalAccess(this.opts, {
-			deviceId,
-			agentId
+	/**
+	* Grant one agent access to this machine (default-deny; user-initiated).
+	* `conversationId` is the conversation whose run asked (null when the grant
+	* is not answering an in-chat request) — the server uses it to wake the
+	* waiting agent.
+	*/
+	async grantAgent(agentId, conversationId) {
+		const auth = this.sessionAuth();
+		if (!auth) throw new Error("granting needs a signed-in CLI session on this machine (the desktop connection alone cannot manage grants)");
+		await grantPortalAccess(auth, {
+			deviceId: await this.ensureDeviceId(),
+			agentId,
+			conversationId
 		});
 		this.granted.add(agentId);
 		this.emit();
 	}
+	/** Session-authed REST auth, or null when only a device token is held. */
+	sessionAuth() {
+		const { sessionToken } = this.opts.credentials();
+		return sessionToken ? {
+			appUrl: this.opts.appUrl,
+			sessionToken
+		} : null;
+	}
+	/**
+	* The bearer token for the portal WebSocket dial: minted from the session
+	* when one is held, otherwise the pre-minted device token as-is.
+	*/
+	async wsToken() {
+		const creds = this.opts.credentials();
+		if (creds.sessionToken) return mintPortalDeviceToken({
+			appUrl: this.opts.appUrl,
+			sessionToken: creds.sessionToken
+		});
+		if (creds.deviceToken) return creds.deviceToken;
+		throw new Error("no portal credentials (not signed in)");
+	}
 	setStatus(status, error = null) {
 		this.status = status;
 		this.error = error;
@@ -493,7 +558,7 @@ var PortalClient = class {
 		while (this.enabled && !this.disposed) {
 			this.setStatus("connecting");
 			try {
-				const token = await mintPortalDeviceToken(this.opts);
+				const token = await this.wsToken();
 				await this.runConnection(token);
 				backoff = INITIAL_BACKOFF_MS;
 			} catch (err) {
@@ -547,8 +612,10 @@ var PortalClient = class {
 		throw new Error("this machine is not connected yet");
 	}
 	async refreshDevice() {
+		const auth = this.sessionAuth();
+		if (!auth) return;
 		try {
-			const { devices } = await fetchPortalDevices(this.opts);
+			const { devices } = await fetchPortalDevices(auth);
 			const mine = findThisDevice(devices, this.machineName);
 			if (!mine) return;
 			this.deviceId = mine.id;
@@ -565,9 +632,11 @@ var PortalClient = class {
 	async syncDeviceState() {
 		await this.refreshDevice();
 		if (this.legacyGrantsChecked) return;
+		const auth = this.sessionAuth();
+		if (!auth) return;
 		this.legacyGrantsChecked = true;
 		try {
-			if (await unifyLegacyCliGrants(this.opts, this.machineName) > 0) await this.refreshDevice();
+			if (await unifyLegacyCliGrants(auth, this.machineName) > 0) await this.refreshDevice();
 		} catch (_error) {}
 	}
 };
@@ -581,4 +650,4 @@ function sleep(ms) {
 }
 
 //#endregion
-export { registerPortalDevice as a, resolveMachineIdentity as c, grantPortalAccess as i, fetchPortalDevices as n, revokePortalAccess as o, findThisDevice as r, isRecord as s, PortalClient as t };
+export { isRecord as n, resolveMachineIdentity as r, PortalClient as t };