@pentoshi/clai 4.11.7 → 4.11.9

package/dist/tools/web/redact.d.ts

@@ -19,27 +19,7 @@ import { type CookieInfo, type CookieSameSite, type HeaderMap } from "./types.js
  * Mirrors Requirement 5.12 / design "Redaction strategy".
  */
 export declare const SENSITIVE_HEADERS: ReadonlySet<string>;
-/**
- * Ordered list of `[name, value]` pairs, the most general header input
- * shape. Repeats of the same name are preserved in the order observed and
- * are joined by {@link applyToHeaders} per RFC 7230.
- *
- * Callers that have a Node `http.IncomingMessage.rawHeaders` array (a flat
- * `string[]` of alternating name/value entries) can convert it with
- *
- * ```ts
- * const pairs: HeaderEntries = [];
- * for (let i = 0; i < raw.length; i += 2) pairs.push([raw[i]!, raw[i + 1]!]);
- * ```
- */
 export type HeaderEntries = ReadonlyArray<readonly [string, string]>;
-/**
- * Reduced cookie shape produced by {@link stripForAudit}: only the
- * non-secret public attributes named by Requirement 5.11 are kept. The
- * cookie's `value`, `expires`, and `maxAge` fields are intentionally
- * absent — the audit log never carries cookie values nor any field that
- * could leak session lifetime back to a third party.
- */
 export interface AuditSafeCookie {
     name: string;
     domain?: string;
@@ -48,12 +28,6 @@ export interface AuditSafeCookie {
     secure?: boolean;
     sameSite?: CookieSameSite;
 }
-/**
- * Output shape of {@link stripForAudit}: a header map with every
- * sensitive header dropped and a cookies list with every value-bearing
- * field removed. Both fields are always present (possibly empty) so the
- * caller can spread them into an audit payload without `undefined` checks.
- */
 export interface AuditSafePayload {
     headers: HeaderMap;
     cookies: AuditSafeCookie[];

package/dist/tools/web/redact.js

@@ -51,7 +51,6 @@ export const SENSITIVE_HEADERS = new Set([
  * {@link stripForAudit} to drop sensitive entries entirely).
  */
 export function applyToHeaders(input, redactSensitive) {
-    // Group repeated header names. Ordering is preserved by the Map.
     const grouped = new Map();
     const entries = Array.isArray(input)
         ? input
@@ -72,7 +71,6 @@ export function applyToHeaders(input, redactSensitive) {
     for (const [key, values] of grouped) {
         if (redactSensitive && SENSITIVE_HEADERS.has(key)) {
             // The redacted placeholder is shorter than the cap and is a fixed
-            // marker; do not run it through the truncator.
             out[key] = REDACTED_PLACEHOLDER;
             continue;
         }

package/dist/tools/web/redact.js.map

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

package/dist/tools/web/request-loop.d.ts

@@ -0,0 +1,38 @@
+import type { WebFetchError } from "./types.js";
+import { RequestLoopContext, networkError } from "./issue-hop.js";
+export { timeoutError } from "./issue-hop.js";
+export { networkError };
+export type { DnsLookupFn, HttpRequestFn, HttpsRequestFn, NormalisedArgs } from "./issue-hop.js";
+export declare function schemeOf(raw: string): string;
+type RequestLoopResult = {
+    ok: true;
+    lastUrl: string;
+    contentType: string | undefined;
+    body: string;
+    bytesReceived: number;
+    truncated: boolean;
+    truncatedAt?: number;
+} | {
+    ok: false;
+    lastUrl: string;
+    error: WebFetchError;
+};
+/**
+ * Run up to {@link MAX_REDIRECT_HOPS} request hops. Each hop:
+ *
+ *   - parses the current URL
+ *   - re-applies the SSRF pre-check on the hostname literal
+ *   - resolves the hostname via {@link DnsLookupFn}, captures `dnsMs`
+ *     and the resolved IP
+ *   - re-applies the SSRF check on the resolved IP
+ *   - builds a pinned-IP `https/http.request` with a custom `lookup`
+ *     callback that returns the resolved IP synchronously
+ *   - on a 3xx with `Location`, appends a redirect hop and loops
+ *   - on a binary content type, returns `binary-content`
+ *   - on a 4xx/5xx terminal, reads up to
+ *     {@link HTTP_ERROR_BODY_PREVIEW_BYTES} bytes for the preview and
+ *     returns `http-error`
+ *   - on a 2xx terminal, reads the body up to `maxBytes` and returns
+ *     success
+ */
+export declare function runRequestLoop(ctx: RequestLoopContext): Promise<RequestLoopResult>;

package/dist/tools/web/request-loop.js

@@ -0,0 +1,172 @@
+import { classify as classifyIp, classifyHost, isAllowedScheme } from "./ssrf-guard.js";
+import { MAX_REDIRECT_HOPS } from "./types.js";
+import { issueHop, networkError } from "./issue-hop.js";
+export { timeoutError } from "./issue-hop.js";
+export { networkError };
+export function schemeOf(raw) {
+    const m = raw.match(/^([a-z][a-z0-9+.\-]*):/i);
+    return m && typeof m[1] === "string" ? `${m[1]}:` : raw;
+}
+/**
+ * Run up to {@link MAX_REDIRECT_HOPS} request hops. Each hop:
+ *
+ *   - parses the current URL
+ *   - re-applies the SSRF pre-check on the hostname literal
+ *   - resolves the hostname via {@link DnsLookupFn}, captures `dnsMs`
+ *     and the resolved IP
+ *   - re-applies the SSRF check on the resolved IP
+ *   - builds a pinned-IP `https/http.request` with a custom `lookup`
+ *     callback that returns the resolved IP synchronously
+ *   - on a 3xx with `Location`, appends a redirect hop and loops
+ *   - on a binary content type, returns `binary-content`
+ *   - on a 4xx/5xx terminal, reads up to
+ *     {@link HTTP_ERROR_BODY_PREVIEW_BYTES} bytes for the preview and
+ *     returns `http-error`
+ *   - on a 2xx terminal, reads the body up to `maxBytes` and returns
+ *     success
+ */
+export async function runRequestLoop(ctx) {
+    let currentUrl = ctx.args.url;
+    for (let hop = 0; hop <= MAX_REDIRECT_HOPS; hop++) {
+        // SSRF + DNS.
+        if (!isAllowedScheme(currentUrl)) {
+            return {
+                ok: false,
+                lastUrl: currentUrl,
+                error: {
+                    kind: "blocked-scheme",
+                    message: `Refusing scheme: ${schemeOf(currentUrl)}`,
+                    url: currentUrl,
+                },
+            };
+        }
+        let parsed;
+        try {
+            parsed = new URL(currentUrl);
+        }
+        catch {
+            return {
+                ok: false,
+                lastUrl: currentUrl,
+                error: {
+                    kind: "validation",
+                    message: `web.fetch: redirect target is not a valid URL: ${currentUrl}`,
+                    url: currentUrl,
+                },
+            };
+        }
+        const hostname = parsed.hostname.replace(/^\[|\]$/g, "");
+        ctx.capture.setHopContext(hostname);
+        // SSRF pre-check on the hostname literal so e.g. https://127.0.0.1
+        const hostClass = classifyHost(hostname);
+        if (hostClass !== null) {
+            return {
+                ok: false,
+                lastUrl: currentUrl,
+                error: {
+                    kind: "blocked-address",
+                    message: `Refusing to fetch ${hostClass.class} address ${hostname} (host=${hostname})`,
+                    url: currentUrl,
+                },
+            };
+        }
+        // / 2.11: the SSRF check is run against the resolved IP, and the
+        const dnsStart = ctx.now();
+        let resolvedIp;
+        let resolvedFamily;
+        try {
+            const result = await ctx.dnsLookupFn(hostname, { family: 0 });
+            resolvedIp = result.address;
+            resolvedFamily = (result.family === 6 ? 6 : 4);
+        }
+        catch (err) {
+            return {
+                ok: false,
+                lastUrl: currentUrl,
+                error: networkError(currentUrl, err, "DNS resolution failed"),
+            };
+        }
+        const dnsMs = ctx.now() - dnsStart;
+        ctx.capture.markDnsResolved(dnsMs, resolvedIp);
+        const ipClass = classifyIp(resolvedIp);
+        if (ipClass !== null) {
+            return {
+                ok: false,
+                lastUrl: currentUrl,
+                error: {
+                    kind: "blocked-address",
+                    message: `Refusing to fetch ${ipClass.class} address ${resolvedIp} (host=${hostname})`,
+                    url: currentUrl,
+                },
+            };
+        }
+        const hopResult = await issueHop({
+            ctx,
+            currentUrl,
+            parsed,
+            resolvedIp,
+            resolvedFamily,
+            hop,
+        });
+        if (hopResult.kind === "redirect") {
+            ctx.capture.addRedirectHop(currentUrl, hopResult.status, hopResult.location);
+            let nextUrl;
+            try {
+                nextUrl = new URL(hopResult.location, parsed).toString();
+            }
+            catch {
+                return {
+                    ok: false,
+                    lastUrl: currentUrl,
+                    error: {
+                        kind: "validation",
+                        message: `web.fetch: redirect Location is not a valid URL: ${hopResult.location}`,
+                        url: currentUrl,
+                    },
+                };
+            }
+            if (hop + 1 > MAX_REDIRECT_HOPS) {
+                return {
+                    ok: false,
+                    lastUrl: nextUrl,
+                    error: {
+                        kind: "redirect-limit",
+                        message: `web.fetch: exceeded ${MAX_REDIRECT_HOPS}-redirect limit (last url=${nextUrl})`,
+                        url: nextUrl,
+                    },
+                };
+            }
+            currentUrl = nextUrl;
+            continue;
+        }
+        if (hopResult.kind === "terminal") {
+            ctx.capture.addRedirectHop(currentUrl, hopResult.status);
+            return {
+                ok: true,
+                lastUrl: currentUrl,
+                contentType: hopResult.contentType,
+                body: hopResult.body,
+                bytesReceived: hopResult.bytesReceived,
+                truncated: hopResult.truncated,
+                ...(hopResult.truncatedAt !== undefined
+                    ? { truncatedAt: hopResult.truncatedAt }
+                    : {}),
+            };
+        }
+        return {
+            ok: false,
+            lastUrl: currentUrl,
+            error: hopResult.error,
+        };
+    }
+    return {
+        ok: false,
+        lastUrl: currentUrl,
+        error: {
+            kind: "redirect-limit",
+            message: `web.fetch: exceeded ${MAX_REDIRECT_HOPS}-redirect limit (last url=${currentUrl})`,
+            url: currentUrl,
+        },
+    };
+}
+//# sourceMappingURL=request-loop.js.map

package/dist/tools/web/request-loop.js.map

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

package/dist/tools/web/response-body.d.ts

@@ -0,0 +1,41 @@
+import { Capture } from "./capture.js";
+import { NormalisedArgs } from "./request-loop.js";
+import type { ResponseMode, WebFetchError, WebFetchOutcome } from "./types.js";
+interface BuildSuccessInput {
+    args: NormalisedArgs;
+    capture: Capture;
+    lastUrl: string;
+    body: string;
+    bytesReceived: number;
+    truncated: boolean;
+    truncatedAt?: number;
+    contentType: string | undefined;
+    now: () => number;
+    t0: number;
+}
+/**
+ * Compose a successful {@link WebFetchOutcome} from the captured
+ * fields, applying redaction and the 64 KiB metadata budget.
+ *
+ * Implements the design's "Pipeline steps in detail" §11–12: redact
+ * before metadata assembly, then run `budget.enforce` so the final
+ * `metadata.budget.metadataBytes` reflects the size of the *trimmed*
+ * payload.
+ */
+export declare function buildSuccessOutcome(input: BuildSuccessInput): WebFetchOutcome;
+interface ErrorOutcomeInput {
+    requestedUrl: string;
+    finalUrl: string;
+    mode: ResponseMode;
+    capture?: Capture | undefined;
+    error: WebFetchError;
+    now: () => number;
+    t0: number;
+    includeHeaders?: boolean | undefined;
+    includeTls?: boolean | undefined;
+    includeTiming?: boolean | undefined;
+    includeRedirectChain?: boolean | undefined;
+    redactSensitive?: boolean | undefined;
+}
+export declare function errorOutcome(input: ErrorOutcomeInput): WebFetchOutcome;
+export {};

package/dist/tools/web/response-body.js

@@ -0,0 +1,174 @@
+import { enforce as enforceBudget } from "./budget.js";
+import { applyToCookies, applyToHeaders } from "./redact.js";
+import { DEFAULT_INCLUDE_HEADERS, DEFAULT_INCLUDE_REDIRECT_CHAIN, DEFAULT_INCLUDE_TIMING, DEFAULT_MAX_BYTES, DEFAULT_REDACT_SENSITIVE, FETCH_TIMEOUT_MS, METADATA_BUDGET_BYTES } from "./types.js";
+/**
+ * Compose a successful {@link WebFetchOutcome} from the captured
+ * fields, applying redaction and the 64 KiB metadata budget.
+ *
+ * Implements the design's "Pipeline steps in detail" §11–12: redact
+ * before metadata assembly, then run `budget.enforce` so the final
+ * `metadata.budget.metadataBytes` reflects the size of the *trimmed*
+ * payload.
+ */
+export function buildSuccessOutcome(input) {
+    const totalMs = input.now() - input.t0;
+    const captured = input.capture.finalize(totalMs);
+    return {
+        ok: true,
+        metadata: assembleMetadata({
+            args: input.args,
+            captured,
+            requestedUrl: input.args.url,
+            finalUrl: input.lastUrl,
+            status: captured.status,
+            contentType: input.contentType,
+            bytesReceived: input.bytesReceived,
+            truncated: input.truncated,
+            ...(input.truncatedAt !== undefined
+                ? { truncatedAt: input.truncatedAt }
+                : {}),
+        }),
+        body: input.body,
+    };
+}
+export function errorOutcome(input) {
+    const totalMs = input.now() - input.t0;
+    const captured = input.capture !== undefined ? input.capture.finalize(totalMs) : undefined;
+    const includeHeaders = input.includeHeaders ?? DEFAULT_INCLUDE_HEADERS;
+    const includeTiming = input.includeTiming ?? DEFAULT_INCLUDE_TIMING;
+    const includeRedirectChain = input.includeRedirectChain ?? DEFAULT_INCLUDE_REDIRECT_CHAIN;
+    const includeTls = input.includeTls ?? false;
+    const redactSensitive = input.redactSensitive ?? DEFAULT_REDACT_SENSITIVE;
+    const args = {
+        url: input.requestedUrl,
+        maxBytes: DEFAULT_MAX_BYTES,
+        timeoutMs: FETCH_TIMEOUT_MS,
+        includeHeaders,
+        includeTls,
+        includeTiming,
+        includeRedirectChain,
+        responseMode: input.mode,
+        responsePart: "full",
+        redactSensitive,
+    };
+    const metadata = captured
+        ? assembleMetadata({
+            args,
+            captured,
+            requestedUrl: input.requestedUrl,
+            finalUrl: input.finalUrl,
+            status: input.error.status ?? captured.status ?? 0,
+            contentType: undefined,
+            bytesReceived: 0,
+            truncated: false,
+        })
+        : assembleEmptyMetadata({
+            args,
+            requestedUrl: input.requestedUrl,
+            finalUrl: input.finalUrl,
+            status: input.error.status ?? 0,
+        });
+    return {
+        ok: false,
+        metadata,
+        body: "",
+        error: input.error,
+    };
+}
+/**
+ * Build a {@link WebFetchMetadata} envelope from a {@link CapturedFields}
+ * snapshot.
+ *
+ * Honors the `include*` flags from {@link NormalisedArgs}: setting a
+ * flag to `false` strips the corresponding optional field from the
+ * envelope (Requirements 2.15–2.18, 2.24). Sensitive headers / cookie
+ * values are redacted by `applyToHeaders` / `applyToCookies` before
+ * the 64 KiB budget loop runs in {@link enforceBudget}.
+ */
+function assembleMetadata(input) {
+    const { args, captured } = input;
+    const headersIn = args.includeHeaders ? captured.headers : undefined;
+    const cookiesIn = captured.cookies;
+    const redactedHeaders = headersIn !== undefined
+        ? applyToHeaders(headersIn, args.redactSensitive)
+        : undefined;
+    const redactedCookies = applyToCookies(cookiesIn, args.redactSensitive);
+    const tlsIn = args.includeTls ? captured.tls : undefined;
+    const timingIn = args.includeTiming ? captured.timing : undefined;
+    const redirectChainIn = args.includeRedirectChain
+        ? captured.redirectChain
+        : undefined;
+    const budgeted = enforceBudget({
+        ...(redactedHeaders !== undefined ? { headers: redactedHeaders } : {}),
+        ...(tlsIn !== undefined ? { tls: tlsIn } : {}),
+        ...(timingIn !== undefined ? { timing: timingIn } : {}),
+        ...(redirectChainIn !== undefined ? { redirectChain: redirectChainIn } : {}),
+        cookies: redactedCookies,
+    });
+    const meta = {
+        requestedUrl: input.requestedUrl,
+        finalUrl: input.finalUrl,
+        status: input.status,
+        resolvedIp: captured.resolvedIp,
+        finalHostname: captured.finalHostname,
+        mode: args.responseMode,
+        bytesReceived: input.bytesReceived,
+        truncated: input.truncated,
+        budget: { metadataBytes: budgeted.metadataBytes, cap: METADATA_BUDGET_BYTES },
+    };
+    if (input.contentType !== undefined)
+        meta.contentType = input.contentType;
+    if (input.truncatedAt !== undefined)
+        meta.truncatedAt = input.truncatedAt;
+    if (budgeted.headers !== undefined)
+        meta.headers = budgeted.headers;
+    if (budgeted.tls !== undefined)
+        meta.tls = budgeted.tls;
+    if (budgeted.timing !== undefined)
+        meta.timing = budgeted.timing;
+    if (budgeted.redirectChain !== undefined)
+        meta.redirectChain = budgeted.redirectChain;
+    if (budgeted.cookies !== undefined)
+        meta.cookies = budgeted.cookies;
+    return meta;
+}
+function assembleEmptyMetadata(input) {
+    const emptyTiming = { dnsMs: 0, tcpMs: 0, ttfbMs: 0, totalMs: 0 };
+    const budgeted = enforceBudget({
+        ...(input.args.includeHeaders ? { headers: {} } : {}),
+        ...(input.args.includeTiming ? { timing: emptyTiming } : {}),
+        ...(input.args.includeRedirectChain
+            ? { redirectChain: [] }
+            : {}),
+        cookies: [],
+    });
+    const meta = {
+        requestedUrl: input.requestedUrl,
+        finalUrl: input.finalUrl,
+        status: input.status,
+        resolvedIp: "",
+        finalHostname: tryHostname(input.finalUrl),
+        mode: input.args.responseMode,
+        bytesReceived: 0,
+        truncated: false,
+        budget: { metadataBytes: budgeted.metadataBytes, cap: METADATA_BUDGET_BYTES },
+    };
+    if (budgeted.headers !== undefined)
+        meta.headers = budgeted.headers;
+    if (budgeted.timing !== undefined)
+        meta.timing = budgeted.timing;
+    if (budgeted.redirectChain !== undefined)
+        meta.redirectChain = budgeted.redirectChain;
+    if (budgeted.cookies !== undefined)
+        meta.cookies = budgeted.cookies;
+    return meta;
+}
+function tryHostname(url) {
+    try {
+        return new URL(url).hostname;
+    }
+    catch {
+        return "";
+    }
+}
+//# sourceMappingURL=response-body.js.map

package/dist/tools/web/response-body.js.map

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

package/dist/tools/web/search-attempts.d.ts

@@ -0,0 +1,20 @@
+import type { SearchProvider } from "./providers/provider.js";
+import type { WebSearchOutcome } from "./types.js";
+export interface SearchKeySet {
+    readonly keys: readonly {
+        value: string;
+    }[];
+    readonly activeIndex: number;
+    readonly source: string;
+}
+export declare function attemptProviderWithKeyRotation(opts: {
+    provider: SearchProvider;
+    keys: SearchKeySet;
+    query: string;
+    maxResults: number;
+    timeoutMs: number;
+    remainingMs: () => number;
+    signal?: AbortSignal | undefined;
+    retrySameKey: boolean;
+    onOutcome: (outcome: WebSearchOutcome) => void;
+}): Promise<WebSearchOutcome>;