skydive-cli 0.2.0-beta.615 → 0.2.0-beta.618

package/dist/js/bin.mjs

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
-import { C as setActiveWorkspace, S as listWorkspaces, T as version, _ as themes, b as getActiveWorkspaceId, o as brandHelpArt, t as installCrashHandler, w as name, x as getSessionIdentity, y as ensureActiveOrganization } from "./install-B5sKLfRc.mjs";
+import { C as setActiveWorkspace, S as listWorkspaces, T as version, _ as themes, b as getActiveWorkspaceId, o as brandHelpArt, t as installCrashHandler, w as name, x as getSessionIdentity, y as ensureActiveOrganization } from "./install-BhPuzBxW.mjs";
 import { A as getUpdateCheckDisabled, C as getLastSeenVersion, D as getShareMachineDefault, I as saveConfig, L as saveSession, M as resolveConfig, N as resolveManagementAuth, O as getStoredApiKeyId, P as resolveSession, S as getConfigPath, _ as API_KEY_PREFIX, b as DEFAULT_WEB_URL, g as API_KEY_FAMILY_PREFIX, h as API_KEYS_URL, i as resolveAgent, j as resolveAppUrl, k as getStoredApiKeyWorkspaceName, v as DEFAULT_API_URL, w as getPromptHistoryPath, x as deleteConfig, z as setLastSeenVersion } from "./print-CNIvmpqW.mjs";
 import { n as printError, r as printTable, t as output } from "./output-DYzzdXYV.mjs";
 import { n as createRestClient } from "./rest-Q5yl_b2-.mjs";
-import { a as registerPortalDevice, c as machineIdentity, n as findThisDevice, o as revokePortalAccess, r as grantPortalAccess, t as fetchPortalDevices } from "./api-CLTp-mKM.mjs";
-import { t as SandboxStream } from "./client-BVOAwU8M.mjs";
+import { a as registerPortalDevice, i as grantPortalAccess, n as fetchPortalDevices, o as revokePortalAccess, r as findThisDevice, s as machineIdentity } from "./client-DT9bWi1D.mjs";
+import { c as PORTAL_DAEMON_FLAG, i as queryDaemonStatus, l as daemonPaths, n as ensureDaemonRunning, o as stopDaemon } from "./daemon-DfMgVlYE.mjs";
+import { t as SandboxStream } from "./client-DfcJFEbh.mjs";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs";
 import { hostname } from "node:os";
@@ -1195,7 +1196,7 @@ const importCommand = {
 				process.exit(1);
 			}
 		}
-		const { runChat } = await import("./boot-BJZrdTk0.mjs");
+		const { runChat } = await import("./boot-CaWHIM4R.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1222,7 +1223,7 @@ async function runImportPrintMode({ argv, appUrl }) {
 		printError(`${session.error.message} For non-interactive use, run \`skydive auth login --web\` first, or set SKYDIVE_SESSION_TOKEN.`);
 		process.exit(1);
 	}
-	const { connectMachineShare } = await import("./print-share-rM8kNeEw.mjs");
+	const { connectMachineShare } = await import("./print-share-D8Nn1qFq.mjs");
 	const machineShare = await connectMachineShare({
 		appUrl,
 		sessionToken: session.value.sessionToken,
@@ -1511,7 +1512,7 @@ const chatCommand = {
 			printError(`Unknown theme "${themeId}". Valid themes: ${themes.map((t) => t.id).join(", ")}`);
 			process.exit(1);
 		}
-		const { runChat } = await import("./boot-BJZrdTk0.mjs");
+		const { runChat } = await import("./boot-CaWHIM4R.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1563,7 +1564,7 @@ async function runPrintMode({ argv, appUrl }) {
 	}
 	let machineShare = null;
 	if (resolveShareMachine(argv)) {
-		const { connectMachineShare } = await import("./print-share-rM8kNeEw.mjs");
+		const { connectMachineShare } = await import("./print-share-D8Nn1qFq.mjs");
 		machineShare = await connectMachineShare({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1819,7 +1820,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-BJZrdTk0.mjs");
+			const { runWorkspacePicker } = await import("./boot-CaWHIM4R.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}
@@ -1897,7 +1898,7 @@ const openCommand = {
 		const agent = argv.agent ? resolveAgent((await fetchPortalDevices(session)).agents, argv.agent) : null;
 		const cwd = argv.cwd ? path.resolve(argv.cwd) : process.cwd();
 		const { machineName } = machineIdentity();
-		const { PortalClient } = await import("./client-D6UUwESi.mjs");
+		const { PortalClient } = await import("./client-CKlIpyAb.mjs");
 		let lastLine = "";
 		let signalConnected;
 		const connected = new Promise((resolve) => {
@@ -1906,7 +1907,7 @@ const openCommand = {
 		const client = new PortalClient({
 			appUrl: session.appUrl,
 			sessionToken: session.sessionToken,
-			cwd,
+			resolveCwd: () => cwd,
 			onState: (state) => {
 				if (state.status === "connected") signalConnected();
 				const line = state.status === "error" ? `portal: connection error: ${state.error ?? "unknown"} — retrying` : `portal: ${state.status}`;
@@ -2021,10 +2022,111 @@ function buildDeviceTable(devices, agents, thisMachineName) {
 		])
 	};
 }
+/**
+* `skydive portal daemon <cmd>` — operator control of the per-host portal daemon
+* (the process that owns the single portal connection and routes exec per
+* conversation). Distinct from the agent-facing `platform portal`: this manages
+* the local daemon a human runs, so it lives on the skydive CLI only.
+*/
+const daemonStatusCommand = {
+	command: "status",
+	describe: "Show the portal daemon: running state, connection, and routing map",
+	handler: async (argv) => {
+		const status = await queryDaemonStatus(requireSession(argv).appUrl);
+		if (argv.json) {
+			output(argv, status ?? { running: false });
+			return;
+		}
+		if (!status) {
+			console.log("portal daemon: not running");
+			return;
+		}
+		const cwdCount = Object.keys(status.cwds).length;
+		console.log(`portal daemon: running (pid ${status.pid})`);
+		console.log(`  app:        ${status.appUrl}`);
+		console.log(`  connection: ${status.portal.status}${status.portal.error ? ` (${status.portal.error})` : ""}`);
+		if (status.portal.machineName) console.log(`  machine:    ${status.portal.friendlyName}`);
+		console.log(`  attached:   ${status.clientCount} CLI session(s)`);
+		console.log(`  granted:    ${status.portal.grantedAgentIds.length} agent(s)`);
+		console.log(`  routing:    ${cwdCount} conversation(s)`);
+	}
+};
+const daemonStopCommand = {
+	command: "stop",
+	describe: "Stop the portal daemon, cutting every attached session and live exec/tunnel",
+	handler: async (argv) => {
+		const result = await stopDaemon(requireSession(argv).appUrl);
+		if (argv.json) {
+			output(argv, { result });
+			return;
+		}
+		console.log(result === "not-running" ? "portal daemon: not running" : result === "failed" ? "portal daemon: could not be stopped" : `portal daemon: stopped${result === "killed" ? " (force-killed)" : ""}`);
+	}
+};
+const daemonStartCommand = {
+	command: "start",
+	describe: "Start the portal daemon if it is not already running",
+	handler: async (argv) => {
+		const session = requireSession(argv);
+		await ensureDaemonRunning(session.appUrl);
+		const status = await queryDaemonStatus(session.appUrl);
+		if (argv.json) {
+			output(argv, {
+				running: !!status,
+				pid: status?.pid ?? null
+			});
+			return;
+		}
+		console.log(status ? `portal daemon: running (pid ${status.pid})` : "portal daemon: failed to start");
+	}
+};
+const daemonRestartCommand = {
+	command: "restart",
+	describe: "Stop and restart the portal daemon (e.g. to pick up a new build)",
+	handler: async (argv) => {
+		const session = requireSession(argv);
+		await stopDaemon(session.appUrl);
+		await ensureDaemonRunning(session.appUrl);
+		const status = await queryDaemonStatus(session.appUrl);
+		if (argv.json) {
+			output(argv, {
+				running: !!status,
+				pid: status?.pid ?? null
+			});
+			return;
+		}
+		console.log(status ? `portal daemon: restarted (pid ${status.pid})` : "portal daemon: failed to restart");
+	}
+};
+const daemonLogsCommand = {
+	command: "logs",
+	describe: "Print the portal daemon's log",
+	builder: (y) => y.option("follow", {
+		alias: "f",
+		type: "boolean",
+		default: false,
+		describe: "Follow the log (like tail -f)"
+	}),
+	handler: async (argv) => {
+		const { logPath } = daemonPaths(requireSession(argv).appUrl);
+		const child = spawn("tail", argv.follow === true ? ["-f", logPath] : [
+			"-n",
+			"200",
+			logPath
+		], { stdio: "inherit" });
+		await new Promise((resolve) => child.on("close", () => resolve()));
+	}
+};
+const daemonCommand = {
+	command: "daemon",
+	describe: "Control the local portal daemon (status, stop, start, restart, logs)",
+	builder: (y) => y.command(daemonStatusCommand).command(daemonStopCommand).command(daemonStartCommand).command(daemonRestartCommand).command(daemonLogsCommand).demandCommand(1, "Specify a subcommand: status, stop, start, restart, logs"),
+	handler: () => {}
+};
 const portalCommand = {
 	command: "portal",
 	describe: "Open this machine's portal to agents and manage their access",
-	builder: (y) => y.command(openCommand).command(grantCommand).command(revokeCommand).command(statusCommand).demandCommand(1, "Specify a subcommand: open, grant, revoke, status"),
+	builder: (y) => y.command(openCommand).command(grantCommand).command(revokeCommand).command(statusCommand).command(daemonCommand).demandCommand(1, "Specify a subcommand: open, grant, revoke, status, daemon"),
 	handler: () => {}
 };
 
@@ -2139,7 +2241,7 @@ async function runPty({ session, agentId, agentName }) {
 		return 1;
 	}
 	console.error(`Connecting to ${agentName}'s sandbox… (Ctrl-] detaches)`);
-	const { runRawPtyPassthrough } = await import("./raw-pty-pspO57gT.mjs");
+	const { runRawPtyPassthrough } = await import("./raw-pty-ChUHav4d.mjs");
 	const result = await runRawPtyPassthrough({
 		stdin: process.stdin,
 		stdout: process.stdout,
@@ -2616,12 +2718,18 @@ if (process.argv.includes(UPDATE_WORKER_FLAG)) {
 	await runUpdateCheckWorker();
 	process.exit(0);
 }
-maybePrintWhatsNew();
-setupUpdateCheck(hideBin(process.argv));
-const resolved = resolveArgv(hideBin(process.argv));
-const raw = hideBin(process.argv);
-if ((raw.includes("--help") || raw.includes("-h")) && !raw.some((a) => !a.startsWith("-")) && !raw.includes("--json") && !raw.includes("--quiet")) process.stdout.write(brandHelpArt());
-createCli(resolved).parse();
+if (process.argv.includes(PORTAL_DAEMON_FLAG)) {
+	const { runPortalDaemon } = await import("./daemon-CqhMYzpN.mjs");
+	runPortalDaemon(process.argv);
+} else runCli();
+function runCli() {
+	maybePrintWhatsNew();
+	setupUpdateCheck(hideBin(process.argv));
+	const resolved = resolveArgv(hideBin(process.argv));
+	const raw = hideBin(process.argv);
+	if ((raw.includes("--help") || raw.includes("-h")) && !raw.some((a) => !a.startsWith("-")) && !raw.includes("--json") && !raw.includes("--quiet")) process.stdout.write(brandHelpArt());
+	createCli(resolved).parse();
+}
 
 //#endregion
 export {  };

package/dist/js/{boot-BJZrdTk0.mjs → boot-CaWHIM4R.mjs}

@@ -1,25 +1,25 @@
 #!/usr/bin/env node
-import { C as setActiveWorkspace, S as listWorkspaces, a as WORDMARK, b as getActiveWorkspaceId, c as applyTheme, d as noColorRequested, f as theme, g as themeVersion, h as themeModeFromColorFgBg, i as MARK_CELLS, l as findTheme, m as themeMode, n as buildCrashReport, p as themeForMode, r as writeCrashReport, s as DEFAULT_THEME_ID, t as installCrashHandler, u as monoTheme, v as themesForMode } from "./install-B5sKLfRc.mjs";
+import { C as setActiveWorkspace, S as listWorkspaces, a as WORDMARK, b as getActiveWorkspaceId, c as applyTheme, d as noColorRequested, f as theme, g as themeVersion, h as themeModeFromColorFgBg, i as MARK_CELLS, l as findTheme, m as themeMode, n as buildCrashReport, p as themeForMode, r as writeCrashReport, s as DEFAULT_THEME_ID, t as installCrashHandler, u as monoTheme, v as themesForMode } from "./install-BhPuzBxW.mjs";
 import { E as getSavedTheme, F as resolveWebUrl, R as saveTheme, S as getConfigPath, T as getReviewStateDir, c as cardActionErrorMessage, d as reconcileMaskedInput, f as resolveConnectUrl, i as resolveAgent, l as parseExternalOauthConnectParams, m as specKeyFor, p as parseConnectCard, s as MASK_CHAR, u as parseOauthConnectParams, v as DEFAULT_API_URL, y as DEFAULT_APP_URL } from "./print-CNIvmpqW.mjs";
 import { a as errorMessage, i as sendErrorMessage, n as createRestClient, o as isRecord, r as errorDetail, t as HttpError } from "./rest-Q5yl_b2-.mjs";
-import "./api-CLTp-mKM.mjs";
-import { t as SandboxStream } from "./client-BVOAwU8M.mjs";
-import { t as PortalClient } from "./client-BigvBsPk.mjs";
-import { t as runRawPtyPassthrough } from "./raw-pty-Dbi2kb9v.mjs";
+import { t as PortalClient } from "./client-DT9bWi1D.mjs";
+import { d as makeLineParser, f as parseDaemonMessage, l as daemonPaths, n as ensureDaemonRunning, s as LOCAL_PROTOCOL_VERSION, u as encodeLine } from "./daemon-DfMgVlYE.mjs";
+import { t as SandboxStream } from "./client-DfcJFEbh.mjs";
+import { t as runRawPtyPassthrough } from "./raw-pty-BcjbTjHJ.mjs";
 import * as os$1 from "node:os";
 import { homedir, platform, release, tmpdir } from "node:os";
 import path, { basename, extname, isAbsolute, join, win32 } from "node:path";
 import { z } from "zod";
 import open from "open";
 import { execFile, spawn } from "node:child_process";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { constants } from "node:fs";
+import { connect, createConnection } from "node:net";
+import { access, appendFile, mkdir, mkdtemp, readFile, readdir, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { MarkdownRenderable, RenderableEvents, StyledText, SyntaxStyle, createCliRenderer, decodePasteBytes, detectLinks, fg, link } from "@opentui/core";
 import { createRoot, extend, useKeyboard, usePaste, useRenderer, useTerminalDimensions } from "@opentui/react";
 import { createContext, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { create } from "zustand";
-import { connect, createConnection } from "node:net";
-import { access, appendFile, mkdir, mkdtemp, readFile, readdir, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { Fragment, jsx, jsxs } from "@opentui/react/jsx-runtime";
 import fuzzysort from "fuzzysort";
 import { fileURLToPath } from "node:url";
@@ -228,23 +228,222 @@ async function resolveInitialScreen({ rest, agentSelector, conversationId, newCo
 	};
 }
 
+//#endregion
+//#region src/chat/portal/daemon-client.ts
+var PortalDaemonClient = class {
+	sessionId = randomUUID();
+	socket = null;
+	disposed = false;
+	reconnectTimer = null;
+	lastBind = null;
+	wantEnabled = false;
+	pendingGrants = /* @__PURE__ */ new Set();
+	grantedAgentIds = /* @__PURE__ */ new Set();
+	constructor(opts) {
+		this.opts = opts;
+	}
+	/** Spawn the daemon if needed and attach. Idempotent. */
+	async start() {
+		if (this.disposed) return;
+		await ensureDaemonRunning(this.opts.appUrl);
+		this.connect();
+	}
+	connect() {
+		if (this.disposed) return;
+		const { socketPath } = daemonPaths(this.opts.appUrl);
+		const socket = connect(socketPath);
+		socket.setEncoding("utf8");
+		this.socket = socket;
+		const parse = makeLineParser();
+		socket.on("connect", () => {
+			this.send({
+				t: "hello",
+				v: LOCAL_PROTOCOL_VERSION,
+				sessionId: this.sessionId,
+				token: this.opts.sessionToken
+			});
+			if (this.wantEnabled) this.send({ t: "enable" });
+			if (this.lastBind) this.send({
+				t: "bind",
+				sessionId: this.sessionId,
+				conversationId: this.lastBind.conversationId,
+				cwd: this.lastBind.cwd
+			});
+			for (const agentId of this.pendingGrants) this.send({
+				t: "grant",
+				agentId
+			});
+		});
+		socket.on("data", (chunk) => {
+			for (const line of parse(chunk)) {
+				const msg = parseDaemonMessage(line);
+				if (msg) this.onMessage(msg);
+			}
+		});
+		const onClose = () => {
+			if (this.socket === socket) this.socket = null;
+			this.scheduleReconnect();
+		};
+		socket.on("close", onClose);
+		socket.on("error", onClose);
+	}
+	scheduleReconnect() {
+		if (this.disposed || this.reconnectTimer) return;
+		this.reconnectTimer = setTimeout(() => {
+			this.reconnectTimer = null;
+			this.start();
+		}, 500);
+		this.reconnectTimer.unref();
+	}
+	onMessage(msg) {
+		if (msg.t === "state") {
+			this.grantedAgentIds = new Set(msg.grantedAgentIds);
+			this.opts.onState({
+				status: msg.status,
+				machineName: msg.machineName,
+				friendlyName: msg.friendlyName,
+				error: msg.error,
+				grantedAgentIds: msg.grantedAgentIds
+			});
+		}
+	}
+	/** Whether this agent is currently authorized on the machine (last daemon state). */
+	isGranted(agentId) {
+		return this.grantedAgentIds.has(agentId);
+	}
+	/** Whether the user has turned machine sharing on from this CLI. */
+	isEnabled() {
+		return this.wantEnabled;
+	}
+	send(msg) {
+		if (this.socket?.writable) this.socket.write(encodeLine(msg));
+	}
+	/** Turn machine sharing on (the daemon connects the portal). */
+	enable() {
+		this.wantEnabled = true;
+		this.send({ t: "enable" });
+	}
+	/** Turn machine sharing off. */
+	disable() {
+		this.wantEnabled = false;
+		this.send({ t: "disable" });
+	}
+	/** Register / update this conversation's working directory for exec routing. */
+	bind(conversationId, cwd) {
+		this.lastBind = {
+			conversationId,
+			cwd
+		};
+		this.send({
+			t: "bind",
+			sessionId: this.sessionId,
+			conversationId,
+			cwd
+		});
+	}
+	/**
+	* Authorize one agent to run commands on this machine. Resolves once the
+	* request is sent to the daemon (the daemon performs the grant and pushes the
+	* updated state); kept async so it's a drop-in for the old in-process client's
+	* awaited `grantAgent`.
+	*/
+	grantAgent(agentId) {
+		this.pendingGrants.add(agentId);
+		this.send({
+			t: "grant",
+			agentId
+		});
+		return Promise.resolve();
+	}
+	/** Detach this CLI. The daemon keeps running for other clients. */
+	dispose() {
+		this.disposed = true;
+		if (this.reconnectTimer) {
+			clearTimeout(this.reconnectTimer);
+			this.reconnectTimer = null;
+		}
+		this.send({
+			t: "bye",
+			sessionId: this.sessionId
+		});
+		try {
+			this.socket?.destroy();
+		} catch (_error) {}
+		this.socket = null;
+	}
+};
+
+//#endregion
+//#region src/chat/portal/create-portal-client.ts
+/**
+* Escape hatch: setting `SKYDIVE_NO_DAEMON` (to any non-empty value)
+* makes the CLI bypass the portal daemon and open the portal connection
+* in-process, the pre-daemon behavior. This is a LOCAL env switch, not a remote
+* flag: it takes effect on the next CLI start and lets a user (or us) fall back
+* instantly if the daemon misbehaves in the wild, without shipping a new build.
+* The daemon is the default because it fixes the multi-process presence flap.
+*/
+function portalDaemonDisabled() {
+	return !!process.env.SKYDIVE_NO_DAEMON;
+}
+/**
+* Build the portal client the app should use: the daemon client by default, or
+* the in-process `PortalClient` when the kill switch is set. The in-process
+* client always runs exec in the launch cwd (it has no conversation map), which
+* is the exact pre-daemon behavior.
+*/
+function createPortalClient(opts) {
+	if (portalDaemonDisabled()) {
+		const client = new PortalClient({
+			appUrl: opts.appUrl,
+			sessionToken: opts.sessionToken,
+			resolveCwd: () => process.cwd(),
+			onState: (state) => opts.onState({
+				status: state.status,
+				machineName: state.machineName,
+				friendlyName: state.friendlyName,
+				error: state.error,
+				grantedAgentIds: state.grantedAgentIds
+			})
+		});
+		return {
+			start: () => Promise.resolve(),
+			enable: () => client.enable(),
+			disable: () => client.disable(),
+			grantAgent: (agentId) => client.grantAgent(agentId),
+			isGranted: (agentId) => client.isGranted(agentId),
+			bind: () => {},
+			dispose: () => client.dispose()
+		};
+	}
+	return new PortalDaemonClient(opts);
+}
+
 //#endregion
 //#region src/chat/portal/use-portal.ts
 /**
-* Owns the `PortalClient` lifecycle for the app session and keeps the store in
-* sync with its status. Constructed once from the resolved session; disabling
-* happens on unmount so quitting the TUI drops presence and kills any children.
+* Owns the portal DAEMON CLIENT lifecycle for the app session and keeps the
+* store in sync with the daemon's status.
+*
+* The CLI no longer opens the portal connection itself: it attaches to a
+* per-host daemon (spawned on demand) that owns the single portal WebSocket, so
+* multiple `skydive` processes on one machine share one portal identity instead
+* of fighting over it (the flap). This hook just wires the daemon client into
+* the store; the chat screen registers each conversation's working directory via
+* `portalClient.bind(...)` so the daemon runs that conversation's exec in the
+* right place.
+*
 * `shareMachine` opts in from launch (the `--share-machine` flag); otherwise the
-* user turns sharing on from the chat screen.
+* user turns sharing on from the chat screen. Detaching on unmount leaves the
+* daemon running for any other attached CLIs.
 */
 function usePortal({ appUrl, sessionToken, shareMachine }) {
 	const syncPortal = useStore((s) => s.syncPortal);
 	const setPortalClient = useStore((s) => s.setPortalClient);
 	useEffect(() => {
-		const client = new PortalClient({
+		const client = createPortalClient({
 			appUrl,
 			sessionToken,
-			cwd: process.cwd(),
 			onState: (state) => syncPortal({
 				status: state.status,
 				machineName: state.machineName,
@@ -253,7 +452,9 @@ function usePortal({ appUrl, sessionToken, shareMachine }) {
 			})
 		});
 		setPortalClient(client);
-		if (shareMachine) client.enable();
+		client.start().then(() => {
+			if (shareMachine) client.enable();
+		});
 		return () => {
 			client.dispose();
 			setPortalClient(null);
@@ -9191,6 +9392,16 @@ function ChatScreen({ agent, conversation }) {
 		agentHost.setSession(conversationId);
 		setResumeConversation(conversationId);
 	}, [agentHost, conversationId]);
+	const bindPortalCwd = useCallback(() => {
+		if (!conversationId || !portalClient) return;
+		if (portal.status === "off") return;
+		const cwd = shellSessionRef.current?.cwd ?? process.cwd();
+		portalClient.bind(conversationId, cwd);
+	}, [
+		conversationId,
+		portalClient,
+		portal.status
+	]);
 	const scrollRef = useRef(null);
 	const composerRef = useRef(null);
 	const jumpToBottom = useCallback(() => {
@@ -9761,6 +9972,7 @@ function ChatScreen({ agent, conversation }) {
 				...m,
 				exit: exitCode
 			} : m));
+			bindPortalCwd();
 		} catch (err) {
 			appendOutput(`\n${errorMessage(err)}`);
 			exitCode = 1;
@@ -9770,7 +9982,7 @@ function ChatScreen({ agent, conversation }) {
 			} : m));
 		}
 		sendContent(formatShellContext(command, captured, exitCode), [], { echo: false });
-	}, [sendContent]);
+	}, [sendContent, bindPortalCwd]);
 	const runSandboxExec = useCallback((command) => {
 		if (!appUrl || !sessionToken) return;
 		const id = crypto.randomUUID();
@@ -10099,6 +10311,7 @@ function ChatScreen({ agent, conversation }) {
 		if (portal.status === "off") {
 			declinedRef.current.delete(agent.id);
 			portalClient.enable();
+			if (conversationId) portalClient.bind(conversationId, shellSessionRef.current?.cwd ?? process.cwd());
 		} else {
 			portalClient.disable();
 			setPortalPrompt(null);
@@ -10107,7 +10320,8 @@ function ChatScreen({ agent, conversation }) {
 		portalClient,
 		portal.status,
 		agent.id,
-		setPortalPrompt
+		setPortalPrompt,
+		conversationId
 	]);
 	const confirmGrant = useCallback(() => {
 		if (!portalClient) return;

package/dist/js/client-CKlIpyAb.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import "./rest-Q5yl_b2-.mjs";
+import { t as PortalClient } from "./client-DT9bWi1D.mjs";
+
+export { PortalClient };