@webority/ensemble 0.5.7 → 0.5.8

package/README.md

@@ -53,7 +53,7 @@ Fleet playbook: `docs/FLEET.md`.
 ### Grok / Codex MCP (existing config)
 When `~/.grok/config.toml` (or Codex) already exists, install **upserts** only
 `[mcp_servers.ensemble]` — other servers (e.g. weborityos) and UI/cli sections are kept.
-Command points at `~/.ensemble/bin/ensemble-runtime` (plus an `ensemble-bus` compat copy of the same binary for older configs).
+Command points at `~/.ensemble/bin/ensemble-runtime` only (no `ensemble-bus` binary or alias).
 
 ## Security model
 Machine ⇄ server auth is a **per-machine token**, resolved server-side to your organization; every

package/bin/ensemble.js

@@ -123,9 +123,7 @@ async function status(args) {
   const t = fs.readFileSync(tokenFile, 'utf8').trim();
   core.log('Ensemble status @ ' + api);
   const runtimeExe = core.runtimeBin();
-  const busCompat = path.join(core.BIN_DIR, 'ensemble-bus' + core.platform().exe);
   core.log('• runtime binary: ' + (core.isUsableBinary(runtimeExe) ? 'ok (' + runtimeExe + ')' : 'MISSING/STUB — ensemble install'));
-  core.log('• bus compat alias: ' + (core.isUsableBinary(busCompat) ? 'ok' : 'missing — ensemble install'));
   const engines = ['claude', 'codex', 'grok', 'opencode', 'omp', 'gemini', 'antigravity'];
   const present = engines.filter((e) => core.enginePresent(e));
   core.log('• engines detected: ' + (present.join(', ') || 'none'));
@@ -135,10 +133,13 @@ async function status(args) {
     if (fs.existsSync(grokToml)) {
       const txt = fs.readFileSync(grokToml, 'utf8');
       const hasEnsemble = /\[mcp_servers\.ensemble\]/.test(txt);
-      const pointsRuntime = /ensemble-runtime/.test(txt) || /ensemble-bus/.test(txt);
-      core.log('• grok MCP: ' + (hasEnsemble && pointsRuntime
-        ? 'configured in ~/.grok/config.toml'
-        : 'NOT wired — run: ensemble hooks'));
+      const pointsRuntime = /ensemble-runtime/.test(txt);
+      const hasLegacyBus = /ensemble-bus/.test(txt);
+      core.log('• grok MCP: ' + (hasEnsemble && pointsRuntime && !hasLegacyBus
+        ? 'configured (ensemble-runtime) in ~/.grok/config.toml'
+        : hasLegacyBus
+          ? 'LEGACY ensemble-bus path — run: ensemble hooks'
+          : 'NOT wired — run: ensemble hooks'));
     } else {
       core.log('• grok MCP: no ~/.grok/config.toml — run: ensemble hooks');
     }
@@ -195,8 +196,9 @@ Run \`ensemble login\` and approve the machine in your browser.`);
     else if (cmd === 'status') await status(args);
     else if (cmd === 'hooks') {
       // Ensure a usable (non-stub) runtime BEFORE wiring — otherwise every engine gets pointed at a
-      // dead path. Replaces tiny leftover ensemble-bus stubs; fails closed on unsupported platforms.
+      // dead path. Fails closed on unsupported platforms. No ensemble-bus compat alias.
       await core.ensureRuntime();
+      core.removeLegacyBusArtifacts();
       const wired = core.wireHooks();
       core.log('wired hooks+MCP: ' + (wired.join(', ') || 'none'));
       if (!wired.some((w) => w.endsWith(':mcp'))) {

package/lib/core.js

@@ -92,8 +92,7 @@ function runtimeBin() {
   return runtimePaths().runtimePath;
 }
 
-// Real runtime/runner single-file binaries are tens of MB. A ~100–200 KB "ensemble-bus" stub left
-// from earlier renames must never count as installed — wiring would point engines at a dead path.
+// Real runtime/runner single-file binaries are tens of MB. Anything smaller is corrupt/stub.
 const MIN_BINARY_BYTES = 1_000_000;
 
 function isUsableBinary(filePath) {
@@ -202,7 +201,7 @@ async function ensureRuntime() {
   // an explicit `ensemble install`, which was the only upgrade path before and left the fleet stale. [BUG-06673]
   if (runtimeInstalled() && installedVersionCurrent()) {
     const p = runtimePaths();
-    installRuntimeCompatAliases(p.runtimePath, p.pf);
+    removeLegacyBusArtifacts();
     return p;
   }
   return ensureBinaries({ force: true });
@@ -228,50 +227,44 @@ function platformPackageDir() {
   }
 }
 
-// Older hooks / MCP configs / docs invoked `ensemble-bus`. Keep a full copy of the runtime under
-// that name so those paths keep working after the rename to ensemble-runtime.
-// Windows often locks ensemble-bus.exe while an MCP client holds it open — rename-aside + temp
-// write so we can replace a tiny stub even when the old handle is sticky.
-function installRuntimeCompatAliases(runtimePath, pf) {
-  if (!isUsableBinary(runtimePath)) return;
-  const busPath = path.join(BIN_DIR, 'ensemble-bus' + pf.exe);
-  if (isUsableBinary(busPath) && fs.statSync(busPath).size === fs.statSync(runtimePath).size) {
-    return; // already a full runtime copy
-  }
+// No backward-compat binary. Delete leftover ensemble-bus* (and framework-dependent debris that
+// sometimes landed next to a bad publish) so only ensemble-runtime remains the bus CLI.
+function removeLegacyBusArtifacts() {
+  ensureDirs();
+  let names;
   try {
-    if (fs.existsSync(busPath) && !isUsableBinary(busPath)) {
-      const aside = busPath + '.old-stub';
-      try {
-        if (fs.existsSync(aside)) fs.unlinkSync(aside);
-        fs.renameSync(busPath, aside);
-      } catch (e) { /* locked — try overwrite paths below */ }
-    }
-    const tmp = busPath + '.new';
-    fs.copyFileSync(runtimePath, tmp);
+    names = fs.readdirSync(BIN_DIR);
+  } catch (e) {
+    return;
+  }
+  for (const name of names) {
+    const lower = name.toLowerCase();
+    const drop =
+      lower.startsWith('ensemble-bus')
+      || lower.startsWith('microsoft.')
+      || lower.startsWith('modelcontextprotocol')
+      || lower === 'system.diagnostics.eventlog.dll'
+      || lower === 'runtimes';
+    if (!drop) continue;
+    const full = path.join(BIN_DIR, name);
     try {
-      if (fs.existsSync(busPath)) {
-        try { fs.unlinkSync(busPath); } catch (e) { /* locked */ }
+      if (fs.statSync(full).isDirectory()) {
+        fs.rmSync(full, { recursive: true, force: true });
+      } else {
+        fs.unlinkSync(full);
       }
-      fs.renameSync(tmp, busPath);
     } catch (e) {
+      // Locked (running MCP still holds a handle): rename aside so nothing can launch it by name.
       try {
-        fs.copyFileSync(tmp, busPath);
-        try { fs.unlinkSync(tmp); } catch (_) { /* ignore */ }
+        const trash = full + '.trash-' + Date.now();
+        fs.renameSync(full, trash);
+        warn('moved locked legacy ' + name + ' aside → ' + path.basename(trash) +
+          ' (delete after restarting agents)');
       } catch (e2) {
-        try { fs.unlinkSync(tmp); } catch (_) { /* ignore */ }
-        // Still wired to ensemble-runtime in configs; compat is best-effort while MCP holds the file.
-        warn('could not replace ensemble-bus compat alias (file locked by a running agent MCP?) — ' +
-          'new wiring uses ensemble-runtime; restart agents and re-run `ensemble hooks` to refresh the alias. ' +
-          '(' + (e2 && e2.message ? e2.message : e2) + ')');
-        return;
+        warn('could not remove legacy ' + name + ' (locked) — restart agents and re-run `ensemble install`. (' +
+          (e2 && e2.message ? e2.message : e2) + ')');
       }
     }
-    if (pf.os !== 'windows') {
-      fs.chmodSync(busPath, 0o755);
-      if (pf.os === 'mac') spawnSync('codesign', ['-s', '-', '-f', busPath], { stdio: 'ignore' });
-    }
-  } catch (e) {
-    warn('could not write ensemble-bus compat alias: ' + (e && e.message ? e.message : e));
   }
 }
 
@@ -327,7 +320,7 @@ async function ensureBinaries(opts) {
       if (pf.os === 'mac') spawnSync('codesign', ['-s', '-', '-f', t.dest], { stdio: 'ignore' });
     }
   }
-  installRuntimeCompatAliases(runtimePath, pf);
+  removeLegacyBusArtifacts();
   writeInstalledVersion();
   // A replaced runner binary only takes effect once the daemon restarts onto it.
   if (runnerRefreshed) restartRunner(pf, runnerPath);
@@ -699,6 +692,7 @@ function has(cmd) {
 // Ensemble owns — used to dedup on re-run so our entry never stacks.
 function isEnsembleHook(h) {
   const cmd = typeof h === 'string' ? h : (h && (h.command || h.cmd || h.run)) || '';
+  // Match ensemble-runtime and any leftover ensemble-bus paths so re-wire strips outdated entries.
   return /ensemble-(bus|runtime)/i.test(String(cmd));
 }
 
@@ -869,6 +863,6 @@ module.exports = {
   ensureBinaries, enrollMachine, writeRunnerConfig, wireHooks, wireMcpServers, enginePresent, installAutostart, startRunner, request,
   sleep, openBrowser, startDevice, pollDevice, finishSetup, assertSupported,
   runtimePaths, runtimeBin, runtimeInstalled, requireRuntime, ensureRuntime,
-  isUsableBinary, installRuntimeCompatAliases, MIN_BINARY_BYTES,
+  isUsableBinary, removeLegacyBusArtifacts, MIN_BINARY_BYTES,
   writeEngineHooks, upsertTomlMcp, installedVersionCurrent, readInstalledVersion, PKG_VERSION,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webority/ensemble",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Connect this machine to Ensemble — runs the local agent runner and wires the ensemble session bus so your coding sessions talk (per-org, isolated).",
   "bin": {
     "ensemble": "bin/ensemble.js"
@@ -9,11 +9,11 @@
     "node": ">=18"
   },
   "optionalDependencies": {
-    "@webority/ensemble-darwin-arm64": "0.5.7",
-    "@webority/ensemble-darwin-x64": "0.5.7",
-    "@webority/ensemble-linux-arm64": "0.5.7",
-    "@webority/ensemble-linux-x64": "0.5.7",
-    "@webority/ensemble-win-x64": "0.5.7"
+    "@webority/ensemble-darwin-arm64": "0.5.8",
+    "@webority/ensemble-darwin-x64": "0.5.8",
+    "@webority/ensemble-linux-arm64": "0.5.8",
+    "@webority/ensemble-linux-x64": "0.5.8",
+    "@webority/ensemble-win-x64": "0.5.8"
   },
   "files": [
     "bin",