test(fleet): validate shipped artifact dispositions

2026-07-14 20:24:50 -05:00
47 changed files with 1743 additions and 5190 deletions
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -26,14 +26,13 @@ pnpm test             # Vitest (all packages)
 pnpm build            # Build all packages
 # Database
-pnpm --filter @mosaicstack/db db:generate  # Offline migration artifact generation only
+pnpm --filter @mosaicstack/db db:push      # Push schema to PG (dev)
-# PostgreSQL execution is held until KBN-101-00/-03/-05 land. Do not invoke a runner,
+pnpm --filter @mosaicstack/db db:generate  # Generate migrations
-# init SQL, or Compose PostgreSQL service from this checkout.
+pnpm --filter @mosaicstack/db db:migrate   # Run migrations
-# Dev: local PGlite data-layer work needs no PostgreSQL. Optional local queue service only:
+# Dev
-docker compose up -d valkey
+docker compose up -d                  # Start PG, Valkey, OTEL, Jaeger
-# Do not start Gateway/Web or root pnpm dev as a local PGlite route: the current unguarded dotenv
+pnpm --filter @mosaicstack/gateway exec tsx src/main.ts  # Start gateway
 # loader can inherit a daemon PostgreSQL DSN. KBN-101-02 must make that state fail closed first.
 ```
 ## Conventions
--- a/README.md
+++ b/README.md
@@ -157,12 +157,7 @@ mosaic storage status
 mosaic storage tier
 mosaic storage export
 mosaic storage import
-# Schema migration is unavailable in this release. The current storage wrapper shells
+mosaic storage migrate
 # directly to `pnpm --filter @mosaicstack/db db:migrate`; it is legacy N-1,
 # uncertified, and MUST NOT be invoked pending KBN-101-02/-03/-06/-08 activation.
 # Future schema migration is non-operative: external bootstrap → TLS/roles → runner
 # --run → runner --verify → readiness. Tier copy uses only the separately held secure
 # migrate-tier route.
 ```
 ### Telemetry
@@ -197,32 +192,29 @@ Consent state is persisted in config. Remote upload is a no-op until you run `mo
 git clone git@git.mosaicstack.dev:mosaicstack/stack.git
 cd stack
-# Install dependencies. The local tier uses in-process PGlite; leave DATABASE_URL unset.
+# Start infrastructure (Postgres, Valkey, Jaeger)
 docker compose up -d
 # Install dependencies
 pnpm install
-# Optional local queue service only. This does not start PostgreSQL.
+# Run migrations
-docker compose up -d valkey
+pnpm --filter @mosaicstack/db run db:migrate
-# The current Gateway/Web local process is held; see docs/guides/dev-guide.md.
+# Start all services in dev mode
-# Do not start it until KBN-101-02 makes inherited dotenv/DSN state fail closed.
+pnpm dev
 ```
-### Held future procedure
+### Infrastructure
-The checked-in Compose PostgreSQL service mounts legacy initialization SQL and is **not** a
+Docker Compose provides:
 current PostgreSQL, standalone, or federated developer route. Do not start it with Compose,
 invoke initialization SQL, or treat the planned migrator as currently executable.
-**Held future activation procedure — non-operative and no current command authority until KBN-101-00, KBN-101-03, and KBN-101-05
+| Service               | Port      | Purpose                |
-land:** external bootstrap → TLS/roles → `mosaic-db-migrator --run` →
+| --------------------- | --------- | ---------------------- |
-`mosaic-db-migrator --verify` → Gateway/Compose readiness. The future deployment artifacts—not
+| PostgreSQL (pgvector) | 5433      | Primary database       |
-this README—will provide the reviewed commands and secret-consumer interface.
+| Valkey                | 6380      | Task queue + caching   |
-
+| Jaeger                | 16686     | Distributed tracing UI |
-For local data-layer work, PGlite needs no PostgreSQL service. The optional Compose command above
+| OTEL Collector        | 4317/4318 | Telemetry ingestion    |
 starts only Valkey; OTEL Collector and Jaeger may likewise be started individually if needed,
 without starting PostgreSQL. A Gateway/Web local process is not currently a safe PGlite route:
 its unguarded dotenv loader may inherit a daemon PostgreSQL DSN. Do not use root `pnpm dev` or a
 Gateway start command until KBN-101-02 makes that state fail closed.
 ### Quality Gates
@@ -239,7 +231,7 @@ pnpm format                  # Prettier auto-fix
 Woodpecker CI runs on every push:
 - `pnpm install --frozen-lockfile`
- **Legacy N-1 CI status only — active, uncertified, and non-authorizing as an operator route:** the checked-in job currently invokes `pnpm --filter @mosaicstack/db run db:migrate` with `DATABASE_URL` against an isolated disposable PostgreSQL CI database. It performs direct DDL in that CI database, is not approved ordinary behavior or an operator route, and remains a known exception pending KBN-101-06 removal/replacement by the certified runner-backed CI path.
+- Database migration against a fresh Postgres
 - `pnpm test` (Turbo-orchestrated across all packages)
 npm packages are published to the Gitea package registry on main merges.
--- a/docs/PERFORMANCE.md
+++ b/docs/PERFORMANCE.md
@@ -149,9 +149,15 @@ for any `<Image>` components added in the future.
 ---
-## Held future procedure
+## How to Apply
-This report is non-operative evidence, not a current runbook. Until **KBN-101-00, KBN-101-03, and KBN-101-05** land, do not execute a PostgreSQL runner from this checkout. The approved future procedure is exactly: external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness. Deployment will supply the reviewed runner, migration-only credentials, and TLS material; Gateway startup only verifies readiness.
+```bash
 # Run the DB migration (requires a live DB)
 pnpm --filter @mosaicstack/db exec drizzle-kit migrate
 # Or, in Docker/Swarm — migrations run automatically on gateway startup
 # via runMigrations() in packages/db/src/migrate.ts
 ```
 ---
--- a/docs/PRD.md
+++ b/docs/PRD.md
@@ -125,35 +125,6 @@ are defined in [docs/TASKS.md](./TASKS.md) and must remain one card/one PR.
 ---
 ## KBN-101 Database Runtime/Migration Role Split (#771)
 ### Problem and objective
 PostgreSQL Gateway/storage currently uses one `DATABASE_URL` for runtime queries and migrations. That makes the deployed application identity an owner and prevents certification that KBN immutable event, artifact, checkpoint, and evidence relations reject runtime `UPDATE`/`DELETE`. KBN-101 freezes a least-privilege runtime/migration split before KBN-100 schema work.
 ### Normative requirements
 1. `K101-REQ-01`: `DATABASE_URL` SHALL be the non-owner PostgreSQL runtime connection and `DATABASE_MIGRATION_URL` SHALL be the migration-only owner/migrator connection. They are required respectively for runtime and the dedicated `mosaic-db-migrator --run|--verify` phase in `standalone`/`federated`; local PGlite is the explicit exception. The published `@mosaicstack/db` bin maps exactly `mosaic-db-migrator` to `./dist/cli.js`, its image entrypoint is exactly `mosaic-db-migrator`, accepts no URL/SQL/schema/role argv, and returns stable sanitized exits. Every current/future PostgreSQL DDL entrypoint SHALL route to that runner or be denied, and SHALL reject `DATABASE_URL`-only execution before connection/DDL. Data migration may connect only after the runner prepares and verifies the PostgreSQL target, through dedicated non-DDL `mosaic_data_importer` and exactly `--target-url-file /run/secrets/mosaic-migrate-target-url`, its fixed paired authenticated provider-version file `/run/secrets/mosaic-migrate-target-version`, plus `--target-attestation-file /run/mosaic-attestations/migrate-target.v1.json`. KBN-101-05 obtains URL key `url` and version only from the same successful Vault KV-v2 response at `secret-{env}/mosaic-stack/database/importer` (`data.metadata.version`), renders them as one immutable generation into separate consumer copies, and never infers a provider version from DSN bytes. The trusted runner verifies TLS/identity/manifest, reads its fixed importer URL/version copies only for binding through safe no-follow fd checks, and signs a credential-free JCS/Ed25519 attestation using its runner-only fixed root-owned private-key file; no signing key reaches importer/runtime. The artifact binds secret version and SHA-256 of exact high-entropy credential-file bytes, canonical TLS host/port/database, CA/SPKI, PostgreSQL system identifier/database OID, importer role, manifest/schema fingerprints, producer invocation/build/image digest, issued/expires/nonce, and correlation. Before target connection the importer validates URL/version/attestation/public-key files, signature/key/expiry/replay/authenticated provider version/digest/generation/bindings and the importer-only CA at exact `DATABASE_TLS_CA_CERT_PATH`; after verified TLS and before DML it validates server/database/role/CA/schema identity, with same-fd/in-memory-byte TOCTOU protection, rotation/revocation, a privileged producer-only-to-importer-only artifact handoff controller that verifies/copies/fsyncs/atomically renames/seals before importer start, consumer isolation/no logging-oracle, and sanitized errors. Raw `--target-url`, `DATABASE_URL` fallback, runtime-owner use, missing/unsafe/substituted files, stale/replayed/tampered/wrong-key attestation, wrong binding, and DDL attempt fail before target connection/DDL; post-connect mismatch closes with zero DML/DDL. A reviewed finite classifier inventories executable current source/scripts/package bins, operator docs, deploy manifests, and exact normative contracts by path; active secure records pin both options/files, producer/key/bindings/tests, while normative contracts cannot mask instructions. Unknown active commands, duplicate-owner, ownerless, missing-path, and historical/status-only masking hits fail. `db:push` is forbidden outside an explicitly disposable local developer database and cannot accept a production-like URL.
 2. `K101-REQ-02`: Gateway runtime/replicas SHALL not execute migrations or DDL. The runner SHALL hold one `max:1` session and fixed two-int advisory namespace `1297044289` (`MOSA`), `1262636593` (`KBN1`) across preflight, reconciliation, migration, verification, and release. It SHALL compare the versioned canonical manifest v1 tuple (journal logical index/tag plus exact SQL-byte SHA-256) to the complete observed ledger mapping; count/set-only, timestamps, and physical insertion order are non-normative and insufficient.
 3. `K101-REQ-03`: PostgreSQL SHALL separate non-login platform database owner, non-login schema owner, dedicated `NOLOGIN SUPERUSER` `mosaic_extension_owner`, login migrator, dedicated login non-DDL data importer, non-login runtime capability, and login runtime roles. For PostgreSQL 17 + pgvector 0.8.2, `vector` is untrusted (`trusted` is absent and `relocatable=true`): only an externally controlled audited platform-bootstrap superuser session may `SET ROLE mosaic_extension_owner` for CREATE/UPDATE/SET SCHEMA, then `RESET ROLE`; the role has `rolcanlogin=false`, `rolsuper=true`, zero members, no runtime credential/Vault secret, and is never provided to app containers. It owns `mosaic_extensions`, fresh `vector`, and owner-bearing extension members, while `mosaic_schema_owner` receives only `USAGE` for type resolution and never ownership/`CREATE`/`ALTER`/`DROP`/member-change/default-privilege authority there. Superuser cannot be constrained by `GRANT`/`REVOKE`; this is identity/non-login/no-membership/external-control/audit isolation, not a false least-privilege claim. Extension operations require control-plane change, independent review, backup/rollback, maintenance window, and audit evidence. Managed targets that cannot establish this exact role are ineligible until an independently approved versioned provider-owned extension-owner profile exists; app/migrator ownership is never silently retained. Existing approved-owner extension relocation validates exact `pg_namespace.nspowner`, `pg_extension.extowner`, member ownership/schema/version, while legacy runtime-owned extension fails closed to a controlled shadow-database migration—never unsupported ownership alteration, catalog mutation, ownership adoption, or `DROP CASCADE`. Runtime, migrator, schema owner, importer, and all service roles must fail `SET ROLE`, catalog/direct `ALTER`/`UPDATE`/`DROP`/membership-change denial, role ownership, superuser/role-creation/schema-creation/TEMPORARY, unsafe membership, untrusted search path, missing grants, unauthenticated TLS, and immutable privilege drift checks. Application schema is fixed `mosaic` with exact `pg_catalog,mosaic` session path; historical public migrations remain byte-immutable legacy bootstrap only, every future Drizzle application declaration targets `mosaic`, and `vector` is explicitly qualified from non-writable `mosaic_extensions`. No config-derived SQL identifier is permitted.
 4. `K101-REQ-04`: `mosaicstack/stack` KBN-101-00 SHALL exclusively own `infra/pg-bootstrap/roles.sql`, `infra/pg-bootstrap/extensions.sql`, `infra/pg-bootstrap/README.md`, and bootstrap tests; KBN-101-05 SHALL exclusively own `tools/db/render-postgres-secrets.ts`, its tests, and current Compose/Portainer/two-gateway deployment declarations, consuming the versioned bootstrap interface without overlap. Environment IaC/Vault is named input and Mosaic deployment control plane/Jason is activation authority. Distinct runtime/migrator/importer URL, importer authenticated provider-version, DB-client CA, Gateway leaf, and PostgreSQL server key/certificate materials are provisioned before a production-like database starts. Importer and migrator have separate immutable URL/version copies at fixed `10002:10002`/`10003:10003` identities; runtime/unrelated containers receive neither importer material, attestation private key, or importer artifact. Runtime, migrator, and importer require their mounted CA plus `sslmode=verify-full`. Exact UID/GID/mode/rendering, service-DNS SANs, Vault/compose/Swarm consumer isolation, two-gateway pair ordering, server activation, pre-enforcement legacy-client drain and `hostssl` zero-plaintext-session proof, fresh/existing transition, CA-overlap rotation, TLS-only rollback, and standalone/federated/Swarm/two-gateway positive/negative TLS evidence are required. No application-generated production certificate or plaintext bootstrap exception is permitted.
 5. `K101-REQ-05`: KBN immutable relations SHALL permit the real runtime role INSERT/SELECT only and deny UPDATE/DELETE; parent retention remains RESTRICT/no-cascade. Role/password/Vault creation is external platform control, never application migration/source.
 6. `K101-REQ-06`: N-1 single-URL compatibility, rollout/rollback, Vault ownership/rotation/redaction, CI, installer, compose/Portainer, observability, and deployment handoffs SHALL be separately bounded one-card/one-PR work. Prepared slices remain inactive while current owner-runtime deployments stay N-1; Mosaic control plane/Jason alone authorizes one final atomic activation or rollback, with no force-on-red/bypass. KBN-101 planning itself SHALL not mutate production.
 7. `K101-REQ-07`: KBN-100 SHALL begin only after the KBN-101 foundation role/schema-boundary certificate; it SHALL rebase on that main head, restore generated Drizzle declaration/snapshot/journal consistency, and bound procedural immutable-table grant/trigger/backfill additions to its schema slice. KBN-101 real deployed-role immutable-operation certification SHALL complete after KBN-100 creates those relations and before KBN-105.
 ### Acceptance criteria
 1. `AC-K101-01`: DTO/command-matrix tests prove required modes, PGlite exception, `mosaic-db-migrator --help|--run|--verify`/stable exits/argv refusal, public-import negative, every finite classified DDL/static-bypass inventory path and both harness pairs reject `DATABASE_URL`-only before connection/DDL, no migration-to-runtime fallback, and `db:push` refusal outside an allowlisted disposable DB. Before inventory, ownership, or status masking, the semantic fixture fails README's exact former commented code-fence generic-wrapper form and the user guide's exact former executable generic-wrapper form; source-consistency proves current `packages/storage/src/cli.ts` directly `execSync`s `pnpm --filter @mosaicstack/db db:migrate` and no `mosaic-db-migrator` bin exists, so runner-delegation documentation fails. The active `docs/guides/migrate-tier.md` route is inventoried to KBN-101-07 and proves runner-produced `--target-url-file /run/secrets/mosaic-migrate-target-url`, fixed paired provider-version file, and `--target-attestation-file /run/mosaic-attestations/migrate-target.v1.json`; runner-only signing/private-key isolation; Vault KV-v2 same-response version provenance, separate immutable generation mounts, importer CA, JCS/Ed25519 signature/key rotation/revocation, atomic artifact, expiry/replay, safe-fd secret-version/digest, canonical TLS/CA/server/database/role/manifest/schema bindings, dedicated non-DDL importer, consumer isolation/no log-oracle, and exact no-connection versus zero-DML rejection for missing/wrong/stale/replayed/tampered/wrong-key/substituted/generation-mismatched inputs. The full current non-normative docs inventory—including user guide, federation historical task/MILESTONES status, and non-operative SETUP—has an exact safe disposition. Scanner semantic checks reject automatic first-boot/startup extension/schema/migration wording, Compose-up-before-runner, init-script authority, production `.env`/monorepo auto-load/`EnvironmentFile=`/credential-export-or-argv/restart-as-secret-activation routes, and every unqualified operator-document `mosaic-db-migrator --run|--verify` hit regardless of named/normative/status classification. The exact former README/dev/deployment Compose-first sequences, former SETUP wording, exact former MILESTONES wording `pgvector extension installed + verified on startup`, former architecture-plan/PERFORMANCE/backlog runner routes, and any unqualified runner fixture fail before inventory masking. Only one `Held future procedure` Markdown section—bounded through the next equal-or-higher heading—may contain the explicit non-operative/no-current-command-authority form that names KBN-101-00/-03/-05 and preserves external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness; every runner hit outside that section fails. The README assertion for the checked-in direct CI `pnpm --filter @mosaicstack/db run db:migrate` with `DATABASE_URL` passes only as active legacy N-1, uncertified, non-authorizing-as-an-operator-route status against an isolated disposable CI database pending KBN-101-06 removal—not as an ordinary operator or approved DDL-authority route. Only local PGlite data-layer work or non-PostgreSQL Compose is current (Gateway/Web local startup is held pending daemon/inherited/project-DSN rejection).
 2. `AC-K101-02`: Fixed namespace lock contention/crash/readiness/non-interference and exact manifest-v1 reconciliation tests prove no replica race/runtime auto-migration and fail closed on every missing/unknown/duplicate/ambiguous/corrupt/stale ledger state.
 3. `AC-K101-03`: Actual PostgreSQL 17 + pgvector 0.8.2 control-file, catalog, Drizzle-generation, vector-query/operator, fresh/approved-owner/legacy-shadow/partial/resume/rollback/N-1, and real deployed-role tests prove `trusted` absent/untrusted plus relocatability, external-superuser `SET ROLE` create/update/`RESET ROLE` audit, exact `rolcanlogin=false`/`rolsuper=true`/zero-membership/no-runtime-secret state, platform/schema/extension-owner/migrator/importer/runtime separation, `pg_extension.extowner` plus owner-bearing extension-member/schema/version assertions, and runtime/migrator/schema-owner/importer/all-service-role `SET ROLE`/ALTER/DROP/member-update denial. They also prove `pg_catalog,mosaic` per-session pool safety, `mosaic_extensions` qualification, identifier injection denial, ownership/membership/ledger-read/TEMP/default grants, and unsafe privilege denial.
 4. `AC-K101-04`: Disposable standalone, federated/Swarm, and two-gateway verified-TLS positives plus for both pairs missing CA/wrong CA/wrong SAN/sslmode downgrade, server/Gateway key mode, UID/GID, secret-consumer isolation, and legacy-drain/`hostssl` negatives prove server bootstrap, ordering, and readiness; PGlite is expressly excluded from this PostgreSQL evidence.
 5. `AC-K101-05`: Real runtime-role evidence proves INSERT/SELECT succeeds and UPDATE/DELETE fails for every frozen immutable KBN relation.
 6. `AC-K101-06`: N-1/atomic activation/rollback, Vault/CA-overlap rotation/redaction, health/operator behavior, CI/deployment handoff, independent exact-head security review, and terminal-green CI evidence the foundation before KBN-100; after KBN-100, the real deployed-role immutable-operation certificate and Ultron approval release KBN-105.
 **Normative implementation contract:** [`docs/native-kanban-sot/KBN-101-DB-ROLE-SPLIT.md`](./native-kanban-sot/KBN-101-DB-ROLE-SPLIT.md). `ASSUMPTION:` existing `standalone` and `federated` are all PostgreSQL production-like modes; any new PostgreSQL tier inherits these requirements until an explicit versioned amendment.
 ---
 ## Tess Interaction Agent Workstream (TESS)
 ### Problem and Objective
@@ -1111,10 +1082,10 @@ Telegram remote control channel.
 ### AC-10: Deployment
- [ ] PGlite data-layer work uses no PostgreSQL; optional Compose services are selected individually and do not start PostgreSQL; Gateway/Web local start remains held until KBN-101-02 rejects daemon/inherited/project DSNs before connection or DDL
+- [ ] `docker compose up` starts full stack from clean state
- [ ] PostgreSQL/federated activation is unavailable until KBN-101-00/-03/-05 deliver external bootstrap, TLS/roles, runner `--run`, runner `--verify`, and Gateway/Compose readiness in that order
+- [ ] `mosaic` CLI installable and functional on bare metal
- [ ] `mosaic` CLI installable and functional on bare metal after the reviewed KBN-101-05 secret-renderer/process-exec or `LoadCredential` interface exists
+- [ ] Database migrations run automatically on first start
- [ ] Local-only configuration documentation is distinct from production generation-pinned Vault-rendered consumer material
+- [ ] `.env.example` documents all required configuration
 ### AC-11: @mosaicstack/\* Packages
--- a/docs/SITEMAP.md
+++ b/docs/SITEMAP.md
@@ -1,12 +1,5 @@
 # Documentation Sitemap
 ## Fleet configuration management
 - [Generated environment boundary](fleet/reference/generated-env-boundary.md) — roster-derived launch projection, strict local data, legacy quarantine, and downstream interface evidence.
 - [Roster v2 structural contract](fleet/reference/roster-v2-fields.md) — local-tmux schema v2 parsing and structural validation.
 - [Role classes and authority](fleet/reference/role-classes.md) — canonical role resolver and protected authority boundaries.
 - [Executable asset dispositions](fleet/migration/example-profile-disposition.md) — shipped v1 fixture/profile/service validation posture.
 ## Official channel plugins
 - [Channel protocol architecture](architecture/channel-protocol.md) — shared lifecycle, message, stable-route, authorization, and response-target contracts.
@@ -21,10 +14,7 @@
 - [Workstream index](native-kanban-sot/INDEX.md) — artifact map, lane partition, and delivery order.
 - [Mission manifest](native-kanban-sot/MISSION-MANIFEST.md) — scope, authority, invariants, and gate model.
 - [Task decomposition](native-kanban-sot/TASKS.md) — dependency-ordered implementation slices and ownership boundaries.
 - [KBN-101 database role split](native-kanban-sot/KBN-101-DB-ROLE-SPLIT.md) — rc.16 direct-Drizzle storage-wrapper hold: legacy N-1/uncertified/non-operative pending -02/-03/-06/-08; exact README/user-guide wrapper forms fail before masking and source-consistency rejects runner-delegation copy; held bootstrap → TLS/roles → run → verify → readiness; plus prior attestation, pgvector owner, classifier, TLS, activation, and certification prerequisite.
 - [Federated tier data migration](guides/migrate-tier.md) — active KBN-101-07 operator route: runner-produced target attestation, dedicated non-DDL importer, and paired credential-/attestation-file references only.
 - [Frozen shared contract](native-kanban-sot/SHARED-CONTRACT.md) — schema, API, Coordinator, health, recovery, and migration contracts.
 - [KBN-101 exact-head security review](reports/native-kanban-sot/kbn-101-contract-security-review-82ce325.md) — retained prior REQUEST CHANGES evidence for `da742ca`; rc.16 awaits independent exact-head re-review after closing the current generic storage-wrapper authority HIGH finding.
 - [Initial independent review](reports/native-kanban-sot/canon-initial-review-no-go.md) — KCR-001–016 findings that blocked the first draft.
 - [Final independent re-review](reports/native-kanban-sot/canon-final-rereview-go.md) — closure evidence and GO verdict.
 - [Ultron final gate](reports/native-kanban-sot/ultron-final-go.md) — final requirements, authority, schema, migration, recovery, and evidence review.
--- a/docs/design/storage-abstraction-middleware.md
+++ b/docs/design/storage-abstraction-middleware.md
@@ -70,10 +70,6 @@ export function createQueue(config?: QueueConfig): QueueHandle {
 ### `@mosaicstack/db` (packages/db/src/client.ts)
 > **Historical design specimen — status-only, not an operator instruction.** KBN-101 supersedes
 > this pre-split `DATABASE_URL` fallback shape; it cannot authorize runtime migration, DDL, or a
 > connection-string fallback. See the KBN-101 runner/role contract for the produced interface.
 ```typescript
 import { drizzle, type PostgresJsDatabase } from 'drizzle-orm/postgres-js';
 import postgres from 'postgres';
--- a/docs/federation/MILESTONES.md
+++ b/docs/federation/MILESTONES.md
@@ -54,7 +54,7 @@ Every milestone adds tests to these layers. A milestone cannot be claimed comple
 - Add `"tier": "federated"` to `mosaic.config.json` schema and validators
 - Docker Compose `federated` profile (`docker-compose.federated.yml`) adds: Postgres+pgvector (5433), Valkey (6380), dedicated volumes
 - Tier detector in gateway bootstrap: reads config, asserts required services reachable, refuses to start otherwise
- **Historical/status only:** the prior startup-provisioning statement is superseded. Runtime/startup extension provisioning is forbidden. PostgreSQL activation remains non-operative with no current command authority until KBN-101-00, KBN-101-03, and KBN-101-05 land; this record authorizes no current DDL, Compose/init, or startup path.
+- `pgvector` extension installed + verified on startup
 - Migration logic: safe upgrade path from `local`/`standalone` → `federated` (data export/import script, one-way)
 - `mosaic doctor` reports tier + service health
 - Gateway continues to serve as a normal standalone instance (no federation yet)
--- a/docs/federation/SETUP.md
+++ b/docs/federation/SETUP.md
@@ -1,74 +1,280 @@
 # Federated Tier Setup Guide
-> **KBN-101 N-1 hold:** This page is **non-operative** and grants no current command
+## What is the federated tier?
 > authority until KBN-101-00, KBN-101-03, and KBN-101-05 land and KBN-101-08 activates a
 > reviewed release. It does not authorize a deployment operation, initialization artifacts,
 > implicit extension/schema/migration creation, raw `CREATE`, direct database initialization, or
 > a Gateway against an unverified database. The prior direct-start wording is retired; its
 > regression fixture is owned by KBN-101-06.
-## Held future procedure
+The federated tier is designed for multi-user and multi-host deployments. It consists of PostgreSQL 17 with pgvector extension (for embeddings and RAG), Valkey for distributed task queueing and caching, and a shared configuration across multiple Mosaic gateway instances. Use this tier when running Mosaic in production or when scaling beyond a single-host deployment.
-This section is non-operative and grants no current command authority until KBN-101-00, KBN-101-03, and KBN-101-05 land.
+## Prerequisites
-The deployment control plane—not an operator shell or deployment lifecycle hook—performs this
+- Docker and Docker Compose installed
-exact held future sequence after activation authorization: external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness.
+- Ports 5433 (PostgreSQL) and 6380 (Valkey) available on your host (or adjust environment variables)
 - At least 2 GB free disk space for data volumes
-1. External bootstrap provisions the approved database/extension prerequisites.
+## Start the federated stack
 2. TLS/roles are installed through the generation-pinned renderer.
 3. The dedicated one-shot runner executes `mosaic-db-migrator --run`.
 4. The same runner executes `mosaic-db-migrator --verify`, including readiness and the
   importer-target attestation where that route is enabled.
 5. Only after successful verification may Gateway reach its independent verified-TLS Gateway
   readiness gate.
-No step may be reordered, skipped, replaced by a raw SQL command, or delegated to an initialization
+Run the federated overlay:
 hook.
 A missing extension, schema, migration, role, secret generation, or readiness proof is a failed
 control-plane precondition; it is not an instruction to start Compose, retry startup, or create
 anything directly.
-## N-1 status and required disposition
+```bash
 docker compose -f docker-compose.federated.yml --profile federated up -d
 ```
-The current branch retains historical federation artifacts, but they are not a deployable
+This starts PostgreSQL 17 with pgvector and Valkey 8. The pgvector extension is created automatically on first boot.
 procedure. `docs/federation/TASKS.md` records their shipped status only. KBN-101-02 retires
 runtime/init DDL; KBN-101-05 owns the renderer/deployment handoff; KBN-101-06 verifies the
 finite scanner and command matrix; and KBN-101-07 owns this operator route. A path named in an
 inventory, a historical-status label, or a normative requirement cannot suppress the semantic
 checks above.
-Until the activation certificate names an exact release, use no database startup or recovery
+Verify the services are running:
 command from this document. For the produced importer interface, see
 [the federated tier migration contract](../guides/migrate-tier.md); it is likewise non-operative
 until activation.
-## Federation and Step-CA reference
+```bash
 docker compose -f docker-compose.federated.yml ps
 ```
-Federation uses PostgreSQL 17 with pgvector, Valkey, and a shared configuration across multiple
+Expected output shows `postgres-federated` and `valkey-federated` both healthy.
-Gateway instances. Step-CA issues federation peer X.509 certificates whose custom OIDs carry a
+
-grant and subject identity. The following facts are reference material only; provisioning and
+## Configure mosaic for federated tier
-secret delivery remain deployment-control-plane work under the activation sequence.
+
 Create or update your `mosaic.config.json`:
 ```json
 {
  "tier": "federated",
  "database": "postgresql://mosaic:mosaic@localhost:5433/mosaic",
  "queue": "redis://localhost:6380"
 }
 ```
 If you're using environment variables instead:
 ```bash
 export DATABASE_URL="postgresql://mosaic:mosaic@localhost:5433/mosaic"
 export REDIS_URL="redis://localhost:6380"
 ```
 ## Verify health
 Run the health check:
 ```bash
 mosaic gateway doctor
 ```
 Expected output (green):
 ```
 Tier: federated  Config: mosaic.config.json
  ✓ postgres         localhost:5433       (42ms)
  ✓ valkey           localhost:6380       (8ms)
  ✓ pgvector         (embedded)           (15ms)
 ```
 For JSON output (useful in CI/automation):
 ```bash
 mosaic gateway doctor --json
 ```
 ## Step 2: Step-CA Bootstrap
 Step-CA is a certificate authority that issues X.509 certificates for federation peers. In Mosaic federation, it signs peer certificates with custom OIDs that embed grant and user identities, enforcing authorization at the certificate level.
 ### Prerequisites for Step-CA
 Before starting the CA, you must set up the dev password:
 ```bash
 cp infra/step-ca/dev-password.example infra/step-ca/dev-password
 # Edit dev-password and set your CA password (minimum 16 characters)
 ```
 The password is required for the CA to boot and derive the provisioner key used by the gateway.
 ### Start the Step-CA service
 Add the step-ca service to your federated stack:
 ```bash
 docker compose -f docker-compose.federated.yml --profile federated up -d step-ca
 ```
 On first boot, the init script (`infra/step-ca/init.sh`) runs automatically. It:
 - Generates the CA root key and certificate in the Docker volume
 - Creates the `mosaic-fed` JWK provisioner
 - Applies the X.509 template from `infra/step-ca/templates/federation.tpl`
 The volume is persistent, so subsequent boots reuse the existing CA keys.
 Verify the CA is healthy:
 ```bash
 curl https://localhost:9000/health --cacert /tmp/step-ca-root.crt
 ```
 (If the root cert file doesn't exist yet, see the extraction steps below.)
 ### Extract credentials for the gateway
 The gateway requires two credentials from the running CA:
 **1. Provisioner key (for `STEP_CA_PROVISIONER_KEY_JSON`)**
 ```bash
 docker exec $(docker ps -qf name=step-ca) cat /home/step/secrets/mosaic-fed.json > /tmp/step-ca-provisioner.json
 ```
 This JSON file contains the JWK public and private keys for the `mosaic-fed` provisioner. Store it securely and pass its contents to the gateway via the `STEP_CA_PROVISIONER_KEY_JSON` environment variable.
 **2. Root certificate (for `STEP_CA_ROOT_CERT_PATH`)**
 ```bash
 docker cp $(docker ps -qf name=step-ca):/home/step/certs/root_ca.crt /tmp/step-ca-root.crt
 ```
 This PEM file is the CA's root certificate, used to verify peer certificates issued by step-ca. Pass its path to the gateway via `STEP_CA_ROOT_CERT_PATH`.
 ### Custom OID Registry
 Federation certificates include custom OIDs in the certificate extension. These encode authorization metadata:
 | OID                 | Name                   | Description           |
-| ------------------- | ------------------------ | --------------------- |
+| ------------------- | ---------------------- | --------------------- |
-| 1.3.6.1.4.1.99999.1 | `mosaic_grant_id`        | Federation grant UUID |
+| 1.3.6.1.4.1.99999.1 | mosaic_grant_id        | Federation grant UUID |
-| 1.3.6.1.4.1.99999.2 | `mosaic_subject_user_id` | Subject user UUID     |
+| 1.3.6.1.4.1.99999.2 | mosaic_subject_user_id | Subject user UUID     |
-The internal arc `1.3.6.1.4.1.99999` is development-only. Before an externally reachable
+These OIDs are verified by the gateway after the CSR is signed, ensuring the certificate was issued with the correct grant and user context.
 production deployment, register an IANA Private Enterprise Number and version the assignments.
 Each value is DER-encoded as an ASN.1 UTF8String containing the UUID.
-The future activated Gateway requires `STEP_CA_URL`, `STEP_CA_PROVISIONER_PASSWORD`,
+### Environment Variables
 `STEP_CA_PROVISIONER_KEY_JSON`, `STEP_CA_ROOT_CERT_PATH`, and `BETTER_AUTH_SECRET` through the
 reviewed secret mechanism. These names do not authorize shell exports, copied credential files,
 or an ad hoc service start.
-## Failure disposition
+Configure the gateway with the following environment variables before startup:
- A TLS, CA, SAN, role, runner, or readiness failure is a control-plane incident. Preserve only
+| Variable                       | Required | Description                                                                                               |
-  sanitized evidence and follow the approved rollback/repair record.
+| ------------------------------ | -------- | --------------------------------------------------------------------------------------------------------- |
- A pgvector/extension failure is a failed external-bootstrap or runner precondition. Do not use
+| `STEP_CA_URL`                  | Yes      | Base URL of the step-ca instance, e.g. `https://step-ca:9000` (use `https://localhost:9000` in local dev) |
-  direct extension SQL, init artifacts, or a startup retry as remediation.
+| `STEP_CA_PROVISIONER_KEY_JSON` | Yes      | JSON-encoded JWK from `/home/step/secrets/mosaic-fed.json`                                                |
- A port, container, or Valkey problem does not permit bypassing the activation sequence.
+| `STEP_CA_ROOT_CERT_PATH`       | Yes      | Absolute path to the root CA certificate (e.g. `/tmp/step-ca-root.crt`)                                   |
- Federation peer-key rotation remains deferred until its separately approved migration plan;
+| `BETTER_AUTH_SECRET`           | Yes      | Secret used to seal peer private keys at rest; already required for M1                                    |
-  do not rotate `BETTER_AUTH_SECRET` without that plan.
+
 Example environment setup:
 ```bash
 export STEP_CA_URL="https://localhost:9000"
 export STEP_CA_PROVISIONER_KEY_JSON="$(cat /tmp/step-ca-provisioner.json)"
 export STEP_CA_ROOT_CERT_PATH="/tmp/step-ca-root.crt"
 export BETTER_AUTH_SECRET="<your-secret>"
 ```
 ## Troubleshooting
 ### Port conflicts
 **Symptom:** `bind: address already in use`
 **Fix:** Stop the base dev stack first:
 ```bash
 docker compose down
 docker compose -f docker-compose.federated.yml --profile federated up -d
 ```
 Or change the host port with an environment variable:
 ```bash
 PG_FEDERATED_HOST_PORT=5434 VALKEY_FEDERATED_HOST_PORT=6381 \
  docker compose -f docker-compose.federated.yml --profile federated up -d
 ```
 ### pgvector extension error
 **Symptom:** `ERROR: could not open extension control file`
 **Fix:** pgvector is created at first boot. Check logs:
 ```bash
 docker compose -f docker-compose.federated.yml logs postgres-federated | grep -i vector
 ```
 If missing, exec into the container and create it manually:
 ```bash
 docker exec <postgres-federated-id> psql -U mosaic -d mosaic -c "CREATE EXTENSION vector;"
 ```
 ### Valkey connection refused
 **Symptom:** `Error: connect ECONNREFUSED 127.0.0.1:6380`
 **Fix:** Check service health:
 ```bash
 docker compose -f docker-compose.federated.yml logs valkey-federated
 ```
 If Valkey is running, verify your firewall allows 6380. On macOS, Docker Desktop may require binding to `host.docker.internal` instead of `localhost`.
 ## Key rotation (deferred)
 Federation peer private keys (`federation_peers.client_key_pem`) are sealed at rest using AES-256-GCM with a key derived from `BETTER_AUTH_SECRET` via SHA-256. If `BETTER_AUTH_SECRET` is rotated, all sealed `client_key_pem` values in the database become unreadable and must be re-sealed with the new key before rotation completes.
 The full key rotation procedure (decrypt all rows with old key, re-encrypt with new key, atomically swap the secret) is out of scope for M2. Operators must not rotate `BETTER_AUTH_SECRET` without a migration plan for all sealed federation peer keys.
 ## OID Assignments — Mosaic Internal OID Arc
 Mosaic uses the private enterprise arc `1.3.6.1.4.1.99999` for custom X.509
 certificate extensions in federation grant certificates.
 **IMPORTANT:** This is a development/internal OID arc. Before deploying to a
 production environment accessible by external parties, register a proper IANA
 Private Enterprise Number (PEN) at <https://pen.iana.org/pen/PenApplication.page>
 and update these assignments accordingly.
 ### Assigned OIDs
 | OID                   | Symbolic name                     | Description                                               |
 | --------------------- | --------------------------------- | --------------------------------------------------------- |
 | `1.3.6.1.4.1.99999.1` | `mosaic.federation.grantId`       | UUID of the `federation_grants` row authorising this cert |
 | `1.3.6.1.4.1.99999.2` | `mosaic.federation.subjectUserId` | UUID of the local user on whose behalf the cert is issued |
 ### Encoding
 Each extension value is DER-encoded as an ASN.1 **UTF8String**:
 ```
 Tag    0x0C        (UTF8String)
 Length 0x24        (36 decimal — fixed length of a UUID string)
 Value  <36 ASCII bytes of the UUID>
 ```
 The step-ca X.509 template at `infra/step-ca/templates/federation.tpl`
 produces this encoding via the Go template expression:
 ```
 {{ printf "\x0c\x24%s" .Token.mosaic_grant_id | b64enc }}
 ```
 The resulting base64 value is passed as the `value` field of the extension
 object in the template JSON.
 ### CA Environment Variables
 The `CaService` (`apps/gateway/src/federation/ca.service.ts`) requires the
 following environment variables at gateway startup:
 | Variable                       | Required | Description                                                          |
 | ------------------------------ | -------- | -------------------------------------------------------------------- |
 | `STEP_CA_URL`                  | Yes      | Base URL of the step-ca instance, e.g. `https://step-ca:9000`        |
 | `STEP_CA_PROVISIONER_PASSWORD` | Yes      | JWK provisioner password for the `mosaic-fed` provisioner            |
 | `STEP_CA_PROVISIONER_KEY_JSON` | Yes      | JSON-encoded JWK (public + private) for the `mosaic-fed` provisioner |
 | `STEP_CA_ROOT_CERT_PATH`       | Yes      | Absolute path to the step-ca root CA certificate PEM file            |
 Set these variables in your environment or secret manager before starting
 the gateway. In the federated Docker Compose stack they are expected to be
 injected via Docker secrets and environment variable overrides.
 ### Fail-loud contract
 The CA service (and the X.509 template) are designed to fail loudly if the
 custom OIDs cannot be embedded:
 - The template produces a malformed extension value (zero-length UTF8String
  body) when the JWT claims `mosaic_grant_id` or `mosaic_subject_user_id` are
  absent. step-ca rejects the CSR rather than issuing a cert without the OIDs.
 - `CaService.issueCert()` throws a `CaServiceError` on every error path with
  a human-readable `remediation` string. It never silently returns a cert that
  may be missing the required extensions.
--- a/docs/federation/TASKS.md
+++ b/docs/federation/TASKS.md
@@ -16,12 +16,12 @@
 Goal: Gateway runs in `federated` tier with containerized PG+pgvector+Valkey. No federation logic yet. Existing standalone behavior does not regress.
 | id        | status | description                                                                                                                                                                                                        | issue | agent  | branch                             | depends_on | estimate | notes                                                                                                                                            |
-| --------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----- | ------ | ---------------------------------- | ---------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| --------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----- | ------ | ---------------------------------- | ---------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
 | FED-M1-01 | done   | Extend `mosaic.config.json` schema: add `"federated"` to `tier` enum in validator + TS types. Keep `local` and `standalone` working. Update schema docs/README where referenced.                                   | #460  | sonnet | feat/federation-m1-tier-config     | —          | 4K       | Shipped in PR #470. Renamed `team` → `standalone`; added `team` deprecation alias; added `DEFAULT_FEDERATED_CONFIG`.                             |
-| FED-M1-02 | done   | Historical shipped-status record: authored a federated Compose overlay with PostgreSQL/pgvector, Valkey, volumes, and healthchecks. It is not a current startup, init, extension, schema, or migration procedure.  | #460  | sonnet | feat/federation-m1-compose         | FED-M1-01  | 5K       | Shipped in PR #471 status only. KBN-101-02 retires its init authority; KBN-101-05 replaces deployment rendering; KBN-101-07 SETUP is non-operative until activation.                                                                                  |
+| FED-M1-02 | done   | Author `docker-compose.federated.yml` as an overlay profile: Postgres 17 + pgvector extension (port 5433), Valkey (6380), named volumes, healthchecks. Compose-up should boot cleanly on a clean machine.          | #460  | sonnet | feat/federation-m1-compose         | FED-M1-01  | 5K       | Shipped in PR #471. Overlay defines `postgres-federated`/`valkey-federated`, profile-gated, with pg-init for pgvector extension.                 |
-| FED-M1-03 | done   | Historical shipped-status record: add pgvector support to `packages/storage/src/adapters/postgres.ts`; no adapter changes for non-federated tiers.                                                                 | #460  | sonnet | feat/federation-m1-pgvector        | FED-M1-02  | 8K       | Shipped in PR #472 status only. **KBN-101 supersedes this behavior:** it cannot authorize current runtime extension creation or any DDL; only the runner/external bootstrap contract may do so.                                                       |
+| FED-M1-03 | done   | Add pgvector support to `packages/storage/src/adapters/postgres.ts`: create extension on init (idempotent), expose vector column type in schema helpers. No adapter changes for non-federated tiers.               | #460  | sonnet | feat/federation-m1-pgvector        | FED-M1-02  | 8K       | Shipped in PR #472. `enableVector` flag on postgres StorageConfig; idempotent CREATE EXTENSION before migrations.                                |
 | FED-M1-04 | done   | Implement `apps/gateway/src/bootstrap/tier-detector.ts`: reads config, asserts PG/Valkey/pgvector reachable for `federated`, fail-fast with actionable error message on failure. Unit tests for each failure mode. | #460  | sonnet | feat/federation-m1-detector        | FED-M1-03  | 8K       | Shipped in PR #473. 12 tests; 5s timeouts on probes; pgvector library/permission discrimination; rejects non-bullmq for federated.               |
-| FED-M1-05 | done   | Historical shipped-status record: prior tier migration implementation.                                                                                                                                             | #460  | sonnet | feat/federation-m1-migrate         | FED-M1-04  | 10K      | Shipped in PR #474 status only. **KBN-101 supersedes this route:** it cannot authorize current credentials, target connection, or DDL. The future active route requires runner verification plus target URL-file and signed attestation-file binding. |
+| FED-M1-05 | done   | Write `scripts/migrate-to-federated.ts`: one-way migration from `local` (PGlite) / `standalone` (PG without pgvector) → `federated`. Dumps, transforms, loads; dry-run + confirm UX. Idempotent on re-run.         | #460  | sonnet | feat/federation-m1-migrate         | FED-M1-04  | 10K      | Shipped in PR #474. `mosaic storage migrate-tier`; DrizzleMigrationSource (corrects P0 found in review); 32 tests; idempotent.                   |
 | FED-M1-06 | done   | Update `mosaic doctor`: report current tier, required services, actual health per service, pgvector presence, overall green/yellow/red. Machine-readable JSON output flag for CI use.                              | #460  | sonnet | feat/federation-m1-doctor          | FED-M1-04  | 6K       | Shipped in PR #475 as `mosaic gateway doctor`. Probes lifted to @mosaicstack/storage; structural TierConfig breaks dep cycle.                    |
 | FED-M1-07 | done   | Integration test: gateway boots in `federated` tier with docker-compose `federated` profile; refuses to boot when PG unreachable (asserts fail-fast); pgvector extension query succeeds.                           | #460  | sonnet | feat/federation-m1-integration     | FED-M1-04  | 8K       | Shipped in PR #476. 3 test files, 4 tests, gated by FEDERATED_INTEGRATION=1; reserved-port helper avoids host collisions.                        |
 | FED-M1-08 | done   | Integration test for migration script: seed a local PGlite with representative data (tasks, notes, users, teams), run migration, assert row counts + key samples equal on federated PG.                            | #460  | sonnet | feat/federation-m1-migrate-test    | FED-M1-05  | 6K       | Shipped in PR #477. Caught P0 in M1-05 (camelCase→snake_case) missed by mocked unit tests; fix in same PR.                                       |
--- a/docs/fleet/FLEET-LAUNCH.md
+++ b/docs/fleet/FLEET-LAUNCH.md
@@ -1,77 +1,114 @@
 # Fleet Launch Runbook
-The local fleet roster is the sole writable desired-state authority for membership and launch policy.
+How every Mosaic fleet agent — workers **and** the orchestrator — is launched, and how to
-Generated environment files are rebuildable projections, not an operator-editable command surface.
+configure each one. The guiding principle: **one roster-driven launcher**. There is no bespoke
 per-agent launch script; the roster plus per-agent `.env` files are the single source of launch
 config.
-## Launch chain
+## The launch chain
-| Layer               | Responsibility                                                                                                                  |
+| Layer            | File                                              | Responsibility                                                                                                                                              |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| ---------------- | ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Roster              | `fleet/roster.yaml` supplies the agent name, class, supported runtime, model, reasoning, tool policy, workdir, and tmux socket. |
+| systemd unit     | `mosaic-agent@<role>.service`                     | One templated unit per role; `ExecStart` runs the session launcher with the instance name `%i`. Defaults `MOSAIC_AGENT_RUNTIME=pi`, `MOSAIC_AGENT_NAME=%i`. |
-| Projection writer   | Renders deterministic `fleet/agents/<name>.env.generated` from the roster.                                                      |
+| session launcher | `tools/fleet/start-agent-session.sh <role>`       | Builds the launch command, opens the tmux pane, wires the heartbeat.                                                                                        |
-| Optional local data | Reads a strict, data-only `fleet/agents/<name>.env.local`; it cannot shadow generated keys.                                     |
+| launch command   | `mosaic yolo <runtime>` (or a per-agent override) | Replaces the pane's foreground process with the runtime, fully seeded.                                                                                      |
-| systemd             | Starts the launcher with `env -i` and fixed bootstrap data. It does not preload either environment file.                        |
+| seeding          | `mosaic`'s `composeContract()`                    | Injects the Constitution/USER/TOOLS/runtime contract, `*.local` overlays, **and** the Fleet-Comms cheat-sheet — all via `--append-system-prompt`.           |
 | session launcher    | Validates generated and local data before it queries, creates, or stops an exact tmux session.                                  |
 | runtime launch      | Derives the fixed `mosaic yolo <runtime>` argument array from validated roster data, then seeds the runtime contract.           |
-The launcher never `source`s or `eval`s an environment file and never accepts an environment-supplied
+Per-agent overrides live in `fleet/agents/<role>.env`, generated from `roster.yaml` by
-command. `MOSAIC_AGENT_COMMAND`, command/channel overrides, unknown keys, generated-key shadowing,
+`generateAgentEnv` (`packages/mosaic/src/commands/fleet.ts`) and consumed by the launcher.
 secret-like key names, duplicate keys, comments, quoted/export syntax, and unsafe values are rejected.
-## Generated and local files
+## Worker launch path (default)
-`<name>.env.generated` is complete, deterministic, and written only by Mosaic. Its ordered keys are:
+1. `roster.yaml` carries each agent's `runtime` and optional `model_hint`.
 2. `generateAgentEnv` emits `fleet/agents/<role>.env` with `MOSAIC_AGENT_NAME`,
   `MOSAIC_AGENT_RUNTIME`, and `MOSAIC_AGENT_MODEL`.
 3. `start-agent-session.sh` has no `MOSAIC_AGENT_COMMAND` set, so it falls through to the default
   (line ~44):
   ```sh
   MOSAIC_AGENT_COMMAND="mosaic yolo $MOSAIC_AGENT_RUNTIME${MOSAIC_AGENT_MODEL:+ --model $MOSAIC_AGENT_MODEL}"
   ```
 4. The launcher bakes `MOSAIC_AGENT_NAME` into the pane command (line ~118), so `composeContract`
   can inject the Fleet-Comms cheat-sheet for that role.
-```dotenv
+That is the whole worker path: roster → `.env` → `mosaic yolo <runtime>` → seeded pane.
-MOSAIC_AGENT_NAME=<roster name>
+
-MOSAIC_AGENT_CLASS=<roster class>
+## Orchestrator fold (PATH A — ships today)
-MOSAIC_AGENT_RUNTIME=<roster runtime>
+
-MOSAIC_AGENT_MODEL=<roster model hint>
+The orchestrator is **just another roster agent** launched through the canonical path — not a
-MOSAIC_AGENT_REASONING=<roster reasoning>
+snowflake script.
-MOSAIC_AGENT_TOOL_POLICY=<roster tool policy>
+
-MOSAIC_AGENT_WORKDIR=<absolute roster work directory>
+| Piece              | Value                               |
-MOSAIC_TMUX_SOCKET=<roster socket or empty>
+| ------------------ | ----------------------------------- |
 | host-side launcher | `orchestrator-launch.sh`            |
 | systemd unit       | `mosaic-fleet-orchestrator.service` |
 | tmux session       | `orchestrator` (role-named)         |
 Set its launch command via `fleet/agents/orchestrator.env`:
 ```sh
 MOSAIC_AGENT_COMMAND='mosaic yolo claude --channels plugin:discord@<channel>'
 ```
-The generated launch contract supports `claude`, `codex`, `opencode`, and `pi`. `mosaic fleet add`
+When `MOSAIC_AGENT_COMMAND` is set, `start-agent-session.sh`'s `if [ -z "$MOSAIC_AGENT_COMMAND" ]`
-rejects another runtime before it writes the roster or modifies generated, local, or quarantine state.
+guard (line ~41) is false, so the line-44 default — **including its hardcoded `yolo`** — is skipped
-The legacy dogfood stub remains an observability-only canary on its separate `mosaic-factory` socket;
+entirely. The override fully controls the runtime and flags. Routing through `mosaic yolo claude`
-it has no generated-launch adapter and cannot be added through this path.
+(rather than a raw `claude` invocation) is what gives the orchestrator the same full
 `composeContract` seeding + Fleet-Comms cheat-sheet as every worker, with `--channels` and any
 other flags passed straight through to the `claude` binary.
-`<name>.env.local` is optional and may contain only non-secret machine data:
+## Launch gotchas
- `MOSAIC_RUNTIME_BIN`
+1. **Flag conflict.** `mosaic yolo claude` already injects `--dangerously-skip-permissions`. Do
- `MOSAIC_HEARTBEAT_RUN_DIR`
+   **not** also pass `--permission-mode bypassPermissions` — the `claude` binary would receive both.
- `MOSAIC_HEARTBEAT_INTERVAL`
+   Use `mosaic yolo claude …` alone (yolo covers the unattended posture), **or** non-yolo
- `MOSAIC_CLAUDE_JSON`
+   `mosaic claude --permission-mode bypassPermissions …`. Never mix the two.
- `CLAUDE_CONFIG_DIR`
+2. **`MOSAIC_AGENT_NAME` must reach the pane.** The launcher bakes it from the instance name, and
   `composeContract` gates the Fleet-Comms block on it (`launch.ts`, in `composeContract`) — **and**
   the role must be a member of `roster.yaml`, or the block resolves empty.
 3. **`launchRuntime` guards.** `mosaic yolo claude` runs `checkSoul` / `checkRuntime` /
   `checkSequentialThinking`. The host needs `SOUL.md` and the sequential-thinking MCP, or the
   launch aborts (a raw `claude` invocation skipped these checks). Dry-run the composed command in a
   throwaway tmux session before swapping a live launcher.
-Paths must be safe absolute paths and the heartbeat interval must be a positive integer. Projection,
+## Why per-agent `.env` survives upgrades (#632)
 local, and quarantine files must be private regular files; the managed directories must be real,
 private, non-symlink paths. Violations fail closed before tmux interaction.
-## Legacy input and diagnostics
+`install.sh` `PRESERVE_PATHS` includes `fleet/*.yaml`, `fleet/agents`, and `fleet/run`, so
 `mosaic update`'s framework re-seed **preserves** your roster and per-agent `.env` overrides
 (glob-aware `cp` fallback; matching TS parity in `file-adapter.ts`). Before #632, an auto re-seed
 could wipe them — which is exactly why PATH A's `.env` override is safe to rely on now.
-A legacy `<name>.env` is input only during projection generation. Roster-owned keys are regenerated;
+## Inspecting the comms wiring
 valid allowed local data can move to `.env.local`; invalid legacy input is privately retained at
 `<name>.env.quarantine`. Neither legacy nor quarantine files are launch authority.
-Diagnostics expose only rule code, key name, and a SHA-256 content hash. They do not reveal command
+- `mosaic fleet comms-block <role>` prints the Fleet-Comms cheat-sheet a given role receives at
-text, credentials, or other values.
+  launch — its `[host:session]` identity, the exact `agent-send.sh` command for each peer, and the
  FLIP / `--verify` conventions. `--host <h>` previews a cross-host view. An unknown role or missing
  roster **fails loud** (stderr + non-zero exit), so a typo is never a silent no-op.
 - Versus `mosaic compose-contract <runtime>`: that emits the **whole** system prompt and reads the
  role from `MOSAIC_AGENT_NAME` (a full-prompt smoke test). `comms-block` is the targeted,
  explicit-arg, comms-only view — e.g. `mosaic fleet comms-block coder0-0` to preview a peer.
-## Launch and stop behavior
+## North Star / future direction
-The launcher obtains the agent's socket only from the validated generated projection. It creates or
+**Vision:** a webUI lets the user edit each agent's launch config — switch **harness**
-checks the exact `=<agent-name>` tmux target; it never uses an ambient socket or fuzzy session match.
+(claude / pi / codex / opencode), toggle **yolo**, pick a **model**, set a **command/channels**
-The same strict parser runs before exact-stop behavior. A fresh native Pi heartbeat remains authoritative;
+override — with no terminal.
 the shell sidecar only provides fallback state when the native marker is stale or absent.
-`mosaic fleet comms-block <role>` can inspect the role's resolved Fleet-Comms block. It is a read-only
+**Continuity — this is not a new launch path.** It is a data-model + UI-binding layer over the
-inspection tool and fails loudly for an unknown role or missing roster.
+existing roster-driven launcher. Field-by-field status today:
-## Current M2 boundary
+| Launch-config field      | Roster-native today? | Mechanism / gap                                                                                                                                          |
 | ------------------------ | -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **harness** (`runtime`)  | ✅ end-to-end        | `roster.runtime` → `generateAgentEnv` emits `MOSAIC_AGENT_RUNTIME` → launcher line 44. UI just writes the field.                                         |
 | **model** (`model_hint`) | ✅ end-to-end        | `roster.model_hint` → `MOSAIC_AGENT_MODEL` → launcher line 44 `--model`. UI just writes the field.                                                       |
 | **yolo**                 | ❌ new               | Launcher line 44 **hardcodes** `mosaic yolo`. A non-yolo toggle needs a roster `yolo` field → emit `MOSAIC_AGENT_YOLO` → make line 44 conditional.       |
 | **command / channels**   | ❌ new               | `MOSAIC_AGENT_COMMAND` is **consumed** (launcher line ~12) but `generateAgentEnv` does not emit it. Needs a roster `command`/`channels` field → emitted. |
-FCM-M2-001 supplies generated/local parsing, validation, projection, quarantine, and launch-boundary
+**The arc:**
-evidence only. It does not authorize roster CRUD expansion, reconciliation, lifecycle changes, remote
+
-or connector mutation, site canaries, or migration. M3 must establish the local reconcile/lifecycle
+- **A** — `.env` `MOSAIC_AGENT_COMMAND` hatch: manual, ships now, kept safe across upgrades by #632.
-path; M4 separately provides migration preview, canary, and rollback gates.
+- **B** — roster-native launch-config: harness + model are already there; add the **yolo** toggle
  (line-44 conditional) and **command/channels** emission to complete the data model.
 - **webUI** — binds dropdowns/toggles directly to those four roster fields.
 PATH A's `.env` override is the **manual form** of exactly what PATH B makes roster-native and the
 webUI edits — one continuous arc, not three separate features. PATH B is tracked as #636.
--- a/docs/fleet/backlog-conventions.md
+++ b/docs/fleet/backlog-conventions.md
@@ -15,8 +15,8 @@ The backlog uses the existing Mosaic storage layer; there is **no** new database
 engine (no sqlite, no raw client).
 | Condition                      | Tier                 | Data location                    |
-| ---------------------------------- | -------------------- | ---------------------------------------------------------------- |
+| ------------------------------ | -------------------- | -------------------------------- |
-| `DATABASE_URL` injected at runtime | Full server Postgres | the verified runtime database; it never authorizes migration/DDL |
+| `DATABASE_URL` set             | Full server Postgres | the configured database          |
 | `PGLITE_DATA_DIR` set (no URL) | Embedded PGlite      | that directory                   |
 | neither (default)              | Embedded PGlite      | `~/.config/mosaic/fleet/backlog` |
@@ -24,7 +24,8 @@ PGlite is real Postgres semantics in-process — including the row locks the ato
 claim relies on — so the **same code** runs on a laptop (embedded, single-host
 default) and on a full Postgres deployment. Switching tiers is config-only.
-For embedded PGlite only, the local backlog routine may prepare its local schema on first use. **Current operator behavior is PGlite-only.** The PostgreSQL path is held until KBN-101 activation; no current PostgreSQL CLI route, runner, or first-use migration is available or authorized. A future activated PostgreSQL runtime may connect only after its separately certified readiness gate.
+The schema (`backlog` table) is created automatically on first CLI use:
 `runMigrations()` for Postgres, `runPgliteMigrations()` for embedded PGlite.
 ### Update safety
--- a/docs/fleet/how-to/create-update-delete-agent.md
+++ b/docs/fleet/how-to/create-update-delete-agent.md
@@ -1,74 +0,0 @@
 # Create, Inspect, Update, and Delete a Local Fleet Agent
 Use the local roster-v2 control plane only. These commands change desired state and derived environment projections; they never start, stop, reconcile, inspect, or otherwise act on systemd, tmux, sessions, or runtimes.
 ## Read and plan first
 ```sh
 mosaic fleet get <name>
 mosaic fleet plan create --expected-generation <n> --agent '<json>'
 mosaic fleet plan update <name> --expected-generation <n> --agent '<json>'
 mosaic fleet plan delete <name> --expected-generation <n>
 ```
 `plan create` takes the name from `--agent`. `plan update` and `plan delete` require the target name immediately after the operation. A plan is deterministic and side-effect free: it validates the complete proposed roster and projection targets without changing files. Use `--dry-run` on `create`, `update`, or `delete` for the same no-write result.
 Every successful command prints JSON. `get` returns `{ "generation", "agent" }`; mutation results contain `plan`, `applied`, `authoritativeRoster`, and `projections`.
 ## Create safely
 ```sh
 mosaic fleet create --expected-generation 7 --agent '{
  "name":"coder0",
  "alias":"Coder 0",
  "className":"code",
  "runtime":"pi",
  "provider":"openai",
  "model":"gpt-5.6-sol",
  "reasoning":"high",
  "toolPolicy":"code",
  "workingDirectory":"/srv/mosaic",
  "persistentPersona":false,
  "resetBetweenTasks":true,
  "launch":{"yolo":true}
 }'
 ```
 Create defaults to `enabled: true` and `desired_state: stopped`. It does not start a process. Add `--persisted-start` only to persist `desired_state: running`; that still does not start a runtime in this M2 command. The JSON payload is an allowlist of the roster-v2 fields shown above plus `launch.yolo`; command, channel, secret-reference, and other unknown keys are rejected rather than ignored. The JSON error exposes only a stable code, never the rejected value.
 ## Update and delete safely
 ```sh
 mosaic fleet update coder0 --expected-generation 8 --agent '<complete JSON agent payload>'
 mosaic fleet delete coder0 --expected-generation 9
 ```
 Updates require a complete agent JSON payload and preserve the stable name. Delete removes only the exact roster-owned `coder0.env.generated` projection. It retains `coder0.env.local`, legacy `coder0.env`, `coder0.env.quarantine`, and every unrelated projection. A delete dry-run leaves all of those files byte-identical.
 ## Handle generation conflicts
 Every mutation requires the current authoritative `--expected-generation`. A stale value returns JSON `error.code: "stale-generation"` with a non-zero exit. Reload with `mosaic fleet get <name>` or reread the roster, plan again using the returned generation, then retry. A concurrent mutation returns `concurrent-mutation`; do not force or bypass the lock.
 ## Interpret partial failures
 The roster is authoritative and is written before derived projections. A late projection I/O failure returns non-zero with redacted, actionable JSON:
 ```json
 {
  "applied": false,
  "authoritativeRoster": "committed",
  "projections": "incomplete",
  "recovery": {
    "code": "projection-apply-failed",
    "action": "regenerate-projections-from-roster"
  }
 }
 ```
 This is not a rollback and not a no-op: reload the roster because its generation and membership were committed, regenerate projections from that roster, then plan a new mutation. Recovery output never contains environment values, credentials, or command text.
 ## Exit and boundary behavior
 Handled validation errors and partial projection failures exit non-zero. `plan`/`--dry-run` and normal mutation JSON make the state explicit; scripts should use both the exit code and `authoritativeRoster`/`projections`, not `applied` alone.
 The commands operate only on `<mosaic-home>/fleet/roster.yaml`, the local roster desired-state authority. They do not accept arbitrary commands, channels, secrets, remote/connector actions, migration/canary actions, or runtime lifecycle operations.
--- a/docs/fleet/reference/agent-mutations.md
+++ b/docs/fleet/reference/agent-mutations.md
@@ -1,43 +0,0 @@
 # Local Fleet Agent Mutations
 FCM-M2-002 provides local roster-v2 create, get, update, delete, and plan operations. They only change desired state and derived environment projections. They never start, stop, inspect, reconcile, or otherwise act on runtimes, systemd units, tmux sessions, or heartbeats.
 ## CLI contract
 The commands operate only on the canonical `<mosaic-home>/fleet/roster.yaml` v2 authority and print one JSON object to stdout. `--agent` is a JSON object with the roster agent fields expressed as `className`, `toolPolicy`, `workingDirectory`, `persistentPersona`, `resetBetweenTasks`, and `launch: { "yolo": boolean }`.
 ```sh
 mosaic fleet get <name>
 mosaic fleet plan <create|update|delete> [name] --expected-generation <n> [--agent '<json>'] [--persisted-start]
 mosaic fleet create --expected-generation <n> --agent '<json>' [--dry-run] [--persisted-start]
 mosaic fleet update <name> --expected-generation <n> --agent '<json>' [--dry-run]
 mosaic fleet delete <name> --expected-generation <n> [--dry-run]
 ```
 `get` returns the authoritative generation and the selected agent. `plan create` derives its name from `--agent`; `plan update <name>` and `plan delete <name>` require the target name. `--agent` accepts only the documented roster-v2 request fields and `launch.yolo`; unknown keys such as commands, channels, or secret references are rejected. Rejection diagnostics return only the stable `invalid-request` code and never echo a rejected value. `plan` and `--dry-run` validate the complete proposed roster and projections but write neither the roster nor projections. `--persisted-start` is available only for a create request: it records `desired_state: running`, but does not start a process. Without it, create records `enabled: true` and `desired_state: stopped`. Handled failures return JSON with `error.code` and exit non-zero; unclassified validation/projection failures use the redacted `mutation-failed` code.
 ## Generation, validation, and idempotency
 Each create, update, or delete request includes `expectedGeneration`. A request whose expected value differs from the authoritative roster generation fails with `stale-generation`; reload and retry with a newly computed plan. A private mutation lock rejects concurrent writers with `concurrent-mutation`.
 `planFleetAgentMutation` is deterministic and side-effect free. `executeFleetAgentMutation` validates the complete proposed roster through the existing structural and shared persona resolver, prepares generated/local/quarantine projections, and writes the roster authority atomically before applying derived projections. Equivalent create retries and delete requests for an already-absent agent are idempotent no-ops.
 Delete removes only the exact `<name>.env.generated` projection for the removed roster entry. Operator-owned `<name>.env.local`, legacy `<name>.env`, quarantine records, and unrelated projections remain untouched. An already-absent generated projection is treated as stale derived state, not as a failed mutation.
 ## Result and recovery
 Mutation results are JSON-safe objects with `applied`, `authoritativeRoster`, `projections`, `plan`, and—only if a derived projection write fails after the authoritative roster write—a recovery object. `applied` is true only when every roster and derived-projection write completed. The explicit state fields prevent a partial result from being mistaken for a rollback or a no-op:
 ```json
 {
  "applied": false,
  "authoritativeRoster": "committed",
  "projections": "incomplete",
  "recovery": {
    "code": "projection-apply-failed",
    "action": "regenerate-projections-from-roster"
  }
 }
 ```
 Dry-runs and idempotent no-ops report `authoritativeRoster: "unchanged"` and `projections: "not-applied"`; a complete mutation reports `"committed"` and `"complete"`. Recovery output identifies the authoritative roster path and regeneration action only. It never contains generated/local/quarantine values, credentials, or command text. A recovery result exits non-zero because the authoritative roster was persisted but derived projections require regeneration. Regenerate projections from the roster before attempting another mutation.
--- a/docs/fleet/reference/generated-env-boundary.md
+++ b/docs/fleet/reference/generated-env-boundary.md
@@ -1,96 +0,0 @@
 # Fleet Generated Environment Boundary
 **Card:** FCM-M2-001 · **Issue:** #758 · **Status:** unreleased/card-local
 The local fleet roster is the desired-state authority. A launch reads a deterministic,
 roster-derived generated projection and an optional strictly data-only local file; neither file is
 a second roster or a command configuration surface.
 ## Paths and ownership
 For agent `<name>` under `<MOSAIC_HOME>/fleet/agents/`:
 | Path                    | Owner                    | Purpose                                                                                                                      |
 | ----------------------- | ------------------------ | ---------------------------------------------------------------------------------------------------------------------------- |
 | `<name>.env.generated`  | Mosaic projection writer | Complete deterministic launch data rendered from the authoritative roster.                                                   |
 | `<name>.env.local`      | Operator                 | Optional, constrained local machine data. It cannot shadow generated keys.                                                   |
 | `<name>.env`            | Legacy input only        | Read once during projection generation, then regenerated/relocated or privately quarantined. It is never a launch authority. |
 | `<name>.env.quarantine` | Mosaic quarantine        | Mode-`0600` private record of forbidden legacy input; it is never read by the launcher.                                      |
 The systemd templates do not load either environment file. They invoke Bash with a fixed, cleared
 bootstrap environment; the launcher reads and validates `.env.generated` and `.env.local` itself before
 it queries, creates, or stops an exact tmux session. It does not `source`, `eval`, or execute an
 environment-supplied command. Exact stop derives its socket from the same validated generated projection,
 not from systemd or ambient environment data.
 All projection, local, and quarantine files must be regular files with no group or world permissions.
 The agent environment directory must also be a real, non-symlink private directory; it is validated
 before either environment file is read or tmux is queried. Unsafe paths, symlinks, or permissions fail
 closed. Diagnostics identify only a rule code, key name, and SHA-256 content hash; they never print
 values, credential material, or command text.
 ## Allowed data
 `.env.generated` is complete and ordered exactly as follows:
 ```dotenv
 MOSAIC_AGENT_NAME=<roster name>
 MOSAIC_AGENT_CLASS=<roster class>
 MOSAIC_AGENT_RUNTIME=<roster runtime>
 MOSAIC_AGENT_MODEL=<roster model hint>
 MOSAIC_AGENT_REASONING=<roster reasoning>
 MOSAIC_AGENT_TOOL_POLICY=<roster tool policy>
 MOSAIC_AGENT_WORKDIR=<absolute roster work directory>
 MOSAIC_TMUX_SOCKET=<roster socket or empty>
 ```
 The generated launch contract supports only `claude`, `codex`, `opencode`, and `pi`. `fleet add`
 uses that same runtime authority and rejects any other runtime before it writes the roster or changes
 projection, local, or quarantine files. The legacy dogfood stub on its separate `mosaic-factory`
 socket remains an observability canary; it has no generated-launch adapter and cannot be added through
 this projection path.
 `.env.local` may contain only these non-secret data keys:
 - `MOSAIC_RUNTIME_BIN`
 - `MOSAIC_HEARTBEAT_RUN_DIR`
 - `MOSAIC_HEARTBEAT_INTERVAL`
 - `MOSAIC_CLAUDE_JSON`
 - `CLAUDE_CONFIG_DIR`
 Local paths must be safe absolute paths and the interval must be a positive integer. Comments,
 quoted/export syntax, duplicate keys, unknown keys, generated-key shadowing, sensitive key names,
 and `MOSAIC_AGENT_COMMAND` are rejected. The launcher derives the only executable command from the
 validated runtime, model, and reasoning data; no arbitrary command compatibility path exists. When a
 Pi runtime writes a fresh `<name>.hb.native` marker, its native heartbeat remains authoritative; the
 shell sidecar resumes its `status=ok` fallback only after that marker is stale or absent.
 ## Legacy disposition
 During projection generation, legacy roster-derived keys are regenerated from the roster. A valid
 allowed local value is relocated to `.env.local`; forbidden, malformed, duplicate, sensitive, and
 unknown legacy entries cause the legacy file to be moved to `.env.quarantine` and are represented by
 sanitized diagnostics. This is deterministic and idempotent after the legacy file has been consumed.
 ## USC interface packet
 This card does not add a USC site file, write a USC roster, or run a site canary. The following is the
 consolidated downstream interface packet. Status is deliberately separated from checkout presence: no
 product release version has been evidenced for this interface set.
 | Interface               | Canonical public path and version                                                                                                                 | Tracker/release status                                                                                                | Downstream limit                                                                              |
 | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
 | M1 structural compiler  | `parseRosterV2` in `packages/mosaic/src/fleet/roster-v2.ts`; schema `docs/fleet/reference/roster-v2.schema.json`; roster `version: 2`             | FCM-M1-001 is recorded done, merged as #764 (`aa5b43b`); no released product version is asserted here.                | Parse YAML/JSON and canonicalize a supplied v2 site roster without writes.                    |
 | M1 semantic resolver    | `validateRosterV2Semantics` in `packages/mosaic/src/fleet/roster-v2.ts`; baseline `framework/fleet/roles/` plus `roles.local/`                    | FCM-M1-002 remains `in-progress` in `docs/TASKS.md`; unreleased.                                                      | Reuse the shared resolver only; no parallel role resolver or lifecycle action.                |
 | M1 disposition evidence | `packages/mosaic/src/fleet/example-profile-dispositions.ts`; `docs/fleet/migration/example-profile-disposition.md`; retained fixture `version: 1` | FCM-M1-003 remains `not-started` in `docs/TASKS.md`; unreleased even though these checkout artifacts are inspectable. | Inspect fixture/profile/service disposition evidence only; it is not migration authorization. |
 | M2 generated boundary   | `packages/mosaic/src/fleet/generated-env-boundary.ts`; generated projection contract in this document                                             | FCM-M2-001 card-local and uncommitted; unreleased.                                                                    | Render/write a roster-derived projection; local input is never authority.                     |
 The canonical source remains `<MOSAIC_HOME>/fleet/roster.yaml` for the current local fleet path.
 Generated environment data is a rebuildable projection, not an operator-editable source of membership,
 runtime policy, or lifecycle state.
 **Corrected downstream gates:** M2 supplies only parse/validation/projection evidence and does not
 permit a USC site canary, reconciliation, or lifecycle mutation. M3 must first define and validate the
 canonical local reconcile/lifecycle path. M4 then supplies preview/migration and its separate
 canary/rollback gates; only after those M3 and M4 gates may a site migration or canary be considered.
 This card authorizes none of those actions.
--- a/docs/guides/admin-guide.md
+++ b/docs/guides/admin-guide.md
@@ -224,9 +224,9 @@ external clients. Authentication requires a valid BetterAuth session (cookie or
 ### Required
 | Variable             | Description                                                                               |
-| -------------------- | ----------------------------------------------------------------------------------------------------------- |
+| -------------------- | ----------------------------------------------------------------------------------------- |
 | `BETTER_AUTH_SECRET` | Secret key for BetterAuth session signing. Must be set or gateway will not start.         |
-| `DATABASE_URL`       | Runtime-only PostgreSQL connection injected from the dedicated deployment secret; no default or inline DSN. |
+| `DATABASE_URL`       | PostgreSQL connection string. Default: `postgresql://mosaic:mosaic@localhost:5433/mosaic` |
 ### Gateway
--- a/docs/guides/deployment.md
+++ b/docs/guides/deployment.md
@@ -1,67 +1,384 @@
 # Deployment Guide
-> **Status: non-operative for PostgreSQL, federated, and bare-metal production.** The checked-in
+This guide covers deploying Mosaic in two modes: **Docker Compose** (recommended for quick setup) and **bare-metal** (production, full control).
 > Compose PostgreSQL service mounts legacy initialization SQL and the KBN-101 bootstrap, runner,
 > secret-renderer, and process-exec interfaces do not exist yet. This page does not authorize a
 > production deployment, database initialization, manual DDL, secret provisioning, or service
 > activation.
-## Current safe local route
+---
-Use PGlite only for current in-process data-layer work; it requires no PostgreSQL. A Gateway/Web
+## Prerequisites
-local process is held because its unguarded dotenv loader can inherit a daemon PostgreSQL DSN and
+
-reach runtime DDL. If a local queue service is useful, start only Valkey:
+| Dependency       | Minimum version | Notes                                          |
 | ---------------- | --------------- | ---------------------------------------------- |
 | Node.js          | 22 LTS          | Required for ESM + `--experimental-vm-modules` |
 | pnpm             | 9               | `npm install -g pnpm`                          |
 | PostgreSQL       | 17              | Must have the `pgvector` extension             |
 | Valkey           | 8               | Redis-compatible; Redis 7+ also works          |
 | Docker + Compose | v2              | For the Docker Compose path only               |
 ---
 ## Docker Compose Deployment (Quick Start)
 The `docker-compose.yml` at the repository root starts PostgreSQL 17 (with pgvector), Valkey 8, an OpenTelemetry Collector, and Jaeger.
 ### 1. Clone and configure
 ```bash
-docker compose up -d valkey
+git clone <repo-url> mosaic
 cd mosaic
 cp .env.example .env
 ```
-This command intentionally does not start PostgreSQL. Do not run a broad Compose start, use its
+Edit `.env`. The minimum required change is:
 PostgreSQL initialization mount, infer that current Compose is a production/federated route, or
 start Gateway/Web until KBN-101-02 supplies fail-closed local-tier/DSN isolation.
-## Held future procedure
+```dotenv
 BETTER_AUTH_SECRET=<output of: openssl rand -base64 32>
 ```
-PostgreSQL local, federated, Compose, and bare-metal production activation are held until these
+### 2. Start infrastructure services
 artifacts land and pass their independent gates:
-1. **KBN-101-00** external privileged bootstrap artifact;
+```bash
-2. **KBN-101-03** sole `mosaic-db-migrator` runner and verified-readiness artifact; and
+docker compose up -d
-3. **KBN-101-05** Vault/secret-renderer-backed deployment and consumer-isolation artifact.
+```
-The required future order is external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness.
+Services and their ports:
-This is a held, non-operative future activation specification with no current command authority. Do not invoke the named
+| Service               | Default port             |
-runner, start PostgreSQL, or substitute a Compose/init/manual-SQL route until the owned artifacts
+| --------------------- | ------------------------ |
-are implemented and reviewed.
+| PostgreSQL            | `localhost:5433`         |
 | Valkey                | `localhost:6380`         |
 | OTEL Collector (HTTP) | `localhost:4318`         |
 | OTEL Collector (gRPC) | `localhost:4317`         |
 | Jaeger UI             | `http://localhost:16686` |
-## Future production secret and unit boundary (schematic only)
+Override host ports via `PG_HOST_PORT` and `VALKEY_HOST_PORT` in `.env` if the defaults conflict.
-No current bare-metal production unit or command is published. KBN-101-05 must supply a reviewed,
+### 3. Install dependencies
 generation-pinned Vault renderer and a process-exec or systemd `LoadCredential` interface before
 production units can exist. The interface must preserve these exact consumer boundaries:
-| Consumer          | May receive                                                                                  | Must never receive                                                                            |
+```bash
-| ----------------- | -------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+pnpm install
-| Gateway/runtime   | Its own runtime URL and DB client CA at process exec                                         | Migrator URL, importer URL/version, attestation material, signing key, PostgreSQL private key |
+```
 | One-shot migrator | Its own migration URL, DB client CA, and runner-only signing capability                      | Runtime URL, importer consumer copy, Gateway/private PostgreSQL keys                          |
 | Data importer     | Its own immutable URL/version copies, importer CA, pinned public key, and sealed attestation | Runtime/migrator URLs, signing key, shared writable mount                                     |
 | PostgreSQL        | Its own server certificate/key and only its approved server material                         | Application, migrator, importer, or Gateway secrets                                           |
-A future unit specification is non-executable until KBN-101-05 supplies it. It must obtain
+### 4. Initialize the database
 credentials through the renderer’s Vault generation and process-exec/`LoadCredential` boundary;
 it must not place credentials in a production environment file, a monorepo auto-load path, a shell
 export, command arguments, logs, or a manual secret-activation lifecycle instruction. Rotation and
 process replacement semantics must be delivered by the reviewed renderer/interface with generation,
 consumer-isolation, mode/owner, and no-mixed-generation evidence—not improvised in this guide.
-## Readiness and troubleshooting status
+```bash
 pnpm --filter @mosaicstack/db db:migrate
 ```
-Until the future procedure is implemented, do not diagnose PostgreSQL with ad hoc SQL, connection
+### 5. Build all packages
 strings, or initialization scripts. The future sanitized runner-verification readiness artifact is
 the required PostgreSQL readiness authority after its bootstrap/TLS prerequisites pass.
 For local PGlite development, diagnose application behavior without introducing a PostgreSQL
 connection.
-Non-database local services may be inspected with their ordinary local health/log tools. Those
+```bash
-checks do not certify PostgreSQL, federated deployment, or production readiness.
+pnpm build
 ```
 ### 6. Start the gateway
 ```bash
 pnpm --filter @mosaicstack/gateway dev
 ```
 Or for production (after build):
 ```bash
 node apps/gateway/dist/main.js
 ```
 ### 7. Start the web app
 ```bash
 # Development
 pnpm --filter @mosaicstack/web dev
 # Production (after build)
 pnpm --filter @mosaicstack/web start
 ```
 The web app runs on port `3000` by default.
 ---
 ## Bare-Metal Deployment
 Use this path when you want to manage PostgreSQL and Valkey yourself (e.g., existing infrastructure, managed cloud databases).
 ### Step 1 — Install system dependencies
 ```bash
 # Node.js 22 via nvm
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 nvm install 22
 nvm use 22
 # pnpm
 npm install -g pnpm
 # PostgreSQL 17 with pgvector (Debian/Ubuntu example)
 sudo apt-get install -y postgresql-17 postgresql-17-pgvector
 # Valkey
 # Follow https://valkey.io/download/ for your distribution
 ```
 ### Step 2 — Create the database
 ```sql
 -- Run as the postgres superuser
 CREATE USER mosaic WITH PASSWORD 'change-me';
 CREATE DATABASE mosaic OWNER mosaic;
 \c mosaic
 CREATE EXTENSION IF NOT EXISTS vector;
 ```
 ### Step 3 — Clone and configure
 ```bash
 git clone <repo-url> /opt/mosaic
 cd /opt/mosaic
 cp .env.example .env
 ```
 Edit `/opt/mosaic/.env`. Required fields:
 ```dotenv
 DATABASE_URL=postgresql://mosaic:<password>@localhost:5432/mosaic
 VALKEY_URL=redis://localhost:6379
 BETTER_AUTH_SECRET=<openssl rand -base64 32>
 BETTER_AUTH_URL=https://your-domain.example.com
 GATEWAY_CORS_ORIGIN=https://your-domain.example.com
 NEXT_PUBLIC_GATEWAY_URL=https://your-domain.example.com
 ```
 ### Step 4 — Install dependencies and build
 ```bash
 pnpm install
 pnpm build
 ```
 ### Step 5 — Run database migrations
 ```bash
 pnpm --filter @mosaicstack/db db:migrate
 ```
 ### Step 6 — Start the gateway
 ```bash
 node apps/gateway/dist/main.js
 ```
 The gateway reads `.env` from the monorepo root automatically (via `dotenv` in `main.ts`).
 ### Step 7 — Start the web app
 ```bash
 # Next.js standalone output
 node apps/web/.next/standalone/server.js
 ```
 The standalone build is self-contained; it does not require `node_modules` to be present at runtime.
 ### Step 8 — Configure a reverse proxy
 #### Nginx example
 ```nginx
 # /etc/nginx/sites-available/mosaic
 # Gateway API
 server {
    listen 443 ssl;
    server_name your-domain.example.com;
    ssl_certificate     /etc/ssl/certs/your-domain.crt;
    ssl_certificate_key /etc/ssl/private/your-domain.key;
    # WebSocket support (for chat.gateway.ts / Socket.IO)
    location /socket.io/ {
        proxy_pass http://127.0.0.1:14242;
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection "upgrade";
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
    }
    # REST + auth
    location / {
        proxy_pass http://127.0.0.1:14242;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
        proxy_set_header X-Forwarded-Proto $scheme;
    }
 }
 # Web app (optional — serve on a subdomain or a separate server block)
 server {
    listen 443 ssl;
    server_name app.your-domain.example.com;
    ssl_certificate     /etc/ssl/certs/your-domain.crt;
    ssl_certificate_key /etc/ssl/private/your-domain.key;
    location / {
        proxy_pass http://127.0.0.1:3000;
        proxy_set_header Host $host;
        proxy_set_header X-Real-IP $remote_addr;
    }
 }
 ```
 #### Caddy example
 ```caddyfile
 # /etc/caddy/Caddyfile
 your-domain.example.com {
    reverse_proxy /socket.io/* localhost:14242 {
        header_up Upgrade {http.upgrade}
        header_up Connection {http.connection}
    }
    reverse_proxy localhost:14242
 }
 app.your-domain.example.com {
    reverse_proxy localhost:3000
 }
 ```
 ---
 ## Production Considerations
 ### systemd Services
 Create a service unit for each process.
 **Gateway** — `/etc/systemd/system/mosaic-gateway.service`:
 ```ini
 [Unit]
 Description=Mosaic Gateway
 After=network.target postgresql.service
 [Service]
 Type=simple
 User=mosaic
 WorkingDirectory=/opt/mosaic
 EnvironmentFile=/opt/mosaic/.env
 ExecStart=/usr/bin/node apps/gateway/dist/main.js
 Restart=on-failure
 RestartSec=5
 StandardOutput=journal
 StandardError=journal
 [Install]
 WantedBy=multi-user.target
 ```
 **Web app** — `/etc/systemd/system/mosaic-web.service`:
 ```ini
 [Unit]
 Description=Mosaic Web App
 After=network.target mosaic-gateway.service
 [Service]
 Type=simple
 User=mosaic
 WorkingDirectory=/opt/mosaic/apps/web
 EnvironmentFile=/opt/mosaic/.env
 ExecStart=/usr/bin/node .next/standalone/server.js
 Environment=PORT=3000
 Environment=HOSTNAME=127.0.0.1
 Restart=on-failure
 RestartSec=5
 StandardOutput=journal
 StandardError=journal
 [Install]
 WantedBy=multi-user.target
 ```
 Enable and start:
 ```bash
 sudo systemctl daemon-reload
 sudo systemctl enable --now mosaic-gateway mosaic-web
 ```
 ### Log Management
 Gateway and web app logs go to systemd journal by default. View with:
 ```bash
 journalctl -u mosaic-gateway -f
 journalctl -u mosaic-web -f
 ```
 Rotate logs by configuring `journald` in `/etc/systemd/journald.conf`:
 ```ini
 SystemMaxUse=500M
 MaxRetentionSec=30day
 ```
 ### Security Checklist
 - Set `BETTER_AUTH_SECRET` to a cryptographically random value (`openssl rand -base64 32`).
 - Restrict `GATEWAY_CORS_ORIGIN` to your exact frontend origin — do not use `*`.
 - Run services as a dedicated non-root system user (e.g., `mosaic`).
 - Firewall: only expose ports 80/443 externally; keep 14242 and 3000 bound to `127.0.0.1`.
 - Set `AGENT_FILE_SANDBOX_DIR` to a directory outside the application root to prevent agent tools from accessing source code.
 - If using `AGENT_USER_TOOLS`, enumerate only the tools non-admin users need.
 ---
 ## Troubleshooting
 ### Gateway fails to start — "BETTER_AUTH_SECRET is required"
 `BETTER_AUTH_SECRET` is missing or empty. Set it in `.env` and restart.
 ### `DATABASE_URL` connection refused
 Verify PostgreSQL is running and the port matches. The Docker Compose default is `5433`; bare-metal typically uses `5432`.
 ```bash
 psql "$DATABASE_URL" -c '\conninfo'
 ```
 ### pgvector extension missing
 ```sql
 \c mosaic
 CREATE EXTENSION IF NOT EXISTS vector;
 ```
 ### Valkey / Redis connection refused
 Check the URL in `VALKEY_URL`. The Docker Compose default is port `6380`.
 ```bash
 redis-cli -u "$VALKEY_URL" ping
 ```
 ### WebSocket connections fail in production
 Ensure your reverse proxy forwards the `Upgrade` and `Connection` headers. See the Nginx/Caddy examples above.
 ### Ollama models not appearing
 Set `OLLAMA_BASE_URL` to the URL where Ollama is running (e.g., `http://localhost:11434`) and set `OLLAMA_MODELS` to a comma-separated list of model IDs you have pulled.
 ```bash
 ollama pull llama3.2
 ```
 ### OTEL traces not appearing in Jaeger
 Verify the collector is reachable at `OTEL_EXPORTER_OTLP_ENDPOINT`. With Docker Compose the default is `http://localhost:4318`. Check `docker compose ps` and `docker compose logs otel-collector`.
 ### Summarization / embedding features not working
 These features require `OPENAI_API_KEY` to be set, or you must point `SUMMARIZATION_API_URL` / `EMBEDDING_API_URL` to an OpenAI-compatible endpoint (e.g., a local Ollama instance with an embeddings model).
--- a/docs/guides/dev-guide.md
+++ b/docs/guides/dev-guide.md
@@ -39,7 +39,7 @@ mosaic-mono-v1/
 │   ├── queue/            # Valkey-backed task queue
 │   └── types/            # Shared TypeScript types
 ├── docker/               # Dockerfile(s) for containerized deployment
-├── infra/                # Infrastructure configuration (for example, OTEL collector)
+├── infra/                # Infra config (OTEL collector, pg-init scripts)
 ├── docker-compose.yml    # Local services (Postgres, Valkey, OTEL, Jaeger)
 └── CLAUDE.md             # Project conventions for AI coding agents
 ```
@@ -86,54 +86,71 @@ cd mosaic-mono-v1
 pnpm install
 ```
-### 2. Use the local PGlite tier
+### 2. Start Infrastructure Services
 The supported local tier is in-process PGlite and requires no PostgreSQL service. Leave
 `DATABASE_URL` unset for this route. Its default local configuration uses PGlite and performs no
 external database probe.
 If a local queue service is useful, start only that non-PostgreSQL service:
 ```bash
-docker compose up -d valkey
+docker compose up -d
 ```
-Do not use the current Compose PostgreSQL service: it mounts legacy `infra/pg-init` SQL and is
+This starts:
 not qualified for KBN-101. Start OTEL Collector or Jaeger individually only when needed and
 without starting PostgreSQL.
-### 3. Gateway/Web local process (held)
+| Service                  | Port           | Description          |
 | ------------------------ | -------------- | -------------------- |
 | PostgreSQL 17 + pgvector | `5433` (host)  | Primary database     |
 | Valkey 8                 | `6380` (host)  | Queue and cache      |
 | OpenTelemetry Collector  | `4317`, `4318` | OTEL gRPC and HTTP   |
 | Jaeger                   | `16686`        | Distributed trace UI |
-Do not start the current Gateway or web process as a local PGlite route. Gateway first loads the
+### 3. Configure Environment
 daemon configuration and then project environment files without a tier guard; a pre-existing
 `DATABASE_URL` can select PostgreSQL, where current startup still reaches runtime DDL/migrations.
 Creating a root `.env` that omits `DATABASE_URL` does not make this safe, so neither a local
 credential file nor a web environment file is a current developer procedure.
-PGlite remains the supported in-process data-layer implementation, and the optional Valkey command
+Create a `.env` file in the monorepo root:
 above remains safe because it does not start PostgreSQL. A safe Gateway/Web local procedure is held
 until KBN-101-02 rejects a daemon, inherited, root, or app-local PostgreSQL DSN and any non-local
 tier before connection or DDL; KBN-101-05 then supplies the production renderer/Vault process-exec
 or `LoadCredential` boundary.
-### Held future procedure
+```env
 # Database (matches docker-compose defaults)
 DATABASE_URL=postgresql://mosaic:mosaic@localhost:5433/mosaic
-PostgreSQL local and federated deployment are held until KBN-101-00 (external bootstrap),
+# Auth (required — generate a random 32+ char string)
-KBN-101-03 (runner), and KBN-101-05 (renderer-backed deployment) land. The following is the
+BETTER_AUTH_SECRET=change-me-to-a-random-secret
 **held, non-operative future activation order with no current command authority**:
-external bootstrap → TLS/roles → `mosaic-db-migrator --run` →
+# Gateway
-`mosaic-db-migrator --verify` → Gateway/Compose readiness.
+GATEWAY_PORT=14242
 GATEWAY_CORS_ORIGIN=http://localhost:3000
-Neither current Compose nor this development guide authorizes PostgreSQL initialization SQL,
+# Web
-manual DDL, or a pre-runner start.
+NEXT_PUBLIC_GATEWAY_URL=http://localhost:14242
-### 5. Gateway/Web start (held)
+# Optional: Ollama
 OLLAMA_BASE_URL=http://localhost:11434
 OLLAMA_MODELS=llama3.2
 ```
-No Gateway/Web start command is currently authorized for the local PGlite route. Do not use root
+The gateway loads `.env` from the monorepo root via `dotenv` at startup
-`pnpm dev` as a workaround: it additionally starts configured integrations and cannot establish the
+(`apps/gateway/src/main.ts`).
-required local-tier/DSN isolation. Resume this section only after KBN-101-02 provides its
+
-fail-closed local-startup evidence.
+### 4. Push the Database Schema
 ```bash
 pnpm --filter @mosaicstack/db db:push
 ```
 This applies the Drizzle schema directly to the database (development only; use
 migrations in production).
 ### 5. Start the Gateway
 ```bash
 pnpm --filter @mosaicstack/gateway exec tsx src/main.ts
 ```
 The gateway starts on port `14242` by default.
 ### 6. Start the Web App
 ```bash
 pnpm --filter @mosaicstack/web dev
 ```
 The web app starts on port `3000` by default.
 ---
@@ -283,13 +300,26 @@ Implement a standard MCP server that exposes tools via the streamable HTTP
 transport or SSE transport. The server must accept connections at a `/mcp`
 endpoint.
-### 2. Gateway MCP configuration (held)
+### 2. Configure `MCP_SERVERS`
-Do not configure MCP endpoint credentials, write them to a local environment file, or restart the
+In your `.env`:
-Gateway from this guide. Gateway/Web startup is held until KBN-101-02 supplies fail-closed
+
-local-tier/DSN isolation and KBN-101-05 supplies the renderer/Vault process-exec or
+```env
-`LoadCredential` secret-consumer interface. The future authenticated MCP route requires verified
+MCP_SERVERS='[{"name":"my-server","url":"http://localhost:3001/mcp"}]'
-HTTPS and certificate validation; plaintext bearer-token examples are forbidden.
+```
 With authentication:
 ```env
 MCP_SERVERS='[{"name":"secure-server","url":"http://my-server/mcp","headers":{"Authorization":"Bearer token"}}]'
 ```
 ### 3. Restart the Gateway
 On startup, `McpClientService` (`apps/gateway/src/mcp-client/mcp-client.service.ts`)
 connects to each configured server, calls `tools/list`, and bridges the results
 to Pi SDK `ToolDefinition` format. These tools become available in all new agent
 sessions.
 ### Tool Naming
@@ -325,31 +355,42 @@ The schema lives in a single file:
 The `insights` table uses a `vector(1536)` column (pgvector) for semantic search.
-### PostgreSQL schema work (held)
+### Development: Push Schema
-Do not prepare or run a PostgreSQL target from this branch. The sole runner, bootstrap, and
+Apply schema changes directly to the dev database (no migration files created):
 renderer are future KBN-101 artifacts, not current commands. When KBN-101-00/-03/-05 land, the
 owned activation documentation will require external bootstrap → TLS/roles → runner `--run` →
 runner `--verify` → Gateway/Compose readiness.
-### Generating migration artifacts
+```bash
 pnpm --filter @mosaicstack/db db:push
 ```
-`pnpm --filter @mosaicstack/db db:generate` is an offline artifact-generation command. It does
+### Generating Migrations
-not authorize connecting to or initializing PostgreSQL. A future reviewed PostgreSQL procedure
+
-will determine when its output is applied.
+For production-safe, versioned changes:
 ```bash
 pnpm --filter @mosaicstack/db db:generate
 ```
 This creates a new SQL migration file in `packages/db/drizzle/`.
 ### Running Migrations
 ```bash
 pnpm --filter @mosaicstack/db db:migrate
 ```
 ### Drizzle Config
-Config is at `packages/db/drizzle.config.ts`. The schema file path and output directory are
+Config is at `packages/db/drizzle.config.ts`. The schema file path and output
-defined there.
+directory are defined there.
 ### Adding a New Table
 1. Add the table definition to `packages/db/src/schema.ts`.
 2. Export it from `packages/db/src/index.ts`.
-3. Generate the offline artifact with `pnpm --filter @mosaicstack/db db:generate`.
+3. Run `pnpm --filter @mosaicstack/db db:push` (dev) or
-4. Do not apply it to PostgreSQL until the future KBN-101 activation artifacts and their owned
+   `pnpm --filter @mosaicstack/db db:generate && pnpm --filter @mosaicstack/db db:migrate`
-   procedure are available. Direct schema push is not a production-like workflow.
+   (production).
 ---
--- a/docs/guides/migrate-tier.md
+++ b/docs/guides/migrate-tier.md
@@ -1,98 +1,147 @@
 # Migrating to the Federated Tier
-> **KBN-101-07 ownership:** This active documentation is a **non-operative KBN-101
+Step-by-step guide to migrate from `local` (PGlite) or `standalone` (PostgreSQL without pgvector) to `federated` (PostgreSQL 17 + pgvector + Valkey).
 > contract** with no current command authority until KBN-101-00, KBN-101-02, KBN-101-03, KBN-101-05, and KBN-101-06 land and
 > KBN-101-08 activates an exact reviewed release. The commands below describe the produced interface only. Do not run them on the
 > current branch or replace them with direct PostgreSQL, raw SQL, legacy storage migration, or
 > credential-on-argv procedures.
-## Held future procedure
+## When to migrate
-This section is non-operative and grants no current command authority until KBN-101-00, KBN-101-03, and KBN-101-05 land.
+Migrate to federated tier when:
-The deployment control plane executes the complete held future procedure, in order: external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness. The
+- Scaling from single-user to multi-user deployments
-runner is the only attestation producer after its verified TLS, identity, manifest, and schema
+- Adding vector embeddings or RAG features
-checks. A data importer is never a schema bootstrap, extension installer, repair command, or DDL
+- Running Mosaic across multiple hosts
-consumer.
+- Requires distributed task queueing and caching
 - Moving to production with high availability
-## Target material contract
+## Prerequisites
-KBN-101-05 obtains the target URL from Vault KV-v2
+- Federated stack running and healthy (see [Federated Tier Setup](../federation/SETUP.md))
-`secret-{env}/mosaic-stack/database/importer`, key `url`, and reads its authenticated version from
+- Source database accessible and empty target database at the federated URL
-the same successful response `data.metadata.version`. A hash or DSN byte sequence is not a
+- Backup of source database (recommended before any migration)
 provider version. The renderer treats URL bytes and provider version as one generation, writes a
 temporary generation directory with fsync plus atomic rename, and creates separate immutable
 consumer mounts. Swarm uses distinct versioned secret/config references. A deployment cannot mix
 generations.
-| Consumer                                      | Permitted material                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+## Dry-run first
 | --------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Migrator-attestation producer (`10003:10003`) | Its own migration URL/CA; read-only `/run/secrets/mosaic-migrate-target-url` and `/run/secrets/mosaic-migrate-target-version`, each `0400`, solely to bind; producer-only attestation output at `/run/mosaic-attestations-producer/migrate-target.v1.json`; root-wrapper-only signing key. It never connects with, uses, exports, logs, or forwards the importer URL/version.                                                                                                            |
 | Privileged deployment handoff controller      | After runner success and before importer creation, it receives only root-owned non-secret expected provider-version/URL-SHA-256/generation descriptor and pinned public verifier key—not URL bytes or private key. It safe-opens/verifies descriptor and producer artifact, copies exact bytes to a new importer-only mount with fsync/atomic rename, sets `10002:10002` `0400`, seals it read-only, and refuses importer start on any partial/wrong-generation/wrong-owner/mode result. |
 | Importer (`10002:10002`)                      | Its own immutable `0400` copies at the same URL/version paths; CA at exact `DATABASE_TLS_CA_CERT_PATH=/run/secrets/mosaic-db-ca.crt`; pinned Ed25519 public key; read-only `/run/mosaic-attestations/migrate-target.v1.json` supplied only by the sealed handoff.                                                                                                                                                                                                                        |
 | Gateway/runtime/unrelated container           | No importer URL/version, importer artifact, attestation private key, or unrelated CA mount.                                                                                                                                                                                                                                                                                                                                                                                              |
-The migrator and importer safe-open URL, provider-version, attestation, and public-key files only
+Always run a dry-run to validate the migration:
 with `O_RDONLY|O_CLOEXEC|O_NOFOLLOW`; they validate from the opened fd that the file is regular,
 has its expected owner/mode and link count one. The migrator digests only that URL fd for binding,
 then zeroizes/closes it. The importer reads URL bytes once into protected memory, validates the
 signed binding and exact CA before connecting from those same bytes, then zeroizes/closes every
 fd. It neither logs nor exposes a URL/version/attestation/key oracle.
 ## Produced command interface
 After activation and only after approved target preparation, the future interface is:
 ```bash
 # Deployment control plane has already completed the held runner procedure above.
 mosaic storage migrate-tier --to federated \
-  --target-url-file /run/secrets/mosaic-migrate-target-url \
+  --target-url postgresql://mosaic:mosaic@localhost:5433/mosaic \
  --target-attestation-file /run/mosaic-attestations/migrate-target.v1.json \
  --dry-run
 ```
-The provider-version file is fixed deployment material, not argv. This connecting dry-run consumes its nonce; before an actual copy, the deployment control plane must provide fresh runner verification and a new sealed handoff. The runner uses its migration
+Expected output (partial example):
 identity; the importer connects only as non-DDL `mosaic_data_importer` and only after all
 pre-connect validation. After verified TLS and before DML it compares PostgreSQL system ID,
 database OID, `current_user`, CA/SPKI, and manifest/schema fingerprints to the artifact.
-## Required refusals and evidence
+```
 [migrate-tier] Analyzing source tier: pglite
 [migrate-tier] Analyzing target tier: federated
 [migrate-tier] Precondition: target is empty ✓
  users: 5 rows
  teams: 2 rows
  conversations: 12 rows
  messages: 187 rows
  ... (all tables listed)
 [migrate-tier] NOTE: Source tier has no pgvector support. insights.embedding will be NULL on all migrated rows.
 [migrate-tier] DRY-RUN COMPLETE (no data written). 206 total rows would be migrated.
 ```
-KBN-101-02/-03/-05/-06 must prove, with stable sanitized errors, that no target connection occurs
+Review the output. If it shows an error (e.g., target not empty), address it before proceeding.
 for missing/unsafe URL/version/attestation/public-key files; symlink, hardlink, owner, mode, or
 TOCTOU violations; mixed URL/version generations; missing/wrong CA mount; stale/replayed/tampered
 or revoked-key artifacts; provider rotation/revocation; wrong TLS/server/database/role/manifest
 binding; raw `--target-url`; `DATABASE_URL` fallback; runtime/owner identity; consumer leakage;
 or any DDL attempt. Post-connect identity mismatch closes with zero DML/DDL. Tests also prove no
 forwarding, child environment, logging, or error oracle leaks URL/version/key/artifact contents.
-The attestation is credential-free JCS with detached Ed25519 signature and binds issued/expiry,
+## Run the migration
 nonce, authenticated provider version, exact URL-fd SHA-256, TLS host/port/database, CA/SPKI,
 PostgreSQL system ID/database OID, importer role, manifest/schema, and producer identity. Provider
 version rotation invalidates an old artifact and requires a fresh rendered generation plus runner
 verification.
-## Actual copy after dry-run
+When ready, run without `--dry-run`:
 After reviewed dry-run, obtain the required fresh verification/attestation generation, then use:
 ```bash
 # Deployment control plane has supplied fresh runner verification and attestation.
 mosaic storage migrate-tier --to federated \
-  --target-url-file /run/secrets/mosaic-migrate-target-url \
+  --target-url postgresql://mosaic:mosaic@localhost:5433/mosaic \
  --target-attestation-file /run/mosaic-attestations/migrate-target.v1.json \
  --yes
 ```
-The dry-run artifact is terminally replayed and must be rejected; `--yes` bypasses no file,
+The `--yes` flag skips the confirmation prompt (required in non-TTY environments like CI).
 generation, signature, TLS, identity, or DDL control.
-## Data boundary and recovery
+The command will:
-The importer has only an allowlisted mutable-table DML registry. It has no grant for immutable KBN
+1. Acquire an advisory lock (blocks concurrent invocations)
-relations, schemas, roles, memberships, extensions, catalogs, or the Drizzle ledger. Source PGlite
+2. Copy data from source to target in dependency order
-uses its explicit local directory and does not make a PostgreSQL URL fallback valid.
+3. Report rows migrated per table
 4. Display any warnings (e.g., null vector embeddings)
-A failed or ambiguous migration is a control-plane incident: preserve sanitized evidence, retain
+## What gets migrated
-the approved backup/rollback state, and retry only after independent review. Never inspect,
+
-unlock, repair, or initialize the target with ad hoc SQL or copied credentials.
+All persistent, user-bound data is migrated in dependency order:
 - **users, teams, team_members** — user and team ownership
 - **accounts** — OAuth provider tokens (durable credentials)
 - **projects, agents, missions, tasks** — all project and agent definitions
 - **conversations, messages** — all chat history
 - **preferences, insights, agent_logs** — preferences and observability
 - **provider_credentials** — stored API keys and secrets
 - **tickets, events, skills, routing_rules, appreciations** — auxiliary records
 Full order is defined in code (`MIGRATION_ORDER` in `packages/storage/src/migrate-tier.ts`).
 ## What gets skipped and why
 Three tables are intentionally not migrated:
 | Table             | Reason                                                                                          |
 | ----------------- | ----------------------------------------------------------------------------------------------- |
 | **sessions**      | TTL'd auth sessions from the old environment; they will fail JWT verification on the new target |
 | **verifications** | One-time tokens (email verify, password reset) that have either expired or been consumed        |
 | **admin_tokens**  | Hashed tokens bound to the old environment's secret keys; must be re-issued                     |
 **Note on accounts and provider_credentials:** These durable credentials ARE migrated because they are user-bound and required for resuming agent work on the target environment. After migration to a multi-tenant federated deployment, operators may want to audit or wipe these if users are untrusted or credentials should not be shared.
 ## Idempotency and concurrency
 The migration is **idempotent**:
 - Re-running is safe (uses `ON CONFLICT DO UPDATE` internally)
 - Ideal for retries on transient failures
 - Concurrent invocations are blocked by a Postgres advisory lock; the second caller will wait
 If a previous run is stuck, check for advisory locks:
 ```sql
 SELECT * FROM pg_locks WHERE locktype='advisory';
 ```
 If you need to force-unlock (dangerous):
 ```sql
 SELECT pg_advisory_unlock(<lock_id>);
 ```
 ## Verify the migration
 After migration completes, spot-check the target:
 ```bash
 # Count rows on a few critical tables
 psql postgresql://mosaic:mosaic@localhost:5433/mosaic -c \
  "SELECT 'users' as table, COUNT(*) FROM users UNION ALL
   SELECT 'conversations' as table, COUNT(*) FROM conversations UNION ALL
   SELECT 'messages' as table, COUNT(*) FROM messages;"
 ```
 Verify a known user or project exists by ID:
 ```bash
 psql postgresql://mosaic:mosaic@localhost:5433/mosaic -c \
  "SELECT id, email FROM users WHERE email='<your-email>';"
 ```
 Ensure vector embeddings are NULL (if source was PGlite) or populated (if source was postgres + pgvector):
 ```bash
 psql postgresql://mosaic:mosaic@localhost:5433/mosaic -c \
  "SELECT embedding IS NOT NULL as has_vector FROM insights LIMIT 5;"
 ```
 ## Rollback
 There is no in-place rollback. If the migration fails:
 1. Restore the target database from a pre-migration backup
 2. Investigate the failure logs
 3. Rerun the migration
 Always test migrations in a staging environment first.
--- a/docs/guides/user-guide.md
+++ b/docs/guides/user-guide.md
@@ -522,14 +522,8 @@ mosaic storage export --bucket agent-artifacts --output ./artifacts.tar.gz
 # Import data into storage
 mosaic storage import --bucket agent-artifacts --input ./artifacts.tar.gz
-# Schema migration is unavailable in this release. The current storage wrapper shells
+# Migrate data between tiers
-# directly to `pnpm --filter @mosaicstack/db db:migrate`; it is legacy N-1,
+mosaic storage migrate --from hot --to cold --older-than 30d
 # uncertified, and MUST NOT be invoked pending KBN-101-02/-03/-06/-08 activation.
 # Future schema migration is non-operative: external bootstrap → TLS/roles → runner
 # --run → runner --verify → readiness.
 # Tier copy uses only the separately held secure migrate-tier route. Never use a legacy
 # --from/--to storage-migrate command or pass a credential on argv.
 ```
 ---
--- a/docs/native-kanban-sot/INDEX.md
+++ b/docs/native-kanban-sot/INDEX.md
@@ -1,17 +1,16 @@
 # Native Kanban/SOT Canon
-**Status:** KCR-001–016 independently cleared; KBN-101 rc.16 current generic storage-wrapper authority remediation awaits independent exact-head re-review under issue [#771](https://git.mosaicstack.dev/mosaicstack/stack/issues/771)
+**Status:** KCR-001–016 independently cleared; canonical publication is in progress under issue [#751](https://git.mosaicstack.dev/mosaicstack/stack/issues/751)
 **Date:** 2026-07-14
 **Implementation hold:** no feature implementation starts until this canon is squash-merged to `main` with terminal-green CI; after merge, every slice remains held until its KBN prerequisite graph is satisfied.
 ## Artifacts
 | Artifact                                                                                 | Purpose                                                                                                                                                                                               |
-| -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ---------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | [Canonical requirements](../requirements/native-kanban-sot.md)                           | Canonical P0–P3 requirements, all seven ratified decisions, fixed invariants, thin MVP, recovery tiers, non-goals, and per-requirement acceptance criteria                                            |
 | [`MISSION-MANIFEST.md`](./MISSION-MANIFEST.md)                                           | Mission/authority boundaries, exact role chain, gate model, mandatory SecReview triggers, Certifier final/no-merge rule, and collision-free slice ownership                                           |
 | [`TASKS.md`](./TASKS.md)                                                                 | Dependency-ordered, bounded P0–P3 slices with IN/OUT scope, dependencies, shared contracts, file ownership, evidence, and USC coder2/3/4/5 parallelization                                            |
 | [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md)                                                       | rc.16 direct-Drizzle current storage-wrapper hold: legacy N-1/uncertified/non-operative pending -02/-03/-06/-08; exact README commented/user-guide executable forms fail before masking and source-consistency rejects runner-delegation copy; held future bootstrap → TLS/roles → run → verify → readiness; plus prior production boundary, pgvector owner, attestation, inventory, manifests, DDL classifier, TLS/bootstrap, activation, and certification contract; foundation prerequisite of KBN-100 and real-role gate before KBN-105 |
 | [`SHARED-CONTRACT.md`](./SHARED-CONTRACT.md)                                             | Remediated v1 integration contract: proof authority, exact failures/routes/DTOs/MCP ownership, concrete current-main field migration map, relational invariants, Coordinator split, recovery delivery |
 | [`contracts/kanban-schema.v1.ts`](./contracts/kanban-schema.v1.ts)                       | Drizzle target declarations including exact owner/principal membership, project congruence, tags/archive, proposals, persisted assignments, monotonic fences, durable retry, immutable evidence/audit |
 | [`contracts/mechanical-coordinator.v1.ts`](./contracts/mechanical-coordinator.v1.ts)     | Pure snapshot decision engine separated from persistence/service adapter; ID-bound approvals, bigint-safe fences, durable retry/quarantine, artifact-backed checkpoints, exact failures               |
@@ -19,7 +18,6 @@
 | [`contracts/recovery-posture.v1.ts`](./contracts/recovery-posture.v1.ts)                 | Provider-neutral shape schema plus normative runtime refinement, cross-field constraints, and Lite/Standard/High-assurance defaults                                                                   |
 | [`tsconfig.json`](./tsconfig.json)                                                       | Strict no-emit project scope for linting and compiling the four frozen TypeScript contracts against the current Stack Drizzle declarations                                                            |
 | [`DOCUMENTATION-CHECKLIST.md`](./DOCUMENTATION-CHECKLIST.md)                             | Publication documentation gate and implementation-slice deferrals                                                                                                                                     |
 | [KBN-101 exact-head security review](../reports/native-kanban-sot/kbn-101-contract-security-review-82ce325.md) | Historical `da742ca` REQUEST CHANGES report retained as prior closure evidence; rc.16 awaits independent exact-head re-review after closing the current generic storage-wrapper authority HIGH finding                                                                                                                                                                                                                                                                                                                                      |
 | [Initial independent review](../reports/native-kanban-sot/canon-initial-review-no-go.md) | KCR-001–016 findings that blocked the first draft                                                                                                                                                     |
 | [Final independent re-review](../reports/native-kanban-sot/canon-final-rereview-go.md)   | Closure matrix, reproducible validation evidence, and GO verdict                                                                                                                                      |
 | [Ultron final gate](../reports/native-kanban-sot/ultron-final-go.md)                     | Final requirements, authority, schema, migration, recovery, decomposition, and evidence review GO                                                                                                     |
@@ -34,7 +32,7 @@
 | **coder5** | Web                                  | Tasks/Projects Kanban/List/detail and later Coordinator/migration-review UI                                                                             |
 | **Mos**    | Serialized integration               | Canon publication, frozen-contract changes, shared-root/exports, integration gates, merge authority                                                     |
-The safe order is KBN-010 → KBN-101 foundation → KBN-100 → KBN-101 deployed-role immutable-operation certificate → KBN-105, then coder3 Gateway/MCP server, coder4 CLI/projection, coder5 web, and coder2 recovery can proceed on disjoint files. KBN-100 is blocked on the KBN-101 foundation; real deployed-role certification—not synthetic test roles—is required before KBN-105. coder4 then runs pure Coordinator → importer → cutover tooling serially. No two active slices edit the same files.
+The safe order is KBN-010 → KBN-100 → KBN-105, then coder3 Gateway/MCP server, coder4 CLI/projection, coder5 web, and coder2 recovery can proceed on disjoint files. coder4 then runs pure Coordinator → importer → cutover tooling serially. No two active slices edit the same files.
 ## Recovery defaults
--- a/docs/native-kanban-sot/KBN-101-DB-ROLE-SPLIT.md
+++ b/docs/native-kanban-sot/KBN-101-DB-ROLE-SPLIT.md
--- a/docs/native-kanban-sot/SHARED-CONTRACT.md
+++ b/docs/native-kanban-sot/SHARED-CONTRACT.md
@@ -1,95 +1,14 @@
 # Native Kanban/SOT — Remediated Shared Contract v1
-**Status:** CONTROL-PLANE rc.16 KBN-101 current generic storage-wrapper authority remediation complete; awaiting independent exact-head re-review. Prior KCR-001–016 and rc.4 SI-001 decisions retained; KBN-101 foundation certification precedes KBN-100 and real immutable-operation certification precedes KBN-105
+**Status:** CONTROL-PLANE SI-001 AMENDMENT AUTHORIZED; prior KCR-001–016 independent-review GO retained; rc.4 requires independent schema/SecReview before KBN-100
-**Version:** 1.0.0-rc.16
+**Version:** 1.0.0-rc.4
-**Date:** 2026-07-15
+**Date:** 2026-07-14
 **Change authority:** Mosaic control plane/Jason only
 **SI-001 amendment authority:** `web1:mosaic-100` control-plane decision under issue #753
 ## Amendment record
-### 1.0.0-rc.16 — Current generic storage-wrapper authority closure
+### 1.0.0-rc.4 — KBN010-SI-001
 - **Current-source truth:** `packages/storage/src/cli.ts` currently shells `storage migrate --run` directly to `pnpm --filter @mosaicstack/db db:migrate` through `execSync`; no `mosaic-db-migrator` executable exists. README and user-guide command guidance therefore remove that command and any runner-delegation claim. The current wrapper is legacy N-1, uncertified, non-operative, and MUST NOT be invoked pending KBN-101-02/-03/-06/-08 activation.
 - **Future-only boundary:** future schema migration remains non-operative and follows external bootstrap → TLS/roles → runner `--run` → runner `--verify` → readiness; tier copy uses only the separately held secure migrate-tier route.
 - **Unmaskable semantic/source-consistency evidence:** before inventory, ownership, or status masking, -06 fails the exact former README commented code-fence generic-wrapper form and exact user-guide executable generic-wrapper form. Its source-consistency test proves the direct-Drizzle `execSync` target and absent runner bin, so any documentation describing current wrapper delegation to the runner fails.
 - **Non-effect:** prior runner, legacy-CI, Compose, production-secret, attestation, pgvector, manifest, lock, TLS, activation, and serial-gate closures remain unchanged.
 ### 1.0.0-rc.15 — Held runner and legacy-CI authority closure
 - **Held runner only:** Current operator documents cannot advertise `mosaic-db-migrator --run|--verify` as executable. The sole passing future form is one `Held future procedure` Markdown section, bounded through its next equal-or-higher heading, that explicitly says non-operative/no-current-command-authority, names KBN-101-00/-03/-05, and preserves external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness. Any runner hit outside that section fails before inventory/ownership/status masking.
 - **PGlite/current-CI boundary:** Fleet backlog current behavior is PGlite-only; PostgreSQL CLI/runner authority remains held until activation. README classifies the checked-in direct `db:migrate` CI job as active legacy N-1, uncertified, non-authorizing as an operator route, and pending KBN-101-06 removal; it is a known direct-DDL exception against an isolated disposable CI database, not approved ordinary behavior. The -06 fixture asserts every required status term and rejects ordinary-authority presentation.
 - **Non-effect:** prior Compose, production-secret, attestation, pgvector, manifest, lock, TLS, activation, and serial-gate closures remain unchanged.
 ### 1.0.0-rc.14 — Current Compose and production-secret route closure
 - **Current developer boundary:** `README.md` and `docs/guides/dev-guide.md` permit only in-process PGlite data-layer work and explicitly selected non-PostgreSQL Compose services. Gateway/Web local start is held because the current unguarded loader can inherit a daemon/project PostgreSQL DSN and reach runtime DDL; KBN-101-02 must reject it before connection. The current PostgreSQL Compose mount is legacy/unqualified; PostgreSQL and federated activation are held until KBN-101-00/-03/-05 and then follow external bootstrap → TLS/roles → runner `--run` → `--verify` → Gateway/Compose readiness.
 - **Production boundary:** `docs/guides/deployment.md` is non-operative until the KBN-101-05 renderer-backed process-exec or `LoadCredential` interface exists. It contains no active production environment-file, monorepo auto-load, credential export/argv, or secret-activation lifecycle route; future units must preserve generation-pinned Vault consumer isolation.
 - **Unmaskable semantic negatives:** -06 fails the exact former README/dev/deployment Compose-first sequences and every production `.env`, `EnvironmentFile=`, credential export/argv, or restart-as-secret-activation fixture before owned/status/normative classification. The held PGlite/non-PostgreSQL route and future ordered activation are the only passing fixtures.
 ### 1.0.0-rc.13 — Federation-MILESTONES indirect-startup closure
 - **Complete operator inventory:** `docs/federation/MILESTONES.md` is exclusively KBN-101-07 and an exact KBN-101-06 `operator-document` `status-only` record. Its former `pgvector extension installed + verified on startup` wording is superseded and forbidden; it authorizes no current DDL, Compose/init, or runtime/startup path.
 - **Unmaskable semantic negative:** before inventory disposition, the scanner fixture proves that exact former wording fails. The only passing status-only sequence is external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway readiness.
 ### 1.0.0-rc.12 — Deployable importer generation and indirect-DDL-route closure
 - **Authenticated generation:** KBN-101-05 owns one canonical Vault KV-v2 importer record, `secret-{env}/mosaic-stack/database/importer` key `url`, with its version taken only from the same successful `data.metadata.version` response. Value plus provider version are one generation, never inferred from DSN bytes. The renderer creates separate immutable `0400` URL/version copies for migrator `10003:10003` binding-only access and importer `10002:10002` access; it uses fsync/atomic generation replacement for Compose and distinct versioned secret/config references for Swarm, so deployment cannot mix generations.
 - **Bounded consumers:** importer alone receives its URL/version, CA at `DATABASE_TLS_CA_CERT_PATH`, pinned public key, and read-only attestation; migrator receives its own migration URL/CA, the URL/version only for no-connect/no-export binding, attestation output, and the root-wrapper-only private key. Safe fd open/fstat/digest/zeroize/close semantics, a privileged producer-only-to-importer-only attestation handoff controller (verify, exact-byte copy, fsync/atomic rename, `10002:10002` `0400` seal, then importer start), no shared writable file, no logging/oracle, provider rotation/revocation, CA/mount, consumer-isolation, and symlink/hardlink/owner/mode/TOCTOU negatives are mandatory.
 - **Indirect-DDL closure:** `docs/federation/SETUP.md` is non-operative until KBN-101 activation and documents only external bootstrap → TLS/roles → runner `--run` → `--verify` → Gateway readiness. The -06 scanner performs unsuppressible semantic checks for automatic first-boot/startup extension/schema/migration language, Compose-up-before-runner, and init-script authority; the former SETUP wording fails and the remediated sequence passes.
 ### 1.0.0-rc.11 — Target-bound importer attestation and exhaustive operator-route closure
 - **Target-bound proof:** trusted `mosaic-db-migrator --verify` now produces the atomic, credential-free `migrate-target.v1.json` JCS/Ed25519 artifact from a runner-only root-owned signing-key reference; the importer receives only pinned public verification keys and the artifact. Its signed v1 fields bind issued/expiry/nonce, exact secret version and SHA-256 of high-entropy target-file bytes, canonical TLS host/port/database, CA/SPKI, PostgreSQL system identifier/database OID, expected importer role, manifest/schema fingerprints, and producer invocation/build/image/correlation. No DSN, username, password, credential bytes, or signing key enters the artifact, importer, runtime, logs, or output.
 - **Fail-closed importer:** `mosaic storage migrate-tier` requires both `--target-url-file /run/secrets/mosaic-migrate-target-url` and `--target-attestation-file /run/mosaic-attestations/migrate-target.v1.json`. Before target connection it validates files, signature/key/expiry/replay, secret version/digest, TLS/CA/role/manifest bindings and opens/digests/connects from the same in-memory URL bytes. After verified TLS but before transaction/DML it matches server ID, database OID, `current_user`, CA/SPKI, and manifest/schema; failure distinguishes zero connection from connection/zero-DML and DDL remains impossible. Rotation overlap/revocation, atomic rename, replay cache, secret rotation invalidation, and wrong/substituted/stale/tampered/file-change tests are mandatory.
 - **Closed documentation surface:** KBN-101-06 inventories every current non-normative scanner hit, including `docs/guides/user-guide.md` and status-only `docs/federation/TASKS.md`; the latter is historical and cannot authorize DDL. The legacy `storage migrate` tier-copy syntax is unavailable. `storage migrate` is schema-wrapper delegation only; secure tier data copy is `migrate-tier`. Exact KBN PRD/contract/shared/task paths may be `normative-contract` scan class but are still scanned and cannot mask executable instructions. The normative detail remains [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md).
 - **Non-effect:** pgvector closure, manifest, lock, role graph, TLS, activation, and KBN-100/KBN-105 serial gates are unchanged.
 ### 1.0.0-rc.10 — PostgreSQL-valid untrusted pgvector owner and active migrate-tier closure
 - **Valid extension authority:** PostgreSQL 17 + pgvector 0.8.2 `vector` is untrusted (`trusted` absent; `relocatable=true`), so `mosaic_extension_owner` is exactly `NOLOGIN SUPERUSER`, not `NOSUPERUSER`. It is dedicated solely to `mosaic_extensions`, `vector`, and owner-bearing extension members; `rolcanlogin=false`, `rolsuper=true`, zero members, no runtime credential/Vault secret, and no app-container delivery are catalog and deployment proof. An externally controlled audited bootstrap-superuser session alone `SET ROLE`s for extension CREATE/UPDATE/SET SCHEMA, then `RESET ROLE`; fresh and shadow paths do so, while in-place existing work requires exact pre-existing `extowner`.
 - **Explicit superuser exception:** `GRANT`/`REVOKE` cannot privilege-limit a superuser. The containment is dedicated identity, no login, no membership, external control plane, audit, independent review, backup/rollback, and maintenance window—not a false least-privilege claim. Runtime, migrator, schema owner, importer, and every service role cannot assume the role or alter/update/drop/change extension membership. Managed targets without this exact role are ineligible unless a versioned provider-owned extension-owner profile is independently approved.
 - **Active secure data-migration route:** `docs/guides/migrate-tier.md` is exclusively KBN-101-07, is active rather than historical, and specifies runner-prepared/verified PostgreSQL destination plus a dedicated non-DDL importer. KBN-101-02 freezes `--target-url-file /run/secrets/mosaic-migrate-target-url`, never credential argv; raw `--target-url`, `DATABASE_URL` fallback, runtime owner, missing/unsafe file, wrong mode, and DDL all fail before target connection/DDL. KBN-101-06 inventory/matrix records the route and exact secure fields, then tests its finite operator-document closure.
 - **Non-effect:** manifest, lock, `mosaic` application schema, TLS, activation, and KBN-100/KBN-105 serial gates remain unchanged. The normative detail remains [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md).
 ### 1.0.0-rc.9 — KBN-101 extension-schema boundary, disjoint manifests, and scanner mechanics
 - **Extension schema owner:** `mosaic_extension_owner`, not `mosaic_schema_owner`, creates and owns `mosaic_extensions`, `vector`, and extension-member objects. The external bootstrap actor `SET ROLE`s for fresh creation or approved-owner relocation, then `RESET ROLE`s; rc.10 replaces the earlier membership wording with the PostgreSQL-valid zero-member superuser exception. Schema owner has only `USAGE` for legacy type resolution—never ownership, `CREATE`, `ALTER`, `DROP`, member change, or default-privilege authority. Runtime, migrator, and schema owner must fail catalog and direct DDL denials; shadow/resume/rollback repeat the owner/default-privilege proof.
 - **Exclusive delivery DAG:** KBN-101-00…09 now has a complete, nonoverlapping exact file/glob manifest with named tests/evidence. The runner mapping is exactly `"mosaic-db-migrator": "./dist/cli.js"` and image `ENTRYPOINT ["mosaic-db-migrator"]`; `packages/storage/src/{cli,migrate-tier}.ts` belongs only to -02, and -07 is documentation only. -08/-09 own evidence paths only. -00…07 are prepared artifacts; the immutable N-1 image remains live until -08 atomic activation, so no independently deployed intermediate can bypass runtime controls.
 - **Mechanical classifier:** -06 owns the exact scanner, inventory fixture, command-matrix harness, and CI wiring. Inventory records pin path/class/owner/disposition/allowed tokens/rationale/expiry/review revision; unknown, duplicate-owner, ownerless, missing-path, invalid allowlist, and historical-category masking fail. The architecture plan's operative direct `db:migrate` is replaced by sole-runner guidance rather than hidden under a historical category.
 - **Non-effect:** manifest v1, lock, `mosaic` application-schema ownership, TLS, activation, KBN-100/KBN-105 serial gates, and all earlier canon decisions remain unchanged. The normative detail remains [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md).
 ### 1.0.0-rc.8 — KBN-101 finite authority, executable runner, and pgvector-owner remediation
 - **Finite authority closure:** KBN-101-06 classifies every current executable source/script/package bin, operator document, and deploy manifest by exact path; unclassified current hits fail. Byte-immutable historical SQL, PGlite-only routines, negative-test literals, vendored/generated artifacts, and clearly labeled historical reports are exact-path/category reviewed allowlists only. `packages/db/src/index.ts` loses its public `runMigrations` export with a direct-import/compile negative; `docs/fleet/backlog-conventions.md` and `docs/PERFORMANCE.md` lose first-use/direct-Drizzle/Gateway-startup migration instructions and carry runner/readiness route negatives. A token scan is only input to the classifier, never proof of authority.
 - **Executable exclusive cards:** KBN-101-03 alone publishes `mosaic-db-migrator` from `packages/db/package.json`/`src/cli.ts`, owns `docker/db-migrator.Dockerfile`, and keeps `{runner,config.dto,manifest,identity,tls}` private, with exact `--run|--verify|--help`, env-only input, stable exits, and command tests. KBN-101-00 alone owns `infra/pg-bootstrap/roles.sql`, `infra/pg-bootstrap/extensions.sql`, `infra/pg-bootstrap/README.md`, plus bootstrap tests. KBN-101-05 alone owns `tools/db/render-postgres-secrets.ts`, renderer tests, and Compose/Portainer/Swarm/two-gateway declarations, consuming the versioned bootstrap interface. No card overlaps renderer/bootstrap/deployment ownership.
 - **Extension-owner transition:** `mosaic_extension_owner` is a dedicated NOLOGIN role whose membership/credentials never reach services; the external bootstrap actor alone may `SET ROLE` during bootstrap. Fresh vector and member objects retain that owner. PostgreSQL has no supported extension-owner alteration: approved-owner existing extension relocation validates `pg_extension.extowner`, members/schema/version and uses tested `ALTER EXTENSION ... SET SCHEMA`; legacy runtime-owned extension fails closed to a controlled shadow database migration with backup, evidence, quiesce/final delta, atomic switch, and read-only rollback window. No catalog mutation, ownership adoption, or `DROP CASCADE` is permitted. Runtime/migrator/schema-owner extension ALTER/DROP/member-update denial is mandatory.
 - **Non-effect:** manifest v1, lock namespace, role/search-path, relocation/TLS/activation, KBN-100/KBN-105 serial gates, and all retained canon decisions are strengthened, not weakened. The normative detail remains [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md).
 ### 1.0.0-rc.7 — KBN-101 complete current-path, relocation, and two-gateway remediation
 - **Finite current-path closure:** static inventory and the `DATABASE_URL`-only-before-connect/DDL denial matrix now explicitly include Gateway's former temporary-table pgvector test (runner-prepared persistent read/query-only fixture), `docker/init-db.sql` retirement, `migrate-tier.ts` runner/bootstrap-only guidance, and the active two-gateway harness. The harness is migrated, not retired: `postgres-a/b → mosaic-db-migrator-a/b → gateway-a/b`, each with isolated URL/CA material, verified readiness, SANs, and positive/negative TLS evidence.
 - **Executable relocation:** KBN-101-03 exclusively owns `schema.ts`, Drizzle snapshots/journal/generated relocation and exact tests. All future application declarations use exported `pgSchema('mosaic')`; immutable historical SQL runs only in trusted legacy `public`. `vector` is fixed in non-writable `mosaic_extensions`, with exact catalog relocatability/version eligibility, explicit type/operator qualification, catalog-class ordering, unknown-object fail-closed behavior, clean/current-public/partial/reverse rollback tests, and an N-1 release order.
 - **Bound deployment ownership:** `mosaicstack/stack` KBN-101-00/05 owns current Compose, Portainer, two-gateway, bootstrap renderer/templates, UID/GID declarations, and rendered validation. Gateway is fixed to `10001:10001`; PostgreSQL UID/GID is image-inspected and frozen only after digest pinning. Exact secret paths, atomic renderer behavior, Compose/Swarm targets/modes, Gateway/PostgreSQL leaf separation, and two-pair TLS failure evidence are required. Mosaic deployment control plane/Jason is the named activation authority; environment IaC/Vault supplies versioned input only.
 - **Correct traceability:** REQ-03 maps to role/schema/search-path, REQ-04 to TLS, REQ-05 to post-KBN-100 immutability, REQ-06 to rollout/rollback, and REQ-07 to the KBN-101 → KBN-100 → KBN-101 → KBN-105 sequence. No prior manifest/lock/role/DAG/activation decision is weakened.
 ### 1.0.0-rc.6 — KBN-101 closed DDL/TLS/ledger activation remediation
 - **Choice:** `mosaic-db-migrator` is the sole application/CI/test PostgreSQL DDL control plane. Every legacy entrypoint is routed or denied, rejects `DATABASE_URL`-only before connection/DDL, and `db:push` is unavailable outside an allowlisted disposable developer target. The runner holds one `max:1` session with fixed `pg_try_advisory_lock(1297044289,1262636593)` across preflight through release.
 - **Exact ledger:** manifest v1 canonically serializes journal logical index/tag and SHA-256 of exact shipped migration bytes. It maps each observed ledger hash to one tuple; physical insertion order is non-normative, while missing/unknown/duplicate/ambiguous/corrupt/stale states fail closed. Shipped `0009` bytes remain unchanged; a missing/effects-absent `0009` runs normally, an applied-late hash maps normally, and partial/full effects with missing hash require backup restoration or separately reviewed repair—not manual adoption.
 - **TLS/search path:** operator/IaC owns CA and server leaf lifecycle, exact compose/Swarm secret mounts, server TLS activation, service-DNS SANs, verified-TLS readiness, transition, CA overlap rotation, and rollback. Runtime/migrator use `verify-full`; PGlite is not PostgreSQL TLS evidence. Application sessions use only `pg_catalog,mosaic`; no URL/config-derived identifier reaches SQL.
 - **Safe release:** cards 00–07 land prepared but inactive; owner-runtime deployments remain N-1. Mosaic control plane/Jason alone authorizes one atomic TLS/roles → runner → readiness → runtime activation or rollback. No runtime-operator compatibility switch, bypass, plaintext interval, or force-on-red exists; all temporary support is removed before KBN-101-08.
 - **Non-effect:** role graph, immutable certification after KBN-100, KBN-105 gate, rc.5’s preserved rc.4 SI-001 invariants, and all KCR-001–016 decisions remain unchanged. Exact detail is normative in [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md).
 ### 1.0.0-rc.5 — KBN-101 role/connection split
 - **Choice:** PostgreSQL `standalone` and `federated` runtime uses `DATABASE_URL` only as a non-owner `mosaic_runtime` login; an explicit migration phase uses `DATABASE_MIGRATION_URL` only as `mosaic_migrator`, which `SET ROLE`s to non-login `mosaic_schema_owner` for DDL. Local PGlite remains an explicit embedded exception.
 - **No fallback / no startup DDL:** missing migration URL fails the migration phase; it never falls back to runtime URL/default/config. Gateway replicas do not run migrations. An advisory-locked migration phase verifies the exact ordered Drizzle ledger fingerprint before replicas may become ready.
 - **Privilege model:** non-login `mosaic_platform_database_owner` is outside application paths; `mosaic_schema_owner` owns only application/ledger schemas. `mosaic_runtime` has only `mosaic_runtime_capability`, owns no object/schema, cannot assume owner/migrator, has no TEMPORARY privilege, has only read access to the Drizzle ledger, and must fail startup if effective identity, unsafe attributes, authenticated TLS, search path, schema version, grants, or immutable relation privileges differ from the frozen contract. `task_events`, `artifacts`, `task_checkpoints`, `task_checkpoint_artifacts`, and `approval_decision_artifacts` grant runtime only INSERT/SELECT; KBN-100 retains RESTRICT/no-cascade semantics.
 - **Non-effect:** rc.4 SI-001 candidate-key/FK order and all KCR-001–016 tenancy, SOT, proposal-audit, approval, fence, recovery, no-cascade, endpoint, and wire invariants are unchanged. This amendment neither creates roles/secrets nor changes production deployment.
 - **Gate:** KBN-101’s role/schema-boundary foundation certificate, Vault/redaction/rotation, N-1/rollback, and independent security GO are mandatory before KBN-100. After KBN-100 creates the immutable relations, KBN-101 real deployed-role immutable-operation certification plus Ultron GO is mandatory before KBN-105; synthetic test-role success alone is insufficient. Exact implementation detail is normative in [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md).
 ### 1.0.0-rc.4 — KBN010-SI-001 (preserved)
 - **Choice:** add the explicitly named, non-partial unique candidate key `missions_workspace_id_uidx` on `missions(workspace_id, id)` and retain `missions_workspace_project_id_uidx` on `(workspace_id, project_id, id)`.
 - **Rationale:** mission `id` remains globally unique, while the composite candidate key makes the frozen tenant-safe generic mission relations valid. `artifacts` and `approval_decisions` are polymorphic exactly-one-target records and do not consistently carry `project_id`; widening both children would unnecessarily broaden v1 and its target semantics.
@@ -100,7 +19,7 @@
 ## 1. Authority
-Concrete contracts are the four `contracts/*.v1.ts` files. PostgreSQL/current-main Drizzle is the sole writable SOT. In PostgreSQL standalone/federated deployments, KBN-101 rc.13 DDL/ledger/TLS/role/attestation/generation separation is a precondition to schema implementation and certification. Public health, Valkey, files, exports, providers, browser state, and outage notes cannot authorize/reconstruct writes. Mechanical Coordinator is non-LLM with no scope/gate/certification/merge authority. Certifier is final independent gate with no merge authority. No feature lane starts until this canon merges and the KBN-010/KBN-105 prerequisites are satisfied.
+Concrete contracts are the four `contracts/*.v1.ts` files. PostgreSQL/current-main Drizzle is the sole writable SOT. Public health, Valkey, files, exports, providers, browser state, and outage notes cannot authorize/reconstruct writes. Mechanical Coordinator is non-LLM with no scope/gate/certification/merge authority. Certifier is final independent gate with no merge authority. No feature lane starts until this canon merges and the KBN-010/KBN-105 prerequisites are satisfied.
 ## 2. Health proof and exact failures
@@ -185,7 +104,7 @@ The candidate key is intentionally redundant with globally unique `missions.id`,
 ### 5.3 New audit/proposal DDL order
-KBN-100 migration DDL may begin only after KBN-101 foundation role/schema-boundary certification. It runs in the explicit migrator/owner phase—not Gateway startup—and its generated Drizzle declaration/snapshot/journal must be mutually consistent. It must execute in this order:
+KBN-100 migration DDL must execute in this order:
 1. create `task_events` and its unique `(workspace_id, id)` key;
 2. create `change_proposals` with nullable acceptance-event ID and required submission-event ID;
@@ -324,7 +243,7 @@ KBN-115/coder2 owns `packages/config/src/recovery-posture.ts`, tests, and recove
 ## 9. Integration, security, and hold
-Required release evidence includes KBN-101 foundation role/schema-boundary and post-KBN-100 real immutable-operation deployed-role certificates (not synthetic roles), empty/prod/partial/rollback/N-1 migration tests; cross-workspace and same-workspace wrong-project negatives; active-membership owners/principals; proposal inertness/normal acceptance; exact failure mapping; concurrent monotonic bigint fences; relational lease/checkpoint/evidence mismatch; immutability privileges/RESTRICT; recovery validation/mechanism evidence; endpoint registry alignment; accessible web journeys; author≠reviewer; mandatory SecReview; final Certifier pass/no merge authority.
+Required release evidence includes empty/prod/partial/rollback/N-1 migration tests; cross-workspace and same-workspace wrong-project negatives; active-membership owners/principals; proposal inertness/normal acceptance; exact failure mapping; concurrent monotonic bigint fences; relational lease/checkpoint/evidence mismatch; immutability privileges/RESTRICT; recovery validation/mechanism evidence; endpoint registry alignment; accessible web journeys; author≠reviewer; mandatory SecReview; final Certifier pass/no merge authority.
 ### 9.1 SI-001 amendment gate and #757 boundary
--- a/docs/native-kanban-sot/TASKS.md
+++ b/docs/native-kanban-sot/TASKS.md
@@ -43,10 +43,8 @@ Shared roots, package exports/manifests, lockfiles, and generated artifacts are
 ```text
 KBN-000 canon remediation
  -> KBN-010 threat/auth/constraint-impact gate (MUST COMPLETE)
      -> KBN-101 foundation role/schema-boundary certificate (SERIAL)
      -> KBN-100 schema + concrete N-1 migration implementation
-              ├─ KBN-101 post-KBN-100 deployed-role immutable-operation certificate (SERIAL)
+          ├─ KBN-105 exact endpoint/DTO/error/registry freeze (SERIAL)
              │    -> KBN-105 exact endpoint/DTO/error/registry freeze (SERIAL)
          │    ├─ KBN-110 domain + Gateway + MCP server implementation
          │    ├─ KBN-120 CLI/projection implementation [coder4 first]
          │    └─ KBN-130 web MVP implementation
@@ -66,7 +64,7 @@ KBN-310 + KBN-320
      -> KBN-340 owner-gated cutover/stabilization
 ```
-No consumer implementation begins before KBN-105. No schema work begins before KBN-010 completes and the KBN-101 foundation role/schema-boundary certificate passes; the real immutable-operation certificate follows KBN-100 and blocks KBN-105. The coder4 order is always KBN-120 → KBN-200 → KBN-300 → KBN-320.
+No consumer implementation begins before KBN-105. No schema work begins before KBN-010 completes. The coder4 order is always KBN-120 → KBN-200 → KBN-300 → KBN-320.
 ## 4. P0 — Canon, threat gate, schema, and exact API freeze
@@ -93,17 +91,6 @@ No consumer implementation begins before KBN-105. No schema work begins before K
 - **Contract surfaces:** schema constraints, health proof, exact errors, command-family authorization.
 - **Evidence:** signed constraint-impact matrix; no unresolved schema-impact finding; SecReview pass.
 ### KBN-101 — PostgreSQL runtime/migration role split and deployed-role certification
 - **Status:** IN PROGRESS — issue [#771](https://git.mosaicstack.dev/mosaicstack/stack/issues/771); rc.16 closes HIGH-1 current generic storage-wrapper authority: README/user-guide remove `storage migrate --run` guidance and false runner delegation; current source is direct-Drizzle, legacy N-1, uncertified, non-operative, and forbidden pending -02/-03/-06/-08 activation. The -06 fixture fails both exact former forms before inventory/status masking and source-consistency rejects current direct-Drizzle wrapper as runner delegation. It awaits independent exact-head re-review; implementation remains held.
 - **Owner:** Mos integration control plane; independently reviewed by security/Ultron.
 - **Mode:** SERIAL foundation certificate blocks KBN-100; its post-KBN-100 real immutable-operation certificate blocks KBN-105.
 - **IN:** Exact `DATABASE_URL` non-owner runtime versus `DATABASE_MIGRATION_URL` owner/migrator connection contract; sole published `mosaic-db-migrator --run|--verify` PostgreSQL DDL path and all legacy/future entrypoint closure; active migrate-tier destination only after runner prepare/verify through exact `--target-url-file /run/secrets/mosaic-migrate-target-url`, paired authenticated provider-version file, and signed `--target-attestation-file /run/mosaic-attestations/migrate-target.v1.json`; runner-only signing key/public-key isolation; canonical Vault KV-v2 target URL/version, generation-pinned renderer, importer CA/public-key/attestation plus privileged sealed producer-to-importer handoff, safe-fd/consumer-isolation/no-log-oracle, TLS/server/database/role/manifest/schema binding, expiry/replay/provider-rotation/TOCTOU/no-DML controls, and dedicated non-DDL importer; finite exact-path scanner/allowlist/active-route review plus unsuppressible automatic-startup/init/Compose-before-runner semantic negatives and every-path before-connect denial matrix; `DATABASE_TLS_CA_CERT_PATH` plus operator/IaC CA/server-key/cert lifecycle, exact service-DNS SANs, Vault/compose/Swarm mount modes, TLS server/bootstrap/rotation/rollback; PGlite exception; fixed two-int advisory lock; manifest-v1 logical-index/tag/exact-byte-SHA-256 ledger reconciliation including safe `0009`; fixed `mosaic` schema and exact `pg_catalog,mosaic` pooled session path; platform/schema/`NOLOGIN SUPERUSER` extension-owner/migrator/importer/runtime roles; approved-owner versus legacy-owner shadow pgvector transition; ownership, zero membership/no runtime secret, TEMP/ledger-read/default privilege and immutable grant proof; N-1 inactive prepared cards then atomic activation/rollback authority; Vault/redaction/observability/operator runbooks; one-card/one-PR implementation DAG.
 - **OUT:** Production mutation in this planning card; KBN-100 tables/data backfill; application API behavior; KBN-105 route/DTO freeze.
 - **Depends on:** KBN-010 completed.
 - **Contract surfaces:** [`KBN-101-DB-ROLE-SPLIT.md`](./KBN-101-DB-ROLE-SPLIT.md); `SHARED-CONTRACT.md` rc.15 amendment.
 - **Evidence:** foundation: exact `--help|--run|--verify`/exit/argv/import-negative plus DTO entrypoint negatives for every finite classified current DDL/static-bypass path (including `DATABASE_URL`-only, runner fixture, retired init, sanitized current operator guidance, both harness pairs, and `db:push` refusal); active migrate-tier paired URL/version/attestation files, signing/public-key isolation, canonical Vault KV-v2 authenticated version, generation-pinned renderer, importer CA, safe fd/TOCTOU/consumer-isolation/no-log-oracle, atomic JCS/Ed25519, digest/TLS/server/database/role/manifest/schema binding, expiry/replay/provider rotation/revocation, zero-connection versus zero-DML, prepared-target/importer/no-DDL negatives; clean/pre-0009/skipped/applied-late/duplicate/unknown/missing/corrupt/stale/backup plus public-to-`mosaic`/partial/reverse runner proof; fixed-lock contention/crash/readiness/unrelated-key tests; runtime cannot invoke migrations/DDL/TEMP; actual pgvector 0.8.2 control metadata, fresh/approved-owner existing/legacy-owner shadow/partial-resume-rollback/N-1 pgvector evidence with `rolcanlogin=false`, `rolsuper=true`, zero members, external-superuser `SET ROLE`/`RESET ROLE` audit, `pg_extension.extowner`, owner-bearing member/schema/version and runtime/migrator/schema-owner/importer/all-service-role `SET ROLE`/ALTER/DROP/member-update denial; disposable standalone, federated/Swarm, and two-gateway verified-TLS positives plus both-pair CA/SAN/downgrade/key mode/UID-GID/URL-secret consumer-isolation and legacy-drain/`hostssl` zero-plaintext negatives; exclusive bootstrap/renderer/manifest ownership test; catalog relocation/vector-query/operator/Drizzle-only-`mosaic`, role/grant/search-path/pool-reset/identifier checks; N-1/atomic TLS-only rollback/no-force-on-red rehearsal; named Vault/bootstrap-control-plane/CA-overlap/redaction/operator evidence; independent author≠reviewer security GO. Post-KBN-100: real deployed non-owner INSERT/SELECT and UPDATE/DELETE denial for immutable event/artifact/evidence relations plus Ultron GO.
 ### KBN-100 — Unified Drizzle schema and concrete N-1 migration
 - **Owner:** **coder2**.
@@ -111,7 +98,7 @@ No consumer implementation begins before KBN-105. No schema work begins before K
 - **Exclusive files:** `packages/db/src/schema.ts`, `packages/db/drizzle/**`, DB tests.
 - **IN:** All frozen tables/joins/enums; workspace/project-congruent constraints; owners/principals; tags/archive; change proposals with both workspace-aware task-event composite FKs and frozen event-before-proposal DDL order; assignment approvals; durable execution/quarantine; monotonic bigint fence; exact checkpoint/evidence joins; RESTRICT/immutability; concrete current-main expand/backfill/switch/contract map.
 - **OUT:** Repositories, Gateway, Coordinator behavior, UI, importer.
- **Depends on:** **KBN-010 completed and KBN-101 foundation role/schema-boundary certificate PASS**. KBN-100 is blocked until both are terminal; it rebases on KBN-101 main, restores generated Drizzle declaration/snapshot/journal consistency, and confines procedural immutable-table grant/trigger/backfill work to its schema ownership. Its new relations are then subject to KBN-101 post-KBN-100 deployed-role certification.
+- **Depends on:** **KBN-010 completed**.
 - **Contract surfaces:** `kanban-schema.v1.ts`; SHARED-CONTRACT current-main delta map.
 - **Evidence:** reviewed SQL; empty/prod-shape/partial-resume/rollback tests; N-1 app safety; legacy columns remain declared; workspace/project mismatch negatives; proposal event-FK missing/foreign-workspace tests; one active lease; monotonic fence; parent-delete RESTRICT; immutability privileges; SecReview.
@@ -122,7 +109,7 @@ No consumer implementation begins before KBN-105. No schema work begins before K
 - **Exclusive files:** canonical endpoint-registry/DTO contract docs; no implementation.
 - **IN:** Exact routes and methods from SHARED-CONTRACT §8; request/success/error fields; status codes; pagination/filter/revision envelopes; idempotency/expected-version headers/fields; proposal commands; health proof exclusion from public DTOs; MCP tool-to-route map.
 - **OUT:** Controller/service/client implementation.
- **Depends on:** KBN-100 and KBN-101 post-KBN-100 deployed-role immutable-operation certification PASS.
+- **Depends on:** KBN-100.
 - **Contract surfaces:** health/error unions; schema IDs/statuses; Gateway DTO freeze.
 - **Evidence:** every FE/CLI/MCP call maps 1:1 to a route; 503/502-504/409 non-cross-map fixtures; contract digest published.
@@ -265,11 +252,9 @@ No consumer implementation begins before KBN-105. No schema work begins before K
 ## 8. Consistent USC wave schedule
 | Wave | coder2                    | coder3                                 | coder4                         | coder5                         |
-| ---- | ----------------------------------------- | ------------------------------------------------------------------------------------ | ------------------------------ | ------------------------------ |
+| ---- | ------------------------- | -------------------------------------- | ------------------------------ | ------------------------------ |
 | 0    | Wait                      | **KBN-010**                            | Wait                           | Wait                           |
-| 0.5  | Wait                                      | **KBN-101 foundation** Mos-controlled role/connection contract and certificate       | Wait                           | Wait                           |
+| 1    | **KBN-100**               | Review constraint implementation       | Wait                           | Wait                           |
 | 1    | **KBN-100** after KBN-101 foundation PASS | Review bounded schema/grant implementation                                           | Wait                           | Wait                           |
 | 1.5  | Certification support                     | **KBN-101 post-KBN-100 deployed-role immutable-operation certificate**, then KBN-105 | Wait                           | Wait                           |
 | 2    | **KBN-115** after KBN-100 | **KBN-105** exact freeze, then KBN-110 | **KBN-120** only after KBN-105 | **KBN-130** only after KBN-105 |
 | 3    | Review support            | Finish KBN-110                         | **KBN-200 after KBN-120**      | Finish KBN-130                 |
 | 4    | —                         | **KBN-210 after KBN-200**              | Review/support                 | **KBN-220 after KBN-210 DTOs** |
--- a/docs/plans/2026-03-15-agent-platform-architecture.md
+++ b/docs/plans/2026-03-15-agent-platform-architecture.md
@@ -1460,11 +1460,12 @@ Add to `packages/db/src/schema.ts` in the `preferences` table definition:
 mutable: boolean('mutable').notNull().default(true),
 ```
-### Held future procedure
+Generate and apply:
-This historical architecture plan grants **no current command authority**. PostgreSQL execution is non-operative until **KBN-101-00, KBN-101-03, and KBN-101-05** land; do not invoke a PostgreSQL runner from this checkout. After those cards land, the approved future procedure is exactly: external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness. Offline migration artifact generation belongs to its owning implementation card and does not activate PostgreSQL execution.
+```bash
-
+pnpm --filter @mosaicstack/db db:generate  # generates migration SQL
-> **KBN-101 supersession:** `pnpm --filter @mosaicstack/db db:migrate` is superseded and MUST NOT be used. The future runner receives only deployment-injected migration credentials; it accepts no URL, SQL, schema, or role argv.
+pnpm --filter @mosaicstack/db db:migrate   # applies to PG
 ```
 Platform enforcement keys (seeded with `mutable = false` by gateway `PreferencesService.onModuleInit()`):
--- a/docs/plans/2026-03-15-wave2-tui-layout-navigation.md
+++ b/docs/plans/2026-03-15-wave2-tui-layout-navigation.md
@@ -946,11 +946,13 @@ pnpm --filter @mosaicstack/types typecheck
 Expected: All PASS
-**Step 2: Manual smoke test (held)**
+**Step 2: Manual smoke test**
-This historical TUI smoke test is unavailable until KBN-101-02 supplies a fail-closed Gateway local
+```bash
-startup route. Do not start current Compose PostgreSQL or infer a local Gateway from PGlite support.
+cd /home/jwoltje/src/mosaic-mono-v1-worktrees/tui-improvements
-A future reviewed test must use the correct Mosaic CLI package and an independently verified Gateway.
+docker compose up -d
 pnpm --filter @mosaicstack/cli exec tsx src/cli.ts tui
 ```
 Verify:
--- a/docs/reports/native-kanban-sot/kbn-101-contract-security-review-82ce325.md
+++ b/docs/reports/native-kanban-sot/kbn-101-contract-security-review-82ce325.md
@@ -1,109 +0,0 @@
 # KBN-101 contract independent security/architecture review
 **Verdict: REQUEST CHANGES**
 ## Review identity and scope
 - **Exact reviewed head:** `da742ca2da4a2ff466916c818fe275c4f7ffd384` (`docs(#771): record role-split review evidence`)
 - **Required comparison:** `origin/main...da742ca2da4a2ff466916c818fe275c4f7ffd384`
 - **Range:** `82ce3252df38a687c50485f8d048b53ca8db5989` is an ancestor of the reviewed head; the final head adds the scratchpad evidence commit and was reviewed.
 - **Changed docs:** `docs/PRD.md`, `docs/SITEMAP.md`, `docs/native-kanban-sot/{INDEX.md,KBN-101-DB-ROLE-SPLIT.md,SHARED-CONTRACT.md,TASKS.md}`, and `docs/scratchpads/771-kbn101-db-role-split.md` (300 additions / 25 deletions).
 - **Reviewed inputs:** issue #771; current DB/Gateway/storage/config/wizard/installer/compose/Portainer/CI sources; all current migration/DDL references; KBN-010, rc.4/rc.5 shared contract, requirements/canon, KBN-100 #769 branch context, and the final scratchpad.
 - **Repository/provider state:** not modified. The pre-existing `.mosaic/orchestrator/*` dirt was not touched.
 The role graph itself is sound in principle: a NOLOGIN platform database owner, separate NOLOGIN schema owner, NOINHERIT migrator which explicitly `SET ROLE`s, and runtime membership only in a capability role with `SET FALSE` does not create circular privilege or application-created login roles. The split of foundation certification before KBN-100 and immutable-operation certification after KBN-100 is also correctly ordered.
 ## Findings
 ### HIGH — DDL/migration control plane is not closed at every current entrypoint
 The contract requires an explicit, locked migration phase and forbids Gateway/runtime DDL (`KBN-101-DB-ROLE-SPLIT.md:34-39`), but its KBN-101-02 result merely says migration-capable commands use the migration DTO (`:109`). It does not prohibit or route every existing bypass through that one command.
 Current bypasses include:
 - `runMigrations()` falls back from an argument to `DATABASE_URL` and a hard-coded URL (`packages/db/src/migrate.ts:24-35`), while `drizzle.config.ts` likewise uses `DATABASE_URL` plus a default (`packages/db/drizzle.config.ts:3-9`).
 - Package scripts expose direct `drizzle-kit migrate` **and** `drizzle-kit push` (`packages/db/package.json:23-26`); `db:push` bypasses the planned journal/fingerprint/lock entirely.
 - `mosaic storage migrate --run` shells out to the direct `db:migrate` script (`packages/storage/src/cli.ts:413-452`).
 - The federated integration test can create types, tables, and indexes directly against `DATABASE_URL` and intentionally operates without a Drizzle ledger (`packages/db/src/federation.integration.test.ts:28-30,46-134`).
 **Failure mode:** a runtime or CI environment with only `DATABASE_URL`, or an operator invoking an existing command, can apply unverified DDL outside the lock, `SET ROLE` preflight, exact-ledger gate, and deployment sequencing. This breaks the requested fail-closed split even if Gateway startup is repaired.
 **Required remediation:** amend KBN-101-02/03/06 to enumerate these entrypoints and make the dedicated migrator runner the only PostgreSQL DDL path. Production-like `db:push` must be removed/blocked; `db:migrate`, `storage migrate --run`, and migration tests must invoke the same migration runner with `DATABASE_MIGRATION_URL`, lock, identity preflight, and ledger verification. Tests needing schema must consume a pre-migrated disposable database, or be explicitly run only by that migration phase. Add negative tests showing each command refuses `DATABASE_URL`-only execution and cannot reach DDL.
 ### HIGH — TLS requirement has no deployable server/bootstrap contract
 The contract correctly requires a mounted CA and hostname-verified TLS (`KBN-101-DB-ROLE-SPLIT.md:25,28,93-95`). However KBN-101-05 promises only a “migration phase and secret binding boundary” (`:112`), not PostgreSQL server TLS, certificate issuance/SANs, CA distribution, startup ordering, or the fresh/existing-database bootstrap trust path.
 Current standalone and federated compose expose plain PostgreSQL with no server TLS configuration or CA mount (`docker-compose.yml:2-14`; `docker-compose.federated.yml:27-44`). The Portainer test stack passes a single plaintext in-network URL and uses the same database login for Gateway and database bootstrap (`deploy/portainer/federated-test.stack.yml:51-60,110-117`).
 **Failure mode:** enforcing the mandatory CA makes current local standalone/federated topologies unable to start; relaxing it to make bootstrap work silently violates K101-REQ-03. A first database cannot be safely migrated until the server certificate, its SAN for the actual service/DNS name, and trusted CA are provisioned, but this lifecycle is not owned or tested.
 **Required remediation:** add a concrete KBN-101-00/05 TLS bootstrap sub-contract: issuer/CA owner; server key/cert and SAN inputs; secure storage/mount permissions; `postgresql.conf`/container TLS enablement; migration and runtime CA mounts; hostname used by each compose/Swarm service; readiness only after TLS authentication; CA overlap rotation; and an existing-database transition. Require a disposable standalone and federated/Swarm test to prove verified TLS succeeds and missing CA, wrong CA, wrong SAN, and `sslmode` downgrade fail before readiness. Do not merge KBN-101-05 with an implicit plaintext exception.
 ### HIGH — exact ledger fingerprint and historical 0009 repair are underspecified for existing databases
 The contract requires an “ordered complete set” and rejection of out-of-order rows (`KBN-101-DB-ROLE-SPLIT.md:36-38`), but does not define the canonical serialized tuple, ledger ordering source, or safe upgrade rule for a historical ledger. The current ledger stores only `id`, `hash`, and `created_at` (`packages/db/src/migrate.ts:70-82,105-107`). Its journal is demonstrably non-monotonic: `0008` has `when=1776822435828`, followed by `0009` at `1745280000000` (`packages/db/drizzle/meta/_journal.json:62-79`); the existing PostgreSQL runner documents that this causes skipping (`packages/db/src/migrate.ts:29-35`).
 **Failure mode:** an implementation can either reject a legitimate historical database after correcting 0009, or accept a reordered/duplicated ledger because no precise comparison rule exists. A count/hash-set implementation would fail to detect the condition that this contract explicitly calls unsafe; physical `id` order is not an adequate substitute after historical repair.
 **Required remediation:** freeze a versioned manifest algorithm before implementation: canonical record fields (at least journal index/tag, corrected logical order, migration content hash, and an explicit migration-manifest version), canonical byte serialization, SHA-256 input, and exact observed-ledger mapping. State whether physical ledger insertion order is normative; if not, compare hash-to-manifest tuples rather than timestamps. Add an idempotent migrator-only 0009 existing-database remediation/reconciliation procedure with backup/rollback evidence. Require clean, pre-0009, 0009-skipped, 0009-applied-late, duplicate, unknown, missing, corrupt-pair, and stale-replica cases. No manual ledger insertion is an acceptable production recovery path.
 ### MEDIUM — advisory-lock namespace is collision-prone and lacks a fixed identifier contract
 The specified lock is `pg_try_advisory_lock(hashtext('mosaic-schema-migration-v1'))` (`KBN-101-DB-ROLE-SPLIT.md:34`). `hashtext` produces a 32-bit key. Session ownership/crash behavior is otherwise correctly stated (one session, same-session release, connection-close release), but an unrelated database user can accidentally collide or deliberately hold the key and force `DATABASE_MIGRATION_LOCKED`.
 **Failure mode:** avoidable migration denial of service in a shared PostgreSQL database. The current repository already uses separate `hashtext` advisory-lock names for migrate-tier, demonstrating the need for a documented namespace rather than a collision-prone implicit one.
 **Required remediation:** freeze a two-int advisory-lock namespace (fixed documented class/object values) or a documented 64-bit `hashtextextended` key with fixed seed; keep acquisition, migration, verification, and release on the single `max:1` migrator session. Add tests for concurrent migration, connection loss/crash release, readiness while the lock holder is active, and an unrelated lock-key non-interference case.
 ### MEDIUM — identifier safety and `search_path` verification need executable constraints
 The contract rightly requires `pg_catalog, <mosaic_application_schema>` and rejects writable paths (`KBN-101-DB-ROLE-SPLIT.md:54,70-77`), but uses dynamic placeholders for database/schema and does not state how migration/bootstrap SQL will avoid identifier interpolation. Existing code has raw-SQL facilities (`packages/storage/src/migrate-tier.ts` uses `.unsafe`), so this is not merely theoretical.
 **Failure mode:** a future operator-configured database/schema value that reaches bootstrap or `SET search_path` through raw string construction can inject DDL, or a pooled connection can retain a mutable search path.
 **Required remediation:** require fixed allowlisted identifiers or server-side identifier quoting (`format('%I', ...)`) only; never interpolate URL/config values into SQL. Set and verify the trusted path per connection/session before any query (`SET LOCAL` inside transactions where applicable), forbid `public`/`$user` additions, and add injection-shaped identifier and pooled-connection reset negatives. Include this in KBN-101-00/01 tests.
 ## Acceptance and threat traceability
 | Requirement / threat | Review result | Evidence or blocking finding |
 | --- | --- | --- |
 | K101-REQ-01 / AC-K101-01 split runtime/migration URLs | Partial | Role/DTO boundary is coherent; HIGH DDL-path finding requires all current commands to be closed. |
 | K101-REQ-02 / AC-K101-02 explicit migration/readiness | Blocked | HIGH ledger definition and HIGH DDL-bypass findings. |
 | K101-REQ-03 / AC-K101-03 least privilege, TLS, grants | Partial | Role model, default privileges, ledger read-only, TEMP/function checks are well specified (`KBN-101...:47-56,70-79`); HIGH TLS bootstrap and MEDIUM identifier constraints remain. |
 | K101-REQ-04 / AC-K101-04 immutable relations | Correctly deferred | KBN-101-09 after KBN-100 is the correct serial gate (`KBN-101...:58-66,115-118`); no synthetic-only certification claim found. |
 | K101-REQ-05 / AC-K101-05 N-1, secrets, rollback | Partial | No owner-runtime exception and rollback keeps migration URL out of Gateway (`:83-95`); deployable TLS and full command inventory are missing. |
 | K101-REQ-06 / AC-K101-07 KBN gates and DAG | Structurally sound | DAG is acyclic: 00→01/{03}; 02→06; 00/01/03→05; 00/04/05/06→07→08→KBN-100→09→KBN-105. KBN-100’s current branch contains docs-only baseline tracking, not schema implementation. |
 | T: runtime DDL / migration fallback | Blocked | HIGH finding 1. Current Gateway/storage, CLI, direct Drizzle scripts, and integration DDL require explicit closure. |
 | T: race/crash/readiness | Partial | Same-session nonblocking lock and replica-unready rules are present (`:34-38`); lock namespace remediation required. |
 | T: immutable evidence rewrite | Correctly staged | Explicit INSERT/SELECT-only matrix and RESTRICT retention are retained; proof is properly after table creation. |
 | T: secret leakage / TLS downgrade | Partial | Redaction and distinct Vault paths are specified (`:93-97`), but no server TLS/bootstrap implementation contract exists. |
 ## Unresolved assumptions
 1. `standalone` and `federated` are the complete PostgreSQL production-like set (K101-A1).
 2. Each eligible deployment can execute a dedicated migration Job/one-shot phase (K101-A2).
 3. Vault path names are targets, not verified existing paths; deployment ownership remains to be established.
 4. PostgreSQL 17 is available for the selected membership and advisory-lock implementation.
 5. The required server-side TLS issuer/certificate lifecycle and Swarm/compose secret transport have not been decided; this is blocking, not a permissible implicit plaintext bootstrap.
 6. Historical databases containing the 0009 journal/ledger anomaly have no frozen reconciliation procedure.
 ## Independent test and consistency evidence
 Read-only checks run in this review:
 | Check | Result |
 | --- | --- |
 | `git diff --check origin/main...da742ca2...` | PASS |
 | `pnpm exec prettier --check` on all seven changed docs | PASS |
 | `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json` | PASS |
 | `docker compose -f docker-compose.yml config --quiet` (isolated test ports) | PASS |
 | `docker compose -f docker-compose.federated.yml --profile federated config --quiet` (isolated test ports) | PASS |
 | Static journal inspection | FAILS the required monotonic ordering premise: 0008 → 0009 `when` decreases; current runner documents skipping behavior. |
 | Static DDL-entrypoint inventory | Found direct Drizzle scripts, storage CLI shell-out, runtime extension/migration calls, fleet backlog migration, tier probe extension creation, and a direct-DLL federated integration test. |
 No live database, Vault, CI, deployment, issue, PR, or repository mutation was performed. The pass results validate documentation syntax/contract compilation and compose syntax only; they do **not** certify the proposed security behavior.
 ## Conclusion
 Do not merge this frozen contract as implementation-ready until the HIGH findings are corrected and independently re-reviewed. The central role ownership/default-privilege design, immutable-table staging, and KBN-100/KBN-105 serial gating should be retained; they are not the reason for this REQUEST CHANGES verdict.
--- a/docs/scratchpads/758-fcm-m2-002-fleet-agent-crud.md
+++ b/docs/scratchpads/758-fcm-m2-002-fleet-agent-crud.md
@@ -1,46 +0,0 @@
 # FCM-M2-002 — Generation-Guarded Fleet Agent CRUD
 - **Task / issue:** FCM-M2-002 / #758
 - **Branch / base:** `feat/758-fleet-agent-crud` from `origin/main` `191efaefeb5c0c6bb218c1292d12ce8e73ace12b`
 - **Budget:** 30K card allocation; no deployment or live-fleet actions.
 ## Objective
 Provide local roster-owned create, get, update, and delete mutations with a generation precondition, deterministic dry-run plan, complete-state structural/semantic/projection validation before writes, atomic roster persistence, and redacted recovery output on a late projection failure.
 ## Scope and exclusions
 - Roster v2 is the sole desired-state authority. Reuse `parseRosterV2`, `renderRosterV2Yaml`, `validateRosterV2Semantics`, and the generated-environment boundary.
 - Fresh create defaults to `enabled: true` and `desired_state: stopped`; this card never starts a runtime.
 - Excluded: reconcile/apply; lifecycle/session/systemd/tmux actions; migration/canary; remote/connector/gateway mutation; arbitrary commands/channels/secrets; generated files as authority; `docs/TASKS.md` and orchestration ledger changes.
 ## Red-first plan
 1. Add failing tests for dry-run non-mutation, stale generation, concurrent writer locking, stopped default create, equivalent idempotency, complete proposed-state semantic/boundary validation, atomic roster write, and injected late projection failure with redacted recovery details.
 2. Implement only a roster-v2 CRUD service and file adapter; no legacy `fleet add/remove` behavior expansion.
 3. Add operator/reference docs for JSON outcomes, generation retries, recovery, and no-runtime-action boundary.
 ## Progress
 - Preflight: clean exact base and no duplicate PR confirmed.
 - Intake read: FCM PRD/AC-FCM-03, task row, launch and generated-env boundaries, roster v2/resolver contracts, legacy fleet command behavior, delivery/QA/TypeScript/security/documentation guidance.
 - TDD: RED observed for the missing CRUD module. GREEN: focused suite passes 7 tests covering stopped-default create, stale generation, idempotency, dry-run non-mutation, concurrent lock denial, exact stale/absent generated-projection delete cleanup, and redacted late-projection recovery.
 - REVIEW-1 remediation: RED observed for absent CLI create/get/update/delete/plan wiring. Added roster-v2-only JSON commands, including safe `get`, read-only planning/dry-run, explicit persisted-start recording (never runtime start), stable handled error codes, and focused CLI coverage.
 - REVIEW-2 remediation: RED observed for missing direct fleet-control-plane registration and ambiguous partial late-I/O result. The public surface is now direct `mosaic fleet {create,get,update,delete,plan}` (not root gateway `mosaic agent`); a late filesystem projection failure returns non-zero redacted JSON with `authoritativeRoster: committed` and `projections: incomplete`, proving no rollback/no-op claim.
 - REVIEW-3 remediation: RED observed for unnamed update/delete plans and deleted-agent quarantine conflict. `plan <operation> [name]` now requires target names only for update/delete; delete validates/removes only exact generated state while retaining local/legacy/quarantine/unrelated files. Actual CLI/filesystem tests cover create/update/delete plans, plan validation/non-mutation, retained artifacts/dry-run bytes, unsafe permission/symlink rejection, and post-roster delete recovery. Added the required operator how-to.
 - REVIEW-4 remediation: RED observed that actual Commander create accepted and silently dropped disallowed `command`, `channel`, and `secretRef` keys. The `--agent` object and nested `launch` now use strict own-property allowlists; non-plain/prototype-sensitive shapes and unknown keys fail `invalid-request` before resolver, roster, or projection mutation. Actual Commander plan/create/update tests cover top-level command/channel/secretRef/constructor/prototype/`__proto__` shapes and nested launch unknown fields, byte-identical retained artifacts, non-zero exit, and diagnostics that never echo rejected values. Docs state the same boundary.
 ## Risks / assumptions
 - **ASSUMPTION:** M2 mutations operate exclusively on the existing v2 roster contract because generation/lifecycle fields are v2-only; legacy v1 add/remove commands remain unchanged compatibility paths.
 - A multi-file roster/projection write cannot be one filesystem rename. The roster is authoritative; a post-roster projection failure returns a redacted recovery plan naming only safe paths/actions, never environment values.
 ## Verification evidence
 - `pnpm --filter @mosaicstack/mosaic test -- fleet-agent-crud-command.spec.ts fleet-agent-crud.spec.ts generated-env-boundary.spec.ts` — PASS (48 tests after REVIEW-4 remediation).
 - `pnpm --filter @mosaicstack/mosaic test` — PASS (54 files, 794 tests after REVIEW-4 remediation).
 - `pnpm --filter @mosaicstack/mosaic lint` — PASS.
 - `pnpm --filter @mosaicstack/mosaic typecheck` — PASS.
 - `pnpm format:check` and `git diff --check` — PASS.
 - Root `pnpm typecheck`, `pnpm lint`, `pnpm format:check`, and `git diff --check` — PASS after REVIEW-4 remediation; full package test is 54 files / 794 tests.
 - REVIEW-4 remediation focused checks are green; fresh full-delta independent review is required before author-green. No commit, push, or PR opened.
--- a/docs/scratchpads/771-kbn101-db-role-split.md
+++ b/docs/scratchpads/771-kbn101-db-role-split.md
@@ -1,183 +0,0 @@
 # Scratchpad — KBN-101 DB runtime/migration role split (#771)
 - **Branch:** `docs/771-kbn101-db-role-split`
 - **Base:** `main` `e9c4aa3`
 - **Scope:** planning/documentation only; authorized files are PRD, Native Kanban task/shared/index docs, sitemap, this scratchpad, and the new KBN-101 contract.
 - **Explicit exclusions:** source/runtime/config/deployment/secret/migration/compose/CI/lock/package/KBN-100 branch edits; no production mutation.
 ## Objective
 Freeze an implementation-ready PostgreSQL role/connection split so the Gateway uses a non-owner runtime identity and only a dedicated migration phase uses an owner/migrator identity. Make real deployed-role certification—not synthetic role tests—a serial prerequisite of KBN-100 and KBN-105.
 ## Intake and current-state evidence
 - Mission MVP is active; W3 Native Kanban/SOT is planning-complete. The task state shows KBN-010 as the predecessor and KBN-100 as the current schema slice.
 - Current branch started at `e9c4aa3`; `.mosaic/orchestrator/{mission.json,session.lock}` were already runtime-modified and remain untouched.
 - `packages/db/src/client.ts`, `migrate.ts`, and `drizzle.config.ts` resolve one `DATABASE_URL` (with default fallback). `packages/storage/src/adapters/postgres.ts` calls `runMigrations(this.url)`.
 - `apps/gateway/src/database/database.module.ts` calls `storageAdapter.migrate()` at startup for PostgreSQL; this is the owner-runtime defect to remove in KBN-101 implementation.
 - `packages/config/src/mosaic-config.ts`, installer wizard, local/federated compose, Portainer test stack, and `.woodpecker/ci.yml` currently expose one URL. PGlite has an existing explicit local migration path.
 - Current KBN contract requires immutable events/checkpoints/artifacts/evidence, `RESTRICT`, and KBN-100 generated Drizzle consistency. It did not establish a deployable runtime identity split.
 ## Frozen decisions
 1. `DATABASE_URL` is the non-owner runtime URL; `DATABASE_MIGRATION_URL` is migration-only. Both are required in their respective PostgreSQL phases; PGlite is the explicit local exception; migration never falls back to runtime/default/config URL.
 2. PostgreSQL Gateway runtime never auto-runs migration/DDL. Dedicated migrator uses `pg_try_advisory_lock(hashtext('mosaic-schema-migration-v1'))`; replicas only check exact ordered Drizzle-ledger readiness and fail closed.
 3. Roles are non-login `mosaic_platform_database_owner`, non-login `mosaic_schema_owner`, login/noinherit `mosaic_migrator`, non-login `mosaic_runtime_capability`, and login/inherit `mosaic_runtime`. Runtime inherits only its capability role with SET/ADMIN denied, has no owner/migrator membership, no unsafe attributes/ownership/DDL authority, and an explicit trusted search path.
 4. Runtime gets mutable DML only as needed, but INSERT/SELECT only on `task_events`, `artifacts`, `task_checkpoints`, `task_checkpoint_artifacts`, and `approval_decision_artifacts`. KBN-100 still enforces RESTRICT/no-cascade.
 5. Startup verifies effective role/ownership/attributes/inherited capability/TEMP/function-execute/ledger grants/search path/immutable denials/schema fingerprint without DSN exposure. It also requires authenticated CA/hostname-verified TLS. Stable sanitized errors and redaction rules are required.
 6. N-1 retains single runtime URL only as a non-certified compatibility release; staged role provisioning/migration/runtime deployment then enforces the split. Rollback never injects migration URL into Gateway.
 7. Vault target paths, rotation, deployment injection, CI, installer, compose, Portainer, and observability are separate one-card/one-PR handoffs. The migration-only file manifest includes `packages/db/drizzle.config.ts`; KBN-101 repairs the known PostgreSQL runner/journal ordering defect and proves a clean database applies every hash once before its foundation certificate. No application migration creates roles/passwords or hardcodes credentials.
 8. KBN-101 foundation merges/certifies first. KBN-100 then rebases, restores Drizzle declaration/snapshot/journal consistency, and bounds procedural immutable-table grant/trigger/backfill work to its own slice. Because those immutable relations do not exist until KBN-100, KBN-101’s real deployed-role immutable-operation certificate follows KBN-100 and is the serial gate before KBN-105.
 ## Assumptions
 - `standalone` and `federated` are all current PostgreSQL production-like modes; a future PostgreSQL tier inherits this contract unless versioned otherwise.
 - Deployment will support a dedicated migration Job/one-shot command. A target that cannot run it cannot receive production/federated KBN certification.
 - Canonical Vault target paths require deployment-owner verification before provisioning; the planning document does not claim they already exist.
 ## Documentation produced
 - `docs/PRD.md`: bounded KBN-101 requirements and acceptance criteria.
 - `docs/native-kanban-sot/KBN-101-DB-ROLE-SPLIT.md`: normative rc.5 implementation, threat, migration/rollback, evidence, and exact file DAG contract.
 - `docs/native-kanban-sot/SHARED-CONTRACT.md`: rc.5 amendment preserving rc.4.
 - `docs/native-kanban-sot/TASKS.md`: KBN-101 inserted before and blocks KBN-100; KBN-105 held.
 - Native Kanban index and root sitemap links.
 ## Validation plan
 1. Prettier only for changed Markdown.
 2. Markdown link target/check checks scoped to modified docs.
 3. Strict contract check with `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json` (the frozen TypeScript contracts remain unchanged).
 4. Diff allowlist proves only authorized documentation files changed, apart from pre-existing Mosaic runtime state.
 5. Independent documentation/security self-review: role escalation, fallback, startup DDL, schema readiness, grants/default privileges, immutable tables, secret leakage, deployment and KBN-100 boundaries.
 ## Review corrections
 Independent Codex review found two blockers and security review found two medium defects; all were remediated in the frozen contract:
 1. Split the KBN-101 certificate into a foundation role/schema-boundary certificate (before KBN-100) and real immutable-operation certificate (after KBN-100, before KBN-105). This preserves the requested KBN-100 block without requiring evidence for tables not yet created.
 2. Removed the legacy owner-runtime exception. N-1 compatibility preserves variable/config shape only; the KBN-101 runtime refuses owner/migrator identity and current single-URL installs remain on their previous release until role cutover.
 3. Introduced `mosaic_platform_database_owner` as a separate non-login platform role. `mosaic_schema_owner` owns application/ledger schemas only, not the database and has no database CREATE/ALTER/extension authority.
 4. Replaced blocking `pg_advisory_lock` with `pg_try_advisory_lock` and the deterministic `DATABASE_MIGRATION_LOCKED` failure.
 5. Review also flagged active `.mosaic/orchestrator` state. It was pre-existing launcher state and remains unstaged/uncommitted.
 6. Second review added `packages/db/drizzle.config.ts` to the migration-only slice, mandates `DATABASE_MIGRATION_URL` with a missing-variable negative, grants runtime only `USAGE` plus `SELECT` on `drizzle.__drizzle_migrations`, and verifies/revokes its ledger writes.
 7. Security review added `DATABASE_TLS_CA_CERT_PATH` / `DatabaseTlsConfigDto` with authenticated TLS and hostname/CA verification in production-like modes, explicit database `TEMPORARY` revocation/catalog denial testing, and default-PUBLIC function EXECUTE revocation with SECURITY DEFINER prohibited by default.
 8. Final review corrected the runtime login to inherit only its capability role with SET/ADMIN denied, and moved the known hash-complete migration-runner/journal repair into KBN-101-03 before the foundation certificate.
 9. Final manifest review added all live runtime DDL paths (`packages/storage/src/tier-detection.ts`, Gateway startup, and `fleet-backlog`) to KBN-101-02, requiring read-only extension probes and no PostgreSQL runtime auto-migration. It also requires KBN-101-04 to stop persisting either DSN into generated `.env`/`mosaic.config.json`, using only Vault/deployment references and injected variables.
 10. Provisioning review separated the external privileged platform bootstrap actor from the NOCREATEDB database-owner role and added KBN-101-00. That IaC/bootstrap card owns fresh/existing database role/ownership/grant/Vault transition evidence and is a foundation-certificate dependency.
 ## Results
 - `pnpm exec prettier --check` on every authorized Markdown file: PASS.
 - Markdown link and whitespace checker on all seven authorized Markdown files: PASS.
 - `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json`: PASS (frozen strict contracts unchanged).
 - Codex code review iterated through role inheritability, hash-complete migration ordering, all reachable runtime DDL entrypoints, installer DSN persistence, and platform-bootstrap ownership; each finding was incorporated into the final frozen contract/DAG. The last security review found no new KBN-101 vulnerability; its sole low finding is the pre-existing unstaged Mosaic session-lock metadata, which is excluded from this commit.
 - Commit: `82ce3252df38a687c50485f8d048b53ca8db5989` (`docs(#771): freeze database runtime role split`).
 - Pre-push queue guard: `ci-queue-wait.sh --purpose push -B main` returned `state=unknown` without failure. The push hook ran repository `pnpm typecheck`, `pnpm lint`, and `pnpm format:check`: PASS.
 - Pushed branch `docs/771-kbn101-db-role-split` at the exact commit above; no PR was opened, merged, or closed. `web1:mosaic-100` received the handoff with head, decisions, DAG, and validation.
 - Awaiting independent security/Ultron review.
 ## 2026-07-15 — rc.6 exact-head remediation session
 - **Objective / correction:** Replace the prior planning-author handoff and close every finding in the [independent exact-head report](../reports/native-kanban-sot/kbn-101-contract-security-review-82ce325.md) against `da742ca2da4a2ff466916c818fe275c4f7ffd384`. The report is a verbatim durable copy of the task-supplied review artifact; scope remains documentation-only, `.mosaic` is excluded, and source/config/compose/CI/deployment/secrets/migrations remain untouched.
 - **Finding 1 — closed DDL control plane:** rc.6 names `mosaic-db-migrator` as the sole application/CI/test PostgreSQL DDL runner, requires `DATABASE_MIGRATION_URL` before connection/DDL, inventories `runMigrations`, Drizzle config/scripts, `db:push`, storage CLI, adapter/Gateway startup, fleet-backlog, extension probes/bootstrap, direct federated integration DDL, CI, and future scripts, and specifies route/deny/test disposition for each. Tests use runner-prepared disposable PostgreSQL or invoke that runner; `db:push` is local-disposable-only and rejects production-like URLs.
 - **Finding 2 — deployable TLS:** rc.6 freezes distinct runtime/migrator URL and CA/server leaf Vault/compose/Swarm secret identifiers, `0400` key and `0600` URL/cert/CA mount requirements, actual compose/Swarm service-DNS SANs, PostgreSQL TLS settings, legacy-client drain/termination plus `hostssl` enforcement, verified-TLS readiness ordering, fresh/existing transition, CA-overlap rotation/TLS-only rollback, and standalone plus federated/Swarm positive and missing/wrong CA/SAN/downgrade negatives. PGlite is explicitly non-PostgreSQL evidence.
 - **Finding 3 — manifest/0009:** rc.6 defines manifest v1 canonical UTF-8 serialization and raw SQL-byte SHA-256, logical journal order, manifest ownership/grants, exact one-to-one observed hash tuple mapping, non-normative physical insertion order, safe original-0009 conditions, ambiguous-effect fail-closed recovery, and the full required reconciliation/backup test matrix. It preserves shipped 0009 bytes and forbids manual ledger adoption/insertion.
 - **Finding 4 — advisory lock:** replaced `hashtext` with fixed signed-int4-safe `(1297044289,1262636593)` (`MOSA`,`KBN1`), one `max:1` runner session, close-on-crash semantics, and contention/crash/readiness/unrelated-key evidence.
 - **Finding 5 — identifiers/search path:** selects `mosaic`, exact `pg_catalog,mosaic` per pooled connection and `SET LOCAL` transactions, plans audited public-object/extension/Drizzle relocation, forbids config-derived identifiers, limits bootstrap quoting to server-side `%I` on fixed allowlist, and requires injection/pool-reset negatives.
 - **Finding 6 — safe DAG:** cards 00–07 are inactive prepared capability while owner-runtime remains N-1; KBN-101-08 is the one atomic activation release after platform roles/TLS and compatible code. Mosaic control plane/Jason alone can activate/rollback; no force-on-red, runtime bypass, or temporary compatibility survives the gate. The approved role graph, post-KBN-100 immutable certification, and KBN-105 gate remain unchanged.
 - **Review remediation:** Codex review found the legacy plaintext cutover gap, missing URL-secret bindings, historical `public` migration incompatibility, non-reproducible checkout-byte hashing, CONNECT allowlisting regression, and undocumented direct-DDL operator instructions. rc.6 now requires drain/scale-to-zero, residual non-TLS session termination, `hostssl` with no `host` rule, zero plaintext-session proof, TLS-only post-enforcement rollback, distinct named runtime/migrator secret consumers, canonical Git-blob/LF manifest bytes, a runner-only owner-controlled legacy-public bootstrap followed by `mosaic` relocation, explicit CONNECT/TEMP revocation, and KBN-101-07 replacement of direct-DDL documentation. It also required the durable exact-head report link above. Pre-existing `.mosaic` runtime state remains excluded.
 - **Validation:** Prettier on all changed Markdown, repository Markdown link/whitespace check, and strict native-kanban contract TypeScript passed before final staging; the final staged diff excludes `.mosaic`. No source-code TDD applies because this is contract-only remediation.
 ## 2026-07-15 — rc.7 residual remediation session
 - **Objective / correction:** Close every residual in the independent exact-head rc.6 re-review at `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview-45ba3d6.md` for `45ba3d6ad4d5383f457a303c05bc816144cfa48a`, without changing source, compose, CI, deployment, migration, or secret artifacts. Only the existing authorized planning/documentation paths are eligible; pre-existing `.mosaic` state remains excluded.
 - **Source-backed scope confirmed:** the active `federated-pgvector.integration.test.ts` executes `CREATE TEMP TABLE`; tracked `docker/init-db.sql` and `infra/pg-init/01-extensions.sql` both create `vector`; `migrate-tier.ts` advertises raw `CREATE EXTENSION`; and `tools/federation-harness/docker-compose.two-gateways.yml` is current plaintext two-PostgreSQL/two-Gateway topology. Current `schema.ts` has 36 default-schema `pgTable` declarations, 6 default `pgEnum` declarations, and an unqualified `vector` custom type; historical migrations contain `public` references.
 - **Plan:** (1) make the finite DDL/static-bypass inventory and `DATABASE_URL`-only denial matrix exact, including the runner-prepared persistent pgvector fixture and migrated two-gateway harness; (2) freeze executable `public`-to-`mosaic` and `mosaic_extensions` transition, Drizzle ownership, object-catalog classes/order, eligibility and rollback tests; (3) bind repository/control-plane ownership, UID/GID validation, exact artifact/mount rules, and both gateway TLS topology; (4) correct PRD acceptance mapping and cross-document rc.7 status; then run formatting, link/contract, source-path, diff, review, commit, queue guard, and push.
 - **Independent review closure:** initial Codex review found Gateway-key consumer wording, `CLAUDE.md` omission, final schema-owner set, and placeholder SANs; all are now explicit. Re-review found the legacy `0001` vector-type resolution problem and `docs/federation/SETUP.md` raw-DDL instruction; the legacy runner now uses only its fixed non-writable `pg_catalog,public,mosaic_extensions` history path, while runtime remains `pg_catalog,mosaic`, and the federation setup path is assigned to KBN-101-07/static inventory. Security review final verdict: no confident vulnerability. The review also repeated the pre-existing tracked `.mosaic` session-state concern; it remains deliberately unstaged/excluded by this task.
 - **Completion evidence:** changed Markdown is Prettier-formatted; local links and strict native-kanban TypeScript passed; source-path inventory confirmed all current referenced paths (the new `apps/gateway/Dockerfile` is explicitly a planned KBN-101-05 artifact); diff check and authorized-doc allowlist passed. No source-code TDD applies to this documentation-only remediation.
 ## 2026-07-15 — rc.8 exact residual remediation session
 - **Objective / correction:** Close all three HIGH findings in the independent rc.7 exact-head re-review at `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview2-0778eba.md` for `0778eba2db3c2dfbaca3af352b12ba0389d3552b`. Scope remains documentation-only: no source, config, Compose, CI, deployment, secret, or migration artifact changed; pre-existing `.mosaic/orchestrator` state remains excluded.
 - **Finite authority closure:** KBN-101-06 now classifies exact current source/scripts/package bins, operator docs, and deploy manifests. `packages/db/src/index.ts` has explicit removal/compile-import negative ownership; `docs/fleet/backlog-conventions.md` and `docs/PERFORMANCE.md` now remove first-use/direct-Drizzle/Gateway-startup migration instructions and point to sole runner/readiness. Byte-immutable historical SQL, PGlite-only routines, negative-test literals, vendored/generated artifacts, and labeled historical reports are exact-path/category reviewed allowlists; unknown hits fail. The contract explicitly rejects relying on a naive token scan alone.
 - **Executable and exclusive handoff closure:** KBN-101-03 exclusively owns the published `mosaic-db-migrator` bin, `packages/db/src/cli.ts`, private migrator modules, `docker/db-migrator.Dockerfile`, exact `--run|--verify|--help`, environment/argv limits, sanitized exits, and command/order tests. KBN-101-00 exclusively owns `infra/pg-bootstrap/roles.sql`, `infra/pg-bootstrap/extensions.sql`, `infra/pg-bootstrap/README.md`, and bootstrap tests. KBN-101-05 exclusively owns `tools/db/render-postgres-secrets.ts`, its tests, and deployment declarations, consuming the versioned bootstrap interface without overlap.
 - **pgvector owner closure:** `mosaic_extension_owner` is dedicated NOLOGIN, available only to the external bootstrap actor during bootstrap; fresh vector/member ownership remains there. The contract records PostgreSQL's unsupported extension-owner transfer and forbids catalog mutation, ownership adoption, and `DROP CASCADE`. Approved-owner existing extensions use verified `ALTER EXTENSION ... SET SCHEMA`; legacy runtime-owned extensions fail closed to a controlled backup/shadow/runner/copy-evidence/quiesce/final-delta/atomic-switch/read-only-rollback migration. It requires `pg_extension.extowner`, member/schema/version, and runtime/migrator/schema-owner ALTER/DROP/member-update denial tests across clean, approved-owner, legacy shadow, partial/resume/rollback, and N-1.
 - **Cross-document state:** PRD, KBN contract, shared contract, task decomposition, index, sitemap, current operator docs, and this scratchpad are rc.8-consistent. The only intended next action is a fresh independent exact-head re-review after validation/push.
 - **Validation / review:** Prettier passed for all nine changed Markdown documents; local links passed (9 documents); `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json` passed; source-path inventory passed (20 paths: 8 current, 12 explicitly planned); finite-authority requirement checklist and `git diff --check` passed. Manual documentation/security review checked the three requested paths, private-only runner boundary/exit contract, non-overlapping 00/03/05 ownership, extension-owner denial and shadow path, and `.mosaic` exclusion. No source-code TDD applies because this is contract-only remediation.
 - **Delivery evidence:** committed `1423c2ad02b5471eab006fb4c878808e5b29c387` as `docs(#771): close role split rc.8 residuals`. Push queue guard returned `state=unknown` without error; push hook ran repository `pnpm typecheck`, `pnpm lint`, and `pnpm format:check`, all PASS; branch push succeeded. This final evidence append is committed next, then the exact remote head is verified. The only intended next action is a fresh independent exact-head re-review.
 ## 2026-07-15 — rc.9 final residual remediation session
 - **Objective / correction:** Close the three findings in `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview3-9cf5d2f.md` against exact head `9cf5d2f6641b14082dc3294e2a84d1fb4ccc019d`: move `mosaic_extensions` schema ownership to `mosaic_extension_owner`; replace all broad/conflicting KBN-101 card ownership with a complete disjoint exact-path/test manifest; and classify the current architecture-plan `db:migrate` instruction with pinned scanner mechanics. Scope remains documentation-only; no source/config/Compose/CI/deployment/secret/migration artifact and no `.mosaic` path may be modified.
 - **Plan:** inspect current tracked source topology to name only existing paths; update the normative contract first and synchronize PRD/shared/task/index/sitemap/version language; run Prettier, changed-doc links, strict contract TypeScript, source/path and manifest-overlap checks, diff allowlist, independent documentation/security review; then stage docs only, commit, queue-guard, push, and verify exact remote SHA. No source-code TDD applies because this is contract-only remediation.
 - **Closure implemented:** rc.9 makes `mosaic_extension_owner` create and own `mosaic_extensions`, `vector`, and members; the external bootstrap actor alone temporarily `SET ROLE`s for fresh/approved-owner work, while schema owner has only `USAGE` for legacy type resolution and never temporary `CREATE`. Catalog/default-ACL plus direct DDL/member denials now cover runtime, migrator, and schema owner through fresh, relocation, shadow/resume, and rollback evidence.
 - **Delivery decomposition:** Replaced broad ownership with complete disjoint 00–09 manifests, exact tests/evidence, producer-before-consumer edges, and an explicit no-intermediate-deploy N-1 activation statement. `packages/storage/src/{cli,migrate-tier}.ts` belongs only to -02; the current tracked init artifacts are retired by -02 as direct-DLL closure; -03 owns all runner/index/migrate/config/schema assets and exact compiled-bin/image mapping; -07 owns docs only; -08/-09 own evidence only.
 - **Classifier closure:** -06 has exact scanner/inventory/matrix paths, canonical inventory fields, classes/dispositions, fixed token/rule set, exact allowlist categories/restrictions, and self-test requirements for unknown, duplicate-owner, ownerless, missing-path, and historical masking cases. The architecture plan now marks direct `db:migrate` superseded and uses `mosaic-db-migrator --run`.
 - **Validation:** Prettier check, strict native-kanban contract TypeScript, changed-document local-link resolution, `git diff --check`, and an automated manifest-overlap/owner/current-source-path check passed. Targeted documentation/security review verified role ownership/default privileges/search path/preflight/legacy/shadow/rollback consistency, disjoint manifests/DAG/activation, scanner mechanics, exact bin/entrypoint, and no `.mosaic` staging intent. No source-code TDD applies because this is documentation-only remediation.
 - **Next:** stage documentation only, commit, queue-guard, push, verify exact remote SHA, then wait for fresh exact-head review.
 - **Delivery evidence:** committed `8cbad2bcd9bc7507052f74f35670ef7c8e39e44e` as `docs(#771): close role split rc.9 residuals`; `ci-queue-wait.sh --purpose push -B main` returned `state=unknown` without error; push-hook `pnpm typecheck`, `pnpm lint`, and `pnpm format:check` all passed; push succeeded and `origin/docs/771-kbn101-db-role-split` resolved to that exact SHA. Pre-existing `.mosaic/orchestrator/{mission.json,session.lock}` remains modified but intentionally unstaged/excluded. The only next action is a fresh independent exact-head re-review.
 ## 2026-07-15 — rc.10 Ultron NO-GO remediation intake
 - **Objective / scope:** Close only HIGH-1 and HIGH-2 in `/home/hermes/agent-work/reviews/771-kbn101-ultron-11f09a1.md` against exact head `11f09a15e43e72afda6a0374668996b4bda9e536`. Documentation only: preserve approved content; no source/config/Compose/CI/deploy/secret/migration edits and no `.mosaic` staging.
 - **Plan:** (1) replace the impossible `NOLOGIN NOSUPERUSER` extension owner with the exact non-login, zero-member `NOLOGIN SUPERUSER` external-control exception and document the non-delegable superuser residual; (2) require the audited external superuser session to `SET ROLE`/`RESET ROLE` for fresh, approved-owner, and shadow extension work, then prove catalog ownership and all service-role denial; (3) assign the active migrate-tier guide exclusively to KBN-101-07, add its active secure route to the -06 inventory/matrix/scanner schema, and freeze `--target-url-file /run/secrets/mosaic_migrate_target_url` plus pre-migrated target/dedicated non-DDL importer requirements; (4) synchronize PRD/shared/tasks/index/sitemap/guide and rc.10 status; (5) validate formatting, links, contracts, source paths, finite operator inventory, diff, review, commit, queue guard, push, and exact remote SHA.
 - **Target-image evidence before edits:** local `pgvector/pgvector:pg17` control file reports `default_version = '0.8.2'`, `relocatable = true`, and no `trusted`/`superuser` override (untrusted PostgreSQL extension). An isolated PostgreSQL 17 container proved a `NOLOGIN SUPERUSER` `mosaic_extension_owner` can create `mosaic_extensions` and `vector` under external-superuser `SET ROLE`, returns to the external session after `RESET ROLE`, has `rolcanlogin=false`, `rolsuper=true`, zero role members, exact extension/schema and owner-bearing-member ownership, and denies `SET ROLE`, `ALTER EXTENSION`, `DROP EXTENSION`, and schema ownership changes to runtime, migrator, schema owner, and data importer. Ownerless PostgreSQL catalog member classes (`pg_am`, `pg_cast`) were intentionally not misrepresented as ownable members.
 - **TDD decision:** skipped as not applicable: this is a documentation-only contract remediation. Future KBN-101-00/-02/-06 tests are specified as the situational evidence; no source/test artifact is permitted in this task.
 - **Final scope correction:** Per control-plane direction, remediation remains bounded to the two Ultron findings. The active guide is explicitly a non-operative KBN-101 contract until its owned implementation/activation lands; no additional design, source, CI, deployment, secret, or test artifact was added.
 - **Validation evidence:** target-image/container role proof PASS (pgvector `0.8.2`, `relocatable=true`, trusted absent/untrusted; external-superuser `SET ROLE`/`RESET ROLE`; exact extension/schema/owner-bearing-member ownership; zero membership and service-role denials). Changed-doc Prettier, strict native-kanban contract TypeScript, local-link resolver (8 docs), finite operator-doc inventory (one active KBN-101-07 route with no credential argv in executable blocks), source-path check (6 current paths), and `git diff --check` PASS. Pre-existing `.mosaic/orchestrator/{mission.json,session.lock}` remains intentionally excluded.
 ## 2026-07-15 — rc.11 exact-head re-review remediation intake
 - **Objective / scope:** Close only HIGH-1 and HIGH-2 in `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview5-f60144e.md` against `f60144eb3eab6234ab01bda592052081c777897e`: target-bind the non-DDL tier importer with a runner-produced signed attestation, and disposition every current non-normative documentation scanner hit, including the active user-guide route and federation historical status. Documentation only; no source/config/Compose/CI/deployment/secret/migration edits and no `.mosaic` staging.
 - **Frozen decision:** `mosaic-db-migrator --verify` is trusted only after TLS/identity/manifest/schema verification and signs a credential-free JCS/Ed25519 v1 artifact from a runner-only fixed root-owned private-key file. The artifact binds secret version/exact URL-file digest, canonical TLS/CA/SPKI/server/database/importer/manifest/schema identity, issued/expiry/nonce, and producer build/correlation; importer gets pinned public key plus artifact only. It validates both files and all bindings before target connection, opens/digests/connects from one in-memory URL read, validates server identity before DML, and distinguishes zero connection from zero DML. Key overlap/revocation, secret-rotation invalidation, replay cache, atomic rename, and sanitized errors are mandatory.
 - **Ownership:** -03 owns producer/signing DTO/tests; -02 importer interface/verification tests; -05 key/artifact mounts/render tests; -06 inventory/matrix and non-masking scanner tests; -07 operator guide. The exact manifests remain disjoint.
 - **Operator correction:** `storage migrate` is schema-wrapper delegation only; legacy `--from hot --to cold` tier-copy guidance is unavailable. Secure tier copy is `migrate-tier` with `--target-url-file` plus `--target-attestation-file`. Federation M1 task language is status-only and adjacent KBN-101 text says it authorizes no current DDL.
 - **TDD decision:** skipped as not applicable: this bounded task changes documentation only. Future -02/-03/-05/-06 tests are specified as the required implementation evidence.
 - **Validation / review:** Prettier PASS on all 18 changed Markdown/root-doc files; `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json` PASS; changed-doc local-link resolver PASS (71 links); full current docs scanner/disposition PASS (10 non-normative paths, 4 normative-contract paths; no unknown active command); legacy `storage migrate --from` and raw target-URL bypass scan PASS; attestation field/interface assertion PASS; exact source ownership/manifest-overlap assertion PASS; `git diff --check`, docs-only scope, and secret-leak scan PASS. Manual documentation/security review verified key isolation, JCS/detached signature, secret-file hash as non-secret evidence, verification ordering/TOCTOU/replay/rotation, no connection vs zero DML, non-masking scanner class, status-only federation history, and no regression to pgvector closure. No source-code TDD applies.
 - **Delivery evidence:** committed `6227f076c819bd124383851633b16d4ef9c88a98` as `docs(#771): bind tier importer to verified target`; staged scope was 18 documentation files only and excluded `.mosaic`. Pre-push queue guard returned `state=unknown` without failure. Push hook ran repository `pnpm typecheck`, `pnpm lint`, and `pnpm format:check`: PASS. Branch push succeeded. Verify the exact remote SHA after this final delivery-evidence append, then idle for independent exact-head re-review and Ultron reverify. `.mosaic/orchestrator/{mission.json,session.lock}` remains pre-existing and excluded.
 ## 2026-07-15 — rc.12 bounded deployable-importer/SETUP remediation plan
 - **Objective / scope:** Close the two HIGH findings in `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview6-65663d4.md` against exact head `65663d4f72f2ace5148bce9aeba04b5a8d5beee9`. Documentation/tracking only; preserve every earlier closure; do not modify source, deployment, Compose, CI, migration, Vault, or `.mosaic` artifacts.
 - **Plan:** (1) make KBN-101-05 own canonical KV-v2 importer URL/version provenance, separate immutable generation-pinned renderer consumers, importer CA/public-key/attestation mounts, fixed importer/migrator identities, safe-fd lifecycle, isolation/rotation/TOCTOU/error evidence, and -02/-03/-06 handoffs; (2) convert `docs/federation/SETUP.md` to a non-operative N-1 reference with only the required external-bootstrap → TLS/roles → runner `--run` → `--verify` → Gateway-readiness sequence; (3) broaden scanner grammar plus path-specific semantic negatives so indirect first-boot/startup/init/Compose authority cannot be masked by a named, normative, or status record; (4) synchronize PRD/shared/tasks/index/sitemap/federation task state and this scratchpad; (5) run formatting, links, strict contracts, complete-doc scanner/semantic assertions, diff/operator inventory, material/manifest overlap, review, docs-only stage, commit, queue guard, push, and exact remote-SHA verification.
 - **TDD decision:** skipped because this bounded change is documentation-only; the affected -02/-03/-05/-06 implementation tests and scanner semantic fixtures are specified as mandatory future evidence.
 - **Review correction:** independent Codex review found the initial `10003` producer → immutable `10002` importer artifact handoff impossible. rc.12 now specifies the required privileged deployment handoff controller: after runner success it safe-opens/verifies producer artifact plus generation, exact-byte copies/fsyncs/atomically renames to a distinct `10002:10002` `0400` importer mount, seals it read-only, and starts no importer on partial/wrong-generation/owner/mode failure. It receives only a root-owned non-secret expected-version/URL-digest/generation descriptor plus public verifier key, never URL bytes/private key; producer/importer share no writable file or mount. Dry-run nonce consumption now requires fresh `--verify` and artifact before `--yes`; the active-route schema requires `targetCredentialVersionFile`. Pre-existing `.mosaic` state is confirmed excluded from staging.
 - **Validation result:** changed-doc Prettier and `git diff --check` PASS; strict `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json` PASS; contract/SETUP material and non-operative semantic assertions PASS. Pending final docs-only stage, commit, queue guard, push, and remote-head verification.
 ## 2026-07-15 — rc.13 MILESTONES semantic-scan remediation intake
 - **Objective / scope:** Close only HIGH-1 from `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview7-7365dcf.md` against `7365dcf15c09262a46132b9c011769ad98243641`. Documentation/tracking only: assign `docs/federation/MILESTONES.md` exclusively to KBN-101-07 and its exact former startup-extension wording to the KBN-101-06 semantic fixture/inventory; replace the wording with a non-operative historical/status disposition. No source, deployment, Compose, CI, Vault, migration, provider, or `.mosaic` artifact is authorized.
 - **Frozen remediation:** runtime/startup extension provisioning is superseded and forbidden. The sole eligible sequence is external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway readiness. The MILESTONES record authorizes no current DDL, Compose/init, or startup path. The scanner must prove the exact former wording fails before any inventory/status-only mask and rerun its full current-doc operator/deploy-manifest scan outside reports/scratchpads.
 - **Plan:** update only MILESTONES plus the exact KBN-101 contract/inventory/manifests and necessary PRD/shared/task/index/sitemap/version/status references; run full lexical+semantic scan, Prettier, links, strict contract TypeScript, diff and manifest-overlap checks; stage docs only (excluding pre-existing `.mosaic`), commit, queue-guard, push, and verify the exact remote SHA. No source-code TDD applies because this bounded task changes documentation only.
 - **Remediation result (pre-commit):** `MILESTONES.md` now makes runtime/startup extension provisioning superseded and forbidden, with only external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `--verify` → Gateway readiness; it authorizes no current DDL/Compose/init/startup path. The KBN-101-07 manifest/inventory is exclusive and KBN-101-06 documents the exact former wording as a semantic negative that fails before inventory masking. Full current-doc scan outside reports/scratchpads: 103 Markdown files, 10 lexical-hit paths classified, 2 owned Compose-before-runner references, and zero ownerless indirect/literal routes. Prettier, strict native-kanban TypeScript, local links (64/0), diff check, and 95-path manifest-overlap reconstruction (0 overlaps; MILESTONES only -07) passed. Pre-existing `.mosaic/orchestrator/{mission.json,session.lock}` remains excluded.
 - **Delivery checkpoint:** committed remediation as `237bac81c93dc4305470cea23a67e4ced730bd61` (`docs(#771): close MILESTONES startup authority`). Push queue guard returned `state=unknown` without failure; the push hook ran repository `pnpm typecheck`, `pnpm lint`, and `pnpm format:check`, all PASS; the remote branch resolved to that exact SHA. This final evidence append is committed next, then the exact remote head is verified and the branch waits for independent exact-head rereview/Ultron reverify. `.mosaic` remains unstaged.
 ## 2026-07-15 — rc.13 current-document safety remediation intake
 - **Objective / scope:** Close only HIGH-1 and HIGH-2 in `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview8-aeacc70.md` against exact head `aeacc702353740aad0f2f086974cc0670e360d1d`. This is documentation/tracking only. Preserve all prior gates; do not edit source, Compose, deployment artifacts, CI, migrations, Vault data, reports, or `.mosaic`.
 - **Source-backed decision:** Current `docker-compose.yml` mounts `infra/pg-init` into PostgreSQL init and that SQL creates `vector`; it cannot be used as a current PostgreSQL start route before KBN-101 bootstrap/runner artifacts exist. The checked-in configuration declares a supported `local` PGlite tier (`DEFAULT_LOCAL_CONFIG` and `tier-detection` both establish in-process PGlite with no external service probe), so docs may retain a local/PGlite route and start only non-PostgreSQL Compose services such as `valkey`.
 - **Plan:** (1) replace the README and dev-guide Compose-first PostgreSQL instructions with a PGlite/no-PostgreSQL developer path and an explicit held PostgreSQL/federated future activation sequence; (2) replace the deployment quick-start and bare-metal production procedure with non-operative status, no production `.env`/automatic dotenv/`EnvironmentFile`/credential export-or-argv/restart guidance, and only a non-executable future renderer/Vault generation-pinned process-exec or `LoadCredential` schematic; (3) expand KBN-101-06/-07 semantic fixture/disposition language to fail the exact former README/dev/deployment Compose-first sequences and production credential routes before ownership/status masking; (4) synchronize PRD/shared/tasks/index/sitemap/status/version and this scratchpad; (5) run formatting, links, strict contract TypeScript, full current-doc lexical+semantic scan outside reports/scratchpads, manifest-overlap, review, docs-only stage, commit, queue guard, push, and exact remote-SHA verification.
 - **TDD decision:** no source or fixture implementation may be changed in this documentation-only remediation. The -06 future fixture requirements are frozen as acceptance evidence; validation here is static semantic inventory plus documentation quality gates.
 - **Correction from independent review:** The initial local-Gateway PGlite wording was unsafe. `apps/gateway/src/main.ts` loads daemon/root/app-local environment files before tier selection; an inherited daemon `DATABASE_URL` can select PostgreSQL, whose current startup reaches extension creation and migrations. No source is authorized in this docs-only task. The remediation therefore holds Gateway/Web local startup, preserves only PGlite data-layer plus selected non-PostgreSQL Compose work, and assigns KBN-101-02 the fail-closed daemon/inherited/root/app-local DSN and non-local-tier rejection before connection/DDL, with a regression proof. The future renderer boundary remains KBN-101-05.
 - **Remediation evidence:** Removed active PostgreSQL Compose-first and production credential guidance from README, CLAUDE, dev/deployment, and the residual historical TUI/MCP routes; local documentation now permits only PGlite data-layer/non-PostgreSQL Valkey work while Gateway/Web startup is explicitly held. KBN-101-06/-07 now freeze exact former README/dev/deployment Compose sequences plus production credential patterns as pre-classification semantic negatives. Independent review surfaced the current daemon/root/app dotenv loader as an unsafe source boundary; no source is authorized here, so the docs hold that startup and assign fail-closed removal/regression proof to KBN-101-02.
 - **Validation:** Prettier PASS (12 changed docs); local-link resolver PASS (71 links); `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json` PASS; full README/CLAUDE/docs inventory PASS (104 documents, 0 active non-normative Compose/init/production-credential violations); manifest reconstruction PASS (10 cards, 95 declared path tokens, 0 overlaps); `git diff --check` PASS. Pre-existing `.mosaic/orchestrator/{mission.json,session.lock}` remains intentionally unstaged.
 - **Final route correction:** Held the residual MCP environment/restart and historical TUI smoke-test routes after review showed they could bypass the Gateway local-start hold; no bearer-token-over-HTTP or Gateway restart route remains in this remediation scope.
 - **Delivery:** committed `7cc156b777189ee89448e4d569a8b3f69560a240` (`docs(#771): hold unsafe database startup routes`) and `d8f935c20ade835aa3ec03fe5d6961885d8b5f0b` (`docs(#771): record final route correction`). Push queue guard returned `state=unknown` without failure; both pushes completed and the remote matched `d8f935c` before this final delivery-evidence append. `.mosaic/orchestrator/{mission.json,session.lock}` remains pre-existing and unstaged. Await a fresh independent exact-head re-review/Ultron verification.
 ## 2026-07-15 — rc.15 exact one-finding runner/legacy-CI remediation intake
 - **Objective / scope:** Close only HIGH-1 in `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview9-be0ebfd.md` against `be0ebfdc6a2b32a0ab6989117ebbb12f43854d71`. Documentation/tracking only: no source, Compose, CI, deployment, migration, Vault, reports, or `.mosaic` edit.
 - **Plan:** Replace imperative current runner routes in the architecture plan and PERFORMANCE with one explicit non-operative future procedure; make fleet backlog current behavior PGlite-only and PostgreSQL held; classify README's checked-in direct CI `db:migrate` as legacy N-1/uncertified/non-authorizing pending KBN-101-06 removal; then extend the future KBN-101-06 lexical/semantic inventory contract so unqualified runner/current-CI authority fails before masking while only the complete named held procedure passes. Synchronize required contract/PRD/shared/task/index/sitemap state, run full docs scan and document gates, stage docs only, commit, queue-guard, push, and verify remote SHA.
 - **TDD decision:** not applicable: the user authorizes documentation only and the named -06 fixture/inventory files do not yet exist; the contract records their required future implementation evidence.
 - **Remediation / review closure:** Architecture, PERFORMANCE, federation SETUP/MILESTONES, deployment/dev/migrate-tier, and README now use one Markdown-bounded `Held future procedure` form where needed: non-operative/no-current-command-authority; KBN-101-00/-03/-05; external bootstrap → TLS/roles → `mosaic-db-migrator --run` → `mosaic-db-migrator --verify` → Gateway/Compose readiness. Any runner hit outside that section is a -06 semantic failure. Fleet backlog current behavior is PGlite-only. README accurately records the checked-in direct CI migration as an active, isolated-disposable-database, uncertified legacy N-1 DDL exception that is non-authorizing as an operator route and pending -06 removal; it no longer falsely claims the current CI role lacks DDL capability. Independent Codex review found and this pass closed the readiness-endpoint, standalone-verify, CI-factuality, and scanner-boundary findings. Its only residual finding concerns pre-existing tracked `.mosaic/orchestrator` runtime state, which is explicitly excluded and unstaged by task scope; security review found no vulnerability.
 - **Validation:** changed-doc Prettier PASS; `pnpm exec tsc --noEmit -p docs/native-kanban-sot/tsconfig.json` PASS; changed-doc local links 72/0; `git diff --check` PASS; full README/CLAUDE/docs lexical+semantic scan outside reports/scratchpads PASS (106 Markdown documents; 7 operator documents with runner tokens; zero unqualified future-runner/current-CI authority routes); KBN-101 manifest check PASS (10 dependency-ordered cards; -07 docs/-06 fixtures disjoint); docs-only allowlist PASS (16 docs, pre-existing `.mosaic` excluded).
 - **Delivery evidence:** committed `d857463a8a4658e34a77177737860cf82cc26ac6` (`docs(#771): hold unimplemented runner routes`). Pre-push queue guard returned `state=unknown` without failure; the push hook ran repository `pnpm typecheck`, `pnpm lint`, and `pnpm format:check`, all PASS. Push succeeded and `origin/docs/771-kbn101-db-role-split` matched `d857463a8a4658e34a77177737860cf82cc26ac6`. This evidence append is committed and pushed next; `.mosaic/orchestrator/{mission.json,session.lock}` stays pre-existing, unstaged, and excluded. Await exact-head independent re-review/Ultron reverify.
 ## 2026-07-15 — rc.16 exact one-finding generic-wrapper remediation intake
 - **Objective / scope:** Close only HIGH-1 in `/home/hermes/agent-work/reviews/771-kbn101-contract-rereview10-18e253c.md` against exact head `18e253c8790bdbb5bc30a06c116472213b83b22f`. Documentation/tracking only: no source, Compose, CI, deployment, migration, Vault, report, or `.mosaic` change.
 - **Source-backed correction:** `packages/storage/src/cli.ts` currently labels `storage migrate` a thin wrapper for `pnpm --filter @mosaicstack/db db:migrate` and executes that direct Drizzle command with `execSync`; no `mosaic-db-migrator` executable exists. Therefore the README commented form and user-guide executable form must not describe runner delegation or provide current command authority.
 - **Plan:** Remove the current wrapper command from README/user-guide command guidance; record it as legacy N-1, uncertified, non-operative, and forbidden pending KBN-101-02/-03/-06/-08 activation. Retain only the held future ordered bootstrap → TLS/roles → runner `--run` → `--verify` → readiness sequence and the separately held secure migrate-tier route. Extend KBN-101-06's future semantic fixture/matrix with both exact former forms (including the README commented code-fence form), requiring their failure before inventory/status masking and a source-consistency assertion that direct Drizzle wrapper source cannot be described as runner delegation. Synchronize status/version references only where required, then run document gates, stage docs only, commit, queue-guard, push, and verify the remote SHA.
 - **TDD decision:** not applicable: this bounded task changes documentation only; the required future -06 semantic/source-consistency fixtures are specified as implementation acceptance evidence.
 - **Remediation / validation:** README and user-guide remove the generic wrapper from command guidance and state the direct-Drizzle current-source truth, legacy-N-1/uncertified/non-operative MUST-NOT-INVOKE boundary, named -02/-03/-06/-08 activation cards, future external-bootstrap → TLS/roles → runner `--run` → `--verify` → readiness sequence, and separately held secure migrate-tier route. The KBN-101 rc.16 contract records both exact former forms (README commented code fence and user-guide executable code fence), requires failure before inventory/ownership/status masking, and requires the direct-Drizzle/no-runner-bin source-consistency proof. Prettier passed on all nine changed Markdown documents; changed-doc local links passed (72/0); strict native-kanban contract TypeScript and `git diff --check` passed; full README/CLAUDE/docs scan outside reports/scratchpads passed (106 documents, zero non-normative executable generic-wrapper or false runner-delegation route); and manifest validation passed (10 cards, 90 exact tokens, zero overlaps). Pre-existing `.mosaic/orchestrator/{mission.json,session.lock}` remains excluded.
--- a/docs/scratchpads/fcm-m2-001-generated-env-boundary.md
+++ b/docs/scratchpads/fcm-m2-001-generated-env-boundary.md
@@ -1,110 +0,0 @@
 # FCM-M2-001 — Generated Environment Boundary
 - **Issue/card:** #758 / FCM-M2-001
 - **Branch/base:** `feat/758-generated-env-boundary` from `origin/main` `e9c4aa3e8b3780719cd5a43c0ef3f37fc70de666`
 - **Budget assumption:** 30K-card budget; implement only the deterministic generated/local environment boundary and its launch-chain/docs/tests.
 ## Objective
 Replace the generic fleet agent `.env` authority/merge path with a deterministic roster-derived `<agent>.env.generated` projection and strict, data-only `<agent>.env.local`. The roster remains the desired-state authority. Reject bad input before the launcher creates a tmux session; never print sensitive or privileged-command values.
 ## Scope and non-goals
 - In scope: deterministic render/write, strict generated/local parse rules, legacy `.env` disposition/quarantine, systemd/launcher boundary, permission/path checks, focused fail-closed tests, operator/reference documentation, USC interface evidence.
 - Excluded: roster CRUD/mutation, v2 roster schema changes, lifecycle/reconcile/apply behavior, migration/canary rollout, connectors, remote surfaces, live-fleet actions, and M2-002.
 ## Plan
 1. Add red tests for generated-key shadowing, malformed/duplicate/unknown/command/sensitive input, no-value diagnostics, deterministic/idempotent projection, secure file modes, and legacy disposition.
 2. Implement a pure strict environment contract plus atomic projection/quarantine helper.
 3. Replace the generic `.env` writer/merge path and systemd reference with `.env.generated` + `.env.local` ownership.
 4. Make the shell launcher parse the files without `source`/`eval`, reject unsafe input before tmux creation, and construct only the roster-derived runtime command.
 5. Add operator/reference documentation with the requested USC M1 interface evidence and M2–M4 gate statement.
 6. Run focused/package/root gates and audit the USC interface packet. Per continuation scope, stop before review, commit, push, PR, or live mutation.
 ## Initial evidence
 - No existing owner: target worktree path absent; no target local/remote branch; `pr-list.sh -s open` returned no open PRs.
 - M1 compiler/API/docs and executable disposition evidence are present at the assigned base.
 - Existing launch chain writes `fleet/agents/<agent>.env`, preserves arbitrary legacy lines via `mergeAgentEnv`, sources `MOSAIC_AGENT_COMMAND`, and executes it through `bash -c`; all are M2 remediation targets.
 - `~/.config/mosaic/guides/SECURITY.md` is absent. Read the available security-review role contract and the vault/secrets guide instead.
 ## Verification log
 ### Continuation (2026-07-14)
 - Preserved the inherited 14-file delta; no reset, stash, rebase, roster mutation, lifecycle action,
  live-fleet action, commit, push, or PR action was performed.
 - Focused gates passed:
  - `pnpm --dir packages/mosaic test -- src/fleet/generated-env-boundary.spec.ts` — 1 file, 10 tests passed.
  - `bash packages/mosaic/framework/tools/fleet/test-start-agent-session.sh` — passed.
  - `bash packages/mosaic/framework/systemd/user/test-fleet-units.sh` — passed.
  - `pnpm --dir packages/mosaic test -- src/commands/fleet.spec.ts` — 1 file, 192 tests passed.
 - Package gates passed before final documentation/format follow-up:
  - `pnpm --dir packages/mosaic typecheck` — passed.
  - `pnpm --dir packages/mosaic lint` — passed.
  - `pnpm --dir packages/mosaic test` — 52 files, 752 tests passed.
 - `pnpm format:check` initially failed only for the new boundary reference and generated-boundary
  TypeScript files; targeted Prettier normalization was applied. A final `pnpm format:check` passed.
 - USC packet audit: the M1 structural compiler is `parseRosterV2` with roster `version: 2`; the
  semantic resolver is `validateRosterV2Semantics`; disposition artifacts retain `version: 1` fixture
  evidence. `docs/TASKS.md` records M1-001 done, M1-002 in-progress, and M1-003 not-started; no
  product release version is claimed. The packet now distinguishes these statuses from checkout
  artifact presence and states the M2 → M3 → M4 downstream gates.
 ## Review remediation (2026-07-14)
 - **Blocker 1 red-first:** Added a launcher reproducer with a `0777` `fleet/agents` parent and a private generated file. Before implementation, `bash packages/mosaic/framework/tools/fleet/test-start-agent-session.sh` failed: `FAIL: generated file under a world-writable parent was accepted`. The failure occurred after the launch path reached fake tmux, proving the parent was not validated.
 - **Blocker 2 red-first:** Added a `symlink()` projection-directory reproducer that preloads generated/local/quarantine/legacy target files and asserts no target mutation. Before implementation, `pnpm --dir packages/mosaic test -- src/fleet/generated-env-boundary.spec.ts` failed the new test because the existing writer followed the `agentEnvDir` symlink and parsed its target legacy input (`expected /unsafe-directory/i`, received `code=malformed-line`). The initial test-only missing `mkdir` import was corrected before recording this behavior failure.
 - **Blocker 3 red-first:** Added fresh/stale/absent native-heartbeat regression coverage. Before implementation, an isolated fake-tmux launcher reproducer with a fresh `<agent>.hb.native` marker failed `FAIL: fresh native heartbeat was overwritten`; the existing sidecar immediately replaced native `status=busy`/`model` content.
 - **Remediation result:** The launcher now rejects a group/world-accessible or symlinked `fleet/agents` parent before an environment read or tmux call. The projection writer uses `lstat` before chmod/write processing and rejects a symlinked directory without creating generated/local/quarantine files or deleting legacy input. The heartbeat sidecar defers to a fresh non-symlink native marker and falls back when stale/absent. Focused green evidence before independent review: `bash packages/mosaic/framework/tools/fleet/test-start-agent-session.sh` and `pnpm --dir packages/mosaic test -- src/fleet/generated-env-boundary.spec.ts` (11 tests) passed.
 - **Independent-review follow-up red-first:** Codex code review returned one blocker and security review one medium CWE-732 finding: the writer repaired an already `0777` directory with `chmod` before trusting its contents. Added a reproducer with a safe local file beneath an existing `0777` directory. Before the follow-up fix, `pnpm --dir packages/mosaic test -- src/fleet/generated-env-boundary.spec.ts` failed because the promise resolved and wrote `coder0.env.generated` instead of rejecting.
 - **Independent-review remediation:** Existing directories now pass non-following private-directory validation before any read or chmod; only a directory created in this call is normalized to `0700`. The fleet-add test fixture now creates its simulated trusted `fleet/agents` boundary at `0700`; this corrects fixture setup to match the new required contract rather than weakening the rejection assertion. Focused reruns passed: generated-boundary 12 tests, launcher boundary suite, and fleet suite 192 tests.
 - **Final verification before re-review:** Launcher + systemd suites passed; package suite passed (52 files, 754 tests); package lint/typecheck, root typecheck (42 tasks), format check, and diff check passed. The rerun code review still reports a tmux command-arity blocker, and the security rerun reports systemd `EnvironmentFile` pre-validation injection findings for both agent units. These were discovered after the specified three-remediation scope; no additional source changes were made. Independent review therefore remains `REQUEST CHANGES` despite the requested three fixes passing their behavioral suites.
 ## Systemd pre-validation remediation (2026-07-14)
 - **Red-first:** Updated the fleet unit contract to reject any `EnvironmentFile=` projection preload, require a cleared bootstrap environment, and require a validated exact-stop path. Before implementation, `bash packages/mosaic/framework/systemd/user/test-fleet-units.sh` failed: `FAIL: agent units must not preload projections before strict parsing`.
 - **Red-first parser/stop coverage:** Added interaction-wrapper and exact-stop cases to the launcher boundary suite. Before implementation, `bash packages/mosaic/framework/tools/fleet/test-start-agent-session.sh` failed: `FAIL: interaction did not use shared strict parser first`, because the interaction wrapper consumed inherited environment before projection validation.
 - **Focused green:** Both unit templates now use `env -i` with fixed `HOME`, agent instance, and PATH; neither has `Environment=`/`EnvironmentFile=`. The interaction wrapper delegates to `start-agent-session.sh --interaction`, so strict generated/local parsing precedes pinned Pi profile checks. `--stop` reuses the strict generated parser before exact `=<agent>` socket/session termination. Passed: systemd unit suite, launcher boundary suite (including malformed interaction, pinned profile, and ambient-socket stop cases), and 210 focused TypeScript tests.
 - **Final verification:** `pnpm --dir packages/mosaic test` passed (52 files, 754 tests); package lint/typecheck, root typecheck (42 tasks), format/diff, and shell syntax checks passed. Security review passed with no findings. Code review repeated the previously refuted tmux argv concern and a pre-existing Claude trust-lock suggestion; per the assigned narrow follow-up, no tmux or unrelated trust-path change was made.
 ## Risks and next review
 - This card is uncommitted and unreleased. The canonical tracker still records its dependencies as
  M1-002 in progress and M1-003 not started; this continuation does not reinterpret those task states.
 - Final post-documentation checks passed: `pnpm --dir packages/mosaic typecheck`,
  `pnpm --dir packages/mosaic lint`, `pnpm --dir packages/mosaic test` (52 files, 752 tests),
  `pnpm typecheck` (42 Turbo tasks), and `pnpm format:check`.
 - Obtain independent code and security review of the complete delta next. Do not run commit, push,
  PR, or live-fleet commands in this continuation.
 ## Fresh-install directory remediation (2026-07-14)
 - **Objective:** Remediate only the fresh-install path where `installFleet` created `fleet/agents`
  with host-umask permissions before the boundary writer correctly rejected it.
 - **Plan:** Add a real `fleet install --no-enable` integration reproducer; prove red; let the
  existing boundary writer own directory creation; run focused and full gates. No commit, push,
  PR, review disposition, or live-fleet action.
 - **Red evidence:** Before the one-line remediation,
  `pnpm --dir packages/mosaic test -- src/commands/fleet.spec.ts` failed the new test with
  `AgentEnvBoundaryError: code=unsafe-permissions` at `ensurePrivateProjectionDirectory`, after
  `installFleet` pre-created the directory.
 - **Change:** Removed only the recursive `mkdir(activePaths.agentEnvDir)` in `installFleet`.
  `writeAgentEnvironmentProjection` remains the sole creator and retains its existing `lstat`,
  private-directory, symlink, and existing-unsafe-directory fail-closed checks.
 - **Focused green:** `pnpm --dir packages/mosaic test -- src/commands/fleet.spec.ts` — 193 tests
  passed. The new integration executes a fresh `fleet install --no-enable`, asserts a real
  non-symlink `0700` directory and a `0600` generated projection. Existing unsafe-directory
  coverage remains in `generated-env-boundary.spec.ts` and asserts no chmod repair/no generated
  file write.
 - **Full gates green:** generated-boundary 12 tests; launcher and systemd suites; package
  typecheck/lint and 52 files / 755 tests; root typecheck (42 tasks), lint, format, diff check,
  and root test (42 tasks) all passed.
 - **Independent review:** The complete inherited uncommitted delta still has Codex `REQUEST CHANGES`
  findings outside this narrow fix (tmux command arity and Claude trust-lock regression), plus a
  security-review medium finding on unvalidated writable ancestor directories. No out-of-scope
  source changes were made.
 - **Risk:** The writer's existing create-then-validate sequence is relied on for the creation
  boundary; a concurrent substitution causes fail-closed validation rather than repair. The
  review findings above remain residual risks for the complete card delta.
--- a/packages/mosaic/framework/fleet/README.md
+++ b/packages/mosaic/framework/fleet/README.md
@@ -9,8 +9,7 @@ package, normally at:
 ```
 The default tmux socket is `mosaic-fleet` so fleet commands do not touch the
-default tmux server. The roster is the desired-state authority; generated environment files are
+default tmux server.
 rebuildable projections, never a second source of configuration.
 ## Examples
@@ -32,17 +31,6 @@ The installed `tools/fleet/print-interaction-effective-policy.sh` prints only
 the resolved name, runtime, model, reasoning, and tool policy. It never reads
 or prints credential variables.
 ## Generated agent environment boundary
 `mosaic fleet install` writes a private deterministic projection at
 `~/.config/mosaic/fleet/agents/<agent>.env.generated`. It may relocate only approved local machine
 data to `<agent>.env.local`; generated keys, arbitrary commands, secret-like keys, duplicate keys,
 unknown keys, and unsafe permissions fail before a tmux session is created. Legacy `.env` input is
 regenerated, relocated, or quarantined and is not a launch authority.
 See [`docs/fleet/reference/generated-env-boundary.md`](../../../../docs/fleet/reference/generated-env-boundary.md)
 for allowed local keys and the USC downstream interface evidence.
 Initialize a roster:
 ```bash
--- a/packages/mosaic/framework/systemd/user/README.md
+++ b/packages/mosaic/framework/systemd/user/README.md
@@ -24,56 +24,45 @@ The agent template calls:
 which starts or reuses a tmux session on `MOSAIC_TMUX_SOCKET`.
-## Generated environment and local data
+## Local customization
-The roster-derived projection is written outside the package at:
+Per-agent overrides live outside the package in:
 ```text
-~/.config/mosaic/fleet/agents/<agent>.env.generated
+~/.config/mosaic/fleet/agents/<agent>.env
 ```
-Systemd does not read either environment file. It starts the launcher with a fixed cleared bootstrap
+Example:
 environment; before it creates, queries, or stops an exact agent tmux session, `start-agent-session.sh`
 strictly parses the generated projection and the optional local data file:
-```text
+```dotenv
-~/.config/mosaic/fleet/agents/<agent>.env.local
+MOSAIC_TMUX_SOCKET=mosaic-fleet
 MOSAIC_AGENT_RUNTIME=claude
 MOSAIC_AGENT_WORKDIR=$HOME/src/your-project
 # Optional escape hatch for PoC/canary agents:
 # MOSAIC_AGENT_COMMAND=mosaic yolo claude
 ```
 The local file may contain only safe machine-specific data (`MOSAIC_RUNTIME_BIN`, heartbeat paths or
 interval, and Claude configuration paths). It cannot override roster-derived keys, carry a command,
 or contain secret-like/unknown keys. Both files must be private regular files. Do not hand-edit the
 generated projection; update the roster and regenerate it instead. A legacy `<agent>.env` is
 consumed only for regeneration, strict relocation, or private quarantine and is never launch input.
 See `docs/fleet/reference/generated-env-boundary.md` for the full contract.
 ## Manual canary sequence
 Use the roster and the supported installer; do not pre-create the agent environment directory or
 edit a generated projection. `mosaic fleet install` validates the roster, installs the units and
 helpers, and writes private roster-derived projections before any service is started.
 ```bash
-# Create a site-owned canary roster. Inspect an existing roster before using --force.
+mkdir -p ~/.config/systemd/user ~/.config/mosaic/tools/fleet ~/.config/mosaic/fleet/agents
-mosaic fleet init --profile minimal --write
+cp packages/mosaic/framework/systemd/user/mosaic-*.service ~/.config/systemd/user/
-mosaic fleet install
+cp packages/mosaic/framework/tools/fleet/*.sh ~/.config/mosaic/tools/fleet/
 chmod +x ~/.config/mosaic/tools/fleet/*.sh
 systemctl --user daemon-reload
-mosaic fleet start canary-pi
+systemctl --user start mosaic-tmux-holder.service
 systemctl --user start mosaic-agent@canary.service
 tmux -L mosaic-fleet ls
 ```
-For an operator-interaction service, first put `<agent-name>` in the roster with the pinned Pi
+# For an operator-interaction service, the roster/env identity selects the
-runtime, model, reasoning, and `operator-interaction` tool policy. Re-run `mosaic fleet install` after
+# generic unit instance; no service source is renamed for an instance.
 that roster change so it writes `<agent-name>.env.generated`; ambient `MOSAIC_AGENT_*` values are not
 launch authority. The generic unit instance uses that generated identity, and no service source is
 renamed for an instance:
 ```bash
 mosaic fleet install
 systemctl --user daemon-reload
 systemctl --user start mosaic-interaction-agent@<agent-name>.service
-~/.config/mosaic/tools/fleet/print-interaction-effective-policy.sh <agent-name>
+MOSAIC_AGENT_NAME=<agent-name> \
 MOSAIC_AGENT_RUNTIME=pi \
 MOSAIC_AGENT_MODEL=openai/gpt-5.6-sol \
 MOSAIC_AGENT_REASONING=high \
 MOSAIC_AGENT_TOOL_POLICY=operator-interaction \
  ~/.config/mosaic/tools/fleet/print-interaction-effective-policy.sh
 ```
 Do not use `tmux kill-server` without `-L mosaic-fleet`; this pattern is meant
--- a/packages/mosaic/framework/systemd/user/mosaic-agent@.service
+++ b/packages/mosaic/framework/systemd/user/mosaic-agent@.service
@@ -7,13 +7,16 @@ PartOf=mosaic-tmux-holder.service
 [Service]
 Type=oneshot
 # Remove loader and noninteractive-shell controls before ExecStart loads env.
 UnsetEnvironment=LD_PRELOAD BASH_ENV ENV
 RemainAfterExit=yes
-# Never preload the projection. The launcher starts from a fixed minimal
+# No default MOSAIC_TMUX_SOCKET: an absent roster socket means the literal
-# environment and strictly validates generated/local data before tmux effects.
+# default tmux socket (no -L). The per-agent .env sets it when the roster names
-ExecStart=/usr/bin/env -i HOME=%h MOSAIC_AGENT_NAME=%i PATH=/usr/bin:/bin /bin/bash --noprofile --norc %h/.config/mosaic/tools/fleet/start-agent-session.sh %i
+# one; otherwise it stays unset and start-agent-session.sh uses the default socket.
-ExecStop=-/usr/bin/env -i HOME=%h MOSAIC_AGENT_NAME=%i PATH=/usr/bin:/bin /bin/bash --noprofile --norc %h/.config/mosaic/tools/fleet/start-agent-session.sh --stop %i
+Environment=MOSAIC_AGENT_NAME=%i
 Environment=MOSAIC_AGENT_RUNTIME=pi
 Environment=MOSAIC_AGENT_WORKDIR=%h
 EnvironmentFile=-%h/.config/mosaic/fleet/agents/%i.env
 ExecStart=/bin/bash %h/.config/mosaic/tools/fleet/start-agent-session.sh %i
 ExecStop=-/bin/bash -lc 'if [ -n "${MOSAIC_TMUX_SOCKET:-}" ]; then tmux -L "$MOSAIC_TMUX_SOCKET" kill-session -t "=%i"; else tmux kill-session -t "=%i"; fi'
 [Install]
 WantedBy=default.target
--- a/packages/mosaic/framework/systemd/user/mosaic-interaction-agent@.service
+++ b/packages/mosaic/framework/systemd/user/mosaic-interaction-agent@.service
@@ -7,13 +7,11 @@ PartOf=mosaic-tmux-holder.service
 [Service]
 Type=oneshot
 # Remove loader and noninteractive-shell controls before ExecStart loads env.
 UnsetEnvironment=LD_PRELOAD BASH_ENV ENV
 RemainAfterExit=yes
-# The interaction wrapper delegates to the shared strict parser before pinned
+Environment=MOSAIC_AGENT_NAME=%i
-# profile checks; no projection data reaches Bash through systemd.
+EnvironmentFile=%h/.config/mosaic/fleet/agents/%i.env
-ExecStart=/usr/bin/env -i HOME=%h MOSAIC_AGENT_NAME=%i PATH=/usr/bin:/bin /bin/bash --noprofile --norc %h/.config/mosaic/tools/fleet/start-interaction-service.sh %i
+ExecStart=/bin/bash %h/.config/mosaic/tools/fleet/start-interaction-service.sh %i
-ExecStop=-/usr/bin/env -i HOME=%h MOSAIC_AGENT_NAME=%i PATH=/usr/bin:/bin /bin/bash --noprofile --norc %h/.config/mosaic/tools/fleet/start-agent-session.sh --stop %i
+ExecStop=-/bin/bash -lc 'if [ -n "${MOSAIC_TMUX_SOCKET:-}" ]; then tmux -L "$MOSAIC_TMUX_SOCKET" kill-session -t "=%i"; else tmux kill-session -t "=%i"; fi'
 [Install]
 WantedBy=default.target
--- a/packages/mosaic/framework/systemd/user/mosaic-tmux-holder.service
+++ b/packages/mosaic/framework/systemd/user/mosaic-tmux-holder.service
@@ -6,11 +6,10 @@ After=default.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-# The holder owns the tmux server, so clear loader, shell-control, and stale
+Environment=MOSAIC_TMUX_SOCKET=mosaic-fleet
-# manager/session variables before the server process starts.
+Environment=MOSAIC_TMUX_HOLDER=_holder
-UnsetEnvironment=LD_PRELOAD BASH_ENV ENV
+ExecStart=/bin/bash -lc 'tmux -L "$MOSAIC_TMUX_SOCKET" has-session -t "=${MOSAIC_TMUX_HOLDER}:0.0" 2>/dev/null || tmux -L "$MOSAIC_TMUX_SOCKET" new-session -d -s "$MOSAIC_TMUX_HOLDER" "while true; do sleep 3600; done"'
-ExecStart=/usr/bin/env -i HOME=%h PATH=/usr/bin:/bin MOSAIC_TMUX_SOCKET=mosaic-fleet MOSAIC_TMUX_HOLDER=_holder /bin/bash --noprofile --norc %h/.config/mosaic/tools/fleet/start-tmux-holder.sh
+ExecStop=-/bin/bash -lc 'tmux -L "$MOSAIC_TMUX_SOCKET" kill-server'
 ExecStop=-/usr/bin/env -i HOME=%h PATH=/usr/bin:/bin MOSAIC_TMUX_SOCKET=mosaic-fleet /bin/bash --noprofile --norc -c 'tmux -L "$MOSAIC_TMUX_SOCKET" kill-server'
 [Install]
 WantedBy=default.target
--- a/packages/mosaic/framework/systemd/user/test-fleet-units.sh
+++ b/packages/mosaic/framework/systemd/user/test-fleet-units.sh
@@ -5,8 +5,6 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "$0")" && pwd)
 HOLDER="$SCRIPT_DIR/mosaic-tmux-holder.service"
 AGENT="$SCRIPT_DIR/mosaic-agent@.service"
 INTERACTION="$SCRIPT_DIR/mosaic-interaction-agent@.service"
 HOLDER_START="$SCRIPT_DIR/../../tools/fleet/start-tmux-holder.sh"
 START_AGENT="$SCRIPT_DIR/../../tools/fleet/start-agent-session.sh"
 fail() {
  echo "FAIL: $*" >&2
@@ -16,40 +14,16 @@ fail() {
 [ -f "$HOLDER" ] || fail "missing mosaic-tmux-holder.service"
 [ -f "$AGENT" ] || fail "missing mosaic-agent@.service"
 [ -f "$INTERACTION" ] || fail "missing mosaic-interaction-agent@.service"
 [ -x "$HOLDER_START" ] || fail "missing executable start-tmux-holder.sh"
 [ -x "$START_AGENT" ] || fail "missing executable start-agent-session.sh"
 grep -qF 'ExecStart=' "$HOLDER" || fail "holder has no ExecStart"
 grep -qF 'tmux -L' "$HOLDER" || fail "holder does not use named tmux socket"
 grep -qF '_holder' "$HOLDER" || fail "holder session is not explicit"
 grep -qF 'UnsetEnvironment=LD_PRELOAD BASH_ENV ENV' "$HOLDER" || \
  fail "holder does not remove loader and shell-control variables"
 grep -qF 'ExecStart=/usr/bin/env -i HOME=%h PATH=/usr/bin:/bin MOSAIC_TMUX_SOCKET=mosaic-fleet MOSAIC_TMUX_HOLDER=_holder /bin/bash --noprofile --norc %h/.config/mosaic/tools/fleet/start-tmux-holder.sh' "$HOLDER" || \
  fail "holder does not clear manager environment before starting tmux"
 grep -qF 'ExecStop=-/usr/bin/env -i HOME=%h PATH=/usr/bin:/bin MOSAIC_TMUX_SOCKET=mosaic-fleet /bin/bash --noprofile --norc -c' "$HOLDER" || \
  fail "holder stop does not clear manager environment"
 if grep -qF -- '/bin/bash -lc' "$HOLDER"; then
  fail "holder must not start tmux through a login shell"
 fi
 grep -qF 'Requires=mosaic-tmux-holder.service' "$AGENT" || fail "agent does not require holder"
 grep -qF 'start-agent-session.sh' "$AGENT" || fail "agent unit does not call start-agent-session.sh"
-if grep -qE '^Environment(File)?=' "$AGENT" "$INTERACTION"; then
+grep -qF 'kill-session -t "=%i"' "$AGENT" || fail "agent stop does not exact-match its session"
  fail "agent units must not accept ambient or projection environment before strict parsing"
 fi
 grep -qF 'UnsetEnvironment=LD_PRELOAD BASH_ENV ENV' "$AGENT" || \
  fail "agent unit does not remove loader and shell-control variables"
 grep -qF 'UnsetEnvironment=LD_PRELOAD BASH_ENV ENV' "$INTERACTION" || \
  fail "interaction unit does not remove loader and shell-control variables"
 grep -qF 'ExecStart=/usr/bin/env -i HOME=%h MOSAIC_AGENT_NAME=%i PATH=/usr/bin:/bin /bin/bash --noprofile --norc' "$AGENT" || \
  fail "agent unit does not clear bootstrap environment before strict parsing"
 grep -qF 'start-agent-session.sh --stop %i' "$AGENT" || \
  fail "agent stop does not use the validated exact-stop path"
 grep -qF 'Requires=mosaic-tmux-holder.service' "$INTERACTION" || fail "interaction service does not require holder"
-grep -qF 'ExecStart=/usr/bin/env -i HOME=%h MOSAIC_AGENT_NAME=%i PATH=/usr/bin:/bin /bin/bash --noprofile --norc' "$INTERACTION" || \
+grep -qF 'EnvironmentFile=%h/.config/mosaic/fleet/agents/%i.env' "$INTERACTION" || fail "interaction service does not require per-agent config"
-  fail "interaction unit does not clear bootstrap environment before strict parsing"
+grep -qF 'start-interaction-service.sh %i' "$INTERACTION" || fail "interaction service does not validate before startup"
 grep -qF 'start-interaction-service.sh %i' "$INTERACTION" || fail "interaction service does not use shared strict parsing"
 grep -qF 'start-agent-session.sh --stop %i' "$INTERACTION" || \
  fail "interaction stop does not use the validated exact-stop path"
 if command -v systemd-analyze >/dev/null 2>&1; then
  systemd-analyze verify --user "$HOLDER" "$AGENT" "$INTERACTION" >/tmp/mosaic-fleet-systemd-verify.log 2>&1 || {
@@ -58,102 +32,4 @@ if command -v systemd-analyze >/dev/null 2>&1; then
  }
 fi
 # Real isolated socket regression: a preexisting server with an LD_PRELOAD
 # constructor marker must fail closed, while a fresh named server is created.
 if command -v tmux >/dev/null 2>&1 && command -v cc >/dev/null 2>&1; then
  TEST_ROOT=$(mktemp -d)
  TEST_SOCKET="mosaic-holder-test-$$"
  trap 'tmux -L "$TEST_SOCKET" kill-server >/dev/null 2>&1 || true; rm -rf "$TEST_ROOT"' EXIT
  MARKER="$TEST_ROOT/loader-marker"
  LIBRARY="$TEST_ROOT/marker.so"
  HOLDER_HOME="$TEST_ROOT/holder-home"
  mkdir -p "$HOLDER_HOME/.config/mosaic/fleet/run"
  chmod 700 "$HOLDER_HOME/.config" "$HOLDER_HOME/.config/mosaic" \
    "$HOLDER_HOME/.config/mosaic/fleet" "$HOLDER_HOME/.config/mosaic/fleet/run"
  printf '123e4567-e89b-12d3-a456-426614174000\n' > \
    "$HOLDER_HOME/.config/mosaic/fleet/run/holder-owner"
  chmod 600 "$HOLDER_HOME/.config/mosaic/fleet/run/holder-owner"
  cat > "$TEST_ROOT/marker.c" <<'EOF'
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 __attribute__((constructor)) static void mark_loader(void) {
  const char *path = getenv("MOSAIC_LOADER_MARKER");
  if (path != NULL) {
    int fd = open(path, O_WRONLY | O_CREAT | O_APPEND, 0600);
    if (fd >= 0) { write(fd, "loaded\\n", 7); close(fd); }
  }
 }
 EOF
  cc -shared -fPIC -o "$LIBRARY" "$TEST_ROOT/marker.c"
  MOSAIC_LOADER_MARKER="$MARKER" LD_PRELOAD="$LIBRARY" \
    tmux -L "$TEST_SOCKET" new-session -d -s _holder 'sleep 60'
  [ -s "$MARKER" ] || fail "contaminated fixture did not execute loader constructor"
  server_pid=$(tmux -L "$TEST_SOCKET" display-message -p '#{pid}')
  : > "$MARKER"
  if /usr/bin/env -i HOME="$HOLDER_HOME" PATH=/usr/bin:/bin \
    MOSAIC_TMUX_SOCKET="$TEST_SOCKET" MOSAIC_TMUX_HOLDER=_holder "$HOLDER_START" \
    >"$TEST_ROOT/holder.out" 2>&1; then
    fail "holder adopted contaminated named server"
  fi
  grep -qF 'global environment does not match the owned-server contract' "$TEST_ROOT/holder.out" || \
    fail "holder did not report contaminated server environment"
  [ "$(tmux -L "$TEST_SOCKET" display-message -p '#{pid}')" = "$server_pid" ] || \
    fail "holder replaced a contaminated server instead of failing closed"
  [ ! -s "$MARKER" ] || fail "holder execution triggered a contaminated loader"
  # Agent validation must reject the same unmanaged server without cleaning its
  # global environment or adding a managed session.
  AGENT_HOME="$HOLDER_HOME/.config/mosaic"
  AGENT_NAME=loader-safe
  AGENT_WORKDIR="$AGENT_HOME/work"
  AGENT_BIN="$TEST_ROOT/agent-bin"
  mkdir -p "$AGENT_HOME/fleet/agents" "$AGENT_WORKDIR" "$AGENT_BIN"
  chmod 700 "$AGENT_HOME/fleet/agents"
  cat > "$AGENT_HOME/fleet/agents/$AGENT_NAME.env.generated" <<EOF
 MOSAIC_AGENT_NAME=$AGENT_NAME
 MOSAIC_AGENT_CLASS=code
 MOSAIC_AGENT_RUNTIME=pi
 MOSAIC_AGENT_MODEL=
 MOSAIC_AGENT_REASONING=
 MOSAIC_AGENT_TOOL_POLICY=code
 MOSAIC_AGENT_WORKDIR=$AGENT_WORKDIR
 MOSAIC_TMUX_SOCKET=$TEST_SOCKET
 EOF
  printf 'MOSAIC_RUNTIME_BIN=%s\n' "$AGENT_BIN" > "$AGENT_HOME/fleet/agents/$AGENT_NAME.env.local"
  chmod 600 "$AGENT_HOME/fleet/agents/$AGENT_NAME.env.generated" \
    "$AGENT_HOME/fleet/agents/$AGENT_NAME.env.local"
  cat > "$AGENT_BIN/mosaic" <<'EOF'
 #!/bin/sh
 sleep 30
 EOF
  chmod 700 "$AGENT_BIN/mosaic"
  server_environment_before=$(tmux -L "$TEST_SOCKET" show-environment -g | sort)
  server_sessions_before=$(tmux -L "$TEST_SOCKET" list-sessions | sort)
  if /usr/bin/env -i HOME="$HOLDER_HOME" PATH=/usr/bin:/bin MOSAIC_HOME="$AGENT_HOME" \
    "$START_AGENT" "$AGENT_NAME" >"$TEST_ROOT/agent.out" 2>&1; then
    fail "agent launcher adopted contaminated named server"
  fi
  [ "$(tmux -L "$TEST_SOCKET" display-message -p '#{pid}')" = "$server_pid" ] || \
    fail "agent launcher changed unmanaged server PID"
  [ "$(tmux -L "$TEST_SOCKET" show-environment -g | sort)" = "$server_environment_before" ] || \
    fail "agent launcher changed unmanaged global environment"
  [ "$(tmux -L "$TEST_SOCKET" list-sessions | sort)" = "$server_sessions_before" ] || \
    fail "agent launcher changed unmanaged sessions"
  tmux -L "$TEST_SOCKET" kill-server
  /usr/bin/env -i HOME="$HOLDER_HOME" PATH=/usr/bin:/bin \
    MOSAIC_TMUX_SOCKET="$TEST_SOCKET" MOSAIC_TMUX_HOLDER=_holder "$HOLDER_START"
  tmux -L "$TEST_SOCKET" has-session -t '=_holder:0.0' || fail "fresh holder was not created"
  if tmux -L "$TEST_SOCKET" show-environment -g LD_PRELOAD 2>/dev/null | grep -q '^LD_PRELOAD='; then
    fail "fresh holder retained LD_PRELOAD"
  fi
  /usr/bin/env -i HOME="$HOLDER_HOME" PATH=/usr/bin:/bin MOSAIC_HOME="$AGENT_HOME" \
    "$START_AGENT" "$AGENT_NAME"
  tmux -L "$TEST_SOCKET" has-session -t "=$AGENT_NAME:0.0" || \
    fail "agent did not launch on a valid owned server"
  tmux -L "$TEST_SOCKET" kill-server
  trap - EXIT
  rm -rf "$TEST_ROOT"
 fi
 echo "ok - fleet systemd unit templates"
--- a/packages/mosaic/framework/tools/fleet/start-agent-session.sh
+++ b/packages/mosaic/framework/tools/fleet/start-agent-session.sh
@@ -1,207 +1,39 @@
 #!/usr/bin/env bash
 set -euo pipefail
-# FCM-M2-001 boundary: only a roster-derived .env.generated projection and a
+AGENT_NAME=${1:-${MOSAIC_AGENT_NAME:-}}
-# separately parsed data-only .env.local can influence launch. Never source an
+# Absent socket ⇒ the LITERAL default tmux socket (no -L). The roster's
-# environment file and never accept a command string from either file.
+# socket_name is honored when set; absent never silently becomes mosaic-fleet
 # (spawn stays consistent with the onboarding cheat-sheet + fleet ps observe).
 MOSAIC_TMUX_SOCKET=${MOSAIC_TMUX_SOCKET:-}
 MOSAIC_AGENT_RUNTIME=${MOSAIC_AGENT_RUNTIME:-pi}
 MOSAIC_AGENT_MODEL=${MOSAIC_AGENT_MODEL:-}
 MOSAIC_AGENT_REASONING=${MOSAIC_AGENT_REASONING:-}
 MOSAIC_AGENT_WORKDIR=${MOSAIC_AGENT_WORKDIR:-$HOME}
 MOSAIC_AGENT_COMMAND=${MOSAIC_AGENT_COMMAND:-}
 MOSAIC_HEARTBEAT_RUN_DIR=${MOSAIC_HEARTBEAT_RUN_DIR:-${MOSAIC_HOME:-$HOME/.config/mosaic}/fleet/run}
 MOSAIC_HEARTBEAT_INTERVAL=${MOSAIC_HEARTBEAT_INTERVAL:-15}
-MODE=launch
+if [ -z "$AGENT_NAME" ]; then
-case "${1:-}" in
+  echo "ERROR: agent name argument or MOSAIC_AGENT_NAME is required" >&2
  --stop)
    MODE=stop
    AGENT_NAME=${2:-}
    ;;
  --interaction)
    MODE=interaction
    AGENT_NAME=${2:-}
    ;;
  *) AGENT_NAME=${1:-${MOSAIC_AGENT_NAME:-}} ;;
 esac
 MOSAIC_HOME=${MOSAIC_HOME:-$HOME/.config/mosaic}
 fail() {
  echo "ERROR: $*" >&2
  exit 64
-}
+fi
-hash_value() {
+case "$MOSAIC_AGENT_REASONING" in
-  printf '%s' "$1" | sha256sum | awk '{print $1}'
+  ''|low|medium|high) ;;
-}
+  *)
-
+    echo "ERROR: MOSAIC_AGENT_REASONING must be low, medium, or high" >&2
 fail_env() {
  local code="$1"
  local key="$2"
  local value="$3"
  echo "ERROR: agent environment rejected: code=${code} key=${key} sha256=$(hash_value "$value")" >&2
    exit 64
 }
 safe_agent_name() {
  [[ "$1" =~ ^[A-Za-z0-9][A-Za-z0-9_.-]*$ ]]
 }
 safe_policy_name() {
  [[ "$1" =~ ^[a-z][a-z0-9-]*$ ]]
 }
 safe_path() {
  [[ "$1" == /* ]] || return 1
  [[ "$1" != *".."* ]] || return 1
  [[ ! "$1" =~ [[:space:]\"\'\`\$\\\;\|\&\<\>\(\)\{\}] ]]
 }
 assert_private_regular_file() {
  local file="$1"
  [ -f "$file" ] && [ ! -L "$file" ] || fail_env unsafe-file '(file)' "$file"
  local mode
  mode=$(stat -c '%a' -- "$file") || fail_env unsafe-file '(file)' "$file"
  (( (8#$mode & 8#077) == 0 )) || fail_env unsafe-permissions '(file)' "$file"
 }
 assert_managed_directory() {
  local directory="$1"
  [ -d "$directory" ] && [ ! -L "$directory" ] || fail_env unsafe-directory '(directory)' "$directory"
  local mode
  mode=$(stat -c '%a' -- "$directory") || fail_env unsafe-directory '(directory)' "$directory"
  (( (8#$mode & 8#022) == 0 )) || fail_env unsafe-permissions '(directory)' "$directory"
 }
 assert_private_directory() {
  local directory="$1"
  assert_managed_directory "$directory"
  local mode
  mode=$(stat -c '%a' -- "$directory") || fail_env unsafe-directory '(directory)' "$directory"
  (( (8#$mode & 8#077) == 0 )) || fail_env unsafe-permissions '(directory)' "$directory"
 }
 [ -n "$AGENT_NAME" ] || fail "agent name argument or MOSAIC_AGENT_NAME is required"
 safe_agent_name "$AGENT_NAME" || fail_env unsafe-agent-name MOSAIC_AGENT_NAME "$AGENT_NAME"
 safe_path "$MOSAIC_HOME" || fail_env unsafe-path MOSAIC_HOME "$MOSAIC_HOME"
 FLEET_DIR="$MOSAIC_HOME/fleet"
 AGENT_ENV_DIR="$FLEET_DIR/agents"
 assert_managed_directory "$MOSAIC_HOME"
 assert_managed_directory "$FLEET_DIR"
 assert_private_directory "$AGENT_ENV_DIR"
 GENERATED_ENV="$AGENT_ENV_DIR/$AGENT_NAME.env.generated"
 LOCAL_ENV="$AGENT_ENV_DIR/$AGENT_NAME.env.local"
 declare -A GENERATED_VALUES=()
 declare -A LOCAL_VALUES=()
 declare -A SEEN_KEYS=()
 is_sensitive_key() {
  [[ "$1" =~ (API[_-]?KEY|AUTH|CREDENTIAL|PASSWORD|PRIVATE|SECRET|TOKEN) ]]
 }
 is_generated_key() {
  case "$1" in
    MOSAIC_AGENT_NAME|MOSAIC_AGENT_CLASS|MOSAIC_AGENT_RUNTIME|MOSAIC_AGENT_MODEL|MOSAIC_AGENT_REASONING|MOSAIC_AGENT_TOOL_POLICY|MOSAIC_AGENT_WORKDIR|MOSAIC_TMUX_SOCKET) return 0 ;;
    *) return 1 ;;
  esac
 }
 is_local_key() {
  case "$1" in
    MOSAIC_RUNTIME_BIN|MOSAIC_HEARTBEAT_RUN_DIR|MOSAIC_HEARTBEAT_INTERVAL|MOSAIC_CLAUDE_JSON|CLAUDE_CONFIG_DIR) return 0 ;;
    *) return 1 ;;
  esac
 }
 validate_generated_value() {
  local key="$1"
  local value="$2"
  case "$key" in
    MOSAIC_AGENT_NAME) safe_agent_name "$value" || fail_env unsafe-agent-name "$key" "$value" ;;
    MOSAIC_AGENT_CLASS) safe_policy_name "$value" || fail_env unsafe-class "$key" "$value" ;;
    MOSAIC_AGENT_RUNTIME)
      case "$value" in claude|codex|opencode|pi) ;; *) fail_env unsupported-runtime "$key" "$value" ;; esac
    ;;
    MOSAIC_AGENT_MODEL) [[ "$value" =~ ^[A-Za-z0-9._/:+-]*$ ]] || fail_env unsafe-model "$key" "$value" ;;
    MOSAIC_AGENT_REASONING)
      case "$value" in ''|low|medium|high) ;; *) fail_env unsupported-reasoning "$key" "$value" ;; esac
      ;;
    MOSAIC_AGENT_TOOL_POLICY) [ -z "$value" ] || safe_policy_name "$value" || fail_env unsafe-tool-policy "$key" "$value" ;;
    MOSAIC_AGENT_WORKDIR) safe_path "$value" || fail_env unsafe-path "$key" "$value" ;;
    MOSAIC_TMUX_SOCKET) [[ "$value" =~ ^[A-Za-z0-9_.-]*$ ]] || fail_env unsafe-socket "$key" "$value" ;;
 esac
 }
 validate_local_value() {
  local key="$1"
  local value="$2"
  if [ "$key" = MOSAIC_HEARTBEAT_INTERVAL ]; then
    [[ "$value" =~ ^[1-9][0-9]*$ ]] || fail_env invalid-interval "$key" "$value"
  else
    safe_path "$value" || fail_env unsafe-path "$key" "$value"
  fi
 }
 load_environment_file() {
  local file="$1"
  local kind="$2"
  [ -e "$file" ] || {
    [ "$kind" = generated ] && fail_env missing-file '(generated)' "$file"
    return 0
  }
  assert_private_regular_file "$file"
  SEEN_KEYS=()
  local line key value
  while IFS= read -r line || [ -n "$line" ]; do
    [ -z "$line" ] && continue
    if [[ ! "$line" =~ ^([A-Z][A-Z0-9_]*)=(.*)$ ]]; then
      fail_env malformed-line '(malformed)' "$line"
    fi
    key=${BASH_REMATCH[1]}
    value=${BASH_REMATCH[2]}
    [ -z "${SEEN_KEYS[$key]+set}" ] || fail_env duplicate-key "$key" "$value"
    SEEN_KEYS[$key]=1
    is_sensitive_key "$key" && fail_env sensitive-key "$key" "$value"
    if [ "$kind" = generated ]; then
      is_generated_key "$key" || fail_env unknown-key "$key" "$value"
      validate_generated_value "$key" "$value"
      GENERATED_VALUES[$key]=$value
    else
      is_generated_key "$key" && fail_env generated-key-shadow "$key" "$value"
      is_local_key "$key" || fail_env unknown-key "$key" "$value"
      validate_local_value "$key" "$value"
      LOCAL_VALUES[$key]=$value
    fi
  done < "$file"
 }
 load_environment_file "$GENERATED_ENV" generated
 for required_key in \
  MOSAIC_AGENT_NAME MOSAIC_AGENT_CLASS MOSAIC_AGENT_RUNTIME MOSAIC_AGENT_MODEL \
  MOSAIC_AGENT_REASONING MOSAIC_AGENT_TOOL_POLICY MOSAIC_AGENT_WORKDIR MOSAIC_TMUX_SOCKET; do
  [ -n "${GENERATED_VALUES[$required_key]+set}" ] || fail_env missing-key "$required_key" ''
 done
 load_environment_file "$LOCAL_ENV" local
 [ "${GENERATED_VALUES[MOSAIC_AGENT_NAME]}" = "$AGENT_NAME" ] || \
  fail_env agent-name-mismatch MOSAIC_AGENT_NAME "${GENERATED_VALUES[MOSAIC_AGENT_NAME]}"
 MOSAIC_TMUX_SOCKET=${GENERATED_VALUES[MOSAIC_TMUX_SOCKET]}
 MOSAIC_AGENT_RUNTIME=${GENERATED_VALUES[MOSAIC_AGENT_RUNTIME]}
 MOSAIC_AGENT_MODEL=${GENERATED_VALUES[MOSAIC_AGENT_MODEL]}
 MOSAIC_AGENT_REASONING=${GENERATED_VALUES[MOSAIC_AGENT_REASONING]}
 MOSAIC_AGENT_WORKDIR=${GENERATED_VALUES[MOSAIC_AGENT_WORKDIR]}
 MOSAIC_AGENT_CLASS=${GENERATED_VALUES[MOSAIC_AGENT_CLASS]}
 MOSAIC_AGENT_TOOL_POLICY=${GENERATED_VALUES[MOSAIC_AGENT_TOOL_POLICY]}
 MOSAIC_RUNTIME_BIN=${LOCAL_VALUES[MOSAIC_RUNTIME_BIN]:-}
 MOSAIC_HEARTBEAT_RUN_DIR=${LOCAL_VALUES[MOSAIC_HEARTBEAT_RUN_DIR]:-$MOSAIC_HOME/fleet/run}
 MOSAIC_HEARTBEAT_INTERVAL=${LOCAL_VALUES[MOSAIC_HEARTBEAT_INTERVAL]:-15}
 MOSAIC_CLAUDE_JSON=${LOCAL_VALUES[MOSAIC_CLAUDE_JSON]:-}
 CLAUDE_CONFIG_DIR=${LOCAL_VALUES[CLAUDE_CONFIG_DIR]:-}
 if ! command -v tmux >/dev/null 2>&1; then
  echo "ERROR: tmux is required" >&2
  exit 69
 fi
 # tmux wrapper: pass -L only when a socket is configured. An absent/empty socket
 # means the default tmux socket (no -L), keeping spawn == observe == cheat-sheet.
 _tmux() {
  if [ -n "$MOSAIC_TMUX_SOCKET" ]; then
    tmux -L "$MOSAIC_TMUX_SOCKET" "$@"
@@ -210,90 +42,140 @@ _tmux() {
  fi
 }
 assert_owned_tmux_server() {
  local owner_file="$MOSAIC_HOME/fleet/run/holder-owner"
  [ -f "$owner_file" ] && [ ! -L "$owner_file" ] || fail "private tmux ownership identity is missing"
  local owner_mode
  owner_mode=$(stat -c '%a' -- "$owner_file") || fail "private tmux ownership identity is unreadable"
  (( (8#$owner_mode & 8#077) == 0 )) || fail "private tmux ownership identity has unsafe permissions"
  local owner
  owner=$(tr -d '\n' < "$owner_file")
  [[ "$owner" =~ ^[a-f0-9-]{36}$ ]] || fail "private tmux ownership identity is malformed"
  _tmux has-session -t '=_holder:0.0' 2>/dev/null || fail "owned tmux holder session is absent"
  local environment expected
  environment=$(_tmux show-environment -g 2>/dev/null) || fail "owned tmux global environment is unreadable"
  expected=$(printf '%s\n' \
    "HOME=$HOME" \
    'PATH=/usr/bin:/bin' \
    "PWD=$HOME" \
    "MOSAIC_FLEET_OWNER=$owner" \
    'MOSAIC_TMUX_HOLDER=_holder' \
    "MOSAIC_TMUX_SOCKET=$MOSAIC_TMUX_SOCKET" | sort)
  [ "$(printf '%s\n' "$environment" | sort)" = "$expected" ] || \
    fail "tmux server ownership or environment validation failed"
 }
 # Validate exact server ownership before querying, cleaning, or creating any
 # managed session. An unmanaged or contaminated named socket is never repaired.
 assert_owned_tmux_server
 if [ "$MODE" = interaction ]; then
  [ "$MOSAIC_AGENT_RUNTIME" = pi ] || fail "operator interaction service requires runtime pi"
  [ "$MOSAIC_AGENT_MODEL" = openai/gpt-5.6-sol ] || \
    fail "operator interaction service requires the pinned model"
  [ "$MOSAIC_AGENT_REASONING" = high ] || \
    fail "operator interaction service requires high reasoning"
  [ "$MOSAIC_AGENT_TOOL_POLICY" = operator-interaction ] || \
    fail "operator interaction service requires the operator-interaction tool policy"
 fi
 if [ "$MODE" = stop ]; then
  _tmux kill-session -t "=${AGENT_NAME}" >/dev/null 2>&1 || true
  exit 0
 fi
 if _tmux has-session -t "=${AGENT_NAME}:0.0" 2>/dev/null; then
  echo "Mosaic agent session already running: $AGENT_NAME on socket ${MOSAIC_TMUX_SOCKET:-(default)}"
  exit 0
 fi
-# Systemd passes HOME as %h, and the installed service fixes MOSAIC_HOME under
+if [ -z "$MOSAIC_AGENT_COMMAND" ]; then
-# that home. Derive the pane home from the canonical path when available so an
+  # Map the roster's per-agent model_hint to `--model` so workers launch on the
-# inherited pane/session HOME cannot become runtime authority.
+  # configured model (e.g. pi on openai-codex/gpt-5.5:high). Omitted when unset.
-PANE_HOME=$HOME
+  MOSAIC_AGENT_COMMAND="mosaic yolo $MOSAIC_AGENT_RUNTIME${MOSAIC_AGENT_MODEL:+ --model $MOSAIC_AGENT_MODEL}${MOSAIC_AGENT_REASONING:+ --thinking $MOSAIC_AGENT_REASONING}"
-case "$MOSAIC_HOME" in
+fi
  */.config/mosaic) PANE_HOME=${MOSAIC_HOME%/.config/mosaic} ;;
 esac
 # ── Derive a runtime-bin PATH prefix ─────────────────────────────────────────
 # Precedence:
 #   1. $MOSAIC_RUNTIME_BIN (explicit override)
 #   2. $(npm config get prefix)/bin  (if npm is on PATH)
 #   3. Fallbacks: $HOME/.npm-global/bin and $HOME/.local/bin
 #
 # Only directories that already exist are included.  The prefix is baked into
 # the pane command regardless of what the LAUNCHER process's $PATH contains,
 # because the tmux pane inherits the tmux SERVER environment (not this script's
 # environment).  A dir on the launcher's PATH may be absent from the server PATH,
 # so every existing candidate must always be included.  Dedup within the
 # constructed prefix avoids listing the same dir twice.
 _build_runtime_bin_prefix() {
  local candidates=()
-  if [ -n "$MOSAIC_RUNTIME_BIN" ]; then candidates+=("$MOSAIC_RUNTIME_BIN"); fi
+
  if [ -n "${MOSAIC_RUNTIME_BIN:-}" ]; then
    candidates+=("$MOSAIC_RUNTIME_BIN")
  fi
  if command -v npm >/dev/null 2>&1; then
    local npm_prefix
    npm_prefix=$(npm config get prefix 2>/dev/null) || true
-    if [ -n "$npm_prefix" ]; then candidates+=("${npm_prefix}/bin"); fi
+    if [ -n "$npm_prefix" ]; then
      candidates+=("${npm_prefix}/bin")
    fi
  fi
  candidates+=("$PANE_HOME/.npm-global/bin" "$PANE_HOME/.local/bin")
-  local prefix="" dir
+  candidates+=("$HOME/.npm-global/bin")
  candidates+=("$HOME/.local/bin")
  local prefix=""
  for dir in "${candidates[@]}"; do
    [ -d "$dir" ] || continue
-    case ":${prefix}:" in *":${dir}:"*) ;; *) prefix="${prefix:+$prefix:}$dir" ;; esac
+    if [ -z "$prefix" ]; then
      prefix="$dir"
    else
      case ":${prefix}:" in
        *":${dir}:"*) ;;  # already in our prefix — skip
        *) prefix="${prefix}:${dir}" ;;
      esac
    fi
  done
  printf '%s' "$prefix"
 }
 MOSAIC_RUNTIME_BIN_PREFIX=$(_build_runtime_bin_prefix)
 PANE_PATH=${MOSAIC_RUNTIME_BIN_PREFIX:+${MOSAIC_RUNTIME_BIN_PREFIX}:}/usr/local/bin:/usr/bin:/bin
 # ── Build the pane command ────────────────────────────────────────────────────
 # The pane command must:
 #   - Export the augmented PATH so the runtime binary is found.
 #   - exec the agent command so the runtime is the pane's foreground process
 #     (makes `fleet ps` pane_current_command check reliable; no DRIFT false-positive).
 #
 # Quoting strategy: single-quote the inner shell snippet so that variable
 # references in MOSAIC_AGENT_COMMAND are NOT expanded here — they expand inside
 # the pane shell.  However, MOSAIC_RUNTIME_BIN_PREFIX and PATH must be expanded
 # NOW (in this script) because the pane shell inherits the tmux server
 # environment, not this script's env.
 #
 # We build the snippet as a double-quoted here-string embedded in a printf call
 # to avoid nested quoting problems.
 #
 # MOSAIC_AGENT_NAME must also be exported INTO the pane: panes inherit the tmux
 # server environment (not this script's, and not the systemd unit's), so the
 # name would otherwise be empty in-pane and the runtime's native heartbeat
 # (which gates on MOSAIC_AGENT_NAME) would never fire. %q-quote it so it is a
 # safe single bash token regardless of the name's characters.
 AGENT_NAME_Q=$(printf '%q' "$AGENT_NAME")
 # MOSAIC_AGENT_CLASS must ALSO be exported INTO the pane, for the same reason as
 # MOSAIC_AGENT_NAME above: the pane inherits the tmux SERVER environment (not this
 # script's env, and not the systemd unit's EnvironmentFile), so the per-agent class
 # written to agents/<name>.env would otherwise be invisible in-pane. The launcher
 # composes the persona contract from process.env.MOSAIC_AGENT_CLASS at launch
 # (compose-contract -> readPersonaContractBlock); without this export it sees an
 # undefined class and silently injects NO persona contract. %q-quote it so it is a
 # safe single bash token; an empty/unset class %q-quotes to '' and is a harmless
 # no-op downstream (readPersonaContractBlock returns '' for an empty class).
 AGENT_CLASS_Q=$(printf '%q' "${MOSAIC_AGENT_CLASS:-}")
 AGENT_TOOL_POLICY_Q=$(printf '%q' "${MOSAIC_AGENT_TOOL_POLICY:-}")
 if [ -n "$MOSAIC_RUNTIME_BIN_PREFIX" ]; then
  PANE_SHELL_SNIPPET="export MOSAIC_AGENT_NAME=${AGENT_NAME_Q}; export MOSAIC_AGENT_CLASS=${AGENT_CLASS_Q}; export MOSAIC_AGENT_TOOL_POLICY=${AGENT_TOOL_POLICY_Q}; export PATH=\"${MOSAIC_RUNTIME_BIN_PREFIX}:\${PATH}\"; exec ${MOSAIC_AGENT_COMMAND}"
 else
  PANE_SHELL_SNIPPET="export MOSAIC_AGENT_NAME=${AGENT_NAME_Q}; export MOSAIC_AGENT_CLASS=${AGENT_CLASS_Q}; export MOSAIC_AGENT_TOOL_POLICY=${AGENT_TOOL_POLICY_Q}; exec ${MOSAIC_AGENT_COMMAND}"
 fi
 mkdir -p "$MOSAIC_AGENT_WORKDIR"
 # ── Pre-trust the workdir for the Claude runtime ─────────────────────────────
 # Claude Code shows a one-time "Is this a project you trust?" folder-trust gate
 # the first time it opens a directory. A fleet-launched agent has no human to
 # answer it, so the pane stalls forever at the prompt while its heartbeat keeps
 # reporting "healthy" (the pane process IS alive — it's just blocked).
 #
 # IMPORTANT: --dangerously-skip-permissions does NOT bypass this gate, and
 # neither does `trustedProjectDirectories` in settings.json (verified empirically
 # 2026-06-24). The ONLY thing the gate honors is the per-project record in
 # ~/.claude.json: projects["<dir>"].hasTrustDialogAccepted == true (exactly what
 # answering the prompt writes). So we pre-seed that record here.
 #
 # Idempotent, atomic, best-effort: any failure is non-fatal (the agent still
 # launches — worst case it stalls on the gate, i.e. the pre-fix status quo).
 # Only the claude runtime needs this; codex/pi have no such gate.
 _ensure_claude_workdir_trusted() {
  local workdir="$1"
-  local resolved
+  # The path claude keys on is the resolved cwd it is launched in.
-  resolved=$(cd "$workdir" 2>/dev/null && pwd -P) || resolved="$workdir"
+  local rp
  rp=$(cd "$workdir" 2>/dev/null && pwd -P) || rp="$workdir"
  # ~/.claude.json lives next to the claude config dir; honor CLAUDE_CONFIG_DIR.
  local claude_json="${MOSAIC_CLAUDE_JSON:-${CLAUDE_CONFIG_DIR:+$CLAUDE_CONFIG_DIR/.claude.json}}"
  claude_json="${claude_json:-$HOME/.claude.json}"
-  command -v python3 >/dev/null 2>&1 || return 1
+
-  MOSAIC_CJ="$claude_json" MOSAIC_TRUST_DIR="$resolved" python3 - <<'PY'
+  if ! command -v python3 >/dev/null 2>&1; then
    echo "WARNING: python3 not found; cannot pre-trust '$rp' for claude (agent may stall on the folder-trust gate)" >&2
    return 1
  fi
  # Serialize concurrent agent launches that share ~/.claude.json (flock if available).
  local lock="${claude_json}.mosaic-lock"
  _seed() {
    MOSAIC_CJ="$claude_json" MOSAIC_TRUST_DIR="$rp" python3 - <<'PY'
 import json, os, sys, tempfile
 cj = os.environ["MOSAIC_CJ"]
 d = os.environ["MOSAIC_TRUST_DIR"]
@@ -302,19 +184,22 @@ try:
    if not isinstance(data, dict):
        data = {}
 except Exception:
    # Never corrupt an unreadable/partial file — bail without writing.
    sys.exit(2)
 projects = data.setdefault("projects", {})
 entry = projects.get(d)
 if not isinstance(entry, dict):
    entry = {}
    projects[d] = entry
 if entry.get("hasTrustDialogAccepted") is True:
    sys.exit(0)  # already trusted — nothing to do
 entry["hasTrustDialogAccepted"] = True
 tmp_dir = os.path.dirname(cj) or "."
 fd, tmp = tempfile.mkstemp(dir=tmp_dir, prefix=".claude.json.mosaic.")
 try:
    with os.fdopen(fd, "w") as f:
        json.dump(data, f, indent=2)
-    os.replace(tmp, cj)
+    os.replace(tmp, cj)  # atomic
 except Exception:
    try:
        os.unlink(tmp)
@@ -323,55 +208,55 @@ except Exception:
    sys.exit(3)
 PY
  }
-
+  if command -v flock >/dev/null 2>&1; then
-if [ "$MOSAIC_AGENT_RUNTIME" = claude ]; then
+    ( flock 9; _seed ) 9>"$lock" 2>/dev/null || _seed
-  _ensure_claude_workdir_trusted "$MOSAIC_AGENT_WORKDIR" || \
+  else
-    echo "WARNING: could not pre-trust workdir for claude agent $AGENT_NAME" >&2
+    _seed
  fi
 }
-LAUNCH_COMMAND=(mosaic yolo "$MOSAIC_AGENT_RUNTIME")
+case "$MOSAIC_AGENT_RUNTIME" in
-if [ -n "$MOSAIC_AGENT_MODEL" ]; then LAUNCH_COMMAND+=(--model "$MOSAIC_AGENT_MODEL"); fi
+  claude)
-if [ -n "$MOSAIC_AGENT_REASONING" ]; then LAUNCH_COMMAND+=(--thinking "$MOSAIC_AGENT_REASONING"); fi
+    _ensure_claude_workdir_trusted "$MOSAIC_AGENT_WORKDIR" \
      || echo "WARNING: could not pre-trust workdir for claude agent $AGENT_NAME" >&2
    ;;
 esac
-# The tmux holder owns a named server. Explicitly clear the pane environment
+# ── Launch the tmux session (no exec — we continue to wire the heartbeat) ────
 # so server/session variables cannot cross the launch boundary; retain only
 # trusted bootstrap, generated, and approved local data as argv assignments.
 LAUNCH_ENV=(
  /usr/bin/env
  -i
  "HOME=$PANE_HOME"
  "PATH=$PANE_PATH"
  "MOSAIC_HOME=$MOSAIC_HOME"
  "MOSAIC_AGENT_NAME=$AGENT_NAME"
  "MOSAIC_AGENT_CLASS=$MOSAIC_AGENT_CLASS"
  "MOSAIC_AGENT_RUNTIME=$MOSAIC_AGENT_RUNTIME"
  "MOSAIC_AGENT_MODEL=$MOSAIC_AGENT_MODEL"
  "MOSAIC_AGENT_REASONING=$MOSAIC_AGENT_REASONING"
  "MOSAIC_AGENT_TOOL_POLICY=$MOSAIC_AGENT_TOOL_POLICY"
  "MOSAIC_AGENT_WORKDIR=$MOSAIC_AGENT_WORKDIR"
  "MOSAIC_TMUX_SOCKET=$MOSAIC_TMUX_SOCKET"
  "MOSAIC_HEARTBEAT_RUN_DIR=$MOSAIC_HEARTBEAT_RUN_DIR"
 )
 mkdir -p "$MOSAIC_AGENT_WORKDIR"
 _tmux new-session -d -s "$AGENT_NAME" -c "$MOSAIC_AGENT_WORKDIR" \
-  "${LAUNCH_ENV[@]}" "${LAUNCH_COMMAND[@]}"
+  bash -c "$PANE_SHELL_SNIPPET"
 # ── Resolve the pane PID (retry briefly to let the session initialise) ────────
 PANE_PID=""
 for _retry in 1 2 3 4 5; do
-  PANE_PID=$(_tmux list-panes -t "=${AGENT_NAME}:0.0" -F '#{pane_pid}' 2>/dev/null || true)
+  PANE_PID=$(_tmux list-panes \
    -t "=${AGENT_NAME}:0.0" -F '#{pane_pid}' 2>/dev/null || true)
  [ -n "$PANE_PID" ] && break
  sleep 0.2
 done
 # ── Spawn the heartbeat sidecar (detached, best-effort) ──────────────────────
 # The sidecar writes ~/.config/mosaic/fleet/run/<AGENT>.hb atomically while the
 # pane process is alive, then exits so the file goes stale (fleet ps shows stale
 # then PANE=dead).  It is runtime-agnostic: it only cares about the pane PID.
 _start_heartbeat_sidecar() {
-  local agent="$1" pane_pid="$2" run_dir="$3" interval="$4"
+  local agent="$1"
  local pane_pid="$2"
  local run_dir="$3"
  local interval="$4"
  local hb_file="${run_dir}/${agent}.hb"
  mkdir -p "$run_dir"
  # Write the sidecar as a self-contained bash one-liner so it carries no
  # references to any variables from this script's environment.
  local sidecar_script
  sidecar_script=$(printf \
-    'hb=%q; pid=%q; iv=%q; native="$hb.native"; mkdir -p "$(dirname "$hb")"; while kill -0 "$pid" 2>/dev/null; do now=$(date +%%s); marker=$(stat -c %%Y -- "$native" 2>/dev/null || true); if [ -z "$marker" ] || [ -L "$native" ] || (( now - marker > iv * 2 + 1 )); then tmp="$hb.tmp.$$"; printf "ts=%%s\npid=%%s\nstatus=ok\n" "$(date +%%Y-%%m-%%dT%%H:%%M:%%S%%z)" "$pid" > "$tmp" && mv "$tmp" "$hb"; fi; sleep "$iv"; done' \
+    'hb=%q; pid=%q; iv=%q; mkdir -p "$(dirname "$hb")"; while kill -0 "$pid" 2>/dev/null; do nat="$hb.native"; if [ -f "$nat" ] && [ "$(( $(date +%%s) - $(stat -c %%Y "$nat" 2>/dev/null || echo 0) ))" -lt "$(( iv * 2 ))" ]; then sleep "$iv"; continue; fi; tmp="$hb.tmp.$$"; printf "ts=%%s\npid=%%s\nstatus=ok\n" "$(date +%%Y-%%m-%%dT%%H:%%M:%%S%%z)" "$pid" > "$tmp" && mv "$tmp" "$hb"; sleep "$iv"; done' \
    "$hb_file" "$pane_pid" "$interval")
  # setsid + disown ensures the sidecar survives this script exiting.
  # stderr/stdout go to /dev/null; failures are non-fatal.
  if command -v setsid >/dev/null 2>&1; then
    setsid bash -c "$sidecar_script" </dev/null >/dev/null 2>&1 &
  else
@@ -381,6 +266,7 @@ _start_heartbeat_sidecar() {
 }
 if [ -n "$PANE_PID" ]; then
  # Guard: do not let sidecar startup failures abort the launcher (set -e).
  _start_heartbeat_sidecar "$AGENT_NAME" "$PANE_PID" \
    "$MOSAIC_HEARTBEAT_RUN_DIR" "$MOSAIC_HEARTBEAT_INTERVAL" || \
    echo "WARNING: heartbeat sidecar could not be started for $AGENT_NAME" >&2
--- a/packages/mosaic/framework/tools/fleet/start-interaction-service.sh
+++ b/packages/mosaic/framework/tools/fleet/start-interaction-service.sh
@@ -9,7 +9,11 @@ fail() {
 }
 [ -n "$AGENT_NAME" ] || fail "agent name argument is required"
 [[ "$AGENT_NAME" =~ ^[A-Za-z0-9_.-]+$ ]] || fail "agent name contains unsupported characters"
 [ "${MOSAIC_AGENT_NAME:-}" = "$AGENT_NAME" ] || fail "configured agent name must exactly match the service instance"
 [ "${MOSAIC_AGENT_RUNTIME:-}" = "pi" ] || fail "operator interaction service requires runtime pi"
 [ "${MOSAIC_AGENT_MODEL:-}" = "openai/gpt-5.6-sol" ] || fail "operator interaction service requires the pinned model"
 [ "${MOSAIC_AGENT_REASONING:-}" = "high" ] || fail "operator interaction service requires high reasoning"
 [ "${MOSAIC_AGENT_TOOL_POLICY:-}" = "operator-interaction" ] || fail "operator interaction service requires the operator-interaction tool policy"
-# The shared launcher strictly validates the generated/local data boundary
+exec "$(cd -- "$(dirname -- "$0")" && pwd)/start-agent-session.sh" "$AGENT_NAME"
 # before it applies this interaction service's pinned profile checks.
 exec "$(cd -- "$(dirname -- "$0")" && pwd)/start-agent-session.sh" --interaction "$AGENT_NAME"
--- a/packages/mosaic/framework/tools/fleet/start-tmux-holder.sh
+++ b/packages/mosaic/framework/tools/fleet/start-tmux-holder.sh
@@ -1,64 +0,0 @@
 #!/usr/bin/env bash
 set -euo pipefail
 # A holder may create only the configured named socket. Existing servers are
 # accepted only when their private install-derived ownership identity, exact
 # holder session, and complete approved global environment all match.
 MOSAIC_HOME=${MOSAIC_HOME:-$HOME/.config/mosaic}
 MOSAIC_TMUX_SOCKET=${MOSAIC_TMUX_SOCKET:-mosaic-fleet}
 MOSAIC_TMUX_HOLDER=${MOSAIC_TMUX_HOLDER:-_holder}
 OWNER_FILE="$MOSAIC_HOME/fleet/run/holder-owner"
 TMUX_BIN=/usr/bin/tmux
 fail() {
  echo "ERROR: refusing unmanaged Mosaic tmux server on socket ${MOSAIC_TMUX_SOCKET}: $1" >&2
  exit 64
 }
 [ -x "$TMUX_BIN" ] || fail "tmux binary is unavailable"
 [ -f "$OWNER_FILE" ] && [ ! -L "$OWNER_FILE" ] || fail "private ownership identity is missing"
 owner_mode=$(stat -c '%a' -- "$OWNER_FILE") || fail "private ownership identity is unreadable"
 (( (8#$owner_mode & 8#077) == 0 )) || fail "private ownership identity has unsafe permissions"
 MOSAIC_FLEET_OWNER=$(tr -d '\n' < "$OWNER_FILE")
 [[ "$MOSAIC_FLEET_OWNER" =~ ^[a-f0-9-]{36}$ ]] || fail "private ownership identity is malformed"
 _tmux() {
  "$TMUX_BIN" -L "$MOSAIC_TMUX_SOCKET" "$@"
 }
 server_running() {
  _tmux list-sessions >/dev/null 2>&1
 }
 assert_owned_server() {
  _tmux has-session -t "=${MOSAIC_TMUX_HOLDER}:0.0" 2>/dev/null || fail "exact holder session is absent"
  local environment
  environment=$(_tmux show-environment -g 2>/dev/null) || fail "global environment is unreadable"
  local expected
  expected=$(printf '%s\n' \
    "HOME=$HOME" \
    'PATH=/usr/bin:/bin' \
    "PWD=$HOME" \
    "MOSAIC_FLEET_OWNER=$MOSAIC_FLEET_OWNER" \
    "MOSAIC_TMUX_HOLDER=$MOSAIC_TMUX_HOLDER" \
    "MOSAIC_TMUX_SOCKET=$MOSAIC_TMUX_SOCKET" | sort)
  [ "$(printf '%s\n' "$environment" | sort)" = "$expected" ] || \
    fail "global environment does not match the owned-server contract"
 }
 if server_running; then
  assert_owned_server
 else
  cd "$HOME" || fail "trusted home is unavailable"
  # Start the tmux server itself under the approved environment. The holder pane
  # receives the same closed environment rather than arbitrary server globals.
  /usr/bin/env -i \
    "HOME=$HOME" \
    PATH=/usr/bin:/bin \
    "MOSAIC_FLEET_OWNER=$MOSAIC_FLEET_OWNER" \
    "MOSAIC_TMUX_HOLDER=$MOSAIC_TMUX_HOLDER" \
    "MOSAIC_TMUX_SOCKET=$MOSAIC_TMUX_SOCKET" \
    "$TMUX_BIN" -L "$MOSAIC_TMUX_SOCKET" new-session -d -s "$MOSAIC_TMUX_HOLDER" \
    /usr/bin/env -i "HOME=$HOME" PATH=/usr/bin:/bin /bin/sh -c 'while true; do sleep 3600; done'
 fi
--- a/packages/mosaic/framework/tools/fleet/test-start-agent-session.sh
+++ b/packages/mosaic/framework/tools/fleet/test-start-agent-session.sh
@@ -3,410 +3,373 @@ set -euo pipefail
 SCRIPT_DIR=$(cd -- "$(dirname -- "$0")" && pwd)
 START="$SCRIPT_DIR/start-agent-session.sh"
-INTERACTION_START="$SCRIPT_DIR/start-interaction-service.sh"
+SOCKET="mosaic-agent-test-$RANDOM-$$"
-ROOT=$(mktemp -d)
+AGENT="agent-$RANDOM"
-FAKE_BIN=$(mktemp -d)
+WORKDIR=$(mktemp -d)
-TMUX_CALLS=$(mktemp)
+
-trap 'rm -rf "$ROOT" "$FAKE_BIN" "$TMUX_CALLS"' EXIT
+# Keep a single cleanup trap that accumulates resources.
 CLEANUP_DIRS=("$WORKDIR")
 CLEANUP_SOCKETS=("$SOCKET")
 trap '_cleanup' EXIT
 _cleanup() {
  for s in "${CLEANUP_SOCKETS[@]:-}"; do
    tmux -L "$s" kill-server >/dev/null 2>&1 || true
  done
  for d in "${CLEANUP_DIRS[@]:-}"; do
    rm -rf "$d"
  done
 }
 fail() {
  echo "FAIL: $*" >&2
  exit 1
 }
-cat > "$FAKE_BIN/tmux" <<'SHIM'
+# ── Test 1: basic session creation with workdir check ─────────────────────────
 MOSAIC_TMUX_SOCKET="$SOCKET" \
 MOSAIC_AGENT_WORKDIR="$WORKDIR" \
 MOSAIC_AGENT_COMMAND='bash --noprofile --norc -i' \
  "$START" "$AGENT"
 tmux -L "$SOCKET" has-session -t "=$AGENT:0.0" || fail "agent session was not created"
 # Retry: pane_current_path briefly reflects the tmux server's cwd until the pane
 # process establishes its own cwd (the -c start dir). Poll until it settles.
 actual_dir=""
 for _ in $(seq 1 30); do
  actual_dir=$(tmux -L "$SOCKET" display-message -p -t "=$AGENT:0.0" '#{pane_current_path}')
  [ "$actual_dir" = "$WORKDIR" ] && break
  sleep 0.1
 done
 [ "$actual_dir" = "$WORKDIR" ] || fail "agent workdir mismatch: $actual_dir (expected $WORKDIR)"
 # ── Test 2: idempotency (duplicate start prints 'already running') ─────────────
 MOSAIC_TMUX_SOCKET="$SOCKET" \
 MOSAIC_AGENT_WORKDIR="$WORKDIR" \
 MOSAIC_AGENT_COMMAND='bash --noprofile --norc -i' \
  "$START" "$AGENT" >/tmp/mosaic-start-agent-idempotent.out
 grep -qF 'already running' /tmp/mosaic-start-agent-idempotent.out || fail "duplicate start was not idempotent"
 # ── Test 3: runtime-bin PATH prefix is baked into the pane command ────────────
 #
 # We capture the command the script would hand to tmux by injecting a fake
 # 'tmux' shim into PATH.  The shim:
 #   - Intercepts 'new-session' calls and records its arguments to a file.
 #   - For 'has-session' calls, exits 1 (session does not exist) so the script
 #     proceeds to launch instead of printing "already running".
 #   - For 'list-panes' calls, returns empty so PANE_PID stays unset and the
 #     heartbeat sidecar is NOT spawned (heartbeat is not the focus of this test;
 #     test 6 and 7 cover that path).  This prevents any real-filesystem side
 #     effects or leaked background processes.
 #   - For all other subcommands, exits 0.
 #
 # Assertions:
 #   a) 'export PATH=' with the synthetic MOSAIC_RUNTIME_BIN prefix appears.
 #   b) 'exec' appears so the runtime replaces the wrapper shell.
 #   c) MOSAIC_AGENT_COMMAND with flags is forwarded intact.
 FAKE_BIN=$(mktemp -d)
 FAKE_RUNTIME_BIN=$(mktemp -d)
 TMUX_ARGS_FILE=$(mktemp)
 HB_RUN_DIR3=$(mktemp -d)
 CLEANUP_DIRS+=("$FAKE_BIN" "$FAKE_RUNTIME_BIN" "$HB_RUN_DIR3")
 # Write the fake tmux shim (uses only positional args, no sourced vars).
 cat > "$FAKE_BIN/tmux" <<SHIM
 #!/usr/bin/env bash
-set -euo pipefail
+# Fake tmux: record new-session args; report has-session as missing.
-printf '%s\0' "$@" >> "${MOSAIC_TEST_TMUX_CALLS:?}"
+subcmd="\$3"  # argv: tmux -L <socket> <subcmd> ...
-args=("$@")
+if [ "\$subcmd" = "has-session" ]; then
-index=0
+  exit 1   # session not found → script will attempt new-session
 if [ "${args[0]:-}" = -L ]; then index=2; fi
 case "${args[$index]:-}" in
  has-session)
    for argument in "${args[@]}"; do
      [ "$argument" = '=_holder:0.0' ] && exit 0
    done
    exit 1
    ;;
  show-environment)
    printf '%s\n' \
      "HOME=${MOSAIC_TEST_HOME:?}" \
      'PATH=/usr/bin:/bin' \
      "PWD=${MOSAIC_TEST_HOME:?}" \
      "MOSAIC_FLEET_OWNER=${MOSAIC_TEST_FLEET_OWNER:?}" \
      'MOSAIC_TMUX_HOLDER=_holder' \
      'MOSAIC_TMUX_SOCKET=mosaic-test'
    exit 0
    ;;
  list-panes) printf '%s\n' "${MOSAIC_TEST_PANE_PID:-}"; exit 0 ;;
  new-session)
    if [ "${MOSAIC_TEST_EXECUTE_PANE:-}" = 1 ]; then
      for ((index = 0; index < ${#args[@]}; index++)); do
        if [ "${args[$index]}" = /usr/bin/env ]; then
          "${args[@]:$index}"
          break
 fi
-      done
+if [ "\$subcmd" = "new-session" ]; then
  printf '%s\n' "\$@" > "$TMUX_ARGS_FILE"
  exit 0
 fi
 if [ "\$subcmd" = "list-panes" ]; then
  # Return empty: no sidecar spawned (heartbeat is not the focus of this test).
  echo ""
  exit 0
 fi
 exit 0
    ;;
  *) exit 0 ;;
 esac
 SHIM
 chmod +x "$FAKE_BIN/tmux"
-cat > "$FAKE_BIN/mosaic" <<'SHIM'
+SOCKET3="mosaic-agent-test3-$RANDOM-$$"
 AGENT3="agent3-$RANDOM"
 WORKDIR3=$(mktemp -d)
 CLEANUP_DIRS+=("$WORKDIR3")
 PATH="$FAKE_BIN:$PATH" \
 MOSAIC_TMUX_SOCKET="$SOCKET3" \
 MOSAIC_AGENT_WORKDIR="$WORKDIR3" \
 MOSAIC_AGENT_RUNTIME="pi" \
 MOSAIC_AGENT_CLASS="code" \
 MOSAIC_AGENT_TOOL_POLICY="operator-interaction" \
 MOSAIC_RUNTIME_BIN="$FAKE_RUNTIME_BIN" \
 MOSAIC_AGENT_COMMAND="mosaic yolo pi --model openai-codex/gpt-5.5:high" \
 MOSAIC_HEARTBEAT_RUN_DIR="$HB_RUN_DIR3" \
  "$START" "$AGENT3"
 all_args=$(cat "$TMUX_ARGS_FILE" 2>/dev/null || true)
 rm -f "$TMUX_ARGS_FILE"
 echo "--- captured tmux new-session args ---"
 echo "$all_args"
 echo "--- end args ---"
 # a) PATH prefix containing FAKE_RUNTIME_BIN must appear.
 echo "$all_args" | grep -qF "export PATH=" || fail "pane command does not export PATH"
 echo "$all_args" | grep -qF "$FAKE_RUNTIME_BIN" || fail "pane command does not include MOSAIC_RUNTIME_BIN in PATH prefix"
 # b) exec must appear so the runtime replaces the wrapper shell.
 echo "$all_args" | grep -qF "exec " || fail "pane command does not use exec"
 # c) Full MOSAIC_AGENT_COMMAND (with flags) must be forwarded.
 echo "$all_args" | grep -qF "mosaic yolo pi --model openai-codex/gpt-5.5:high" || \
  fail "pane command does not forward MOSAIC_AGENT_COMMAND with flags intact"
 # d) MOSAIC_AGENT_NAME and the per-agent MOSAIC_AGENT_CLASS must BOTH be exported
 #    INTO the pane. The pane inherits the tmux SERVER environment (not this
 #    script's env, nor the systemd unit's EnvironmentFile), so any per-agent var
 #    the launcher needs in-pane must be re-exported in the snippet. CLASS is
 #    load-bearing: the launcher composes the persona contract from
 #    process.env.MOSAIC_AGENT_CLASS, so a missing export silently drops the
 #    persona (regression guard for the A3a pane-propagation gap).
 echo "$all_args" | grep -qF "export MOSAIC_AGENT_NAME=" || \
  fail "pane command does not export MOSAIC_AGENT_NAME into the pane"
 echo "$all_args" | grep -qF "export MOSAIC_AGENT_CLASS=code" || \
  fail "pane command does not export MOSAIC_AGENT_CLASS into the pane (persona would silently drop)"
 echo "$all_args" | grep -qF "export MOSAIC_AGENT_TOOL_POLICY=operator-interaction" || \
  fail "pane command does not export MOSAIC_AGENT_TOOL_POLICY into the pane"
 # ── Test 4: when no extra runtime-bin dirs exist, exec still appears ───────────
 TMUX_ARGS_FILE2=$(mktemp)
 FAKE_BIN2=$(mktemp -d)
 HB_RUN_DIR4=$(mktemp -d)
 CLEANUP_DIRS+=("$FAKE_BIN2" "$HB_RUN_DIR4")
 cat > "$FAKE_BIN2/tmux" <<SHIM2
 #!/usr/bin/env bash
-set -euo pipefail
+subcmd="\$3"
-env -0 > "${MOSAIC_HOME:?}/fleet/pane-environment"
+if [ "\$subcmd" = "has-session" ]; then exit 1; fi
-SHIM
+if [ "\$subcmd" = "new-session" ]; then
-chmod +x "$FAKE_BIN/mosaic"
+  printf '%s\n' "\$@" > "$TMUX_ARGS_FILE2"
-
+  exit 0
 write_generated() {
  local home="$1"
  local agent="$2"
  mkdir -p "$home/fleet/agents" "$home/fleet/run"
  chmod 700 "$home" "$home/fleet" "$home/fleet/agents" "$home/fleet/run"
  printf '123e4567-e89b-12d3-a456-426614174000\n' > "$home/fleet/run/holder-owner"
  chmod 600 "$home/fleet/run/holder-owner"
  cat > "$home/fleet/agents/$agent.env.generated" <<EOF
 MOSAIC_AGENT_NAME=$agent
 MOSAIC_AGENT_CLASS=code
 MOSAIC_AGENT_RUNTIME=pi
 MOSAIC_AGENT_MODEL=openai-codex/gpt-5.6-sol
 MOSAIC_AGENT_REASONING=high
 MOSAIC_AGENT_TOOL_POLICY=code
 MOSAIC_AGENT_WORKDIR=$home/work
 MOSAIC_TMUX_SOCKET=mosaic-test
 EOF
  chmod 600 "$home/fleet/agents/$agent.env.generated"
  mkdir -p "$home/work"
 }
 run_start() {
  local home="$1"
  local agent="$2"
  HOME="$home" PATH="$FAKE_BIN:$PATH" MOSAIC_TEST_TMUX_CALLS="$TMUX_CALLS" \
    MOSAIC_TEST_PANE_PID="${MOSAIC_TEST_PANE_PID:-}" \
    MOSAIC_TEST_HOME="$home" \
    MOSAIC_TEST_FLEET_OWNER=123e4567-e89b-12d3-a456-426614174000 \
    MOSAIC_HOME="$home" "$START" "$agent"
 }
 # Valid generated data launches only the fixed runtime argument array. It never
 # reads an agent-command string or constructs a bash -c pane payload.
 HOME_VALID="$ROOT/valid"
 AGENT_VALID="coder0"
 write_generated "$HOME_VALID" "$AGENT_VALID"
 run_start "$HOME_VALID" "$AGENT_VALID"
 valid_args=$(tr '\0' '\n' < "$TMUX_CALLS")
 echo "$valid_args" | grep -qF new-session || fail "valid generated projection did not reach tmux"
 echo "$valid_args" | grep -qF 'mosaic' || fail "fixed mosaic launcher command missing"
 echo "$valid_args" | grep -qF 'yolo' || fail "fixed yolo launcher command missing"
 echo "$valid_args" | grep -qF 'pi' || fail "roster runtime missing"
 if echo "$valid_args" | grep -qF 'bash -c'; then
  fail "launcher constructed a shell command payload"
 fi
-
+if [ "\$subcmd" = "list-panes" ]; then
-# The pane must start through an absolute clean-environment boundary. Its
+  # Return empty: no sidecar spawned (heartbeat is not the focus of this test).
-# runtime command remains an argv vector, but no holder/session environment
+  echo ""
-# control variable can pass through the pane command.
+  exit 0
 echo "$valid_args" | grep -qxF '/usr/bin/env' || fail "pane does not use absolute env"
 echo "$valid_args" | grep -qxF -- '-i' || fail "pane environment is not cleared"
 # The generated-file parent is a security boundary too: even a private regular
 # file is untrusted if its parent can be replaced or written by another user.
 # Validation must happen before fake tmux receives even a has-session call.
 : > "$TMUX_CALLS"
 HOME_UNSAFE_PARENT="$ROOT/unsafe-parent"
 write_generated "$HOME_UNSAFE_PARENT" "coder-parent"
 chmod 777 "$HOME_UNSAFE_PARENT/fleet/agents"
 if output=$(run_start "$HOME_UNSAFE_PARENT" coder-parent 2>&1); then
  fail "generated file under a world-writable parent was accepted"
 fi
-[ ! -s "$TMUX_CALLS" ] || fail "tmux ran before unsafe parent rejection"
+exit 0
-echo "$output" | grep -qF 'code=unsafe-permissions' || fail "unsafe parent diagnostic missing"
+SHIM2
 chmod +x "$FAKE_BIN2/tmux"
-: > "$TMUX_CALLS"
+SOCKET4="mosaic-agent-test4-$RANDOM-$$"
-HOME_SYMLINK_PARENT="$ROOT/symlink-parent"
+AGENT4="agent4-$RANDOM"
-write_generated "$HOME_SYMLINK_PARENT" "coder-symlink-parent"
+WORKDIR4=$(mktemp -d)
-mv "$HOME_SYMLINK_PARENT/fleet/agents" "$HOME_SYMLINK_PARENT/private-agents"
+CLEANUP_DIRS+=("$WORKDIR4")
-ln -s "$HOME_SYMLINK_PARENT/private-agents" "$HOME_SYMLINK_PARENT/fleet/agents"
+
-if output=$(run_start "$HOME_SYMLINK_PARENT" coder-symlink-parent 2>&1); then
+# MOSAIC_RUNTIME_BIN points to a non-existent dir so prefix will be empty;
-  fail "generated file under a symlinked parent was accepted"
+# .npm-global/bin and .local/bin may or may not exist but we just want exec.
 PATH="$FAKE_BIN2:$PATH" \
 MOSAIC_TMUX_SOCKET="$SOCKET4" \
 MOSAIC_AGENT_WORKDIR="$WORKDIR4" \
 MOSAIC_AGENT_RUNTIME="pi" \
 MOSAIC_RUNTIME_BIN="/nonexistent-dir-$$" \
 MOSAIC_AGENT_COMMAND="mosaic yolo pi" \
 MOSAIC_HEARTBEAT_RUN_DIR="$HB_RUN_DIR4" \
  "$START" "$AGENT4"
 all_args4=$(cat "$TMUX_ARGS_FILE2" 2>/dev/null || true)
 rm -f "$TMUX_ARGS_FILE2"
 rm -rf "$WORKDIR4"
 echo "$all_args4" | grep -qF "exec " || fail "pane command (no prefix dirs) does not use exec"
 echo "$all_args4" | grep -qF "mosaic yolo pi" || fail "pane command does not include agent command when no prefix"
 # ── Test 5: candidate dir already in LAUNCHER $PATH is still baked into pane ──
 #
 # Regression guard for the bug where _build_runtime_bin_prefix() used to skip
 # a candidate because it was already present in the launcher process's $PATH.
 # That check was wrong: the pane inherits the tmux SERVER environment, not the
 # launcher's env.  Even if a dir is on the launcher's PATH it must always be
 # baked into the pane's PATH export.
 #
 # We prove this by setting PATH to include FAKE_RUNTIME_BIN5 (the candidate),
 # then asserting the generated new-session command still exports it.
 TMUX_ARGS_FILE5=$(mktemp)
 FAKE_BIN5=$(mktemp -d)
 FAKE_RUNTIME_BIN5=$(mktemp -d)  # this dir IS on the launcher's PATH below
 HB_RUN_DIR5=$(mktemp -d)
 CLEANUP_DIRS+=("$FAKE_BIN5" "$FAKE_RUNTIME_BIN5" "$HB_RUN_DIR5")
 cat > "$FAKE_BIN5/tmux" <<SHIM5
 #!/usr/bin/env bash
 subcmd="\$3"
 if [ "\$subcmd" = "has-session" ]; then exit 1; fi
 if [ "\$subcmd" = "new-session" ]; then
  printf '%s\n' "\$@" > "$TMUX_ARGS_FILE5"
  exit 0
 fi
-[ ! -s "$TMUX_CALLS" ] || fail "tmux ran before symlinked parent rejection"
+if [ "\$subcmd" = "list-panes" ]; then
-echo "$output" | grep -qF 'code=unsafe-directory' || fail "symlinked parent diagnostic missing"
+  # Return empty: no sidecar spawned (heartbeat is not the focus of this test).
-
+  echo ""
-# Every managed ancestor is a boundary: MOSAIC_HOME, fleet, and agents. A
+  exit 0
 # symlink or group/world-writable ancestor must fail before environment parsing,
 # workdir creation, or tmux effects. The malformed local input proves parsing
 # was not reached when the ancestor rejection is reported.
 assert_managed_ancestor_rejected() {
  local ancestor="$1"
  local hazard="$2"
  local home="$ROOT/managed-${ancestor//\//-}-${hazard}"
  local agent="coder-managed-${ancestor//\//-}-${hazard}"
  local node
  write_generated "$home" "$agent"
  printf 'MOSAIC_AGENT_COMMAND=must-not-be-parsed\n' > "$home/fleet/agents/$agent.env.local"
  chmod 600 "$home/fleet/agents/$agent.env.local"
  rm -rf "$home/work"
  case "$ancestor" in
    MOSAIC_HOME) node="$home" ;;
    MOSAIC_HOME/fleet) node="$home/fleet" ;;
    MOSAIC_HOME/fleet/agents) node="$home/fleet/agents" ;;
    *) fail "unknown managed ancestor: $ancestor" ;;
  esac
  if [ "$hazard" = symlink ]; then
    local target="${node}-target"
    mv "$node" "$target"
    ln -s "$target" "$node"
  else
    chmod 777 "$node"
 fi
 exit 0
 SHIM5
 chmod +x "$FAKE_BIN5/tmux"
-  : > "$TMUX_CALLS"
+SOCKET5="mosaic-agent-test5-$RANDOM-$$"
-  if output=$(run_start "$home" "$agent" 2>&1); then
+AGENT5="agent5-$RANDOM"
-    fail "${hazard} $ancestor was accepted"
+WORKDIR5=$(mktemp -d)
-  fi
+CLEANUP_DIRS+=("$WORKDIR5")
-  [ ! -s "$TMUX_CALLS" ] || fail "tmux ran before $hazard $ancestor rejection"
+CLEANUP_SOCKETS+=("$SOCKET5")
  [ ! -e "$home/work" ] || fail "workdir was created before $hazard $ancestor rejection"
  echo "$output" | grep -qF "code=unsafe-" || fail "managed ancestor diagnostic missing"
  if echo "$output" | grep -qF 'key=MOSAIC_AGENT_COMMAND'; then
    fail "environment parsing ran before $hazard $ancestor rejection"
  fi
 }
-for managed_ancestor in MOSAIC_HOME MOSAIC_HOME/fleet MOSAIC_HOME/fleet/agents; do
+# FAKE_RUNTIME_BIN5 is deliberately placed on the LAUNCHER PATH so that the
-  assert_managed_ancestor_rejected "$managed_ancestor" symlink
+# old (buggy) code would have skipped it.  The correct code must still include
-  assert_managed_ancestor_rejected "$managed_ancestor" group-world-writable
+# it in the pane PATH export.
 PATH="$FAKE_BIN5:$FAKE_RUNTIME_BIN5:$PATH" \
 MOSAIC_TMUX_SOCKET="$SOCKET5" \
 MOSAIC_AGENT_WORKDIR="$WORKDIR5" \
 MOSAIC_AGENT_RUNTIME="pi" \
 MOSAIC_RUNTIME_BIN="$FAKE_RUNTIME_BIN5" \
 MOSAIC_AGENT_COMMAND="mosaic yolo pi" \
 MOSAIC_HEARTBEAT_RUN_DIR="$HB_RUN_DIR5" \
  "$START" "$AGENT5"
 all_args5=$(cat "$TMUX_ARGS_FILE5" 2>/dev/null || true)
 rm -f "$TMUX_ARGS_FILE5"
 rm -rf "$WORKDIR5"
 echo "--- test 5: launcher-PATH candidate must still appear in pane export ---"
 echo "$all_args5"
 echo "--- end test 5 args ---"
 echo "$all_args5" | grep -qF "export PATH=" || \
  fail "test5: pane command does not export PATH when candidate is on launcher PATH"
 echo "$all_args5" | grep -qF "$FAKE_RUNTIME_BIN5" || \
  fail "test5: candidate dir (already on launcher PATH) was NOT baked into pane PATH — regression"
 # ── Test 6: heartbeat sidecar — pane PID resolved + .hb file written ──────────
 #
 # Uses a real tmux session (same socket as test 1 which already has $AGENT) so
 # list-panes returns a real pane PID.  We override MOSAIC_HEARTBEAT_RUN_DIR to
 # a temp dir and set a 1-second interval, then wait up to 3 s for the .hb file
 # to appear and check its content.
 HB_RUN_DIR=$(mktemp -d)
 CLEANUP_DIRS+=("$HB_RUN_DIR")
 # Re-use the session+agent created in Test 1 (still alive on $SOCKET / $AGENT).
 # We need to invoke the script for a NEW agent on the same socket to exercise
 # the heartbeat path with a real pane PID.
 AGENT6="agent6-$RANDOM"
 MOSAIC_TMUX_SOCKET="$SOCKET" \
 MOSAIC_AGENT_WORKDIR="$WORKDIR" \
 MOSAIC_AGENT_COMMAND='bash --noprofile --norc -i' \
 MOSAIC_HEARTBEAT_RUN_DIR="$HB_RUN_DIR" \
 MOSAIC_HEARTBEAT_INTERVAL="1" \
  "$START" "$AGENT6"
 HB_FILE="$HB_RUN_DIR/${AGENT6}.hb"
 # Wait up to 5 seconds for the heartbeat file to appear.
 _waited=0
 until [ -f "$HB_FILE" ] || [ "$_waited" -ge 5 ]; do
  sleep 0.5
  _waited=$((_waited + 1))
 done
-# A local file cannot shadow any roster-derived generated key. Validation must
+[ -f "$HB_FILE" ] || fail "test6: heartbeat file not written at $HB_FILE within 5s"
 # happen before fake tmux receives even a has-session call.
 : > "$TMUX_CALLS"
 HOME_SHADOW="$ROOT/shadow"
 write_generated "$HOME_SHADOW" "coder1"
 printf 'MOSAIC_AGENT_RUNTIME=codex\n' > "$HOME_SHADOW/fleet/agents/coder1.env.local"
 chmod 600 "$HOME_SHADOW/fleet/agents/coder1.env.local"
 if output=$(run_start "$HOME_SHADOW" coder1 2>&1); then
  fail "generated-key shadow was accepted"
 fi
 [ ! -s "$TMUX_CALLS" ] || fail "tmux ran before generated-key shadow rejection"
 echo "$output" | grep -qF 'key=MOSAIC_AGENT_RUNTIME' || fail "shadow diagnostic omitted key"
 echo "$output" | grep -qF 'sha256=' || fail "shadow diagnostic omitted hash"
 if echo "$output" | grep -qF 'codex'; then
  fail "shadow diagnostic leaked value"
 fi
-# Arbitrary command compatibility is quarantined/rejected as data. Diagnostics
+hb_content=$(cat "$HB_FILE")
-# may name the key and hash but must never echo the privileged command text.
+echo "--- test 6: heartbeat file content ---"
-: > "$TMUX_CALLS"
+echo "$hb_content"
-HOME_COMMAND="$ROOT/command"
+echo "--- end test 6 ---"
 write_generated "$HOME_COMMAND" "coder2"
 COMMAND_VALUE='mosaic yolo codex --dangerous'
 printf 'MOSAIC_AGENT_COMMAND=%s\n' "$COMMAND_VALUE" > "$HOME_COMMAND/fleet/agents/coder2.env.local"
 chmod 600 "$HOME_COMMAND/fleet/agents/coder2.env.local"
 if output=$(run_start "$HOME_COMMAND" coder2 2>&1); then
  fail "arbitrary command override was accepted"
 fi
 [ ! -s "$TMUX_CALLS" ] || fail "tmux ran before command rejection"
 echo "$output" | grep -qF 'key=MOSAIC_AGENT_COMMAND' || fail "command diagnostic omitted key"
 echo "$output" | grep -qF 'sha256=' || fail "command diagnostic omitted hash"
 if echo "$output" | grep -qF "$COMMAND_VALUE"; then
  fail "command diagnostic leaked command value"
 fi
-# Group/world-readable local input is not trusted even when its syntax is safe.
+# Verify required fields are present.
-: > "$TMUX_CALLS"
+echo "$hb_content" | grep -qE '^ts=[0-9]{4}-[0-9]{2}-[0-9]{2}T' || \
-HOME_PERMS="$ROOT/perms"
+  fail "test6: heartbeat ts field missing or malformed"
-write_generated "$HOME_PERMS" "coder3"
+echo "$hb_content" | grep -qE '^pid=[0-9]+' || \
-printf 'MOSAIC_RUNTIME_BIN=/opt/mosaic/bin\n' > "$HOME_PERMS/fleet/agents/coder3.env.local"
+  fail "test6: heartbeat pid field missing or malformed"
-chmod 644 "$HOME_PERMS/fleet/agents/coder3.env.local"
+echo "$hb_content" | grep -qF 'status=ok' || \
-if output=$(run_start "$HOME_PERMS" coder3 2>&1); then
+  fail "test6: heartbeat status=ok missing"
  fail "world-readable local input was accepted"
 fi
 [ ! -s "$TMUX_CALLS" ] || fail "tmux ran before permissions rejection"
 echo "$output" | grep -qF 'code=unsafe-permissions' || fail "permission diagnostic missing"
-# A unit/holder-like clean bootstrap must yield a pane with trusted HOME and
+# ── Test 7: heartbeat sidecar — targets correct .hb path per agent name ────────
-# computed PATH only. The pane command itself must not carry loader, shell
+#
-# control, arbitrary sentinel, or stale bootstrap variables.
+# Uses the fake-tmux shim approach (like tests 3-5) to capture the sidecar
-: > "$TMUX_CALLS"
+# invocation without needing a real session.  A fake setsid shim records its
-HOME_PANE_BOUNDARY="$ROOT/pane-boundary/.config/mosaic"
+# arguments so we can assert the sidecar script targets the expected .hb path
-write_generated "$HOME_PANE_BOUNDARY" "coder-pane-boundary"
+# and uses the configured interval.
 PANE_TRUSTED_HOME="${HOME_PANE_BOUNDARY%/.config/mosaic}"
 PANE_STALE_HOME="$ROOT/stale-home"
 PANE_STALE_PATH="$ROOT/stale-bin"
 PANE_BASH_ENV="$ROOT/pane-boundary.bash-env"
 printf 'MOSAIC_RUNTIME_BIN=%s\n' "$FAKE_BIN" > \
  "$HOME_PANE_BOUNDARY/fleet/agents/coder-pane-boundary.env.local"
 chmod 600 "$HOME_PANE_BOUNDARY/fleet/agents/coder-pane-boundary.env.local"
 LD_PRELOAD='/not/loaded/by-clean-bootstrap.so' \
 BASH_ENV="$PANE_BASH_ENV" \
 MOSAIC_UNTRUSTED_SENTINEL='must-not-reach-pane' \
 HOME="$PANE_STALE_HOME" \
 PATH="$PANE_STALE_PATH" \
  /usr/bin/env -i \
    "HOME=$PANE_TRUSTED_HOME" \
    "PATH=$FAKE_BIN:/usr/bin:/bin" \
    "MOSAIC_HOME=$HOME_PANE_BOUNDARY" \
    "MOSAIC_TEST_TMUX_CALLS=$TMUX_CALLS" \
    "MOSAIC_TEST_HOME=$PANE_TRUSTED_HOME" \
    MOSAIC_TEST_FLEET_OWNER=123e4567-e89b-12d3-a456-426614174000 \
    MOSAIC_TEST_EXECUTE_PANE=1 \
    "$START" coder-pane-boundary
 pane_args=$(tr '\0' '\n' < "$TMUX_CALLS")
 echo "$pane_args" | grep -qxF "HOME=$PANE_TRUSTED_HOME" || \
  fail "pane did not restore trusted HOME"
 echo "$pane_args" | grep -qF "HOME=$PANE_STALE_HOME" && \
  fail "pane inherited stale HOME"
 echo "$pane_args" | grep -qF "$PANE_STALE_PATH" && fail "pane inherited stale PATH"
 for blocked in LD_PRELOAD= BASH_ENV= MOSAIC_UNTRUSTED_SENTINEL=; do
  echo "$pane_args" | grep -qF "$blocked" && fail "pane inherited $blocked"
 done
-after_pane_env=$(printf '%s\n' "$pane_args" | grep -n -m1 -F '/usr/bin/env' | cut -d: -f1)
+FAKE_BIN7=$(mktemp -d)
-[ -n "$after_pane_env" ] || fail "pane command did not use absolute env"
+FAKE_RUNTIME_BIN7=$(mktemp -d)
-printf '%s\n' "$pane_args" | tail -n +"$after_pane_env" | grep -qxF -- '-i' || \
+SETSID_ARGS_FILE=$(mktemp)
-  fail "pane command did not clear its environment"
+HB_RUN_DIR7=$(mktemp -d)
-pane_environment=$(tr '\0' '\n' < "$HOME_PANE_BOUNDARY/fleet/pane-environment")
+CLEANUP_DIRS+=("$FAKE_BIN7" "$FAKE_RUNTIME_BIN7" "$HB_RUN_DIR7")
 echo "$pane_environment" | grep -qxF "HOME=$PANE_TRUSTED_HOME" || \
  fail "runtime pane did not receive trusted HOME"
 echo "$pane_environment" | grep -qF "$PANE_STALE_PATH" && fail "runtime pane received stale PATH"
 for blocked in LD_PRELOAD= BASH_ENV= MOSAIC_UNTRUSTED_SENTINEL=; do
  echo "$pane_environment" | grep -qF "$blocked" && fail "runtime pane received $blocked"
 done
-write_interaction_generated() {
+AGENT7="my-fleet-agent-$RANDOM"
-  local home="$1"
+INTERVAL7="42"
  local agent="$2"
  mkdir -p "$home/fleet/agents" "$home/fleet/run" "$home/work"
  chmod 700 "$home" "$home/fleet" "$home/fleet/agents" "$home/fleet/run"
  printf '123e4567-e89b-12d3-a456-426614174000\n' > "$home/fleet/run/holder-owner"
  chmod 600 "$home/fleet/run/holder-owner"
  cat > "$home/fleet/agents/$agent.env.generated" <<EOF
 MOSAIC_AGENT_NAME=$agent
 MOSAIC_AGENT_CLASS=operator-interaction
 MOSAIC_AGENT_RUNTIME=pi
 MOSAIC_AGENT_MODEL=openai/gpt-5.6-sol
 MOSAIC_AGENT_REASONING=high
 MOSAIC_AGENT_TOOL_POLICY=operator-interaction
 MOSAIC_AGENT_WORKDIR=$home/work
 MOSAIC_TMUX_SOCKET=mosaic-test
 EOF
  chmod 600 "$home/fleet/agents/$agent.env.generated"
 }
-run_interaction() {
+# Fake tmux: has-session → not found; new-session → ok; list-panes → known PID.
-  local home="$1"
+cat > "$FAKE_BIN7/tmux" <<SHIM7
-  local agent="$2"
+#!/usr/bin/env bash
-  HOME="$home" PATH="$FAKE_BIN:$PATH" MOSAIC_TEST_TMUX_CALLS="$TMUX_CALLS" \
+subcmd="\$3"
-    MOSAIC_TEST_HOME="$home" \
+if [ "\$subcmd" = "has-session" ]; then exit 1; fi
-    MOSAIC_TEST_FLEET_OWNER=123e4567-e89b-12d3-a456-426614174000 \
+if [ "\$subcmd" = "new-session" ]; then exit 0; fi
-    MOSAIC_HOME="$home" "$INTERACTION_START" "$agent"
+if [ "\$subcmd" = "list-panes" ]; then echo "88888"; exit 0; fi
-}
+exit 0
 SHIM7
 chmod +x "$FAKE_BIN7/tmux"
-write_heartbeat_local() {
+# Fake setsid: capture the bash -c <script> argument for inspection, then
-  local home="$1"
+# background an actual bash subshell so disown succeeds in the caller.
-  local agent="$2"
+cat > "$FAKE_BIN7/setsid" <<'SETSID_SHIM'
-  mkdir -p "$home/run"
+#!/usr/bin/env bash
-  cat > "$home/fleet/agents/$agent.env.local" <<EOF
+# argv: setsid bash -c <sidecar_script>
-MOSAIC_HEARTBEAT_RUN_DIR=$home/run
+# Record the full argument list to the capture file, then exit cleanly.
-MOSAIC_HEARTBEAT_INTERVAL=1
+printf '%s\0' "$@" > __SETSID_ARGS_FILE__
-EOF
+exit 0
-  chmod 600 "$home/fleet/agents/$agent.env.local"
+SETSID_SHIM
-}
+# Patch the placeholder with the real capture-file path (avoids heredoc expansion issues).
 sed -i "s|__SETSID_ARGS_FILE__|${SETSID_ARGS_FILE}|g" "$FAKE_BIN7/setsid"
 chmod +x "$FAKE_BIN7/setsid"
-wait_for_sidecar_status() {
+SOCKET7="mosaic-agent-test7-$RANDOM-$$"
-  local file="$1"
+WORKDIR7=$(mktemp -d)
-  for _retry in $(seq 1 30); do
+CLEANUP_DIRS+=("$WORKDIR7")
    grep -qF 'status=ok' "$file" 2>/dev/null && return 0
    sleep 0.1
  done
  fail "heartbeat sidecar did not resume after native marker became stale or absent"
 }
-# A fresh Pi-native marker is authoritative: the shell sidecar may start but
+PATH="$FAKE_BIN7:$PATH" \
-# must not overwrite Pi's busy/ok/model heartbeat. It must resume only when
+MOSAIC_TMUX_SOCKET="$SOCKET7" \
-# the marker is stale or absent.
+MOSAIC_AGENT_WORKDIR="$WORKDIR7" \
-HOME_NATIVE_FRESH="$ROOT/native-fresh"
+MOSAIC_AGENT_RUNTIME="pi" \
-write_generated "$HOME_NATIVE_FRESH" "coder-native-fresh"
+MOSAIC_RUNTIME_BIN="$FAKE_RUNTIME_BIN7" \
-write_heartbeat_local "$HOME_NATIVE_FRESH" "coder-native-fresh"
+MOSAIC_AGENT_COMMAND="mosaic yolo pi" \
-FRESH_HB="$HOME_NATIVE_FRESH/run/coder-native-fresh.hb"
+MOSAIC_HEARTBEAT_RUN_DIR="$HB_RUN_DIR7" \
-printf 'ts=native\npid=1\nstatus=busy\nmodel=authoritative-model\n' > "$FRESH_HB"
+MOSAIC_HEARTBEAT_INTERVAL="$INTERVAL7" \
-touch "$FRESH_HB.native"
+  "$START" "$AGENT7"
 MOSAIC_TEST_PANE_PID=$$ run_start "$HOME_NATIVE_FRESH" coder-native-fresh
 sleep 0.3
 fresh_content=$(cat "$FRESH_HB")
 [ "$fresh_content" = 'ts=native
 pid=1
 status=busy
 model=authoritative-model' ] || fail "fresh native heartbeat was overwritten"
-HOME_NATIVE_STALE="$ROOT/native-stale"
+# Give the background setsid shim a moment to finish writing the capture file.
-write_generated "$HOME_NATIVE_STALE" "coder-native-stale"
+sleep 0.5
 write_heartbeat_local "$HOME_NATIVE_STALE" "coder-native-stale"
 STALE_HB="$HOME_NATIVE_STALE/run/coder-native-stale.hb"
 printf 'ts=native\npid=1\nstatus=busy\nmodel=stale-model\n' > "$STALE_HB"
 touch -d '10 seconds ago' "$STALE_HB.native"
 MOSAIC_TEST_PANE_PID=$$ run_start "$HOME_NATIVE_STALE" coder-native-stale
 wait_for_sidecar_status "$STALE_HB"
-HOME_NATIVE_ABSENT="$ROOT/native-absent"
+setsid_args=$(cat "$SETSID_ARGS_FILE" 2>/dev/null | tr '\0' '\n' || true)
-write_generated "$HOME_NATIVE_ABSENT" "coder-native-absent"
+rm -f "$SETSID_ARGS_FILE"
-write_heartbeat_local "$HOME_NATIVE_ABSENT" "coder-native-absent"
+rm -rf "$WORKDIR7"
 ABSENT_HB="$HOME_NATIVE_ABSENT/run/coder-native-absent.hb"
 printf 'ts=native\npid=1\nstatus=busy\nmodel=absent-model\n' > "$ABSENT_HB"
 MOSAIC_TEST_PANE_PID=$$ run_start "$HOME_NATIVE_ABSENT" coder-native-absent
 wait_for_sidecar_status "$ABSENT_HB"
-# The interaction wrapper delegates to the shared strict parser before applying
+echo "--- test 7: captured setsid args ---"
-# its pinned policy, so malformed projection data wins over profile diagnostics.
+echo "$setsid_args"
-: > "$TMUX_CALLS"
+echo "--- end test 7 ---"
 HOME_INTERACTION_MALFORMED="$ROOT/interaction-malformed"
 write_interaction_generated "$HOME_INTERACTION_MALFORMED" "interaction-malformed"
 printf 'UNTRUSTED_BOOTSTRAP=value\n' >> "$HOME_INTERACTION_MALFORMED/fleet/agents/interaction-malformed.env.generated"
 if output=$(run_interaction "$HOME_INTERACTION_MALFORMED" interaction-malformed 2>&1); then
  fail "interaction wrapper accepted malformed generated data"
 fi
 [ ! -s "$TMUX_CALLS" ] || fail "tmux ran before interaction strict-parser rejection"
 echo "$output" | grep -qF 'code=unknown-key' || fail "interaction did not use shared strict parser first"
-# A syntactically valid but policy-incompatible projection reaches the pinned
+# The sidecar script (bash -c <script>) must reference the correct .hb path.
-# interaction policy check only after strict parsing and never starts tmux.
+expected_hb="${HB_RUN_DIR7}/${AGENT7}.hb"
-: > "$TMUX_CALLS"
+echo "$setsid_args" | grep -qF "$expected_hb" || \
-HOME_INTERACTION_POLICY="$ROOT/interaction-policy"
+  fail "test7: sidecar script does not reference correct .hb path ($expected_hb)"
 write_interaction_generated "$HOME_INTERACTION_POLICY" "interaction-policy"
 perl -0pi -e 's/MOSAIC_AGENT_RUNTIME=pi/MOSAIC_AGENT_RUNTIME=codex/' \
  "$HOME_INTERACTION_POLICY/fleet/agents/interaction-policy.env.generated"
 if output=$(run_interaction "$HOME_INTERACTION_POLICY" interaction-policy 2>&1); then
  fail "interaction wrapper accepted a policy-incompatible projection"
 fi
 interaction_policy_args=$(tr '\0' '\n' < "$TMUX_CALLS")
 echo "$interaction_policy_args" | grep -qF 'new-session' && \
  fail "interaction pinned-policy rejection created a tmux session"
 echo "$output" | grep -qF 'operator interaction service requires runtime pi' || \
  fail "interaction pinned-policy check did not follow strict parsing"
-# Exact stop derives the socket exclusively from the validated generated
+# The sidecar script must use the configured interval.
-# projection and ignores an ambient socket supplied by the caller.
+echo "$setsid_args" | grep -qF "$INTERVAL7" || \
-: > "$TMUX_CALLS"
+  fail "test7: sidecar script does not reference configured interval ($INTERVAL7)"
 HOME_STOP="$ROOT/stop"
 write_generated "$HOME_STOP" "coder-stop"
 HOME="$HOME_STOP" PATH="$FAKE_BIN:$PATH" MOSAIC_TEST_TMUX_CALLS="$TMUX_CALLS" \
  MOSAIC_TEST_HOME="$HOME_STOP" \
  MOSAIC_TEST_FLEET_OWNER=123e4567-e89b-12d3-a456-426614174000 \
  MOSAIC_HOME="$HOME_STOP" MOSAIC_TMUX_SOCKET=ambient-socket "$START" --stop coder-stop
 stop_args=$(tr '\0' '\n' < "$TMUX_CALLS")
 echo "$stop_args" | grep -qxF 'mosaic-test' || fail "exact stop did not use the validated generated socket"
 echo "$stop_args" | grep -qxF 'kill-session' || fail "exact stop did not request session termination"
 echo "$stop_args" | grep -qxF '=coder-stop' || fail "exact stop did not exact-match the generated agent name"
 if echo "$stop_args" | grep -qF 'ambient-socket'; then
  fail "exact stop trusted an ambient socket"
 fi
-echo 'ok - start-agent-session generated environment boundary'
+echo "ok - start-agent-session"
--- a/packages/mosaic/src/commands/fleet-agent-crud-command.spec.ts
+++ b/packages/mosaic/src/commands/fleet-agent-crud-command.spec.ts
@@ -1,657 +0,0 @@
 import { chmod, mkdir, mkdtemp, readFile, rename, rm, symlink, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { Command } from 'commander';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import { fleetAgentMutationExitCode } from './fleet-agent-crud-command.js';
 import { registerFleetCommand, type FleetCommandDeps } from './fleet.js';
 const roster = `
 version: 2
 generation: 7
 transport: tmux
 tmux:
  socket_name: mosaic-fleet
  holder_session: _holder
 defaults:
  working_directory: /srv/mosaic
  runtime: pi
 runtimes:
  pi:
    reset_command: /new
 agents:
  - name: orchestrator
    alias: Orchestrator
    class: orchestrator
    runtime: pi
    provider: openai
    model: gpt-5.6-sol
    reasoning: high
    tool_policy: orchestrator
    working_directory: /srv/mosaic
    persistent_persona: true
    reset_between_tasks: false
    lifecycle:
      enabled: true
      desired_state: stopped
    launch:
      yolo: true
 `;
 const agent = {
  name: 'coder0',
  alias: 'Coder 0',
  className: 'code',
  runtime: 'pi',
  provider: 'openai',
  model: 'gpt-5.6-sol',
  reasoning: 'high',
  toolPolicy: 'code',
  workingDirectory: '/srv/mosaic',
  persistentPersona: false,
  resetBetweenTasks: true,
  launch: { yolo: true },
 };
 let cleanup: string | undefined;
 afterEach(async (): Promise<void> => {
  vi.restoreAllMocks();
  process.exitCode = undefined;
  if (cleanup) await rm(cleanup, { recursive: true, force: true });
  cleanup = undefined;
 });
 async function fleetHome(): Promise<string> {
  cleanup = await mkdtemp(join(tmpdir(), 'mosaic-fleet-crud-command-'));
  const fleetDir = join(cleanup, 'fleet');
  const agentsDir = join(fleetDir, 'agents');
  const rolesDir = join(fleetDir, 'roles');
  await mkdir(agentsDir, { recursive: true, mode: 0o700 });
  await mkdir(rolesDir, { recursive: true, mode: 0o700 });
  await chmod(cleanup, 0o700);
  await chmod(fleetDir, 0o700);
  await chmod(agentsDir, 0o700);
  await chmod(rolesDir, 0o700);
  await writeFile(join(fleetDir, 'roster.yaml'), roster, { mode: 0o600 });
  for (const className of ['orchestrator', 'code']) {
    await writeFile(
      join(rolesDir, `${className}.md`),
      `# ${className}\n\n(\`class: ${className}\`)\n`,
      {
        mode: 0o600,
      },
    );
  }
  return cleanup;
 }
 function program(mosaicHome: string, deps: FleetCommandDeps = {}): Command {
  const result = new Command();
  result.exitOverride();
  registerFleetCommand(result, { ...deps, mosaicHome });
  return result;
 }
 function output(): { lines: string[] } {
  const lines: string[] = [];
  vi.spyOn(console, 'log').mockImplementation((value: string): void => {
    lines.push(value);
  });
  return { lines };
 }
 describe('mosaic fleet local roster mutations', (): void => {
  it('returns non-zero when a projection failure leaves recovery work after roster persistence', (): void => {
    expect(
      fleetAgentMutationExitCode({
        recovery: {
          code: 'projection-apply-failed',
          rosterPath: '/private/fleet/roster.yaml',
          action: 'regenerate-projections-from-roster',
        },
      }),
    ).toBe(1);
  });
  it('returns zero for a mutation result without recovery work', (): void => {
    expect(fleetAgentMutationExitCode({})).toBe(0);
  });
  it('registers programmatic local create, get, update, delete, and plan commands', async (): Promise<void> => {
    const home = await fleetHome();
    const root = program(home);
    const fleet = root.commands.find((candidate: Command): boolean => candidate.name() === 'fleet');
    expect(fleet?.commands.map((candidate: Command): string => candidate.name())).toEqual(
      expect.arrayContaining(['create', 'delete', 'get', 'plan', 'update']),
    );
  });
  it('runs the JSON mutation commands through the direct mosaic fleet control plane', async (): Promise<void> => {
    const home = await fleetHome();
    const root = new Command();
    root.exitOverride();
    registerFleetCommand(root, { mosaicHome: home });
    const fleet = root.commands.find((candidate: Command): boolean => candidate.name() === 'fleet');
    expect(fleet?.commands.map((candidate: Command): string => candidate.name())).toEqual(
      expect.arrayContaining(['create', 'delete', 'get', 'plan', 'update']),
    );
  });
  it('gets one v2 roster agent as stable JSON without mutating the roster', async (): Promise<void> => {
    const home = await fleetHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const captured = output();
    const root = new Command();
    root.exitOverride();
    registerFleetCommand(root, { mosaicHome: home });
    await root.parseAsync(['node', 'mosaic', 'fleet', 'get', 'orchestrator']);
    expect(JSON.parse(captured.lines.join('\n'))).toMatchObject({
      generation: 7,
      agent: { name: 'orchestrator', lifecycle: { desiredState: 'stopped' } },
    });
    expect(await readFile(rosterPath, 'utf8')).toBe(roster);
  });
  it('returns a JSON error and non-zero exit for a missing local agent', async (): Promise<void> => {
    const home = await fleetHome();
    const captured = output();
    await program(home).parseAsync(['node', 'mosaic', 'fleet', 'get', 'missing']);
    expect(JSON.parse(captured.lines.join('\n'))).toEqual({ error: { code: 'agent-not-found' } });
    expect(process.exitCode).toBe(1);
  });
  it('prints a deterministic create plan without changing roster or generated projections', async (): Promise<void> => {
    const home = await fleetHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const captured = output();
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'plan',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    expect(JSON.parse(captured.lines.join('\n'))).toMatchObject({
      applied: false,
      plan: {
        operation: 'create',
        currentGeneration: 7,
        nextGeneration: 8,
        agent: { name: 'coder0', lifecycle: { enabled: true, desiredState: 'stopped' } },
      },
    });
    expect(await readFile(rosterPath, 'utf8')).toBe(roster);
    await expect(
      readFile(join(home, 'fleet', 'agents', 'coder0.env.generated'), 'utf8'),
    ).rejects.toThrow();
  });
  it('plans create, update, and delete with operation-specific target names without mutation', async (): Promise<void> => {
    const home = await fleetHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const captured = output();
    const updatedCoder = { ...agent, alias: 'Coder Updated' };
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'plan',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    const beforePlans = await readFile(rosterPath, 'utf8');
    const beforeOrchestratorProjection = await readFile(
      join(home, 'fleet', 'agents', 'orchestrator.env.generated'),
      'utf8',
    );
    captured.lines.length = 0;
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'plan',
      'update',
      'coder0',
      '--expected-generation',
      '8',
      '--agent',
      JSON.stringify(updatedCoder),
    ]);
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'plan',
      'delete',
      'coder0',
      '--expected-generation',
      '8',
    ]);
    const plans = captured.lines.map((line: string): unknown => JSON.parse(line));
    expect(plans).toMatchObject([
      { plan: { operation: 'update', agent: { name: 'coder0' } } },
      { plan: { operation: 'delete', agent: { name: 'coder0' } } },
    ]);
    expect(await readFile(rosterPath, 'utf8')).toBe(beforePlans);
    expect(
      await readFile(join(home, 'fleet', 'agents', 'orchestrator.env.generated'), 'utf8'),
    ).toBe(beforeOrchestratorProjection);
  });
  it.each([
    ['plan create', ['fleet', 'plan', 'create'], 'top-level'],
    ['create', ['fleet', 'create'], 'top-level'],
    ['update', ['fleet', 'update', 'orchestrator'], 'top-level'],
    ['plan create', ['fleet', 'plan', 'create'], 'launch'],
    ['create', ['fleet', 'create'], 'launch'],
    ['update', ['fleet', 'update', 'orchestrator'], 'launch'],
  ])(
    'rejects unknown and prototype-sensitive agent fields without mutation',
    async (_operation: string, command: string[], shape: string): Promise<void> => {
      const home = await fleetHome();
      const rosterPath = join(home, 'fleet', 'roster.yaml');
      const agentsDir = join(home, 'fleet', 'agents');
      const captured = output();
      const artifactContents = new Map([
        ['orchestrator.env.generated', 'generated-before\n'],
        ['orchestrator.env.local', 'local-before\n'],
        ['orchestrator.env', 'legacy-before\n'],
        ['orchestrator.env.quarantine', 'quarantine-before\n'],
      ]);
      for (const [filename, content] of artifactContents) {
        await writeFile(join(agentsDir, filename), content, { mode: 0o600 });
      }
      const rejectedValue = 'must-not-appear-in-diagnostics';
      const unsafeAgent = {
        ...agent,
        name: 'orchestrator',
        launch: shape === 'launch' ? { yolo: true, command: rejectedValue } : { yolo: true },
        ...(shape === 'top-level'
          ? {
              command: rejectedValue,
              channel: rejectedValue,
              secretRef: rejectedValue,
              constructor: rejectedValue,
              prototype: rejectedValue,
            }
          : {}),
      };
      const payload =
        shape === 'top-level'
          ? JSON.stringify(unsafeAgent).replace(/}$/, ',"__proto__":{"unsupported":true}}')
          : JSON.stringify(unsafeAgent);
      await program(home).parseAsync([
        'node',
        'mosaic',
        ...command,
        '--expected-generation',
        '7',
        '--agent',
        payload,
      ]);
      const diagnostic = captured.lines.pop() ?? '';
      expect(JSON.parse(diagnostic)).toEqual({ error: { code: 'invalid-request' } });
      expect(diagnostic).not.toContain(rejectedValue);
      expect(process.exitCode).toBe(1);
      expect(await readFile(rosterPath, 'utf8')).toBe(roster);
      for (const [filename, content] of artifactContents) {
        expect(await readFile(join(agentsDir, filename), 'utf8')).toBe(content);
      }
    },
  );
  it('rejects missing update/delete plan names and an extra create plan name', async (): Promise<void> => {
    const home = await fleetHome();
    const captured = output();
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'plan',
      'delete',
      '--expected-generation',
      '7',
    ]);
    expect(JSON.parse(captured.lines.pop() ?? '')).toEqual({ error: { code: 'invalid-request' } });
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'plan',
      'create',
      'coder0',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    expect(JSON.parse(captured.lines.pop() ?? '')).toEqual({ error: { code: 'invalid-request' } });
  });
  it('plans persisted start as desired state without starting a runtime', async (): Promise<void> => {
    const home = await fleetHome();
    const captured = output();
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'plan',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
      '--persisted-start',
    ]);
    expect(JSON.parse(captured.lines.join('\n'))).toMatchObject({
      applied: false,
      plan: { agent: { lifecycle: { desiredState: 'running' } } },
    });
  });
  it('returns non-zero JSON when a filesystem projection fails after roster persistence', async (): Promise<void> => {
    const home = await fleetHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const agentsDir = join(home, 'fleet', 'agents');
    const captured = output();
    await program(home, {
      projectionApplier: async (): Promise<never> => {
        throw new Error('injected projection failure');
      },
    }).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    expect(JSON.parse(captured.lines.join('\n'))).toMatchObject({
      applied: false,
      authoritativeRoster: 'committed',
      projections: 'incomplete',
      recovery: { code: 'projection-apply-failed', action: 'regenerate-projections-from-roster' },
    });
    expect(process.exitCode).toBe(1);
    expect(await readFile(rosterPath, 'utf8')).toContain('generation: 8');
    expect(await readFile(rosterPath, 'utf8')).toContain('name: coder0');
    await expect(readFile(join(agentsDir, 'coder0.env.generated'), 'utf8')).rejects.toThrow();
  });
  it('deletes only the target generated projection while retaining legacy and quarantine artifacts', async (): Promise<void> => {
    const home = await fleetHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const agentsDir = join(home, 'fleet', 'agents');
    const captured = output();
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    await writeFile(join(agentsDir, 'coder0.env.local'), 'MOSAIC_RUNTIME_BIN=/usr/bin/pi\n', {
      mode: 0o600,
    });
    await writeFile(join(agentsDir, 'coder0.env'), 'MOSAIC_AGENT_COMMAND=legacy-command\n', {
      mode: 0o600,
    });
    await writeFile(join(agentsDir, 'coder0.env.quarantine'), 'quarantine-before\n', {
      mode: 0o600,
    });
    await writeFile(join(agentsDir, 'unrelated.env.generated'), 'unrelated-before\n', {
      mode: 0o600,
    });
    const beforeDryRun = await Promise.all([
      readFile(rosterPath, 'utf8'),
      readFile(join(agentsDir, 'coder0.env.generated'), 'utf8'),
      readFile(join(agentsDir, 'coder0.env.local'), 'utf8'),
      readFile(join(agentsDir, 'coder0.env'), 'utf8'),
      readFile(join(agentsDir, 'coder0.env.quarantine'), 'utf8'),
      readFile(join(agentsDir, 'unrelated.env.generated'), 'utf8'),
    ]);
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'delete',
      'coder0',
      '--expected-generation',
      '8',
      '--dry-run',
    ]);
    expect(JSON.parse(captured.lines.pop() ?? '')).toMatchObject({
      applied: false,
      authoritativeRoster: 'unchanged',
      projections: 'not-applied',
    });
    expect(
      await Promise.all([
        readFile(rosterPath, 'utf8'),
        readFile(join(agentsDir, 'coder0.env.generated'), 'utf8'),
        readFile(join(agentsDir, 'coder0.env.local'), 'utf8'),
        readFile(join(agentsDir, 'coder0.env'), 'utf8'),
        readFile(join(agentsDir, 'coder0.env.quarantine'), 'utf8'),
        readFile(join(agentsDir, 'unrelated.env.generated'), 'utf8'),
      ]),
    ).toEqual(beforeDryRun);
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'delete',
      'coder0',
      '--expected-generation',
      '8',
    ]);
    expect(JSON.parse(captured.lines.pop() ?? '')).toMatchObject({
      applied: true,
      authoritativeRoster: 'committed',
      projections: 'complete',
    });
    await expect(readFile(join(agentsDir, 'coder0.env.generated'), 'utf8')).rejects.toThrow();
    expect(await readFile(join(agentsDir, 'coder0.env.local'), 'utf8')).toBe(beforeDryRun[2]);
    expect(await readFile(join(agentsDir, 'coder0.env'), 'utf8')).toBe(beforeDryRun[3]);
    expect(await readFile(join(agentsDir, 'coder0.env.quarantine'), 'utf8')).toBe(beforeDryRun[4]);
    expect(await readFile(join(agentsDir, 'unrelated.env.generated'), 'utf8')).toBe(
      beforeDryRun[5],
    );
    expect(await readFile(rosterPath, 'utf8')).toContain('generation: 9');
  });
  it('reports truthful partial recovery when a delete projection fails after roster persistence', async (): Promise<void> => {
    const home = await fleetHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const agentsDir = join(home, 'fleet', 'agents');
    const captured = output();
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    captured.lines.length = 0;
    await program(home, {
      projectionApplier: async (): Promise<never> => {
        throw new Error('injected projection failure');
      },
    }).parseAsync(['node', 'mosaic', 'fleet', 'delete', 'coder0', '--expected-generation', '8']);
    expect(JSON.parse(captured.lines.pop() ?? '')).toMatchObject({
      applied: false,
      authoritativeRoster: 'committed',
      projections: 'incomplete',
      recovery: { code: 'projection-apply-failed', action: 'regenerate-projections-from-roster' },
    });
    expect(process.exitCode).toBe(1);
    expect(await readFile(rosterPath, 'utf8')).toContain('generation: 9');
    expect(await readFile(rosterPath, 'utf8')).not.toContain('name: coder0');
    expect(await readFile(join(agentsDir, 'coder0.env.generated'), 'utf8')).toContain(
      'MOSAIC_AGENT_NAME=coder0',
    );
  });
  it.each(['unsafe directory permissions', 'symlinked directory'] as const)(
    'rejects delete before roster mutation for %s',
    async (hazard: 'unsafe directory permissions' | 'symlinked directory'): Promise<void> => {
      const home = await fleetHome();
      const rosterPath = join(home, 'fleet', 'roster.yaml');
      const agentsDir = join(home, 'fleet', 'agents');
      const captured = output();
      await program(home).parseAsync([
        'node',
        'mosaic',
        'fleet',
        'create',
        '--expected-generation',
        '7',
        '--agent',
        JSON.stringify(agent),
      ]);
      const beforeRoster = await readFile(rosterPath, 'utf8');
      let generatedPath = join(agentsDir, 'coder0.env.generated');
      if (hazard === 'unsafe directory permissions') {
        await chmod(agentsDir, 0o777);
      } else {
        const targetDir = join(home, 'fleet', 'agents-target');
        await rename(agentsDir, targetDir);
        await symlink(targetDir, agentsDir, 'dir');
        generatedPath = join(targetDir, 'coder0.env.generated');
      }
      try {
        captured.lines.length = 0;
        await program(home).parseAsync([
          'node',
          'mosaic',
          'fleet',
          'delete',
          'coder0',
          '--expected-generation',
          '8',
        ]);
      } finally {
        if (hazard === 'unsafe directory permissions') await chmod(agentsDir, 0o700);
      }
      expect(JSON.parse(captured.lines.pop() ?? '')).toEqual({
        error: { code: 'mutation-failed' },
      });
      expect(await readFile(rosterPath, 'utf8')).toBe(beforeRoster);
      expect(await readFile(generatedPath, 'utf8')).toContain('MOSAIC_AGENT_NAME=coder0');
    },
  );
  it('creates, updates, and deletes through the v2 roster without runtime actions', async (): Promise<void> => {
    const home = await fleetHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const agentsDir = join(home, 'fleet', 'agents');
    const captured = output();
    const updated = { ...agent, alias: 'Coder Zero' };
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'create',
      '--expected-generation',
      '7',
      '--agent',
      JSON.stringify(agent),
    ]);
    expect(JSON.parse(captured.lines.pop() ?? '')).toMatchObject({ applied: true });
    expect(await readFile(join(agentsDir, 'coder0.env.generated'), 'utf8')).toContain(
      'MOSAIC_AGENT_NAME=coder0',
    );
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'update',
      'coder0',
      '--expected-generation',
      '8',
      '--agent',
      JSON.stringify(updated),
    ]);
    expect(JSON.parse(captured.lines.pop() ?? '')).toMatchObject({
      applied: true,
      plan: { nextGeneration: 9, agent: { alias: 'Coder Zero' } },
    });
    await writeFile(join(agentsDir, 'coder0.env.local'), 'MOSAIC_RUNTIME_BIN=/usr/bin/retain\n', {
      mode: 0o600,
    });
    await program(home).parseAsync([
      'node',
      'mosaic',
      'fleet',
      'delete',
      'coder0',
      '--expected-generation',
      '9',
    ]);
    expect(JSON.parse(captured.lines.pop() ?? '')).toMatchObject({
      applied: true,
      plan: { operation: 'delete', nextGeneration: 10, agent: { name: 'coder0' } },
    });
    await expect(readFile(join(agentsDir, 'coder0.env.generated'), 'utf8')).rejects.toThrow();
    expect(await readFile(join(agentsDir, 'coder0.env.local'), 'utf8')).toBe(
      'MOSAIC_RUNTIME_BIN=/usr/bin/retain\n',
    );
    expect(await readFile(rosterPath, 'utf8')).toContain('generation: 10');
    expect(await readFile(rosterPath, 'utf8')).not.toContain('name: coder0');
  });
 });
--- a/packages/mosaic/src/commands/fleet-agent-crud-command.ts
+++ b/packages/mosaic/src/commands/fleet-agent-crud-command.ts
@@ -1,392 +0,0 @@
 import { readFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import type { Command } from 'commander';
 import {
  executeFleetAgentMutation,
  FleetAgentMutationError,
  type FleetAgentMutationAgent,
  type FleetAgentMutationOperation,
  type FleetAgentMutationOptions,
  type FleetAgentMutationRequest,
  type FleetAgentMutationResult,
 } from '../fleet/fleet-agent-crud.js';
 import {
  parseRosterV2,
  ROSTER_V2_REASONING_LEVELS,
  ROSTER_V2_SUPPORTED_RUNTIMES,
  type FleetRosterV2,
  type RosterV2ReasoningLevel,
  type RosterV2RuntimeName,
 } from '../fleet/roster-v2.js';
 export interface FleetAgentCrudCommandDeps {
  readonly mosaicHome?: string;
  /** Test seam for deterministic post-roster filesystem projection failures. */
  readonly projectionApplier?: FleetAgentMutationOptions['projectionApplier'];
 }
 interface MutationOptions {
  readonly expectedGeneration: string;
  readonly agent?: string;
  readonly dryRun?: boolean;
  readonly persistedStart?: boolean;
 }
 const AGENT_REQUEST_KEYS = new Set([
  'name',
  'alias',
  'className',
  'runtime',
  'provider',
  'model',
  'reasoning',
  'toolPolicy',
  'workingDirectory',
  'persistentPersona',
  'resetBetweenTasks',
  'launch',
 ]);
 const AGENT_LAUNCH_REQUEST_KEYS = new Set(['yolo']);
 /** Registers only roster-v2 desired-state mutations; it never invokes runtime actions. */
 export function registerFleetAgentCrudCommands(
  agentCommand: Command,
  deps: FleetAgentCrudCommandDeps = {},
 ): void {
  agentCommand
    .command('get <name>')
    .description('Read one local roster-v2 agent as JSON')
    .action(async (name: string): Promise<void> => {
      await writeJsonOutcome(async (): Promise<void> => {
        const roster = await loadRoster(agentCommand, deps);
        const agent = roster.agents.find((candidate): boolean => candidate.name === name);
        if (!agent)
          throw new FleetAgentMutationError('agent-not-found', `Agent "${name}" is not in roster.`);
        printJson({ generation: roster.generation, agent });
      });
    });
  registerMutationCommand(agentCommand, deps, 'create');
  registerMutationCommand(agentCommand, deps, 'update');
  registerMutationCommand(agentCommand, deps, 'delete');
  agentCommand
    .command('plan <operation> [name]')
    .description('Plan a local roster-v2 mutation without writing roster or projections')
    .requiredOption('--expected-generation <number>', 'Authoritative roster generation')
    .option('--agent <json>', 'JSON agent payload for create or update')
    .option(
      '--persisted-start',
      'Plan create with desired_state: running without starting a runtime',
    )
    .action(
      async (operation: string, name: string | undefined, opts: MutationOptions): Promise<void> => {
        await writeJsonOutcome(async (): Promise<void> => {
          const parsedOperation = parseOperation(operation);
          await executeCommand(
            agentCommand,
            deps,
            parsedOperation,
            opts,
            true,
            parsePlanTargetName(parsedOperation, name),
          );
        });
      },
    );
 }
 function registerMutationCommand(
  agentCommand: Command,
  deps: FleetAgentCrudCommandDeps,
  operation: FleetAgentMutationOperation,
 ): void {
  const command = agentCommand
    .command(
      operation === 'update'
        ? 'update <name>'
        : `${operation}${operation === 'delete' ? ' <name>' : ''}`,
    )
    .description(`${operation} a local roster-v2 agent without runtime actions`)
    .requiredOption('--expected-generation <number>', 'Authoritative roster generation')
    .option('--agent <json>', 'JSON agent payload for create or update')
    .option('--dry-run', 'Validate and plan without writing roster or projections');
  if (operation === 'create') {
    command.option(
      '--persisted-start',
      'Persist desired_state: running without starting a runtime',
    );
    command.action(async (opts: MutationOptions): Promise<void> => {
      await writeJsonOutcome(async (): Promise<void> => {
        await executeCommand(agentCommand, deps, operation, opts, false);
      });
    });
    return;
  }
  command.action(async (name: string, opts: MutationOptions): Promise<void> => {
    await writeJsonOutcome(async (): Promise<void> => {
      await executeCommand(agentCommand, deps, operation, opts, false, name);
    });
  });
 }
 async function executeCommand(
  agentCommand: Command,
  deps: FleetAgentCrudCommandDeps,
  operation: FleetAgentMutationOperation,
  opts: MutationOptions,
  forceDryRun: boolean,
  name?: string,
 ): Promise<void> {
  const mosaicHome = resolveMosaicHome(agentCommand, deps);
  const rosterPath = resolveRosterPath(agentCommand, mosaicHome);
  const roster = parseRosterV2(await readFile(rosterPath, 'utf8'), 'yaml');
  const request = buildRequest(operation, opts, name);
  const result = await executeFleetAgentMutation({
    roster,
    request,
    mosaicHome,
    rosterPath,
    agentEnvDir: join(mosaicHome, 'fleet', 'agents'),
    rolesDir: join(mosaicHome, 'fleet', 'roles'),
    overrideDir: join(mosaicHome, 'fleet', 'roles.local'),
    dryRun: forceDryRun || opts.dryRun === true,
    ...(deps.projectionApplier === undefined ? {} : { projectionApplier: deps.projectionApplier }),
  });
  printJson(result);
  process.exitCode = fleetAgentMutationExitCode(result);
 }
 /** A persisted roster with failed derived projections is a non-zero CLI outcome. */
 export function fleetAgentMutationExitCode(
  result: Pick<FleetAgentMutationResult, 'recovery'>,
 ): 0 | 1 {
  return result.recovery === undefined ? 0 : 1;
 }
 function parsePlanTargetName(
  operation: FleetAgentMutationOperation,
  name: string | undefined,
 ): string | undefined {
  if (operation === 'create') {
    if (name !== undefined) {
      throw new FleetAgentMutationError(
        'invalid-request',
        'Create plan does not accept a target name.',
      );
    }
    return undefined;
  }
  if (name === undefined) {
    throw new FleetAgentMutationError(
      'invalid-request',
      `${operation} plan requires a target agent name.`,
    );
  }
  return name;
 }
 function buildRequest(
  operation: FleetAgentMutationOperation,
  opts: MutationOptions,
  name?: string,
 ): FleetAgentMutationRequest {
  const expectedGeneration = parseExpectedGeneration(opts.expectedGeneration);
  const agent = opts.agent === undefined ? undefined : parseAgent(opts.agent);
  if ((operation === 'create' || operation === 'update') && !agent) {
    throw new FleetAgentMutationError('invalid-request', `${operation} requires --agent JSON.`);
  }
  return {
    operation,
    expectedGeneration,
    ...(name === undefined ? {} : { name }),
    ...(agent === undefined ? {} : { agent }),
    ...(operation === 'create' && opts.persistedStart === true ? { persistedStart: true } : {}),
  };
 }
 function parseExpectedGeneration(value: string): number {
  const generation = Number(value);
  if (!Number.isSafeInteger(generation) || generation < 1) {
    throw new FleetAgentMutationError(
      'invalid-request',
      '--expected-generation must be a positive safe integer.',
    );
  }
  return generation;
 }
 function parseOperation(value: string): FleetAgentMutationOperation {
  if (value === 'create' || value === 'update' || value === 'delete') return value;
  throw new FleetAgentMutationError(
    'invalid-request',
    'plan operation must be create, update, or delete.',
  );
 }
 function parseAgent(source: string): FleetAgentMutationAgent {
  let value: unknown;
  try {
    value = JSON.parse(source);
  } catch {
    throw new FleetAgentMutationError('invalid-request', '--agent must be valid JSON.');
  }
  if (!isRecord(value)) {
    throw new FleetAgentMutationError('invalid-request', '--agent must be a JSON object.');
  }
  rejectUnknownKeys(value, AGENT_REQUEST_KEYS, '--agent');
  const runtime = requiredRuntime(value, 'runtime');
  const reasoning = requiredReasoning(value, 'reasoning');
  const launch = requiredRecord(value, 'launch');
  rejectUnknownKeys(launch, AGENT_LAUNCH_REQUEST_KEYS, '--agent.launch');
  return {
    name: requiredString(value, 'name'),
    alias: requiredString(value, 'alias'),
    className: requiredString(value, 'className'),
    runtime,
    provider: requiredString(value, 'provider'),
    model: requiredString(value, 'model'),
    reasoning,
    toolPolicy: requiredString(value, 'toolPolicy'),
    workingDirectory: requiredString(value, 'workingDirectory'),
    persistentPersona: requiredBoolean(value, 'persistentPersona'),
    resetBetweenTasks: requiredBoolean(value, 'resetBetweenTasks'),
    launch: { yolo: requiredBoolean(launch, 'yolo') },
  };
 }
 async function loadRoster(
  agentCommand: Command,
  deps: FleetAgentCrudCommandDeps,
 ): Promise<FleetRosterV2> {
  const mosaicHome = resolveMosaicHome(agentCommand, deps);
  const rosterPath = resolveRosterPath(agentCommand, mosaicHome);
  return parseRosterV2(await readFile(rosterPath, 'utf8'), 'yaml');
 }
 function resolveMosaicHome(agentCommand: Command, deps: FleetAgentCrudCommandDeps): string {
  const opts = agentCommand.optsWithGlobals<{ mosaicHome?: string }>();
  return opts.mosaicHome ?? deps.mosaicHome ?? join(process.env['HOME'] ?? '', '.config', 'mosaic');
 }
 function resolveRosterPath(agentCommand: Command, mosaicHome: string): string {
  const opts = agentCommand.optsWithGlobals<{ roster?: string }>();
  const canonical = join(mosaicHome, 'fleet', 'roster.yaml');
  if (opts.roster !== undefined && resolve(opts.roster) !== resolve(canonical)) {
    throw new FleetAgentMutationError(
      'invalid-request',
      'Roster-v2 mutations require the canonical <mosaic-home>/fleet/roster.yaml path.',
    );
  }
  return canonical;
 }
 function rejectUnknownKeys(
  value: Record<string, unknown>,
  allowedKeys: ReadonlySet<string>,
  field: string,
 ): void {
  const hasUnsupportedOwnProperty = Object.getOwnPropertyNames(value).some(
    (key: string): boolean => !allowedKeys.has(key),
  );
  if (hasUnsupportedOwnProperty || Object.getOwnPropertySymbols(value).length > 0) {
    throw new FleetAgentMutationError('invalid-request', `${field} contains unsupported keys.`);
  }
 }
 function requiredString(value: Record<string, unknown>, key: string): string {
  const candidate = requiredOwnValue(value, key);
  if (typeof candidate !== 'string' || candidate.length === 0) {
    throw new FleetAgentMutationError(
      'invalid-request',
      `--agent.${key} must be a non-empty string.`,
    );
  }
  return candidate;
 }
 function requiredBoolean(value: Record<string, unknown>, key: string): boolean {
  const candidate = requiredOwnValue(value, key);
  if (typeof candidate !== 'boolean') {
    throw new FleetAgentMutationError('invalid-request', `--agent.${key} must be a boolean.`);
  }
  return candidate;
 }
 function requiredRecord(value: Record<string, unknown>, key: string): Record<string, unknown> {
  const candidate = requiredOwnValue(value, key);
  if (!isRecord(candidate)) {
    throw new FleetAgentMutationError('invalid-request', `--agent.${key} must be an object.`);
  }
  return candidate;
 }
 function requiredRuntime(value: Record<string, unknown>, key: string): RosterV2RuntimeName {
  const candidate = requiredString(value, key);
  if (!isRuntime(candidate)) {
    throw new FleetAgentMutationError(
      'invalid-request',
      `--agent.${key} is not a supported runtime.`,
    );
  }
  return candidate;
 }
 function requiredReasoning(value: Record<string, unknown>, key: string): RosterV2ReasoningLevel {
  const candidate = requiredString(value, key);
  if (!isReasoning(candidate)) {
    throw new FleetAgentMutationError(
      'invalid-request',
      `--agent.${key} is not a supported reasoning level.`,
    );
  }
  return candidate;
 }
 function isRuntime(value: string): value is RosterV2RuntimeName {
  return ROSTER_V2_SUPPORTED_RUNTIMES.some(
    (runtime: RosterV2RuntimeName): boolean => runtime === value,
  );
 }
 function isReasoning(value: string): value is RosterV2ReasoningLevel {
  return ROSTER_V2_REASONING_LEVELS.some(
    (reasoning: RosterV2ReasoningLevel): boolean => reasoning === value,
  );
 }
 function requiredOwnValue(value: Record<string, unknown>, key: string): unknown {
  if (!Object.hasOwn(value, key)) {
    throw new FleetAgentMutationError('invalid-request', `--agent.${key} is required.`);
  }
  return value[key];
 }
 function isRecord(value: unknown): value is Record<string, unknown> {
  return (
    typeof value === 'object' &&
    value !== null &&
    !Array.isArray(value) &&
    Object.getPrototypeOf(value) === Object.prototype
  );
 }
 async function writeJsonOutcome(action: () => Promise<void>): Promise<void> {
  try {
    await action();
  } catch (error: unknown) {
    process.exitCode = 1;
    printJson({
      error: {
        code: error instanceof FleetAgentMutationError ? error.code : 'mutation-failed',
      },
    });
  }
 }
 function printJson(value: object): void {
  console.log(JSON.stringify(value));
 }
--- a/packages/mosaic/src/commands/fleet.spec.ts
+++ b/packages/mosaic/src/commands/fleet.spec.ts
@@ -1,4 +1,4 @@
-import { chmod, lstat, mkdir, mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises';
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { Command } from 'commander';
@@ -82,14 +82,10 @@ describe('registerFleetCommand', () => {
    expect(fleet!.commands.map((command) => command.name()).sort()).toEqual([
      'add',
      'backlog',
      'create',
      'delete',
      'get',
      'init',
      'install',
      'install-systemd',
      'persona',
      'plan',
      'profile',
      'provision',
      'ps',
@@ -98,7 +94,6 @@ describe('registerFleetCommand', () => {
      'start',
      'status',
      'stop',
      'update',
      'verify',
    ]);
  });
@@ -289,8 +284,6 @@ describe('fleet roster parsing', () => {
        'MOSAIC_AGENT_CLASS=implementer',
        'MOSAIC_AGENT_RUNTIME=codex',
        'MOSAIC_AGENT_MODEL=',
        'MOSAIC_AGENT_REASONING=',
        'MOSAIC_AGENT_TOOL_POLICY=',
        'MOSAIC_AGENT_WORKDIR=/srv/mosaic',
        'MOSAIC_TMUX_SOCKET=mosaic-fleet',
        '',
@@ -332,38 +325,57 @@ describe('fleet roster parsing', () => {
    );
  });
-  it('rejects legacy command overrides instead of merging them into generated authority', () => {
+  it('preserves site-owned agent EnvironmentFile overrides while refreshing roster keys', () => {
-    const generated = generateAgentEnv(
+    const generated = [
-      {
+      'MOSAIC_AGENT_NAME=coder0',
-        version: 1,
+      'MOSAIC_AGENT_RUNTIME=codex',
-        transport: 'tmux',
+      'MOSAIC_AGENT_WORKDIR=/srv/new',
-        tmux: { socketName: 'mosaic-fleet', holderSession: '_holder' },
+      'MOSAIC_TMUX_SOCKET=mosaic-fleet',
-        defaults: { workingDirectory: '/srv/new' },
+      '',
-        runtimes: {},
+    ].join('\n');
-        agents: [],
+    const existing = [
-      },
+      'MOSAIC_AGENT_NAME=old-name',
-      { name: 'coder0', className: 'code', runtime: 'codex' },
+      'MOSAIC_AGENT_RUNTIME=old-runtime',
-    );
+      'MOSAIC_AGENT_WORKDIR=/srv/old',
      'MOSAIC_TMUX_SOCKET=old-socket',
      'MOSAIC_AGENT_COMMAND=/home/jarvis/.config/mosaic/fleet/canary.sh',
      '# site note',
      '',
    ].join('\n');
-    expect((): string => mergeAgentEnv(generated, 'MOSAIC_AGENT_COMMAND=legacy-command\n')).toThrow(
+    expect(mergeAgentEnv(generated, existing)).toBe(
-      /MOSAIC_AGENT_COMMAND/,
+      [
        'MOSAIC_AGENT_NAME=coder0',
        'MOSAIC_AGENT_RUNTIME=codex',
        'MOSAIC_AGENT_WORKDIR=/srv/new',
        'MOSAIC_TMUX_SOCKET=mosaic-fleet',
        'MOSAIC_AGENT_COMMAND=/home/jarvis/.config/mosaic/fleet/canary.sh',
        '# site note',
        '',
      ].join('\n'),
    );
  });
-  it('does not merge a valid local value into the generated projection', () => {
+  it('updates (does not duplicate) MOSAIC_AGENT_CLASS on re-launch', () => {
-    const generated = generateAgentEnv(
+    const generated = [
-      {
+      'MOSAIC_AGENT_NAME=coder0',
-        version: 1,
+      'MOSAIC_AGENT_CLASS=orchestrator',
-        transport: 'tmux',
+      'MOSAIC_AGENT_RUNTIME=codex',
-        tmux: { socketName: 'mosaic-fleet', holderSession: '_holder' },
+      '',
-        defaults: { workingDirectory: '/srv/new' },
+    ].join('\n');
-        runtimes: {},
+    const existing = [
-        agents: [],
+      'MOSAIC_AGENT_NAME=coder0',
-      },
+      'MOSAIC_AGENT_CLASS=worker',
-      { name: 'coder0', className: 'code', runtime: 'codex' },
+      'MOSAIC_AGENT_RUNTIME=codex',
-    );
+      '',
    ].join('\n');
-    expect(mergeAgentEnv(generated, 'MOSAIC_RUNTIME_BIN=/opt/mosaic/bin\n')).toBe(generated);
+    const merged = mergeAgentEnv(generated, existing);
    // mergeAgentEnv keys by VAR name, so the regenerated CLASS wins and there is
    // exactly one MOSAIC_AGENT_CLASS line (no stale worker value left behind).
    expect(merged).toContain('MOSAIC_AGENT_CLASS=orchestrator');
    expect(merged).not.toContain('MOSAIC_AGENT_CLASS=worker');
    expect(merged.match(/^MOSAIC_AGENT_CLASS=/gm)).toHaveLength(1);
  });
  it('rejects unknown roster fields instead of silently defaulting', async () => {
@@ -1117,92 +1129,6 @@ describe('fleet command construction', () => {
    }
  });
  it('creates private managed directories and roster/projection files through fresh init and install under umask 022', async () => {
    const originalHome = process.env.HOME;
    const originalMosaicHome = process.env.MOSAIC_HOME;
    const originalUmask = process.umask(0o022);
    const home = await tempDir();
    process.env.HOME = home;
    delete process.env.MOSAIC_HOME;
    const mosaicHome = join(home, '.config', 'mosaic');
    const program = new Command();
    program.exitOverride();
    registerFleetCommand(program, { frameworkRoot: resolve(process.cwd(), 'framework') });
    try {
      await expect(
        program.parseAsync(['node', 'mosaic', 'fleet', 'init', '--profile', 'minimal', '--write']),
      ).resolves.toBeDefined();
      await expect(
        program.parseAsync(['node', 'mosaic', 'fleet', 'install', '--no-enable']),
      ).resolves.toBeDefined();
      for (const path of [
        mosaicHome,
        join(mosaicHome, 'fleet'),
        join(mosaicHome, 'fleet', 'agents'),
      ]) {
        expect((await stat(path)).mode & 0o777).toBe(0o700);
      }
      expect((await stat(join(mosaicHome, 'fleet', 'roster.yaml'))).mode & 0o777).toBe(0o600);
      expect(
        (await stat(join(mosaicHome, 'fleet', 'agents', 'canary-pi.env.generated'))).mode & 0o777,
      ).toBe(0o600);
    } finally {
      process.umask(originalUmask);
      if (originalHome === undefined) delete process.env.HOME;
      else process.env.HOME = originalHome;
      if (originalMosaicHome === undefined) delete process.env.MOSAIC_HOME;
      else process.env.MOSAIC_HOME = originalMosaicHome;
      await rm(home, { recursive: true, force: true });
    }
  });
  it('creates a private real projection directory and private generated files on fresh install', async () => {
    const originalHome = process.env.HOME;
    const home = await tempDir();
    process.env.HOME = home;
    const mosaicHome = join(home, '.config', 'mosaic');
    const agentEnvDir = join(mosaicHome, 'fleet', 'agents');
    const fleetDir = join(mosaicHome, 'fleet');
    await mkdir(fleetDir, { recursive: true, mode: 0o700 });
    await chmod(mosaicHome, 0o700);
    await chmod(fleetDir, 0o700);
    await writeFile(
      join(mosaicHome, 'fleet', 'roster.yaml'),
      [
        'version: 1',
        'transport: tmux',
        'agents:',
        '  - name: coder0',
        '    runtime: pi',
        '    class: code',
      ].join('\n'),
    );
    const program = new Command();
    program.exitOverride();
    registerFleetCommand(program, {
      frameworkRoot: resolve(process.cwd(), 'framework'),
      mosaicHome,
    });
    try {
      await expect(
        program.parseAsync(['node', 'mosaic', 'fleet', 'install', '--no-enable']),
      ).resolves.toBeDefined();
      const directoryMetadata = await lstat(agentEnvDir);
      expect(directoryMetadata.isDirectory()).toBe(true);
      expect(directoryMetadata.isSymbolicLink()).toBe(false);
      expect(directoryMetadata.mode & 0o777).toBe(0o700);
      expect((await stat(join(agentEnvDir, 'coder0.env.generated'))).mode & 0o777).toBe(0o600);
    } finally {
      if (originalHome === undefined) delete process.env.HOME;
      else process.env.HOME = originalHome;
      await rm(home, { recursive: true, force: true });
    }
  });
  it.each(['start', 'stop', 'restart', 'status'] as const)(
    'rejects single-agent %s for agents outside the roster',
    async (action) => {
@@ -1761,10 +1687,8 @@ describe('fleet ps — drift detection', () => {
 describe('fleet-polish bundle — boot-survival symmetry', () => {
  async function rosterHome(agents: string): Promise<string> {
    const home = await tempDir();
-    const fleetDir = join(home, 'fleet');
+    await mkdir(join(home, 'fleet'), { recursive: true });
-    await mkdir(fleetDir, { recursive: true, mode: 0o700 });
+    await writeFile(join(home, 'fleet', 'roster.yaml'), agents);
    await chmod(fleetDir, 0o700);
    await writeFile(join(fleetDir, 'roster.yaml'), agents);
    return home;
  }
@@ -3535,11 +3459,7 @@ describe('fleet add command', () => {
  async function makeHome(agents = ['orchestrator']): Promise<string> {
    const dir = await mkdtemp(join(tmpdir(), 'mosaic-fleet-add-'));
-    const fleetDir = join(dir, 'fleet');
+    await mkdir(join(dir, 'fleet', 'agents'), { recursive: true });
    const agentEnvDir = join(fleetDir, 'agents');
    await mkdir(agentEnvDir, { recursive: true, mode: 0o700 });
    await chmod(fleetDir, 0o700);
    await chmod(agentEnvDir, 0o700);
    const agentLines = agents.map((name) => {
      const cls = name === 'orchestrator' ? 'orchestrator' : 'worker';
      return `  - name: ${name}\n    runtime: claude\n    class: ${cls}`;
@@ -3573,110 +3493,11 @@ describe('fleet add command', () => {
    const roster = await loadFleetRoster(join(home, 'fleet', 'roster.yaml'));
    expect(roster.agents.map((a) => a.name)).toContain('coder0');
-    const envContent = await readFile(
+    const envContent = await readFile(join(home, 'fleet', 'agents', 'coder0.env'), 'utf8');
      join(home, 'fleet', 'agents', 'coder0.env.generated'),
      'utf8',
    );
    expect(envContent).toContain('MOSAIC_AGENT_NAME=coder0');
    expect(envContent).toContain('MOSAIC_AGENT_RUNTIME=codex');
  });
  it('rejects an unprojectable dogfood runtime without mutating roster or projection state', async () => {
    home = await makeHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const agentEnvDir = join(home, 'fleet', 'agents');
    const trackedPaths = [
      rosterPath,
      join(agentEnvDir, 'dogfood.env.generated'),
      join(agentEnvDir, 'dogfood.env.local'),
      join(agentEnvDir, 'dogfood.env.quarantine'),
    ];
    await writeFile(trackedPaths[1]!, 'generated-before\n');
    await writeFile(trackedPaths[2]!, 'MOSAIC_RUNTIME_BIN=/safe/runtime\n');
    await writeFile(trackedPaths[3]!, 'quarantine-before\n');
    const beforeState = new Map<string, Buffer>();
    for (const path of trackedPaths) beforeState.set(path, await readFile(path));
    const calls: string[][] = [];
    const runner: CommandRunner = async (command, args) => {
      calls.push([command, ...args]);
      return { stdout: '', stderr: '', exitCode: 0 };
    };
    const program = new Command();
    program.exitOverride();
    registerFleetCommand(program, { runner, mosaicHome: home });
    await expect(
      program.parseAsync([
        'node',
        'mosaic',
        'fleet',
        'add',
        'dogfood',
        '--runtime',
        'dogfood',
        '--class',
        'worker',
        '--no-start',
      ]),
    ).rejects.toThrow(/runtime/i);
    for (const path of trackedPaths) {
      expect(await readFile(path)).toEqual(beforeState.get(path));
    }
    expect(calls).toEqual([]);
  });
  it('rejects supported add with a deterministic quarantine conflict before roster persistence', async () => {
    home = await makeHome();
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const agentEnvDir = join(home, 'fleet', 'agents');
    const trackedPaths = [
      rosterPath,
      join(agentEnvDir, 'coder1.env.generated'),
      join(agentEnvDir, 'coder1.env.local'),
      join(agentEnvDir, 'coder1.env'),
      join(agentEnvDir, 'coder1.env.quarantine'),
    ];
    await writeFile(trackedPaths[1]!, 'generated-before\n', { mode: 0o600 });
    await writeFile(trackedPaths[2]!, 'MOSAIC_RUNTIME_BIN=/safe/runtime\n', { mode: 0o600 });
    await writeFile(trackedPaths[3]!, 'MOSAIC_AGENT_COMMAND=must-be-quarantined\n', {
      mode: 0o600,
    });
    await writeFile(trackedPaths[4]!, 'quarantine-before\n', { mode: 0o600 });
    const beforeState = new Map<string, Buffer>();
    for (const path of trackedPaths) beforeState.set(path, await readFile(path));
    const calls: string[][] = [];
    const runner: CommandRunner = async (command, args) => {
      calls.push([command, ...args]);
      return { stdout: '', stderr: '', exitCode: 0 };
    };
    const program = new Command();
    program.exitOverride();
    registerFleetCommand(program, { runner, mosaicHome: home });
    await expect(
      program.parseAsync([
        'node',
        'mosaic',
        'fleet',
        'add',
        'coder1',
        '--runtime',
        'codex',
        '--class',
        'worker',
        '--no-start',
      ]),
    ).rejects.toThrow('quarantine-exists');
    for (const path of trackedPaths) {
      expect(await readFile(path)).toEqual(beforeState.get(path));
    }
    expect(calls).toEqual([]);
  });
  it('--no-start skips the start command', async () => {
    home = await makeHome();
    const calls: string[][] = [];
@@ -3838,10 +3659,7 @@ describe('fleet remove command', () => {
      ].join('\n'),
    );
    // Create env and heartbeat files for coder0
-    await writeFile(
+    await writeFile(join(dir, 'fleet', 'agents', 'coder0.env'), 'MOSAIC_AGENT_NAME=coder0\n');
      join(dir, 'fleet', 'agents', 'coder0.env.generated'),
      'MOSAIC_AGENT_NAME=coder0\n',
    );
    await writeFile(join(dir, 'fleet', 'run', 'coder0.hb'), 'ts=2026-01-01T00:00:00.000Z\n');
    return dir;
  }
@@ -3920,15 +3738,12 @@ describe('fleet remove command', () => {
    await program.parseAsync(['node', 'mosaic', 'fleet', 'remove', 'coder0', '--keep-files']);
-    // Generated projection should still exist.
+    // Env file should still exist
-    const envContent = await readFile(
+    const envContent = await readFile(join(home, 'fleet', 'agents', 'coder0.env'), 'utf8');
      join(home, 'fleet', 'agents', 'coder0.env.generated'),
      'utf8',
    );
    expect(envContent).toContain('MOSAIC_AGENT_NAME=coder0');
  });
-  it('generated projection is removed by default (no --keep-files)', async () => {
+  it('env file is removed by default (no --keep-files)', async () => {
    home = await makeHome();
    const runner: CommandRunner = async () => ({ stdout: '', stderr: '', exitCode: 0 });
    const program = new Command();
@@ -3937,9 +3752,7 @@ describe('fleet remove command', () => {
    await program.parseAsync(['node', 'mosaic', 'fleet', 'remove', 'coder0']);
-    await expect(
+    await expect(readFile(join(home, 'fleet', 'agents', 'coder0.env'), 'utf8')).rejects.toThrow();
      readFile(join(home, 'fleet', 'agents', 'coder0.env.generated'), 'utf8'),
    ).rejects.toThrow();
  });
  it('removing the sole orchestrator throws with a clear error about the guard', async () => {
--- a/packages/mosaic/src/commands/fleet.ts
+++ b/packages/mosaic/src/commands/fleet.ts
@@ -18,21 +18,7 @@ import { spawn } from 'node:child_process';
 import * as readline from 'node:readline';
 import type { Command } from 'commander';
 import YAML from 'yaml';
 import {
  registerFleetAgentCrudCommands,
  type FleetAgentCrudCommandDeps,
 } from './fleet-agent-crud-command.js';
 import { resolveCommsBlock } from '../fleet/comms-onboarding.js';
 import {
  applyPreparedAgentEnvironmentProjection,
  ensureFleetHolderIdentity,
  GENERATED_AGENT_ENV_SUPPORTED_RUNTIMES,
  parseAgentEnvironment,
  prepareAgentEnvironmentProjection,
  renderGeneratedAgentEnvironment,
  writeAgentEnvironmentProjection,
  writeManagedFleetRoster,
 } from '../fleet/generated-env-boundary.js';
 import { registerFleetBacklogCommand } from './fleet-backlog.js';
 import { registerFleetPersonaCommand } from './fleet-personas.js';
 import { registerFleetProfileCommand } from './fleet-profiles.js';
@@ -77,7 +63,6 @@ export interface FleetCommandDeps {
   * Tests stub this to simulate interactive or non-interactive environments.
   */
  isStdinTTY?: boolean;
  projectionApplier?: FleetAgentCrudCommandDeps['projectionApplier'];
 }
 interface RawFleetRoster {
@@ -524,35 +509,50 @@ export async function generateNorthStarMarkdown(repoRoot?: string): Promise<stri
 }
 export function generateAgentEnv(roster: FleetRoster, agent: FleetAgent): string {
-  return renderGeneratedAgentEnvironment(generateAgentEnvValues(roster, agent));
+  const workingDirectory = agent.workingDirectory ?? roster.defaults.workingDirectory;
  return [
    `MOSAIC_AGENT_NAME=${shellEnvValue(agent.name)}`,
    // Per-agent class → start-agent-session.sh / launcher reads this to inject the
    // matching persona contract for the agent's class (default `worker`).
    `MOSAIC_AGENT_CLASS=${shellEnvValue(agent.className)}`,
    `MOSAIC_AGENT_RUNTIME=${shellEnvValue(agent.runtime)}`,
    // Per-agent model hint → start-agent-session.sh appends `--model <hint>` to
    // the `mosaic yolo` launch so workers run on the roster's model (e.g. pi on
    // openai-codex/gpt-5.5:high). Empty when the agent declares no model_hint.
    `MOSAIC_AGENT_MODEL=${shellEnvValue(agent.modelHint ?? '')}`,
    ...(agent.reasoningLevel !== undefined
      ? [`MOSAIC_AGENT_REASONING=${shellEnvValue(agent.reasoningLevel)}`]
      : []),
    ...(agent.toolPolicy !== undefined
      ? [`MOSAIC_AGENT_TOOL_POLICY=${shellEnvValue(agent.toolPolicy)}`]
      : []),
    `MOSAIC_AGENT_WORKDIR=${shellEnvValue(expandHome(workingDirectory))}`,
    `MOSAIC_TMUX_SOCKET=${shellEnvValue(roster.tmux.socketName)}`,
    '',
  ].join('\n');
 }
 /**
 * Compatibility shim for callers that previously merged site-owned data into a
 * generated file. Local data is validated but never appended to the generated
 * projection, preventing a local override from becoming hidden authority.
 */
 export function mergeAgentEnv(generatedEnv: string, existingEnv?: string): string {
-  parseAgentEnvironment(generatedEnv, 'generated');
+  if (!existingEnv?.trim()) {
  if (existingEnv?.trim()) parseAgentEnvironment(existingEnv, 'local');
    return generatedEnv;
  }
-
+  const generatedKeys = new Set(
-function generateAgentEnvValues(
+    generatedEnv
-  roster: FleetRoster,
+      .split('\n')
-  agent: FleetAgent,
+      .map((line) => line.match(/^([A-Za-z_][A-Za-z0-9_]*)=/)?.[1])
-): Readonly<Record<string, string>> {
+      .filter((key): key is string => key !== undefined),
-  const workingDirectory = agent.workingDirectory ?? roster.defaults.workingDirectory;
+  );
-  return {
+  const preservedLines = existingEnv.split('\n').filter((line) => {
-    MOSAIC_AGENT_NAME: agent.name,
+    if (!line.trim()) {
-    MOSAIC_AGENT_CLASS: agent.className,
+      return false;
-    MOSAIC_AGENT_RUNTIME: agent.runtime,
+    }
-    MOSAIC_AGENT_MODEL: agent.modelHint ?? '',
+    const key = line.match(/^([A-Za-z_][A-Za-z0-9_]*)=/)?.[1];
-    MOSAIC_AGENT_REASONING: agent.reasoningLevel ?? '',
+    return key === undefined || !generatedKeys.has(key);
-    MOSAIC_AGENT_TOOL_POLICY: agent.toolPolicy ?? '',
+  });
-    MOSAIC_AGENT_WORKDIR: expandHome(workingDirectory),
+  if (preservedLines.length === 0) {
-    MOSAIC_TMUX_SOCKET: roster.tmux.socketName,
+    return generatedEnv;
-  };
+  }
  return [generatedEnv.trimEnd(), ...preservedLines, ''].join('\n');
 }
 export function buildFleetServiceCommand(action: FleetServiceAction, agentName?: string): string[] {
@@ -1544,12 +1544,8 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
          `Fleet roster already exists: ${destination}. Re-run with --force to overwrite.`,
        );
      }
      if (resolve(destination) === resolve(activePaths.rosterPath)) {
        await writeManagedFleetRoster(activePaths.mosaicHome, destination, content);
      } else {
      await mkdir(dirname(destination), { recursive: true });
      await writeFile(destination, content);
      }
      // Guarantee the two-agent floor: exactly one orchestrator AND at least
      // one enhancer for every profile except the sanctioned no-orchestrator
@@ -1952,17 +1948,15 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
        };
        const updatedRoster = addAgentToRoster(roster, newAgent);
        const generated = generateAgentEnvValues(updatedRoster, newAgent);
        // Preflight every deterministic projection, local, legacy, quarantine,
        // and managed-directory condition before roster authority changes.
        const preparedProjection = await prepareAgentEnvironmentProjection({
          mosaicHome: activePaths.mosaicHome,
          agentEnvDir: activePaths.agentEnvDir,
          agentName: name,
          generated,
        });
        await writeFile(rosterPath, serializeRosterToYaml(updatedRoster));
-        await applyPreparedAgentEnvironmentProjection(preparedProjection);
+
        const envPath = join(activePaths.agentEnvDir, `${name}.env`);
        const existingEnv = (await canRead(envPath)) ? await readFile(envPath, 'utf8') : undefined;
        await mkdir(activePaths.agentEnvDir, { recursive: true });
        await writeFile(
          envPath,
          mergeAgentEnv(generateAgentEnv(updatedRoster, newAgent), existingEnv),
        );
        console.log(`Added ${name} (${opts.runtime}/${opts.class}) to the fleet.`);
@@ -2043,11 +2037,10 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
      // Write updated roster
      await writeFile(rosterPath, serializeRosterToYaml(updatedRoster));
-      // Delete the non-authoritative generated projection and heartbeat files
+      // Delete env and heartbeat files (best-effort, non-fatal)
      // (best-effort, non-fatal). Operator local/quarantine data is retained.
      if (!opts.keepFiles) {
        try {
-          await unlink(join(activePaths.agentEnvDir, `${name}.env.generated`));
+          await unlink(join(activePaths.agentEnvDir, `${name}.env`));
        } catch {
          // best-effort
        }
@@ -2079,10 +2072,6 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
  // profile. DRY-RUN by default; --write persists under the same --mosaic-home.
  registerFleetProvisionCommand(cmd, () => cmd.opts<{ mosaicHome: string }>().mosaicHome);
  // Roster-v2 desired-state mutations belong directly to the fleet control
  // plane; they do not share the root `mosaic agent` gateway-backed surface.
  registerFleetAgentCrudCommands(cmd, deps);
  return cmd;
 }
@@ -2339,17 +2328,16 @@ async function installFleet(cmd: Command, frameworkRoot: string): Promise<void>
  const activePaths = resolveFleetPaths(cmd.opts<{ mosaicHome: string }>().mosaicHome);
  assertDefaultMosaicHomeForSystemd(activePaths.mosaicHome);
  const roster = await loadRosterForCommand(cmd);
  await ensureFleetHolderIdentity(activePaths.mosaicHome);
  await mkdir(activePaths.fleetToolsDir, { recursive: true });
  await mkdir(activePaths.tmuxToolsDir, { recursive: true });
  await mkdir(activePaths.systemdUserDir, { recursive: true });
  await mkdir(activePaths.agentEnvDir, { recursive: true });
  const startAgentSessionPath = join(activePaths.fleetToolsDir, 'start-agent-session.sh');
  const startInteractionServicePath = join(
    activePaths.fleetToolsDir,
    'start-interaction-service.sh',
  );
  const startTmuxHolderPath = join(activePaths.fleetToolsDir, 'start-tmux-holder.sh');
  const printInteractionPolicyPath = join(
    activePaths.fleetToolsDir,
    'print-interaction-effective-policy.sh',
@@ -2359,7 +2347,6 @@ async function installFleet(cmd: Command, frameworkRoot: string): Promise<void>
  const executableToolPaths = [
    startAgentSessionPath,
    startInteractionServicePath,
    startTmuxHolderPath,
    printInteractionPolicyPath,
    sendMessagePath,
    agentSendPath,
@@ -2372,10 +2359,6 @@ async function installFleet(cmd: Command, frameworkRoot: string): Promise<void>
    join(frameworkRoot, 'tools', 'fleet', 'start-interaction-service.sh'),
    startInteractionServicePath,
  );
  await copyFile(
    join(frameworkRoot, 'tools', 'fleet', 'start-tmux-holder.sh'),
    startTmuxHolderPath,
  );
  await copyFile(
    join(frameworkRoot, 'tools', 'fleet', 'print-interaction-effective-policy.sh'),
    printInteractionPolicyPath,
@@ -2399,12 +2382,9 @@ async function installFleet(cmd: Command, frameworkRoot: string): Promise<void>
  );
  for (const agent of roster.agents) {
-    await writeAgentEnvironmentProjection({
+    const envPath = join(activePaths.agentEnvDir, `${agent.name}.env`);
-      mosaicHome: activePaths.mosaicHome,
+    const existingEnv = (await canRead(envPath)) ? await readFile(envPath, 'utf8') : undefined;
-      agentEnvDir: activePaths.agentEnvDir,
+    await writeFile(envPath, mergeAgentEnv(generateAgentEnv(roster, agent), existingEnv));
      agentName: agent.name,
      generated: generateAgentEnvValues(roster, agent),
    });
  }
  console.log(`Installed fleet files for ${roster.agents.length} agent(s).`);
@@ -2676,6 +2656,19 @@ function expandHome(path: string): string {
  return path === '~' || path.startsWith('~/') ? join(homedir(), path.slice(2)) : path;
 }
 function shellEnvValue(value: string): string {
  // Empty ⇒ a bare `VAR=` (unambiguous empty in a systemd EnvironmentFile and
  // when shell-sourced). Quoting it as '' risks a literal two-char value (e.g.
  // a tmux socket named "''"), which would defeat the default-socket behavior.
  if (value === '') {
    return '';
  }
  if (/^[A-Za-z0-9_./:=@+-]+$/.test(value)) {
    return value;
  }
  return `'${value.replaceAll("'", "'\"'\"'")}'`;
 }
 async function stopFleetBestEffort(runner: CommandRunner, agentNames: string[]): Promise<void> {
  const failures: string[] = [];
  for (const agentName of agentNames) {
@@ -2777,8 +2770,13 @@ export function countEnhancers(roster: FleetRoster): number {
 }
 /** Valid runtime identifiers for fleet agents. */
-/** Runtime launchers accepted by `fleet add`; shared with the generated projection validator. */
+export const VALID_FLEET_RUNTIMES: readonly string[] = [
-export const VALID_FLEET_RUNTIMES: readonly string[] = GENERATED_AGENT_ENV_SUPPORTED_RUNTIMES;
+  'pi',
  'claude',
  'codex',
  'opencode',
  'dogfood',
 ];
 /**
 * Add a new agent to a fleet roster (immutable — returns a new FleetRoster).
--- a/packages/mosaic/src/fleet/fleet-agent-crud.spec.ts
+++ b/packages/mosaic/src/fleet/fleet-agent-crud.spec.ts
@@ -1,220 +0,0 @@
 import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterEach, describe, expect, it } from 'vitest';
 import {
  FleetAgentMutationError,
  executeFleetAgentMutation,
  planFleetAgentMutation,
  type FleetAgentMutationRequest,
 } from './fleet-agent-crud.js';
 import { parseRosterV2, renderRosterV2Yaml } from './roster-v2.js';
 const roster = parseRosterV2(`
 version: 2
 generation: 7
 transport: tmux
 tmux:
  socket_name: mosaic-fleet
  holder_session: _holder
 defaults:
  working_directory: /srv/mosaic
  runtime: pi
 runtimes:
  pi:
    reset_command: /new
 agents:
  - name: orchestrator
    alias: Orchestrator
    class: orchestrator
    runtime: pi
    provider: openai
    model: gpt-5.6-sol
    reasoning: high
    tool_policy: orchestrator
    working_directory: /srv/mosaic
    persistent_persona: true
    reset_between_tasks: false
    lifecycle:
      enabled: true
      desired_state: stopped
    launch:
      yolo: true
 `);
 function createRequest(): FleetAgentMutationRequest {
  return {
    operation: 'create',
    expectedGeneration: 7,
    agent: {
      name: 'coder0',
      alias: 'Coder 0',
      className: 'code',
      runtime: 'pi',
      provider: 'openai',
      model: 'gpt-5.6-sol',
      reasoning: 'high',
      toolPolicy: 'code',
      workingDirectory: '/srv/mosaic',
      persistentPersona: false,
      resetBetweenTasks: true,
      launch: { yolo: true },
    },
  };
 }
 let cleanup: string | undefined;
 afterEach(async (): Promise<void> => {
  if (cleanup) await rm(cleanup, { recursive: true, force: true });
  cleanup = undefined;
 });
 async function semanticDirs(): Promise<{ rolesDir: string; overrideDir: string }> {
  cleanup = await mkdtemp(join(tmpdir(), 'mosaic-fleet-crud-'));
  const rolesDir = join(cleanup, 'roles');
  const overrideDir = join(cleanup, 'roles.local');
  await mkdir(rolesDir, { recursive: true });
  await mkdir(overrideDir, { recursive: true });
  for (const klass of ['orchestrator', 'code']) {
    await writeFile(join(rolesDir, `${klass}.md`), `# ${klass}\n\n(\`class: ${klass}\`)\n`);
  }
  return { rolesDir, overrideDir };
 }
 describe('fleet agent CRUD plan', (): void => {
  it('creates stopped-by-default desired state and a deterministic generation plan', (): void => {
    const plan = planFleetAgentMutation(roster, createRequest());
    expect(plan).toMatchObject({
      operation: 'create',
      currentGeneration: 7,
      nextGeneration: 8,
      changed: true,
      agent: { name: 'coder0', lifecycle: { enabled: true, desiredState: 'stopped' } },
    });
  });
  it('rejects a stale generation before proposing effects', (): void => {
    expect((): void => {
      planFleetAgentMutation(roster, { ...createRequest(), expectedGeneration: 6 });
    }).toThrow(FleetAgentMutationError);
  });
  it('treats an equivalent retry as an idempotent no-op', (): void => {
    const created = planFleetAgentMutation(roster, createRequest()).roster;
    const retried = planFleetAgentMutation(created, {
      ...createRequest(),
      expectedGeneration: created.generation,
    });
    expect(retried).toMatchObject({ changed: false, currentGeneration: 8, nextGeneration: 8 });
  });
 });
 describe('fleet agent CRUD execution', (): void => {
  it('keeps roster and projections unchanged for dry-run', async (): Promise<void> => {
    const dirs = await semanticDirs();
    const home = join(cleanup!, 'mosaic');
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    await mkdir(join(home, 'fleet', 'agents'), { recursive: true, mode: 0o700 });
    await writeFile(rosterPath, 'before\n', { mode: 0o600 });
    const result = await executeFleetAgentMutation({
      roster,
      request: createRequest(),
      mosaicHome: home,
      rosterPath,
      agentEnvDir: join(home, 'fleet', 'agents'),
      rolesDir: dirs.rolesDir,
      overrideDir: dirs.overrideDir,
      dryRun: true,
    });
    expect(result.applied).toBe(false);
    expect(await readFile(rosterPath, 'utf8')).toBe('before\n');
    await expect(
      readFile(join(home, 'fleet', 'agents', 'coder0.env.generated'), 'utf8'),
    ).rejects.toThrow();
  });
  it('fails closed when another writer owns the mutation lock', async (): Promise<void> => {
    const dirs = await semanticDirs();
    const home = join(cleanup!, 'mosaic');
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    await mkdir(join(home, 'fleet', 'agents'), { recursive: true, mode: 0o700 });
    await writeFile(rosterPath, renderRosterV2Yaml(roster), { mode: 0o600 });
    await writeFile(`${rosterPath}.mutation.lock`, 'owned\n', { mode: 0o600 });
    await expect(
      executeFleetAgentMutation({
        roster,
        request: createRequest(),
        mosaicHome: home,
        rosterPath,
        agentEnvDir: join(home, 'fleet', 'agents'),
        rolesDir: dirs.rolesDir,
        overrideDir: dirs.overrideDir,
      }),
    ).rejects.toMatchObject({ code: 'concurrent-mutation' });
    expect(await readFile(rosterPath, 'utf8')).toBe(renderRosterV2Yaml(roster));
  });
  it('deletes only the removed agent generated projection when it is stale or absent', async (): Promise<void> => {
    const dirs = await semanticDirs();
    const home = join(cleanup!, 'mosaic');
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    const agentEnvDir = join(home, 'fleet', 'agents');
    const created = planFleetAgentMutation(roster, createRequest()).roster;
    await mkdir(agentEnvDir, { recursive: true, mode: 0o700 });
    await writeFile(rosterPath, renderRosterV2Yaml(created), { mode: 0o600 });
    await writeFile(join(agentEnvDir, 'coder0.env.local'), 'MOSAIC_RUNTIME_BIN=/usr/bin/pi\n', {
      mode: 0o600,
    });
    const result = await executeFleetAgentMutation({
      roster: created,
      request: { operation: 'delete', expectedGeneration: 8, name: 'coder0' },
      mosaicHome: home,
      rosterPath,
      agentEnvDir,
      rolesDir: dirs.rolesDir,
      overrideDir: dirs.overrideDir,
    });
    expect(result).toMatchObject({ applied: true, plan: { nextGeneration: 9 } });
    await expect(readFile(join(agentEnvDir, 'coder0.env.generated'), 'utf8')).rejects.toThrow();
    expect(await readFile(join(agentEnvDir, 'coder0.env.local'), 'utf8')).toBe(
      'MOSAIC_RUNTIME_BIN=/usr/bin/pi\n',
    );
  });
  it('returns redacted projection recovery after the authoritative roster write', async (): Promise<void> => {
    const dirs = await semanticDirs();
    const home = join(cleanup!, 'mosaic');
    const rosterPath = join(home, 'fleet', 'roster.yaml');
    await mkdir(join(home, 'fleet', 'agents'), { recursive: true, mode: 0o700 });
    await writeFile(rosterPath, renderRosterV2Yaml(roster), { mode: 0o600 });
    const result = await executeFleetAgentMutation({
      roster,
      request: createRequest(),
      mosaicHome: home,
      rosterPath,
      agentEnvDir: join(home, 'fleet', 'agents'),
      rolesDir: dirs.rolesDir,
      overrideDir: dirs.overrideDir,
      projectionApplier: async (): Promise<void> => {
        throw new Error('MOSAIC_AGENT_COMMAND=must-not-leak');
      },
    });
    expect(result).toMatchObject({
      applied: false,
      authoritativeRoster: 'committed',
      projections: 'incomplete',
      recovery: { code: 'projection-apply-failed', action: 'regenerate-projections-from-roster' },
    });
    expect(JSON.stringify(result)).not.toContain('must-not-leak');
    expect(parseRosterV2(await readFile(rosterPath, 'utf8'), 'yaml').generation).toBe(8);
  });
 });
--- a/packages/mosaic/src/fleet/fleet-agent-crud.ts
+++ b/packages/mosaic/src/fleet/fleet-agent-crud.ts
@@ -1,397 +0,0 @@
 import { open, readFile, unlink } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import {
  applyPreparedAgentEnvironmentProjection,
  prepareAgentGeneratedProjectionDeletion,
  prepareAgentEnvironmentProjection,
  type PreparedAgentEnvironmentProjection,
  writeManagedFleetRoster,
 } from './generated-env-boundary.js';
 import {
  parseRosterV2,
  renderRosterV2Yaml,
  validateRosterV2Semantics,
  type FleetRosterV2,
  type FleetRosterV2Agent,
  type FleetRosterV2Launch,
  type FleetRosterV2Lifecycle,
  type RosterV2ReasoningLevel,
  type RosterV2RuntimeName,
 } from './roster-v2.js';
 export type FleetAgentMutationOperation = 'create' | 'update' | 'delete';
 export interface FleetAgentMutationAgent {
  readonly name: string;
  readonly alias: string;
  readonly className: string;
  readonly runtime: RosterV2RuntimeName;
  readonly provider: string;
  readonly model: string;
  readonly reasoning: RosterV2ReasoningLevel;
  readonly toolPolicy: string;
  readonly workingDirectory: string;
  readonly persistentPersona: boolean;
  readonly resetBetweenTasks: boolean;
  readonly launch: FleetRosterV2Launch;
 }
 export interface FleetAgentMutationRequest {
  readonly operation: FleetAgentMutationOperation;
  readonly expectedGeneration: number;
  readonly name?: string;
  readonly agent?: FleetAgentMutationAgent;
  readonly persistedStart?: boolean;
 }
 export interface FleetAgentMutationPlan {
  readonly operation: FleetAgentMutationOperation;
  readonly currentGeneration: number;
  readonly nextGeneration: number;
  readonly changed: boolean;
  readonly roster: FleetRosterV2;
  readonly agent?: FleetRosterV2Agent;
 }
 export type FleetAgentMutationAuthoritativeRosterState = 'unchanged' | 'committed';
 export type FleetAgentMutationProjectionState = 'not-applied' | 'complete' | 'incomplete';
 export interface FleetAgentMutationResult {
  /** True only when every requested roster and projection write completed. */
  readonly applied: boolean;
  /** Whether the authoritative roster changed on disk. */
  readonly authoritativeRoster: FleetAgentMutationAuthoritativeRosterState;
  /** Whether derived projections were skipped, complete, or require recovery. */
  readonly projections: FleetAgentMutationProjectionState;
  readonly plan: FleetAgentMutationPlan;
  readonly recovery?: FleetAgentMutationRecovery;
 }
 export interface FleetAgentMutationRecovery {
  readonly code: 'projection-apply-failed';
  readonly rosterPath: string;
  readonly action: 'regenerate-projections-from-roster';
 }
 export interface FleetAgentMutationOptions {
  readonly roster: FleetRosterV2;
  readonly request: FleetAgentMutationRequest;
  readonly mosaicHome: string;
  readonly rosterPath: string;
  readonly agentEnvDir: string;
  readonly rolesDir: string;
  readonly overrideDir: string;
  readonly dryRun?: boolean;
  readonly projectionApplier?: (prepared: PreparedAgentEnvironmentProjection) => Promise<unknown>;
 }
 export class FleetAgentMutationError extends Error {
  constructor(
    readonly code:
      | 'stale-generation'
      | 'agent-conflict'
      | 'agent-not-found'
      | 'invalid-request'
      | 'concurrent-mutation'
      | 'projection-apply-failed',
    message: string,
  ) {
    super(message);
    this.name = FleetAgentMutationError.name;
  }
 }
 /** Plans a generation-guarded desired-state mutation without writing any file. */
 export function planFleetAgentMutation(
  roster: FleetRosterV2,
  request: FleetAgentMutationRequest,
 ): FleetAgentMutationPlan {
  if (request.expectedGeneration !== roster.generation) {
    throw new FleetAgentMutationError(
      'stale-generation',
      `Expected roster generation ${request.expectedGeneration}; current generation is ${roster.generation}.`,
    );
  }
  if (request.operation === 'create') return planCreate(roster, request);
  if (request.operation === 'update') return planUpdate(roster, request);
  return planDelete(roster, request);
 }
 /**
 * Validates the complete proposed roster and its deterministic projections before
 * changing the roster authority. The only post-roster write is a derived projection.
 */
 export async function executeFleetAgentMutation(
  options: FleetAgentMutationOptions,
 ): Promise<FleetAgentMutationResult> {
  const plan = planFleetAgentMutation(options.roster, options.request);
  await validateRosterV2Semantics(plan.roster, {
    rolesDir: options.rolesDir,
    overrideDir: options.overrideDir,
  });
  const prepared = await prepareProjections(plan.roster, options.mosaicHome, options.agentEnvDir);
  if (plan.operation === 'delete' && plan.agent) {
    // Delete validates only the exact generated projection. Local overrides,
    // legacy input, and quarantine records are retained operator state.
    await prepareAgentGeneratedProjectionDeletion({
      mosaicHome: options.mosaicHome,
      agentEnvDir: options.agentEnvDir,
      agentName: plan.agent.name,
    });
  }
  if (options.dryRun === true || !plan.changed) {
    return { applied: false, authoritativeRoster: 'unchanged', projections: 'not-applied', plan };
  }
  const lockPath = `${options.rosterPath}.mutation.lock`;
  const release = await acquireMutationLock(lockPath);
  try {
    const persisted = parseRosterV2(await readFile(options.rosterPath, 'utf8'), 'yaml');
    if (persisted.generation !== options.roster.generation) {
      throw new FleetAgentMutationError(
        'stale-generation',
        `Expected roster generation ${options.roster.generation}; current generation is ${persisted.generation}.`,
      );
    }
    await writeManagedFleetRoster(
      options.mosaicHome,
      options.rosterPath,
      renderRosterV2Yaml(plan.roster),
    );
    const apply = options.projectionApplier ?? applyPreparedAgentEnvironmentProjection;
    try {
      for (const projection of prepared) await apply(projection);
      if (plan.operation === 'delete' && plan.agent) {
        await prepareAgentGeneratedProjectionDeletion({
          mosaicHome: options.mosaicHome,
          agentEnvDir: options.agentEnvDir,
          agentName: plan.agent.name,
        });
        await removeGeneratedProjection(options.agentEnvDir, plan.agent.name);
      }
    } catch {
      throw new FleetAgentMutationError(
        'projection-apply-failed',
        `Projection application failed after roster write; regenerate projections from ${options.rosterPath}.`,
      );
    }
    return { applied: true, authoritativeRoster: 'committed', projections: 'complete', plan };
  } catch (error: unknown) {
    if (error instanceof FleetAgentMutationError && error.code === 'projection-apply-failed') {
      return {
        applied: false,
        authoritativeRoster: 'committed',
        projections: 'incomplete',
        plan,
        recovery: {
          code: 'projection-apply-failed',
          rosterPath: options.rosterPath,
          action: 'regenerate-projections-from-roster',
        },
      };
    }
    throw error;
  } finally {
    await release();
  }
 }
 function planCreate(
  roster: FleetRosterV2,
  request: FleetAgentMutationRequest,
 ): FleetAgentMutationPlan {
  if (!request.agent)
    throw new FleetAgentMutationError('invalid-request', 'Create requires an agent.');
  const existing = roster.agents.find(
    (agent: FleetRosterV2Agent): boolean => agent.name === request.agent?.name,
  );
  const created = toRosterAgent(request.agent, request.persistedStart === true);
  if (existing) {
    if (sameAgent(existing, created)) return unchangedPlan(roster, request.operation, existing);
    throw new FleetAgentMutationError('agent-conflict', `Agent "${created.name}" already exists.`);
  }
  return changedPlan(roster, request.operation, [...roster.agents, created], created);
 }
 function planUpdate(
  roster: FleetRosterV2,
  request: FleetAgentMutationRequest,
 ): FleetAgentMutationPlan {
  if (!request.name || !request.agent) {
    throw new FleetAgentMutationError('invalid-request', 'Update requires name and agent.');
  }
  const existing = roster.agents.find(
    (agent: FleetRosterV2Agent): boolean => agent.name === request.name,
  );
  if (!existing)
    throw new FleetAgentMutationError(
      'agent-not-found',
      `Agent "${request.name}" is not in roster.`,
    );
  if (request.agent.name !== request.name) {
    throw new FleetAgentMutationError(
      'invalid-request',
      'Agent names are immutable during update.',
    );
  }
  const updated = {
    ...toRosterAgent(request.agent, existing.lifecycle.desiredState === 'running'),
    lifecycle: existing.lifecycle,
  };
  if (sameAgent(existing, updated)) return unchangedPlan(roster, request.operation, existing);
  return changedPlan(
    roster,
    request.operation,
    roster.agents.map(
      (agent: FleetRosterV2Agent): FleetRosterV2Agent =>
        agent.name === request.name ? updated : agent,
    ),
    updated,
  );
 }
 function planDelete(
  roster: FleetRosterV2,
  request: FleetAgentMutationRequest,
 ): FleetAgentMutationPlan {
  if (!request.name) throw new FleetAgentMutationError('invalid-request', 'Delete requires name.');
  const existing = roster.agents.find(
    (agent: FleetRosterV2Agent): boolean => agent.name === request.name,
  );
  if (!existing) return unchangedPlan(roster, request.operation);
  return changedPlan(
    roster,
    request.operation,
    roster.agents.filter((agent: FleetRosterV2Agent): boolean => agent.name !== request.name),
    existing,
  );
 }
 function toRosterAgent(
  input: FleetAgentMutationAgent,
  persistedStart: boolean,
 ): FleetRosterV2Agent {
  const lifecycle: FleetRosterV2Lifecycle = {
    enabled: true,
    desiredState: persistedStart ? 'running' : 'stopped',
  };
  return { ...input, lifecycle };
 }
 function changedPlan(
  roster: FleetRosterV2,
  operation: FleetAgentMutationOperation,
  agents: readonly FleetRosterV2Agent[],
  agent?: FleetRosterV2Agent,
 ): FleetAgentMutationPlan {
  const proposed = { ...roster, generation: roster.generation + 1, agents };
  const normalized = parseRosterV2(renderRosterV2Yaml(proposed), 'yaml');
  return {
    operation,
    currentGeneration: roster.generation,
    nextGeneration: normalized.generation,
    changed: true,
    roster: normalized,
    ...(agent ? { agent } : {}),
  };
 }
 function unchangedPlan(
  roster: FleetRosterV2,
  operation: FleetAgentMutationOperation,
  agent?: FleetRosterV2Agent,
 ): FleetAgentMutationPlan {
  return {
    operation,
    currentGeneration: roster.generation,
    nextGeneration: roster.generation,
    changed: false,
    roster,
    ...(agent ? { agent } : {}),
  };
 }
 function sameAgent(left: FleetRosterV2Agent, right: FleetRosterV2Agent): boolean {
  return (
    left.name === right.name &&
    left.alias === right.alias &&
    left.className === right.className &&
    left.runtime === right.runtime &&
    left.provider === right.provider &&
    left.model === right.model &&
    left.reasoning === right.reasoning &&
    left.toolPolicy === right.toolPolicy &&
    left.workingDirectory === right.workingDirectory &&
    left.persistentPersona === right.persistentPersona &&
    left.resetBetweenTasks === right.resetBetweenTasks &&
    left.launch.yolo === right.launch.yolo &&
    left.lifecycle.enabled === right.lifecycle.enabled &&
    left.lifecycle.desiredState === right.lifecycle.desiredState
  );
 }
 async function prepareProjections(
  roster: FleetRosterV2,
  mosaicHome: string,
  agentEnvDir: string,
 ): Promise<readonly PreparedAgentEnvironmentProjection[]> {
  const projections: PreparedAgentEnvironmentProjection[] = [];
  for (const agent of roster.agents) {
    projections.push(
      await prepareAgentEnvironmentProjection({
        mosaicHome,
        agentEnvDir,
        agentName: agent.name,
        generated: generatedValues(roster, agent),
      }),
    );
  }
  return projections;
 }
 function generatedValues(
  roster: FleetRosterV2,
  agent: FleetRosterV2Agent,
 ): Readonly<Record<string, string>> {
  return {
    MOSAIC_AGENT_NAME: agent.name,
    MOSAIC_AGENT_CLASS: agent.className,
    MOSAIC_AGENT_RUNTIME: agent.runtime,
    MOSAIC_AGENT_MODEL: agent.model,
    MOSAIC_AGENT_REASONING: agent.reasoning,
    MOSAIC_AGENT_TOOL_POLICY: agent.toolPolicy,
    MOSAIC_AGENT_WORKDIR: agent.workingDirectory,
    MOSAIC_TMUX_SOCKET: roster.tmux.socketName,
  };
 }
 async function removeGeneratedProjection(agentEnvDir: string, agentName: string): Promise<void> {
  try {
    await unlink(join(agentEnvDir, `${agentName}.env.generated`));
  } catch (error: unknown) {
    if (isMissingFile(error)) return;
    throw error;
  }
 }
 function isMissingFile(error: unknown): boolean {
  return typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT';
 }
 async function acquireMutationLock(lockPath: string): Promise<() => Promise<void>> {
  try {
    const handle = await open(lockPath, 'wx', 0o600);
    await handle.close();
  } catch {
    throw new FleetAgentMutationError(
      'concurrent-mutation',
      `Another roster mutation is in progress for ${dirname(lockPath)}.`,
    );
  }
  return async (): Promise<void> => {
    await unlink(lockPath).catch((): void => {});
  };
 }
--- a/packages/mosaic/src/fleet/generated-env-boundary.spec.ts
+++ b/packages/mosaic/src/fleet/generated-env-boundary.spec.ts
@@ -1,279 +0,0 @@
 import {
  chmod,
  mkdir,
  mkdtemp,
  readFile,
  rename,
  rm,
  stat,
  symlink,
  writeFile,
 } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { afterEach, describe, expect, it } from 'vitest';
 import {
  AgentEnvBoundaryError,
  parseAgentEnvironment,
  renderGeneratedAgentEnvironment,
  writeAgentEnvironmentProjection,
 } from './generated-env-boundary.js';
 const generatedValues = {
  MOSAIC_AGENT_NAME: 'coder0',
  MOSAIC_AGENT_CLASS: 'code',
  MOSAIC_AGENT_RUNTIME: 'pi',
  MOSAIC_AGENT_MODEL: 'openai-codex/gpt-5.6-sol',
  MOSAIC_AGENT_REASONING: 'high',
  MOSAIC_AGENT_TOOL_POLICY: 'code',
  MOSAIC_AGENT_WORKDIR: '/srv/mosaic',
  MOSAIC_TMUX_SOCKET: 'mosaic-fleet',
 };
 describe('generated fleet agent environment boundary', (): void => {
  let cleanup: string | undefined;
  afterEach(async (): Promise<void> => {
    if (cleanup) {
      await rm(cleanup, { recursive: true, force: true });
      cleanup = undefined;
    }
  });
  it('renders a deterministic complete generated projection', (): void => {
    expect(renderGeneratedAgentEnvironment(generatedValues)).toBe(
      [
        'MOSAIC_AGENT_NAME=coder0',
        'MOSAIC_AGENT_CLASS=code',
        'MOSAIC_AGENT_RUNTIME=pi',
        'MOSAIC_AGENT_MODEL=openai-codex/gpt-5.6-sol',
        'MOSAIC_AGENT_REASONING=high',
        'MOSAIC_AGENT_TOOL_POLICY=code',
        'MOSAIC_AGENT_WORKDIR=/srv/mosaic',
        'MOSAIC_TMUX_SOCKET=mosaic-fleet',
        '',
      ].join('\n'),
    );
  });
  it.each([
    ['generated-key shadowing', 'MOSAIC_AGENT_RUNTIME=codex\n'],
    ['unknown key', 'UNRELATED_SETTING=value\n'],
    ['arbitrary command', 'MOSAIC_AGENT_COMMAND=mosaic yolo codex\n'],
    ['sensitive key', 'MOSAIC_AGENT_TOKEN=do-not-log-me\n'],
    ['malformed syntax', 'export MOSAIC_RUNTIME_BIN=/opt/bin\n'],
    ['duplicate keys', 'MOSAIC_RUNTIME_BIN=/opt/bin\nMOSAIC_RUNTIME_BIN=/other/bin\n'],
  ])('rejects local %s without echoing values', (_name: string, source: string): void => {
    let error: unknown;
    try {
      parseAgentEnvironment(source, 'local');
    } catch (caught: unknown) {
      error = caught;
    }
    expect(error).toBeInstanceOf(AgentEnvBoundaryError);
    expect(String(error)).not.toContain('mosaic yolo codex');
    expect(String(error)).not.toContain('do-not-log-me');
    expect(String(error)).toMatch(/key=.*sha256=/);
  });
  it('rejects unsafe generated paths before any launch consumer can use them', (): void => {
    expect((): void => {
      renderGeneratedAgentEnvironment({
        ...generatedValues,
        MOSAIC_AGENT_WORKDIR: '../outside',
      });
    }).toThrow(AgentEnvBoundaryError);
  });
  it('creates missing managed directories privately before writing a projection', async (): Promise<void> => {
    cleanup = await mkdtemp(join(tmpdir(), 'mosaic-generated-env-'));
    const mosaicHome = join(cleanup, 'mosaic');
    const agentEnvDir = join(mosaicHome, 'fleet', 'agents');
    const result = await writeAgentEnvironmentProjection({
      mosaicHome,
      agentEnvDir,
      agentName: 'coder0',
      generated: generatedValues,
    });
    for (const directory of [mosaicHome, join(mosaicHome, 'fleet'), agentEnvDir]) {
      expect((await stat(directory)).mode & 0o777).toBe(0o700);
    }
    expect((await stat(result.generatedPath)).mode & 0o777).toBe(0o600);
  });
  it('regenerates desired keys, relocates safe legacy local data, and quarantines forbidden legacy input', async (): Promise<void> => {
    cleanup = await mkdtemp(join(tmpdir(), 'mosaic-generated-env-'));
    const mosaicHome = join(cleanup, 'mosaic');
    const agentEnvDir = join(mosaicHome, 'fleet', 'agents');
    await mkdir(agentEnvDir, { recursive: true, mode: 0o700 });
    await writeFile(
      join(agentEnvDir, 'coder0.env'),
      [
        'MOSAIC_AGENT_NAME=stale-name',
        'MOSAIC_AGENT_RUNTIME=codex',
        'MOSAIC_RUNTIME_BIN=/opt/mosaic/bin',
        'MOSAIC_AGENT_COMMAND=mosaic yolo codex --dangerous',
        '',
      ].join('\n'),
      { mode: 0o600 },
    );
    const result = await writeAgentEnvironmentProjection({
      mosaicHome,
      agentEnvDir,
      agentName: 'coder0',
      generated: generatedValues,
    });
    expect(await readFile(result.generatedPath, 'utf8')).toBe(
      renderGeneratedAgentEnvironment(generatedValues),
    );
    expect(await readFile(result.localPath, 'utf8')).toBe('MOSAIC_RUNTIME_BIN=/opt/mosaic/bin\n');
    const quarantine = await readFile(result.quarantinePath!, 'utf8');
    expect(quarantine).toContain('MOSAIC_AGENT_COMMAND=mosaic yolo codex --dangerous');
    await expect(readFile(join(agentEnvDir, 'coder0.env'), 'utf8')).rejects.toThrow();
    expect((await stat(result.generatedPath)).mode & 0o077).toBe(0);
    expect((await stat(result.localPath)).mode & 0o077).toBe(0);
    expect(result.diagnostics).toEqual([expect.objectContaining({ key: 'MOSAIC_AGENT_COMMAND' })]);
    expect(JSON.stringify(result.diagnostics)).not.toContain('mosaic yolo codex --dangerous');
  });
  it('fails closed on an existing local override with unsafe permissions', async (): Promise<void> => {
    cleanup = await mkdtemp(join(tmpdir(), 'mosaic-generated-env-'));
    const mosaicHome = join(cleanup, 'mosaic');
    const agentEnvDir = join(mosaicHome, 'fleet', 'agents');
    await mkdir(agentEnvDir, { recursive: true, mode: 0o700 });
    const localPath = join(agentEnvDir, 'coder0.env.local');
    await writeFile(localPath, 'MOSAIC_RUNTIME_BIN=/opt/mosaic/bin\n', { mode: 0o600 });
    await chmod(localPath, 0o644);
    await expect(
      writeAgentEnvironmentProjection({
        mosaicHome,
        agentEnvDir,
        agentName: 'coder0',
        generated: generatedValues,
      }),
    ).rejects.toThrow(/permissions/i);
  });
  it('rejects an existing group/world-accessible projection directory before reading it', async (): Promise<void> => {
    cleanup = await mkdtemp(join(tmpdir(), 'mosaic-generated-env-'));
    const mosaicHome = join(cleanup, 'mosaic');
    const agentEnvDir = join(mosaicHome, 'fleet', 'agents');
    const localPath = join(agentEnvDir, 'coder0.env.local');
    const generatedPath = join(agentEnvDir, 'coder0.env.generated');
    await mkdir(agentEnvDir, { recursive: true, mode: 0o700 });
    await writeFile(localPath, 'MOSAIC_RUNTIME_BIN=/opt/mosaic/bin\n', { mode: 0o600 });
    await chmod(agentEnvDir, 0o777);
    await expect(
      writeAgentEnvironmentProjection({
        mosaicHome,
        agentEnvDir,
        agentName: 'coder0',
        generated: generatedValues,
      }),
    ).rejects.toThrow(/unsafe-permissions/i);
    await expect(readFile(localPath, 'utf8')).resolves.toBe('MOSAIC_RUNTIME_BIN=/opt/mosaic/bin\n');
    await expect(readFile(generatedPath, 'utf8')).rejects.toThrow();
  });
  it.each([
    ['MOSAIC_HOME', 'symlink'],
    ['MOSAIC_HOME/fleet', 'symlink'],
    ['MOSAIC_HOME/fleet/agents', 'symlink'],
    ['MOSAIC_HOME', 'group/world-writable'],
    ['MOSAIC_HOME/fleet', 'group/world-writable'],
    ['MOSAIC_HOME/fleet/agents', 'group/world-writable'],
  ])(
    'rejects a %s %s managed ancestor before any projection mutation',
    async (ancestor: string, hazard: string): Promise<void> => {
      cleanup = await mkdtemp(join(tmpdir(), 'mosaic-generated-env-'));
      const mosaicHome = join(cleanup, 'mosaic');
      const fleetDir = join(mosaicHome, 'fleet');
      const agentEnvDir = join(fleetDir, 'agents');
      const generatedPath = join(agentEnvDir, 'coder0.env.generated');
      const localPath = join(agentEnvDir, 'coder0.env.local');
      const legacyPath = join(agentEnvDir, 'coder0.env');
      const quarantinePath = join(agentEnvDir, 'coder0.env.quarantine');
      const managedPaths: Record<string, string> = {
        MOSAIC_HOME: mosaicHome,
        'MOSAIC_HOME/fleet': fleetDir,
        'MOSAIC_HOME/fleet/agents': agentEnvDir,
      };
      const unsafePath = managedPaths[ancestor];
      if (unsafePath === undefined) throw new Error(`Unknown managed ancestor: ${ancestor}`);
      await mkdir(agentEnvDir, { recursive: true, mode: 0o700 });
      await chmod(mosaicHome, 0o700);
      await chmod(fleetDir, 0o700);
      await chmod(agentEnvDir, 0o700);
      await writeFile(generatedPath, 'generated-before\n', { mode: 0o600 });
      await writeFile(localPath, 'MOSAIC_RUNTIME_BIN=/safe/runtime\n', { mode: 0o600 });
      await writeFile(legacyPath, 'MOSAIC_AGENT_COMMAND=legacy-command\n', { mode: 0o600 });
      if (hazard === 'symlink') {
        const targetPath = `${unsafePath}-target`;
        await rename(unsafePath, targetPath);
        await symlink(targetPath, unsafePath, 'dir');
      } else {
        await chmod(unsafePath, 0o777);
      }
      await expect(
        writeAgentEnvironmentProjection({
          mosaicHome,
          agentEnvDir,
          agentName: 'coder0',
          generated: generatedValues,
        }),
      ).rejects.toThrow(/unsafe-(directory|permissions)/i);
      await expect(readFile(generatedPath, 'utf8')).resolves.toBe('generated-before\n');
      await expect(readFile(localPath, 'utf8')).resolves.toBe('MOSAIC_RUNTIME_BIN=/safe/runtime\n');
      await expect(readFile(legacyPath, 'utf8')).resolves.toBe(
        'MOSAIC_AGENT_COMMAND=legacy-command\n',
      );
      await expect(readFile(quarantinePath, 'utf8')).rejects.toThrow();
    },
  );
  it('rejects a symlinked projection directory without mutating its target', async (): Promise<void> => {
    cleanup = await mkdtemp(join(tmpdir(), 'mosaic-generated-env-'));
    const mosaicHome = join(cleanup, 'mosaic');
    const targetDirectory = join(cleanup, 'target');
    const linkedDirectory = join(mosaicHome, 'fleet', 'agents');
    const legacyPath = join(targetDirectory, 'coder0.env');
    const generatedPath = join(targetDirectory, 'coder0.env.generated');
    const localPath = join(targetDirectory, 'coder0.env.local');
    const quarantinePath = join(targetDirectory, 'coder0.env.quarantine');
    await mkdir(join(mosaicHome, 'fleet'), { recursive: true, mode: 0o700 });
    await mkdir(targetDirectory, { mode: 0o700 });
    await writeFile(legacyPath, 'MOSAIC_AGENT_COMMAND=legacy-command\n', { mode: 0o600 });
    await writeFile(generatedPath, 'generated-before\n', { mode: 0o600 });
    await writeFile(localPath, 'local-before\n', { mode: 0o600 });
    await writeFile(quarantinePath, 'quarantine-before\n', { mode: 0o600 });
    await symlink(targetDirectory, linkedDirectory, 'dir');
    await expect(
      writeAgentEnvironmentProjection({
        mosaicHome,
        agentEnvDir: linkedDirectory,
        agentName: 'coder0',
        generated: generatedValues,
      }),
    ).rejects.toThrow(/unsafe-directory/i);
    await expect(readFile(legacyPath, 'utf8')).resolves.toBe(
      'MOSAIC_AGENT_COMMAND=legacy-command\n',
    );
    await expect(readFile(generatedPath, 'utf8')).resolves.toBe('generated-before\n');
    await expect(readFile(localPath, 'utf8')).resolves.toBe('local-before\n');
    await expect(readFile(quarantinePath, 'utf8')).resolves.toBe('quarantine-before\n');
  });
 });
--- a/packages/mosaic/src/fleet/generated-env-boundary.ts
+++ b/packages/mosaic/src/fleet/generated-env-boundary.ts
@@ -1,532 +0,0 @@
 import { createHash, randomUUID } from 'node:crypto';
 import { chmod, lstat, mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
 import { dirname, join, resolve } from 'node:path';
 export type AgentEnvironmentKind = 'generated' | 'local';
 export interface AgentEnvironmentDiagnostic {
  readonly code: string;
  readonly key: string;
  readonly sha256: string;
 }
 export interface AgentEnvironmentProjectionOptions {
  readonly mosaicHome: string;
  readonly agentEnvDir: string;
  readonly agentName: string;
  readonly generated: Readonly<Record<string, string>>;
 }
 export interface AgentGeneratedProjectionDeletionOptions {
  readonly mosaicHome: string;
  readonly agentEnvDir: string;
  readonly agentName: string;
 }
 export interface AgentEnvironmentProjectionResult {
  readonly generatedPath: string;
  readonly localPath: string;
  readonly quarantinePath?: string;
  readonly diagnostics: readonly AgentEnvironmentDiagnostic[];
 }
 /** A projection fully validated without changing managed files. */
 export interface PreparedAgentEnvironmentProjection {
  readonly mosaicHome: string;
  readonly agentEnvDir: string;
  readonly generatedPath: string;
  readonly localPath: string;
  readonly legacyPath: string;
  readonly generated: string;
  readonly local: string;
  readonly legacy?: string;
  readonly quarantinePath?: string;
  readonly diagnostics: readonly AgentEnvironmentDiagnostic[];
 }
 export class AgentEnvBoundaryError extends Error {
  readonly diagnostic: AgentEnvironmentDiagnostic;
  constructor(code: string, key: string, value: string) {
    const diagnostic: AgentEnvironmentDiagnostic = {
      code,
      key,
      sha256: hashValue(value),
    };
    super(`Agent environment rejected: code=${code} key=${key} sha256=${diagnostic.sha256}`);
    this.name = 'AgentEnvBoundaryError';
    this.diagnostic = diagnostic;
  }
 }
 export const GENERATED_AGENT_ENV_KEYS = [
  'MOSAIC_AGENT_NAME',
  'MOSAIC_AGENT_CLASS',
  'MOSAIC_AGENT_RUNTIME',
  'MOSAIC_AGENT_MODEL',
  'MOSAIC_AGENT_REASONING',
  'MOSAIC_AGENT_TOOL_POLICY',
  'MOSAIC_AGENT_WORKDIR',
  'MOSAIC_TMUX_SOCKET',
 ] as const;
 export const LOCAL_AGENT_ENV_KEYS = [
  'MOSAIC_RUNTIME_BIN',
  'MOSAIC_HEARTBEAT_RUN_DIR',
  'MOSAIC_HEARTBEAT_INTERVAL',
  'MOSAIC_CLAUDE_JSON',
  'CLAUDE_CONFIG_DIR',
 ] as const;
 const GENERATED_KEY_SET = new Set<string>(GENERATED_AGENT_ENV_KEYS);
 const LOCAL_KEY_SET = new Set<string>(LOCAL_AGENT_ENV_KEYS);
 const SENSITIVE_KEY = /(?:API[_-]?KEY|AUTH|CREDENTIAL|PASSWORD|PRIVATE|SECRET|TOKEN)/i;
 const AGENT_NAME = /^[A-Za-z0-9][A-Za-z0-9_.-]*$/;
 const POLICY_NAME = /^[a-z][a-z0-9-]*$/;
 const TMUX_SOCKET = /^[A-Za-z0-9_.-]*$/;
 const MODEL = /^[A-Za-z0-9._/:+-]*$/;
 /** Runtime launchers supported by the generated environment contract. */
 export const GENERATED_AGENT_ENV_SUPPORTED_RUNTIMES = [
  'claude',
  'codex',
  'opencode',
  'pi',
 ] as const;
 const SUPPORTED_RUNTIMES = new Set<string>(GENERATED_AGENT_ENV_SUPPORTED_RUNTIMES);
 const REASONING = new Set(['', 'low', 'medium', 'high']);
 /** Parses a strict data-only generated or local environment file without shell evaluation. */
 export function parseAgentEnvironment(
  source: string,
  kind: AgentEnvironmentKind,
 ): Readonly<Record<string, string>> {
  const values: Record<string, string> = {};
  const seen = new Set<string>();
  for (const line of source.split('\n')) {
    if (line === '') continue;
    const match = /^([A-Z][A-Z0-9_]*)=(.*)$/.exec(line);
    if (!match) throw new AgentEnvBoundaryError('malformed-line', '(malformed)', line);
    const [, key, value] = match;
    if (key === undefined || value === undefined) {
      throw new AgentEnvBoundaryError('malformed-line', '(malformed)', line);
    }
    if (seen.has(key)) throw new AgentEnvBoundaryError('duplicate-key', key, value);
    seen.add(key);
    if (SENSITIVE_KEY.test(key)) throw new AgentEnvBoundaryError('sensitive-key', key, value);
    if (containsShellSyntax(value)) throw new AgentEnvBoundaryError('unsafe-value', key, value);
    if (kind === 'generated') {
      if (!GENERATED_KEY_SET.has(key)) throw new AgentEnvBoundaryError('unknown-key', key, value);
    } else {
      if (GENERATED_KEY_SET.has(key))
        throw new AgentEnvBoundaryError('generated-key-shadow', key, value);
      if (!LOCAL_KEY_SET.has(key)) throw new AgentEnvBoundaryError('unknown-key', key, value);
    }
    values[key] = value;
  }
  if (kind === 'generated') assertGeneratedValues(values);
  else assertLocalValues(values);
  return Object.freeze(values);
 }
 /** Renders the roster-derived generated projection in a stable, complete key order. */
 export function renderGeneratedAgentEnvironment(values: Readonly<Record<string, string>>): string {
  const normalized = normalizeGeneratedValues(values);
  return `${GENERATED_AGENT_ENV_KEYS.map((key): string => `${key}=${normalized[key]}`).join('\n')}\n`;
 }
 /** Validates all deterministic projection inputs and target state without mutation. */
 export async function prepareAgentEnvironmentProjection(
  options: AgentEnvironmentProjectionOptions,
 ): Promise<PreparedAgentEnvironmentProjection> {
  if (!AGENT_NAME.test(options.agentName)) {
    throw new AgentEnvBoundaryError('unsafe-agent-name', 'MOSAIC_AGENT_NAME', options.agentName);
  }
  await validatePrivateProjectionDirectory(options.mosaicHome, options.agentEnvDir);
  const generatedPath = join(options.agentEnvDir, `${options.agentName}.env.generated`);
  const localPath = join(options.agentEnvDir, `${options.agentName}.env.local`);
  const legacyPath = join(options.agentEnvDir, `${options.agentName}.env`);
  const generated = renderGeneratedAgentEnvironment(options.generated);
  await assertPrivateRegularFileIfPresent(generatedPath);
  const currentLocal = await readOptionalPrivateFile(localPath);
  const parsedLocal =
    currentLocal === undefined ? {} : parseAgentEnvironment(currentLocal, 'local');
  const legacy = await readOptionalPrivateFile(legacyPath);
  const legacyDisposition =
    legacy === undefined ? emptyLegacyDisposition() : classifyLegacyEnvironment(legacy);
  for (const [key, value] of Object.entries(legacyDisposition.localValues)) {
    if (parsedLocal[key] !== undefined && parsedLocal[key] !== value) {
      throw new AgentEnvBoundaryError('legacy-local-conflict', key, value);
    }
  }
  const local = renderLocalAgentEnvironment({ ...legacyDisposition.localValues, ...parsedLocal });
  const quarantinePath = legacyDisposition.diagnostics.length
    ? join(options.agentEnvDir, `${options.agentName}.env.quarantine`)
    : undefined;
  if (quarantinePath !== undefined) {
    const existingQuarantine = await readOptionalPrivateFile(quarantinePath);
    if (existingQuarantine !== undefined) {
      throw new AgentEnvBoundaryError('quarantine-exists', '(quarantine)', existingQuarantine);
    }
  }
  return {
    mosaicHome: options.mosaicHome,
    agentEnvDir: options.agentEnvDir,
    generatedPath,
    localPath,
    legacyPath,
    generated,
    local,
    ...(legacy === undefined ? {} : { legacy }),
    ...(quarantinePath === undefined ? {} : { quarantinePath }),
    diagnostics: legacyDisposition.diagnostics,
  };
 }
 /**
 * Validates only the exact generated projection eligible for a roster delete.
 * Local overrides, legacy input, and quarantine records are operator-retained and
 * intentionally excluded from delete validation and cleanup.
 */
 export async function prepareAgentGeneratedProjectionDeletion(
  options: AgentGeneratedProjectionDeletionOptions,
 ): Promise<string> {
  if (!AGENT_NAME.test(options.agentName)) {
    throw new AgentEnvBoundaryError('unsafe-agent-name', 'MOSAIC_AGENT_NAME', options.agentName);
  }
  await validatePrivateProjectionDirectory(options.mosaicHome, options.agentEnvDir);
  const generatedPath = join(options.agentEnvDir, `${options.agentName}.env.generated`);
  await assertPrivateRegularFileIfPresent(generatedPath);
  return generatedPath;
 }
 /** Applies a previously prepared deterministic projection. */
 export async function applyPreparedAgentEnvironmentProjection(
  prepared: PreparedAgentEnvironmentProjection,
 ): Promise<AgentEnvironmentProjectionResult> {
  await ensurePrivateProjectionDirectory(prepared.mosaicHome, prepared.agentEnvDir);
  await writePrivateAtomically(prepared.generatedPath, prepared.generated);
  if (prepared.local !== '') await writePrivateAtomically(prepared.localPath, prepared.local);
  if (prepared.quarantinePath !== undefined && prepared.legacy !== undefined) {
    await writePrivateAtomically(prepared.quarantinePath, prepared.legacy);
  }
  if (prepared.legacy !== undefined) await unlink(prepared.legacyPath);
  return {
    generatedPath: prepared.generatedPath,
    localPath: prepared.localPath,
    ...(prepared.quarantinePath === undefined ? {} : { quarantinePath: prepared.quarantinePath }),
    diagnostics: prepared.diagnostics,
  };
 }
 /** Writes deterministic projection files and explicitly removes legacy `.env` authority. */
 export async function writeAgentEnvironmentProjection(
  options: AgentEnvironmentProjectionOptions,
 ): Promise<AgentEnvironmentProjectionResult> {
  return applyPreparedAgentEnvironmentProjection(await prepareAgentEnvironmentProjection(options));
 }
 /** Creates the canonical managed roster path with private fresh-chain permissions. */
 export async function writeManagedFleetRoster(
  mosaicHome: string,
  rosterPath: string,
  content: string,
 ): Promise<void> {
  const fleetDir = join(mosaicHome, 'fleet');
  const expectedRosterPath = join(fleetDir, 'roster.yaml');
  if (resolve(rosterPath) !== resolve(expectedRosterPath)) {
    throw new AgentEnvBoundaryError('unsafe-file', '(roster)', rosterPath);
  }
  await ensureManagedDirectory(mosaicHome, false);
  await ensureManagedDirectory(fleetDir, false);
  await writePrivateAtomically(rosterPath, content);
 }
 /** Ensures the private install-derived identity used to own a named tmux server. */
 export async function ensureFleetHolderIdentity(mosaicHome: string): Promise<string> {
  const fleetDir = join(mosaicHome, 'fleet');
  const runDir = join(fleetDir, 'run');
  const identityPath = join(runDir, 'holder-owner');
  await ensureManagedDirectory(mosaicHome, false);
  await ensureManagedDirectory(fleetDir, false);
  await ensureManagedDirectory(runDir, true);
  const existing = await readOptionalPrivateFile(identityPath);
  if (existing !== undefined) {
    const identity = existing.trim();
    if (!/^[a-f0-9-]{36}$/.test(identity)) {
      throw new AgentEnvBoundaryError('unsafe-owner-identity', '(holder-owner)', existing);
    }
    return identity;
  }
  const identity = randomUUID();
  await writePrivateAtomically(identityPath, `${identity}\n`);
  return identity;
 }
 function normalizeGeneratedValues(
  values: Readonly<Record<string, string>>,
 ): Readonly<Record<string, string>> {
  const normalized: Record<string, string> = {};
  for (const key of GENERATED_AGENT_ENV_KEYS) {
    const value = values[key];
    if (value === undefined) throw new AgentEnvBoundaryError('missing-key', key, '');
    normalized[key] = value;
  }
  for (const [key, value] of Object.entries(values)) {
    if (!GENERATED_KEY_SET.has(key)) throw new AgentEnvBoundaryError('unknown-key', key, value);
  }
  assertGeneratedValues(normalized);
  return Object.freeze(normalized);
 }
 function renderLocalAgentEnvironment(values: Readonly<Record<string, string>>): string {
  if (Object.keys(values).length === 0) return '';
  const parsed = parseAgentEnvironment(
    Object.entries(values)
      .sort(([left], [right]): number => left.localeCompare(right))
      .map(([key, value]): string => `${key}=${value}`)
      .join('\n'),
    'local',
  );
  return `${Object.entries(parsed)
    .sort(([left], [right]): number => left.localeCompare(right))
    .map(([key, value]): string => `${key}=${value}`)
    .join('\n')}\n`;
 }
 function assertGeneratedValues(values: Readonly<Record<string, string>>): void {
  for (const key of GENERATED_AGENT_ENV_KEYS) {
    const value = values[key];
    if (value === undefined) throw new AgentEnvBoundaryError('missing-key', key, '');
  }
  const name = requiredGeneratedValue(values, 'MOSAIC_AGENT_NAME');
  const className = requiredGeneratedValue(values, 'MOSAIC_AGENT_CLASS');
  const runtime = requiredGeneratedValue(values, 'MOSAIC_AGENT_RUNTIME');
  const model = requiredGeneratedValue(values, 'MOSAIC_AGENT_MODEL');
  const reasoning = requiredGeneratedValue(values, 'MOSAIC_AGENT_REASONING');
  const toolPolicy = requiredGeneratedValue(values, 'MOSAIC_AGENT_TOOL_POLICY');
  const workingDirectory = requiredGeneratedValue(values, 'MOSAIC_AGENT_WORKDIR');
  const socket = requiredGeneratedValue(values, 'MOSAIC_TMUX_SOCKET');
  if (!AGENT_NAME.test(name))
    throw new AgentEnvBoundaryError('unsafe-agent-name', 'MOSAIC_AGENT_NAME', name);
  if (!POLICY_NAME.test(className)) {
    throw new AgentEnvBoundaryError('unsafe-class', 'MOSAIC_AGENT_CLASS', className);
  }
  if (!SUPPORTED_RUNTIMES.has(runtime)) {
    throw new AgentEnvBoundaryError('unsupported-runtime', 'MOSAIC_AGENT_RUNTIME', runtime);
  }
  if (!MODEL.test(model))
    throw new AgentEnvBoundaryError('unsafe-model', 'MOSAIC_AGENT_MODEL', model);
  if (!REASONING.has(reasoning)) {
    throw new AgentEnvBoundaryError('unsupported-reasoning', 'MOSAIC_AGENT_REASONING', reasoning);
  }
  if (toolPolicy !== '' && !POLICY_NAME.test(toolPolicy)) {
    throw new AgentEnvBoundaryError('unsafe-tool-policy', 'MOSAIC_AGENT_TOOL_POLICY', toolPolicy);
  }
  if (!isSafeAbsolutePath(workingDirectory)) {
    throw new AgentEnvBoundaryError('unsafe-path', 'MOSAIC_AGENT_WORKDIR', workingDirectory);
  }
  if (!TMUX_SOCKET.test(socket)) {
    throw new AgentEnvBoundaryError('unsafe-socket', 'MOSAIC_TMUX_SOCKET', socket);
  }
 }
 function requiredGeneratedValue(values: Readonly<Record<string, string>>, key: string): string {
  const value = values[key];
  if (value === undefined) throw new AgentEnvBoundaryError('missing-key', key, '');
  return value;
 }
 function assertLocalValues(values: Readonly<Record<string, string>>): void {
  for (const [key, value] of Object.entries(values)) {
    if (key === 'MOSAIC_HEARTBEAT_INTERVAL') {
      if (!/^[1-9][0-9]*$/.test(value)) {
        throw new AgentEnvBoundaryError('invalid-interval', key, value);
      }
      continue;
    }
    if (!isSafeAbsolutePath(value)) throw new AgentEnvBoundaryError('unsafe-path', key, value);
  }
 }
 function isSafeAbsolutePath(value: string): boolean {
  return (
    value.startsWith('/') && !value.split('/').includes('..') && !/[\s"'`$\\;&|<>(){}]/.test(value)
  );
 }
 function containsShellSyntax(value: string): boolean {
  return /["'`$\\;&|<>(){}]/.test(value);
 }
 interface LegacyDisposition {
  readonly localValues: Readonly<Record<string, string>>;
  readonly diagnostics: readonly AgentEnvironmentDiagnostic[];
 }
 function emptyLegacyDisposition(): LegacyDisposition {
  return { localValues: {}, diagnostics: [] };
 }
 function classifyLegacyEnvironment(source: string): LegacyDisposition {
  const localValues: Record<string, string> = {};
  const diagnostics: AgentEnvironmentDiagnostic[] = [];
  const seen = new Set<string>();
  for (const line of source.split('\n')) {
    if (line === '') continue;
    const match = /^([A-Z][A-Z0-9_]*)=(.*)$/.exec(line);
    if (!match || match[1] === undefined || match[2] === undefined) {
      diagnostics.push(diagnostic('malformed-line', '(malformed)', line));
      continue;
    }
    const [, key, value] = match;
    if (seen.has(key)) {
      diagnostics.push(diagnostic('duplicate-key', key, value));
      continue;
    }
    seen.add(key);
    if (GENERATED_KEY_SET.has(key)) continue;
    try {
      parseAgentEnvironment(`${key}=${value}\n`, 'local');
      localValues[key] = value;
    } catch (error: unknown) {
      if (error instanceof AgentEnvBoundaryError) diagnostics.push(error.diagnostic);
      else throw error;
    }
  }
  return { localValues: Object.freeze(localValues), diagnostics: Object.freeze(diagnostics) };
 }
 function diagnostic(code: string, key: string, value: string): AgentEnvironmentDiagnostic {
  return { code, key, sha256: hashValue(value) };
 }
 function hashValue(value: string): string {
  return createHash('sha256').update(value).digest('hex');
 }
 async function readOptionalPrivateFile(path: string): Promise<string | undefined> {
  try {
    await assertPrivateRegularFile(path);
    return await readFile(path, 'utf8');
  } catch (error: unknown) {
    if (isMissingFile(error)) return undefined;
    throw error;
  }
 }
 function isMissingFile(error: unknown): boolean {
  return typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT';
 }
 async function validatePrivateProjectionDirectory(
  mosaicHome: string,
  agentEnvDir: string,
 ): Promise<void> {
  const fleetDir = join(mosaicHome, 'fleet');
  const expectedAgentEnvDir = join(fleetDir, 'agents');
  if (resolve(agentEnvDir) !== resolve(expectedAgentEnvDir)) {
    throw new AgentEnvBoundaryError('unsafe-directory', '(directory)', agentEnvDir);
  }
  await assertManagedDirectoryIfPresent(mosaicHome, false);
  await assertManagedDirectoryIfPresent(fleetDir, false);
  await assertManagedDirectoryIfPresent(agentEnvDir, true);
 }
 async function ensurePrivateProjectionDirectory(
  mosaicHome: string,
  agentEnvDir: string,
 ): Promise<void> {
  await validatePrivateProjectionDirectory(mosaicHome, agentEnvDir);
  const fleetDir = join(mosaicHome, 'fleet');
  await ensureManagedDirectory(mosaicHome, false);
  await ensureManagedDirectory(fleetDir, false);
  await ensureManagedDirectory(agentEnvDir, true);
 }
 async function ensureManagedDirectory(path: string, privateDirectory: boolean): Promise<void> {
  let created = false;
  try {
    await lstat(path);
  } catch (error: unknown) {
    if (!isMissingFile(error)) throw error;
    try {
      await mkdir(path, { recursive: true, mode: 0o700 });
      created = true;
    } catch (mkdirError: unknown) {
      if (!isAlreadyExists(mkdirError)) throw mkdirError;
    }
  }
  await assertManagedDirectory(path, privateDirectory);
  if (created) {
    await chmod(path, 0o700);
    await assertManagedDirectory(path, privateDirectory);
  }
 }
 function isAlreadyExists(error: unknown): boolean {
  return typeof error === 'object' && error !== null && 'code' in error && error.code === 'EEXIST';
 }
 async function assertManagedDirectoryIfPresent(
  path: string,
  privateDirectory: boolean,
 ): Promise<void> {
  try {
    await assertManagedDirectory(path, privateDirectory);
  } catch (error: unknown) {
    if (isMissingFile(error)) return;
    throw error;
  }
 }
 async function assertManagedDirectory(path: string, privateDirectory: boolean): Promise<void> {
  const metadata = await lstat(path);
  if (!metadata.isDirectory()) {
    throw new AgentEnvBoundaryError('unsafe-directory', '(directory)', path);
  }
  if ((metadata.mode & 0o022) !== 0 || (privateDirectory && (metadata.mode & 0o077) !== 0)) {
    throw new AgentEnvBoundaryError('unsafe-permissions', '(directory)', path);
  }
 }
 async function assertPrivateRegularFileIfPresent(path: string): Promise<void> {
  try {
    await assertPrivateRegularFile(path);
  } catch (error: unknown) {
    if (isMissingFile(error)) return;
    throw error;
  }
 }
 async function assertPrivateRegularFile(path: string): Promise<void> {
  const metadata = await lstat(path);
  if (!metadata.isFile()) throw new AgentEnvBoundaryError('unsafe-file', '(file)', path);
  if ((metadata.mode & 0o077) !== 0) {
    throw new AgentEnvBoundaryError('unsafe-permissions', '(file)', path);
  }
 }
 async function writePrivateAtomically(path: string, content: string): Promise<void> {
  try {
    await assertPrivateRegularFile(path);
  } catch (error: unknown) {
    if (!isMissingFile(error)) throw error;
  }
  const temporaryPath = join(dirname(path), `.${randomUUID()}.tmp`);
  await writeFile(temporaryPath, content, { encoding: 'utf8', mode: 0o600, flag: 'wx' });
  await rename(temporaryPath, path);
 }