@aexol/spectral 0.9.58 → 0.9.60

package/dist/extensions/web/utils/fetcher.js

@@ -0,0 +1,289 @@
+/**
+ * HTTP fetch wrapper for the web_fetch tool.
+ *
+ * Handles URL validation, SSRF protection, redirects, timeouts, abort signals,
+ * response size limits, and content-type filtering.
+ */
+import { lookup } from "node:dns/promises";
+import { isIP } from "node:net";
+export class WebFetchError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "WebFetchError";
+    }
+}
+const DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36";
+const MAX_BODY_SIZE_BYTES = 5 * 1024 * 1024; // 5 MB
+const MAX_REDIRECTS = 10;
+/** Private/loopback IPv4 CIDR prefixes. */
+const PRIVATE_IPV4_PREFIXES = [
+    "10.",
+    ...Array.from({ length: 16 }, (_, i) => `172.${16 + i}.`),
+    "192.168.",
+    "169.254.",
+    "127.",
+    "0.",
+    ...Array.from({ length: 64 }, (_, i) => `100.${64 + i}.`),
+];
+const BLOCKED_HOSTNAMES = new Set([
+    "localhost",
+    "metadata.google.internal",
+    "metadata",
+    "169.254.169.254",
+    "fd00.local",
+    "metadata.aws.internal",
+    "metadata.azure.internal",
+]);
+function isPrivateIPv4(ip) {
+    for (const prefix of PRIVATE_IPV4_PREFIXES) {
+        if (ip.startsWith(prefix))
+            return true;
+    }
+    return false;
+}
+function isPrivateIPv6(ip) {
+    const lower = ip.toLowerCase();
+    return (lower === "::1" ||
+        lower.startsWith("fe80:") ||
+        lower.startsWith("fc00:") ||
+        lower.startsWith("fd00:") ||
+        lower.startsWith("fd01:") ||
+        (lower.startsWith("::ffff:") && isPrivateIPv4(lower.replace("::ffff:", ""))));
+}
+function isPrivateIp(ip) {
+    const family = isIP(ip);
+    if (family === 4)
+        return isPrivateIPv4(ip);
+    if (family === 6)
+        return isPrivateIPv6(ip);
+    return false;
+}
+/**
+ * Validate a URL with SSRF protection.
+ *
+ * Throws WebFetchError for invalid URLs, non-http(s) protocols, blocked
+ * hostnames, or hostnames that resolve to private IP addresses.
+ */
+export async function validateUrl(urlStr, allowPrivateHosts = false) {
+    if (!urlStr || typeof urlStr !== "string") {
+        throw new WebFetchError("URL is required.");
+    }
+    const trimmed = urlStr.trim();
+    if (/^(file|ftp|gopher|dict|ldap|data|blob|javascript):/i.test(trimmed)) {
+        throw new WebFetchError(`Protocol not allowed: ${trimmed}`);
+    }
+    let parsed;
+    try {
+        parsed = new URL(trimmed);
+    }
+    catch {
+        throw new WebFetchError(`Invalid URL: ${urlStr}`);
+    }
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+        throw new WebFetchError(`Only http:// and https:// URLs are supported, got: ${parsed.protocol}`);
+    }
+    const hostname = parsed.hostname.toLowerCase();
+    if (!allowPrivateHosts && BLOCKED_HOSTNAMES.has(hostname)) {
+        throw new WebFetchError(`Blocked hostname: ${hostname}`);
+    }
+    const ipLiteral = hostname.replace(/^\[|\]$/g, "");
+    const ipFamily = isIP(ipLiteral);
+    if (!allowPrivateHosts && ipFamily && isPrivateIp(ipLiteral)) {
+        throw new WebFetchError(`URL points to a private IP address: ${hostname}`);
+    }
+    if (!allowPrivateHosts && !ipFamily) {
+        try {
+            const records = await lookup(hostname, { all: true });
+            for (const record of records) {
+                if (isPrivateIp(record.address)) {
+                    throw new WebFetchError(`Hostname ${hostname} resolves to private IP ${record.address}. Blocked by SSRF protection.`);
+                }
+            }
+        }
+        catch (err) {
+            if (err instanceof WebFetchError)
+                throw err;
+            // DNS failures are allowed to pass through; the fetch itself will fail.
+        }
+    }
+    return parsed;
+}
+function detectCharset(contentType) {
+    const match = /charset=([^\s;]+)/i.exec(contentType);
+    if (match) {
+        const charset = match[1].toLowerCase().trim().replace(/^["']|["']$/g, "");
+        // Only return charsets TextDecoder is likely to support.
+        if (["utf-8", "utf8", "iso-8859-1", "windows-1252", "ascii", "us-ascii"].includes(charset)) {
+            return charset === "utf8" ? "utf-8" : charset;
+        }
+    }
+    return undefined;
+}
+/** Validate that the Content-Type is readable text, not binary media. */
+export function validateContentType(contentType) {
+    const lower = contentType.toLowerCase().split(";")[0].trim();
+    const allowedPrefixes = [
+        "text/",
+        "application/json",
+        "application/xml",
+        "application/xhtml+xml",
+        "application/ld+json",
+        "application/rss+xml",
+        "application/atom+xml",
+    ];
+    const blockedPrefixes = [
+        "image/",
+        "video/",
+        "audio/",
+        "application/octet-stream",
+        "application/zip",
+        "application/gzip",
+        "application/x-gzip",
+        "application/x-tar",
+        "application/x-bzip",
+        "application/x-bzip2",
+        "application/x-rar-compressed",
+        "application/pdf",
+        "application/msword",
+        "application/vnd.ms-",
+        "application/vnd.openxmlformats-",
+        "font/",
+    ];
+    for (const prefix of blockedPrefixes) {
+        if (lower.startsWith(prefix)) {
+            throw new WebFetchError(`Content-Type not readable: ${contentType}`);
+        }
+    }
+    const isJsonSubtype = lower.endsWith("+json");
+    if (!isJsonSubtype && !allowedPrefixes.some((prefix) => lower.startsWith(prefix))) {
+        // Reject unknown content types rather than guessing; this prevents returning
+        // binary or otherwise unreadable data to the model.
+        throw new WebFetchError(`Content-Type not allowed: ${contentType}. Only text-based types (text/*, application/json, application/*+json, application/xml, RSS/Atom) are supported.`);
+    }
+}
+/**
+ * Fetch a public URL and return its decoded text content.
+ */
+export async function fetchWebPage(url, opts = {}) {
+    const parsed = await validateUrl(url, opts.allowPrivateHosts);
+    const userAgent = opts.userAgent ?? DEFAULT_USER_AGENT;
+    const timeoutSeconds = clampTimeout(opts.timeoutSeconds ?? 30);
+    let currentUrl = parsed.href;
+    let lastResponse = null;
+    let lastError;
+    // Single global timeout for the entire fetch operation, including redirects.
+    const globalController = new AbortController();
+    const globalTimeoutId = setTimeout(() => globalController.abort(new WebFetchError("Global fetch timeout exceeded.")), timeoutSeconds * 1000);
+    // Link the caller's signal so external cancellation also aborts the fetch.
+    const callerSignal = opts.signal;
+    const onCallerAbort = () => globalController.abort();
+    if (callerSignal) {
+        if (callerSignal.aborted) {
+            clearTimeout(globalTimeoutId);
+            throw new WebFetchError("Request was cancelled.");
+        }
+        callerSignal.addEventListener("abort", onCallerAbort, { once: true });
+    }
+    try {
+        for (let i = 0; i <= MAX_REDIRECTS; i++) {
+            try {
+                const res = await fetch(currentUrl, {
+                    redirect: "manual",
+                    signal: globalController.signal,
+                    headers: {
+                        "User-Agent": userAgent,
+                        Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,application/json;q=0.8,*/*;q=0.7",
+                        "Accept-Language": "en-US,en;q=0.9",
+                    },
+                });
+                if (res.status >= 300 && res.status < 400) {
+                    const location = res.headers.get("location");
+                    if (location) {
+                        currentUrl = new URL(location, currentUrl).href;
+                        await validateUrl(currentUrl, opts.allowPrivateHosts);
+                        continue;
+                    }
+                }
+                lastResponse = res;
+                break;
+            }
+            catch (err) {
+                lastError = err instanceof Error ? err.message : String(err);
+                if (err instanceof WebFetchError)
+                    throw err;
+                break;
+            }
+        }
+    }
+    finally {
+        clearTimeout(globalTimeoutId);
+        if (callerSignal) {
+            callerSignal.removeEventListener("abort", onCallerAbort);
+        }
+    }
+    if (!lastResponse) {
+        if (!lastError) {
+            throw new WebFetchError(`Too many redirects: the server redirected more than ${MAX_REDIRECTS} times. Last URL: ${currentUrl}`);
+        }
+        throw new WebFetchError(lastError);
+    }
+    if (!lastResponse.ok) {
+        throw new WebFetchError(`HTTP ${lastResponse.status} ${lastResponse.statusText}`.trim());
+    }
+    const contentTypeHeader = lastResponse.headers.get("content-type") ?? "";
+    validateContentType(contentTypeHeader);
+    const contentLengthHeader = lastResponse.headers.get("content-length");
+    if (contentLengthHeader) {
+        const contentLength = Number.parseInt(contentLengthHeader, 10);
+        if (!Number.isNaN(contentLength) && contentLength > MAX_BODY_SIZE_BYTES) {
+            throw new WebFetchError(`Response body too large: ${contentLength} bytes (max ${MAX_BODY_SIZE_BYTES} bytes)`);
+        }
+    }
+    // Stream the body so we can abort early if it exceeds the limit.
+    const reader = lastResponse.body?.getReader();
+    if (!reader) {
+        throw new WebFetchError("Response body is not readable.");
+    }
+    const chunks = [];
+    let received = 0;
+    try {
+        while (true) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            if (value) {
+                received += value.length;
+                if (received > MAX_BODY_SIZE_BYTES) {
+                    throw new WebFetchError(`Response body exceeds maximum size of ${MAX_BODY_SIZE_BYTES} bytes`);
+                }
+                chunks.push(value);
+            }
+        }
+    }
+    finally {
+        reader.releaseLock();
+    }
+    const buffer = Buffer.concat(chunks);
+    const charset = detectCharset(contentTypeHeader) ?? "utf-8";
+    let content;
+    try {
+        content = new TextDecoder(charset, { fatal: false }).decode(buffer);
+    }
+    catch {
+        content = new TextDecoder("utf-8", { fatal: false }).decode(buffer);
+    }
+    return {
+        url: parsed.href,
+        finalUrl: currentUrl,
+        contentType: contentTypeHeader,
+        content,
+        contentLengthBytes: buffer.length,
+    };
+}
+function clampTimeout(seconds) {
+    const min = 1;
+    const max = 120;
+    if (!Number.isFinite(seconds))
+        return 30;
+    return Math.max(min, Math.min(max, seconds));
+}

package/dist/extensions/web/utils/parser.d.ts

@@ -0,0 +1,15 @@
+export type OutputFormat = "text" | "markdown" | "html" | "json";
+export declare class ContentConversionError extends Error {
+    constructor(message: string);
+}
+/**
+ * Convert fetched content into the requested output format.
+ *
+ * - html: returns the raw body as-is.
+ * - json: parses JSON and returns stable two-space pretty-printed JSON.
+ * - text: strips scripts, styles, iframes, etc. and returns plain visible text.
+ * - markdown: converts HTML to Markdown using turndown when available,
+ *   with a cheerio-based fallback for headings, lists, links, and code.
+ */
+export declare function convertContent(content: string, format: OutputFormat): Promise<string>;
+//# sourceMappingURL=parser.d.ts.map

package/dist/extensions/web/utils/parser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../../src/extensions/web/utils/parser.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjE,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI5B;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,MAAM,CAAC,CAejB"}

package/dist/extensions/web/utils/parser.js

@@ -0,0 +1,205 @@
+/**
+ * HTML/JSON → text / markdown / raw HTML / pretty JSON conversion for the
+ * web_fetch tool.
+ */
+import * as cheerio from "cheerio";
+export class ContentConversionError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "ContentConversionError";
+    }
+}
+/**
+ * Convert fetched content into the requested output format.
+ *
+ * - html: returns the raw body as-is.
+ * - json: parses JSON and returns stable two-space pretty-printed JSON.
+ * - text: strips scripts, styles, iframes, etc. and returns plain visible text.
+ * - markdown: converts HTML to Markdown using turndown when available,
+ *   with a cheerio-based fallback for headings, lists, links, and code.
+ */
+export async function convertContent(content, format) {
+    if (format === "html") {
+        return content;
+    }
+    if (format === "json") {
+        return formatJson(content);
+    }
+    if (format === "text") {
+        return extractText(content);
+    }
+    // format === "markdown"
+    return convertToMarkdown(content);
+}
+function formatJson(content) {
+    const source = content.charCodeAt(0) === 0xfeff ? content.slice(1) : content;
+    try {
+        const parsed = JSON.parse(source);
+        const pretty = JSON.stringify(parsed, null, 2);
+        if (pretty === undefined) {
+            throw new ContentConversionError("JSON value cannot be rendered.");
+        }
+        return pretty;
+    }
+    catch (err) {
+        if (err instanceof ContentConversionError)
+            throw err;
+        const detail = err instanceof Error ? err.message : String(err);
+        throw new ContentConversionError(`Invalid JSON content: ${detail}`);
+    }
+}
+function extractText(html) {
+    const $ = cheerio.load(html);
+    $("script, style, noscript, iframe, canvas, svg, template").remove();
+    $("[aria-hidden='true']").remove();
+    $("[hidden]").remove();
+    return $("body")
+        .text()
+        .replace(/\s+/g, " ")
+        .trim();
+}
+async function convertToMarkdown(html) {
+    // Try turndown first; fall back to a simple cheerio converter if unavailable.
+    try {
+        const TurndownService = (await import("turndown")).default;
+        const service = new TurndownService({
+            headingStyle: "atx",
+            codeBlockStyle: "fenced",
+            bulletListMarker: "-",
+        });
+        service.addRule("strikethrough", {
+            filter: ["del", "s", "strike"],
+            replacement: (content) => `~~${content}~~`,
+        });
+        service.addRule("removeScripts", {
+            filter: ["script", "style", "noscript", "iframe", "canvas", "svg", "template"],
+            replacement: () => "",
+        });
+        return service.turndown(html).trim();
+    }
+    catch {
+        return cheerioToMarkdown(html);
+    }
+}
+/** Simple cheerio-based Markdown converter used when turndown is unavailable. */
+function cheerioToMarkdown(html) {
+    const $ = cheerio.load(html);
+    $("script, style, noscript, iframe, canvas, svg, template").remove();
+    const lines = [];
+    function pushLine(text) {
+        const trimmed = text.replace(/\s+/g, " ").trim();
+        if (!trimmed)
+            return;
+        lines.push(trimmed);
+    }
+    function walkNodes(nodes, depth = 0) {
+        nodes.each((_, el) => {
+            if (el.type === "text") {
+                const text = el.data ?? "";
+                if (text.trim()) {
+                    lines.push(text.trim());
+                }
+                return;
+            }
+            if (el.type !== "tag")
+                return;
+            const $el = $(el);
+            const tag = el.tagName.toLowerCase();
+            const text = $el.text().trim();
+            switch (tag) {
+                case "h1":
+                    pushLine(`# ${text}`);
+                    break;
+                case "h2":
+                    pushLine(`## ${text}`);
+                    break;
+                case "h3":
+                    pushLine(`### ${text}`);
+                    break;
+                case "h4":
+                    pushLine(`#### ${text}`);
+                    break;
+                case "h5":
+                    pushLine(`##### ${text}`);
+                    break;
+                case "h6":
+                    pushLine(`###### ${text}`);
+                    break;
+                case "p":
+                    // Walk children instead of emitting the full container text; this
+                    // avoids duplicating inline elements (links, code, emphasis) while
+                    // still emitting plain text nodes.
+                    walkNodes($el.children(), depth);
+                    break;
+                case "br":
+                    lines.push("");
+                    break;
+                case "a": {
+                    const href = $el.attr("href") ?? "";
+                    if (href) {
+                        pushLine(`[${text}](${href})`);
+                    }
+                    else {
+                        pushLine(text);
+                    }
+                    break;
+                }
+                case "code":
+                    pushLine(`\`${text}\``);
+                    break;
+                case "pre": {
+                    const code = $el.find("code").text().trim() || text;
+                    pushLine(`\`\`\`\n${code}\n\`\`\``);
+                    break;
+                }
+                case "li": {
+                    const prefix = "  ".repeat(Math.max(0, depth)) + "- ";
+                    const nested = $el.children("ul, ol");
+                    const ownText = $el.clone().children("ul, ol").remove().end().text().trim();
+                    if (ownText)
+                        pushLine(`${prefix}${ownText}`);
+                    if (nested.length) {
+                        walkNodes(nested.children(), depth + 1);
+                    }
+                    break;
+                }
+                case "blockquote":
+                    pushLine(text
+                        .split("\n")
+                        .map((line) => `> ${line}`)
+                        .join("\n"));
+                    break;
+                case "div":
+                case "section":
+                case "article":
+                case "main":
+                case "header":
+                case "footer":
+                case "aside":
+                case "nav":
+                    walkNodes($el.children(), depth);
+                    break;
+                case "span":
+                case "strong":
+                case "b":
+                case "em":
+                case "i":
+                default:
+                    if (text) {
+                        lines.push(text);
+                    }
+                    break;
+            }
+        });
+    }
+    walkNodes($("body").children());
+    // Collapse whitespace and join lines into readable markdown.
+    const result = [];
+    for (const line of lines) {
+        const normalized = line.replace(/\s+/g, " ").trim();
+        if (!normalized)
+            continue;
+        result.push(normalized);
+    }
+    return result.join("\n\n").trim();
+}

package/dist/memory/branch.d.ts.map

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

package/dist/memory/branch.js

@@ -292,13 +292,21 @@ export function recallObservationSources(entries, observationId) {
     return { status: "found", observationId, matches, collision: matches.length > 1 };
 }
 function getPriorMemoryDetails(entries) {
-    const idx = findLastCompactionIndex(entries);
-    if (idx !== -1) {
-        const details = entries[idx].details;
+    const compactionMemory = findLastSupportedMemoryCompaction(entries);
+    if (compactionMemory)
+        return compactionMemory.details;
+    return getLatestRestoredSnapshot(entries)?.details;
+}
+function findLastSupportedMemoryCompaction(entries) {
+    for (let i = entries.length - 1; i >= 0; i--) {
+        const entry = entries[i];
+        if (entry.type !== "compaction")
+            continue;
+        const details = entry.details;
         if (isSupportedMemoryDetails(details))
-            return details;
+            return { index: i, details };
     }
-    return getLatestRestoredSnapshot(entries)?.details;
+    return undefined;
 }
 export function recallMemorySources(entries, memoryId) {
     const indexedObservations = collectIndexedObservations(entries);
@@ -422,14 +430,14 @@ function collectObservationsPendingNextCompaction(entries) {
     const idToIdx = new Map();
     for (let i = 0; i < entries.length; i++)
         idToIdx.set(entries[i].id, i);
-    const priorCompactionIdx = findLastCompactionIndex(entries);
+    const priorMemoryCompaction = findLastSupportedMemoryCompaction(entries);
     const restoredSnapshot = getLatestRestoredSnapshot(entries);
     let thresholdStartIdx;
-    if (priorCompactionIdx === -1) {
+    if (!priorMemoryCompaction) {
         thresholdStartIdx = branchIndexAfterCoveredSourceCount(entries, restoredSnapshot?.coveredSourceCount ?? 0);
     }
     else {
-        const priorFirstKept = entries[priorCompactionIdx].firstKeptEntryId;
+        const priorFirstKept = entries[priorMemoryCompaction.index].firstKeptEntryId;
         if (!priorFirstKept)
             throw new Error("prior compaction entry missing firstKeptEntryId");
         const idx = idToIdx.get(priorFirstKept);

package/dist/memory/commands/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/memory/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AASpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA6F/E"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/memory/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AASpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA8F/E"}

package/dist/memory/commands/status.js

@@ -21,9 +21,10 @@ export function registerStatusCommand(ext, runtime) {
             const pendingObsTokens = estimateObservationPoolTokens(pendingObs);
             const pendingObsCount = pendingObs.length;
             const relevanceHistogram = countByRelevance([...committedObs, ...pendingObs]);
-            const keepRecentTokens = SettingsManager.create(ctx.cwd).getCompactionKeepRecentTokens();
+            const compactionPolicy = SettingsManager.create(ctx.cwd).getCompactionPolicy();
+            const keepRecentTokens = compactionPolicy.conversation.keepRecentTokens;
             const obsThreshold = runtime.config.observationThresholdTokens;
-            const compThreshold = runtime.config.compactionThresholdTokens;
+            const compThreshold = Math.max(runtime.config.compactionThresholdTokens, compactionPolicy.autoOlderHistory.minRawTokens);
             const refThreshold = runtime.config.reflectionThresholdTokens;
             // Approximation: the real compaction gate excludes pending obs whose coversFromId falls inside
             // the new keep-recent tail (deferred to next cycle) and adds any sync-catch-up gap obs produced

package/dist/memory/config.d.ts

@@ -23,6 +23,18 @@ export interface Config {
     observerMaxChunkTokens?: number;
     reflectorMaxTurnsPerPass?: number;
     prunerMaxTurnsPerPass?: number;
+    /** Raw source tokens since last compaction before adding DCP-lite nudges. */
+    dcpNudgeMinRawTokens: number;
+    /** Absolute context tokens before adding DCP-lite nudges. Mirrors DCP compress.minContextLimit. */
+    dcpNudgeMinContextTokens: number;
+    /** Context-window percent before adding DCP-lite nudges. */
+    dcpNudgeContextPercent: number;
+    /** Minimum turns between repeated DCP-lite nudges. */
+    dcpNudgeTurnInterval: number;
+    /** Provider requests after a user prompt before adding an in-run DCP-lite nudge. */
+    dcpInRunNudgeIterationThreshold: number;
+    /** Minimum provider requests between repeated in-run DCP-lite nudges. */
+    dcpInRunNudgeFrequency: number;
     /** @deprecated Use reflectorMaxTurnsPerPass and prunerMaxTurnsPerPass. */
     compactionMaxToolCalls?: number;
     interAgent?: InterAgentConfig;

package/dist/memory/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/memory/config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;AAE/D,MAAM,WAAW,gBAAgB;IAChC,yFAAyF;IACzF,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,4DAA4D;IAC5D,qBAAqB,CAAC,EAAE,SAAS,CAAC;IAClC,wEAAwE;IACxE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,MAAM;IACtB,0BAA0B,EAAE,MAAM,CAAC;IACnC,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,0EAA0E;IAC1E,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wBAAwB,EAAE,MAAM,CAAC;IACjC,qBAAqB,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,QAAQ,EAAE,MAOtB,CAAC;AA0DF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAMrE;AAED,wBAAgB,aAAa,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAOnF;AAaD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAUpF"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/memory/config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;AAE/D,MAAM,WAAW,gBAAgB;IAChC,yFAAyF;IACzF,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,4DAA4D;IAC5D,qBAAqB,CAAC,EAAE,SAAS,CAAC;IAClC,wEAAwE;IACxE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,MAAM;IACtB,0BAA0B,EAAE,MAAM,CAAC;IACnC,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACnD,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,6EAA6E;IAC7E,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mGAAmG;IACnG,wBAAwB,EAAE,MAAM,CAAC;IACjC,4DAA4D;IAC5D,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sDAAsD;IACtD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oFAAoF;IACpF,+BAA+B,EAAE,MAAM,CAAC;IACxC,yEAAyE;IACzE,sBAAsB,EAAE,MAAM,CAAC;IAC/B,0EAA0E;IAC1E,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wBAAwB,EAAE,MAAM,CAAC;IACjC,qBAAqB,EAAE,MAAM,CAAC;CAC9B;AAcD,eAAO,MAAM,QAAQ,EAAE,MAatB,CAAC;AAsEF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAMrE;AAED,wBAAgB,aAAa,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAOnF;AAaD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAUpF"}