axstack 0.21.0 → 0.22.0

package/README.md

@@ -14,7 +14,8 @@ coordination. You can start at the phase you need.
 
 | Layer | Skill | What it does |
 | --- | --- | --- |
-| Plan | [axstack-align](skills/axstack-align/SKILL.md) | Settle scope through questions, a design lens sketch, and a four-family arena for hard choices. |
+| Plan | [axstack-align](skills/axstack-align/SKILL.md) | Settle scope through questions, a design lens sketch, and inline brainstorm validation. |
+| Plan | [axstack-brainstorm](skills/axstack-brainstorm/SKILL.md) | Validate an approach with independent candidates; judges for hard choices. |
 | Plan | [axstack-spec](skills/axstack-spec/SKILL.md) | Write and approve an observable specification. |
 | Plan | [axstack-tickets](skills/axstack-tickets/SKILL.md) | Break approved scope into executable tasks. |
 | Build | [axstack-implement](skills/axstack-implement/SKILL.md) | Build with strict TDD and an author → review → repair loop. |
@@ -36,7 +37,7 @@ implementation. Research, explanation, and peer review can start directly.
 
 | Failure mode | How Axstack responds |
 | --- | --- |
-| Wrong thing built | Align rounds clarify the request; a four-family arena compares approaches for hard choices. |
+| Wrong thing built | Align rounds clarify the request; every brainstorm runs a light arena across configured families. Use judges only for Rung 2 hard-to-reverse choices. |
 | Nobody really reviewed it | Strict TDD checks behavior first; with the mixed preset, cross-provider review checks the exact revision. |
 | Design rot | The design lens sketches boundaries before a build; Improve surfaces evidenced changes later. |
 | Agents left a mess | T3 makes delegation visible, one writer owns each PR, cleanup stays bounded, and a human merges. |

package/docs/installation.md

@@ -220,16 +220,20 @@ reconciles their findings.
 
 The mixed checker and `axstack-research-web-google` have provider
 `antigravity`; mixed `axstack-research-x` has provider `grok`. All three use
-`model: null` with notes authorizing their agent-ID routes; T3 resolves the exact
-model from the first entry for that provider in saved capabilities. Empty
-Antigravity model catalogs hold. The single-provider presets configure the checker and keep
+`model: null` with notes authorizing their agent-ID routes; T3 resolves Grok's
+exact model from the first entry for that provider in saved capabilities.
+For Antigravity `model:null` roles, select the first listed model whose ID ends
+with `-<effort>` from saved capabilities and record its exact ID.
+Missing effort-suffix matches hold resolution for Antigravity, including empty
+model catalogs. The single-provider presets configure the checker and keep
 both cross-provider research routes as intentional absences. Their
 unavailable adviser and round-2 seat remain explicit same-provider
 `model: null` roles, which do not make installation unready;
 Align and Spec still hold until both Astra and Opus can return independent
-receipts. For an arena-grade Align question, round 1 needs Opus; round 2, if
-invoked, needs escalation Fable and Astra; a required seat that is unavailable holds that
-round. The current chat drives on whatever
+receipts. Every brainstorm runs a light arena across configured families.
+Use judges only for Rung 2 hard-to-reverse choices: round 1 needs Opus; round 2,
+if invoked, needs escalation Fable and Astra; a required seat that is unavailable
+holds that round. The current chat drives on whatever
 model runs it; no preset carries a driver role. Every other missing, invalid, unsupported, or unavailable role value holds only
 the affected work. Codex and Claude class resolution reads the saved T3 capabilities catalog via
 `skills/axstack/scripts/resolve-models.js --provider`; missing or malformed

package/docs/workflows.md

@@ -162,15 +162,17 @@ for explicit ownership transfer.
 - `axstack-align` maps facts and dependencies, asks prioritized questions, and
   consults Astra and Opus independently with the same bounded evidence and
   question. It synthesizes disagreements and reuses unchanged receipts. For a
-  hard-to-reverse design choice it runs an arena instead: Astra, Opus, Grok,
-  and Antigravity each author a candidate. `axstack-arena-judge-opus` scores
-  them in round 1; the driver compares its own pick with that verdict. If they
-  disagree on the base or the user rejects the round-1 synthesis,
-  `axstack-escalation-fable` and `axstack-arena-judge-astra` independently
-  score the same anonymized candidates and rubric in round 2. The driver
-  picks a base, grafts strong ideas, and records judge verdicts per round in
-  the `Decisions` rows without averaging. Fable escalation uses a fresh
-  session for round 2, high-stakes agreement, or the bounded trigger in
+  Rung 1 or 2 design question it loads `axstack-brainstorm` inline and reuses
+  its receipt instead of consulting twice; Align owns the interview.
+- `axstack-brainstorm` validates an approach standalone or inline in the driver,
+  report-only. Every invocation compares independent Astra, Opus, Grok and
+  Antigravity candidates, including premise and smallest-change/do-nothing
+  checks. The driver scores, picks and grafts; Rung 1 uses no judges. At Rung 2,
+  `axstack-arena-judge-opus` judges round 1; disagreement on the base or caller
+  re-invocation with the user's rejection triggers fresh Fable/Astra round 2.
+  It returns a verdict, sketch and proposed questions, with no interview,
+  prototype or execution approval. Required seats hold; optional dropouts are
+  fenced. Fable also serves the bounded triggers in
   [Standing contracts](../skills/axstack/references/contracts.md).
 - `axstack-spec` writes observable acceptance, exclusions, decisions, and one
   user-approved revision baseline. Linear through the executor MCP is the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axstack",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Axstack installer and setup CLI: installs owned chat skills and role data, configures supported harness settings, and checks T3 Code capabilities.",
   "keywords": [
     "claude-code",

package/skills/axstack/references/automations.md

@@ -271,6 +271,15 @@ The orphan sweep covers the run record's repositories plus registered repositori
 `t3_thread_organize` settle/archive changes metadata only; exact guarded Git
 worktree removal remains separate. Unknown, active or user-taken-over threads,
 ambiguous publication and failed salvage stay preserved.
+
+A review-manager pass may retire a predecessor pass's local `t3code/*` branch
+with exact `git branch -D <branch>` only when ALL hold: the predecessor pass is
+settled and proven run/lane-owned by recorded identity, its descendants and
+evidence are settled, no worktree has the branch checked out, no remote
+counterpart exists, its tip equals the recorded tip, and its tip is an ancestor
+of the verified remote default branch. Otherwise hold; all other `git branch -d`
+rules remain unchanged.
+
 Past the authorized storage limit (default 20 retained lane worktrees), disable the schedule
 with `update_scheduled_task` using `enabled:false` and hold.
 Read back the disabled schedule with `list_scheduled_tasks`; uncertainty holds.

package/skills/axstack/references/contracts.md

@@ -55,10 +55,9 @@ profile. Record the driver's provider and model in the run record.
 
 For Align and Spec, the driver forms an independent assessment first, then
 consults `axstack-advisor-astra` and `axstack-advisor-opus` independently with
-the same bounded evidence and question. The one exception is an arena-grade
-Align question: there the driver frames the brief and rubric, the advisers
-author candidates, and the driver assesses only after the candidates and judge
-verdicts return. The driver synthesizes disagreements,
+the same bounded evidence and question. The exception covers every brainstorm: the driver frames
+its brief and rubric and assesses only after the candidates and required judge
+rounds return. The driver synthesizes disagreements,
 owns the decision, and the user still approves the spec. Reuse each valid
 unchanged receipt; changed evidence, scope, or question requires a fresh
 receipt. If either adviser is unavailable, Align and Spec hold without model or

package/skills/axstack/references/design-lens.md

@@ -15,15 +15,15 @@ sketch through the scope identity.
   not reclassify work: Rung 1 can stay small. An unsettled material design
   question still makes routing reassess size.
 - **Rung 2 — arena.** A Rung 1 design that also meets the existing ADR test:
-  a meaningful, hard-to-reverse, non-obvious trade-off. Use Align's all-family
-  arena for that question.
+  a meaningful, hard-to-reverse, non-obvious trade-off. Use [Brainstorm](../../axstack-brainstorm/SKILL.md)
+  with its Rung 2 judge rounds for that question.
 
 There is no numeric threshold, file-count gate, or class-count gate.
 
 ## Questions in order
 
 Ask only unresolved areas in numbered `Qn` rounds of one to three. Give each a
-recommendation, reason, and trade-off; use Align's adviser critique. Design and
+recommendation, reason, and trade-off; use Align's inline brainstorm synthesis. Design and
 arena questions share its unchanged budget: 20 normally, a justified extension
 to 35, then opted-in refinement of at most five.
 

package/skills/axstack/references/routing.md

@@ -23,9 +23,11 @@ Resolve Codex and Claude classes with
 `skills/axstack/scripts/resolve-models.js --provider <provider> --capabilities <path>`
 using saved T3 capabilities JSON; missing or malformed capabilities holds.
 Claude exact IDs come from capabilities, replacing transcript read-back.
-Use an explicit model as given; for `model:null` without a class, only grok and
-antigravity use the provider's first listed model from saved capabilities and
-record its exact ID.
+Use an explicit model as given; for `model:null` without a class, grok uses the
+provider's first listed model from saved capabilities and records its exact ID.
+For `model:null` without a class, Antigravity must select the first listed model
+whose ID ends with `-<effort>` from saved capabilities and record its exact ID.
+Missing effort-suffix matches hold resolution for Antigravity.
 A Codex or Claude role with neither model nor class is an intentional absence
 and holds.
 Resume must reuse the saved capabilities and role snapshot with no re-resolution; changes require the user’s explicit decision.
@@ -50,6 +52,8 @@ step (3) for user routing: no substitution or same-provider review.
 
 ## Direct routes (no spec ceremony)
 
+- Validate an approach -> `axstack-brainstorm`: inline, report-only independent
+  candidates; light arena always, judges only at Rung 2; return to the caller.
 - Bounded research -> `axstack-research`: verify primary sources and code,
   cite limits, and fan out distinct questions.
 - Understand a system or gap -> `axstack-explain`:

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

@@ -32,6 +32,9 @@ A `model:null` role lacking a class must use the first model listed for its
 provider in saved capabilities only for grok and antigravity (launch-by-agent-id
 providers); record the exact ID, rather than an unresolved provider default.
 Antigravity must hold when saved capabilities advertise zero models.
+For Antigravity, first-listed selection must use the first model ID ending in `-<effort>` because its model ID encodes effort.
+No matching effort suffix holds resolution for Antigravity.
+For Antigravity, pass no effort option; effort read-back uses the model ID suffix.
 For codex or claude, a role lacking both model and class is an intentional
 absence and must hold; never use a provider default for that role.
 

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

@@ -45,7 +45,7 @@ function providerFrom(catalog, provider) {
   return instance;
 }
 
-function modelFrom(models, { provider, model: pin, class: modelClass, excluded }) {
+function modelFrom(models, { provider, model: pin, class: modelClass, excluded, effort }) {
   if (pin && pin !== 'null') {
     const model = models.find((model) => model.id === pin && !excluded.includes(model.id));
     if (!model) throw new Error(`missing requested model ${pin}`);
@@ -56,8 +56,9 @@ function modelFrom(models, { provider, model: pin, class: modelClass, excluded }
     if (['codex', 'claude'].includes(provider)) {
       throw new Error(`intentional absence for ${provider}: missing model and class`);
     }
-    // Launch-by-agent-ID providers bind the first listed ID; exclusions never select a substitute.
-    const model = models[0];
+    // Antigravity encodes effort in its ID; exclusions never select a substitute.
+    const model = provider === 'antigravity'
+      ? models.find((model) => model.id.endsWith(`-${effort}`)) : models[0];
     if (!model || excluded.includes(model.id)) throw new Error('missing first listed model');
     return model;
   }
@@ -88,14 +89,21 @@ try {
   const catalog = JSON.parse(readFileSync(path, 'utf8'));
   const instance = providerFrom(catalog, provider);
   const model = modelFrom(instance.models, options);
-  const effortOptions = model.options.filter((option) => effortIds[provider]
-    ? option.id === effortIds[provider] : ['reasoningEffort', 'effort'].includes(option.id));
-  if (effortOptions.length !== 1 || !effortOptions[0].options?.some((value) => value.id === effort)
-    || (provider === 'grok' && effort === 'max')) {
-    throw new Error(`unsupported effort ${effort} for ${provider}/${model.id}`);
+  let effortOption = null;
+  if (provider === 'antigravity') {
+    if (!model.id.endsWith(`-${effort}`)) {
+      throw new Error(`unsupported effort ${effort} for ${provider}/${model.id}`);
+    }
+  } else {
+    const effortOptions = model.options.filter((option) => option.id === effortIds[provider]);
+    if (effortOptions.length !== 1 || !effortOptions[0].options?.some((value) => value.id === effort)
+      || (provider === 'grok' && effort === 'max')) {
+      throw new Error(`unsupported effort ${effort} for ${provider}/${model.id}`);
+    }
+    effortOption = { id: effortOptions[0].id, value: effort };
   }
   console.log(JSON.stringify({ provider, providerInstanceId: instance.providerInstanceId,
-    model: model.id, effortOption: { id: effortOptions[0].id, value: effort }, source: 'capabilities', path }));
+    model: model.id, effortOption, source: 'capabilities', path }));
 } catch (error) {
   console.error(`model capabilities resolution hold: ${error.message}`);
   process.exitCode = 1;

package/skills/axstack-align/SKILL.md

@@ -26,7 +26,9 @@ Set the rung from researched facts; never ask the user to choose it. A change
 inside one module's existing interface, ownership, data flow, and failure
 guarantees is Rung 0: no design questions or sketch. Otherwise load the
 [design lens ladder](../axstack/references/design-lens.md) for Rung 1 or 2
-and settle only unresolved areas in its order within the existing budget. Carry a
+and settle only unresolved areas in its order within the existing budget.
+For unresolved Rung 1 or 2 design questions, load
+[Brainstorm](../axstack-brainstorm/SKILL.md) inline. Carry a
 Rung 1 or 2 sketch in the substantial spec's `Design` section or the returned
 small-change intent. A design question alone does not make small work
 substantial; apply routing's existing size reassessment rule.
@@ -65,9 +67,10 @@ substantial; apply routing's existing size reassessment rule.
 The current chat remains the driver under
 [Standing contracts](../axstack/references/contracts.md). For each new
 user round, the driver independently drafts the prioritized frontier and
-recommendations, except for an arena-grade question (below), where the driver
-writes the brief and rubric but drafts no recommendation until the candidates
-and judge verdicts return, so nothing anchors them. Then consult `axstack-advisor-astra` and
+recommendations, except for brainstorm questions, where the driver frames the
+brief and rubric and assesses after the candidates and required judge rounds
+return. Reuse valid brainstorm receipts to replace the adviser consult for
+that question. For other questions, consult `axstack-advisor-astra` and
 `axstack-advisor-opus` independently, without cross-reading, using the same
 bounded evidence and question. Each adviser challenges assumptions, edges,
 omissions, and alternatives; the driver synthesizes disagreements and accepts
@@ -87,60 +90,10 @@ the draft unchanged; it needs no new adviser pair. Changed draft text, a
 blocking finding, or a high-stakes decision requires fresh receipts on the new
 revision.
 
-## Arena for hard-to-reverse design choices
-
-Critique of one draft anchors every reader to that draft's shape. Rung 2 designs
-alone enter the arena: they meet the same test as for an ADR (a meaningful,
-hard-to-reverse, non-obvious trade-off: architecture, module boundaries, data
-model, migration strategy). Replace the critique round for that question with
-an arena. Small or routine questions never enter the arena.
-
-1. **Frame.** The driver writes the brief (the artifact, its constraints, the
-   settled decisions it must respect) and three to six gradeable rubric
-   criteria. Candidates receive only the brief; the rubric is for judging.
-2. **Fan out.** Produce one candidate per configured family independently from the same brief,
-   without cross-reading: `axstack-advisor-astra`, `axstack-advisor-opus`,
-   `axstack-arena-candidate-grok`, and `axstack-arena-candidate-antigravity`.
-   Each gives a design, rationale, and rejected alternatives. The driver authors no candidate.
-3. **Cross-judge.** After every candidate completes, give round 1 judge
-   `axstack-arena-judge-opus` the anonymized, relabeled candidates and rubric to
-   score every candidate per criterion and recommend a base with a reason.
-   The driver compares its own pick with the Opus verdict. Only if the driver
-   and the Opus judge disagree on the base, or the user rejects the round-1
-   synthesis,
-   run round 2 with fresh sessions: `axstack-escalation-fable` and `axstack-arena-judge-astra`
-   independently score the same anonymized candidates and rubric. Judges never
-   author, never cross-read each other, and never average verdicts. After round-2
-   verdicts return, the driver re-picks in step 4 and re-presents in step 6.
-4. **Pick.** The driver reads every candidate end to end and scores per
-   criterion, not on holistic feel, then compares with the judge verdicts from
-   each completed round. Agreement confirms the base. On disagreement, re-read
-   the rationales and decide with a stated reason; never average verdicts or
-   fabricate consensus.
-5. **Graft.** Walk the losing candidates once more for the one or two ideas
-   worth porting and fold them into the base by hand so the result stays
-   coherent under one mental model. Convergence on the same shape is a strong
-   agreement signal: adopt the consensus shape, no graft. Wide divergence
-   means the frame was under-specified: reframe and rerun once, never
-   average.
-6. **Present.** The synthesized design is the recommendation in the next
-   `Qn`, with its trade-off, judge verdicts per round, and what was grafted or rejected.
-   The user still decides; spec approval remains the one human checkpoint.
-
-Record the synthesis note (base, grafts and their source candidate, rejections,
-dropouts, judge verdicts per round) as `Decisions` rows in the
-[run record](../axstack/references/run-record.md). Load
-[T3 runtime](../axstack/references/t3-runtime.md) immediately before the
-first candidate or judge dispatch. If an optional Grok or Antigravity candidate
-malfunctions (launch failure, trust/login prompt, or prompt block), fence it,
-record `absent (<reason>)`, name it once in the next
-read-back, and continue with available candidates without relay or substitution.
-A required adviser, candidate, or judge unavailable at launch or returning a
-failed receipt holds that question without substitution; record the gap and ask
-whether to proceed. In mixed fan-out retain at least one Codex and one Claude
-seat, or hold the affected question.
-For an uncertain dispatch, reconcile natively; it is never treated as absent.
-Unaffected fact work and questions continue.
+## Use the brainstorm synthesis
+
+Present its recommendation and trade-off in the next `Qn` within the same
+question budget. The user still decides; reuse unchanged receipts.
 
 ## Bound the interview
 

package/skills/axstack-brainstorm/SKILL.md

@@ -0,0 +1,24 @@
+---
+name: axstack-brainstorm
+description: When validating a design approach, use axstack-brainstorm to compare independent candidates and return a synthesis.
+---
+
+# Brainstorm
+
+Standalone usage: `/axstack-brainstorm <problem + candidate approach>`.
+Run inline in the current T3 driver thread. Never delegate a coordinator.
+This procedure is report-only. Do not implement, prototype, or grant execution
+or spec approval. Never interview the user or invoke Align.
+
+Load [Standing contracts](../axstack/references/contracts.md) before acting.
+Set the rung from researched facts under the
+[design lens](../axstack/references/design-lens.md); Rung 2 meets its ADR test.
+Follow the [arena procedure](references/arena.md), preserving settled decisions
+and naming missing evidence. Candidates challenge the supplied approach as
+well as proposing alternatives.
+
+Return `recommend | revise | reject | unresolved` with the
+[sketch](../axstack/references/design-lens.md#sketch), including `Rejected` and
+`Open`, plus base, criterion scores, grafts, dropouts and completed judge rounds.
+Return proposed questions to the caller. The caller owns preferences, next
+steps and any approval; an open blocker stays unresolved.

package/skills/axstack-brainstorm/references/arena.md

@@ -0,0 +1,56 @@
+## Arena
+
+Every brainstorm runs a light arena. At Rung 1, the driver scores, picks and
+grafts without a judge round. Only at Rung 2, run the judge rounds below for
+hard-to-reverse choices; they replace the critique round for that question.
+
+1. **Frame.** The driver writes the brief (the artifact, its constraints, the
+   settled decisions it must respect) and three to six gradeable rubric
+   criteria. Every brief requires a premise check and comparison with the
+   smallest change and doing nothing. The rubric uses agent-contributor red
+   flags as evidence prompts: seeing only opened files, copying the nearest
+   example, taking the shortest path that compiles. Treat them as prompts, not defects. Candidates receive only the brief; the rubric is for judging.
+2. **Fan out.** Produce one candidate per configured family independently from the same brief,
+   without cross-reading: `axstack-advisor-astra`, `axstack-advisor-opus`,
+   `axstack-arena-candidate-grok`, and `axstack-arena-candidate-antigravity`.
+   Each gives a design, rationale, and rejected alternatives. The driver authors no candidate.
+   The driver drafts no recommendation until every candidate returns.
+3. **Cross-judge (Rung 2 only).** After every candidate completes, give round 1 judge
+   `axstack-arena-judge-opus` the anonymized, relabeled candidates and rubric to
+   score every candidate per criterion and recommend a base with a reason.
+   The driver compares its own pick with the Opus verdict. Only if the driver
+   and the Opus judge disagree on the base, or the caller re-invokes with the user's rejection of the round-1
+   synthesis,
+   run round 2 with fresh sessions: `axstack-escalation-fable` and `axstack-arena-judge-astra`
+   independently score the same anonymized candidates and rubric. Judges never
+   author, never cross-read each other, and never average verdicts. After round-2
+   verdicts return, the driver re-picks in step 4 and re-presents in step 6.
+4. **Pick.** The driver reads every candidate end to end and scores per
+   criterion, not on holistic feel, then compares with the judge verdicts from
+   each completed round. Agreement confirms the base. On disagreement, re-read
+   the rationales and decide with a stated reason; never average verdicts or
+   fabricate consensus.
+5. **Graft.** Revisit losing candidates once; graft one or two ideas by hand
+   into the coherent base under one mental model. Convergence on the same shape is a strong
+   agreement signal: adopt the consensus shape, no graft. Wide divergence
+   means the frame was under-specified: reframe and rerun once, never
+   average.
+6. **Present.** Return the synthesized design to the caller with its
+   trade-off, judge verdicts per round, and what was grafted or rejected.
+   The user still decides; spec approval remains the one human checkpoint.
+
+Record the synthesis note (base, graft sources, rejections, dropouts, judge
+verdicts per round) as `Decisions` rows in the
+[caller's run record](../../axstack/references/run-record.md) when one exists,
+otherwise include it in the returned verdict. Load
+[T3 runtime](../../axstack/references/t3-runtime.md) immediately before the
+first candidate or judge dispatch. If an optional Grok or Antigravity candidate
+malfunctions (launch failure, trust/login prompt, or prompt block), fence it,
+record `absent (<reason>)`, name it once in the next
+read-back, and continue with available candidates without relay or substitution.
+A required adviser, candidate, or judge needed for this rung unavailable at
+launch or returning a failed receipt holds that question without substitution;
+record the gap and return a proposed question to the caller about whether to proceed. In mixed fan-out retain at least one Codex and one Claude
+seat, or hold the affected question.
+For an uncertain dispatch, reconcile natively; it is never treated as absent.
+Unaffected fact work and questions continue.