@open-agent-toolkit/cli 0.1.45 → 0.1.48

package/dist/commands/doctor/index.js

@@ -7,17 +7,18 @@ 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, } from '../../config/oat-config.js';
+import { readOatConfig, readOatLocalConfig, readUserConfig, isCodexMaterializedRouteTarget, isWorkflowDispatchCandidateLadder, isWorkflowDispatchFallbackRoute, } from '../../config/oat-config.js';
 import { resolveAssetsRoot } from '../../fs/assets.js';
 import { resolveProjectRoot, resolveScopeRoot } from '../../fs/paths.js';
 import TOML from '@iarna/toml';
 import { loadManifest } from '../../manifest/index.js';
 import { claudeAdapter } from '../../providers/claude/index.js';
 import { codexAdapter } from '../../providers/codex/index.js';
+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 { validateMatrixCell, } from '../../providers/identity/availability.js';
+import { normalizeMatrixCellAvailability, validateMatrixCell, } from '../../providers/identity/availability.js';
 import { formatDoctorResults } from '../../ui/output.js';
 import { Command } from 'commander';
 async function pathExistsDefault(path) {
@@ -143,24 +144,39 @@ function createDependencies() {
 function isRouteTarget(entry) {
     return typeof entry === 'object' && entry !== null && !Array.isArray(entry);
 }
+function formatRouteTargetValue(entry) {
+    return [entry.model, entry.effort].filter(Boolean).join('/');
+}
 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}]`;
+    const addEntry = (entry, entryPath) => {
         if (typeof entry === 'string') {
             refs.push({ layer, provider, value: entry, path: entryPath });
-            continue;
+            return;
         }
         if (!isRouteTarget(entry)) {
-            continue;
+            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,
+                provider: targetProvider,
                 value: entry.model,
                 path: `${entryPath}.model`,
             });
@@ -168,11 +184,27 @@ function addDispatchMatrixCellRefs(refs, layer, provider, path, cell) {
         if (entry.effort) {
             refs.push({
                 layer,
-                provider,
+                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;
+    }
+    for (const [index, entry] of cell.entries()) {
+        addEntry(entry, `${path}[${index}]`);
     }
 }
 function collectDispatchMatrixCellRefs(layers) {
@@ -203,7 +235,12 @@ function collectDispatchMatrixCellRefs(layers) {
 }
 function formatDispatchMatrixIssueList(issues) {
     return issues
-        .map((issue) => `${issue.path}=${issue.value} (${issue.layer} config)`)
+        .map((issue) => {
+        const suffix = 'message' in issue && typeof issue.message === 'string'
+            ? `; ${issue.message}`
+            : '';
+        return `${issue.path}=${issue.value} (${issue.layer} config)${suffix}`;
+    })
         .join(', ');
 }
 async function createDispatchMatrixDoctorCheck(scopeRoot, layers, dependencies) {
@@ -218,18 +255,24 @@ async function createDispatchMatrixDoctorCheck(scopeRoot, layers, dependencies)
     }
     const issues = [];
     for (const ref of refs) {
-        let availability;
+        let result;
         try {
-            availability = await dependencies.validateMatrixCell(ref.provider, ref.value, {
+            result = normalizeMatrixCellAvailability(await dependencies.validateMatrixCell(ref.provider, ref.value, {
                 cwd: scopeRoot,
                 env: dependencies.processEnv,
-            });
+                detailed: true,
+                ...(ref.target ? { target: ref.target } : {}),
+            }));
         }
         catch {
-            availability = 'unvalidated';
+            result = { availability: 'unvalidated' };
         }
-        if (availability !== 'valid') {
-            issues.push({ ...ref, availability });
+        if (result.availability !== 'valid') {
+            issues.push({
+                ...ref,
+                availability: result.availability,
+                ...(result.message ? { message: result.message } : {}),
+            });
         }
     }
     if (issues.length === 0) {
@@ -250,16 +293,45 @@ async function createDispatchMatrixDoctorCheck(scopeRoot, layers, dependencies)
         messageParts.push(`Unvalidated dispatch matrix cells: ${formatDispatchMatrixIssueList(unvalidated)}`);
     }
     const hasUnknown = unknown.length > 0;
+    const hasUnvalidated = unvalidated.length > 0;
     return {
         name: 'project:dispatch_matrix',
         description: 'Dispatch matrix cell availability',
-        status: hasUnknown ? 'warn' : 'pass',
+        status: hasUnknown || hasUnvalidated ? '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,
     };
 }
+function getCodexAgentConfigFile(config) {
+    if (!config || typeof config !== 'object' || Array.isArray(config)) {
+        return null;
+    }
+    const configFile = config.config_file;
+    return typeof configFile === 'string' && configFile.startsWith('agents/')
+        ? configFile
+        : null;
+}
+function isLikelyOatGeneratedCodexRoleName(roleName) {
+    return (roleName === 'oat-phase-implementer' ||
+        roleName === 'oat-reviewer' ||
+        roleName.startsWith('oat-phase-implementer-') ||
+        roleName.startsWith('oat-reviewer-'));
+}
+async function isManagedCodexRoleConfig(scopeRoot, roleName, configFile, dependencies) {
+    const absoluteRolePath = join(scopeRoot, '.codex', configFile);
+    if (!(await dependencies.pathExists(absoluteRolePath))) {
+        return isLikelyOatGeneratedCodexRoleName(roleName);
+    }
+    try {
+        const roleContent = await dependencies.readFile(absoluteRolePath);
+        return isOatManagedCodexRoleFile(roleContent, roleName);
+    }
+    catch {
+        return false;
+    }
+}
 async function runChecksForScope(scope, scopeRoot, userConfigDir, dependencies) {
     const checks = [];
     const skillsPath = join(scopeRoot, '.agents', 'skills');
@@ -419,17 +491,18 @@ async function runChecksForScope(scope, scopeRoot, userConfigDir, dependencies)
                     !Array.isArray(parsedConfig.agents)
                     ? parsedConfig.agents
                     : null;
-                const managedRoles = Object.entries(agents ?? {})
-                    .filter(([, config]) => {
-                    if (!config ||
-                        typeof config !== 'object' ||
-                        Array.isArray(config)) {
-                        return false;
+                const managedRoles = [];
+                const roleConfigFiles = new Map();
+                for (const [roleName, roleConfig] of Object.entries(agents ?? {})) {
+                    const configFile = getCodexAgentConfigFile(roleConfig);
+                    if (!configFile) {
+                        continue;
+                    }
+                    roleConfigFiles.set(roleName, configFile);
+                    if (await isManagedCodexRoleConfig(scopeRoot, roleName, configFile, dependencies)) {
+                        managedRoles.push(roleName);
                     }
-                    const configFile = config.config_file;
-                    return (typeof configFile === 'string' && configFile.startsWith('agents/'));
-                })
-                    .map(([roleName]) => roleName);
+                }
                 if (managedRoles.length > 0) {
                     const multiAgentEnabled = features?.multi_agent === true || features?.multi_agent === 'true';
                     checks.push({
@@ -445,11 +518,9 @@ async function runChecksForScope(scope, scopeRoot, userConfigDir, dependencies)
                     });
                     const missingRoleFiles = [];
                     for (const roleName of managedRoles) {
-                        const roleConfig = agents[roleName];
-                        const configFile = roleConfig.config_file;
-                        if (typeof configFile !== 'string') {
+                        const configFile = roleConfigFiles.get(roleName);
+                        if (!configFile)
                             continue;
-                        }
                         const absoluteRolePath = join(scopeRoot, '.codex', configFile);
                         if (!(await dependencies.pathExists(absoluteRolePath))) {
                             missingRoleFiles.push(configFile);
@@ -464,7 +535,7 @@ async function runChecksForScope(scope, scopeRoot, userConfigDir, dependencies)
                             : `Missing codex role files: ${missingRoleFiles.join(', ')}`,
                         fix: missingRoleFiles.length === 0
                             ? undefined
-                            : 'Regenerate codex roles with `oat sync --scope project`.',
+                            : 'Regenerate codex roles with `oat sync --scope project`, or materialize a single role with `oat providers codex materialize ...`.',
                     });
                 }
             }

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

@@ -4,6 +4,7 @@ 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';
+import { parseReviewGateVerdict } from './review-verdict.js';
 interface GateCommandDependencies {
     buildCommandContext: (options: GlobalOptions) => CommandContext;
     resolveProjectRoot: (cwd: string) => Promise<string>;
@@ -15,6 +16,7 @@ interface GateCommandDependencies {
     writeUserConfig: (userConfigDir: string, config: UserConfig) => Promise<void>;
     resolveEffectiveConfig: (repoRoot: string, userConfigDir: string, env: NodeJS.ProcessEnv) => Promise<ResolvedConfig>;
     runProcess: (command: string, args: string[], options: ProcessRunOptions) => Promise<ProcessRunResult>;
+    parseReviewGateVerdict: typeof parseReviewGateVerdict;
     processEnv: NodeJS.ProcessEnv;
 }
 interface ProcessRunOptions {
@@ -44,8 +46,10 @@ interface GateProducerIdentity {
     confidence: IdentityConfidence;
     family: ModelFamily;
     avoidFamilies: ModelFamily[];
+    contributingScopes?: string[];
+    contributingStampCount?: number;
     diversityClaimable: boolean;
-    source: 'flag' | 'stamp' | 'unknown';
+    source: 'flag' | 'stamp' | 'aggregated-stamps' | 'unknown';
 }
 interface GateDiversityMetadata {
     avoid: CrossProviderAvoid;
@@ -57,6 +61,8 @@ interface GateDiversityMetadata {
         family: ModelFamily;
         source: GateProducerIdentity['source'];
         avoidFamilies: ModelFamily[];
+        contributingScopes?: string[];
+        contributingStampCount?: number;
     };
     reviewer: {
         target: string;

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