@open-agent-toolkit/cli 0.1.42 → 0.1.45

package/dist/commands/doctor/index.js

@@ -7,7 +7,7 @@ import { createPjmDisabledCheck, runPjmDoctorChecks, } from '../pjm/doctor.js';
 import { getSkillVersion } from '../shared/frontmatter.js';
 import { withScopeOption } from '../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../shared/shared.utils.js';
-import { readOatConfig } from '../../config/oat-config.js';
+import { readOatConfig, readOatLocalConfig, readUserConfig, } from '../../config/oat-config.js';
 import { resolveAssetsRoot } from '../../fs/assets.js';
 import { resolveProjectRoot, resolveScopeRoot } from '../../fs/paths.js';
 import TOML from '@iarna/toml';
@@ -17,6 +17,7 @@ import { codexAdapter } from '../../providers/codex/index.js';
 import { copilotAdapter } from '../../providers/copilot/index.js';
 import { cursorAdapter } from '../../providers/cursor/index.js';
 import { geminiAdapter } from '../../providers/gemini/index.js';
+import { validateMatrixCell, } from '../../providers/identity/availability.js';
 import { formatDoctorResults } from '../../ui/output.js';
 import { Command } from 'commander';
 async function pathExistsDefault(path) {
@@ -129,13 +130,137 @@ function createDependencies() {
         readFile: async (path) => readFile(path, 'utf8'),
         resolveAssetsRoot,
         readOatConfig,
+        readOatLocalConfig,
+        readUserConfig,
+        validateMatrixCell,
+        processEnv: process.env,
         runPjmDoctorChecks,
         // Default binding remains self-contained, but still honors the caller-
         // provided pathExists dependency from runChecksForScope when available.
         checkSkillVersions: (scopeRoot, assetsRoot, pathExists = pathExistsDefault) => checkSkillVersionsDefault(scopeRoot, assetsRoot, pathExists),
     };
 }
-async function runChecksForScope(scope, scopeRoot, dependencies) {
+function isRouteTarget(entry) {
+    return typeof entry === 'object' && entry !== null && !Array.isArray(entry);
+}
+function addDispatchMatrixCellRefs(refs, layer, provider, path, cell) {
+    if (typeof cell === 'string') {
+        refs.push({ layer, provider, value: cell, path });
+        return;
+    }
+    for (const [index, entry] of cell.entries()) {
+        const entryPath = `${path}[${index}]`;
+        if (typeof entry === 'string') {
+            refs.push({ layer, provider, value: entry, path: entryPath });
+            continue;
+        }
+        if (!isRouteTarget(entry)) {
+            continue;
+        }
+        if (entry.model) {
+            refs.push({
+                layer,
+                provider,
+                value: entry.model,
+                path: `${entryPath}.model`,
+            });
+        }
+        if (entry.effort) {
+            refs.push({
+                layer,
+                provider,
+                value: entry.effort,
+                path: `${entryPath}.effort`,
+            });
+        }
+    }
+}
+function collectDispatchMatrixCellRefs(layers) {
+    const refs = [];
+    for (const { layer, config } of layers) {
+        const providers = config.workflow?.dispatchCeiling?.providers ?? {};
+        for (const [provider, providerValue] of Object.entries(providers)) {
+            const providerPath = `workflow.dispatchCeiling.providers.${provider}`;
+            if (typeof providerValue === 'string') {
+                refs.push({
+                    layer,
+                    provider,
+                    value: providerValue,
+                    path: providerPath,
+                });
+                continue;
+            }
+            const tierMap = providerValue;
+            for (const [tier, cell] of Object.entries(tierMap)) {
+                if (cell === undefined) {
+                    continue;
+                }
+                addDispatchMatrixCellRefs(refs, layer, provider, `${providerPath}.${tier}`, cell);
+            }
+        }
+    }
+    return refs;
+}
+function formatDispatchMatrixIssueList(issues) {
+    return issues
+        .map((issue) => `${issue.path}=${issue.value} (${issue.layer} config)`)
+        .join(', ');
+}
+async function createDispatchMatrixDoctorCheck(scopeRoot, layers, dependencies) {
+    const refs = collectDispatchMatrixCellRefs(layers);
+    if (refs.length === 0) {
+        return {
+            name: 'project:dispatch_matrix',
+            description: 'Dispatch matrix cell availability',
+            status: 'pass',
+            message: 'No configured dispatch matrix cells found in user, shared, or local config layers.',
+        };
+    }
+    const issues = [];
+    for (const ref of refs) {
+        let availability;
+        try {
+            availability = await dependencies.validateMatrixCell(ref.provider, ref.value, {
+                cwd: scopeRoot,
+                env: dependencies.processEnv,
+            });
+        }
+        catch {
+            availability = 'unvalidated';
+        }
+        if (availability !== 'valid') {
+            issues.push({ ...ref, availability });
+        }
+    }
+    if (issues.length === 0) {
+        return {
+            name: 'project:dispatch_matrix',
+            description: 'Dispatch matrix cell availability',
+            status: 'pass',
+            message: `All configured dispatch matrix cells are available: ${formatDispatchMatrixIssueList(refs)}.`,
+        };
+    }
+    const unknown = issues.filter((issue) => issue.availability === 'unknown-value');
+    const unvalidated = issues.filter((issue) => issue.availability === 'unvalidated');
+    const messageParts = [];
+    if (unknown.length > 0) {
+        messageParts.push(`Unknown dispatch matrix cells: ${formatDispatchMatrixIssueList(unknown)}`);
+    }
+    if (unvalidated.length > 0) {
+        messageParts.push(`Unvalidated dispatch matrix cells: ${formatDispatchMatrixIssueList(unvalidated)}`);
+    }
+    const hasUnknown = unknown.length > 0;
+    return {
+        name: 'project:dispatch_matrix',
+        description: 'Dispatch matrix cell availability',
+        status: hasUnknown ? 'warn' : 'pass',
+        message: messageParts.join('. '),
+        fix: hasUnknown
+            ? 'Run `oat config set workflow.dispatchCeiling.providers.<provider> <value>` with an available value, or refresh provider assets with `oat sync --scope project`.'
+            : undefined,
+    };
+}
+async function runChecksForScope(scope, scopeRoot, userConfigDir, dependencies) {
     const checks = [];
     const skillsPath = join(scopeRoot, '.agents', 'skills');
     const agentsPath = join(scopeRoot, '.agents', 'agents');
@@ -345,7 +470,16 @@ async function runChecksForScope(scope, scopeRoot, dependencies) {
             }
         }
         const repoReferenceRoot = join(scopeRoot, '.oat', 'repo');
-        const config = await dependencies.readOatConfig(scopeRoot);
+        const [userConfig, config, localConfig] = await Promise.all([
+            dependencies.readUserConfig(userConfigDir),
+            dependencies.readOatConfig(scopeRoot),
+            dependencies.readOatLocalConfig(scopeRoot),
+        ]);
+        checks.push(await createDispatchMatrixDoctorCheck(scopeRoot, [
+            { layer: 'user', config: userConfig },
+            { layer: 'shared', config },
+            { layer: 'local', config: localConfig },
+        ], dependencies));
         const projectManagementEnabled = config.tools?.['project-management'] === true;
         if (projectManagementEnabled) {
             checks.push(...(await dependencies.runPjmDoctorChecks(repoReferenceRoot, {
@@ -362,7 +496,7 @@ async function runDoctorCommand(context, dependencies) {
     const checks = [];
     for (const scope of resolveConcreteScopes(context.scope)) {
         const scopeRoot = await dependencies.resolveScopeRoot(scope, context);
-        const scopeChecks = await runChecksForScope(scope, scopeRoot, dependencies);
+        const scopeChecks = await runChecksForScope(scope, scopeRoot, join(context.home, '.oat'), dependencies);
         checks.push(...scopeChecks);
     }
     if (context.json) {

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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"}