agent-nuvira 3.3.1 → 3.3.4

package/dist/agents/step-handoff.js

@@ -0,0 +1,443 @@
+/**
+ * Step hand-off — the durable record a FAILED step leaves for whoever runs next.
+ *
+ * WHY THIS EXISTS (the live NVDA-addon failure):
+ * Over 19 attempts on one WhatsApp ask the pipeline never produced the add-on,
+ * and every attempt started from an empty hand. The morning's traces show the
+ * shape of it: the same plan re-planned 18 times, the same three files "created"
+ * 18 times, and a 934s stall in the middle of the run that had a model change
+ * underneath it. The design says a broken task is handed to another model — and
+ * it is, WITHIN a step (`loop-executor`'s candidate walk). What did not exist is
+ * the record that survives the step. So the next candidate, the next turn and
+ * the next *run* each re-derived the same plan and re-attempted the same files,
+ * with nothing telling them that a previous attempt had already landed two of
+ * the three files.
+ *
+ * The four facts a hand-off carries, in the order they matter:
+ *   1. WHAT the step must produce (`declared`) — from the planner's
+ *      `expectedFiles` / the goal's named deliverable, not from the model's
+ *      self-report.
+ *   2. WHAT IS ALREADY ON DISK (`landed`) — re-derived from the filesystem on
+ *      every read, never trusted from a previous write. A hand-off that
+ *      remembered "installTasks.py: done" while the file was absent would
+ *      recreate the exact false completion this exists to end.
+ *   3. WHAT IS STILL MISSING (`remaining`).
+ *   4. WHO TRIED AND WHY IT FAILED (`attempts`) — so the incoming model is told
+ *      what was already attempted, not silently handed the same prompt.
+ *
+ * Keying (this is what makes a REWORDED ask resume):
+ * A step's key is the digest of its DECLARED ARTIFACTS, sorted, so the same
+ * deliverable written two different ways in one project maps to one hand-off.
+ * Only when a step declares no artifacts does the key fall back to a normalized
+ * digest of its description. `loadOpenHandoffs` is project-scoped for the same
+ * reason: a run that asks for the same thing in different words still finds the
+ * previous attempt, because it is looking at the project, not at the sentence.
+ *
+ * Deliberately deterministic and LLM-free, like the working-state ledger: facts
+ * and a compact block, no summarizer, no drift. Storage is
+ * `~/.nuvira/memory/step-handoffs.json` (honours NUVIRA_MEMORY_DIR /
+ * BUFF_MEMORY_DIR). Every operation is best-effort and must NEVER throw — a
+ * hand-off failure reports, it does not break a run.
+ */
+import { envBuff, resolveNuviraHome } from '../config/paths.js';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { createHash } from 'node:crypto';
+import { join, resolve } from 'node:path';
+import { verifyArtifacts } from './artifact-verification.js';
+// ─── Constants ──────────────────────────────────────────────────────────────
+const CURRENT_VERSION = 1;
+/** Cap on remembered attempts per step (oldest drop first). */
+export const MAX_ATTEMPTS = 10;
+/** Cap on remembered steps in the whole file (oldest drop first). */
+export const MAX_ENTRIES = 120;
+/** Cap on the injected block — it rides in prompts, so it stays short. */
+export const MAX_BLOCK_CHARS = 1_600;
+/** Built-in artifacts a plan may name without the planner declaring them. */
+const DELIVERABLE_EXTENSIONS = [
+    '.nvda-addon', '.zip', '.wheel', '.whl', '.vsix', '.tar.gz', '.tgz', '.jar', '.epub',
+];
+// ─── Storage ────────────────────────────────────────────────────────────────
+function memoryDir() {
+    return envBuff('MEMORY_DIR') || join(resolveNuviraHome(), 'memory');
+}
+function storePath() {
+    return join(memoryDir(), 'step-handoffs.json');
+}
+function readFileSafe() {
+    try {
+        if (!existsSync(storePath()))
+            return { version: CURRENT_VERSION, entries: {} };
+        const data = JSON.parse(readFileSync(storePath(), 'utf-8'));
+        if (!data || typeof data !== 'object' || !data.entries || typeof data.entries !== 'object') {
+            return { version: CURRENT_VERSION, entries: {} };
+        }
+        return data;
+    }
+    catch {
+        return { version: CURRENT_VERSION, entries: {} };
+    }
+}
+function writeFileSafe(data) {
+    try {
+        if (!existsSync(memoryDir()))
+            mkdirSync(memoryDir(), { recursive: true });
+        writeFileSync(storePath(), JSON.stringify(data, null, 2), 'utf-8');
+    }
+    catch {
+        // Best-effort — a hand-off write must never break a run.
+    }
+}
+/** Normalize a project path so one project always maps to one entry. */
+export function normalizeProjectPath(projectPath) {
+    try {
+        return resolve(projectPath);
+    }
+    catch {
+        return projectPath;
+    }
+}
+function sha(text) {
+    return createHash('sha1').update(text).digest('hex').slice(0, 12);
+}
+/**
+ * Normalize a declared artifact path so two spellings of the same file collide:
+ * absolute or relative, with either slash, with surrounding quotes or whitespace.
+ * Deliberately does NOT resolve against a root — the stored key must be stable
+ * whether the caller passes `manifest.ini` or the absolute path.
+ */
+function normalizeArtifact(declared) {
+    return declared
+        .trim()
+        .replace(/^['"]|['"]$/g, '')
+        .replace(/\\/g, '/')
+        .replace(/\/{2,}/g, '/')
+        .replace(/^\.\//, '')
+        .toLowerCase();
+}
+/**
+ * Lowercase, punctuation-free, whitespace-collapsed — so rewording still matches.
+ * Hyphens and underscores are JOINED rather than split: "add-on" and "addon"
+ * are the same word, and that is the pair a person varies most when re-asking.
+ */
+function normalizeGoal(goal) {
+    return (goal || '')
+        .toLowerCase()
+        .replace(/[-_]+/g, '')
+        .replace(/[^a-z0-9]+/g, ' ')
+        .trim()
+        .replace(/\s+/g, ' ');
+}
+/**
+ * The stable key for a step.
+ *
+ * Artifacts win when there are any: the same deliverable asked for in different
+ * words yields the same key, which is the whole point (a reworded ask must
+ * resume). The description is the fallback, normalized so trivial rewording
+ * ("Package the addon" / "package  the add-on") collapses to one key.
+ */
+export function stepKeyFor(input) {
+    const artifacts = (input.declared ?? [])
+        .map(normalizeArtifact)
+        .filter(Boolean)
+        .sort();
+    if (artifacts.length > 0)
+        return `art:${sha(artifacts.join('\n'))}`;
+    const text = input.stepDescription?.trim() || input.goal?.trim() || 'step';
+    return `txt:${sha(normalizeGoal(text))}`;
+}
+/** The composite store key: project + step. Goal text is NOT part of it, on purpose. */
+function entryKey(projectPath, stepKey) {
+    return `${normalizeProjectPath(projectPath)}\u0000${stepKey}`;
+}
+// ─── Reconciliation ─────────────────────────────────────────────────────────
+/**
+ * Re-derive `landed` / `remaining` from the filesystem.
+ *
+ * This is the rule that keeps a hand-off honest: a stored field saying a file
+ * was written is a CLAIM, and the live failure was a run that believed one. So
+ * every read of a hand-off re-checks disk, and a file that has since vanished
+ * moves back into `remaining`.
+ */
+export function reconcileHandoff(handoff) {
+    const declared = handoff.declared ?? [];
+    if (declared.length === 0)
+        return handoff;
+    try {
+        const check = verifyArtifacts(declared, handoff.projectPath, handoff.allowEmpty ? { allowEmpty: handoff.allowEmpty } : {});
+        const bad = new Set([...check.missing, ...check.empty].map(normalizeArtifact));
+        const landed = declared.filter((d) => !bad.has(normalizeArtifact(d)));
+        const remaining = declared.filter((d) => bad.has(normalizeArtifact(d)));
+        return { ...handoff, landed, remaining };
+    }
+    catch {
+        // An unreadable filesystem is not a verdict — keep the previous split.
+        return handoff;
+    }
+}
+// ─── API ────────────────────────────────────────────────────────────────────
+/**
+ * Record one failed attempt at a step, and return the updated hand-off.
+ *
+ * Called wherever an attempt stops without finishing: a candidate failing in the
+ * loop's failover walk, a task failing in the pipeline, a deliverable that is
+ * missing after a step claimed success. A step that later succeeds should call
+ * {@link clearStepHandoff} so the next run does not inherit stale guidance.
+ */
+export function recordStepHandoff(input) {
+    const projectPath = normalizeProjectPath(input.projectPath);
+    const stepKey = input.stepKey || stepKeyFor({
+        ...(input.declared ? { declared: input.declared } : {}),
+        stepDescription: input.stepDescription,
+        goal: input.goal,
+    });
+    const key = entryKey(projectPath, stepKey);
+    const data = readFileSafe();
+    const now = Date.now();
+    const declared = (input.declared ?? []).filter((d) => d && d.trim());
+    const prev = data.entries[key] ?? {
+        goal: input.goal,
+        projectPath,
+        stepKey,
+        stepDescription: input.stepDescription,
+        declared,
+        landed: [],
+        remaining: declared,
+        attempts: [],
+        updatedAt: now,
+    };
+    const attempt = {
+        at: now,
+        route: input.route,
+        kind: input.kind,
+        reason: (input.reason || '').replace(/\s+/g, ' ').trim().slice(0, 300),
+        ...(input.tokens ? { tokens: input.tokens } : {}),
+    };
+    const attempts = [...prev.attempts, attempt];
+    if (attempts.length > MAX_ATTEMPTS)
+        attempts.splice(0, attempts.length - MAX_ATTEMPTS);
+    const next = reconcileHandoff({
+        ...prev,
+        // A later statement of the same step wins: the planner may have learned the
+        // real file list on a retry, and the freshest declaration is the better one.
+        goal: input.goal || prev.goal,
+        stepDescription: input.stepDescription || prev.stepDescription,
+        declared: declared.length > 0 ? declared : prev.declared,
+        attempts,
+        updatedAt: now,
+    });
+    data.entries[key] = next;
+    prune(data);
+    writeFileSafe(data);
+    return next;
+}
+/** Drop the oldest entries once the file is over its cap. */
+function prune(data) {
+    const entries = Object.entries(data.entries);
+    if (entries.length <= MAX_ENTRIES)
+        return;
+    entries.sort((a, b) => b[1].updatedAt - a[1].updatedAt);
+    data.entries = Object.fromEntries(entries.slice(0, MAX_ENTRIES));
+}
+/** Load one step's hand-off, reconciled against disk (null when none). */
+export function loadStepHandoff(projectPath, stepKey) {
+    const data = readFileSafe();
+    const found = data.entries[entryKey(projectPath, stepKey)];
+    return found ? reconcileHandoff(found) : null;
+}
+/**
+ * Every hand-off for a project that still has work left, newest first.
+ *
+ * Project-scoped rather than goal-scoped on purpose: this is what lets a
+ * REWORDED ask resume. The caller asked the same thing of the same project, so
+ * the outstanding work is found by project, not by matching sentences.
+ *
+ * A hand-off whose `remaining` is empty is finished — it is filtered out here so
+ * a completed step is never presented as outstanding.
+ */
+export function loadOpenHandoffs(projectPath, options = {}) {
+    const key = normalizeProjectPath(projectPath);
+    const data = readFileSafe();
+    const open = [];
+    for (const [k, value] of Object.entries(data.entries)) {
+        if (!k.startsWith(`${key}\u0000`))
+            continue;
+        const reconciled = reconcileHandoff(value);
+        // "Open" means a declared artifact is still missing — the only honest test.
+        if (reconciled.remaining.length === 0)
+            continue;
+        // A step with nothing declared and no recorded attempt is not outstanding
+        // work we can describe; it would only add prompt weight.
+        if (reconciled.declared.length === 0)
+            continue;
+        open.push(reconciled);
+    }
+    open.sort((a, b) => b.updatedAt - a.updatedAt);
+    const limit = options.limit ?? 5;
+    return open.slice(0, limit);
+}
+/** Forget one step's hand-off (call it when the step has genuinely finished). */
+export function clearStepHandoff(projectPath, stepKey) {
+    const data = readFileSafe();
+    const key = entryKey(projectPath, stepKey);
+    if (!(key in data.entries))
+        return;
+    delete data.entries[key];
+    writeFileSafe(data);
+}
+/** Forget every hand-off for a project. */
+export function clearProjectHandoffs(projectPath) {
+    const prefix = `${normalizeProjectPath(projectPath)}\u0000`;
+    const data = readFileSafe();
+    let changed = false;
+    for (const k of Object.keys(data.entries)) {
+        if (k.startsWith(prefix)) {
+            delete data.entries[k];
+            changed = true;
+        }
+    }
+    if (changed)
+        writeFileSafe(data);
+}
+// ─── Formatting (the injected block) ────────────────────────────────────────
+/** `provider:model` → `provider` (the model name is noise when both are shown). */
+function providerOf(route) {
+    const idx = route.indexOf(':');
+    return idx > 0 ? route.slice(0, idx) : route;
+}
+/**
+ * Format hand-offs as a compact, model-readable block ('' when there is nothing
+ * outstanding — a clean project must add no prompt weight).
+ *
+ * The instruction is blunt by design. The live failure was a run that re-derived
+ * a plan it already had and re-attempted files that already existed; "do NOT
+ * redo the files listed as already on disk" is the one sentence that changes
+ * that behaviour, so it is stated rather than implied.
+ */
+export function formatHandoffs(handoffs, now = Date.now()) {
+    const open = handoffs.filter((h) => h.remaining.length > 0);
+    if (open.length === 0)
+        return '';
+    const lines = [
+        '[Hand-off — earlier attempts at this work did NOT finish. Continue from this state; do not start over.]',
+    ];
+    for (const h of open) {
+        const label = (h.stepDescription || h.goal || 'unfinished step').replace(/\s+/g, ' ').trim().slice(0, 160);
+        lines.push(`• ${label}`);
+        if (h.landed.length > 0) {
+            // Wrapped, not passed by reference: `Array.map` hands the callback
+            // (value, index, array), so `.map(shorten)` would pass the INDEX as the
+            // width and truncate every path to `…`.
+            lines.push(`  ✅ already on disk (do NOT redo): ${h.landed.map((p) => shorten(p)).join(', ')}`);
+        }
+        lines.push(`  ⬜ still missing: ${h.remaining.map((p) => shorten(p)).join(', ')}`);
+        const last = h.attempts[h.attempts.length - 1];
+        if (last) {
+            const age = relativeAge(last.at, now);
+            const what = last.kind === 'quality'
+                ? 'answered with its own reasoning instead of the work'
+                : last.kind === 'refused'
+                    ? 'was refused by a tool gate'
+                    : 'failed';
+            lines.push(`  ⚠️ last attempt (${age}, ${providerOf(last.route)}) ${what}${last.reason ? `: ${last.reason}` : ''}`);
+            if (h.attempts.length > 1) {
+                lines.push(`  ℹ️ ${h.attempts.length} attempts so far — the approaches above did not work; take a different one.`);
+            }
+        }
+    }
+    let block = lines.join('\n');
+    if (block.length > MAX_BLOCK_CHARS) {
+        block = `${block.slice(0, MAX_BLOCK_CHARS)}\n[hand-off truncated to fit the context budget]`;
+    }
+    return block;
+}
+/** Show the tail of a long path — the filename is the part that matters. */
+function shorten(path, max = 60) {
+    const flat = path.replace(/\\/g, '/');
+    if (flat.length <= max)
+        return flat;
+    const tail = flat.split('/').slice(-2).join('/');
+    return tail.length <= max ? `…/${tail}` : `…${flat.slice(-max)}`;
+}
+function relativeAge(ts, now) {
+    const mins = Math.max(0, Math.round((now - ts) / 60_000));
+    if (mins < 1)
+        return 'just now';
+    if (mins < 60)
+        return `${mins}m ago`;
+    const hours = Math.round(mins / 60);
+    if (hours < 24)
+        return `${hours}h ago`;
+    return `${Math.round(hours / 24)}d ago`;
+}
+/**
+ * Convenience: the block a caller injects for a project, '' when clean.
+ * The single entry point every surface uses, so "load and reconcile" is one
+ * call rather than a convention each caller has to remember.
+ */
+export function handoffBlockFor(projectPath, options = {}) {
+    try {
+        return formatHandoffs(loadOpenHandoffs(projectPath, options));
+    }
+    catch {
+        return '';
+    }
+}
+/**
+ * The artifacts a goal names but a plan may not have declared.
+ *
+ * A planner that forgets `expectedFiles` leaves the deliverable unverified —
+ * exactly the shape of the live failure, where the ask named
+ * `kuttaaddon.nvda-addon` and no step declared it. Pulling obvious deliverable
+ * paths out of the goal text gives the hand-off (and the verifier) something
+ * concrete to check even then. Best-effort and deliberately narrow: only paths
+ * with a file extension are taken, capped, and never invented.
+ */
+export function deliverablesNamedIn(goal) {
+    const found = [];
+    const seen = new Set();
+    const push = (path) => {
+        const key = normalizeArtifact(path);
+        if (!path || seen.has(key))
+            return false;
+        seen.add(key);
+        found.push(path);
+        return found.length >= 8;
+    };
+    // 1. Anything with a file extension: `kuttaaddon.nvda-addon`, `report.pdf`.
+    //    The extension group allows an INTERNAL hyphen, because the deliverable
+    //    in the live failure was `.nvda-addon` — the one extension that matters
+    //    here is the one a plain `[a-z0-9]` class cannot match.
+    const withExt = (goal || '').match(/[~./\w-]*[\w.-]+\.(?:[a-z0-9][a-z0-9-]{0,15})(?:\.[a-z0-9]{2,8})?/gi) ?? [];
+    for (const raw of withExt) {
+        const path = raw.replace(/^['"]|['"]$/g, '').trim();
+        if (!path || !path.includes('.'))
+            continue;
+        const lower = path.toLowerCase();
+        const interesting = DELIVERABLE_EXTENSIONS.some((ext) => lower.endsWith(ext)) ||
+            /\//.test(path) ||
+            /^(dockerfile|makefile)$/i.test(path);
+        if (!interesting)
+            continue;
+        if (push(path))
+            return found;
+    }
+    // 2. An ABSOLUTE destination with no extension — `Save this in folder
+    //    /Users/dheeraj/Documents/kuttaaddon/`. This is the case the live ask
+    //    actually used: it named a destination DIRECTORY and never named the
+    //    package, so extension-matching alone found nothing to hold the run
+    //    accountable to. Two or more segments, so a bare `/tmp` in prose is not
+    //    mistaken for a deliverable. Directories satisfy existence, so these are
+    //    verified (and re-opened on resume) by the same artifact check as files.
+    const absolute = (goal || '').match(/(?:~\/|\/)[\w.-]+(?:\/[\w.-]+)+\/?/g) ?? [];
+    for (const raw of absolute) {
+        const path = raw.replace(/[.,;:]+$/, '').trim();
+        if (!path || path.includes('.'))
+            continue; // extensions handled above
+        if (path.split('/').filter(Boolean).length < 2)
+            continue;
+        if (push(path))
+            return found;
+    }
+    return found;
+}
+//# sourceMappingURL=step-handoff.js.map

package/dist/agents/step-handoff.js.map

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

package/dist/cli/agent.d.ts

@@ -1,12 +1,12 @@
 /**
- * Agent command — Scaffold and manage custom agents for the agent-baba-d platform.
+ * Agent command — Scaffold and manage custom agents for the agent-nuvira platform.
  *
  * Usage:
  *   nuvira agent create <name>    — Create a new custom agent project from a template
  *   nuvira agent list             — List all discovered custom agent plugins
  *   nuvira agent info <name>      — Show details about a discovered agent plugin
  *
- * The `nuvira agent create` command scaffolds a new project using the @agent-baba-d/sdk
+ * The `nuvira agent create` command scaffolds a new project using the @agent-nuvira/sdk
  * package, providing a ready-to-develop custom agent with:
  * - package.json with SDK dependency
  * - TypeScript configuration

package/dist/cli/agent.js

@@ -1,12 +1,12 @@
 /**
- * Agent command — Scaffold and manage custom agents for the agent-baba-d platform.
+ * Agent command — Scaffold and manage custom agents for the agent-nuvira platform.
  *
  * Usage:
  *   nuvira agent create <name>    — Create a new custom agent project from a template
  *   nuvira agent list             — List all discovered custom agent plugins
  *   nuvira agent info <name>      — Show details about a discovered agent plugin
  *
- * The `nuvira agent create` command scaffolds a new project using the @agent-baba-d/sdk
+ * The `nuvira agent create` command scaffolds a new project using the @agent-nuvira/sdk
  * package, providing a ready-to-develop custom agent with:
  * - package.json with SDK dependency
  * - TypeScript configuration
@@ -27,7 +27,7 @@ function generateAgentProject(name, agentName, description) {
         'package.json': JSON.stringify({
             name: name.toLowerCase().replace(/\s+/g, '-'),
             version: '1.0.0',
-            description: `Custom agent-baba-d agent: ${description}`,
+            description: `Custom agent-nuvira agent: ${description}`,
             type: 'module',
             main: './dist/agent.js',
             scripts: {
@@ -37,7 +37,7 @@ function generateAgentProject(name, agentName, description) {
                 dev: 'tsc --watch',
             },
             dependencies: {
-                '@agent-baba-d/sdk': '^1.0.0',
+                '@agent-nuvira/sdk': '^1.0.1',
             },
             devDependencies: {
                 typescript: '^5.3.0',
@@ -59,7 +59,7 @@ function generateAgentProject(name, agentName, description) {
             },
             include: ['src'],
         }, null, 2),
-        'src/agent.ts': `import { Agent, type AgentContext, type AgentResult, type LLMCallFn } from '@agent-baba-d/sdk';
+        'src/agent.ts': `import { Agent, type AgentContext, type AgentResult, type LLMCallFn } from '@agent-nuvira/sdk';
 
 /**
  * ${className} — ${description}
@@ -109,7 +109,7 @@ import {
   createTestContext,
   createMockCallLLM,
   assertAgentResult,
-} from '@agent-baba-d/sdk/testing';
+} from '@agent-nuvira/sdk/testing';
 import { ${className} } from '../src/agent.js';
 
 describe('${className}', () => {
@@ -190,7 +190,7 @@ npm run build
 npm test
 \`\`\`
 
-## Usage in agent-baba-d
+## Usage in agent-nuvira
 
 Place the compiled agent in \`~/.nuvira/agents/\`:
 
@@ -218,14 +218,14 @@ function toPascalCase(str) {
 export class AgentCommand extends BaseCommand {
     create() {
         const command = new Command('agent')
-            .description('Scaffold and manage custom agent-baba-d agents');
+            .description('Scaffold and manage custom agent-nuvira agents');
         // ── create ─────────────────────────────────────────────────────────────
         command
             .command('create')
             .description('Create a new custom agent project from a template')
             .argument('[name]', 'Agent project name (e.g., "my-code-reviewer")')
             .option('-n, --agent-name <name>', 'Agent class name (defaults to project name in PascalCase)')
-            .option('-d, --description <desc>', 'Agent description', 'A custom agent-baba-d agent')
+            .option('-d, --description <desc>', 'Agent description', 'A custom agent-nuvira agent')
             .option('--dir <path>', 'Output directory (defaults to ./<name>)')
             .action(async (name, options) => {
             await this.createAgent(name, options || {});
@@ -267,7 +267,7 @@ export class AgentCommand extends BaseCommand {
             projectName = answer.name.trim();
         }
         const agentName = options?.agentName || projectName;
-        const description = options?.description || 'A custom agent-baba-d agent';
+        const description = options?.description || 'A custom agent-nuvira agent';
         const projectDir = options?.dir || join(process.cwd(), projectName);
         if (existsSync(projectDir)) {
             logger.error(`Directory already exists: ${projectDir}`);

package/dist/cli/benchmark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"benchmark.d.ts","sourceRoot":"","sources":["../../src/cli/benchmark.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAuB5C,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,MAAM,IAAI,OAAO;YA4DH,YAAY;IA4H1B;;;;;OAKG;YACW,mBAAmB;IA0KjC,OAAO,CAAC,SAAS;YA6BH,WAAW;CAqD1B"}
+{"version":3,"file":"benchmark.d.ts","sourceRoot":"","sources":["../../src/cli/benchmark.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAuB5C,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,MAAM,IAAI,OAAO;YA4DH,YAAY;IA4H1B;;;;;OAKG;YACW,mBAAmB;IAiLjC,OAAO,CAAC,SAAS;YA6BH,WAAW;CAqD1B"}

package/dist/cli/benchmark.js

@@ -18,7 +18,7 @@ import { BaseCommand } from './commands.js';
 import { PipelineBoard } from './pipeline-board.js';
 import { getEventBus, EventNames } from '../observability/event-bus.js';
 import { resolveProvider } from './router.js';
-import { resolveWorkingModel } from '../inference/model-validator.js';
+import { resolveRoute } from '../inference/route-resolver.js';
 import { resolveDefaultModel } from '../inference/default-model-resolver.js';
 import { getAutoRouter } from '../learning/auto-router.js';
 import { buildAutoResolveOptions } from '../learning/resolve-options.js';
@@ -273,9 +273,16 @@ export class BenchmarkCommand extends BaseCommand {
             // which can be stale (deprecated gemini-2.0-flash-exp → 404) or a
             // placeholder (nim 'new-nim-model'). Validate against the provider's live
             // list and repair to a verified-working model so benchmark --routing
-            // never benchmarks a model that 404s.
-            const workingModel = await resolveWorkingModel(resolved.provider, pick.provider, pick.model);
-            if (workingModel !== pick.model) {
+            // never benchmarks a model that 404s. resolveRoute prints the
+            // substitution itself, so this no longer repeats it.
+            const route = await resolveRoute({
+                providerType: pick.provider,
+                provider: resolved.provider,
+                model: pick.model,
+                source: 'benchmark',
+            });
+            const workingModel = route.model;
+            if (route.substituted) {
                 logger.warn(`  ♻️  Model '${pick.model}' unavailable on '${pick.provider}' — benchmarking verified '${workingModel}' instead.`);
                 // Keep the dashboard audit trail accurate: re-record with the model
                 // actually benchmarked, carrying the router's real complexity/score.