skydive-cli 0.3.0 → 0.4.0

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

@@ -0,0 +1,79 @@
+(boolean_scalar) @boolean
+
+(null_scalar) @constant.builtin
+
+[
+  (double_quote_scalar)
+  (single_quote_scalar)
+  (block_scalar)
+  (string_scalar)
+] @string
+
+[
+  (integer_scalar)
+  (float_scalar)
+] @number
+
+(comment) @comment
+
+[
+  (anchor_name)
+  (alias_name)
+] @label
+
+(tag) @type
+
+[
+  (yaml_directive)
+  (tag_directive)
+  (reserved_directive)
+] @attribute
+
+(block_mapping_pair
+  key: (flow_node
+    [
+      (double_quote_scalar)
+      (single_quote_scalar)
+    ] @property))
+
+(block_mapping_pair
+  key: (flow_node
+    (plain_scalar
+      (string_scalar) @property)))
+
+(flow_mapping
+  (_
+    key: (flow_node
+      [
+        (double_quote_scalar)
+        (single_quote_scalar)
+      ] @property)))
+
+(flow_mapping
+  (_
+    key: (flow_node
+      (plain_scalar
+        (string_scalar) @property))))
+
+[
+  ","
+  "-"
+  ":"
+  ">"
+  "?"
+  "|"
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "*"
+  "&"
+  "---"
+  "..."
+] @punctuation.special

package/dist/js/chat/tui/chunks/grammars/grammars.ts

@@ -0,0 +1,146 @@
+/**
+ * Extra tree-sitter grammars for the chat TUI, on top of OpenTUI's five
+ * bundled ones (javascript, typescript, markdown, zig). Without these, every
+ * fenced code block and every diff/file-review pane in a non-js/ts language
+ * renders unhighlighted.
+ *
+ * Each entry pairs a prebuilt `.wasm` parser with its co-versioned
+ * `highlights.scm` query. `scripts/fetch-grammars.ts` vendors both from the
+ * same npm package into ./assets and records the versions in manifest.json —
+ * grammar and query MUST match or `Query` compilation throws at runtime.
+ *
+ * ── Why the `with { type: 'file' }` imports ──────────────────────────────
+ * The chat TUI always runs under Bun (the `chat` command re-execs itself
+ * under Bun before it touches OpenTUI). Under Bun these imports resolve to a
+ * real filesystem path in dev, and `bun build --compile` embeds each asset
+ * into the binary's virtual filesystem and rewrites the path to `/$bunfs`.
+ * OpenTUI loads its own bundled grammars exactly this way.
+ *
+ * Rolldown (tsdown, the npm build) CANNOT parse `.wasm`/`.scm` as modules, so
+ * this file is externalized in tsdown.config.mts and copied verbatim into
+ * dist/js/chat/tui/chunks/grammars/ alongside its assets; the bundled
+ * bin.mjs reaches it through a dynamic import that Bun resolves at runtime.
+ * Keep every asset reference a static `with { type: 'file' }` import so the
+ * compiled binary discovers and embeds them — a runtime `Bun.file(path)` on
+ * a computed path would not be embedded.
+ */
+import type { FiletypeParserOptions } from '@opentui/core';
+
+import python_wasm from './assets/python.wasm' with { type: 'file' };
+import python_scm from './assets/python.highlights.scm' with { type: 'file' };
+import bash_wasm from './assets/bash.wasm' with { type: 'file' };
+import bash_scm from './assets/bash.highlights.scm' with { type: 'file' };
+import go_wasm from './assets/go.wasm' with { type: 'file' };
+import go_scm from './assets/go.highlights.scm' with { type: 'file' };
+import rust_wasm from './assets/rust.wasm' with { type: 'file' };
+import rust_scm from './assets/rust.highlights.scm' with { type: 'file' };
+import c_wasm from './assets/c.wasm' with { type: 'file' };
+import c_scm from './assets/c.highlights.scm' with { type: 'file' };
+import cpp_wasm from './assets/cpp.wasm' with { type: 'file' };
+import cpp_scm from './assets/cpp.highlights.scm' with { type: 'file' };
+import java_wasm from './assets/java.wasm' with { type: 'file' };
+import java_scm from './assets/java.highlights.scm' with { type: 'file' };
+import ruby_wasm from './assets/ruby.wasm' with { type: 'file' };
+import ruby_scm from './assets/ruby.highlights.scm' with { type: 'file' };
+import css_wasm from './assets/css.wasm' with { type: 'file' };
+import css_scm from './assets/css.highlights.scm' with { type: 'file' };
+import html_wasm from './assets/html.wasm' with { type: 'file' };
+import html_scm from './assets/html.highlights.scm' with { type: 'file' };
+import json_wasm from './assets/json.wasm' with { type: 'file' };
+import json_scm from './assets/json.highlights.scm' with { type: 'file' };
+import yaml_wasm from './assets/yaml.wasm' with { type: 'file' };
+import yaml_scm from './assets/yaml.highlights.scm' with { type: 'file' };
+import toml_wasm from './assets/toml.wasm' with { type: 'file' };
+import toml_scm from './assets/toml.highlights.scm' with { type: 'file' };
+import lua_wasm from './assets/lua.wasm' with { type: 'file' };
+import lua_scm from './assets/lua.highlights.scm' with { type: 'file' };
+
+/**
+ * `aliases` are the alternate names a code fence or file extension may use
+ * for the language (```sh → bash, ```py → python). OpenTUI's markdown
+ * injection resolver looks up a fence's info-string against each parser's
+ * registered aliases, so listing them here is what makes ```sh highlight.
+ * The canonical `filetype` need not be repeated in its own alias list.
+ */
+export const EXTRA_GRAMMARS: FiletypeParserOptions[] = [
+  {
+    filetype: 'python',
+    aliases: ['py', 'python3'],
+    wasm: python_wasm,
+    queries: { highlights: [python_scm] },
+  },
+  {
+    filetype: 'bash',
+    aliases: ['sh', 'shell', 'zsh', 'shellscript'],
+    wasm: bash_wasm,
+    queries: { highlights: [bash_scm] },
+  },
+  {
+    filetype: 'go',
+    aliases: ['golang'],
+    wasm: go_wasm,
+    queries: { highlights: [go_scm] },
+  },
+  {
+    filetype: 'rust',
+    aliases: ['rs'],
+    wasm: rust_wasm,
+    queries: { highlights: [rust_scm] },
+  },
+  {
+    filetype: 'c',
+    aliases: ['h'],
+    wasm: c_wasm,
+    queries: { highlights: [c_scm] },
+  },
+  {
+    filetype: 'cpp',
+    aliases: ['c++', 'cc', 'cxx', 'hpp', 'hxx', 'hh'],
+    wasm: cpp_wasm,
+    queries: { highlights: [cpp_scm] },
+  },
+  {
+    filetype: 'java',
+    wasm: java_wasm,
+    queries: { highlights: [java_scm] },
+  },
+  {
+    filetype: 'ruby',
+    aliases: ['rb'],
+    wasm: ruby_wasm,
+    queries: { highlights: [ruby_scm] },
+  },
+  {
+    filetype: 'css',
+    wasm: css_wasm,
+    queries: { highlights: [css_scm] },
+  },
+  {
+    filetype: 'html',
+    aliases: ['htm'],
+    wasm: html_wasm,
+    queries: { highlights: [html_scm] },
+  },
+  {
+    filetype: 'json',
+    aliases: ['jsonc'],
+    wasm: json_wasm,
+    queries: { highlights: [json_scm] },
+  },
+  {
+    filetype: 'yaml',
+    aliases: ['yml'],
+    wasm: yaml_wasm,
+    queries: { highlights: [yaml_scm] },
+  },
+  {
+    filetype: 'toml',
+    wasm: toml_wasm,
+    queries: { highlights: [toml_scm] },
+  },
+  {
+    filetype: 'lua',
+    wasm: lua_wasm,
+    queries: { highlights: [lua_scm] },
+  },
+];

package/dist/js/{client-Dc7GZ3PG.mjs → client-CKzK-12y.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as errorMessage, t as HttpError } from "./rest-BlN_uWmL.mjs";
+import { a as errorMessage, t as HttpError } from "./rest-imDZZGQA.mjs";
 import os from "node:os";
 import { z } from "zod";
 import { spawn } from "node:child_process";

package/dist/js/client-D6apKmV0.mjs

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import "./rest-imDZZGQA.mjs";
+import "./billing-blocked-CwfG1BTR.mjs";
+import { t as PortalClient } from "./client-CKzK-12y.mjs";
+
+export { PortalClient };

package/dist/js/daemon-BADmpJAs.mjs

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+import "./rest-imDZZGQA.mjs";
+import "./billing-blocked-CwfG1BTR.mjs";
+import "./client-CKzK-12y.mjs";
+import { a as runPortalDaemon, i as queryDaemonStatus, n as ensureDaemonRunning, o as stopDaemon, r as isDaemonListening, t as PortalDaemon } from "./daemon-CaFz7Wtw.mjs";
+
+export { runPortalDaemon };

package/dist/js/{daemon-Co4CtpXZ.mjs → daemon-CaFz7Wtw.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { o as isRecord } from "./rest-BlN_uWmL.mjs";
-import { t as PortalClient } from "./client-Dc7GZ3PG.mjs";
+import { o as isRecord } from "./rest-imDZZGQA.mjs";
+import { t as PortalClient } from "./client-CKzK-12y.mjs";
 import os from "node:os";
 import path from "node:path";
 import { z } from "zod";

package/dist/js/{install-CMYBFvR2.mjs → install-Ba-UTi-l.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { x as getConfigPath } from "./print-Cd-bVSEJ.mjs";
+import { S as getConfigPath } from "./print-X2N5wJ5l.mjs";
 import os from "node:os";
 import path from "node:path";
 import { err, ok } from "neverthrow";
@@ -8,7 +8,7 @@ import fs from "node:fs";
 
 //#region package.json
 var name = "skydive-cli";
-var version$1 = "0.3.0";
+var version$1 = "0.4.0";
 
 //#endregion
 //#region src/auth/organization.ts

package/dist/js/{print-CPCFci60.mjs → print-BXNq9UxE.mjs}

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-import { a as runPrint, i as resolveAgent, n as messageGet, o as toPrintError, r as readStdin, t as collectRunText } from "./print-Cd-bVSEJ.mjs";
-import "./rest-BlN_uWmL.mjs";
+import { a as runPrint, i as resolveAgent, n as messageGet, o as toPrintError, r as readStdin, t as collectRunText } from "./print-X2N5wJ5l.mjs";
+import "./rest-imDZZGQA.mjs";
+import "./billing-blocked-CwfG1BTR.mjs";
 
 export { messageGet, readStdin, resolveAgent, runPrint };

package/dist/js/{print-Cd-bVSEJ.mjs → print-X2N5wJ5l.mjs}

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-import { a as errorMessage, i as sendErrorMessage, n as createRestClient, o as isRecord, t as HttpError } from "./rest-BlN_uWmL.mjs";
+import { a as errorMessage, i as sendErrorMessage, n as createRestClient, o as isRecord, t as HttpError } from "./rest-imDZZGQA.mjs";
+import { i as billingBlockedOutcomeFromSendResponse, n as BillingBlockedError } from "./billing-blocked-CwfG1BTR.mjs";
 import path from "node:path";
 import Conf from "conf";
 import { err, ok } from "neverthrow";
@@ -153,6 +154,21 @@ function resolveSession(opts) {
 		appUrl
 	});
 }
+function resolveChatAuth(opts) {
+	const session = resolveSession({ appUrl: opts.appUrl });
+	if (session.isOk()) return ok({
+		token: session.value.sessionToken,
+		appUrl: session.value.appUrl,
+		kind: "session"
+	});
+	const apiKey = process.env["SKYDIVE_API_KEY"] ?? store.get("apiKey");
+	if (apiKey) return ok({
+		token: apiKey,
+		appUrl: process.env["SKYDIVE_APP_URL"] ?? opts.appUrl ?? store.get("apiUrl") ?? process.env["SKYDIVE_API_URL"] ?? DEFAULT_APP_URL,
+		kind: "api-key"
+	});
+	return err({ message: "Not signed in. Run `skydive auth login` first." });
+}
 function saveSession(session) {
 	store.set("sessionToken", session.sessionToken);
 	store.set("sessionObtainedAt", (/* @__PURE__ */ new Date()).toISOString());
@@ -175,6 +191,10 @@ function saveTheme(mode, themeId) {
 function getShareMachineDefault() {
 	return store.get("shareMachineDefault") ?? false;
 }
+/** Test-only setter; production writes happen by editing config.json. */
+function saveShareMachineDefault(value) {
+	store.set("shareMachineDefault", value);
+}
 /**
 * Whether the update check is disabled via config.json (`"updateCheck":
 * false`). The persistent counterpart to the SKYDIVE_NO_UPDATE_CHECK /
@@ -184,6 +204,52 @@ function getShareMachineDefault() {
 function getUpdateCheckDisabled() {
 	return store.get("updateCheck") === false;
 }
+/** Test-only setter; production writes happen by editing config.json. */
+function saveUpdateCheck(value) {
+	if (value === void 0) {
+		store.delete("updateCheck");
+		return;
+	}
+	store.set("updateCheck", value);
+}
+function parseBoolean(raw) {
+	const v = raw.trim().toLowerCase();
+	if ([
+		"true",
+		"1",
+		"yes",
+		"on"
+	].includes(v)) return ok(true);
+	if ([
+		"false",
+		"0",
+		"no",
+		"off"
+	].includes(v)) return ok(false);
+	return err(`Expected a boolean (true/false), got "${raw}".`);
+}
+const PREFERENCES = [{
+	key: "shareMachineDefault",
+	type: "boolean",
+	describe: "Share this machine over the portal on `skydive chat` launch, as if --share-machine were passed. Default false.",
+	read: () => getShareMachineDefault(),
+	isSet: () => store.has("shareMachineDefault"),
+	parse: parseBoolean,
+	write: (value) => saveShareMachineDefault(value),
+	clear: () => store.delete("shareMachineDefault")
+}, {
+	key: "updateCheck",
+	type: "boolean",
+	describe: "Run the daily background update check and its \"Update available\" notice. Set false to disable. Default true.",
+	read: () => !getUpdateCheckDisabled(),
+	isSet: () => store.has("updateCheck"),
+	parse: parseBoolean,
+	write: (value) => saveUpdateCheck(value),
+	clear: () => store.delete("updateCheck")
+}];
+function getPreference(key) {
+	return PREFERENCES.find((p) => p.key === key);
+}
 
 //#endregion
 //#region src/chat/tui/chat/card.ts
@@ -557,6 +623,16 @@ async function runPrint({ appUrl, sessionToken, prompt, agentSelector, conversat
 *    actionable copy the interactive TUI shows instead of an obtuse blob.
 */
 function toPrintError(err, messageId) {
+	if (err instanceof HttpError) {
+		const billing = billingBlockedOutcomeFromSendResponse({
+			status: err.status,
+			body: err.body
+		});
+		if (billing) return new BillingBlockedError(billing, {
+			partialText: null,
+			messageId: messageId ?? null
+		});
+	}
 	if (err instanceof HttpError && err.status >= 500) {
 		const recovery = messageId ? ` The run may still be completing server-side. Do NOT blindly retry (it would re-run the agent). Fetch the result with: skydive messages get ${messageId}` : "";
 		return /* @__PURE__ */ new Error(`The request to Skydive timed out at the edge (HTTP ${err.status}).${recovery}`);
@@ -575,9 +651,11 @@ async function collectRunText({ client, appUrl, target, onText, messageIdForHint
 	let text = "";
 	const controller = new AbortController();
 	let streamError = null;
+	let billingBlocked = null;
 	const connectCards = [];
 	const onEvent = (event) => {
 		if (event.kind === "finished") {
+			if (event.outcome) billingBlocked = event.outcome;
 			if (event.error) streamError = event.error;
 			return;
 		}
@@ -608,6 +686,10 @@ async function collectRunText({ client, appUrl, target, onText, messageIdForHint
 	} catch (err) {
 		throw toPrintError(err, messageIdForHint);
 	}
+	if (billingBlocked) throw new BillingBlockedError(billingBlocked, {
+		partialText: text || null,
+		messageId: messageIdForHint
+	});
 	if (streamError) throw new Error(streamError);
 	return {
 		text,
@@ -677,4 +759,4 @@ async function readStdin() {
 }
 
 //#endregion
-export { resolveAppUrl as A, getPromptHistoryPath as C, getStoredApiKeyId as D, getShareMachineDefault as E, saveConfig as F, saveSession as I, saveTheme as L, resolveManagementAuth as M, resolveSession as N, getStoredApiKeyWorkspaceName as O, resolveWebUrl as P, setLastSeenVersion as R, getLastSeenVersion as S, getSavedTheme as T, API_KEY_PREFIX as _, runPrint as a, deleteConfig as b, cardActionErrorMessage as c, reconcileMaskedInput as d, resolveConnectUrl as f, API_KEY_FAMILY_PREFIX as g, API_KEYS_URL as h, resolveAgent as i, resolveConfig as j, getUpdateCheckDisabled as k, parseExternalOauthConnectParams as l, specKeyFor as m, messageGet as n, toPrintError as o, parseConnectCard as p, readStdin as r, MASK_CHAR as s, collectRunText as t, parseOauthConnectParams as u, DEFAULT_API_URL as v, getReviewStateDir as w, getConfigPath as x, DEFAULT_APP_URL as y };
+export { getStoredApiKeyWorkspaceName as A, saveTheme as B, getLastSeenVersion as C, getSavedTheme as D, getReviewStateDir as E, resolveManagementAuth as F, resolveSession as I, resolveWebUrl as L, resolveAppUrl as M, resolveChatAuth as N, getShareMachineDefault as O, resolveConfig as P, saveConfig as R, getConfigPath as S, getPromptHistoryPath as T, setLastSeenVersion as V, API_KEY_PREFIX as _, runPrint as a, PREFERENCES as b, cardActionErrorMessage as c, reconcileMaskedInput as d, resolveConnectUrl as f, API_KEY_FAMILY_PREFIX as g, API_KEYS_URL as h, resolveAgent as i, getUpdateCheckDisabled as j, getStoredApiKeyId as k, parseExternalOauthConnectParams as l, specKeyFor as m, messageGet as n, toPrintError as o, parseConnectCard as p, readStdin as r, MASK_CHAR as s, collectRunText as t, parseOauthConnectParams as u, DEFAULT_API_URL as v, getPreference as w, deleteConfig as x, DEFAULT_APP_URL as y, saveSession as z };

package/dist/js/{print-share-7qfpQtWK.mjs → print-share-D72CfWJk.mjs}

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

package/dist/js/{raw-pty-BcjbTjHJ.mjs → raw-pty-DAmb8uqt.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as SandboxStream } from "./client-DfcJFEbh.mjs";
+import { t as SandboxStream } from "./client-D8s9vY4p.mjs";
 
 //#region src/chat/sandbox/raw-pty.ts
 /**

package/dist/js/raw-pty-t5DC-e1T.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import "./client-D8s9vY4p.mjs";
+import { t as runRawPtyPassthrough } from "./raw-pty-DAmb8uqt.mjs";
+
+export { runRawPtyPassthrough };

package/dist/js/rest-Br2eFTlj.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import { i as sendErrorMessage, n as createRestClient, r as errorDetail, t as HttpError } from "./rest-imDZZGQA.mjs";
+import "./billing-blocked-CwfG1BTR.mjs";
+
+export { createRestClient };

package/dist/js/{rest-BlN_uWmL.mjs → rest-imDZZGQA.mjs}

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { a as billingBlockedOutcomeSchema } from "./billing-blocked-CwfG1BTR.mjs";
 import { z } from "zod";
 import { createParser } from "eventsource-parser";
 
@@ -82,6 +83,11 @@ function serverErrorMessage(body) {
 * line from the HTTP status when the body carried nothing usable. This keeps
 * new server-side error copy flowing through without a CLI change, while never
 * leaving the user staring at a bare status code.
+*
+* Billing-blocked (typed 402) is deliberately NOT handled here: both callers
+* detect it first via billingBlockedOutcomeFromSendResponse and render the
+* richer billing surface (system-notice row / distinct exit code), so this
+* stays a purely generic mapper.
 */
 function sendErrorMessage(err) {
 	if (!(err instanceof HttpError)) return `Couldn't reach Skydive (${err instanceof Error ? err.message : String(err)}). Check your connection and try again.`;
@@ -161,7 +167,8 @@ function createRestClient({ appUrl, sessionToken, workspaceId }) {
 					if (event.kind === "finished") finished = true;
 					onEvent(event.kind === "finished" ? {
 						...event,
-						error: event.error ?? null
+						error: event.error ?? null,
+						outcome: event.outcome ?? null
 					} : event);
 				} });
 				const decoder = new TextDecoder();
@@ -560,7 +567,8 @@ const runStreamEventSchema = z.union([z.object({
 }), z.object({
 	kind: z.literal("finished"),
 	status: z.string(),
-	error: z.string().nullish()
+	error: z.string().nullish(),
+	outcome: billingBlockedOutcomeSchema.nullish()
 })]);
 const streamErrorSchema = z.object({ error: z.string() });
 const conversationStreamEventSchema = z.discriminatedUnion("kind", [

package/package.json

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

package/dist/js/client-DuwxEDG4.mjs

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

package/dist/js/daemon-Ch_MSDmQ.mjs

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-import "./rest-BlN_uWmL.mjs";
-import "./client-Dc7GZ3PG.mjs";
-import { a as runPortalDaemon, i as queryDaemonStatus, n as ensureDaemonRunning, o as stopDaemon, r as isDaemonListening, t as PortalDaemon } from "./daemon-Co4CtpXZ.mjs";
-
-export { runPortalDaemon };

package/dist/js/raw-pty-ChUHav4d.mjs

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-import "./client-DfcJFEbh.mjs";
-import { t as runRawPtyPassthrough } from "./raw-pty-BcjbTjHJ.mjs";
-
-export { runRawPtyPassthrough };

package/dist/js/rest-CDTXCmUb.mjs

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-import { i as sendErrorMessage, n as createRestClient, r as errorDetail, t as HttpError } from "./rest-BlN_uWmL.mjs";
-
-export { createRestClient };