@open-agent-toolkit/cli 0.1.43 → 0.1.45

package/dist/commands/gate/index.d.ts

@@ -1,6 +1,8 @@
 import { type CommandContext, type GlobalOptions } from '../../app/command-context.js';
 import { type ExecTarget, type OatConfig, type OatLocalConfig, type UserConfig } from '../../config/oat-config.js';
 import { type ResolvedConfig } from '../../config/resolve.js';
+import { type ModelFamily } from '../../providers/identity/family.js';
+import { type IdentityConfidence, type IdentityProvenance } from '../../providers/identity/provenance.js';
 import { Command } from 'commander';
 interface GateCommandDependencies {
     buildCommandContext: (options: GlobalOptions) => CommandContext;
@@ -20,16 +22,51 @@ interface ProcessRunOptions {
     env: NodeJS.ProcessEnv;
     purpose: 'host-detection' | 'availability' | 'execute';
     stdio: 'ignore' | 'inherit';
+    timeoutMs: number;
 }
 interface ProcessRunResult {
     exitCode: number;
+    timedOut?: boolean;
 }
-type CrossProviderAvoid = 'same-runtime' | 'none';
+type CrossProviderAvoid = 'same-family' | 'same-runtime' | 'none';
+type GateDiversityAchieved = 'different-family' | 'degraded-to-different-slug' | 'same-family - no diverse target available' | 'unknown-producer';
 export interface SelectedExecTarget {
     id: string;
     target: ExecTarget;
+    model?: string;
+    family: ModelFamily;
+    diversity?: GateDiversityMetadata;
+    noDiverseFamilyFallback?: boolean;
 }
-export declare function selectExecTarget(registry: Readonly<Record<string, ExecTarget>>, currentRuntime: string, avoid: CrossProviderAvoid): SelectedExecTarget | null;
+interface GateProducerIdentity {
+    value: string;
+    provenance: IdentityProvenance;
+    confidence: IdentityConfidence;
+    family: ModelFamily;
+    avoidFamilies: ModelFamily[];
+    diversityClaimable: boolean;
+    source: 'flag' | 'stamp' | 'unknown';
+}
+interface GateDiversityMetadata {
+    avoid: CrossProviderAvoid;
+    achieved: GateDiversityAchieved;
+    producer: {
+        value: string;
+        provenance: IdentityProvenance;
+        confidence: IdentityConfidence;
+        family: ModelFamily;
+        source: GateProducerIdentity['source'];
+        avoidFamilies: ModelFamily[];
+    };
+    reviewer: {
+        target: string;
+        runtime: string;
+        family: ModelFamily;
+        model?: string;
+    };
+    warning?: string;
+}
+export declare function selectExecTarget(registry: Readonly<Record<string, ExecTarget>>, currentRuntime: string, avoid: CrossProviderAvoid, producerIdentity?: GateProducerIdentity): SelectedExecTarget | null;
 export declare function createGateCommand(overrides?: Partial<GateCommandDependencies>): Command;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/commands/gate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/gate/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EAQL,KAAK,UAAU,EAIf,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,UAAU,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,UAAU,uBAAuB;IAC/B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,KACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/D,eAAe,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9E,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7B,UAAU,EAAE,CACV,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE,iBAAiB,KACvB,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AA0CD,UAAU,iBAAiB;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,OAAO,EAAE,gBAAgB,GAAG,cAAc,GAAG,SAAS,CAAC;IACvD,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,KAAK,kBAAkB,GAAG,cAAc,GAAG,MAAM,CAAC;AAMlD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;CACpB;AAyZD,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAC9C,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,kBAAkB,GACxB,kBAAkB,GAAG,IAAI,CAE3B;AAu7BD,wBAAgB,iBAAiB,CAC/B,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwKT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/gate/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/gate/index.js

@@ -9,6 +9,9 @@ import { BUILTIN_EXEC_TARGETS, readOatConfig, readOatLocalConfig, readUserConfig
 import { resolveEffectiveConfig, resolveExecTargets, resolveGate, } from '../../config/resolve.js';
 import { dirExists, fileExists } from '../../fs/io.js';
 import { normalizeToPosixPath, resolveProjectRoot } from '../../fs/paths.js';
+import { classifyModelFamily, } from '../../providers/identity/family.js';
+import { resolveIdentityConfidence, } from '../../providers/identity/provenance.js';
+import { parseDispatchStamps } from '../../providers/identity/stamp.js';
 import { Command } from 'commander';
 import { parseReviewGateVerdict, severityDisplayName, } from './review-verdict.js';
 const DEFAULT_DEPENDENCIES = {
@@ -31,6 +34,7 @@ const VALID_WRITE_LAYERS = [
     'user',
 ];
 const VALID_CROSS_PROVIDER_AVOIDS = [
+    'same-family',
     'same-runtime',
     'none',
 ];
@@ -40,7 +44,15 @@ const VALID_REVIEW_GATE_THRESHOLDS = [
     'medium',
     'minor',
 ];
+const VALID_IDENTITY_PROVENANCES = [
+    'declared',
+    'observed',
+    'inferred',
+    'unknown',
+];
 const REVIEW_GATE_CONTEXT_NOTE = 'This review is gate-originated. If you run `oat-project-review-provide`, set `oat_review_invocation: gate` in the review artifact. Write a canonical review artifact with `### Critical`, `### Important`, `### Medium`, and `### Minor` headings in that order, using `None` for empty sections.';
+const GATE_CHECK_TIMEOUT_MS = 5_000;
+const GATE_EXEC_TIMEOUT_MS = 10 * 60 * 1_000;
 function reviewGateProjectContext(projectPath) {
     return `Resolved OAT project path: ${projectPath}. Run the review for this project path.`;
 }
@@ -52,14 +64,38 @@ function assembleReviewGatePrompt(segments) {
 }
 async function runChildProcess(command, args, options) {
     return new Promise((resolve, reject) => {
+        let timedOut = false;
+        let killTimeout = null;
         const child = spawn(command, args, {
             cwd: options.cwd,
             env: options.env,
             stdio: options.stdio,
         });
-        child.on('error', reject);
+        const timeout = setTimeout(() => {
+            timedOut = true;
+            child.kill('SIGTERM');
+            killTimeout = setTimeout(() => {
+                child.kill('SIGKILL');
+            }, 5_000);
+            killTimeout.unref();
+        }, options.timeoutMs);
+        timeout.unref();
+        child.on('error', (error) => {
+            clearTimeout(timeout);
+            if (killTimeout) {
+                clearTimeout(killTimeout);
+            }
+            reject(error);
+        });
         child.on('close', (code) => {
-            resolve({ exitCode: code ?? 1 });
+            clearTimeout(timeout);
+            if (killTimeout) {
+                clearTimeout(killTimeout);
+            }
+            resolve({
+                exitCode: timedOut ? 124 : (code ?? 1),
+                ...(timedOut ? { timedOut: true } : {}),
+            });
         });
     });
 }
@@ -105,9 +141,9 @@ function parseLayer(value) {
     return layer;
 }
 function parseCrossProviderAvoid(value) {
-    const avoid = value?.trim() || 'same-runtime';
+    const avoid = value?.trim() || 'same-family';
     if (!VALID_CROSS_PROVIDER_AVOIDS.includes(avoid)) {
-        throw new Error('--avoid must be one of same-runtime | none.');
+        throw new Error('--avoid must be one of same-family | same-runtime | none.');
     }
     return avoid;
 }
@@ -144,6 +180,17 @@ function parseNumericFlag(value, flag, defaultValue) {
     }
     return parsed;
 }
+function resolveGateExecTimeoutMs(env) {
+    const rawValue = env.OAT_GATE_EXEC_TIMEOUT_MS?.trim();
+    if (!rawValue) {
+        return GATE_EXEC_TIMEOUT_MS;
+    }
+    const parsed = Number(rawValue);
+    if (!Number.isInteger(parsed) || parsed < 1) {
+        return GATE_EXEC_TIMEOUT_MS;
+    }
+    return parsed;
+}
 function parseArgvJson(value, flag) {
     let parsed;
     try {
@@ -275,6 +322,7 @@ function cloneExecTarget(target) {
         runtime: target.runtime,
         baseCommand: [...target.baseCommand],
         priority: target.priority,
+        ...(target.models ? { models: [...target.models] } : {}),
         ...(target.hostDetectionCommand
             ? { hostDetectionCommand: [...target.hostDetectionCommand] }
             : {}),
@@ -283,17 +331,236 @@ function cloneExecTarget(target) {
             : {}),
     };
 }
+function identityFromRecords(records, source) {
+    const resolved = resolveIdentityConfidence(records);
+    const family = classifyModelFamily({ value: resolved.value });
+    return {
+        value: resolved.value,
+        provenance: resolved.provenance,
+        confidence: resolved.confidence,
+        family,
+        avoidFamilies: resolved.diversityClaimable && family !== 'unknown' ? [family] : [],
+        diversityClaimable: resolved.diversityClaimable,
+        source,
+    };
+}
+function unknownProducerIdentity() {
+    return identityFromRecords([], 'unknown');
+}
+function parseProducerIdentityOption(value) {
+    const trimmed = value?.trim();
+    if (!trimmed) {
+        return unknownProducerIdentity();
+    }
+    const separator = trimmed.lastIndexOf(':');
+    const producer = separator > 0 ? trimmed.slice(0, separator).trim() : '';
+    const provenance = separator > 0 ? trimmed.slice(separator + 1).trim() : '';
+    if (!producer || !provenance) {
+        throw new Error('--producer-identity must use <value>:<declared|observed|inferred|unknown>.');
+    }
+    if (!VALID_IDENTITY_PROVENANCES.includes(provenance)) {
+        throw new Error('--producer-identity provenance must be one of declared | observed | inferred | unknown.');
+    }
+    return identityFromRecords([{ value: producer, provenance: provenance }], 'flag');
+}
+function identityFromStamps(stamps) {
+    const identities = stamps
+        .map((stamp) => identityFromRecords([{ value: stamp.producer, provenance: stamp.provenance }], 'stamp'))
+        .filter((identity) => identity.diversityClaimable && identity.family !== 'unknown');
+    const latest = identities.at(-1);
+    if (!latest) {
+        return unknownProducerIdentity();
+    }
+    return {
+        ...latest,
+        avoidFamilies: [...new Set(identities.map((identity) => identity.family))],
+    };
+}
+function phaseNumber(scope) {
+    const match = scope.match(/^p(\d+)(?:$|-t\d+$)/);
+    const value = match?.[1];
+    return value === undefined ? undefined : Number.parseInt(value, 10);
+}
+function reviewScopeRange(scope) {
+    if (scope === 'final') {
+        return { start: 1, end: Number.MAX_SAFE_INTEGER };
+    }
+    const range = scope.match(/^p(\d+)-p(\d+)$/);
+    if (!range) {
+        return null;
+    }
+    return {
+        start: Number.parseInt(range[1] ?? '0', 10),
+        end: Number.parseInt(range[2] ?? '0', 10),
+    };
+}
+function stampInReviewScope(stampScope, reviewScope) {
+    const range = reviewScopeRange(reviewScope);
+    if (!range) {
+        return false;
+    }
+    const stampPhase = phaseNumber(stampScope);
+    return (stampPhase !== undefined &&
+        stampPhase >= range.start &&
+        stampPhase <= range.end);
+}
+async function readStampedProducerIdentity(options) {
+    const scope = options.reviewScope?.trim();
+    if (!scope) {
+        return unknownProducerIdentity();
+    }
+    let markdown;
+    try {
+        markdown = await readFile(join(options.repoRoot, options.projectPath, 'implementation.md'), 'utf8');
+    }
+    catch {
+        return unknownProducerIdentity();
+    }
+    const stamps = parseDispatchStamps(markdown).filter((candidate) => candidate.role === 'implementer' || candidate.role === 'fix');
+    const exactStamp = [...stamps]
+        .reverse()
+        .find((candidate) => candidate.scope === scope);
+    if (exactStamp) {
+        return identityFromStamps([exactStamp]);
+    }
+    return identityFromStamps(stamps.filter((candidate) => stampInReviewScope(candidate.scope, scope)));
+}
+async function resolveReviewProducerIdentity(options) {
+    if (options.explicit?.trim()) {
+        return parseProducerIdentityOption(options.explicit);
+    }
+    return readStampedProducerIdentity(options);
+}
+function findPinnedModelArg(argv) {
+    for (let index = 0; index < argv.length; index += 1) {
+        const arg = argv[index];
+        if (arg === '--model') {
+            const value = argv[index + 1]?.trim();
+            return value || undefined;
+        }
+        if (arg?.startsWith('--model=')) {
+            const value = arg.slice('--model='.length).trim();
+            return value || undefined;
+        }
+    }
+    return undefined;
+}
+function targetCandidateModels(target) {
+    const pinnedModel = findPinnedModelArg(target.baseCommand);
+    if (pinnedModel) {
+        return [pinnedModel];
+    }
+    if (target.models && target.models.length > 0) {
+        return [...target.models];
+    }
+    return undefined;
+}
+function candidateFamily(target, model) {
+    if (model) {
+        return classifyModelFamily({ value: model });
+    }
+    return classifyModelFamily({ value: '', providerId: target.runtime });
+}
+function expandExecTargetCandidates(id, target) {
+    const models = targetCandidateModels(target);
+    if (!models) {
+        return [
+            {
+                id,
+                target: cloneExecTarget(target),
+                family: candidateFamily(target, undefined),
+            },
+        ];
+    }
+    return models.map((model) => ({
+        id,
+        target: cloneExecTarget(target),
+        model,
+        family: candidateFamily(target, model),
+    }));
+}
+function producerHasKnownFamily(identity) {
+    return identity.diversityClaimable && identity.avoidFamilies.length > 0;
+}
+function shouldAttemptNoDiverseFallback(avoid) {
+    return avoid === 'same-family';
+}
+function achievedDiversity(selected, producerIdentity) {
+    if (!producerHasKnownFamily(producerIdentity)) {
+        return 'unknown-producer';
+    }
+    if (selected.family !== 'unknown' &&
+        !producerIdentity.avoidFamilies.includes(selected.family)) {
+        return 'different-family';
+    }
+    if (selected.model && selected.model !== producerIdentity.value) {
+        return 'degraded-to-different-slug';
+    }
+    return 'same-family - no diverse target available';
+}
+function diversityFallbackWarning(achieved) {
+    if (achieved !== 'unknown-producer' &&
+        achieved !== 'degraded-to-different-slug' &&
+        achieved !== 'same-family - no diverse target available') {
+        return undefined;
+    }
+    return `No different-family gate target was available; running with achieved=${achieved}.`;
+}
+function attachDiversityMetadata(selected, avoid, producerIdentity) {
+    const achieved = achievedDiversity(selected, producerIdentity);
+    const warning = selected.noDiverseFamilyFallback
+        ? diversityFallbackWarning(achieved)
+        : undefined;
+    return {
+        ...selected,
+        diversity: {
+            avoid,
+            achieved,
+            producer: {
+                value: producerIdentity.value,
+                provenance: producerIdentity.provenance,
+                confidence: producerIdentity.confidence,
+                family: producerIdentity.family,
+                source: producerIdentity.source,
+                avoidFamilies: producerIdentity.avoidFamilies,
+            },
+            reviewer: {
+                target: selected.id,
+                runtime: selected.target.runtime,
+                family: selected.family,
+                ...(selected.model ? { model: selected.model } : {}),
+            },
+            ...(warning ? { warning } : {}),
+        },
+    };
+}
 function argvHead(argv) {
     return [argv[0] ?? '', argv.slice(1)];
 }
-function listExecTargetCandidates(registry, currentRuntime, avoid) {
-    const shouldAvoidSameRuntime = avoid === 'same-runtime' && currentRuntime !== 'unknown';
+function listExecTargetCandidates(registry, currentRuntime, avoid, producerIdentity = unknownProducerIdentity()) {
+    const shouldAvoidSameFamily = avoid === 'same-family' && producerHasKnownFamily(producerIdentity);
+    const shouldAvoidSameRuntime = currentRuntime !== 'unknown' &&
+        (avoid === 'same-runtime' ||
+            (avoid === 'same-family' && !producerHasKnownFamily(producerIdentity)));
     return sortedExecTargetEntries(registry)
         .filter(({ target }) => !shouldAvoidSameRuntime || target.runtime !== currentRuntime)
-        .map(({ id, target }) => ({ id, target: cloneExecTarget(target) }));
+        .flatMap(({ id, target }) => expandExecTargetCandidates(id, target))
+        .filter((candidate) => !shouldAvoidSameFamily ||
+        (candidate.family !== 'unknown' &&
+            !producerIdentity.avoidFamilies.includes(candidate.family)));
+}
+export function selectExecTarget(registry, currentRuntime, avoid, producerIdentity) {
+    return (listExecTargetCandidates(registry, currentRuntime, avoid, producerIdentity)[0] ?? null);
 }
-export function selectExecTarget(registry, currentRuntime, avoid) {
-    return listExecTargetCandidates(registry, currentRuntime, avoid)[0] ?? null;
+async function firstAvailableExecTarget(candidates, context, dependencies) {
+    for (const candidate of candidates) {
+        const availabilityCommand = candidate.target.availabilityCommand;
+        if (!availabilityCommand ||
+            (await checkArgv(availabilityCommand, 'availability', context, dependencies))) {
+            return candidate;
+        }
+    }
+    return null;
 }
 async function checkArgv(argv, purpose, context, dependencies) {
     const [command, args] = argvHead(argv);
@@ -306,6 +573,7 @@ async function checkArgv(argv, purpose, context, dependencies) {
             env: dependencies.processEnv,
             purpose,
             stdio: 'ignore',
+            timeoutMs: GATE_CHECK_TIMEOUT_MS,
         });
         return result.exitCode === 0;
     }
@@ -326,52 +594,70 @@ async function resolveCurrentRuntime(currentRuntime, context, dependencies) {
     }
     return 'unknown';
 }
-async function selectAvailableExecTarget(registry, currentRuntime, avoid, context, dependencies) {
-    for (const candidate of listExecTargetCandidates(registry, currentRuntime, avoid)) {
-        const availabilityCommand = candidate.target.availabilityCommand;
-        if (!availabilityCommand ||
-            (await checkArgv(availabilityCommand, 'availability', context, dependencies))) {
-            return candidate;
-        }
+async function selectAvailableExecTarget(registry, currentRuntime, avoid, producerIdentity, context, dependencies) {
+    const selected = await firstAvailableExecTarget(listExecTargetCandidates(registry, currentRuntime, avoid, producerIdentity), context, dependencies);
+    if (selected) {
+        return selected;
     }
-    return null;
+    if (!shouldAttemptNoDiverseFallback(avoid)) {
+        return null;
+    }
+    const fallback = await firstAvailableExecTarget(listExecTargetCandidates(registry, currentRuntime, 'none', unknownProducerIdentity()), context, dependencies);
+    return fallback ? { ...fallback, noDiverseFamilyFallback: true } : null;
 }
-async function resolveSelectedExecTarget(targets, options, context, dependencies) {
+async function resolveSelectedExecTarget(targets, options, producerIdentity, context, dependencies) {
     const explicitTarget = options.target?.trim();
     if (explicitTarget) {
         const target = targets[explicitTarget];
         if (!target) {
             throw new Error(`Unknown exec target "${explicitTarget}".`);
         }
-        return { id: explicitTarget, target: cloneExecTarget(target) };
+        return attachDiversityMetadata(expandExecTargetCandidates(explicitTarget, target)[0], 'none', producerIdentity);
     }
     const avoid = parseCrossProviderAvoid(options.avoid);
     const currentRuntime = await resolveCurrentRuntime(options.currentRuntime, context, dependencies);
-    const selected = await selectAvailableExecTarget(targets, currentRuntime, avoid, context, dependencies);
+    const selected = await selectAvailableExecTarget(targets, currentRuntime, avoid, producerIdentity, context, dependencies);
     if (!selected) {
         throw new Error(noEligibleTargetMessage(currentRuntime, avoid));
     }
-    return selected;
+    return attachDiversityMetadata(selected, avoid, producerIdentity);
 }
 async function executeTarget(selected, prompt, context, dependencies) {
     const [command, baseArgs] = argvHead(selected.target.baseCommand);
     if (!command) {
         throw new Error(`Exec target "${selected.id}" has an empty base command.`);
     }
+    const modelArgs = selected.model && !findPinnedModelArg(selected.target.baseCommand)
+        ? ['--model', selected.model]
+        : [];
+    const timeoutMs = resolveGateExecTimeoutMs(dependencies.processEnv);
+    if (!context.json) {
+        context.logger.info(`Running gate target ${selected.id} (${selected.target.runtime}); timeout=${timeoutMs}ms.`);
+    }
     try {
-        const result = await dependencies.runProcess(command, [...baseArgs, ...prompt], {
+        return await dependencies.runProcess(command, [...baseArgs, ...modelArgs, ...prompt], {
             cwd: context.cwd,
             env: dependencies.processEnv,
             purpose: 'execute',
             stdio: 'inherit',
+            timeoutMs,
         });
-        return result.exitCode;
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         throw new Error(`Failed to launch exec target "${selected.id}" (${command}): ${message}`, { cause: error });
     }
 }
+function logGateDiversity(selected, context) {
+    const diversity = selected.diversity;
+    if (!diversity || context.json) {
+        return;
+    }
+    if (diversity.warning) {
+        context.logger.warn(diversity.warning);
+    }
+    context.logger.info(`Gate diversity: achieved=${diversity.achieved} producer=${diversity.producer.value} producer_family=${diversity.producer.family} provenance=${diversity.producer.provenance} confidence=${diversity.producer.confidence} reviewer=${diversity.reviewer.target} reviewer_family=${diversity.reviewer.family}`);
+}
 function noEligibleTargetMessage(currentRuntime, avoid) {
     return `No eligible gate exec target found for current runtime "${currentRuntime}" with --avoid ${avoid}. Install or configure an alternate runtime, rerun with --avoid none, or pin a target with --target <id>.`;
 }
@@ -622,10 +908,18 @@ function writeReviewGateResult(context, payload) {
         context.logger.info(`Artifact normalized: inserted ${payload.normalization.insertedSeverities.map((severity) => severityDisplayName(severity)).join(', ')} empty Findings section(s).`);
     }
     context.logger.info(`Verdict: ${payload.status} (critical=${payload.counts.critical}, important=${payload.counts.important}, medium=${payload.counts.medium}, minor=${payload.counts.minor})`);
+    if (payload.diversity) {
+        if (payload.diversity.warning) {
+            context.logger.warn(payload.diversity.warning);
+        }
+        context.logger.info(`Gate diversity: achieved=${payload.diversity.achieved} producer=${payload.diversity.producer.value} producer_family=${payload.diversity.producer.family} provenance=${payload.diversity.producer.provenance} confidence=${payload.diversity.producer.confidence} reviewer=${payload.diversity.reviewer.target} reviewer_family=${payload.diversity.reviewer.family}`);
+    }
     context.logger.info(payload.handoff);
 }
 function writeReviewGateExecutionFailure(context, payload) {
-    const message = `Review did not complete: target ${payload.target} exited with code ${payload.exitCode}.`;
+    const message = payload.timedOut
+        ? `Review did not complete: target ${payload.target} timed out after ${payload.timeoutMs}ms.`
+        : `Review did not complete: target ${payload.target} exited with code ${payload.exitCode}.`;
     if (context.json) {
         context.logger.json({
             status: 'review_failed',
@@ -634,6 +928,10 @@ function writeReviewGateExecutionFailure(context, payload) {
             target: payload.target,
             project: payload.project,
             exitCode: payload.exitCode,
+            timedOut: payload.timedOut ?? false,
+            ...(payload.timeoutMs !== undefined
+                ? { timeoutMs: payload.timeoutMs }
+                : {}),
             message,
         });
         return;
@@ -751,8 +1049,11 @@ async function runCrossProviderExec(prompt, options, context, dependencies) {
     try {
         const effective = await readEffectiveConfig(context, dependencies);
         const targets = resolveExecTargets(effective);
-        const selected = await resolveSelectedExecTarget(targets, options, context, dependencies);
-        process.exitCode = await executeTarget(selected, prompt, context, dependencies);
+        const producerIdentity = parseProducerIdentityOption(options.producerIdentity);
+        const selected = await resolveSelectedExecTarget(targets, options, producerIdentity, context, dependencies);
+        logGateDiversity(selected, context);
+        const result = await executeTarget(selected, prompt, context, dependencies);
+        process.exitCode = result.exitCode;
     }
     catch (error) {
         writeError(context, error);
@@ -770,7 +1071,13 @@ async function runReviewGate(prompt, options, context, dependencies) {
             project: options.project,
         });
         const targets = resolveExecTargets(effective);
-        const selected = await resolveSelectedExecTarget(targets, options, context, dependencies);
+        const producerIdentity = await resolveReviewProducerIdentity({
+            explicit: options.producerIdentity,
+            repoRoot,
+            projectPath,
+            reviewScope: options.reviewScope,
+        });
+        const selected = await resolveSelectedExecTarget(targets, options, producerIdentity, context, dependencies);
         const threshold = parseReviewGateThreshold(options.exitNonzeroOn);
         const before = await listActiveProjectReviewCandidates({
             repoRoot,
@@ -787,13 +1094,16 @@ async function runReviewGate(prompt, options, context, dependencies) {
                 : []),
             prompt.join(' '),
         ]);
-        const childExitCode = await executeTarget(selected, [reviewPrompt], context, dependencies);
+        const childResult = await executeTarget(selected, [reviewPrompt], context, dependencies);
+        const childExitCode = childResult.exitCode;
         if (childExitCode !== 0) {
             writeReviewGateExecutionFailure(context, {
                 runId,
                 target: selected.id,
                 project: projectPath,
                 exitCode: childExitCode,
+                timedOut: childResult.timedOut ?? false,
+                timeoutMs: resolveGateExecTimeoutMs(dependencies.processEnv),
             });
             process.exitCode = childExitCode;
             return;
@@ -858,6 +1168,7 @@ async function runReviewGate(prompt, options, context, dependencies) {
             invocation: verdict.invocation,
             normalization: verdict.normalization,
             handoff,
+            diversity: selected.diversity,
         });
         process.exitCode = blocking ? 1 : 0;
     }
@@ -906,8 +1217,9 @@ export function createGateCommand(overrides = {}) {
         .command('cross-provider-exec')
         .description('Run a prompt through an alternate configured runtime target')
         .option('--target <id>', 'Run this exact exec target')
-        .option('--avoid <mode>', 'Avoidance mode: same-runtime or none')
+        .option('--avoid <mode>', 'Avoidance mode: same-family, same-runtime, or none')
         .option('--current-runtime <runtime>', 'Override detected runtime for testing or manual routing')
+        .option('--producer-identity <identity>', 'Producer identity as <value>:<declared|observed|inferred|unknown>')
         .argument('<prompt...>', 'Prompt arguments appended to the target command')
         .action(async (prompt, options, command) => {
         const context = dependencies.buildCommandContext(readGlobalOptions(command));
@@ -917,8 +1229,9 @@ export function createGateCommand(overrides = {}) {
         .command('review')
         .description('Run a review gate and map review findings to exit status')
         .option('--target <id>', 'Run this exact exec target')
-        .option('--avoid <mode>', 'Avoidance mode: same-runtime or none')
+        .option('--avoid <mode>', 'Avoidance mode: same-family, same-runtime, or none')
         .option('--current-runtime <runtime>', 'Override detected runtime for testing or manual routing')
+        .option('--producer-identity <identity>', 'Producer identity as <value>:<declared|observed|inferred|unknown>')
         .option('--project <path-or-name>', 'Project path or name to review; defaults to the active project')
         .option('--review-scope <scope>', 'Review scope hint for the provider')
         .option('--review-type <type>', 'Review type hint for the provider')

package/dist/commands/internal/cursor-current-target.d.ts

@@ -0,0 +1,37 @@
+import { type CommandContext, type GlobalOptions } from '../../app/command-context.js';
+import { type ModelFamily } from '../../providers/identity/family.js';
+import type { IdentityProvenance } from '../../providers/identity/provenance.js';
+import { Command } from 'commander';
+export interface CursorAgentRunOptions {
+    cwd: string;
+    env: NodeJS.ProcessEnv;
+}
+export interface CursorAgentRunResult {
+    ok: boolean;
+    stdout: string;
+    stderr: string;
+}
+export interface CursorProbeDependencies {
+    runCursorAgent: (args: string[], options: CursorAgentRunOptions) => Promise<CursorAgentRunResult>;
+    readFile: (path: string, encoding: BufferEncoding) => Promise<string>;
+    env?: NodeJS.ProcessEnv;
+}
+interface CursorCurrentTargetCommandDependencies extends CursorProbeDependencies {
+    buildCommandContext: (options: GlobalOptions) => CommandContext;
+}
+export type CursorCurrentTargetSource = 'cursor-agent models' | '--list-models' | 'init-event' | 'cli-config' | 'unknown';
+export interface CursorCurrentTarget {
+    value: string;
+    source: CursorCurrentTargetSource;
+    provenance: IdentityProvenance;
+    family: ModelFamily;
+    rawValue?: string;
+}
+export declare function probeCursorCurrentTarget(options: {
+    cwd: string;
+    home: string;
+    dependencies?: Partial<CursorProbeDependencies>;
+}): Promise<CursorCurrentTarget>;
+export declare function createCursorCurrentTargetCommand(overrides?: Partial<CursorCurrentTargetCommandDependencies>): Command;
+export {};
+//# sourceMappingURL=cursor-current-target.d.ts.map

package/dist/commands/internal/cursor-current-target.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor-current-target.d.ts","sourceRoot":"","sources":["../../../src/commands/internal/cursor-current-target.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,CACd,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAED,UAAU,sCAAuC,SAAQ,uBAAuB;IAC9E,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;CACjE;AAED,MAAM,MAAM,yBAAyB,GACjC,qBAAqB,GACrB,eAAe,GACf,YAAY,GACZ,YAAY,GACZ,SAAS,CAAC;AAEd,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,yBAAyB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAiMD,wBAAsB,wBAAwB,CAAC,OAAO,EAAE;IACtD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACjD,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmE/B;AAeD,wBAAgB,gCAAgC,CAC9C,SAAS,GAAE,OAAO,CAAC,sCAAsC,CAAM,GAC9D,OAAO,CAoBT"}