@codeyam-editor/codeyam-editor 0.1.0-staging.36d3518 → 0.1.0-staging.398fa2d

package/npm/cli.js

@@ -1,16 +1,65 @@
 #!/usr/bin/env node
 
-const { spawn } = require("child_process");
-const { ensureBinary, uiDistDir } = require("./utils");
+/**
+ * Production launcher for the codeyam-editor.
+ *
+ * Run from a project directory after installing the npm package:
+ *   cd ~/workspace/my-app
+ *   codeyam-editor            # start fresh
+ *   codeyam-editor --restart  # kill existing and restart
+ *
+ * The pre-built binary and UI are resolved from the package install location.
+ * process.cwd() is treated as the target project directory.
+ */
 
-const binary = ensureBinary();
+const path = require("path");
+const fs = require("fs");
+const { ensureServer, restartServer, waitForPort, ensureBinary, uiDistDir } = require("./utils");
+const { open } = require("./open");
 
-const child = spawn(binary, process.argv.slice(2), {
-  stdio: "inherit",
-  cwd: process.cwd(),
-  env: { ...process.env, CODEYAM_EDITOR_UI_DIR: uiDistDir() },
-});
+const SERVER_PORT = 14199;
+const shouldRestart = process.argv.includes("--restart");
 
-child.on("exit", (code) => {
-  process.exit(code ?? 1);
-});
+/** Read the target project's .codeyam/editor.json to find the app port. */
+function readProjectPort() {
+  try {
+    const configPath = path.join(process.cwd(), ".codeyam", "editor.json");
+    const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+    return config.port || 3000;
+  } catch {
+    return 3000;
+  }
+}
+
+async function main() {
+  const projectDir = process.cwd();
+  console.error(`Project: ${projectDir}`);
+
+  // Start the Rust backend — binary from package, CWD = target project
+  const serverChild = shouldRestart
+    ? await restartServer(SERVER_PORT)
+    : await ensureServer(SERVER_PORT);
+
+  // Wait for the target project's dev server (port + 1 is the internal port)
+  const appPort = readProjectPort();
+  const viteInternalPort = appPort + 1;
+  console.error(`Waiting for dev server on port ${viteInternalPort}...`);
+  const viteReady = await waitForPort(viteInternalPort, 15000, 300);
+  if (!viteReady) {
+    console.error(`Warning: Dev server not ready on port ${viteInternalPort}. Live Preview may not work initially.`);
+  }
+
+  const url = `http://localhost:${SERVER_PORT}`;
+  console.error(`Editor UI: ${url}`);
+  console.error(`Live Preview: http://localhost:${appPort}`);
+  open(url);
+  const keepAlive = setInterval(() => {}, 60_000);
+
+  process.on("SIGINT", () => {
+    clearInterval(keepAlive);
+    if (serverChild) serverChild.kill("SIGINT");
+    process.exit(0);
+  });
+}
+
+main();

package/npm/editor-dev.js

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+/**
+ * Development launcher for running the codeyam-editor against any project.
+ *
+ * Run from the target project directory:
+ *   cd ~/workspace/my-app
+ *   codeyam-editor-dev          # start fresh
+ *   codeyam-editor-dev --restart # kill existing and restart
+ *
+ * Uses the locally-built binary and UI from the editor repo (resolved via
+ * __dirname), but treats process.cwd() as the target project directory.
+ */
+
+const { execSync } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+const { ensureServer, restartServer, waitForPort, rootDir } = require("./utils");
+const { open } = require("./open");
+
+const SERVER_PORT = 14199;
+const shouldRestart = process.argv.includes("--restart");
+
+/** Read the target project's .codeyam/editor.json to find the app port. */
+function readProjectPort() {
+  try {
+    const configPath = path.join(process.cwd(), ".codeyam", "editor.json");
+    const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+    return config.port || 3000;
+  } catch {
+    return 3000;
+  }
+}
+
+async function main() {
+  const projectDir = process.cwd();
+  console.error(`Editor repo: ${rootDir}`);
+  console.error(`Target project: ${projectDir}`);
+
+  // Build the Rust binary from the editor repo
+  console.error("Building Rust binary...");
+  try {
+    execSync("cargo build", {
+      stdio: "inherit",
+      cwd: rootDir,
+    });
+  } catch {
+    console.error("Failed to build Rust binary. Continuing with existing build (if any)...");
+  }
+
+  // Build the UI from the editor repo
+  console.error("Building UI...");
+  try {
+    execSync("npx vite build", {
+      stdio: "inherit",
+      cwd: path.join(rootDir, "ui"),
+    });
+  } catch {
+    console.error("Failed to build UI. Continuing with existing build (if any)...");
+  }
+
+  // Start the Rust backend — binary from editor repo, CWD = target project
+  const serverChild = shouldRestart
+    ? await restartServer(SERVER_PORT)
+    : await ensureServer(SERVER_PORT);
+
+  // Wait for the target project's Vite dev server (port + 1 is the internal port)
+  const appPort = readProjectPort();
+  const viteInternalPort = appPort + 1;
+  console.error(`Waiting for dev server on port ${viteInternalPort}...`);
+  const viteReady = await waitForPort(viteInternalPort, 15000, 300);
+  if (!viteReady) {
+    console.error(`Warning: Dev server not ready on port ${viteInternalPort}. Live Preview may not work initially.`);
+  }
+
+  const url = `http://localhost:${SERVER_PORT}`;
+  console.error(`Editor UI: ${url}`);
+  console.error(`Live Preview: http://localhost:${appPort}`);
+  console.error(`Project: ${projectDir}`);
+  open(url);
+  const keepAlive = setInterval(() => {}, 60_000);
+
+  process.on("SIGINT", () => {
+    clearInterval(keepAlive);
+    if (serverChild) serverChild.kill("SIGINT");
+    process.exit(0);
+  });
+}
+
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeyam-editor/codeyam-editor",
-  "version": "0.1.0-staging.36d3518",
+  "version": "0.1.0-staging.398fa2d",
   "description": "Language-agnostic managed execution sandbox for scenario-driven development",
   "bin": {
     "codeyam-editor": "./npm/cli.js"