@oscharko-dev/keiko 0.2.0-beta.2 → 0.2.0-beta.4

package/node_modules/@oscharko-dev/keiko-model-gateway/dist/http.js

@@ -77,9 +77,21 @@ function readCertificateFile(path) {
         return [];
     }
 }
+// One-time set of paths we have already warned about so the warning fires once per path.
+const warnedCaBundlePaths = new Set();
 function extraCaCertificates(caBundlePath) {
     const paths = [process.env.NODE_EXTRA_CA_CERTS, caBundlePath].filter((path) => path !== undefined && path.trim().length > 0);
-    return paths.flatMap((path) => readCertificateFile(path));
+    return paths.flatMap((path) => {
+        const certs = readCertificateFile(path);
+        // Warn once when a configured path yields no certificates so the operator
+        // can tell the file is missing or unreadable without throwing at startup.
+        if (certs.length === 0 && !warnedCaBundlePaths.has(path)) {
+            warnedCaBundlePaths.add(path);
+            // eslint-disable-next-line no-console
+            console.warn(`[keiko-model-gateway] CA bundle at ${path} could not be read or is empty`);
+        }
+        return certs;
+    });
 }
 function nodeCaCertificates(source) {
     const getter = tls.getCACertificates;
@@ -102,6 +114,10 @@ export function gatewayTrustedCaCertificates(caBundlePath) {
         ...extraCaCertificates(caBundlePath),
     ]));
 }
+// Exposed for tests to reset the one-time warning set between runs.
+export function _resetWarnedCaBundlePaths() {
+    warnedCaBundlePaths.clear();
+}
 function bodyToString(body) {
     if (body === undefined || body === null) {
         return undefined;
@@ -120,11 +136,15 @@ function bodyToString(body) {
 // the CA-bundle fallback streams tokens instead of buffering the whole response.
 export function streamingResponseFromNode(res, onCancel, maxBytes = MAX_RESPONSE_BYTES) {
     let total = 0;
+    let done = false;
     const body = new ReadableStream({
         start(controller) {
             res.on("data", (chunk) => {
+                if (done)
+                    return;
                 total += chunk.length;
                 if (total > maxBytes) {
+                    done = true;
                     controller.error(new Error("gateway response exceeded the size limit"));
                     onCancel();
                     return;
@@ -132,13 +152,20 @@ export function streamingResponseFromNode(res, onCancel, maxBytes = MAX_RESPONSE
                 controller.enqueue(new Uint8Array(chunk));
             });
             res.on("end", () => {
+                if (done)
+                    return;
+                done = true;
                 controller.close();
             });
             res.on("error", (error) => {
+                if (done)
+                    return;
+                done = true;
                 controller.error(error);
             });
         },
         cancel() {
+            done = true;
             onCancel();
         },
     });
@@ -148,9 +175,21 @@ export function streamingResponseFromNode(res, onCancel, maxBytes = MAX_RESPONSE
         headers: headersFromNode(res.headers),
     });
 }
-function fetchWithCaBundle(url, init, egress) {
+// Composes a caller-supplied AbortSignal with an AbortSignal.timeout so both
+// cancellation and deadline are observed. Returns undefined when neither is set.
+function composeSignal(callerSignal, timeoutMs) {
+    const timeoutSignal = timeoutMs !== undefined ? AbortSignal.timeout(timeoutMs) : undefined;
+    if (callerSignal != null && timeoutSignal !== undefined) {
+        return AbortSignal.any([callerSignal, timeoutSignal]);
+    }
+    if (callerSignal != null)
+        return callerSignal;
+    return timeoutSignal;
+}
+function fetchWithCaBundle(url, init, egress, maxResponseBytes) {
     const body = bodyToString(init.body);
     const headers = headersToRecord(init.headers);
+    const cap = maxResponseBytes ?? MAX_RESPONSE_BYTES;
     return new Promise((resolve, reject) => {
         const req = httpsRequest(url, {
             method: init.method ?? "GET",
@@ -158,7 +197,7 @@ function fetchWithCaBundle(url, init, egress) {
             ca: [...gatewayTrustedCaCertificates(egress?.caBundlePath)],
             signal: init.signal ?? undefined,
         }, (res) => {
-            resolve(streamingResponseFromNode(res, () => req.destroy()));
+            resolve(streamingResponseFromNode(res, () => req.destroy(), cap));
         });
         req.on("error", reject);
         req.end(body);
@@ -177,6 +216,14 @@ function defaultPort(protocol) {
 function targetPort(url) {
     return url.port.length > 0 ? url.port : defaultPort(url.protocol);
 }
+// Returns the Host header value for a target URL: omit the port when it is the
+// default for the scheme (443 for https, 80 for http) so the value matches what
+// undici sends directly and satisfies SigV4 pre-signed S3 URLs behind a proxy.
+function hostHeader(url) {
+    const isDefaultPort = (url.protocol === "https:" && (url.port === "" || url.port === "443")) ||
+        (url.protocol === "http:" && (url.port === "" || url.port === "80"));
+    return isDefaultPort ? url.hostname : `${url.hostname}:${url.port}`;
+}
 function noProxyRuleMatches(rule, host, hostPort) {
     if (rule.length === 0)
         return false;
@@ -239,19 +286,33 @@ const PROXY_UNREACHABLE_CODES = new Set([
     "EHOSTUNREACH",
     "ENETUNREACH",
 ]);
+const ABORT_ERROR_NAMES = new Set(["AbortError", "TimeoutError"]);
 function mapProxyError(error) {
     if (error instanceof OutboundHttpEgressError)
         return error;
     if (isRecoverableTlsTrustError(error)) {
         return new OutboundHttpEgressError("TLS_CA_FAILURE", "TLS certificate verification failed for outbound egress.");
     }
-    const code = isRecord(error) && typeof error.code === "string" ? error.code : undefined;
-    if (code !== undefined && PROXY_UNREACHABLE_CODES.has(code)) {
-        return new OutboundHttpEgressError("PROXY_UNREACHABLE", "Configured proxy is unreachable.");
+    if (error instanceof Error) {
+        const code = isRecord(error) ? error.code : undefined;
+        if ((typeof code === "string" && PROXY_UNREACHABLE_CODES.has(code)) ||
+            ABORT_ERROR_NAMES.has(error.name)) {
+            return new OutboundHttpEgressError("PROXY_UNREACHABLE", "Configured proxy is unreachable.");
+        }
+        return error;
+    }
+    return new OutboundHttpEgressError("PROXY_EGRESS_FAILED", "Outbound egress failed.");
+}
+const PROXY_UNREACHABLE_ERROR = new OutboundHttpEgressError("PROXY_UNREACHABLE", "Configured proxy is unreachable.");
+function attachAbortGuard(signal, onAbort) {
+    if (signal.aborted) {
+        onAbort();
+        return () => undefined;
     }
-    return error instanceof Error
-        ? error
-        : new OutboundHttpEgressError("PROXY_EGRESS_FAILED", "Outbound egress failed.");
+    signal.addEventListener("abort", onAbort, { once: true });
+    return () => {
+        signal.removeEventListener("abort", onAbort);
+    };
 }
 function openProxySocket(proxy, ca, signal) {
     const host = proxy.hostname;
@@ -278,23 +339,20 @@ function openProxySocket(proxy, ca, signal) {
         const onAbort = () => {
             socket.destroy();
             settle(() => {
-                reject(new DOMException("The operation was aborted.", "AbortError"));
+                reject(PROXY_UNREACHABLE_ERROR);
             });
         };
+        let removeAbort = () => undefined;
         const cleanup = () => {
             socket.off("error", onError);
-            signal?.removeEventListener("abort", onAbort);
+            removeAbort();
         };
         const socket = proxy.protocol === "https:"
             ? tls.connect({ host, port, servername: tlsServerName(host), ca: [...ca] }, onConnect)
             : netConnect({ host, port }, onConnect);
         socket.once("error", onError);
         if (signal !== undefined) {
-            if (signal.aborted) {
-                onAbort();
-                return;
-            }
-            signal.addEventListener("abort", onAbort, { once: true });
+            removeAbort = attachAbortGuard(signal, onAbort);
         }
     });
 }
@@ -302,16 +360,14 @@ function readConnectHeader(socket, signal) {
     return new Promise((resolve, reject) => {
         const chunks = [];
         let settled = false;
-        const cleanup = () => {
-            socket.off("data", onData);
-            socket.off("error", onError);
-            signal?.removeEventListener("abort", onAbort);
-        };
+        let removeAbort = () => undefined;
         const settle = (fn) => {
             if (settled)
                 return;
             settled = true;
-            cleanup();
+            socket.off("data", onData);
+            socket.off("error", onError);
+            removeAbort();
             fn();
         };
         const onData = (chunk) => {
@@ -335,17 +391,13 @@ function readConnectHeader(socket, signal) {
         const onAbort = () => {
             socket.destroy();
             settle(() => {
-                reject(new DOMException("The operation was aborted.", "AbortError"));
+                reject(PROXY_UNREACHABLE_ERROR);
             });
         };
         socket.on("data", onData);
         socket.once("error", onError);
         if (signal !== undefined) {
-            if (signal.aborted) {
-                onAbort();
-                return;
-            }
-            signal.addEventListener("abort", onAbort, { once: true });
+            removeAbort = attachAbortGuard(signal, onAbort);
         }
     });
 }
@@ -415,10 +467,15 @@ function responseFromClientRequest(start) {
         start(resolve, reject);
     });
 }
-function fetchHttpViaProxy(target, init, proxy, ca) {
+function fetchHttpViaProxy(target, init, proxy, ca, maxResponseBytes) {
     const body = bodyToString(init.body);
     const headers = headersToRecord(init.headers);
+    // Ensure Host header omits the default port (fixes SigV4 pre-signed S3 URLs).
+    if (!Object.prototype.hasOwnProperty.call(headers, "host")) {
+        headers.host = hostHeader(target);
+    }
     const request = proxy.protocol === "https:" ? httpsRequest : httpRequest;
+    const cap = maxResponseBytes ?? MAX_RESPONSE_BYTES;
     return responseFromClientRequest((resolve, reject) => {
         const req = request({
             protocol: proxy.protocol,
@@ -432,7 +489,7 @@ function fetchHttpViaProxy(target, init, proxy, ca) {
         }, (res) => {
             resolve(streamingResponseFromNode(res, () => {
                 req.destroy();
-            }));
+            }, cap));
         });
         req.on("error", (error) => {
             reject(mapProxyError(error));
@@ -440,13 +497,19 @@ function fetchHttpViaProxy(target, init, proxy, ca) {
         req.end(body);
     });
 }
-async function fetchHttpsViaProxy(target, init, proxy, ca) {
+async function fetchHttpsViaProxy(target, init, proxy, ca, maxResponseBytes) {
     const body = bodyToString(init.body);
     const headers = headersToRecord(init.headers);
     if (!Object.prototype.hasOwnProperty.call(headers, "connection")) {
         headers.connection = "close";
     }
+    // Ensure Host header omits :443 so it matches what undici sends directly and
+    // satisfies SigV4 pre-signed S3 URLs behind a proxy.
+    if (!Object.prototype.hasOwnProperty.call(headers, "host")) {
+        headers.host = hostHeader(target);
+    }
     const socket = await createTlsTunnel(target, proxy, ca, init.signal ?? undefined);
+    const cap = maxResponseBytes ?? MAX_RESPONSE_BYTES;
     return responseFromClientRequest((resolve, reject) => {
         const req = httpRequest({
             method: init.method ?? "GET",
@@ -459,7 +522,7 @@ async function fetchHttpsViaProxy(target, init, proxy, ca) {
         }, (res) => {
             resolve(streamingResponseFromNode(res, () => {
                 req.destroy();
-            }));
+            }, cap));
         });
         req.on("error", (error) => {
             reject(mapProxyError(error));
@@ -467,31 +530,38 @@ async function fetchHttpsViaProxy(target, init, proxy, ca) {
         req.end(body);
     });
 }
-function fetchViaProxy(target, init, proxyRaw, egress) {
+function fetchViaProxy(target, init, proxyRaw, egress, maxResponseBytes) {
     const proxy = parseProxyUrl(proxyRaw);
     const ca = gatewayTrustedCaCertificates(egress?.caBundlePath);
     return target.protocol === "https:"
-        ? fetchHttpsViaProxy(target, init, proxy, ca)
-        : fetchHttpViaProxy(target, init, proxy, ca);
+        ? fetchHttpsViaProxy(target, init, proxy, ca, maxResponseBytes)
+        : fetchHttpViaProxy(target, init, proxy, ca, maxResponseBytes);
 }
-export async function gatewayFetch(url, options = {}) {
-    const { fetchImpl, useCaFallback = fetchImpl === undefined, egress, ...init } = options;
-    const doFetch = fetchImpl ?? globalThis.fetch;
-    const target = new URL(url);
-    const proxy = fetchImpl === undefined ? proxyForTarget(target, egress) : undefined;
-    if (proxy !== undefined) {
-        return fetchViaProxy(target, init, proxy, egress);
-    }
+// Extracted from gatewayFetch to keep its cyclomatic complexity within the limit.
+async function fetchDirectWithCaFallback(url, init, doFetch, useCaFallback, egress, maxResponseBytes) {
     try {
         return await doFetch(url, init);
     }
     catch (error) {
         if (useCaFallback && usesHttps(url) && isRecoverableTlsTrustError(error)) {
-            return fetchWithCaBundle(url, init, egress);
+            return fetchWithCaBundle(url, init, egress, maxResponseBytes);
         }
         throw error;
     }
 }
+export async function gatewayFetch(url, options = {}) {
+    const { fetchImpl, useCaFallback = fetchImpl === undefined, egress, timeoutMs, maxResponseBytes, ...rest } = options;
+    // Compose caller signal + optional timeout into a single signal for all paths.
+    const composedSignal = composeSignal(rest.signal, timeoutMs);
+    const init = composedSignal !== undefined ? { ...rest, signal: composedSignal } : rest;
+    const doFetch = fetchImpl ?? globalThis.fetch;
+    const target = new URL(url);
+    const proxy = fetchImpl === undefined ? proxyForTarget(target, egress) : undefined;
+    if (proxy !== undefined) {
+        return fetchViaProxy(target, init, proxy, egress, maxResponseBytes);
+    }
+    return fetchDirectWithCaFallback(url, init, doFetch, useCaFallback, egress, maxResponseBytes);
+}
 export async function readJsonCapped(response, maxBytes = MAX_RESPONSE_BYTES) {
     if (response.body === null) {
         return response.json();

package/node_modules/@oscharko-dev/keiko-model-gateway/dist/qualityIntelligence/dispatcher.d.ts

@@ -20,5 +20,19 @@ export interface QualityIntelligenceDispatcherResult {
     readonly budget: QualityIntelligenceBudgetState;
     readonly cacheHit: boolean;
 }
+/**
+ * Compose a single Quality Intelligence model call with capability gate, budget reservation,
+ * prompt segmentation, replay cache, composed timeout/cancellation, and qi/* safe-error shaping.
+ *
+ * REUSABLE PRIMITIVE — NOT the current live path. The live generation/judge runtime
+ * (`keiko-server` generationPort.ts / judgePort.ts) deliberately calls the gateway `ModelPort`
+ * directly and applies its own capability gate + prompt segmentation, inheriting timeout / retry /
+ * circuit-breaking from the gateway resilience layer (`resilience.ts`) — the same machinery Chat
+ * and grounded-QA use. This dispatcher (and its budget / replayCache / circuitBreaker / cancellation
+ * helpers) is the ported-from-Test-Intelligence composition kept available for a future multi-call
+ * QI flow that wants combined budget + cache + circuit semantics at one call site. It must NOT be
+ * force-wired into the live ports (that would change the resilience contract) and must NOT be
+ * deleted as "dead code" (#279: ported TI ideas live here as generic gateway capabilities).
+ */
 export declare function dispatchQualityIntelligenceRequest(args: QualityIntelligenceDispatcherArgs): Promise<QualityIntelligenceDispatcherResult>;
 //# sourceMappingURL=dispatcher.d.ts.map

package/node_modules/@oscharko-dev/keiko-model-gateway/dist/qualityIntelligence/dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/qualityIntelligence/dispatcher.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAGV,eAAe,EACf,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,EAGL,KAAK,yCAAyC,EAC/C,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,kCAAkC,EACxC,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAExE,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,OAAO,EAAE,8BAA8B,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,yCAAyC,EAAE,CAAC;IACxE,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,kCAAkC,CAAC,kBAAkB,CAAC,CAAC;IACvE,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAC3C;AAED,MAAM,WAAW,mCAAmC;IAClD,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAuED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,iCAAiC,GACtC,OAAO,CAAC,mCAAmC,CAAC,CAuC9C"}
+{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/qualityIntelligence/dispatcher.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAGV,eAAe,EACf,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,EAGL,KAAK,yCAAyC,EAC/C,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,kCAAkC,EACxC,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,mBAAmB,CAAC;AACxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAExE,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,OAAO,EAAE,8BAA8B,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,yCAAyC,EAAE,CAAC;IACxE,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,kCAAkC,CAAC,kBAAkB,CAAC,CAAC;IACvE,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAC3C;AAED,MAAM,WAAW,mCAAmC;IAClD,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAChD,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAuED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,iCAAiC,GACtC,OAAO,CAAC,mCAAmC,CAAC,CAuC9C"}

package/node_modules/@oscharko-dev/keiko-model-gateway/dist/qualityIntelligence/dispatcher.js

@@ -65,6 +65,20 @@ async function invokePort(ctx) {
         handle.dispose();
     }
 }
+/**
+ * Compose a single Quality Intelligence model call with capability gate, budget reservation,
+ * prompt segmentation, replay cache, composed timeout/cancellation, and qi/* safe-error shaping.
+ *
+ * REUSABLE PRIMITIVE — NOT the current live path. The live generation/judge runtime
+ * (`keiko-server` generationPort.ts / judgePort.ts) deliberately calls the gateway `ModelPort`
+ * directly and applies its own capability gate + prompt segmentation, inheriting timeout / retry /
+ * circuit-breaking from the gateway resilience layer (`resilience.ts`) — the same machinery Chat
+ * and grounded-QA use. This dispatcher (and its budget / replayCache / circuitBreaker / cancellation
+ * helpers) is the ported-from-Test-Intelligence composition kept available for a future multi-call
+ * QI flow that wants combined budget + cache + circuit semantics at one call site. It must NOT be
+ * force-wired into the live ports (that would change the resilience contract) and must NOT be
+ * deleted as "dead code" (#279: ported TI ideas live here as generic gateway capabilities).
+ */
 export async function dispatchQualityIntelligenceRequest(args) {
     assertProfileCompatibleWithModel(args.profile, args.model);
     if (isExhausted(args.budget)) {

package/node_modules/@oscharko-dev/keiko-model-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oscharko-dev/keiko-model-gateway",
-  "version": "0.2.0-beta.2",
+  "version": "0.2.0-beta.4",
   "private": true,
   "type": "module",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
   },
   "scripts": {
     "build": "tsc -b tsconfig.json",
-    "typecheck": "tsc -b tsconfig.json --noEmit",
+    "typecheck": "tsc -b tsconfig.json",
     "test": "vitest run"
   },
   "files": [