@event4u/agent-config 5.10.0 → 6.0.0

package/docs/decisions/ADR-020-global-only-consumer-scope.md

@@ -24,7 +24,7 @@ Companion artefacts:
 - Bridge contract: [`docs/contracts/consumer-bridge.md`](../contracts/consumer-bridge.md)
 - Wizard contract: [`docs/contracts/gui-wizard.md`](../contracts/gui-wizard.md)
 - Predecessor ADR: [`ADR-007`](ADR-007-agent-discovery-scopes.md) — scope precedence, global-default amendment
-- Perms entry-gate: [`scripts/lint_global_paths.py`](../../scripts/lint_global_paths.py)
+- Perms entry-gate: [`scripts/lint_global_paths.py`](../../src/scripts/lint_global_paths.py)
 - Payload schema: [`internal/schemas/wizard-apply-payload.schema.json`](../../internal/schemas/wizard-apply-payload.schema.json)
 
 ## Context
@@ -97,6 +97,28 @@ the user-content / metadata surface without violating global-only.
 Forbidden, unchanged: writing any distributed content into the
 consumer repo outside `AGENT_CONFIG_DEV_MODE=1`.
 
+## Amendment — 2026-06-03 · settings-scope correction (ADR-049)
+
+The original Consequences bullet "one source of truth for `personal.*`,
+`agent_council.*`, and `personas:`" overstated the global surface and used a
+key name that never existed in code. [`ADR-049`](ADR-049-configuration-trust-boundary.md)
+(AI-council-converged, anthropic/claude-sonnet-4-5 + openai/gpt-4o, 2026-06-03)
+corrects this:
+
+- The global surface is **secrets** (provider keys, already global) plus the
+  curated identity **whitelist** (`MERGEABLE_KEYS`) — not all of `personal.*`,
+  not council config, not personas.
+- **Council configuration and personas stay project-local** (version-controlled).
+  The `MERGEABLE_KEYS` whitelist is a **security trust boundary**: an untrusted
+  project repo must not be able to escalate `ai_council` / arbitrary `personal.*`
+  into user scope. Widening the whitelist now requires a threat model.
+- The key name is **`ai_council`** (canonical, in `agents/settings/.ai-council.yml`),
+  never `agent_council`.
+
+This amendment narrows ADR-020's wording; the global-only **consumer install**
+decision (distributed content writes only to `~/.event4u/agent-config/`) is
+unchanged.
+
 ## Alternatives considered
 
 - **Status quo (project default + global opt-in).** Keeps the drift
@@ -113,7 +135,10 @@ consumer repo outside `AGENT_CONFIG_DEV_MODE=1`.
 ## Consequences
 
 **Positive.**
-- One source of truth for `personal.*`, `agent_council.*`, and `personas:`.
+- One source of truth for the curated cross-project identity keys
+  (`MERGEABLE_KEYS`) and provider secrets. _(Amended 2026-06-03 — the original
+  wording named `personal.*`, `agent_council.*`, and `personas:` as global; see
+  the settings-scope correction below and [`ADR-049`](ADR-049-configuration-trust-boundary.md): council config + personas stay project-local; the key is `ai_council`.)_
 - New skills / rules / commands reach every consumer the moment they
   install or run `task dev:install-global` — no per-repo bump.
 - The onboarding wizard becomes the only authoring surface for

package/docs/decisions/ADR-022-daily-workspace-decomposition.md

@@ -14,7 +14,7 @@ type: forward-looking
 ## Status
 
 **Accepted** · 2026-05-24. Phase 4 Step 1 of
-[`road-to-employee-product-and-external-proof.md`](../../agents/roadmaps/road-to-employee-product-and-external-proof.md).
+[`road-to-employee-product-and-external-proof.md`](../../agents/roadmaps/archive/road-to-employee-product-and-external-proof.md).
 Records the council's verdict on the original "workspace shape"
 question — that the question was malformed — and replaces a single
 chrome decision with three sequenced sub-decisions.
@@ -29,7 +29,7 @@ number under the new strategy.
 
 Companion artefacts:
 
-- Roadmap: [`agents/roadmaps/road-to-employee-product-and-external-proof.md`](../../agents/roadmaps/road-to-employee-product-and-external-proof.md)
+- Roadmap: [`agents/roadmaps/archive/road-to-employee-product-and-external-proof.md`](../../agents/roadmaps/archive/road-to-employee-product-and-external-proof.md)
 - Council question: [`agents/decisions/open-questions/daily-workspace-shape.md`](../../agents/decisions/open-questions/daily-workspace-shape.md)
 - Council verdict: `agents/runtime/council/responses/daily-workspace-shape.json` (gitignored) <!-- council-ref-allowed: ADR decision trace -->
 - Predecessor ADRs: [`ADR-014`](ADR-014-gui-framework-choice.md) (installer chrome), [`ADR-016`](ADR-016-installer-architecture.md) (installer architecture), [`ADR-020`](ADR-020-global-only-consumer-scope.md) (consumer scope).

package/docs/decisions/ADR-024-workspace-v0-feature-floor.md

@@ -123,4 +123,4 @@ be dropped or expanded without rewriting the others.
 - Predecessor ADRs: [`ADR-022`](ADR-022-daily-workspace-decomposition.md), [`ADR-023`](ADR-023-host-agent-protocol.md).
 - Knowledge ingestion contract: [`docs/contracts/local-knowledge-ingestion.md`](../contracts/local-knowledge-ingestion.md).
 - Role experience contract: [`docs/contracts/role-experience.md`](../contracts/role-experience.md).
-- Roadmap: [`agents/roadmaps/road-to-employee-product-and-external-proof.md`](../../agents/roadmaps/road-to-employee-product-and-external-proof.md) Phase 4.
+- Roadmap: [`agents/roadmaps/archive/road-to-employee-product-and-external-proof.md`](../../agents/roadmaps/archive/road-to-employee-product-and-external-proof.md) Phase 4.

package/docs/decisions/ADR-028-root-layout.md

@@ -4,7 +4,7 @@ status: accepted
 date: 2026-05-25
 decision: root-layout
 supersedes: —
-superseded_by: —
+superseded_by: ADR-045
 phase: v3.x · root-layout-cleanup Phase 1
 type: structural
 review_date: 2027-05-25

package/docs/decisions/ADR-030-claude-code-command-projection.md

@@ -75,7 +75,7 @@ Rejected alternatives:
 Session 2026-05-28, design mode, 2 rounds, $0.06 actual.
 Members: `claude-sonnet-4-5` + `gpt-4o`. Both converged on Option B,
 CONDITIONAL on the three verifications below. Responses captured at
-`agents/runtime/council/responses/claude-code-distribution.json`.
+`agents/runtime/council/responses/claude-code-distribution.json`. <!-- council-ref-allowed: ADR decision trace -->
 
 ### Three conditions (all verified 2026-05-28)
 
@@ -136,7 +136,7 @@ See § Decision above — Option A (dual projection) and Option C
 - Roadmap:
   `agents/roadmaps/road-to-claude-code-global-distribution.md` Phase 3.
 - Council session responses:
-  `agents/runtime/council/responses/claude-code-distribution.json`.
+  `agents/runtime/council/responses/claude-code-distribution.json`. <!-- council-ref-allowed: ADR decision trace -->
 - Empirical verification: `~/.claude/commands/probe/sub.md` route
   test, 2026-05-28 (Condition 1 + Condition 2).
 - Mirror implementation: `scripts/install.py::_CLAUDE_SKILL_BUNDLE`

package/docs/decisions/ADR-038-canonical-settings-path.md

@@ -51,6 +51,26 @@ co-located with the rest of the settings layer. The repo-root
 - The `.gitignore` basename match already covers the canonical path — no new
   ignore entry required.
 
+## Amendment — 2026-06-03 · dev-mode resolution semantics
+
+Recorded alongside [`ADR-049`](ADR-049-configuration-trust-boundary.md) so a
+future contributor does not read `AGENT_CONFIG_DEV_MODE=1` as a settings-scope
+escape hatch.
+
+When `AGENT_CONFIG_DEV_MODE=1` (`scripts/install.py` treats the package repo as
+both source and project surface, per [`ADR-020`](ADR-020-global-only-consumer-scope.md)):
+
+- The package repo's `agents/settings/` **is** the project surface — its
+  `.agent-settings.yml` / `.ai-council.yml` are the maintainer's test fixtures
+  for exercising the loader against real files, not a workaround.
+- The user-global layer (`~/.event4u/agent-config/`) still provides the
+  whitelisted identity keys and provider secrets exactly as in a consumer install.
+- **No special merge logic.** The normal cascade composes (user-global whitelist
+  → project-canonical → local override). Dev-mode changes *which directory* is the
+  project surface, never *which keys* may cascade — the `MERGEABLE_KEYS` trust
+  boundary from [`ADR-049`](ADR-049-configuration-trust-boundary.md) holds
+  unchanged.
+
 ## Alternatives considered
 
 - **Keep root canonical (status quo).** Rejected: leaves the override/main-file

package/docs/decisions/ADR-041-controlled-command-verbs.md

@@ -0,0 +1,133 @@
+---
+adr: 041
+status: accepted
+date: 2026-06-03
+decision: controlled-command-verbs
+supersedes: —
+superseded_by: —
+phase: v6.0.0 · governance, evals, evidence-based pruning
+type: forward-looking
+---
+
+# ADR-041 — Controlled verb vocabulary for visible commands
+
+## Status
+
+**Accepted** · 2026-06-03. Authored as Phase 2 / Step 4 of
+[`road-to-6.0.0-c-governance-and-evals`](../../agents/roadmaps/road-to-6.0.0-c-governance-and-evals.md),
+the governance front of the experience-first rebuild. Sits alongside the
+per-pack command budget ([`capability-packs.md` § Budget exemption
+process](../contracts/capability-packs.md)) and the routing-metadata
+requirement (Step 4b). Builds on
+[`ADR-003`](ADR-003-command-invocation-syntax.md) (cluster / colon syntax) and
+the locked-cluster contract
+([`command-clusters.md`](../contracts/command-clusters.md)).
+
+## Context
+
+6.0.0-B made the capability **pack** the surfacing unit; 6.0.0-C installs the
+governance that keeps the surface from re-bloating. A per-pack command budget
+caps *how many* visible commands a pack carries. This ADR governs *how they are
+named*: a visible command's leading token must be a controlled verb, so the
+surface reads as a small, predictable verb vocabulary (`work`, `implement`,
+`review`, `fix`, …) rather than an open-ended noun soup.
+
+Without a controlled vocabulary, every new visible command invents its own
+naming shape and the "fewer, navigable commands" promise of the pack rebuild
+erodes one well-meaning addition at a time. The `create-*` shape is singled out
+for an outright ban: which files to create is an in-flow decision the agent
+makes, not a command surface to enumerate.
+
+> **Council convergence (anthropic/claude-sonnet-4-5 + openai/gpt-4o,
+> 3-round design debate, 2026-06-03):** both members converged on
+> forward-only enforcement (grandfather the existing surface, gate new
+> additions), a **version-controlled YAML allowlist** reviewed via PR with an
+> ADR for any new verb, **grandfathering `create-pr`** through an explicit
+> documented exception rather than a broad exemption, and a **single modular
+> lint** (one pass, configurable severity) over two/three separate lints — the
+> "vocabulary gate + structure advisor" split was rejected because a
+> CI-passes / review-fails wedge trains contributors to ignore warnings.
+
+## Decision
+
+1. **Controlled verb allowlist.** Visible commands (tier 0/1) must have a
+   leading token (the substring before the first `-`, or the cluster sub-name
+   for `cluster:sub` commands) drawn from the allowlist in
+   [`src/config/discovery/command-verbs.yml`](../../config/discovery/command-verbs.yml).
+   The allowlist seeds the curated verbs (`work`, `audit`, `plan`, `implement`,
+   `review`, `fix`, `test`, `ship`, `sync`, `explain`, `estimate`, `refine`,
+   `publish`) plus the established cluster-head / standalone tokens already in
+   use on the visible surface (so the existing 20 visible commands all pass).
+
+2. **No `create-*` commands.** `create` is a banned leading token for *new*
+   visible commands. The agent decides which files to create in-flow; the
+   command surface does not enumerate creation targets.
+
+3. **`create-pr` is grandfathered** via an explicit `grandfathered:` entry in
+   the YAML — a documented single-command exception, not a broad waiver.
+
+4. **Forward-only enforcement.** The lint
+   ([`scripts/lint_command_verbs.py`](../../src/scripts/lint_command_verbs.py))
+   checks only command files **added or promoted to visible since the `main`
+   baseline**, mirroring `lint_no_new_atomic_commands.py`. The existing surface
+   is grandfathered; no rename wave.
+
+5. **A new verb requires an ADR.** Adding a token to `approved_verbs` is a
+   governance change: it lands in its own PR with a short ADR (or an addendum
+   referencing this one) justifying the new verb. The YAML is the machine list;
+   the ADR is the human rationale.
+
+6. **Single modular lint.** One lint pass implements both the approved-verb rule
+   and the banned-prefix rule. No separate "advisory" lint that warns without
+   gating — every rule the lint carries blocks CI (configurable per-rule, but
+   default error), so there is no CI-green / review-red wedge.
+
+## Consequences
+
+- **Positive.** The visible surface stays a small, scannable verb vocabulary.
+  New commands are nudged toward reuse of an existing verb (and therefore an
+  existing cluster) before inventing a new one. The `create-*` ban removes a
+  whole class of "expose a creation target as a command" growth.
+- **Positive.** Forward-only + grandfathering means zero disruption to the
+  current surface; the gate only ever fires on a *new* visible command.
+- **Negative / accepted.** The seeded allowlist includes established cluster-head
+  nouns (`feature`, `judge`, `council`, `memory`, `roadmap`, `agents`), so the
+  vocabulary is not purely verbs on day one. This is the cost of forward-only
+  grandfathering; the teeth come from "a new token needs an ADR", not from
+  retroactively purging the established heads.
+- **Negative / accepted.** Leading-token tokenization is a heuristic
+  (`review-changes` → `review`). Compound or underscore-shaped names are out of
+  scope until a real case appears.
+
+## Alternatives considered
+
+- **Retroactive enforcement** (every existing visible command must conform now).
+  Rejected: forces a rename wave across a heavily-referenced surface for no
+  user-facing gain. Both council members rejected it.
+- **Two/three separate lints** (cluster-head structure advisor + sub-verb gate +
+  banned-pattern gate) with mixed soft/hard severity. Rejected per the council:
+  advisory-only warnings that never graduate to errors become noise and create a
+  CI-passes / review-fails wedge.
+- **Rename `create-pr`.** Rejected: breaking change across docs, READMEs, and
+  other commands for no benefit; an explicit grandfather entry is cheaper and
+  honest.
+
+## Amendment — 2026-06-04 · `git` verb (6.0.0-D Step 12, Class B1)
+
+> **Accepted** · 2026-06-04. ADR-044 §3 makes `commit` / `create-pr` move into a
+> dedicated `git` pack with `slug_prefix: git` (Class B1), so their canonical
+> invocations become `git-commit` / `git-pr-create`. The leading token `git` is
+> therefore added to `approved_verbs`. This both honours the new naming scheme
+> and lets the long-standing `create-pr` grandfather entry retire naturally: the
+> canonical name is now `git-pr-create` (verb `git`, banned `create-` prefix no
+> longer in the leading position), with `replaces: [create-pr]` keeping the old
+> invocation routable via `migrate`. The grandfather row stays until the alias
+> window closes (6.1).
+
+## References
+
+- [`src/config/discovery/command-verbs.yml`](../../config/discovery/command-verbs.yml) — the allowlist + banned prefixes + grandfathered exceptions.
+- [`scripts/lint_command_verbs.py`](../../src/scripts/lint_command_verbs.py) — the forward-only single lint.
+- [`command-clusters.md`](../contracts/command-clusters.md) — locked clusters + sub-command naming.
+- [`capability-packs.md`](../contracts/capability-packs.md) — sibling per-pack budget governance (Phase 1).
+- [`ADR-003`](ADR-003-command-invocation-syntax.md) — invocation / colon syntax.

package/docs/decisions/ADR-042-runtime-resolver-decision-gate.md

@@ -0,0 +1,113 @@
+---
+adr: 042
+status: accepted
+date: 2026-06-03
+decision: runtime-resolver-decision-gate
+supersedes: —
+superseded_by: —
+phase: v6.0.0 · governance, evals, evidence-based pruning
+type: decision
+---
+
+# ADR-042 — Runtime pack resolver: STOP (projection-time filtering is sufficient)
+
+## Status
+
+**Accepted** · 2026-06-03. Records the Phase 5 decision gate of
+[`road-to-6.0.0-c-governance-and-evals`](../../agents/roadmaps/road-to-6.0.0-c-governance-and-evals.md)
+(Step 9). Builds directly on
+[`ADR-040`](ADR-040-execution-model-projection-time-filtering.md)
+(projection-time filtering, not a runtime resolver).
+
+## Context
+
+6.0.0-B shipped **projection-time** (build/install-time) pack-scoped filtering.
+The final phase of 6.0.0-C is a STOP/GO gate: do we ALSO build a **runtime
+resolver** that re-resolves the active pack set mid-session, live, as the user
+switches context?
+
+The gate criterion (from the roadmap): *"Only if the answer is 'switching
+demanded' does a runtime resolver earn its place. If not, STOP — projection-time
+filtering was sufficient and a runtime resolver is over-engineering."*
+
+The evidence at decision time:
+
+- **ADR-040 already chose projection-time** as the mechanism and did not
+  foreclose runtime resolution forever — it scoped 6.0.0 to projection-time.
+  Overturning that precedent requires extraordinary, proven demand.
+- **No telemetry exists.** The measurement events (`rule.tier2_loaded`,
+  `persona.cited`, `skill.activated`) were only just added in this roadmap's
+  Phase 3; the evidence-based-pruning contract requires ≥ 30 days before any
+  usage claim is trustworthy. There is zero accumulated data showing
+  mid-session switching demand.
+- **A lightweight mid-session affordance already exists.** `/profile:activate`
+  writes an ephemeral `runtime.active_packs` overlay that *biases* the surfaced
+  set (recommendation-bias MVP, no persistence, no execution-gating). Users can
+  already bias mid-session without a resolver.
+
+## Decision
+
+**STOP. Do not build a runtime pack resolver now.** Projection-time filtering
+(ADR-040) plus the `/profile:activate` recommendation-bias overlay is sufficient
+for the surfacing problem 6.0.0 set out to solve. A runtime resolver would cross
+a new config→execution trust boundary, introduce state-sync complexity (what
+happens when projection-time config changes while runtime state is active?), and
+add a context-window tax (every pack switch = a new system prompt) — all with
+**no evidence** the problem it solves exists.
+
+> **Council convergence (anthropic/claude-sonnet-4-5 + openai/gpt-4o, 3-round
+> design debate, 2026-06-03):** both members converged on **STOP**. The burden
+> of proof rests on PROCEED and is not met without telemetry; `/profile:activate`
+> already covers mid-session biasing; building the resolver now is "speculative
+> engineering". Both flagged a sharper refinement: high `/profile:activate`
+> usage alone would justify making the overlay *persistent*, NOT a full
+> resolver — only an **execution-gating** need (skills *unavailable*, not just
+> de-prioritised) that the overlay cannot serve would justify the resolver.
+
+## Re-trigger condition (falsifiable)
+
+This decision reopens only when **all** of the following hold, measured over a
+**≥ 30-day** telemetry window:
+
+1. **Switching frequency** — `/profile:activate` invoked ≥ 2×/session in ≥ 40%
+   of sessions.
+2. **Pack diversity** — users switch between ≥ 3 distinct pack combinations
+   (not just toggling one pack on/off).
+3. **Execution-gating need** — explicit user feedback requesting *execution-level*
+   gating (skills made unavailable in a mode, not merely de-prioritised) that
+   projection-time + `/profile:activate` cannot serve.
+
+If only (1) and (2) hold without (3), the correct response is to make
+`/profile:activate` **persistent across sessions** (a config-write), NOT to
+build a resolver. The resolver earns its place only when the need is
+execution-gating, not recommendation-bias.
+
+## Consequences
+
+- **Positive.** No new trust boundary, no state-sync complexity, no
+  context-window tax. The 6.0.0 rebuild ships with the simplest mechanism that
+  solves the stated problem. ADR-040's precedent is reaffirmed, not eroded.
+- **Positive.** The re-trigger condition is concrete and data-bearing — a future
+  decision is made on telemetry, not on a guess, consistent with the
+  evidence-based-pruning posture of this whole roadmap.
+- **Negative / accepted.** If a real execution-gating need emerges, it waits for
+  the next ≥ 30-day telemetry window before it can be acted on. Accepted: the
+  cost of waiting is low (the overlay covers biasing today), and the cost of
+  building speculatively is high.
+
+## Alternatives considered
+
+- **PROCEED — build the runtime resolver now.** Rejected: no evidence of demand,
+  overturns ADR-040 without cause, adds a new trust boundary and context-window
+  cost. The council's hardest pushback throughout the 6.0.0 rebuild.
+- **Build a smaller "persistent `/profile:activate`" instead.** Deferred, not
+  rejected: it is the *correct* response IF re-trigger conditions (1)+(2) fire
+  without (3). Not warranted now (no telemetry), but it is the cheaper next step
+  if data later shows persistence demand.
+
+## References
+
+- [`ADR-040`](ADR-040-execution-model-projection-time-filtering.md) — the projection-time decision this gate reaffirms.
+- [`evidence-based-pruning.md`](../contracts/evidence-based-pruning.md) — the ≥ 30-day telemetry posture the re-trigger condition follows.
+- [`local-analytics.md`](../contracts/local-analytics.md) — the `/profile:activate` switching signal the re-trigger reads.
+- [`command-clusters.md`](../contracts/command-clusters.md) § `profile` cluster — the `/profile:activate` overlay.

package/docs/decisions/ADR-043-monorepo-collapse-to-src-domains.md

@@ -0,0 +1,128 @@
+---
+adr: 043
+status: accepted
+date: 2026-06-03
+decision: monorepo-collapse-to-src-domains
+supersedes: ADR-017
+superseded_by: —
+phase: v6.0.0 · D structural restructure
+type: decision
+---
+
+# ADR-043 — Collapse `packages/` into `src/domains/` (with boundary safeguards)
+
+## Status
+
+**Accepted** · 2026-06-03. Records the Phase 3 decision gate of
+[`road-to-6.0.0-d-structural-restructure`](../../agents/roadmaps/archive/road-to-6.0.0-d-structural-restructure.md)
+(Step 9). Supersedes the per-pack physical layout of
+[`ADR-017`](ADR-017-monorepo-physical-layout.md) for the source tree.
+Decision routed through the AI council (anthropic/claude-sonnet-4-5 +
+openai/gpt-4o, design mode, 2026-06-03).
+
+**Executed** · 2026-06-05. The collapse is now carried out: `packages/` no longer
+exists at the repo root. The uncondensed source container moved to `src/agent-src/`
+([`ADR-051`](ADR-051-uncondensed-source-container-relocation.md)); pack homes moved to
+`src/packs/<id>/` (capability packs + core) and `src/domains/<pack>/` (command-bearing),
+with ops dirs to root `deploy/` ([`ADR-052`](ADR-052-packages-removal-and-pack-home-migration.md)).
+The condensed `.agent-src/` output is byte-identical across the move.
+
+## Context
+
+The decision: collapse the build-time `packages/<pack>/.agent-src.uncondensed/`
+source trees into `src/domains/<pack>/`, OR keep per-pack publishing and nest
+`src/domains/` inside each package.
+
+### Install-pattern evidence (the gate criterion)
+
+1. The suite ships as **one** npm package `@event4u/agent-config`. The published
+   `files` array contains `.agent-src/`, `config/`, `docs/`, `scripts/`,
+   `templates/`, `dist/` — it does **not** contain `packages/`. The per-pack
+   source tree is build-time only and is never shipped to consumers.
+2. **No `packages/*/package.json` exists** — packs are not separately publishable
+   npm packages; they are a build-time source organisation.
+3. Consumers select pack subsets via `install.py --packs a,b,c`, which operates
+   on the discovery projection (`.agent-src/` + discovery manifest) *within* the
+   single published package — not by installing separate npm packages.
+4. After Phase 2, 15 of 17 packs are empty shells (their only content was
+   skills/rules, now in the flat `src/skills/` + `src/rules/` library); commands
+   live in `core` + `pack-fun` and declare ownership via the `pack:` frontmatter.
+
+The expected answer — **no subset installs as separate packages** — holds. The
+physical `packages/` boundary buys nothing at the consumer interface.
+
+## Decision
+
+**COLLAPSE** `packages/<pack>/` into `src/domains/<pack>/`, with the four
+council-mandated boundary safeguards below. The collapse changes only the
+build-time source layout; it does not change the shipped npm package shape.
+
+## Council convergence and the boundary risk
+
+Both members converged on **collapse-with-safeguards**, not an unconditional GO.
+The shared concern: the `packages/` filesystem boundary is a *forcing function*,
+not documentation — collapsing trades compile-time impossibility of cross-pack
+coupling for lint-time detection ("build-time architectural decay"). The GO is
+conditioned on the boundary being enforced by a lint that walks **actual**
+includes, on a re-split proof staying live, on a documented rollback, and on a
+path-stability contract.
+
+### Safeguards (status in this repo)
+
+| # | Council-required safeguard | Status |
+|---|---|---|
+| 1 | One reference extraction re-validated in CI (not all packs every PR) + a documented recipe | **Already in place** — `scripts/prove_pack_extractable.py` + `tests/test_prove_pack_extractable.py` lock laravel's extractability; the recipe is the script's transitive-closure resolver, runnable per pack on demand. |
+| 2 | A dependency lint that walks **actual** includes, not just `pack.yaml` metadata | **Already in place** — `scripts/lint_pack_dependencies.py` (Phase-0 Step 3) compares declared `pack.yaml` deps against the real frontmatter `skills:`/`rules:` includes and asserts the pack-graph DAG is acyclic. |
+| 3 | A documented rollback / kill-switch criterion | **Documented here** (see below). |
+| 4 | A path-stability contract for shipped paths | **Structurally satisfied** — `scripts/_lib/agent_src.py` maps physical `src/domains/<pack>/` and `src/{skills,rules}/` onto stable *logical* paths (`commands/…`, `skills/…`, `rules/…`). The shipped `.agent-src/` logical paths are therefore unchanged by the collapse. The consumer-facing path break of 6.0.0 comes from the root→`src/` move (Step 16) and is carried by `migrate`, not by this collapse. |
+
+The council's central worry — "the lint must walk actual imports, not metadata"
+— is exactly what safeguard #2 already does for this repo's markdown-include
+dependency model (frontmatter `skills:`/`rules:` is the hard dependency axis;
+advisory `see also` links are warnings, per the Step-6 council).
+
+### Rollback / kill-switch criterion (safeguard #3)
+
+Re-split is proven possible (Phase-1 extraction proof), so revert is mechanical,
+not archaeological. The collapse is reverted if **either** holds within one
+release cycle of landing:
+
+- `lint_pack_dependencies.py` or `prove_pack_extractable.py` records a
+  cross-domain dangling reference that cannot be resolved by declaring the
+  dependency (i.e. a genuine boundary violation, not a missing `pack.yaml` line);
+  **and** the violation recurs after one fix attempt.
+- A pack that must ship as a standalone npm package is identified (subset-install
+  demand appears) — at which point per-pack publishing is restored by nesting
+  `src/domains/<pack>/` back into a package using the documented recipe.
+
+Absent either trigger, the collapse stands.
+
+## Consequences
+
+- **Positive.** One source tree reads as the product (`src/domains/<pack>/<verb>/`);
+  the empty-shell packs disappear; the dependency graph is enforced by lint +
+  extraction proof rather than by accident of directory nesting; the consumer
+  install model is unchanged.
+- **Negative / risk.** Architectural discipline now depends on the boundary lint
+  rather than module-resolution impossibility — mitigated by safeguards #1–#2
+  running on every PR and the rollback criterion in #3.
+- **Follow-on.** Step 10 executes the physical move of the `core` + `pack-fun`
+  command sets into `src/domains/<pack>/<verb>/` with pack renames; the
+  meta-pack split and remaining consolidation stay in 6.0.x / 6.1 per the
+  roadmap's scope-line rule.
+
+## Alternatives considered
+
+- **Keep per-pack publishing, nest `src/domains/` inside each package.** Rejected:
+  no evidence of subset installs as separate npm packages; preserves a boundary
+  that buys nothing at the consumer interface while blocking the "tree reads as
+  the product" goal.
+
+## References
+
+- [`road-to-6.0.0-d-structural-restructure`](../../agents/roadmaps/archive/road-to-6.0.0-d-structural-restructure.md) Step 9.
+- [`ADR-017`](ADR-017-monorepo-physical-layout.md) — superseded source layout.
+- Council session: anthropic/claude-sonnet-4-5 + openai/gpt-4o, design mode,
+  2026-06-03 (collapse-with-safeguards convergence).
+- `scripts/prove_pack_extractable.py`, `scripts/lint_pack_dependencies.py`,
+  `scripts/_lib/agent_src.py`.