@mcoda/agents 0.1.38 → 0.1.41

package/dist/AgentService/AgentService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AgentService.d.ts","sourceRoot":"","sources":["../../src/AgentService/AgentService.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EAKpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAY7C,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AA2LhG,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,sBAAsB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,qBAAa,YAAY;IAErB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;gBADP,IAAI,EAAE,gBAAgB,EACtB,OAAO,GAAE,mBAAwB;WAG9B,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC;IAKtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAUhD,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAIrE,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAInD,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YAIpD,kBAAkB;YAMlB,kBAAkB;IA6BhC,OAAO,CAAC,kBAAkB;IA+BpB,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IA4C/E,OAAO,CAAC,KAAK;YAIC,OAAO;YASP,UAAU;IAQxB,OAAO,CAAC,6BAA6B;YAOvB,mBAAmB;YAgCnB,uBAAuB;YAiBvB,gBAAgB;IAM9B,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,8BAA8B;IAStC,OAAO,CAAC,iBAAiB;YAOX,oBAAoB;YA6BpB,oBAAoB;YA6CpB,sBAAsB;YAkBtB,mBAAmB;YAUnB,4BAA4B;IAkCpC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAmBlD,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6H9E,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;YAwP5F,mBAAmB;YAkBnB,uBAAuB;YAwBvB,mBAAmB;CAYlC"}
+{"version":3,"file":"AgentService.d.ts","sourceRoot":"","sources":["../../src/AgentService/AgentService.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EAKpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAY7C,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAyMhG,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,sBAAsB,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,qBAAa,YAAY;IAErB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;gBADP,IAAI,EAAE,gBAAgB,EACtB,OAAO,GAAE,mBAAwB;WAG9B,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC;IAKtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAUhD,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAIrE,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAInD,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YAIpD,kBAAkB;YAMlB,kBAAkB;IA6BhC,OAAO,CAAC,kBAAkB;IAqCpB,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IA4C/E,OAAO,CAAC,KAAK;YAIC,OAAO;YASP,UAAU;IAQxB,OAAO,CAAC,6BAA6B;YAOvB,mBAAmB;YAgCnB,uBAAuB;YAiBvB,gBAAgB;IAM9B,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,8BAA8B;IAStC,OAAO,CAAC,iBAAiB;YAOX,oBAAoB;YA6BpB,oBAAoB;YA6CpB,sBAAsB;YAkBtB,mBAAmB;YAUnB,4BAA4B;IAkCpC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAmBlD,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6H9E,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;YAwP5F,mBAAmB;YAkBnB,uBAAuB;YAwBvB,mBAAmB;CAYlC"}

package/dist/AgentService/AgentService.js

@@ -56,6 +56,17 @@ const WINDOW_RESET_FALLBACK_MS = {
     weekly: 7 * 24 * 60 * 60 * 1000,
     other: 60 * 60 * 1000,
 };
+const isManagedMswarmCloudAgent = (agent) => {
+    const config = agent.config;
+    if (!config || typeof config !== "object" || Array.isArray(config)) {
+        return false;
+    }
+    const managed = config.mswarmCloud;
+    return Boolean(managed &&
+        typeof managed === "object" &&
+        !Array.isArray(managed) &&
+        managed.managed === true);
+};
 const isIoEnabled = () => {
     const raw = process.env[IO_ENV];
     if (!raw)
@@ -266,6 +277,10 @@ export class AgentService {
         if (adapterType.endsWith("-api")) {
             if (hasSecret)
                 return adapterType;
+            if (adapterType === "openai-api" && isManagedMswarmCloudAgent(agent)) {
+                const label = agent.slug ?? agent.id;
+                throw new Error(`AUTH_REQUIRED: Managed mswarm cloud agent ${label} is missing the synced API key; run \`mcoda config set mswarm-api-key <KEY>\` and \`mcoda cloud agent sync\`.`);
+            }
             if (adapterType === "codex-api" || adapterType === "openai-api") {
                 // Default to the codex CLI when API creds are missing.
                 adapterType = "codex-cli";

package/dist/adapters/openai/OpenAiAdapter.d.ts

@@ -25,6 +25,7 @@ export declare class OpenAiAdapter implements AgentAdapter {
     private ensureApiKey;
     private buildHeaders;
     private buildBody;
+    private buildHealthCheckBody;
 }
 export {};
 //# sourceMappingURL=OpenAiAdapter.d.ts.map

package/dist/adapters/openai/OpenAiAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenAiAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/openai/OpenAiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAwHtG,KAAK,YAAY,GAAG,aAAa,GAAG;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,qBAAa,aAAc,YAAW,YAAY;IAMpC,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,SAAS,CAAsC;gBAEnC,MAAM,EAAE,YAAY;IAUlC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IAkBnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwC5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;IAwFhG,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,SAAS;CAmBlB"}
+{"version":3,"file":"OpenAiAdapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/openai/OpenAiAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAiKtG,KAAK,YAAY,GAAG,aAAa,GAAG;IAClC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,qBAAa,aAAc,YAAW,YAAY;IAMpC,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,SAAS,CAAsC;gBAEnC,MAAM,EAAE,YAAY;IAUlC,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAIpC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;IA6GnC,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwC5D,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC;IAwFhG,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,SAAS;IAoBjB,OAAO,CAAC,oBAAoB;CAU7B"}

package/dist/adapters/openai/OpenAiAdapter.js

@@ -1,4 +1,13 @@
+import { parseUsageLimitError } from "../../AgentService/UsageLimitParser.js";
 const DEFAULT_BASE_URL = "https://api.openai.com/v1";
+const MAX_RESPONSE_DETAIL_CHARS = 500;
+const RATE_LIMIT_HEADER_NAMES = [
+    "retry-after",
+    "x-ratelimit-reset-after",
+    "x-ratelimit-reset",
+    "x-ratelimit-reset-at",
+    "x-ratelimit-remaining",
+];
 const asString = (value) => (typeof value === "string" ? value : undefined);
 const resolveString = (value) => {
     const raw = asString(value)?.trim();
@@ -11,6 +20,37 @@ const normalizeBaseUrl = (value) => {
         return undefined;
     return str.endsWith("/") ? str.slice(0, -1) : str;
 };
+const buildRateLimitProbeMessage = (response, responseText) => {
+    const parts = [`openai_probe http ${response.status}`];
+    const retryAfter = response.headers.get("retry-after")?.trim();
+    if (retryAfter) {
+        const retryAfterSeconds = Number.parseInt(retryAfter, 10);
+        parts.push(Number.isFinite(retryAfterSeconds) && retryAfterSeconds > 0
+            ? `Retry after ${retryAfterSeconds} seconds`
+            : `Retry after ${retryAfter}`);
+    }
+    for (const headerName of RATE_LIMIT_HEADER_NAMES) {
+        if (headerName === "retry-after")
+            continue;
+        const headerValue = response.headers.get(headerName)?.trim();
+        if (headerValue) {
+            parts.push(`${headerName}: ${headerValue}`);
+        }
+    }
+    const trimmedResponse = responseText.trim();
+    if (trimmedResponse) {
+        parts.push(trimmedResponse);
+    }
+    return parts.join(". ");
+};
+const resolveRetryAfterMs = (resetAt, nowMs) => {
+    if (!resetAt)
+        return undefined;
+    const timestampMs = Date.parse(resetAt);
+    if (!Number.isFinite(timestampMs))
+        return undefined;
+    return Math.max(0, timestampMs - nowMs);
+};
 const resolveBaseUrl = (config) => {
     const anyConfig = config;
     const agentConfig = config.agent?.config;
@@ -128,16 +168,105 @@ export class OpenAiAdapter {
                 agentId: this.config.agent.id,
                 status: "unreachable",
                 lastCheckedAt: new Date().toISOString(),
-                details: { reason: "missing_api_key" },
+                details: {
+                    adapter: "openai-api",
+                    source: "openai_probe",
+                    model: this.config.model,
+                    baseUrl: this.baseUrl,
+                    reason: "missing_api_key",
+                },
+            };
+        }
+        const startedAt = Date.now();
+        try {
+            const model = this.ensureModel();
+            const apiKey = this.ensureApiKey();
+            const url = this.ensureBaseUrl();
+            const response = await fetch(`${url}/chat/completions`, {
+                method: "POST",
+                headers: this.buildHeaders(apiKey, false),
+                body: JSON.stringify(this.buildHealthCheckBody(model)),
+            });
+            const responseText = await response.text().catch(() => "");
+            const checkedAtMs = Date.now();
+            const lastCheckedAt = new Date(checkedAtMs).toISOString();
+            const latencyMs = checkedAtMs - startedAt;
+            if (!response.ok) {
+                if (response.status === 429) {
+                    const parsedLimit = parseUsageLimitError(new Error(buildRateLimitProbeMessage(response, responseText)), checkedAtMs);
+                    return {
+                        agentId: this.config.agent.id,
+                        status: "healthy",
+                        lastCheckedAt,
+                        latencyMs,
+                        details: {
+                            adapter: "openai-api",
+                            source: "openai_probe",
+                            model,
+                            baseUrl: url,
+                            reason: "rate_limited",
+                            transient: true,
+                            rateLimited: true,
+                            httpStatus: response.status,
+                            response: responseText.slice(0, MAX_RESPONSE_DETAIL_CHARS),
+                            resetAt: parsedLimit?.resetAt,
+                            resetAtSource: parsedLimit?.resetAtSource,
+                            retryAfterMs: resolveRetryAfterMs(parsedLimit?.resetAt, checkedAtMs),
+                            windowTypes: parsedLimit?.windowTypes,
+                        },
+                    };
+                }
+                return {
+                    agentId: this.config.agent.id,
+                    status: "unreachable",
+                    lastCheckedAt,
+                    latencyMs,
+                    details: {
+                        adapter: "openai-api",
+                        source: "openai_probe",
+                        model,
+                        baseUrl: url,
+                        reason: "http_error",
+                        httpStatus: response.status,
+                        response: responseText.slice(0, MAX_RESPONSE_DETAIL_CHARS),
+                    },
+                };
+            }
+            return {
+                agentId: this.config.agent.id,
+                status: "healthy",
+                lastCheckedAt,
+                latencyMs,
+                details: {
+                    adapter: "openai-api",
+                    source: "openai_probe",
+                    model,
+                    baseUrl: url,
+                },
+            };
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const reason = /model is not configured/i.test(message)
+                ? "missing_model"
+                : /missing api key/i.test(message)
+                    ? "missing_api_key"
+                    : "probe_failed";
+            return {
+                agentId: this.config.agent.id,
+                status: "unreachable",
+                lastCheckedAt: new Date().toISOString(),
+                latencyMs: Date.now() - startedAt,
+                details: {
+                    adapter: "openai-api",
+                    source: "openai_probe",
+                    model: this.config.model,
+                    baseUrl: this.baseUrl,
+                    reason,
+                    error: message,
+                },
             };
         }
-        return {
-            agentId: this.config.agent.id,
-            status: "healthy",
-            lastCheckedAt: new Date().toISOString(),
-            latencyMs: 0,
-            details: { adapter: "openai-api", model: this.config.model, baseUrl: this.baseUrl },
-        };
     }
     async invoke(request) {
         const url = this.ensureBaseUrl();
@@ -321,4 +450,14 @@ export class OpenAiAdapter {
         }
         return body;
     }
+    buildHealthCheckBody(model) {
+        const body = this.buildBody("healthcheck", model, false);
+        if (body.max_tokens === undefined && body.max_completion_tokens === undefined) {
+            body.max_tokens = 1;
+        }
+        if (body.temperature === undefined) {
+            body.temperature = 0;
+        }
+        return body;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcoda/agents",
-  "version": "0.1.38",
+  "version": "0.1.41",
   "description": "Agent registry and capabilities for mcoda.",
   "type": "module",
   "main": "dist/index.js",
@@ -30,8 +30,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@mcoda/shared": "0.1.38",
-    "@mcoda/db": "0.1.38"
+    "@mcoda/shared": "0.1.41",
+    "@mcoda/db": "0.1.41"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",