fix(fleet): heartbeat consistency — honor MOSAIC_HOME + MOSAIC_HEARTBEAT_INTERVAL

F3 milestone 1 — the two pre-existing HB bugs (from #584) flagged in the #590 review:
- writer (start-agent-session.sh): MOSAIC_HEARTBEAT_RUN_DIR now defaults to
  ${MOSAIC_HOME:-$HOME/.config/mosaic}/fleet/run, matching the path `fleet ps`
  reads (heartbeatPath uses the resolved mosaicHome). Fixes false "stale/unknown"
  HB on custom MOSAIC_HOME deployments.
- reader (fleet.ts): new heartbeatIntervalMs() honors MOSAIC_HEARTBEAT_INTERVAL
  (seconds); parseHeartbeat's freshness threshold now matches the writer's actual
  cadence instead of a hardcoded 15s. + vitest coverage.

Validated: custom-home writer dir == reader path; interval 30 -> 30000ms, unset
-> 15000ms; prettier clean.

Refs #542 #588

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

packages/mosaic/framework/fleet/examples/coding.yaml

@@ -0,0 +1,32 @@
+version: 1
+transport: tmux
+tmux:
+  socket_name: mosaic-factory
+  holder_session: _holder
+defaults:
+  working_directory: ~
+runtimes:
+  claude:
+    reset_command: /clear
+  pi:
+    reset_command: /new
+agents:
+  - name: orchestrator
+    runtime: claude
+    class: orchestrator
+    persistent_persona: true
+  - name: coder0
+    runtime: pi
+    class: implementer
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true
+  - name: coder1
+    runtime: pi
+    class: implementer
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true
+  - name: reviewer
+    runtime: pi
+    class: reviewer
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true

packages/mosaic/framework/fleet/examples/general.yaml

@@ -0,0 +1,22 @@
+version: 1
+transport: tmux
+tmux:
+  socket_name: mosaic-factory
+  holder_session: _holder
+defaults:
+  working_directory: ~
+runtimes:
+  claude:
+    reset_command: /clear
+  pi:
+    reset_command: /new
+agents:
+  - name: orchestrator
+    runtime: claude
+    class: orchestrator
+    persistent_persona: true
+  - name: generalist
+    runtime: pi
+    class: worker
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true

packages/mosaic/framework/fleet/examples/hybrid.yaml

@@ -0,0 +1,32 @@
+version: 1
+transport: tmux
+tmux:
+  socket_name: mosaic-factory
+  holder_session: _holder
+defaults:
+  working_directory: ~
+runtimes:
+  claude:
+    reset_command: /clear
+  pi:
+    reset_command: /new
+agents:
+  - name: orchestrator
+    runtime: claude
+    class: orchestrator
+    persistent_persona: true
+  - name: coder0
+    runtime: pi
+    class: implementer
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true
+  - name: researcher0
+    runtime: pi
+    class: researcher
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true
+  - name: reviewer
+    runtime: pi
+    class: reviewer
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true

packages/mosaic/framework/fleet/examples/research.yaml

@@ -0,0 +1,32 @@
+version: 1
+transport: tmux
+tmux:
+  socket_name: mosaic-factory
+  holder_session: _holder
+defaults:
+  working_directory: ~
+runtimes:
+  claude:
+    reset_command: /clear
+  pi:
+    reset_command: /new
+agents:
+  - name: orchestrator
+    runtime: claude
+    class: orchestrator
+    persistent_persona: true
+  - name: researcher0
+    runtime: pi
+    class: researcher
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true
+  - name: researcher1
+    runtime: pi
+    class: researcher
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true
+  - name: analyst
+    runtime: pi
+    class: analyst
+    model_hint: openai-codex/gpt-5.5:high
+    reset_between_tasks: true

packages/mosaic/framework/install.sh

@@ -19,13 +19,23 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 TARGET_DIR="${MOSAIC_HOME:-$HOME/.config/mosaic}"
 INSTALL_MODE="${MOSAIC_INSTALL_MODE:-prompt}"
 
-# Files/dirs preserved across upgrades (never overwritten).
+# Files/dirs protected from rsync --delete during sync. NOTE: framework-owned
+# entries (CONSTITUTION/AGENTS/STANDARDS) ARE re-applied afterward by
+# reconcile_framework_files (overwrite + backup-once); the rest stay user-owned.
 # User-created content in these paths survives rsync --delete.
-PRESERVE_PATHS=("AGENTS.md" "SOUL.md" "USER.md" "TOOLS.md" "STANDARDS.md" "memory" "sources" "credentials")
+PRESERVE_PATHS=("CONSTITUTION.md" "AGENTS.md" "SOUL.md" "USER.md" "TOOLS.md" "STANDARDS.md" "memory" "sources" "credentials")
+
+# Framework-owned contract files: re-copied from defaults/ on every upgrade (the
+# user must not edit them; a divergent copy is backed up once before overwrite).
+# USER_SEEDED files are written once on first install, then owned by the user.
+# Both lists are APPEND-FRIENDLY — add a new shipped framework file here and to the
+# matching list in packages/mosaic/src/config/file-adapter.ts.
+FRAMEWORK_OWNED=("CONSTITUTION.md" "AGENTS.md" "STANDARDS.md")
+USER_SEEDED=("TOOLS.md")
 
 # Current framework schema version — bump this when the layout changes.
 # The migration system uses this to run upgrade steps.
-FRAMEWORK_VERSION=2
+FRAMEWORK_VERSION=3
 
 # ─── colours ──────────────────────────────────────────────────────────────────
 if [[ -t 1 ]]; then
@@ -40,6 +50,47 @@ warn() { echo -e "  ${YELLOW}⚠${RESET} $1" >&2; }
 fail() { echo -e "  ${RED}✗${RESET} $1" >&2; }
 step() { echo -e "\n${BOLD}$1${RESET}"; }
 
+# ─── snapshot / restore (crash safety for upgrades) ──────────────────────────
+SNAPSHOT_DIR=""
+make_snapshot() {
+  is_existing_install || return 0
+  SNAPSHOT_DIR="$(mktemp -d "${TMPDIR:-/tmp}/mosaic-snapshot-XXXXXX")"
+  cp -a "$TARGET_DIR/." "$SNAPSHOT_DIR/" 2>/dev/null || true
+}
+restore_snapshot() {
+  [[ -n "$SNAPSHOT_DIR" && -d "$SNAPSHOT_DIR" ]] || return 0
+  fail "Install interrupted/failed — restoring previous state from snapshot"
+  rm -rf "$TARGET_DIR"; mkdir -p "$TARGET_DIR"
+  cp -a "$SNAPSHOT_DIR/." "$TARGET_DIR/" 2>/dev/null || true
+}
+cleanup_snapshot() { [[ -n "$SNAPSHOT_DIR" && -d "$SNAPSHOT_DIR" ]] && rm -rf "$SNAPSHOT_DIR"; SNAPSHOT_DIR=""; }
+
+# Reconcile contract files after sync: framework-owned overwrite (backup-once),
+# user-seeded seed-if-absent.
+reconcile_framework_files() {
+  local defaults="$TARGET_DIR/defaults" f
+  [[ -d "$defaults" ]] || return 0
+  for f in "${FRAMEWORK_OWNED[@]}"; do
+    [[ -f "$defaults/$f" ]] || continue
+    # Already current — skip to avoid mtime churn.
+    if [[ -f "$TARGET_DIR/$f" ]] && cmp -s "$TARGET_DIR/$f" "$defaults/$f"; then
+      continue
+    fi
+    if [[ -f "$TARGET_DIR/$f" && ! -f "$TARGET_DIR/${f}.pre-constitution.bak" ]]; then
+      cp "$TARGET_DIR/$f" "$TARGET_DIR/${f}.pre-constitution.bak"
+      warn "$f is now framework-owned and was updated; your previous copy is saved as ${f}.pre-constitution.bak — re-apply intended changes as a .local overlay or policy/ file (see CONSTITUTION.md / constitution/LAYER-MODEL.md)."
+    fi
+    cp "$defaults/$f" "$TARGET_DIR/$f"
+  done
+  for f in "${USER_SEEDED[@]}"; do
+    [[ -f "$defaults/$f" ]] || continue
+    if [[ ! -f "$TARGET_DIR/$f" ]]; then
+      cp "$defaults/$f" "$TARGET_DIR/$f"
+      ok "Seeded $f from defaults"
+    fi
+  done
+}
+
 # ─── helpers ──────────────────────────────────────────────────────────────────
 
 is_existing_install() {
@@ -113,11 +164,14 @@ sync_framework() {
   fi
 
   if command -v rsync >/dev/null 2>&1; then
-    local rsync_args=(-a --delete --exclude ".git" --exclude ".framework-version")
+    local rsync_args=(-a --delete --exclude ".git" --exclude ".framework-version" --exclude "*.pre-constitution.bak")
 
     if [[ "$INSTALL_MODE" == "keep" ]]; then
+      # Anchor to the transfer root (leading /) so we preserve the TOP-LEVEL
+      # ~/.config/mosaic/<file> without also excluding defaults/<file> from sync
+      # (reconcile_framework_files needs the freshly-synced defaults/ copies).
       for path in "${PRESERVE_PATHS[@]}"; do
-        rsync_args+=(--exclude "$path")
+        rsync_args+=(--exclude "/$path")
       done
     fi
 
@@ -137,7 +191,7 @@ sync_framework() {
     done
   fi
 
-  find "$TARGET_DIR" -mindepth 1 -maxdepth 1 ! -name ".git" ! -name ".framework-version" -exec rm -rf {} +
+  find "$TARGET_DIR" -mindepth 1 -maxdepth 1 ! -name ".git" ! -name ".framework-version" ! -name "*.pre-constitution.bak" -exec rm -rf {} +
   cp -R "$SOURCE_DIR"/. "$TARGET_DIR"/
   rm -rf "$TARGET_DIR/.git"
 
@@ -195,10 +249,15 @@ run_migrations() {
     fi
   fi
 
-  # ── Future migrations go here ──────────────────────────────────────────────
-  # if [[ "$from_version" -lt 3 ]]; then
-  #   ...
-  # fi
+  # ── Migration: v2 → v3 (Constitution split) ───────────────────────────────
+  # CONSTITUTION.md / AGENTS.md / STANDARDS.md become framework-owned (overwritten
+  # on upgrade). reconcile_framework_files() has already run before this point: it
+  # backed up any user-edited copy to <file>.pre-constitution.bak and installed the
+  # new framework version. Nothing further to do here — the advisory was emitted at
+  # reconcile time. (STANDARDS.local.md composition lands with the overlay composer.)
+  if [[ "$from_version" -lt 3 ]]; then
+    ok "Migrated to the Constitution layout (framework-owned CONSTITUTION/AGENTS/STANDARDS)"
+  fi
 }
 
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -216,29 +275,25 @@ else
   ok "Install mode: overwrite"
 fi
 
+# Snapshot before any destructive file operation; restore on interrupt/failure.
+make_snapshot
+trap 'restore_snapshot' ERR INT TERM
+
 sync_framework
 
 # Ensure persistent directories exist
 mkdir -p "$TARGET_DIR/memory"
 mkdir -p "$TARGET_DIR/credentials"
 
-# Seed defaults — copy framework contract files from defaults/ to framework
-# root if not already present. These ship with sensible defaults but must
-# never be overwritten once the user has customized them.
+# Reconcile contract files from defaults/ into the framework root: framework-owned
+# files (CONSTITUTION/AGENTS/STANDARDS) are overwritten every upgrade (a divergent
+# copy is backed up once); user-seeded files (TOOLS) are written on first install only.
 #
 # This list must match the framework-contract whitelist in
 # packages/mosaic/src/config/file-adapter.ts (FileConfigAdapter.syncFramework).
 # SOUL.md and USER.md are intentionally NOT seeded here — they are generated
 # by `mosaic init` from templates with user-supplied values.
-DEFAULTS_DIR="$TARGET_DIR/defaults"
-if [[ -d "$DEFAULTS_DIR" ]]; then
-  for default_file in CONSTITUTION.md AGENTS.md STANDARDS.md TOOLS.md; do
-    if [[ -f "$DEFAULTS_DIR/$default_file" ]] && [[ ! -f "$TARGET_DIR/$default_file" ]]; then
-      cp "$DEFAULTS_DIR/$default_file" "$TARGET_DIR/$default_file"
-      ok "Seeded $default_file from defaults"
-    fi
-  done
-fi
+reconcile_framework_files
 
 # Ensure tool scripts are executable
 find "$TARGET_DIR/tools" -name "*.sh" -exec chmod +x {} + 2>/dev/null || true
@@ -249,6 +304,18 @@ ok "Framework synced to $TARGET_DIR"
 # Run migrations before post-install (migrations may remove old bin/ etc.)
 run_migrations
 
+# File-system phase complete and consistent — clear the restore trap.
+trap - ERR INT TERM
+cleanup_snapshot
+
+# Testability / minimal-install hook: stop after the file-system phase, before any
+# environment-touching post-install steps (runtime linking, MCP setup, skills, doctor).
+if [[ "${MOSAIC_SYNC_ONLY:-0}" == "1" ]]; then
+  write_framework_version
+  ok "Sync-only mode: file phase complete"
+  exit 0
+fi
+
 step "Post-install tasks"
 
 SCRIPTS="$TARGET_DIR/tools/_scripts"

packages/mosaic/framework/tools/_scripts/mosaic-init

@@ -274,6 +274,13 @@ detect_existing_config
 echo "[mosaic-init] Generating SOUL.md — agent identity contract"
 echo ""
 
+# Fail-closed persona: in non-interactive mode the agent NAME must be supplied
+# explicitly (--name) — never silently ship an agent named "Assistant".
+if [[ $NON_INTERACTIVE -eq 1 && -z "$AGENT_NAME" ]]; then
+  echo "[mosaic-init] ERROR: --name (agent name) is required in non-interactive mode." >&2
+  exit 1
+fi
+
 prompt_if_empty AGENT_NAME "What name should agents use" "Assistant"
 prompt_if_empty ROLE_DESCRIPTION "Agent role description" "execution partner and visibility engine"
 

packages/mosaic/framework/tools/fleet/start-agent-session.sh

@@ -6,7 +6,7 @@ MOSAIC_TMUX_SOCKET=${MOSAIC_TMUX_SOCKET:-mosaic-factory}
 MOSAIC_AGENT_RUNTIME=${MOSAIC_AGENT_RUNTIME:-pi}
 MOSAIC_AGENT_WORKDIR=${MOSAIC_AGENT_WORKDIR:-$HOME}
 MOSAIC_AGENT_COMMAND=${MOSAIC_AGENT_COMMAND:-}
-MOSAIC_HEARTBEAT_RUN_DIR=${MOSAIC_HEARTBEAT_RUN_DIR:-$HOME/.config/mosaic/fleet/run}
+MOSAIC_HEARTBEAT_RUN_DIR=${MOSAIC_HEARTBEAT_RUN_DIR:-${MOSAIC_HOME:-$HOME/.config/mosaic}/fleet/run}
 MOSAIC_HEARTBEAT_INTERVAL=${MOSAIC_HEARTBEAT_INTERVAL:-15}
 
 if [ -z "$AGENT_NAME" ]; then

packages/mosaic/framework/tools/quality/scripts/test-install-migration.sh

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# test-install-migration.sh — fixture matrix for the v2→v3 (Constitution) upgrade
+# migration in install.sh. Runs the installer against throwaway MOSAIC_HOME dirs
+# with MOSAIC_SYNC_ONLY=1 (file phase only — no environment-touching post-install)
+# and asserts the framework-owned-overwrite + user-preserve + backup semantics.
+#
+# Mirrors the TS fixture suite in packages/mosaic/src/config/file-adapter.test.ts;
+# both installers MUST behave identically.
+#
+# Usage:  bash test-install-migration.sh
+set -uo pipefail
+
+FW="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"   # packages/mosaic/framework
+INSTALL="$FW/install.sh"
+DEFA="$FW/defaults"
+
+pass=0; fail=0
+chk() { if eval "$2"; then echo "  ✓ $1"; pass=$((pass + 1)); else echo "  ✗ $1"; fail=$((fail + 1)); fi; }
+run() { MOSAIC_HOME="$1" MOSAIC_INSTALL_MODE="$2" MOSAIC_SYNC_ONLY=1 bash "$INSTALL" >/dev/null 2>&1; }
+
+echo "install.sh v2→v3 migration fixture matrix:"
+
+# F1 — fresh install
+T1=$(mktemp -d); run "$T1" overwrite
+chk "F1 fresh: CONSTITUTION/AGENTS/STANDARDS/TOOLS seeded" \
+  "[ -f '$T1/CONSTITUTION.md' ] && [ -f '$T1/AGENTS.md' ] && [ -f '$T1/STANDARDS.md' ] && [ -f '$T1/TOOLS.md' ]"
+chk "F1 fresh: AGENTS == shipped default" "cmp -s '$T1/AGENTS.md' '$DEFA/AGENTS.md'"
+chk "F1 fresh: framework-version stamped 3" "[ \"\$(cat '$T1/.framework-version' 2>/dev/null)\" = 3 ]"
+
+# F2 — legacy install with a user-edited AGENTS.md (the sanctioned pre-constitution customization)
+T2=$(mktemp -d); mkdir -p "$T2/credentials"
+printf '# user-edited AGENTS pre-constitution\n' > "$T2/AGENTS.md"
+printf '# my persona\n' > "$T2/SOUL.md"
+printf 'token\n' > "$T2/credentials/c.json"
+echo 2 > "$T2/.framework-version"
+run "$T2" keep
+chk "F2 legacy-edited: AGENTS overwritten to framework version" "cmp -s '$T2/AGENTS.md' '$DEFA/AGENTS.md'"
+chk "F2 legacy-edited: prior AGENTS saved to .pre-constitution.bak" \
+  "grep -q 'user-edited AGENTS pre-constitution' '$T2/AGENTS.md.pre-constitution.bak'"
+chk "F2 legacy-edited: SOUL.md preserved" "grep -q 'my persona' '$T2/SOUL.md'"
+chk "F2 legacy-edited: credentials preserved" "grep -q token '$T2/credentials/c.json'"
+chk "F2 legacy-edited: CONSTITUTION.md installed" "[ -f '$T2/CONSTITUTION.md' ]"
+run "$T2" keep
+chk "F2 idempotent: .pre-constitution.bak preserved across a 2nd upgrade" \
+  "grep -q 'user-edited AGENTS pre-constitution' '$T2/AGENTS.md.pre-constitution.bak'"
+
+# F3 — user-tuned STANDARDS.md
+T3=$(mktemp -d); printf '# tuned standards\n' > "$T3/STANDARDS.md"; printf '# persona\n' > "$T3/SOUL.md"; echo 2 > "$T3/.framework-version"
+run "$T3" keep
+chk "F3 tuned-standard: STANDARDS overwritten" "cmp -s '$T3/STANDARDS.md' '$DEFA/STANDARDS.md'"
+chk "F3 tuned-standard: tuned copy backed up" "grep -q 'tuned standards' '$T3/STANDARDS.md.pre-constitution.bak'"
+
+# F4 — unattended / no TTY (stdin closed): must complete without hanging, default to keep
+T4=$(mktemp -d); printf '# persona\n' > "$T4/SOUL.md"; printf '# old\n' > "$T4/AGENTS.md"; echo 2 > "$T4/.framework-version"
+MOSAIC_HOME="$T4" MOSAIC_SYNC_ONLY=1 bash "$INSTALL" </dev/null >/dev/null 2>&1
+chk "F4 no-TTY: completed, AGENTS updated" "cmp -s '$T4/AGENTS.md' '$DEFA/AGENTS.md'"
+
+# F5 — failure path must not corrupt existing data (invalid mode rejected before any file op)
+T5=$(mktemp -d); mkdir -p "$T5/credentials"; printf '# orig\n' > "$T5/SOUL.md"; printf 'keepme\n' > "$T5/credentials/c.json"; echo 2 > "$T5/.framework-version"
+MOSAIC_HOME="$T5" MOSAIC_INSTALL_MODE=bogus MOSAIC_SYNC_ONLY=1 bash "$INSTALL" >/dev/null 2>&1; rc=$?
+chk "F5 failure: invalid mode rejected (nonzero exit)" "[ $rc -ne 0 ]"
+chk "F5 failure: SOUL + credentials intact" "grep -q orig '$T5/SOUL.md' && grep -q keepme '$T5/credentials/c.json'"
+
+rm -rf "$T1" "$T2" "$T3" "$T4" "$T5"
+echo
+echo "RESULT: $pass passed, $fail failed"
+[ "$fail" -eq 0 ]

packages/mosaic/framework/tools/quality/scripts/verify-sanitized.sh

@@ -53,9 +53,15 @@ _selftest() {
   local tmp; tmp="$(mktemp -d)" || return 1
   printf 'contact jason.woltje at jarvis-brain (PDA-friendly)\n' > "$tmp/planted.md"
   printf 'X="${VAR:-$HOME/src/whatever/x.json}"\n' > "$tmp/planted.sh"
+  printf 'name: jason-woltje\n' > "$tmp/planted.yaml"
+  printf '[Service]\nUser=jarvis\n' > "$tmp/planted.service"
   local rc=0
   grep -qIEi "$DENYLIST" "$tmp/planted.md" || { echo "✗ SELF-TEST: identity denylist regex broken" >&2; rc=1; }
   grep -qIE  "$STRUCTURAL_SH" "$tmp/planted.sh" || { echo "✗ SELF-TEST: structural regex broken" >&2; rc=1; }
+  # Prove the identity scan covers the config formats it claims to (yaml/service/etc).
+  local n_ext
+  n_ext=$(find "$tmp" -type f \( -name '*.yaml' -o -name '*.service' \) -print0 | xargs -0 -r grep -lIEi "$DENYLIST" 2>/dev/null | wc -l)
+  [[ "$n_ext" -eq 2 ]] || { echo "✗ SELF-TEST: identity scan does not cover .yaml/.service extensions" >&2; rc=1; }
   rm -rf "$tmp"; return $rc
 }
 _selftest || exit 2

packages/mosaic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mosaicstack/mosaic",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "repository": {
     "type": "git",
     "url": "https://git.mosaicstack.dev/mosaicstack/stack.git",

packages/mosaic/src/commands/fleet.spec.ts

@@ -15,9 +15,12 @@ import {
   buildSystemdEnableCommand,
   buildSystemdShowCommand,
   buildTmuxListPanesCommand,
+  buildTmuxListSessionsCommand,
   classifySendResult,
+  countOrchestrators,
   detectDrift,
   enableFleetUnits,
+  FLEET_PROFILES,
   generateAgentEnv,
   getDefaultOperatorSourceLabel,
   getDefaultTenantAndHost,
@@ -27,15 +30,19 @@ import {
   loadFleetRoster,
   mergeAgentEnv,
   parseHeartbeat,
+  parseInitProfile,
   parseSystemdShow,
   parseTmuxListPanes,
+  parseTmuxListSessions,
   registerFleetCommand,
   resolveFleetPaths,
+  resolvePresetFilename,
   RUNTIME_ACCEPTABLE_COMMANDS,
   VERIFY_DEFAULT_TIMEOUT_MS,
   VERIFY_POLL_INTERVAL_MS,
   type AgentPsRow,
   type CommandRunner,
+  type FleetProfile,
   type FleetRoster,
   type InteractiveRunner,
   type SleepFn,
@@ -844,6 +851,23 @@ describe('fleet ps — heartbeat parsing', () => {
     expect(hb.health).toBe('unknown');
     expect(hb.ts).toBeNull();
   });
+
+  it('honors MOSAIC_HEARTBEAT_INTERVAL for the freshness threshold', () => {
+    const prev = process.env.MOSAIC_HEARTBEAT_INTERVAL;
+    try {
+      // A 60s-old beat is STALE at the default 15s interval (3x15 = 45s)...
+      const ts = new Date(NOW - 60_000).toISOString();
+      const content = `ts=${ts}\npid=1\nstatus=ok\n`;
+      delete process.env.MOSAIC_HEARTBEAT_INTERVAL;
+      expect(parseHeartbeat(content, NOW).health).toBe('stale');
+      // ...but HEALTHY when the operator widened the interval to 30s (3x30 = 90s).
+      process.env.MOSAIC_HEARTBEAT_INTERVAL = '30';
+      expect(parseHeartbeat(content, NOW).health).toBe('healthy');
+    } finally {
+      if (prev === undefined) delete process.env.MOSAIC_HEARTBEAT_INTERVAL;
+      else process.env.MOSAIC_HEARTBEAT_INTERVAL = prev;
+    }
+  });
 });
 
 describe('fleet ps — systemd show parsing', () => {
@@ -1074,6 +1098,10 @@ describe('fleet ps — JSON output shape (FR-6)', () => {
           exitCode: 0,
         };
       }
+      if (fullArgs.includes('list-sessions')) {
+        // Only the roster agent session on the socket (no unmanaged sessions)
+        return { stdout: 'canary-pi\n', stderr: '', exitCode: 0 };
+      }
       return { stdout: '', stderr: '', exitCode: 0 };
     };
 
@@ -1117,11 +1145,15 @@ describe('fleet ps — JSON output shape (FR-6)', () => {
     expect(row.runtime).toBe('pi');
     expect(row.systemdActive).toBe('active');
     expect(row.systemdEnabled).toBe('disabled');
+
+    // managed/source fields for roster agents
+    expect(row.managed).toBe(true);
+    expect(row.source).toBe('roster');
   });
 });
 
 describe('fleet ps — command sequences issued', () => {
-  it('issues systemd show + tmux list-panes per agent', async () => {
+  it('issues systemd show + tmux list-panes per agent, then list-sessions for socket discovery', async () => {
     const home = await mkdtemp(join(tmpdir(), 'mosaic-fleet-'));
     const rosterPath = join(home, 'fleet', 'roster.yaml');
     await mkdir(join(home, 'fleet'), { recursive: true });
@@ -1135,6 +1167,10 @@ describe('fleet ps — command sequences issued', () => {
     const calls: string[][] = [];
     const runner: CommandRunner = async (command, args) => {
       calls.push([command, ...args]);
+      if ([command, ...args].join(' ').includes('list-sessions')) {
+        // Only the roster agent — no unmanaged sessions
+        return { stdout: 'coder0\n', stderr: '', exitCode: 0 };
+      }
       return {
         stdout: 'ActiveState=inactive\nSubState=dead\nUnitFileState=enabled\n',
         stderr: '',
@@ -1155,6 +1191,7 @@ describe('fleet ps — command sequences issued', () => {
       expect(calls).toEqual([
         buildSystemdShowCommand('coder0'),
         buildTmuxListPanesCommand('coder0', 'mosaic-factory'),
+        buildTmuxListSessionsCommand('mosaic-factory'),
       ]);
     } finally {
       console.log = origLog;
@@ -1163,6 +1200,258 @@ describe('fleet ps — command sequences issued', () => {
   });
 });
 
+describe('buildTmuxListSessionsCommand', () => {
+  it('builds exact list-sessions command with session_name format', () => {
+    expect(buildTmuxListSessionsCommand('mosaic-factory')).toEqual([
+      'tmux',
+      '-L',
+      'mosaic-factory',
+      'list-sessions',
+      '-F',
+      '#{session_name}',
+    ]);
+  });
+
+  it('uses DEFAULT_SOCKET_NAME when socket is omitted', () => {
+    const cmd = buildTmuxListSessionsCommand();
+    expect(cmd[2]).toBe('mosaic-factory');
+  });
+});
+
+describe('parseTmuxListSessions', () => {
+  it('splits newline-delimited session names', () => {
+    expect(parseTmuxListSessions('canary-pi\n_holder\nsome-adhoc\n')).toEqual([
+      'canary-pi',
+      '_holder',
+      'some-adhoc',
+    ]);
+  });
+
+  it('returns empty array for blank output', () => {
+    expect(parseTmuxListSessions('')).toEqual([]);
+    expect(parseTmuxListSessions('  \n  \n')).toEqual([]);
+  });
+
+  it('trims whitespace from each line', () => {
+    expect(parseTmuxListSessions('  canary-pi  \n  some-adhoc  \n')).toEqual([
+      'canary-pi',
+      'some-adhoc',
+    ]);
+  });
+});
+
+describe('fleet ps — unmanaged socket sessions', () => {
+  it('includes unmanaged session row flagged UNMANAGED and excludes _holder', async () => {
+    const home = await mkdtemp(join(tmpdir(), 'mosaic-fleet-'));
+    const rosterPath = join(home, 'fleet', 'roster.yaml');
+    await mkdir(join(home, 'fleet'), { recursive: true });
+    await writeFile(
+      rosterPath,
+      [
+        'version: 1',
+        'transport: tmux',
+        'agents:',
+        '  - name: canary-pi',
+        '    runtime: pi',
+        '    class: canary',
+      ].join('\n'),
+    );
+
+    const nowMs = Date.now();
+    const activityEpoch = Math.floor((nowMs - 10_000) / 1000);
+
+    const runner: CommandRunner = async (command, args) => {
+      const full = [command, ...args].join(' ');
+      if (full.includes('list-sessions')) {
+        // Socket has: canary-pi (roster), _holder (excluded), some-adhoc (unmanaged)
+        return { stdout: 'canary-pi\n_holder\nsome-adhoc\n', stderr: '', exitCode: 0 };
+      }
+      if (full.includes('list-panes')) {
+        return { stdout: `99999 bash 0 ${activityEpoch}\n`, stderr: '', exitCode: 0 };
+      }
+      if (full.includes('systemctl') && full.includes('show')) {
+        return {
+          stdout: 'ActiveState=inactive\nSubState=dead\nUnitFileState=unknown\n',
+          stderr: '',
+          exitCode: 0,
+        };
+      }
+      return { stdout: '', stderr: '', exitCode: 0 };
+    };
+
+    const lines: string[] = [];
+    const origLog = console.log;
+    console.log = (msg: string) => {
+      lines.push(msg);
+    };
+
+    const program = new Command();
+    program.exitOverride();
+    registerFleetCommand(program, { runner, mosaicHome: home });
+
+    try {
+      await program.parseAsync(['node', 'mosaic', 'fleet', 'ps', '--json']);
+    } finally {
+      console.log = origLog;
+      await rm(home, { recursive: true, force: true });
+    }
+
+    const json = JSON.parse(lines.join('')) as AgentPsRow[];
+    expect(Array.isArray(json)).toBe(true);
+
+    // Should have 2 rows: canary-pi (roster) + some-adhoc (unmanaged); _holder excluded
+    expect(json).toHaveLength(2);
+
+    // Roster agent comes first
+    const rosterRow = json[0]!;
+    expect(rosterRow.name).toBe('canary-pi');
+    expect(rosterRow.managed).toBe(true);
+    expect(rosterRow.source).toBe('roster');
+
+    // Unmanaged session comes second
+    const unmanagedRow = json[1]!;
+    expect(unmanagedRow.name).toBe('some-adhoc');
+    expect(unmanagedRow.managed).toBe(false);
+    expect(unmanagedRow.source).toBe('socket');
+    expect(unmanagedRow.runtime).toBe('unknown');
+
+    // _holder must not appear
+    expect(json.map((r) => r.name)).not.toContain('_holder');
+
+    // tenant_id and host must be present on unmanaged rows
+    expect(typeof unmanagedRow.tenant_id).toBe('string');
+    expect(unmanagedRow.tenant_id.length).toBeGreaterThan(0);
+    expect(typeof unmanagedRow.host).toBe('string');
+    expect(unmanagedRow.host.length).toBeGreaterThan(0);
+
+    // driftFlag must be false for unmanaged (no roster runtime to compare)
+    expect(unmanagedRow.driftFlag).toBe(false);
+  });
+
+  it('shows UNMANAGED flag in table output for unmanaged sessions', async () => {
+    const home = await mkdtemp(join(tmpdir(), 'mosaic-fleet-'));
+    const rosterPath = join(home, 'fleet', 'roster.yaml');
+    await mkdir(join(home, 'fleet'), { recursive: true });
+    await writeFile(
+      rosterPath,
+      [
+        'version: 1',
+        'transport: tmux',
+        'agents:',
+        '  - name: canary-pi',
+        '    runtime: pi',
+        '    class: canary',
+      ].join('\n'),
+    );
+
+    const runner: CommandRunner = async (command, args) => {
+      const full = [command, ...args].join(' ');
+      if (full.includes('list-sessions')) {
+        return { stdout: 'canary-pi\nsome-adhoc\n', stderr: '', exitCode: 0 };
+      }
+      if (full.includes('list-panes')) {
+        return { stdout: '0 bash 1 0\n', stderr: '', exitCode: 0 };
+      }
+      if (full.includes('systemctl') && full.includes('show')) {
+        return {
+          stdout: 'ActiveState=inactive\nSubState=dead\nUnitFileState=unknown\n',
+          stderr: '',
+          exitCode: 0,
+        };
+      }
+      return { stdout: '', stderr: '', exitCode: 0 };
+    };
+
+    const lines: string[] = [];
+    const origLog = console.log;
+    console.log = (msg: string) => {
+      lines.push(msg);
+    };
+
+    const program = new Command();
+    program.exitOverride();
+    registerFleetCommand(program, { runner, mosaicHome: home });
+
+    try {
+      await program.parseAsync(['node', 'mosaic', 'fleet', 'ps']);
+    } finally {
+      console.log = origLog;
+      await rm(home, { recursive: true, force: true });
+    }
+
+    const tableOutput = lines.join('\n');
+    // some-adhoc row must appear with UNMANAGED flag
+    expect(tableOutput).toMatch(/some-adhoc/);
+    expect(tableOutput).toMatch(/UNMANAGED/);
+    // canary-pi roster row must not have UNMANAGED
+    const rosterLine = lines.find((l) => l.includes('canary-pi'));
+    expect(rosterLine).toBeDefined();
+    expect(rosterLine).not.toMatch(/UNMANAGED/);
+  });
+
+  it('gracefully shows only roster rows when list-sessions fails (socket missing)', async () => {
+    const home = await mkdtemp(join(tmpdir(), 'mosaic-fleet-'));
+    const rosterPath = join(home, 'fleet', 'roster.yaml');
+    await mkdir(join(home, 'fleet'), { recursive: true });
+    await writeFile(
+      rosterPath,
+      [
+        'version: 1',
+        'transport: tmux',
+        'agents:',
+        '  - name: canary-pi',
+        '    runtime: pi',
+        '    class: canary',
+      ].join('\n'),
+    );
+
+    const runner: CommandRunner = async (command, args) => {
+      const full = [command, ...args].join(' ');
+      if (full.includes('list-sessions')) {
+        // Simulate socket missing
+        return { stdout: '', stderr: 'no server running on /tmp/...', exitCode: 1 };
+      }
+      if (full.includes('list-panes')) {
+        return { stdout: '12345 pi 0 0\n', stderr: '', exitCode: 0 };
+      }
+      if (full.includes('systemctl') && full.includes('show')) {
+        return {
+          stdout: 'ActiveState=inactive\nSubState=dead\nUnitFileState=enabled\n',
+          stderr: '',
+          exitCode: 0,
+        };
+      }
+      return { stdout: '', stderr: '', exitCode: 0 };
+    };
+
+    const lines: string[] = [];
+    const origLog = console.log;
+    console.log = (msg: string) => {
+      lines.push(msg);
+    };
+
+    const program = new Command();
+    program.exitOverride();
+    registerFleetCommand(program, { runner, mosaicHome: home });
+
+    try {
+      // Must not throw
+      await expect(
+        program.parseAsync(['node', 'mosaic', 'fleet', 'ps', '--json']),
+      ).resolves.toBeDefined();
+    } finally {
+      console.log = origLog;
+      await rm(home, { recursive: true, force: true });
+    }
+
+    const json = JSON.parse(lines.join('')) as AgentPsRow[];
+    // Only roster agent visible; no crash
+    expect(json).toHaveLength(1);
+    expect(json[0]!.name).toBe('canary-pi');
+    expect(json[0]!.managed).toBe(true);
+  });
+});
+
 describe('agent watch', () => {
   it('builds exact grouped-viewer creation command', () => {
     expect(
@@ -1865,3 +2154,270 @@ describe('agent send --verify', () => {
     expect(VERIFY_DEFAULT_TIMEOUT_MS).toBe(6_000);
   });
 });
+
+// ---------------------------------------------------------------------------
+// Fleet Phase F1: config-type presets + AI-free init wizard
+// ---------------------------------------------------------------------------
+
+describe('fleet preset rosters', () => {
+  const examplesDir = resolve(process.cwd(), 'framework', 'fleet', 'examples');
+
+  it.each(['general', 'coding', 'research', 'hybrid'] as FleetProfile[])(
+    '%s preset: loads via loadFleetRoster and has exactly one orchestrator',
+    async (preset) => {
+      const rosterPath = join(examplesDir, `${preset}.yaml`);
+      const roster = await loadFleetRoster(rosterPath);
+      expect(countOrchestrators(roster)).toBe(1);
+      expect(roster.agents.find((a) => a.name === 'orchestrator')).toBeDefined();
+    },
+  );
+
+  it('general preset: orchestrator + one generalist worker', async () => {
+    const roster = await loadFleetRoster(join(examplesDir, 'general.yaml'));
+    expect(roster.agents.map((a) => a.name)).toEqual(['orchestrator', 'generalist']);
+    expect(roster.agents.find((a) => a.name === 'orchestrator')?.runtime).toBe('claude');
+    expect(roster.agents.find((a) => a.name === 'generalist')?.runtime).toBe('pi');
+  });
+
+  it('coding preset: orchestrator + coder0 + coder1 + reviewer', async () => {
+    const roster = await loadFleetRoster(join(examplesDir, 'coding.yaml'));
+    expect(roster.agents.map((a) => a.name)).toEqual([
+      'orchestrator',
+      'coder0',
+      'coder1',
+      'reviewer',
+    ]);
+  });
+
+  it('research preset: orchestrator + researcher0 + researcher1 + analyst', async () => {
+    const roster = await loadFleetRoster(join(examplesDir, 'research.yaml'));
+    expect(roster.agents.map((a) => a.name)).toEqual([
+      'orchestrator',
+      'researcher0',
+      'researcher1',
+      'analyst',
+    ]);
+  });
+
+  it('hybrid preset: orchestrator + coder0 + researcher0 + reviewer', async () => {
+    const roster = await loadFleetRoster(join(examplesDir, 'hybrid.yaml'));
+    expect(roster.agents.map((a) => a.name)).toEqual([
+      'orchestrator',
+      'coder0',
+      'researcher0',
+      'reviewer',
+    ]);
+  });
+
+  it('worker agents in new presets use pi runtime with model_hint openai-codex/gpt-5.5:high', async () => {
+    for (const preset of ['general', 'coding', 'research', 'hybrid'] as FleetProfile[]) {
+      const roster = await loadFleetRoster(join(examplesDir, `${preset}.yaml`));
+      const workers = roster.agents.filter((a) => a.name !== 'orchestrator');
+      for (const worker of workers) {
+        expect(worker.runtime).toBe('pi');
+        expect(worker.modelHint).toBe('openai-codex/gpt-5.5:high');
+      }
+    }
+  });
+
+  it('orchestrator in new presets uses claude runtime with persistent_persona', async () => {
+    for (const preset of ['general', 'coding', 'research', 'hybrid'] as FleetProfile[]) {
+      const roster = await loadFleetRoster(join(examplesDir, `${preset}.yaml`));
+      const orch = roster.agents.find((a) => a.name === 'orchestrator');
+      expect(orch?.runtime).toBe('claude');
+      expect(orch?.persistentPersona).toBe(true);
+    }
+  });
+
+  it('new presets are sanitized: no operator identity tokens', async () => {
+    for (const preset of ['general', 'coding', 'research', 'hybrid'] as FleetProfile[]) {
+      const text = await readFile(join(examplesDir, `${preset}.yaml`), 'utf8');
+      expect(text).not.toMatch(/jarvis|jason|woltje/i);
+      // working_directory must not reference ~/src or /home
+      expect(text).not.toMatch(/~\/src|\/home\//);
+    }
+  });
+});
+
+describe('parseInitProfile', () => {
+  it('accepts all six fleet profiles', () => {
+    expect(parseInitProfile('general')).toBe('general');
+    expect(parseInitProfile('coding')).toBe('coding');
+    expect(parseInitProfile('research')).toBe('research');
+    expect(parseInitProfile('hybrid')).toBe('hybrid');
+    expect(parseInitProfile('minimal')).toBe('minimal');
+    expect(parseInitProfile('local-canary')).toBe('local-canary');
+  });
+
+  it('rejects unknown profiles with a message listing all valid names', () => {
+    expect(() => parseInitProfile('typo')).toThrow('Unsupported fleet profile');
+    expect(() => parseInitProfile('typo')).toThrow('general');
+    expect(() => parseInitProfile('typo')).toThrow('coding');
+  });
+
+  it('FLEET_PROFILES contains all six valid profile names', () => {
+    expect(FLEET_PROFILES).toContain('general');
+    expect(FLEET_PROFILES).toContain('coding');
+    expect(FLEET_PROFILES).toContain('research');
+    expect(FLEET_PROFILES).toContain('hybrid');
+    expect(FLEET_PROFILES).toContain('minimal');
+    expect(FLEET_PROFILES).toContain('local-canary');
+  });
+});
+
+describe('resolvePresetFilename', () => {
+  it.each(FLEET_PROFILES)('maps %s to %s.yaml', (profile) => {
+    expect(resolvePresetFilename(profile)).toBe(`${profile}.yaml`);
+  });
+});
+
+describe('fleet init wizard', () => {
+  let cleanup: string | undefined;
+
+  afterEach(async () => {
+    if (cleanup) {
+      await rm(cleanup, { recursive: true, force: true });
+      cleanup = undefined;
+    }
+  });
+
+  it('defaults to general when stdin is not a TTY and no --profile is given', async () => {
+    cleanup = await tempDir();
+    const rosterPath = join(cleanup, 'fleet', 'roster.yaml');
+    const frameworkRoot = resolve(process.cwd(), 'framework');
+    const stderrMessages: string[] = [];
+    const stderrSpy = vi.spyOn(process.stderr, 'write').mockImplementation((msg) => {
+      stderrMessages.push(String(msg));
+      return true;
+    });
+    const program = new Command();
+    program.exitOverride();
+    // isStdinTTY: false simulates non-interactive environment
+    registerFleetCommand(program, { frameworkRoot, mosaicHome: cleanup, isStdinTTY: false });
+
+    try {
+      await program.parseAsync([
+        'node',
+        'mosaic',
+        'fleet',
+        '--roster',
+        rosterPath,
+        'init',
+        '--write',
+      ]);
+      const content = await readFile(rosterPath, 'utf8');
+      // Should have written the general preset
+      expect(content).toContain('name: orchestrator');
+      expect(content).toContain('name: generalist');
+      // Stderr should explain the fallback
+      expect(stderrMessages.join('')).toMatch(/defaulting to fleet profile "general"/);
+    } finally {
+      stderrSpy.mockRestore();
+    }
+  });
+
+  it('uses --profile to select preset without wizard (non-TTY path)', async () => {
+    cleanup = await tempDir();
+    const rosterPath = join(cleanup, 'fleet', 'roster.yaml');
+    const frameworkRoot = resolve(process.cwd(), 'framework');
+    const program = new Command();
+    program.exitOverride();
+    registerFleetCommand(program, { frameworkRoot, mosaicHome: cleanup, isStdinTTY: false });
+
+    try {
+      await program.parseAsync([
+        'node',
+        'mosaic',
+        'fleet',
+        '--roster',
+        rosterPath,
+        'init',
+        '--profile',
+        'coding',
+        '--write',
+      ]);
+      const content = await readFile(rosterPath, 'utf8');
+      expect(content).toContain('name: coder0');
+      expect(content).toContain('name: reviewer');
+    } finally {
+      // cleanup handled by afterEach
+    }
+  });
+
+  it('written roster has exactly one orchestrator agent (countOrchestrators validation)', async () => {
+    cleanup = await tempDir();
+    const frameworkRoot = resolve(process.cwd(), 'framework');
+    for (const preset of ['general', 'coding', 'research', 'hybrid'] as FleetProfile[]) {
+      const rosterPath = join(cleanup, `${preset}-roster.yaml`);
+      const program = new Command();
+      program.exitOverride();
+      registerFleetCommand(program, { frameworkRoot, mosaicHome: cleanup, isStdinTTY: false });
+      await program.parseAsync([
+        'node',
+        'mosaic',
+        'fleet',
+        '--roster',
+        rosterPath,
+        'init',
+        '--profile',
+        preset,
+        '--write',
+      ]);
+      const roster = await loadFleetRoster(rosterPath);
+      expect(countOrchestrators(roster)).toBe(1);
+    }
+  });
+
+  it('re-init with --write and existing roster requires --force (R8 idempotency)', async () => {
+    cleanup = await tempDir();
+    const rosterPath = join(cleanup, 'fleet', 'roster.yaml');
+    const frameworkRoot = resolve(process.cwd(), 'framework');
+    const program = new Command();
+    program.exitOverride();
+    registerFleetCommand(program, { frameworkRoot, mosaicHome: cleanup, isStdinTTY: false });
+
+    // First write
+    await program.parseAsync([
+      'node',
+      'mosaic',
+      'fleet',
+      '--roster',
+      rosterPath,
+      'init',
+      '--profile',
+      'general',
+      '--write',
+    ]);
+
+    // Second write without --force must fail
+    await expect(
+      program.parseAsync([
+        'node',
+        'mosaic',
+        'fleet',
+        '--roster',
+        rosterPath,
+        'init',
+        '--profile',
+        'general',
+        '--write',
+      ]),
+    ).rejects.toThrow('Fleet roster already exists');
+
+    // With --force must succeed
+    await program.parseAsync([
+      'node',
+      'mosaic',
+      'fleet',
+      '--roster',
+      rosterPath,
+      'init',
+      '--profile',
+      'coding',
+      '--write',
+      '--force',
+    ]);
+    const content = await readFile(rosterPath, 'utf8');
+    expect(content).toContain('name: coder0');
+  });
+});

packages/mosaic/src/commands/fleet.ts

@@ -4,6 +4,7 @@ import { homedir, hostname, userInfo } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
+import * as readline from 'node:readline';
 import type { Command } from 'commander';
 import YAML from 'yaml';
 
@@ -41,6 +42,11 @@ export interface FleetCommandDeps {
   sleepFn?: SleepFn;
   mosaicHome?: string;
   frameworkRoot?: string;
+  /**
+   * Injectable TTY check for `fleet init` wizard. Defaults to process.stdin.isTTY.
+   * Tests stub this to simulate interactive or non-interactive environments.
+   */
+  isStdinTTY?: boolean;
 }
 
 interface RawFleetRoster {
@@ -362,6 +368,16 @@ export function buildAgentTailCommand(
 // ---------------------------------------------------------------------------
 
 export const HEARTBEAT_INTERVAL_MS = 15_000;
+
+/**
+ * Heartbeat interval in ms, honoring MOSAIC_HEARTBEAT_INTERVAL (seconds) so the
+ * `fleet ps` freshness threshold matches the writer sidecar's actual cadence
+ * (start-agent-session.sh). Falls back to HEARTBEAT_INTERVAL_MS (15s).
+ */
+export function heartbeatIntervalMs(): number {
+  const sec = Number.parseInt(process.env.MOSAIC_HEARTBEAT_INTERVAL ?? '', 10);
+  return Number.isFinite(sec) && sec > 0 ? sec * 1000 : HEARTBEAT_INTERVAL_MS;
+}
 export const HEARTBEAT_HEALTHY_MULTIPLIER = 3;
 
 export interface HeartbeatInfo {
@@ -389,6 +405,10 @@ export interface AgentPsRow {
   driftFlag: boolean;
   /** active but UnitFileState=disabled */
   bootEnableWarning: boolean;
+  /** true = came from roster; false = found on socket but not in roster */
+  managed: boolean;
+  /** "roster" = defined in roster.yaml; "socket" = discovered via tmux list-sessions */
+  source: 'roster' | 'socket';
 }
 
 /**
@@ -431,6 +451,26 @@ export function buildTmuxListPanesCommand(
   ];
 }
 
+/**
+ * Returns the tmux list-sessions command to enumerate all sessions on a socket.
+ * Format: `tmux -L <socket> list-sessions -F '#{session_name}'`
+ * Used to discover ad-hoc sessions that are not in the roster.
+ */
+export function buildTmuxListSessionsCommand(socketName = DEFAULT_SOCKET_NAME): string[] {
+  return ['tmux', '-L', socketName, 'list-sessions', '-F', '#{session_name}'];
+}
+
+/**
+ * Parse the output of `tmux list-sessions -F '#{session_name}'` into an array of session names.
+ * Returns an empty array on empty/blank output.
+ */
+export function parseTmuxListSessions(output: string): string[] {
+  return output
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0);
+}
+
 /**
  * Returns the heartbeat file path for an agent.
  */
@@ -466,7 +506,7 @@ export function parseHeartbeat(content: string | null, nowMs = Date.now()): Hear
       status = val;
     }
   }
-  const thresholdMs = HEARTBEAT_INTERVAL_MS * HEARTBEAT_HEALTHY_MULTIPLIER;
+  const thresholdMs = heartbeatIntervalMs() * HEARTBEAT_HEALTHY_MULTIPLIER;
   let health: 'healthy' | 'stale' | 'unknown' = 'unknown';
   let ageMs: number | null = null;
   if (ts !== null) {
@@ -775,19 +815,42 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
   cmd
     .command('init')
     .description('Initialize a local fleet roster')
-    .option('--profile <name>', 'Roster profile: minimal or local-canary', 'minimal')
+    .option(
+      '--profile <name>',
+      `Roster profile: ${FLEET_PROFILES.join(', ')} (skips interactive wizard)`,
+    )
     .option('--write', 'Write the roster to Mosaic home')
     .option('--force', 'Overwrite an existing roster when used with --write')
-    .action(async (opts: { profile: string; write?: boolean; force?: boolean }) => {
+    .action(async (opts: { profile?: string; write?: boolean; force?: boolean }) => {
       const commandOpts = cmd.opts<{ mosaicHome: string; roster?: string }>();
       const activePaths = resolveFleetPaths(commandOpts.mosaicHome);
-      const profile = parseInitProfile(opts.profile);
-      const source = join(frameworkRoot, 'fleet', 'examples', `${profile}.yaml`);
+
+      let profile: FleetProfile;
+      if (opts.profile !== undefined) {
+        // Explicit --profile flag: validate and use it (non-interactive path).
+        profile = parseInitProfile(opts.profile);
+      } else {
+        // No --profile: use wizard when stdin is a TTY, else default to 'general'.
+        const isTTY = deps.isStdinTTY ?? process.stdin.isTTY ?? false;
+        if (isTTY) {
+          profile = await promptFleetProfile();
+        } else {
+          process.stderr.write(
+            'Note: stdin is not a TTY; defaulting to fleet profile "general". ' +
+              'Use --profile <name> to select a different preset.\n',
+          );
+          profile = 'general';
+        }
+      }
+
+      const source = join(frameworkRoot, 'fleet', 'examples', resolvePresetFilename(profile));
       const content = await readFile(source, 'utf8');
+
       if (!opts.write) {
         console.log(content.trimEnd());
         return;
       }
+
       const destination = commandOpts.roster ?? activePaths.rosterPath;
       if (!opts.force && (await canRead(destination))) {
         throw new Error(
@@ -796,7 +859,23 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
       }
       await mkdir(dirname(destination), { recursive: true });
       await writeFile(destination, content);
-      console.log(`Wrote fleet roster: ${destination}`);
+
+      // Validate: exactly one orchestrator required (R5) — friendly summary on success.
+      const written = await loadFleetRoster(destination);
+      const orchCount = countOrchestrators(written);
+      if (orchCount !== 1) {
+        process.stderr.write(
+          `Warning: fleet roster at ${destination} has ${orchCount} orchestrator agent(s) (expected exactly 1).\n`,
+        );
+        console.log(
+          `Initialized ${profile} fleet: ${written.agents.length} agent(s). Next: mosaic fleet install`,
+        );
+      } else {
+        const workerCount = written.agents.length - 1;
+        console.log(
+          `Initialized ${profile} fleet: 1 orchestrator + ${workerCount} agent(s). Next: mosaic fleet install`,
+        );
+      }
     });
 
   cmd
@@ -897,7 +976,9 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
 
   cmd
     .command('ps')
-    .description('Show real-time status for all roster agents (systemd + tmux + heartbeat)')
+    .description(
+      'Show real-time status for all roster agents and unmanaged socket sessions (systemd + tmux + heartbeat)',
+    )
     .option('--json', 'Print JSON array')
     .action(async (opts: { json?: boolean }) => {
       const commandOpts = cmd.opts<{ mosaicHome: string; roster?: string }>();
@@ -908,6 +989,9 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
 
       const rows: AgentPsRow[] = [];
 
+      // Build the set of roster agent names for quick lookup when filtering socket sessions.
+      const rosterAgentNames = new Set(roster.agents.map((a) => a.name));
+
       for (const agent of roster.agents) {
         // systemd show
         const showResult = await runner(...splitCommand(buildSystemdShowCommand(agent.name)));
@@ -948,9 +1032,75 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
           heartbeat: hb,
           driftFlag,
           bootEnableWarning,
+          managed: true,
+          source: 'roster',
         });
       }
 
+      // Enumerate all live sessions on the socket to surface unmanaged (ad-hoc) sessions.
+      // If list-sessions fails (socket not up), silently skip — show roster rows only.
+      try {
+        const listSessionsResult = await runner(
+          ...splitCommand(buildTmuxListSessionsCommand(roster.tmux.socketName)),
+        );
+        if (listSessionsResult.exitCode === 0) {
+          const socketSessions = parseTmuxListSessions(listSessionsResult.stdout);
+          const holderSession = roster.tmux.holderSession;
+
+          for (const sessionName of socketSessions) {
+            // Skip roster agents (already in rows) and the holder session (infrastructure).
+            if (rosterAgentNames.has(sessionName) || sessionName === holderSession) {
+              continue;
+            }
+
+            // tmux list-panes for pane info
+            const panesResult = await runner(
+              ...splitCommand(buildTmuxListPanesCommand(sessionName, roster.tmux.socketName)),
+            );
+            const paneInfo = parseTmuxListPanes(panesResult.stdout, nowMs);
+
+            // heartbeat — try reading the .hb file using the same path convention
+            const hbFile = heartbeatPath(sessionName, activePaths.mosaicHome);
+            let hbContent: string | null = null;
+            try {
+              hbContent = await readFile(hbFile, 'utf8');
+            } catch {
+              hbContent = null;
+            }
+            const hb = parseHeartbeat(hbContent, nowMs);
+
+            // systemd — check if mosaic-agent@<name>.service exists (usually inactive for ad-hoc)
+            const showResult = await runner(...splitCommand(buildSystemdShowCommand(sessionName)));
+            const sysInfo = parseSystemdShow(showResult.stdout);
+
+            const bootEnableWarning =
+              sysInfo.ActiveState === 'active' && sysInfo.UnitFileState === 'disabled';
+
+            rows.push({
+              name: sessionName,
+              tenant_id,
+              host,
+              // runtime unknown — not in roster
+              runtime: 'unknown',
+              systemdActive: sysInfo.ActiveState,
+              systemdEnabled: sysInfo.UnitFileState,
+              paneAlive: !paneInfo.dead,
+              panePid: paneInfo.pid,
+              paneCommand: paneInfo.command,
+              idleSeconds: paneInfo.idleSeconds,
+              heartbeat: hb,
+              // No roster runtime to compare — drift is not meaningful for unmanaged sessions
+              driftFlag: false,
+              bootEnableWarning,
+              managed: false,
+              source: 'socket',
+            });
+          }
+        }
+      } catch {
+        // list-sessions failed (socket missing or permission error) — show roster rows only
+      }
+
       if (opts.json) {
         console.log(JSON.stringify(rows, null, 2));
         return;
@@ -982,6 +1132,7 @@ export function registerFleetCommand(program: Command, deps: FleetCommandDeps =
             ? `${Math.round(row.heartbeat.ageMs / 1000)}s/${row.heartbeat.health}`
             : `unknown`;
         const flags: string[] = [];
+        if (!row.managed) flags.push('UNMANAGED');
         if (row.driftFlag) flags.push('DRIFT');
         if (row.bootEnableWarning) flags.push('BOOT-ENABLE');
 
@@ -1572,11 +1723,96 @@ function splitCommand(command: string[]): [string, string[]] {
   return [bin, args];
 }
 
-function parseInitProfile(profile: string): 'minimal' | 'local-canary' {
-  if (profile === 'minimal' || profile === 'local-canary') {
-    return profile;
+/** All supported fleet profile names. */
+export type FleetProfile =
+  | 'general'
+  | 'coding'
+  | 'research'
+  | 'hybrid'
+  | 'minimal'
+  | 'local-canary';
+
+/** The list of all valid fleet profile names, for wizard menus and error messages. */
+export const FLEET_PROFILES: readonly FleetProfile[] = [
+  'general',
+  'coding',
+  'research',
+  'hybrid',
+  'minimal',
+  'local-canary',
+];
+
+/**
+ * Maps a fleet profile name to its example YAML filename (without the path).
+ * Pure function — testable without I/O.
+ */
+export function resolvePresetFilename(profile: FleetProfile): string {
+  return `${profile}.yaml`;
+}
+
+/**
+ * Validate and normalise a fleet profile name string.
+ * Throws with a clear message on unknown values.
+ */
+export function parseInitProfile(profile: string): FleetProfile {
+  if ((FLEET_PROFILES as readonly string[]).includes(profile)) {
+    return profile as FleetProfile;
   }
-  throw new Error(`Unsupported fleet profile "${profile}". Use: minimal, local-canary.`);
+  throw new Error(`Unsupported fleet profile "${profile}". Use: ${FLEET_PROFILES.join(', ')}.`);
+}
+
+/**
+ * Count orchestrator agents in a parsed roster.
+ * Returns the count; callers assert === 1.
+ */
+export function countOrchestrators(roster: FleetRoster): number {
+  return roster.agents.filter((a) => a.className === 'orchestrator').length;
+}
+
+/**
+ * Prompt interactively for a fleet profile via stdin readline.
+ * AI-free: no LLM calls — pure readline menu.
+ * Resolves with the chosen profile string, or rejects on I/O error.
+ */
+function promptFleetProfile(): Promise<FleetProfile> {
+  return new Promise((resolve, reject) => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const menu = [
+      '',
+      'Choose a fleet configuration type:',
+      '  1) general      — orchestrator + generalist worker',
+      '  2) coding       — orchestrator + coder0 + coder1 + reviewer',
+      '  3) research     — orchestrator + researcher0 + researcher1 + analyst',
+      '  4) hybrid       — orchestrator + coder0 + researcher0 + reviewer',
+      '  5) minimal      — single canary-pi agent (no orchestrator)',
+      '  6) local-canary — legacy canary preset with lead + coder + reviewer',
+      '',
+    ].join('\n');
+    process.stdout.write(menu);
+    rl.question('Enter number or name [1]: ', (answer) => {
+      rl.close();
+      const trimmed = answer.trim();
+      // Map numeric shortcut → name
+      const byNumber: Record<string, FleetProfile> = {
+        '1': 'general',
+        '2': 'coding',
+        '3': 'research',
+        '4': 'hybrid',
+        '5': 'minimal',
+        '6': 'local-canary',
+        '': 'general', // default on empty enter
+      };
+      if (trimmed in byNumber) {
+        resolve(byNumber[trimmed]!);
+        return;
+      }
+      try {
+        resolve(parseInitProfile(trimmed));
+      } catch (err) {
+        reject(err);
+      }
+    });
+  });
 }
 
 function writeCommandOutput(result: CommandResult): void {

packages/mosaic/src/config/file-adapter.test.ts

@@ -99,11 +99,8 @@ describe('FileConfigAdapter.syncFramework — defaults seeding', () => {
     );
   });
 
-  it('preserves existing contract files — never overwrites user customization', async () => {
-    // Also plant a root-level AGENTS.md in sourceDir so that `syncDirectory`
-    // itself (not just the seed loop) has something to try to overwrite.
-    // Without this, the test would silently pass even if preserve semantics
-    // were broken in syncDirectory.
+  it('overwrites framework-owned files (backup-once) but preserves user-seeded files', async () => {
+    // Plant a root-level AGENTS.md in sourceDir so syncDirectory's preserve is exercised.
     writeFileSync(join(fixture.sourceDir, 'AGENTS.md'), '# shipped AGENTS from source root\n');
 
     writeFileSync(join(fixture.mosaicHome, 'TOOLS.md'), '# user-customized TOOLS\n');
@@ -112,18 +109,50 @@ describe('FileConfigAdapter.syncFramework — defaults seeding', () => {
     const adapter = new FileConfigAdapter(fixture.mosaicHome, fixture.sourceDir);
     await adapter.syncFramework('keep');
 
+    // User-seeded TOOLS.md is preserved.
     expect(readFileSync(join(fixture.mosaicHome, 'TOOLS.md'), 'utf-8')).toBe(
       '# user-customized TOOLS\n',
     );
-    expect(readFileSync(join(fixture.mosaicHome, 'AGENTS.md'), 'utf-8')).toBe(
+    // Framework-owned AGENTS.md is overwritten from defaults/ ...
+    expect(readFileSync(join(fixture.mosaicHome, 'AGENTS.md'), 'utf-8')).toBe('# AGENTS default\n');
+    // ... and the user's prior copy is backed up exactly once.
+    expect(readFileSync(join(fixture.mosaicHome, 'AGENTS.md.pre-constitution.bak'), 'utf-8')).toBe(
       '# user-customized AGENTS\n',
     );
-    // And the missing contract file still gets seeded.
+    // Framework-owned STANDARDS.md (absent) gets installed.
     expect(readFileSync(join(fixture.mosaicHome, 'STANDARDS.md'), 'utf-8')).toContain(
       '# STANDARDS default',
     );
   });
 
+  it('backs up a divergent framework-owned file only once (idempotent across re-sync)', async () => {
+    writeFileSync(join(fixture.mosaicHome, 'AGENTS.md'), '# user-customized AGENTS\n');
+    const adapter = new FileConfigAdapter(fixture.mosaicHome, fixture.sourceDir);
+
+    await adapter.syncFramework('keep'); // 1st: backup created, AGENTS overwritten
+    await adapter.syncFramework('keep'); // 2nd: AGENTS already == default, no new backup
+
+    expect(readFileSync(join(fixture.mosaicHome, 'AGENTS.md.pre-constitution.bak'), 'utf-8')).toBe(
+      '# user-customized AGENTS\n',
+    );
+  });
+
+  it('preserves SOUL.md and credentials through a framework-owned overwrite', async () => {
+    writeFileSync(join(fixture.mosaicHome, 'SOUL.md'), '# my persona\n');
+    writeFileSync(join(fixture.mosaicHome, 'AGENTS.md'), '# user-customized AGENTS\n');
+    mkdirSync(join(fixture.mosaicHome, 'credentials'), { recursive: true });
+    writeFileSync(join(fixture.mosaicHome, 'credentials', 'c.json'), 'token\n');
+
+    const adapter = new FileConfigAdapter(fixture.mosaicHome, fixture.sourceDir);
+    await adapter.syncFramework('keep');
+
+    expect(readFileSync(join(fixture.mosaicHome, 'SOUL.md'), 'utf-8')).toBe('# my persona\n');
+    expect(readFileSync(join(fixture.mosaicHome, 'credentials', 'c.json'), 'utf-8')).toBe(
+      'token\n',
+    );
+    expect(readFileSync(join(fixture.mosaicHome, 'AGENTS.md'), 'utf-8')).toBe('# AGENTS default\n');
+  });
+
   it('is a no-op for seeding when defaults/ dir does not exist', async () => {
     rmSync(fixture.defaultsDir, { recursive: true });
 

packages/mosaic/src/config/file-adapter.ts

@@ -13,12 +13,17 @@ import { join } from 'node:path';
  * This list must match the explicit seed loop in
  * packages/mosaic/framework/install.sh.
  */
-export const DEFAULT_SEED_FILES = [
-  'CONSTITUTION.md',
-  'AGENTS.md',
-  'STANDARDS.md',
-  'TOOLS.md',
-] as const;
+// Framework-owned contract files: re-copied from defaults/ on every upgrade (a
+// divergent existing copy is backed up once to <file>.pre-constitution.bak first).
+// MUST match FRAMEWORK_OWNED in packages/mosaic/framework/install.sh (append-friendly).
+export const FRAMEWORK_OWNED_FILES = ['CONSTITUTION.md', 'AGENTS.md', 'STANDARDS.md'] as const;
+
+// User-seeded contract files: written once on first install, then owned by the user.
+// MUST match USER_SEEDED in packages/mosaic/framework/install.sh.
+export const USER_SEEDED_FILES = ['TOOLS.md'] as const;
+
+// Union, retained for callers/tests that assert the full seed set on a fresh install.
+export const DEFAULT_SEED_FILES = [...FRAMEWORK_OWNED_FILES, ...USER_SEEDED_FILES] as const;
 import type { ConfigService, ConfigSection, ResolvedConfig } from './config-service.js';
 import type { SoulConfig, UserConfig, ToolsConfig, InstallAction } from '../types.js';
 import { soulSchema, userSchema, toolsSchema } from './schemas.js';
@@ -159,6 +164,7 @@ export class FileConfigAdapter implements ConfigService {
     const preservePaths =
       action === 'keep' || action === 'reconfigure'
         ? [
+            'CONSTITUTION.md',
             'AGENTS.md',
             'SOUL.md',
             'USER.md',
@@ -175,10 +181,10 @@ export class FileConfigAdapter implements ConfigService {
       excludeGit: true,
     });
 
-    // Copy framework-contract files (AGENTS.md, STANDARDS.md, TOOLS.md)
-    // from framework/defaults/ into the mosaic home root if they don't
-    // exist yet. These are written on first install only and are never
-    // overwritten afterwards — the user may have customized them.
+    // Reconcile framework-contract files from framework/defaults/ into the mosaic
+    // home root: framework-owned files (CONSTITUTION/AGENTS/STANDARDS) are overwritten
+    // every upgrade (backup-once); user-seeded files (TOOLS) are written on first
+    // install only. Mirrors reconcile_framework_files() in install.sh.
     //
     // SOUL.md and USER.md are deliberately NOT seeded here. They are
     // generated from templates by the soul/user wizard stages with
@@ -186,7 +192,22 @@ export class FileConfigAdapter implements ConfigService {
     // identity flow and leak placeholder content into the mosaic home.
     const defaultsDir = join(this.sourceDir, 'defaults');
     if (existsSync(defaultsDir)) {
-      for (const entry of DEFAULT_SEED_FILES) {
+      // Framework-owned: overwrite from defaults/ every sync; back up a divergent
+      // existing copy ONCE to <file>.pre-constitution.bak before the first overwrite.
+      for (const entry of FRAMEWORK_OWNED_FILES) {
+        const src = join(defaultsDir, entry);
+        const dest = join(this.mosaicHome, entry);
+        if (!existsSync(src) || !statSync(src).isFile()) continue;
+        // Already current — skip to avoid mtime churn.
+        if (existsSync(dest) && readFileSync(src).equals(readFileSync(dest))) continue;
+        const bak = `${dest}.pre-constitution.bak`;
+        if (existsSync(dest) && !existsSync(bak)) {
+          copyFileSync(dest, bak);
+        }
+        copyFileSync(src, dest);
+      }
+      // User-seeded: write only if absent.
+      for (const entry of USER_SEEDED_FILES) {
         const src = join(defaultsDir, entry);
         const dest = join(this.mosaicHome, entry);
         if (existsSync(dest)) continue;