@codeyam-editor/codeyam-editor 0.1.2 → 0.1.3

package/npm/utils.js

@@ -8,14 +8,20 @@ const serverStatePath = path.join(rootDir, ".codeyam", "server-state.json");
 
 /**
  * Map (process.platform, process.arch) → the platform sub-package that
- * carries the matching native binary. Kept as a small data table so adding
- * a new platform (e.g. linux/arm64) is one entry, not a new branch.
+ * carries the matching native binaries. Each sub-package ships TWO
+ * binaries side-by-side in its `bin/` dir: the `codeyam-editor` monolith
+ * and the dedicated `codeyam-editor-pty-broker` daemon (its own
+ * executable file / inode, for a stable honest process name). They live
+ * in the same dir so the broker auto-spawn's sibling-of-current-exe
+ * resolution finds the broker next to the monolith with no copying.
+ * Kept as a small data table so adding a new platform (e.g. linux/arm64)
+ * is one entry, not a new branch.
  */
 const PLATFORM_PACKAGES = {
-  "darwin-arm64": { pkg: "@codeyam-editor/codeyam-editor-darwin-arm64", binary: "codeyam-editor" },
-  "darwin-x64":   { pkg: "@codeyam-editor/codeyam-editor-darwin-x64",   binary: "codeyam-editor" },
-  "linux-x64":    { pkg: "@codeyam-editor/codeyam-editor-linux-x64",    binary: "codeyam-editor" },
-  "win32-x64":    { pkg: "@codeyam-editor/codeyam-editor-win32-x64",    binary: "codeyam-editor.exe" },
+  "darwin-arm64": { pkg: "@codeyam-editor/codeyam-editor-darwin-arm64", binary: "codeyam-editor", broker: "codeyam-editor-pty-broker" },
+  "darwin-x64":   { pkg: "@codeyam-editor/codeyam-editor-darwin-x64",   binary: "codeyam-editor", broker: "codeyam-editor-pty-broker" },
+  "linux-x64":    { pkg: "@codeyam-editor/codeyam-editor-linux-x64",    binary: "codeyam-editor", broker: "codeyam-editor-pty-broker" },
+  "win32-x64":    { pkg: "@codeyam-editor/codeyam-editor-win32-x64",    binary: "codeyam-editor.exe", broker: "codeyam-editor-pty-broker.exe" },
 };
 
 /**
@@ -27,6 +33,14 @@ function binaryName(platform = process.platform) {
   return platform === "win32" ? "codeyam-editor.exe" : "codeyam-editor";
 }
 
+/**
+ * Platform-correct executable filename for the dedicated broker binary.
+ * Mirrors {@link binaryName} for the second shipped binary.
+ */
+function brokerBinaryName(platform = process.platform) {
+  return platform === "win32" ? "codeyam-editor-pty-broker.exe" : "codeyam-editor-pty-broker";
+}
+
 /** Look up the platform sub-package metadata for a given platform/arch pair. */
 function platformPackageInfo(platform = process.platform, arch = process.arch) {
   return PLATFORM_PACKAGES[`${platform}-${arch}`] || null;
@@ -62,10 +76,25 @@ function findBinary() {
   }
 
   const name = binaryName();
-  const devCandidates = [
-    path.join(rootDir, "target", "debug", name),
-    path.join(rootDir, "target", "release", name),
-  ];
+  // Target directories to search, in precedence order. A custom
+  // CARGO_TARGET_DIR (cloud VMs set CARGO_TARGET_DIR=/codeyam-build-target)
+  // wins over the default ./target — cargo builds ONLY into the configured
+  // dir, so ./target may be stale or absent. Honoring it here keeps
+  // `ensureBinary` from building successfully and then failing to locate the
+  // result. CARGO_TARGET_DIR may be absolute or relative to the workspace
+  // root; path.resolve handles both (an absolute value ignores rootDir).
+  const targetDirs = [];
+  const customTarget = process.env.CARGO_TARGET_DIR;
+  if (customTarget) {
+    targetDirs.push(path.resolve(rootDir, customTarget));
+  }
+  targetDirs.push(path.join(rootDir, "target"));
+
+  const devCandidates = [];
+  for (const dir of targetDirs) {
+    devCandidates.push(path.join(dir, "debug", name));
+    devCandidates.push(path.join(dir, "release", name));
+  }
   for (const candidate of devCandidates) {
     if (fs.existsSync(candidate)) return candidate;
   }
@@ -133,48 +162,71 @@ function ensureBinary() {
     console.error("Binary not found after build.");
     process.exit(1);
   }
+  verifyBrokerBinaryPresent(binary);
   return binary;
 }
 
-/** Resolve the UI dist directory for the binary to serve. */
-function uiDistDir() {
-  return path.join(rootDir, "ui", "dist");
-}
-
 /**
- * True when `cwd` IS the editor repo root (or is nested under it), so the
- * wrapper is being used to develop the editor itself rather than against an
- * external client project. Compares realpath-resolved paths so a symlinked
- * checkout (`~/work/foo` → `/Volumes/dev/foo`) still matches — the same
- * convention `crates/control-api/src/state.rs:203` documents for the
- * server-side identity probe.
- *
- * Pure and synchronous (uses `fs.realpathSync`). On a realpath failure (an
- * unreadable path, race with a moved file) the un-resolved value is used as
- * a fallback — the same defensive shape `canonicalisePath` uses, so the
- * wrapper never bails on a transient fs hiccup.
- *
- * Gate for the dev wrapper's passthrough `cargo build`: when the target
- * project is the editor itself, rebuilding makes sense (the developer is
- * iterating on editor source). When it is any other project, the rebuild
- * does nothing of value and ripples into the stale-binary watcher's
- * SIGUSR1 re-exec, resetting the user's session for no reason. The
- * `CODEYAM_DEV_REBUILD=1` env preserves the one legitimate "editing the
- * editor against a client project" workflow.
+ * Resolve the dedicated broker binary path. Mirrors {@link findBinary}:
+ * the published platform sub-package ships it next to the monolith, and
+ * a dev `cargo build` produces it under target/debug|release. Returns
+ * null if it can't be located — the Rust broker auto-spawn then falls
+ * back to the monolith `editor pty-broker daemon` shim, so a missing
+ * broker binary degrades gracefully rather than breaking the editor.
  */
-function isSelfHostTarget(cwd, repoRoot) {
-  const safeReal = (p) => {
+function findBrokerBinary() {
+  const info = platformPackageInfo();
+  if (info && info.broker) {
     try {
-      return fs.realpathSync(p);
-    } catch {
-      return p;
+      const resolved = require.resolve(`${info.pkg}/bin/${info.broker}`, {
+        paths: [rootDir],
+      });
+      if (fs.existsSync(resolved)) return resolved;
+    } catch (e) {
+      if (e.code !== "MODULE_NOT_FOUND") throw e;
     }
-  };
-  const cwdReal = safeReal(cwd);
-  const repoReal = safeReal(repoRoot);
-  if (cwdReal === repoReal) return true;
-  const sep = path.sep;
-  return cwdReal.startsWith(repoReal.endsWith(sep) ? repoReal : repoReal + sep);
+  }
+
+  const name = brokerBinaryName();
+  const targetDirs = [];
+  const customTarget = process.env.CARGO_TARGET_DIR;
+  if (customTarget) {
+    targetDirs.push(path.resolve(rootDir, customTarget));
+  }
+  targetDirs.push(path.join(rootDir, "target"));
+
+  for (const dir of targetDirs) {
+    for (const profile of ["debug", "release"]) {
+      const candidate = path.join(dir, profile, name);
+      if (fs.existsSync(candidate)) return candidate;
+    }
+  }
+  return null;
+}
+
+/**
+ * Best-effort check that the dedicated broker binary sits next to the
+ * monolith (the layout the broker auto-spawn's sibling resolution
+ * expects). Logs a one-line note when it's missing — never throws or
+ * exits, because the Rust side degrades to the monolith shim. `monolith`
+ * is the resolved monolith binary path; the broker is expected as its
+ * sibling.
+ */
+function verifyBrokerBinaryPresent(monolith) {
+  const sibling = path.join(path.dirname(monolith), brokerBinaryName());
+  if (fs.existsSync(sibling)) return;
+  const located = findBrokerBinary();
+  if (located) return;
+  console.error(
+    "Note: dedicated broker binary (codeyam-editor-pty-broker) not found next to " +
+    `${monolith}. The PTY broker will fall back to the monolith \`editor pty-broker daemon\` ` +
+    "shim. Reinstall the platform sub-package, or run `cargo build -p codeyam-pty-broker`."
+  );
+}
+
+/** Resolve the UI dist directory for the binary to serve. */
+function uiDistDir() {
+  return path.join(rootDir, "ui", "dist");
 }
 
 /**
@@ -734,11 +786,13 @@ module.exports = {
   rootDir,
   serverStatePath,
   binaryName,
+  brokerBinaryName,
   platformPackageInfo,
   PLATFORM_PACKAGES,
   findBinary,
+  findBrokerBinary,
+  verifyBrokerBinaryPresent,
   ensureBinary,
-  isSelfHostTarget,
   staleBinaryBanner,
   enforceFreshBinary,
   uiDistDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeyam-editor/codeyam-editor",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Language-agnostic managed execution sandbox for scenario-driven development",
   "bin": {
     "codeyam-editor": "./npm/cli.js"
@@ -9,10 +9,10 @@
     "playwright": "^1.58.2"
   },
   "optionalDependencies": {
-    "@codeyam-editor/codeyam-editor-darwin-arm64": "0.1.2",
-    "@codeyam-editor/codeyam-editor-darwin-x64": "0.1.2",
-    "@codeyam-editor/codeyam-editor-linux-x64": "0.1.2",
-    "@codeyam-editor/codeyam-editor-win32-x64": "0.1.2"
+    "@codeyam-editor/codeyam-editor-darwin-arm64": "0.1.3",
+    "@codeyam-editor/codeyam-editor-darwin-x64": "0.1.3",
+    "@codeyam-editor/codeyam-editor-linux-x64": "0.1.3",
+    "@codeyam-editor/codeyam-editor-win32-x64": "0.1.3"
   },
   "keywords": [
     "codeyam",