skydive-cli 0.1.0-beta.50 → 0.1.0-beta.65

package/dist/js/bin.mjs

@@ -13,7 +13,7 @@ import fs from "node:fs";
 import zlib from "node:zlib";
 
 //#region package.json
-var version$1 = "0.1.0-beta.50";
+var version$1 = "0.1.0-beta.65";
 
 //#endregion
 //#region src/types.ts
@@ -447,7 +447,7 @@ async function getActiveWorkspaceId({ appUrl, sessionToken }) {
 }
 async function setActiveWorkspace({ appUrl, sessionToken, organizationId }) {
 	try {
-		const res = await fetch(`${appUrl}/api/auth/organization/set-active`, {
+		const res = await fetch(`${appUrl}/api/v1/workspaces/switch`, {
 			method: "POST",
 			headers: {
 				...authHeaders(sessionToken),
@@ -455,7 +455,7 @@ async function setActiveWorkspace({ appUrl, sessionToken, organizationId }) {
 			},
 			body: JSON.stringify({ organizationId })
 		});
-		if (!res.ok) return err({ message: `failed to set active workspace (${res.status})` });
+		if (!res.ok) return err({ message: `failed to switch workspace (${res.status})` });
 		return ok(void 0);
 	} catch (e) {
 		return err({ message: e instanceof Error ? e.message : String(e) });
@@ -2046,7 +2046,7 @@ const chatCommand = {
 			printError(`Unknown theme "${themeId}". Valid themes: ${themes.map((t) => t.id).join(", ")}`);
 			process.exit(1);
 		}
-		const { runChat } = await import("./boot-SDnaYmi-.mjs");
+		const { runChat } = await import("./boot-BUk9yMvA.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -2137,7 +2137,7 @@ async function runList(argv, { hint }) {
 		w.name,
 		w.slug
 	]));
-	if (hint && !argv.quiet) console.log("\nRun `skydive workspace switch <slug>` to switch which workspace `skydive chat` uses.");
+	if (hint && !argv.quiet) console.log("\nRun `skydive workspace switch` to pick a workspace, or pass its slug directly.");
 }
 const listCommand = {
 	command: "list",
@@ -2145,15 +2145,28 @@ const listCommand = {
 	handler: (argv) => runList(argv, { hint: false })
 };
 const switchCommand = {
-	command: "switch <workspace>",
+	command: "switch [workspace]",
 	describe: "Switch which workspace `skydive chat` uses",
 	builder: (y) => y.positional("workspace", {
 		type: "string",
-		demandOption: true,
+		demandOption: false,
 		describe: "Workspace slug, name, or ID"
 	}),
 	handler: async (argv) => {
 		const session = requireSession(argv);
+		if (!argv.workspace) {
+			if (argv.json || argv.quiet || isNonInteractive()) {
+				printError("Interactive workspace switching needs a terminal. Pass a workspace slug, name, or ID.");
+				process.exit(1);
+			}
+			if (await ensureBunAndReexec((message) => process.stderr.write(`${message}\n`)) === "unavailable") {
+				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-BUk9yMvA.mjs");
+			await runWorkspacePicker(session);
+			return;
+		}
 		const workspaces = await listWorkspaces(session);
 		if (workspaces.isErr()) {
 			printError(workspaces.error.message);
@@ -2277,4 +2290,4 @@ function resolveArgv(args, tty = {
 createCli(resolveArgv(hideBin(process.argv))).parse();
 
 //#endregion
-export { resolveWebUrl as _, noColorRequested as a, themeMode as c, themesForMode as d, getActiveWorkspaceId as f, getSavedTheme as g, DEFAULT_APP_URL as h, monoTheme as i, themeModeFromColorFgBg as l, DEFAULT_API_URL as m, applyTheme as n, theme as o, listWorkspaces as p, findTheme as r, themeForMode as s, DEFAULT_THEME_ID as t, themeVersion as u, saveTheme as v };
+export { getSavedTheme as _, noColorRequested as a, themeMode as c, themesForMode as d, getActiveWorkspaceId as f, DEFAULT_APP_URL as g, DEFAULT_API_URL as h, monoTheme as i, themeModeFromColorFgBg as l, setActiveWorkspace as m, applyTheme as n, theme as o, listWorkspaces as p, findTheme as r, themeForMode as s, DEFAULT_THEME_ID as t, themeVersion as u, resolveWebUrl as v, saveTheme as y };

package/dist/js/{boot-SDnaYmi-.mjs → boot-BUk9yMvA.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { i as createRestClient, n as resolveAgent, r as HttpError } from "./print-BtMdNPJR.mjs";
-import { _ as resolveWebUrl, a as noColorRequested, c as themeMode, d as themesForMode, f as getActiveWorkspaceId, g as getSavedTheme, h as DEFAULT_APP_URL, i as monoTheme, l as themeModeFromColorFgBg, m as DEFAULT_API_URL, n as applyTheme, o as theme, p as listWorkspaces, r as findTheme, s as themeForMode, t as DEFAULT_THEME_ID, u as themeVersion, v as saveTheme } from "./bin.mjs";
+import { _ as getSavedTheme, a as noColorRequested, c as themeMode, d as themesForMode, f as getActiveWorkspaceId, g as DEFAULT_APP_URL, h as DEFAULT_API_URL, i as monoTheme, l as themeModeFromColorFgBg, m as setActiveWorkspace, n as applyTheme, o as theme, p as listWorkspaces, r as findTheme, s as themeForMode, t as DEFAULT_THEME_ID, u as themeVersion, v as resolveWebUrl, y as saveTheme } from "./bin.mjs";
 import path, { basename, isAbsolute, join, win32 } from "node:path";
 import { z } from "zod";
 import open from "open";
@@ -1226,6 +1226,7 @@ function screenLabel(screen, chatTitle) {
 		case "error": return "";
 		case "agent-picker": return "pick an agent";
 		case "agent-create": return "create an agent";
+		case "workspace-picker": return "switch workspace";
 		case "conversation-picker": return `${screen.agent.name} · pick a conversation`;
 		case "chat": {
 			const c = screen.conversation;
@@ -1258,7 +1259,8 @@ function AgentPickerScreen() {
 	const [cache, setCache] = useState({});
 	const [state, setState] = useState({ kind: "loading" });
 	useKeyboard((key) => {
-		if (key.name === "n" && key.ctrl) goTo({ kind: "agent-create" });
+		if (key.name === "w" && key.ctrl) goTo({ kind: "workspace-picker" });
+		else if (key.name === "n" && key.ctrl) goTo({ kind: "agent-create" });
 		else if (key.name === "tab") setScope((s) => s === "mine" ? "org" : "mine");
 	});
 	useEffect(() => {
@@ -1324,7 +1326,7 @@ function AgentPickerScreen() {
 	});
 	if (state.agents.length === 0) return /* @__PURE__ */ jsx("text", {
 		fg: theme.muted,
-		children: scope === "mine" ? "no agents of yours yet. press tab to see all agents, or ctrl+n to create one." : "no agents in this workspace. press ctrl+n to create one."
+		children: scope === "mine" ? "no agents of yours yet. press tab to see all agents, ctrl+w to switch workspace, or ctrl+n to create one." : "no agents in this workspace. press ctrl+w to switch workspace, or ctrl+n to create one."
 	});
 	return /* @__PURE__ */ jsx(FilterableAgentList, {
 		agents: state.agents,
@@ -1391,7 +1393,7 @@ function FilterableAgentList({ agents, scope, onPick }) {
 					" ",
 					"· tab ",
 					scope === "mine" ? "all" : "mine",
-					" · ↑/↓ move · ↵ open · ctrl+n new"
+					" · ↑/↓ move · ↵ open · ctrl+w workspace · ctrl+n new"
 				]
 			}),
 			/* @__PURE__ */ jsx("box", {
@@ -1568,6 +1570,146 @@ function AgentCreateScreen() {
 	});
 }
 
+//#endregion
+//#region src/chat/tui/screens/workspace-picker.tsx
+function WorkspacePicker({ appUrl, sessionToken, onSelect, onCancel }) {
+	const { height } = useTerminalDimensions();
+	const [state, setState] = useState({ kind: "loading" });
+	const [highlight, setHighlight] = useState(0);
+	const [switching, setSwitching] = useState(false);
+	useEffect(() => {
+		let cancelled = false;
+		(async () => {
+			const [workspaces, activeId] = await Promise.all([listWorkspaces({
+				appUrl,
+				sessionToken
+			}), getActiveWorkspaceId({
+				appUrl,
+				sessionToken
+			})]);
+			if (cancelled) return;
+			if (workspaces.isErr()) {
+				setState({
+					kind: "error",
+					message: workspaces.error.message
+				});
+				return;
+			}
+			if (activeId.isErr()) {
+				setState({
+					kind: "error",
+					message: activeId.error.message
+				});
+				return;
+			}
+			setHighlight(Math.max(0, workspaces.value.findIndex((workspace) => workspace.id === activeId.value)));
+			setState({
+				kind: "ready",
+				workspaces: workspaces.value,
+				activeId: activeId.value
+			});
+		})();
+		return () => {
+			cancelled = true;
+		};
+	}, [appUrl, sessionToken]);
+	const rows = state.kind === "ready" ? state.workspaces : [];
+	const clamped = Math.min(highlight, Math.max(0, rows.length - 1));
+	useKeyboard((key) => {
+		if (switching) return;
+		if (key.name === "escape" || key.name === "c" && key.ctrl) onCancel();
+		else if (key.name === "up") setHighlight(Math.max(0, clamped - 1));
+		else if (key.name === "down") setHighlight(Math.min(rows.length - 1, clamped + 1));
+		else if (key.name === "return") {
+			const workspace = rows[clamped];
+			if (!workspace) return;
+			setSwitching(true);
+			(async () => {
+				const result = await setActiveWorkspace({
+					appUrl,
+					sessionToken,
+					organizationId: workspace.id
+				});
+				if (result.isErr()) {
+					setState({
+						kind: "error",
+						message: result.error.message
+					});
+					setSwitching(false);
+					return;
+				}
+				onSelect(workspace);
+			})();
+		}
+	});
+	if (state.kind === "loading") return /* @__PURE__ */ jsx("text", {
+		fg: theme.muted,
+		children: "loading workspaces…"
+	});
+	if (state.kind === "error") return /* @__PURE__ */ jsxs("box", {
+		style: { flexDirection: "column" },
+		children: [/* @__PURE__ */ jsxs("text", {
+			fg: theme.error,
+			children: ["error: ", state.message]
+		}), /* @__PURE__ */ jsx("text", {
+			fg: theme.dim,
+			children: "esc cancel"
+		})]
+	});
+	if (rows.length === 0) return /* @__PURE__ */ jsxs("box", {
+		style: { flexDirection: "column" },
+		children: [/* @__PURE__ */ jsx("text", {
+			fg: theme.muted,
+			children: "no workspaces available"
+		}), /* @__PURE__ */ jsx("text", {
+			fg: theme.dim,
+			children: "esc cancel"
+		})]
+	});
+	const visibleRows = Math.max(3, height - 6);
+	const start = windowStart(clamped, rows.length, visibleRows);
+	const windowed = rows.slice(start, start + visibleRows);
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			flexGrow: 1
+		},
+		children: [
+			/* @__PURE__ */ jsx("text", {
+				fg: theme.accent,
+				children: "switch workspace"
+			}),
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					flexDirection: "column",
+					flexGrow: 1,
+					marginTop: 1
+				},
+				children: windowed.map((workspace, index) => {
+					const selected = start + index === clamped;
+					const active = workspace.id === state.activeId;
+					return /* @__PURE__ */ jsxs("text", {
+						fg: selected ? theme.accent : theme.fg,
+						children: [
+							selected ? "› " : "  ",
+							active ? "● " : "  ",
+							workspace.name,
+							/* @__PURE__ */ jsxs("span", {
+								fg: theme.dim,
+								children: [" ", workspace.slug]
+							})
+						]
+					}, workspace.id);
+				})
+			}),
+			/* @__PURE__ */ jsx("text", {
+				fg: theme.dim,
+				children: switching ? "switching…" : "↑/↓ move · ↵ select · esc cancel"
+			})
+		]
+	});
+}
+
 //#endregion
 //#region src/chat/tui/screens/conversation-picker.tsx
 function ConversationPickerScreen({ agent }) {
@@ -5914,6 +6056,15 @@ function App({ appUrl, sessionToken, shareMachine, promptHistoryPath, notificati
 						screen.kind === "error" && /* @__PURE__ */ jsx(ErrorScreen, { message: screen.message }),
 						screen.kind === "agent-picker" && rest && /* @__PURE__ */ jsx(AgentPickerScreen, {}),
 						screen.kind === "agent-create" && rest && /* @__PURE__ */ jsx(AgentCreateScreen, {}),
+						screen.kind === "workspace-picker" && /* @__PURE__ */ jsx(WorkspacePicker, {
+							appUrl,
+							sessionToken,
+							onCancel: () => goTo({ kind: "agent-picker" }),
+							onSelect: (workspace) => {
+								setWorkspaceName(workspace.name);
+								goTo({ kind: "agent-picker" });
+							}
+						}),
 						screen.kind === "conversation-picker" && rest && /* @__PURE__ */ jsx(ConversationPickerScreen, { agent: screen.agent }),
 						screen.kind === "chat" && rest && /* @__PURE__ */ jsx(ChatScreen, {
 							agent: screen.agent,
@@ -6202,6 +6353,27 @@ async function runChat({ appUrl, sessionToken, shareMachine, promptHistoryPath,
 		agentSelector: agentSelector ?? null
 	}));
 }
+/** Open the same workspace picker used by the initial agent screen. */
+async function runWorkspacePicker({ appUrl, sessionToken }) {
+	const renderer = await createCliRenderer({ exitOnCtrlC: false });
+	const detected = await renderer.waitForThemeMode() ?? themeModeFromColorFgBg() ?? "dark";
+	useStore.getState().setThemeMode(detected);
+	const close = () => renderer.destroy();
+	createRoot(renderer).render(/* @__PURE__ */ jsx("box", {
+		style: {
+			flexDirection: "column",
+			flexGrow: 1,
+			padding: 1,
+			backgroundColor: theme.background
+		},
+		children: /* @__PURE__ */ jsx(WorkspacePicker, {
+			appUrl,
+			sessionToken,
+			onSelect: close,
+			onCancel: close
+		})
+	}));
+}
 
 //#endregion
-export { runChat };
+export { runChat, runWorkspacePicker };

package/package.json

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