@jinn-network/client 0.1.7 → 0.1.8

package/dist/cli/commands/codedigest-revert-check.js

@@ -0,0 +1,249 @@
+import { parseArgs } from 'node:util';
+import { execFileSync } from 'node:child_process';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { emitEnvelope } from '../../errors/envelope.js';
+import { loadConfig } from '../../config.js';
+import { createDiscoveryAPI } from '../../discovery/factory.js';
+import { DiscoveryUnavailableError } from '../../discovery/types.js';
+import { hashImplStateDir } from '../../harnesses/freeze.js';
+import { decideRevert, resolveRevertPolicy, } from '../../learner/revert-decision.js';
+const PRODUCTION_DEPS = {
+    buildDiscovery: (configPath) => {
+        const config = loadConfig(configPath);
+        const chainId = config.network === 'testnet' ? 84532 : 8453;
+        // Mirror the daemon's floor wiring (solver-plugins.ts discoveryApiFactory):
+        // only rpcUrl + chainId are needed for the http primary; the floor is never
+        // routed for getCodeDigestRewards (withFallback propagates the error).
+        return createDiscoveryAPI(config.discovery ?? { mode: 'onchain' }, {
+            rpcUrl: config.rpcUrl,
+            chainId,
+        });
+    },
+};
+/**
+ * A commit sha as it appears in the operator's local `improvePromotionsDir`
+ * records: 7-64 hex chars (abbreviated through full git object ids). Rejecting
+ * anything else BEFORE handing the value to `git archive` closes the
+ * argument-injection class where a leading-dash value (`--output=...`,
+ * `--remote=...`) is parsed as a git option instead of a tree-ish (#764 M1).
+ */
+const COMMIT_SHA_RE = /^[0-9a-fA-F]{7,64}$/;
+export function isValidCommitSha(sha) {
+    return COMMIT_SHA_RE.test(sha);
+}
+/**
+ * Hash a commit's tree the way production stamps codeDigest: export the tree
+ * with `git archive` (no `.git`) and re-hash with the same deterministic hasher
+ * `hashImplStateDir` uses, ignoring `.git`. Returns the `sha256:`-prefixed
+ * digest the indexer stores. Keeping this in TS means the Consolidator prompt
+ * never reimplements the hasher (the single largest correctness risk, #764).
+ */
+export async function codeDigestForCommit(implStateDir, sha) {
+    if (!isValidCommitSha(sha)) {
+        throw new Error(`commit sha must be 7-64 hex chars (got "${sha}")`);
+    }
+    const exportDir = mkdtempSync(join(tmpdir(), 'cd-export-'));
+    try {
+        // `--` is an end-of-options separator: even though `sha` is shape-validated
+        // above, this is defense-in-depth so `git archive` can never parse a
+        // leading-dash value as an option (#764 M1, git argument-injection class).
+        const tar = execFileSync('git', ['archive', '--', sha], { cwd: implStateDir, maxBuffer: 1 << 28 });
+        execFileSync('tar', ['-x', '-C', exportDir], { input: tar });
+        const hex = await hashImplStateDir(exportDir, { ignoreRelPaths: ['.git'] });
+        return `sha256:${hex}`;
+    }
+    finally {
+        rmSync(exportDir, { recursive: true, force: true });
+    }
+}
+/**
+ * Validate the optional numeric CLI flags (#764 M1). Each is only checked when
+ * the operator actually provided it (omitted → policy default applies). Returns
+ * the first failure, or `undefined` when all provided flags are in range.
+ *   - min-samples: finite integer >= 1
+ *   - window:      finite integer >= 1
+ *   - alpha:       finite number in the open interval (0, 1)
+ */
+export function validateNumericFlags(flags) {
+    const isPositiveInt = (n) => Number.isFinite(n) && Number.isInteger(n) && n >= 1;
+    if (flags.minSamples !== undefined) {
+        const n = Number(flags.minSamples);
+        if (!isPositiveInt(n)) {
+            return { field: 'min-samples', message: `--min-samples must be a finite integer >= 1 (got "${flags.minSamples}")` };
+        }
+    }
+    if (flags.window !== undefined) {
+        const n = Number(flags.window);
+        if (!isPositiveInt(n)) {
+            return { field: 'window', message: `--window must be a finite integer >= 1 (got "${flags.window}")` };
+        }
+    }
+    if (flags.alpha !== undefined) {
+        const n = Number(flags.alpha);
+        if (!Number.isFinite(n) || n <= 0 || n >= 1) {
+            return { field: 'alpha', message: `--alpha must be a finite number in (0, 1) (got "${flags.alpha}")` };
+        }
+    }
+    return undefined;
+}
+function toAggregate(codeDigest, rows) {
+    const found = rows.find((r) => r.codeDigest === codeDigest);
+    if (!found)
+        return { codeDigest, attempts: 0, passes: 0, passRate: 0 };
+    return { codeDigest, attempts: found.attempts, passes: found.passes, passRate: found.passRate };
+}
+export function createCodedigestRevertCheckCommand(deps = PRODUCTION_DEPS) {
+    return {
+        name: 'codedigest-revert-check',
+        summary: 'Decide whether an Improve commit regressed the pass rate (per-codeDigest, #764)',
+        helpText: `Usage:
+  jinn codedigest-revert-check --code-digest <sha256:...> --parent-code-digest <sha256:...> [options]
+  jinn codedigest-revert-check --impl-state-dir <path> --commit <sha> --parent <sha> [options]
+
+Options:
+  --operator 0x..       Restrict aggregates to attempts this operator Safe claimed
+  --solvernet <cid>     Restrict to a SolverNet manifest CID
+  --min-samples N       Minimum indexed attempts per arm (default 30)
+  --alpha A             Two-sided significance threshold (default 0.05)
+  --window N            Recent-attempts window per codeDigest (default 200)
+  --json                Emit JSON (default)
+
+Either pass two codeDigests directly, OR pass --impl-state-dir + --commit + --parent
+to have the command export each commit's tree (git archive, no .git) and hash it
+the way production stamps codeDigest — so the caller never reimplements the hasher.
+
+Emits a JSON decision: { withCommit, atParent, delta, pValue, significant, recommendRevert, reason }.
+On indexer outage emits recommendRevert=false reason=discovery_unavailable (the Consolidator then skips reverts).`,
+        async run(ctx) {
+            let parsed;
+            try {
+                parsed = parseArgs({
+                    args: ctx.argv,
+                    options: {
+                        'code-digest': { type: 'string' },
+                        'parent-code-digest': { type: 'string' },
+                        'impl-state-dir': { type: 'string' },
+                        commit: { type: 'string' },
+                        parent: { type: 'string' },
+                        operator: { type: 'string' },
+                        solvernet: { type: 'string' },
+                        'min-samples': { type: 'string' },
+                        alpha: { type: 'string' },
+                        window: { type: 'string' },
+                        config: { type: 'string' },
+                        json: { type: 'boolean', default: true },
+                    },
+                    allowPositionals: false,
+                });
+            }
+            catch (err) {
+                emitEnvelope({
+                    code: 'invalid_invocation',
+                    message: err instanceof Error ? err.message : String(err),
+                    exampleCli: 'jinn codedigest-revert-check --code-digest sha256:.. --parent-code-digest sha256:..',
+                    details: { field: 'flags' },
+                }, { writer: ctx.writer, exit: ctx.exit });
+                return;
+            }
+            // Resolve the two codeDigests — either supplied directly or hashed from
+            // an impl-state-dir git history.
+            let child = parsed.values['code-digest'];
+            let parent = parsed.values['parent-code-digest'];
+            const implStateDir = parsed.values['impl-state-dir'];
+            const commitSha = parsed.values.commit;
+            const parentSha = parsed.values.parent;
+            if ((!child || !parent) && implStateDir && commitSha && parentSha) {
+                // Validate sha shape before any git invocation. A leading-dash value
+                // would be parsed by `git archive` as an option, not a tree-ish
+                // (#764 M1 argument-injection). Reject with the command's existing
+                // invalid_invocation envelope (exit 11) rather than letting it flow
+                // into git.
+                const badSha = !isValidCommitSha(commitSha)
+                    ? { field: 'commit', value: commitSha }
+                    : !isValidCommitSha(parentSha)
+                        ? { field: 'parent', value: parentSha }
+                        : undefined;
+                if (badSha) {
+                    emitEnvelope({
+                        code: 'invalid_invocation',
+                        message: `--${badSha.field} sha must be 7-64 hex chars (got "${badSha.value}")`,
+                        exampleCli: 'jinn codedigest-revert-check --impl-state-dir <path> --commit <sha> --parent <sha>',
+                        details: { field: badSha.field },
+                    }, { writer: ctx.writer, exit: ctx.exit });
+                    return;
+                }
+                try {
+                    [child, parent] = await Promise.all([
+                        codeDigestForCommit(implStateDir, commitSha),
+                        codeDigestForCommit(implStateDir, parentSha),
+                    ]);
+                }
+                catch (err) {
+                    emitEnvelope({
+                        code: 'invalid_invocation',
+                        message: `failed to hash commit trees: ${err instanceof Error ? err.message : String(err)}`,
+                        exampleCli: 'jinn codedigest-revert-check --impl-state-dir <path> --commit <sha> --parent <sha>',
+                        details: { field: 'impl-state-dir' },
+                    }, { writer: ctx.writer, exit: ctx.exit });
+                    return;
+                }
+            }
+            if (!child || !parent) {
+                emitEnvelope({
+                    code: 'invalid_invocation',
+                    message: 'provide either --code-digest + --parent-code-digest, or --impl-state-dir + --commit + --parent',
+                    exampleCli: 'jinn codedigest-revert-check --code-digest sha256:.. --parent-code-digest sha256:..',
+                    details: { field: 'flags' },
+                }, { writer: ctx.writer, exit: ctx.exit });
+                return;
+            }
+            // Validate provided numeric flags. `Number('abc')` is NaN, `--alpha 0`
+            // silently disables every revert, `--window 0` is nonsensical — reject
+            // out-of-range input with the command's existing invalid_invocation
+            // envelope (exit 11) rather than letting a bad value flow into the policy.
+            const numErr = validateNumericFlags({
+                minSamples: parsed.values['min-samples'],
+                window: parsed.values.window,
+                alpha: parsed.values.alpha,
+            });
+            if (numErr) {
+                emitEnvelope({
+                    code: 'invalid_invocation',
+                    message: numErr.message,
+                    exampleCli: 'jinn codedigest-revert-check --code-digest sha256:.. --parent-code-digest sha256:.. --alpha 0.05 --window 200 --min-samples 30',
+                    details: { field: numErr.field },
+                }, { writer: ctx.writer, exit: ctx.exit });
+                return;
+            }
+            const policy = resolveRevertPolicy({
+                ...(parsed.values['min-samples'] ? { minSamplesPerArm: Number(parsed.values['min-samples']) } : {}),
+                ...(parsed.values.alpha ? { alpha: Number(parsed.values.alpha) } : {}),
+                ...(parsed.values.window ? { recentAttemptsWindow: Number(parsed.values.window) } : {}),
+            });
+            const discovery = deps.buildDiscovery(parsed.values.config);
+            let rows;
+            try {
+                rows = await discovery.getCodeDigestRewards({
+                    codeDigests: [child, parent],
+                    window: policy.recentAttemptsWindow,
+                    ...(parsed.values.operator ? { operator: parsed.values.operator } : {}),
+                    ...(parsed.values.solvernet ? { solverNetManifestCid: parsed.values.solvernet } : {}),
+                });
+            }
+            catch (err) {
+                if (err instanceof DiscoveryUnavailableError) {
+                    ctx.writer.write(JSON.stringify({ recommendRevert: false, reason: 'discovery_unavailable', message: err.message }) + '\n');
+                    return;
+                }
+                throw err;
+            }
+            const decision = decideRevert({ withCommit: toAggregate(child, rows), atParent: toAggregate(parent, rows) }, policy);
+            ctx.writer.write(JSON.stringify(decision) + '\n');
+        },
+    };
+}
+const command = createCodedigestRevertCheckCommand();
+export default command;
+//# sourceMappingURL=codedigest-revert-check.js.map

package/dist/cli/commands/codedigest-revert-check.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codedigest-revert-check.js","sourceRoot":"","sources":["../../../src/cli/commands/codedigest-revert-check.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/solver-nets.d.ts

@@ -4,6 +4,7 @@ export declare function resolveValidatePoolInstanceIds(flags: {
     instancesFile?: string;
     seedPositive?: boolean;
     knownBad?: boolean;
+    knownPytestMissing?: boolean;
 }): string[];
 export declare function describeSweRebenchV2PoolFreshness(opts: {
     stateDir: string;

package/dist/cli/commands/solver-nets.js

@@ -8,9 +8,9 @@ import { emitResult } from '../output.js';
 import { loadConfig } from '../../config.js';
 import { buildHarnesses } from '../../harnesses/impls/index.js';
 import { canonicalHarnessName, CLAUDE_CODE_HARNESS, harnessNameMatches } from '../../harnesses/names.js';
-import { loadSolverNets } from '../../solver-nets/registry.js';
+import { findJoinedByName, loadSolverNets, solverTypeFromJoinedContract, } from '../../solver-nets/registry.js';
 import { buildPredictionOperatorStatus, runPredictionSample, } from '../../solver-nets/prediction-operator-ux.js';
-import { EVAL_SEMANTICS_VERSION } from '../../solver-types/_swe-rebench-v2-validated-pool.js';
+import { EVAL_SEMANTICS_VERSION, summarizeValidatedPool, } from '../../solver-types/_swe-rebench-v2-validated-pool.js';
 import { defaultStateDir as sweRebenchV2DefaultStateDir } from '../../solver-types/swe-rebench-v2.js';
 const DEFAULT_CONFIG_PATH = join(homedir(), '.jinn-client', 'config.json');
 // ---------------------------------------------------------------------------
@@ -60,6 +60,9 @@ export function resolveValidatePoolInstanceIds(flags) {
     if (flags.knownBad) {
         collected.push(...readInstanceIdFile('swe-rebench-v2-known-bad.json'));
     }
+    if (flags.knownPytestMissing) {
+        collected.push(...readInstanceIdFile('swe-rebench-v2-pytest-missing.json'));
+    }
     return Array.from(new Set(collected));
 }
 // ---------------------------------------------------------------------------
@@ -135,6 +138,61 @@ function predictionDefault() {
         taskGenerator: { enabled: true },
     };
 }
+/**
+ * Project a joined-config entry into the legacy `SolverNetConfig` display
+ * shape used by the show/doctor/sample renderers. Mid-migration entries may
+ * lack `contract`, in which case `solverType` is reported as `'(unknown)'`.
+ */
+function solverNetFromJoined(net) {
+    return {
+        enabled: true,
+        solverType: solverTypeFromJoinedContract(net) ?? '(unknown)',
+        ...(net.harness ? { harness: net.harness } : {}),
+        plugins: Array.isArray(net.plugins) ? net.plugins : [],
+        // Generator ownership is launched-record-driven (issue #421); a joined
+        // entry never carries a taskGenerator block of its own.
+        taskGenerator: { enabled: false },
+    };
+}
+/**
+ * Resolve the SolverNet a read-only subverb (show/doctor/sample) should
+ * operate against. Per issue #421 F4:
+ *
+ *   1. Prefer the still-on-disk legacy file shape (`cfg.solverNets[name]`)
+ *      when present, so display-time sanitization (e.g. promoting
+ *      `canonicalPlugin.source` into `plugins[]`) keeps working on configs
+ *      the operator hasn't rewritten yet. The on-disk file is untouched by
+ *      the in-memory migration; this branch surfaces what's literally on
+ *      disk.
+ *   2. Otherwise consult `loadConfig().joinedSolverNets` — the canonical
+ *      view for an operator who has rejoined via the SPA (where there is
+ *      no legacy on-disk block to fall back to).
+ *   3. Otherwise surface `undefined` so the caller can emit
+ *      `Unknown SolverNet: <name>`. The synthetic `predictionDefault()`
+ *      shim is gone — it was masking the rejoined-via-SPA case.
+ */
+function resolveReadOnlySolverNet(configPath, cfg, name) {
+    // 1. Legacy on-disk file shape (untouched by in-memory migration). Keeps
+    // canonicalPlugin promotion working for operators who haven't re-saved
+    // their config yet.
+    const legacy = cfg.solverNets?.[name];
+    if (legacy)
+        return legacy;
+    // 2. Joined view — the post-SPA-join authoritative shape.
+    try {
+        const loaded = loadConfig(configPath);
+        const joined = findJoinedByName(loaded.joinedSolverNets, name);
+        if (joined)
+            return solverNetFromJoined(joined);
+    }
+    catch {
+        // If loadConfig fails (malformed schema, missing file when configPath
+        // was explicit, etc.), surface `undefined` so the caller reports the
+        // unresolved name rather than throwing through to the operator.
+    }
+    // 3. Nothing matched.
+    return undefined;
+}
 function sourceOf(entry) {
     return typeof entry === 'string' ? entry : entry.source;
 }
@@ -286,6 +344,7 @@ const command = {
   jinn solver-nets validate-pool swe-rebench-v2 [--limit <n>] [--force]
                                 [--instance-id <id>]... [--instances-file <path>]
                                 [--seed-positive] [--known-bad]
+                                [--known-pytest-missing]
             Run the gold patch of each pool instance through the eval harness
             and cache which instances are scorable; the generator then posts
             only those. Requires Docker + \`jinn harnesses enable
@@ -296,8 +355,17 @@ const command = {
             --known-bad scopes the run to instances in
             client/scripts/swe-rebench-v2-known-bad.json (gold eval runs;
             expected to record scorable:false).
+            --known-pytest-missing scopes the run to instances in
+            client/scripts/swe-rebench-v2-pytest-missing.json (Stage-1 #493
+            sample of ungradeable:pytest_missing instances; under v4
+            EVAL_SEMANTICS_VERSION + the pytest-install guard these should
+            re-validate as scorable:true).
             Repeatable --instance-id and --instances-file scope the run to
             a specific subset.
+  jinn solver-nets validate-pool-report swe-rebench-v2 [--human|--json]
+            Read-only report of the local validated-pool.json: total entries,
+            scorable/unscorable counts, histogram by normalised reason, and
+            the highest-yield unscorable blocker. Does not run any eval.
 
 Output flags:
   --human   Render readable terminal output instead of JSON (supported by
@@ -324,28 +392,24 @@ Output flags:
                 'instances-file': { type: 'string' },
                 'seed-positive': { type: 'boolean' },
                 'known-bad': { type: 'boolean' },
+                'known-pytest-missing': { type: 'boolean' },
             },
         });
         const human = Boolean(parsed.values['human']);
         const json = Boolean(parsed.values['json']);
         const [name, arg2] = parsed.positionals;
         if (!subverb || subverb === 'list') {
+            // Issue #421: the legacy `solverNets` block has been retired. `loadConfig`
+            // migrates any on-disk legacy entries into joinedSolverNets with
+            // synthetic `legacy:<short-name>` keys, so the joined-only iteration
+            // here surfaces both modern and migrated entries.
             const loaded = loadConfig(configPath);
-            const legacy = Object.entries(loaded.solverNets).map(([netName, net]) => ({
-                name: netName,
-                source: 'legacy',
-                enabled: net.enabled,
-                solverType: net.solverType,
-                harness: net.harness,
-                pluginCount: net.plugins.length,
-                taskGeneratorEnabled: net.taskGenerator.enabled,
-            }));
             const joined = Object.entries(loaded.joinedSolverNets ?? {}).map(([cid, net]) => ({
                 name: net.name ?? cid,
                 source: 'joined',
                 manifestCid: cid,
                 enabled: true,
-                solverType: 'prediction.v1',
+                solverType: net.contract ? `${net.contract.id}.${net.contract.version}` : '(unknown)',
                 harness: net.harness,
                 pluginCount: (net.plugins ?? []).length,
                 taskGeneratorEnabled: false,
@@ -353,21 +417,89 @@ Output flags:
             const value = {
                 verb: 'solver-nets list',
                 configPath,
-                solverNets: [...legacy, ...joined],
+                solverNets: joined,
             };
             emit(ctx, value, human, json, (v) => {
                 const list = v;
                 if (list.solverNets.length === 0)
                     return 'No SolverNets configured.';
                 return list.solverNets
-                    .map((n) => {
-                    const base = `${n.name}  ${n.enabled ? 'enabled' : 'disabled'}  ${n.solverType}  harness=${n.harness ?? '(default)'}  plugins=${n.pluginCount}  generator=${n.taskGeneratorEnabled ? 'on' : 'off'}  source=${n.source}`;
-                    return 'manifestCid' in n ? `${base}  cid=${n.manifestCid}` : base;
-                })
+                    .map((n) => `${n.name}  ${n.enabled ? 'enabled' : 'disabled'}  ${n.solverType}  ` +
+                    `harness=${n.harness ?? '(default)'}  plugins=${n.pluginCount}  ` +
+                    `generator=${n.taskGeneratorEnabled ? 'on' : 'off'}  source=${n.source}  cid=${n.manifestCid}`)
                     .join('\n');
             });
             return;
         }
+        if (subverb === 'validate-pool-report') {
+            if (name !== 'swe-rebench-v2') {
+                fail(ctx, 'solver-nets validate-pool-report currently supports only `swe-rebench-v2`');
+                return;
+            }
+            const stateDir = ctx.env['JINN_SWE_REBENCH_V2_STATE_DIR'] ?? sweRebenchV2DefaultStateDir();
+            const path = join(stateDir, 'validated-pool.json');
+            let raw;
+            try {
+                raw = JSON.parse(readFileSync(path, 'utf8'));
+            }
+            catch {
+                fail(ctx, `validated-pool.json is absent or unreadable at ${path}`);
+                return;
+            }
+            let summary;
+            try {
+                summary = summarizeValidatedPool(raw);
+            }
+            catch (err) {
+                fail(ctx, `validated-pool.json is malformed: ${err.message}`);
+                return;
+            }
+            const evalSemanticsVersion = raw.evalSemanticsVersion ?? 'unknown';
+            const freshness = await describeSweRebenchV2PoolFreshness({ stateDir });
+            const highestYieldBlocker = summary.byReason.find((b) => b.reason !== 'gold-patch-resolves')?.reason ?? null;
+            const value = {
+                verb: 'solver-nets validate-pool-report',
+                solverNet: 'swe-rebench-v2',
+                evalSemanticsVersion,
+                currentEvalSemanticsVersion: EVAL_SEMANTICS_VERSION,
+                stateDir,
+                ...summary,
+                highestYieldBlocker,
+                freshness,
+            };
+            emit(ctx, value, human, json, (v) => {
+                const s = v;
+                const lines = [
+                    `SolverNet: swe-rebench-v2`,
+                    `  stateDir: ${s.stateDir}`,
+                    `  evalSemanticsVersion (file): ${s.evalSemanticsVersion}`,
+                    `  evalSemanticsVersion (current): ${s.currentEvalSemanticsVersion}`,
+                    `  total entries: ${s.totalEntries}`,
+                    `  scorable: ${s.scorable}`,
+                    `  unscorable: ${s.unscorable}`,
+                    `Histogram (by normalised reason, descending):`,
+                ];
+                for (const bucket of s.byReason) {
+                    lines.push(`  ${String(bucket.count).padStart(6)}  ${bucket.reason}`);
+                }
+                if (s.highestYieldBlocker) {
+                    lines.push(`Highest-yield unscorable blocker: ${s.highestYieldBlocker}`);
+                }
+                // #806: gold-patch-not-resolved entries whose PASS_TO_PASS tests broke
+                // (p2p_broke > 0) are usually an environment/setup problem, not a
+                // non-resolving gold patch — a chase-able, recoverable capacity blocker.
+                const p2pBroke = s.byReason.find((b) => b.reason === 'gold-patch-not-resolved:p2p-broke');
+                if (p2pBroke && p2pBroke.count > 0) {
+                    lines.push(`Candidate capacity blocker: ${p2pBroke.count} gold-patch-not-resolved entr${p2pBroke.count === 1 ? 'y' : 'ies'} broke PASS_TO_PASS (environment/setup problem, likely recoverable — investigate before treating as non-resolving patches)`);
+                }
+                if (s.freshness.status === 'stale') {
+                    lines.push(`Freshness: stale — ${s.freshness.reason}`);
+                    lines.push(`  run: ${s.freshness.cli}`);
+                }
+                return lines.join('\n');
+            });
+            return;
+        }
         if (subverb === 'validate-pool') {
             if (name !== 'swe-rebench-v2') {
                 fail(ctx, 'solver-nets validate-pool currently supports only `swe-rebench-v2`');
@@ -401,6 +533,7 @@ Output flags:
                 instancesFile: parsed.values['instances-file'],
                 seedPositive: Boolean(parsed.values['seed-positive']),
                 knownBad: Boolean(parsed.values['known-bad']),
+                knownPytestMissing: Boolean(parsed.values['known-pytest-missing']),
             });
             process.stderr.write('[validate-pool] loading the SWE-rebench v2 pool…\n');
             let poolTasks = await loadSweRebenchV2Pool();
@@ -428,11 +561,33 @@ Output flags:
             fail(ctx, `solver-nets ${subverb} requires <name>`);
             return;
         }
-        const solverNets = ensureSolverNets(cfg);
-        if (name === 'prediction' && !solverNets[name]) {
-            solverNets[name] = predictionDefault();
+        const isReadOnlySubverb = subverb === 'show' || subverb === 'doctor' || subverb === 'sample';
+        if (!isReadOnlySubverb) {
+            // Issue #421: these subverbs still edit the legacy solverNets file shape
+            // for one upgrade cycle. The daemon's loadConfig migrates any on-disk
+            // legacy entries into joinedSolverNets on next start; the canonical join
+            // flow is the SPA (Operator > SolverNets).
+            process.stderr.write(`[solver-nets] WARNING: subverb '${subverb}' edits the legacy solverNets ` +
+                `file shape (issue #421). The daemon auto-migrates this on next load; ` +
+                `re-join via the SPA (Operator > SolverNets) to replace synthetic legacy:* ` +
+                `keys with real manifest CIDs.\n`);
+        }
+        // Resolve the SolverNet to operate on. Read-only subverbs prefer the
+        // joined view (issue #421 F4) so an operator who has rejoined via the
+        // SPA sees their real entry rather than a synthetic predictionDefault()
+        // stub. Mutation subverbs keep the legacy on-disk shape because they
+        // write through it for the one-cycle bridge.
+        let net;
+        if (isReadOnlySubverb) {
+            net = resolveReadOnlySolverNet(configPath, cfg, name);
+        }
+        else {
+            const solverNets = ensureSolverNets(cfg);
+            if (name === 'prediction' && !solverNets[name]) {
+                solverNets[name] = predictionDefault();
+            }
+            net = solverNets[name];
         }
-        const net = solverNets[name];
         if (!net) {
             fail(ctx, `Unknown SolverNet: ${name}`);
             return;
@@ -445,7 +600,7 @@ Output flags:
         if (subverb === 'doctor') {
             if (net.solverType === 'prediction.v1') {
                 const loaded = loadConfig(configPath);
-                const status = await buildPredictionOperatorStatus({ config: loaded, configPath, name });
+                const status = await buildPredictionOperatorStatus({ config: loaded, configPath });
                 emit(ctx, { verb: 'solver-nets doctor', ...status }, human, json, renderPredictionStatusHuman);
                 return;
             }