skydive-cli 0.6.0-beta.13 → 0.6.0-beta.15

package/dist/js/bin.mjs

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-import { c as version, s as name, t as createRestClient } from "./rest-BL0LvgFv.mjs";
-import { A as getPromptHistoryPath, B as resolveConfig, D as getDefaultAgent, E as getConfigPath, F as getStoredApiKeyWorkspaceName, G as saveSession, H as resolveSession$1, I as getUpdateCheckDisabled, N as getShareMachineDefault, O as getLastSeenVersion, P as getStoredApiKeyId, R as resolveAppUrl, S as DEFAULT_API_URL, T as deleteConfig, V as resolveManagementAuth, W as saveConfig, b as API_KEY_FAMILY_PREFIX, i as resolveAgent$1, k as getPreference, q as setLastSeenVersion, w as PREFERENCES, x as API_KEY_PREFIX, y as API_KEYS_URL, z as resolveChatAuth } from "./print-Cy646pv0.mjs";
-import { A as installAgentAlias, B as resolveWorkspaceId, D as machineOsFromPlatform, E as buildImportSeedPrompt, F as detectShell, I as ensureActiveOrganization, L as getActiveWorkspaceId, M as takenAliasNames, N as SUPPORTED_SHELLS, O as aliasActivationHint, P as defaultInstallEnv, R as getSessionIdentity, V as setActiveWorkspace, c as getAutomaticLogsDir, j as slugifyAliasName, k as dedupeAliasName, l as maybeStartProfiling, o as brandHelpArt, t as installCrashHandler, u as profileDir, w as themes, z as listWorkspaces } from "./install-n38o12q4.mjs";
+import { c as version, s as name, t as createRestClient } from "./rest-Benrf1yZ.mjs";
+import { A as getPromptHistoryPath, B as resolveConfig, D as getDefaultAgent, E as getConfigPath, F as getStoredApiKeyWorkspaceName, G as saveSession, H as resolveSession$1, I as getUpdateCheckDisabled, N as getShareMachineDefault, O as getLastSeenVersion, P as getStoredApiKeyId, R as resolveAppUrl, S as DEFAULT_API_URL, T as deleteConfig, V as resolveManagementAuth, W as saveConfig, b as API_KEY_FAMILY_PREFIX, i as resolveAgent$1, k as getPreference, q as setLastSeenVersion, w as PREFERENCES, x as API_KEY_PREFIX, y as API_KEYS_URL, z as resolveChatAuth } from "./print-C_xW32a6.mjs";
+import { A as installAgentAlias, B as resolveWorkspaceId, D as machineOsFromPlatform, E as buildImportSeedPrompt, F as detectShell, I as ensureActiveOrganization, L as getActiveWorkspaceId, M as takenAliasNames, N as SUPPORTED_SHELLS, O as aliasActivationHint, P as defaultInstallEnv, R as getSessionIdentity, V as setActiveWorkspace, c as getAutomaticLogsDir, j as slugifyAliasName, k as dedupeAliasName, l as maybeStartProfiling, o as brandHelpArt, t as installCrashHandler, u as profileDir, w as themes, z as listWorkspaces } from "./install-Fo1riO1w.mjs";
 import { n as printError, r as printTable, t as output } from "./output-C9mb3sUB.mjs";
 import { t as HttpError } from "./http-error-BF2NZZE3.mjs";
 import "./billing-blocked-D3l5kJlX.mjs";
-import { a as resolveMachineIdentity } from "./client-JCeJ0RAt.mjs";
+import { a as resolveMachineIdentity } from "./client-7decrdm4.mjs";
 import "./tls-cert-Rua2oV7n.mjs";
 import { i as grantPortalAccess, n as fetchPortalDevices, o as registerPortalDevice, r as findThisDevice, s as revokePortalAccess } from "./api-BFQ4PQDA.mjs";
-import { d as daemonPaths, i as queryDaemonStatus, n as ensureDaemonRunning, s as stopDaemon, u as PORTAL_DAEMON_FLAG } from "./daemon-LnRwTN3W.mjs";
+import { d as daemonPaths, i as queryDaemonStatus, n as ensureDaemonRunning, s as stopDaemon, u as PORTAL_DAEMON_FLAG } from "./daemon-5HHkFtaF.mjs";
 import { a as encodeFsRequest, i as decodeFsResponse, n as SANDBOX_STREAM_PATH, r as streamSpecToQuery, t as SandboxStream } from "./client-l6orYfqq.mjs";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs";
@@ -1584,7 +1584,7 @@ const importCommand = {
 				process.exit(1);
 			}
 		}
-		const { runChat } = await import("./boot-DME-U2DQ.mjs");
+		const { runChat } = await import("./boot-D5_QVvwk.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1614,7 +1614,7 @@ async function runImportPrintMode({ argv, appUrl }) {
 		printError(`${session.error.message} For non-interactive use, run \`skydive auth login --web\` first, or set SKYDIVE_SESSION_TOKEN.`);
 		process.exit(1);
 	}
-	const { connectMachineShare } = await import("./print-share-CsfmGXNy.mjs");
+	const { connectMachineShare } = await import("./print-share-ooQ3IrUT.mjs");
 	const machineShare = await connectMachineShare({
 		appUrl,
 		sessionToken: session.value.sessionToken,
@@ -1622,7 +1622,7 @@ async function runImportPrintMode({ argv, appUrl }) {
 	});
 	const extra = (argv.print ?? "").trim();
 	const prompt = buildImportSeedPrompt(process.cwd(), machineOsFromPlatform(process.platform)) + (extra ? `\n\nAdditional instructions: ${extra}` : "");
-	const { runPrint } = await import("./print-CBeqAsBA.mjs");
+	const { runPrint } = await import("./print-sWlw3B6z.mjs");
 	try {
 		const result = await runPrint({
 			appUrl,
@@ -2029,7 +2029,7 @@ const chatCommand = {
 			sessionToken: auth.value.token,
 			agentSelector: argv.agent ?? null
 		});
-		const { runChat } = await import("./boot-DME-U2DQ.mjs");
+		const { runChat } = await import("./boot-D5_QVvwk.mjs");
 		await runChat({
 			appUrl: auth.value.appUrl,
 			sessionToken: auth.value.token,
@@ -2113,7 +2113,7 @@ async function runPrintMode({ argv, appUrl }) {
 		printError(`${auth.error.message} For non-interactive use, run \`skydive auth login\` first, or set SKYDIVE_API_KEY / SKYDIVE_SESSION_TOKEN.`);
 		process.exit(1);
 	}
-	const { runPrint, readStdin } = await import("./print-CBeqAsBA.mjs");
+	const { runPrint, readStdin } = await import("./print-sWlw3B6z.mjs");
 	const workspaceId = await resolveWorkspaceFlag({
 		appUrl,
 		sessionToken: auth.value.token,
@@ -2143,7 +2143,7 @@ async function runPrintMode({ argv, appUrl }) {
 			process.exit(1);
 		}
 	} else {
-		const { connectMachineShare } = await import("./print-share-CsfmGXNy.mjs");
+		const { connectMachineShare } = await import("./print-share-ooQ3IrUT.mjs");
 		machineShare = await connectMachineShare({
 			appUrl: auth.value.appUrl,
 			sessionToken: auth.value.token,
@@ -2208,7 +2208,7 @@ const getCommand$1 = {
 			printError(`${auth.error.message} Run \`skydive auth login\` first, or set SKYDIVE_API_KEY / SKYDIVE_SESSION_TOKEN.`);
 			process.exit(1);
 		}
-		const { messageGet } = await import("./print-CBeqAsBA.mjs");
+		const { messageGet } = await import("./print-sWlw3B6z.mjs");
 		try {
 			const result = await messageGet({
 				appUrl: auth.value.appUrl,
@@ -2411,7 +2411,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-DME-U2DQ.mjs");
+			const { runWorkspacePicker } = await import("./boot-D5_QVvwk.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}
@@ -2490,7 +2490,7 @@ const openCommand = {
 		const agent = argv.agent ? resolveAgent$1((await fetchPortalDevices(session)).agents, argv.agent) : null;
 		const cwd = argv.cwd ? path.resolve(argv.cwd) : process.cwd();
 		const { machineName } = await resolveMachineIdentity(null);
-		const { PortalDaemonClient } = await import("./daemon-client-DPlUrHM0.mjs");
+		const { PortalDaemonClient } = await import("./daemon-client-CkU1-t5_.mjs");
 		let lastLine = "";
 		let signalConnected;
 		const connected = new Promise((resolve) => {
@@ -2847,8 +2847,8 @@ const sandboxCommand = {
 	}).example("skydive sandbox --agent grace", "Live terminal (Ctrl-] detaches)").example("skydive sandbox --agent grace -- tail -n 50 /tmp/harness.log", "One-shot command (use `--` so its flags reach the sandbox)").example("skydive sandbox --agent grace -- sh -c 'ls /tmp | wc -l'", "Shell features go through an explicit `sh -c`"),
 	handler: async (argv) => {
 		const session = requireSession(argv);
-		const { createRestClient } = await import("./rest-CN-FGWu1.mjs");
-		const { resolveAgent } = await import("./print-CBeqAsBA.mjs");
+		const { createRestClient } = await import("./rest-8DCRRen0.mjs");
+		const { resolveAgent } = await import("./print-sWlw3B6z.mjs");
 		const client = createRestClient({
 			appUrl: session.appUrl,
 			sessionToken: session.sessionToken
@@ -3119,8 +3119,8 @@ const fsEditCommand = {
 	handler: async (argv) => {
 		const session = requireSession(argv);
 		const remotePath = argv.path;
-		const { createRestClient } = await import("./rest-CN-FGWu1.mjs");
-		const { resolveAgent } = await import("./print-CBeqAsBA.mjs");
+		const { createRestClient } = await import("./rest-8DCRRen0.mjs");
+		const { resolveAgent } = await import("./print-sWlw3B6z.mjs");
 		const client = createRestClient({
 			appUrl: session.appUrl,
 			sessionToken: session.sessionToken
@@ -4573,7 +4573,7 @@ if (process.argv.includes(UPDATE_WORKER_FLAG)) {
 	process.exit(0);
 }
 if (process.argv.includes(PORTAL_DAEMON_FLAG)) {
-	const { runPortalDaemon } = await import("./daemon-DtDwegIj.mjs");
+	const { runPortalDaemon } = await import("./daemon-CLTmAfBt.mjs");
 	runPortalDaemon(process.argv);
 } else runCli();
 function runCli() {

package/dist/js/{boot-DME-U2DQ.mjs → boot-D5_QVvwk.mjs}

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
-import { a as errorMessage, i as sendErrorMessage, n as errorDetail, o as isRecord, t as createRestClient } from "./rest-BL0LvgFv.mjs";
-import { C as DEFAULT_APP_URL, E as getConfigPath, K as saveTheme, L as recordDefaultAgent, M as getSavedTheme, S as DEFAULT_API_URL, U as resolveWebUrl, _ as parseConnectCard, c as actionableCardVerb, d as parseOauthConnectParams, f as prioritizeActionableCards, g as computeSettledLabel, h as composeQuestionAnswer, i as resolveAgent, j as getReviewStateDir, l as cardActionErrorMessage, m as resolveConnectUrl, p as reconcileMaskedInput, s as MASK_CHAR, u as parseExternalOauthConnectParams, v as specKeyFor } from "./print-Cy646pv0.mjs";
-import { A as installAgentAlias, C as themeVersion, D as machineOsFromPlatform, F as detectShell, L as getActiveWorkspaceId, M as takenAliasNames, O as aliasActivationHint, S as themeModeFromColorFgBg, T as themesForMode, V as setActiveWorkspace, _ as monoTheme, a as WORDMARK, b as themeForMode, d as profilingEnabled, f as record, g as findTheme, h as applyTheme, i as MARK_CELLS, j as slugifyAliasName, k as dedupeAliasName, m as DEFAULT_THEME_ID, n as buildCrashReport, p as writeArtifact, r as writeCrashReport, s as splashFitsWidth, t as installCrashHandler, v as noColorRequested, x as themeMode, y as theme, z as listWorkspaces } from "./install-n38o12q4.mjs";
+import { a as errorMessage, i as sendErrorMessage, n as errorDetail, o as isRecord, t as createRestClient } from "./rest-Benrf1yZ.mjs";
+import { C as DEFAULT_APP_URL, E as getConfigPath, K as saveTheme, L as recordDefaultAgent, M as getSavedTheme, S as DEFAULT_API_URL, U as resolveWebUrl, _ as parseConnectCard, c as actionableCardVerb, d as parseOauthConnectParams, f as prioritizeActionableCards, g as computeSettledLabel, h as composeQuestionAnswer, i as resolveAgent, j as getReviewStateDir, l as cardActionErrorMessage, m as resolveConnectUrl, p as reconcileMaskedInput, s as MASK_CHAR, u as parseExternalOauthConnectParams, v as specKeyFor } from "./print-C_xW32a6.mjs";
+import { A as installAgentAlias, C as themeVersion, D as machineOsFromPlatform, F as detectShell, L as getActiveWorkspaceId, M as takenAliasNames, O as aliasActivationHint, S as themeModeFromColorFgBg, T as themesForMode, V as setActiveWorkspace, _ as monoTheme, a as WORDMARK, b as themeForMode, d as profilingEnabled, f as record, g as findTheme, h as applyTheme, i as MARK_CELLS, j as slugifyAliasName, k as dedupeAliasName, m as DEFAULT_THEME_ID, n as buildCrashReport, p as writeArtifact, r as writeCrashReport, s as splashFitsWidth, t as installCrashHandler, v as noColorRequested, x as themeMode, y as theme, z as listWorkspaces } from "./install-Fo1riO1w.mjs";
 import { t as HttpError } from "./http-error-BF2NZZE3.mjs";
 import { i as billingBlockedOutcomeFromSendResponse } from "./billing-blocked-D3l5kJlX.mjs";
-import { t as PortalClient } from "./client-JCeJ0RAt.mjs";
+import { t as PortalClient } from "./client-7decrdm4.mjs";
 import { t as defaultTlsCertSource } from "./tls-cert-Rua2oV7n.mjs";
 import "./api-BFQ4PQDA.mjs";
-import "./daemon-LnRwTN3W.mjs";
+import "./daemon-5HHkFtaF.mjs";
 import { t as SandboxStream } from "./client-l6orYfqq.mjs";
-import { t as PortalDaemonClient } from "./daemon-client-BoLMCnVn.mjs";
+import { t as PortalDaemonClient } from "./daemon-client-BdEu0TK_.mjs";
 import { t as runRawPtyPassthrough } from "./raw-pty-dndn1Kxc.mjs";
 import * as os$1 from "node:os";
 import { homedir, platform, release, tmpdir } from "node:os";
@@ -7028,9 +7028,9 @@ function flattenOutputText(value) {
 * anchor set the screen renders is always at most one.
 */
 function subagentAnchorsFromHistory(items) {
-	let latest = null;
-	for (const item of items) if (item.kind === "tool" && item.toolName === "subagent") latest = item.id;
-	return latest === null ? [] : [latest];
+	const ids = /* @__PURE__ */ new Set();
+	for (const item of items) if (item.kind === "tool" && item.toolName === "subagent") ids.add(item.id);
+	return [...ids];
 }
 /**
 * The next anchor set as a `subagent` call streams in live. Always the single
@@ -7038,8 +7038,8 @@ function subagentAnchorsFromHistory(items) {
 * stacking beside it, so the composer only ever has one fan-out card above it.
 */
 function nextAnchoredSubagentIds({ current, nextId }) {
-	if (current.length === 1 && current[0] === nextId) return current;
-	return [nextId];
+	if (current.includes(nextId)) return current;
+	return [...current, nextId];
 }
 /**
 * The card's rows: one per queued run (call order), each carrying the
@@ -7051,7 +7051,7 @@ function nextAnchoredSubagentIds({ current, nextId }) {
 * mid-turn.
 */
 function subagentRows({ titles, queued, fetched }) {
-	if (queued.length === 0) return titles.map((title, index) => ({
+	if (fetched === null && queued.length === 0) return titles.map((title, index) => ({
 		id: `queued:${index}`,
 		title,
 		status: "queued",
@@ -7062,7 +7062,18 @@ function subagentRows({ titles, queued, fetched }) {
 		contextTokens: null,
 		latestActivity: null
 	}));
-	return queued.map((task, index) => {
+	const tasks = new Map(queued.map((task, index) => [task.id, {
+		task,
+		index
+	}]));
+	for (const id of fetched?.keys() ?? []) if (!tasks.has(id)) tasks.set(id, {
+		task: {
+			id,
+			conversationId: null
+		},
+		index: -1
+	});
+	return [...tasks.values()].map(({ task, index }) => {
 		const row = fetched?.get(task.id) ?? null;
 		return {
 			id: task.id,
@@ -7220,34 +7231,57 @@ function SubagentRowView({ row, selected, width, nowMs, onOpen }) {
 * the card reports its rows up through ConversationContext so the screen
 * knows what's selectable).
 */
-function ToolSubagent({ item, isActive: _isActive, onLiveChange, onHeightChange }) {
+function ToolSubagent({ items, isActive: _isActive, onHeightChange }) {
 	const { rest, conversationId, openConversation, onSubagentBatch, subagentSelection } = useConversationContext();
 	const { width } = useTerminalDimensions();
-	const titles = subagentTaskTitles(item.input);
-	const queued = item.output?.kind === "ok" ? queuedSubagentTasks(item.output.value) : [];
-	const idsKey = queued.map((task) => task.id).join(",");
+	const optimistic = /* @__PURE__ */ new Map();
+	let pendingIndex = 0;
+	for (const item of items) {
+		const titles = subagentTaskTitles(item.input);
+		const queued = item.output?.kind === "ok" ? queuedSubagentTasks(item.output.value) : [];
+		if (queued.length === 0) {
+			for (const title of titles) {
+				optimistic.set(`pending:${pendingIndex}`, {
+					title,
+					conversationId: null
+				});
+				pendingIndex += 1;
+			}
+			continue;
+		}
+		for (const [index, task] of queued.entries()) if (!optimistic.has(task.id)) optimistic.set(task.id, {
+			title: titles[index] ?? "Subagent task",
+			conversationId: task.conversationId
+		});
+	}
+	const queued = [...optimistic].map(([id, task]) => ({
+		id,
+		conversationId: task.conversationId
+	}));
+	const titles = [...optimistic.values()].map((task) => task.title);
 	const [fetched, setFetched] = useState(null);
 	const rows = subagentRows({
 		titles,
 		queued,
 		fetched
 	});
-	const live = rows.length === 0 || rows.some((row) => isLiveStatus(row.status));
+	const live = fetched === null || rows.some((row) => isLiveStatus(row.status));
 	const [nowMs, setNowMs] = useState(() => Date.now());
 	useEffect(() => {
 		if (!live || rows.length === 0) return;
 		const id = setInterval(() => setNowMs(Date.now()), 1e3);
 		return () => clearInterval(id);
 	}, [live, rows.length]);
-	useEffect(() => {
-		onLiveChange?.(live);
-	}, [live, onLiveChange]);
 	useEffect(() => {
 		const visibleRows = Math.min(rows.length, MAX_VISIBLE_ROWS);
-		onHeightChange?.(rows.length === 0 ? 1 : 1 + visibleRows + (rows.length > MAX_VISIBLE_ROWS ? 1 : 0));
-	}, [onHeightChange, rows.length]);
+		onHeightChange?.(rows.length === 0 ? items.length > 0 ? 1 : 0 : 1 + visibleRows + (rows.length > MAX_VISIBLE_ROWS ? 1 : 0));
+	}, [
+		items.length,
+		onHeightChange,
+		rows.length
+	]);
 	useEffect(() => {
-		if (!rest || !conversationId || idsKey.length === 0 || !live) return;
+		if (!rest || !conversationId || !live) return;
 		let cancelled = false;
 		let timer = null;
 		const tick = async () => {
@@ -7266,14 +7300,12 @@ function ToolSubagent({ item, isActive: _isActive, onLiveChange, onHeightChange
 	}, [
 		rest,
 		conversationId,
-		idsKey,
 		live
 	]);
-	const reportKey = rows.map((row) => `${row.id}:${row.status}:${row.conversationId ?? ""}`).join("|");
 	useEffect(() => {
-		if (!onSubagentBatch || rows.length === 0) return;
+		if (!onSubagentBatch || !conversationId || rows.length === 0) return;
 		onSubagentBatch({
-			toolCallId: item.id,
+			toolCallId: conversationId,
 			live,
 			rows: rows.map((row) => ({
 				id: row.id,
@@ -7282,18 +7314,21 @@ function ToolSubagent({ item, isActive: _isActive, onLiveChange, onHeightChange
 		});
 	}, [
 		onSubagentBatch,
-		item.id,
+		conversationId,
 		live,
-		reportKey
+		rows.map((row) => `${row.id}:${row.status}:${row.conversationId ?? ""}`).join("|")
 	]);
-	if (rows.length === 0) return /* @__PURE__ */ jsxs("text", { children: [/* @__PURE__ */ jsx("span", {
-		fg: theme.warning,
-		children: "◐ "
-	}), /* @__PURE__ */ jsx("span", {
-		fg: theme.tool,
-		children: "Delegating to subagents…"
-	})] });
-	const selectedIndex = subagentSelection && subagentSelection.toolCallId === item.id ? Math.min(subagentSelection.index, rows.length - 1) : null;
+	if (rows.length === 0) {
+		if (items.length === 0 || fetched !== null) return null;
+		return /* @__PURE__ */ jsxs("text", { children: [/* @__PURE__ */ jsx("span", {
+			fg: theme.warning,
+			children: "◐ "
+		}), /* @__PURE__ */ jsx("span", {
+			fg: theme.tool,
+			children: "Delegating to subagents…"
+		})] });
+	}
+	const selectedIndex = subagentSelection && subagentSelection.toolCallId === conversationId ? Math.min(subagentSelection.index, rows.length - 1) : null;
 	const start = rows.length > MAX_VISIBLE_ROWS ? windowStart(selectedIndex ?? 0, rows.length, MAX_VISIBLE_ROWS) : 0;
 	const visible = rows.slice(start, start + MAX_VISIBLE_ROWS);
 	const moreBelow = rows.length - start - visible.length;
@@ -7351,32 +7386,24 @@ function ToolSubagent({ item, isActive: _isActive, onLiveChange, onHeightChange
 * a settled batch keeps its rows — titles and drill-in — until the next
 * fan-out replaces the group.
 */
-function SubagentCardView({ items, isActive, onHeightChange, onBatchLiveChange }) {
-	const [heightById, setHeightById] = useState({});
-	const setBatchHeight = useCallback((id, height) => {
-		setHeightById((current) => current[id] === height ? current : {
-			...current,
-			[id]: height
-		});
-	}, []);
-	const height = useMemo(() => items.length === 0 ? 0 : 1 + items.reduce((rows, item) => rows + (heightById[item.id] ?? 0), 0) + (items.length - 1), [heightById, items]);
-	useEffect(() => onHeightChange?.(height), [height, onHeightChange]);
-	if (items.length === 0) return null;
+function SubagentCardView({ items, isActive, onHeightChange }) {
+	const [height, setHeight] = useState(0);
+	useEffect(() => onHeightChange?.(height > 0 ? height + 1 : 0), [height, onHeightChange]);
 	return /* @__PURE__ */ jsx("box", {
 		style: {
 			flexDirection: "column",
 			flexShrink: 0,
-			marginTop: 1,
-			paddingLeft: 1,
-			paddingRight: 1,
+			height: height > 0 ? void 0 : 0,
+			marginTop: height > 0 ? 1 : 0,
+			paddingLeft: height > 0 ? 1 : 0,
+			paddingRight: height > 0 ? 1 : 0,
 			gap: 1
 		},
-		children: items.map((item) => /* @__PURE__ */ jsx(ToolSubagent, {
-			item,
+		children: /* @__PURE__ */ jsx(ToolSubagent, {
+			items,
 			isActive,
-			onLiveChange: (live) => onBatchLiveChange?.(item.id, live),
-			onHeightChange: (batchHeight) => setBatchHeight(item.id, batchHeight)
-		}, item.id))
+			onHeightChange: setHeight
+		})
 	});
 }
 
@@ -13177,10 +13204,6 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 	const togglePlanExpanded = useCallback(() => setPlanExpanded((current) => !current), []);
 	const [subagentRows, setSubagentRows] = useState(0);
 	const [anchoredSubagentIds, setAnchoredSubagentIds] = useState([]);
-	const anchoredSubagentLiveRef = useRef({});
-	const setAnchoredBatchLive = useCallback((id, live) => {
-		anchoredSubagentLiveRef.current[id] = live;
-	}, []);
 	const [scrolledUp, setScrolledUp] = useState(false);
 	const [stickyPromptId, setStickyPromptId] = useState(null);
 	const transcriptRowRefs = useRef(/* @__PURE__ */ new Map());
@@ -13381,12 +13404,10 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 		return items.filter((item) => item.kind === "tool" && item.toolName === "subagent" && ids.has(item.id));
 	}, [items, anchoredSubagentIds]);
 	const anchoredSubagentBatch = useMemo(() => {
-		for (const item of subagentItems) {
-			const batch = subagentBatches.get(item.id);
-			if (batch && batch.rows.length > 0) return batch;
-		}
-		return null;
-	}, [subagentItems, subagentBatches]);
+		if (!conversationId) return null;
+		const batch = subagentBatches.get(conversationId);
+		return batch && batch.rows.length > 0 ? batch : null;
+	}, [conversationId, subagentBatches]);
 	const anchoredSubagentBatchRef = useRef(anchoredSubagentBatch);
 	anchoredSubagentBatchRef.current = anchoredSubagentBatch;
 	useEffect(() => {
@@ -13487,7 +13508,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 				});
 				setItems(loaded);
 				const anchors = subagentAnchorsFromHistory(loaded);
-				if (anchors.length > 0) setAnchoredSubagentIds((current) => current.length > 0 ? current : anchors);
+				if (anchors.length > 0) setAnchoredSubagentIds((current) => [...new Set([...anchors, ...current])]);
 				seedPrLinks(loaded);
 				setTodos(latestTodosFromHistory(firstPage.messages));
 				setHistoryLoaded(true);
@@ -13562,14 +13583,10 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 					prScanner.addChunk(event.chunk);
 					if ((event.chunk.type === "tool-input-start" || event.chunk.type === "tool-input-available") && event.chunk.toolName === "subagent" && typeof event.chunk.toolCallId === "string") {
 						const id = event.chunk.toolCallId;
-						setAnchoredSubagentIds((current) => {
-							const next = nextAnchoredSubagentIds({
-								current,
-								nextId: id
-							});
-							if (next.length === 1 && next[0] === id) anchoredSubagentLiveRef.current = { [id]: true };
-							return next;
-						});
+						setAnchoredSubagentIds((current) => nextAnchoredSubagentIds({
+							current,
+							nextId: id
+						}));
 					}
 					if (event.chunk.type === "data-anyone-todos-updated") {
 						const next = todosFromPayload(event.chunk.data);
@@ -15603,8 +15620,7 @@ function ChatScreen({ agent, conversation, attachRunId, parentConversationId })
 			/* @__PURE__ */ jsx(SubagentCardView, {
 				items: subagentItems,
 				isActive: run.kind !== "idle",
-				onHeightChange: setSubagentRows,
-				onBatchLiveChange: setAnchoredBatchLive
+				onHeightChange: setSubagentRows
 			}),
 			todoCardVisible && todos ? /* @__PURE__ */ jsx(TodoCardView, {
 				todos,

package/dist/js/{client-JCeJ0RAt.mjs → client-7decrdm4.mjs}

@@ -160,7 +160,7 @@ function errorMessage(err) {
 * the commit time of the built tree is one monotonic clock they share.
 */
 function portalDaemonBuild() {
-	return "1788894076";
+	return "1788972427";
 }
 /**
 * Whether a client carrying `mine` should replace a running daemon carrying
@@ -186,6 +186,8 @@ function parseStamp(stamp) {
 
 //#endregion
 //#region ../portal-protocol/src/index.ts
+const CLOSE_SUPERSEDED = 4001;
+const CLOSE_FLAP_COOLDOWN = 4002;
 const MAX_WS_FRAME_BYTES = 16 * 1024 * 1024;
 const T_DATA = 1;
 const T_CTRL = 2;
@@ -584,7 +586,11 @@ const DEFAULT_HEARTBEAT = {
 	wakeGapThresholdMs: 1e4,
 	netWatchTickMs: 2e3,
 	initialBackoffMs: 500,
-	maxBackoffMs: 1e4
+	maxBackoffMs: 1e4,
+	supersededBackoffFloorMs: 5e3,
+	flapWindowMs: 6e4,
+	flapMaxStandDowns: 3,
+	flapBackoffMs: 6e4
 };
 /**
 * A cheap fingerprint of the machine's network identity: every non-internal
@@ -669,6 +675,7 @@ var PortalClient = class {
 	netWatch = null;
 	netFingerprint = networkFingerprint();
 	backoffKick = null;
+	inStandDownSleep = false;
 	dialReason = null;
 	disconnectedAt = null;
 	handingOff = false;
@@ -739,6 +746,7 @@ var PortalClient = class {
 			this.ws.terminate();
 			return;
 		}
+		if (this.inStandDownSleep) return;
 		this.kickBackoff();
 	}
 	kickBackoff() {
@@ -914,11 +922,23 @@ var PortalClient = class {
 			this.opts.onMachineName(identity.machineName, identity.machineNameSource);
 		}
 		let backoff = this.heartbeatConfig.initialBackoffMs;
+		let standDowns = [];
 		while (this.enabled && !this.disposed && !this.handingOff) {
 			this.setStatus("connecting");
+			let sleepFloor = 0;
 			try {
 				const token = await this.wsToken();
-				if (await this.runConnection(token)) backoff = this.heartbeatConfig.initialBackoffMs;
+				const { healthy, standDown } = await this.runConnection(token);
+				if (standDown) {
+					const now = Date.now();
+					standDowns.push(now);
+					standDowns = standDowns.filter((at) => now - at <= this.heartbeatConfig.flapWindowMs);
+					if (standDowns.length >= this.heartbeatConfig.flapMaxStandDowns) {
+						backoff = this.heartbeatConfig.flapBackoffMs;
+						this.setStatus("error", "another portal connection for this machine keeps taking over — if Skydive Desktop or `skydive portal open` is running twice, quit the duplicate; an unstable network can also cause this briefly");
+					} else backoff = Math.max(Math.min(backoff * 2, this.heartbeatConfig.maxBackoffMs), this.heartbeatConfig.supersededBackoffFloorMs);
+					sleepFloor = backoff / 2;
+				} else if (healthy) backoff = this.heartbeatConfig.initialBackoffMs;
 				else backoff = Math.min(backoff * 2, this.heartbeatConfig.maxBackoffMs);
 			} catch (err) {
 				if (!this.enabled || this.disposed || this.handingOff) break;
@@ -926,17 +946,23 @@ var PortalClient = class {
 				backoff = Math.min(backoff * 2, this.heartbeatConfig.maxBackoffMs);
 			}
 			if (!this.enabled || this.disposed || this.handingOff) break;
-			await this.backoffSleep(Math.random() * backoff);
+			this.inStandDownSleep = sleepFloor > 0;
+			await this.backoffSleep(sleepFloor + Math.random() * Math.max(backoff - sleepFloor, 0));
+			this.inStandDownSleep = false;
 		}
 	}
 	runConnection(token) {
 		return new Promise((resolve) => {
 			let settled = false;
 			let healthy = false;
+			let standDown = false;
 			const settle = () => {
 				if (settled) return;
 				settled = true;
-				resolve(healthy);
+				resolve({
+					healthy,
+					standDown
+				});
 			};
 			const ws = new WebSocket(portalWsUrl(this.opts.appUrl, this.machineName, this.friendlyName, {
 				build: portalDaemonBuild(),
@@ -988,7 +1014,9 @@ var PortalClient = class {
 			ws.on("error", (err) => {
 				this.error = errorMessage(err);
 			});
-			ws.on("close", (code) => {
+			ws.on("close", (code, reason) => {
+				standDown = code === CLOSE_SUPERSEDED || code === CLOSE_FLAP_COOLDOWN || code === 1e3 && reason.toString() === "superseded";
+				if (standDown) this.dialReason ??= `superseded (code ${code})`;
 				this.dialReason ??= `connection closed (code ${code})`;
 				this.disconnectedAt ??= Date.now();
 				clearInterval(heartbeat);

package/dist/js/client-Dwy-uGNl.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import { t as PortalClient } from "./client-7decrdm4.mjs";
+import "./api-BFQ4PQDA.mjs";
+
+export { PortalClient };

package/dist/js/{daemon-LnRwTN3W.mjs → daemon-5HHkFtaF.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as isRecord, n as isNewerBuild, r as portalDaemonBuild, t as PortalClient } from "./client-JCeJ0RAt.mjs";
+import { i as isRecord, n as isNewerBuild, r as portalDaemonBuild, t as PortalClient } from "./client-7decrdm4.mjs";
 import { t as defaultTlsCertSource } from "./tls-cert-Rua2oV7n.mjs";
 import os from "node:os";
 import path from "node:path";

package/dist/js/{daemon-DtDwegIj.mjs → daemon-CLTmAfBt.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import "./client-JCeJ0RAt.mjs";
+import "./client-7decrdm4.mjs";
 import "./tls-cert-Rua2oV7n.mjs";
 import "./api-BFQ4PQDA.mjs";
-import { a as runPortalDaemon, c as stopDaemonForHandoff, i as queryDaemonStatus, n as ensureDaemonRunning, o as startPortalDaemon, r as isDaemonListening, s as stopDaemon, t as PortalDaemon } from "./daemon-LnRwTN3W.mjs";
+import { a as runPortalDaemon, c as stopDaemonForHandoff, i as queryDaemonStatus, n as ensureDaemonRunning, o as startPortalDaemon, r as isDaemonListening, s as stopDaemon, t as PortalDaemon } from "./daemon-5HHkFtaF.mjs";
 
 export { runPortalDaemon };

package/dist/js/{daemon-client-BoLMCnVn.mjs → daemon-client-BdEu0TK_.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { d as daemonPaths, f as encodeLine, l as LOCAL_PROTOCOL_VERSION, m as parseDaemonMessage, n as ensureDaemonRunning, p as makeLineParser } from "./daemon-LnRwTN3W.mjs";
+import { d as daemonPaths, f as encodeLine, l as LOCAL_PROTOCOL_VERSION, m as parseDaemonMessage, n as ensureDaemonRunning, p as makeLineParser } from "./daemon-5HHkFtaF.mjs";
 import { randomUUID } from "node:crypto";
 import { connect } from "node:net";
 

package/dist/js/daemon-client-CkU1-t5_.mjs

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+import "./client-7decrdm4.mjs";
+import "./tls-cert-Rua2oV7n.mjs";
+import "./api-BFQ4PQDA.mjs";
+import "./daemon-5HHkFtaF.mjs";
+import { t as PortalDaemonClient } from "./daemon-client-BdEu0TK_.mjs";
+
+export { PortalDaemonClient };

package/dist/js/{install-n38o12q4.mjs → install-Fo1riO1w.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { c as version$1 } from "./rest-BL0LvgFv.mjs";
-import { E as getConfigPath } from "./print-Cy646pv0.mjs";
+import { c as version$1 } from "./rest-Benrf1yZ.mjs";
+import { E as getConfigPath } from "./print-C_xW32a6.mjs";
 import os from "node:os";
 import path from "node:path";
 import { err, ok } from "neverthrow";

package/dist/js/{print-Cy646pv0.mjs → print-C_xW32a6.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as errorMessage, i as sendErrorMessage, o as isRecord, t as createRestClient } from "./rest-BL0LvgFv.mjs";
+import { a as errorMessage, i as sendErrorMessage, o as isRecord, t as createRestClient } from "./rest-Benrf1yZ.mjs";
 import { t as HttpError } from "./http-error-BF2NZZE3.mjs";
 import { i as billingBlockedOutcomeFromSendResponse, n as BillingBlockedError } from "./billing-blocked-D3l5kJlX.mjs";
 import path from "node:path";

package/dist/js/{print-CBeqAsBA.mjs → print-sWlw3B6z.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import "./rest-BL0LvgFv.mjs";
-import { a as runPrint, i as resolveAgent, n as messageGet, o as toPrintError, r as readStdin, t as collectRunText } from "./print-Cy646pv0.mjs";
+import "./rest-Benrf1yZ.mjs";
+import { a as runPrint, i as resolveAgent, n as messageGet, o as toPrintError, r as readStdin, t as collectRunText } from "./print-C_xW32a6.mjs";
 import "./billing-blocked-D3l5kJlX.mjs";
 
 export { messageGet, readStdin, resolveAgent, runPrint };

package/dist/js/{print-share-CsfmGXNy.mjs → print-share-ooQ3IrUT.mjs}

@@ -14,7 +14,7 @@ import { n as printError } from "./output-C9mb3sUB.mjs";
 * the reply (and to --json).
 */
 async function connectMachineShare({ appUrl, sessionToken, timeoutHint }) {
-	const { PortalClient } = await import("./client-D0FfDGC9.mjs");
+	const { PortalClient } = await import("./client-Dwy-uGNl.mjs");
 	const { defaultTlsCertSource } = await import("./tls-cert-BpCaD5AT.mjs");
 	let signalConnected;
 	const connected = new Promise((resolve) => {

package/dist/js/{rest-CN-FGWu1.mjs → rest-8DCRRen0.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as sendErrorMessage, n as errorDetail, r as filenameFromContentDisposition, t as createRestClient } from "./rest-BL0LvgFv.mjs";
+import { i as sendErrorMessage, n as errorDetail, r as filenameFromContentDisposition, t as createRestClient } from "./rest-Benrf1yZ.mjs";
 import { t as HttpError } from "./http-error-BF2NZZE3.mjs";
 import "./billing-blocked-D3l5kJlX.mjs";
 

package/dist/js/{rest-BL0LvgFv.mjs → rest-Benrf1yZ.mjs}

@@ -6,7 +6,7 @@ import { createParser } from "eventsource-parser";
 
 //#region package.json
 var name = "skydive-cli";
-var version = "0.6.0-beta.13";
+var version = "0.6.0-beta.15";
 
 //#endregion
 //#region src/chat/util.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skydive-cli",
-  "version": "0.6.0-beta.13",
+  "version": "0.6.0-beta.15",
   "description": "Skydive CLI — cloud agents from the command line",
   "homepage": "https://skydive.com",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@opentui/react": "0.5.8",
+    "@opentui/react": "0.4.3",
     "conf": "^13.0.1",
     "diff": "9.0.0",
     "eventsource-parser": "^3.0.8",
@@ -39,7 +39,7 @@
     "fuzzysort": "^3.1.0",
     "neverthrow": "^8.2.0",
     "open": "^10.1.0",
-    "react": "^19.2.0",
+    "react": "^19.0.0",
     "react-devtools-core": "^7.0.1",
     "safe-stable-stringify": "^2.3.1",
     "semver": "^7.7.4",
@@ -71,9 +71,9 @@
   },
   "//optionalDependencies": "The per-platform binary packages (skydive-cli-<os>-<arch>) are INTENTIONALLY not committed here. They are published by release-skydive-cli-binaries.yml and injected — pinned to the exact version being published — into the published launcher's optionalDependencies at release time (scripts/prepare-platform-packages.mjs --pin-version, run in release-skydive-cli.yml). Committing them would make `yarn install` try to resolve versions that only exist post-publish, breaking local dev and CI. npm installs of a published skydive-cli still get them (os/cpu-gated); the launcher (src/launcher.ts) resolves and execs the matching one. Local dev never needs them: it runs the JS bundle or `build:binary` directly.",
   "optionalDependencies": {
-    "skydive-cli-darwin-arm64": "0.6.0-beta.13",
-    "skydive-cli-darwin-x64": "0.6.0-beta.13",
-    "skydive-cli-linux-x64": "0.6.0-beta.13",
-    "skydive-cli-linux-arm64": "0.6.0-beta.13"
+    "skydive-cli-darwin-arm64": "0.6.0-beta.15",
+    "skydive-cli-darwin-x64": "0.6.0-beta.15",
+    "skydive-cli-linux-x64": "0.6.0-beta.15",
+    "skydive-cli-linux-arm64": "0.6.0-beta.15"
   }
 }

package/dist/js/client-D0FfDGC9.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-import { t as PortalClient } from "./client-JCeJ0RAt.mjs";
-import "./api-BFQ4PQDA.mjs";
-
-export { PortalClient };

package/dist/js/daemon-client-DPlUrHM0.mjs

@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-import "./client-JCeJ0RAt.mjs";
-import "./tls-cert-Rua2oV7n.mjs";
-import "./api-BFQ4PQDA.mjs";
-import "./daemon-LnRwTN3W.mjs";
-import { t as PortalDaemonClient } from "./daemon-client-BoLMCnVn.mjs";
-
-export { PortalDaemonClient };