skydive-cli 0.1.0-beta.389 → 0.1.0-beta.390

package/README.md

@@ -25,7 +25,10 @@ single `config.json`:
   same machine replaces it rather than accumulating rows, and
   `skydive auth logout` revokes it, so signing out doesn't leave a live key
   behind. The workspace is in the name because the key is pinned to it: unlike
-  the session, a key never follows `workspace switch`.
+  the session, a key never follows `workspace switch` — and whenever the key
+  (not the session) is the credential actually driving a management command,
+  the CLI says so on stderr, naming the pinned workspace, so commands never
+  silently act in a workspace you switched away from.
 - a **user session** for `skydive chat`. Chat is user-level and multi-agent,
   so it authenticates as you — and unlike the API key (which is pinned to the
   workspace that minted it), the session follows `skydive workspace switch`.

package/dist/js/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { A as getStoredApiKeyId, C as DEFAULT_WEB_URL, E as getPromptHistoryPath, F as resolveSession, L as saveConfig, M as resolveAppUrl, N as resolveConfig, P as resolveManagementAuth, R as saveSession, T as getConfigPath, _ as setActiveWorkspace, b as API_KEY_PREFIX, d as themes, g as listWorkspaces, h as getSessionIdentity, j as getUpdateCheckDisabled, k as getShareMachineDefault, m as getActiveWorkspaceId, p as ensureActiveOrganization, v as API_KEYS_URL, w as deleteConfig, x as DEFAULT_API_URL, y as API_KEY_FAMILY_PREFIX } from "./theme-DRuLtrTy.mjs";
+import { A as getStoredApiKeyId, C as DEFAULT_WEB_URL, E as getPromptHistoryPath, F as resolveManagementAuth, I as resolveSession, M as getUpdateCheckDisabled, N as resolveAppUrl, P as resolveConfig, R as saveConfig, T as getConfigPath, _ as setActiveWorkspace, b as API_KEY_PREFIX, d as themes, g as listWorkspaces, h as getSessionIdentity, j as getStoredApiKeyWorkspaceName, k as getShareMachineDefault, m as getActiveWorkspaceId, p as ensureActiveOrganization, v as API_KEYS_URL, w as deleteConfig, x as DEFAULT_API_URL, y as API_KEY_FAMILY_PREFIX, z as saveSession } from "./theme-C_Fqxi-U.mjs";
 import { n as createRestClient } from "./rest-DTlkPko_.mjs";
 import { i as resolveAgent } from "./print-BhfjRrxI.mjs";
 import { a as registerPortalDevice, c as machineIdentity, n as findThisDevice, o as revokePortalAccess, r as grantPortalAccess, t as fetchPortalDevices } from "./api-DRpbKHz6.mjs";
@@ -19,7 +19,7 @@ import semver from "semver";
 
 //#region package.json
 var name = "skydive-cli";
-var version = "0.1.0-beta.389";
+var version = "0.1.0-beta.390";
 
 //#endregion
 //#region src/types.ts
@@ -578,7 +578,8 @@ async function runBrowserLogin(argv) {
 	if (minted.isOk()) saveConfig({
 		apiKey: minted.value.key,
 		apiUrl: appUrl,
-		apiKeyId: minted.value.id
+		apiKeyId: minted.value.id,
+		workspaceName: identity?.activeWorkspaceName ?? null
 	});
 	else process.stderr.write(`Warning: signed in, but could not mint an API key (${minted.error.message}). Management commands will use your session; run \`skydive auth login\` again to retry.
 `);
@@ -623,7 +624,8 @@ async function runApiKeyLogin(argv, apiKey) {
 	saveConfig({
 		apiKey,
 		apiUrl,
-		apiKeyId: null
+		apiKeyId: null,
+		workspaceName: null
 	});
 	if (argv.json) output(argv, {
 		authenticated: true,
@@ -694,6 +696,7 @@ const statusCommand$1 = {
 					workspaceName: identity?.activeWorkspaceName ?? null
 				},
 				managementAuth: management.isOk() ? management.value.kind : null,
+				keyWorkspaceName: getStoredApiKeyWorkspaceName(),
 				configPath: getConfigPath()
 			});
 			return;
@@ -706,6 +709,8 @@ const statusCommand$1 = {
 			console.log("API key:");
 			console.log(`  Key:    ${apiKey.value.apiKey.slice(0, 12)}...`);
 			console.log(`  API:    ${apiKey.value.apiUrl}`);
+			const pinned = getStoredApiKeyWorkspaceName();
+			if (pinned) console.log(`  Space:  ${pinned} (the key always acts here)`);
 		} else console.log("API key:      not configured.");
 		if (session.isOk()) {
 			console.log("Chat session:");
@@ -721,7 +726,7 @@ const statusCommand$1 = {
 			}
 		} else console.log("Chat session: not signed in.");
 		if (management.isOk()) {
-			const via = management.value.kind === "session" ? "chat session (follows `workspace switch`)" : "API key (pinned to the workspace that minted it)";
+			const via = management.value.kind === "session" ? "chat session (follows `workspace switch`)" : management.value.pinnedWorkspaceName ? `API key (always acts in "${management.value.pinnedWorkspaceName}")` : "API key (always acts in the workspace it was created in)";
 			console.log(`Management commands use: ${via}`);
 		}
 		console.log(`Config: ${getConfigPath()}`);
@@ -760,6 +765,8 @@ function requireManagementClient(argv) {
 		printError(auth.error.message);
 		process.exit(1);
 	}
+	if (auth.value.kind === "api-key" && auth.value.pinnedWorkspaceName) process.stderr.write(`Using this machine's API key, which always acts in the "${auth.value.pinnedWorkspaceName}" workspace (even after \`workspace switch\`). Run \`skydive auth login\` to change that.
+`);
 	return new SkydiveApiClient(auth.value);
 }
 /** Resolve the session (see {@link requireSession}) and build a REST client. */
@@ -1416,7 +1423,7 @@ const chatCommand = {
 			printError(`Unknown theme "${themeId}". Valid themes: ${themes.map((t) => t.id).join(", ")}`);
 			process.exit(1);
 		}
-		const { runChat } = await import("./boot-CMhIv1BG.mjs");
+		const { runChat } = await import("./boot-Ce1QLo2p.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1728,7 +1735,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-CMhIv1BG.mjs");
+			const { runWorkspacePicker } = await import("./boot-Ce1QLo2p.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}

package/dist/js/{boot-CMhIv1BG.mjs → boot-Ce1QLo2p.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { D as getReviewStateDir, I as resolveWebUrl, O as getSavedTheme, S as DEFAULT_APP_URL, T as getConfigPath, _ as setActiveWorkspace, a as noColorRequested, c as themeMode, f as themesForMode, g as listWorkspaces, i as monoTheme, l as themeModeFromColorFgBg, m as getActiveWorkspaceId, n as applyTheme, o as theme, r as findTheme, s as themeForMode, t as DEFAULT_THEME_ID, u as themeVersion, x as DEFAULT_API_URL, z as saveTheme } from "./theme-DRuLtrTy.mjs";
+import { B as saveTheme, D as getReviewStateDir, L as resolveWebUrl, O as getSavedTheme, S as DEFAULT_APP_URL, T as getConfigPath, _ as setActiveWorkspace, a as noColorRequested, c as themeMode, f as themesForMode, g as listWorkspaces, i as monoTheme, l as themeModeFromColorFgBg, m as getActiveWorkspaceId, n as applyTheme, o as theme, r as findTheme, s as themeForMode, t as DEFAULT_THEME_ID, u as themeVersion, x as DEFAULT_API_URL } from "./theme-C_Fqxi-U.mjs";
 import { n as createRestClient, r as errorDetail, t as HttpError } from "./rest-DTlkPko_.mjs";
 import { n as isRecord, t as errorMessage } from "./util-z9Pne47f.mjs";
 import { c as cardActionErrorMessage, d as reconcileMaskedInput, f as resolveConnectUrl, i as resolveAgent, l as parseExternalOauthConnectParams, p as parseConnectCard, s as MASK_CHAR, u as parseOauthConnectParams } from "./print-BhfjRrxI.mjs";

package/dist/js/{theme-DRuLtrTy.mjs → theme-C_Fqxi-U.mjs}

@@ -77,13 +77,17 @@ function resolveManagementAuth(opts) {
 	if (session.isOk()) return ok({
 		token: session.value.sessionToken,
 		apiUrl: session.value.appUrl,
-		kind: "session"
+		kind: "session",
+		pinnedWorkspaceName: null
 	});
-	const apiKey = process.env["SKYDIVE_API_KEY"] ?? store.get("apiKey");
+	const envKey = process.env["SKYDIVE_API_KEY"];
+	const storedKey = store.get("apiKey");
+	const apiKey = envKey ?? storedKey;
 	if (apiKey) return ok({
 		token: apiKey,
 		apiUrl: process.env["SKYDIVE_API_URL"] ?? opts.apiUrl ?? store.get("apiUrl") ?? DEFAULT_API_URL,
-		kind: "api-key"
+		kind: "api-key",
+		pinnedWorkspaceName: !envKey && storedKey ? store.get("apiKeyWorkspaceName") ?? null : null
 	});
 	return err({ message: "Not authenticated. Run `skydive auth login`." });
 }
@@ -92,11 +96,17 @@ function saveConfig(config) {
 	store.set("apiUrl", config.apiUrl);
 	if (config.apiKeyId) store.set("apiKeyId", config.apiKeyId);
 	else store.delete("apiKeyId");
+	if (config.workspaceName) store.set("apiKeyWorkspaceName", config.workspaceName);
+	else store.delete("apiKeyWorkspaceName");
 }
 /** Server-side id of the auto-minted key, if login minted one. */
 function getStoredApiKeyId() {
 	return store.get("apiKeyId") ?? null;
 }
+/** Workspace the auto-minted key is pinned to, if login recorded one. */
+function getStoredApiKeyWorkspaceName() {
+	return store.get("apiKeyWorkspaceName") ?? null;
+}
 function deleteConfig() {
 	store.clear();
 }
@@ -971,4 +981,4 @@ function applyTheme(def) {
 }
 
 //#endregion
-export { getStoredApiKeyId as A, DEFAULT_WEB_URL as C, getReviewStateDir as D, getPromptHistoryPath as E, resolveSession as F, resolveWebUrl as I, saveConfig as L, resolveAppUrl as M, resolveConfig as N, getSavedTheme as O, resolveManagementAuth as P, saveSession as R, DEFAULT_APP_URL as S, getConfigPath as T, setActiveWorkspace as _, noColorRequested as a, API_KEY_PREFIX as b, themeMode as c, themes as d, themesForMode as f, listWorkspaces as g, getSessionIdentity as h, monoTheme as i, getUpdateCheckDisabled as j, getShareMachineDefault as k, themeModeFromColorFgBg as l, getActiveWorkspaceId as m, applyTheme as n, theme as o, ensureActiveOrganization as p, findTheme as r, themeForMode as s, DEFAULT_THEME_ID as t, themeVersion as u, API_KEYS_URL as v, deleteConfig as w, DEFAULT_API_URL as x, API_KEY_FAMILY_PREFIX as y, saveTheme as z };
+export { getStoredApiKeyId as A, saveTheme as B, DEFAULT_WEB_URL as C, getReviewStateDir as D, getPromptHistoryPath as E, resolveManagementAuth as F, resolveSession as I, resolveWebUrl as L, getUpdateCheckDisabled as M, resolveAppUrl as N, getSavedTheme as O, resolveConfig as P, saveConfig as R, DEFAULT_APP_URL as S, getConfigPath as T, setActiveWorkspace as _, noColorRequested as a, API_KEY_PREFIX as b, themeMode as c, themes as d, themesForMode as f, listWorkspaces as g, getSessionIdentity as h, monoTheme as i, getStoredApiKeyWorkspaceName as j, getShareMachineDefault as k, themeModeFromColorFgBg as l, getActiveWorkspaceId as m, applyTheme as n, theme as o, ensureActiveOrganization as p, findTheme as r, themeForMode as s, DEFAULT_THEME_ID as t, themeVersion as u, API_KEYS_URL as v, deleteConfig as w, DEFAULT_API_URL as x, API_KEY_FAMILY_PREFIX as y, saveSession as z };

package/package.json

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