skydive-cli 0.5.0-beta.3 → 0.5.0-beta.4

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-DtuXkIkR.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-RmWjKIHD.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 resolveMachineIdentity, i as grantPortalAccess, n as fetchPortalDevices, o as revokePortalAccess, r as findThisDevice } from "./client-Dd5sMXPv.mjs";
-import { i as queryDaemonStatus, l as PORTAL_DAEMON_FLAG, n as ensureDaemonRunning, s as stopDaemon, u as daemonPaths } from "./daemon-Bq93vOIk.mjs";
+import { i as queryDaemonStatus, l as PORTAL_DAEMON_FLAG, n as ensureDaemonRunning, s as stopDaemon, u as daemonPaths } from "./daemon-BYlIJN6x.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-BVVbrf2k.mjs");
+		const { runChat } = await import("./boot-B_93T51X.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-C1LPsgTP.mjs");
+	const { connectMachineShare } = await import("./print-share-uwUG16Ov.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-BVVbrf2k.mjs");
+		const { runChat } = await import("./boot-B_93T51X.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-C1LPsgTP.mjs");
+		const { connectMachineShare } = await import("./print-share-uwUG16Ov.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-BVVbrf2k.mjs");
+			const { runWorkspacePicker } = await import("./boot-B_93T51X.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}
@@ -2366,7 +2366,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 } = await resolveMachineIdentity();
-		const { PortalDaemonClient } = await import("./daemon-client-srAit8Fz.mjs");
+		const { PortalDaemonClient } = await import("./daemon-client-Z4Ce4zf-.mjs");
 		let lastLine = "";
 		let signalConnected;
 		const connected = new Promise((resolve) => {
@@ -4169,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-DDBIumf1.mjs");
+	const { runPortalDaemon } = await import("./daemon-CBvFKDpy.mjs");
 	runPortalDaemon(process.argv);
 } else runCli();
 function runCli() {

package/dist/js/{boot-BVVbrf2k.mjs → boot-B_93T51X.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-DtuXkIkR.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-RmWjKIHD.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-Dd5sMXPv.mjs";
-import "./daemon-Bq93vOIk.mjs";
+import "./daemon-BYlIJN6x.mjs";
 import { t as SandboxStream } from "./client-Cn2af31H.mjs";
-import { t as PortalDaemonClient } from "./daemon-client-Bewt98dE.mjs";
+import { t as PortalDaemonClient } from "./daemon-client-DPjmvIDE.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/{daemon-Bq93vOIk.mjs → daemon-BYlIJN6x.mjs}

@@ -8,6 +8,43 @@ import { createHash } from "node:crypto";
 import { connect, createServer } from "node:net";
 import { access, appendFile, mkdir, readFile, unlink, writeFile } from "node:fs/promises";
 
+//#region ../portal-daemon/src/build-stamp.ts
+/**
+* This build's stamp: the unix commit time (seconds) of the source it was
+* compiled from. Empty string when unstamped (a dev source run without the
+* env override).
+*
+* Why a commit time and not a package version: the daemon ships inside two
+* independently-versioned installers (the skydive CLI and the desktop app),
+* so their semvers are not comparable — but both build from this repo, so
+* the commit time of the built tree is one monotonic clock they share.
+*/
+function portalDaemonBuild() {
+	return "1786574791";
+}
+/**
+* Whether a client carrying `mine` should replace a running daemon carrying
+* `theirs` (newest build wins):
+*
+*  - an unstamped client never takes over — it can't prove it's newer;
+*  - a stamped client replaces an unstamped daemon — every stamped build
+*    postdates stamping, so the unstamped daemon is older by construction;
+*  - otherwise strictly greater wins; equal keeps the incumbent, so two
+*    identical builds never bounce the daemon between them.
+*/
+function isNewerBuild(mine, theirs) {
+	const mineAt = parseStamp(mine);
+	if (mineAt === null) return false;
+	const theirsAt = parseStamp(theirs);
+	if (theirsAt === null) return true;
+	return mineAt > theirsAt;
+}
+function parseStamp(stamp) {
+	if (!/^[0-9]+$/.test(stamp)) return null;
+	return Number(stamp);
+}
+
+//#endregion
 //#region ../portal-daemon/src/local-protocol.ts
 /**
 * Local IPC between the portal DAEMON and the `skydive` CLI processes attached
@@ -220,6 +257,7 @@ const daemonStatusResultSchema = z.object({
 	v: z.number(),
 	pid: z.number(),
 	appUrl: z.string(),
+	build: z.string().default(""),
 	portal: z.object({
 		status: z.enum([
 			"off",
@@ -516,6 +554,7 @@ var PortalDaemon = class {
 			v: LOCAL_PROTOCOL_VERSION,
 			pid: process.pid,
 			appUrl: this.appUrl,
+			build: portalDaemonBuild(),
 			portal: {
 				status: portal?.status ?? "off",
 				machineName: portal?.machineName ?? "",
@@ -573,10 +612,23 @@ var PortalDaemon = class {
 * before dispatching a normal command — the same pattern the update-check
 * worker uses, so it survives bundling (import.meta.url points at the bundle,
 * not a standalone daemon module).
+*
+* Newest build wins: the daemon is embedded in two independently-updated
+* installers (the skydive CLI and the desktop app), and whoever spawned first
+* would otherwise hold the socket forever — a stale desktop daemon serving a
+* newer CLI indefinitely. So when a daemon is already listening, compare its
+* build stamp to ours: if ours is strictly newer, ask it to shut down (it
+* drains attached clients, who reconnect within ~500ms) and spawn from this
+* binary. Both spawners apply the same rule, so a host converges on the
+* newest installed build with at most one bounce.
 */
 async function ensureDaemonRunning(appUrl) {
 	const { socketPath } = daemonPaths(appUrl);
-	if (await isDaemonListening(socketPath)) return;
+	if (await isDaemonListening(socketPath)) {
+		const status = await queryDaemonStatus(appUrl);
+		if (!status || !isNewerBuild(portalDaemonBuild(), status.build)) return;
+		if (await stopDaemon(appUrl) === "failed") return;
+	}
 	const entry = process.argv[1];
 	const args = entry ? [
 		entry,

package/dist/js/{daemon-DDBIumf1.mjs → daemon-CBvFKDpy.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 import "./client-Dd5sMXPv.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-Bq93vOIk.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-BYlIJN6x.mjs";
 
 export { runPortalDaemon };

package/dist/js/{daemon-client-Bewt98dE.mjs → daemon-client-DPjmvIDE.mjs}

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

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

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

package/dist/js/{print-share-C1LPsgTP.mjs → print-share-uwUG16Ov.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-CKBQ8pft.mjs");
+	const { PortalClient } = await import("./client-DZstLQ_1.mjs");
 	let signalConnected;
 	const connected = new Promise((resolve) => {
 		signalConnected = resolve;

package/dist/js/{profiler-DtuXkIkR.mjs → profiler-RmWjKIHD.mjs}

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

package/package.json

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

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

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