skydive-cli 0.2.0-beta.482 → 0.2.0-beta.509

package/README.md

@@ -176,6 +176,13 @@ internal API. On launch it walks you through:
    formatting, collapsed reasoning, and rich rendering of tool calls
    (`bash`, `edit`/`write` diffs, `read`, `grep`/`glob`).
 
+You can change conversation without leaving chat. `/conversation` (aliases
+`/conversations`, `/conv`) reopens the conversation list, and
+`/conversation <id>` — an id, its `/c/<id>` link, or a pasted
+`skydive chat --resume <id>` line — jumps straight into that thread, including
+one belonging to a **different** agent. Either way the run you leave behind
+keeps going server-side; reopening it reattaches to the stream.
+
 Runs under **Node** like every other command. The TUI renders through
 OpenTUI, whose native core needs the [Bun](https://bun.sh) runtime, so the
 first `chat` run downloads a private, pinned Bun and re-execs under it

package/dist/js/bin.mjs

@@ -20,7 +20,7 @@ import semver from "semver";
 
 //#region package.json
 var name = "skydive-cli";
-var version = "0.2.0-beta.482";
+var version = "0.2.0-beta.509";
 
 //#endregion
 //#region src/types.ts
@@ -1200,7 +1200,7 @@ const importCommand = {
 				process.exit(1);
 			}
 		}
-		const { runChat } = await import("./boot-B8ownO3n.mjs");
+		const { runChat } = await import("./boot-C-wL4WoP.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1511,7 +1511,7 @@ const chatCommand = {
 			printError(`Unknown theme "${themeId}". Valid themes: ${themes.map((t) => t.id).join(", ")}`);
 			process.exit(1);
 		}
-		const { runChat } = await import("./boot-B8ownO3n.mjs");
+		const { runChat } = await import("./boot-C-wL4WoP.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1810,7 +1810,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-B8ownO3n.mjs");
+			const { runWorkspacePicker } = await import("./boot-C-wL4WoP.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}

package/dist/js/{boot-B8ownO3n.mjs → boot-C-wL4WoP.mjs}

@@ -2003,6 +2003,33 @@ function relativeTime(iso) {
 	return `${Math.floor(diffMs / 864e5)}d ago`;
 }
 
+//#endregion
+//#region src/chat/conversation-ref.ts
+/**
+* Parsing the conversation reference a user hands `/conversation`.
+*
+* The whole point of the command is that you paste whatever you already have
+* in front of you, so every form the platform hands out has to work: a bare
+* id, the `https://skydive.com/c/<id>` link an agent replies with, or the
+* `skydive chat --resume <id>` line the TUI prints on exit. All three carry
+* exactly one id, so we pull the first uuid out of the string rather than
+* teaching this about URL shapes and command syntax.
+*
+* Validating here (instead of letting the API answer) is what turns a typo
+* into "not a conversation id" in the composer rather than a request that
+* cannot succeed.
+*/
+const uuidPattern = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;
+/**
+* The conversation id in `input`, lowercased, or null when there isn't one.
+* Trailing punctuation, query strings and surrounding prose are tolerated —
+* a pasted link or command line is the expected input, not the exception.
+*/
+function parseConversationRef(input) {
+	const match = uuidPattern.exec(input);
+	return match ? match[0].toLowerCase() : null;
+}
+
 //#endregion
 //#region src/chat/paste.ts
 const MAX_PATH_PASTE_CHARS = 4096;
@@ -4095,8 +4122,8 @@ function TodoCardView({ todos, isActive }) {
 //#endregion
 //#region src/chat/tui/chat/footer-hints.ts
 /** Build the chat footer copy independently of its colors and layout. */
-function formatChatFooterStatus({ runKind, ctrlCArmed, isShared, hasPendingSteer, hasActionableCard, nonWebChannel }) {
-	const connectHint = hasActionableCard ? "ctrl+r connect · " : "";
+function formatChatFooterStatus({ runKind, ctrlCArmed, isShared, hasPendingSteer, actionableCardCount, nonWebChannel }) {
+	const connectHint = actionableCardCount > 1 ? `ctrl+r connect (${actionableCardCount}) · ` : actionableCardCount === 1 ? "ctrl+r connect · " : "";
 	switch (runKind) {
 		case "idle":
 			if (ctrlCArmed) return "press ctrl+c again to quit";
@@ -4443,7 +4470,7 @@ const keybindGroups = [
 			},
 			{
 				keys: "ctrl+r",
-				action: "run the newest connect card (auth cards)"
+				action: "act on a waiting connect card (auth cards)"
 			},
 			{
 				keys: "pgup / pgdn",
@@ -4887,6 +4914,13 @@ const slashCommands = [
 		description: "start a new conversation with this agent",
 		action: { kind: "new-conversation" }
 	},
+	{
+		name: "conversation",
+		aliases: ["conversations", "conv"],
+		argsHint: "[id or link]",
+		description: "switch conversation (no id: pick from the list)",
+		action: { kind: "conversation" }
+	},
 	{
 		name: "model",
 		aliases: [],
@@ -4926,7 +4960,7 @@ const slashCommands = [
 		name: "connect",
 		aliases: [],
 		argsHint: null,
-		description: "run the newest connect card (auth cards)",
+		description: "act on a waiting connect card (auth cards)",
 		action: { kind: "connect" }
 	},
 	{
@@ -4951,7 +4985,7 @@ const slashCommands = [
 *
 * An argument-less command only matches as the exact line — `/help me write
 * a plan` stays an ordinary message rather than swallowing the user's text
-* into the help modal. Only `sandbox` accepts a rest.
+* into the help modal. Only `sandbox` and `conversation` accept a rest.
 */
 function matchSlashCommand(line) {
 	if (!line.startsWith("/")) return null;
@@ -5024,6 +5058,93 @@ function printResumeHint(write = (text) => process.stdout.write(text)) {
 	lastConversationId = null;
 }
 
+//#endregion
+//#region src/chat/tui/screens/card-picker.tsx
+/**
+* Asks which connect card ctrl+r should act on. A conversation can hold
+* several cards waiting at once (a batch of `platform auth configure` calls),
+* and the chord can't guess which one the user means — picking the newest
+* silently strands the rest, since a card left in `launched` or `error` stays
+* actionable forever. Rendered as an overlay in place of the transcript, like
+* the model and theme pickers, so the conversation and any live run survive.
+*/
+function CardPicker({ cards, onSelect, onCancel }) {
+	const { height } = useTerminalDimensions();
+	const [highlight, setHighlight] = useState(0);
+	const clamped = Math.min(highlight, Math.max(0, cards.length - 1));
+	const visibleRows = Math.max(3, height - 6);
+	const start = windowStart(clamped, cards.length, visibleRows);
+	const windowed = cards.slice(start, start + visibleRows);
+	useKeyboard((key) => {
+		if (key.name === "escape") {
+			onCancel();
+			return;
+		}
+		if (key.name === "up") setHighlight(Math.max(0, clamped - 1));
+		else if (key.name === "down") setHighlight(Math.min(Math.max(0, cards.length - 1), clamped + 1));
+		else if (key.name === "return") {
+			const card = cards[clamped];
+			if (card) onSelect(card);
+		}
+	});
+	useEffect(() => {
+		if (cards.length === 0) onCancel();
+	}, [cards.length, onCancel]);
+	if (cards.length === 0) return null;
+	return /* @__PURE__ */ jsxs("box", {
+		style: {
+			flexDirection: "column",
+			flexGrow: 1
+		},
+		children: [
+			/* @__PURE__ */ jsx("text", {
+				fg: theme.accent,
+				children: "connect"
+			}),
+			/* @__PURE__ */ jsx("box", {
+				style: {
+					flexDirection: "column",
+					flexGrow: 1,
+					marginTop: 1
+				},
+				children: windowed.map((card, i) => {
+					const selected = start + i === clamped;
+					const waiting = waitingOn(card);
+					const label = card.card.button?.label ?? "";
+					return /* @__PURE__ */ jsxs("text", {
+						fg: selected ? theme.accent : theme.fg,
+						children: [
+							selected ? "› " : "  ",
+							"⚿ ",
+							card.card.title,
+							label ? /* @__PURE__ */ jsxs("span", {
+								fg: theme.muted,
+								children: [" · ", label]
+							}) : null,
+							waiting ? /* @__PURE__ */ jsxs("span", {
+								fg: theme.dim,
+								children: [" · ", waiting]
+							}) : null
+						]
+					}, card.id);
+				})
+			}),
+			/* @__PURE__ */ jsxs("text", {
+				fg: theme.dim,
+				children: [cards.length, " waiting · ↑/↓ move · ↵ select · esc cancel"]
+			})
+		]
+	});
+}
+/** Why a card is still on the list, for the rows that aren't simply untouched. */
+function waitingOn(card) {
+	switch (card.status) {
+		case "launched": return "finish in your browser";
+		case "error": return card.detail ?? "failed";
+		default: return null;
+	}
+}
+
 //#endregion
 //#region src/chat/tui/screens/model-picker.tsx
 /**
@@ -7882,6 +8003,10 @@ function routeInput(raw) {
 				kind: "sandbox-exec",
 				command: match.rest
 			} : { kind: "sandbox-pty" };
+			case "conversation": return match.rest ? {
+				kind: "open-conversation",
+				ref: match.rest
+			} : { kind: "conversation-picker" };
 			case "new-conversation":
 			case "model-picker":
 			case "theme-picker":
@@ -8087,6 +8212,7 @@ function ChatScreen({ agent, conversation }) {
 	const [input, setInput] = useState("");
 	const [run, setRun] = useState({ kind: "idle" });
 	const [model, setModel] = useState(agent.model ?? null);
+	const [cardPickerOpen, setCardPickerOpen] = useState(false);
 	const [modelPickerOpen, setModelPickerOpen] = useState(false);
 	const [themePickerOpen, setThemePickerOpen] = useState(false);
 	const [helpOpen, setHelpOpen] = useState(false);
@@ -8200,6 +8326,7 @@ function ChatScreen({ agent, conversation }) {
 		};
 	}, [
 		grantPrompt,
+		cardPickerOpen,
 		modelPickerOpen,
 		themePickerOpen,
 		helpOpen,
@@ -8555,10 +8682,15 @@ function ChatScreen({ agent, conversation }) {
 		portalClient,
 		portal.status
 	]);
-	const runNewestCard = useCallback(() => {
-		const target = [...itemsRef.current].reverse().find(isActionableCard);
-		if (!target) return false;
-		runCardAction(target);
+	const promptForCards = useCallback(() => {
+		const targets = itemsRef.current.filter(isActionableCard);
+		const [only] = targets;
+		if (!only) return false;
+		if (targets.length === 1) {
+			runCardAction(only);
+			return true;
+		}
+		setCardPickerOpen(true);
 		return true;
 	}, [runCardAction]);
 	const handleCredInput = useCallback((displayed) => {
@@ -8803,7 +8935,7 @@ function ChatScreen({ agent, conversation }) {
 		stageAttachment(image);
 	}, [stageAttachment]);
 	usePaste((event) => {
-		if (modelPickerOpen || themePickerOpen || helpOpen || credPromptOpen || grantPrompt || nonWebChannel) return;
+		if (cardPickerOpen || modelPickerOpen || themePickerOpen || helpOpen || credPromptOpen || grantPrompt || nonWebChannel) return;
 		const text = event.metadata?.kind === "binary" ? "" : decodePasteBytes(event.bytes);
 		const route = routePaste({
 			kind: event.metadata?.kind,
@@ -8852,6 +8984,7 @@ function ChatScreen({ agent, conversation }) {
 		if (composer.plainText === "" && inputRef.current !== "") applyComposerText(inputRef.current, "end");
 	}, [
 		grantPrompt,
+		cardPickerOpen,
 		modelPickerOpen,
 		themePickerOpen,
 		helpOpen,
@@ -8922,6 +9055,64 @@ function ChatScreen({ agent, conversation }) {
 		agent,
 		goTo
 	]);
+	/**
+	* Leave this conversation for another screen without ending its run: drop
+	* our own SSE subscription and nothing else — never `rest.cancelRun` — so
+	* the agent keeps working server-side and reopening the thread reattaches.
+	* Same contract as `esc`, which is why `/conversation` is allowed mid-run
+	* where `/new` is not: what you land on still lists the thread you left,
+	* so the run is never stranded out of reach.
+	*/
+	const leaveForScreen = useCallback((next) => {
+		const current = runRef.current;
+		if (current.kind === "streaming") current.abort.abort();
+		if (current.kind !== "idle") useStore.getState().showToast({ message: `${agent.name} keeps working — reopen to reattach` });
+		goTo(next);
+	}, [agent.name, goTo]);
+	/**
+	* `/conversation <id or link>`: open that conversation without leaving the
+	* TUI — the point being that the id usually arrives *from* an agent, in the
+	* session you started to go find it.
+	*
+	* Resolution goes through `resolveInitialScreen`, the same path
+	* `--resume <id>` takes, so an id belonging to a different agent opens
+	* under that agent and the not-found / no-access wording lives in one
+	* place.
+	*/
+	const openConversationRef = useCallback(async (ref) => {
+		const target = parseConversationRef(ref);
+		if (!target) {
+			setItems((prev) => [...prev, {
+				kind: "error",
+				id: crypto.randomUUID(),
+				text: `not a conversation id: ${ref} — pass an id, its /c/<id> link, or run /conversation on its own to pick from the list`
+			}]);
+			return;
+		}
+		if (!rest) return;
+		if (target === conversationId) {
+			useStore.getState().showToast({ message: "already in this conversation" });
+			return;
+		}
+		try {
+			leaveForScreen(await resolveInitialScreen({
+				rest,
+				agentSelector: null,
+				conversationId: target,
+				newConversation: false
+			}));
+		} catch (err) {
+			setItems((prev) => [...prev, {
+				kind: "error",
+				id: crypto.randomUUID(),
+				text: `couldn't open ${target}: ${errorMessage(err)}`
+			}]);
+		}
+	}, [
+		rest,
+		conversationId,
+		leaveForScreen
+	]);
 	const toggleShare = useCallback(() => {
 		if (!portalClient) return;
 		if (portal.status === "off") {
@@ -8993,6 +9184,15 @@ function ChatScreen({ agent, conversation }) {
 						}
 					});
 					break;
+				case "conversation-picker":
+					leaveForScreen({
+						kind: "conversation-picker",
+						agent
+					});
+					break;
+				case "open-conversation":
+					openConversationRef(routed.ref);
+					break;
 				case "model-picker":
 					setModelPickerOpen(true);
 					break;
@@ -9024,7 +9224,7 @@ function ChatScreen({ agent, conversation }) {
 					openInBrowser();
 					break;
 				case "connect":
-					if (!runNewestCard()) useStore.getState().showToast({ message: "no connect card waiting for action" });
+					if (!promptForCards()) useStore.getState().showToast({ message: "no connect card waiting for action" });
 					break;
 				case "help":
 					setHelpOpen(true);
@@ -9051,6 +9251,8 @@ function ChatScreen({ agent, conversation }) {
 		runLocalShell,
 		runSandboxExec,
 		runSandboxPty,
+		leaveForScreen,
+		openConversationRef,
 		toggleShare,
 		openInBrowser,
 		quit,
@@ -9063,7 +9265,7 @@ function ChatScreen({ agent, conversation }) {
 		model,
 		portal.status,
 		portal.grantedAgentIds,
-		runNewestCard
+		promptForCards
 	]);
 	const submit = useCallback(() => {
 		const staged = attachments.filter((a) => a.status !== "error");
@@ -9118,7 +9320,7 @@ function ChatScreen({ agent, conversation }) {
 			}
 			if (reviewFocused) return;
 		}
-		if (modelPickerOpen || themePickerOpen || helpOpen) return;
+		if (cardPickerOpen || modelPickerOpen || themePickerOpen || helpOpen) return;
 		if (grantPrompt) {
 			if (key.name === "y") {
 				confirmGrant();
@@ -9210,7 +9412,7 @@ function ChatScreen({ agent, conversation }) {
 			return;
 		}
 		if (key.name === "r" && key.ctrl) {
-			runNewestCard();
+			promptForCards();
 			return;
 		}
 		if (key.name === "t" && key.ctrl) {
@@ -9286,23 +9488,31 @@ function ChatScreen({ agent, conversation }) {
 		}
 	});
 	const hasPendingSteer = items.some((m) => m.kind === "pending-steer");
-	const hasActionableCard = items.some(isActionableCard);
+	const actionableCards = useMemo(() => items.filter(isActionableCard), [items]);
 	const statusText = useMemo(() => formatChatFooterStatus({
 		runKind: run.kind,
 		ctrlCArmed,
 		isShared,
 		hasPendingSteer,
-		hasActionableCard,
+		actionableCardCount: actionableCards.length,
 		nonWebChannel: nonWebChannel !== null
 	}), [
 		run.kind,
 		ctrlCArmed,
 		isShared,
 		hasPendingSteer,
-		hasActionableCard,
+		actionableCards.length,
 		nonWebChannel
 	]);
 	const modelHint = formatModelHint(model);
+	if (cardPickerOpen) return /* @__PURE__ */ jsx(CardPicker, {
+		cards: actionableCards,
+		onSelect: (card) => {
+			setCardPickerOpen(false);
+			runCardAction(card);
+		},
+		onCancel: () => setCardPickerOpen(false)
+	});
 	if (modelPickerOpen) return /* @__PURE__ */ jsx(ModelPicker, {
 		agentId: agent.id,
 		currentModel: model,

package/package.json

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