@open-agent-toolkit/cli 0.1.11 → 0.1.13

package/assets/skills/oat-project-implement/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-project-implement
-version: 2.0.19
+version: 2.0.20
 description: Use when plan.md is ready for execution. Dispatches phase-level subagents with bounded fix loops; supports plan-declared parallel phase groups with worktree-isolated execution and ordered fan-in.
 argument-hint: '[--retry-limit <N>] [--dry-run]'
 disable-model-invocation: true
@@ -164,55 +164,101 @@ Forbidden: Selected: Tier 2 — Inline because the user did not separately menti
 
 ### Dispatch Ceiling Preflight
 
-Before any phase work, resolve and print the OAT dispatch ceiling for the
-current provider. This is a preflight gate, not a mid-run question.
+Before any phase work, resolve and print the OAT dispatch ceiling. This is a
+preflight gate, not a mid-run question.
 
-Use the CLI helper as the source of truth for resolution:
+Use the CLI resolver as the source of truth:
 
 ```bash
-oat project dispatch-ceiling resolve --provider <codex|claude> --preflight --json
+oat project dispatch-ceiling resolve --provider <active-provider> --preflight --json
 ```
 
 If `oat` is not in PATH, use:
 
 ```bash
-pnpm run cli -- project dispatch-ceiling resolve --provider <codex|claude> --preflight --json
+pnpm run cli -- project dispatch-ceiling resolve --provider <active-provider> --preflight --json
 ```
 
 Resolution order:
 
-1. Effective config key `workflow.dispatchCeiling.<provider>` via the resolver CLI
+1. Config keys `workflow.dispatchCeiling.providers.<provider>` (local > shared > user)
 2. Project `state.md` frontmatter key `oat_dispatch_ceiling`
-3. Interactive implementation preflight prompt
+3. Interactive implementation preflight prompt (below)
 4. Non-interactive unresolved: block before work starts
 
-Provider values:
-
-- Codex: `low`, `medium`, `high`, `xhigh`
-- Claude: `haiku`, `sonnet`, `opus`
+**JSON response shape** (from `--json`):
+
+```json
+{
+  "status": "resolved",
+  "provider": "codex",
+  "value": "high",
+  "source": "project-state",
+  "preset": "balanced",
+  "unresolved": false,
+  "providerDefaultEffort": "medium",
+  "providers": {
+    "codex": {
+      "value": "high",
+      "mode": "enforced",
+      "mechanism": "pinned-variant",
+      "dispatchArgs": { "variant": "oat-phase-implementer-high" },
+      "verifyOnDispatch": false
+    }
+  }
+}
+```
 
-For Codex, also resolve the provider default effort when possible by reading
-Codex configuration (for example `.codex/config.toml`). If it cannot be found,
-display `unknown`. Do not treat provider default as the OAT ceiling.
-The resolver prints this as `providerDefaultEffort` in JSON and includes it in
-human-readable output.
+Read `providers.<active-provider>` for the concrete dispatch controls. The
+`dispatchArgs` field carries the provider-specific argument to pass through
+(Codex: `variant` name; Claude: `model` string). Never re-derive these from the
+preset label — the resolver is the single compilation/join point.
 
-Print this before phase work:
+Print before phase work:
 
 ```text
-Codex dispatch ceiling: high
-Source: project state
-Codex provider default effort: medium
+Dispatch ceiling: high (codex, enforced — pinned-variant)
+Source: project state  |  Preset: balanced
+Provider default effort: medium
 Note: OAT will use pinned subagent variants up to high. Base/unpinned roles resolve through the provider default.
 ```
 
-If no ceiling resolves and the session is interactive, ask before starting
-implementation and persist the answer in project `state.md` frontmatter:
+If no ceiling resolves and the session is interactive, present the preset
+prompt once before starting work:
+
+```text
+No dispatch ceiling is configured for this project.
+
+Set the dispatch ceiling — the maximum subagent tier OAT may use.
+
+  1. Balanced (recommended) — Codex: high · Claude: sonnet
+  2. Maximum                — Codex: xhigh · Claude: opus  (reviews always run at this tier)
+  3. Cost-conscious         — Codex: medium · Claude: sonnet
+  4. Advanced — set per provider
+  5. No ceiling
+
+OAT applies this where the provider exposes a reliable mechanism (Codex: pinned
+variants; Claude: Task model parameter). Other providers may treat it as advisory.
+```
+
+**Preset selection** persists `preset` + compiled per-provider values. On
+selection, print the exact compiled result (e.g., "Ceiling set: balanced →
+Codex: high · Claude: sonnet") before proceeding.
+
+**Advanced (option 4)** prompts for each provider's value individually, then
+persists `providers` + `source` only — no `preset` key.
+
+**No ceiling (option 5)** leaves `oat_dispatch_ceiling` unset; implementer
+subagents run at provider defaults.
+
+Persist in project `state.md` frontmatter using the normalized shape:
 
 ```yaml
 oat_dispatch_ceiling:
-  provider: codex
-  value: high
+  preset: balanced # omit when Advanced was chosen
+  providers:
+    codex: high
+    claude: sonnet
   source: project-state
 ```
 
@@ -221,12 +267,12 @@ exists, rerun the resolver with non-interactive behavior and stop before work
 starts if it blocks:
 
 ```bash
-oat project dispatch-ceiling resolve --provider <codex|claude> --preflight --non-interactive
+oat project dispatch-ceiling resolve --provider <active-provider> --preflight --non-interactive
 ```
 
 ```text
 BLOCKED: Codex dispatch ceiling is unresolved in non-interactive mode.
-Set workflow.dispatchCeiling.codex in .oat/config.json or oat_dispatch_ceiling in project state.
+Set workflow.dispatchCeiling.providers.codex in .oat/config.json or oat_dispatch_ceiling in project state.
 ```
 
 Dry-run mode must report the unresolved ceiling and planned behavior without
@@ -263,16 +309,18 @@ Codex rules:
    - `medium`: normal multi-file implementation and moderate integration risk
    - `high`: broad architecture, security/auth/redaction boundaries, subtle state behavior, or repeated substantive review failures
    - `xhigh`: highest-risk work that requires the configured ceiling to allow xhigh
-3. Selected effort is `min(preferred, resolved_ceiling)`.
-4. Dispatch implementer/fix work through `oat-phase-implementer-<selected>`.
-5. Dispatch review work through `oat-reviewer-<resolved_ceiling>` for deterministic quality gate behavior.
+3. Selected effort is `min(preferred, resolved_ceiling)` for implementer/fix work.
+4. For implementer/fix dispatch: call `oat project dispatch-ceiling resolve --provider codex --role implementer`; read `providers.codex.dispatchArgs.variant` for the role name (e.g., `oat-phase-implementer-high`). Pass that variant name directly — do not re-derive it from the ceiling value.
+5. For review dispatch: call `oat project dispatch-ceiling resolve --provider codex --role reviewer`; read `providers.codex.dispatchArgs.variant` for the reviewer role name (e.g., `oat-reviewer-high`). Reviewer always targets the ceiling for deterministic quality gate behavior.
 6. Use base/unpinned Codex roles only as a fallback or explicit provider-default choice. Log `Selected effort: provider-default`, display provider default effort when known, and do not describe this as parent-ceiling inheritance.
 7. Do not use top-level per-call `reasoning_effort` as the standard OAT selected-effort path; dogfooding showed that path can be inconsistent.
 
 Claude rules:
 
 - Claude ceiling is model-based: `haiku < sonnet < opus`.
-- Select the lowest sufficient model capped by `workflow.dispatchCeiling.claude` or project `oat_dispatch_ceiling`.
+- Implementer dispatch: select the lowest sufficient model capped by the resolved Claude ceiling (`min(preferred, ceiling)`).
+- Review dispatch: target the resolved Claude ceiling directly.
+- Call `oat project dispatch-ceiling resolve --provider claude --role implementer --orchestrator-tier <current-orchestrator-tier>` (or `--role reviewer`); read `providers.claude.dispatchArgs.model` for the model string to pass. Pass `--orchestrator-tier` so the resolver can flag above-orchestrator upgrade requests and set `verifyOnDispatch` correctly.
 - Pass `model: "<value>"` when `model_axis=selected:<value>` on the Task tool call.
 - Keep `effort_axis=not-applicable`; Claude Code has no separate per-dispatch effort axis.
 
@@ -360,6 +408,52 @@ provider_default_effort: { value | unknown | not-applicable }
 dispatch_rationale: { short rationale }
 ```
 
+### Dispatch Ceiling Enforcement Log
+
+After each phase dispatch (implementation, fix, or review), append one enforcement
+log line. The log reflects the `mode` and `mechanism` returned by
+`oat project dispatch-ceiling resolve` — do not compute these yourself.
+
+**Three-state log format:**
+
+```text
+Dispatch ceiling: {value} ({provider}, {mode} — {mechanism detail})
+```
+
+**Log examples (matching resolver output):**
+
+```text
+Dispatch ceiling: high (codex, enforced — variant oat-phase-implementer-high)
+Dispatch ceiling: high (codex, enforced — variant oat-reviewer-high)
+Dispatch ceiling: sonnet (claude, enforced — Task model arg)
+Dispatch ceiling: opus (claude, enforced — Task model arg)
+Dispatch ceiling: high (cursor, unsupported — no adapter; informational)
+Dispatch ceiling: unresolved (codex, advisory — ceiling set but no value resolved)
+```
+
+**Verify-on-upgrade (`verifyOnDispatch: true`):**
+
+When the resolver returns `providers.<provider>.verifyOnDispatch: true`, the
+requested tier is above the orchestrator tier (an upgrade request). Before
+logging `enforced`, confirm the actual model/tier used by the dispatched agent.
+If the provider honored the request, log `enforced`. If it did not:
+
+```text
+Dispatch ceiling: opus (claude, advisory — provider did not honor upgrade; ran sonnet)
+```
+
+**`enforced`** — the adapter compiled concrete dispatch args and the provider
+accepted them. Log value + provider + mechanism detail (variant name or "Task
+model arg").
+
+**`advisory`** — the adapter supports the ceiling but no concrete value resolved,
+or the provider is known but could not be verified. Log with note "ceiling set
+but no value resolved" or "provider did not honor upgrade; ran \<tier\>".
+
+**`unsupported`** — the provider has no registered adapter. Log with note "no
+adapter; informational". Never block on unsupported — dispatch follows provider
+defaults.
+
 ### Dry-Run Mode
 
 When the skill is invoked with `--dry-run`:

package/assets/skills/oat-project-plan/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-project-plan
-version: 1.3.3
+version: 1.3.4
 description: Use when design.md is complete and executable implementation tasks are needed. Breaks design into bite-sized TDD tasks in canonical plan.md format.
 disable-model-invocation: true
 user-invocable: true
@@ -314,50 +314,50 @@ If `## Planning Checklist` is missing (older plans), add it before finalizing wi
 
 ### Step 11.5: Resolve Dispatch Ceiling Before Implementation Readiness
 
-Before marking the plan ready for implementation, resolve the dispatch ceiling
-for the current provider.
+Before marking the plan ready for implementation, resolve the dispatch ceiling.
 
 Resolution order:
 
-1. Repo/user/local config key `workflow.dispatchCeiling.<provider>` via `oat config get`
+1. Config keys `workflow.dispatchCeiling.providers.<provider>` via the resolver CLI
 2. Project `state.md` frontmatter key `oat_dispatch_ceiling`
-3. Interactive planning prompt
+3. Interactive planning prompt (below)
 4. Leave unresolved for implementation preflight when non-interactive
 
-Provider values:
-
-- Codex: `low`, `medium`, `high`, `xhigh`
-- Claude: `haiku`, `sonnet`, `opus`
-
-If no ceiling resolves for the current provider and the session is interactive,
-ask once before final plan review:
+If no ceiling resolves and the session is interactive, present the preset
+prompt once before final plan review:
 
 ```text
-No Codex dispatch ceiling is configured for this project.
+Set the dispatch ceiling — the maximum subagent tier OAT may use.
 
-Choose the maximum Codex reasoning effort OAT may dispatch during implementation:
-low | medium | high | xhigh
+  1. Balanced (recommended) — Codex: high · Claude: sonnet
+  2. Maximum                — Codex: xhigh · Claude: opus  (reviews always run at this tier)
+  3. Cost-conscious         — Codex: medium · Claude: sonnet
+  4. Advanced — set per provider
+  5. No ceiling
 
-This controls implementer/reviewer subagent variants. It does not change your Codex config.
+OAT applies this where the provider exposes a reliable mechanism (Codex: pinned
+variants; Claude: Task model parameter). Other providers may treat it as advisory.
 ```
 
-Adapt the wording for Claude:
+**Preset selection** persists `preset` + compiled per-provider values. On
+selection, print the exact compiled result (e.g., "Ceiling set: balanced →
+Codex: high · Claude: sonnet") before proceeding.
 
-```text
-No Claude dispatch ceiling is configured for this project.
+**Advanced (option 4)** prompts for each provider's value individually, then
+persists `providers` + `source` only — no `preset` key.
 
-Choose the maximum Claude model tier OAT may dispatch during implementation:
-haiku | sonnet | opus
-
-This controls provider-native subagent model selection. It does not change your Claude config.
-```
+**No ceiling (option 5)** leaves `oat_dispatch_ceiling` unset; implementer
+subagents run at provider defaults.
 
-Persist the answer in `"$PROJECT_PATH/state.md"` frontmatter:
+Persist the answer in `"$PROJECT_PATH/state.md"` frontmatter using the
+normalized shape:
 
 ```yaml
 oat_dispatch_ceiling:
-  provider: codex
-  value: high
+  preset: balanced          # omit when Advanced was chosen
+  providers:
+    codex: high
+    claude: sonnet
   source: project-state
 ```
 
@@ -365,7 +365,7 @@ Do not prompt when `OAT_NON_INTERACTIVE=1` or when no user-response channel
 exists. In that case, leave the value unresolved. `oat-project-implement`
 must block before work starts if it still cannot resolve a ceiling.
 
-Do not treat Codex provider default effort as the OAT dispatch ceiling. Provider
+Do not treat provider default effort as the OAT dispatch ceiling. Provider
 default is informational for base/unpinned roles only.
 
 ### Step 12: Review Plan with User

package/assets/skills/oat-project-quick-start/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-project-quick-start
-version: 2.1.3
+version: 2.1.4
 description: Use when a task is small enough for quick mode or rapid iteration is preferred. Scaffolds a lightweight OAT project from discovery directly to a runnable plan, with optional brainstorming and lightweight design.
 argument-hint: '<project-name> ["project description"]'
 disable-model-invocation: true
@@ -459,49 +459,50 @@ Required parallelism pass before finalizing the plan:
 ### Step 3.5: Resolve Dispatch Ceiling Before Implementation Readiness
 
 Before moving the quick project to ready-for-implementation, resolve the
-dispatch ceiling for the current provider.
+dispatch ceiling.
 
 Resolution order:
 
-1. Repo/user/local config key `workflow.dispatchCeiling.<provider>` via `oat config get`
+1. Config keys `workflow.dispatchCeiling.providers.<provider>` via the resolver CLI
 2. Project `state.md` frontmatter key `oat_dispatch_ceiling`
-3. Interactive quick-planning prompt
+3. Interactive quick-planning prompt (below)
 4. Leave unresolved for implementation preflight when non-interactive
 
-Provider values:
-
-- Codex: `low`, `medium`, `high`, `xhigh`
-- Claude: `haiku`, `sonnet`, `opus`
-
-If no ceiling resolves for the current provider and the session is interactive,
-ask once before finalizing `plan.md`:
+If no ceiling resolves and the session is interactive, present the preset
+prompt once before finalizing `plan.md`:
 
 ```text
-No Codex dispatch ceiling is configured for this project.
+Set the dispatch ceiling — the maximum subagent tier OAT may use.
 
-Choose the maximum Codex reasoning effort OAT may dispatch during implementation:
-low | medium | high | xhigh
+  1. Balanced (recommended) — Codex: high · Claude: sonnet
+  2. Maximum                — Codex: xhigh · Claude: opus  (reviews always run at this tier)
+  3. Cost-conscious         — Codex: medium · Claude: sonnet
+  4. Advanced — set per provider
+  5. No ceiling
 
-This controls implementer/reviewer subagent variants. It does not change your Codex config.
+OAT applies this where the provider exposes a reliable mechanism (Codex: pinned
+variants; Claude: Task model parameter). Other providers may treat it as advisory.
 ```
 
-Adapt the wording for Claude:
+**Preset selection** persists `preset` + compiled per-provider values. On
+selection, print the exact compiled result (e.g., "Ceiling set: balanced →
+Codex: high · Claude: sonnet") before proceeding.
 
-```text
-No Claude dispatch ceiling is configured for this project.
+**Advanced (option 4)** prompts for each provider's value individually, then
+persists `providers` + `source` only — no `preset` key.
 
-Choose the maximum Claude model tier OAT may dispatch during implementation:
-haiku | sonnet | opus
-
-This controls provider-native subagent model selection. It does not change your Claude config.
-```
+**No ceiling (option 5)** leaves `oat_dispatch_ceiling` unset; implementer
+subagents run at provider defaults.
 
-Persist the answer in `"$PROJECT_PATH/state.md"` frontmatter:
+Persist the answer in `"$PROJECT_PATH/state.md"` frontmatter using the
+normalized shape:
 
 ```yaml
 oat_dispatch_ceiling:
-  provider: codex
-  value: high
+  preset: balanced # omit when Advanced was chosen
+  providers:
+    codex: high
+    claude: sonnet
   source: project-state
 ```
 
@@ -509,7 +510,7 @@ Do not prompt when `OAT_NON_INTERACTIVE=1` or when no user-response channel
 exists. In that case, leave the value unresolved. `oat-project-implement`
 must block before work starts if it still cannot resolve a ceiling.
 
-Do not treat Codex provider default effort as the OAT dispatch ceiling. Provider
+Do not treat provider default effort as the OAT dispatch ceiling. Provider
 default is informational for base/unpinned roles only.
 
 ### Step 4: Sync Project State

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/config/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGhF,OAAO,EACL,KAAK,SAAS,EACd,KAAK,cAAc,EAGnB,KAAK,UAAU,EAOhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2DpC,UAAU,yBAAyB;IACjC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAC/C,cAAc,CAAC;IACpB,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,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,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,MAAM,CAAC,UAAU,CAAC;CAC/B;AA2pCD,wBAAgB,mBAAmB,CACjC,SAAS,GAAE,OAAO,CAAC,yBAAyB,CAAM,GACjD,OAAO,CA0GT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/config/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAIhF,OAAO,EACL,KAAK,SAAS,EACd,KAAK,cAAc,EAGnB,KAAK,UAAU,EAQhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4DpC,UAAU,yBAAyB;IACjC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,CAAC,KAC/C,cAAc,CAAC;IACpB,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,mBAAmB,EAAE,CACnB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,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,MAAM,CAAC,UAAU,CAAC;CAC/B;AAysCD,wBAAgB,mBAAmB,CACjC,SAAS,GAAE,OAAO,CAAC,yBAAyB,CAAM,GACjD,OAAO,CA0GT"}

package/dist/commands/config/index.js

@@ -2,6 +2,7 @@ import { join } from 'node:path';
 import { buildCommandContext } from '../../app/command-context.js';
 import { resolveProjectsRoot } from '../shared/oat-paths.js';
 import { readGlobalOptions } from '../shared/shared.utils.js';
+import { compileDispatchCeilingPreset } from '../../config/dispatch-ceiling-preset.js';
 import { readOatConfig, readOatLocalConfig, readUserConfig, writeOatConfig, writeOatLocalConfig, writeUserConfig, } from '../../config/oat-config.js';
 import { resolveEffectiveConfig, } from '../../config/resolve.js';
 import { resolveProjectRoot } from '../../fs/paths.js';
@@ -40,8 +41,9 @@ const KEY_ORDER = [
     'workflow.autoReviewAtHillCheckpoints',
     'workflow.autoNarrowReReviewScope',
     'workflow.designMode',
-    'workflow.dispatchCeiling.codex',
-    'workflow.dispatchCeiling.claude',
+    'workflow.dispatchCeiling.preset',
+    'workflow.dispatchCeiling.providers.codex',
+    'workflow.dispatchCeiling.providers.claude',
     'worktrees.root',
 ];
 const CONFIG_CATALOG = [
@@ -420,26 +422,37 @@ const CONFIG_CATALOG = [
         description: 'Persisted preference for oat-project-design: "collaborative" runs every section section-by-section, "selective" drafts routine sections silently and live-reviews high-risk sections, and "draft" drafts the full design up front for holistic review. Quick-start lightweight design supports collaborative/draft only and treats selective as collaborative when encountered. When unset, the skill prompts. Runtime signals (OAT_NON_INTERACTIVE=1, no TTY) always outrank this preference. Resolution: arg > env > non-interactive context > local > shared > user > default.',
     },
     {
-        key: 'workflow.dispatchCeiling.codex',
+        key: 'workflow.dispatchCeiling.preset',
+        group: 'Workflow Preferences (3-layer: local > shared > user)',
+        file: '.oat/config.local.json | .oat/config.json | ~/.oat/config.json',
+        scope: 'workflow',
+        type: 'balanced | maximum | cost-conscious',
+        defaultValue: 'unset',
+        mutability: 'read/write',
+        owningCommand: 'oat config set workflow.dispatchCeiling.preset <value>',
+        description: 'Provider-neutral ceiling preset that compiles to concrete per-provider values at write time. balanced → Codex: high, Claude: sonnet; maximum → Codex: xhigh, Claude: opus; cost-conscious → Codex: medium, Claude: sonnet. Preset provenance only; runtime dispatch reads concrete providers values. Resolution: local > shared > user > default.',
+    },
+    {
+        key: 'workflow.dispatchCeiling.providers.codex',
         group: 'Workflow Preferences (3-layer: local > shared > user)',
         file: '.oat/config.local.json | .oat/config.json | ~/.oat/config.json',
         scope: 'workflow',
         type: 'low | medium | high | xhigh',
         defaultValue: 'unset',
         mutability: 'read/write',
-        owningCommand: 'oat config set workflow.dispatchCeiling.codex <value>',
-        description: 'Maximum Codex reasoning effort OAT may select for deterministic implementation and review subagent variants. Provider defaults remain informational for base/unpinned roles and are not treated as this ceiling. Resolution: local > shared > user > default.',
+        owningCommand: 'oat config set workflow.dispatchCeiling.providers.codex <value>',
+        description: 'Explicit Codex ceiling value (advanced/manual). Wins over any preset. Maximum Codex reasoning effort OAT may select for deterministic implementation and review subagent variants. Resolution: local > shared > user > default.',
     },
     {
-        key: 'workflow.dispatchCeiling.claude',
+        key: 'workflow.dispatchCeiling.providers.claude',
         group: 'Workflow Preferences (3-layer: local > shared > user)',
         file: '.oat/config.local.json | .oat/config.json | ~/.oat/config.json',
         scope: 'workflow',
         type: 'haiku | sonnet | opus',
         defaultValue: 'unset',
         mutability: 'read/write',
-        owningCommand: 'oat config set workflow.dispatchCeiling.claude <value>',
-        description: 'Maximum Claude model tier OAT may select for provider-native subagent dispatch. Claude has no separate per-dispatch effort axis, so the effort axis remains not-applicable. Resolution: local > shared > user > default.',
+        owningCommand: 'oat config set workflow.dispatchCeiling.providers.claude <value>',
+        description: 'Explicit Claude ceiling value (advanced/manual). Wins over any preset. Maximum Claude model tier OAT may select for provider-native subagent dispatch. Resolution: local > shared > user > default.',
     },
     {
         key: 'sync.defaultStrategy',
@@ -503,8 +516,14 @@ const WORKFLOW_ENUM_VALUES = {
     'workflow.postImplementSequence': ['wait', 'summary', 'pr', 'docs-pr'],
     'workflow.reviewExecutionModel': ['subagent', 'inline', 'fresh-session'],
     'workflow.designMode': ['collaborative', 'selective', 'draft'],
-    'workflow.dispatchCeiling.codex': ['low', 'medium', 'high', 'xhigh'],
-    'workflow.dispatchCeiling.claude': ['haiku', 'sonnet', 'opus'],
+    'workflow.dispatchCeiling.preset': ['balanced', 'maximum', 'cost-conscious'],
+    'workflow.dispatchCeiling.providers.codex': [
+        'low',
+        'medium',
+        'high',
+        'xhigh',
+    ],
+    'workflow.dispatchCeiling.providers.claude': ['haiku', 'sonnet', 'opus'],
 };
 const WORKFLOW_BOOLEAN_KEYS = new Set([
     'workflow.archiveOnComplete',
@@ -588,13 +607,34 @@ function parseWorkflowValue(key, rawValue) {
 }
 function applyWorkflowValue(workflow, key, value) {
     const subKey = key.slice('workflow.'.length);
-    if (subKey.startsWith('dispatchCeiling.')) {
-        const providerKey = subKey.slice('dispatchCeiling.'.length);
+    if (subKey === 'dispatchCeiling.preset') {
+        // Presets compile to concrete per-provider values at write time so the
+        // resolver (which reads only providers.*) gets a usable ceiling. The preset
+        // label is persisted as provenance alongside the compiled providers.
+        const compiled = compileDispatchCeilingPreset(value);
+        return {
+            ...workflow,
+            dispatchCeiling: {
+                ...workflow.dispatchCeiling,
+                preset: compiled.preset,
+                providers: {
+                    ...workflow.dispatchCeiling?.providers,
+                    codex: compiled.providers.codex,
+                    claude: compiled.providers.claude,
+                },
+            },
+        };
+    }
+    if (subKey.startsWith('dispatchCeiling.providers.')) {
+        const providerKey = subKey.slice('dispatchCeiling.providers.'.length);
         return {
             ...workflow,
             dispatchCeiling: {
                 ...workflow.dispatchCeiling,
-                [providerKey]: value,
+                providers: {
+                    ...workflow.dispatchCeiling?.providers,
+                    [providerKey]: value,
+                },
             },
         };
     }

package/dist/commands/project/dispatch-ceiling/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/dispatch-ceiling/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAEL,KAAK,uBAAuB,EAG7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAcpC,UAAU,2BAA2B;IACnC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7B,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC7E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAiXD,wBAAgB,mCAAmC,CACjD,SAAS,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,OAAO,CAsCT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/dispatch-ceiling/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAEL,KAAK,uBAAuB,EAG7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4BpC,UAAU,2BAA2B;IACnC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,KACnB,OAAO,CAAC,cAAc,CAAC,CAAC;IAC7B,oBAAoB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC7E,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;CAC/B;AAggBD,wBAAgB,mCAAmC,CACjD,SAAS,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,OAAO,CAiDT"}