@unbound-app/cli 0.1.3 → 0.4.0

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import { cli, command } from "cleye";
 import { z } from "zod";
 import { existsSync, mkdirSync, readFileSync, readdirSync, watch, writeFileSync } from "node:fs";
-import { dirname, join, relative, resolve, sep } from "node:path";
+import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { ControllerClient } from "@unbound-app/debugger-protocol/controller";
 import { CONTROLLER_ENDPOINT_MARKER, DEFAULT_BRIDGE_PORT } from "@unbound-app/debugger-protocol";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -439,7 +439,8 @@ function scaffoldTemplate(from, to, tokens) {
 	mkdirSync(to, { recursive: true });
 	for (const entry of readdirSync(from, { withFileTypes: true })) {
 		const source = join(from, entry.name);
-		const target = join(to, entry.name === GITIGNORE_SOURCE ? ".gitignore" : substitute(entry.name, tokens));
+		const name = entry.name === GITIGNORE_SOURCE ? ".gitignore" : substitute(entry.name, tokens);
+		const target = join(to, name);
 		if (entry.isDirectory()) {
 			scaffoldTemplate(source, target, tokens);
 			continue;
@@ -583,12 +584,13 @@ const createCommand = {
 function printOutro(result) {
 	const kindDocs = `${DOCS_BASE_URL}/${result.kind}s/introduction`;
 	const manifestDocs = `${DOCS_BASE_URL}/addons/manifest`;
-	note([
+	const steps = [
 		`cd ${relative(process.cwd(), result.dir) || "."}`,
 		"ubd dev",
 		`Learn the ${result.kind} API: ${kindDocs}`,
 		`Manifest reference: ${manifestDocs}`
-	].join("\n"), "Next steps");
+	];
+	note(steps.join("\n"), "Next steps");
 	outro(`${result.name} ready.`);
 }
 //#endregion
@@ -767,13 +769,65 @@ const evalCommand = {
 //#endregion
 //#region src/lib/reload-transport.ts
 /**
-* The shipped transport: hot reload is not yet wired, so it only reports that the app must be
-* restarted for the rebuild to take effect. The real mechanism swaps this out without touching
-* `ubd dev`.
+* How long the watcher waits for a dropped device to reconnect before warning and dropping a reload.
+* Longer than a one-shot command's poll (`DEVICE_WAIT_TIMEOUT_MS`): a `ubd dev` session runs for
+* hours, and a backgrounded app or slept device can take a few seconds to redial the bridge.
 */
-const stubReloadTransport = { async reload(addon) {
-	process.stdout.write(`Rebuilt ${addon.id}, but hot reload is not yet available — restart the app to load it.\n`);
-} };
+const RECONNECT_WAIT_MS = 5e3;
+/**
+* @description Builds the real hot-reload transport over the shared bridge controller. Each reload
+* reads the freshly built bundle and manifest from disk and pushes them to the device via
+* {@link ControllerClient.pushPlugin}. Theme hot reload isn't wired yet, so a theme is skipped with a
+* notice. If the device isn't connected it waits briefly for a reconnect, then warns and drops the
+* reload; any disk or transport failure is reported. Nothing here throws, so the watcher keeps running.
+* @param context A bearer of the bridge client shared by every command; its client dials on first use.
+* @param reconnectWaitMs How long to wait for a dropped device to reconnect before dropping a reload.
+* @returns A {@link ReloadTransport} bound to that context.
+*/
+function createReloadTransport(context, reconnectWaitMs = RECONNECT_WAIT_MS) {
+	return { async reload(addon) {
+		if (addon.kind !== "plugin") {
+			process.stdout.write(`Rebuilt ${addon.id}, but ${addon.kind} hot reload isn't available yet — restart the app to load it.\n`);
+			return;
+		}
+		const { client } = context;
+		if (!client.isDeviceConnected) await waitForDevice(client, reconnectWaitMs);
+		if (!client.isDeviceConnected) {
+			process.stderr.write(`Device not connected — skipping reload of ${addon.id}; save again once reconnected.\n`);
+			return;
+		}
+		try {
+			const { manifest, bundle } = readBuiltAddon(addon);
+			process.stdout.write(`Pushing ${addon.id}…\n`);
+			const result = await client.pushPlugin({
+				addonId: addon.id,
+				bundle,
+				manifest
+			});
+			if (result.ok) process.stdout.write(`Reloaded ${addon.id}.\n`);
+			else process.stderr.write(`Failed to reload ${addon.id}: ${result.error}\n`);
+		} catch (error) {
+			process.stderr.write(`Failed to reload ${addon.id}: ${error?.message ?? error}\n`);
+		}
+	} };
+}
+/**
+* @description Reads a built addon's manifest and bundle off disk. A static addon ships its files
+* as-is, so its bundle is the file named by `main` in its directory; a built addon's bundle is the
+* JavaScript the build emitted into the output directory, named after `main` with a `.js` extension.
+* @param addon The freshly built addon.
+* @returns The parsed manifest and the bundle source.
+*/
+function readBuiltAddon(addon) {
+	const manifest = JSON.parse(readFileSync(join(addon.dir, "manifest.json"), "utf8"));
+	const bundleName = addon.static ? manifest.main : basename(manifest.main).replace(/\.\w+$/, ".js");
+	const bundlePath = join(addon.output, bundleName);
+	if (!existsSync(bundlePath)) throw new Error(`Built bundle not found at ${bundlePath}. Hot reload expects the build to emit ${bundleName} into ${addon.output}.`);
+	return {
+		manifest,
+		bundle: readFileSync(bundlePath, "utf8")
+	};
+}
 //#endregion
 //#region src/lib/dev-server.ts
 /** How long file changes inside one addon settle before that addon rebuilds. */
@@ -866,7 +920,8 @@ function toBuiltAddon(addon) {
 		id: addon.id,
 		kind: addon.kind,
 		dir: addon.dir,
-		output: addon.output
+		output: addon.output,
+		static: addon.static
 	};
 }
 //#endregion
@@ -885,9 +940,9 @@ const commands = [
 			cli: true,
 			mcp: false
 		},
-		schema: z.object({}),
-		async handler() {
-			const server = new DevServer(loadConfig(), stubReloadTransport);
+		schema: z.object({ port: z.number().default(DEFAULT_BRIDGE_PORT).describe("The port the debugger bridge listens on.") }),
+		async handler(_input, context) {
+			const server = new DevServer(loadConfig(), createReloadTransport(context));
 			process.on("SIGINT", () => {
 				server.stop();
 				process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@unbound-app/cli",
-	"version": "0.1.3",
+	"version": "0.4.0",
 	"description": "The `ubd` command line for the Unbound client: evaluate on-device code and serve the debugger as an MCP.",
 	"author": {
 		"name": "Mario P.",
@@ -13,7 +13,7 @@
 		"directory": "packages/cli"
 	},
 	"bin": {
-		"ubd": "./dist/index.mjs"
+		"ubd": "dist/index.mjs"
 	},
 	"files": [
 		"dist",
@@ -27,15 +27,12 @@
 	"dependencies": {
 		"@clack/prompts": "^1.7.0",
 		"@modelcontextprotocol/sdk": "^1.29.0",
-		"@unbound-app/debugger-protocol": "0.1.3",
+		"@unbound-app/debugger-protocol": "0.4.0",
+		"@unbound-app/types": "0.4.0",
 		"cleye": "^1.3.4",
 		"picocolors": "^1.1.1",
 		"zod": "^4.0.0"
 	},
-	"devDependencies": {
-		"@types/bun": "latest",
-		"tsdown": "^0.22.9"
-	},
 	"peerDependencies": {
 		"typescript": "^5.9.3"
 	}