openmausbot 0.1.69 → 0.1.71

package/dist-server/server/env-path.js

@@ -80,6 +80,16 @@ let loginShellPath = null;
  * and without resetting it a rescan would rebuild the cache without those
  * entries and never re-probe — "check again" would permanently lose
  * anything only the login shell's rc file knows about. */
+// Directories the app manages itself (its own npm prefix for engines it
+// installs from Settings). They go ahead of everything else so an engine
+// installed there wins over an older copy elsewhere on PATH.
+const registeredDirs = [];
+export function registerPathDir(dir) {
+    if (registeredDirs.includes(dir))
+        return;
+    registeredDirs.unshift(dir);
+    resetPathCache();
+}
 export function resetPathCache() {
     cached = null;
     probed = false;
@@ -88,6 +98,7 @@ export function resetPathCache() {
 export function augmentedPath() {
     if (cached === null) {
         cached = mergePaths([
+            ...registeredDirs.filter((d) => existsSync(d)),
             ...(process.env.OMB_EXTRA_PATH ? process.env.OMB_EXTRA_PATH.split(delimiter) : []),
             ...(process.env.PATH ? process.env.PATH.split(delimiter) : []),
             // Keep the last successful login-shell result while a rescan starts a
@@ -131,6 +142,7 @@ export function resetPathCacheForTests() {
     cached = null;
     probed = false;
     loginShellPath = null;
+    registeredDirs.length = 0;
 }
 /** Every `name` binary on the augmented PATH as absolute paths, in PATH
  * order (first = what a bare name would run). Used by the Engines panel's

package/dist-server/server/harness/bus.js

@@ -67,7 +67,7 @@ export class EventBus {
         this.deliver(event);
     }
     deliver(event) {
-        for (const listener of [...this.listeners]) {
+        for (const listener of Array.from(this.listeners)) {
             try {
                 listener(event);
             }

package/dist-server/server/harness/registry.js

@@ -5,6 +5,12 @@
 // compatible — do not remove it); dispose tears an instance down without
 // touching its siblings.
 import { findCliCandidates } from "../env-path.js";
+import { installNpmEngine, npmAvailable, serverInstallFor } from "../engine-install.js";
+/** The driver's install descriptor plus what this machine can do about it. */
+function withServerInstall(install, npmPresent) {
+    const server = install ? serverInstallFor(install, npmPresent) : null;
+    return server ? { ...install, server } : install;
+}
 /** The `cli` field off a driver's default config, when it has one — the
  * placeholder an override input shows when nothing is set. */
 function cliDefaultOf(driver) {
@@ -30,7 +36,14 @@ export class ProviderRegistry {
      * from their own config; this map only reports what was configured */
     cliByInstance = new Map();
     driversByKind;
-    constructor(drivers) {
+    /** Where Settings-driven npm installs go; the data directory by default. */
+    enginesBaseDir;
+    /** Whether npm is on this machine; injectable because the PATH scan also
+     * looks in standard install locations, which tests cannot empty. */
+    npmPresent;
+    constructor(drivers, options = {}) {
+        this.enginesBaseDir = options.enginesBaseDir;
+        this.npmPresent = options.npmAvailable ?? npmAvailable;
         this.driversByKind = new Map(drivers.map((d) => [d.driverKind, d]));
     }
     async load(configs) {
@@ -113,11 +126,22 @@ export class ProviderRegistry {
         await instance.refreshModels?.();
         return true;
     }
+    /** A driver's own installer (a managed download) first; otherwise the
+     * app's npm prefix, when the driver's install one-liner is an npm package
+     * and npm is on PATH. False means Settings has nothing to offer here. */
     async installRuntime(instanceId) {
-        const instance = this.get(instanceId);
-        if (!instance?.installRuntime)
+        const entry = this.byId.get(instanceId);
+        if (!entry)
+            return false;
+        if (entry.live?.installRuntime) {
+            await entry.live.installRuntime();
+            return true;
+        }
+        const driver = this.driversByKind.get(entry.shadow?.driverKind ?? entry.live.driverKind);
+        const server = serverInstallFor(driver?.install, this.npmPresent());
+        if (!server)
             return false;
-        await instance.installRuntime();
+        await installNpmEngine(server.package, { baseDir: this.enginesBaseDir, cli: cliDefaultOf(driver) });
         return true;
     }
     async startAuthentication(instanceId) {
@@ -158,6 +182,7 @@ export class ProviderRegistry {
             candidatesByName.set(name, found);
             return found;
         };
+        const npmPresent = this.npmPresent();
         return Promise.all(this.entries().map(async (entry) => {
             const driver = this.driversByKind.get(entry.shadow?.driverKind ?? entry.live.driverKind);
             if (entry.shadow) {
@@ -170,7 +195,7 @@ export class ProviderRegistry {
                     capabilities: { computerMcp: false, agentsMcp: false, localComputerMcp: false },
                     // an unknown driver has no driver record, hence no install path
                     access: driver?.metadata.access ?? "subscription",
-                    install: driver?.install,
+                    install: withServerInstall(driver?.install, npmPresent),
                     cli: entry.shadow.cli,
                     cliDefault: cliDefaultOf(driver),
                     // a shadow is exactly the "your CLI is broken, pick another"
@@ -205,7 +230,7 @@ export class ProviderRegistry {
                     approvalReview: inst.reviewPermission !== undefined,
                 },
                 access: driver?.metadata.access ?? "subscription",
-                install: driver?.install,
+                install: withServerInstall(driver?.install, npmPresent),
                 authentication: inst.startAuthentication
                     ? {
                         method: inst.getAuthentication && inst.completeAuthentication