@aristanetworks/eos-mcp-server 0.8.0-beta → 0.9.0-beta

package/dist/config/schema.d.ts

@@ -2,60 +2,70 @@ import { z } from "zod";
 export declare const serverConfigFileSchema: z.ZodObject<{
     version: z.ZodOptional<z.ZodLiteral<1>>;
     diagnostics: z.ZodOptional<z.ZodEffects<z.ZodObject<{
-        stateFile: z.ZodOptional<z.ZodString>;
+        stateFile: z.ZodOptional<z.ZodNever>;
         defaultPingCount: z.ZodDefault<z.ZodNumber>;
         maxPingCount: z.ZodDefault<z.ZodNumber>;
         maxProbesPerRequest: z.ZodDefault<z.ZodNumber>;
         maxDestinationsPerRequest: z.ZodDefault<z.ZodNumber>;
         deviceConcurrency: z.ZodDefault<z.ZodNumber>;
+        maxConcurrentDiagnostics: z.ZodDefault<z.ZodNumber>;
         pingReplyTimeoutMs: z.ZodDefault<z.ZodNumber>;
         commandTimeoutMs: z.ZodDefault<z.ZodNumber>;
         httpTimeoutMs: z.ZodDefault<z.ZodNumber>;
         overallOperationTimeoutMs: z.ZodDefault<z.ZodNumber>;
+        nativeRequestTimeout: z.ZodDefault<z.ZodBoolean>;
     }, "strict", z.ZodTypeAny, {
         defaultPingCount: number;
         maxPingCount: number;
         maxProbesPerRequest: number;
         maxDestinationsPerRequest: number;
         deviceConcurrency: number;
+        maxConcurrentDiagnostics: number;
         pingReplyTimeoutMs: number;
         commandTimeoutMs: number;
         httpTimeoutMs: number;
         overallOperationTimeoutMs: number;
-        stateFile?: string | undefined;
+        nativeRequestTimeout: boolean;
+        stateFile?: undefined;
     }, {
-        stateFile?: string | undefined;
+        stateFile?: undefined;
         defaultPingCount?: number | undefined;
         maxPingCount?: number | undefined;
         maxProbesPerRequest?: number | undefined;
         maxDestinationsPerRequest?: number | undefined;
         deviceConcurrency?: number | undefined;
+        maxConcurrentDiagnostics?: number | undefined;
         pingReplyTimeoutMs?: number | undefined;
         commandTimeoutMs?: number | undefined;
         httpTimeoutMs?: number | undefined;
         overallOperationTimeoutMs?: number | undefined;
+        nativeRequestTimeout?: boolean | undefined;
     }>, {
         defaultPingCount: number;
         maxPingCount: number;
         maxProbesPerRequest: number;
         maxDestinationsPerRequest: number;
         deviceConcurrency: number;
+        maxConcurrentDiagnostics: number;
         pingReplyTimeoutMs: number;
         commandTimeoutMs: number;
         httpTimeoutMs: number;
         overallOperationTimeoutMs: number;
-        stateFile?: string | undefined;
+        nativeRequestTimeout: boolean;
+        stateFile?: undefined;
     }, {
-        stateFile?: string | undefined;
+        stateFile?: undefined;
         defaultPingCount?: number | undefined;
         maxPingCount?: number | undefined;
         maxProbesPerRequest?: number | undefined;
         maxDestinationsPerRequest?: number | undefined;
         deviceConcurrency?: number | undefined;
+        maxConcurrentDiagnostics?: number | undefined;
         pingReplyTimeoutMs?: number | undefined;
         commandTimeoutMs?: number | undefined;
         httpTimeoutMs?: number | undefined;
         overallOperationTimeoutMs?: number | undefined;
+        nativeRequestTimeout?: boolean | undefined;
     }>>;
     inventory: z.ZodOptional<z.ZodString>;
     actor: z.ZodOptional<z.ZodString>;
@@ -64,6 +74,7 @@ export declare const serverConfigFileSchema: z.ZodObject<{
     readTimeoutMs: z.ZodOptional<z.ZodNumber>;
     overallOperationTimeoutMs: z.ZodOptional<z.ZodNumber>;
     deviceConcurrency: z.ZodOptional<z.ZodNumber>;
+    readFanOut: z.ZodOptional<z.ZodNumber>;
     maxReadTargets: z.ZodOptional<z.ZodNumber>;
     maxShowCommandsPerRequest: z.ZodOptional<z.ZodNumber>;
     maxLoggingMessagesPerRequest: z.ZodOptional<z.ZodNumber>;
@@ -96,17 +107,20 @@ export declare const serverConfigFileSchema: z.ZodObject<{
         maxProbesPerRequest: number;
         maxDestinationsPerRequest: number;
         deviceConcurrency: number;
+        maxConcurrentDiagnostics: number;
         pingReplyTimeoutMs: number;
         commandTimeoutMs: number;
         httpTimeoutMs: number;
         overallOperationTimeoutMs: number;
-        stateFile?: string | undefined;
+        nativeRequestTimeout: boolean;
+        stateFile?: undefined;
     } | undefined;
     inventory?: string | undefined;
     actor?: string | undefined;
     logFile?: string | undefined;
     caFile?: string | undefined;
     readTimeoutMs?: number | undefined;
+    readFanOut?: number | undefined;
     maxReadTargets?: number | undefined;
     maxShowCommandsPerRequest?: number | undefined;
     maxLoggingMessagesPerRequest?: number | undefined;
@@ -124,22 +138,25 @@ export declare const serverConfigFileSchema: z.ZodObject<{
     overallOperationTimeoutMs?: number | undefined;
     version?: 1 | undefined;
     diagnostics?: {
-        stateFile?: string | undefined;
+        stateFile?: undefined;
         defaultPingCount?: number | undefined;
         maxPingCount?: number | undefined;
         maxProbesPerRequest?: number | undefined;
         maxDestinationsPerRequest?: number | undefined;
         deviceConcurrency?: number | undefined;
+        maxConcurrentDiagnostics?: number | undefined;
         pingReplyTimeoutMs?: number | undefined;
         commandTimeoutMs?: number | undefined;
         httpTimeoutMs?: number | undefined;
         overallOperationTimeoutMs?: number | undefined;
+        nativeRequestTimeout?: boolean | undefined;
     } | undefined;
     inventory?: string | undefined;
     actor?: string | undefined;
     logFile?: string | undefined;
     caFile?: string | undefined;
     readTimeoutMs?: number | undefined;
+    readFanOut?: number | undefined;
     maxReadTargets?: number | undefined;
     maxShowCommandsPerRequest?: number | undefined;
     maxLoggingMessagesPerRequest?: number | undefined;
@@ -153,63 +170,73 @@ export declare const serverConfigFileSchema: z.ZodObject<{
         mcpPasswordEnv?: string | undefined;
     } | undefined;
 }>;
-export declare const resolvedServerConfigSchema: z.ZodObject<{
+export declare const resolvedServerConfigSchema: z.ZodEffects<z.ZodObject<{
     configPath: z.ZodOptional<z.ZodString>;
     diagnostics: z.ZodDefault<z.ZodEffects<z.ZodObject<{
-        stateFile: z.ZodOptional<z.ZodString>;
+        stateFile: z.ZodOptional<z.ZodNever>;
         defaultPingCount: z.ZodDefault<z.ZodNumber>;
         maxPingCount: z.ZodDefault<z.ZodNumber>;
         maxProbesPerRequest: z.ZodDefault<z.ZodNumber>;
         maxDestinationsPerRequest: z.ZodDefault<z.ZodNumber>;
         deviceConcurrency: z.ZodDefault<z.ZodNumber>;
+        maxConcurrentDiagnostics: z.ZodDefault<z.ZodNumber>;
         pingReplyTimeoutMs: z.ZodDefault<z.ZodNumber>;
         commandTimeoutMs: z.ZodDefault<z.ZodNumber>;
         httpTimeoutMs: z.ZodDefault<z.ZodNumber>;
         overallOperationTimeoutMs: z.ZodDefault<z.ZodNumber>;
+        nativeRequestTimeout: z.ZodDefault<z.ZodBoolean>;
     }, "strict", z.ZodTypeAny, {
         defaultPingCount: number;
         maxPingCount: number;
         maxProbesPerRequest: number;
         maxDestinationsPerRequest: number;
         deviceConcurrency: number;
+        maxConcurrentDiagnostics: number;
         pingReplyTimeoutMs: number;
         commandTimeoutMs: number;
         httpTimeoutMs: number;
         overallOperationTimeoutMs: number;
-        stateFile?: string | undefined;
+        nativeRequestTimeout: boolean;
+        stateFile?: undefined;
     }, {
-        stateFile?: string | undefined;
+        stateFile?: undefined;
         defaultPingCount?: number | undefined;
         maxPingCount?: number | undefined;
         maxProbesPerRequest?: number | undefined;
         maxDestinationsPerRequest?: number | undefined;
         deviceConcurrency?: number | undefined;
+        maxConcurrentDiagnostics?: number | undefined;
         pingReplyTimeoutMs?: number | undefined;
         commandTimeoutMs?: number | undefined;
         httpTimeoutMs?: number | undefined;
         overallOperationTimeoutMs?: number | undefined;
+        nativeRequestTimeout?: boolean | undefined;
     }>, {
         defaultPingCount: number;
         maxPingCount: number;
         maxProbesPerRequest: number;
         maxDestinationsPerRequest: number;
         deviceConcurrency: number;
+        maxConcurrentDiagnostics: number;
         pingReplyTimeoutMs: number;
         commandTimeoutMs: number;
         httpTimeoutMs: number;
         overallOperationTimeoutMs: number;
-        stateFile?: string | undefined;
+        nativeRequestTimeout: boolean;
+        stateFile?: undefined;
     }, {
-        stateFile?: string | undefined;
+        stateFile?: undefined;
         defaultPingCount?: number | undefined;
         maxPingCount?: number | undefined;
         maxProbesPerRequest?: number | undefined;
         maxDestinationsPerRequest?: number | undefined;
         deviceConcurrency?: number | undefined;
+        maxConcurrentDiagnostics?: number | undefined;
         pingReplyTimeoutMs?: number | undefined;
         commandTimeoutMs?: number | undefined;
         httpTimeoutMs?: number | undefined;
         overallOperationTimeoutMs?: number | undefined;
+        nativeRequestTimeout?: boolean | undefined;
     }>>;
     inventoryPath: z.ZodOptional<z.ZodString>;
     actor: z.ZodOptional<z.ZodString>;
@@ -217,7 +244,10 @@ export declare const resolvedServerConfigSchema: z.ZodObject<{
     caFile: z.ZodOptional<z.ZodString>;
     readTimeoutMs: z.ZodDefault<z.ZodNumber>;
     overallOperationTimeoutMs: z.ZodOptional<z.ZodNumber>;
+    /** eAPI slots one host may hold across all calls, reads and diagnostics (ADR 0009). */
     deviceConcurrency: z.ZodDefault<z.ZodNumber>;
+    /** Hosts one read call contacts at once. */
+    readFanOut: z.ZodDefault<z.ZodNumber>;
     maxReadTargets: z.ZodDefault<z.ZodNumber>;
     maxShowCommandsPerRequest: z.ZodDefault<z.ZodNumber>;
     maxLoggingMessagesPerRequest: z.ZodDefault<z.ZodNumber>;
@@ -248,13 +278,16 @@ export declare const resolvedServerConfigSchema: z.ZodObject<{
         maxProbesPerRequest: number;
         maxDestinationsPerRequest: number;
         deviceConcurrency: number;
+        maxConcurrentDiagnostics: number;
         pingReplyTimeoutMs: number;
         commandTimeoutMs: number;
         httpTimeoutMs: number;
         overallOperationTimeoutMs: number;
-        stateFile?: string | undefined;
+        nativeRequestTimeout: boolean;
+        stateFile?: undefined;
     };
     readTimeoutMs: number;
+    readFanOut: number;
     maxReadTargets: number;
     maxShowCommandsPerRequest: number;
     maxLoggingMessagesPerRequest: number;
@@ -277,21 +310,96 @@ export declare const resolvedServerConfigSchema: z.ZodObject<{
     deviceConcurrency?: number | undefined;
     overallOperationTimeoutMs?: number | undefined;
     diagnostics?: {
-        stateFile?: string | undefined;
+        stateFile?: undefined;
         defaultPingCount?: number | undefined;
         maxPingCount?: number | undefined;
         maxProbesPerRequest?: number | undefined;
         maxDestinationsPerRequest?: number | undefined;
         deviceConcurrency?: number | undefined;
+        maxConcurrentDiagnostics?: number | undefined;
         pingReplyTimeoutMs?: number | undefined;
         commandTimeoutMs?: number | undefined;
         httpTimeoutMs?: number | undefined;
         overallOperationTimeoutMs?: number | undefined;
+        nativeRequestTimeout?: boolean | undefined;
     } | undefined;
     actor?: string | undefined;
     logFile?: string | undefined;
     caFile?: string | undefined;
     readTimeoutMs?: number | undefined;
+    readFanOut?: number | undefined;
+    maxReadTargets?: number | undefined;
+    maxShowCommandsPerRequest?: number | undefined;
+    maxLoggingMessagesPerRequest?: number | undefined;
+    maxResponseSizeBytes?: number | undefined;
+    eapiVersion?: 1 | "latest" | undefined;
+    secretEnvPrefixes?: string[] | undefined;
+    defaultConnection?: {
+        ansibleUser?: string | undefined;
+        ansibleHttpapiPort?: number | undefined;
+        mcpValidateCerts?: boolean | undefined;
+        mcpPasswordEnv?: string | undefined;
+    } | undefined;
+    configPath?: string | undefined;
+    inventoryPath?: string | undefined;
+}>, {
+    deviceConcurrency: number;
+    diagnostics: {
+        defaultPingCount: number;
+        maxPingCount: number;
+        maxProbesPerRequest: number;
+        maxDestinationsPerRequest: number;
+        deviceConcurrency: number;
+        maxConcurrentDiagnostics: number;
+        pingReplyTimeoutMs: number;
+        commandTimeoutMs: number;
+        httpTimeoutMs: number;
+        overallOperationTimeoutMs: number;
+        nativeRequestTimeout: boolean;
+        stateFile?: undefined;
+    };
+    readTimeoutMs: number;
+    readFanOut: number;
+    maxReadTargets: number;
+    maxShowCommandsPerRequest: number;
+    maxLoggingMessagesPerRequest: number;
+    maxResponseSizeBytes: number;
+    eapiVersion: 1 | "latest";
+    secretEnvPrefixes: string[];
+    defaultConnection: {
+        ansibleUser?: string | undefined;
+        ansibleHttpapiPort?: number | undefined;
+        mcpValidateCerts?: boolean | undefined;
+        mcpPasswordEnv?: string | undefined;
+    };
+    overallOperationTimeoutMs?: number | undefined;
+    actor?: string | undefined;
+    logFile?: string | undefined;
+    caFile?: string | undefined;
+    configPath?: string | undefined;
+    inventoryPath?: string | undefined;
+}, {
+    deviceConcurrency?: number | undefined;
+    overallOperationTimeoutMs?: number | undefined;
+    diagnostics?: {
+        stateFile?: undefined;
+        defaultPingCount?: number | undefined;
+        maxPingCount?: number | undefined;
+        maxProbesPerRequest?: number | undefined;
+        maxDestinationsPerRequest?: number | undefined;
+        deviceConcurrency?: number | undefined;
+        maxConcurrentDiagnostics?: number | undefined;
+        pingReplyTimeoutMs?: number | undefined;
+        commandTimeoutMs?: number | undefined;
+        httpTimeoutMs?: number | undefined;
+        overallOperationTimeoutMs?: number | undefined;
+        nativeRequestTimeout?: boolean | undefined;
+    } | undefined;
+    actor?: string | undefined;
+    logFile?: string | undefined;
+    caFile?: string | undefined;
+    readTimeoutMs?: number | undefined;
+    readFanOut?: number | undefined;
     maxReadTargets?: number | undefined;
     maxShowCommandsPerRequest?: number | undefined;
     maxLoggingMessagesPerRequest?: number | undefined;

package/dist/config/schema.js

@@ -12,6 +12,7 @@ export const serverConfigFileSchema = z
     readTimeoutMs: z.number().int().positive().optional(),
     overallOperationTimeoutMs: z.number().int().positive().optional(),
     deviceConcurrency: z.number().int().positive().optional(),
+    readFanOut: z.number().int().positive().optional(),
     maxReadTargets: z.number().int().positive().optional(),
     maxShowCommandsPerRequest: z.number().int().positive().optional(),
     maxLoggingMessagesPerRequest: z.number().int().positive().max(9999).optional(),
@@ -38,7 +39,10 @@ export const resolvedServerConfigSchema = z
     caFile: z.string().min(1).optional(),
     readTimeoutMs: z.number().int().positive().default(10_000),
     overallOperationTimeoutMs: z.number().int().positive().optional(),
-    deviceConcurrency: z.number().int().positive().default(5),
+    /** eAPI slots one host may hold across all calls, reads and diagnostics (ADR 0009). */
+    deviceConcurrency: z.number().int().positive().default(3),
+    /** Hosts one read call contacts at once. */
+    readFanOut: z.number().int().positive().default(10),
     maxReadTargets: z.number().int().positive().default(50),
     maxShowCommandsPerRequest: z.number().int().positive().default(5),
     maxLoggingMessagesPerRequest: z.number().int().positive().max(9999).default(1000),
@@ -53,5 +57,14 @@ export const resolvedServerConfigSchema = z
         mcpPasswordEnv: z.string().min(1).optional()
     })
         .default({})
+})
+    .superRefine((config, context) => {
+    if (config.diagnostics.deviceConcurrency > config.deviceConcurrency) {
+        context.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["diagnostics", "deviceConcurrency"],
+            message: "Must not exceed the top-level deviceConcurrency, which covers reads and diagnostics together"
+        });
+    }
 });
 //# sourceMappingURL=schema.js.map

package/dist/config/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}

package/dist/connection/eosDeviceReader.d.ts

@@ -1,6 +1,7 @@
 import type { ResolvedServerConfig } from "../config/schema.js";
 import type { EosCommandResult, EosCommandRunner, EapiOutputMode, RunShowCommandOptions } from "../eapi/types.js";
 import type { InventoryHostModel } from "../inventory/types.js";
+import type { EapiSlots } from "../operations/eapiSlots.js";
 /**
  * Runs EOS read commands for an inventory host.
  *
@@ -10,9 +11,13 @@ import type { InventoryHostModel } from "../inventory/types.js";
 export interface EosDeviceReader {
     runShowCommands(host: InventoryHostModel, commands: string[], outputMode: EapiOutputMode, options?: RunShowCommandOptions): Promise<EosCommandResult[]>;
 }
+/** Each request first waits for one of the host's shared eAPI slots and frees it when the request
+ * settles (ADR 0009), so `readTimeoutMs` starts at dispatch, not while queued.
+ */
 export declare class EapiDeviceReader implements EosDeviceReader {
     private readonly config;
     private readonly runner;
-    constructor(config: ResolvedServerConfig, runner: EosCommandRunner);
+    private readonly slots;
+    constructor(config: ResolvedServerConfig, runner: EosCommandRunner, slots: EapiSlots);
     runShowCommands(host: InventoryHostModel, commands: string[], outputMode: EapiOutputMode, options?: RunShowCommandOptions): Promise<EosCommandResult[]>;
 }

package/dist/connection/eosDeviceReader.js

@@ -1,13 +1,24 @@
 import { resolveEapiConnection } from "./resolveConnection.js";
+/** Each request first waits for one of the host's shared eAPI slots and frees it when the request
+ * settles (ADR 0009), so `readTimeoutMs` starts at dispatch, not while queued.
+ */
 export class EapiDeviceReader {
     config;
     runner;
-    constructor(config, runner) {
+    slots;
+    constructor(config, runner, slots) {
         this.config = config;
         this.runner = runner;
+        this.slots = slots;
     }
-    runShowCommands(host, commands, outputMode, options) {
-        return this.runner.runShowCommands(resolveEapiConnection(this.config, host), commands, outputMode, options);
+    async runShowCommands(host, commands, outputMode, options) {
+        const release = await this.slots.acquireRead(options?.signal, host.inventoryHostname);
+        try {
+            return await this.runner.runShowCommands(resolveEapiConnection(this.config, host), commands, outputMode, options);
+        }
+        finally {
+            release();
+        }
     }
 }
 //# sourceMappingURL=eosDeviceReader.js.map

package/dist/connection/eosDeviceReader.js.map

@@ -1 +1 @@
-{"version":3,"file":"eosDeviceReader.js","sourceRoot":"","sources":["../../src/connection/eosDeviceReader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAiB/D,MAAM,OAAO,gBAAgB;IAER;IACA;IAFnB,YACmB,MAA4B,EAC5B,MAAwB;QADxB,WAAM,GAAN,MAAM,CAAsB;QAC5B,WAAM,GAAN,MAAM,CAAkB;IACxC,CAAC;IAEJ,eAAe,CACb,IAAwB,EACxB,QAAkB,EAClB,UAA0B,EAC1B,OAA+B;QAE/B,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAChC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EACxC,QAAQ,EACR,UAAU,EACV,OAAO,CACR,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"eosDeviceReader.js","sourceRoot":"","sources":["../../src/connection/eosDeviceReader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAiB/D;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAER;IACA;IACA;IAHnB,YACmB,MAA4B,EAC5B,MAAwB,EACxB,KAAgB;QAFhB,WAAM,GAAN,MAAM,CAAsB;QAC5B,WAAM,GAAN,MAAM,CAAkB;QACxB,UAAK,GAAL,KAAK,CAAW;IAChC,CAAC;IAEJ,KAAK,CAAC,eAAe,CACnB,IAAwB,EACxB,QAAkB,EAClB,UAA0B,EAC1B,OAA+B;QAE/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtF,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CACtC,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EACxC,QAAQ,EACR,UAAU,EACV,OAAO,CACR,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;CACF"}

package/dist/diagnostics/eapiRunner.js

@@ -19,7 +19,13 @@ export class EapiDiagnosticRunner {
             throw new DiagnosticExecutionError(toErrorCode(error, "diagnostic_execution_failed"), toErrorMessage(error), "not_dispatched");
         }
         try {
-            const results = await this.runner.runTextCommands(connection, [buildPingCommand(request)], { enable: true, signal: context.signal, requestId: context.requestId });
+            const results = await this.runner.runTextCommands(connection, [buildPingCommand(request)], {
+                enable: true,
+                signal: context.signal,
+                requestId: context.requestId,
+                // Lets EOS stop the command itself at the same budget the server holds an uncertain slot for.
+                ...(this.config.diagnostics.nativeRequestTimeout ? { requestTimeoutSeconds: this.config.diagnostics.commandTimeoutMs / 1000 } : {})
+            });
             const output = results[0]?.output;
             if (results.length !== 1 || typeof output !== "string") {
                 throw new DiagnosticExecutionError("diagnostic_output_unrecognized", "Expected one text result from EOS", "unknown");

package/dist/diagnostics/eapiRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"eapiRunner.js","sourceRoot":"","sources":["../../src/diagnostics/eapiRunner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAG1E,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,MAAM,OAAO,oBAAoB;IACF;IAA+C;IAA5E,YAA6B,MAA4B,EAAmB,MAA4B;QAA3E,WAAM,GAAN,MAAM,CAAsB;QAAmB,WAAM,GAAN,MAAM,CAAsB;IAAG,CAAC;IAE5G,KAAK,CAAC,OAAO,CAAC,IAAwB,EAAE,OAA2B,EAAE,OAAmC;QACtG,IAAI,UAAgC,CAAC;QACrC,IAAI,CAAC;YACH,UAAU,GAAG,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;QACjH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,wBAAwB,CAAC,WAAW,CAAC,KAAK,EAAE,6BAA6B,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;QACjI,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YACnK,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;YAClC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACvD,MAAM,IAAI,wBAAwB,CAAC,gCAAgC,EAAE,mCAAmC,EAAE,SAAS,CAAC,CAAC;YACvH,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,wEAAwE;YACxE,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC;YAC/D,IAAI,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,4BAA4B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAAE,MAAM,KAAK,CAAC;YACrI,MAAM,IAAI,GAAG,KAAK,YAAY,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACzE,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBAC9B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3H,CAAC,CAAC,SAAS,CAAC;YACd,uEAAuE;YACvE,sEAAsE;YACtE,MAAM,IAAI,wBAAwB,CAAC,IAAI,EAAE,kCAAkC,IAAI,GAAG,EAAE,SAAS,EAAE;gBAC7F,UAAU,EAAE,IAAI,IAAI,cAAc,CAAC,KAAK,CAAC;aAC1C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"eapiRunner.js","sourceRoot":"","sources":["../../src/diagnostics/eapiRunner.ts"],"names":[],"mappings":"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"}

package/dist/diagnostics/executor.d.ts

@@ -1,7 +1,7 @@
 import type { ResolvedServerConfig } from "../config/schema.js";
 import type { InventoryModel } from "../inventory/types.js";
 import { type ReadDeviceResultBase, type ReadOperationResultEnvelope } from "../operations/readExecution.js";
-import type { DiagnosticJournal } from "./journalTypes.js";
+import { EapiSlots } from "../operations/eapiSlots.js";
 import type { DiagnosticCapacitySnapshot, DiagnosticDeviceRunner, DiagnosticFinding, DiagnosticRequest, ResolvedDiagnosticRequest } from "./types.js";
 export interface DiagnosticDeviceResult extends ReadDeviceResultBase {
     destination: string;
@@ -11,14 +11,17 @@ export interface DiagnosticDeviceResult extends ReadDeviceResultBase {
 export type DiagnosticResult = ReadOperationResultEnvelope<DiagnosticDeviceResult> & {
     request: ResolvedDiagnosticRequest;
 };
-/** Owns policy, budgets, fan-out, global admission, cancellation, and result normalization. */
+/** Owns policy, budgets, fan-out, cancellation, and result normalization. Admission, per device and
+ * server-wide, belongs to the EapiSlots it shares with read tools.
+ */
 export declare class DiagnosticExecutor {
     private readonly model;
     private readonly config;
     private readonly runner;
-    private readonly concurrency;
+    private readonly slots;
     private readonly shutdown;
-    constructor(model: InventoryModel, config: ResolvedServerConfig, runner: DiagnosticDeviceRunner, journal?: DiagnosticJournal);
+    /** A running server passes its shared `slots`; tests may omit it to get a private instance. */
+    constructor(model: InventoryModel, config: ResolvedServerConfig, runner: DiagnosticDeviceRunner, slots?: EapiSlots);
     close(): void;
     getCapacity(): DiagnosticCapacitySnapshot;
     execute(options: {

package/dist/diagnostics/executor.js

@@ -1,31 +1,34 @@
 import { AppError, toErrorCode } from "../core/errors.js";
 import { resolveInventoryTarget } from "../inventory/resolveTarget.js";
-import { buildDeviceResultSummary, buildReadDeviceFailure, buildReadDeviceSuccess, buildReadOperationResultEnvelope, enforceReadTargetLimit, mapWithConcurrency, runWithOperationTimeout } from "../operations/readExecution.js";
-import { DiagnosticConcurrency } from "./concurrency.js";
+import { buildDeviceResultSummary, buildReadDeviceFailure, buildReadDeviceSuccess, buildReadOperationResultEnvelope, enforceReadTargetLimit, runWithOperationTimeout } from "../operations/readExecution.js";
+import { EapiSlots, eapiSlotLimits } from "../operations/eapiSlots.js";
 import { DiagnosticExecutionError } from "./executionError.js";
 import { pingDiagnostic } from "./ping.js";
 const diagnosticDefinitions = {
     ping: pingDiagnostic
 };
-/** Owns policy, budgets, fan-out, global admission, cancellation, and result normalization. */
+/** Owns policy, budgets, fan-out, cancellation, and result normalization. Admission, per device and
+ * server-wide, belongs to the EapiSlots it shares with read tools.
+ */
 export class DiagnosticExecutor {
     model;
     config;
     runner;
-    concurrency;
+    slots;
     shutdown = new AbortController();
-    constructor(model, config, runner, journal) {
+    /** A running server passes its shared `slots`; tests may omit it to get a private instance. */
+    constructor(model, config, runner, slots = new EapiSlots(eapiSlotLimits(config), config.diagnostics.commandTimeoutMs)) {
         this.model = model;
         this.config = config;
         this.runner = runner;
-        this.concurrency = new DiagnosticConcurrency(config.diagnostics.deviceConcurrency, journal);
+        this.slots = slots;
     }
     close() {
         this.shutdown.abort(new AppError("diagnostic_server_stopping", "Diagnostic executor is stopping"));
-        this.concurrency.close();
+        this.slots.close();
     }
     getCapacity() {
-        return this.concurrency.snapshot();
+        return this.slots.snapshot();
     }
     async execute(options) {
         const signal = options.signal === undefined ? this.shutdown.signal : AbortSignal.any([options.signal, this.shutdown.signal]);
@@ -34,7 +37,6 @@ export class DiagnosticExecutor {
         const operationName = `eos_${options.request.kind}`;
         const operationConfig = {
             ...this.config,
-            deviceConcurrency: this.config.diagnostics.deviceConcurrency,
             overallOperationTimeoutMs: this.config.diagnostics.overallOperationTimeoutMs
         };
         const resolvedTarget = resolveInventoryTarget(this.model, { target: options.target });
@@ -47,10 +49,10 @@ export class DiagnosticExecutor {
         if (resolvedTarget.resolvedHosts.length * probesPerHost > this.config.diagnostics.maxProbesPerRequest) {
             throw new AppError("diagnostic_probe_limit_exceeded", `Request exceeds maxProbesPerRequest ${this.config.diagnostics.maxProbesPerRequest}`);
         }
-        this.concurrency.assertUsableCapacity();
-        // Each host/execution pair takes its own reservation; results stay in host-then-execution order.
+        // Each host/execution pair takes its own reservation, and all are queued at once so the admission
+        // controller, not fan-out order, decides which device runs next. Results stay in host-then-execution order.
         const hostExecutions = resolvedTarget.resolvedHosts.flatMap((host) => prepared.executions.map((execution) => ({ host, execution })));
-        const results = await runWithOperationTimeout(operationConfig, operationName, (operationSignal) => mapWithConcurrency(hostExecutions, operationConfig.deviceConcurrency, async ({ host, execution }) => {
+        const results = await runWithOperationTimeout(operationConfig, operationName, (operationSignal) => Promise.all(hostExecutions.map(async ({ host, execution }) => {
             try {
                 return await this.runExecution(definition, host, execution, operationSignal, options.includeRaw === true);
             }
@@ -63,7 +65,7 @@ export class DiagnosticExecutor {
                         : {})
                 };
             }
-        }, operationSignal), signal);
+        })), signal);
         return buildReadOperationResultEnvelope(options.target, { resolvedTarget, results, summary: buildDeviceResultSummary(results) }, {
             extra: { request: prepared.request },
             responseSizeLimit: { config: this.config, operationName }
@@ -86,7 +88,7 @@ export class DiagnosticExecutor {
         }
     }
     async executeOnDevice(host, request, signal) {
-        const reservation = await this.concurrency.acquire(signal, { inventoryHostname: host.inventoryHostname, diagnostic: request.kind });
+        const reservation = await this.slots.acquireDiagnostic(signal, { inventoryHostname: host.inventoryHostname, diagnostic: request.kind });
         if (signal.aborted) {
             reservation.complete();
             throw new AppError("operation_aborted", "Diagnostic was cancelled before dispatch");

package/dist/diagnostics/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/diagnostics/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/diagnostics/executor.ts"],"names":[],"mappings":"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"}