skydive-cli 0.1.0-beta.291 → 0.1.0-beta.311

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.291";
+var version$1 = "0.1.0-beta.311";
 
 //#endregion
 //#region src/types.ts
@@ -1023,7 +1023,12 @@ function createRestClient({ appUrl, sessionToken }) {
 		}, sendResultSchema),
 		activeRun: async ({ conversationId }) => {
 			const { run } = await get(`/api/v1/chat/active-run?${new URLSearchParams({ conversationId }).toString()}`, activeRunResponseSchema);
-			return run;
+			if (!run) return null;
+			return {
+				runId: run.runId,
+				agentId: run.agentId ?? "",
+				agentName: run.agentName ?? ""
+			};
 		},
 		cancelRun: async ({ runId }) => {
 			await post(`/api/v1/chat/runs/${encodeURIComponent(runId)}/cancel`, {}, z.object({ ok: z.boolean() }));
@@ -1187,7 +1192,11 @@ const uiMessagePartSchema = z.union([
 const uiMessageSchema = z.object({
 	id: z.string(),
 	role: z.string(),
-	parts: z.array(uiMessagePartSchema)
+	parts: z.array(uiMessagePartSchema),
+	metadata: z.object({ custom: z.object({
+		agentId: z.string().nullish(),
+		agentName: z.string().nullish()
+	}).passthrough().optional() }).passthrough().optional()
 });
 const recapResponseSchema = z.object({ recap: z.object({ text: z.string() }).nullable() });
 const listMessagesResponseSchema = z.object({ messages: z.array(uiMessageSchema) });
@@ -1196,6 +1205,8 @@ const sendResultSchema = z.object({
 	messageId: z.string().uuid().nullish(),
 	conversationId: z.string().uuid(),
 	isNewConversation: z.boolean(),
+	agentId: z.string().nullish(),
+	agentName: z.string().nullish(),
 	steered: z.boolean().optional(),
 	directive: z.object({ id: z.string() }).passthrough().optional()
 });
@@ -1210,7 +1221,11 @@ const finalizeResponseSchema = z.object({
 	mediaType: z.string(),
 	sizeBytes: z.number().nullable().optional()
 });
-const activeRunResponseSchema = z.object({ run: z.object({ runId: z.string() }).nullable() });
+const activeRunResponseSchema = z.object({ run: z.object({
+	runId: z.string(),
+	agentId: z.string().nullish(),
+	agentName: z.string().nullish()
+}).nullable() });
 const oauthConnectResponseSchema = z.object({ connectLink: z.string() }).passthrough();
 const externalOauthConnectResponseSchema = z.object({ authorizationUrl: z.string().optional() }).passthrough();
 const runStreamEventSchema = z.union([z.object({
@@ -2592,7 +2607,7 @@ const chatCommand = {
 			printError(`Unknown theme "${themeId}". Valid themes: ${themes.map((t) => t.id).join(", ")}`);
 			process.exit(1);
 		}
-		const { runChat } = await import("./boot-fBjqXxKo.mjs");
+		const { runChat } = await import("./boot-DEX6CwVM.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -3375,7 +3390,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-fBjqXxKo.mjs");
+			const { runWorkspacePicker } = await import("./boot-DEX6CwVM.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}

package/dist/js/{boot-fBjqXxKo.mjs → boot-DEX6CwVM.mjs}

@@ -1096,7 +1096,8 @@ function AgentCreateScreen() {
 				agent,
 				conversation: {
 					kind: "new",
-					agentId: agent.id
+					agentId: agent.id,
+					nonce: crypto.randomUUID()
 				}
 			});
 		} catch (err) {
@@ -1406,7 +1407,8 @@ function ConversationList({ agent, conversations, complete, onPick }) {
 			agent,
 			conversation: {
 				kind: "new",
-				agentId: agent.id
+				agentId: agent.id,
+				nonce: crypto.randomUUID()
 			}
 		});
 		else onPick({
@@ -2905,6 +2907,19 @@ function RenderItem({ item }) {
 			barColor: null,
 			children: /* @__PURE__ */ jsx(CardItem, { item })
 		});
+		case "info": return /* @__PURE__ */ jsx(Row, {
+			barColor: null,
+			children: /* @__PURE__ */ jsxs("box", {
+				style: { flexDirection: "column" },
+				children: [/* @__PURE__ */ jsx("text", {
+					fg: theme.muted,
+					children: /* @__PURE__ */ jsx("b", { children: item.title })
+				}), /* @__PURE__ */ jsx("text", {
+					fg: theme.muted,
+					children: item.text
+				})]
+			})
+		});
 		case "recap": return /* @__PURE__ */ jsx(Row, {
 			barColor: null,
 			children: /* @__PURE__ */ jsxs("text", {
@@ -3027,16 +3042,23 @@ function str(chunk, key) {
 	const value = chunk[key];
 	return typeof value === "string" ? value : null;
 }
-function applyChunk(items, chunk) {
+/**
+* `agentName` is the display name of the agent producing this run's stream.
+* It's stamped onto each assistant-origin item so a multi-agent conversation
+* can attribute live turns; pass null in a solo thread to leave items
+* un-attributed (the chat screen only renders the name when the thread has
+* more than one agent).
+*/
+function applyChunk(items, chunk, agentName = null) {
 	const type = str(chunk, "type");
 	if (!type) return [...items];
 	switch (type) {
-		case "text-start": return appendAssistantTextStart(items, str(chunk, "id") ?? cryptoId());
+		case "text-start": return appendAssistantTextStart(items, str(chunk, "id") ?? cryptoId(), agentName);
 		case "text-delta": {
 			const id = str(chunk, "id");
 			const delta = str(chunk, "delta") ?? str(chunk, "text") ?? "";
 			if (!id || !delta) return [...items];
-			return appendAssistantTextDelta(items, id, delta);
+			return appendAssistantTextDelta(items, id, delta, agentName);
 		}
 		case "text-end": {
 			const id = str(chunk, "id");
@@ -3049,14 +3071,15 @@ function applyChunk(items, chunk) {
 				kind: "reasoning",
 				id: bubbleId,
 				text: "",
-				done: false
+				done: false,
+				agentName
 			}];
 		}
 		case "reasoning-delta": {
 			const id = str(chunk, "id");
 			const delta = str(chunk, "delta") ?? str(chunk, "text") ?? "";
 			if (!id || !delta) return [...items];
-			return appendReasoningDelta(items, id, delta);
+			return appendReasoningDelta(items, id, delta, agentName);
 		}
 		case "reasoning-end": {
 			const id = str(chunk, "id");
@@ -3079,7 +3102,8 @@ function applyChunk(items, chunk) {
 				inputText: "",
 				input: null,
 				output: null,
-				state: "streaming"
+				state: "streaming",
+				agentName
 			}];
 		}
 		case "tool-input-delta": {
@@ -3108,7 +3132,8 @@ function applyChunk(items, chunk) {
 				inputText: "",
 				input,
 				output: null,
-				state: "input-ready"
+				state: "input-ready",
+				agentName
 			}];
 		}
 		case "tool-output-available": {
@@ -3165,7 +3190,8 @@ function applyChunk(items, chunk) {
 				id,
 				card,
 				status: "idle",
-				detail: null
+				detail: null,
+				agentName
 			};
 			if (items.some((m) => m.kind === "card" && m.id === id)) return items.map((m) => m.kind === "card" && m.id === id ? next : m);
 			return [...items, next];
@@ -3206,16 +3232,17 @@ function openTextIndex(items, id, kind) {
 	}
 	return -1;
 }
-function appendAssistantTextStart(items, id) {
+function appendAssistantTextStart(items, id, agentName) {
 	const bubbleId = freshTextId(items, id, "assistant-text");
 	return [...items, {
 		kind: "assistant-text",
 		id: bubbleId,
 		text: "",
-		done: false
+		done: false,
+		agentName
 	}];
 }
-function appendAssistantTextDelta(items, id, delta) {
+function appendAssistantTextDelta(items, id, delta, agentName) {
 	const idx = openTextIndex(items, id, "assistant-text");
 	if (idx === -1) {
 		const bubbleId = freshTextId(items, id, "assistant-text");
@@ -3223,7 +3250,8 @@ function appendAssistantTextDelta(items, id, delta) {
 			kind: "assistant-text",
 			id: bubbleId,
 			text: delta,
-			done: false
+			done: false,
+			agentName
 		}];
 	}
 	return items.map((m, i) => i === idx && m.kind === "assistant-text" ? {
@@ -3231,7 +3259,7 @@ function appendAssistantTextDelta(items, id, delta) {
 		text: m.text + delta
 	} : m);
 }
-function appendReasoningDelta(items, id, delta) {
+function appendReasoningDelta(items, id, delta, agentName) {
 	const idx = openTextIndex(items, id, "reasoning");
 	if (idx === -1) {
 		const bubbleId = freshTextId(items, id, "reasoning");
@@ -3239,7 +3267,8 @@ function appendReasoningDelta(items, id, delta) {
 			kind: "reasoning",
 			id: bubbleId,
 			text: delta,
-			done: false
+			done: false,
+			agentName
 		}];
 	}
 	return items.map((m, i) => i === idx && m.kind === "reasoning" ? {
@@ -3269,6 +3298,59 @@ function cryptoId() {
 	return crypto.randomUUID();
 }
 
+//#endregion
+//#region src/chat/tui/chat/attribution.ts
+/**
+* The agent that authored an item, or null for items with no agent (the user's
+* own turns, errors, the recap).
+*/
+function itemAgentName(m) {
+	return "agentName" in m ? m.agentName ?? null : null;
+}
+/**
+* Items that end an agent's turn: the human speaking or acting. The next
+* assistant item after one of these starts a new turn and is re-headed with its
+* author, even when the same agent replies again — in a multi-agent thread the
+* reader can't be asked to scan back past their own message to work out who is
+* answering.
+*/
+function isTurnSeparator(m) {
+	return m.kind === "user" || m.kind === "pending-steer" || m.kind === "shell";
+}
+/**
+* Every agent that has spoken in the transcript, plus the agent on screen.
+* Attribution renders only when this holds more than one name, mirroring web's
+* group-chat gate so a solo thread carries no attribution chrome at all.
+*/
+function conversationAgentNames(items, onScreenAgentName) {
+	const names = new Set([onScreenAgentName]);
+	for (const item of items) {
+		const name = itemAgentName(item);
+		if (name) names.add(name);
+	}
+	return names;
+}
+/**
+* The agent-name label to render above `items[i]`, or null for no label. Every
+* assistant turn is headed with its author's name. Within one turn the items
+* (text, reasoning, tool calls) share the single header, so a turn isn't
+* re-labeled on each tool row; `error` and `recap` items are transparent and
+* don't break that grouping.
+*/
+function agentLabelFor(items, i) {
+	const current = items[i];
+	const name = current ? itemAgentName(current) : null;
+	if (!name) return null;
+	for (let j = i - 1; j >= 0; j--) {
+		const prevItem = items[j];
+		if (!prevItem) continue;
+		if (isTurnSeparator(prevItem)) return name;
+		const prev = itemAgentName(prevItem);
+		if (prev !== null) return prev === name ? null : name;
+	}
+	return name;
+}
+
 //#endregion
 //#region src/chat/tui/chat/history.ts
 function isDynamicTool(part) {
@@ -3297,6 +3379,7 @@ function uiMessagesToItems(messages) {
 			continue;
 		}
 		if (m.role === "assistant") {
+			const agentName = m.metadata?.custom?.agentName ?? null;
 			let textBuf = "";
 			let textIdx = 0;
 			for (const part of m.parts) {
@@ -3309,7 +3392,8 @@ function uiMessagesToItems(messages) {
 						kind: "assistant-text",
 						id: `${m.id}#t${textIdx++}`,
 						text: textBuf,
-						done: true
+						done: true,
+						agentName
 					});
 					textBuf = "";
 				}
@@ -3318,7 +3402,8 @@ function uiMessagesToItems(messages) {
 						kind: "reasoning",
 						id: `${m.id}#r${textIdx++}`,
 						text: "text" in part && typeof part.text === "string" ? part.text : "",
-						done: true
+						done: true,
+						agentName
 					});
 					continue;
 				}
@@ -3332,7 +3417,8 @@ function uiMessagesToItems(messages) {
 							id: toolCallId ?? `${m.id}#c${textIdx++}`,
 							card,
 							status: "idle",
-							detail: null
+							detail: null,
+							agentName
 						});
 					}
 					continue;
@@ -3352,7 +3438,8 @@ function uiMessagesToItems(messages) {
 							kind: "ok",
 							value: part.output
 						} : null,
-						state
+						state,
+						agentName
 					});
 				}
 			}
@@ -3360,7 +3447,8 @@ function uiMessagesToItems(messages) {
 				kind: "assistant-text",
 				id: `${m.id}#t${textIdx++}`,
 				text: textBuf,
-				done: true
+				done: true,
+				agentName
 			});
 		}
 	}
@@ -3381,7 +3469,7 @@ function mapToolState(raw) {
 function formatChatFooterStatus({ runKind, ctrlCArmed, isShared, hasPendingSteer, hasActionableCard }) {
 	const connectHint = hasActionableCard ? "ctrl+r connect · " : "";
 	switch (runKind) {
-		case "idle": return ctrlCArmed ? "press ctrl+c again to quit" : `${connectHint}↵  send · esc back · ctrl+c quit · ctrl+t ${isShared ? "revoke access" : "local access"} · ? keybinds`;
+		case "idle": return ctrlCArmed ? "press ctrl+c again to quit" : `${connectHint}↵  send · / commands · esc back · ctrl+c quit · ctrl+t ${isShared ? "revoke access" : "local access"} · ? keybinds`;
 		case "sending": return "sending…";
 		case "streaming": return hasPendingSteer ? `${connectHint}↵ steer · esc cancel steer · ctrl+c cancel run` : `${connectHint}↵ steer · ctrl+c cancel`;
 	}
@@ -3391,6 +3479,31 @@ function formatModelHint(model) {
 	return `ctrl+p · ${model ?? "default"}`;
 }
 
+//#endregion
+//#region src/chat/tui/chat/status-info.ts
+/**
+* Body text for the `/status` transcript block: the session facts the status
+* bar and footer can't fit, one aligned `label  value` row each. Pure so the
+* layout is testable without a renderer.
+*/
+function formatStatusInfo({ appUrl, workspaceName, agentName, conversationId, model, share }) {
+	const rows = [
+		["app", appUrl ?? "unknown"],
+		["workspace", workspaceName ?? "unknown"],
+		["agent", agentName],
+		["conversation", conversationId ?? "new — created when you send the first message"],
+		["model", model ?? "default"],
+		["local access", formatShare(share)]
+	];
+	const width = Math.max(...rows.map(([label]) => label.length));
+	return rows.map(([label, value]) => `${label.padEnd(width)}  ${value}`).join("\n");
+}
+function formatShare(share) {
+	if (share.status === "off") return "off — ctrl+t to share this machine";
+	if (share.status !== "connected") return share.status;
+	return share.grantedToAgent ? "shared — this agent can run commands here" : "shared — this agent is not granted";
+}
+
 //#endregion
 //#region src/chat/notification-preview.ts
 const MAX_NOTIFICATION_PREVIEW_CHARS = 240;
@@ -3677,12 +3790,37 @@ const keybindGroups = [
 				keys: "pgup / pgdn",
 				action: "scroll transcript"
 			},
+			{
+				keys: "/",
+				action: "open the command menu (start of message)"
+			},
 			{
 				keys: "?",
 				action: "open this help (composer empty)"
 			}
 		]
 	},
+	{
+		title: "command menu (type / to open)",
+		binds: [
+			{
+				keys: "↑ / ↓",
+				action: "move selection"
+			},
+			{
+				keys: "tab",
+				action: "complete the command"
+			},
+			{
+				keys: "↵",
+				action: "run (or complete) the selected command"
+			},
+			{
+				keys: "esc",
+				action: "dismiss the menu"
+			}
+		]
+	},
 	{
 		title: "agent picker",
 		binds: [
@@ -3933,6 +4071,182 @@ function HelpModal({ onClose }) {
 	});
 }
 
+//#endregion
+//#region src/chat/tui/autocomplete/completion-menu.tsx
+const MAX_COMPLETION_ROWS = 6;
+/**
+* Rows the menu occupies in the chat screen's fixed layout budget: the
+* windowed items (min 1 for the empty row) plus the border. The chat screen
+* subtracts this from the transcript height, mirroring the composer and
+* staged-attachment panels.
+*/
+function completionMenuHeight(itemCount) {
+	return Math.min(Math.max(itemCount, 1), MAX_COMPLETION_ROWS) + 2;
+}
+/**
+* The inline autocomplete dropdown, rendered directly above the composer
+* (never as a screen overlay — the composer must stay mounted and focused).
+* Pure presentation: the chat screen owns the open/highlight state and the
+* keyboard handling.
+*/
+function CompletionMenu({ items, highlight }) {
+	const start = windowStart(highlight, items.length, MAX_COMPLETION_ROWS);
+	const windowed = items.slice(start, start + MAX_COMPLETION_ROWS);
+	return /* @__PURE__ */ jsx("box", {
+		style: {
+			border: true,
+			borderColor: theme.faint,
+			paddingLeft: 1,
+			paddingRight: 1,
+			flexShrink: 0,
+			marginTop: 1,
+			flexDirection: "column"
+		},
+		children: windowed.length === 0 ? /* @__PURE__ */ jsx("text", {
+			fg: theme.muted,
+			children: "no matching command — ↵ sends as a message"
+		}) : windowed.map((item, i) => {
+			const selected = start + i === highlight;
+			return /* @__PURE__ */ jsxs("text", {
+				fg: selected ? theme.accent : theme.fg,
+				children: [
+					selected ? "› " : "  ",
+					item.label,
+					item.hint ? /* @__PURE__ */ jsx("span", {
+						fg: theme.dim,
+						children: ` ${item.hint}`
+					}) : null,
+					/* @__PURE__ */ jsx("span", {
+						fg: theme.muted,
+						children: `  ${item.description}`
+					})
+				]
+			}, item.id);
+		})
+	});
+}
+
+//#endregion
+//#region src/chat/slash-commands.ts
+const slashCommands = [
+	{
+		name: "sandbox",
+		aliases: ["sbx"],
+		argsHint: "[command]",
+		description: "run in the agent's sandbox (no command: open a terminal)",
+		action: { kind: "sandbox" }
+	},
+	{
+		name: "new",
+		aliases: [],
+		argsHint: null,
+		description: "start a new conversation with this agent",
+		action: { kind: "new-conversation" }
+	},
+	{
+		name: "model",
+		aliases: [],
+		argsHint: null,
+		description: "switch the model for the next run",
+		action: { kind: "model-picker" }
+	},
+	{
+		name: "theme",
+		aliases: [],
+		argsHint: null,
+		description: "switch the color theme",
+		action: { kind: "theme-picker" }
+	},
+	{
+		name: "status",
+		aliases: [],
+		argsHint: null,
+		description: "show connection and session status",
+		action: { kind: "status" }
+	},
+	{
+		name: "share",
+		aliases: [],
+		argsHint: null,
+		description: "local access: grant / revoke this machine",
+		action: { kind: "share" }
+	},
+	{
+		name: "browser",
+		aliases: [],
+		argsHint: null,
+		description: "open this conversation in the browser",
+		action: { kind: "browser" }
+	},
+	{
+		name: "connect",
+		aliases: [],
+		argsHint: null,
+		description: "run the newest connect card (auth cards)",
+		action: { kind: "connect" }
+	},
+	{
+		name: "help",
+		aliases: [],
+		argsHint: null,
+		description: "show keybinds and commands",
+		action: { kind: "help" }
+	},
+	{
+		name: "exit",
+		aliases: ["quit"],
+		argsHint: null,
+		description: "quit the chat",
+		action: { kind: "quit" }
+	}
+];
+/**
+* Match a submitted line against the registry: `/<name>` or `/<name> <rest>`,
+* case-insensitive on the name. Returns the command plus the trimmed rest,
+* or null when the line isn't a known slash command.
+*
+* 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.
+*/
+function matchSlashCommand(line) {
+	if (!line.startsWith("/")) return null;
+	const sp = line.indexOf(" ");
+	const name = (sp === -1 ? line.slice(1) : line.slice(1, sp)).toLowerCase();
+	const command = slashCommands.find((c) => c.name === name || c.aliases.includes(name));
+	if (!command) return null;
+	const rest = sp === -1 ? "" : line.slice(sp + 1).trim();
+	if (command.argsHint === null && rest !== "") return null;
+	return {
+		command,
+		rest
+	};
+}
+/**
+* The in-progress command token the completion menu should open for: the
+* composer text is a lone `/<partial>` with no whitespace yet (whitespace
+* means the name is settled and the user is typing arguments — or prose).
+* Returns the partial name ('' right after `/`), or null when no menu
+* should show.
+*/
+function detectCommandTrigger(text) {
+	if (!text.startsWith("/")) return null;
+	if (/\s/.test(text)) return null;
+	return text.slice(1);
+}
+/**
+* Menu ordering: prefix matches (registry order) ahead of substring matches,
+* checked against names and aliases. Empty query lists everything.
+*/
+function filterSlashCommands(query) {
+	const q = query.trim().toLowerCase();
+	if (!q) return [...slashCommands];
+	const names = (c) => [c.name, ...c.aliases];
+	const prefix = slashCommands.filter((c) => names(c).some((n) => n.startsWith(q)));
+	const substring = slashCommands.filter((c) => !prefix.includes(c) && names(c).some((n) => n.includes(q)));
+	return [...prefix, ...substring];
+}
+
 //#endregion
 //#region src/chat/tui/screens/model-picker.tsx
 /**
@@ -4759,28 +5073,35 @@ function routeInput(raw) {
 			command
 		} : { kind: "noop" };
 	}
-	const sandbox = matchSlash(line, ["sandbox", "sbx"]);
-	if (sandbox !== null) return sandbox ? {
-		kind: "sandbox-exec",
-		command: sandbox
-	} : { kind: "sandbox-pty" };
+	const match = matchSlashCommand(line);
+	if (match) {
+		const { action } = match.command;
+		switch (action.kind) {
+			case "sandbox": return match.rest ? {
+				kind: "sandbox-exec",
+				command: match.rest
+			} : { kind: "sandbox-pty" };
+			case "new-conversation":
+			case "model-picker":
+			case "theme-picker":
+			case "status":
+			case "share":
+			case "browser":
+			case "connect":
+			case "help":
+			case "quit": return { kind: action.kind };
+			default: {
+				const exhaustive = action;
+				throw new Error(`unhandled slash action: ${JSON.stringify(exhaustive)}`);
+			}
+		}
+	}
 	if (line.trim().toLowerCase() === "exit") return { kind: "quit" };
 	return {
 		kind: "message",
 		content: raw
 	};
 }
-/**
-* If `line` is `/<name>` or `/<name> <rest>` for one of `names`, return the
-* trimmed rest (possibly ''); otherwise null. Case-insensitive on the name.
-*/
-function matchSlash(line, names) {
-	if (!line.startsWith("/")) return null;
-	const sp = line.indexOf(" ");
-	const name = (sp === -1 ? line.slice(1) : line.slice(1, sp)).toLowerCase();
-	if (!names.includes(name)) return null;
-	return sp === -1 ? "" : line.slice(sp + 1).trim();
-}
 /** Max characters of `!` output we forward to the agent as context. */
 const SHELL_CONTEXT_OUTPUT_CAP = 16e3;
 /**
@@ -5066,6 +5387,7 @@ function ChatScreen({ agent, conversation }) {
 	const sessionToken = useStore((s) => s.sessionToken);
 	const goTo = useStore((s) => s.goTo);
 	const setChatTitle = useStore((s) => s.setChatTitle);
+	const workspaceName = useStore((s) => s.workspaceName);
 	const portal = useStore((s) => s.portal);
 	const portalClient = useStore((s) => s.portalClient);
 	const setPortalPrompt = useStore((s) => s.setPortalPrompt);
@@ -5089,6 +5411,12 @@ function ChatScreen({ agent, conversation }) {
 	const uploadsRef = useRef(/* @__PURE__ */ new Map());
 	const [credPrompt, setCredPrompt] = useState(null);
 	const credPromptOpen = credPrompt !== null;
+	const [menuDismissed, setMenuDismissed] = useState(false);
+	const [menuHighlight, setMenuHighlight] = useState(0);
+	const commandQuery = grantPrompt || credPrompt ? null : detectCommandTrigger(input);
+	const menuCommands = commandQuery === null ? [] : filterSlashCommands(commandQuery);
+	const menuOpen = commandQuery !== null && !menuDismissed;
+	const menuHighlightClamped = Math.min(menuHighlight, Math.max(0, menuCommands.length - 1));
 	const runRef = useRef(run);
 	runRef.current = run;
 	const itemsRef = useRef(items);
@@ -5118,7 +5446,8 @@ function ChatScreen({ agent, conversation }) {
 	const pendingRows = pendingVisible ? attachments.length + 2 : 0;
 	const credPromptHeight = 4 + (credPrompt && (credPrompt.error || credPrompt.submitting) ? 1 : 0);
 	const bottomBoxHeight = credPrompt ? credPromptHeight : composerBoxHeight;
-	const scrollHeight = Math.max(3, height - 5 - bottomBoxHeight - pendingRows);
+	const menuRows = menuOpen ? completionMenuHeight(menuCommands.length) : 0;
+	const scrollHeight = Math.max(3, height - 5 - bottomBoxHeight - pendingRows - menuRows);
 	useEffect(() => {
 		const composer = composerRef.current;
 		if (!composer) return;
@@ -5168,10 +5497,11 @@ function ChatScreen({ agent, conversation }) {
 			cancelled = true;
 		};
 	}, [rest, initialConversationId]);
-	const attachToRun = useCallback((runId) => {
+	const attachToRun = useCallback((runId, runAgentName) => {
 		if (!rest) return;
 		const abort = new AbortController();
 		const responsePreview = createResponsePreview();
+		const streamAgentName = runAgentName ?? agent.name;
 		setRun({
 			kind: "streaming",
 			runId,
@@ -5183,7 +5513,7 @@ function ChatScreen({ agent, conversation }) {
 			onEvent: (event) => {
 				if (event.kind === "chunk") {
 					responsePreview.addChunk(event.chunk);
-					setItems((prev) => applyChunk(prev, event.chunk));
+					setItems((prev) => applyChunk(prev, event.chunk, streamAgentName));
 					return;
 				}
 				const errorText = event.error;
@@ -5221,6 +5551,7 @@ function ChatScreen({ agent, conversation }) {
 		agent.name,
 		agentHost
 	]);
+	const multiAgent = useMemo(() => conversationAgentNames(items, agent.name), [items, agent.name]).size > 1;
 	useEffect(() => {
 		if (!rest || !conversationId) return;
 		const abort = new AbortController();
@@ -5244,7 +5575,7 @@ function ChatScreen({ agent, conversation }) {
 			try {
 				const active = await rest.activeRun({ conversationId });
 				if (cancelled || !active) return;
-				attachToRun(active.runId);
+				attachToRun(active.runId, active.agentName || null);
 			} catch (_error) {}
 		})();
 		return () => {
@@ -5311,10 +5642,10 @@ function ChatScreen({ agent, conversation }) {
 					text: trimmed
 				} : m));
 				const current = runRef.current;
-				if (!(current.kind === "streaming" && current.runId === result.runId)) attachToRun(result.runId);
+				if (!(current.kind === "streaming" && current.runId === result.runId)) attachToRun(result.runId, result.agentName ?? null);
 				return;
 			}
-			attachToRun(result.runId);
+			attachToRun(result.runId, result.agentName ?? null);
 		} catch (err) {
 			setItems((prev) => [...prev.filter((m) => m.id !== optimisticId), {
 				kind: "error",
@@ -5449,6 +5780,12 @@ function ChatScreen({ agent, conversation }) {
 		portalClient,
 		portal.status
 	]);
+	const runNewestCard = useCallback(() => {
+		const target = [...itemsRef.current].reverse().find(isActionableCard);
+		if (!target) return false;
+		runCardAction(target);
+		return true;
+	}, [runCardAction]);
 	const handleCredInput = useCallback((displayed) => {
 		setCredPrompt((prev) => {
 			if (!prev || prev.submitting) return prev;
@@ -5625,42 +5962,12 @@ function ChatScreen({ agent, conversation }) {
 		agentHost,
 		renderer
 	]);
-	const submit = useCallback(() => {
-		const content = input.trim();
-		const staged = attachments.filter((a) => a.status !== "error");
-		if (!content && staged.length === 0) return;
-		const routed = routeInput(content);
-		if (routed.kind !== "message") {
-			history.append(content);
-			setInput("");
-			composerRef.current?.clear();
-			setComposerRows(1);
-			if (routed.kind === "local-shell") runLocalShell(routed.command);
-			else if (routed.kind === "sandbox-exec") runSandboxExec(routed.command);
-			else if (routed.kind === "sandbox-pty") runSandboxPty();
-			else if (routed.kind === "quit") quit();
-			return;
-		}
-		history.append(content);
-		setInput("");
-		composerRef.current?.clear();
-		setComposerRows(1);
-		setAttachments([]);
-		sendContent(content, staged);
-	}, [
-		input,
-		attachments,
-		sendContent,
-		history,
-		runLocalShell,
-		runSandboxExec,
-		runSandboxPty,
-		quit
-	]);
 	const handleComposerChange = useCallback(() => {
 		const composer = composerRef.current;
 		if (!composer) return;
 		setInput(composer.plainText);
+		setMenuHighlight(0);
+		if (detectCommandTrigger(composer.plainText) === null) setMenuDismissed(false);
 		setComposerRows(Math.min(Math.max(composer.editorView.getTotalVirtualLineCount(), 1), maxComposerRows));
 	}, []);
 	/**
@@ -5840,6 +6147,126 @@ function ChatScreen({ agent, conversation }) {
 		setPortalPrompt(null);
 		useStore.getState().showToast({ message: "kept this machine private" });
 	}, [agent.id, setPortalPrompt]);
+	const executeLine = useCallback((content, staged) => {
+		if (!content && staged.length === 0) return;
+		const routed = routeInput(content);
+		if (routed.kind !== "message") {
+			history.append(content);
+			setInput("");
+			composerRef.current?.clear();
+			setComposerRows(1);
+			switch (routed.kind) {
+				case "local-shell":
+					runLocalShell(routed.command);
+					break;
+				case "sandbox-exec":
+					runSandboxExec(routed.command);
+					break;
+				case "sandbox-pty":
+					runSandboxPty();
+					break;
+				case "new-conversation":
+					if (runRef.current.kind !== "idle") {
+						useStore.getState().showToast({ message: "finish or cancel the run first (ctrl+c)" });
+						break;
+					}
+					goTo({
+						kind: "chat",
+						agent,
+						conversation: {
+							kind: "new",
+							agentId: agent.id,
+							nonce: crypto.randomUUID()
+						}
+					});
+					break;
+				case "model-picker":
+					setModelPickerOpen(true);
+					break;
+				case "theme-picker":
+					setThemePickerOpen(true);
+					break;
+				case "status":
+					setItems((prev) => [...prev, {
+						kind: "info",
+						id: crypto.randomUUID(),
+						title: "status",
+						text: formatStatusInfo({
+							appUrl,
+							workspaceName,
+							agentName: agent.name,
+							conversationId,
+							model,
+							share: {
+								status: portal.status,
+								grantedToAgent: portal.grantedAgentIds.includes(agent.id)
+							}
+						})
+					}]);
+					break;
+				case "share":
+					toggleShare();
+					break;
+				case "browser":
+					openInBrowser();
+					break;
+				case "connect":
+					if (!runNewestCard()) useStore.getState().showToast({ message: "no connect card waiting for action" });
+					break;
+				case "help":
+					setHelpOpen(true);
+					break;
+				case "quit":
+					quit();
+					break;
+				case "noop": break;
+				default: {
+					const exhaustive = routed;
+					throw new Error(`unhandled route: ${JSON.stringify(exhaustive)}`);
+				}
+			}
+			return;
+		}
+		history.append(content);
+		setInput("");
+		composerRef.current?.clear();
+		setComposerRows(1);
+		setAttachments([]);
+		sendContent(content, staged);
+	}, [
+		history,
+		runLocalShell,
+		runSandboxExec,
+		runSandboxPty,
+		toggleShare,
+		openInBrowser,
+		quit,
+		sendContent,
+		goTo,
+		agent,
+		appUrl,
+		workspaceName,
+		conversationId,
+		model,
+		portal.status,
+		portal.grantedAgentIds,
+		runNewestCard
+	]);
+	const submit = useCallback(() => {
+		const staged = attachments.filter((a) => a.status !== "error");
+		executeLine(input.trim(), staged);
+	}, [
+		executeLine,
+		input,
+		attachments
+	]);
+	const acceptCompletion = useCallback((command, execute) => {
+		if (execute && command.argsHint === null) {
+			executeLine(`/${command.name}`, []);
+			return;
+		}
+		applyComposerText(`/${command.name} `, "end");
+	}, [executeLine, applyComposerText]);
 	useEffect(() => {
 		if (!portalClient || portal.status !== "connected") return;
 		if (portal.grantedAgentIds.includes(agent.id)) return;
@@ -5885,6 +6312,38 @@ function ChatScreen({ agent, conversation }) {
 			}
 			if (!(key.name === "c" && key.ctrl || key.name === "pageup" || key.name === "pgup" || key.name === "pagedown" || key.name === "pgdn")) return;
 		}
+		if (menuOpen) {
+			if (key.name === "escape") {
+				setMenuDismissed(true);
+				return;
+			}
+			const selected = menuCommands[menuHighlightClamped];
+			if (selected) {
+				if (key.name === "up") {
+					setMenuHighlight((h) => Math.max(0, Math.min(h, menuCommands.length - 1) - 1));
+					key.preventDefault();
+					return;
+				}
+				if (key.name === "down") {
+					setMenuHighlight((h) => Math.min(menuCommands.length - 1, h + 1));
+					key.preventDefault();
+					return;
+				}
+				if (key.name === "tab") {
+					acceptCompletion(selected, false);
+					key.preventDefault();
+					return;
+				}
+				if ((key.name === "return" || key.name === "kpenter") && !key.shift) {
+					const query = (commandQuery ?? "").toLowerCase();
+					if (!(query === selected.name || selected.aliases.includes(query)) || selected.argsHint === null) {
+						acceptCompletion(selected, true);
+						key.preventDefault();
+						return;
+					}
+				}
+			}
+		}
 		const composer = composerRef.current;
 		if (composer && !grantPrompt && !credPrompt && (key.name === "up" || key.name === "down")) {
 			if (key.name === "up") {
@@ -5898,6 +6357,7 @@ function ChatScreen({ agent, conversation }) {
 				const text = history.previous(composer.plainText);
 				if (text === null) return;
 				applyComposerText(text, "start");
+				if (detectCommandTrigger(text) !== null) setMenuDismissed(true);
 				key.preventDefault();
 				return;
 			}
@@ -5912,6 +6372,7 @@ function ChatScreen({ agent, conversation }) {
 			const text = history.next(composer.plainText);
 			if (text === null) return;
 			applyComposerText(text, "end");
+			if (detectCommandTrigger(text) !== null) setMenuDismissed(true);
 			key.preventDefault();
 			return;
 		}
@@ -5920,8 +6381,7 @@ function ChatScreen({ agent, conversation }) {
 			return;
 		}
 		if (key.name === "r" && key.ctrl) {
-			const target = [...itemsRef.current].reverse().find(isActionableCard);
-			if (target) runCardAction(target);
+			runNewestCard();
 			return;
 		}
 		if (key.name === "t" && key.ctrl) {
@@ -6045,7 +6505,22 @@ function ChatScreen({ agent, conversation }) {
 							agent.name,
 							" below."
 						]
-					}) : /* @__PURE__ */ jsx(Fragment, { children: items.map((item) => /* @__PURE__ */ jsx(RenderItem, { item }, item.id)) }), run.kind !== "idle" ? /* @__PURE__ */ jsx(ActivityRow, { label: run.kind === "sending" ? "sending" : "working" }) : null]
+					}) : /* @__PURE__ */ jsx(Fragment, { children: items.map((item, i) => {
+						const label = multiAgent ? agentLabelFor(items, i) : null;
+						return /* @__PURE__ */ jsxs("box", {
+							style: { flexDirection: "column" },
+							children: [label ? /* @__PURE__ */ jsx("box", {
+								style: {
+									paddingLeft: 3,
+									paddingRight: 1
+								},
+								children: /* @__PURE__ */ jsx("text", {
+									fg: theme.muted,
+									children: /* @__PURE__ */ jsx("b", { children: label })
+								})
+							}) : null, /* @__PURE__ */ jsx(RenderItem, { item })]
+						}, item.id);
+					}) }), run.kind !== "idle" ? /* @__PURE__ */ jsx(ActivityRow, { label: run.kind === "sending" ? "sending" : "working" }) : null]
 				})
 			}),
 			pendingVisible ? /* @__PURE__ */ jsxs("box", {
@@ -6071,6 +6546,15 @@ function ChatScreen({ agent, conversation }) {
 					children: "ctrl+x remove last"
 				})]
 			}) : null,
+			menuOpen ? /* @__PURE__ */ jsx(CompletionMenu, {
+				items: menuCommands.map((c) => ({
+					id: c.name,
+					label: `/${c.name}`,
+					hint: c.argsHint,
+					description: c.description
+				})),
+				highlight: menuHighlightClamped
+			}) : null,
 			credPrompt ? /* @__PURE__ */ jsx(CredentialPromptBox, {
 				prompt: credPrompt,
 				height: credPromptHeight,
@@ -6441,7 +6925,7 @@ function App({ appUrl, sessionToken, shareMachine, promptHistoryPath, notificati
 						screen.kind === "chat" && rest && /* @__PURE__ */ jsx(ChatScreen, {
 							agent: screen.agent,
 							conversation: screen.conversation
-						})
+						}, "id" in screen.conversation ? screen.conversation.id : screen.conversation.nonce)
 					]
 				})
 			]

package/package.json

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