@event4u/agent-config 16.4.0 → 17.0.0

package/src/scripts/council_cli.ts

@@ -16,8 +16,8 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
-import { project_settings_path, resolve_project_root } from './_lib/agent_settings.js';
-import { load_agent_settings } from './_lib/agent_settings.js';
+import { load_agent_settings, project_settings_path, resolve_project_root } from './_lib/agent_settings.js';
+import { recentHostMarker } from './_lib/quota_parked.js';
 import { detectEnvironment, type EnvironmentReport } from './_lib/environment_detector.js';
 
 import {
@@ -79,10 +79,14 @@ import {
 import { AuthCache, select_solo_member } from './ai_council/solo_dispatch.js';
 import { InvalidModeError, resolve_global_mode } from './ai_council/modes.js';
 import { classifyCliFailure, resolveMemberTransport, type AbsentReason } from './ai_council/transport_resolver.js';
+import { classifyContentClass, DEFAULT_CONTENT_CLASS, DEFAULT_SEAT_CEILING, type ContentClass } from './ai_council/content_ceiling.js';
+import { parseRouteFields, routeBilling } from './ai_council/free_route.js';
 import {
     disabledSeats as _disabledSeats,
     resolvedTransportFor as _resolvedTransportFor,
+    routeStatusLines as _routeStatusLines,
 } from './ai_council/status_surface.js';
+import { routeMemberFor } from './ai_council/route_member.js';
 import { evaluateQuorum, type QuorumResult } from './ai_council/quorum.js';
 import {
     _emitQuorumEvent,
@@ -518,6 +522,11 @@ interface BuildMembersOptions {
      * state that differs per machine and per CI run.
      */
     environment_report?: EnvironmentReport | null;
+    /**
+     * The class of what this pass sends. Omitted → `project-content`, so a seat
+     * whose ceiling is `public-artifact` is dropped as absent.
+     */
+    content_class?: ContentClass;
     /**
      * Recorded provider observations. Supplied ⇒ presence is gated on the
      * qualification ladder; omitted ⇒ not evaluated at all, and presence keeps
@@ -678,14 +687,12 @@ function build_members(settings: Dict, opts: BuildMembersOptions = {}): External
             continue;
         }
         total_enabled += 1;
-        // road-to-always-on-orchestration Phase 3.1: the single reconciled
-        // entry point — composes `resolve_mode` (which layer decided the
-        // mode) with `resolveTransport` (what `auto` expands to on THIS
-        // machine). The hand-rolled `mode === 'api' | 'cli' | 'manual'`
-        // switch this replaces had no `'auto'` case, so every invocation
-        // broke the moment the loader default flipped `api` → `auto`
-        // (`config.ts::_build_defaults`) — every member fell through to the
-        // final `else` below and killed the whole pass.
+        const routed = routeMemberFor(name, cfg, opts.content_class ?? DEFAULT_CONTENT_CLASS, overrides[name] as string | undefined);
+        if (routed !== null) {
+            if ('absent' in routed) { record_absent(routed.absent); _stderr(`[council] SKIP ${name}: ${routed.absent.detail}\n`); } else members.push(routed.client);
+            continue;
+        }
+        // Composes `resolve_mode` with what `auto` expands to on THIS machine.
         const api_key_present = _member_api_key_present(cfg);
         const resolved = resolveMemberTransport({
             provider: name,
@@ -694,6 +701,8 @@ function build_members(settings: Dict, opts: BuildMembersOptions = {}): External
             memberSettings: cfg,
             globalMode: global_mode ?? null,
             binaryOverride: (cfg['binary'] as string | null) ?? null,
+            seatCeiling: classifyContentClass(cfg['content_ceiling'], DEFAULT_SEAT_CEILING),
+            contentClass: opts.content_class ?? DEFAULT_CONTENT_CLASS,
             // `exactOptionalPropertyTypes` rejects an explicit `undefined` —
             // see `resolveMemberTransport`'s own forwarding call for the
             // same pattern.
@@ -757,23 +766,10 @@ function build_members(settings: Dict, opts: BuildMembersOptions = {}): External
         }
         const model = (overrides[name] as string | undefined) || (cfg['model'] as string | undefined) || null;
         if (resolved.transport === 'api' && _API_PROVIDERS.has(name)) {
-            // m2 fix (independent-review finding) — `resolveMemberTransport`'s
-            // `auto` chain treats "a key-file or env-key auth record exists
-            // for this provider" as sufficient to resolve transport=`api`
-            // (its own default `apiKeyPresent` read off the environment
-            // report, used whenever the member config carries no explicit
-            // `api_key_ref` at all — see `_member_api_key_present` above,
-            // which returns `undefined`, not `false`, in exactly that case).
-            // But gemini/xai/perplexity's OWN construction contract is
-            // stricter: `_construct_api_member` requires an EXPLICIT
-            // `api_key_ref` for those three and refuses the legacy-fallback
-            // path other providers get, throwing `CouncilDisabledError`. A
-            // generic env var (e.g. `GEMINI_API_KEY` set for an unrelated
-            // tool) satisfying the permissive auto-chain read while
-            // `api_key_ref` was never wired into the council config is
-            // exactly this mismatch — previously an UNCAUGHT throw here
-            // killed the entire pass. Same catch-and-skip shape the CLI
-            // branch below already uses for its own construction failure.
+            // The `auto` chain resolves `api` on any detected key, but gemini,
+            // xai and perplexity require an EXPLICIT `api_key_ref` and throw
+            // `CouncilDisabledError` without one. A generic env var set for an
+            // unrelated tool must skip the seat, not kill the pass.
             try {
                 members.push(
                     _construct_api_member(name, model, {
@@ -1126,7 +1122,7 @@ function format_estimate_table(
         const e = estimates[i] as CostEstimateLike;
         rows.push(
             `  ${m.name}/${m.model}: ` +
-                `~${e.input_tokens} in + ${e.output_tokens} out  =  $${_pyFixed(_total_usd(e), 4)}`,
+                `~${e.input_tokens} in + ${e.output_tokens} out  =  $${_pyFixed(_total_usd(e), 4)}${e.priced === false ? `  unpriced: ${m.name}/${m.model}` : ''}`,
         );
     }
     let total = estimates.reduce((acc, e) => acc + _total_usd(e), 0.0);
@@ -1159,6 +1155,7 @@ interface CostEstimateLike {
     output_tokens: number;
     input_usd: number;
     output_usd: number;
+    priced?: boolean;
 }
 
 function _total_usd(e: CostEstimateLike): number {
@@ -1342,6 +1339,23 @@ interface ChairmanResult {
     response: CouncilResponse | null;
 }
 
+/** Enabled seats as chair candidates, each with its route billing so an unpaid seat is refused the chair. */
+export function chairman_candidates(membersRaw: Dict): ChairmanCandidate[] {
+    const candidates: ChairmanCandidate[] = [];
+    for (const [name, raw] of Object.entries(membersRaw)) {
+        const md = (raw as Dict) || {};
+        if (md['enabled'] !== true) continue;
+        const parsed = parseRouteFields(name, md, false);
+        const billing = 'route' in parsed && parsed.route !== null ? routeBilling(parsed.route) : null;
+        candidates.push({
+            name,
+            tier: typeof md['tier'] === 'number' ? (md['tier'] as number) : null,
+            ...(billing !== null ? { billing } : {}),
+        });
+    }
+    return candidates;
+}
+
 /** Phase 2 chairman dispatch — optional extra billable pass after consult.
  *  Gated on `ai_council.chairman.mode != host`; selection per the 2026-07-12
  *  council decision (provider-difference primary, tier tie-break) via
@@ -1366,15 +1380,7 @@ function _maybe_run_chairman(
     }
     const cfg_member = typeof ch['member'] === 'string' ? (ch['member'] as string) : null;
     const membersRaw = (_isDict(ai_cfg) ? (ai_cfg['members'] as Dict) : null) || {};
-    const candidates: ChairmanCandidate[] = [];
-    for (const [name, raw] of Object.entries(membersRaw)) {
-        const md = (raw as Dict) || {};
-        if (md['enabled'] !== true) continue;
-        candidates.push({
-            name,
-            tier: typeof md['tier'] === 'number' ? (md['tier'] as number) : null,
-        });
-    }
+    const candidates = chairman_candidates(membersRaw);
     const deliberated = new Set(
         responses.filter((r) => r.error === null && r.text.trim() !== '').map((r) => r.provider),
     );
@@ -1884,7 +1890,7 @@ function _necessity_gate(opts: {
     if (!enabled || mode === 'off') {
         return [true, 0, null];
     }
-    const result = classify_necessity(opts.prompt, opts.lens, opts.invocation as never);
+    const result = classify_necessity(opts.prompt, opts.lens, opts.invocation as never, { ratePressure: recentHostMarker(REPO_ROOT) });
     const caps = _provider_caps_snapshot(opts.ai_cfg);
     const hashed = (opts.original_ask || '') || opts.prompt;
 
@@ -2048,6 +2054,7 @@ function _size_fit_gate(opts: {
                         `\`${member.model}\` → \`${verdict.suggested_model}\` · ` +
                         `${verdict.reason}\n`,
                 );
+                Object.assign(member, { size_fit: { configured_model: member.model, size_fit_reason: verdict.reason } });
                 member.model = verdict.suggested_model;
                 applied = true;
             } else {
@@ -2245,6 +2252,7 @@ export function cmd_status(args: Args, opts: { env?: Record<string, string | und
                                 absent_reason: t.absentReason,
                                 policy_exclusion: m.policy_exclusion,
                                 content_ceiling: m.content_ceiling,
+                                route: m.route?.base_url ?? null,
                             },
                         ];
                     }),
@@ -2299,6 +2307,7 @@ export function cmd_status(args: Args, opts: { env?: Record<string, string | und
             }
             _stdout(`  content ceiling  ${name}: ${member.content_ceiling}\n`);
         }
+        for (const line of _routeStatusLines(enabledMembers)) _stdout(`${line}\n`);
         // 1.2: a disabled seat was invisible here — `enabled` members only.
         for (const [name, reason] of Object.entries(_disabledSeats(cfg))) {
             _stdout(`  disabled seat    ${name}: ${reason}\n`);
@@ -3950,5 +3959,6 @@ export {
     // (the pre-run print is gated on `build_members` having populated
     // `quorum_out`), and constructing a real roster would spend money.
     _format_quorum_line,
+    _size_fit_gate,
     CouncilDisabledError,
 };

package/src/scripts/cross_repo_retrieve.ts

@@ -19,7 +19,9 @@
  * TypeScript and a `.ts` cannot import a `.py`, so the redaction + chunking
  * primitives are ported faithfully inline here and verified byte-identical
  * against the retired Python implementations (differential-tested, no behavior divergence).
- * They carry no legacy-source-path literal, matching the `.py`.
+ * They carry no legacy-source-path literal, matching the `.py`. The secret
+ * scrub is the exception: it calls the ported `workspace_secrets.scrub`, whose
+ * credential detection is the one rule table's.
  *
  * Scope guards (Option A):
  *   - read-only, no writes, no network;
@@ -38,6 +40,8 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
+import { redactIdentifiers } from './_lib/identifier_redaction.js';
+import { scrub } from './_lib/workspace_secrets.js';
 import { collect } from './linked_projects_list.js';
 
 const _HERE = fileURLToPath(import.meta.url);
@@ -57,82 +61,15 @@ const SKIP_DIRS: ReadonlySet<string> = new Set([
 
 const CHUNK_BYTES = 2 * 1024;
 
-// workspace_secrets patterns (HIGH-confidence first, then FUZZY).
-const _RE_PRIVATE_KEY =
-    /-----BEGIN [A-Z ]+PRIVATE KEY-----[\s\S]*?-----END [A-Z ]+PRIVATE KEY-----/g;
-const _RE_AWS = /AKIA[0-9A-Z]{16}/g;
-const _RE_GH = /gh[pousr]_[A-Za-z0-9]{36,}/g;
-const _RE_OPENAI = /sk-[A-Za-z0-9]{20,}/g;
-const _RE_KV_SECRET =
-    /(?:api[_-]?key|secret|token|password|passwd|bearer)\s*[:=]\s*['"]?[A-Za-z0-9_\-+/=]{12,}['"]?/gi;
-const _SECRET_PATTERNS: ReadonlyArray<RegExp> = [
-    _RE_PRIVATE_KEY,
-    _RE_AWS,
-    _RE_GH,
-    _RE_OPENAI,
-    _RE_KV_SECRET,
-];
-const _SECRET_PLACEHOLDER = '[SECRET]';
-
-// knowledge_ingest PII patterns.
-const _RE_EMAIL = /[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[A-Za-z]{2,}/g;
-const _RE_PHONE = new RegExp(
-    '(?:(?<=\\s)|(?<=^))' +
-        '(?:\\+?\\d{1,3}[\\s.\\-]?)?' +
-        '(?:\\(\\d{2,4}\\)[\\s.\\-]?|\\d{2,4}[\\s.\\-])' +
-        '\\d{2,4}[\\s.\\-]?\\d{2,4}(?:[\\s.\\-]?\\d{2,4})?',
-    'g',
-);
-const _RE_IBAN = /\b[A-Z]{2}\d{2}[A-Z0-9]{11,30}\b/g;
-const _RE_CC = /\b(?:\d[ \-]?){13,19}\b/g;
-const _RE_SSN = /\b\d{3}-\d{2}-\d{4}\b/g;
-
-/** Count and replace all matches like Python `re.subn`. */
-function _subn(text: string, pat: RegExp, repl: string): [string, number] {
-    let n = 0;
-    const out = text.replace(pat, () => {
-        n += 1;
-        return repl;
-    });
-    return [out, n];
-}
-
-/** Faithful port of `workspace_secrets.scrub(text, include_fuzzy=True)`. */
+/** `workspace_secrets.scrub(text, include_fuzzy=True)`: credential detection is the rule table's. */
 function _scrub_secrets(text: string): [string, number] {
-    if (typeof text !== 'string' || text === '') {
-        return [text, 0];
-    }
-    let count = 0;
-    let out = text;
-    for (const pat of _SECRET_PATTERNS) {
-        const [t, n] = _subn(out, pat, _SECRET_PLACEHOLDER);
-        out = t;
-        count += n;
-    }
-    return [out, count];
+    return scrub(text, { include_fuzzy: true });
 }
 
 /** Faithful port of `knowledge_ingest.redact(text, counters)`. */
 function redact(text: string, counters: Record<string, number>): [string, number] {
-    const _bump = (name: string, n = 1): void => {
-        counters[name] = (counters[name] ?? 0) + n;
-    };
-    let [out, secrets_count] = _scrub_secrets(text);
-    const piiPats: ReadonlyArray<[RegExp, string]> = [
-        [_RE_IBAN, 'IBAN'],
-        [_RE_CC, 'CC'],
-        [_RE_SSN, 'SSN'],
-        [_RE_EMAIL, 'EMAIL'],
-        [_RE_PHONE, 'PHONE'],
-    ];
-    for (const [pat, tag] of piiPats) {
-        const [t, n] = _subn(out, pat, `[${tag}]`);
-        out = t;
-        if (n) {
-            _bump(tag, n);
-        }
-    }
-    return [out, secrets_count];
+    const [out, secrets_count] = _scrub_secrets(text);
+    return [redactIdentifiers(out, counters), secrets_count];
 }
 
 /** UTF-8 byte length, mirror of Python `len(s.encode("utf-8"))`. */

package/src/scripts/design_lock.ts

@@ -0,0 +1,106 @@
+#!/usr/bin/env tsx
+/**
+ * Flag a UI value that lies outside a Consistency Lock declared in `DESIGN.md`
+ * (road-to-a-canvas-the-code-owns step 8.2). The logic and its reasons live in
+ * `_lib/design_lock.ts`.
+ *
+ * Usage:
+ *   npx tsx design_lock.ts [--design-md DESIGN.md] [--baseline <json>]
+ *                          [--write-baseline <json>] [--json] <file|dir>...
+ *
+ * Exit codes: 0 — scanned (findings are flags, never a failure) · 2 — argument
+ * error. Pass the changed UI files to see only what this change introduced; a
+ * brownfield project records its existing drift once with `--write-baseline`.
+ */
+
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+import { type LockFinding, checkFile, newDrift, parseLocks } from './_lib/design_lock.js';
+
+const _HERE = fileURLToPath(import.meta.url);
+const UI_FILE = /\.(css|scss|sass|less|html|htm|vue|svelte|astro|jsx|tsx)$/i;
+
+function collect(target: string, out: string[]): void {
+    const st = fs.lstatSync(target);
+    if (st.isDirectory()) {
+        for (const n of fs.readdirSync(target).sort()) if (n !== 'node_modules' && !n.startsWith('.')) collect(path.join(target, n), out);
+    } else if (st.isFile() && UI_FILE.test(target)) out.push(target);
+}
+
+export function main(argv: readonly string[] = process.argv.slice(2)): number {
+    let designMd = 'DESIGN.md';
+    let baseline: string | null = null;
+    let writeBaseline: string | null = null;
+    let json = false;
+    const targets: string[] = [];
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i] as string;
+        const take = (): string => {
+            const v = argv[++i];
+            if (v === undefined) throw new Error(`argument ${a}: expected one argument`);
+            return v;
+        };
+        if ((a === '--design-md' || a === '--baseline' || a === '--write-baseline') && argv[i + 1] === undefined) {
+            process.stderr.write(`design_lock: argument ${a}: expected one argument\n`);
+            return 2;
+        }
+        if (a === '--design-md') designMd = take();
+        else if (a === '--baseline') baseline = take();
+        else if (a === '--write-baseline') writeBaseline = take();
+        else if (a === '--json') json = true;
+        else if (a.startsWith('-')) {
+            process.stderr.write(`design_lock: unrecognized argument: ${a}\n`);
+            return 2;
+        } else targets.push(a);
+    }
+    let md = '';
+    try {
+        md = fs.readFileSync(designMd, 'utf-8');
+    } catch {
+        process.stdout.write(`design_lock: no ${designMd} — no Lock is declared, nothing to check\n`);
+        return 0;
+    }
+    const locks = parseLocks(md);
+    const files: string[] = [];
+    for (const t of targets) if (fs.existsSync(t)) collect(t, files);
+    let findings: LockFinding[] = files.flatMap((f) => checkFile(path.relative(process.cwd(), f), fs.readFileSync(f, 'utf-8'), locks));
+    if (writeBaseline !== null) {
+        fs.writeFileSync(writeBaseline, `${JSON.stringify(findings.map((f) => ({ file: f.file, value: f.value })), null, 2)}\n`);
+        process.stdout.write(`design_lock: recorded ${findings.length} existing finding(s) as the baseline\n`);
+        return 0;
+    }
+    if (baseline !== null) {
+        let known: unknown;
+        try {
+            known = JSON.parse(fs.readFileSync(baseline, 'utf-8'));
+        } catch (err) {
+            process.stderr.write(`design_lock: --baseline ${baseline} is unreadable (${err instanceof Error ? err.message : String(err)})\n`);
+            return 2;
+        }
+        if (!Array.isArray(known)) {
+            process.stderr.write(`design_lock: --baseline ${baseline} is not a JSON array of findings\n`);
+            return 2;
+        }
+        findings = newDrift(findings, known as Array<{ file: string; value: string }>);
+    }
+    if (json) process.stdout.write(`${JSON.stringify({ findings }, null, 2)}\n`);
+    else {
+        for (const f of findings) process.stdout.write(`• ${f.file}:${f.line} [${f.lock} lock] ${f.message}\n`);
+        process.stdout.write(`design_lock: ${findings.length} value(s) outside a declared Lock in ${files.length} file(s) — rebuttable: state why in the diff, or record it in a baseline.\n`);
+    }
+    return 0;
+}
+
+function _isCliEntry(): boolean {
+    if (process.argv[1] === undefined) return false;
+    if (import.meta.url === pathToFileURL(path.resolve(process.argv[1])).href) return true;
+    try {
+        return fs.realpathSync(fileURLToPath(import.meta.url)) === fs.realpathSync(path.resolve(process.argv[1]));
+    } catch {
+        return false;
+    }
+}
+
+if (_isCliEntry() || process.argv[1] === _HERE) process.exit(main());

package/src/scripts/design_slop_rules.ts

@@ -675,6 +675,36 @@ export const SLOP_RULES: SlopRule[] = [
         })
         .map((b) => ({ line: b.line, snippet: b.selector.slice(0, 80) })),
   },
+  {
+    id: "slop-t12-swap-without-metric-fallback",
+    catalogId: "T12",
+    severity: "P3",
+    engines: ["css"],
+    description: "Self-hosted webfont with font-display: swap and no metric-matched fallback @font-face",
+    message:
+      "swap paints the fallback first; without a local() fallback carrying size-adjust, ascent-override and descent-override, every line reflows at the swap (T12).",
+    gated: (ctx) => ctx.has("size-adjust", "metric-matched fallback"),
+    detect: ({ content }) => {
+      const faces = cssBlocks(content).filter((b) => /^@font-face$/i.test(b.selector));
+      // Self-hosted: a url() that is not an absolute http(s) address. A
+      // third-party delivery is owned by the webfont-delivery section.
+      const swapped = faces.filter(
+        (b) =>
+          /font-display\s*:\s*swap/i.test(b.body) &&
+          /url\(/i.test(b.body) &&
+          !/url\(\s*["']?https?:\/\//i.test(b.body),
+      );
+      if (swapped.length === 0) return [];
+      const matched = faces.some(
+        (b) =>
+          /local\(/i.test(b.body) &&
+          /size-adjust\s*:/i.test(b.body) &&
+          /ascent-override\s*:/i.test(b.body) &&
+          /descent-override\s*:/i.test(b.body),
+      );
+      return matched ? [] : swapped.map((b) => ({ line: b.line, snippet: b.body.trim().split("\n")[0]?.slice(0, 80) ?? "" }));
+    },
+  },
   {
     id: "slop-m1-bounce-easing",
     catalogId: "M1",