@prestyj/cli 5.32.0 → 5.32.2

package/dist/core/blocked-packages-file.d.ts

@@ -0,0 +1,33 @@
+import type { BlockedPackage } from "./shell-threats.js";
+export declare const BLOCKLIST_START = "<!-- ez-safe:blocked-packages:start -->";
+export declare const BLOCKLIST_END = "<!-- ez-safe:blocked-packages:end -->";
+/**
+ * Same names and order as the system prompt's CONTEXT_FILES (a test keeps
+ * them equal): EZ Coder loads only the first that exists per folder, so the
+ * list must go into that one. Creating a CLAUDE.md beside a .cursorrules
+ * would outrank it and silently drop the user's own rules.
+ */
+export declare const INSTRUCTION_FILES: readonly ["AGENTS.override.md", "AGENTS.md", "CLAUDE.md", ".cursorrules", "CONVENTIONS.md"];
+/** The instruction file EZ Coder reads in `dir` (CLAUDE.md when there is none yet, as /init). */
+export declare function instructionFileFor(dir: string): Promise<string>;
+/** One list line, or null when anything fails validation. */
+export declare function blocklistLine(pkg: BlockedPackage): string | null;
+/** The text with the managed block set to `entries` (added at the end if missing). */
+export declare function withBlocklist(text: string, entries: string[]): string;
+/** Entries currently in the managed block of `text`. */
+export declare function readBlocklist(text: string): string[];
+/**
+ * Only write inside a real project: never the home folder or a filesystem
+ * root (a ~/CLAUDE.md would apply to every project), and never a loose folder
+ * such as Downloads or a temp dir with no project marker in it.
+ */
+export declare function isProjectDir(dir: string, home?: string): Promise<boolean>;
+/**
+ * Add `packages` to the project's list in `dir`. Returns the file written, or
+ * null when nothing new needed recording (or `dir` isn't a project, or the
+ * file is read-only/someone else's: their choice wins). Rejects on I/O
+ * failure; callers fire and forget and log it.
+ */
+export declare function recordBlockedPackages(dir: string, packages: readonly BlockedPackage[], options?: {
+    home?: string;
+}): Promise<string | null>;

package/dist/core/blocked-packages-file.js

@@ -0,0 +1,274 @@
+/**
+ * The project's "don't install" list: when a guard refuses a package, the app
+ * (not the agent) records it in the instruction file EZ Coder loads for the
+ * project, so every later session knows about it from its first token.
+ *
+ * One small managed block between markers, appended to the file EZ Coder
+ * reads (the first of INSTRUCTION_FILES that exists; CLAUDE.md is created when
+ * none does, as /init does). Deduplicated, capped, and nothing but validated package names,
+ * versions and our own reason text ever goes in, so the block can't carry
+ * injected instructions. Never touched mid-prompt: the running session already
+ * knows from the block message, and nothing re-renders the cached prompt.
+ */
+import { constants as fsConstants } from "node:fs";
+import fsp from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { retryWindowsReplace } from "./session-storage.js";
+export const BLOCKLIST_START = "<!-- ez-safe:blocked-packages:start -->";
+export const BLOCKLIST_END = "<!-- ez-safe:blocked-packages:end -->";
+const HEADER = [
+    "## Blocked packages",
+    "EZ Coder's safety checks blocked these. Never install or run them; use another version or package.",
+];
+/** Newest entries kept; older ones fall off the top. */
+const MAX_ENTRIES = 30;
+/** Bigger instruction files are left alone (not ours to rewrite). */
+const MAX_FILE_BYTES = 4 * 1024 * 1024;
+/**
+ * Same names and order as the system prompt's CONTEXT_FILES (a test keeps
+ * them equal): EZ Coder loads only the first that exists per folder, so the
+ * list must go into that one. Creating a CLAUDE.md beside a .cursorrules
+ * would outrank it and silently drop the user's own rules.
+ */
+export const INSTRUCTION_FILES = [
+    "AGENTS.override.md",
+    "AGENTS.md",
+    "CLAUDE.md",
+    ".cursorrules",
+    "CONVENTIONS.md",
+];
+const NAME = /^(?:@[a-z0-9._-]+\/)?[a-z0-9._-]+$/i;
+const VERSION = /^[a-z0-9][a-z0-9.+_-]{0,63}$/i;
+const REASON = /^[\w "(),.:@/-]{1,120}$/;
+/** The instruction file EZ Coder reads in `dir` (CLAUDE.md when there is none yet, as /init). */
+export async function instructionFileFor(dir) {
+    for (const name of INSTRUCTION_FILES) {
+        const file = path.join(dir, name);
+        try {
+            if ((await fsp.stat(file)).isFile())
+                return file;
+        }
+        catch {
+            // Not there: try the next name.
+        }
+    }
+    return path.join(dir, "CLAUDE.md");
+}
+/** One list line, or null when anything fails validation. */
+export function blocklistLine(pkg) {
+    if (pkg.ecosystem !== "npm" && pkg.ecosystem !== "PyPI")
+        return null;
+    if (!NAME.test(pkg.name) || (pkg.version !== undefined && !VERSION.test(pkg.version))) {
+        return null;
+    }
+    if (!REASON.test(pkg.reason))
+        return null;
+    const id = pkg.version ? `${pkg.name}@${pkg.version}` : pkg.name;
+    return `- ${pkg.ecosystem} \`${id}\`: ${pkg.reason}`;
+}
+/** `- npm \`chalk@5.6.1\`: …` → `npm chalk@5.6.1`, the dedupe key. */
+function lineKey(line) {
+    return /^- (\S+) `([^`]+)`/.exec(line)?.slice(1, 3).join(" ").toLowerCase() ?? line;
+}
+/**
+ * The managed block's span in `text`: the first end marker that has a start
+ * marker before it, paired with the nearest such start. A stray start or end
+ * marker (hand-edited, half-deleted) never makes us swallow the user's text
+ * between it and a real block.
+ */
+function blockSpan(text) {
+    let end = text.indexOf(BLOCKLIST_END);
+    while (end !== -1) {
+        const start = text.lastIndexOf(BLOCKLIST_START, end);
+        if (start !== -1)
+            return { start, end };
+        end = text.indexOf(BLOCKLIST_END, end + BLOCKLIST_END.length);
+    }
+    return null;
+}
+/** Lines inside the block that aren't ours (a user's own note): kept as-is. */
+function blockExtras(text) {
+    const span = blockSpan(text);
+    if (!span)
+        return [];
+    return text
+        .slice(span.start + BLOCKLIST_START.length, span.end)
+        .split(/\r?\n/)
+        .filter((line) => line.trim() !== "" && !line.startsWith("- ") && !HEADER.includes(line));
+}
+/** The text with the managed block set to `entries` (added at the end if missing). */
+export function withBlocklist(text, entries) {
+    const eol = text.includes("\r\n") ? "\r\n" : "\n";
+    const block = [BLOCKLIST_START, ...HEADER, ...blockExtras(text), ...entries, BLOCKLIST_END].join(eol);
+    const span = blockSpan(text);
+    if (span) {
+        return text.slice(0, span.start) + block + text.slice(span.end + BLOCKLIST_END.length);
+    }
+    const body = text.replace(/[ \t\r\n]+$/, "");
+    return body ? `${body}${eol}${eol}${block}${eol}` : `${block}${eol}`;
+}
+/** Entries currently in the managed block of `text`. */
+export function readBlocklist(text) {
+    const span = blockSpan(text);
+    if (!span)
+        return [];
+    return text
+        .slice(span.start + BLOCKLIST_START.length, span.end)
+        .split(/\r?\n/)
+        .filter((line) => line.startsWith("- "));
+}
+/** Files and folders that make `dir` a real project (a worktree's `.git` is a file). */
+const PROJECT_MARKERS = [
+    ".git",
+    "package.json",
+    "pyproject.toml",
+    "requirements.txt",
+    "setup.py",
+    "Cargo.toml",
+    "go.mod",
+    "package-lock.json",
+    "pnpm-lock.yaml",
+    "yarn.lock",
+    "bun.lock",
+    "uv.lock",
+    ...INSTRUCTION_FILES,
+];
+/**
+ * Only write inside a real project: never the home folder or a filesystem
+ * root (a ~/CLAUDE.md would apply to every project), and never a loose folder
+ * such as Downloads or a temp dir with no project marker in it.
+ */
+export async function isProjectDir(dir, home = os.homedir()) {
+    const resolved = path.resolve(dir);
+    if (path.parse(resolved).root === resolved)
+        return false;
+    const norm = (p) => (process.platform === "win32" ? p.toLowerCase() : p);
+    if (home && norm(path.resolve(home)) === norm(resolved))
+        return false;
+    const hits = await Promise.all(PROJECT_MARKERS.map((name) => fsp.lstat(path.join(resolved, name)).then(() => true, () => false)));
+    return hits.includes(true);
+}
+/** Lockfiles older than this are from a crashed writer and may be taken over. */
+const LOCK_STALE_MS = 10_000;
+const LOCK_WAIT_MS = 3_000;
+/**
+ * A cross-process lock beside the file (two GG windows on one project are two
+ * sidecars only when they're separate apps; still, never lose an entry or the
+ * user's text). Returns the release function, or throws after LOCK_WAIT_MS.
+ */
+async function lockFile(file) {
+    const lock = `${file}.ez-lock`;
+    const deadline = Date.now() + LOCK_WAIT_MS;
+    for (;;) {
+        try {
+            const handle = await fsp.open(lock, "wx");
+            await handle.close();
+            return () => fsp.rm(lock, { force: true });
+        }
+        catch (err) {
+            if (err.code !== "EEXIST")
+                throw err;
+            const st = await fsp.stat(lock).catch(() => null);
+            if (st && Date.now() - st.mtimeMs > LOCK_STALE_MS) {
+                await fsp.rm(lock, { force: true }).catch(() => { });
+                continue;
+            }
+            if (Date.now() > deadline)
+                throw new Error(`${lock} is held by another writer`, { cause: err });
+            await new Promise((resolve) => setTimeout(resolve, 25));
+        }
+    }
+}
+/** Read, merge, write atomically; "changed" when the file moved under us. */
+async function writeOnce(file, lines) {
+    const before = await fsp.stat(file).catch(() => null);
+    const text = before ? await fsp.readFile(file, "utf8") : "";
+    const entries = readBlocklist(text);
+    const known = new Set(entries.map(lineKey));
+    const added = lines.filter((line) => {
+        const key = lineKey(line);
+        if (known.has(key))
+            return false;
+        known.add(key);
+        return true;
+    });
+    if (added.length === 0)
+        return null;
+    const next = withBlocklist(text, [...entries, ...added].slice(-MAX_ENTRIES));
+    const tmp = `${file}.${process.pid}.${Date.now()}.tmp`;
+    try {
+        await fsp.writeFile(tmp, next, {
+            encoding: "utf8",
+            mode: before ? before.mode & 0o777 : 0o644,
+        });
+        const now = await fsp.stat(file).catch(() => null);
+        if (now?.mtimeMs !== before?.mtimeMs || now?.size !== before?.size) {
+            await fsp.rm(tmp, { force: true });
+            return "changed";
+        }
+        await retryWindowsReplace(() => fsp.rename(tmp, file));
+    }
+    catch (err) {
+        await fsp.rm(tmp, { force: true }).catch(() => { });
+        throw err;
+    }
+    return file;
+}
+/** One write at a time per file, so concurrent blocks never lose an entry. */
+const queues = new Map();
+/**
+ * Add `packages` to the project's list in `dir`. Returns the file written, or
+ * null when nothing new needed recording (or `dir` isn't a project, or the
+ * file is read-only/someone else's: their choice wins). Rejects on I/O
+ * failure; callers fire and forget and log it.
+ */
+export async function recordBlockedPackages(dir, packages, options = {}) {
+    const lines = packages.map(blocklistLine).filter((l) => l !== null);
+    if (lines.length === 0)
+        return null;
+    if (!(await isProjectDir(dir, options.home)))
+        return null;
+    let file = await instructionFileFor(dir);
+    // A symlinked CLAUDE.md -> AGENTS.md: write through to the real file, never
+    // replace the link with a regular file.
+    const link = await fsp.lstat(file).catch(() => null);
+    if (link?.isSymbolicLink())
+        file = await fsp.realpath(file).catch(() => file);
+    const run = async () => {
+        const first = await fsp.stat(file).catch(() => null);
+        if (first) {
+            if (!first.isFile() || first.size > MAX_FILE_BYTES)
+                return null;
+            // Read-only or owned by someone else: leave it alone (a rename would
+            // silently replace it).
+            const writable = await fsp.access(file, fsConstants.W_OK).then(() => true, () => false);
+            if (!writable)
+                return null;
+        }
+        const release = await lockFile(file);
+        try {
+            // An editor saving mid-write: re-read and try again, never clobber it.
+            for (let attempt = 0; attempt < 3; attempt++) {
+                const result = await writeOnce(file, lines);
+                if (result !== "changed")
+                    return result;
+            }
+            return null;
+        }
+        finally {
+            await release().catch(() => { });
+        }
+    };
+    const prev = queues.get(file) ?? Promise.resolve();
+    const next = prev.then(run, run);
+    const settled = next.catch(() => null);
+    queues.set(file, settled);
+    // Drop the entry once idle, so the map doesn't grow with every project.
+    void settled.then(() => {
+        if (queues.get(file) === settled)
+            queues.delete(file);
+    });
+    return next;
+}
+//# sourceMappingURL=blocked-packages-file.js.map

package/dist/core/blocked-packages-file.js.map

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

package/dist/core/compaction/policy.d.ts

@@ -1,7 +1,7 @@
 import type { Provider } from "@prestyj/ai";
 export declare const DEFAULT_COMPACTION_THRESHOLD = 0.85;
-/** The latency-capped effective context window for a provider, if one applies. */
-export declare function resolveLatencyWindowCap(provider: Provider): number | undefined;
+/** The effective trigger window cap for a provider (and model), if one applies. */
+export declare function resolveLatencyWindowCap(provider: Provider, model?: string): number | undefined;
 export interface CompactionPolicy {
     threshold: number;
     targetTokens: number;

package/dist/core/compaction/policy.js

@@ -1,63 +1,106 @@
 export const DEFAULT_COMPACTION_THRESHOLD = 0.85;
 /**
- * Latency caps on the context window used for compaction TRIGGERING.
+ * Caps on the context window used for compaction TRIGGERING, per provider.
  *
- * Some providers advertise huge windows (GLM: 1M, MiniMax/MiMo/Gemini: 1M+)
- * whose pricing model tolerates but whose transports may not: on the public
- * API every turn re-prefills the whole active context, and observed GLM
- * prefill was ~3-5K tok/s uncached (2026-09-22 sidecar log: 44-68s
- * time-to-first-token at 213K tokens). A session sitting at 21% of a 1M
- * window therefore paid a 45-70s tax on EVERY model call without ever
- * approaching the 85% compaction trigger.
+ * The trigger is `threshold × min(contextWindow, cap)`. A cap moves only when
+ * compaction summarizes; the model's true window still governs hard limits
+ * (request size, output budgets), and min() keeps a smaller advertised window
+ * authoritative — a cap never raises a trigger.
  *
- * Three tiers, ALL evidence-driven — this is deliberately not GLM-only:
+ * Every entry below needs evidence of ONE of these, cited inline:
  *
- *   1. MEASURED SLOW — explicit cap (glm: 176K → trigger ~150K, from the
- *      incident log).
- *   2. MEASURED HEALTHY — no cap: the transport's prompt caching demonstrably
- *      keeps large contexts fast (anthropic: we send explicit cache_control
- *      breakpoints; openai: sidecar audit shows flat 5-6s TTFT p95 at 237K
- *      tokens, zero stalls in 2,000+ turns). Capping these would throw away
- *      working context for nothing.
- *   3. UNKNOWN — the conservative default cap below. Any provider we have
- *      not measured gets it, so a user on ANY model is protected from the
- *      mega-window + cold-prefill pattern. The `cache_health` /
- *      `prompt_cache_miss` diag lines (agent-loop) turn tier 3 into tier 1 or
- *      2 with one line here as evidence arrives — remove a provider's cap
- *      once its logs show healthy cache reads at large sizes, lower it when
- *      they show misses.
+ *   - a hard input limit below the advertised window;
+ *   - measured slow turns (re-prefill without prompt caching);
+ *   - a price tier that reprices the WHOLE request once the prompt crosses a
+ *     size, so every turn past it costs more;
+ *   - the vendor's own agent compacting this model earlier on the same route.
  *
- * The model's true context window still governs hard limits (request size,
- * output budgets); a cap only moves when compaction summarizes. min() keeps a
- * smaller advertised window authoritative — the default never raises a
- * trigger that the provider's real window already keeps lower.
+ * "uncapped" needs evidence too: automatic prompt caching with cheap cache
+ * hits and no long-context tier, or measured fast turns at large sizes.
+ * Providers with no evidence either way keep {@link DEFAULT_LATENCY_WINDOW_CAP}.
+ * Verified 2026-10-16 against the vendors' agents in source (deepseek-harness,
+ * gemini-cli, qwen-code, codex, CodeWhale's model/pricing tables) and docs.
  */
-const PROVIDER_LATENCY_WINDOW_CAPS = {
+const PROVIDER_WINDOW_CAPS = {
+    // Measured: TTFT 1.1s <50K → 3.6s at 700K–1M, ~100% cache reads over
+    // 26,000+ turns (session logs, 2026-10). No long-context price tier. Claude
+    anthropic: "uncapped",
+    // Price line: once input passes 272K, OpenAI bills the WHOLE request at 2×
+    // input/cache and 1.5× output (OpenAI model pages, via CodeWhale pricing.rs
+    // OPENAI_LONG_CONTEXT_SURCHARGE_THRESHOLD). Codex itself stays under it,
+    // compacting at 90% of a 272K window (codex-rs/protocol/src/openai_models.rs
+    // auto_compact_token_limit). Trigger 231K on both routes: the API key's
+    // 1.05M window is capped here, the Codex OAuth route already passes 272K.
+    openai: 272_000,
+    // Measured slow: every turn re-prefilled the whole context on the Coding
+    // Plan endpoint at ~3–5K tok/s (2026-09-22 sidecar log: 44–68s TTFT at 213K).
     glm: 176_000,
+    // DeepSeek's own agent compacts at 80% of a 1M window with no cap
+    // (deepseek-harness packages/compaction: ratio 0.8, DEFAULT_CONTEXT_WINDOW
+    // 1_000_000). Automatic prefix caching, hits ~1/50 of a miss (pi models:
+    // cacheRead 0.006 vs input 0.30), no long-context surcharge.
+    deepseek: "uncapped",
+    // Kimi K3: automatic caching, hit $0.30 vs miss $3.00, no long-context tier
+    // (platform.kimi.ai pricing, via CodeWhale pricing.rs). Kimi For Coding
+    // (K2.8 Preview) serves up to 1M (kimi.com/code/docs).
+    moonshot: "uncapped",
+    // Measured: mimo-v2.6-pro ~1,600 turns, TTFT 4–7s, 95–100% of input read
+    // from cache up to 250K (session logs). Cache hit $0.0036 vs miss $0.435
+    // (~1/120), and V2.6 has a single price tier (Xiaomi rate card).
+    xiaomi: "uncapped",
+    // MiniMax-M3 doubles its price once input passes 512K (0.30 → 0.60 in, cache
+    // 0.06 → 0.12: CodeWhale pricing.rs MINIMAX_M3_LONG_CONTEXT_THRESHOLD, from
+    // MiniMax's pay-as-you-go page), and 512K is the guaranteed window; "1M" is
+    // up to. Trigger 435K stays under the line.
+    minimax: 512_000,
+    // Google's own Gemini CLI compresses at 50% of the window on this same
+    // Code Assist route (packages/cli/src/ui/constants.ts
+    // DEFAULT_COMPRESSION_THRESHOLD = 0.5; tokenLimit 1_048_576 for every
+    // Gemini model), and implicit caching on Code Assist is unverified. 616K ×
+    // 0.85 = 524K ≈ 50% of 1,048,576. Flash and Flash Lite are flat-priced at any
+    // prompt size; 3.1 Pro has its own price-line cap in MODEL_WINDOW_CAPS.
+    gemini: 616_000,
+    // Price line: xAI bills the WHOLE request at 2× ($4 / $1 cached / $12) once a
+    // grok-4.7 prompt reaches 200K tokens (docs.x.ai/developers/pricing;
+    // CodeWhale pricing.rs GROK_4_6_LONG_CONTEXT_THRESHOLD = 200_000). Trigger
+    // 170K stays under the line.
+    xai: 200_000,
+    // Qwen's own agent (qwen-code) runs qwen3.8-max at a 1M window and compacts
+    // at 85% (chatCompressionService DEFAULT_PCT). OpenRouter lists cache reads
+    // at $0.25 vs $2.00 input and no long-context tier.
+    openrouter: "uncapped",
 };
-/** Providers with MEASURED healthy prompt caching — exempt from the default cap. */
-const PROVIDERS_WITH_HEALTHY_CACHING = new Set([
-    "anthropic", // explicit cache_control breakpoints in our transport
-    "openai", // sidecar audit 2026-09-22: flat TTFT p95 at 237K tokens, 0 stalls / 2000+ turns
-]);
-/** Conservative ceiling for providers whose cache behaviour is UNMEASURED.
- *  Only bites mega-windows (≥ ~470K): typical 200-272K windows are unaffected. */
+/**
+ * Per-model caps, checked before the provider's rule: a model whose pricing
+ * differs from the rest of its provider.
+ */
+const MODEL_WINDOW_CAPS = {
+    // Price line: Gemini 3.1 Pro bills the WHOLE request at $4 / $18 instead of
+    // $2 / $12 once the prompt passes 200K tokens (Gemini API pricing); the
+    // Flash models stay flat. On a Code Assist licence this compacts earlier than
+    // Gemini CLI's 50%, which keeps API-key users off the higher rate.
+    "gemini-3.1-pro-preview": 200_000,
+};
+/** Conservative ceiling for providers with NO evidence either way (Sakana, the
+ *  Hugging Face router — whose served window and caching vary by backend).
+ *  Only bites windows above ~470K; 200–272K windows are unaffected. */
 const DEFAULT_LATENCY_WINDOW_CAP = 400_000;
-/** The latency-capped effective context window for a provider, if one applies. */
-export function resolveLatencyWindowCap(provider) {
-    const explicit = PROVIDER_LATENCY_WINDOW_CAPS[provider];
-    if (explicit != null)
-        return explicit;
-    if (PROVIDERS_WITH_HEALTHY_CACHING.has(provider))
+/** The effective trigger window cap for a provider (and model), if one applies. */
+export function resolveLatencyWindowCap(provider, model) {
+    const modelCap = model === undefined ? undefined : MODEL_WINDOW_CAPS[model];
+    if (modelCap !== undefined)
+        return modelCap;
+    const rule = PROVIDER_WINDOW_CAPS[provider];
+    if (rule === "uncapped")
         return undefined;
-    return DEFAULT_LATENCY_WINDOW_CAP;
+    return rule ?? DEFAULT_LATENCY_WINDOW_CAP;
 }
 /** One trigger policy shared by app sessions and CLI compaction. */
 export function resolveCompactionPolicy(options) {
     const threshold = Number.isFinite(options.threshold) && options.threshold > 0 && options.threshold < 1
         ? options.threshold
         : DEFAULT_COMPACTION_THRESHOLD;
-    const latencyCap = resolveLatencyWindowCap(options.provider);
+    const latencyCap = resolveLatencyWindowCap(options.provider, options.model);
     // The trigger fires against the latency-capped window when one applies —
     // min() keeps a provider-declared window smaller than the cap authoritative.
     const effectiveWindow = latencyCap

package/dist/core/compaction/policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/core/compaction/policy.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,CAAC;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,4BAA4B,GAAsC;IACtE,GAAG,EAAE,OAAO;CACb,CAAC;AAEF,oFAAoF;AACpF,MAAM,8BAA8B,GAA0B,IAAI,GAAG,CAAC;IACpE,WAAW,EAAE,sDAAsD;IACnE,QAAQ,EAAE,iFAAiF;CAC9E,CAAC,CAAC;AAEjB;kFACkF;AAClF,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAE3C,kFAAkF;AAClF,MAAM,UAAU,uBAAuB,CAAC,QAAkB;IACxD,MAAM,QAAQ,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;IACxD,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,QAAQ,CAAC;IACtC,IAAI,8BAA8B,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IACnE,OAAO,0BAA0B,CAAC;AACpC,CAAC;AAQD,oEAAoE;AACpE,MAAM,UAAU,uBAAuB,CAAC,OAOvC;IACC,MAAM,SAAS,GACb,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,SAAU,GAAG,CAAC,IAAI,OAAO,CAAC,SAAU,GAAG,CAAC;QACpF,CAAC,CAAC,OAAO,CAAC,SAAU;QACpB,CAAC,CAAC,4BAA4B,CAAC;IACnC,MAAM,UAAU,GAAG,uBAAuB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,yEAAyE;IACzE,6EAA6E;IAC7E,MAAM,eAAe,GAAG,UAAU;QAChC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC;QAC7C,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;IAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC;IACzE,MAAM,SAAS,GACb,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC;IACpF,OAAO;QACL,SAAS;QACT,YAAY;QACZ,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS;YACT,aAAa,EAAE,eAAe;YAC9B,SAAS;YACT,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,IAAI,IAAI;SACnD,CAAC;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/core/compaction/policy.ts"],"names":[],"mappings":"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"}

package/dist/core/compaction/token-estimator.d.ts

@@ -27,7 +27,10 @@ export declare function measureConversationChars(messages: Message[]): {
  * its authoritative total input tokens (uncached + cache read/write). Skips
  * histories containing image/video parts.
  */
-export declare function calibrateEstimatorFromUsage(history: Message[], usage: Usage): void;
+export declare function calibrateEstimatorFromUsage(history: Message[], usage: Usage, 
+/** Characters the provider also counted but `history` lacks — the tool
+ *  definitions sent with the request. Omitting them biases the ratio low. */
+extraChars?: number): void;
 export declare function estimateTokens(text: string): number;
 export declare function estimateMessageTokens(message: Message): number;
 export declare function estimateConversationTokens(messages: Message[]): number;

package/dist/core/compaction/token-estimator.js

@@ -108,12 +108,15 @@ export function measureConversationChars(messages) {
  * its authoritative total input tokens (uncached + cache read/write). Skips
  * histories containing image/video parts.
  */
-export function calibrateEstimatorFromUsage(history, usage) {
+export function calibrateEstimatorFromUsage(history, usage, 
+/** Characters the provider also counted but `history` lacks — the tool
+ *  definitions sent with the request. Omitting them biases the ratio low. */
+extraChars = 0) {
     const { chars, hasMedia } = measureConversationChars(history);
     if (hasMedia)
         return;
     const totalInputTokens = usage.inputTokens + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
-    calibrateEstimator(chars, totalInputTokens);
+    calibrateEstimator(chars + Math.max(0, extraChars), totalInputTokens);
 }
 function getModelCharsPerToken() {
     if (!activeModel)

package/dist/core/compaction/token-estimator.js.map

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

package/dist/core/event-bus.d.ts

@@ -86,6 +86,16 @@ export interface BusEventMap {
     diagnostics: {
         text: string;
     };
+    /** A project's lockfile pins a package now known to be malware (background check). */
+    security_notice: {
+        key: string;
+        message: string;
+    };
+    /** A guard blocked something (or found an infected installed package): a chat row. */
+    security_block: {
+        rule: string;
+        target: string;
+    };
     hook: {
         kind: "ideal" | "verification" | "loop_break" | "regrounding";
         coverageExpected?: string[];

package/dist/core/event-bus.js

@@ -19,6 +19,8 @@ function emptyListenerSets() {
         server_tool_call: new Set(),
         server_tool_result: new Set(),
         diagnostics: new Set(),
+        security_notice: new Set(),
+        security_block: new Set(),
         hook: new Set(),
         hook_armed: new Set(),
         subagent_state: new Set(),

package/dist/core/event-bus.js.map

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