@open-agent-toolkit/cli 0.2.13 → 0.2.15

package/assets/skills/subagent-orchestration/references/model-selection-principles.md

@@ -0,0 +1,105 @@
+# Model Selection Principles
+
+Read this reference for every dispatch before the active provider reference.
+It contains the durable contract. Provider files contain dated examples.
+
+## Selection Unit
+
+Never select from a model family name alone. Preserve these axes separately:
+
+- provider and harness;
+- exact model selector and selector granularity;
+- provider-native effort or reasoning selector;
+- service tier, including fast or priority variants;
+- reasoning mode when the provider exposes one independently of effort;
+- role, context inheritance, authority, deadline, and route.
+
+Do not normalize effort labels across providers. `medium`, `high`, `xhigh`,
+`max`, extended thinking, adaptive thinking, and provider-specific modes have
+different semantics. The exact pair or tuple is the route.
+
+## Five Task Classes
+
+Classify in this order: deterministic verifiability, silent-miss risk,
+dispersed-context reconciliation, ambiguity or novelty, then consequence.
+File count and duration alone never justify escalation.
+
+| Task class               | Qualification contract                                                                                                          |
+| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------- |
+| `mechanical-recon`       | Deterministic inventories, parity checks, exact extraction, or command execution whose misses are visible and cheaply verified. |
+| `intelligent-recon`      | Interpretation of unfamiliar code, policy, semantics, or evidence where a plausible miss could survive mechanical validation.   |
+| `default-implementation` | Independently bounded implementation or dossier work that must retain and reconcile dispersed context.                          |
+| `hard-reasoning`         | Ambiguity, novelty, architecture, difficult diagnosis, or competing interpretations dominates.                                  |
+| `consequential`          | Security, release safety, irreversible effects, adversarial analysis, foundational decisions, or expensive failure dominates.   |
+
+When uncertain, use the stronger class. Never select below a supplied floor.
+
+## Default, Economy, and Escalation
+
+Provider references may give three routes:
+
+- **Default:** conservative route expected to hold quality without exceptional spend.
+- **Economy:** permitted only when scope, verification, and consequences make the downgrade safe.
+- **Escalation:** stronger route for ambiguity, unresolved evidence, or consequence.
+
+Economy is not automatically “the smallest model.” Mechanical coding agents
+still require enough capability to use tools, follow scope, and return complete
+evidence. Prefer scripts over models when a deterministic program fully solves
+the task.
+
+## Escalation Boundaries
+
+- Mechanical to intelligent recon when judgment is required to identify a
+  finding, or when a miss would be silent.
+- Recon to default implementation when success depends on retaining and
+  reconciling dispersed context, not merely searching many files.
+- Default implementation to hard reasoning when ambiguity, novelty, or
+  reasoning difficulty dominates.
+- Any class to consequential when security, production impact, irreversibility,
+  adversarial behavior, or expensive failure dominates.
+
+Narrow a poorly decomposed task before escalating its model. Model capability
+never repairs an over-broad objective.
+
+## Long Context
+
+Large context alone does not change the task class, but it can disqualify a
+model. Provider references may set a separate long-context floor based on
+published retention evidence. Do not assume a cheap model with a large nominal
+context window can use that window reliably.
+
+## Tool Reliability
+
+Schema validity and semantic correctness are separate. For tool-using workers:
+
+- expose the minimum tool set;
+- prefer strict schemas when supported;
+- document inputs, outputs, errors, and side effects;
+- separate read from write authority;
+- require exact evidence in the output;
+- validate results and mutations outside the model;
+- make writes idempotent or confirmation-bound;
+- retain authorization in the caller or operator.
+
+Higher effort may change tool-call behavior. Do not lower effort merely because
+the final answer is short.
+
+## Service Tiers
+
+A fast or priority tier is a latency control unless the provider explicitly
+documents a capability difference. It does not satisfy a higher task-class
+floor. Choose it only when wall-clock latency is worth the price and record it
+separately from the model and effort.
+
+## Independent Review
+
+For high-risk diffs and foundational decisions, prefer an author and reviewer
+from different model families or providers. Agreement is not proof; disagreement
+is evidence that the root must resolve. The root verifies every load-bearing
+claim and retains final judgment.
+
+## Staleness
+
+Read `evidence-and-refresh.md` when provider guidance is review-required or
+stale, a newer model appears, or a current control cannot be expressed. Do not
+automatically replace an incumbent with the newest version.

package/assets/skills/subagent-orchestration/references/provider-claude.md

@@ -0,0 +1,81 @@
+---
+guidance_version: 2026-07-22
+last_verified: 2026-07-22
+review_after: 2026-09-04
+---
+
+# Claude Model Selection
+
+Load this reference when the active harness is Claude Code or the route is a
+direct Anthropic API worker. Current user and repository instructions override
+the dated model examples below. Launch mechanics for OAT dispatch live in
+`oat-dispatch-subagents/references/provider-claude.md`.
+
+## Current Families
+
+- `claude-haiku-4-5`: fastest economical class for straightforward,
+  high-volume, mechanically verified work.
+- `claude-sonnet-5`: normal workhorse for coding, tool use, knowledge work, and
+  agentic execution.
+- `claude-opus-4-8`: strong complex coding and enterprise route and the
+  default for hard-reasoning and consequential work.
+- `claude-fable-5`: exceptional escalation route for the most difficult
+  long-running agents, coding, and frontier knowledge work.
+
+Claude Mythos 5 is invitation-only and intended for approved defensive cyber
+work. It is not a general routing candidate unless the organization explicitly
+provisions and authorizes it.
+
+## Provider-Native Effort
+
+Never normalize Claude effort against OpenAI or Cursor labels.
+
+- Sonnet 5: high is the default workhorse; medium is the cost-saving step down;
+  xhigh is for the hardest coding and agentic work; max is exceptional.
+- Opus 4.8: start at xhigh for coding and agentic work; use high for other
+  intelligence-sensitive work; lower only after evaluation.
+- Fable 5: start at high; use xhigh for capability-sensitive work; max is
+  exceptional; medium/low are routine-work controls, not the default economy
+  substitute for Sonnet.
+- Haiku 4.5 does not expose the same adaptive-effort surface. Use only controls
+  present in the live schema.
+
+Effort changes tool-call behavior as well as prose. Record it independently.
+For Opus 4.8 direct API calls, verify adaptive thinking is enabled as required
+by the current API contract. Fable adaptive thinking is always on in the
+current API.
+
+## Dated Task-Class Matrix
+
+| Task class               | Default        | Economy                                              | Escalation                                   | Floor notes                                                                               |
+| ------------------------ | -------------- | ---------------------------------------------------- | -------------------------------------------- | ----------------------------------------------------------------------------------------- |
+| `mechanical-recon`       | Haiku 4.5      | Same, with strict output and mechanical verification | Sonnet 5 medium                              | Haiku is below floor for semantic audits and silent-miss-prone exploration.               |
+| `intelligent-recon`      | Sonnet 5 high  | Sonnet 5 medium                                      | Sonnet xhigh or Opus 4.8 xhigh               | Do not use Sonnet low for coding or open-ended recon.                                     |
+| `default-implementation` | Sonnet 5 high  | Sonnet 5 medium                                      | Sonnet xhigh or Opus 4.8 xhigh               | Fable low/medium is not the routine economy route.                                        |
+| `hard-reasoning`         | Opus 4.8 xhigh | Sonnet 5 xhigh                                       | Fable 5 xhigh for exceptional escalation     | Unresolved ambiguity or exceptional novelty must justify Fable's incremental cost.        |
+| `consequential`          | Opus 4.8 xhigh | No routine economy route                             | Fable 5 xhigh or max plus independent review | A consequential label alone does not justify Fable; retain root authorization and review. |
+
+## Root and Subagent Cost Posture
+
+Preserve strong, low-volume root orchestration. Root calls are
+coherence-critical and comparatively infrequent, while bounded subagents carry
+most execution volume. Capture routine savings in higher-volume subagents by
+routing mechanical work to Haiku and normal implementation to Sonnet instead
+of weakening the root orchestrator.
+
+Opus remains the hard-reasoning and consequential root default. Escalate the
+root from Opus to Fable only when unresolved ambiguity, exceptional novelty or
+consequence, or a directly relevant Fable strength is expected to justify the
+incremental cost. A consequential classification by itself is insufficient.
+
+## Cyber-Sensitive Evidence
+
+Fable 5 has a stronger cyber classifier that may flag benign coding and
+debugging work. For security review, vulnerability triage, auth boundaries,
+permissions, and other dual-use workflows where false-positive blocking would
+break the run, Opus 4.8 xhigh remains the operational default. Pair
+consequential findings with an independent provider review.
+
+Do not infer that a stronger safety classifier is a capability weakness. It is
+evidence about predictable workflow completion and refusal behavior, not an
+exception that inverts the general Opus-first policy.

package/assets/skills/subagent-orchestration/references/provider-codex.md

@@ -0,0 +1,63 @@
+---
+guidance_version: 2026-07-22
+last_verified: 2026-07-22
+review_after: 2026-09-04
+---
+
+# Codex and OpenAI Model Selection
+
+Load this reference when the active harness is Codex or the route is a direct
+OpenAI API worker. Current user and repository instructions override the dated
+model examples below. Launch mechanics for OAT dispatch live in
+`oat-dispatch-subagents/references/provider-codex.md`.
+
+## Current Families
+
+Use the GPT-5.6 family for new general coding and knowledge work unless an
+existing evaluated workflow requires an older snapshot:
+
+- `gpt-5.6-sol`: frontier capability;
+- `gpt-5.6-terra`: intelligence and cost balance;
+- `gpt-5.6-luna`: cost-sensitive, high-volume work.
+
+Direct API specialist routes:
+
+- `gpt-5.4-mini`: economical coding, computer use, and subagent work;
+- `gpt-5.4-nano`: classification, extraction, ranking, and simple high-volume
+  subagents. Do not use it for semantic repository exploration.
+
+Treat GPT-5.5, GPT-5.4 full, GPT-5.3 Codex, GPT-5.2, and older models as
+compatibility, regression, or account-availability routes unless current
+workflow evidence prefers them. Do not keep an older model merely because its
+name includes `codex`.
+
+## Dated Task-Class Matrix
+
+| Task class               | Default                 | Economy                                                                                            | Escalation                                           | Floor notes                                                    |
+| ------------------------ | ----------------------- | -------------------------------------------------------------------------------------------------- | ---------------------------------------------------- | -------------------------------------------------------------- |
+| `mechanical-recon`       | `gpt-5.6-luna`, `high`  | Direct API only: `gpt-5.4-mini` medium; `gpt-5.4-nano` medium for strict extraction/classification | `gpt-5.6-terra`, medium or high                      | Do not use Luna none/low for broad repository work.            |
+| `intelligent-recon`      | `gpt-5.6-terra`, `high` | Terra `medium` with tight scope and verification                                                   | Sol `medium`, then `high`                            | A silent miss disqualifies Terra none/low.                     |
+| `default-implementation` | `gpt-5.6-sol`, `medium` | Terra `high` for independently bounded, strongly tested work                                       | Sol `high`                                           | Luna is not the normal implementation lead.                    |
+| `hard-reasoning`         | `gpt-5.6-sol`, `high`   | Sol `medium` only after narrowing the problem                                                      | Sol `xhigh`                                          | Do not automatically escalate Terra to xhigh/max; move to Sol. |
+| `consequential`          | `gpt-5.6-sol`, `xhigh`  | No routine economy route                                                                           | Sol `max`, or a separately evaluated Sol `pro` route | Require independent review and root-owned authorization.       |
+
+`reasoning.mode: "pro"` is a separate quality/latency/cost control on GPT-5.6,
+not a model slug and not an effort label. Record it independently. Evaluate it
+against max or xhigh on representative consequential work before adopting it.
+
+## Long-Context Floor
+
+For very large context, prefer Sol or Terra. Published GPT-5.6 results show a
+large Luna retention drop in the 256K-to-1M range. Large context does not change
+the task class, but it may disqualify Luna, mini, or nano.
+
+## Tool-Heavy Work
+
+Use Programmatic Tool Calling only for bounded processing such as filtering,
+joining, ranking, deduplication, aggregation, or validation over tool results.
+Keep stages requiring fresh judgment in direct calls or the root. Declare the
+allowed tools, output schema, evidence, concurrency, retries, and stopping
+conditions.
+
+Use strict structured outputs for mechanical API workers. Strict schema
+conformance does not prove that the chosen tool or semantic result is correct.

package/assets/skills/subagent-orchestration/references/provider-cursor.md

@@ -0,0 +1,78 @@
+---
+guidance_version: 2026-07-22
+last_verified: 2026-07-22
+review_after: 2026-09-04
+catalog_basis: user-supplied Cursor snapshot plus current Cursor documentation
+---
+
+# Cursor Model Selection
+
+Load this reference when the active harness is Cursor (IDE, CLI, or SDK).
+Current user and repository instructions override the dated model examples
+below. Treat every observed catalog as a volatile snapshot, never a durable
+inventory. Launch mechanics for OAT dispatch live in
+`oat-dispatch-subagents/references/provider-cursor.md`.
+
+## Harness Rule
+
+Cursor wraps model providers with its own prompts, tools, context management,
+agent loop, aliases, and service tiers. Direct-provider evidence informs a
+candidate, but Cursor-native evidence should decide a Cursor route when the two
+conflict.
+
+The Cursor SDK exposes the Cursor runtime, harness, and models. It is not a
+transparent raw OpenAI or Anthropic API call.
+
+## Service-Tier Rule
+
+Treat every alias ending in `-fast` as a service-tier selection, not a higher
+capability class, unless current Cursor documentation explicitly says
+otherwise. Composer 2.5 fast is documented as the same intelligence at a higher
+price. Use standard aliases for background work and fast aliases only when
+measured wall-clock latency justifies the premium.
+
+Record the model and the service tier separately even when Cursor encodes both
+in one opaque alias.
+
+## Dated Task-Class Matrix
+
+Use exact aliases from the live catalog. The examples below were present in the
+user's 2026-07-21 snapshot.
+
+| Task class               | Default                                                                         | Economy                                                                              | Escalation                                             | Floor notes                                                                                                                                                                           |
+| ------------------------ | ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ | ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `mechanical-recon`       | `composer-2.5`                                                                  | `composer-2.5`                                                                       | `gpt-5.6-luna-high`                                    | Use `composer-2.5-fast` or Luna fast only for latency, not capability.                                                                                                                |
+| `intelligent-recon`      | `cursor-grok-4.5-medium` or `gpt-5.6-sol-medium`                                | `gpt-5.6-terra-high`                                                                 | `gpt-5.6-sol-high`                                     | Grok medium is a primary route; Sol medium is the conservative silent-miss alternative; Terra high is the cost-saving route.                                                          |
+| `default-implementation` | `gpt-5.6-sol-medium`                                                            | `composer-2.5` for bounded, testable changes                                         | `gpt-5.6-sol-high` or `claude-fable-5-thinking-high`   | Sol is the conservative incumbent; `cursor-grok-4.5-medium` is a primary alternative for general implementation. Choose Fable for open-ended coherence; Sol for code-first execution. |
+| `hard-reasoning`         | `gpt-5.6-sol-high`                                                              | `cursor-grok-4.5-high` for architecture, ambiguous debugging, and incident diagnosis | `gpt-5.6-sol-xhigh` or `claude-fable-5-thinking-xhigh` | Narrow the task before downgrading. Do not infer equivalence between the two escalation efforts.                                                                                      |
+| `consequential`          | Cross-family author/reviewer pair, normally Sol xhigh plus Fable thinking xhigh | No routine economy route                                                             | Sol max plus Fable thinking max                        | For cyber-sensitive review, use `claude-opus-4-8-thinking-xhigh` or max instead of relying on Fable alone. Grok may contribute analysis but is never the sole reviewer.               |
+
+## Broader Cursor Routes
+
+- `cursor-grok-4.5-medium`: primary alternative for intelligent recon and
+  general implementation; strong for code exploration, brainstorming, research
+  synthesis, debugging, broad knowledge work, and judgment-heavy tool
+  workflows.
+- `cursor-grok-4.5-high`: economy route for hard reasoning, architecture,
+  ambiguous debugging, and incident diagnosis.
+- `cursor-grok-4.5-low`: simpler tool workflows; prefer `composer-2.5` for
+  highly mechanical work on cost.
+- Grok is never the sole final authority for a consequential factual, security,
+  incident, or architectural conclusion. Require tool evidence, citations,
+  logs, query results, or file references for load-bearing Grok claims, or
+  pair it with an independent Sol, Fable, or Opus reviewer.
+- CursorBench caveat: Cursor disclosed that Cursor repository data entered
+  Grok 4.5's training mixture. Treat its ranking as evidence of
+  competitiveness, not proof of superiority over nearby frontier models.
+- `claude-sonnet-5-thinking-high`: strong provider-diversity alternative for
+  normal implementation and agentic work when available.
+- `gpt-5.4-mini-medium`: economical general tool and coding worker.
+- `gpt-5.4-nano-medium`: strict extraction, classification, ranking, and simple
+  read-only tool calls. Not a semantic repository worker.
+- Gemini, Kimi, GLM, GPT-5.5/5.4/5.3 Codex/5.2, and older Claude aliases:
+  compatibility, availability, or task-specific alternatives. Do not make them
+  defaults without current relevant evidence.
+
+`auto` is allowed for interactive convenience only. It is prohibited for
+class-constrained dispatch, repeatable evaluations, auditable automation, and
+consequential work because the exact model is not a stable input.

package/dist/commands/init/tools/brainstorm/index.d.ts

@@ -2,7 +2,6 @@ import { type CommandContext, type GlobalOptions } from '../../../../app/command
 import { type PromptContext } from '../../../shared/shared.prompts.js';
 import { type ScanToolsOptions } from '../../../tools/shared/scan-tools.js';
 import type { ToolInfo } from '../../../tools/shared/types.js';
-import { type OatConfig } from '../../../../config/oat-config.js';
 import { Command } from 'commander';
 import { type InstallBrainstormOptions, type InstallBrainstormResult } from './install-brainstorm.js';
 type InstallScope = 'project' | 'user';
@@ -14,8 +13,6 @@ interface InitToolsBrainstormDependencies {
     installBrainstorm: (options: InstallBrainstormOptions) => Promise<InstallBrainstormResult>;
     confirmAction: (message: string, ctx: PromptContext) => Promise<boolean>;
     scanTools: (options: ScanToolsOptions) => Promise<ToolInfo[]>;
-    readOatConfig: (repoRoot: string) => Promise<OatConfig>;
-    writeOatConfig: (repoRoot: string, config: OatConfig) => Promise<void>;
 }
 export declare function createInitToolsBrainstormCommand(overrides?: Partial<InitToolsBrainstormDependencies>): Command;
 export {};

package/dist/commands/init/tools/brainstorm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/commands/init/tools/brainstorm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC7B,MAAM,sBAAsB,CAAC;AAM9B,KAAK,YAAY,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvC,UAAU,+BAA+B;IACvC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,gBAAgB,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7E,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,iBAAiB,EAAE,CACjB,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACtC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,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;CACxE;AA+KD,wBAAgB,gCAAgC,CAC9C,SAAS,GAAE,OAAO,CAAC,+BAA+B,CAAM,GACvD,OAAO,CA2BT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/commands/init/tools/brainstorm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AAMzC,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAG7D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAC7B,MAAM,sBAAsB,CAAC;AAM9B,KAAK,YAAY,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvC,UAAU,+BAA+B;IACvC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,gBAAgB,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7E,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,iBAAiB,EAAE,CACjB,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,uBAAuB,CAAC,CAAC;IACtC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;CAC/D;AA+JD,wBAAgB,gCAAgC,CAC9C,SAAS,GAAE,OAAO,CAAC,+BAA+B,CAAM,GACvD,OAAO,CA2BT"}

package/dist/commands/init/tools/brainstorm/index.js

@@ -5,7 +5,6 @@ import { confirmAction, } from '../../../shared/shared.prompts.js';
 import { readGlobalOptions } from '../../../shared/shared.utils.js';
 import { canonicalPathsForPack, setInstalledCanonicalPaths, } from '../../../tools/shared/install-sync-context.js';
 import { scanTools as defaultScanTools, } from '../../../tools/shared/scan-tools.js';
-import { readOatConfig as defaultReadOatConfig, writeOatConfig as defaultWriteOatConfig, } from '../../../../config/oat-config.js';
 import { resolveAssetsRoot } from '../../../../fs/assets.js';
 import { resolveProjectRoot, resolveScopeRoot } from '../../../../fs/paths.js';
 import { Command } from 'commander';
@@ -18,8 +17,6 @@ const DEFAULT_DEPENDENCIES = {
     installBrainstorm: defaultInstallBrainstorm,
     confirmAction,
     scanTools: defaultScanTools,
-    readOatConfig: defaultReadOatConfig,
-    writeOatConfig: defaultWriteOatConfig,
 };
 async function resolveInstallScope(context, projectRoot, userRoot, assetsRoot, dependencies) {
     // Honor explicit --scope before any existing-install or default
@@ -81,11 +78,6 @@ function reportSuccess(context, scope, targetRoot, assetsRoot, result) {
     context.logger.info(`Skills: ${counts.skills}`);
     context.logger.info(`Run: oat sync --scope ${scope}`);
 }
-async function persistConfigAfterInstall(projectRoot, dependencies) {
-    const config = await dependencies.readOatConfig(projectRoot);
-    const tools = { ...(config.tools ?? {}), brainstorm: true };
-    await dependencies.writeOatConfig(projectRoot, { ...config, tools });
-}
 async function runInitToolsBrainstorm(context, options, dependencies) {
     try {
         const projectRoot = await dependencies.resolveProjectRoot(context.cwd);
@@ -108,10 +100,6 @@ async function runInitToolsBrainstorm(context, options, dependencies) {
             targetRoot,
             force: options.force,
         });
-        // Persist tools.brainstorm: true to .oat/config.json after a
-        // successful install so config-write semantics match the main
-        // installer flow used by `oat init tools`.
-        await persistConfigAfterInstall(projectRoot, dependencies);
         reportSuccess(context, scope, targetRoot, assetsRoot, result);
         process.exitCode = 0;
         return true;

package/dist/commands/init/tools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/tools/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/init/tools/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/init/tools/index.js

@@ -7,7 +7,8 @@ import { addLocalPaths } from '../../local/manage.js';
 import { removeAgentsMdSection, upsertAgentsMdSection, } from '../../shared/agents-md.js';
 import { selectManyWithAbort, selectWithAbort, } from '../../shared/shared.prompts.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
-import { canonicalPathsForPacks, setInstalledCanonicalPaths, } from '../../tools/shared/install-sync-context.js';
+import { canonicalPathsForPacks, getInstalledCanonicalPaths, setInstalledCanonicalPaths, } from '../../tools/shared/install-sync-context.js';
+import { reconcileProjectToolsConfig } from '../../tools/shared/project-tools-config.js';
 import { scanTools } from '../../tools/shared/scan-tools.js';
 import { readOatConfig, resolveLocalPaths, writeOatConfig, } from '../../../config/oat-config.js';
 import { resolveAssetsRoot } from '../../../fs/assets.js';
@@ -443,16 +444,6 @@ function buildPackEndStateChoices(pack, currentLocation, defaultEndState) {
     const rest = annotated.filter((choice) => choice.value !== defaultEndState);
     return defaultChoice ? [defaultChoice, ...rest] : annotated;
 }
-function buildInstalledToolsConfig(selectedPacks, installedPackStates, existingTools) {
-    const selectedPackSet = new Set(selectedPacks);
-    const tools = { ...existingTools };
-    for (const pack of ALL_TOOL_PACKS) {
-        tools[pack] =
-            selectedPackSet.has(pack) ||
-                installedPackStates[pack].location !== 'not-installed';
-    }
-    return tools;
-}
 function reportSuccess(context, packs, syncScopes) {
     if (context.json) {
         context.logger.json({
@@ -877,9 +868,6 @@ export async function runInitTools(context, dependencies) {
             projectManagementSectionResult.action !== 'no-change') {
             context.logger.info(`AGENTS.md project-management section ${projectManagementSectionResult.action}.`);
         }
-        const config = await dependencies.readOatConfig(projectRoot);
-        const tools = buildInstalledToolsConfig(selectedPacks, initialPackStates, config.tools);
-        await dependencies.writeOatConfig(projectRoot, { ...config, tools });
         const affectedScopesList = [...affectedScopes];
         lastRunInitToolsMetadata = {
             affectedScopes: affectedScopesList,
@@ -909,19 +897,52 @@ export function createInitToolsCommand(overrides = {}) {
         ...DEFAULT_DEPENDENCIES,
         ...overrides,
     };
-    return new Command('tools')
-        .description('Install OAT tool packs (core, ideas, docs, workflows, utility, project-management, research, brainstorm)')
-        .addCommand(createInitToolsCoreCommand())
-        .addCommand(createInitToolsIdeasCommand())
-        .addCommand(createInitToolsDocsCommand())
-        .addCommand(createInitToolsProjectManagementCommand())
-        .addCommand(createInitToolsWorkflowsCommand())
-        .addCommand(createInitToolsUtilityCommand())
-        .addCommand(createInitToolsResearchCommand())
-        .addCommand(createInitToolsBrainstormCommand())
-        .action(async (_options, command) => {
+    async function reconcileAfterInstall(actionCommand) {
+        if (process.exitCode !== undefined && process.exitCode !== 0) {
+            return;
+        }
+        if (getInstalledCanonicalPaths(actionCommand).length === 0) {
+            return;
+        }
+        const context = dependencies.buildCommandContext(readGlobalOptions(actionCommand));
+        const repoRoot = await dependencies.resolveProjectRoot(context.cwd);
+        await reconcileProjectToolsConfig({
+            repoRoot,
+            cwd: context.cwd,
+            home: context.home,
+        }, dependencies);
+    }
+    const packCommands = [
+        createInitToolsCoreCommand(),
+        createInitToolsIdeasCommand(),
+        createInitToolsDocsCommand(),
+        createInitToolsProjectManagementCommand(),
+        createInitToolsWorkflowsCommand(),
+        createInitToolsUtilityCommand(),
+        createInitToolsResearchCommand(),
+        createInitToolsBrainstormCommand({
+            buildCommandContext: dependencies.buildCommandContext,
+            resolveProjectRoot: dependencies.resolveProjectRoot,
+            resolveScopeRoot: dependencies.resolveScopeRoot,
+            resolveAssetsRoot: dependencies.resolveAssetsRoot,
+            installBrainstorm: dependencies.installBrainstorm,
+            scanTools: dependencies.scanTools,
+        }),
+    ];
+    for (const packCommand of packCommands) {
+        packCommand.hook('postAction', async (_thisCommand, actionCommand) => {
+            await reconcileAfterInstall(actionCommand);
+        });
+    }
+    const command = new Command('tools').description('Install OAT tool packs (core, ideas, docs, workflows, utility, project-management, research, brainstorm)');
+    for (const packCommand of packCommands) {
+        command.addCommand(packCommand);
+    }
+    command.action(async (_options, command) => {
         const context = dependencies.buildCommandContext(readGlobalOptions(command));
         const selectedPacks = await runInitTools(context, dependencies);
         setInstalledCanonicalPaths(command, canonicalPathsForPacks(selectedPacks));
+        await reconcileAfterInstall(command);
     });
+    return command;
 }

package/dist/commands/init/tools/shared/skill-manifest.d.ts

@@ -19,7 +19,7 @@ export declare const IDEA_SKILLS: readonly ['oat-idea-new', 'oat-idea-ideate', '
 export declare const CORE_SKILLS: readonly ['oat-docs', 'oat-doctor'];
 export declare const DOCS_SKILLS: readonly ['authoring-docs', 'oat-agent-instructions-analyze', 'oat-agent-instructions-apply', 'oat-docs-analyze', 'oat-docs-apply', 'oat-docs-authoring', 'oat-docs-bootstrap'];
 export declare const DOCS_SCRIPTS: readonly ['resolve-tracking.sh'];
-export declare const UTILITY_SKILLS: readonly ['create-agnostic-skill', 'explainer-kit', 'oat-dispatch-subagents', 'oat-repo-improve', 'oat-repo-maintainability-review', 'oat-review-provide', 'oat-review-provide-remote', 'oat-review-receive', 'oat-review-receive-remote'];
+export declare const UTILITY_SKILLS: readonly ['create-agnostic-skill', 'explainer-kit', 'oat-dispatch-subagents', 'subagent-orchestration', 'oat-repo-improve', 'oat-repo-maintainability-review', 'oat-review-provide', 'oat-review-provide-remote', 'oat-review-receive', 'oat-review-receive-remote'];
 export declare const PROJECT_MANAGEMENT_SKILLS: readonly ['oat-pjm-add-backlog-item', 'oat-pjm-decision', 'oat-pjm-update-repo-reference', 'oat-pjm-review-backlog'];
 export declare const PROJECT_MANAGEMENT_TEMPLATES: readonly ['backlog-item.md', 'roadmap.md', 'current-state.md', 'decision.md', 'repo-agents.md', 'pjm-agents.md', 'reference-agents.md'];
 export declare const PROJECT_MANAGEMENT_SCRIPTS: readonly [];

package/dist/commands/init/tools/shared/skill-manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-manifest.d.ts","sourceRoot":"","sources":["../../../../../src/commands/init/tools/shared/skill-manifest.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAKtD,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE5E;AAID,eAAO,MAAM,eAAe,YAC1B,2BAA2B,EAC3B,mBAAmB,EACnB,wBAAwB,EACxB,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,oBAAoB,EACpB,gCAAgC,EAChC,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EACzB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,iCAAiC,EACjC,yBAAyB,EACzB,uBAAuB,EACvB,oBAAoB,EACpB,4BAA4B,EAC5B,mCAAmC,EACnC,4BAA4B,EAC5B,mCAAmC,EACnC,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,EAC1B,wBAAwB,EACxB,6BAA6B,EAC7B,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,CACL,CAAC;AAEX,eAAO,MAAM,eAAe,YAC1B,wBAAwB,EACxB,0BAA0B,EAC1B,iBAAiB,CACT,CAAC;AAEX,eAAO,MAAM,kBAAkB,YAC7B,UAAU,EACV,cAAc,EACd,SAAS,EACT,WAAW,EACX,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,CACR,CAAC;AAEX,eAAO,MAAM,gBAAgB,YAC3B,uBAAuB,EACvB,wBAAwB,EACxB,qBAAqB,CACb,CAAC;AAIX,eAAO,MAAM,WAAW,YACtB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,CACb,CAAC;AAIX,eAAO,MAAM,WAAW,YAAI,UAAU,EAAE,YAAY,CAAU,CAAC;AAI/D,eAAO,MAAM,WAAW,YACtB,gBAAgB,EAChB,gCAAgC,EAChC,8BAA8B,EAC9B,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,CACZ,CAAC;AAEX,eAAO,MAAM,YAAY,YAAI,qBAAqB,CAAU,CAAC;AAI7D,eAAO,MAAM,cAAc,YACzB,uBAAuB,EACvB,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EAClB,iCAAiC,EACjC,oBAAoB,EACpB,2BAA2B,EAC3B,oBAAoB,EACpB,2BAA2B,CACnB,CAAC;AAIX,eAAO,MAAM,yBAAyB,YACpC,0BAA0B,EAC1B,kBAAkB,EAClB,+BAA+B,EAC/B,wBAAwB,CAChB,CAAC;AAEX,eAAO,MAAM,4BAA4B,YACvC,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,CACb,CAAC;AAEX,eAAO,MAAM,0BAA0B,aAAc,CAAC;AAItD,eAAO,MAAM,iBAAiB,YAAI,gBAAgB,CAAU,CAAC;AAI7D,eAAO,MAAM,eAAe,YAC1B,SAAS,EACT,SAAS,EACT,eAAe,EACf,SAAS,EACT,YAAY,CACJ,CAAC;AAEX,eAAO,MAAM,eAAe,YAAI,wBAAwB,CAAU,CAAC"}
+{"version":3,"file":"skill-manifest.d.ts","sourceRoot":"","sources":["../../../../../src/commands/init/tools/shared/skill-manifest.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAKtD,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE5E;AAID,eAAO,MAAM,eAAe,YAC1B,2BAA2B,EAC3B,mBAAmB,EACnB,wBAAwB,EACxB,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,oBAAoB,EACpB,gCAAgC,EAChC,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EACzB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,iCAAiC,EACjC,yBAAyB,EACzB,uBAAuB,EACvB,oBAAoB,EACpB,4BAA4B,EAC5B,mCAAmC,EACnC,4BAA4B,EAC5B,mCAAmC,EACnC,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,EAC1B,wBAAwB,EACxB,6BAA6B,EAC7B,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,CACL,CAAC;AAEX,eAAO,MAAM,eAAe,YAC1B,wBAAwB,EACxB,0BAA0B,EAC1B,iBAAiB,CACT,CAAC;AAEX,eAAO,MAAM,kBAAkB,YAC7B,UAAU,EACV,cAAc,EACd,SAAS,EACT,WAAW,EACX,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,CACR,CAAC;AAEX,eAAO,MAAM,gBAAgB,YAC3B,uBAAuB,EACvB,wBAAwB,EACxB,qBAAqB,CACb,CAAC;AAIX,eAAO,MAAM,WAAW,YACtB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,CACb,CAAC;AAIX,eAAO,MAAM,WAAW,YAAI,UAAU,EAAE,YAAY,CAAU,CAAC;AAI/D,eAAO,MAAM,WAAW,YACtB,gBAAgB,EAChB,gCAAgC,EAChC,8BAA8B,EAC9B,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,CACZ,CAAC;AAEX,eAAO,MAAM,YAAY,YAAI,qBAAqB,CAAU,CAAC;AAI7D,eAAO,MAAM,cAAc,YACzB,uBAAuB,EACvB,eAAe,EACf,wBAAwB,EACxB,wBAAwB,EACxB,kBAAkB,EAClB,iCAAiC,EACjC,oBAAoB,EACpB,2BAA2B,EAC3B,oBAAoB,EACpB,2BAA2B,CACnB,CAAC;AAIX,eAAO,MAAM,yBAAyB,YACpC,0BAA0B,EAC1B,kBAAkB,EAClB,+BAA+B,EAC/B,wBAAwB,CAChB,CAAC;AAEX,eAAO,MAAM,4BAA4B,YACvC,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,CACb,CAAC;AAEX,eAAO,MAAM,0BAA0B,aAAc,CAAC;AAItD,eAAO,MAAM,iBAAiB,YAAI,gBAAgB,CAAU,CAAC;AAI7D,eAAO,MAAM,eAAe,YAC1B,SAAS,EACT,SAAS,EACT,eAAe,EACf,SAAS,EACT,YAAY,CACJ,CAAC;AAEX,eAAO,MAAM,eAAe,YAAI,wBAAwB,CAAU,CAAC"}

package/dist/commands/init/tools/shared/skill-manifest.js

@@ -99,6 +99,7 @@ export const UTILITY_SKILLS = [
     'create-agnostic-skill',
     'explainer-kit',
     'oat-dispatch-subagents',
+    'subagent-orchestration',
     'oat-repo-improve',
     'oat-repo-maintainability-review',
     'oat-review-provide',

package/dist/commands/init/tools/utility/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/commands/init/tools/utility/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAEnB,MAAM,iCAAiC,CAAC;AAQzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAE1B,MAAM,mBAAmB,CAAC;AAM3B,KAAK,YAAY,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvC,UAAU,4BAA4B;IACpC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,gBAAgB,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7E,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,cAAc,EAAE,CACd,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,mBAAmB,EAAE,CAAC,CAAC,SAAS,MAAM,EACpC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAC/B,GAAG,EAAE,aAAa,KACf,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACzB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1E;AAoID,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,OAAO,CAAC,4BAA4B,CAAM,GACpD,OAAO,CAeT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/commands/init/tools/utility/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAEnB,MAAM,iCAAiC,CAAC;AAQzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAE1B,MAAM,mBAAmB,CAAC;AAM3B,KAAK,YAAY,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvC,UAAU,4BAA4B;IACpC,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,kBAAkB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,gBAAgB,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAC7E,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,cAAc,EAAE,CACd,OAAO,EAAE,qBAAqB,KAC3B,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,mBAAmB,EAAE,CAAC,CAAC,SAAS,MAAM,EACpC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAC/B,GAAG,EAAE,aAAa,KACf,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACzB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1E;AAsJD,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,OAAO,CAAC,4BAA4B,CAAM,GACpD,OAAO,CAeT"}

package/dist/commands/init/tools/utility/index.js

@@ -19,6 +19,19 @@ const DEFAULT_DEPENDENCIES = {
 function resolveScope(context) {
     return context.scope === 'user' ? 'user' : 'project';
 }
+function expandUtilitySelection(selectedSkills) {
+    const dispatchSkill = 'oat-dispatch-subagents';
+    const guidanceSkill = 'subagent-orchestration';
+    const dispatchIndex = selectedSkills.indexOf(dispatchSkill);
+    if (dispatchIndex === -1 || selectedSkills.includes(guidanceSkill)) {
+        return selectedSkills;
+    }
+    return [
+        ...selectedSkills.slice(0, dispatchIndex + 1),
+        guidanceSkill,
+        ...selectedSkills.slice(dispatchIndex + 1),
+    ];
+}
 function reportSuccess(context, scope, targetRoot, assetsRoot, selectedSkills, result) {
     if (context.json) {
         context.logger.json({
@@ -44,20 +57,21 @@ async function runInitToolsUtility(context, options, dependencies, command) {
         const targetRoot = scope === 'project'
             ? await dependencies.resolveProjectRoot(context.cwd)
             : dependencies.resolveScopeRoot('user', context.cwd, context.home);
-        const selectedSkills = context.interactive
+        const requestedSkills = context.interactive
             ? await dependencies.selectManyWithAbort('Select utility skills to install', UTILITY_SKILLS.map((skill) => ({
                 label: skill,
                 value: skill,
                 checked: true,
             })), { interactive: context.interactive })
             : [...UTILITY_SKILLS];
-        if (selectedSkills === null) {
+        if (requestedSkills === null) {
             if (!context.json) {
                 context.logger.info('Cancelled: no utility skills installed.');
             }
             process.exitCode = 0;
             return;
         }
+        const selectedSkills = expandUtilitySelection(requestedSkills);
         if (selectedSkills.length === 0) {
             if (!context.json) {
                 context.logger.info('No utility skills selected.');

package/dist/commands/tools/has/has-pack.d.ts

@@ -0,0 +1,18 @@
+import type { CommandContext } from '../../../app/command-context.js';
+import type { ScanToolsOptions } from '../../tools/shared/scan-tools.js';
+import type { PackName, ToolInfo } from '../../tools/shared/types.js';
+import type { ConcreteScope } from '../../../shared/types.js';
+export declare const PACK_NAMES: readonly ["core", "ideas", "docs", "workflows", "utility", "project-management", "research", "brainstorm"];
+export interface PackAvailability {
+    pack: PackName;
+    available: boolean;
+    scopes: ConcreteScope[];
+}
+export interface PackAvailabilityDependencies {
+    scanTools: (options: ScanToolsOptions) => Promise<ToolInfo[]>;
+    resolveScopeRoot: (scope: ConcreteScope, cwd: string, home: string) => Promise<string>;
+    resolveAssetsRoot: () => Promise<string>;
+}
+export declare function isPackName(value: string): value is PackName;
+export declare function resolvePackAvailability(pack: PackName, scopes: ConcreteScope[], context: CommandContext, dependencies: PackAvailabilityDependencies): Promise<PackAvailability>;
+//# sourceMappingURL=has-pack.d.ts.map

package/dist/commands/tools/has/has-pack.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"has-pack.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/has/has-pack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,eAAO,MAAM,UAAU,4GASiB,CAAC;AAEzC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,gBAAgB,EAAE,CAChB,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,KACT,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,QAAQ,CAE3D;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,aAAa,EAAE,EACvB,OAAO,EAAE,cAAc,EACvB,YAAY,EAAE,4BAA4B,GACzC,OAAO,CAAC,gBAAgB,CAAC,CAyB3B"}