skydive-cli 0.4.1-beta.1 → 0.4.1-beta.3

package/dist/js/bin.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { C as ensureActiveOrganization, D as setActiveWorkspace, E as listWorkspaces, O as name, T as getSessionIdentity, a as installCrashHandler, k as version, t as maybeStartProfiling, u as brandHelpArt, w as getActiveWorkspaceId, x as themes } from "./profiler-QFAEvYKe.mjs";
+import { C as ensureActiveOrganization, D as setActiveWorkspace, E as listWorkspaces, O as name, T as getSessionIdentity, a as installCrashHandler, k as version, t as maybeStartProfiling, u as brandHelpArt, w as getActiveWorkspaceId, x as themes } from "./profiler-iQDVJ3Ho.mjs";
 import { A as getStoredApiKeyWorkspaceName, C as getLastSeenVersion, F as resolveManagementAuth, I as resolveSession, M as resolveAppUrl, N as resolveChatAuth, O as getShareMachineDefault, P as resolveConfig, R as saveConfig, S as getConfigPath, T as getPromptHistoryPath, V as setLastSeenVersion, _ as API_KEY_PREFIX, b as PREFERENCES, g as API_KEY_FAMILY_PREFIX, h as API_KEYS_URL, i as resolveAgent, j as getUpdateCheckDisabled, k as getStoredApiKeyId, v as DEFAULT_API_URL, w as getPreference, x as deleteConfig, z as saveSession } from "./print-CbayCa87.mjs";
 import { n as printError, r as printTable, t as output } from "./output-DYzzdXYV.mjs";
 import { t as HttpError } from "./http-error-DzyrsLAZ.mjs";
 import { t as createRestClient } from "./rest-BY2nADw5.mjs";
 import "./billing-blocked-2wju4gC_.mjs";
-import { a as registerPortalDevice, c as machineIdentity, i as grantPortalAccess, n as fetchPortalDevices, o as revokePortalAccess, r as findThisDevice } from "./client-Cf7cvftg.mjs";
-import { c as PORTAL_DAEMON_FLAG, i as queryDaemonStatus, l as daemonPaths, n as ensureDaemonRunning, o as stopDaemon } from "./daemon-DaUaCMwC.mjs";
+import { a as registerPortalDevice, c as resolveMachineIdentity, i as grantPortalAccess, n as fetchPortalDevices, o as revokePortalAccess, r as findThisDevice } from "./client-DaZyQfQ-.mjs";
+import { i as queryDaemonStatus, l as PORTAL_DAEMON_FLAG, n as ensureDaemonRunning, s as stopDaemon, u as daemonPaths } from "./daemon-DpqP-4tS.mjs";
 import { t as SandboxStream } from "./client-Cn2af31H.mjs";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs";
@@ -1516,7 +1516,7 @@ const importCommand = {
 				process.exit(1);
 			}
 		}
-		const { runChat } = await import("./boot-DPmh-zP7.mjs");
+		const { runChat } = await import("./boot-B04lv7Lk.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1543,7 +1543,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-CT4ltX7u.mjs");
+	const { connectMachineShare } = await import("./print-share-Jgn0lqGr.mjs");
 	const machineShare = await connectMachineShare({
 		appUrl,
 		sessionToken: session.value.sessionToken,
@@ -1928,7 +1928,7 @@ const chatCommand = {
 			sessionToken: auth.value.token,
 			agentSelector: argv.agent ?? null
 		});
-		const { runChat } = await import("./boot-DPmh-zP7.mjs");
+		const { runChat } = await import("./boot-B04lv7Lk.mjs");
 		await runChat({
 			appUrl: auth.value.appUrl,
 			sessionToken: auth.value.token,
@@ -2020,7 +2020,7 @@ async function runPrintMode({ argv, appUrl }) {
 			process.exit(1);
 		}
 	} else {
-		const { connectMachineShare } = await import("./print-share-CT4ltX7u.mjs");
+		const { connectMachineShare } = await import("./print-share-Jgn0lqGr.mjs");
 		machineShare = await connectMachineShare({
 			appUrl: auth.value.appUrl,
 			sessionToken: auth.value.token,
@@ -2287,7 +2287,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-DPmh-zP7.mjs");
+			const { runWorkspacePicker } = await import("./boot-B04lv7Lk.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}
@@ -2336,11 +2336,12 @@ const workspaceCommand = {
 */
 async function resolveGrantTarget(argv) {
 	const session = requireSession(argv);
-	const { devices, agents } = await fetchPortalDevices(session);
+	const [{ devices, agents }, identity] = await Promise.all([fetchPortalDevices(session), resolveMachineIdentity()]);
 	return {
 		session,
 		agent: resolveAgent(agents, argv.agent),
-		device: findThisDevice(devices, machineIdentity().machineName)
+		device: findThisDevice(devices, identity.machineName),
+		identity
 	};
 }
 function agentOption(y) {
@@ -2364,8 +2365,8 @@ const openCommand = {
 		const session = requireSession(argv);
 		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 { PortalDaemonClient } = await import("./daemon-client-DlblQIR9.mjs");
+		const { machineName } = await resolveMachineIdentity();
+		const { PortalDaemonClient } = await import("./daemon-client-TQuXEURW.mjs");
 		let lastLine = "";
 		let signalConnected;
 		const connected = new Promise((resolve) => {
@@ -2406,8 +2407,8 @@ const grantCommand = {
 	describe: "Allow an agent to run commands on this machine (persists until revoked)",
 	builder: agentOption,
 	handler: async (argv) => {
-		const { session, agent, device } = await resolveGrantTarget(argv);
-		const { machineName, friendlyName } = machineIdentity();
+		const { session, agent, device, identity } = await resolveGrantTarget(argv);
+		const { machineName, friendlyName } = identity;
 		const deviceId = device ? device.id : (await registerPortalDevice(session, {
 			machineName,
 			friendlyName
@@ -2431,8 +2432,8 @@ const revokeCommand = {
 	describe: "Remove an agent's access to this machine",
 	builder: agentOption,
 	handler: async (argv) => {
-		const { session, agent, device } = await resolveGrantTarget(argv);
-		if (!device) throw new Error(`this machine (${machineIdentity().machineName}) isn't registered with the portal, so there's nothing to revoke.`);
+		const { session, agent, device, identity } = await resolveGrantTarget(argv);
+		if (!device) throw new Error(`this machine (${identity.machineName}) isn't registered with the portal, so there's nothing to revoke.`);
 		await revokePortalAccess(session, {
 			deviceId: device.id,
 			agentId: agent.id
@@ -2463,7 +2464,7 @@ const statusCommand = {
 			console.log("No machines registered. Run `skydive portal open` to register this one.");
 			return;
 		}
-		const { headers, rows } = buildDeviceTable(devices, agents, machineIdentity().machineName);
+		const { headers, rows } = buildDeviceTable(devices, agents, (await resolveMachineIdentity()).machineName);
 		printTable(headers, rows);
 	}
 };
@@ -2471,7 +2472,7 @@ const statusCommand = {
 * Build the `portal status` table. Grant ids are shown as agent names when the
 * org roster resolves them (deleted agents fall back to the raw id), and the
 * device this CLI would register as is marked so "which row is me" doesn't
-* depend on knowing the `-cli` naming convention.
+* depend on scanning the table.
 */
 function buildDeviceTable(devices, agents, thisMachineName) {
 	const agentNames = new Map(agents.map((a) => [a.id, a.name]));
@@ -4168,7 +4169,7 @@ if (process.argv.includes(UPDATE_WORKER_FLAG)) {
 	process.exit(0);
 }
 if (process.argv.includes(PORTAL_DAEMON_FLAG)) {
-	const { runPortalDaemon } = await import("./daemon-imLBqTGg.mjs");
+	const { runPortalDaemon } = await import("./daemon-BKVPOhzU.mjs");
 	runPortalDaemon(process.argv);
 } else runCli();
 function runCli() {

package/dist/js/{boot-DPmh-zP7.mjs → boot-B04lv7Lk.mjs}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-import { D as setActiveWorkspace, E as listWorkspaces, S as themesForMode, _ as themeForMode, a as installCrashHandler, b as themeVersion, c as MARK_CELLS, d as DEFAULT_THEME_ID, f as applyTheme, g as theme, h as noColorRequested, i as writeArtifact, l as WORDMARK, m as monoTheme, n as profilingEnabled, o as buildCrashReport, p as findTheme, r as record, s as writeCrashReport, v as themeMode, w as getActiveWorkspaceId, y as themeModeFromColorFgBg } from "./profiler-QFAEvYKe.mjs";
+import { D as setActiveWorkspace, E as listWorkspaces, S as themesForMode, _ as themeForMode, a as installCrashHandler, b as themeVersion, c as MARK_CELLS, d as DEFAULT_THEME_ID, f as applyTheme, g as theme, h as noColorRequested, i as writeArtifact, l as WORDMARK, m as monoTheme, n as profilingEnabled, o as buildCrashReport, p as findTheme, r as record, s as writeCrashReport, v as themeMode, w as getActiveWorkspaceId, y as themeModeFromColorFgBg } from "./profiler-iQDVJ3Ho.mjs";
 import { B as saveTheme, D as getSavedTheme, E as getReviewStateDir, L as resolveWebUrl, S as getConfigPath, 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-CbayCa87.mjs";
 import { t as HttpError } from "./http-error-DzyrsLAZ.mjs";
 import { a as isRecord, i as errorMessage, n as errorDetail, r as sendErrorMessage, t as createRestClient } from "./rest-BY2nADw5.mjs";
 import { i as billingBlockedOutcomeFromSendResponse } from "./billing-blocked-2wju4gC_.mjs";
-import { t as PortalClient } from "./client-Cf7cvftg.mjs";
-import "./daemon-DaUaCMwC.mjs";
+import { t as PortalClient } from "./client-DaZyQfQ-.mjs";
+import "./daemon-DpqP-4tS.mjs";
 import { t as SandboxStream } from "./client-Cn2af31H.mjs";
-import { t as PortalDaemonClient } from "./daemon-client-CJxbCLOb.mjs";
+import { t as PortalDaemonClient } from "./daemon-client-F7gX12Mp.mjs";
 import { t as runRawPtyPassthrough } from "./raw-pty-B6mAroiI.mjs";
 import * as os$1 from "node:os";
 import { homedir, platform, release, tmpdir } from "node:os";

package/dist/js/client-BsTDaKa2.mjs

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

package/dist/js/{client-Cf7cvftg.mjs → client-DaZyQfQ-.mjs}

@@ -2,27 +2,51 @@
 import { t as HttpError } from "./http-error-DzyrsLAZ.mjs";
 import os from "node:os";
 import { z } from "zod";
-import { spawn } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import { WebSocket } from "ws";
 
 //#region ../portal-daemon/src/machine.ts
 /**
-* Identity this machine registers under when the CLI shares it via the portal.
+* Identity this machine registers under on the portal.
 *
-* The `-cli` suffix / `(CLI)` label keep a CLI-shared machine a DISTINCT portal
-* device from the same host's Skydive Desktop app. `portal_device` is unique on
-* (org, user, machineName), and directives route to whichever socket holds the
-* device — if the CLI and desktop registered the same name they'd share a
-* device row and both execute every directive. Distinct names also make the
-* grant UI unambiguous about which surface is being authorized.
+* One device row per (org, user, machine): the daemon owns the host's single
+* portal connection, and every surface (CLI, TUI, desktop app) shares that
+* row, so a grant applies to the machine no matter which surface the user
+* shared from. The name must therefore match what the desktop app registers —
+* on macOS that is `scutil --get LocalHostName` (the Rust client's own
+* derivation, stabler than the network-assigned hostname), with the plain
+* hostname as the fallback for other platforms or a failed read.
+*
+* Historically the CLI suffixed `-cli` to keep a device distinct from the
+* desktop's; `unifyLegacyCliGrants` migrates grants off those rows.
 */
-function machineIdentity() {
-	const host = (os.hostname() || "machine").trim().replace(/\.local$/i, "") || "machine";
+async function resolveMachineIdentity() {
+	const fallback = fallbackHost();
+	if (process.platform !== "darwin") return {
+		machineName: fallback,
+		friendlyName: fallback
+	};
+	const local = await scutilRead("LocalHostName") ?? fallback;
 	return {
-		machineName: `${host}-cli`,
-		friendlyName: `${host} (CLI)`
+		machineName: local,
+		friendlyName: await scutilRead("ComputerName") ?? local
 	};
 }
+function fallbackHost() {
+	return (os.hostname() || "machine").trim().replace(/\.local$/i, "") || "machine";
+}
+function scutilRead(key) {
+	return new Promise((resolve) => {
+		execFile("/usr/sbin/scutil", ["--get", key], { timeout: 2e3 }, (error, stdout) => {
+			if (error) {
+				resolve(null);
+				return;
+			}
+			const value = stdout.trim();
+			resolve(value.length > 0 ? value : null);
+		});
+	});
+}
 const INHERITED_ENV = [
 	"HOME",
 	"USER",
@@ -340,12 +364,34 @@ async function revokePortalAccess(auth, { deviceId, agentId }) {
 }
 /**
 * The device row for a given machine identity. Matching is by `machineName`
-* equality — the stable per-surface handle (`<host>-cli` vs the desktop's
-* `<host>`), not the display label.
+* 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
@@ -370,13 +416,11 @@ var PortalClient = class {
 	error = null;
 	deviceId = null;
 	granted = /* @__PURE__ */ new Set();
-	machineName;
-	friendlyName;
+	machineName = "";
+	friendlyName = "";
+	legacyGrantsChecked = false;
 	constructor(opts) {
 		this.opts = opts;
-		const identity = machineIdentity();
-		this.machineName = identity.machineName;
-		this.friendlyName = identity.friendlyName;
 	}
 	isEnabled() {
 		return this.enabled;
@@ -438,6 +482,11 @@ var PortalClient = class {
 		});
 	}
 	async connectLoop() {
+		if (!this.machineName) {
+			const identity = await resolveMachineIdentity();
+			this.machineName = identity.machineName;
+			this.friendlyName = identity.friendlyName;
+		}
 		let backoff = INITIAL_BACKOFF_MS;
 		while (this.enabled && !this.disposed) {
 			this.setStatus("connecting");
@@ -470,7 +519,7 @@ var PortalClient = class {
 			this.jobs = jobs;
 			ws.on("open", () => {
 				this.setStatus("connected");
-				this.refreshDevice();
+				this.syncDeviceState();
 			});
 			ws.on("message", (data, isBinary) => {
 				if (isBinary) jobs.handleFrame(toBuffer(data));
@@ -505,6 +554,20 @@ var PortalClient = class {
 			this.emit();
 		} catch (_error) {}
 	}
+	/**
+	* Post-connect device sync: read our row, then (once per process) copy any
+	* grants still hanging off the legacy `<host>-cli` device onto this one so
+	* agents the user already approved keep their access under the merged
+	* identity.
+	*/
+	async syncDeviceState() {
+		await this.refreshDevice();
+		if (this.legacyGrantsChecked) return;
+		this.legacyGrantsChecked = true;
+		try {
+			if (await unifyLegacyCliGrants(this.opts, this.machineName) > 0) await this.refreshDevice();
+		} catch (_error) {}
+	}
 };
 function toBuffer(data) {
 	if (Buffer.isBuffer(data)) return data;
@@ -516,4 +579,4 @@ function sleep(ms) {
 }
 
 //#endregion
-export { registerPortalDevice as a, machineIdentity as c, grantPortalAccess as i, fetchPortalDevices as n, revokePortalAccess as o, findThisDevice as r, isRecord as s, PortalClient as t };
+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 };

package/dist/js/daemon-BKVPOhzU.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import "./client-DaZyQfQ-.mjs";
+import { a as runPortalDaemon, i as queryDaemonStatus, n as ensureDaemonRunning, o as startPortalDaemon, r as isDaemonListening, s as stopDaemon, t as PortalDaemon } from "./daemon-DpqP-4tS.mjs";
+
+export { runPortalDaemon };

package/dist/js/{daemon-DaUaCMwC.mjs → daemon-DpqP-4tS.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { s as isRecord, t as PortalClient } from "./client-Cf7cvftg.mjs";
+import { s as isRecord, t as PortalClient } from "./client-DaZyQfQ-.mjs";
 import os from "node:os";
 import path from "node:path";
 import { z } from "zod";
@@ -510,7 +510,16 @@ async function ensureDaemonRunning(appUrl) {
 function runPortalDaemon(argv) {
 	const appUrl = argv[argv.indexOf(PORTAL_DAEMON_FLAG) + 1];
 	if (!appUrl) process.exit(1);
-	new PortalDaemon(appUrl).listen().catch(() => process.exit(1));
+	startPortalDaemon(appUrl).catch(() => process.exit(1));
+}
+/**
+* Become the portal daemon for `appUrl`: bind the control socket and serve
+* attached clients until idle shutdown. Resolves once listening; rejects if
+* the socket can't be bound (another daemon already holds it). Shared by the
+* CLI's re-exec entry above and the standalone `main.ts` entry.
+*/
+function startPortalDaemon(appUrl) {
+	return new PortalDaemon(appUrl).listen();
 }
 async function isDaemonListening(socketPath) {
 	if (!await pathExists(socketPath)) return false;
@@ -621,4 +630,4 @@ function sleep(ms) {
 }
 
 //#endregion
-export { runPortalDaemon as a, PORTAL_DAEMON_FLAG as c, makeLineParser as d, parseDaemonMessage as f, queryDaemonStatus as i, daemonPaths as l, ensureDaemonRunning as n, stopDaemon as o, isDaemonListening as r, LOCAL_PROTOCOL_VERSION as s, PortalDaemon as t, encodeLine as u };
+export { runPortalDaemon as a, LOCAL_PROTOCOL_VERSION as c, encodeLine as d, makeLineParser as f, queryDaemonStatus as i, PORTAL_DAEMON_FLAG as l, ensureDaemonRunning as n, startPortalDaemon as o, parseDaemonMessage as p, isDaemonListening as r, stopDaemon as s, PortalDaemon as t, daemonPaths as u };

package/dist/js/{daemon-client-CJxbCLOb.mjs → daemon-client-F7gX12Mp.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { d as makeLineParser, f as parseDaemonMessage, l as daemonPaths, n as ensureDaemonRunning, s as LOCAL_PROTOCOL_VERSION, u as encodeLine } from "./daemon-DaUaCMwC.mjs";
+import { c as LOCAL_PROTOCOL_VERSION, d as encodeLine, f as makeLineParser, n as ensureDaemonRunning, p as parseDaemonMessage, u as daemonPaths } from "./daemon-DpqP-4tS.mjs";
 import { randomUUID } from "node:crypto";
 import { connect } from "node:net";
 

package/dist/js/daemon-client-TQuXEURW.mjs

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import "./client-DaZyQfQ-.mjs";
+import "./daemon-DpqP-4tS.mjs";
+import { t as PortalDaemonClient } from "./daemon-client-F7gX12Mp.mjs";
+
+export { PortalDaemonClient };

package/dist/js/{print-share-CT4ltX7u.mjs → print-share-Jgn0lqGr.mjs}

@@ -14,7 +14,7 @@ import { n as printError } from "./output-DYzzdXYV.mjs";
 * the reply (and to --json).
 */
 async function connectMachineShare({ appUrl, sessionToken, timeoutHint }) {
-	const { PortalClient } = await import("./client-CneLVPei.mjs");
+	const { PortalClient } = await import("./client-BsTDaKa2.mjs");
 	let signalConnected;
 	const connected = new Promise((resolve) => {
 		signalConnected = resolve;

package/dist/js/{profiler-QFAEvYKe.mjs → profiler-iQDVJ3Ho.mjs}

@@ -8,7 +8,7 @@ import fs from "node:fs";
 
 //#region package.json
 var name = "skydive-cli";
-var version$1 = "0.4.1-beta.1";
+var version$1 = "0.4.1-beta.3";
 
 //#endregion
 //#region src/auth/organization.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skydive-cli",
-  "version": "0.4.1-beta.1",
+  "version": "0.4.1-beta.3",
   "description": "Skydive CLI — cloud agents from the command line",
   "homepage": "https://skydive.com",
   "license": "MIT",

package/dist/js/client-CneLVPei.mjs

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

package/dist/js/daemon-client-DlblQIR9.mjs

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-import "./client-Cf7cvftg.mjs";
-import "./daemon-DaUaCMwC.mjs";
-import { t as PortalDaemonClient } from "./daemon-client-CJxbCLOb.mjs";
-
-export { PortalDaemonClient };

package/dist/js/daemon-imLBqTGg.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-import "./client-Cf7cvftg.mjs";
-import { a as runPortalDaemon, i as queryDaemonStatus, n as ensureDaemonRunning, o as stopDaemon, r as isDaemonListening, t as PortalDaemon } from "./daemon-DaUaCMwC.mjs";
-
-export { runPortalDaemon };