axstack 0.20.30 → 0.20.31

package/skills/axstack/references/autopilot.md

@@ -0,0 +1,108 @@
+# Autopilot
+
+This reference applies to authorized engineering-delivery runs. The original
+driver remains the sole run-record writer and phase router in the same chat;
+phase completion is not a native ownership handoff. Explicit planning-only,
+read-only, stop-after-phase, observation-only, and peer requests retain their
+selected boundary. A status question such as "what's left" is observation,
+not a mode change.
+
+## Advance and hold
+
+Advance only after the finishing phase returns its completed identity (a
+small-change intent, approved spec, matching ticket map, merge-ready or merged
+state) and the run record has no open hold. A hold from any phase stops the run:
+record its reason, owner, and resume condition, then take no dependent action.
+That covers tracker access, adviser or arena-seat availability, diligence
+FINDINGS when the phase records a hold, CI-wait timeout, readiness UNKNOWN,
+dismissed approval, wake or cleanup uncertainty, single-provider routing, an
+existing tag or version, and failed publish. Diligence FINDINGS during implement
+follow its §6 repair route; at spec, tickets, or release preparation the driver
+resolves them before advancing, and only a recorded hold pauses autopilot.
+
+Record `Autopilot: on | paused (<hold>; resume: <condition>) | off (cancelled
+<ts>)` and the next step in the private run record. A user answer to the hold
+resumes after reconciliation; silence does not.
+Awaiting human spec approval records `Autopilot: paused (spec approval; resume:
+human approval)` as a decision hold eligible under the Notification policy.
+
+## Phase sequence
+
+- Small: Align read-back, small-change intent, implement, watch in maintain
+  mode, human merge. An opted-in Align refinement is part of read-back.
+- Substantial: Align, spec draft with advisers and diligence, human spec
+  approval at gate 1, tickets with diligence, implement, watch in maintain mode,
+  merge-ready, human merge. An opted-in Align refinement is part of gate 1.
+
+Do not seek another phase-start instruction after a completed identity.
+Spec approval is always the human's decision. Every PR merge is the human's,
+including a release PR and each PR in a stack, bottom-up.
+
+## Implement into maintain watch
+
+When implement publishes the run's first PR, arm exactly one `axstack-watch`
+chat-run in authorized maintain mode. Use the 10-minute harness wake, with the
+existing Orca fallback when unavailable. Later run PRs join after verified
+publication readback; an explicitly adopted PR joins only with its maintenance
+snapshot. The original driver alone routes work; one author writes each
+candidate. Until a PR is merge-ready, wakes feed implement §6 step 4. After
+merge-ready, watch §5 maintenance repairs feedback, rebases when the base moves,
+keeps CI green, and checks approvals without re-requesting human review.
+
+Maintain is the default mode for run-created PRs. End the chat-run watch when
+every watched PR is merged or closed and the run's release step is settled or
+not applicable, or when the user cancels. Expiry is a recorded stop with
+resumable state, never a silent renewal. A required PR closed without merging
+is incomplete scope; it does not make the run release-eligible. On wake expiry
+record `Autopilot: paused (wake expired; resume: user reauthorizes a wake)` and
+notify under the recorded Notification policy when user action is needed.
+
+## Release and install, when applicable
+
+Detect applicability once at Align or spec time. Record `Release: <AGENTS.md
+file:line + tag-triggered workflow path + named install hosts> | not applicable
+(<reason>)`. The predicate is an AGENTS.md release rule naming an existing
+tag-triggered workflow. A partial match is not applicable and its reason is
+noted. Install hosts come only from explicit targets; an absent host list is a
+decision hold, not permission to infer hosts. A missing install host list at
+Align or spec time is a decision hold before release authority is presented.
+
+Show the `Release:` line in the spec for human approval at gate 1, or the small
+work Align read-back. Copy that decision to `Authority:` in the run record.
+This authority is per run and never carries over to another run or repository.
+The small-work Align read-back names the existing Release and host-mutation
+authority and explicit hosts; silence cannot fill a missing authority or target.
+
+After all required feature PRs merge, open one release PR. Default to a patch
+version, or minor if a `feat` commit landed since the last tag. This normal run
+PR gets authored review and diligence of its body against merged PRs, reaches
+merge-ready, then waits for human merge. Once the forge confirms that merge,
+tag and wait for the staged publish. Human npm stage approval is a decision
+hold: agents never run `npm stage approve`. A wake verifies the registry reports
+the expected package and version. Install on the named hosts, verify version
+and roles, then run Close-out last with release and install receipts and the
+installed version.
+
+An existing version or tag, failed publish, pending approval, uncertain
+registry result, missing host access, or failed install verification is a
+resumable hold, never success. Tagging, publishing, installation, and host
+mutation require the recorded per-run authority and their existing checks.
+
+## Resume, cancel, and notify
+
+At every entry (user message, wake, compaction, or new chat), reconcile the
+owner, authoritative Dispatch, approved revision, PR membership, uncertain
+tags, wakes, publications, and completed receipts under lifecycle and
+run-record before advancing. Only the original driver advances. Wakes do not
+reset attempt budgets and do not grant approvals. Cancel sets `Autopilot: off`,
+stops new actions, and ends the watch under watch §6 with guarded settlement.
+Cancellation does not cancel a running author Dispatch by inference; let it
+report, then settle that exact Dispatch under lifecycle guards without new
+publication.
+
+Use the run's recorded Notification policy through `axstack-relay`.
+Decision holds, including spec and npm approval, are always eligible. Across
+implementation and release, merge-ready and merged notifications together are
+capped at two per run; deduplicate by purpose and revision. Healthy ticks stay
+quiet. A failed or uncertain delivery preserves the underlying hold. A relay
+message is only a notification, never authority to approve, merge, or publish.

package/skills/axstack/references/contracts.md

@@ -40,7 +40,11 @@ Validate the configured provider and model at actual launch. If it is
 unavailable or exhausted, pause affected work, record the gap, and ask the
 user. Never infer a route from quota state or subscription entitlement. Every
 substitution requires the user's decision: configured alternatives and native
-fallback prose are not defaults.
+fallback prose are not defaults. The only within-class exception is explicit
+model rejection before the first turn: Codex may retry with `--retry-of` using
+the next eligible version in the same class, provider, and effort, recording
+the failed ID, error, and fallback ID. Claude rejection holds. Timeout, quota,
+and auth failures hold.
 
 ## Driver and adviser split
 

package/skills/axstack/references/orca-runtime.md

@@ -38,23 +38,42 @@ Read `roles.json` from the installed shared root `skills/axstack/`. The installe
 shape is `{ "version": 1, "preset": "<name>", "roles": [...] }`. Bundled
 profiles are setup inputs shaped as
 `{ "version": 1, "roles": [...] }`. A new run records the selected preset and
-all 32 role rows once. An active run keeps the exact snapshot until the user
-explicitly changes it.
-
-Select the requested role by stable ID. A missing or null model holds only that role;
-never launch a provider default. Launch-by-agent-id routes for which Orca exposes no
+all 32 role rows once. For each role record class, resolved exact ID, source,
+and time. An active run keeps the exact snapshot; resume reuses it without
+re-resolution until the user explicitly changes it.
+
+Select the requested role by stable ID. A missing class and missing or null
+model holds only that role; never launch a provider default. Resolve Codex
+classes with `scripts/resolve-models.js`, passing the catalog path explicitly;
+missing or malformed catalogs hold. The first launch of each Claude class uses
+its alias. Read the exact ID from the first assistant turn's `message.model` in
+that worker's own session transcript at
+`~/.claude/projects/<worktree-path-slug>/*.jsonl`; the worktree path slug
+replaces each non-alphanumeric character with `-`. Identify the file by the
+worker's session ID, or use the newest file created after launch. Later launches
+of that class use the recorded exact ID. Before read-back record `alias,
+unresolved`; record an unknown read-back as unknown and hold
+provenance-dependent work. A worker self-report is a labeled last
+resort. Launch-by-agent-id routes for which Orca exposes no
 `--model` override (today: `grok`, `antigravity`) record `model: null` with an explicit note and are
 launchable; the run record snapshots the model the TUI reports. Validate provider, model, and effort
 against the guide and actual launch capability. Stored `modeId` and other
 permission fields are conservative intent, not proof of effective permission
 parity or a security boundary. Requested settings, input acceptance, effective
 settings, and completed work are separate evidence. An unsupported or
-unavailable value holds affected work for the user's decision without fallback.
+unavailable value holds affected work for the user's decision except the narrow
+retry below.
 The single-provider preset's null adviser and round-2 seat are intentional installation data, not
 readiness failure; because Align and Spec require both adviser receipts, either
 null adviser still holds those phases. The current chat is the driver and has
 no role row in any preset.
 
+Only explicit model rejection before the first turn permits a Codex
+`--retry-of` with the next eligible ID in the same class, provider, and effort.
+Fence the rejected Dispatch and record tried ID, error, and fallback ID in the
+snapshot and reply. Timeout, quota, auth, and other failures hold; Claude
+rejection holds. Apply this to every role, including advisers and judges.
+
 ## Materialize checkouts as worktrees of the registered repo
 
 Every reviewer, release, or worker checkout is `ORCA worktree create --repo

package/skills/axstack/references/role-roster.md

@@ -5,12 +5,12 @@
 - `axstack-reviewer-primary` and `axstack-reviewer-secondary` are the ordered
   peer pair. Peer review uses both; authored review uses this table:
 
-  | Preset | Author | Reviewer (model/effort) |
+  | Preset | Author class | Reviewer (class/effort) |
   | --- | --- | --- |
-  | `mixed` | Codex / Sol (`codex/gpt-6-sol`) | `axstack-reviewer-secondary` (`claude/claude-opus-5-5` medium) |
-  | `mixed` | Claude / Opus (`claude/claude-opus-5-5`) | `axstack-reviewer-primary` (`codex/gpt-6-sol` high) |
-  | `codex-only` | Codex / Sol (`codex/gpt-6-sol`) | `axstack-reviewer-secondary` (`codex/gpt-6-luna` xhigh) |
-  | `claude-only` | Claude / Opus (`claude/claude-opus-5-5`) | `axstack-reviewer-secondary` (`claude/claude-sonnet-5-5` high) |
+  | `mixed` | `codex/sol` | `axstack-reviewer-secondary` (`claude/opus` medium) |
+  | `mixed` | `claude/opus` | `axstack-reviewer-primary` (`codex/sol` high) |
+  | `codex-only` | `codex/sol` | `axstack-reviewer-secondary` (`codex/luna` xhigh) |
+  | `claude-only` | `claude/opus` | `axstack-reviewer-secondary` (`claude/sonnet` high) |
 - `axstack-advisor-astra`/`axstack-advisor-opus` advise and author candidates;
   `axstack-arena-candidate-grok`/
   `axstack-arena-candidate-antigravity` add families.
@@ -24,11 +24,11 @@
 - `axstack-auditor`/`axstack-research-requirements`/
   `axstack-research-code`/`axstack-research-web`/
   `axstack-explore-execution`/`axstack-monitor`:
-  `claude-sonnet-5-5` high in mixed/claude-only.
+  `claude/sonnet` high in mixed/claude-only.
   `axstack-monitor`: standalone watch never sends; chat-run watch: bounded
   internal reports to its Run and original driver.
 - Sol pairs `axstack-auditor-sol`/`axstack-research-code-sol`/
-  `axstack-explore-execution-sol`: `codex/gpt-6-sol` high in
+  `axstack-explore-execution-sol`: `codex/sol` high in
   mixed/codex-only; intentionally absent in claude-only. Dispatch each
   independently from its Sonnet seat on the same bounded brief without
   cross-reading. The driver reconciles findings per claim, never averages.

package/skills/axstack/references/routing.md

@@ -11,22 +11,33 @@ skills root, or an explicit user selection in the run record. Missing or contrad
 a setup gap: hold. Never infer from live profiles or `list_profiles`, harness,
 tools, credentials, quota, subscription, or default to `mixed`.
 
-At start, snapshot all 32 role IDs with provider/model/mode/effort; absent
+At start, snapshot all 32 role IDs with provider/modelClass/model/mode/effort; absent
 or unconfigured roles are recorded explicitly; never default.
 Such a role holds only its work. Later installed or changed roles need an
 explicit user decision to enter the snapshot. Live profiles
 are authoritative at snapshot time and for availability; bundled presets are setup
 inputs, not runtime proof.
+For each role record class, resolved exact ID, source (catalog, transcript, or
+pin), and time. Codex classes resolve through
+`skills/axstack/scripts/resolve-models.js` with an explicit catalog
+path; missing or malformed catalog holds. Claude classes start as `alias,
+unresolved` until transcript read-back. Resume must reuse the snapshot and
+never re-resolve it.
 
 Preset changes apply to new runs only; an active run keeps its snapshot.
 Changing it or replacing a session needs an explicit user decision and
 revalidation. Unavailable models, efforts, roles, or overrides hold only affected
 work; no automatic fallback, quota routing, subscription inference, or silent
-provider/model/effort substitution.
+provider/model/effort substitution. Only
+explicit model rejection before the first turn permits Codex `--retry-of` with
+the next eligible ID in the same class, provider, and effort. Fence the failed
+Dispatch and record tried ID, error, and fallback ID in the snapshot and reply.
+Timeout, quota, auth, and other failures hold; Claude rejection holds.
 
 Load the [Role roster](role-roster.md) for configured roles and authored-review pairings.
 
-Provenance is matched on provider/model ID; effort never maps. Missing table-row
+Provenance is matched on provider/model class derived from the recorded exact ID;
+effort never maps. Missing table-row
 provenance is unsupported and `INCOMPLETE`; report it and ask the user. Never
 infer from slot, driver, owner, or provider. Author and owner never review.
 
@@ -75,7 +86,7 @@ reason in the run record, or in the brief for tiny direct work.
   Require an approved spec plus a ticket map tied to that exact spec
   revision, with acceptance checks and dependencies in the explicitly selected
   Markdown, GitHub Issues, or Linear store. Prepare via `axstack-align` -> `axstack-spec`
-  (one approval) -> `axstack-tickets` -> handoff, then stop.
+  (one approval) -> `axstack-tickets` -> handoff, then continue under autopilot when eligible.
 - **Small:** clear, bounded one-PR work. The driver captures the named
   **small-change intent** from the current request or user-chosen existing
   issue plus explicit acceptance checks and exclusions, snapshots it once, and
@@ -96,7 +107,7 @@ not alone a formal spec trigger. Hold affected unsafe work while reassessing.
 ## Lifecycle routes (mode-specific scope identity required)
 
 - Preparation: substantial work follows the align -> spec -> tickets ->
-  handoff path above, then stops; small work uses the driver-captured
+  handoff path above, then continues under autopilot when eligible; small work uses the driver-captured
   small-change intent.
 - Execution: with its identity present, `axstack-implement` ->
   `axstack-review` -> `axstack-watch`.

package/skills/axstack/references/run-record.md

@@ -151,6 +151,8 @@ Authority: <who authorized which mutation>
 Intent: <approved spec rev | small-change intent | adopted snapshot | peer/read-only mode>
 Routing: <preset + source + snapshot ref>
 Notification policy: <none | transport/target label/host/instructions path>
+Autopilot: on | paused (<hold>; resume: <condition>) | off (cancelled <ts>); next: <step>
+Release: <AGENTS.md file:line + tag-triggered workflow path + named install hosts> | not applicable (<reason>)
 Source base: <exact revision or source identity>
 IDs: <repo/project + workspace/agent receipt pointers>
 Worktrees in other repositories: <per-run repository and worktree IDs or none>

package/skills/axstack/scripts/resolve-models.js

@@ -0,0 +1,46 @@
+import { readFileSync } from 'node:fs';
+
+const args = process.argv.slice(2);
+const option = (name) => {
+  const index = args.indexOf(name);
+  return index < 0 ? null : args[index + 1];
+};
+const path = option('--catalog');
+const modelClass = option('--class');
+const effort = option('--effort');
+
+try {
+  if (!path || !['astra', 'sol', 'luna'].includes(modelClass) || !effort) {
+    throw new Error('expected --catalog path --class astra|sol|luna --effort level');
+  }
+  const catalog = JSON.parse(readFileSync(path, 'utf8'));
+  if (!Array.isArray(catalog.models) || typeof catalog.client_version !== 'string'
+    || typeof catalog.fetched_at !== 'string') {
+    throw new Error('malformed catalog');
+  }
+  const classPattern = new RegExp(`^gpt-(\\d+(?:\\.\\d+)*)-${modelClass}$`);
+  const candidates = catalog.models
+    .filter((entry) => entry && entry.visibility === 'list'
+      && typeof entry.slug === 'string'
+      && classPattern.test(entry.slug)
+      && Array.isArray(entry.supported_reasoning_levels)
+      && entry.supported_reasoning_levels.some((level) => level?.effort === effort))
+    .map((entry) => entry.slug)
+    .sort((left, right) => {
+      const a = left.slice(4, -(modelClass.length + 1)).split('.').map(Number);
+      const b = right.slice(4, -(modelClass.length + 1)).split('.').map(Number);
+      for (let i = 0; i < Math.max(a.length, b.length); i++) {
+        const difference = (b[i] ?? 0) - (a[i] ?? 0);
+        if (difference) return difference;
+      }
+      return 0;
+    });
+  if (!candidates.length) throw new Error(`no eligible ${modelClass} model in catalog`);
+  console.log(JSON.stringify({
+    provider: 'codex', modelClass, effort, model: candidates[0], candidates,
+    catalog: { path, client_version: catalog.client_version, fetched_at: catalog.fetched_at },
+  }));
+} catch (error) {
+  console.error(`model catalog resolution hold: ${error.message}`);
+  process.exitCode = 1;
+}

package/skills/axstack-align/SKILL.md

@@ -5,6 +5,9 @@ description: When exploring or planning engineering work, use axstack-align to s
 
 # Align
 
+For authorized delivery runs, follow [Autopilot](../axstack/references/autopilot.md)
+for phase continuation and holds.
+
 On driver entry, sweep under [Workspace hygiene](../axstack/references/workspace-hygiene.md); dispatched workers do not sweep.
 For every dispatch brief, name its private `<run dir>/evidence/<dispatch>/` folder.
 
@@ -166,7 +169,7 @@ record or spec. Read-only scope keeps proposed documentation in the permitted
 private record or response. Documentation is neither implementation nor spec
 approval; record chosen document names and paths once per run.
 
-## Read back, classify, and stop
+## Read back, classify, and route
 
 1. Read back the decisions, constraints, exclusions, and remaining evidence
    gaps. For substantial work, this summary becomes part of the draft spec in
@@ -189,6 +192,7 @@ approval; record chosen document names and paths once per run.
    [Orca runtime](../axstack/references/orca-runtime.md) immediately before
    actual dispatch. Alignment completion never dispatches a recipient.
 
-Alignment stops for both sizes only when the handoff is usable, its next scope
-identity is explicit, and execution has not started. The user invokes
-`axstack-implement` to execute.
+Alignment completes for both sizes only when the handoff is usable and its next
+scope identity is explicit. An eligible delivery run continues under Autopilot;
+an explicit stop-after-Align request ends here. Substantial work continues to
+Spec, and small work continues from its small-change intent to Implement.

package/skills/axstack-audit/SKILL.md

@@ -28,8 +28,8 @@ immediately before an actual auditor profile or session dispatch. Ordinary
 audit reading and record writing do not load it, and the auditor never
 dispatches.
 
-Core owns the `axstack-auditor` profile (claude/claude-sonnet-5-5 high in
-mixed/claude-only; codex/gpt-6-luna xhigh in codex-only) and its invocation.
+Core owns the `axstack-auditor` profile (claude/sonnet high in
+mixed/claude-only; codex/luna xhigh in codex-only) and its invocation.
 This skill governs what that auditor reads, measures, and proposes.
 Dispatch `axstack-auditor` and `axstack-auditor-sol` independently on the same
 bounded brief, without cross-reading. The driver reconciles findings per claim;
@@ -91,6 +91,14 @@ counts with denominators plus the evidence behind the count:
   evidence path is absent, or `UNKNOWN` with the reason when its records are
   unavailable.
 - Independent exact-revision review status and unresolved findings.
+  For authored PRs, measure the selected reviewer against this class pairing:
+
+  | Preset | Author class | Reviewer (class/effort) |
+  | --- | --- | --- |
+  | `mixed` | `codex/sol` | `axstack-reviewer-secondary` (`claude/opus` medium) |
+  | `mixed` | `claude/opus` | `axstack-reviewer-primary` (`codex/sol` high) |
+  | `codex-only` | `codex/sol` | `axstack-reviewer-secondary` (`codex/luna` xhigh) |
+  | `claude-only` | `claude/opus` | `axstack-reviewer-secondary` (`claude/sonnet` high) |
 - Simplification applicability determinations evidenced / total candidate diffs,
   and complete simplification receipts / total candidates, broken down as
   `applied`, `not-applicable`, or `UNKNOWN` with the reason. This measures

package/skills/axstack-implement/SKILL.md

@@ -5,6 +5,9 @@ description: When an approved task is ready to build or repair, use axstack-impl
 
 # Implement
 
+For authorized delivery runs, follow [Autopilot](../axstack/references/autopilot.md)
+for phase continuation and holds.
+
 On driver entry, sweep under [Workspace hygiene](../axstack/references/workspace-hygiene.md); dispatched workers do not sweep.
 For every dispatch brief, name its private `<run dir>/evidence/<dispatch>/` folder.
 Include [Safe deletion](../axstack/references/workspace-hygiene.md#safe-deletion) in author briefs.
@@ -215,23 +218,34 @@ For each PR:
    `repairs` once and counts once toward the third-round hold.
 
 One run-level completion wait covers every unsettled Dispatch; the bounded
-forge check wait is the only other wait. End a turn only when every required PR
+forge check wait is the only other implementation wait. The eligible run arms
+one maintain-mode chat-run watch at its first published PR; that watch owns its
+10-minute harness wake or Orca fallback. End a turn only when every required PR
 is `merge-ready` or `held`. Under the recorded Notification policy,
-`axstack-relay` sends only a serious risk immediately or a genuine blocked
-operation that needs user intervention after bounded safe recovery. Questions,
-spec approvals, progress, CI pending, merge-ready, merged, and completion stay
+`axstack-relay` sends only a serious risk immediately, a genuine blocked
+operation needing user intervention after bounded safe recovery, or the
+decision holds and capped milestones named by the recorded Notification policy.
+Routine questions stay in Orca. Progress, CI pending, and completion always stay
 in Orca.
+Only the bounded categories—user-decision holds (including spec approval),
+serious-risk holds, and at most two merge-ready/merged milestones per run—may
+be relayed under the recorded Notification policy.
 
 Merge-ready is the human boundary: the user merges, bottom-up for a stack. The
-driver resumes on the user's next message or `/axstack-watch`; no Orca merge
-wake exists today. Re-read forge state: record forge-merged PRs as `merged`;
+driver resumes on the user's next message, `/axstack-watch`, or the armed
+chat-run watch wake; no Orca merge wake exists today.
+Re-read forge state: record forge-merged PRs as `merged`;
 changed heads or feedback return to step 1; retain useful author work before Close-out.
-Run Close-out once only after every required PR is forge-merged and acceptance
-passes. It settles workers, records counts, makes the auditor decision and
+Run Close-out once only after every required PR is forge-merged, the run's
+Release step is settled or not applicable, and acceptance passes. It settles
+workers, records counts, makes the auditor decision and
 settlement, releases worktrees, closes eligible tickets, and archives the run.
+Without an Autopilot or Release record, the Release step is not applicable for
+both Close-out and run completion.
 
 The loop requires the `mixed` two-provider authored-review row. `codex-only` or
 `claude-only` holds at step (3) for an explicit user routing choice, with no
 substitution or same-provider review. Derived PR states are `authoring |
 published | in-review | repairing(n) | merge-ready | merged | held`. The run is
-done only when every required PR is forge-merged and Close-out has receipts.
+done only when every required PR is forge-merged, the run's Release step is
+settled or not applicable, and Close-out has receipts.

package/skills/axstack-relay/SKILL.md

@@ -5,6 +5,9 @@ description: When the user requests a relay message or test, or an authorized no
 
 # Relay
 
+For authorized delivery runs, follow [Autopilot](../axstack/references/autopilot.md)
+for phase continuation and holds.
+
 Send normal messages, transport tests, and authorized notifications to the
 user through Hermes' native one-way `hermes send`. This is an inline caller
 procedure: it creates no driver, team, owner, auditor, monitor, child session,
@@ -25,8 +28,12 @@ Choose the applicable message type:
   in the caller's private notification policy. State the issue, impact, and the
   answer or action needed.
 - **Routine run events:** questions, spec approvals, progress, CI pending,
-  merge-ready, merged, and completion stay in Orca. They never become proactive
-  relay messages merely because the run is waiting.
+  merge-ready, merged, and completion stay in Orca unless the recorded
+  Notification policy names it. A policy may name only user-decision holds and
+  at most two merge-ready/merged milestones per run; deduplicate across implementation
+  and release. Progress, CI pending, and completion are never eligible merely
+  because a policy exists. They never become proactive relay messages merely
+  because the run is waiting.
 
 Verify the transport, execution host, and intended recipient from the user's
 request, trusted caller context, or an existing private notification policy.

package/skills/axstack-review/SKILL.md

@@ -204,17 +204,18 @@ This section applies to peer and authored PR modes.
    - **Authored:** exactly one eligible independent reviewer from this complete
      mapping:
 
-     | Preset | Actual author provider/model | Reviewer role (configured model/effort) |
+     | Preset | Actual author provider/class | Reviewer role (configured class/effort) |
      | --- | --- | --- |
-     | `mixed` | Codex / Sol (`codex/gpt-6-sol`) | `axstack-reviewer-secondary` (`claude/claude-opus-5-5` medium) |
-     | `mixed` | Claude / Opus (`claude/claude-opus-5-5`) | `axstack-reviewer-primary` (`codex/gpt-6-sol` high) |
-     | `codex-only` | Codex / Sol (`codex/gpt-6-sol`) | `axstack-reviewer-secondary` (`codex/gpt-6-luna` xhigh) |
-     | `claude-only` | Claude / Opus (`claude/claude-opus-5-5`) | `axstack-reviewer-secondary` (`claude/claude-sonnet-5-5` high) |
+     | `mixed` | `codex/sol` | `axstack-reviewer-secondary` (`claude/opus` medium) |
+     | `mixed` | `claude/opus` | `axstack-reviewer-primary` (`codex/sol` high) |
+     | `codex-only` | `codex/sol` | `axstack-reviewer-secondary` (`codex/luna` xhigh) |
+     | `claude-only` | `claude/opus` | `axstack-reviewer-secondary` (`claude/sonnet` high) |
 
      The diligence receipt is separate and does not count as a reviewer receipt.
 
-     Provenance is matched on provider/model ID; record effort, but never use
-     effort to create a mapping. Any other author provenance for the
+     From the recorded exact model ID, derive its class and match provenance
+     on provider/class; record effort, but never use effort to create a mapping.
+     An ID with no class is `INCOMPLETE`. Any other author provenance for the
      selected preset is unsupported and `INCOMPLETE`, including its secondary
      reviewer model, Astra, Luna, or Fable. Report the exact provenance gap and
      ask the user. Never derive a reverse pairing from slot position. The
@@ -233,6 +234,11 @@ This section applies to peer and authored PR modes.
    effort and spawn no redundant final reviewer. If a required reviewer is
    unavailable, report that exact model gap, mark review `INCOMPLETE`, and ask
    the user; do not lower effort or choose any automatic fallback.
+   The only within-class exception is explicit model rejection before the first
+   turn: Codex may use
+   `--retry-of` with the next eligible ID in the same class, provider, and
+   effort; fence and record the rejected attempt. Timeout, quota, and auth
+   failures hold; Claude rejection holds. Never cross class or provider.
 
    Continue only when session receipts prove the required models, non-author
    independence, actual author provenance where applicable, and exact brief.

package/skills/axstack-spec/SKILL.md

@@ -5,6 +5,9 @@ description: When agreed work needs an approved baseline, use axstack-spec to wr
 
 # Specification baseline
 
+For authorized delivery runs, follow [Autopilot](../axstack/references/autopilot.md)
+for phase continuation and holds.
+
 On driver entry, sweep under [Workspace hygiene](../axstack/references/workspace-hygiene.md); dispatched workers do not sweep.
 For every dispatch brief, name its private `<run dir>/evidence/<dispatch>/` folder.
 
@@ -75,7 +78,8 @@ Material change: <none | description + affected PRs/tasks + hold state>
    The snapshot is ready for ticketing when its authoritative revision,
    counterpart, and preserved ref resolve to the approved content. Return that
    exact identity; routine execution of the settled plan needs no repeat adviser
-   consultation or spec approval.
+   consultation or spec approval. In an eligible delivery run with no hold,
+   continue to Tickets in the same driver chat.
 
 ## Material revisions
 

package/skills/axstack-tickets/SKILL.md

@@ -5,12 +5,15 @@ description: When an approved capability needs executable tasks, use axstack-tic
 
 # Tickets
 
+For authorized delivery runs, follow [Autopilot](../axstack/references/autopilot.md)
+for phase continuation and holds.
+
 On driver entry, sweep under [Workspace hygiene](../axstack/references/workspace-hygiene.md); dispatched workers do not sweep.
 For every dispatch brief, name its private `<run dir>/evidence/<dispatch>/` folder.
 
 Produce an executable capability map tied to the exact approved spec revision.
 Keep user-visible capabilities in the selected store, keep implementation detail
-in the repository, reconcile lifecycle state, and stop before implementation.
+in the repository, reconcile lifecycle state, and return a map for continuation.
 
 Before mapping, load [Standing contracts](../axstack/references/contracts.md).
 Follow its required edge to [Shared lifecycle](../axstack/references/lifecycle.md),
@@ -100,5 +103,5 @@ Recommendation: <move to In Review | keep open | close | other> (driver verifies
 
 5. **Return the mapping.** Report the pinned spec revision, selected store, map
    references, mutations performed by the driver, recorded gaps, and unresolved
-   decisions. Stop with a map ready for lifecycle continuation; implementation
-   has not started.
+   decisions. With a complete map and no hold, an eligible delivery run
+   continues to Implement in the same driver chat.

package/skills/axstack-watch/SKILL.md

@@ -5,6 +5,9 @@ description: When babysitting an existing PR, use axstack-watch to monitor or ma
 
 # Watch
 
+For authorized delivery runs, follow [Autopilot](../axstack/references/autopilot.md)
+for phase continuation and holds.
+
 On driver entry, sweep under [Workspace hygiene](../axstack/references/workspace-hygiene.md); dispatched workers do not sweep.
 For every dispatch brief, name its private `<run dir>/evidence/<dispatch>/` folder.
 
@@ -49,7 +52,8 @@ authority is unverified, record the hold and continue read-only.
 
 Choose one mode from the user's authority and record it before dispatch:
 
-- **Chat-run watch:** the initiating chat remains the only driver and record
+- **Chat-run watch:** authorized maintain mode is the default for run-created
+  PRs. The initiating chat remains the only driver and record
   writer for every PR raised in its Run, including later verified publications
   and explicitly adopted members. Follow [Chat-run watch runtime](references/watch-runtime.md#chat-run-watch)
   for its scheduled driver wake and Orca fallback. This mode has no replacement `axstack-owner` or
@@ -121,11 +125,16 @@ A handled wake has an acknowledged event ID, an observation or action bound to
 the current revision, and a recorded hold or next owner where work remains.
 
 Under a recorded `Notification policy`, the owner may use the optional
-[axstack-relay](../axstack-relay/SKILL.md) only for a serious risk immediately
-or a genuine blocked operation needing user intervention after bounded safe
-recovery. Questions, spec approvals, progress, CI pending, merge-ready, merged,
-and completion stay in Orca. The standalone monitor never sends; the chat-run
-observer reports only internally. Deduplicate authorized notifications;
+[axstack-relay](../axstack-relay/SKILL.md) only for a serious risk immediately,
+a genuine blocked operation needing user intervention after bounded safe
+recovery, or decision holds and capped milestones named by the recorded policy.
+Routine questions stay in Orca. Progress, CI pending, and completion always stay
+in Orca.
+Only the bounded categories—user-decision holds (including spec approval),
+serious-risk holds, and at most two merge-ready/merged milestones per run—may
+be relayed under the recorded Notification policy.
+The standalone monitor never sends; the chat-run observer reports only
+internally. Deduplicate authorized notifications;
 absent policy or failed relay uses the current Orca conversation and leaves
 the existing hold open.
 
@@ -148,10 +157,14 @@ human approval remain allowed.
 
 ## 6. End and preserve continuity
 
-End a chat-run watch after all members merged or closed, user cancellation, or
-the recorded wake expires. Stop the chosen wake and verify its stop receipt;
-a failed or uncertain harness wake stop is a hold.
-the Orca fallback also needs own-automation disable/readback and driver-owned automation
+End a chat-run watch after all members merged or closed and the run's release
+step is settled or not applicable, user cancellation, or the recorded wake
+expires. Without an Autopilot or Release record, the release step is not
+applicable to this watch. A required PR closed without merging records a
+decision hold and the wake remains active while unexpired until the user
+resolves scope, cancels, or the wake expires. Stop the chosen wake and verify
+its stop receipt; a failed or uncertain harness wake stop is a hold.
+The Orca fallback also needs own-automation disable/readback and driver-owned automation
 removal and workspace cleanup under
 [Watch runtime](references/watch-runtime.md#chat-run-watch).
 
@@ -183,6 +196,6 @@ Resume: <known commands or verified refs needed to reconcile from this revision>
 
 The watch ends only when registrations are stopped, receipts are recorded, and
 the PR is either merged or represented by this resumable state.
-When every required PR is merged, follow the lifecycle
-[Close-out](../axstack/references/lifecycle.md#close-out) before reporting the
-run as done.
+When every required PR is merged and the run's Release step is settled or not
+applicable, follow the lifecycle [Close-out](../axstack/references/lifecycle.md#close-out)
+before reporting the run as done.