@rainbow-robotics/muscat-plugin-kit 0.1.2-dev.35 → 0.1.2-dev.37

package/cli/bin/muscat-pk.mjs

@@ -21,7 +21,7 @@ Usage: muscat-pk <command> [options]
 Commands:
   new [dir]        Scaffold a new plugin project (prompts: author, email, description, type, front-package-manager)
   type change      Switch backend type (python | cpp | ros2-python | ros2-cpp)
-  build            Build + lock deps + vendor wheels + zip (--no-zip: skip zip, --no-lock: skip python lock/vendor, --arch x86_64|aarch64|both)
+  build            Build + lock deps + vendor wheels + zip (--no-zip: skip zip, --no-lock: skip python lock/vendor, --arch amd64|arm64|both)
   dev              Run Socket.IO bridge, dev:ui, and dev:back together
   dev:ui           Preview the plugin in a mini-Muscat (preview-host)
   dev:back         Run the plugin back end (python: watchfiles reload / ros2: Docker)

package/cli/src/build.mjs

@@ -14,8 +14,8 @@ import { createRequire } from "node:module";
 import { basename, dirname, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { execSync, spawnSync } from "node:child_process";
-import { ensureDocker, findPluginRoot, hasBin, humanSize, log } from "./util.mjs";
-import { assertManifest } from "./manifest.mjs";
+import { ensureDocker, findPluginRoot, hasBin, humanSize, log, parseArgs } from "./util.mjs";
+import { assertManifest, manifestRuntime } from "./manifest.mjs";
 
 // Find a usable node binary (for running vite as subprocess).
 function findNodeBin() {
@@ -60,14 +60,6 @@ function isMainBranch() {
   return branch === "main" || branch === "master";
 }
 
-function manifestRuntime(root) {
-  try {
-    return JSON.parse(readFileSync(resolve(root, "manifest.json"), "utf8")).runtime?.type ?? "python";
-  } catch {
-    return "python";
-  }
-}
-
 // For ros2 plugins, compile the colcon workspace inside the Jazzy + Python 3.12 container.
 // rclpy: arch-agnostic (pure Python) → dist/ros2_ws/install/ (built once)
 // rclcpp: arch-specific C++ binaries → dist/ros2_ws/install-{arch}/ per arch
@@ -280,18 +272,7 @@ export async function buildPlugin({ root, minify = false } = {}) {
   return { pluginRoot, distDir };
 }
 
-function dirSize(dir) {
-  let total = 0;
-  for (const entry of readdirSync(dir)) {
-    const full = resolve(dir, entry);
-    const st = statSync(full);
-    total += st.isDirectory() ? dirSize(full) : st.size;
-  }
-  return total;
-}
-
-// Recursively sum directory size, skipping subdirs in `skip` list (by name).
-function dirSizeExcluding(dir, skip = []) {
+function dirSize(dir, skip = []) {
   if (!existsSync(dir)) return 0;
   let total = 0;
   for (const entry of readdirSync(dir)) {
@@ -313,7 +294,7 @@ function dirSizeExcluding(dir, skip = []) {
 function calcInstalledSize(pluginRoot) {
   const distDir = resolve(pluginRoot, "dist");
 
-  const installedSize = dirSizeExcluding(distDir, ["wheels"]);
+  const installedSize = dirSize(distDir, ["wheels"]);
 
   // Write to root manifest.json
   const rootManifestPath = resolve(pluginRoot, "manifest.json");
@@ -369,9 +350,7 @@ function packZip(pluginRoot) {
  * @returns {Promise<string[]>} e.g. ['amd64'] | ['arm64'] | ['amd64','arm64']
  */
 async function promptArch(args = []) {
-  // --arch x86_64 | --arch aarch64 | --arch both
-  const archFlag = args.find((a) => a.startsWith("--arch="))?.slice(7)
-    ?? (args.includes("--arch") ? args[args.indexOf("--arch") + 1] : null);
+  const archFlag = parseArgs(args).arch ?? null;
   if (archFlag) {
     if (archFlag === "both") return ["amd64", "arm64"];
     if (archFlag === "amd64" || archFlag === "x86_64") return ["amd64"];

package/cli/src/check-package.mjs

@@ -1,29 +1,13 @@
-import { execFileSync } from "node:child_process";
-import { existsSync, readdirSync, statSync } from "node:fs";
+import { execSync } from "node:child_process";
+import { existsSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const root = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
-const roots = [resolve(root, "cli"), resolve(root, "preview-host")];
-
-function* mjsFiles(dir) {
-  for (const entry of readdirSync(dir)) {
-    const full = resolve(dir, entry);
-    const stat = statSync(full);
-    if (stat.isDirectory()) {
-      if (entry === "dist" || entry === "runtime" || entry === "templates") {
-        continue;
-      }
-      yield* mjsFiles(full);
-    } else if (entry.endsWith(".mjs")) {
-      yield full;
-    }
-  }
-}
-
-for (const dir of roots) {
-  if (!existsSync(dir)) continue;
-  for (const file of mjsFiles(dir)) {
-    execFileSync(process.execPath, ["--check", file], { stdio: "inherit" });
-  }
+for (const dir of ["cli", "preview-host"]) {
+  if (!existsSync(resolve(root, dir))) continue;
+  execSync(
+    `find ${dir} -name '*.mjs' ! -path '*/dist/*' ! -path '*/runtime/*' ! -path '*/templates/*' -exec node --check {} +`,
+    { cwd: root, stdio: "inherit" },
+  );
 }

package/cli/src/devBack.mjs

@@ -8,10 +8,10 @@
 //   ros2   : Jazzy + Python 3.12 container, colcon build, run the node, restart
 //            on source changes (rclcpp rebuilds on change).
 import { spawn, spawnSync } from "node:child_process";
-import { existsSync, readFileSync, watch } from "node:fs";
+import { existsSync, watch } from "node:fs";
 import { resolve } from "node:path";
 import { ensureDocker, findPluginRoot, log } from "./util.mjs";
-import { readManifest as readManifestSchema, validateManifest } from "./manifest.mjs";
+import { manifestRuntime, readManifest, validateManifest } from "./manifest.mjs";
 import {
   PYTHON_DEV_IMAGE,
   assertDockerReady as pyAssertDockerReady,
@@ -29,18 +29,6 @@ import {
   ensureImage as cppEnsureImage,
 } from "./cpp.mjs";
 
-function readManifest(root) {
-  try {
-    return JSON.parse(readFileSync(resolve(root, "manifest.json"), "utf8"));
-  } catch {
-    return {};
-  }
-}
-
-function manifestRuntime(root) {
-  return readManifest(root).runtime?.type ?? "python";
-}
-
 // ── python ────────────────────────────────────────────────────────────────────
 // Runs in a warm Ubuntu 24.04 + Python 3.12 container (matches the robot).
 // Under `muscat-pk dev`, it shares the bridge container's netns, so the SDK
@@ -245,7 +233,7 @@ function runCpp(root) {
 }
 
 function warnManifest(root) {
-  const manifest = readManifestSchema(root);
+  const manifest = readManifest(root);
   if (!manifest || Object.keys(manifest).length === 0) return;
   const errors = validateManifest(manifest);
   for (const e of errors) log.warn(`manifest.json: ${e}`);

package/cli/src/manifest.mjs

@@ -36,6 +36,10 @@ export function readManifest(root) {
   }
 }
 
+export function manifestRuntime(root) {
+  return readManifest(root)?.runtime?.type ?? "python";
+}
+
 function validateIcons(icons, errors) {
   if (icons === undefined || icons === null) {
     errors.push("icons is required");

package/cli/src/new.mjs

@@ -10,10 +10,9 @@ import {
   statSync,
   writeFileSync,
 } from "node:fs";
-import { createInterface } from "node:readline/promises";
 import { basename, resolve } from "node:path";
 import { rmSync } from "node:fs";
-import { hasBin, kitVersion, parseArgs, templatesDir, log } from "./util.mjs";
+import { hasBin, kitVersion, parseArgs, prompt, templatesDir, log } from "./util.mjs";
 
 // `--type` values map to a runtime descriptor. ros2 has a python (rclpy) and a
 // C++ (rclcpp) flavor; we expose them as distinct type choices for clarity.
@@ -41,14 +40,6 @@ export function runtimeForChoice(choice, slug) {
   }
 }
 
-async function prompt(question, fallback) {
-  if (!process.stdin.isTTY) return fallback;
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const answer = (await rl.question(question)).trim();
-  rl.close();
-  return answer || fallback;
-}
-
 export function applyTokens(dir, tokens) {
   for (const entry of readdirSync(dir)) {
     const full = resolve(dir, entry);

package/cli/src/ros2.mjs

@@ -76,6 +76,8 @@ export function colconBuild(root, { image = ROS2_DEV_IMAGE, symlink = false, arc
   const script = [
     "pip install -r requirements.txt --break-system-packages --ignore-installed -q || true",
     "cd ros2_ws",
+    // ponytail: rm only on cross-arch; same-arch dev rebuilds keep the cache
+    ...(arch ? ["rm -rf build"] : []),
     `colcon build ${flag} --install-base ${installBase}`.trim(),
   ].join(" && ");
   const label = arch

package/cli/src/type.mjs

@@ -3,9 +3,8 @@
 //   Adds the matching backend overlay; never deletes existing user code
 //   (e.g. ros2_ws/ or cpp/ are left in place when switching away).
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { createInterface } from "node:readline/promises";
 import { basename, resolve } from "node:path";
-import { findPluginRoot, log } from "./util.mjs";
+import { findPluginRoot, log, prompt } from "./util.mjs";
 import {
   TYPE_CHOICES,
   applyTokens,
@@ -17,14 +16,6 @@ import {
 
 const TYPES = Object.keys(TYPE_CHOICES);
 
-async function prompt(question, fallback) {
-  if (!process.stdin.isTTY) return fallback;
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const answer = (await rl.question(question)).trim();
-  rl.close();
-  return answer || fallback;
-}
-
 function readManifest(root) {
   const path = resolve(root, "manifest.json");
   if (!existsSync(path)) throw new Error(`manifest.json not found in ${root}`);

package/cli/src/update.mjs

@@ -10,12 +10,11 @@
 //
 // After updating the CLI itself, also bumps the plugin project's local deps
 // and migrates the project structure if it's outdated (src/ → ui/, root main.py → py/).
-import { createInterface } from "node:readline";
 import { execSync, spawn } from "node:child_process";
 import { chmodSync, copyFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join, resolve } from "node:path";
-import { findPluginRoot, KIT_PUBLISHED_NAME, kitVersion, log, parseArgs } from "./util.mjs";
+import { findPluginRoot, KIT_PUBLISHED_NAME, kitVersion, log, parseArgs, prompt } from "./util.mjs";
 
 const PLUGIN_UI_PACKAGE = "@rainbow-robotics/plugin-ui";
 const S3_BASE = "https://rainbow-deploy.s3.ap-northeast-2.amazonaws.com/muscat-plugin-kit";
@@ -135,13 +134,6 @@ function detectOldStructure(root) {
   return issues;
 }
 
-function prompt(question) {
-  return new Promise((resolve) => {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    rl.question(question, (answer) => { rl.close(); resolve(answer.trim()); });
-  });
-}
-
 async function migrateStructure(root, issues) {
   log.warn("This plugin project's structure is outdated:");
   for (const issue of issues) log.info("  • " + issue.desc);

package/cli/src/util.mjs

@@ -3,6 +3,7 @@ import { spawnSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { createInterface } from "node:readline/promises";
 
 /** True if an executable is on PATH (cross-platform). */
 export function hasBin(bin) {
@@ -65,6 +66,15 @@ export function parseArgs(args, { booleans = [] } = {}) {
   return out;
 }
 
+/** Prompt user for input. Returns trimmed answer or fallback (non-TTY or empty). */
+export async function prompt(question, fallback = "") {
+  if (!process.stdin.isTTY) return fallback;
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  const answer = (await rl.question(question)).trim();
+  rl.close();
+  return answer || fallback;
+}
+
 /** Walk up from cwd to find the plugin project root (has manifest.json). */
 export function findPluginRoot(start = process.cwd()) {
   let dir = resolve(start);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainbow-robotics/muscat-plugin-kit",
-  "version": "0.1.2-dev.35",
+  "version": "0.1.2-dev.37",
   "type": "module",
   "engines": {
     "node": ">=20"
@@ -31,7 +31,7 @@
     "@types/react-dom": "^19.0.4"
   },
   "dependencies": {
-    "@rainbow-robotics/preview-host": "0.1.2-dev.35",
+    "@rainbow-robotics/preview-host": "0.1.2-dev.37",
     "socket.io": "^4.8.1"
   },
   "optionalDependencies": {