@songsid/agend 2.1.0 → 2.1.1-beta.2

package/dist/backend/types.d.ts

@@ -165,12 +165,7 @@ export interface CliBackend {
         models: ModelOption[];
     }>;
 }
-/**
- * Resolve the full path to a CLI binary.
- * tmux new-window runs commands in a minimal shell without user PATH,
- * so we resolve at daemon startup time when the full PATH is available.
- */
-export declare function resolveBinary(name: string): string;
+export declare function resolveBinary(name: string, fallbackDirs?: readonly string[]): string;
 export declare function validateModel(model: string): string;
 /** Check if a model name is compatible with the given backend. */
 export declare function isModelCompatible(backendName: string, model: string): boolean;

package/dist/backend/types.js

@@ -1,4 +1,7 @@
 import { execFileSync } from "node:child_process";
+import { accessSync, constants, readdirSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
 /** Best-effort `<binary> --version` (first line, trimmed). Never throws. */
 export function probeCliVersion(binaryPath) {
     try {
@@ -14,13 +17,54 @@ export function probeCliVersion(binaryPath) {
  * tmux new-window runs commands in a minimal shell without user PATH,
  * so we resolve at daemon startup time when the full PATH is available.
  */
-export function resolveBinary(name) {
+function commonBinaryDirs() {
+    const dirs = [
+        dirname(process.execPath),
+        join(homedir(), ".local", "bin"),
+        join(homedir(), ".npm-global", "bin"),
+        "/usr/local/bin",
+        "/usr/bin",
+        "/bin",
+    ];
+    // Root installations often retain Codex under an nvm prefix while sudo's
+    // secure_path omits it. Probe every installed nvm Node bin as a fallback.
     try {
-        return execFileSync("which", [name], { encoding: "utf-8" }).trim();
+        const nvmVersions = join(homedir(), ".nvm", "versions", "node");
+        for (const version of readdirSync(nvmVersions).sort().reverse()) {
+            dirs.push(join(nvmVersions, version, "bin"));
+        }
     }
-    catch {
-        return name; // fallback to bare name
+    catch { /* nvm is optional */ }
+    // Also cover custom npm prefixes such as ~/.npm-global.
+    try {
+        const prefix = execFileSync("npm", ["prefix", "-g"], {
+            encoding: "utf-8",
+            timeout: 3000,
+            stdio: ["ignore", "pipe", "ignore"],
+        }).trim();
+        if (prefix)
+            dirs.push(join(prefix, "bin"));
+    }
+    catch { /* npm may not be in the restricted PATH */ }
+    return [...new Set(dirs)];
+}
+export function resolveBinary(name, fallbackDirs) {
+    try {
+        const resolved = execFileSync("which", [name], { encoding: "utf-8" }).trim();
+        if (resolved)
+            return resolved;
+    }
+    catch { /* search common absolute locations below */ }
+    for (const dir of fallbackDirs ?? commonBinaryDirs()) {
+        const candidate = join(dir, name);
+        try {
+            accessSync(candidate, constants.X_OK);
+            if (statSync(candidate).isFile())
+                return candidate;
+        }
+        catch { /* try next candidate */ }
     }
+    return name; // final fallback keeps the previous shell-PATH behavior
 }
 /**
  * Whitelist for model names embedded into the shell command line.

package/dist/backend/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/backend/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAiFlD,4EAA4E;AAC5E,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC/H,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,SAAS,CAAC;IAAC,CAAC;AAC/B,CAAC;AAkHD;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC,CAAC,wBAAwB;IACvC,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,aAAa,GAAG,qBAAqB,CAAC;AAC5C,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,iBAAiB,aAAa,EAAE,CAAC,CAAC;IAChG,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,0GAA0G;AAC1G,MAAM,sBAAsB,GAA2B;IACrD,aAAa,EAAE,4CAA4C;IAC3D,UAAU,EAAE,mCAAmC;IAC/C,OAAO,EAAE,wBAAwB;IACjC,YAAY,EAAE,UAAU;IACxB,UAAU,EAAE,GAAG,EAAG,iDAAiD;IACnE,0EAA0E;IAC1E,8DAA8D;IAC9D,aAAa,EAAE,2BAA2B;IAC1C,MAAM,EAAE,QAAQ,EAAG,gDAAgD;CACpE,CAAC;AAEF,kEAAkE;AAClE,MAAM,UAAU,iBAAiB,CAAC,WAAmB,EAAE,KAAa;IAClE,MAAM,OAAO,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC,CAAC,iCAAiC;IAC5D,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAmB,EAAE,KAAa;IACpE,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,kBAAkB,KAAK,uCAAuC,WAAW,0BAA0B,CAAC,CAAC;IACpH,CAAC;AACH,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,UAAU,CAAC,CAAS;IAClC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC;AACzC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/backend/types.ts"],"names":[],"mappings":"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"}

package/dist/fleet-manager.d.ts

@@ -44,6 +44,8 @@ export interface DeliveryOptions {
 }
 export declare class FleetManager implements FleetContext, LifecycleContext, ArchiverContext, StatuslineWatcherContext, OutboundContext, AgentEndpointContext {
     dataDir: string;
+    private static signalTarget;
+    private static sighupHandlerInstalled;
     private children;
     readonly lifecycle: InstanceLifecycle;
     /** @deprecated Use lifecycle.daemons — kept for backward compat */
@@ -66,6 +68,12 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     instanceIpcClients: Map<string, IpcClient>;
     scheduler: Scheduler | null;
     private configPath;
+    /** SIGHUPs received before startAll finishes are replayed once startup is safe. */
+    private startupComplete;
+    /** Coalesces one or more SIGHUPs into at most one follow-up reconciliation. */
+    private reloadPending;
+    /** A running reconciliation; only one may mutate lifecycle/config state at a time. */
+    private reconcileInFlight;
     logger: Logger;
     private topicCommands;
     sessionRegistry: Map<string, string>;
@@ -113,6 +121,9 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private webToken;
     private viewToken;
     constructor(dataDir: string);
+    private handleSighup;
+    private scheduleReconcile;
+    private finishStartup;
     lastActivityMs(name: string): number;
     private getInstanceIdle;
     webhookEmit(event: string, name: string, data?: Record<string, unknown>): void;

package/dist/fleet-manager.js

@@ -42,6 +42,7 @@ import { handleSettingsRequest } from "./settings-api.js";
 import { setLocale, detectLocale, t } from "./locale.js";
 import { handleAgentRequest } from "./agent-endpoint.js";
 import { ClassicChannelManager, getClassicBackendChoices, isSelectableClassicBackend, readClassicLastActivityAt } from "./classic-channel-manager.js";
+import { validateFleetConfig } from "./config-validator.js";
 import { readLastInboundAt } from "./daemon.js";
 import { clearPausedMarker } from "./pause-marker.js";
 import { getTmuxSession } from "./config.js";
@@ -88,6 +89,8 @@ const MODEL_SELECT_CALLBACK_PREFIX = "model-select:";
 const CLI_ENV_TTL_MS = 24 * 60 * 60 * 1000; // /model reads cached CLI env within 24h
 export class FleetManager {
     dataDir;
+    static signalTarget = null;
+    static sighupHandlerInstalled = false;
     children = new Map();
     lifecycle;
     /** @deprecated Use lifecycle.daemons — kept for backward compat */
@@ -112,6 +115,12 @@ export class FleetManager {
     instanceIpcClients = new Map();
     scheduler = null;
     configPath = "";
+    /** SIGHUPs received before startAll finishes are replayed once startup is safe. */
+    startupComplete = false;
+    /** Coalesces one or more SIGHUPs into at most one follow-up reconciliation. */
+    reloadPending = false;
+    /** A running reconciliation; only one may mutate lifecycle/config state at a time. */
+    reconcileInFlight = null;
     logger = createLogger("info");
     topicCommands;
     // sessionName → instanceName mapping for external sessions
@@ -174,11 +183,46 @@ export class FleetManager {
     viewToken = null;
     constructor(dataDir) {
         this.dataDir = dataDir;
+        FleetManager.signalTarget = this;
+        if (!FleetManager.sighupHandlerInstalled) {
+            process.on("SIGHUP", () => FleetManager.signalTarget?.handleSighup());
+            FleetManager.sighupHandlerInstalled = true;
+        }
         this.lifecycle = new InstanceLifecycle(this);
         this.topicCommands = new TopicCommands(this);
         this.topicArchiver = new TopicArchiver(this);
         this.statuslineWatcher = new StatuslineWatcher(this);
     }
+    handleSighup() {
+        this.logger.info("Received SIGHUP, hot-reloading config...");
+        if (!this.startupComplete) {
+            this.reloadPending = true;
+            this.logger.info("Fleet startup is still in progress — queued config reload");
+            return;
+        }
+        this.scheduleReconcile();
+    }
+    scheduleReconcile() {
+        if (this.reconcileInFlight) {
+            this.reloadPending = true;
+            this.logger.info("Config reconciliation already running — coalesced reload request");
+            return;
+        }
+        this.reloadPending = false;
+        this.reconcileInFlight = this.reconcileInstances()
+            .catch(err => this.logger.error({ err }, "SIGHUP config reload failed"))
+            .finally(() => {
+            this.reconcileInFlight = null;
+            if (this.reloadPending && this.startupComplete) {
+                this.scheduleReconcile();
+            }
+        });
+    }
+    finishStartup() {
+        this.startupComplete = true;
+        if (this.reloadPending)
+            this.scheduleReconcile();
+    }
     // ── ArchiverContext bridge ────────────────────────────────────────────
     lastActivityMs(name) {
         return this.lastActivity.get(name) ?? 0;
@@ -796,6 +840,8 @@ export class FleetManager {
     }
     /** Start all instances from fleet config */
     async startAll(configPath) {
+        FleetManager.signalTarget = this;
+        this.startupComplete = false;
         this.configPath = configPath;
         this.loadEnvFile();
         // Rotate fleet.log if oversized (before any logging)
@@ -1184,14 +1230,6 @@ export class FleetManager {
             this.checkForUpdates();
             this.updateCheckTimer = setInterval(() => this.checkForUpdates(), 24 * 60 * 60 * 1000);
         }, 60 * 60 * 1000);
-        // SIGHUP: hot-reload instance config (add/remove/restart instances)
-        const onSighup = () => {
-            this.logger.info("Received SIGHUP, hot-reloading config...");
-            this.reconcileInstances()
-                .catch(err => this.logger.error({ err }, "SIGHUP config reload failed"));
-            process.once("SIGHUP", onSighup);
-        };
-        process.once("SIGHUP", onSighup);
         const onRestart = () => {
             this.logger.info("Received SIGUSR2, initiating graceful restart...");
             this.restartInstances()
@@ -1213,6 +1251,10 @@ export class FleetManager {
             });
         };
         process.once("SIGUSR1", onFullRestart);
+        // A SIGHUP may arrive after the PID/general is available but before the
+        // rest of startup finishes. Replay one coalesced reload only after all
+        // startup-owned lifecycle work and signal handlers are in place.
+        this.finishStartup();
     }
     /**
      * Delete inbox files older than retentionDays (by mtime). Cleans the shared
@@ -4744,6 +4786,8 @@ When users create specialized instances, suggest these configurations:
         return t("classic.stopped");
     }
     async stopAll() {
+        this.startupComplete = false;
+        this.reloadPending = false;
         this.ipcStoppingInstances.add("__fleet_stopping__");
         sdNotify("STOPPING=1");
         if (this.watchdogTimer) {
@@ -4951,7 +4995,40 @@ When users create specialized instances, suggest these configurations:
         if (!this.configPath)
             return;
         const oldConfig = this.fleetConfig;
-        this.loadConfig(this.configPath);
+        const previousRawConfig = this.rawFleetConfig;
+        const previousRawDocument = this.rawFleetDocument;
+        const previousSavedSnapshot = this.savedFleetConfigSnapshot;
+        try {
+            this.loadConfig(this.configPath);
+        }
+        catch (err) {
+            this.fleetConfig = oldConfig;
+            this.rawFleetConfig = previousRawConfig;
+            this.rawFleetDocument = previousRawDocument;
+            this.savedFleetConfigSnapshot = previousSavedSnapshot;
+            throw err;
+        }
+        const validation = validateFleetConfig(this.rawFleetConfig);
+        const oldCount = Object.keys(oldConfig?.instances ?? {}).length;
+        const newCount = Object.keys(this.fleetConfig?.instances ?? {}).length;
+        const removedRatio = oldCount > 0 && newCount < oldCount
+            ? (oldCount - newCount) / oldCount
+            : 0;
+        const unsafeEmpty = oldCount > 0 && newCount === 0;
+        const unsafeBulkRemoval = removedRatio > 0.5;
+        if (!validation.valid || unsafeEmpty || unsafeBulkRemoval) {
+            this.fleetConfig = oldConfig;
+            this.rawFleetConfig = previousRawConfig;
+            this.rawFleetDocument = previousRawDocument;
+            this.savedFleetConfigSnapshot = previousSavedSnapshot;
+            this.logger.error({
+                oldCount,
+                newCount,
+                removedRatio,
+                validationErrors: validation.errors,
+            }, "Refusing unsafe fleet config reload; running configuration was kept");
+            return;
+        }
         this.routing.rebuild(this.fleetConfig);
         this.reregisterClassicChannels();
         this.scheduler?.reload();