skydive-cli 0.1.0-beta.341 → 0.1.0-beta.347

package/README.md

@@ -70,6 +70,26 @@ skydive portal status
 
 Global flags: `--json`, `--quiet`, `--api-url <url>`.
 
+## Workspaces
+
+Every `skydive` command acts inside one **workspace** — the org/team boundary
+that owns your agents, conversations, and secrets. If your account belongs to
+several workspaces (say, your company org and a personal one), the same agent
+name can exist in both, so which workspace is active determines what every
+command sees.
+
+- `skydive workspace list` — workspaces on your account, with the active one
+  marked.
+- `skydive workspace switch [workspace]` — change the active workspace. All
+  commands — `agents`, `secrets`, `keys`, `chat`, `conversations` — follow it.
+- `skydive auth status` — shows who you're logged in as and which workspace is
+  active.
+- In the chat TUI, `ctrl+w` switches workspace from the agent picker.
+
+The active workspace is stored in the CLI config file and persists across
+invocations. If a command can't find an agent you know exists, check
+`skydive auth status` first — you're probably in the wrong workspace.
+
 ## `skydive secrets`
 
 Manage the environment secrets injected into an agent's sandbox. All
@@ -250,7 +270,7 @@ environments, and driving agents from other tools:
 ```sh
 skydive portal open                    # connect and stay in the foreground (ctrl+c to close)
 skydive portal open --agent grace      # …and grant that agent on first connect
-skydive portal open --cwd ~/some/repo  # working directory for the agent's commands
+skydive portal open --cwd ~/some/repo  # working directory for the agent's commands (a starting point, not a boundary — see above)
 skydive portal grant --agent grace     # allow an agent (registers this machine if needed)
 skydive portal revoke --agent grace     # remove an agent's access
 skydive portal status                   # machines, connection state, granted agents

package/dist/js/bin.mjs

@@ -16,7 +16,7 @@ import zlib from "node:zlib";
 import os from "node:os";
 
 //#region package.json
-var version$1 = "0.1.0-beta.341";
+var version$1 = "0.1.0-beta.347";
 
 //#endregion
 //#region src/types.ts
@@ -1171,11 +1171,14 @@ const conversationSummarySchema = z.object({
 		title: z.string().nullable().optional()
 	})
 });
-const conversationTitleSchema = z.object({
+const conversationDetailSchema = z.object({
 	id: z.string().uuid(),
-	title: z.string().nullable()
+	title: z.string().nullable(),
+	agentId: z.string().uuid(),
+	createdAt: z.string(),
+	updatedAt: z.string()
 });
-const getConversationResponseSchema = z.object({ conversation: conversationTitleSchema });
+const getConversationResponseSchema = z.object({ conversation: conversationDetailSchema });
 const listConversationsResponseSchema = z.object({
 	conversations: z.array(conversationSummarySchema),
 	nextCursor: z.string().nullable().optional(),
@@ -2570,8 +2573,9 @@ const chatCommand = {
 		type: "string",
 		describe: "Target agent, by id, slug, or name. With -p, the agent to send the one-shot prompt to. Without -p, pre-selects the agent and opens its conversation list, skipping the agent picker. Optional when the account has exactly one agent."
 	}).option("conversation", {
+		alias: "resume",
 		type: "string",
-		describe: "For -p: continue an existing conversation by id instead of starting a new one."
+		describe: "Continue an existing conversation by id. With -p, the one-shot lands in that conversation; without -p, the TUI opens directly into it (the agent is resolved from the conversation, no --agent needed)."
 	}).option("share-machine", {
 		type: "boolean",
 		describe: "Share this machine with the agent over the portal so it can run commands here (default-deny; in the TUI you approve per agent, with -p the flag grants the target agent for the run). Defaults to `shareMachineDefault` in the CLI config file; --no-share-machine disables for this invocation."
@@ -2582,7 +2586,7 @@ const chatCommand = {
 		type: "boolean",
 		default: true,
 		describe: "Show a desktop notification when a run finishes or needs your input while this terminal is unfocused (use --no-notify to disable)"
-	}).example("skydive chat -p \"summarize my open PRs\" --agent grace", "One-shot, non-interactive").example("echo \"what changed today?\" | skydive chat -p --agent grace", "Read the prompt from stdin").example("skydive chat --agent grace", "Open Grace's conversation list in the TUI (skips the agent picker)"),
+	}).example("skydive chat -p \"summarize my open PRs\" --agent grace", "One-shot, non-interactive").example("echo \"what changed today?\" | skydive chat -p --agent grace", "Read the prompt from stdin").example("skydive chat --agent grace", "Open Grace's conversation list in the TUI (skips the agent picker)").example("skydive chat --resume 0197e0f3-…", "Reopen a previous conversation in the TUI (the id is printed when you quit a chat)"),
 	handler: async (argv) => {
 		const appUrl = resolveAppUrl({ appUrl: argv["api-url"] });
 		if (argv.print !== void 0) {
@@ -2618,7 +2622,7 @@ const chatCommand = {
 			printError(`Unknown theme "${themeId}". Valid themes: ${themes.map((t) => t.id).join(", ")}`);
 			process.exit(1);
 		}
-		const { runChat } = await import("./boot-Dr7pEKqB.mjs");
+		const { runChat } = await import("./boot-BcuOicbb.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -2626,7 +2630,8 @@ const chatCommand = {
 			promptHistoryPath: getPromptHistoryPath(),
 			theme: themeId,
 			notifications: argv.notify,
-			agentSelector: argv.agent ?? null
+			agentSelector: argv.agent ?? null,
+			conversationId: argv.conversation ?? null
 		});
 	}
 };
@@ -3411,7 +3416,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-Dr7pEKqB.mjs");
+			const { runWorkspacePicker } = await import("./boot-BcuOicbb.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}
@@ -3795,6 +3800,7 @@ const VALUE_FLAGS = new Set([
 	"-p",
 	"--agent",
 	"--conversation",
+	"--resume",
 	"--theme",
 	"--api-url"
 ]);

package/dist/js/{boot-Dr7pEKqB.mjs → boot-BcuOicbb.mjs}

@@ -137,18 +137,56 @@ const useStore = create((set, get) => ({
 /**
 * Decide the screen the chat TUI boots into.
 *
-* With no `--agent` selector we open the agent picker, exactly as before.
-* With a selector (`skydive chat --agent grace`, no `-p`) we resolve it
+* With no selector we open the agent picker, exactly as before.
+*
+* With `--agent` (`skydive chat --agent grace`, no `-p`) we resolve it
 * against the org roster and open that agent's conversation list, skipping
 * the picker. Resolution reuses the same `resolveAgent` rules as the `-p`
 * path so a given selector behaves identically in both modes: an id, or a
 * unique case-insensitive slug/name; ambiguous or unknown selectors throw
 * with the candidate list.
 *
+* With `--resume <conversation-id>` we skip both pickers and boot straight
+* into that conversation. The id alone is enough — the owning agent is
+* recovered from the conversation itself — so the "Resume this conversation
+* with: …" hint printed on exit round-trips without the user also passing
+* `--agent`. When both are given, the conversation wins (it pins the agent
+* anyway).
+*
 * Kept out of the React component so it's unit-testable under Node (the
 * component itself can't render without Bun + OpenTUI).
 */
-async function resolveInitialScreen({ rest, agentSelector }) {
+async function resolveInitialScreen({ rest, agentSelector, conversationId }) {
+	if (conversationId) {
+		const [conversation, agents] = await Promise.all([rest.getConversation({ conversationId }).catch((err) => {
+			if (err instanceof HttpError && err.status === 404) throw new Error(`No conversation with id ${conversationId} — it may have been deleted, or belong to another workspace.`);
+			throw err;
+		}), rest.listAgents({
+			scope: "org",
+			onPage: null
+		})]);
+		const agent = agents.find((a) => a.id === conversation.agentId);
+		if (!agent) throw new Error(`Conversation ${conversationId} belongs to an agent you can't access.`);
+		return {
+			kind: "chat",
+			agent,
+			conversation: {
+				id: conversation.id,
+				title: conversation.title,
+				createdAt: conversation.createdAt,
+				updatedAt: conversation.updatedAt,
+				preview: null,
+				channel: null,
+				channelLabel: null,
+				agent: {
+					id: agent.id,
+					name: agent.name,
+					slug: agent.slug ?? null,
+					title: agent.title ?? null
+				}
+			}
+		};
+	}
 	if (!agentSelector) return { kind: "agent-picker" };
 	return {
 		kind: "conversation-picker",
@@ -4337,6 +4375,39 @@ function filterSlashCommands(query) {
 	return [...prefix, ...substring];
 }
 
+//#endregion
+//#region src/chat/tui/resume-hint.ts
+/**
+* The "Resume this conversation with: …" hint printed when the TUI exits.
+*
+* There are two ways out of the app — ChatScreen's quit (double ctrl+c or a
+* bare `exit`/`quit` line) and the app-root global ctrl+c on non-chat
+* screens (after `esc` back to the picker) — and both must print the hint:
+* esc'ing out of a live run then quitting is exactly the case where the id
+* is the only way back in (the agent keeps working server-side). So the
+* last-opened conversation is tracked here, module-scoped, and both
+* teardown sites call `printResumeHint()`.
+*
+* The write happens synchronously AFTER `renderer.destroy()` returns, never
+* on a process 'exit' hook — the native renderer teardown can end the
+* process without firing JS exit listeners (observed on darwin). By the
+* time destroy() returns, stdout is unhooked and the alt screen restored,
+* so the lines land in normal scrollback.
+*/
+let lastConversationId = null;
+/** Record the conversation currently open in the chat screen (null while a
+* brand-new conversation hasn't been materialized on the server yet). */
+function setResumeConversation(conversationId) {
+	lastConversationId = conversationId;
+}
+/** Print the resume hint for the last opened conversation, if any. Call
+* after `renderer.destroy()`. Prints at most once per process. */
+function printResumeHint(write = (text) => process.stdout.write(text)) {
+	if (!lastConversationId) return;
+	write(`\nResume this conversation with:\n  skydive chat --resume ${lastConversationId}\n`);
+	lastConversationId = null;
+}
+
 //#endregion
 //#region src/chat/tui/screens/model-picker.tsx
 /**
@@ -5534,6 +5605,7 @@ function ChatScreen({ agent, conversation }) {
 	}, [agentHost]);
 	useEffect(() => {
 		agentHost.setSession(conversationId);
+		setResumeConversation(conversationId);
 	}, [agentHost, conversationId]);
 	const scrollRef = useRef(null);
 	const composerRef = useRef(null);
@@ -6053,6 +6125,7 @@ function ChatScreen({ agent, conversation }) {
 		portalClient?.dispose();
 		agentHost.dispose();
 		renderer.destroy();
+		printResumeHint();
 	}, [
 		portalClient,
 		agentHost,
@@ -6889,7 +6962,7 @@ function ToastView() {
 
 //#endregion
 //#region src/chat/tui/app.tsx
-function App({ appUrl, sessionToken, shareMachine, promptHistoryPath, notifications, agentSelector }) {
+function App({ appUrl, sessionToken, shareMachine, promptHistoryPath, notifications, agentSelector, conversationId }) {
 	const renderer = useRenderer();
 	const screen = useStore((s) => s.screen);
 	useStore((s) => s.themeId);
@@ -6961,7 +7034,8 @@ function App({ appUrl, sessionToken, shareMachine, promptHistoryPath, notificati
 			try {
 				const screen = await resolveInitialScreen({
 					rest,
-					agentSelector
+					agentSelector,
+					conversationId
 				});
 				if (cancelled) return;
 				goTo(screen);
@@ -6982,6 +7056,7 @@ function App({ appUrl, sessionToken, shareMachine, promptHistoryPath, notificati
 		sessionToken,
 		promptHistoryPath,
 		agentSelector,
+		conversationId,
 		goTo,
 		setClients,
 		fail
@@ -6991,6 +7066,7 @@ function App({ appUrl, sessionToken, shareMachine, promptHistoryPath, notificati
 			useStore.getState().portalClient?.dispose();
 			agentHost.dispose();
 			renderer.destroy();
+			printResumeHint();
 		}
 	});
 	return /* @__PURE__ */ jsx(AgentHostContext.Provider, {
@@ -7284,7 +7360,7 @@ var LinkifiedMarkdownRenderable = class extends MarkdownRenderable {
 * module — and the heavy OpenTUI dependency graph it pulls in — is
 * dynamically imported and never loaded on the Node management path.
 */
-async function runChat({ appUrl, sessionToken, shareMachine, promptHistoryPath, theme: themeOverride, notifications, agentSelector }) {
+async function runChat({ appUrl, sessionToken, shareMachine, promptHistoryPath, theme: themeOverride, notifications, agentSelector, conversationId }) {
 	const renderer = await createCliRenderer({ exitOnCtrlC: false });
 	extend({ markdown: LinkifiedMarkdownRenderable });
 	const store = useStore.getState();
@@ -7308,7 +7384,8 @@ async function runChat({ appUrl, sessionToken, shareMachine, promptHistoryPath,
 		shareMachine,
 		promptHistoryPath,
 		notifications,
-		agentSelector: agentSelector ?? null
+		agentSelector: agentSelector ?? null,
+		conversationId: conversationId ?? null
 	}));
 }
 /** Open the same workspace picker used by the initial agent screen. */

package/package.json

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