skydive-cli 0.2.0-beta.742 → 0.3.0-beta.764

package/CHANGELOG.md

@@ -7,11 +7,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.0] - 2026-08-04
+
 ### Added
 
-- Chat TUI sets the terminal title (OSC) to the live conversation title, so a terminal multiplexer (cmux, tmux, zellij) or window names its tab after the conversation. Follows renames from autoname, web, and Slack, and resets to a neutral default on exit.
-- Every TUI screen (pickers included), not just chat, now drives the title, and inside cmux the workspace (sidebar entry) is renamed too via the cmux control socket. A workspace title you set by hand is left untouched. The tab and workspace title read title-first (title then agent name), while the in-app status bar stays agent-first.
-- Notification and sidebar previews use the last text block of the reply (the answer, not the opening preamble) and render as plain text, stripping inline markdown so markers like asterisks and backticks no longer leak into the preview.
+**Chat TUI**
+
+- `/fork` slash command to fork a conversation at any point and continue in a new thread.
+- `/conversation` switches threads from inside a live session.
+- `/compact` triggers manual conversation compaction.
+- `/portal` and `/copy` slash commands.
+- Archive the current conversation from the chat TUI.
+- `--new` flag on `skydive chat` to start a fresh conversation.
+- Debounced server-side conversation search in the picker, with title matches ranked first.
+- File review pane orientation toggle, and review comments in the file pane.
+- Pinned plan card controls and a jump-to-latest hint.
+- Terminal title (OSC) follows the live conversation title on every screen; inside cmux the workspace is renamed too, and linked PRs are pushed to the cmux sidebar.
+- Every participating agent shows in the conversation list; connect cards each have their own identity, and ctrl+r asks which connect card to act on.
+- Colored Skydive splash art in `skydive --help` and the TUI pickers.
+- New-agent name prefilled from the server's suggestion.
+
+**CLI & platform**
+
+- `skydive update` self-updater, with an update notice when a new version is available.
+- Shell completions for bash, zsh, and fish via `completion install`.
+- Portal daemon: one connection per host with per-conversation working directories.
+- Agent-led coding-agent import (`skydive import`).
+- Per-workspace scoping on the REST client, and cross-org `--agent <uuid>` auto-switches workspace.
+- `skydive-beta` wrapper for the canary channel.
+
+### Fixed
+
+- `skydive update` no longer claims an update is available on every npm install.
+- Chat memory is bounded (payload clamps + windowed rows) with a memory watchdog and OOM diagnostic report; transcript rows are memoized so streaming stops re-rendering the whole chat.
+- Chat-send failures map to real error messages.
+- Notification and sidebar previews use the last text block of the reply and strip inline markdown.
+- Picker rows no longer overlap when a conversation title contains a newline, tab, or control character.
+- Sending to non-web channel conversations is blocked in the TUI.
+- GitHub bot connect opens on the web front door, not api.skydive.com.
+- TUI activity counter times from the run, not the screen.
 
 ## [0.2.0] - 2026-07-29
 

package/dist/js/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as setActiveWorkspace, S as listWorkspaces, T as version, _ as themes, b as getActiveWorkspaceId, o as brandHelpArt, t as installCrashHandler, w as name, x as getSessionIdentity, y as ensureActiveOrganization } from "./install-Cv3sBZxr.mjs";
+import { C as setActiveWorkspace, S as listWorkspaces, T as version, _ as themes, b as getActiveWorkspaceId, o as brandHelpArt, t as installCrashHandler, w as name, x as getSessionIdentity, y as ensureActiveOrganization } from "./install-DEZmJLGH.mjs";
 import { A as resolveAppUrl, C as getPromptHistoryPath, D as getStoredApiKeyId, E as getShareMachineDefault, F as saveConfig, I as saveSession, M as resolveManagementAuth, N as resolveSession, O as getStoredApiKeyWorkspaceName, R as setLastSeenVersion, S as getLastSeenVersion, _ as API_KEY_PREFIX, b as deleteConfig, g as API_KEY_FAMILY_PREFIX, h as API_KEYS_URL, i as resolveAgent, j as resolveConfig, k as getUpdateCheckDisabled, v as DEFAULT_API_URL, x as getConfigPath } from "./print-Cd-bVSEJ.mjs";
 import { n as printError, r as printTable, t as output } from "./output-DYzzdXYV.mjs";
 import { n as createRestClient, t as HttpError } from "./rest-BlN_uWmL.mjs";
@@ -1500,7 +1500,7 @@ const importCommand = {
 				process.exit(1);
 			}
 		}
-		const { runChat } = await import("./boot-DhorgAxS.mjs");
+		const { runChat } = await import("./boot-Bs-IF23f.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -1912,7 +1912,7 @@ const chatCommand = {
 			sessionToken: session.value.sessionToken,
 			agentSelector: argv.agent ?? null
 		});
-		const { runChat } = await import("./boot-DhorgAxS.mjs");
+		const { runChat } = await import("./boot-Bs-IF23f.mjs");
 		await runChat({
 			appUrl,
 			sessionToken: session.value.sessionToken,
@@ -2254,7 +2254,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-DhorgAxS.mjs");
+			const { runWorkspacePicker } = await import("./boot-Bs-IF23f.mjs");
 			await runWorkspacePicker(session);
 			return;
 		}
@@ -3586,7 +3586,7 @@ function setupUpdateCheck(argv) {
 
 //#endregion
 //#region src/changelog.generated.ts
-const CHANGELOG_MD = "# Changelog\n\nAll notable changes to the Skydive CLI are documented here.\n\nThe format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),\nand this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n\n## [Unreleased]\n\n### Added\n\n- Chat TUI sets the terminal title (OSC) to the live conversation title, so a terminal multiplexer (cmux, tmux, zellij) or window names its tab after the conversation. Follows renames from autoname, web, and Slack, and resets to a neutral default on exit.\n- Every TUI screen (pickers included), not just chat, now drives the title, and inside cmux the workspace (sidebar entry) is renamed too via the cmux control socket. A workspace title you set by hand is left untouched. The tab and workspace title read title-first (title then agent name), while the in-app status bar stays agent-first.\n- Notification and sidebar previews use the last text block of the reply (the answer, not the opening preamble) and render as plain text, stripping inline markdown so markers like asterisks and backticks no longer leak into the preview.\n\n## [0.2.0] - 2026-07-29\n\n### Added\n\n**Sandbox & machine access**\n\n- Standalone `skydive sandbox` command for direct access to an agent's sandbox.\n- `/sandbox` in the chat TUI — live PTY session and one-shot command execution.\n- Headless machine sharing via `skydive portal`, with self-registering portal grants.\n- `shareMachineDefault` config key for always-on portal sharing.\n\n**Chat TUI**\n\n- File pane (`ctrl+g`) with Changes and Files tabs: a shared file tree plus source viewer and a workspace browser, mouse-resizable and responsive to terminal size.\n- Agent todo list rendered in the chat TUI, above the composer, mirroring the web chat's todo card.\n- Fuzzy finder in the conversation and agent pickers.\n- Slash-command autocomplete menu.\n- Paste or drag-and-drop any file into the composer; paste clipboard images with Cmd+V.\n- Run local shell commands with `!` in the composer.\n- Conversation recaps, streamed live title updates, and per-agent attribution on assistant turns.\n- Working timer rolls up into minutes and hours.\n- Conversation picker paginates past 50 conversations and shows only your own conversations.\n- Esc leaves a live run; typing `exit` quits the chat.\n- Cursor Dark theme.\n- Picker rows no longer overlap when a conversation title contains a newline, tab, or control character.\n\n**Headless & scripting**\n\n- Resume a conversation by id.\n- `conversations list` and `conversations show` for transcript reads.\n- `messages get`, with run recovery keyed on message id.\n- Connect cards surface in headless `-p` mode so a driving agent never gets stuck.\n\n**Authentication**\n\n- `skydive auth login` via the browser now auto-mints an API key, so one login yields both a chat session and a usable management credential. Management commands announce the key's pinned workspace when it drives them, so a workspace mismatch is visible at use time.\n- Workspace picker on the device authorization page.\n- Account and workspace identity shown in `auth status`.\n\n**Platform**\n\n- Standalone binary builds compiling the CLI into a per-target executable.\n- Interactive workspace switcher; management commands follow the active workspace.\n- Terminal host integrations and agent notifications.\n\n### Fixed\n\n- Transcript errors collapse to one line, click to expand (REST and portal errors keep their full body).\n- Dragged/pasted image file paths attach the file instead of inserting path text, including macOS paths with literal parentheses.\n- Bare URLs in chat markdown are hyperlinked so they survive text wrap.\n- Composer draft is preserved across TUI overlays.\n- Relative connect links resolve before opening the browser.\n- Numbered markdown headings render colored in the TUI.\n- Chat transcript pages by 75% of a screen; picker rows stay on one line.\n- Run starts push to the TUI over the conversation stream.\n- Security: remediated high-severity dependency findings and cleared tar/shell-quote CVEs.\n\n## [0.1.0] - 2026-07-21\n\nInitial public release: `skydive chat` TUI, agent and conversation management,\ndevice authorization, and headless `-p` mode.\n";
+const CHANGELOG_MD = "# Changelog\n\nAll notable changes to the Skydive CLI are documented here.\n\nThe format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),\nand this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).\n\n## [Unreleased]\n\n## [0.3.0] - 2026-08-04\n\n### Added\n\n**Chat TUI**\n\n- `/fork` slash command to fork a conversation at any point and continue in a new thread.\n- `/conversation` switches threads from inside a live session.\n- `/compact` triggers manual conversation compaction.\n- `/portal` and `/copy` slash commands.\n- Archive the current conversation from the chat TUI.\n- `--new` flag on `skydive chat` to start a fresh conversation.\n- Debounced server-side conversation search in the picker, with title matches ranked first.\n- File review pane orientation toggle, and review comments in the file pane.\n- Pinned plan card controls and a jump-to-latest hint.\n- Terminal title (OSC) follows the live conversation title on every screen; inside cmux the workspace is renamed too, and linked PRs are pushed to the cmux sidebar.\n- Every participating agent shows in the conversation list; connect cards each have their own identity, and ctrl+r asks which connect card to act on.\n- Colored Skydive splash art in `skydive --help` and the TUI pickers.\n- New-agent name prefilled from the server's suggestion.\n\n**CLI & platform**\n\n- `skydive update` self-updater, with an update notice when a new version is available.\n- Shell completions for bash, zsh, and fish via `completion install`.\n- Portal daemon: one connection per host with per-conversation working directories.\n- Agent-led coding-agent import (`skydive import`).\n- Per-workspace scoping on the REST client, and cross-org `--agent <uuid>` auto-switches workspace.\n- `skydive-beta` wrapper for the canary channel.\n\n### Fixed\n\n- `skydive update` no longer claims an update is available on every npm install.\n- Chat memory is bounded (payload clamps + windowed rows) with a memory watchdog and OOM diagnostic report; transcript rows are memoized so streaming stops re-rendering the whole chat.\n- Chat-send failures map to real error messages.\n- Notification and sidebar previews use the last text block of the reply and strip inline markdown.\n- Picker rows no longer overlap when a conversation title contains a newline, tab, or control character.\n- Sending to non-web channel conversations is blocked in the TUI.\n- GitHub bot connect opens on the web front door, not api.skydive.com.\n- TUI activity counter times from the run, not the screen.\n\n## [0.2.0] - 2026-07-29\n\n### Added\n\n**Sandbox & machine access**\n\n- Standalone `skydive sandbox` command for direct access to an agent's sandbox.\n- `/sandbox` in the chat TUI — live PTY session and one-shot command execution.\n- Headless machine sharing via `skydive portal`, with self-registering portal grants.\n- `shareMachineDefault` config key for always-on portal sharing.\n\n**Chat TUI**\n\n- File pane (`ctrl+g`) with Changes and Files tabs: a shared file tree plus source viewer and a workspace browser, mouse-resizable and responsive to terminal size.\n- Agent todo list rendered in the chat TUI, above the composer, mirroring the web chat's todo card.\n- Fuzzy finder in the conversation and agent pickers.\n- Slash-command autocomplete menu.\n- Paste or drag-and-drop any file into the composer; paste clipboard images with Cmd+V.\n- Run local shell commands with `!` in the composer.\n- Conversation recaps, streamed live title updates, and per-agent attribution on assistant turns.\n- Working timer rolls up into minutes and hours.\n- Conversation picker paginates past 50 conversations and shows only your own conversations.\n- Esc leaves a live run; typing `exit` quits the chat.\n- Cursor Dark theme.\n- Picker rows no longer overlap when a conversation title contains a newline, tab, or control character.\n\n**Headless & scripting**\n\n- Resume a conversation by id.\n- `conversations list` and `conversations show` for transcript reads.\n- `messages get`, with run recovery keyed on message id.\n- Connect cards surface in headless `-p` mode so a driving agent never gets stuck.\n\n**Authentication**\n\n- `skydive auth login` via the browser now auto-mints an API key, so one login yields both a chat session and a usable management credential. Management commands announce the key's pinned workspace when it drives them, so a workspace mismatch is visible at use time.\n- Workspace picker on the device authorization page.\n- Account and workspace identity shown in `auth status`.\n\n**Platform**\n\n- Standalone binary builds compiling the CLI into a per-target executable.\n- Interactive workspace switcher; management commands follow the active workspace.\n- Terminal host integrations and agent notifications.\n\n### Fixed\n\n- Transcript errors collapse to one line, click to expand (REST and portal errors keep their full body).\n- Dragged/pasted image file paths attach the file instead of inserting path text, including macOS paths with literal parentheses.\n- Bare URLs in chat markdown are hyperlinked so they survive text wrap.\n- Composer draft is preserved across TUI overlays.\n- Relative connect links resolve before opening the browser.\n- Numbered markdown headings render colored in the TUI.\n- Chat transcript pages by 75% of a screen; picker rows stay on one line.\n- Run starts push to the TUI over the conversation stream.\n- Security: remediated high-severity dependency findings and cleared tar/shell-quote CVEs.\n\n## [0.1.0] - 2026-07-21\n\nInitial public release: `skydive chat` TUI, agent and conversation management,\ndevice authorization, and headless `-p` mode.\n";
 
 //#endregion
 //#region src/whats-new.ts

package/dist/js/{boot-DhorgAxS.mjs → boot-Bs-IF23f.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as setActiveWorkspace, S as listWorkspaces, a as WORDMARK, b as getActiveWorkspaceId, c as applyTheme, d as noColorRequested, f as theme, g as themeVersion, h as themeModeFromColorFgBg, i as MARK_CELLS, l as findTheme, m as themeMode, n as buildCrashReport, p as themeForMode, r as writeCrashReport, s as DEFAULT_THEME_ID, t as installCrashHandler, u as monoTheme, v as themesForMode } from "./install-Cv3sBZxr.mjs";
+import { C as setActiveWorkspace, S as listWorkspaces, a as WORDMARK, b as getActiveWorkspaceId, c as applyTheme, d as noColorRequested, f as theme, g as themeVersion, h as themeModeFromColorFgBg, i as MARK_CELLS, l as findTheme, m as themeMode, n as buildCrashReport, p as themeForMode, r as writeCrashReport, s as DEFAULT_THEME_ID, t as installCrashHandler, u as monoTheme, v as themesForMode } from "./install-DEZmJLGH.mjs";
 import { L as saveTheme, P as resolveWebUrl, T as getSavedTheme, c as cardActionErrorMessage, d as reconcileMaskedInput, f as resolveConnectUrl, i as resolveAgent, l as parseExternalOauthConnectParams, m as specKeyFor, p as parseConnectCard, s as MASK_CHAR, u as parseOauthConnectParams, v as DEFAULT_API_URL, w as getReviewStateDir, x as getConfigPath, y as DEFAULT_APP_URL } from "./print-Cd-bVSEJ.mjs";
 import { a as errorMessage, i as sendErrorMessage, n as createRestClient, o as isRecord, r as errorDetail, t as HttpError } from "./rest-BlN_uWmL.mjs";
 import { t as PortalClient } from "./client-Dc7GZ3PG.mjs";
@@ -16,7 +16,7 @@ import { execFile, spawn } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { connect, createConnection } from "node:net";
 import { access, appendFile, mkdir, mkdtemp, readFile, readdir, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
-import { MarkdownRenderable, RenderableEvents, StyledText, SyntaxStyle, createCliRenderer, decodePasteBytes, detectLinks, fg, link } from "@opentui/core";
+import { MarkdownRenderable, RenderableEvents, StyledText, SyntaxStyle, addDefaultParsers, createCliRenderer, decodePasteBytes, detectLinks, fg, link } from "@opentui/core";
 import { createRoot, extend, useKeyboard, usePaste, useRenderer, useTerminalDimensions } from "@opentui/react";
 import { createContext, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { create } from "zustand";
@@ -3056,8 +3056,13 @@ function syntaxStyleTable() {
 		"keyword.function": { fg: theme.syntaxMagenta },
 		"keyword.return": { fg: theme.syntaxMagenta },
 		"keyword.operator": { fg: theme.syntaxMagenta },
+		conditional: { fg: theme.syntaxMagenta },
+		repeat: { fg: theme.syntaxMagenta },
+		preproc: { fg: theme.syntaxMagenta },
 		string: { fg: theme.syntaxGreen },
 		"string.special": { fg: theme.syntaxTeal },
+		escape: { fg: theme.syntaxTeal },
+		"string.escape": { fg: theme.syntaxTeal },
 		character: { fg: theme.syntaxGreen },
 		comment: {
 			fg: theme.dim,
@@ -3066,10 +3071,13 @@ function syntaxStyleTable() {
 		function: { fg: theme.syntaxBlue },
 		"function.method": { fg: theme.syntaxBlue },
 		"function.builtin": { fg: theme.syntaxCyan },
+		method: { fg: theme.syntaxBlue },
 		variable: { fg: theme.fg },
 		"variable.builtin": { fg: theme.syntaxRed },
 		"variable.parameter": { fg: theme.syntaxYellow },
 		"variable.member": { fg: theme.syntaxTeal },
+		parameter: { fg: theme.syntaxYellow },
+		field: { fg: theme.syntaxTeal },
 		type: { fg: theme.syntaxCyan },
 		"type.builtin": { fg: theme.syntaxCyan },
 		constant: { fg: theme.syntaxOrange },
@@ -3084,6 +3092,7 @@ function syntaxStyleTable() {
 		"punctuation.bracket": { fg: theme.muted },
 		"punctuation.delimiter": { fg: theme.muted },
 		"punctuation.special": { fg: theme.syntaxCyan },
+		delimiter: { fg: theme.muted },
 		constructor: { fg: theme.syntaxBlue },
 		module: { fg: theme.syntaxBlue },
 		label: { fg: theme.syntaxCyan },
@@ -3480,10 +3489,16 @@ function trimCommonIndent(hunks) {
 	for (const hunk of hunks) hunk.lines = hunk.lines.map((line) => isContentLine(line) ? line[0] + line.slice(1 + min) : line);
 }
 /**
-* OpenTUI 0.2.15 bundles tree-sitter parsers for javascript(+react),
-* typescript(+react), markdown, and zig only — anything else renders
-* unhighlighted (but still red/green). Returning undefined skips the
-* highlight pass entirely instead of asking for a parser that isn't there.
+* Maps a file extension to the tree-sitter filetype used to highlight it in
+* diffs and the file/review pane. OpenTUI bundles parsers for
+* javascript(+react), typescript(+react), markdown, and zig; the rest are
+* registered by ./grammars. An extension absent here returns
+* undefined, which skips the highlight pass (the diff still renders red/green)
+* rather than asking the client for a parser it doesn't have.
+*
+* Keep the filetype values in sync with the canonical `filetype`/`aliases`
+* registered in ./grammars/grammars.ts — an extension mapping to a filetype no
+* parser is registered for just renders plain.
 */
 const FILETYPE_BY_EXT = {
 	ts: "typescript",
@@ -3496,7 +3511,34 @@ const FILETYPE_BY_EXT = {
 	jsx: "javascriptreact",
 	md: "markdown",
 	markdown: "markdown",
-	zig: "zig"
+	zig: "zig",
+	py: "python",
+	pyi: "python",
+	pyw: "python",
+	sh: "bash",
+	bash: "bash",
+	zsh: "bash",
+	go: "go",
+	rs: "rust",
+	c: "c",
+	h: "c",
+	cpp: "cpp",
+	cxx: "cpp",
+	cc: "cpp",
+	hpp: "cpp",
+	hxx: "cpp",
+	hh: "cpp",
+	java: "java",
+	rb: "ruby",
+	css: "css",
+	html: "html",
+	htm: "html",
+	json: "json",
+	jsonc: "json",
+	yaml: "yaml",
+	yml: "yaml",
+	toml: "toml",
+	lua: "lua"
 };
 function filetypeForPath(filePath) {
 	const base = filePath.split("/").pop() ?? filePath;
@@ -11899,6 +11941,24 @@ var LinkifiedMarkdownRenderable = class extends MarkdownRenderable {
 	}
 };
 
+//#endregion
+//#region src/chat/tui/chunks/grammars/index.ts
+/**
+* Register the extra tree-sitter grammars (python, go, rust, bash, …) before
+* the renderer boots its tree-sitter client, so fenced code blocks and diffs
+* in those languages highlight instead of rendering as plain text.
+*
+* `addDefaultParsers` merges by filetype into the set the client registers on
+* init, so this must run BEFORE `createCliRenderer`. The grammar definitions
+* live in ./grammars.ts, which is externalized from the tsdown bundle (it
+* imports `.wasm`/`.scm` assets rolldown can't parse) — so we reach it through
+* a dynamic import that both Bun-runtime (npm) and the compiled binary resolve.
+*/
+async function registerGrammars() {
+	const { EXTRA_GRAMMARS } = await import("./chat/tui/chunks/grammars/grammars.js");
+	addDefaultParsers(EXTRA_GRAMMARS);
+}
+
 //#endregion
 //#region src/chat/memory-watchdog.ts
 const MB = 1024 * 1024;
@@ -12019,6 +12079,45 @@ function startMemoryWatchdog(opts = {}) {
 	};
 }
 
+//#endregion
+//#region src/chat/theme-boot.ts
+/**
+* How long the first paint waits for the terminal to report its background
+* colour via OSC 10/11.
+*
+* OpenTUI's own default is 1000ms, and `createCliRenderer` has already switched
+* to the alternate screen by the time we wait — so on a terminal that never
+* answers the query (no OSC theme support, or a passthrough that eats it) the
+* user watched a blank cleared screen for a flat second on every launch, which
+* measured as 68% of cold start. Bound it by our budget rather than the
+* dependency's: 20ms is a typical real answer, so 100ms is generous.
+*/
+const THEME_QUERY_GRACE_MS = 100;
+/**
+* Settle the theme for the first paint, and keep following the terminal after
+* it.
+*
+* Order is the whole point and is load-bearing:
+*
+* 1. Subscribe to `theme_mode` FIRST. It carries both a late OSC answer and
+*    every later system light/dark flip, so with the subscription in place,
+*    giving up on the query early can only cost a briefly-wrong first paint —
+*    never a permanently wrong theme.
+* 2. Apply the synchronous `COLORFGBG` sniff (iTerm2 and friends set it) so
+*    there is something correct to paint at t=0.
+* 3. Only then wait, briefly, for the real answer.
+*
+* Inverting 2 and 3 is the bug this replaced: `COLORFGBG` was consulted only
+* after the 1000ms timeout expired, i.e. we blocked the launch waiting for
+* information we already had.
+*/
+async function settleBootThemeMode({ source, applyThemeMode, graceMs = THEME_QUERY_GRACE_MS, env }) {
+	source.on("theme_mode", applyThemeMode);
+	applyThemeMode(themeModeFromColorFgBg(env) ?? "dark");
+	const answered = await source.waitForThemeMode(graceMs);
+	if (answered) applyThemeMode(answered);
+}
+
 //#endregion
 //#region src/chat/boot.tsx
 /**
@@ -12028,6 +12127,7 @@ function startMemoryWatchdog(opts = {}) {
 * dynamically imported and never loaded on the Node management path.
 */
 async function runChat({ appUrl, sessionToken, shareMachine, promptHistoryPath, theme: themeOverride, notifications, agentSelector, conversationId, newConversation, seedPrompt }) {
+	await registerGrammars();
 	const watchdog = startMemoryWatchdog();
 	installCrashHandler({ memoryProvider: () => watchdog.snapshot() });
 	const renderer = await createCliRenderer({ exitOnCtrlC: false });
@@ -12045,13 +12145,10 @@ async function runChat({ appUrl, sessionToken, shareMachine, promptHistoryPath,
 			themeId: monoTheme.id
 		});
 	} else if (themeOverride && findTheme(themeOverride)) store.lockTheme(themeOverride);
-	else {
-		const detected = await renderer.waitForThemeMode() ?? themeModeFromColorFgBg() ?? "dark";
-		store.setThemeMode(detected);
-		renderer.on("theme_mode", (mode) => {
-			useStore.getState().setThemeMode(mode);
-		});
-	}
+	else await settleBootThemeMode({
+		source: renderer,
+		applyThemeMode: (mode) => useStore.getState().setThemeMode(mode)
+	});
 	createRoot(renderer).render(/* @__PURE__ */ jsx(App, {
 		appUrl,
 		sessionToken,
@@ -12066,8 +12163,10 @@ async function runChat({ appUrl, sessionToken, shareMachine, promptHistoryPath,
 /** Open the same workspace picker used by the initial agent screen. */
 async function runWorkspacePicker({ appUrl, sessionToken }) {
 	const renderer = await createCliRenderer({ exitOnCtrlC: false });
-	const detected = await renderer.waitForThemeMode() ?? themeModeFromColorFgBg() ?? "dark";
-	useStore.getState().setThemeMode(detected);
+	await settleBootThemeMode({
+		source: renderer,
+		applyThemeMode: (mode) => useStore.getState().setThemeMode(mode)
+	});
 	const close = () => renderer.destroy();
 	createRoot(renderer).render(/* @__PURE__ */ jsx("box", {
 		style: {

package/dist/js/chat/tui/chunks/grammars/assets/bash.highlights.scm

@@ -0,0 +1,56 @@
+[
+  (string)
+  (raw_string)
+  (heredoc_body)
+  (heredoc_start)
+] @string
+
+(command_name) @function
+
+(variable_name) @property
+
+[
+  "case"
+  "do"
+  "done"
+  "elif"
+  "else"
+  "esac"
+  "export"
+  "fi"
+  "for"
+  "function"
+  "if"
+  "in"
+  "select"
+  "then"
+  "unset"
+  "until"
+  "while"
+] @keyword
+
+(comment) @comment
+
+(function_definition name: (word) @function)
+
+(file_descriptor) @number
+
+[
+  (command_substitution)
+  (process_substitution)
+  (expansion)
+]@embedded
+
+[
+  "$"
+  "&&"
+  ">"
+  ">>"
+  "<"
+  "|"
+] @operator
+
+(
+  (command (_) @constant)
+  (#match? @constant "^-")
+)

package/dist/js/chat/tui/chunks/grammars/assets/c.highlights.scm

@@ -0,0 +1,81 @@
+(identifier) @variable
+
+((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z\\d_]*$"))
+
+"break" @keyword
+"case" @keyword
+"const" @keyword
+"continue" @keyword
+"default" @keyword
+"do" @keyword
+"else" @keyword
+"enum" @keyword
+"extern" @keyword
+"for" @keyword
+"if" @keyword
+"inline" @keyword
+"return" @keyword
+"sizeof" @keyword
+"static" @keyword
+"struct" @keyword
+"switch" @keyword
+"typedef" @keyword
+"union" @keyword
+"volatile" @keyword
+"while" @keyword
+
+"#define" @keyword
+"#elif" @keyword
+"#else" @keyword
+"#endif" @keyword
+"#if" @keyword
+"#ifdef" @keyword
+"#ifndef" @keyword
+"#include" @keyword
+(preproc_directive) @keyword
+
+"--" @operator
+"-" @operator
+"-=" @operator
+"->" @operator
+"=" @operator
+"!=" @operator
+"*" @operator
+"&" @operator
+"&&" @operator
+"+" @operator
+"++" @operator
+"+=" @operator
+"<" @operator
+"==" @operator
+">" @operator
+"||" @operator
+
+"." @delimiter
+";" @delimiter
+
+(string_literal) @string
+(system_lib_string) @string
+
+(null) @constant
+(number_literal) @number
+(char_literal) @number
+
+(field_identifier) @property
+(statement_identifier) @label
+(type_identifier) @type
+(primitive_type) @type
+(sized_type_specifier) @type
+
+(call_expression
+  function: (identifier) @function)
+(call_expression
+  function: (field_expression
+    field: (field_identifier) @function))
+(function_declarator
+  declarator: (identifier) @function)
+(preproc_function_def
+  name: (identifier) @function.special)
+
+(comment) @comment

package/dist/js/chat/tui/chunks/grammars/assets/cpp.highlights.scm

@@ -0,0 +1,70 @@
+; Functions
+
+(call_expression
+  function: (qualified_identifier
+    name: (identifier) @function))
+
+(template_function
+  name: (identifier) @function)
+
+(template_method
+  name: (field_identifier) @function)
+
+(template_function
+  name: (identifier) @function)
+
+(function_declarator
+  declarator: (qualified_identifier
+    name: (identifier) @function))
+
+(function_declarator
+  declarator: (field_identifier) @function)
+
+; Types
+
+((namespace_identifier) @type
+ (#match? @type "^[A-Z]"))
+
+(auto) @type
+
+; Constants
+
+(this) @variable.builtin
+(null "nullptr" @constant)
+
+; Keywords
+
+[
+ "catch"
+ "class"
+ "co_await"
+ "co_return"
+ "co_yield"
+ "constexpr"
+ "constinit"
+ "consteval"
+ "delete"
+ "explicit"
+ "final"
+ "friend"
+ "mutable"
+ "namespace"
+ "noexcept"
+ "new"
+ "override"
+ "private"
+ "protected"
+ "public"
+ "template"
+ "throw"
+ "try"
+ "typename"
+ "using"
+ "concept"
+ "requires"
+ "virtual"
+] @keyword
+
+; Strings
+
+(raw_string_literal) @string

package/dist/js/chat/tui/chunks/grammars/assets/css.highlights.scm

@@ -0,0 +1,76 @@
+(comment) @comment
+
+(tag_name) @tag
+(nesting_selector) @tag
+(universal_selector) @tag
+
+"~" @operator
+">" @operator
+"+" @operator
+"-" @operator
+"*" @operator
+"/" @operator
+"=" @operator
+"^=" @operator
+"|=" @operator
+"~=" @operator
+"$=" @operator
+"*=" @operator
+
+"and" @operator
+"or" @operator
+"not" @operator
+"only" @operator
+
+(attribute_selector (plain_value) @string)
+
+((property_name) @variable
+ (#match? @variable "^--"))
+((plain_value) @variable
+ (#match? @variable "^--"))
+
+(class_name) @property
+(id_name) @property
+(namespace_name) @property
+(property_name) @property
+(feature_name) @property
+
+(pseudo_element_selector (tag_name) @attribute)
+(pseudo_class_selector (class_name) @attribute)
+(attribute_name) @attribute
+
+(function_name) @function
+
+"@media" @keyword
+"@import" @keyword
+"@charset" @keyword
+"@namespace" @keyword
+"@supports" @keyword
+"@keyframes" @keyword
+(at_keyword) @keyword
+(to) @keyword
+(from) @keyword
+(important) @keyword
+
+(string_value) @string
+(color_value) @string.special
+
+(integer_value) @number
+(float_value) @number
+(unit) @type
+
+[
+  "#"
+  ","
+  "."
+  ":"
+  "::"
+  ";"
+] @punctuation.delimiter
+
+[
+  "{"
+  ")"
+  "("
+  "}"
+] @punctuation.bracket