@open-agent-toolkit/cli 0.1.45 → 0.1.48

package/dist/providers/identity/availability.js

@@ -1,9 +1,11 @@
 import { execFile } from 'node:child_process';
-import { join } from 'node:path';
 import { promisify } from 'node:util';
-import { VALID_CLAUDE_DISPATCH_CEILINGS, VALID_CODEX_DISPATCH_CEILINGS, } from '../../config/oat-config.js';
+import { VALID_CLAUDE_DISPATCH_CEILINGS } from '../../config/oat-config.js';
 import { fileExists } from '../../fs/io.js';
 const execFileAsync = promisify(execFile);
+export function normalizeMatrixCellAvailability(result) {
+    return typeof result === 'string' ? { availability: result } : result;
+}
 async function runCursorAgent(args, options) {
     try {
         const { stdout, stderr } = await execFileAsync('cursor-agent', args, {
@@ -27,9 +29,33 @@ async function runCursorAgent(args, options) {
         };
     }
 }
+async function runCodex(args, options) {
+    try {
+        const { stdout, stderr } = await execFileAsync('codex', args, {
+            cwd: options.cwd,
+            env: options.env,
+            maxBuffer: 16 * 1024 * 1024,
+            timeout: 10_000,
+        });
+        return {
+            ok: true,
+            stdout: String(stdout),
+            stderr: String(stderr),
+        };
+    }
+    catch (error) {
+        const failure = error;
+        return {
+            ok: false,
+            stdout: String(failure.stdout ?? ''),
+            stderr: String(failure.stderr ?? failure.message),
+        };
+    }
+}
 const DEFAULT_DEPENDENCIES = {
     pathExists: fileExists,
     runCursorAgent,
+    runCodex,
     env: process.env,
 };
 function apiKeyArgs(env) {
@@ -61,43 +87,245 @@ function availabilityFromCursorCatalog(value, stdout) {
         ? 'valid'
         : 'unknown-value';
 }
-async function validateCodexCell(value, cwd, dependencies) {
-    if (!VALID_CODEX_DISPATCH_CEILINGS.includes(value)) {
-        return 'unknown-value';
+const CURSOR_SUBAGENT_PROBE_SENTINEL = 'OAT_CURSOR_SUBAGENT_MODEL_VALID';
+function hasCursorSubagentProbeSentinel(stdout) {
+    return stdout
+        .split(/\r?\n/)
+        .some((line) => line.trim() === CURSOR_SUBAGENT_PROBE_SENTINEL);
+}
+function cursorSubagentProbePrompt(model) {
+    return [
+        'Validate whether a Cursor subagent Task can be launched with a specific model.',
+        `Use the Task tool once with model "${model}" and ask the subagent to reply exactly: ${CURSOR_SUBAGENT_PROBE_SENTINEL}.`,
+        'After the subagent returns, print only its exact reply.',
+    ].join('\n');
+}
+function cursorSubagentProbeArgs(model, env) {
+    return [
+        ...apiKeyArgs(env),
+        '-p',
+        cursorSubagentProbePrompt(model),
+        '--output-format=text',
+        '--force',
+    ];
+}
+function unique(values) {
+    return [...new Set(values)];
+}
+function extractModelSlugs(value) {
+    const matches = value.match(/\b[a-z][a-z0-9]*(?:[-.][a-z0-9]+)+\b/gi) ?? [];
+    return unique(matches
+        .map((match) => match.replace(/[),.;:]+$/g, ''))
+        .filter((match) => /\d/.test(match)));
+}
+function parseCursorAllowedSubagentModels(output) {
+    const sections = [];
+    const patterns = [
+        /\ballowed\s+(?:subagent\s+)?models?\s*:?\s*([^\n]+)/gi,
+        /\bsupported\s+(?:subagent\s+)?models?\s*:?\s*([^\n]+)/gi,
+        /\bvalid\s+(?:subagent\s+)?models?\s*:?\s*([^\n]+)/gi,
+        /\bone\s+of\s*:?\s*([^\n]+)/gi,
+    ];
+    for (const pattern of patterns) {
+        for (const match of output.matchAll(pattern)) {
+            if (match[1]) {
+                sections.push(match[1]);
+            }
+        }
+    }
+    return unique(sections.flatMap(extractModelSlugs));
+}
+function cursorAllowedModelsMessage(allowedValues) {
+    return `Allowed subagent models: ${allowedValues.join(', ')}.`;
+}
+function cursorRejectedMessage(allowedValues) {
+    return `Cursor rejected this model for subagent Task dispatch. ${cursorAllowedModelsMessage(allowedValues)}`;
+}
+function cursorCatalogContextMessage(value, availability) {
+    if (availability === 'valid') {
+        return `Cursor's broad model catalog lists '${value}', but subagent Task dispatch could not be validated.`;
+    }
+    if (availability === 'unknown-value') {
+        return `Cursor's broad model catalog does not list '${value}'.`;
+    }
+    return undefined;
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function stringFromUnknown(value) {
+    return typeof value === 'string' && value.trim().length > 0
+        ? value.trim()
+        : null;
+}
+function extractCodexEffort(value) {
+    if (typeof value === 'string') {
+        return stringFromUnknown(value);
+    }
+    if (!isRecord(value)) {
+        return null;
+    }
+    return (stringFromUnknown(value.effort) ??
+        stringFromUnknown(value.id) ??
+        stringFromUnknown(value.name));
+}
+function extractCodexEfforts(model) {
+    const efforts = [];
+    for (const key of [
+        'supported_reasoning_levels',
+        'supported_reasoning_efforts',
+        'supported_efforts',
+    ]) {
+        const value = model[key];
+        if (!Array.isArray(value)) {
+            continue;
+        }
+        efforts.push(...value
+            .map(extractCodexEffort)
+            .filter((effort) => effort !== null));
     }
+    const defaultEffort = stringFromUnknown(model.default_reasoning_level);
+    if (defaultEffort) {
+        efforts.push(defaultEffort);
+    }
+    return unique(efforts);
+}
+function parseCodexCatalog(stdout) {
+    let parsed;
     try {
-        const implementerExists = await dependencies.pathExists(join(cwd, '.codex', 'agents', `oat-phase-implementer-${value}.toml`));
-        const reviewerExists = await dependencies.pathExists(join(cwd, '.codex', 'agents', `oat-reviewer-${value}.toml`));
-        return implementerExists && reviewerExists ? 'valid' : 'unknown-value';
+        parsed = JSON.parse(stdout);
     }
     catch {
-        return 'unvalidated';
+        return null;
+    }
+    if (!isRecord(parsed) || !Array.isArray(parsed.models)) {
+        return null;
+    }
+    const entries = [];
+    for (const model of parsed.models) {
+        if (!isRecord(model)) {
+            continue;
+        }
+        const slug = stringFromUnknown(model.slug);
+        if (!slug) {
+            continue;
+        }
+        const supportedEfforts = extractCodexEfforts(model);
+        entries.push({
+            slug,
+            supportedEfforts: supportedEfforts.length > 0 ? supportedEfforts : null,
+        });
+    }
+    return entries.length > 0 ? entries : null;
+}
+function codexTargetFromValue(value, target) {
+    const targetModel = stringFromUnknown(target?.model);
+    const targetEffort = stringFromUnknown(target?.effort);
+    if (targetModel && targetEffort) {
+        return { model: targetModel, effort: targetEffort };
+    }
+    const [model, effort] = value.split('/');
+    return {
+        model: stringFromUnknown(model),
+        effort: stringFromUnknown(effort),
+    };
+}
+function codexUnsupportedEffortMessage(model, effort, supportedEfforts) {
+    return `Codex debug models lists '${model}', but effort '${effort}' is not supported. Supported Codex efforts: ${supportedEfforts.join(', ')}.`;
+}
+async function validateCodexCell(value, cwd, dependencies, target) {
+    const { model, effort } = codexTargetFromValue(value, target);
+    if (!model || !effort || value.trim().length === 0) {
+        return { availability: 'unknown-value' };
+    }
+    const result = await dependencies.runCodex(['debug', 'models'], {
+        cwd,
+        env: dependencies.env ?? process.env,
+    });
+    if (!result.ok) {
+        return { availability: 'unvalidated' };
+    }
+    const catalog = parseCodexCatalog(result.stdout);
+    if (!catalog) {
+        return { availability: 'unvalidated' };
+    }
+    const entry = catalog.find((modelEntry) => modelEntry.slug === model);
+    if (!entry) {
+        return {
+            availability: 'unknown-value',
+            message: `Codex debug models does not list '${model}'.`,
+        };
+    }
+    if (!entry.supportedEfforts) {
+        return {
+            availability: 'unvalidated',
+            message: `Codex debug models lists '${model}', but supported reasoning efforts could not be parsed.`,
+        };
     }
+    if (!entry.supportedEfforts.includes(effort)) {
+        return {
+            availability: 'unknown-value',
+            allowedValues: entry.supportedEfforts,
+            message: codexUnsupportedEffortMessage(model, effort, entry.supportedEfforts),
+        };
+    }
+    return { availability: 'valid' };
 }
-async function validateCursorCell(value, cwd, dependencies) {
+export async function validateCursorSubagentModel(value, options) {
+    const dependencies = {
+        ...DEFAULT_DEPENDENCIES,
+        env: options.env ?? DEFAULT_DEPENDENCIES.env,
+        ...options.dependencies,
+    };
     const env = dependencies.env ?? process.env;
-    const runOptions = { cwd, env };
+    const runOptions = { cwd: options.cwd, env };
+    const probeResult = await dependencies.runCursorAgent(cursorSubagentProbeArgs(value, env), runOptions);
+    const probeOutput = `${probeResult.stdout}\n${probeResult.stderr}`;
+    if (probeResult.ok && hasCursorSubagentProbeSentinel(probeResult.stdout)) {
+        return { availability: 'valid' };
+    }
+    const allowedValues = parseCursorAllowedSubagentModels(probeOutput);
+    if (allowedValues.length > 0) {
+        const availability = allowedValues.includes(value)
+            ? 'valid'
+            : 'unknown-value';
+        return {
+            availability,
+            allowedValues,
+            message: availability === 'valid'
+                ? cursorAllowedModelsMessage(allowedValues)
+                : cursorRejectedMessage(allowedValues),
+        };
+    }
     const modelsResult = await dependencies.runCursorAgent([...apiKeyArgs(env), 'models'], runOptions);
     if (modelsResult.ok) {
         const availability = availabilityFromCursorCatalog(value, modelsResult.stdout);
         if (availability !== null) {
-            return availability;
+            return {
+                availability: availability === 'valid' ? 'unvalidated' : 'unknown-value',
+                message: cursorCatalogContextMessage(value, availability),
+            };
         }
     }
     const listResult = await dependencies.runCursorAgent([...apiKeyArgs(env), '--list-models'], runOptions);
     if (listResult.ok) {
         const availability = availabilityFromCursorCatalog(value, listResult.stdout);
         if (availability !== null) {
-            return availability;
+            return {
+                availability: availability === 'valid' ? 'unvalidated' : 'unknown-value',
+                message: cursorCatalogContextMessage(value, availability),
+            };
         }
     }
-    return 'unvalidated';
+    return { availability: 'unvalidated' };
 }
 export async function validateMatrixCell(provider, value, options) {
     const normalizedProvider = provider.trim().toLowerCase();
     const normalizedValue = value.trim();
     if (!normalizedProvider || !normalizedValue) {
-        return 'unknown-value';
+        return options.detailed
+            ? { availability: 'unknown-value' }
+            : 'unknown-value';
     }
     const dependencies = {
         ...DEFAULT_DEPENDENCIES,
@@ -105,15 +333,21 @@ export async function validateMatrixCell(provider, value, options) {
         ...options.dependencies,
     };
     if (normalizedProvider === 'claude') {
-        return VALID_CLAUDE_DISPATCH_CEILINGS.includes(normalizedValue)
+        const availability = VALID_CLAUDE_DISPATCH_CEILINGS.includes(normalizedValue)
             ? 'valid'
             : 'unknown-value';
+        return options.detailed ? { availability } : availability;
     }
     if (normalizedProvider === 'codex') {
-        return validateCodexCell(normalizedValue, options.cwd, dependencies);
+        const result = await validateCodexCell(normalizedValue, options.cwd, dependencies, options.target);
+        return options.detailed ? result : result.availability;
     }
     if (normalizedProvider === 'cursor') {
-        return validateCursorCell(normalizedValue, options.cwd, dependencies);
+        const result = await validateCursorSubagentModel(normalizedValue, {
+            ...options,
+            dependencies,
+        });
+        return options.detailed ? result : result.availability;
     }
-    return 'unvalidated';
+    return options.detailed ? { availability: 'unvalidated' } : 'unvalidated';
 }

package/dist/providers/identity/stamp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stamp.d.ts","sourceRoot":"","sources":["../../../src/providers/identity/stamp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG,KAAK,GAAG,QAAQ,CAAC;AACjE,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,KAAK,GAAG,UAAU,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAyDD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAiBvE;AAqGD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,0BAA+B,GACvC,aAAa,EAAE,CAqBjB;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,0BAA+B,GACvC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAepC"}
+{"version":3,"file":"stamp.d.ts","sourceRoot":"","sources":["../../../src/providers/identity/stamp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG,KAAK,GAAG,QAAQ,CAAC;AACjE,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,KAAK,GAAG,UAAU,CAAC;AAE9D,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,cAAc,CAAC;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,kBAAkB,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAyDD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAiBvE;AA6GD,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,0BAA+B,GACvC,aAAa,EAAE,CAqBjB;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,0BAA+B,GACvC,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAepC"}

package/dist/providers/identity/stamp.js

@@ -90,6 +90,10 @@ function parseModernStamp(line, lineNumber, fields, options) {
         warn(options, lineNumber, 'missing or invalid role');
         return undefined;
     }
+    if (role !== inferRole(action)) {
+        warn(options, lineNumber, `incompatible action/role pair ${action}/${role}`);
+        return undefined;
+    }
     const scope = singleToken(fields.get('scope'), '');
     if (!scope) {
         warn(options, lineNumber, 'missing scope');

package/dist/shared/types.d.ts

@@ -7,4 +7,5 @@ export declare const ScopeSchema: z.ZodEnum<["project", "user", "all"]>;
 export type Scope = z.infer<typeof ScopeSchema>;
 export type ConcreteScope = Exclude<Scope, 'all'>;
 export declare const SCOPE_CONTENT_TYPES: Record<Scope, ContentType[]>;
+export declare const USER_SCOPE_MANAGED_AGENT_FILES: readonly ["oat-phase-implementer.md", "oat-reviewer.md"];
 //# sourceMappingURL=types.d.ts.map

package/dist/shared/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,iBAAiB,uCAAqC,CAAC;AACpE,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,kBAAkB,wCAAsC,CAAC;AACtE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,WAAW,uCAAqC,CAAC;AAC9D,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAQlD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,CAI5D,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shared/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,iBAAiB,uCAAqC,CAAC;AACpE,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,kBAAkB,wCAAsC,CAAC;AACtE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,WAAW,uCAAqC,CAAC;AAC9D,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAChD,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAQlD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,CAI5D,CAAC;AAEF,eAAO,MAAM,8BAA8B,0DAGjC,CAAC"}

package/dist/shared/types.js

@@ -12,3 +12,7 @@ export const SCOPE_CONTENT_TYPES = {
     user: USER_SCOPE_CONTENT_TYPES,
     all: ALL_SCOPE_CONTENT_TYPES,
 };
+export const USER_SCOPE_MANAGED_AGENT_FILES = [
+    'oat-phase-implementer.md',
+    'oat-reviewer.md',
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-agent-toolkit/cli",
-  "version": "0.1.45",
+  "version": "0.1.48",
   "private": false,
   "description": "Open Agent Toolkit CLI",
   "homepage": "https://github.com/voxmedia/open-agent-toolkit/tree/main/packages/cli",
@@ -34,7 +34,7 @@
     "ora": "^9.0.0",
     "yaml": "2.8.2",
     "zod": "^3.25.76",
-    "@open-agent-toolkit/control-plane": "0.1.45"
+    "@open-agent-toolkit/control-plane": "0.1.48"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",