@open-agent-toolkit/cli 0.1.48 → 0.1.50

package/dist/commands/config/index.js

@@ -5,12 +5,14 @@ import { resolveProjectsRoot } from '../shared/oat-paths.js';
 import { confirmAction, } from '../shared/shared.prompts.js';
 import { readGlobalOptions } from '../shared/shared.utils.js';
 import { compileDispatchCeilingPreset } from '../../config/dispatch-ceiling-preset.js';
+import { normalizeDispatchMatrix, validateDispatchRouteTarget, walkDispatchMatrix, } from '../../config/dispatch-matrix.js';
 import { dispatchPolicyModeDescription, dispatchPolicyPolicyDescription, managedDispatchPolicyValueList, } from '../../config/dispatch-policy-options.js';
-import { VALID_DISPATCH_POLICY_MODES, VALID_MANAGED_DISPATCH_POLICIES, isCodexMaterializedRouteTarget, isWorkflowDispatchCandidateLadder, isWorkflowDispatchFallbackRoute, readOatConfig, readOatLocalConfig, readUserConfig, validateDispatchRouteTarget, writeOatConfig, writeOatLocalConfig, writeUserConfig, } from '../../config/oat-config.js';
+import { VALID_DISPATCH_POLICY_MODES, VALID_MANAGED_DISPATCH_POLICIES, readOatConfig, readOatLocalConfig, readUserConfig, writeOatConfig, writeOatLocalConfig, writeUserConfig, } from '../../config/oat-config.js';
 import { resolveEffectiveConfig, } from '../../config/resolve.js';
 import { resolveAssetsRoot } from '../../fs/assets.js';
 import { resolveProjectRoot } from '../../fs/paths.js';
 import { normalizeMatrixCellAvailability, validateMatrixCell, } from '../../providers/identity/availability.js';
+import { createDispatchValidationPassContext, validateDispatchMatrixRefs, } from '../../providers/identity/dispatch-validation.js';
 import { Command } from 'commander';
 import { createConfigDumpCommand } from './dump.js';
 const DISPATCH_CEILING_PROVIDER_KEY_PREFIX = 'workflow.dispatchCeiling.providers.';
@@ -563,6 +565,8 @@ const DEFAULT_DEPENDENCIES = {
     readFile: (path) => readFileDefault(path, 'utf8'),
     confirmAction,
     validateMatrixCell,
+    createDispatchValidationPassContext,
+    validateDispatchMatrixRefs,
     processEnv: process.env,
 };
 function isConfigKey(value) {
@@ -765,130 +769,62 @@ function parseDispatchMatrixRecommendation(raw) {
     if (!isRecord(parsed.providers)) {
         throw new Error('Dispatch matrix recommendation asset is missing providers.');
     }
+    const normalized = normalizeDispatchMatrix(parsed.providers, {
+        pathPrefix: 'workflow.dispatchCeiling.providers',
+        compatibilityMode: 'layered-config',
+    });
     return {
         version,
-        providers: parsed.providers,
+        providers: normalized.providers,
+        issues: normalized.issues,
     };
 }
-function isRouteTarget(entry) {
-    return isRecord(entry);
-}
-function formatRouteTargetValue(entry) {
-    return [entry.model, entry.effort].filter(Boolean).join('/');
+function collectDispatchMatrixCellRefs(providers) {
+    return walkDispatchMatrix(providers, {
+        source: 'repo-config',
+        pathPrefix: 'workflow.dispatchCeiling.providers',
+    });
 }
-function addDispatchMatrixCellRefs(refs, provider, path, cell) {
-    if (typeof cell === 'string') {
-        refs.push({ provider, value: cell, path });
-        return;
-    }
-    const addEntry = (entry, entryPath) => {
-        if (typeof entry === 'string') {
-            refs.push({ provider, value: entry, path: entryPath });
-            return;
-        }
-        if (!isRouteTarget(entry)) {
-            return;
-        }
-        const targetProvider = entry.harness ?? provider;
-        if (isCodexMaterializedRouteTarget(provider, entry)) {
-            if (entry.model && entry.effort) {
-                refs.push({
-                    provider: targetProvider,
-                    value: formatRouteTargetValue(entry),
-                    path: entryPath,
-                    target: entry,
-                });
-                return;
-            }
-        }
-        if (entry.model) {
-            refs.push({
-                provider: targetProvider,
-                value: entry.model,
-                path: `${entryPath}.model`,
-            });
-        }
-        if (entry.effort) {
-            refs.push({
-                provider: targetProvider,
-                value: entry.effort,
-                path: `${entryPath}.effort`,
-            });
-        }
-    };
-    if (isWorkflowDispatchCandidateLadder(cell)) {
-        for (const [candidateIndex, candidate] of cell.candidates.entries()) {
-            const candidatePath = `${path}.candidates[${candidateIndex}]`;
-            if (isWorkflowDispatchFallbackRoute(candidate)) {
-                for (const [routeIndex, entry] of candidate.route.entries()) {
-                    addEntry(entry, `${candidatePath}.route[${routeIndex}]`);
-                }
-                continue;
-            }
-            addEntry(candidate, candidatePath);
+function collectDispatchMatrixTargetValidationErrors(refs, issues) {
+    const errors = issues.map((issue) => {
+        const relativePath = issue.path.startsWith(DISPATCH_CEILING_PROVIDER_KEY_PREFIX)
+            ? issue.path.slice(DISPATCH_CEILING_PROVIDER_KEY_PREFIX.length)
+            : '';
+        const provider = relativePath.split(/[.[]/, 1)[0] ?? '';
+        const closedValues = closedDispatchProviderValues(provider);
+        if (typeof issue.value === 'string' && closedValues) {
+            return `Invalid value for ${issue.path}: expected one of ${closedValues.join(' | ')}, got '${issue.value}'`;
         }
-        return;
-    }
-    for (const [index, entry] of cell.entries()) {
-        addEntry(entry, `${path}[${index}]`);
-    }
-}
-function collectDispatchMatrixCellRefs(providers) {
-    const refs = [];
-    for (const [provider, providerValue] of Object.entries(providers)) {
-        const providerPath = `workflow.dispatchCeiling.providers.${provider}`;
-        if (typeof providerValue === 'string') {
-            refs.push({ provider, value: providerValue, path: providerPath });
+        return `${issue.path}: malformed dispatch matrix entry (${issue.kind}).`;
+    });
+    for (const ref of refs) {
+        if (ref.target === null) {
             continue;
         }
-        for (const [tier, cell] of Object.entries(providerValue)) {
-            if (cell === undefined) {
-                continue;
-            }
-            addDispatchMatrixCellRefs(refs, provider, `${providerPath}.${tier}`, cell);
+        const validation = validateDispatchRouteTarget(ref.provider, ref.target);
+        if (!validation.valid) {
+            errors.push(`${ref.path}: ${validation.reason}`);
         }
     }
-    return refs;
+    return errors;
 }
-function collectDispatchMatrixTargetValidationErrors(providers) {
-    const errors = [];
-    for (const [provider, providerValue] of Object.entries(providers)) {
-        if (typeof providerValue === 'string') {
-            continue;
-        }
-        const providerPath = `workflow.dispatchCeiling.providers.${provider}`;
-        for (const [tier, cell] of Object.entries(providerValue)) {
-            if (cell === undefined || typeof cell === 'string') {
-                continue;
-            }
-            const validateEntry = (entry, entryPath) => {
-                if (!isRouteTarget(entry)) {
-                    return;
-                }
-                const validation = validateDispatchRouteTarget(provider, entry);
-                if (!validation.valid) {
-                    errors.push(`${entryPath}: ${validation.reason}`);
-                }
-            };
-            if (isWorkflowDispatchCandidateLadder(cell)) {
-                for (const [candidateIndex, candidate] of cell.candidates.entries()) {
-                    const candidatePath = `${providerPath}.${tier}.candidates[${candidateIndex}]`;
-                    if (isWorkflowDispatchFallbackRoute(candidate)) {
-                        for (const [routeIndex, entry] of candidate.route.entries()) {
-                            validateEntry(entry, `${candidatePath}.route[${routeIndex}]`);
-                        }
-                        continue;
-                    }
-                    validateEntry(candidate, candidatePath);
-                }
-                continue;
-            }
-            for (const [index, entry] of cell.entries()) {
-                validateEntry(entry, `${providerPath}.${tier}[${index}]`);
-            }
-        }
+function toAvailabilityRef(ref) {
+    if (ref.value !== null) {
+        return { provider: ref.provider, value: ref.value, path: ref.path };
     }
-    return errors;
+    if (ref.target === null) {
+        return null;
+    }
+    const value = ref.target.model ?? ref.target.effort;
+    if (!value) {
+        return null;
+    }
+    return {
+        provider: ref.target.harness ?? ref.provider,
+        value,
+        path: ref.path,
+        target: ref.target,
+    };
 }
 function applyWorkflowValue(workflow, key, value) {
     const subKey = key.slice('workflow.'.length);
@@ -1225,28 +1161,34 @@ async function loadDispatchMatrixRecommendation(dependencies) {
     return parseDispatchMatrixRecommendation(await dependencies.readFile(assetPath));
 }
 async function validateRecommendationCells(repoRoot, recommendation, dependencies, warn) {
-    const targetErrors = collectDispatchMatrixTargetValidationErrors(recommendation.providers);
+    const refs = collectDispatchMatrixCellRefs(recommendation.providers);
+    const targetErrors = collectDispatchMatrixTargetValidationErrors(refs, recommendation.issues);
     if (targetErrors.length > 0) {
         throw new Error(targetErrors.join('\n'));
     }
-    for (const ref of collectDispatchMatrixCellRefs(recommendation.providers)) {
+    const availabilityRefs = refs.filter((matrixRef) => {
+        const ref = toAvailabilityRef(matrixRef);
+        if (ref === null) {
+            return false;
+        }
         const closedValues = closedDispatchProviderValues(ref.provider);
         if (!ref.target && closedValues && !closedValues.includes(ref.value)) {
             throw new Error(`Invalid value for ${ref.path}: expected one of ${closedValues.join(' | ')}, got '${ref.value}'`);
         }
-        let availability;
-        try {
-            availability = await dependencies.validateMatrixCell(ref.provider, ref.value, {
-                cwd: repoRoot,
-                env: dependencies.processEnv,
-                detailed: true,
-                ...(ref.target ? { target: ref.target } : {}),
-            });
-        }
-        catch {
-            availability = 'unvalidated';
-        }
-        const warning = matrixCellAvailabilityWarning(ref.path, ref.value, availability);
+        return true;
+    });
+    const pass = dependencies.createDispatchValidationPassContext({
+        cwd: repoRoot,
+        env: dependencies.processEnv,
+        validateMatrixCell: dependencies.validateMatrixCell,
+    });
+    const results = await dependencies.validateDispatchMatrixRefs(availabilityRefs, pass);
+    for (const result of results) {
+        const ref = toAvailabilityRef(result.ref);
+        const warning = matrixCellAvailabilityWarning(ref.path, ref.value, {
+            availability: result.status,
+            ...(result.diagnostic ? { message: result.diagnostic } : {}),
+        });
         if (warning) {
             warn(warning);
         }

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

@@ -3,6 +3,7 @@ import { type PjmDoctorOptions } from '../pjm/doctor.js';
 import { type OatConfig, type OatLocalConfig, type UserConfig } from '../../config/oat-config.js';
 import { type Manifest } from '../../manifest/index.js';
 import { type MatrixCellAvailabilityResponse, type ValidateMatrixCellOptions } from '../../providers/identity/availability.js';
+import { createDispatchValidationPassContext, validateDispatchMatrixRefs } from '../../providers/identity/dispatch-validation.js';
 import type { ConcreteScope } from '../../shared/types.js';
 import { type DoctorCheck } from '../../ui/output.js';
 import { Command } from 'commander';
@@ -23,6 +24,8 @@ interface DoctorDependencies {
     readOatLocalConfig: (repoRoot: string) => Promise<OatLocalConfig>;
     readUserConfig: (userConfigDir: string) => Promise<UserConfig>;
     validateMatrixCell: (provider: string, value: string, options: ValidateMatrixCellOptions) => Promise<MatrixCellAvailabilityResponse>;
+    createDispatchValidationPassContext: typeof createDispatchValidationPassContext;
+    validateDispatchMatrixRefs: typeof validateDispatchMatrixRefs;
     processEnv: NodeJS.ProcessEnv;
     runPjmDoctorChecks: (repoRoot: string, options?: PjmDoctorOptions) => Promise<DoctorCheck[]>;
     checkSkillVersions: (scopeRoot: string, assetsRoot: string, pathExists: (path: string) => Promise<boolean>) => Promise<SkillVersionReport>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/doctor/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/doctor/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAY9B,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,cAAc,EAGnB,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAO9D,OAAO,EAGL,KAAK,8BAA8B,EACnC,KAAK,yBAAyB,EAC/B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,mCAAmC,EACnC,0BAA0B,EAC3B,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,UAAU,kBAAkB;IAC1B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,gBAAgB,EAAE,CAChB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7D,cAAc,EAAE,CACd,SAAS,EAAE,MAAM,KACd,OAAO,CACV,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CACnE,CAAC;IACF,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,kBAAkB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,cAAc,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/D,kBAAkB,EAAE,CAClB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAC7C,mCAAmC,EAAE,OAAO,mCAAmC,CAAC;IAChF,0BAA0B,EAAE,OAAO,0BAA0B,CAAC;IAC9D,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;IAC9B,kBAAkB,EAAE,CAClB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,gBAAgB,KACvB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5B,kBAAkB,EAAE,CAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,KAC3C,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAClC;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,UAAU,kBAAkB;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,0BAA0B,EAAE,MAAM,CAAC;IACnC,cAAc,EAAE,oBAAoB,EAAE,CAAC;CACxC;AA2pBD,wBAAgB,mBAAmB,CACjC,SAAS,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAC1C,OAAO,CAcT"}

package/dist/commands/doctor/index.js

@@ -7,7 +7,8 @@ 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, readOatLocalConfig, readUserConfig, isCodexMaterializedRouteTarget, isWorkflowDispatchCandidateLadder, isWorkflowDispatchFallbackRoute, } from '../../config/oat-config.js';
+import { walkDispatchMatrix, } from '../../config/dispatch-matrix.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';
@@ -18,7 +19,8 @@ import { isOatManagedCodexRoleFile } from '../../providers/codex/codec/shared.js
 import { copilotAdapter } from '../../providers/copilot/index.js';
 import { cursorAdapter } from '../../providers/cursor/index.js';
 import { geminiAdapter } from '../../providers/gemini/index.js';
-import { normalizeMatrixCellAvailability, validateMatrixCell, } from '../../providers/identity/availability.js';
+import { validateMatrixCell, } from '../../providers/identity/availability.js';
+import { createDispatchValidationPassContext, validateDispatchMatrixRefs, } from '../../providers/identity/dispatch-validation.js';
 import { formatDoctorResults } from '../../ui/output.js';
 import { Command } from 'commander';
 async function pathExistsDefault(path) {
@@ -134,6 +136,8 @@ function createDependencies() {
         readOatLocalConfig,
         readUserConfig,
         validateMatrixCell,
+        createDispatchValidationPassContext,
+        validateDispatchMatrixRefs,
         processEnv: process.env,
         runPjmDoctorChecks,
         // Default binding remains self-contained, but still honors the caller-
@@ -141,97 +145,46 @@ function createDependencies() {
         checkSkillVersions: (scopeRoot, assetsRoot, pathExists = pathExistsDefault) => checkSkillVersionsDefault(scopeRoot, assetsRoot, pathExists),
     };
 }
-function isRouteTarget(entry) {
-    return typeof entry === 'object' && entry !== null && !Array.isArray(entry);
-}
-function formatRouteTargetValue(entry) {
-    return [entry.model, entry.effort].filter(Boolean).join('/');
+function collectDispatchMatrixCellRefs(layers) {
+    return layers.flatMap(({ source, config }) => {
+        const providers = config.workflow?.dispatchCeiling?.providers ?? {};
+        return walkDispatchMatrix(providers, {
+            source,
+            pathPrefix: 'workflow.dispatchCeiling.providers',
+        });
+    });
 }
-function addDispatchMatrixCellRefs(refs, layer, provider, path, cell) {
-    if (typeof cell === 'string') {
-        refs.push({ layer, provider, value: cell, path });
-        return;
+function dispatchMatrixSourceLabel(source) {
+    switch (source) {
+        case 'user-config':
+            return 'user';
+        case 'repo-config':
+            return 'shared';
+        case 'local-config':
+            return 'local';
+        case 'project-state':
+            return 'project-state';
     }
-    const addEntry = (entry, entryPath) => {
-        if (typeof entry === 'string') {
-            refs.push({ layer, provider, value: entry, path: entryPath });
-            return;
-        }
-        if (!isRouteTarget(entry)) {
-            return;
-        }
-        const targetProvider = entry.harness ?? provider;
-        if (isCodexMaterializedRouteTarget(provider, entry)) {
-            if (entry.model && entry.effort) {
-                refs.push({
-                    layer,
-                    provider: targetProvider,
-                    value: formatRouteTargetValue(entry),
-                    path: entryPath,
-                    target: entry,
-                });
-                return;
-            }
-        }
-        if (entry.model) {
-            refs.push({
-                layer,
-                provider: targetProvider,
-                value: entry.model,
-                path: `${entryPath}.model`,
-            });
-        }
-        if (entry.effort) {
-            refs.push({
-                layer,
-                provider: targetProvider,
-                value: entry.effort,
-                path: `${entryPath}.effort`,
-            });
-        }
-    };
-    if (isWorkflowDispatchCandidateLadder(cell)) {
-        for (const [candidateIndex, candidate] of cell.candidates.entries()) {
-            const candidatePath = `${path}.candidates[${candidateIndex}]`;
-            if (isWorkflowDispatchFallbackRoute(candidate)) {
-                for (const [routeIndex, entry] of candidate.route.entries()) {
-                    addEntry(entry, `${candidatePath}.route[${routeIndex}]`);
-                }
-                continue;
-            }
-            addEntry(candidate, candidatePath);
-        }
-        return;
+}
+function dispatchMatrixRefValue(ref) {
+    return ref.value ?? ref.target?.model ?? ref.target?.effort ?? 'unknown';
+}
+function dispatchMatrixAvailabilityRef(ref) {
+    if (ref.value !== null) {
+        return { provider: ref.provider, value: ref.value, target: null };
     }
-    for (const [index, entry] of cell.entries()) {
-        addEntry(entry, `${path}[${index}]`);
+    if (ref.target === null) {
+        return null;
     }
-}
-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);
-            }
-        }
+    const value = ref.target.model ?? ref.target.effort;
+    if (!value) {
+        return null;
     }
-    return refs;
+    return {
+        provider: ref.target.harness ?? ref.provider,
+        value,
+        target: ref.target,
+    };
 }
 function formatDispatchMatrixIssueList(issues) {
     return issues
@@ -239,12 +192,12 @@ function formatDispatchMatrixIssueList(issues) {
         const suffix = 'message' in issue && typeof issue.message === 'string'
             ? `; ${issue.message}`
             : '';
-        return `${issue.path}=${issue.value} (${issue.layer} config)${suffix}`;
+        return `${issue.path}=${dispatchMatrixRefValue(issue)} (${dispatchMatrixSourceLabel(issue.source)} config)${suffix}`;
     })
         .join(', ');
 }
 async function createDispatchMatrixDoctorCheck(scopeRoot, layers, dependencies) {
-    const refs = collectDispatchMatrixCellRefs(layers);
+    const refs = collectDispatchMatrixCellRefs(layers).filter((ref) => dispatchMatrixAvailabilityRef(ref) !== null);
     if (refs.length === 0) {
         return {
             name: 'project:dispatch_matrix',
@@ -253,25 +206,19 @@ async function createDispatchMatrixDoctorCheck(scopeRoot, layers, dependencies)
             message: 'No configured dispatch matrix cells found in user, shared, or local config layers.',
         };
     }
+    const pass = dependencies.createDispatchValidationPassContext({
+        cwd: scopeRoot,
+        env: dependencies.processEnv,
+        validateMatrixCell: dependencies.validateMatrixCell,
+    });
+    const results = await dependencies.validateDispatchMatrixRefs(refs, pass);
     const issues = [];
-    for (const ref of refs) {
-        let result;
-        try {
-            result = normalizeMatrixCellAvailability(await dependencies.validateMatrixCell(ref.provider, ref.value, {
-                cwd: scopeRoot,
-                env: dependencies.processEnv,
-                detailed: true,
-                ...(ref.target ? { target: ref.target } : {}),
-            }));
-        }
-        catch {
-            result = { availability: 'unvalidated' };
-        }
-        if (result.availability !== 'valid') {
+    for (const result of results) {
+        if (result.status !== 'valid') {
             issues.push({
-                ...ref,
-                availability: result.availability,
-                ...(result.message ? { message: result.message } : {}),
+                ...result.ref,
+                availability: result.status,
+                ...(result.diagnostic ? { message: result.diagnostic } : {}),
             });
         }
     }
@@ -547,9 +494,9 @@ async function runChecksForScope(scope, scopeRoot, userConfigDir, dependencies)
             dependencies.readOatLocalConfig(scopeRoot),
         ]);
         checks.push(await createDispatchMatrixDoctorCheck(scopeRoot, [
-            { layer: 'user', config: userConfig },
-            { layer: 'shared', config },
-            { layer: 'local', config: localConfig },
+            { source: 'user-config', config: userConfig },
+            { source: 'repo-config', config },
+            { source: 'local-config', config: localConfig },
         ], dependencies));
         const projectManagementEnabled = config.tools?.['project-management'] === true;
         if (projectManagementEnabled) {

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":"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"}
+{"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,EAKL,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAEL,KAAK,WAAW,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAExB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EACL,sBAAsB,EAIvB,MAAM,kBAAkB,CAAC;AAE1B,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,sBAAsB,EAAE,OAAO,sBAAsB,CAAC;IACtD,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AA6CD,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;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,gBAAgB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,KAAK,kBAAkB,GAAG,aAAa,GAAG,cAAc,GAAG,MAAM,CAAC;AAClE,KAAK,qBAAqB,GACtB,kBAAkB,GAClB,4BAA4B,GAC5B,2CAA2C,GAC3C,kBAAkB,CAAC;AAUvB,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,kBAAkB,CAAC;IAC/B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,WAAW,EAAE,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,mBAAmB,GAAG,SAAS,CAAC;CAC5D;AAED,UAAU,qBAAqB;IAC7B,KAAK,EAAE,kBAAkB,CAAC;IAC1B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,QAAQ,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,kBAAkB,CAAC;QAC/B,UAAU,EAAE,kBAAkB,CAAC;QAC/B,MAAM,EAAE,WAAW,CAAC;QACpB,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACvC,aAAa,EAAE,WAAW,EAAE,CAAC;QAC7B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;IACF,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,WAAW,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA2iCD,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,EAC9C,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,kBAAkB,EACzB,gBAAgB,CAAC,EAAE,oBAAoB,GACtC,kBAAkB,GAAG,IAAI,CAS3B;AAkgDD,wBAAgB,iBAAiB,CAC/B,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwMT"}