@songsid/agend 2.1.8-beta.6 → 2.1.8-beta.8

package/dist/fleet-manager.d.ts

@@ -967,6 +967,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private handleDecisionCrud;
     /** Resolve display name for an instance, fallback to instance name. */
     resolveDisplayName(instanceName: string): string;
+    /** Inherited keys such as __proto__ must never resolve to a mutable instance. */
+    private ownInstanceConfig;
     /** Persist identity to the instance's actual config store. Classic instances
      * are registry rows in classicBot.yaml, not fleet.yaml instance entries. */
     private setInstanceDisplayName;
@@ -1672,7 +1674,14 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     /** `/install-cli cancel` — abort the active install and remove its window. */
     cancelInstallSession(): Promise<string>;
     /** `command -v` on a login shell, so PATH additions from rc files count. */
-    private verifyBinaryOnLoginShell;
+    /**
+     * The absolute path a fresh login shell resolves `binary` to, or null. Only
+     * a real executable file counts: `command -v` also answers with an alias
+     * definition or a function name, neither of which a spawn could run.
+     */
+    private locateBinaryOnLoginShell;
+    /** Put an installed binary's directory on the fleet's PATH (#1059), once. */
+    private adoptBinaryDirectory;
     /** "Sign in now?" button after a successful install. */
     private handleInstallLoginConfirm;
     /** Discord native `/login` slash — shared by every adapter dispatch block. */

package/dist/fleet-manager.js

@@ -1,10 +1,10 @@
-import { existsSync, readFileSync, mkdirSync, writeFileSync, unlinkSync, rmSync, readdirSync, renameSync, copyFileSync, chmodSync, statSync } from "node:fs";
+import { existsSync, readFileSync, mkdirSync, writeFileSync, unlinkSync, rmSync, readdirSync, renameSync, copyFileSync, chmodSync, statSync, accessSync, constants as fsConstants } from "node:fs";
 import { randomBytes, randomUUID } from "node:crypto";
 import { spawnSync } from "node:child_process";
 import { freemem, totalmem, cpus } from "node:os";
 import { createServer } from "node:http";
 import { Worker } from "node:worker_threads";
-import { join, dirname, basename } from "node:path";
+import { join, dirname, basename, delimiter, isAbsolute } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getAgendHome, ensureWorkspaceGit } from "./paths.js";
 import { beginFullRestartProgress as persistFullRestartProgress, beginUpdateProgress as persistUpdateProgress, clearUpdateMarker, isUpdateInProgress, readUpdateProgress, setUpdateProgressStage, updateProgressOperation, } from "./update-marker.js";
@@ -6002,10 +6002,15 @@ export class FleetManager {
             ?? this.classicChannels?.getAll().find(ch => ch.instanceName === instanceName)?.displayName
             ?? instanceName;
     }
+    /** Inherited keys such as __proto__ must never resolve to a mutable instance. */
+    ownInstanceConfig(instanceName) {
+        const instances = this.fleetConfig?.instances;
+        return instances && Object.hasOwn(instances, instanceName) ? instances[instanceName] : undefined;
+    }
     /** Persist identity to the instance's actual config store. Classic instances
      * are registry rows in classicBot.yaml, not fleet.yaml instance entries. */
     setInstanceDisplayName(instanceName, displayName) {
-        const fleetInstance = this.fleetConfig?.instances[instanceName];
+        const fleetInstance = this.ownInstanceConfig(instanceName);
         if (fleetInstance) {
             fleetInstance.display_name = displayName;
             this.saveFleetConfig();
@@ -6014,7 +6019,7 @@ export class FleetManager {
         return this.classicChannels?.setDisplayNameByInstance(instanceName, displayName) ?? false;
     }
     setInstanceDescription(instanceName, description) {
-        const fleetInstance = this.fleetConfig?.instances[instanceName];
+        const fleetInstance = this.ownInstanceConfig(instanceName);
         if (fleetInstance) {
             fleetInstance.description = description;
             this.saveFleetConfig();
@@ -7110,7 +7115,7 @@ export class FleetManager {
      * An empty emoji removes that status's override.
      */
     async setPersonaEmoji(instanceName, args) {
-        const self = this.fleetConfig?.instances[instanceName];
+        const self = this.ownInstanceConfig(instanceName);
         if (!self)
             return { error: this.personaEmojiMissing(instanceName) };
         const status = (args.status ?? "delivered");
@@ -7155,8 +7160,9 @@ export class FleetManager {
         // Re-read after the validation above, which may have waited on Discord:
         // another set_persona_emoji or a Settings save can have changed another
         // status, or replaced this instance's config object, meanwhile. Change
-        // only this one key on what is there now.
-        const current = this.fleetConfig?.instances[instanceName];
+        // only this one key on what is there now. Ownership must still hold:
+        // removal during the await must not fall through to an inherited entry.
+        const current = this.ownInstanceConfig(instanceName);
         if (!current)
             return { error: this.personaEmojiMissing(instanceName) };
         const map = { ...(current.status_emojis ?? {}) };
@@ -9683,10 +9689,16 @@ export class FleetManager {
                 }
                 // The installer may only have added the binary to a profile PATH; a
                 // fresh login shell sees that, the fleet process's PATH may not.
-                if (!this.verifyBinaryOnLoginShell(info.binary)) {
+                const installedAt = this.locateBinaryOnLoginShell(info.binary);
+                if (!installedAt) {
                     await chat.adapter.sendText(chat.chatId, t("install.verify_failed", backend, info.binary), { threadId: chat.threadId }).catch(() => { });
                     return;
                 }
+                // #1059: make it reachable from this process too. `/login` lists what
+                // `which` finds on the fleet's own PATH, and instances resolve their
+                // binary the same way, so a binary only a login shell could see was
+                // installed, reported as verified, and then offered nowhere.
+                this.adoptBinaryDirectory(installedAt, backend);
                 if (!LOGIN_FLOWS[backend]) {
                     await chat.adapter.sendText(chat.chatId, t("install.success_no_login", backend), { threadId: chat.threadId }).catch(() => { });
                     return;
@@ -9746,15 +9758,35 @@ export class FleetManager {
         return t("install.cancelled", backend);
     }
     /** `command -v` on a login shell, so PATH additions from rc files count. */
-    verifyBinaryOnLoginShell(binary) {
+    /**
+     * The absolute path a fresh login shell resolves `binary` to, or null. Only
+     * a real executable file counts: `command -v` also answers with an alias
+     * definition or a function name, neither of which a spawn could run.
+     */
+    locateBinaryOnLoginShell(binary) {
         try {
-            const result = spawnSync("bash", ["-lc", `command -v ${binary}`], { timeout: 10_000, stdio: "pipe" });
-            return result.status === 0;
+            const result = spawnSync("bash", ["-lc", `command -v ${binary}`], { timeout: 10_000, stdio: "pipe", encoding: "utf8" });
+            if (result.status !== 0)
+                return null;
+            const path = String(result.stdout ?? "").trim().split("\n").pop()?.trim() ?? "";
+            if (!isAbsolute(path))
+                return null;
+            accessSync(path, fsConstants.X_OK);
+            return statSync(path).isFile() ? path : null;
         }
         catch {
-            return false;
+            return null;
         }
     }
+    /** Put an installed binary's directory on the fleet's PATH (#1059), once. */
+    adoptBinaryDirectory(binaryPath, backend) {
+        const dir = dirname(binaryPath);
+        const entries = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
+        if (entries.includes(dir))
+            return;
+        process.env.PATH = [dir, ...entries].join(delimiter);
+        this.logger.info({ backend, dir }, "Added the installed CLI's directory to the fleet PATH");
+    }
     /** "Sign in now?" button after a successful install. */
     async handleInstallLoginConfirm(data, callbackAdapterId, receivingAdapter) {
         const claimed = this.consumeNonceCallback(INSTALL_LOGIN_CALLBACK_PREFIX, /^install-login:([0-9a-f]+):(go|later)$/, data, callbackAdapterId, receivingAdapter);