@rainbow-robotics/muscat-plugin-kit 0.1.2-dev.15 → 0.1.2-dev.17

package/cli/src/build.mjs

@@ -147,7 +147,7 @@ const HOST_PROVIDED_EXTERNALS = [
 
 export async function buildPlugin({ root, minify = false } = {}) {
   const pluginRoot = root ?? findPluginRoot();
-  const entry = resolve(pluginRoot, "src/content.tsx");
+  const entry = resolve(pluginRoot, "ui/content.tsx");
   if (!existsSync(entry)) {
     throw new Error(`missing entry: ${entry}`);
   }
@@ -155,7 +155,7 @@ export async function buildPlugin({ root, minify = false } = {}) {
   rmSync(distDir, { recursive: true, force: true });
   mkdirSync(distDir, { recursive: true });
 
-  log.step("bundling src/content.tsx → dist/content.js");
+  log.step("bundling ui/content.tsx → dist/content.js");
   await buildWithFallback({
     entryPoints: [entry],
     outfile: resolve(distDir, "content.js"),
@@ -176,11 +176,22 @@ export async function buildPlugin({ root, minify = false } = {}) {
   // Generate sandbox.html — plugin authors don't manage this file.
   writeFileSync(resolve(distDir, "sandbox.html"), SANDBOX_HTML, "utf8");
   log.step("generated dist/sandbox.html");
+
   const assetsSrc = resolve(pluginRoot, "assets");
   if (existsSync(assetsSrc)) {
     cpSync(assetsSrc, resolve(distDir, "assets"), { recursive: true });
   }
 
+  // Backend runtime files — copy entire py/ into dist/, then requirements.txt from root.
+  const pySrc = resolve(pluginRoot, "py");
+  if (existsSync(pySrc)) {
+    cpSync(pySrc, distDir, { recursive: true });
+  }
+  const rootReqs = resolve(pluginRoot, "requirements.txt");
+  if (existsSync(rootReqs)) {
+    copyFileSync(rootReqs, resolve(distDir, "requirements.txt"));
+  }
+
   log.ok(`built → ${distDir}`);
   return { pluginRoot, distDir };
 }

package/cli/src/devBack.mjs

@@ -31,6 +31,7 @@ function manifestRuntime(root) {
 function runPython(root) {
   const venv = resolve(root, ".venv");
   const py = venvPython(venv);
+  const pyDir = resolve(root, "py");
 
   if (!existsSync(py)) {
     log.step("creating .venv…");
@@ -43,7 +44,7 @@ function runPython(root) {
       if (!is312) log.warn("python3.12 not found; using fallback (robot targets 3.12).");
       spawnSync(cmd[0], [...cmd.slice(1), "-m", "venv", venv], { cwd: root, stdio: "inherit" });
     } else {
-      throw new Error("Python not found (uv / conda / python3 none available). Install Python 3.12 to run the backend.");
+      throw new Error("Python not found (uv / conda / python3 none available). Install Python 3.12 to run the py.");
     }
   }
 
@@ -53,9 +54,6 @@ function runPython(root) {
     spawnSync(py, ["-m", "pip", "install", "-q", "-r", reqs], { cwd: root, stdio: "inherit" });
   }
 
-  // watchfiles = uvicorn's reloader. --filter python watches every *.py in the
-  // project (and ignores .venv/__pycache__/node_modules), so interdependent
-  // modules trigger reloads — not just main.py.
   log.step("pip install -q watchfiles (dev reloader)…");
   spawnSync(py, ["-m", "pip", "install", "-q", "watchfiles"], { cwd: root, stdio: "inherit" });
 
@@ -63,10 +61,10 @@ function runPython(root) {
   const backEnv = { ...process.env, ...(pluginId ? { RB_PLUGIN_ID: pluginId } : {}) };
   if (pluginId) log.step(`RB_PLUGIN_ID=${pluginId}`);
 
-  log.step("watchfiles → python main.py (reload on any .py change)");
+  log.step("watchfiles → python py/main.py (reload on any .py change in py/)");
   const child = spawn(
     py,
-    ["-m", "watchfiles", "--filter", "python", "--target-type", "command", "python main.py", "."],
+    ["-m", "watchfiles", "--filter", "python", "--target-type", "command", "python py/main.py", "py"],
     { cwd: root, stdio: "inherit", env: backEnv },
   );
   const cleanup = () => { if (!child.killed) child.kill(); };

package/cli/src/pack.mjs

@@ -29,11 +29,8 @@ export async function runPack() {
   const zipPath = resolve(pluginRoot, zipName);
   rmSync(zipPath, { force: true });
 
-  // Contents: dist/ + back-end files if present.
+  // dist/ already contains main.py, requirements.txt, manifest.json, assets/.
   const entries = ["dist"];
-  for (const f of ["main.py", "requirements.txt"]) {
-    if (existsSync(resolve(pluginRoot, f))) entries.push(f);
-  }
   if (existsSync(resolve(pluginRoot, "ros2_ws/install"))) {
     entries.push("ros2_ws/install");
   }

package/cli/src/update.mjs

@@ -8,9 +8,11 @@
 //   local   : plugin project's node_modules (fallback)
 //             → <pm> add @rainbow-robotics/muscat-plugin-kit@<tag>
 //
-// After updating the CLI itself, also bumps the plugin project's local deps.
+// 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, readFileSync, writeFileSync } from "node:fs";
+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";
@@ -65,13 +67,13 @@ async function updateBinary(tag) {
   const version = await resolveS3Version(tag);
   const current = kitVersion();
   if (version === current) {
-    log.ok(`이미 최신 버전입니다 (v${current})`);
+    log.ok(`Already up to date (v${current})`);
     return;
   }
 
   const binaryName = s3BinaryName();
   const url = `${S3_BASE}/v${version}/${binaryName}`;
-  log.step(`바이너리 다운로드: v${current} → v${version}`);
+  log.step(`Downloading binary: v${current} → v${version}`);
 
   const data = await fetchBinary(url);
   const execPath = process.execPath;
@@ -88,14 +90,14 @@ async function updateBinary(tag) {
       stdio: "ignore",
     }).unref();
 
-    log.ok(`v${version} 다운로드 완료. 다음 실행 시 자동 적용됩니다.`);
+    log.ok(`v${version} downloaded. Will be applied on next run.`);
   } else {
     // macOS / Linux: can replace the file while it's mapped into memory
     const tmp = join(tmpdir(), `muscat-pk-${version}`);
     writeFileSync(tmp, data);
     chmodSync(tmp, 0o755);
     copyFileSync(tmp, execPath);
-    log.ok(`v${version} 업데이트 완료.`);
+    log.ok(`Updated to v${version}.`);
   }
 }
 
@@ -104,7 +106,79 @@ async function updateBinary(tag) {
 function updateNpmGlobal(tag) {
   log.step(`npm install -g ${KIT_PUBLISHED_NAME}@${tag}`);
   execSync(`npm install -g ${KIT_PUBLISHED_NAME}@${tag}`, { stdio: "inherit" });
-  log.ok("글로벌 CLI 업데이트 완료.");
+  log.ok("Global CLI updated.");
+}
+
+// ── project structure migration ───────────────────────────────────────────────
+
+function detectOldStructure(root) {
+  const issues = [];
+  if (existsSync(resolve(root, "src", "content.tsx")) && !existsSync(resolve(root, "ui"))) {
+    issues.push({ kind: "src→ui", desc: "src/content.tsx  →  ui/content.tsx" });
+  }
+  if (existsSync(resolve(root, "main.py")) && !existsSync(resolve(root, "py"))) {
+    issues.push({ kind: "main→py", desc: "main.py  →  py/main.py" });
+  }
+  if (existsSync(resolve(root, "backend"))) {
+    issues.push({ kind: "backend→py", desc: "backend/  →  py/" });
+  }
+  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);
+  log.warn("Files will be moved and modified. Back up or commit your work before proceeding.");
+
+  const answer = await prompt("Migrate project structure? [y/N] ");
+  if (answer.toLowerCase() !== "y") {
+    log.info("Structure migration skipped.");
+    return;
+  }
+
+  for (const issue of issues) {
+    if (issue.kind === "src→ui") {
+      renameSync(resolve(root, "src"), resolve(root, "ui"));
+      log.ok("src/  →  ui/");
+
+      const vitePath = resolve(root, "vite.config.ts");
+      if (existsSync(vitePath)) {
+        writeFileSync(vitePath, readFileSync(vitePath, "utf8").replace(/["']src\/content\.tsx["']/g, '"ui/content.tsx"'));
+        log.ok("vite.config.ts entry updated");
+      }
+      const tscPath = resolve(root, "tsconfig.json");
+      if (existsSync(tscPath)) {
+        writeFileSync(tscPath, readFileSync(tscPath, "utf8").replace(/"src"/g, '"ui"'));
+        log.ok("tsconfig.json include updated");
+      }
+    }
+
+    if (issue.kind === "main→py") {
+      mkdirSync(resolve(root, "py"), { recursive: true });
+      renameSync(resolve(root, "main.py"), resolve(root, "py", "main.py"));
+      log.ok("main.py  →  py/main.py");
+    }
+
+    if (issue.kind === "backend→py") {
+      renameSync(resolve(root, "backend"), resolve(root, "py"));
+      log.ok("backend/  →  py/");
+      const pyReqs = resolve(root, "py", "requirements.txt");
+      const rootReqs = resolve(root, "requirements.txt");
+      if (existsSync(pyReqs) && !existsSync(rootReqs)) {
+        renameSync(pyReqs, rootReqs);
+        log.ok("py/requirements.txt  →  requirements.txt (project root)");
+      }
+    }
+  }
+
+  log.ok("Migration complete. Run `muscat-pk build` to verify.");
 }
 
 // ── plugin project local deps ─────────────────────────────────────────────────
@@ -117,31 +191,48 @@ function updateLocalDeps(root, tag) {
     : pm === "yarn" ? `yarn add ${list.join(" ")}`
     : `${pm} add ${list.join(" ")}`;
 
-  log.step(`플러그인 로컬 deps 업데이트 (${pm}): ${list.join(", ")}`);
+  log.step(`Updating plugin local deps (${pm}): ${list.join(", ")}`);
   try {
     execSync(cmd, { cwd: root, stdio: "inherit" });
-    log.ok("로컬 deps 업데이트 완료.");
+    log.ok("Local deps updated.");
   } catch {
-    log.warn("로컬 deps 업데이트 실패 (오프라인?). 수동 실행:\n  " + cmd);
+    log.warn("Local deps update failed (offline?). Run manually:\n  " + cmd);
   }
 }
 
 // ── main ─────────────────────────────────────────────────────────────────────
 
+async function resolveTag(explicitTag) {
+  if (explicitTag) return explicitTag;
+
+  const current = kitVersion();
+  const isDevVersion = current.includes("-dev.");
+
+  if (!isDevVersion) return "latest";
+
+  const answer = await prompt(
+    `You are on a dev version (v${current}).\n` +
+    `  [1] Stay on dev  — update to latest dev build\n` +
+    `  [2] Switch to stable — update to latest stable release\n` +
+    `Choice [1/2, default: 1]: `
+  );
+  return answer.trim() === "2" ? "latest" : "dev";
+}
+
 export async function runUpdate(args = []) {
   const opts = parseArgs(args);
-  const tag = opts._[0] || opts.version || opts.tag || "latest";
+  const explicitTag = opts._[0] || opts.version || opts.tag || "";
+  const tag = await resolveTag(explicitTag);
 
   // 1. Update the CLI itself
   if (isBinaryMode) {
-    log.step("바이너리 자기 업데이트 중…");
+    log.step("Updating binary…");
     try {
       await updateBinary(tag);
     } catch (err) {
-      log.warn(`바이너리 업데이트 실패: ${err.message}`);
+      log.warn(`Binary update failed: ${err.message}`);
     }
   } else {
-    // Check if globally installed via npm (execPath's npm prefix contains this package)
     const isGlobal = (() => {
       try {
         const prefix = execSync("npm prefix -g", { encoding: "utf8" }).trim();
@@ -155,16 +246,22 @@ export async function runUpdate(args = []) {
       try {
         updateNpmGlobal(tag);
       } catch (err) {
-        log.warn(`글로벌 CLI 업데이트 실패: ${err.message}`);
+        log.warn(`Global CLI update failed: ${err.message}`);
       }
     }
   }
 
-  // 2. Update the plugin project's local deps (best-effort)
+  // 2. Plugin project: structure migration + local deps
   try {
     const root = findPluginRoot();
+
+    const structureIssues = detectOldStructure(root);
+    if (structureIssues.length > 0) {
+      await migrateStructure(root, structureIssues);
+    }
+
     updateLocalDeps(root, tag);
   } catch {
-    // Not inside a plugin project — skip local update silently
+    // Not inside a plugin project — skip silently
   }
 }

package/cli/templates/common/manifest.json

@@ -14,12 +14,5 @@
       "opens": "popover"
     }
   ],
-  "actions": [
-    {
-      "id": "grip",
-      "topic": "rby2/plugin/__PLUGIN_ID__/grip",
-      "schema": { "width": "number" }
-    }
-  ],
   "runtime": { "type": "__RUNTIME_TYPE__", "entry": "main.py" }
 }

package/cli/templates/common/tsconfig.json

@@ -9,5 +9,5 @@
     "noEmit": true,
     "lib": ["DOM", "DOM.Iterable", "ESNext"]
   },
-  "include": ["src"]
+  "include": ["ui"]
 }

package/cli/templates/common/vite.config.ts

@@ -17,7 +17,7 @@ export default defineConfig({
   plugins: [react()],
   build: {
     lib: {
-      entry: "src/content.tsx",
+      entry: "ui/content.tsx",
       formats: ["es"],
       fileName: "content",
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainbow-robotics/muscat-plugin-kit",
-  "version": "0.1.2-dev.15",
+  "version": "0.1.2-dev.17",
   "type": "module",
   "engines": {
     "node": ">=20"