Merge remote-tracking branch 'origin/main' into fm/retired-gate-delivery-k9

# Conflicts:
#	bin/fm-auto-reap.sh

Author: ruby-dlee

.agents/skills/bootstrap-diagnostics/SKILL.md

@@ -17,7 +17,6 @@ The inline rules in `AGENTS.md` section 3 still bind: detect, then consent, then
 
 - `MISSING: <tool> (install: <command>)` - list the missing tools to the captain with a one-line purpose each plus the printed install commands, wait for consent (one approval may cover the list), then run `bin/fm-bootstrap.sh install <approved tools...>`.
   For `treehouse`, this also covers an installed version whose `treehouse get` lacks `--lease`; treat it as an upgrade request.
-  For `no-mistakes`, this also covers an installed version older than 1.31.2, because crewmate validation briefs delegate gate mechanics to no-mistakes' version-matched guidance.
   For `tasks-axi`, this also covers an installed build that fails the compatibility probe (`docs/configuration.md` "Backlog backend" owns the definition); `config/backlog-backend=manual` only suppresses the `TASKS_AXI: available` capability line, not this missing-tool report.
   For `quota-axi`, bootstrap requires it because crew-dispatch `quota-balanced` may call it and direct account-directory selection uses it; `bin/fm-dispatch-select.sh` still degrades at runtime when quota data is unavailable.
   Direct account-directory selection also requires Agent Fleet's read-only profile registry to enforce worker-pool eligibility.

.agents/skills/firstmate-codexapp/SKILL.md

@@ -47,7 +47,7 @@ git log --oneline --max-count=3
 ```
 
 For writable repo work, instruct the worker to use the Codex-created current directory.
-Do not tell it to `cd` into the saved project checkout for edits, commits, no-mistakes, pushes, or PR work.
+Do not tell it to `cd` into the saved project checkout for edits, commits, pushes, or PR work.
 
 When sending follow-up instructions, use `send_message_to_thread`.
 If the user types directly into the visible thread, treat that as authoritative and reconcile from `read_thread` instead of undoing it.

.agents/skills/firstmate-coding-guidelines/SKILL.md

@@ -75,7 +75,7 @@ Firstmate adds this skill's load instruction to firstmate-repo briefs by hand in
 - Plain dash `-`, never an em dash.
 - Never add an agent name as a commit co-author.
 - `bin/*.sh` and `bin/backends/*.sh` must pass `shellcheck`.
-- Run `bin/fm-lint.sh` before treating a script change as done; it is the single owner of the lint definition (file set, config, and pinned ShellCheck version) that CI and the no-mistakes pre-push gate use with the same full-or-focused Azure-service scope, and it refuses to run under any other ShellCheck version.
+- Run `bin/fm-lint.sh` before treating a script change as done; it is the single owner of the lint definition (file set, config, and pinned ShellCheck version) used by local development and CI, and it refuses to run under any other ShellCheck version.
 - Colocate tests with the existing pattern in `tests/`, name them `<subject>.test.sh`, and extend an existing script rather than inventing a new runner.
 - `bin/*.py` runs under whichever `python3` is first on the invoking shell's `PATH`, which is often older than the version CI pins, so a newer-only API fails at runtime rather than in CI.
 - Prefer the idiom already used across `bin/`: `os.stat(path, follow_symlinks=...)`, not the Python 3.10+ `Path.stat(follow_symlinks=...)`.

.agents/skills/fmx-respond/SKILL.md

@@ -80,7 +80,7 @@ The asker being your own captain (owner-only routing) does **not** relax this: a
 Never include, in any form:
 
 - Task ids, branch names, worktree paths, PR/issue numbers, or repo-internal identifiers.
-- Tooling/internal vocabulary: crewmate, scout, ship, secondmate, harness names, watcher, heartbeat, brief, teardown, no-mistakes, yolo, delivery modes.
+- Tooling/internal vocabulary: crewmate, scout, ship, secondmate, harness names, watcher, heartbeat, brief, teardown, yolo, delivery modes.
 - Captain-private material: the captain's name, product strategy, unreleased plans, revenue, internal URLs, file contents, or anything the captain has not made public.
 - Secrets of any kind: tokens, keys, credentials, the pairing token, hostnames.
 

.agents/skills/harness-adapters/SKILL.md

@@ -109,7 +109,6 @@ Do not manually reproduce backend-specific timing.
 
 Use `stuck-crewmate-recovery` for the full escalation ladder.
 A low context indicator is not evidence of a stuck agent.
-Do not change shared daemon lifecycle while recovering a no-mistakes task.
 
 ## Verifying a new adapter
 

.agents/skills/secondmate-provisioning/SKILL.md

@@ -93,13 +93,12 @@ Direct seed without a preexisting brief requires `FM_SECONDMATE_CHARTER`.
 Run `bin/fm-home-seed.sh validate` when checking registry integrity; it refuses duplicate ids, duplicate homes, and nested or overlapping homes.
 
 Seeding is transactional.
-If validation, cloning, no-mistakes initialization, or registry update fails, generated briefs, new homes, new project clones, and registry edits are rolled back.
+If validation, cloning, or registry update fails, generated briefs, new homes, new project clones, and registry edits are rolled back.
 Home provisioning, child spawn, and retirement use one canonical home lifecycle lock.
 The lock order is home lifecycle, task lifecycle, then registry; recursive retirement acquires parent homes before child homes and holds each home lock through its final state check, removal, and registry update.
 
-Secondmate project lists may include `no-mistakes` and `direct-PR` projects only.
+Secondmate project lists may include `direct-PR` projects only.
 `local-only` projects stay with the main firstmate.
-For `no-mistakes` projects, seeding initializes only projects newly cloned into a secondmate home and refuses to mutate a preexisting clone that is not already initialized.
 
 ## Backlog handoff
 

.agents/skills/stow/SKILL.md

@@ -35,7 +35,7 @@ The goal is a session that is safe to reset or destroy because everything durabl
    - Project-intrinsic knowledge: never hand-write a project's `AGENTS.md`.
      Route it through a normal ship task so a crewmate records it via `bin/fm-ensure-agents-md.sh` and commits it through that project's delivery pipeline, exactly as section 6 describes.
      If the fleet is live, delegate this to a crewmate rather than doing it inline.
-   - Knowledge generalizable to every firstmate user: this repo's own `AGENTS.md` (or other shared, tracked material), shipped through the normal branch -> no-mistakes -> PR -> captain-merge pipeline for this repo (section 1), never hand-committed straight to `main`.
+   - Knowledge generalizable to every firstmate user: this repo's own `AGENTS.md` (or other shared, tracked material), shipped through the normal branch -> PR -> green CI -> exact-head Crosscheck -> approved merge pipeline for this repo (section 1), never hand-committed straight to `main`.
    - Task-scoped notes: inspect the relevant backlog item with `tasks-axi show <id> --full`, judge whether the new note is new, duplicate, superseding, or obsolete, then write a considered replacement body by running `tasks-axi update <id> --body-file <path>` through `bin/fm-data-write.py --data "$FM_HOME/data" -- <command>`.
      When the replacement intentionally supersedes prior state that should remain recoverable, add `--archive-body` to that update command so the prior body stays recoverable without copying it into the replacement.
      Never append.

.agents/skills/stuck-crewmate-recovery/SKILL.md

@@ -2,8 +2,8 @@
 name: stuck-crewmate-recovery
 description: >-
   Agent-only playbook for stuck firstmate direct reports.
-  Use after a stale wake, permission-prompt or system-dialog suspicion, no-mistakes reattach socket read timeout, looping pane, repeated confusion, an answered-by-brief question, an unresponsive crewmate, or a failed steer.
-  Routes permission grants and home-scoped validation recovery before the ordinary peek, steer, interrupt, relaunch, and failed-status ladder.
+  Use after a stale wake, permission-prompt or system-dialog suspicion, looping pane, repeated confusion, an answered-by-brief question, an unresponsive crewmate, or a failed steer.
+  Routes permission handling before the ordinary peek, steer, interrupt, relaunch, and failed-status ladder.
 user-invocable: false
 metadata:
   internal: true
@@ -16,19 +16,6 @@ Use this playbook when a direct report is stale, permission-blocked, looping, re
 Load `harness-adapters` before handling a permission prompt or sending an interrupt, exit command, resume command, or harness-specific skill invocation.
 The target window's harness is recorded as `harness=` in `state/<id>.meta`.
 
-## No-mistakes reattach timeout branch
-
-Handle an error shaped as `drive run: reconcile run ...: read response: ... socket: i/o timeout` before the ordinary ladder.
-That signature means an established daemon connection missed the bounded run-snapshot response deadline; it is not evidence that the daemon stopped.
-
-1. Run `FM_HOME=<this-firstmate-home> bin/fm-no-mistakes-reattach.sh <id>` from the active firstmate repository unless `FM_HOME` already names the active home.
-2. Let the helper own retry timing and task identity checks.
-   It retries only the observed transient signature and requires the daemon to report running before every attempt. This read-only preflight narrows risk but cannot guarantee no start because ordinary `axi run` calls `EnsureDaemon` after the check; strict protection requires an upstream attach-only operation.
-3. Treat a returned gate or outcome as the current run result and continue the ordinary validation decision or completion workflow.
-4. If the helper exhausts its retries, preserve its exact final error and escalate the lane as blocked without changing daemon lifecycle state.
-5. Do not use this branch for another daemon error.
-   Diagnose that error through the ordinary ladder and retain the shared-daemon prohibition.
-
 ## Permission-blocked branch
 
 Handle permission evidence before the ordinary recovery ladder because approving, denying, interrupting, or relaunching can change the security decision or hide the only useful evidence.

.agents/skills/updatefirstmate/SKILL.md

@@ -9,13 +9,13 @@ metadata:
 # updatefirstmate
 
 Self-update firstmate in place.
-Firstmate is its own repo behind the same no-mistakes gate as any project, so shared tracked material reaches `main` and then waits for each running firstmate to pull it; `AGENTS.md` section 12 owns that material's self-update boundary.
+Firstmate is its own repo, so shared tracked material reaches `main` through a green PR and exact-head Crosscheck, then waits for each running firstmate to pull it; `AGENTS.md` section 12 owns that material's self-update boundary.
 Only `AGENTS.md`, `bin/`, and `.agents/skills/` are a running firstmate instruction surface; public `skills/` is installer-facing and is not loaded by firstmate.
 This skill performs that pull for the running main firstmate and every secondmate, without disturbing any in-flight work.
 
 The update is **fast-forward only** - the same sanctioned self-write as the fleet sync firstmate already runs.
 It never forces, never creates a merge commit, never stashes, and advances a target only on a clean fast-forward; anything dirty, diverged, offline, or on the wrong branch is skipped and reported.
-A tracked-files fast-forward leaves the gitignored operational dirs (data/, state/, config/, projects/, .no-mistakes/) untouched, so a secondmate's in-flight work is never disrupted.
+A tracked-files fast-forward leaves the gitignored operational dirs (data/, state/, config/, projects/) untouched, so a secondmate's in-flight work is never disrupted.
 This touches only the firstmate repo and its own worktrees, never anything under `projects/`.
 
 ## What it does

.github/workflows/ci.yml

@@ -12,7 +12,6 @@ permissions:
 jobs:
   lint:
     name: Lint shell scripts
-    needs: behavior-test-plan
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -23,59 +22,15 @@ jobs:
           set -eu
           bin/fm-install-shellcheck.sh "$RUNNER_TEMP/bin"
           echo "$RUNNER_TEMP/bin" >> "$GITHUB_PATH"
-      # Single owner of the lint definition (file set + config + version). Do not
-      # re-spell the shellcheck command here; keep CI and the pre-push gate on it.
+      # Single owner of the lint definition (file set + config + version).
+      # Do not re-spell the shellcheck command here.
       - run: bin/fm-lint.sh
-        if: needs.behavior-test-plan.outputs.mode == 'full'
-      - name: Lint changed Azure service shell files
-        if: needs.behavior-test-plan.outputs.mode == 'focused'
-        shell: bash
-        run: |
-          set -euo pipefail
-          files=()
-          while IFS= read -r path; do
-            [ -n "$path" ] && files+=("$path")
-          done < <(python3 bin/fm-azure-service-test-scope.py shell \
-            "${{ github.event.pull_request.base.sha }}" \
-            "${{ github.event.pull_request.head.sha }}")
-          if [ "${#files[@]}" -gt 0 ]; then
-            bin/fm-lint.sh "${files[@]}"
-          else
-            echo "No changed shell files in focused Azure service diff"
-          fi
       # ShellCheck cannot see the .mjs tools, and nothing else parsed them: a
       # syntax error in one reached main green.
       - run: bin/fm-lint-node.sh
 
-  behavior-test-plan:
-    name: Behavior test shard plan
-    runs-on: ubuntu-latest
-    outputs:
-      mode: ${{ steps.scope.outputs.mode }}
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - name: Select focused or full behavior coverage
-        id: scope
-        shell: bash
-        run: |
-          set -euo pipefail
-          mode=full
-          if [ "$GITHUB_EVENT_NAME" = pull_request ]; then
-            mode=$(python3 bin/fm-azure-service-test-scope.py mode \
-              "${{ github.event.pull_request.base.sha }}" \
-              "${{ github.event.pull_request.head.sha }}")
-          fi
-          printf 'mode=%s\n' "$mode" >> "$GITHUB_OUTPUT"
-          printf 'FM_BEHAVIOR_MODE %s\n' "$mode"
-      - name: Prove complete, disjoint shard coverage
-        run: bin/fm-behavior-shards.sh --check 8
-
   behavior-tests:
     name: Behavior tests (shard ${{ matrix.shard }}/8)
-    needs: behavior-test-plan
-    if: needs.behavior-test-plan.outputs.mode == 'full'
     runs-on: ubuntu-latest
     timeout-minutes: 25
     strategy:
@@ -155,66 +110,27 @@ jobs:
           if-no-files-found: warn
           overwrite: true
 
-  behavior-tests-focused:
-    name: Behavior tests (focused Azure service)
-    needs: behavior-test-plan
-    if: needs.behavior-test-plan.outputs.mode == 'focused'
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-python@v6
-        with:
-          python-version: "3.11"
-      - name: Run focused Azure service behavior tests
-        shell: bash
-        run: |
-          set -euo pipefail
-          tests=()
-          while IFS= read -r path; do
-            [ -n "$path" ] && tests+=("$path")
-          done < <(python3 bin/fm-azure-service-test-scope.py list)
-          [ "${#tests[@]}" -gt 0 ]
-          FM_TEST_SKIP_HERDR=1 tests/run.sh "${tests[@]}"
-
   behavior-tests-complete:
     # Preserve the historical required-check name while proving the union of
     # what the eight runners actually executed, not only the planned inventory.
     name: Behavior tests
-    needs: [behavior-test-plan, behavior-tests, behavior-tests-focused]
+    needs: behavior-tests
     if: always()
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - name: Require one selected behavior mode
-        env:
-          BEHAVIOR_MODE: ${{ needs.behavior-test-plan.outputs.mode }}
-        run: |
-          case "$BEHAVIOR_MODE" in
-            full|focused) ;;
-            *) echo "invalid behavior mode: $BEHAVIOR_MODE" >&2; exit 1 ;;
-          esac
       - name: Download executed-test manifests
-        if: needs.behavior-test-plan.outputs.mode == 'full'
         uses: actions/download-artifact@v4
         continue-on-error: true
         with:
           pattern: behavior-shard-*
           path: ${{ runner.temp }}/behavior-manifests
           merge-multiple: true
       - name: Verify complete execution union
-        if: needs.behavior-test-plan.outputs.mode == 'full'
         run: bin/fm-behavior-shards.sh --verify 8 "$RUNNER_TEMP/behavior-manifests"
-      - name: Verify focused execution
-        if: needs.behavior-test-plan.outputs.mode == 'focused'
-        env:
-          FOCUSED_RESULT: ${{ needs.behavior-tests-focused.result }}
-        run: test "$FOCUSED_RESULT" = success
 
   agent-fleet:
     name: Agent Fleet package
-    needs: behavior-test-plan
-    if: needs.behavior-test-plan.outputs.mode == 'full'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -246,7 +162,7 @@ jobs:
       - name: Personal fleet paths must not be tracked
         run: |
           set -eu
-          tracked=$(git ls-files -- data state config projects .no-mistakes)
+          tracked=$(git ls-files -- data state config projects)
           if [ -n "$tracked" ]; then
             echo "::error::Personal fleet paths are tracked in git:"
             printf '%s\n' "$tracked"