@@ -70,3 +70,77 @@ jobs:
       - name: Snapshot gas (diagnostic)
         run: forge snapshot --check --diff || true
         continue-on-error: true
+
+  forge-test-account:
+    name: Forge Test (TotalReclawAccount)
+    # Option E Phase 3 (P3-1/P3-2/P3-4). This is a SEPARATE job (not a step
+    # folded into `forge-test` above) because `contracts/account/` is a
+    # deliberately SEPARATE Foundry project with its own `foundry.toml` and
+    # `lib/` — see `contracts/account/foundry.toml`'s header comment for
+    # why: adding `account-abstraction`/`openzeppelin-contracts` to the
+    # OUTER project's `lib/`+`remappings.txt` was tried first and reverted,
+    # because solc embeds the full project-wide `settings.remappings` list
+    # into EVERY compiled contract's metadata regardless of whether that
+    # contract uses them — verified to shift `EventfulDataEdge`'s bytecode
+    # and break `test/DataEdgeStagingCreate2.t.sol`'s pinned CREATE2
+    # address for the real, deployed staging DataEdge. Keeping this a
+    # fully separate `forge build`/`forge test` invocation (own working
+    # directory, own project root) is what guarantees the outer job's
+    # compiled artifacts can never be perturbed by this one.
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    defaults:
+      run:
+        working-directory: contracts/account
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: stable
+
+      - name: Show forge version
+        run: forge --version
+
+      # contracts/account/lib/ is gitignored — install pinned versions
+      # (matching contracts/account/foundry.lock) fresh on every run.
+      - name: Install vendored libs (forge-std, account-abstraction, openzeppelin-contracts)
+        run: |
+          forge install --no-git foundry-rs/forge-std@v1.16.1
+          forge install --no-git OpenZeppelin/openzeppelin-contracts@v5.0.2
+          forge install --no-git eth-infinitism/account-abstraction@v0.7.0
+
+      - name: Build
+        run: forge build --sizes
+
+      # Storage-layout diff gate (B2 mitigation) — TotalReclawAccount must
+      # declare ZERO plain state variables beyond what it inherits from
+      # SimpleAccount; all new session-key state lives in ERC-7201
+      # namespaced storage, which correctly does not appear in solc's
+      # storageLayout output. See script/storage-layout-diff.sh.
+      - name: Storage layout diff (TotalReclawAccount vs SimpleAccount baseline)
+        run: ./script/storage-layout-diff.sh
+
+      # Includes the fork test suite (TotalReclawAccountFork.t.sol), which
+      # forks live Gnosis mainnet against a public RPC
+      # (https://rpc.gnosischain.com by default; override with
+      # GNOSIS_RPC_URL repo/environment secret for a private endpoint with
+      # less exposure to public-RPC rate limits). Read-only — never
+      # broadcasts a transaction. If this specific job is flaky on public
+      # RPC availability, that is a CI-infra follow-up, not a reason to
+      # drop the fork tests — they are the highest-value test in the phase
+      # (phase3-impl spec §3.4) and must keep running on every PR that
+      # touches this contract.
+      - name: Run tests (including fork tests against live Gnosis)
+        env:
+          # GH Actions `||` falls back on an unset/empty secret (empty
+          # string is falsy in expression context) — do NOT rely on
+          # `vm.envOr`'s unset-vs-empty handling here, resolve it in YAML
+          # instead so an absent secret can never resolve to "".
+          GNOSIS_RPC_URL: ${{ secrets.GNOSIS_RPC_URL || 'https://rpc.gnosischain.com' }}
+        run: forge test -vvv
@@ -132,4 +132,12 @@ mcp/package-lock.json
 # Foundry vendored libraries — install via 'forge install foundry-rs/forge-std' from contracts/
 contracts/lib/forge-std/
 contracts/out/
+
+# contracts/account/ is its OWN Foundry project (Option E Phase 3 --
+# TotalReclawAccount), deliberately isolated from contracts/foundry.toml.
+# See contracts/account/foundry.toml's header comment. Libs pinned in
+# contracts/account/foundry.lock, reinstalled by CI and by hand locally.
+contracts/account/lib/
+contracts/account/out/
+contracts/account/cache/
 .desloppify/
@@ -0,0 +1,20 @@
+{
+  "lib/forge-std": {
+    "tag": {
+      "name": "v1.16.1",
+      "rev": "620536fa5277db4e3fd46772d5cbc1ea0696fb43"
+    }
+  },
+  "lib/openzeppelin-contracts": {
+    "tag": {
+      "name": "v5.0.2",
+      "rev": "dbb6104ce834628e473d2173bbc9d47f81a9eec3"
+    }
+  },
+  "lib/account-abstraction": {
+    "tag": {
+      "name": "v0.7.0",
+      "rev": "7af70c8993a6f42973f520ae0752386a5032abe7"
+    }
+  }
+}
@@ -0,0 +1,50 @@
+# Foundry config for `TotalReclawAccount` (Option E Phase 3, P3-1/P3-2).
+#
+# WHY THIS IS A SEPARATE FOUNDRY PROJECT FROM `contracts/foundry.toml`,
+# NOT JUST A NEW FILE IN THE EXISTING ONE:
+#
+# `TotalReclawAccount` subclasses eth-infinitism's `SimpleAccount`, which
+# needs the real `account-abstraction` (v0.7.0) and `openzeppelin-contracts`
+# (v5.0.2) packages as Foundry libs. Adding those libs' directories (or a
+# `remappings.txt` naming them) under the SHARED `contracts/lib/` /
+# `contracts/remappings.txt` was tried first and reverted: solc embeds the
+# FULL, PROJECT-WIDE `settings.remappings` list into every compiled
+# contract's metadata, REGARDLESS of whether that specific contract
+# actually imports anything through those remappings. Verified empirically:
+# adding the two new remapping lines (with no other change, not even the
+# lib directories present) shifted `EventfulDataEdge`'s compiled bytecode
+# and broke `test/DataEdgeStagingCreate2.t.sol`'s pinned CREATE2 address
+# assertion for the STAGING DataEdge (`0xE7a4D2677B686e13775Ba9092631089e35F0BB91`,
+# a REAL deployed contract) — a self-inflicted, purely incidental bytecode
+# change to a contract this PR has nothing to do with. A nested Foundry
+# project (its own `foundry.toml`, `lib/`, `remappings.txt`) is the only
+# way to add `account-abstraction`/`openzeppelin-contracts` without that
+# collateral effect: `forge` resolves the project root as the nearest
+# `foundry.toml` walking up from the working directory, so a `forge build`
+# / `forge test` run from THIS directory never sees, and cannot perturb,
+# the outer project's compiler settings or vendored libs.
+#
+# Run from here: `cd contracts/account && forge build && forge test`.
+# CI wiring: `.github/workflows/forge-test.yml` (separate job/step, see
+# comment there for why it must not be folded into the outer job).
+
+[profile.default]
+src = "contracts"
+test = "test"
+out = "out"
+libs = ["lib"]
+solc_version = "0.8.24"
+# Deterministic CREATE2: strip the appended metadata hash so `creationCode`
+# is a pure function of (source, solc version, optimizer settings) and the
+# predicted implementation address reproduces on any machine/toolchain.
+bytecode_hash = "none"
+cbor_metadata = false
+optimizer = true
+optimizer_runs = 200
+via_ir = false
+extra_output = ["storageLayout"]
+
+[fmt]
+line_length = 100
+tab_width = 4
+bracket_spacing = false
@@ -0,0 +1,3 @@
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+account-abstraction/=lib/account-abstraction/
+forge-std/=lib/forge-std/src/
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+# Option E Phase 3 (P3-4) — storage-layout diff CI gate.
+#
+# `TotalReclawAccount` MUST declare zero plain state variables beyond what
+# it inherits from `SimpleAccount` (B2 mitigation: a state variable that
+# collides with `owner` at slot 0 is catastrophic and silent, per
+# `docs/plans/2026-08-02-option-e-phase3-audit-risk.md` §2). All new
+# session-key state lives in ERC-7201 namespaced storage, accessed via a
+# fixed-slot inline-assembly getter, which does NOT show up in solc's
+# `storageLayout.storage` array — so the strongest possible assertion of
+# "no new plain state variables" is: this array is BYTE-IDENTICAL between
+# `TotalReclawAccount` and the `SimpleAccount` it subclasses.
+#
+# `contracts/account/foundry.toml` already sets `extra_output =
+# ["storageLayout"]`; this script is what consumes it (the phase3-impl
+# spec §3.1/§3.4 note that nothing did, before this).
+#
+# Usage: contracts/account/script/storage-layout-diff.sh
+# Exit 0 = layouts match. Exit 1 = they differ (or either inspect failed).
+
+set -euo pipefail
+cd "$(dirname "$0")/.."
+
+echo "Building..."
+forge build >/dev/null
+
+echo "Inspecting TotalReclawAccount storage layout..."
+forge inspect TotalReclawAccount storageLayout --json > /tmp/tra-storage-layout.json
+
+echo "Inspecting SimpleAccount (the deployed baseline's implementation contract) storage layout..."
+forge inspect SimpleAccount storageLayout --json > /tmp/simple-account-storage-layout.json
+
+# Compare only the `.storage` array (slot, offset, type, label) — the
+# `.types` dictionary can differ trivially in ordering/naming without any
+# real layout difference, so it is not part of the gate.
+python3 - <<'PY'
+import json
+import sys
+
+with open("/tmp/tra-storage-layout.json") as f:
+    tra = json.load(f)["storage"]
+with open("/tmp/simple-account-storage-layout.json") as f:
+    simple = json.load(f)["storage"]
+
+def normalize(entries):
+    return [
+        {"slot": e["slot"], "offset": e["offset"], "label": e["label"], "type": e["type"]}
+        for e in entries
+    ]
+
+tra_n = normalize(tra)
+simple_n = normalize(simple)
+
+if tra_n != simple_n:
+    print("STORAGE LAYOUT MISMATCH — TotalReclawAccount declares state that", file=sys.stderr)
+    print("SimpleAccount does not (or vice versa). This is exactly the B2", file=sys.stderr)
+    print("failure class (silent slot-0 collision risk) — do not deploy.", file=sys.stderr)
+    print("", file=sys.stderr)
+    print("TotalReclawAccount:", file=sys.stderr)
+    for e in tra_n:
+        print(f"  slot {e['slot']:>3} offset {e['offset']} {e['label']}: {e['type']}", file=sys.stderr)
+    print("SimpleAccount:", file=sys.stderr)
+    for e in simple_n:
+        print(f"  slot {e['slot']:>3} offset {e['offset']} {e['label']}: {e['type']}", file=sys.stderr)
+    sys.exit(1)
+
+print(f"OK — {len(tra_n)} plain state variable(s), byte-identical between TotalReclawAccount and SimpleAccount:")
+for e in tra_n:
+    print(f"  slot {e['slot']:>3} offset {e['offset']} {e['label']}: {e['type']}")
+PY
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/`
	`2`	`+account-abstraction/=lib/account-abstraction/`
	`3`	`+forge-std/=lib/forge-std/src/`