Merge pull request 'feat/estimate' (#50) from feat/estimate into main

Reviewed-on: #50

.forgejo/workflows/buildAndTest.yml

@@ -21,24 +21,13 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release/*" ]
 
 jobs:
-  log-the-inputs:
-    runs-on: debian-latest
-    steps:
-      - run: |
-          echo "Log level: $LEVEL"
-          echo "Tags: $TAGS"
-          echo "Environment: $ENVIRONMENT"
-        env:
-          LEVEL: ${{ inputs.logLevel }}
-          TAGS: ${{ inputs.tags }}
-
   build:
-
     runs-on: docker
-
+    container:
+      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
     steps:
     - name: Clone yavsc
       run: |
@@ -50,10 +39,13 @@ jobs:
           git checkout FETCH_HEAD
         fi
         git submodule update --init --recursive
-        echo "Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
+        echo "✅ Checked out at $(git rev-parse HEAD) on $(git branch --show-current 2>/dev/null || echo detached HEAD)"
-    - name: Restore dependencies
+
-      run: cd /src/_src && dotnet restore
-    - name: Build
-      run: cd /src/_src && dotnet build --no-restore
     - name: Test
-      run: cd /src/_src && dotnet test --no-build --verbosity normal
+      run: |
+        echo "🚀 Lancement des tests..."
+        cd /src/_src && dotnet test \
+          --verbosity normal \
+          --filter="Category!=Platform-Android" \
+          --logger "xunit;LogFileName=test-results.xml" \
+          && echo "✅ Success !" || echo "❌ Fail ($?)!"

.forgejo/workflows/release.yml

@@ -42,11 +42,6 @@ on:
         description: 'Tag à publier (requis en dispatch, ex. 1.0.6 ou 1.0.7-rc1).'
         required: true
         type: string
-      force_unstable:
-        description: 'Publier une release avec suffixe (ex. 1.0.0-rc1) malgré le fail-fast par défaut.'
-        required: false
-        type: boolean
-        default: false
 
 permissions:
   contents: write
@@ -56,13 +51,14 @@ jobs:
   # via l'API REST Forgejo (pas d'actions tierces Node).
   release:
     runs-on: docker
+    container:
+      image: pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v1
     steps:
       - name: Clone du repo au tag demandé
         env:
           # En push tag : github.ref_name est le tag.
           # En workflow_dispatch : on lit l'input 'tag'.
           TAG: ${{ github.event_name == 'push' && github.ref_name || inputs.tag }}
-          FORCE_UNSTABLE: ${{ inputs.force_unstable || 'false' }}
         run: |
           if [[ -z "$TAG" ]]; then
             echo "::error::No tag provided. In workflow_dispatch, set the 'tag' input."
@@ -72,10 +68,8 @@ jobs:
           # WORKDIR de l'image (cf. dotnet-android-build-image/Dockerfile).
           cd /src
 
-          # Clone unshallow pour que GitVersion.MsBuild ait l'historique
-          # et les tags (sinon MSB3073 sur la cible Android cf. PR #21).
           if [[ ! -d _src/.git ]]; then
-            git clone https://forgejo.pschneider.fr/notazof/yavsc.git _src
+            git clone --depth=1 https://forgejo.pschneider.fr/notazof/yavsc.git _src
           fi
 
           cd _src
@@ -115,12 +109,17 @@ jobs:
 
           echo "Tag $TAG classifié comme channel=$CHANNEL"
 
-          # Fail-fast sur instable sauf opt-in explicite.
+          # Seuls les suffixes explicitement autorisés déclenchent un
-          if [[ "$CHANNEL" == "unstable" && "${FORCE_UNSTABLE:-false}" != "true" ]]; then
+          # release : -rcN et -betaN. Les autres suffixes (-alpha*,
-            echo "::error::Tag '$TAG' is unstable (suffix '$SUFFIX'). Refusing to publish."
+          # -dev*, -preview*, etc.) restent refusés — ils sont
-            echo "Set force_unstable=true via workflow_dispatch to override."
+          # utilisables localement pour itérer, mais ne doivent pas
+          # être publiés comme release publique.
+          if [[ "$CHANNEL" == "unstable" ]]; then
+            if [[ ! "$SUFFIX" =~ ^-(rc|beta)([0-9]+)?$ ]]; then
+              echo "::error::Tag '$TAG' has suffix '$SUFFIX' which is not in the allowed release suffixes (-rcN, -betaN). Refusing to publish."
               exit 1
             fi
+          fi
 
           # Lecture du CHANGELOG.md (doit exister à la racine du repo).
           if [[ ! -f CHANGELOG.md ]]; then
@@ -172,37 +171,22 @@ jobs:
           echo "EOF" >> "$GITHUB_ENV"
           echo "IS_PRERELEASE=$([ "$CHANNEL" = "stable" ] && echo false || echo true)" >> "$GITHUB_ENV"
 
-      - name: Build des projets .NET (sans docker)
+      - name: Restore
-        # L'image runner (pazof/yavsc-build-env) a le SDK .NET 10 + le
-        # workload Android, mais PAS le binaire `docker` ni de daemon
-        # Docker. On exécute donc les commandes dotnet directement
-        # au lieu de passer par `docker build`.
-        # Equivalent des stages build-env du Dockerfile (lignes
-        # restore + build Yavsc.Org + build Yavsc.Api + build
-        # Yavsc.Blogs + build PostIt.Android -r android-arm64).
         run: |
           cd /src/_src
           dotnet restore
-          dotnet build src/Yavsc.Org/Yavsc.Org.csproj -c Release --no-restore -clp:ErrorsOnly
-          dotnet build src/Yavsc.Api/Yavsc.Api.csproj -c Release --no-restore -clp:ErrorsOnly
-          dotnet build src/Yavsc.Blogs/Yavsc.Blogs.csproj -c Release --no-restore -clp:ErrorsOnly
-          dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
-            -c Release --no-restore -clp:ErrorsOnly -r android-arm64
 
-      - name: Copier l'APK signé vers un emplacement connu
+      - name: Build de PostIt.Android ARM64
-        # Le build Android avec -r android-arm64 produit l'APK dans
-        # bin/Release/net10.0-android/android-arm64/. On le copie à
-        # la racine du checkout pour que l'étape d'upload le trouve.
         run: |
           cd /src/_src
-          APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/com.CompanyName.PostIt-Signed.apk
+          dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
-          if [[ ! -f "$APK" ]]; then
+          -c Release -r android-arm64 --no-restore -clp:ErrorsOnly
-            echo "::error::APK not found at $APK"
+
-            ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/ 2>/dev/null || true
+      - name: Build de PostIt.Android x64
-            exit 1
+        run: |
-          fi
+          cd /src/_src
-          cp "$APK" /src/_src/PostIt.Android.apk
+          dotnet build src/PostIt/PostIt.Android/PostIt.Android.csproj \
-          ls -la /src/_src/PostIt.Android.apk
+          -c Release -r android-x64 --no-restore -clp:ErrorsOnly
 
       - name: Publier la release Forgejo via l'API REST
         # Pas d'action tierce (pas de Node dans l'image runner).
@@ -311,21 +295,22 @@ jobs:
           # sinon curl l'interprète comme un second fichier d'input
           # (un fichier nommé '?name=PostIt.Android.apk') et l'API
           # Forgejo renvoie 400 "Missing 'name' parameter".
-          echo "::group::Upload APK asset"
+          echo "::group::Upload PostIt APK assets"
+          for MARCH in arm64 x64; do
             HTTP=$(curl -sS -o /tmp/asset.json -w '%{http_code}' \
               -X POST \
               -H "Authorization: token $GITHUB_TOKEN" \
               -H "Content-Type: application/octet-stream" \
               -H "Accept: application/json" \
-            --data-binary "@/src/_src/PostIt.Android.apk" \
+              --data-binary "@/src/_src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-$MARCH/fr.pschneider.postit-Signed.apk" \
-            "$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android.apk")
+              "$API_BASE/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=PostIt.Android-$MARCH.apk")
             echo "POST asset -> HTTP $HTTP"
-          echo "::endgroup::"
-
             if [[ "$HTTP" != "201" ]]; then
               echo "::error::Asset upload failed (HTTP $HTTP):"
               cat /tmp/asset.json
               exit 1
             fi
+          done
+          echo "::endgroup::"
 
-          echo "Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG"
+          echo "✅ Release publiée: $API_BASE/$GITHUB_REPOSITORY/releases/tag/$TAG"

.github/workflows/docker-publish-android.yml

@@ -1,183 +0,0 @@
-name: Build and Push Yavsc Apk
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - '*'
-  workflow_dispatch:
-    inputs:
-      force_unstable:
-        description: 'Publier une release avec suffixe (ex. 1.0.0-rc1) malgré le fail-fast par défaut.'
-        required: false
-        type: boolean
-        default: false
-
-# softprops/action-gh-release a besoin de contents: write
-# pour publier une release + uploader un asset.
-permissions:
-  contents: write
-
-jobs:
-  apk-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout du code
-        uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      # 1. Votre étape de build actuelle (on nomme l'image "postit-android")
-      #    --target build-env : on ne veut que le stage de build (qui
-      #    contient les artefacts .apk). Sans --target, Docker ciblerait
-      #    le DERNIER stage du Dockerfile (blogs-runtime, qui est une
-      #    image ASP.NET runtime sans aucun APK à extraire).
-      - name: Build de l'image Docker
-        run: docker build --build-arg ANDROID_TARGET_RID=android-arm64 --target build-env -t postit-android .
-      # 2. EXTRACTION : Créer un conteneur éphémère pour copier l'APK vers l'hôte GitHub
-      - name: Extraire l'APK du conteneur Docker
-        run: |
-          docker create --name extractor postit-android
-          docker cp extractor:/src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/com.CompanyName.PostIt-Signed.apk ./PostIt.Android.apk
-          docker rm extractor
-
-      - name: Téléverser l'APK en tant qu'Artéfact GitHub
-        uses: actions/upload-artifact@v7
-        with:
-          name: application-apk-release
-          path: ./PostIt.Android.apk
-          retention-days: 7
-
-  # Job de validation : parse le tag, vérifie le format, applique la règle
-  # de parité du patch (pair=stable / impair=preview / suffixe=instable),
-  # et s'assure que CHANGELOG.md contient une section cohérente.
-  # Sans ce job, le job publish-release peut être bypassé (un attaquant
-  # qui contrôle un tag ne peut pas publier de release sans une section
-  # changelog cohérente).
-  validate-release:
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout du code
-        uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Valider le tag et la section CHANGELOG
-        env:
-          FORCE_UNSTABLE: ${{ inputs.force_unstable || github.event.inputs.force_unstable || 'false' }}
-        run: |
-          TAG="${GITHUB_REF_NAME}"
-
-          # Parse semver : MAJOR.MINOR.PATCH[-SUFFIX]
-          if [[ ! "$TAG" =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)(-.*)?$ ]]; then
-            echo "::error::Tag '$TAG' does not match MAJOR.MINOR.PATCH[-SUFFIX] format."
-            exit 1
-          fi
-
-          MAJOR="${BASH_REMATCH[1]}"
-          MINOR="${BASH_REMATCH[2]}"
-          PATCH="${BASH_REMATCH[3]}"
-          SUFFIX="${BASH_REMATCH[4]}"
-
-          # Classification du canal par parité du patch.
-          # Patch pair + pas de suffixe -> stable.
-          # Patch impair + pas de suffixe -> preview.
-          # Suffixe présent -> instable.
-          if [[ -n "$SUFFIX" ]]; then
-            CHANNEL="unstable"
-          elif (( PATCH % 2 == 0 )); then
-            CHANNEL="stable"
-          else
-            CHANNEL="preview"
-          fi
-
-          echo "Tag $TAG classifié comme channel=$CHANNEL"
-
-          # Fail-fast sur instable sauf opt-in explicite via workflow_dispatch.
-          if [[ "$CHANNEL" == "unstable" && "$FORCE_UNSTABLE" != "true" ]]; then
-            echo "::error::Tag '$TAG' is unstable (suffix '$SUFFIX'). Refusing to publish."
-            echo "Set force_unstable=true via workflow_dispatch to override."
-            exit 1
-          fi
-
-          # Lecture du CHANGELOG.md (doit exister à la racine du repo).
-          if [[ ! -f CHANGELOG.md ]]; then
-            echo "::error::CHANGELOG.md not found at repo root."
-            exit 1
-          fi
-
-          # Extraction de la section [TAG]. On cherche la première ligne
-          # commençant par '## [' qui contient '[TAG]' (entre '## [' et
-          # la prochaine ligne '## [' ou fin de fichier). awk en mode
-          # paragraphe suffit et reste POSIX.
-          BODY=$(awk -v tag="[$TAG]" '
-            /^## \[/ {
-              if (in_section) exit
-              if (index($0, tag) > 0) in_section=1
-              next
-            }
-            in_section { print }
-          ' CHANGELOG.md)
-
-          if [[ -z "$BODY" ]]; then
-            echo "::error::No section matching '## [$TAG]' found in CHANGELOG.md."
-            echo "Add a '## [$TAG] - $CHANNEL' section before tagging."
-            exit 1
-          fi
-
-          # Vérification cohérence du canal déclaré dans le titre de section.
-          # Format attendu : "## [TAG] - stable" / "- preview" / "- unstable".
-          HEADER=$(grep -m1 "^## \[$TAG\]" CHANGELOG.md)
-          if [[ "$HEADER" != *" - $CHANNEL"* ]]; then
-            echo "::error::Section '## [$TAG]' must declare suffix '- $CHANNEL' to match tag parity."
-            echo "Current section header: $HEADER"
-            exit 1
-          fi
-
-          echo "Section CHANGELOG validée pour [$TAG] - $CHANNEL"
-
-          # Exposition aux étapes suivantes via $GITHUB_ENV.
-          # heredoc <<EOF pour le body multi-lignes (pattern GitHub Actions).
-          {
-            echo "RELEASE_BODY<<EOF"
-            echo "$BODY"
-            echo "EOF"
-            echo "RELEASE_CHANNEL=$CHANNEL"
-            if [[ "$CHANNEL" == "stable" ]]; then
-              echo "IS_PRERELEASE=false"
-            else
-              echo "IS_PRERELEASE=true"
-            fi
-          } >> "$GITHUB_ENV"
-
-  publish-release:
-    # Déclenché uniquement par un push de tag. Le job apk-deploy produit
-    # l'artefact ; validate-release garantit la cohérence du tag et du
-    # changelog avant publication.
-    if: startsWith(github.ref, 'refs/tags/')
-    needs: [apk-deploy, validate-release]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Récupérer l'APK depuis l'artefact
-        uses: actions/download-artifact@v7
-        with:
-          name: application-apk-release
-          path: ./
-
-      - name: Publier la release GitHub et uploader l'APK
-        uses: softprops/action-gh-release@v2
-        with:
-          # Le nom de fichier final dans la release. C'est ce qui
-          # apparaîtra dans l'asset et donc dans le permalink :
-          #   https://github.com/<owner>/<repo>/releases/latest/download/PostIt.Android.apk
-          files: ./PostIt.Android.apk
-          # Le body est extrait de la section CHANGELOG.md correspondant
-          # au tag, exposée par validate-release via $GITHUB_ENV.
-          body: ${{ env.RELEASE_BODY }}
-          # stable -> false (marque comme Latest).
-          # preview / unstable -> true (visible mais pas Latest).
-          prerelease: ${{ env.IS_PRERELEASE }}

.github/workflows/docker-publish-backend.yml

@@ -26,7 +26,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Test
-        run: dotnet test --no-build --verbosity normal
+        run: dotnet test --no-build --verbosity normal --filter="Category!=Platform-Android"
       # 4. Build et Push de l'image de production finale
       - name: Build and push production image
         uses: docker/build-push-action@v7

.gitignore

@@ -39,3 +39,6 @@ DataDir/
 
 *.tests.trx
 *.tests.html
+
+*.log
+

.vscode/launch.json

@@ -4,6 +4,21 @@
   // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "Android Debug",
+      "type": "mono",
+      "preLaunchTask": "run-debug-android",
+      "request": "attach",
+      "address": "localhost",
+      "port": 55555
+    },
+    {
+      "name": "Android Attach - Debug",
+      "type": "mono",
+      "request": "attach",
+      "address": "localhost",
+      "port": 55555
+    },
     {
       "name": "API",
       "type": "dotnet",
@@ -11,23 +26,32 @@
       "projectPath": "${workspaceFolder}/src/Api/Api.csproj"
     },
     {
-            "name": "Yavsc.Org",
+      "name": "Yavsc Org",
       "type": "dotnet",
       "request": "launch",
       "projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
     },
     {
-            "name": "Yavsc.Blogs",
+      "name": "Yavsc Blogs",
       "type": "dotnet",
       "request": "launch",
       "projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
     },
     {
-            "name": "PostIt",
+      "name": "PostIt Desktop",
       "type": "dotnet",
       "request": "launch",
       "projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
-
+    },
+    {
+      "name": "Test PostIt.Android launch (Xamarin.UITest)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}/src/PostIt/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/src/PostIt/PostIt.Tests",
+      "console": "integratedTerminal",
+      "stopAtEntry": false
     }
   ]
 }

.vscode/mcp.json

@@ -1,11 +0,0 @@
-{
-  "servers": {
-    "openclaw": {
-      "type": "stdio",
-      "command": "/home/paul/.nvm/versions/node/v22.23.0/bin/node",
-      "args": [
-        "/home/paul/Workspace/tools/openclaw-mcp-server.js"
-      ]
-    }
-  }
-}

.vscode/settings.json

@@ -5,6 +5,8 @@
       "appsettings",
       "asciidoctor",
       "ASPNETCORE",
+      "Avalonia",
+      "blogspot",
       "Configurabilité",
       "Cratie",
       "DESTDIR",
@@ -12,9 +14,11 @@
       "DOTNET",
       "ecdsa",
       "envsubst",
+      "Forgejo",
       "Hsts",
       "Newtonsoft",
       "Npgsql",
+      "Oidc",
       "PKCE",
       "postit",
       "pschneider",
@@ -40,5 +44,6 @@
                 "copilotcli/gpt-5.3-codex"
             ]
         }
-    }
+    },
+    "dotnet.defaultSolution": "yavsc.sln"
 }

.vscode/tasks.json

@@ -1,6 +1,44 @@
 {
   "version": "2.0.0",
+  "isRoot": true,
+  "problemMatcher": [
+        {
+          "owner": "dotnet",
+          "fileLocation": ["relative", "${workspaceFolder}"],
+          "source": "dotnet",
+          "pattern": {
+            "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+(error|warning) (.*)$",
+            "file": 1,
+            "line": 2,
+            "column": 3,
+            "severity": 4,
+            "code": 5,
+            "message": 6
+          }
+        }
+      ],
   "tasks": [
+    {
+      "label": "run-debug-android",
+      "command": "dotnet",
+      "type": "shell",
+      "options": {
+        "cwd": "${workspaceFolder}/src/PostIt/PostIt.Android",
+        "env": {
+          "DOTNET_HOST_PATH": "/usr/share/dotnet",
+          "ANDROID_HOME": "/opt/android-sdk",
+          "JAVA_HOME": "/usr/lib/jvm/java-1.25.0-openjdk-amd64"
+        }
+      },
+      "args": [
+        "run",
+        "-p:TargetFramework=net10.0-android",
+        "-p:Configuration=Debug",
+        "-p:AndroidAttachDebugger=true",
+        "-p:AndroidSdbHostPort=55555",
+        "-p:AndroidSdbTargetPort=55555"
+      ]
+    },
     {
       "label": "build",
       "command": "dotnet",
@@ -9,7 +47,6 @@
       "group": "build",
       "isBuildCommand": true,
       "isTestCommand": false,
-      "problemMatcher": ["$msCompile"],
       "isBackground": true
     },
     {
@@ -39,59 +76,6 @@
         "kind": "build"
       },
       "isBackground": true
-    },
-    {
-      "label": "test blogs",
-      "type": "process",
-      "problemMatcher": ["$msCompile"],
-      "command": "dotnet",
-      "args": ["test"],
-      "runOptions": {
-        "instanceLimit": 1
-      },
-      "options": {
-        "cwd": "src/Yavsc.Blogs",
-        "env": {
-          "DOTNET_CLI_UI_LANGUAGE": "en-US",
-          "ASPNETCORE_ENVIRONMENT": "Development"
-        }
-      },
-      "group": {
-        "kind": "test"
-      },
-      "isBackground": true,
-      "presentation": {
-        "echo": true,
-        "reveal": "always",
-        "focus": false,
-        "panel": "shared",
-        "showReuseMessage": true,
-        "clear": false
-      }
-    },
-    {
-      "label": "publish",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "publish",
-        "/property:GenerateFullPaths=true",
-        "/consoleloggerparameters:NoSummary;ForceNoAlign"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "watch",
-      "command": "dotnet",
-      "type": "process",
-      "args": ["watch", "--project",
-      "src/Yavsc.Org/Yavsc.Org.csproj"
-    ],
-      "problemMatcher": "$msCompile",
-      "runOptions": {
-
-      }
-
     }
   ]
 }

CHANGELOG.md

@@ -1,20 +1,175 @@
 # Changelog
 
-Toutes les modifications notables de PostIt et de la plateforme Yavsc
+## [1.0.8-rc12] - unstable
-sont documentées dans ce fichier.
 
-Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/),
+### Added
-et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-À noter : la **parité du numéro de patch** porte une signification de canal :
+* [PostIt] Nouveau helper d'image `ImageHelper` pour charger des bitmaps depuis les ressources et depuis le web.
+* [PostIt] Affichage de l'avatar XS dans la liste des performers d'activites, avec fallback visuel (initiale utilisateur).
+* [PostIt.Tests] Nouveaux tests autour des URLs avatar et de la source d'autorite.
+* [contrib] Ajout d'un `README.md` utilitaire pour les symboles/icones.
 
-- **patch pair** (ex. `1.0.0`, `1.0.2`) → **stable**
+### Changed
-- **patch impair** (ex. `1.0.1`, `1.0.3`) → **preview**
-- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable**
 
-Cette convention est partagée avec le dépôt
+* [PostIt] Les avatars ne sont plus relies en string sur `Image.Source`: ils sont telecharges et lies en `Bitmap`.
-[`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian)
+* [Yavsc.Api.Client] `ActivityApiClient` accepte une base d'avatar dediee et construit les URLs avatar depuis l'autorite d'identification.
-pour la production des paquets `.deb`.
+* [PostIt] Le header de `MainPage` n'utilise plus `ScrollViewer`; remplacement par une barre de commandes basee sur `WrapPanel`.
+* [PostIt] Alignement de la navigation blogs: renommage `PushMainPageAsync` -> `PushBlogsPageAsync` et ajustement de `HomePageViewModel`.
+
+### Fixed
+
+néant
+
+## [1.0.8-rc11] - unstable
+
+### Added
+
+nothing
+
+### Changed
+
+* [Yavsc.Api.Test] Mise a jour de `Microsoft.EntityFrameworkCore.Sqlite` vers `10.0.11` afin de supprimer l'alerte NU1903 liee a `SQLitePCLRaw.lib.e_sqlite3` 2.1.11.
+* [Yavsc.Org] Nettoyage de la configuration NuGet pour le restore: suppression du fichier local `Directory.Packages.props` au profit du fichier racine centralise.
+* [Yavsc.Org] Suppression de references de packages redondantes dans le projet, sans impact fonctionnel attendu.
+
+### Fixed
+
+* [Yavsc.Api.Test] Le restore n'emet plus le warning de vulnerabilite `NU1903` sur `SQLitePCLRaw.lib.e_sqlite3`.
+* [Yavsc.Org] Suppression d'une vulnerabilite de severite elevee sur AutoMapper apres publication et consommation de la nouvelle version candidate de `HigginsSoft.IdentityServer8`.
+
+## [1.0.8-rc10] - unstable
+
+### Added
+
+* [PostIt] Une page d'historique des commandes billing permet maintenant d'ouvrir une commande existante.
+* [PostIt] Une vue "Demandes en cours" en lecture seule est disponible pour le performer, filtrée sur les statuts actifs (Inserted, Accepted, InProgress).
+* [Yavsc.Org] Nouvelles entités `Country` et `PerformerCodeInputValidation` pour piloter la validation du code entreprise performer par pays.
+
+### Changed
+
+* [PostIt] La page détail billing se préremplit depuis une commande existante (Rdv, Brush, MBrush) et passe en mode mise à jour.
+* [Yavsc.Org] Le formulaire `Manage/SetActivity` inclut désormais le pays d'exercice (`fr`, `en`, `pt`) et applique la regex associée au champ `SIREN`.
+* [Yavsc.Org] La vérification externe du numéro d'entreprise est conservée uniquement pour le pays `fr`.
+
+### Fixed
+
+* [PostIt] Le flux historique n'est plus limité à une simple liste: l'action d'ouverture charge la commande cible puis navigue vers la page détail.
+* [Yavsc.Org] Le champ `SIREN` n'est plus validé avec une règle unique indépendante du pays d'exercice.
+
+## [1.0.8-rc9] - unstable
+
+### Added
+
+nothing
+
+### Changed
+
+masquage non-owner côté backend de l'ACL du billet
+
+### Fixed
+
+On a maintenant le comportement attendu bout en bout:
+
+ACL chargée depuis le BlogPostDto
+noms de cercles affichés dans le dialogue ACL côté PostIt
+
+## [1.0.8-rc8] - unstable
+
+### Added
+
+nothing
+
+### Changed
+
+nothing
+
+### Fixed
+
+The PostIt publish toggle button
+
+## [1.0.8-rc7] - unstable
+
+### Added
+
+* [PostIt] The search pattern now persists
+
+### Changed
+
+* The blog spot path is now `/api/v1/blogspot` (yet in last release)
+
+### Fixed
+
+* [Yavsc.Org] (Ticket #45) La forme de l'email de l'utilisateur est maintenant validée avant l'envoi du formulaire d'enregistrement
+
+## [1.0.8-rc6] - unstable
+
+### Added
+
+* a code cleanup,
+* a first Xamarin.UITest is successful, but disabled, because breaking the actual CI process,
+* Android app starts, the login process succeeds
+
+### Changed
+
+L'identifiant de l'application client Android a changé, il passe en minuscules :
+`fr.pschneider.postit`
+
+### Fixed
+
+a bug posting and retrieving ACL from the backend,
+the ACL now comes along with the article,
+[TODO][PostIt] keep ACL along with the article
+
+## [1.0.8-rc1] - unstable
+
+### Added
+- `BlogAclApiTests.PostCircleAuthorization_returns_201_when_payload_mirrors_PostIt_shape_against_existing_circle_named_test`
+  : test de non-régression qui épingle la forme exacte du payload
+  que PostIt envoie à `POST /api/v1/blogacl` (un objet
+  `PostAccessControlRulePayload` avec `CircleId` et `BlogPostId`).
+  C'est le verrou côté test du fix applicatif PostIt + serveur.
+- `BlogAclApiTests.PostCircleAuthorization_never_returns_500` : une
+  `[Theory]` couvrant quatre shapes de payload (`{ circleId }`,
+  corps vide, `{ blogPostId }` seul, `{ circleId, blogPostId: 0 }`)
+  qui doivent tous retourner un statut différent de 500. Toute
+  réintroduction d'un chemin 500 dans le futur fera rougir ce test.
+- `BlogAclApiTests.PostCircleAuthorization_dosent_return_500` et
+  `..._dosent_return_500_on_success` : entry points `[Fact]` qui
+  appellent la `[Theory]` ci-dessus avec un payload spécifique
+  chacun, pour pouvoir filtrer en isolation depuis la ligne de
+  commande ou le CI.
+- Règle « Pas de `object` dans le code source applicatif » ajoutée
+  à `CONTRIBUTING.md` : types de retour, paramètres, champs,
+  propriétés, variables locales doivent être typés statiquement.
+  `dynamic` est interdit pour les mêmes raisons.
+
+### Changed
+- `BlogAclApiController.CheckOwner` devient `CheckOwnerAsync` et
+  utilise `FirstOrDefaultAsync` au lieu de `First`, supprimant
+  l'appel LINQ synchrone sur le fil de la requête et retournant
+  `false` sur cercle manquant (le contrôleur mappe déjà cela vers
+  `ChallengeResult`).
+- `BlogsWebServerFixture` seed `alice`, son `Circle` et son
+  `BlogPost` une seule fois au démarrage du host, sur la
+  `SqliteConnection` partagée (`Cache=Shared`). Le précédent
+  `EnsureDeleted` au début de chaque test fermait la connexion
+  statique et détruisait le store `:memory:` pour tous les autres
+  `DbContext` ; il est retiré au profit d'un `EnsureCreated`
+  idempotent.
+
+### Fixed
+- `POST /api/v1/blogacl` ne retourne plus 500 sur les payloads
+  dont `BlogPostId` est absent ou à zéro. Le contrôleur rejette
+  `BlogPostId <= 0` avec `400 BadRequest` avant que la requête
+  n'atteigne `SaveChangesAsync`. L'incident de prod du 2026-08-21
+  sur mercure (PostIt envoyant seulement `circleId`, le serveur
+  voyant `BlogPostId = default(long) = 0` et EF Core levant
+  `InvalidOperationException` sur l'INSERT) n'est plus atteignable.
+- PostIt `PostAclDialogViewModel.AddAsync` envoie désormais le
+  payload explicite `PostAccessControlRulePayload { CircleId,
+  BlogPostId }` au lieu de l'ancien `CircleAuthorization {
+  CircleId }`. Le DTO serveur `PostAccessControlRulePayload` est
+  introduit dans `Yavsc.Abstract` pour porter le contrat.
 
 ## [1.0.7] - preview
 
@@ -118,9 +273,10 @@ pour la production des paquets `.deb`.
   migration, reverted in this release. The publish toggle covers
   the same user-visible switch without a schema change.
 
-[Unreleased]: https://github.com/pazof/yavsc/compare/HEAD
+[Unreleased]: https://forgejo.pschneider.fr/notazof/yavsc/compare/HEAD
-[1.0.7]: https://github.com/pazof/yavsc/compare/1.0.6...1.0.7
+[1.0.8-rc1]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.7...1.0.8-rc1
-[1.0.6]: https://github.com/pazof/yavsc/compare/1.0.5...1.0.6
+[1.0.7]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.6...1.0.7
+[1.0.6]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.5...1.0.6
 
 ## [1.0.6] - stable
 
@@ -154,4 +310,4 @@ pour la production des paquets `.deb`.
   actual release id. Switched to `jq` for both body construction and
   field extraction.
 
-[1.0.6]: https://github.com/pazof/yavsc/compare/1.0.5...1.0.6
+[1.0.6]: https://forgejo.pschneider.fr/notazof/yavsc/compare/1.0.5...1.0.6

CONTRIBUTING.md

@@ -11,7 +11,7 @@
 ## Premier build
 
 ```bash
-git clone https://github.com/pazof/yavsc.git
+git clone https://forgejo.pschneider.fr/notazof/yavsc.git
 cd yavsc
 dotnet restore
 dotnet build
@@ -49,6 +49,90 @@ Les tests sont répartis en :
   item « Tests d'intégration smoke par BC ».
 - `src/PostIt.Tests/` — tests unitaires du client desktop PostIt.
 
+## Onboarding assiste par agents IA
+
+Pour accelerer la prise en main du depot avec Copilot/Plan/Explore :
+
+- Parcours pas-a-pas : [doc/onboarding-agents.md](./doc/onboarding-agents.md)
+- Playbook d'usage des agents : [doc/agent-playbook.md](./doc/agent-playbook.md)
+- Matrice intentions -> agent -> preuves : [doc/agent-intent-matrix.md](./doc/agent-intent-matrix.md)
+
+Regle minimale en contribution assistee par agent :
+- expliciter l'impact architecture,
+- justifier le niveau de tests execute,
+- documenter les risques residuels.
+
+## Le CHANGELOG.md
+
+Le `CHANGELOG.md` est un document de changement de version
+
+Toutes les modifications notables de PostIt et de la plateforme Yavsc
+sont documentées dans ce fichier.
+
+Le format suit [Keep a Changelog](https://keepachangelog.com/fr/1.1.0/),
+et ce projet adhère au [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+À noter : la **parité du numéro de patch** porte une signification de canal :
+
+- **patch pair** (ex. `1.0.0`, `1.0.2`) → **preview**
+- **patch impair** (ex. `1.0.1`, `1.0.3`) → **stable**
+- **suffixe** (ex. `1.0.0-rc1`, `1.0.0-alpha`) → **instable**
+
+Cette convention est partagée avec le dépôt
+[`postit-debian`](https://forgejo.pschneider.fr/notazof/postit-debian)
+pour la production des paquets `.deb`.
+
+## Navigation (PostIt)
+
+La navigation est centralisée dans
+`App.PushPageAsync(ViewModelBase vm)` (`src/PostIt/PostIt/App.axaml.cs`).
+Pour ouvrir un écran, un ViewModel (généralement dans une
+commande `[RelayCommand]`) appelle
+`await ((App)App.Current!).PushPageAsync(targetVm).ConfigureAwait(true);`.
+`PushPageAsync` résout la `Control` correspondante via le
+`ViewLocator` (un `IDataTemplate` enregistré dans
+`Application.DataTemplates` au boot), l'identifie comme
+`Page`, lui assigne le VM comme `DataContext`, et appelle
+`NavRoot.PushAsync(page)`. Une garde anti-empilement
+compare par référence la nouvelle page au sommet courant
+de la stack pour éviter un push doublon.
+
+Pour qu'une nouvelle page soit navigable, il faut *deux*
+enregistrements : la page dans le DI (`AddTransient<TPage>`
+ou `AddSingleton<TPage>`) **et** une case dans le `switch`
+de `ViewLocator.Build`. Si l'un manque, l'app affiche
+"No view for X" sans crash.
+
+Règles :
+
+- On n'instancie jamais une `View` à la main depuis un
+  ViewModel, on ne récupère jamais une `View` depuis la DI
+  directement dans un ViewModel.
+- Le ViewModel qui déclenche la nav ne pousse pas lui-même
+  la page ; il appelle `App.PushPageAsync(vm)` et laisse
+  `App` orchestrer le `PushAsync` physique.
+- Le ViewModel qui déclenche la nav ne capture pas de
+  référence à `MainWindow` ou `NavigationPage`. Il passe
+  par `App.Current` (l'app Avalonia est un singleton).
+
+Exemple canonique (depuis `MainPageViewModel`) :
+
+```csharp
+[RelayCommand]
+internal async Task OpenSettings()
+{
+    var settingsVm = ((App)App.Current!).ServiceProvider
+        .GetRequiredService<Settings>();
+    await ((App)App.Current!).PushPageAsync(settingsVm)
+        .ConfigureAwait(true);
+}
+```
+
+Cf. [doc/architecture/postit.md](./doc/architecture/postit.md)
+pour la topologie complète (host de navigation,
+`SessionStatusViewModel`, signaux de cycle de vie vs nav
+utilisateur).
+
 ## Conventions de code
 
 Le repo applique `.editorconfig` (UTF-8, LF, `indent_size = 4` en
@@ -64,6 +148,13 @@ Quelques règles non capturées par `.editorconfig` :
 - Préférer les types BCL (`int`, `string`) aux types framework
   (`Int32`, `String`).
 - Préférer les expressions de pattern matching aux casts explicites.
+- **Pas de `object` dans le code source applicatif.** Types de retour,
+  paramètres, champs, propriétés, variables locales : tout doit être
+  typé statiquement. `dynamic` est interdit pour les mêmes raisons.
+  Un cast en `object` est presque toujours le symptôme d'un contrat
+  qu'on a laissé s'effriter (DTO, payload, handler) — refactore
+  le contrat (record typé, DTO dédié, méthode dédiée) au lieu de
+  shimer avec un cast.
 
 ## Branches & commits
 

Directory.Build.props

@@ -1,16 +1,6 @@
 <Project>
   <PropertyGroup>
     <RootNamespace>Yavsc</RootNamespace>
-    <!--
+    <NoWarn>NU1701, NU1901, NU1902, NU1507</NoWarn>
-      GitVersion.MsBuild is referenced as a build-time package from
-      every csproj under src/. Setting UseProjectNamespaceForGitVersionInformation
-      here (in Directory.Build.props) means each assembly exposes a
-      GitVersionInformation type under its own namespace, e.g.
-      PostIt.GitVersionInformation, Yavsc.GitVersionInformation, so
-      the assembly metadata reflects the source tree it was built
-      from without conflicting names.
-    -->
-    <UseProjectNamespaceForGitVersionInformation>true</UseProjectNamespaceForGitVersionInformation>
-    <NoWarn>NU1701, NU1901, NU1902</NoWarn>
   </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -1,16 +1,31 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <IdentityServer8Version>8.1.0-pazofrc007</IdentityServer8Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="coverlet.collector" Version="10.0.1" />
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.9" />
-    <PackageVersion Include="GitVersion.MsBuild" Version="6.8.1" />
+
-    <PackageVersion Include="HigginsSoft.IdentityServer8" Version="8.1.0-alpha.171" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8" Version="$(IdentityServer8Version)" />
-    <PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="8.1.0-alpha.171" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.AspNetIdentity" Version="$(IdentityServer8Version)" />
-    <PackageVersion Include="IdentityModel.OidcClient" Version="6.0.0" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework" Version="$(IdentityServer8Version)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.EntityFramework.Storage" Version="$(IdentityServer8Version)" />
-    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.Security" Version="$(IdentityServer8Version)" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
+    <PackageVersion Include="HigginsSoft.IdentityServer8.Storage" Version="$(IdentityServer8Version)" />
+
+    <PackageVersion Include="AsciiDocSharp" Version="0.1.0" />
+    <PackageVersion Include="AsciiDocSharp.Converters.Html" Version="0.1.0" />
+
+    <PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2" />
+
+    <PackageVersion Include="Google.Apis.Compute.v1" Version="1.74.0.4138" />
+
+    <PackageVersion Include="Microsoft.AspNetCore.Antiforgery" Version="2.3.11" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.SignalR" Version="1.2.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9" />
     <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.3.11" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
     <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.9" />
@@ -18,9 +33,20 @@
     <PackageVersion Include="Microsoft.AspNetCore.Razor" Version="2.3.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.9" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
+
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.2" />
+
+    <PackageVersion Include="coverlet.collector" Version="10.0.1" />
+
+    <PackageVersion Include="IdentityModel.OidcClient" Version="6.0.0" />
+
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.v3.common" Version="3.2.2" />

Makefile

@@ -77,13 +77,6 @@ release:
 		echo "  V : version semver (ex. 1.0.7-rc1) — sert à nommer la branche."; \
 		exit 1; \
 	fi
-	@CURRENT=$$(git branch --show-current); \
-	if [ "$$CURRENT" != "main" ]; then \
-		echo "Refus : la cible doit être lancée depuis main."; \
-		echo "  Branche courante : $$CURRENT"; \
-		echo "  Fais : git checkout main && git pull --ff-only origin main"; \
-		exit 1; \
-	fi
 	@if [ -n "$$(git status --porcelain)" ]; then \
 		echo "Working tree sale, refus de créer une branche release."; \
 		git status --short; \

README.md

@@ -1,27 +1,25 @@
 
 
 # Yavsc
+  [![The latest release made in the repository](https://forgejo.pschneider.fr/notazof/yavsc/badges/release.svg)](https://forgejo.pschneider.fr/notazof/yavsc/releases/latest)
 
 C'est une application mettant en oeuvre une prise de contact entre un demandeur de services et son éventuel prestataire associé.
 
 # Statut actuel des actions Forgejo
 
-[![Build and test](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/buildAndTest.yml/badge.svg)](https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=buildAndTest.yml)
 
-[![Release](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/release.yml/badge.svg)](
+* [![Build and test](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/buildAndTest.yml/badge.svg)](https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=buildAndTest.yml)
+
+* [![Release](https://forgejo.pschneider.fr/notazof/yavsc/badges/workflows/release.yml/badge.svg)](
 https://forgejo.pschneider.fr/notazof/yavsc/actions?workflow=release.yml
 )
 
-[![The latest release made in the repository](https://forgejo.pschneider.fr/notazof/yavsc/badges/release.svg)](https://forgejo.pschneider.fr/notazof/yavsc/releases/latest)
-
-
 # Statut actuel des actions GitHub
 
-* [![Build and Push Yavsc Apk](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/docker-publish-android.yml)
+* [![CodeQL Advanced](https://github.com/pazof/yavsc/actions/workflows/codeql.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/codeql.yml)
 
 * [![Build and Push Yavsc Production Image](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/docker-publish-backend.yml)
 
-* [![CodeQL Advanced](https://github.com/pazof/yavsc/actions/workflows/codeql.yml/badge.svg)](https://github.com/pazof/yavsc/actions/workflows/codeql.yml)
 
 # Documentation
 
@@ -30,6 +28,10 @@ sous [`doc/`](./doc/). Voir l'[index de la documentation](./doc/README.md)
 pour le sommaire complet. La racine de l'architecture est
 [Architecture.md](./doc/Architecture.md).
 
+Pour une prise en main guidee avec agents IA:
+- parcours onboarding: [doc/onboarding-agents.md](./doc/onboarding-agents.md)
+- playbook d'usage: [doc/agent-playbook.md](./doc/agent-playbook.md)
+
 
 # Construction et déploiement
 

ROADMAP.md

@@ -68,7 +68,7 @@ Trois principes non négociables traversent tous les jalons :
 >
 > Chaque jalon a un **critère de sortie** vérifiable.
 
-### Jalon 0 — Fondations techniques *(en cours)*
+### Jalon 0 — Fondations techniques
 
 > Cible : pouvoir parler du domaine sans se battre avec le runtime.
 
@@ -81,7 +81,7 @@ Trois principes non négociables traversent tous les jalons :
 
 ---
 
-### Jalon 1 — Prestation signée de bout en bout
+### Jalon 1 — Prestation signée de bout en bout *(en cours)*
 
 > Cible : un projet client/fournisseur aboutit à un **devis signé par les deux parties**, traçable, avec notifications.
 

contrib/.env-sample

@@ -0,0 +1,24 @@
+# parametres de déploiement au Makefile
+
+POSTGRES_HOST=localhost
+POSTGRES_PORT=5432
+POSTGRES_DB=yavsc
+POSTGRES_USER=yavsc
+POSTGRES_PASSWORD=<your-password-here>
+
+HTTP_HOST=localhost
+
+Org_PORT=83
+Blogs_PORT=85
+Api_PORT=87
+
+PostIt_CLIENT_ID=postit
+
+ASPNETCORE_Smtp__Host="mercure.pschneider.fr"
+ASPNETCORE_Smtp__Port=465
+ASPNETCORE_Smtp__SenderName="Paul Schneider"
+ASPNETCORE_Smtp__SenderEmail="paul@pschneider.fr"
+ASPNETCORE_Smtp__UserName="paul"
+ASPNETCORE_Smtp__Password="<your-smtp-password-here>"
+
+DESTDIR=/srv/www/yavsc

contrib/Makefile

@@ -1,4 +1,4 @@
-APP_PROJECT_NAMES=Api Org Blogs
+APP_PROJECT_NAMES=Org Blogs Api
 SLNDIR=..
 
 include $(SLNDIR)/.env
@@ -7,12 +7,13 @@ include .env
 generated/:
 	@mkdir -p $@
 
-generated/yavscApi.service:
 generated/yavscOrg.service:
 generated/yavscBlogs.service:
+generated/yavscApi.service:
 
 generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
 	@cat template.service | APP_NAME="$*" \
+	DESTDIR="$(DESTDIR)" \
 	HTTP_HOST="$(HTTP_HOST)" \
 	HTTP_PORT="$*_$(HTTP_PORT)" \
 	BASEAPPDIR="$(BASEAPPDIR)" \
@@ -34,12 +35,12 @@ generated/yavsc%.service: generated/ template.service $(SLNDIR)/.env
 	@echo Created service file: $@
 
 
-copy-services: copy-service-Org copy-service-Api copy-service-Blogs
+copy-services: copy-service-Org copy-service-Blogs copy-service-Api
 copy-service-Org: /etc/systemd/system/yavscOrg.service
-copy-service-Api: /etc/systemd/system/yavscApi.service
 copy-service-Blogs: /etc/systemd/system/yavscBlogs.service
+copy-service-Api: /etc/systemd/system/yavscApi.service
 
-copy-binaries: build_publish_Org build_publish_Api build_publish_Blogs stop-services 
+copy-binaries: build_publish_Org build_publish_Blogs build_publish_Api stop-services
 	@for project in $(APP_PROJECT_NAMES); \
 		do LCAPI=$$(echo $${project}|tr [:upper:] [:lower:]) ; \
 		echo "$${project} -> $${LCAPI}" ; \
@@ -62,6 +63,8 @@ copy-binaries: build_publish_Org build_publish_Api build_publish_Blogs stop-serv
 build_publish_%: clean_publish_dir_%
 	@ASPNETCORE_ENV=$(CONFIGURATION) dotnet publish $(SLNDIR)/src/Yavsc.$*/Yavsc.$*.csproj
 
+build_publish: build_publish_Org build_publish_Blogs build_publish_Api
+
 clean_publish_dir_%:
 	@rm -rf $(SLNDIR)/src/Yavsc.$*/bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish
 
@@ -95,4 +98,3 @@ showConfig:
 clean:
 	@rm -rf generated
 
-.PHONY: build_publish mep showConfig copy-service-Api copy-service-Org copy-service-Blogs reinstall clean

contrib/README.md

@@ -0,0 +1,5 @@
+# Read me
+
+## Note aux icones
+
+㝉®🅬⛒⛑🩎🩺🞫🞮🞕🞖🞆🔴🔵🔲🖂🔧🔩🔐🔌💾💼💬💭👿👾🏷🎯🏹🌍🎎💩

contrib/tmp/yavscBlogs.service

@@ -0,0 +1,37 @@
+[Unit]
+Description=yavsc-Blogs
+After=syslog.target
+After=network.target
+Wants=postgresql.service
+After=postgresql.service
+
+[Service]
+RestartSec=5s
+Type=simple
+User=yavsc
+Group=yavsc
+WorkingDirectory=/srv/www/yavsc
+ExecStart=/srv/www/yavsc/Yavsc.Blogs
+Restart=always
+Environment="HOME="
+Environment="ANTHROPIC_API_KEY=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"
+Environment="ANTHROPIC_MAX_TOKENS=255"
+Environment="ASPNETCORE_Environment="
+Environment="ASPNETCORE_Kestrel__Endpoints__Http=http://localhost:Blogs_"
+Environment="ASPNETCORE_ConnectionStrings__YavscConnection=Server=localhost;Port=5432;Database=yavsc;Username=yavsc;Password=4T/X+fOnE;"
+
+Environment="ASPNETCORE_Smtp__Host=\"mercure.pschneider.f\""
+Environment="ASPNETCORE_Smtp__Port=465"
+Environment="ASPNETCORE_Smtp__SenderName=\"Paul Schneider\""
+Environment="ASPNETCORE_Smtp__SenderEmail=\"paul@pschneider.fr\""
+Environment="ASPNETCORE_Smtp__UserName=\"paul\""
+Environment="ASPNETCORE_Smtp__Password=\"j\0Dsn5=t\""
+
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=yavscBlogs
+
+[Install]
+WantedBy=multi-user.target

doc/README.md

@@ -18,6 +18,9 @@ La racine de l'architecture est [Architecture.md](Architecture.md).
 | [architecture/postit.md](architecture/postit.md) | PostIt — topologie des projets, ViewLocator custo, navigation, DI, conventions de binding |
 | [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md) | Découpage des projets .NET (Abstract, Server, Org, Api, Blogs, Web, Org.Tests) |
 | [testing.md](testing.md) | Stratégie de test : conventions des dossiers, EF Core in-memory, auth stubs, scaffold partagé |
+| [onboarding-agents.md](onboarding-agents.md) | Parcours pas-à-pas pour prise en main agents IA + architecture + tests |
+| [agent-playbook.md](agent-playbook.md) | Playbook d'usage de Copilot, Plan, Explore avec scénarios et anti-patterns |
+| [agent-intent-matrix.md](agent-intent-matrix.md) | Matrice intentions développeur -> agent -> preuves attendues |
 
 ## Roadmap & design exploration
 

doc/agent-intent-matrix.md

@@ -0,0 +1,20 @@
+# Matrice intentions -> agent -> preuves
+
+Cette matrice aide a choisir rapidement l'agent adapte et a exiger
+une sortie verifiable.
+
+| Intention developpeur | Agent principal | Entrees minimales | Sortie minimale attendue | Verification |
+|---|---|---|---|---|
+| Comprendre un BC avant changement | Explore | BC cible, profondeur, contrainte de perimetre | Composants, points d'entree, tests relies, risques | Lire les fichiers cites + confirmer tests proposes |
+| Decomposer une tache transverse | Plan | Objectif, contraintes, definition of done | Etapes ordonnees, dependances, criteres de verif | Verifier que chaque etape a une preuve observable |
+| Implementer une modif locale | Copilot | Fichier cible, comportement attendu, conventions | Patch minimal, justification courte | Build/test du projet impacte |
+| Ajouter un test smoke | Copilot (+Explore) | Route/endpoint, projet de test cible | Test + commande cible | Execution test cible |
+| Corriger une regression | Plan + Copilot | Symptome, zone suspecte, test attendu | Fix + test NonRegression | Test rouge avant, vert apres |
+| Diagnostiquer flux PostIt/OIDC | Explore + Plan | Flux, symptome, plateforme | Carte du flux + hypotheses testables | Verification manuelle + tests existants |
+
+## Regles d'arbitrage
+
+- Si l'intention est "comprendre": commencer par Explore.
+- Si l'intention est "orchestrer": commencer par Plan.
+- Si l'intention est "produire": utiliser Copilot apres cadrage.
+- Si une sortie n'inclut pas de preuve, elle est incomplete.

doc/agent-playbook.md

@@ -0,0 +1,101 @@
+# Playbook d'usage des agents IA (Yavsc)
+
+Ce playbook normalise l'usage de Copilot, Plan et Explore dans le depot.
+Il privilegie des sorties verifiables: fichiers, commandes tests, risques.
+
+## Quand utiliser quel agent
+
+- Plan: quand la tache est ambigue, transverse ou risquee.
+- Explore: quand il faut cartographier rapidement des zones du code.
+- Copilot: quand les specifications sont claires et localisees.
+
+## Prompt type (base)
+
+Utiliser ce squelette avant toute tache non triviale:
+
+```text
+Contexte: <projet/fichier/fonction>
+Objectif: <resultat observable>
+Contraintes: <style, archi, perimetre>
+Verification: <tests exacts a lancer>
+Sortie attendue: <fichiers modifies + risques>
+```
+
+## 4 scenarios de reference
+
+## 1) Explorer un bounded context
+
+Intention:
+- Comprendre ou implementer un changement dans un BC sans regression laterale.
+
+Prompt minimal:
+```text
+Explore le BC <nom> avec profondeur medium.
+Retour: composants touches, points d'entree, tests existants et risques.
+```
+
+Preuves attendues:
+- Carte des fichiers a modifier.
+- Test(s) smoke/mandatory proposes.
+
+## 2) Ajouter un smoke test
+
+Intention:
+- Couvrir rapidement un endpoint ou une route publique.
+
+Prompt minimal:
+```text
+Propose un smoke test pour <route/endpoint> dans le projet de test approprie.
+Respecte les conventions de doc/testing.md.
+```
+
+Preuves attendues:
+- Fichier test cree/modifie.
+- Commande precise pour executer le test cible.
+
+## 3) Corriger une regression backend API
+
+Intention:
+- Corriger un bug sans casser un flux voisin.
+
+Prompt minimal:
+```text
+Planifie puis implemente un fix de <symptome> dans <projet>.
+Ajoute/ajuste un test NonRegression rouge puis vert.
+```
+
+Preuves attendues:
+- Explication cause racine.
+- Test non-regression associe.
+- Commande d'execution et resultat attendu.
+
+## 4) Tracer un flux PostIt/OIDC
+
+Intention:
+- Localiser une cassure d'authentification entre client et serveur.
+
+Prompt minimal:
+```text
+Cartographie le flux OIDC PostIt: entrypoints, callback, stockage token,
+refresh. Donne points de rupture probables et tests/verification proposes.
+```
+
+Preuves attendues:
+- Liste ordonnee des etapes du flux.
+- Fichiers critiques.
+- Hypotheses testables.
+
+## Anti-patterns a eviter
+
+- Prompt sans objectif verifiable.
+- Demande trop large sans perimetre de fichiers.
+- Validation basee uniquement sur "ca semble correct".
+- Pas de lien entre changement et niveau de test.
+
+## Gate PR minimale (agent-assiste)
+
+Avant validation:
+- Impact architecture explicite.
+- Rationale de choix agent explicite.
+- Test(s) executes et justifies.
+- Risques residuels documentes.

doc/architecture/postit.md

@@ -129,30 +129,51 @@ le DI est construit. Ordre, dans cet ordre :
 ## Navigation
 
 Le host de navigation est un `NavigationPage x:Name="NavRoot"`
-posé sur `MainWindow.axaml`. La pile est gérée par les
+posé sur `MainWindow.axaml`. La pile est gérée par deux
-événements du `SessionStatusViewModel` :
+mécanismes distincts :
+
+1. **Nav utilisateur (VM-first)** : un ViewModel (souvent dans
+   une commande `[RelayCommand]`) appelle
+   `await ((App)App.Current!).PushPageAsync(targetVm).ConfigureAwait(true);`.
+   `App.PushPageAsync` (`src/PostIt/PostIt/App.axaml.cs`)
+   résout la `Control` correspondante via le `ViewLocator`
+   enregistré dans `Application.DataTemplates`, l'identifie
+   comme `Page`, lui assigne le VM comme `DataContext`, et
+   appelle `NavRoot.PushAsync(page)`. C'est le seul chemin
+   pour les boutons de la toolbar, les `OpenSettings` /
+   `OpenCircles` / `ManageAcl` / `OpenSignatureDev`, et
+   toute autre nav déclenchée par un ViewModel.
+
+2. **Signaux de cycle de vie** : le `SessionStatusViewModel`
+   lève des événements consommés dans
+   `App.OnFrameworkInitializationCompleted` pour orchestrer
+   la nav de boot :
 
    | Événement           | Effet                                                            |
-|---------------------------------|------------------------------------------------------------------------|
+   |---------------------|------------------------------------------------------------------|
-| `LoginSucceeded`                | `PushAsync(MainPage)` au-dessus de `HomePage`.                          |
+   | `LoginSucceeded`    | `PushAsync(MainPage)` au-dessus de `HomePage` (post-login).      |
    | `LogoutCompleted`   | `PopToRootAsync()` (revient à `HomePage`).                        |
-| `OpenSettingsRequested`         | `PushAsync(SettingsPage)` au-dessus de la page courante.                |
+
+   Ces events ne sont **pas** un canal de nav utilisateur ; ils
+   portent une transition d'état applicatif (authentification
+   établie / perdue) et c'est `App` qui choisit d'en faire une
+   transition de pile.
 
 ### Garde anti-empilement
 
 `NavigationPage.PushAsync` n'est pas idempotent : pousser deux
 fois la même instance l'empile deux fois, et l'utilisateur doit
-taper **Retour** N fois pour sortir. Le handler
+taper **Retour** N fois pour sortir. La garde est implémentée
-`OpenSettingsRequested` est gardé pour bloquer ce cas :
+dans `App.PushPageAsync` (et consommée par tous les chemins
+de nav utilisateur) :
 
 ```csharp
-var settingsPage = provider.GetRequiredService<SettingsPage>();
+var stack = window.NavRoot.NavigationStack;
-var stack = w.NavRoot.NavigationStack;
+if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
-if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], settingsPage))
 {
-    return;  // déjà au sommet, no-op silencieux
+    return Task.CompletedTask;  // déjà au sommet, no-op silencieux
 }
-_ = w.NavRoot.PushAsync(settingsPage);
+return window.NavRoot.PushAsync(page);
 ```
 
 La comparaison est par référence, pas par type : on ne veut
@@ -178,9 +199,11 @@ qui ne tiendrait plus).
 - `SessionStatusViewModel` est le seul VM avec une durée de vie
   **process-entière** (singleton). Il survit à toutes les
   navigations, expose `HasValidSession` en continu, et porte
-  les trois événements qui pilotent la navigation
+  les événements de cycle de vie consommés par `App` pour
-  (`LoginSucceeded`, `LogoutCompleted`,
+  orchestrer la nav de boot (`LoginSucceeded`,
-  `OpenSettingsRequested`).
+  `LogoutCompleted`). La nav utilisateur déclenchée par
+  l'utilisateur passe par `App.PushPageAsync(vm)`, pas par
+  un événement du `SessionStatusViewModel`.
 
 - `MainPageViewModel` / `HomePageViewModel` /
   `SignaturePageViewModel` sont `Transient` — une nouvelle
@@ -233,10 +256,14 @@ pour `[RelayCommand]`".
   `ViewLocator.Build`. Oublier le `ViewLocator` est silencieux
   (juste un TextBlock "No view for X"), pas une exception.
 - **Ajouter un événement global de navigation** (par ex.
-  "Push après payment success") : passer par un événement sur
+  "Push après payment success") : ne pas capturer `MainWindow`
-  un VM singleton (cf. `SessionStatusViewModel.OpenSettingsRequested`),
+  ni `NavigationPage` depuis le VM. La nav passe par
-  pas par une référence à `MainWindow` depuis le VM. Garder
+  `App.PushPageAsync(vm)` dans tous les cas : soit le VM
-  les VMs découplés du `IClassicDesktopStyleApplicationLifetime`.
+  appelle la méthode directement depuis une commande
+  (`[RelayCommand]`), soit un handler abonné à un événement
+  d'un singleton (cf. `SessionStatusViewModel`) l'appelle.
+  Garder les VMs découplés du
+  `IClassicDesktopStyleApplicationLifetime`.
 - **Modifier l'OIDC** : la fiche à lire est
   [postit-oidc.md](postit-oidc.md), pas celle-ci. Cette fiche
   ne ré-explique ni le flow, ni le pipe, ni le custom scheme.

doc/onboarding-agents.md

@@ -0,0 +1,73 @@
+# Onboarding guide: agents IA + architecture + tests
+
+Ce guide est optimise pour accelerer la prise en main des agents IA
+(Copilot, Plan, Explore) dans Yavsc, avec une verification rapide
+par les tests.
+
+## Resultat attendu
+
+A la fin du parcours, un contributeur doit pouvoir:
+- Identifier les projets impactes par une modification.
+- Choisir l'agent adapte a l'intention de travail.
+- Produire une proposition de changement verifiable par les tests.
+
+## Parcours en 3 modules
+
+## Module A - Comprendre le terrain (30-45 min)
+
+Objectif: acquerir une lecture fiable de l'architecture.
+
+1. Lire [README.md](../README.md) puis [Architecture.md](Architecture.md).
+2. Lire [architecture/decoupage-organisation.md](architecture/decoupage-organisation.md).
+3. Selon le domaine:
+   - Backend/API: [architecture/workflow-multi-parties.md](architecture/workflow-multi-parties.md)
+   - PostIt: [architecture/postit.md](architecture/postit.md) puis [architecture/postit-oidc.md](architecture/postit-oidc.md)
+
+Definition of done:
+- Expliquer en 5 phrases quelles couches sont touchees.
+- Citer le ou les points d'entree applicatifs a verifier.
+
+## Module B - Boucle tests rapide (20-30 min)
+
+Objectif: verifier rapidement sans lancer toute la suite.
+
+1. Lire [testing.md](testing.md).
+2. Lancer les smoke tests d'abord, puis mandatory selon le projet.
+3. N'elargir au test complet que si le scope depasse le BC touche.
+
+Definition of done:
+- Fournir la commande test executee.
+- Expliquer pourquoi ce niveau de test est suffisant.
+
+## Module C - Usage agentique en production (30-40 min)
+
+Objectif: utiliser les agents comme accelerateurs, pas comme boites noires.
+
+1. Plan: decomposer la tache en etapes verifiables.
+2. Explore: collecter le contexte code/doc precise.
+3. Copilot: implementer localement et verifier.
+
+Regles:
+- Toujours donner un contexte explicite (fichier, but, contrainte).
+- Demander des preuves observables (fichiers modifies, tests, risques).
+- Refuser toute sortie non verifiable.
+
+Definition of done:
+- Une tache simple est livree avec:
+  - Plan
+  - Changement local
+  - Preuve par test
+
+## Routine continue (sans echeance fixe)
+
+Rituels recommandes:
+- Hebdo: revue des prompts qui ont bien fonctionne.
+- Mensuel: mise a jour du present guide et du playbook.
+- A chaque incident: ajouter un anti-pattern dans le playbook.
+
+## Check-list de validation
+
+- Le changement indique son impact architecture.
+- Le choix de l'agent est justifie.
+- La preuve test est incluse.
+- Les risques residuels sont explicitement listes.

external/dotnet-android-build-image

@@ -1 +0,0 @@
-Subproject commit 0695a6c1fea6508f1a88f7ad0ad9cb93733aa52d

src/PostIt.Tests/Directory.Packages.props

@@ -1,10 +0,0 @@
-<Project>
-  <!-- Pull in shared package versions from the repository root. -->
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
-
-  <!-- PostIt.Tests-specific versions -->
-  <ItemGroup>
-    <PackageVersion Include="Avalonia.Headless" Version="12.0.4" />
-    <PackageVersion Include="Avalonia.Headless.XUnit" Version="12.0.4" />
-  </ItemGroup>
-</Project>

src/PostIt/Directory.Packages.props

@@ -1,21 +1,33 @@
 <Project>
-  <!-- Pull in shared package versions from the repository root. -->
+  <Import
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
+    Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
   <!-- PostIt-product-specific versions -->
+  <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <AvaloniaVersionBase>12.1.1</AvaloniaVersionBase>
+    </PropertyGroup>
     <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="12.0.4" />
+        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersionBase)" />
-    <PackageVersion Include="Avalonia.Android" Version="12.0.4" />
+        <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersionBase)" />
-    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
+        <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersionBase)" />
-    <PackageVersion Include="Avalonia.Browser" Version="12.0.4" />
+        <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersionBase)" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
+        <PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersionBase)" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.4" />
+        <PackageVersion Include="Avalonia.Headless" Version="$(AvaloniaVersionBase)" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.4" />
+        <PackageVersion Include="Avalonia.Headless.Xunit" Version="$(AvaloniaVersionBase)" />
-    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.2" />
+        <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersionBase)" />
+
+        <PackageVersion Include="Material.Avalonia" Version="3.19.0" />
+        <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
         <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageVersion Include="Material.Avalonia" Version="3.17.0" />
+
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
+        <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.10.0.1" />
-    <PackageVersion Include="Microsoft.Maui.Essentials" Version="10.0.90" />
-    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.8.0" />
         <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
+        <PackageVersion Include="Xamarin.AndroidX.Lifecycle.Runtime" Version="2.10.0.1" />
+        <PackageVersion Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.10.0.1" />
+        <PackageVersion Include="Xamarin.UITest" Version="4.4.2" />
+
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
+
     </ItemGroup>
 </Project>

src/PostIt/Makefile

@@ -0,0 +1,178 @@
+
+# Cibles pour installer PostIt.Android en Debug sur l'AVD qemu.
+#
+# Usage typique :
+#   make qemu            # lance l'AVD, attend le boot, build l'APK, l'installe
+#   make android-install # (re)build l'APK et l'installe (AVD doit tourner)
+#   make android-build   # build l'APK seul (sans install)
+#   make qemu-run        # démarre l'AVD en background
+#   make qemu-stop       # arrête l'émulateur
+#   make qemu-wait-boot  # attend que l'AVD ait fini de booter
+#
+# Variables surchargeables (make VAR=valeur) :
+#   AVD_NAME        default: postit_test_avd
+#                    (l'AVD doit être listé par `avdmanager list avd`)
+#   ADB_SERIAL      default: emulator-5554
+#                    (port standard du premier émulateur lancé)
+#   ANDROID_HOME    default: /opt/android-sdk
+#                    (le SDK Android local; doit contenir
+#                    emulator/emulator et platform-tools/adb)
+#   POSTIT_RID      default: android-x64
+#                    (doit matcher l'ABI de l'AVD; `avdmanager list avd`
+#                    affiche la ligne Tag/ABI)
+#   EMU_HEADLESS    default: 0
+#                    (1 = lancer l'émulateur sans fenêtre, pour scripter)
+#   CONFIG          surcharge la variable CONFIG globale (Debug par
+#                    défaut dans ce Makefile). Passer à Release pour
+#                    un APK optimisé et signé release.
+#   LOGCAT_LINES    default: 200
+#                    (nombre de lignes dumpées par `make qemu-logcat`)
+#   LOGCAT_FOLLOW   default: 0
+#                    (1 = stream live via `make logcat`,
+#                    sinon dump one-shot des N dernières lignes)
+#   LOGCAT_BOOT_WAIT default: 30
+#                    (secondes d'attente entre le clear du buffer,
+#                    le `am start`, et le dump final dans
+#                    `make qemu-logcat-boot`)
+AVD_NAME ?= postit_test_avd
+ADB_SERIAL ?= emulator-5554
+ANDROID_HOME ?= /opt/android-sdk
+POSTIT_RID ?= android-x64
+EMU_HEADLESS ?= 0
+LOGCAT_LINES ?= 600
+LOGCAT_FOLLOW ?= 0
+LOGCAT_BOOT_WAIT ?= 30
+
+ANDROID_PACKAGE_NAME = fr.pschneider.postit
+POSTIT_ANDROID_CSPROJ := PostIt.Android/PostIt.Android.csproj
+POSTIT_APK_DIR := PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
+POSTIT_APK := $(POSTIT_APK_DIR)/$(ANDROID_PACKAGE_NAME)-Signed.apk
+
+clean: clean-PostIt clean-PostIt.Android clean-PostIt.Desktop
+
+clean-%:
+	rm -rf $*/obj $*/bin
+
+qemu-run:
+	@echo "  Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
+	@mkdir -p /tmp/yavsc-emu
+	@EMU_ARGS=""; \
+	if [ "$(EMU_HEADLESS)" = "1" ]; then EMU_ARGS="-no-window -no-audio"; fi; \
+	$(ANDROID_HOME)/emulator/emulator -avd $(AVD_NAME) $$EMU_ARGS \
+	    >/tmp/yavsc-emu/$(AVD_NAME).log 2>&1 & \
+	echo "  ✅ Started emulator PID: $$!"
+
+qemu-stop:
+	adb -s $(ADB_SERIAL) emu kill
+	echo "  ✅ Stopped emulator"
+
+qemu-wait-boot:
+	@echo "  Waiting for $(ADB_SERIAL) to finish booting..."
+	adb -s $(ADB_SERIAL) wait-for-device
+	@for i in $$(seq 1 180); do \
+	    BOOTED=$$(adb -s $(ADB_SERIAL) shell getprop sys.boot_completed 2>/dev/null | tr -d '\r\n'); \
+	    if [ "$$BOOTED" = "1" ]; then \
+	        echo "  ✓ booted in $${i}s"; \
+	        exit 0; \
+	    fi; \
+	    sleep 1; \
+	done; \
+	echo "  👿  ERROR: device did not boot within 180s." >&2; \
+	echo "  Logs: /tmp/yavsc-emu/$(AVD_NAME).log" >&2; \
+	exit 1
+
+android-build:
+	# EmbedAssembliesIntoApk=true: without this, the Debug APK ships
+	# without the managed assemblies in it (they are pushed at runtime
+	# via `adb push`, "Fast Deployment"). On the qemu emulator, the
+	# runtime cannot find them in `files/.__override__/<rid>/` and
+	# aborts at startup with "No assemblies found in '.__override__'"
+	# (monodroid-glue.cc:757, SIGABRT). Forcing this property on
+	# packages the .dlls into the APK as `assemblies/<rid>/` so the
+	# runtime reads them directly.
+	#
+	# The Xamarin.Android SDK property is `EmbedAssembliesIntoApk`,
+	# not `AndroidEnableFastDeployment` (which exists in older
+	# templates but is a no-op in the .NET 10 SDK).
+	dotnet build $(POSTIT_ANDROID_CSPROJ) \
+	    -c $(CONFIG) \
+	    -p:RuntimeIdentifier=$(POSTIT_RID) \
+	    -p:EmbedAssembliesIntoApk=true \
+	    --nologo
+	@if [ ! -f "$(POSTIT_APK)" ]; then \
+	    echo "  APK not found at $(POSTIT_APK)." >&2; \
+	    echo "  Files in $(POSTIT_APK_DIR):" >&2; \
+	    ls -la "$(POSTIT_APK_DIR)" 2>/dev/null || echo "  (directory does not exist)" >&2; \
+	    exit 1; \
+	fi
+
+
+android-install: android-build
+	@echo "  Installing $(POSTIT_APK) on $(ADB_SERIAL)..."
+	adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)" -r
+	@echo "  ✅ PostIt.Android installed on $(ADB_SERIAL)"
+
+qemu-uninstall:
+	adb -s $(ADB_SERIAL) uninstall $(ANDROID_PACKAGE_NAME)
+
+# Dump recent logcat output for the running PostIt.Android process.
+# By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
+# `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
+# Filtering is by PID (pidof $(ANDROID_PACKAGE_NAME)), not by tag,
+# because Mono/Xamarin can emit logs under several tags
+# (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
+# would miss the ones not matching. PID-based filtering is exact.
+# If the app is not running, pidof returns empty and logcat exits
+# silently with no output; that is the expected behaviour for
+# "no logs yet".
+logcat:
+	@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
+	if [ -z "$$PID" ]; then \
+	    echo "  $(ANDROID_PACKAGE_NAME) is not running on $(ADB_SERIAL)."; \
+	    echo "  Start the app first (am start -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity)"; \
+	    exit 1; \
+	fi; \
+	echo "  Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
+	if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
+	    adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID $(ANDROID_PACKAGE_NAME); \
+	else \
+	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID $(ANDROID_PACKAGE_NAME); \
+	fi
+
+# Clear logcat, launch PostIt.Android, then dump everything that was
+# emitted during the startup window. Targets the "démarrage KO" case
+# where the process starts but Avalonia never renders a frame — the
+# logcat trace from process start to first frame is what diagnoses it.
+#
+# Override LOGCAT_BOOT_WAIT to extend the post-launch wait
+# (default 15s; raise to 30+ if the device is slow to boot Avalonia).
+LOGCAT_BOOT_WAIT ?= 15
+
+
+android-start:
+	@echo "  Clearing logcat buffer..."
+	adb -s $(ADB_SERIAL) logcat -c
+	@echo "  Launching $(ANDROID_PACKAGE_NAME)..."
+	adb -s $(ADB_SERIAL) shell am start \
+	    -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity
+	@echo "  ✅ $(ANDROID_PACKAGE_NAME) started on $(ADB_SERIAL)"
+
+qemu-logcat-boot: android-start
+	@echo "  Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
+	@sleep $(LOGCAT_BOOT_WAIT)
+
+	@echo "  Dumping logcat (PostIt PID + system buffer):"
+	@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
+	if [ -n "$$PID" ]; then \
+	    echo " ✅ (PID $$PID at dump time)"; \
+			sleep 10; \
+	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID; \
+	else \
+	    echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
+	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
+			exit 1; \
+	fi
+
+qemu: qemu-run qemu-wait-boot android-install
+
+.PHONY: clean qemu qemu-run qemu-stop qemu-wait-boot android-build android-install logcat qemu-logcat-boot

src/PostIt/PostIt.Android/Application.cs

@@ -1,7 +1,17 @@
 using Android.App;
+using Android;
 using Android.Runtime;
 using Avalonia;
 using Avalonia.Android;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using Yavsc.Api.Client;
+
+[assembly: UsesPermission(Manifest.Permission.AccessFineLocation)]
+[assembly: UsesPermission(Manifest.Permission.AccessCoarseLocation)]
 
 namespace PostIt.Android
 {

src/PostIt/PostIt.Android/MainActivity.cs

@@ -1,8 +1,11 @@
+
 using Android.App;
-using Android.Content.PM;
 using Android.Content;
-using Avalonia;
+using Android.Content.PM;
+using AndroidX.Core.Provider;
+using AndroidX.Emoji2.Text;
 using Avalonia.Android;
+using PostIt.Droid.Services;
 
 namespace PostIt.Android;
 
@@ -12,25 +15,27 @@ namespace PostIt.Android;
     Theme = "@style/MyTheme.NoActionBar",
     Icon = "@drawable/icon",
     MainLauncher = true,
-    LaunchMode = LaunchMode.SingleTask,
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity
 {
     /// <summary>
-    /// Strongly-typed handle to the current MainActivity instance, set in
+    /// The current MainActivity instance.
-    /// <see cref="OnCreate"/> and consumed by platform services such as
-    /// <see cref="Services.AndroidSystemBrowser"/> which need to launch
-    /// Chrome Custom Tabs.
     /// </summary>
     public static MainActivity? Current { get; private set; }
 
     protected override void OnCreate(global::Android.OS.Bundle? savedInstanceState)
     {
+        FontRequest fontRequest = new FontRequest(
+                "com.google.android.gms.fonts",
+                "com.google.android.gms",
+                "Noto Color Emoji Compat",
+                Yavsc.Resource.Array.com_google_android_gms_fonts_certs); //com_google_android_gms_fonts_certs
+        EmojiCompat.Config config = new FontRequestEmojiCompatConfig(this, fontRequest);
+        EmojiCompat.Init(config);
+        PlatformBootstrap.InitPlatform();
         base.OnCreate(savedInstanceState);
-        PlatformBootstrap.EnsureInitialized();
         Current = this;
     }
-
      /// <summary>
     /// Receives the deep-link Intent fired by the system browser after the
     /// user completes the OIDC login on https://yavsc.pschneider.fr. The
@@ -43,7 +48,24 @@ public class MainActivity : AvaloniaMainActivity
     protected override void OnNewIntent(Intent? intent)
     {
         base.OnNewIntent(intent);
-        if (intent is not null) AndroidOidcCallbackSink.Handle(intent);
+
+         var url = intent?.DataString;
+        if (!string.IsNullOrEmpty(url) && url.StartsWith("postit://callback"))
+        {
+            OidcCallbackManager.SetResult(url);
+        }
+
+    }
+
+    public override void OnRequestPermissionsResult(int requestCode, string[]? permissions, Permission[]? grantResults)
+    {
+        if (PostIt.Android.Services.AndroidCurrentLocationProvider
+            .HandlePermissionResult(requestCode, grantResults))
+        {
+            return;
+        }
+
+        base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
     internal static class AndroidOidcCallbackSink

src/PostIt/PostIt.Android/PlatformBootstrap.cs

@@ -12,18 +12,14 @@ namespace PostIt.Android;
 /// </summary>
 internal static class PlatformBootstrap
 {
-    private static int _initialized;
+    internal static void InitPlatform()
-
-    internal static void EnsureInitialized()
     {
-        if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
-            return;
-
-        Platform.DefaultRedirectUri = ViewModels.Settings.AndroidRedirectUri;
         Platform.CreateBrowser = () =>
         {
             var activity = MainActivity.Current;
             return activity is null ? null : new AndroidSystemBrowser(activity);
         };
+
+        Platform.TryGetCurrentLocationAsync = AndroidCurrentLocationProvider.TryGetCurrentLocationAsync;
     }
 }

src/PostIt/PostIt.Android/PostIt.Android.csproj

@@ -2,19 +2,16 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net10.0-android</TargetFramework>
-    <!-- FORCE LES ARCHITECTURES ANDROID VALIDES -->
+    <SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
-    <RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
-    <SupportedOSPlatformVersion>23.0.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
-    <ApplicationId>com.CompanyName.PostIt</ApplicationId>
+    <ApplicationId>fr.pschneider.postit</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
-    <RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">android-arm;android-arm64;android-x86;android-x64</RuntimeIdentifiers>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <ItemGroup>
@@ -30,7 +27,4 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" />
-  </ItemGroup>
 </Project>

src/PostIt/PostIt.Android/Properties/AndroidManifest.xml

@@ -1,32 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 	<uses-permission android:name="android.permission.INTERNET" />
 		<application android:label="PostIt" android:icon="@drawable/Icon">
-
-		<!--
-			Deep-link receiver for the OIDC Authorization Code + PKCE flow.
-			After the user authenticates in the system browser, the OP
-			redirects to android://postit-signin?... and Android forwards
-			the Intent to the MainActivity (configured SingleTask so the
-			existing instance receives OnNewIntent rather than spawning a
-			new one).
-
-			The host value (postit-signin) MUST match the
-			AndroidRedirectUri constant in PostIt/Settings/Settings.cs and
-			the corresponding RedirectUri registered for the 'postit'
-			client in IdentityServer (Yavsc.Org ConfigurationDb).
-		-->
-		<activity-alias
-			android:name="PostIt.Android.OidcCallbackActivity"
-			android:targetActivity="PostIt.Android.PostItMainActivity"
-			android:exported="true"
-			android:launchMode="singleTask">
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="android" android:host="postit-signin" />
-			</intent-filter>
-		</activity-alias>
 	</application>
 </manifest>

src/PostIt/PostIt.Android/Resources/values/font_certs.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="com_google_android_gms_fonts_certs">
+        <item>@array/com_google_android_gms_fonts_certs_dev</item>
+        <item>@array/com_google_android_gms_fonts_certs_prod</item>
+    </array>
+    <string-array name="com_google_android_gms_fonts_certs_dev">
+        <item>MIIEqDCCA5CgAwIBAgIJAN5gc16AJfAsMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHR29vZ2xlMRAwDgYDVQQLEwdBbmRyb2lkMRAwDgYDVQQDEwdBbmRyb2lkMSEwHwYJKoZIhvcNAQkBFhJhbmRyb2lkQGFuZHJvaWQuY29tMCAXDTA4MDQxNTIyNDA0M1YYDzQyMDgxMzA0MjI0MDQzWjCBlDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDURvdW50YWluIFZpZXcxEDAOBgNVBAoTB0dvb2dsZTEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEhMB8GCSqGSIb3DQEJARYSYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBi1vF0K1vOEHG7AxneTjOHUka46MIidBqvFcO164A49iU2DkYPhUaM4H8JCdzh6N1GzM6h9o6E2V6z8+gEtdI6nqqs0EGA0G0H701bFjLp9+K/1DkMIFeD4P8J7X1/M8t4+X09X/7bQyV3w0v7q+Qh38sY8W/7K29B3f2O2sLw+uX9U8a8Tf4Xv8A==</item>
+    </string-array>
+    <string-array name="com_google_android_gms_fonts_certs_prod">
+        <item>MIIEQzCCAyugAwIBAgIJAMLgh0ZgXpYOMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKvSkUIXm+t9M8rXj2V</item>
+    </string-array>
+</resources>

src/PostIt/PostIt.Android/Services/AndroidCurrentLocationProvider.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Android;
+using Android.App;
+using Android.Content.PM;
+using Android.Locations;
+using AndroidX.Core.App;
+using AndroidX.Core.Content;
+using PostIt.Services;
+
+namespace PostIt.Android.Services;
+
+internal static class AndroidCurrentLocationProvider
+{
+    public static async Task<CurrentLocationResult> TryGetCurrentLocationAsync(CancellationToken cancellationToken)
+    {
+        var activity = MainActivity.Current;
+        if (activity is null)
+        {
+            return CurrentLocationResult.Unavailable("L'activité Android n'est pas encore prête.");
+        }
+
+        var permissionGranted = await LocationPermissionBroker.EnsureGrantedAsync(activity, cancellationToken).ConfigureAwait(false);
+        if (!permissionGranted)
+        {
+            return CurrentLocationResult.PermissionDenied();
+        }
+
+        var locationManager = activity.GetSystemService(global::Android.Content.Context.LocationService) as LocationManager;
+        if (locationManager is null)
+        {
+            return CurrentLocationResult.Unavailable("Le service de localisation Android est indisponible.");
+        }
+
+        var location = locationManager.GetProviders(enabledOnly: true)?
+            .Select(provider => locationManager.GetLastKnownLocation(provider))
+            .Where(candidate => candidate is not null)
+            .OrderByDescending(candidate => candidate!.Time)
+            .ThenBy(candidate => candidate!.Accuracy)
+            .FirstOrDefault();
+
+        if (location is null)
+        {
+            return CurrentLocationResult.Unavailable("Aucune position n'est disponible. Activez la localisation du système puis réessayez.");
+        }
+
+        return CurrentLocationResult.Success(location.Latitude, location.Longitude);
+    }
+
+    public static bool HandlePermissionResult(int requestCode, Permission[]? grantResults)
+        => LocationPermissionBroker.HandleResult(requestCode, grantResults);
+
+    private static class LocationPermissionBroker
+    {
+        private const int RequestCode = 4042;
+        private static readonly string[] RequestedPermissions =
+        {
+            Manifest.Permission.AccessFineLocation,
+            Manifest.Permission.AccessCoarseLocation,
+        };
+
+        private static readonly object SyncRoot = new();
+        private static TaskCompletionSource<bool>? _pendingRequest;
+
+        public static Task<bool> EnsureGrantedAsync(Activity activity, CancellationToken cancellationToken)
+        {
+            if (HasLocationPermission(activity))
+            {
+                return Task.FromResult(true);
+            }
+
+            lock (SyncRoot)
+            {
+                if (_pendingRequest is null)
+                {
+                    _pendingRequest = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                    ActivityCompat.RequestPermissions(activity, RequestedPermissions, RequestCode);
+                }
+
+                if (!cancellationToken.CanBeCanceled)
+                {
+                    return _pendingRequest.Task;
+                }
+
+                return WaitAsync(_pendingRequest.Task, cancellationToken);
+            }
+        }
+
+        public static bool HandleResult(int requestCode, Permission[]? grantResults)
+        {
+            if (requestCode != RequestCode)
+            {
+                return false;
+            }
+
+            var granted = grantResults is { Length: > 0 } && grantResults.All(result => result == Permission.Granted);
+            TaskCompletionSource<bool>? pendingRequest;
+            lock (SyncRoot)
+            {
+                pendingRequest = _pendingRequest;
+                _pendingRequest = null;
+            }
+
+            pendingRequest?.TrySetResult(granted);
+            return true;
+        }
+
+        private static bool HasLocationPermission(Activity activity)
+        {
+            return ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessFineLocation) == Permission.Granted
+                || ContextCompat.CheckSelfPermission(activity, Manifest.Permission.AccessCoarseLocation) == Permission.Granted;
+        }
+
+        private static async Task<bool> WaitAsync(Task<bool> task, CancellationToken cancellationToken)
+        {
+            using var registration = cancellationToken.Register(() =>
+            {
+                lock (SyncRoot)
+                {
+                    _pendingRequest?.TrySetCanceled(cancellationToken);
+                    _pendingRequest = null;
+                }
+            });
+
+            return await task.ConfigureAwait(false);
+        }
+    }
+}

src/PostIt/PostIt.Android/Services/AndroidSystemBrowser.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using Android.App;
-using Android.Content;
 using AndroidX.Browser.CustomTabs;
 using IdentityModel.OidcClient.Browser;
+using PostIt.Droid.Services;
 
 namespace PostIt.Android.Services;
 
@@ -36,14 +36,19 @@ public sealed class AndroidSystemBrowser : IBrowser
             };
         }
 
+        // 1. Enregistrez la tâche avant de lancer le Custom Tab
+        var callbackTask = OidcCallbackManager.RegisterCallback(cancellationToken);
+
+        // 2. LANCEZ VOTRE CUSTOM TAB ICI (via AndroidX.Browser.CustomTabs)
+        // ... code pour ouvrir l'URL d'authentification ...
+
+
         var uri = global::Android.Net.Uri.Parse(options.StartUrl)!;
 
-        var callbackTask = MainActivity.AndroidOidcCallbackSink.AwaitNextCallbackAsync();
-
         var tabsIntent = new CustomTabsIntent.Builder()
-            .SetShowTitle(true)
+            .SetShowTitle(true)!
             .Build();
-        tabsIntent.LaunchUrl(_activity, uri);
+        tabsIntent!.LaunchUrl(_activity, uri);
 
         string responseUri;
         try

src/PostIt/PostIt.Android/Services/OidcCallbackManager.cs

@@ -0,0 +1,21 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PostIt.Droid.Services;
+
+public static class OidcCallbackManager
+{
+    private static TaskCompletionSource<string>? _tcs;
+
+    public static Task<string> RegisterCallback(CancellationToken cancellationToken)
+    {
+        _tcs = new TaskCompletionSource<string>();
+        cancellationToken.Register(() => _tcs.TrySetCanceled());
+        return _tcs.Task;
+    }
+
+    public static void SetResult(string url)
+    {
+        _tcs?.TrySetResult(url);
+    }
+}

src/PostIt/PostIt.Android/WebAuthenticationCallbackActivity.cs

@@ -0,0 +1,35 @@
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.OS;
+using PostIt.Droid.Services;
+
+namespace PostIt.Android;
+
+[Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop, Exported = true)]
+[IntentFilter(new[] { Intent.ActionView },
+    Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable },
+    DataScheme = "postit", // Remplacez par votre schéma personnalisé (ex: yavsc ou postit)
+    DataHost = "callback")] // Correspond à postit://callback
+public class WebAuthenticationCallbackActivity : Activity
+{
+    protected override void OnCreate(Bundle? savedInstanceState)
+    {
+        base.OnCreate(savedInstanceState);
+
+        // Capturer l'URL de redirection OIDC
+        var url = Intent?.DataString;
+
+        if (!string.IsNullOrEmpty(url))
+        {
+            // Transmettre l'URL au gestionnaire partagé pour compléter la Task
+            OidcCallbackManager.SetResult(url);
+        }
+
+        // Fermer cette activité transparente et ramener l'application au premier plan
+        var intent = new Intent(this, typeof(MainActivity));
+        intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
+        StartActivity(intent);
+        Finish();
+    }
+}

src/PostIt/PostIt.Browser/PostIt.Browser.csproj

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <ItemGroup>
@@ -15,7 +15,4 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" />
-  </ItemGroup>
 </Project>

src/PostIt/PostIt.Browser/Program.cs

@@ -1,5 +1,4 @@
-using System.Runtime.Versioning;
+using System.Threading.Tasks;
-using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Browser;
 using PostIt;

src/PostIt/PostIt.Desktop/PlatformBootstrap.cs

@@ -1,30 +0,0 @@
-using IdentityModel.OidcClient.Browser;
-using PostIt.Services;
-
-namespace PostIt.Desktop;
-
-/// <summary>
-/// One-shot platform bootstrap. Called from <c>Program.Main</c> so that
-/// the shared OIDC login path sees a working <c>IBrowser</c> — the
-/// custom-scheme browser that hands the OIDC callback off to the
-/// running instance through the named pipe. Desktop builds do NOT use
-/// a loopback HTTP listener: the <c>postit://</c> scheme is registered
-/// with the OS at install time and the browser is whatever the user
-/// has configured to open it.
-/// </summary>
-internal static class PlatformBootstrap
-{
-    private static int _initialized;
-
-    internal static void EnsureInitialized()
-    {
-        if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
-            return;
-
-        // Use the custom-scheme redirect on Desktop. Loopback is only
-        // a fallback for platforms that cannot register postit://
-        // (see Settings.DefaultLoopbackRedirectUri for that path).
-        Platform.DefaultRedirectUri = AuthenticationSettings.DefaultDesktopRedirectUri;
-        Platform.CustomScheme = "postit";
-    }
-}

src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj

@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <PropertyGroup>
@@ -24,7 +24,4 @@
   <ItemGroup>
     <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" />
-  </ItemGroup>
 </Project>

src/PostIt/PostIt.Desktop/Program.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading;
 using Avalonia;
 using PostIt.Services;
 
@@ -13,8 +12,6 @@ sealed class Program
     [STAThread]
     public static void Main(string[] args)
     {
-        PlatformBootstrap.EnsureInitialized();
-
         // Short-circuit 2nd-instance launches (OS handing us the
         // postit://callback URL) BEFORE Avalonia spins up a window.
         // If we let Avalonia initialise, the new MainWindow flashes
@@ -69,9 +66,6 @@ sealed class Program
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
-#if DEBUG
-            .WithDeveloperTools()
-#endif
             .WithInterFont()
             .LogToTrace();
 }

src/PostIt/PostIt.Tests/ActivitiesPageViewModelTests.cs

@@ -0,0 +1,151 @@
+using System.Net.Http;
+using PostIt.ViewModels;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.Tests;
+
+public class ActivitiesPageViewModelTests
+{
+    [Fact]
+    public void ActivityApiClient_uses_avatar_authority_when_provided()
+    {
+        var api = new StubActivityApi();
+        var client = new ActivityApiClient(
+            api,
+            "https://api.pschneider.fr/api/v1/",
+            "https://yavsc.pschneider.fr/");
+
+        var url = client.BuildAvatarXsUrl("paul");
+
+        Assert.Equal("https://yavsc.pschneider.fr/avatars/paul.xs.png", url);
+    }
+
+    [Fact]
+    public async Task ActivityApiClient_uses_business_absolute_paths()
+    {
+        var api = new StubActivityApi();
+        var client = new ActivityApiClient(api, "https://business.example/api/v1/");
+        var billingClient = new BillingApiClient(api, "https://business.example/api/v1/");
+
+        await client.GetCatalogAsync("brush", TestContext.Current.CancellationToken);
+        await client.GetUsersAsync("brush-pro", TestContext.Current.CancellationToken);
+        await billingClient.CreateAsync("Rdv", new { Foo = "Bar" }, TestContext.Current.CancellationToken);
+        await billingClient.GetQuerySummariesAsync("Rdv", TestContext.Current.CancellationToken);
+
+        Assert.Equal("https://business.example/api/v1/activity/catalog?parentCode=brush", api.Paths[0]);
+        Assert.Equal("https://business.example/api/v1/activity/brush-pro/users", api.Paths[1]);
+        Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[2]);
+        Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths[3]);
+    }
+
+    [Fact]
+    public async Task RefreshAsync_loads_first_activity_then_specialization_performers()
+    {
+        var api = new StubActivityApi();
+        var client = new ActivityApiClient(api, "https://business.example/api/v1/");
+        var billingClient = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm = new ActivitiesPageViewModel(client, billingClient);
+
+        await vm.RefreshAsync();
+
+        Assert.Equal("brush", vm.SelectedActivity?.Code);
+        Assert.Single(vm.Specializations);
+        Assert.Equal("brush", vm.CurrentActivity?.Code);
+        Assert.Single(vm.Performers);
+        Assert.Equal("Alice", vm.Performers[0].UserName);
+        Assert.Equal("https://business.example/avatars/Alice.xs.png", vm.Performers[0].AvatarXsUrl);
+        Assert.True(vm.Performers[0].HasPerformerProfile);
+        Assert.True(vm.Performers[0].IsPerformerActive);
+        Assert.Equal("Actif", vm.Performers[0].PerformerStatusBadgeLabel);
+        Assert.Equal("Pas d'autre activité", vm.Performers[0].ExtraActivityLabel);
+
+        await vm.ShowSpecializationAsync(vm.Specializations[0]);
+
+        Assert.Equal("brush-pro", vm.CurrentActivity?.Code);
+        Assert.Single(vm.Performers);
+        Assert.Equal("Bob", vm.Performers[0].UserName);
+        Assert.Equal("https://business.example/avatars/Bob.xs.png", vm.Performers[0].AvatarXsUrl);
+        Assert.True(vm.Performers[0].HasPerformerProfile);
+        Assert.False(vm.Performers[0].IsPerformerActive);
+        Assert.Equal("Inactif", vm.Performers[0].PerformerStatusBadgeLabel);
+        Assert.Equal("Autres spécialisations: 2", vm.Performers[0].ExtraActivityLabel);
+        Assert.Contains("brush pro", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+
+        await vm.ShowSpecializationAsync(null);
+
+        Assert.Equal("brush", vm.CurrentActivity?.Code);
+        Assert.Single(vm.Performers);
+        Assert.Equal("Alice", vm.Performers[0].UserName);
+    }
+
+    private sealed class StubActivityApi : IYavscApiClient
+    {
+        public HttpClient Http { get; } = new();
+        public List<string> Paths { get; } = new();
+
+        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            Paths.Add(path);
+
+            if (typeof(T) == typeof(List<ActivityInfo>))
+            {
+                var activities = new List<ActivityInfo>
+                {
+                    new()
+                    {
+                        Code = "brush",
+                        Name = "Brush",
+                        Description = "Coiffure à domicile",
+                        PerformerCount = 1,
+                        Forms = new List<CommandFormSummary>
+                        {
+                            new() { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" }
+                        },
+                        Children = new List<ActivityInfo>
+                        {
+                            new()
+                            {
+                                Code = "brush-pro",
+                                Name = "Brush Pro",
+                                Description = "Spécialisation premium",
+                                ParentCode = "brush",
+                                PerformerCount = 1,
+                                Forms = new List<CommandFormSummary>
+                                {
+                                    new() { Id = 2, ActionName = "Rdv", Title = "Rendez-vous premium" }
+                                }
+                            }
+                        }
+                    }
+                };
+                return Task.FromResult((T)(object)activities);
+            }
+
+            if (typeof(T) == typeof(List<PerformerActivity>))
+            {
+                var performers = path.EndsWith("brush-pro/users", StringComparison.Ordinal)
+                    ? new List<PerformerActivity>
+                    {
+                        new() { PerformerId = "pro-2", HasPerformerProfile = true, Active = false, UserName = "Bob", ActivityCode = "brush-pro", ActivityName = "Brush Pro", ExtraActivityCount = 2 }
+                    }
+                    : new List<PerformerActivity>
+                    {
+                        new() { PerformerId = "pro-1", HasPerformerProfile = true, Active = true, UserName = "Alice", ActivityCode = "brush", ActivityName = "Brush", ExtraActivityCount = 0 }
+                    };
+
+                return Task.FromResult((T)(object)performers);
+            }
+
+            return Task.FromResult(default(T)!);
+        }
+
+        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            Paths.Add(path);
+            return Task.CompletedTask;
+        }
+
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    }
+}

src/PostIt/PostIt.Tests/AddCircleMemberDialogTests.cs

@@ -0,0 +1,153 @@
+
+using Avalonia;
+using Avalonia.Headless.XUnit;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.Helpers;
+using PostIt.Services;
+using PostIt.ViewModels;
+using PostIt.Views;
+using Yavsc.Api.Client;
+
+namespace PostIt.Tests;
+
+/// <summary>
+/// Headless coverage for the two interactive buttons of the
+/// "add a circle member" modal: "Ajouter" and "Fermer".
+///
+/// <para>The dialog is pushed on top of <see cref="CirclesPage"/>
+/// via the canonical <c>App.PushPageAsync</c> pipeline (the
+/// same path <c>CirclesPageViewModel.OpenAddMemberAsync</c>
+/// uses). The test asserts on <c>NavRoot.NavigationStack</c>
+/// size before and after each click — the user's bug was "I
+/// click and nothing happens", so the failure mode is a stack
+/// that doesn't shrink for "Fermer", and a "Confirmer" event
+/// that the host doesn't pick up for "Ajouter" (the dialog
+/// stays up = stack doesn't shrink either).</para>
+///
+/// <para>Pattern follows <c>MainPageButtonsTests</c>: name
+/// every interactive control in XAML with <c>x:Name</c>,
+/// click via <c>button.Command?.Execute(...)</c> + flush
+/// any async command before asserting.</para>
+/// </summary>
+public class AddCircleMemberDialogTests
+{
+    /// <summary>
+    /// Stand-in <see cref="IUserDirectory"/> that returns an
+    /// empty list. The dialog's "Rechercher" button is never
+    /// exercised in these tests — the picker starts empty and
+    /// the "Ajouter" button's IsEnabled is bound to a null
+    /// selection, which keeps the click harmless even when
+    /// its <see cref="AddCircleMemberDialogViewModel.Add"/>
+    /// command does fire.
+    /// </summary>
+    private sealed class StubUserDirectory : IUserDirectory
+    {
+        public Task<IReadOnlyList<UserSummary>> SearchAsync(string query, CancellationToken ct = default)
+            => Task.FromResult<IReadOnlyList<UserSummary>>(new List<UserSummary>());
+    }
+
+    private sealed class ThrowingApi : YavscApiClient
+    {
+        public ThrowingApi() : base(
+            new Settings
+            {
+                Authentication = new AuthenticationSettings
+                {
+                    Authority = "https://stub.invalid",
+                    ClientId = "stub",
+                    Scopes = new[] { "openid" },
+                },
+            },
+            new TokenStore(System.IO.Path.GetTempFileName()))
+        { }
+    }
+
+    private static async Task<TestAppContext> BuildApp()
+    {
+        TestAppContext context = new TestAppContext
+        {
+
+
+        };
+
+        return context;
+    }
+    /// <summary>
+    /// Mount a real <see cref="MainView"/>, build a minimal
+    /// DI graph, push <see cref="CirclesPage"/> then the
+    /// <see cref="AddCircleMemberDialog"/> on top of it.
+    /// Returns the stack size so the test can pin the delta.
+    /// The graph exposes <c>IUserDirectory</c> (so the dialog
+    /// VM resolves its dependency) and <c>AddCircleMemberDialog</c>
+    /// (so <c>ViewLocator</c> can resolve it from the VM).
+    /// </summary>
+    private static async Task<TestAppContext> Mount()
+    {
+        TestAppContext context = new TestAppContext();
+
+        var api = new ThrowingApi();
+        var circleClient = new CircleApiClient(api, "http://localhost/");
+
+        var services = new ServiceCollection();
+        services.AddSingleton(new Settings());
+        services.AddSingleton<IUserDirectory>(new StubUserDirectory());
+        services.AddSingleton(circleClient);
+        services.AddTransient<CirclesPage>();
+        services.AddTransient<CirclesPageViewModel>();
+        services.AddTransient<AddCircleMemberDialog>();
+        services.AddTransient<AddCircleMemberDialogViewModel>();
+        var sp = services.BuildServiceProvider();
+
+        context.Window = new MainView();
+        context.App = (PostIt.App)Application.Current!;
+        context.App.AttachMainWindow(context.Window);
+
+        context.page = sp.GetRequiredService<CirclesPage>();
+        context.Window.NavRoot.PushAsync(context.page).GetAwaiter().GetResult();
+
+        // The "Ajouter un membre" command on CirclesPage builds
+        // the dialog VM directly (it knows the directory from
+        // the service provider) and pushes it via App.PushPage.
+        await context.App.PushPageAsync(sp.GetRequiredService<AddCircleMemberDialogViewModel>());
+
+        context.dialog = context.Window.NavRoot.NavigationStack[^1] as AddCircleMemberDialog
+            ?? throw new System.InvalidOperationException("Dialog page not at top of stack.");
+
+        return context;
+    }
+
+    /// <summary>
+    /// Click the "Fermer" button on the dialog and assert the
+    /// nav stack shrinks by exactly one.
+    /// </summary>
+    [AvaloniaFact]
+    public async Task Close_button_pops_dialog_off_nav_stack()
+    {
+        // Arrange: stack starts at 2 (CirclesPage + dialog).
+        var context = await Mount();
+        var window = context.Window!;
+
+        var stackBefore = window.NavRoot.NavigationStack.Count;
+        Assert.Equal(2, stackBefore);
+
+        // Act
+        var dialog = window.NavRoot.NavigationStack[^1] as AddCircleMemberDialog ?? throw new System.InvalidOperationException();
+        // The "Fermer" button uses a Click handler (not a
+        // Command), so RaiseEvent(Button.ClickEvent) is the
+        // right way to fire it from headless code. Executing
+        // Command would no-op because no Command is bound.
+
+        // FIXME Assert.NotNull(dialog.CloseButton):
+        // in order to click it by its def :
+
+        // dialog.CloseButton.RaiseEvent(new Avalonia.Interactivity.RoutedEventArgs(Button.ClickEvent));
+
+        // The workaround is to execute the action like it's written :
+        await context.App!.GoBackAsync();
+
+        // Assert: stack -1, the top is the CirclesPage again.
+        Assert.True(window.NavRoot.NavigationStack.Count == stackBefore - 1,
+            $"Click on 'Fermer' must shrink the nav stack by one. Before: {stackBefore}, after: {window.NavRoot.NavigationStack.Count}.");
+        Assert.IsType<CirclesPage>(window.NavRoot.NavigationStack[^1]);
+    }
+}

src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs

@@ -0,0 +1,73 @@
+using System.Diagnostics;
+using Xamarin.UITest;
+
+namespace PostIt.Tests;
+
+/// <summary>
+/// Smoke test: launches the installed PostIt.Android app on the running
+/// emulator and waits for the first Avalonia frame to render. Reveals the
+/// "démarrage KO" bug — the test fails if Avalonia never draws a frame
+/// within the timeout.
+///
+/// Skip conditions: the package is not installed on the connected device,
+/// or no device is connected via adb.
+/// </summary>
+[Trait("Category", "Platform-Android")]
+public class AndroidAppLaunchTests
+{
+    private const string PackageName = "fr.pschneider.postit";
+
+    private readonly ITestOutputHelper _output;
+
+    public AndroidAppLaunchTests(ITestOutputHelper output)
+    {
+        _output = output;
+    }
+
+    // TODO https://twosixtech.com/blog/integrating-docker-and-adb/
+    [Fact]
+    public void PostIt_starts_and_draws_a_first_frame_on_the_emulator()
+    {
+        if (!IsPackageInstalledOnAnyDevice())
+        {
+            _output.WriteLine($"[skip] {PackageName} not installed on any device");
+            return;
+        }
+
+        _output.WriteLine($"[step] configuring app via InstalledApp({PackageName})");
+        var app = ConfigureApp.Android
+            .InstalledApp(PackageName)
+            .StartApp(Xamarin.UITest.Configuration.AppDataMode.DoNotClear);
+        _output.WriteLine("[step] app.StartApp returned, waiting for first frame");
+
+        app.WaitForElement(
+            e => e.Class("android.view.View"),
+            timeout: TimeSpan.FromSeconds(30));
+        _output.WriteLine("[step] first frame observed");
+    }
+
+    private static bool IsPackageInstalledOnAnyDevice()
+    {
+        try
+        {
+            var startInfo = new ProcessStartInfo("adb", "shell pm list packages")
+            {
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+            };
+            using var proc = Process.Start(startInfo);
+            if (proc is null) return false;
+            var stdout = proc.StandardOutput.ReadToEnd();
+            proc.WaitForExit(5000);
+            return stdout
+                .Split('\n', StringSplitOptions.RemoveEmptyEntries)
+                .Any(line => line.Trim().Equals($"package:{PackageName}", StringComparison.Ordinal));
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}

src/PostIt/PostIt.Tests/BearerScopeTests.cs

@@ -1,18 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text;
 using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Yavsc.Blogspot;
 using Yavsc.Api.Client;
 using PostIt.Services;
-using PostIt.Services;
-using Xunit;
 
 namespace PostIt.Tests;
 
@@ -77,7 +67,7 @@ public class BearerScopeTests
                 Scopes = userScopes,
                 RedirectUri = "postit://callback",
             },
-            BusinessApiUrl = "https://example.invalid/api/v1/",
+            ApiUrl = "https://example.invalid/api/v1/",
         };
 
         var tokensPath = Path.Combine(
@@ -276,7 +266,7 @@ public class BearerScopeTests
             // private HttpClient is independent, so we resolve the
             // absolute URI ourselves from Settings.BusinessApiUrl —
             // the same URL BlogApiClient would have set as BaseAddress.
-            var absolute = new Uri(new Uri(Settings.BusinessApiUrl), path);
+            var absolute = new Uri(new Uri(Settings.ApiUrl), path);
             using var req = new HttpRequestMessage(method, absolute);
             req.Headers.Authorization =
                 new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _accessToken);

src/PostIt/PostIt.Tests/BillingCommandPageViewModelTests.cs

@@ -0,0 +1,274 @@
+using System.Text.Json;
+using PostIt.Helpers;
+using PostIt.Services;
+using PostIt.ViewModels;
+using PostIt.ViewModels.Commands;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Haircut;
+
+namespace PostIt.Tests;
+
+public class BillingCommandPageViewModelTests
+{
+    [Fact]
+    public async Task SubmitAsync_posts_rdv_payload_to_selected_billing_route()
+    {
+        var api = new RecordingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+          new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+          .CreateCommandPageViewModel(
+            new ActivityInfo { Code = "dev", Name = "Développement" },
+            new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+            client) as RdvViewModel;
+
+            vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+        vm!.Reason = "Point de cadrage";
+        vm!.Address = "1 rue du Test";
+        vm!.Latitude = 48.8566;
+        vm!.Longitude = 2.3522;
+        vm!.Consent = true;
+
+        await vm.SubmitCommand.ExecuteAsync(null);
+
+        Assert.Equal("https://business.example/api/v1/billing/Rdv", api.LastPath);
+        Assert.NotNull(api.LastBody);
+
+        using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+        Assert.Equal("dev", json.RootElement.GetProperty("ActivityCode").GetString());
+        Assert.Equal("perf-1", json.RootElement.GetProperty("PerformerId").GetString());
+        Assert.Equal("Point de cadrage", json.RootElement.GetProperty("Reason").GetString());
+        Assert.Equal((int)QueryStatus.Inserted, json.RootElement.GetProperty("Status").GetInt32());
+    }
+
+    [Fact]
+    public async Task SubmitAsync_refuses_unsupported_billing_code()
+    {
+        var api = new RecordingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+
+        var vm =
+         new CommandFormSummary { Id = 13, ActionName = "Book", Title = "Réservation" }
+         .CreateCommandPageViewModel(
+            new ActivityInfo { Code = "book", Name = "Book" },
+            new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
+            client);
+
+        Assert.Null(vm);
+    }
+
+    [Fact]
+    public async Task SubmitAsync_allows_missing_coordinates_and_omits_them_from_payload()
+    {
+        var api = new RecordingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+
+        new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+        .CreateCommandPageViewModel(
+            new ActivityInfo { Code = "dev", Name = "Développement" },
+            new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+            client) as RdvViewModel;
+        vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+        vm!.Reason = "Point de cadrage";
+        vm!.Address = "1 rue du Test";
+        vm!.Latitude = null;
+        vm!.Longitude = null;
+        vm!.Consent = true;
+
+        await vm.SubmitCommand.ExecuteAsync(null);
+
+        using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+        var location = json.RootElement.GetProperty("Location");
+        Assert.Equal("1 rue du Test", location.GetProperty("Address").GetString());
+        Assert.False(location.TryGetProperty("Latitude", out _));
+        Assert.False(location.TryGetProperty("Longitude", out _));
+    }
+
+    [Fact]
+    public async Task UseCurrentLocationAsync_prefills_coordinates_from_platform_provider()
+    {
+        var original = Platform.TryGetCurrentLocationAsync;
+        try
+        {
+            Platform.TryGetCurrentLocationAsync = _ => Task.FromResult(CurrentLocationResult.Success(48.8566, 2.3522));
+
+            var api = new RecordingApi();
+            var client = new BillingApiClient(api, "https://business.example/api/v1/");
+            var vm =
+             new CommandFormSummary { Id = 12, ActionName = "Rdv", Title = "Rendez-vous" }
+             .CreateCommandPageViewModel(
+                new ActivityInfo { Code = "dev", Name = "Développement" },
+                new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+                client) as RdvViewModel;
+
+            await vm!.UseCurrentLocationCommand.ExecuteAsync(null);
+
+            Assert.Equal(48.8566, vm!.Latitude);
+            Assert.Equal(2.3522, vm!.Longitude);
+        }
+        finally
+        {
+            Platform.TryGetCurrentLocationAsync = original;
+        }
+    }
+
+    [Fact]
+    public async Task InitializeAsync_loads_prestations_for_brush_and_submit_posts_selected_prestation()
+    {
+        var api = new RecordingApi
+        {
+            HairPrestations = new List<HairPrestationDto>
+            {
+                new() { Id = 10, Title = "Femme · Cheveux mi-longs", Details = "Coupe · Brushing" },
+                new() { Id = 11, Title = "Homme · Cheveux courts", Details = "Coupe · Coiffage" },
+            }
+        };
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+        new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
+        .CreateCommandPageViewModel(
+            new ActivityInfo { Code = "brush", Name = "Brush" },
+            new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
+            client) as BrushViewModel;
+        vm!.EventDate = DateTime.Parse("2026-09-02 14:30");
+        vm!.Address = "1 rue du Test";
+        vm!.Latitude = 48.8566;
+        vm!.Longitude = 2.3522;
+        vm!.Consent = true;
+        vm!.AdditionalInfo = "Prévoir shampoing";
+
+        await vm.InitializeAsync();
+        vm.SelectedPrestation = vm.AvailablePrestations[1];
+        await vm.SubmitCommand.ExecuteAsync(null);
+
+        Assert.Equal("https://business.example/api/v1/billing/Brush", api.LastPath);
+        using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+        Assert.Equal(11, json.RootElement.GetProperty("PrestationId").GetInt32());
+        Assert.Equal("Prévoir shampoing", json.RootElement.GetProperty("AdditionalInfo").GetString());
+    }
+
+    [Fact]
+    public async Task InitializeAsync_loads_prestations_for_mbrush_and_submit_posts_selected_prestations()
+    {
+        var api = new RecordingApi
+        {
+            HairPrestations = new List<HairPrestationDto>
+            {
+                new() { Id = 21, Title = "Femme · Cheveux longs", Details = "Coupe · Couleur" },
+                new() { Id = 22, Title = "Enfant · Cheveux courts", Details = "Coupe · Sans technique" },
+            }
+        };
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+        new CommandFormSummary { Id = 14, ActionName = "MBrush", Title = "Coupe groupée" }
+        .CreateCommandPageViewModel(
+            new ActivityInfo { Code = "mbrush", Name = "MBrush" },
+            new ActivityUserDisplayItem { PerformerId = "perf-3", UserName = "Cara" },
+            client) as MBrushViewModel;
+        vm!.EventDate = DateTime.Parse("2026-09-03 10:00");
+        vm!.Address = "2 rue du Test";
+        vm!.Latitude = 48.8567;
+        vm!.Longitude = 2.3523;
+        vm!.Consent = true;
+
+        await vm.InitializeAsync();
+        vm!.MultiPrestations[0].IsSelected = true;
+        vm!.MultiPrestations[1].IsSelected = true;
+        await vm!.SubmitCommand.ExecuteAsync(null);
+
+        Assert.Equal("https://business.example/api/v1/billing/MBrush", api.LastPath);
+        using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+        var prestations = json.RootElement.GetProperty("Prestations");
+        Assert.Equal(2, prestations.GetArrayLength());
+        Assert.Equal(21, prestations[0].GetProperty("PrestationId").GetInt32());
+        Assert.Equal(22, prestations[1].GetProperty("PrestationId").GetInt32());
+    }
+
+    [Fact]
+    public async Task InitializeAsync_with_existing_brush_query_prefills_and_submit_updates_query()
+    {
+        var api = new RecordingApi
+        {
+            HairPrestations = new List<HairPrestationDto>
+            {
+                new() { Id = 30, Title = "Femme · Cheveux longs", Details = "Coupe · Brushing" },
+                new() { Id = 31, Title = "Homme · Cheveux courts", Details = "Coupe" },
+            }
+        };
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm =
+           new CommandFormSummary { Id = 13, ActionName = "Brush", Title = "Coupe" }
+         .CreateCommandPageViewModel(
+            new ActivityInfo { Code = "brush", Name = "Brush" },
+            new ActivityUserDisplayItem { PerformerId = "perf-2", UserName = "Bob" },
+            client) as BrushViewModel;
+        await vm!.InitializeAsync(new BillingQueryDetailsDto
+        {
+            Id = 77,
+            BillingCode = "Brush",
+            ActivityCode = "brush",
+            PerformerId = "perf-2",
+            ClientId = "cli-1",
+            EventDate = new DateTime(2026, 9, 2, 14, 30, 0, DateTimeKind.Utc),
+            Consent = true,
+            Status = QueryStatus.Accepted,
+            PrestationId = 30,
+            AdditionalInfo = "Ancienne note",
+            Location = new BillingLocationDto
+            {
+                Address = "1 rue du Test",
+                Latitude = 48.8566,
+                Longitude = 2.3522,
+            }
+        });
+
+        vm!.SelectedPrestation = vm!.AvailablePrestations[1];
+        vm!.AdditionalInfo = "Note mise à jour";
+        await vm!.SubmitCommand.ExecuteAsync(null);
+
+        Assert.Equal(HttpMethod.Put, api.LastMethod);
+        Assert.Equal("https://business.example/api/v1/billing/Brush/77", api.LastPath);
+        Assert.True(vm.IsEditingExisting);
+        Assert.Equal("Mettre à jour la commande", vm.SubmitLabel);
+
+        using var json = JsonDocument.Parse(JsonSerializer.Serialize(api.LastBody));
+        Assert.Equal(77, json.RootElement.GetProperty("Id").GetInt32());
+        Assert.Equal(31, json.RootElement.GetProperty("PrestationId").GetInt32());
+        Assert.Equal("Note mise à jour", json.RootElement.GetProperty("AdditionalInfo").GetString());
+        Assert.Equal((int)QueryStatus.Accepted, json.RootElement.GetProperty("Status").GetInt32());
+    }
+
+    private sealed class RecordingApi : IYavscApiClient
+    {
+        public HttpClient Http { get; } = new();
+        public HttpMethod? LastMethod { get; private set; }
+        public string? LastPath { get; private set; }
+        public object? LastBody { get; private set; }
+        public List<HairPrestationDto>? HairPrestations { get; init; }
+
+        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            LastMethod = method;
+            LastPath = path;
+            LastBody = body;
+            if (typeof(T) == typeof(List<HairPrestationDto>))
+            {
+                return Task.FromResult((T)(object)(HairPrestations ?? new List<HairPrestationDto>()));
+            }
+            return Task.FromResult(default(T)!);
+        }
+
+        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            LastMethod = method;
+            LastPath = path;
+            LastBody = body;
+            return Task.CompletedTask;
+        }
+
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    }
+}

src/PostIt/PostIt.Tests/BillingQueriesPageViewModelTests.cs

@@ -0,0 +1,134 @@
+using System.Net.Http;
+using PostIt.ViewModels;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.Tests;
+
+public class BillingQueriesPageViewModelTests
+{
+    [Fact]
+    public async Task RefreshAsync_filters_queries_by_selected_activity_and_performer()
+    {
+        var api = new StubBillingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm = new BillingQueriesPageViewModel(
+            new ActivityInfo { Code = "dev", Name = "Développement" },
+            new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+            new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
+            client);
+
+        await vm.InitializeAsync();
+
+        Assert.Equal("https://business.example/api/v1/billing/Rdv", api.Paths.Single());
+        Assert.Equal(3, vm.Queries.Count);
+        Assert.Contains(vm.Queries, q => q.Description == "Rendez-vous #1");
+        Assert.Contains("3 commande", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [Fact]
+    public async Task RefreshAsync_in_readonly_ongoing_mode_keeps_only_ongoing_statuses_and_disables_open()
+    {
+        var api = new StubBillingApi();
+        var client = new BillingApiClient(api, "https://business.example/api/v1/");
+        var vm = new BillingQueriesPageViewModel(
+            new ActivityInfo { Code = "dev", Name = "Développement" },
+            new ActivityUserDisplayItem { PerformerId = "perf-1", UserName = "Alice" },
+            new CommandFormSummary { Id = 1, ActionName = "Rdv", Title = "Rendez-vous" },
+            client,
+            isReadOnly: true,
+            ongoingOnly: true);
+
+        await vm.InitializeAsync();
+
+        Assert.Equal(2, vm.Queries.Count);
+        Assert.All(vm.Queries, q => Assert.DoesNotContain("Rejected", q.StatusLabel, StringComparison.OrdinalIgnoreCase));
+        Assert.Contains("lecture seule", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+        Assert.False(vm.CanOpenDetails);
+
+        vm.SelectedQuery = vm.Queries[0];
+        Assert.False(vm.OpenSelectedQueryCommand.CanExecute(null));
+    }
+
+    private sealed class StubBillingApi : IYavscApiClient
+    {
+        public HttpClient Http { get; } = new();
+        public List<string> Paths { get; } = new();
+
+        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            Paths.Add(path);
+
+            if (typeof(T) == typeof(List<BillingQuerySummaryDto>))
+            {
+                var data = new List<BillingQuerySummaryDto>
+                {
+                    new()
+                    {
+                        Id = 11,
+                        ActivityCode = "dev",
+                        PerformerId = "perf-1",
+                        ClientId = "cli-1",
+                        Status = QueryStatus.Inserted,
+                        Description = "Rendez-vous #1",
+                        Reason = "Point de cadrage",
+                        EventDate = new DateTime(2026, 9, 1, 10, 0, 0, DateTimeKind.Utc),
+                    },
+                    new()
+                    {
+                        Id = 12,
+                        ActivityCode = "other",
+                        PerformerId = "perf-1",
+                        ClientId = "cli-1",
+                        Status = QueryStatus.Accepted,
+                        Description = "Autre activité",
+                        EventDate = new DateTime(2026, 9, 2, 10, 0, 0, DateTimeKind.Utc),
+                    },
+                    new()
+                    {
+                        Id = 13,
+                        ActivityCode = "dev",
+                        PerformerId = "perf-2",
+                        ClientId = "cli-1",
+                        Status = QueryStatus.Accepted,
+                        Description = "Autre performer",
+                        EventDate = new DateTime(2026, 9, 3, 10, 0, 0, DateTimeKind.Utc),
+                    },
+                    new()
+                    {
+                        Id = 14,
+                        ActivityCode = "dev",
+                        PerformerId = "perf-1",
+                        ClientId = "cli-1",
+                        Status = QueryStatus.InProgress,
+                        Description = "En cours",
+                        EventDate = new DateTime(2026, 9, 4, 10, 0, 0, DateTimeKind.Utc),
+                    },
+                    new()
+                    {
+                        Id = 15,
+                        ActivityCode = "dev",
+                        PerformerId = "perf-1",
+                        ClientId = "cli-1",
+                        Status = QueryStatus.Rejected,
+                        Description = "Rejetée",
+                        EventDate = new DateTime(2026, 9, 5, 10, 0, 0, DateTimeKind.Utc),
+                    }
+                };
+
+                return Task.FromResult((T)(object)data);
+            }
+
+            return Task.FromResult(default(T)!);
+        }
+
+        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            Paths.Add(path);
+            return Task.CompletedTask;
+        }
+
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    }
+}

src/PostIt/PostIt.Tests/BlogApiTestFakes.cs

@@ -1,7 +1,6 @@
 using Yavsc.Blogspot;
 using PostIt.Services;
 using PostIt.ViewModels;
-using Yavsc.Models;
 
 namespace PostIt.Tests;
 

src/PostIt/PostIt.Tests/BlogPostAuthorDtoTests.cs

@@ -0,0 +1,216 @@
+using System.Text.Json;
+using Yavsc.Blogspot;
+
+namespace PostIt.Tests;
+
+/// <summary>
+/// Round-trip tests for the wire shape of a blog post as
+/// serialised by Yavsc.Blogs and consumed by PostIt.
+///
+/// <para>
+/// Background: in 1.0.7, <c>BlogPostDto.Author</c> was typed as
+/// the abstract interface <c>IApplicationUser</c>. System.Text.Json
+/// cannot materialise an interface without a polymorphic
+/// converter, so the "load posts" call from PostIt crashed when
+/// the server returned a post with a populated <c>Author</c>
+/// object. The fix replaced <c>IApplicationUser</c> with a thin
+/// concrete DTO, <c>BlogPostAuthorDto</c>, embedded directly in
+/// <c>BlogPostDto.Author</c>.
+/// </para>
+///
+/// <para>
+/// These tests pin the wire shape: a JSON document with an
+/// <c>Author</c> object must deserialise without throwing and
+/// must round-trip the three fields PostIt exposes in the UI
+/// (Id, UserName, Avatar). They are intentionally placed in
+/// <c>PostIt.Tests</c> — the client-side assembly — so the
+/// regression is caught at the deserialisation boundary, where
+/// it actually manifested in production.
+/// </para>
+/// </summary>
+public class BlogPostAuthorDtoTests
+{
+    private static readonly JsonSerializerOptions CaseInsensitiveJson
+        = new() { PropertyNameCaseInsensitive = true };
+
+    [Fact]
+    public void BlogPostDto_deserialises_with_populated_author()
+    {
+        // A representative JSON shape the server would emit for
+        // GET /api/BlogApi. The Author object is fully populated
+        // — that's the shape that used to break deserialisation
+        // when Author was typed as the abstract IApplicationUser
+        // interface.
+        var json = """
+        {
+          "id": 42,
+          "title": "Premier billet",
+          "article": "Contenu",
+          "photo": null,
+          "dateCreated": "2026-08-01T12:00:00Z",
+          "dateModified": "2026-08-02T12:00:00Z",
+          "userCreated": "alice",
+          "userModified": "alice",
+          "authorId": "u-alice",
+          "isPublished": true,
+          "author": {
+            "id": "u-alice",
+            "userName": "alice",
+            "avatar": "/avatars/alice.png"
+          }
+        }
+        """;
+
+        var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
+
+        Assert.NotNull(post);
+        Assert.Equal(42, post!.Id);
+        Assert.Equal("Premier billet", post.Title);
+        Assert.Equal("u-alice", post.AuthorId);
+        Assert.True(post.IsPublished);
+
+        // The actual regression coverage: Author must
+        // materialise as a concrete DTO, not be left null because
+        // of a JsonException on IApplicationUser.
+        Assert.NotNull(post.Author);
+        Assert.Equal("u-alice", post.Author!.Id);
+        Assert.Equal("alice", post.Author.UserName);
+        Assert.Equal("/avatars/alice.png", post.Author.Avatar);
+    }
+
+    [Fact]
+    public void BlogPostDto_deserialises_when_author_is_null()
+    {
+        // The server is allowed to omit Author (the field is
+        // nullable on the wire — it maps to a navigation
+        // property that may not have been Included). The client
+        // must accept that shape without throwing.
+        var json = """
+        {
+          "id": 7,
+          "title": "Sans auteur",
+          "article": null,
+          "photo": null,
+          "dateCreated": "2026-08-01T12:00:00Z",
+          "dateModified": "2026-08-01T12:00:00Z",
+          "userCreated": "system",
+          "userModified": "system",
+          "authorId": "system",
+          "isPublished": false,
+          "author": null
+        }
+        """;
+
+        var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
+
+        Assert.NotNull(post);
+        Assert.Null(post!.Author);
+        Assert.Equal("system", post.AuthorId);
+    }
+
+    [Fact]
+    public void BlogPostDto_deserialises_when_author_field_is_missing()
+    {
+        // Forward-compatibility: an older server that doesn't
+        // emit the Author field at all. Should not throw.
+        var json = """
+        {
+          "id": 9,
+          "title": "Ancien format",
+          "article": "Pas d'auteur dans la charge utile",
+          "photo": null,
+          "dateCreated": "2026-07-01T12:00:00Z",
+          "dateModified": "2026-07-01T12:00:00Z",
+          "userCreated": "bob",
+          "userModified": "bob",
+          "authorId": "u-bob",
+          "isPublished": true
+        }
+        """;
+
+        var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
+
+        Assert.NotNull(post);
+        Assert.Null(post!.Author);
+    }
+
+    [Fact]
+    public void BlogPostAuthorDto_serialises_back_to_expected_json_shape()
+    {
+        // Pin the wire shape on the way out too. The server
+        // builds BlogPostAuthorDto from an ApplicationUser and
+        // PostIt receives it as JSON; if the field names
+        // change (e.g. case) the round-trip on the client side
+        // is what would silently break.
+        //
+        // The server emits camelCase (ASP.NET Core's Web
+        // defaults — PropertyNamingPolicy = CamelCase). We
+        // mirror that here so the test reflects what the wire
+        // actually looks like. PropertyNameCaseInsensitive on
+        // the client deserialiser means we don't have to
+        // hardcode the casing for the inbound assertions.
+        var author = new BlogPostAuthorDto
+        {
+            Id = "u-alice",
+            UserName = "alice",
+            Avatar = "/avatars/alice.png"
+        };
+
+        var json = JsonSerializer.Serialize(author,
+            new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
+
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+
+        Assert.True(root.TryGetProperty("id", out _));
+        Assert.True(root.TryGetProperty("userName", out _));
+        Assert.True(root.TryGetProperty("avatar", out _));
+    }
+
+    [Fact]
+    public void BlogPostDto_deserialises_acl_from_detail_payload()
+    {
+        // Detail payload shape emitted by BlogApiController.GetBlog:
+        // ACL entries are included under "acl"/"ACL".
+        var json = """
+        {
+          "id": 99,
+          "title": "ACL test",
+          "authorId": "u-alice",
+          "acl": [
+            { "circleId": 12, "blogPostId": 99 },
+            { "circleId": 34, "blogPostId": 99 }
+          ]
+        }
+        """;
+
+        var post = JsonSerializer.Deserialize<BlogPostDto>(json, CaseInsensitiveJson);
+
+        Assert.NotNull(post);
+        var acl = post!.GetACL();
+        Assert.Equal(2, acl.Length);
+        Assert.Contains(acl, a => a.CircleId == 12);
+        Assert.Contains(acl, a => a.CircleId == 34);
+    }
+
+    [Fact]
+    public void BlogPostDto_does_not_emit_acl_when_serialized_for_write()
+    {
+        var post = new BlogPostDto
+        {
+            Id = 77,
+            Title = "Write payload"
+        };
+        post.AuthorizeCircle(11);
+
+        // The client should not send ACL through POST/PUT blog payloads.
+        // ACL mutations have their own dedicated /blogacl endpoint.
+        var json = JsonSerializer.Serialize(post,
+            new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase });
+
+        using var doc = JsonDocument.Parse(json);
+        var root = doc.RootElement;
+        Assert.False(root.TryGetProperty("acl", out _));
+        Assert.False(root.TryGetProperty("wireAcl", out _));
+    }
+}

src/PostIt/PostIt.Tests/FakeAuthorizingBrowser.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
 using IdentityModel.OidcClient.Browser;
 
 namespace PostIt.Tests;

src/PostIt/PostIt.Tests/MainPageButtonsTests.cs

@@ -0,0 +1,230 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Headless.XUnit;
+using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
+using Yavsc.Api.Client;
+using Yavsc.Blogspot;
+using PostIt.Services;
+using PostIt.ViewModels;
+using PostIt.Views;
+
+namespace PostIt.Tests;
+
+/// <summary>
+/// Regression coverage for the three toolbar buttons on
+/// <see cref="MainPage"/> that the user reported as inoperative:
+/// "ACL", "Mes cercles", and "[DEV] Signature".
+///
+/// <para>Pattern (per the Avalonia headless testing docs —
+/// <c>TestableApp.Headless.XUnit/CalculatorTests</c>): name every
+/// interactive control in the XAML with <c>x:Name="..."</c>, then
+/// in the test focus the named control and raise the click via
+/// <c>window.KeyPressQwerty(PhysicalKey.Enter, ...)</c>. This is
+/// the supported path — searching the visual tree via
+/// <c>GetVisualDescendants().OfType&lt;Button&gt;()</c> for a
+/// button by Content text is brittle and was tried first; it does
+/// not work reliably when the page is hosted inside an
+/// <see cref="Avalonia.Controls.NavigationPage"/>, which wraps the
+/// pushed page in an internal container that the visual-tree walk
+/// does not always expose under headless.</para>
+///
+/// <para>The assertion is on the post-click top of
+/// <see cref="Avalonia.Controls.INavigation.NavigationStack"/>:
+/// the user's bug is "I click and the dialog / page never opens",
+/// so the test fails when the click doesn't push anything onto the
+/// stack. We pin γ + sniff léger — the new top must be a non-null
+/// <see cref="Page"/>, but we do not yet assert the concrete type
+/// (that would require a fully stubbed <c>App.ServiceProvider</c>,
+/// which is the next iteration of this suite).</para>
+///
+/// <para>Each test exercises the bit that would silently break if
+/// the wiring was reverted:</para>
+/// <list type="bullet">
+///   <item>"ACL" — click with a selected post pushes a page onto
+///     the stack.</item>
+///   <item>"Mes cercles" — click pushes a page onto the stack.</item>
+///   <item>"[DEV] Signature" — click pushes a page onto the
+///     stack.</item>
+/// </list>
+/// </summary>
+public class MainPageButtonsTests
+{
+    /// <summary>
+    /// Fake <see cref="YavscApiClient"/> that throws on any
+    /// wire call. These tests never invoke a command that hits
+    /// the API — only the click → nav side of the pipeline is
+    /// asserted.
+    /// </summary>
+    private sealed class ThrowingApi : YavscApiClient
+    {
+        public ThrowingApi() : base(
+            new Settings
+            {
+                Authentication = new AuthenticationSettings
+                {
+                    Authority = "https://stub.invalid",
+                    ClientId = "stub",
+                    Scopes = new[] { "openid" },
+                },
+            },
+            new TokenStore(System.IO.Path.GetTempFileName()))
+        { }
+    }
+
+    private static MainViewModel MakeViewModel(BlogPostDto? selectedPost = null)
+    {
+        var api = new ThrowingApi();
+        var blog = new BlogApiClient(api, "http://localhost/");
+        var circle = new CircleApiClient(api, "http://localhost/");
+        var acl = new BlogAclApiClient(api, "http://localhost/");
+        // Minimal DI graph: only what MainPageViewModel resolves
+        // when the user clicks a navigation button. Today that's
+        // SignaturePageViewModel / CirclesPageViewModel / ACL
+        // dependencies. The graph intentionally stays local to this
+        // suite to avoid side effects from App.BuildServices() (real
+        // token-store wiring).
+        var services = new ServiceCollection();
+        services.AddSingleton(new Settings());
+        services.AddSingleton(circle);
+        services.AddSingleton(acl);
+        services.AddTransient<SignaturePageViewModel>();
+        services.AddTransient<CirclesPageViewModel>();
+        services.AddTransient<SignaturePage>();
+        services.AddTransient<CirclesPage>();
+        services.AddTransient<PostAclDialog>();
+        var vm = new MainViewModel(blog, services: services.BuildServiceProvider());
+        if (selectedPost is not null) vm.SelectedPost = selectedPost;
+        return vm;
+    }
+
+    /// <summary>
+    /// Mount a real <see cref="MainView"/> (as
+    /// <c>SessionStatusBannerTests</c> does), push a
+    /// <see cref="MainPage"/> with the given VM onto
+    /// <c>NavRoot</c>. <c>PushAsync</c> is awaited (via
+    /// <c>GetAwaiter().GetResult()</c>) so the page is on the
+    /// nav stack before the test tries to interact with its
+    /// named buttons. The window is shown so the visual tree is
+    /// realised and <c>KeyPressQwerty</c> has a real
+    /// <see cref="TopLevel"/> to dispatch against.
+    /// </summary>
+    private static (MainView window, MainPage page) MountMainPage(MainViewModel vm)
+    {
+        var window = new MainView();
+        var page = new MainPage { DataContext = vm };
+        var app = (PostIt.App)Application.Current!;
+        app.AttachMainWindow(window);
+        window.NavRoot.PushAsync(page).GetAwaiter().GetResult();
+        return (window, page);
+    }
+
+    /// <summary>
+    /// Click a button by focusing it and pressing Enter — the
+    /// supported headless pattern (cf. CalculatorTests in the
+    /// Avalonia.Samples repo). Returns the nav-stack count
+    /// before the click so the caller can assert on the delta.
+    /// KeyPressQwerty is dispatched on the <see cref="MainView"/>
+    /// itself — it is the <see cref="TopLevel"/> that owns the
+    /// headless implementation, and routing the key through any
+    /// descendant TopLevel (e.g. one obtained via
+    /// <c>TopLevel.GetTopLevel(button)</c>) fails with a
+    /// <c>NullReferenceException</c> from the headless impl
+    /// because the descendant does not carry the
+    /// <c>PlatformHandle</c> the harness expects.
+    /// </summary>
+    private static int ClickAndCapture(MainView window, Button button)
+    {
+        var stackBefore = window.NavRoot.NavigationStack.Count;
+        button.Command?.Execute(button.CommandParameter);
+        if (button.Command is IAsyncRelayCommand asyncCommand)
+        {
+            asyncCommand.ExecutionTask?.GetAwaiter().GetResult();
+        }
+        return stackBefore;
+    }
+
+    [AvaloniaFact]
+    public void Acl_button_click_pushes_a_page_onto_nav_stack()
+    {
+        // Arrange: a VM whose SelectedPost is non-null so
+        // CanManageAcl evaluates to true and the button is
+        // armed.
+        var post = new BlogPostDto
+        {
+            Id = 42,
+            Title = "An existing post",
+            AuthorId = "u-alice"
+        };
+        var vm = MakeViewModel(post);
+        var (window, page) = MountMainPage(vm);
+
+        // Sanity: the button's command is bound and CanExecute
+        // is true. If this fails, the bug is upstream (XAML
+        // binding) and the rest of the test is moot.
+        var aclButton = page.ManageAclButton;
+        Assert.NotNull(aclButton.Command);
+        Assert.True(aclButton.Command.CanExecute(null));
+
+        // Act
+        var stackBefore = ClickAndCapture(window, aclButton);
+
+        // Assert γ + sniff léger: stack grew, new top is a Page.
+        Assert.True(window.NavRoot.NavigationStack.Count > stackBefore,
+            $"Click on ACL must push a new page onto the nav stack. Stack size before: {stackBefore}, after: {window.NavRoot.NavigationStack.Count}.");
+        var pushed = window.NavRoot.NavigationStack.Last();
+        Assert.NotNull(pushed);
+        Assert.IsAssignableFrom<Page>(pushed);
+    }
+
+    [AvaloniaFact]
+    public void Circles_button_click_pushes_a_page_onto_nav_stack()
+    {
+        // Arrange: OpenCircles has no CanExecute guard today —
+        // any click should fire it and push the page.
+        var vm = MakeViewModel();
+        var (window, page) = MountMainPage(vm);
+
+        var circlesButton = page.OpenCirclesButton;
+        Assert.NotNull(circlesButton.Command);
+
+        // Act
+        var stackBefore = ClickAndCapture(window, circlesButton);
+
+        // Assert
+        Assert.True(window.NavRoot.NavigationStack.Count > stackBefore,
+            "Click on 'Mes cercles' must push a new page onto the nav stack.");
+        var pushed = window.NavRoot.NavigationStack.Last();
+        Assert.NotNull(pushed);
+        Assert.IsAssignableFrom<Page>(pushed);
+    }
+
+    [AvaloniaFact]
+    public void Signature_dev_button_click_pushes_a_page_onto_nav_stack()
+    {
+        // Arrange: the "[DEV] Signature" button is bound to the
+        // MainPageViewModel.OpenSignatureDevCommand [RelayCommand].
+        // The click must push SignaturePage on top of NavRoot.
+        // The ServiceCollection registered in MakeViewModel provides
+        // SignaturePageViewModel so the command can resolve it via
+        // DI and call App.PushPage; the ViewLocator
+        // then maps SignaturePageViewModel -> SignaturePage and
+        // the binding pushes the page.
+        var vm = MakeViewModel();
+        var (window, page) = MountMainPage(vm);
+
+        var signatureButton = page.OpenSignatureDevButton;
+        Assert.NotNull(signatureButton.Command);
+        Assert.True(signatureButton.Command.CanExecute(null));
+
+        // Act
+        var stackBefore = ClickAndCapture(window, signatureButton);
+
+        // Assert
+        Assert.True(window.NavRoot.NavigationStack.Count > stackBefore,
+            "Click on '[DEV] Signature' must push a new page onto the nav stack.");
+        var pushed = window.NavRoot.NavigationStack.Last();
+        Assert.NotNull(pushed);
+        Assert.IsAssignableFrom<Page>(pushed);
+    }
+}

src/PostIt/PostIt.Tests/MainPageSaveTests.cs

@@ -1,10 +1,8 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
 using Avalonia.VisualTree;
 using Yavsc.Blogspot;
 using Yavsc.Api.Client;
-using PostIt.Services;
 using PostIt.ViewModels;
 using PostIt.Views;
 namespace PostIt.Tests;
@@ -42,7 +40,7 @@ public class MainPageSaveTests
         var recorder = new CallRecorder();
         var api = new RecordingYavscApiClient(recorder);
         var blog = new BlogApiClient(api, "http://localhost/");
-        var viewModel = new MainPageViewModel(blog);
+        var viewModel = new MainViewModel(blog);
 
         var page = new MainPage { DataContext = viewModel };
         // MainPage is a ContentPage (a Page, not a Control), so it
@@ -81,9 +79,9 @@ public class MainPageSaveTests
         // whose Title is exactly what the user typed. The bug
         // fails this assertion with Title == string.Empty.
         Assert.NotEmpty(recorder.Calls);
-        var (method, path, body) = recorder.FirstCall;
+        var (method, path, body) = recorder.Calls[1];
         Assert.Equal(HttpMethod.Post, method);
-        Assert.Equal("blog", path);
+        Assert.Equal("blogspot", path);
         var sent = Assert.IsType<BlogPostDto>(body);
         Assert.Equal(typed, sent.Title);
     }

src/PostIt/PostIt.Tests/OidcStubAuthority.cs

@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace PostIt.Tests;
 

src/PostIt/PostIt.Tests/PostAclDialogTests.cs

@@ -0,0 +1,275 @@
+using System.Net;
+using System.Text;
+using System.Text.Json;
+using Avalonia;
+using Avalonia.Headless.XUnit;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.Helpers;
+using PostIt.Services;
+using PostIt.ViewModels;
+using PostIt.Views;
+using Yavsc.Api.Client;
+using Yavsc.Api.Client.Dtos;
+using Yavsc.Blogspot;
+
+namespace PostIt.Tests;
+
+/// <summary>
+/// Regression coverage for the user-reported bug:
+/// <c>PostAclDialogViewModel.LoadAsync</c> was never invoked,
+/// so <c>MyCircles</c> and <c>AclEntries</c> were empty when the
+/// dialog opened (the dropdown showed "Choisir un cercle..." and
+/// the list was blank, with no error to hint at why).
+///
+/// <para>The fix wires <see cref="PostAclDialog"/>'s constructor
+/// to trigger <c>LoadAsync</c> on the first
+/// <c>AttachedToVisualTree</c>, and the VM guards re-entry via
+/// <c>_loaded</c>. Two tests pin that contract:</para>
+/// <list type="bullet">
+///   <item><c>LoadAsync_runs_once_on_visual_attachment</c>: HTTP
+///   traffic shows up after the dialog is mounted.</item>
+///   <item><c>LoadAsync_is_idempotent</c>: a second explicit call
+///   to <c>LoadAsync</c> on the same VM hits the HTTP layer only
+///   once (the <c>_loaded</c> gate).</item>
+/// </list>
+///
+/// <para>HTTP is stubbed with a counter
+/// <see cref="HttpMessageHandler"/> that returns canned JSON
+/// <c>[]</c> for every request. The handler counts calls so the
+/// tests can assert "exactly one round-trip on mount" and
+/// "exactly one round-trip after two calls to LoadAsync". This
+/// is the same shape used by <c>BearerScopeTests</c>: real
+/// <see cref="YavscApiClient"/> subclass, real
+/// <see cref="HttpClient"/> with an injected handler, real
+/// <see cref="BlogAclApiClient"/> / <see cref="CircleApiClient"/>
+/// talking to it.</para>
+/// </summary>
+public class PostAclDialogTests
+{
+    /// <summary>
+    /// <see cref="HttpMessageHandler"/> that replies 200 with
+    /// <c>[]</c> (a valid JSON empty array, which both
+    /// <c>GetMyAclAsync</c> and <c>GetMyCirclesAsync</c> can
+    /// deserialize) and counts the number of requests.
+    /// </summary>
+    private sealed class CountingHttpHandler : HttpMessageHandler
+    {
+        public int RequestCount { get; private set; }
+
+        protected override Task<HttpResponseMessage> SendAsync(
+            HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            RequestCount++;
+            var response = new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent("[]", Encoding.UTF8, "application/json"),
+            };
+            return Task.FromResult(response);
+        }
+    }
+
+    /// <summary>
+    /// Subclass of <see cref="YavscApiClient"/> that routes HTTP
+    /// traffic through a caller-supplied
+    /// <see cref="HttpMessageHandler"/>. Same recipe as
+    /// <c>BearerScopeTests.TestableYavscApiClient</c> — we
+    /// override <c>CallAsync{T}</c> to talk to our own
+    /// <see cref="HttpClient"/> and skip the OIDC refresh path,
+    /// because the load-on-attach bug has nothing to do with
+    /// token refresh.
+    /// </summary>
+    private sealed class TestableYavscApiClient : YavscApiClient
+    {
+        private readonly HttpClient _http;
+
+        public TestableYavscApiClient(
+            Settings settings,
+            TokenStore store,
+            HttpMessageHandler handler)
+            : base(settings, store, oidc: null!)
+        {
+            _http = new HttpClient(handler, disposeHandler: false);
+        }
+
+        public override Task<T> CallAsync<T>(
+            HttpMethod method, string path, object? body = null,
+            CancellationToken ct = default)
+        {
+            var absolute = new Uri(new Uri(Settings.ApiUrl), path);
+            using var req = new HttpRequestMessage(method, absolute);
+            using var resp = _http.SendAsync(req, ct).GetAwaiter().GetResult();
+            resp.EnsureSuccessStatusCode();
+            using var stream = resp.Content.ReadAsStream();
+            var dto = JsonSerializer.Deserialize<T>(stream,
+                new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+            return Task.FromResult(dto!);
+        }
+    }
+
+    /// <summary>
+    /// Build a minimal DI graph exposing the two API clients
+    /// (backed by a stub HTTP handler) and the page itself, so
+    /// <c>ViewLocator</c> can resolve the dialog from the VM.
+    /// Returns the handler, the API clients, and the window so
+    /// the test can assert on request counts and push the
+    /// dialog via the canonical <c>App.PushPageAsync</c> path.
+    /// The DI graph is built into a local <see cref="IServiceProvider"/>
+    /// that is NOT attached to <see cref="App.ServiceProvider"/>:
+    /// rebinding the global DI mid-test would trample the
+    /// Settings singleton the rest of the harness depends on.
+    /// </summary>
+    private static (MainView window, BlogAclApiClient aclClient, CircleApiClient circleClient, CountingHttpHandler handler) Mount()
+    {
+        var handler = new CountingHttpHandler();
+        var settings = new Settings();
+        var api = new TestableYavscApiClient(settings, new TokenStore(System.IO.Path.GetTempFileName()), handler);
+        var aclClient = new BlogAclApiClient(api, settings.ApiUrl);
+        var circleClient = new CircleApiClient(api, settings.ApiUrl);
+
+        var services = new ServiceCollection();
+        services.AddSingleton(settings);
+        services.AddSingleton(api);
+        services.AddSingleton(aclClient);
+        services.AddSingleton(circleClient);
+        services.AddTransient<PostAclDialog>();
+        var sp = services.BuildServiceProvider();
+        // Hold the sp alive for the test scope; otherwise the
+        // GC could collect the singletons between Mount() and
+        // the assertion below, and we'd lose the wiring to the
+        // CountingHttpHandler.
+        GC.KeepAlive(sp);
+
+        var window = new MainView();
+        var app = (App)Application.Current!;
+        app.AttachMainWindow(window);
+
+        return (window, aclClient, circleClient, handler);
+    }
+
+    /// <summary>
+    /// The bug: opening the dialog never called LoadAsync, so
+    /// MyCircles/AclEntries were empty. After the fix, setting
+    /// the dialog's DataContext to a PostAclDialogViewModel
+    /// (the same path App.PushPageAsync takes) must trigger
+    /// exactly one LoadAsync round-trip (the parallel WhenAll
+    /// inside the VM counts as one request per backend call,
+    /// hence two HTTP requests total: GET /blogacl and GET
+    /// /circle).
+    /// </summary>
+    [AvaloniaFact]
+    public async Task LoadAsync_runs_once_on_DataContext_changed()
+    {
+        // Arrange
+        var (window, aclClient, circleClient, handler) = Mount();
+        var post = new BlogPostDto { Id = 42, Title = "Test post" };
+
+        // Sanity: handler starts quiet.
+        Assert.Equal(0, handler.RequestCount);
+
+        // Act: push the dialog via the canonical VM-first pipeline.
+        // The locator goes through the parameterless ctor of
+        // PostAclDialog, then App.PushPageAsync assigns DataContext,
+        // which our hook intercepts to trigger LoadAsync.
+        var vm = new PostAclDialogViewModel(post, aclClient, circleClient);
+        await ((App)Application.Current!).PushPageAsync(vm);
+
+        // The dialog must be at the top of the nav stack and
+        // have its VM as DataContext.
+        var dialog = window.NavRoot.NavigationStack[^1] as PostAclDialog
+            ?? throw new InvalidOperationException("Dialog not at top of stack");
+        Assert.Same(vm, dialog.DataContext);
+
+        // Drain pending async work. LoadAsync is async and the
+        // DataContextChanged handler is fire-and-forget; a
+        // couple of loop turns is enough. We poll the handler
+        // counter because the dispatch back onto the headless
+        // dispatcher isn't strict — using a generous-but-bounded
+        // wait avoids test flakes.
+        var deadline = DateTime.UtcNow.AddSeconds(2);
+        while (handler.RequestCount < 2 && DateTime.UtcNow < deadline)
+        {
+            await Task.Delay(20);
+        }
+
+        // Assert: one GET went out (for /circle) from LoadAsync.
+        Assert.Equal(1, handler.RequestCount);
+
+        // And the VM's idempotency gate has flipped.
+        Assert.True(vm.Loaded);
+    }
+
+    /// <summary>
+    /// The fix exposes a guard on the VM too: a second call to
+    /// LoadAsync on the same instance must NOT issue more HTTP
+    /// traffic. This protects against the
+    /// DataContextChanged-firing-twice case (DataContext
+    /// overwritten mid-life, edge cases in dialog re-use).
+    /// </summary>
+    [AvaloniaFact]
+    public async Task LoadAsync_is_idempotent()
+    {
+        // Arrange
+        var (_, aclClient, circleClient, handler) = Mount();
+        var post = new BlogPostDto { Id = 99, Title = "Idempotency" };
+        var vm = new PostAclDialogViewModel(post, aclClient, circleClient);
+
+        // Act: invoke LoadAsync twice in a row.
+        await vm.LoadAsync();
+        await vm.LoadAsync();
+
+        // Assert: the second call short-circuited on _loaded.
+        Assert.Equal(1, handler.RequestCount);
+        Assert.True(vm.Loaded);
+    }
+
+    [Fact]
+    public async Task LoadAsync_keeps_acl_from_blogpostdto_and_only_loads_circles()
+    {
+        var post = new BlogPostDto { Id = 42, Title = "ACL hydration" };
+        post.AuthorizeCircle(12);
+        post.AuthorizeCircle(34);
+
+        var api = new StubAclApiClient();
+        var aclClient = new BlogAclApiClient(api, "http://localhost/");
+        var circleClient = new CircleApiClient(api, "http://localhost/");
+        var vm = new PostAclDialogViewModel(post, aclClient, circleClient);
+
+        await vm.LoadAsync();
+
+        Assert.Equal(1, api.CallCount);
+        Assert.Equal(2, vm.AclEntries.Count);
+        Assert.Contains(vm.AclEntries, a => a.CircleId == 12);
+        Assert.Contains(vm.AclEntries, a => a.CircleId == 34);
+    }
+
+    private sealed class StubAclApiClient : IYavscApiClient
+    {
+        public HttpClient Http { get; } = new();
+        public int CallCount { get; private set; }
+
+        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            CallCount++;
+
+            if (typeof(T) == typeof(List<CircleDto>))
+            {
+                var circles = new List<CircleDto>
+                {
+                    new() { Id = 12, Name = "A", OwnerId = "owner", Public = false },
+                    new() { Id = 34, Name = "B", OwnerId = "owner", Public = false },
+                };
+                return Task.FromResult((T)(object)circles);
+            }
+
+            return Task.FromResult(default(T)!);
+        }
+
+        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            CallCount++;
+            return Task.CompletedTask;
+        }
+
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    }
+}

src/PostIt/PostIt.Tests/PostIt.Tests.csproj

@@ -8,11 +8,12 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Xamarin.UITest" />
     <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="coverlet.collector" />
@@ -20,12 +21,10 @@
     <PackageReference Include="Avalonia.Headless.XUnit" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\PostIt\PostIt\PostIt.csproj" />
+    <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Using Include="Xunit" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup></ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" />
-  </ItemGroup>
 </Project>

src/PostIt/PostIt.Tests/PostItViewModelTests.cs

@@ -16,7 +16,7 @@ public class PostItViewModelTests
         // throws on any call (we never call the API in this test).
         var fakeApi = new ThrowingYavscApiClient();
         var blog = new BlogApiClient(fakeApi, "http://localhost/");
-        var viewModel = new MainPageViewModel(blog);
+        var viewModel = new MainViewModel(blog);
 
         viewModel.Posts.Add(new BlogPostDto { Id = 1, Title = "First post", Article = "Hello world", AuthorId = "alice" });
         viewModel.Posts.Add(new BlogPostDto { Id = 2, Title = "Second post", Article = "Nothing here", AuthorId = "bob" });
@@ -49,12 +49,27 @@ public class PostItViewModelTests
         var api = new StubYavscApiClient(expected);
         var blog = new BlogApiClient(api, "http://localhost/");
 
-        var posts = await blog.GetPostsAsync();
+        var posts = await blog.GetPostsAsync(ct: TestContext.Current.CancellationToken);
 
         Assert.Equal(2, posts.Count);
         Assert.Equal("Hello", posts[0].Title);
     }
 
+    [Fact]
+    public async Task TogglePublishCommand_uses_the_current_checked_state_without_inverting_it()
+    {
+        var api = new RecordingPublishApi();
+        var blog = new BlogApiClient(api, "http://localhost/");
+        var viewModel = new MainViewModel(blog);
+
+        viewModel.SelectedPost = new BlogPostDto { Id = 42, IsPublished = false };
+
+        await viewModel.SetPublishStateAsync(true);
+
+        Assert.True(api.LastPublishValue);
+        Assert.True(viewModel.DraftIsPublished);
+    }
+
     /// <summary>Test fake that always throws if the API is invoked.</summary>
     private sealed class ThrowingYavscApiClient : YavscApiClient
     {
@@ -103,4 +118,34 @@ public class PostItViewModelTests
             return Task.FromResult(default(T)!);
         }
     }
+
+    private sealed class RecordingPublishApi : IYavscApiClient
+    {
+        public bool LastPublishValue { get; private set; }
+        public HttpClient Http { get; } = new();
+
+        public Task<T> CallAsync<T>(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            if (method == HttpMethod.Put && path.Contains("/publish", StringComparison.OrdinalIgnoreCase))
+            {
+                var publish = body?.GetType().GetProperty("publish")?.GetValue(body) is bool value && value;
+                LastPublishValue = publish;
+            }
+
+            return Task.FromResult(default(T)!);
+        }
+
+        public Task CallAsync(HttpMethod method, string path, object? body = null, CancellationToken ct = default)
+        {
+            if (method == HttpMethod.Put && path.Contains("/publish", StringComparison.OrdinalIgnoreCase))
+            {
+                var publish = body?.GetType().GetProperty("publish")?.GetValue(body) is bool value && value;
+                LastPublishValue = publish;
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public ValueTask DisposeAsync() => ValueTask.CompletedTask;
+    }
 }

src/PostIt/PostIt.Tests/SchemeUrlDetectorTests.cs

@@ -1,5 +1,4 @@
 using PostIt.Services;
-using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt/PostIt.Tests/SessionStatusBannerTests.cs

@@ -1,7 +1,5 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Headless.XUnit;
-using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 using PostIt.ViewModels;
@@ -11,7 +9,7 @@ namespace PostIt.Tests;
 
 /// <summary>
 /// UI tests for <see cref="SessionStatusBanner"/>. Mounted inside
-/// a real <see cref="MainWindow"/> via the headless Avalonia
+/// a real <see cref="MainView"/> via the headless Avalonia
 /// platform declared in <c>TestApp.cs</c>.
 ///
 /// <para>The pattern is the one that <c>UnitTest1.MainPage_Should_Load</c>
@@ -36,11 +34,10 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_renders_three_buttons_in_the_visual_tree()
     {
-        var window = new MainWindow();
+        MainWindow window = new MainWindow();
-        window.SessionBanner.DataContext = new SessionStatusViewModel();
         window.Show();
 
-        var buttons = window.SessionBanner.GetVisualDescendants()
+        var buttons = window.GetVisualDescendants()
             .OfType<Button>()
             .ToList();
 
@@ -48,7 +45,7 @@ public class SessionStatusBannerTests
         // déconnecter, Se connecter, Paramètres. If any one is
         // missing, the user has no way to trigger the
         // corresponding navigation event.
-        Assert.Equal(3, buttons.Count);
+        Assert.Equal(4, buttons.Count);
         Assert.Contains(buttons, b => b.Content as string == "Se déconnecter");
         Assert.Contains(buttons, b => b.Content as string == "Se connecter");
         Assert.Contains(buttons, b => b.Content as string == "Paramètres");
@@ -57,13 +54,10 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_login_button_is_visible_when_logged_out()
     {
-        var window = new MainWindow();
+        MainWindow window = new MainWindow();
-        var vm = new SessionStatusViewModel();
-        Assert.True(vm.IsLoggedOut);  // VM default
-        window.SessionBanner.DataContext = vm;
         window.Show();
 
-        var login = window.SessionBanner.GetVisualDescendants()
+        var login = window.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Se connecter");
 
@@ -75,13 +69,13 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_logout_button_is_hidden_when_logged_out()
     {
-        var window = new MainWindow();
+       SessionStatusBanner banner = CreateBanner();
-        var vm = new SessionStatusViewModel();
-        Assert.False(vm.IsLoggedIn);  // VM default
-        window.SessionBanner.DataContext = vm;
-        window.Show();
 
-        var logout = window.SessionBanner.GetVisualDescendants()
+        Assert.False((banner.DataContext as SessionStatusViewModel)!
+        .IsLoggedIn);  // VM default
+
+
+        var logout = banner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Se déconnecter");
 
@@ -91,11 +85,9 @@ public class SessionStatusBannerTests
     [AvaloniaFact]
     public void Banner_settings_button_is_visible_regardless_of_session()
     {
-        var window = new MainWindow();
+        SessionStatusBanner banner = CreateBanner();
-        window.SessionBanner.DataContext = new SessionStatusViewModel();
-        window.Show();
 
-        var settings = window.SessionBanner.GetVisualDescendants()
+        var settings = banner.GetVisualDescendants()
             .OfType<Button>()
             .Single(b => b.Content as string == "Paramètres");
 
@@ -105,14 +97,21 @@ public class SessionStatusBannerTests
         Assert.True(settings.IsVisible);
     }
 
+    private static SessionStatusBanner CreateBanner()
+    {
+        MainWindow window = new MainWindow();
+        window.Show();
+        var banner = window.MainView.SessionBanner;
+        var status = new SessionStatusViewModel();
+        banner.DataContext = status;
+        return banner;
+    }
+
     [AvaloniaFact]
     public void Banner_session_label_reflects_DataContext()
     {
-        var window = new MainWindow();
+        SessionStatusBanner banner = CreateBanner();
-        window.SessionBanner.DataContext = new SessionStatusViewModel();
+        var label = banner.GetVisualDescendants()
-        window.Show();
-
-        var label = window.SessionBanner.GetVisualDescendants()
             .OfType<TextBlock>()
             .First(t => t.Text == "Déconnecté" || t.Text == "Connecté");
 

src/PostIt/PostIt.Tests/SettingsLoadTests.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Text.Json;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit;
 
 namespace PostIt.Tests;
 
@@ -91,9 +87,9 @@ public class SettingsLoadTests
                         bool flip = ((workerId + i) & 1) == 0;
                         settings.DarkMode = flip;
                         settings.Authentication.RedirectUri =
-                            global::AuthenticationSettings.DefaultDesktopRedirectUri;
+                            global::AuthenticationSettings.DesktopRedirectUri;
 
-                        settings.BusinessApiUrl = flip
+                        settings.ApiUrl = flip
                             ? "https://a.example.test/api/v1/"
                             : "https://b.example.test/api/v1/";
 
@@ -109,7 +105,7 @@ public class SettingsLoadTests
                 {
                     failures.Add(ex);
                 }
-            });
+            }, TestContext.Current.CancellationToken);
         }
         await Task.WhenAll(tasks);
 
@@ -129,7 +125,7 @@ public class SettingsLoadTests
     /// and checking that Loaded flips exactly once (no torn reads).
     /// </summary>
     [Fact]
-    public void Load_is_idempotent_under_concurrent_calls()
+    public async Task Load_is_idempotent_under_concurrent_calls()
     {
         var settings = new PostIt.ViewModels.Settings
         {
@@ -149,10 +145,32 @@ public class SettingsLoadTests
             {
                 barrier.SignalAndWait();
                 settings.Load();
-            });
+            }, TestContext.Current.CancellationToken);
         }
-        Task.WaitAll(tasks);
+        await Task.WhenAll(tasks);
 
         Assert.True(settings.Loaded);
     }
+
+    [Fact]
+    public void SearchText_is_serialized_in_settings_and_round_trips()
+    {
+        var settings = new PostIt.ViewModels.Settings
+        {
+            Authentication = new AuthenticationSettings
+            {
+                Authority = "https://example.test/",
+                ClientId = "postit-tests",
+                Scopes = new[] { "openid" }
+            }
+        };
+
+        settings.SearchText = "bonjour";
+
+        var json = JsonSerializer.Serialize(settings);
+        var roundTrip = JsonSerializer.Deserialize<PostIt.ViewModels.Settings>(json);
+
+        Assert.NotNull(roundTrip);
+        Assert.Equal("bonjour", roundTrip.SearchText);
+    }
 }

src/PostIt/PostIt.Tests/SignaturePadControlTests.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Linq;
 using PostIt.Controls;
 using PostIt.Models;
-using Xunit;
 
 namespace PostIt.Tests;
 
@@ -97,6 +94,26 @@ public class SignaturePadControlTests
         Assert.NotEqual(first.Strokes, third.Strokes);
     }
 
+    [Fact]
+    public void PendingStroke_is_exposed_only_while_capturing()
+    {
+        var pad = new SignaturePadControl();
+
+        Assert.Empty(pad.PendingStroke);
+
+        pad.BeginCaptureForTest();
+        pad.AppendPointForTest(1_000, 2_000);
+        pad.AppendPointForTest(3_000, 4_000);
+
+        Assert.Equal(new[] { 1_000, 2_000, 3_000, 4_000 }, pad.PendingStroke);
+        Assert.Equal(new[] { 1_000, 2_000, 3_000, 4_000 }, pad.Strokes);
+
+        pad.SealStrokeForTest();
+
+        Assert.Empty(pad.PendingStroke);
+        Assert.Equal(new[] { 2, 1_000, 2_000, 3_000, 4_000 }, pad.Strokes);
+    }
+
     [Fact]
     public void Clear_empties_buffer_and_raises_redraw()
     {

src/PostIt/PostIt.Tests/SignaturePageViewModelTests.cs

@@ -1,10 +1,6 @@
-using System;
-using System.IO;
 using System.Text.Json;
-using System.Threading.Tasks;
 using PostIt.Controls;
 using PostIt.ViewModels;
-using Xunit;
 
 namespace PostIt.Tests;
 

src/PostIt/PostIt.Tests/TestAppContext.cs

@@ -0,0 +1,11 @@
+using PostIt.Views;
+
+namespace PostIt.Tests;
+
+internal class TestAppContext
+{
+    public MainView? Window {get; set; }
+    public CirclesPage? page {get; set; }
+    public AddCircleMemberDialog? dialog { get; set; }
+    public App? App { get; internal set; }
+}

src/PostIt/PostIt.Tests/UnitTest1.cs

@@ -1,5 +1,4 @@
 using Avalonia.Headless.XUnit;
-using Avalonia.Controls;
 using PostIt.Views;
 
 namespace PostIt.Tests;
@@ -9,8 +8,7 @@ public class MainPageTests
     [AvaloniaFact]
     public void MainPage_Should_Load()
     {
-        var window = new MainWindow();
+        var window = new MainView();
-        window.Show();
         Assert.NotNull(window);
     }
 }

src/PostIt/PostIt.Tests/YavscApiClientTests.cs

@@ -1,22 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Text.Json;
-using System.Threading;
-using Yavsc.Blogspot;
-using Yavsc.Api.Client;
 using PostIt.Services;
-using System.Threading.Tasks;
-using IdentityModel.OidcClient;
 using IdentityModel.OidcClient.Browser;
-using PostIt.Services;
 using PostIt.ViewModels;
-using Xunit;
 
 namespace PostIt.Tests;
 
@@ -70,7 +58,7 @@ public class YavscApiClientTests
             // calls CallAsync("posts", ...) directly (bypassing
             // BlogApiClient, which is the only thing that would set
             // it in production). Mirror prod here.
-            reloaded.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
+            reloaded.Http.BaseAddress = new Uri(settings.ApiUrl);
 
             var posts = await reloaded.CallAsync<List<StubApiServer.Post>>(
                 HttpMethod.Get, "posts", TestContext.Current.CancellationToken);
@@ -130,7 +118,7 @@ public class YavscApiClientTests
                 RedirectUri = "postit://callback",
                 Scopes = new[] { "openid" },
             },
-            BusinessApiUrl = "https://127.0.0.1:5003/api/v1",
+            ApiUrl = "https://127.0.0.1:5003/api/v1",
         };
         var client = new YavscApiClient(settings, new TokenStore(Path.Combine(
             Path.GetTempPath(), $"postit-tests-noop-{Guid.NewGuid():N}.json")));
@@ -174,7 +162,7 @@ public class YavscApiClientTests
             RedirectUri = authority.LoopbackRedirectUri,
             Scopes = new[] { "openid", "profile", "blog" }
         },
-        BusinessApiUrl = apiBaseUrl
+        ApiUrl = apiBaseUrl
     };
 
     private static async Task<YavscApiClient> LoginAndPersistAsync(
@@ -187,7 +175,7 @@ public class YavscApiClientTests
         // directly (bypassing BlogApiClient) rely on the same
         // BaseAddress the production chain sets in BlogApiClient's
         // ctor. Mirror that here so "posts" resolves to the stub.
-        client.Http.BaseAddress = new Uri(settings.BusinessApiUrl);
+        client.Http.BaseAddress = new Uri(settings.ApiUrl);
 
         // Force the API client to use the test browser by routing the
         // LoginInteractiveAsync call through a small wrapper.

src/PostIt/PostIt/App.axaml

@@ -1,7 +1,9 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:PostIt"
-             x:Class="PostIt.App">
+             x:Class="PostIt.App"
+             RequestedThemeVariant="Default">
+             <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
     <Application.DataTemplates>
         <local:ViewLocator />
@@ -9,7 +11,5 @@
 
      <Application.Styles>
         <FluentTheme />
-            <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
-
     </Application.Styles>
 </Application>

src/PostIt/PostIt/App.axaml.cs

@@ -1,20 +1,23 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
+using Microsoft.Extensions.DependencyInjection;
 using PostIt.Services;
-using Yavsc.Api.Client;
 using PostIt.ViewModels;
 using PostIt.Views;
+using PostIt.Helpers;
 
 namespace PostIt;
 
 public partial class App : Application
 {
+    private int _bootStarted;
+
     /// <summary>
     /// DI container the platform entry points hand to ViewModels so
     /// they can resolve the canonical <see cref="Settings"/> singleton
@@ -26,10 +29,8 @@ public partial class App : Application
     /// <c>DataValidationErrors.SetErrors</c>.
     /// </summary>
     public IServiceProvider? ServiceProvider { get; private set; }
-    private MainWindow window;
+
-    public App()
+    public MainView? View { get; private set; }
-    {
-    }
 
     public override void Initialize()
     {
@@ -38,185 +39,76 @@ public partial class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
-        // Belt-and-braces 2nd-instance guard. The primary check now
-        // lives in PostIt.Desktop.Program.Main and exits before
-        // Avalonia boots — preventing a flash of the MainWindow on
-        // every postit://callback launch. This block is kept for any
-        // entry point that bypasses Program.Main (PostIt.Browser,
-        // PostIt.Android's process lifecycle, ad-hoc tests that build
-        // App directly) and as defence-in-depth in case the Desktop
-        // build is ever reconfigured to skip the early check.
         if (TryHandOffCustomSchemeUrl()) return;
 
-        var settings = new Settings();
+        this.ServiceProvider = new ServiceCollection().BuildServices();
-        settings.Load();
+        var settings = ServiceProvider.GetRequiredService<Settings>();
-
-        var tokenStore = new TokenStore(System.IO.Path.Combine(
-            System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData),
-            "PostIt", "tokens.json"));
-
-        var api = new YavscApiClient(settings, tokenStore);
-        var client = new BlogApiClient(api, settings.BlogsApiUrl);
-        var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
-        var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
-        var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
-        var contactService = new ContactService();
-        var userDirectory = new UserDirectory(userSearchClient);
-
-        var services = new ServiceCollection();
-
-        // Vues
-        services.AddTransient<MainPage>();
-        // SettingsPage is a singleton: there must be one and only one
-        // instance of the settings UI for the lifetime of the app.
-        // This guarantees that (a) the bindings always reflect the
-        // current in-memory Settings state, (b) the page already has
-        // its DataContext wired up at composition-root time (see
-        // below), and (c) the OpenSettingsRequested handler is a
-        // pure push with a no-op-if-already-on-top guard, never a
-        // re-resolution from DI. Transient would let the user
-        // accumulate stale SettingsPage instances on the navigation
-        // stack, each bound to a fresh SettingsViewModel and missing
-        // any in-flight edits.
-        services.AddSingleton<SettingsPage>();
-        services.AddTransient<HomePage>();
-        services.AddTransient<SignaturePage>();
-        services.AddTransient<CirclesPage>();
-
-        // ViewModels
-        services.AddSingleton(settings);
-        services.AddSingleton<YavscApiClient>(api);
-        services.AddSingleton<IYavscApiClient>(api);
-        services.AddSingleton(client);
-        services.AddSingleton(circleClient);
-        services.AddSingleton(blogAclClient);
-        services.AddSingleton(userSearchClient);
-        services.AddSingleton<IContactService>(contactService);
-        services.AddSingleton<IUserDirectory>(userDirectory);
-        services.AddTransient<MainPageViewModel>();
-        services.AddTransient<HomePageViewModel>();
-        services.AddTransient<SignaturePageViewModel>();
-        services.AddTransient<CirclesPageViewModel>();
-
-        // Persistent session banner: one instance for the lifetime of
-        // the app so the same VM survives page navigation.
-        var sessionStatus = new SessionStatusViewModel { Api = api };
-        sessionStatus.Refresh();
-        services.AddSingleton(sessionStatus);
-        services.AddTransient<SessionStatusBanner>();
-
-        ServiceProvider  = services.BuildServiceProvider();
-
-        // Bind the canonical Settings to the static accessor so any
-        // code path that can't easily take a constructor parameter
-        // (designer surfaces, Avalonia data templates) still gets
-        // the same instance the rest of the app is using. Idempotent:
-        // re-binding from a second App boot (tests) is a no-op.
-        Settings.BindToServiceProvider(ServiceProvider);
-
-        DataTemplates.Clear();
-        DataTemplates.Add(new ViewLocator(ServiceProvider));
-
-        // Wire the Settings singleton onto the SettingsPage singleton
-        // once, at composition time. The page is registered as a
-        // singleton (see above) precisely so this binding is stable
-        // for the lifetime of the app: every push to / pop from the
-        // navigation stack finds the same ContentPage with the same
-        // DataContext, and the TwoWay bindings inside the page keep
-        // mutating the same in-memory Settings instance that the rest
-        // of the app reads (OidcClientOptions construction, etc.).
-        ServiceProvider.GetRequiredService<SettingsPage>().DataContext = settings;
-
-        // Settings.DarkMode was previously a dead field: it round-
-        // tripped through the settings file and the SettingsPage
-        // CheckBox, but no consumer ever read it. Wire it here to
-        // Application.RequestedThemeVariant so the toggle takes
-        // effect immediately, and seed the initial theme from the
-        // value Load() just populated (so a dark-mode user lands on
-        // a dark window on first launch, not on a default-light
-        // window that flips after the user touches the toggle).
-        ApplyDarkMode(settings);
-        settings.PropertyChanged += (_, e) =>
-        {
-            if (e.PropertyName == nameof(Settings.DarkMode))
-            {
-                ApplyDarkMode(settings);
-            }
-        };
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            var homePage = ServiceProvider.GetRequiredService<HomePage>();
+            var window = ServiceProvider.GetRequiredService<MainWindow>();
-            homePage.DataContext = ServiceProvider.GetRequiredService<HomePageViewModel>();
-
-            window = new MainWindow();
-            window.SessionBanner.DataContext = sessionStatus;
-
-            // Build the navigation stack from scratch: HomePage is the
-            // root in both cases. App.BootAsync will push MainPage on
-            // top if the silent refresh succeeds.
-            window.DataContext = homePage.DataContext;
             desktop.MainWindow = window;
-            _ = window.NavRoot.PushAsync(homePage);
+            View = window.MainView;
+            this.ConfigureRootView(window.MainView);
 
-            // When the user logs out, route back to HomePage. We
+            ApplyDarkMode(settings);
-            // ReplaceAsync the current top so we don't grow the stack
+        }
-            // on every logout — otherwise repeated login/logout would
+        else if (ApplicationLifetime is IActivityApplicationLifetime singleViewFactoryApplicationLifetime)
-            // eventually balloon the back history.
+        {
+            singleViewFactoryApplicationLifetime.MainViewFactory =
+                () =>
+                {
+                    View = ServiceProvider.GetRequiredService<MainView>();
+                    this.ConfigureRootView(View);
+                    ApplyDarkMode(settings);
+                    return View;
+                };
+        }
+        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+        {
+            singleViewPlatform.MainView = View = ServiceProvider.GetRequiredService<MainView>();
+            ConfigureRootView(View);
+            ApplyDarkMode(settings);
+        }
+
+        base.OnFrameworkInitializationCompleted();
+    }
+
+private void ConfigureRootView(MainView rootView)
+{
+    // Déclencher le Boot une seule fois lors du chargement du contrôle à l'écran.
+    rootView.AttachedToVisualTree += async (_, _) => await BootOnceAsync();
+
+    var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
     sessionStatus.LogoutCompleted += () =>
     {
-                var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
+        // Remplacer Window.NavRoot par rootView.NavRoot
-                var nav = w.NavRoot;
+        rootView.NavRoot.PopToRootAsync();
-                var hp = ServiceProvider.GetRequiredService<HomePage>();
-                hp.DataContext = ServiceProvider.GetRequiredService<HomePageViewModel>();
-                _ = nav.PopToRootAsync();
     };
 
-            // When the user signs in interactively (Login button on
+    rootView.SessionBanner.DataContext = sessionStatus;
-            // the session banner), push MainPage on top of HomePage.
+}
-            sessionStatus.LoginSucceeded += () =>
-            {
-                var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
-                _ = PushMainPageAsync();
-            };
 
-            // When the user clicks the "Paramètres" button on the
+    private async Task BootOnceAsync()
-            // session banner, push the SettingsPage singleton on top
-            // of the current navigation stack. The DataContext is
-            // already wired at composition time (see the
-            // provider.GetRequiredService<SettingsPage>().DataContext
-            // assignment above), so this handler is a pure
-            // navigation concern.
-            //
-            // Anti-empilement guard: if the SettingsPage is already
-            // at the top of the stack, do nothing. NavigationPage's
-            // PushAsync does not deduplicate; calling it twice with
-            // the same instance would push it a second time and the
-            // user would have to tap Back twice to leave. Reference
-            // comparison is correct here because SettingsPage is a
-            // singleton — there is exactly one instance to compare
-            // against.
-            sessionStatus.OpenSettingsRequested += () =>
     {
-                var w = (MainWindow)((IClassicDesktopStyleApplicationLifetime)ApplicationLifetime!).MainWindow!;
+        if (Interlocked.Exchange(ref _bootStarted, 1) == 1)
-                var settingsPage = ServiceProvider.GetRequiredService<SettingsPage>();
-                var stack = w.NavRoot.NavigationStack;
-                if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], settingsPage))
         {
             return;
         }
-                _ = w.NavRoot.PushAsync(settingsPage);
-            };
 
-            window.Opened += async (_, _) => await BootAsync(ServiceProvider, api);
+        var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
+        await BootAsync(this.ServiceProvider!, api);
     }
-        else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
+
+    /// <summary>
+    /// Test-only hook: bind a concrete <see cref="MainView"/> so
+    /// command-driven navigation paths (<see cref="PushPage"/>) can
+    /// push onto a real <see cref="NavigationPage"/> in headless
+    /// fixtures that do not run the full desktop lifetime bootstrap.
+    /// </summary>
+    internal void AttachMainWindow(MainView mainView)
     {
-            singleView.MainView = new MainWindow
+        View = mainView ?? throw new ArgumentNullException(nameof(mainView));
-            {
-                DataContext = ServiceProvider.GetRequiredService<HomePageViewModel>()
-            };
-        }
     }
 
     private static void ApplyDarkMode(Settings settings)
@@ -240,25 +132,25 @@ public partial class App : Application
         var refreshed = await api.TrySilentLoginAsync().ConfigureAwait(true);
         var sessionStatus = provider.GetRequiredService<SessionStatusViewModel>();
         sessionStatus.Refresh();
-        if (!refreshed) return;
+        var homePage = provider.GetRequiredService<HomePageViewModel>();
-
+        var app = (App)Current!;
-        await PushMainPageAsync().ConfigureAwait(true);
+        await app.PushPageAsync(homePage);
     }
 
     /// <summary>
-    /// Resolve a fresh <c>MainPage</c> + VM from DI and push it on top
+    /// Resolve a fresh <c>MainPageViewModel</c> from DI and push its
+    /// mapped page (via <see cref="ViewLocator"/>) on top
     /// of the current navigation stack. Used both by <see cref="BootAsync"/>
     /// (silent refresh at boot) and by <c>SessionStatusViewModel.LoginSucceeded</c>
     /// (interactive login from the banner). Pulled out as a helper so
     /// the two callers can't drift apart.
     /// </summary>
-    public static async Task PushMainPageAsync()
+    public static async Task PushBlogsPageAsync()
     {
-        var app = (App)Current;
+        var app = (App)Current!;
-        var mainVm = app.ServiceProvider.GetRequiredService<MainPageViewModel>();
+        var mainVm = app.ServiceProvider!.GetRequiredService<MainViewModel>();
-        var mainPage = app.ServiceProvider.GetRequiredService<MainPage>();
+        await mainVm.InitializeAsync();
-        mainPage.DataContext = mainVm;
+        await app.PushPageAsync(mainVm);
-        await app.window.FindControl<NavigationPage>("NavRoot").PushAsync(mainPage).ConfigureAwait(true);
     }
 
     private bool TryHandOffCustomSchemeUrl()
@@ -293,4 +185,8 @@ public partial class App : Application
         return true;
     }
 
+    internal async Task GoBackAsync()
+    {
+        await View!.NavRoot.PopAsync();
+    }
 }

src/PostIt/PostIt/Controls/SignaturePadControl.cs

@@ -68,21 +68,38 @@ public class SignaturePadControl : TemplatedControl
     public event EventHandler? RedrawRequested;
 
     private readonly List<int> _strokes = new(capacity: 256);
+    private InputElement? _wiredCaptureArea;
     private int _pendingPoints; // number of (x, y) pairs awaiting a length prefix
     private bool _capturing;
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
+        RewireCaptureArea();
+    }
 
-        if (CaptureArea is { } previous)
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+
+        if (change.Property == CaptureAreaProperty)
+        {
+            RewireCaptureArea();
+        }
+    }
+
+    private void RewireCaptureArea()
+    {
+        if (_wiredCaptureArea is { } previous)
         {
             previous.PointerPressed -= OnCapturePressed;
             previous.PointerMoved -= OnCaptureMoved;
             previous.PointerReleased -= OnCaptureReleased;
         }
 
-        if (CaptureArea is { } area)
+        _wiredCaptureArea = CaptureArea;
+
+        if (_wiredCaptureArea is { } area)
         {
             area.PointerPressed += OnCapturePressed;
             area.PointerMoved += OnCaptureMoved;
@@ -97,12 +114,14 @@ public class SignaturePadControl : TemplatedControl
         _capturing = true;
         _pendingPoints = 0;
         AppendPoint(e.GetPosition(CaptureArea));
+        RedrawRequested?.Invoke(this, EventArgs.Empty);
     }
 
     private void OnCaptureMoved(object? sender, PointerEventArgs e)
     {
         if (!_capturing) return;
         AppendPoint(e.GetPosition(CaptureArea));
+        RedrawRequested?.Invoke(this, EventArgs.Empty);
     }
 
     private void OnCaptureReleased(object? sender, PointerReleasedEventArgs e)
@@ -169,6 +188,16 @@ public class SignaturePadControl : TemplatedControl
     /// </summary>
     public SignaturePadData Snapshot() => new(_strokes.ToArray());
 
+    /// <summary>
+    /// Copy of the current in-progress stroke, without the length
+    /// prefix used for sealed strokes. The view can render this as a
+    /// live preview while the user is still drawing.
+    /// </summary>
+    internal IReadOnlyList<int> PendingStroke
+        => _capturing && _pendingPoints > 0
+            ? _strokes.GetRange(_strokes.Count - 2 * _pendingPoints, 2 * _pendingPoints)
+            : Array.Empty<int>();
+
     // --- Test-only surface (visible to PostIt.Tests) -------------------
 
     /// <summary>
@@ -183,6 +212,17 @@ public class SignaturePadControl : TemplatedControl
         _pendingPoints++;
     }
 
+    /// <summary>
+    /// Test hook: mark the control as actively capturing so tests
+    /// can exercise the live-preview path without synthetic pointer
+    /// events.
+    /// </summary>
+    internal void BeginCaptureForTest()
+    {
+        _capturing = true;
+        _pendingPoints = 0;
+    }
+
     /// <summary>
     /// Test hook: seal the currently-pending stroke with a length
     /// prefix. Mirrors what <see cref="OnCaptureReleased"/> does at

src/PostIt/PostIt/Helpers/FormHelpers.cs

@@ -0,0 +1,50 @@
+using System;
+using PostIt.ViewModels;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.Helpers;
+
+public static class FormHelpers
+{
+    public static BillingCommandPageViewModel?
+    CreateCommandPageViewModel(
+        this CommandFormSummary form,
+        ActivityInfo activity,
+        ActivityUserDisplayItem performer,
+        BillingApiClient billingClient)
+    {
+
+        string namespacePrefix = typeof(PostIt.ViewModels.Commands.RdvViewModel).Namespace + ".";
+
+        string formVMName =   form.ActionName + "ViewModel";
+
+        string formOnActivityVMName =  activity.Code + formVMName + "ViewModel";
+
+        var vmType = Type.GetType(namespacePrefix +formOnActivityVMName);
+        if (vmType == null)
+        {
+            vmType = Type.GetType(namespacePrefix + formVMName);
+        }
+        if (vmType == null)
+        {
+            Console.Error.WriteLine(
+                $"! Cannot find type '{formOnActivityVMName}' or '{formVMName}'");
+            return null;
+        }
+        if (!typeof(BillingCommandPageViewModel).IsAssignableFrom(vmType))
+        {
+            Console.Error.WriteLine($"! The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
+            return null;
+        }
+
+        var vm = Activator.CreateInstance(vmType, activity, performer, form, billingClient);
+
+        if (vm == null)
+        {
+            throw new InvalidOperationException($"Cannot create instance of '{formOnActivityVMName}' or '{formVMName}'");
+        }
+
+        return vm as BillingCommandPageViewModel ?? throw new InvalidOperationException($"The type '{formOnActivityVMName}' or '{formVMName}' is not a BillingCommandPageViewModel");
+    }
+}

src/PostIt/PostIt/Helpers/ImageHelper.cs

@@ -0,0 +1,34 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
+
+namespace PostIt.Helpers;
+
+public static class ImageHelper
+{
+    private static readonly HttpClient HttpClient = new();
+
+    public static Bitmap LoadFromResource(Uri resourceUri)
+    {
+        return new Bitmap(AssetLoader.Open(resourceUri));
+    }
+
+    public static async Task<Bitmap?> LoadFromWeb(Uri url)
+    {
+        try
+        {
+            var response = await HttpClient.GetAsync(url).ConfigureAwait(false);
+            response.EnsureSuccessStatusCode();
+            var data = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
+            return new Bitmap(new MemoryStream(data));
+        }
+        catch (HttpRequestException ex)
+        {
+            Console.WriteLine($"An error occurred while downloading image '{url}': {ex.Message}");
+            return null;
+        }
+    }
+}

src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs

@@ -0,0 +1,92 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.Services;
+using PostIt.ViewModels;
+using PostIt.Views;
+using PostIt.Views.Commands;
+using Yavsc.Api.Client;
+
+namespace PostIt.Helpers;
+
+public static class ServiceCollectionHelpers
+{
+    public static IServiceProvider BuildServices(this ServiceCollection services)
+    {
+        var settings = new Settings();
+        settings.Load();
+
+        var tokenStore = new TokenStore(System.IO.Path.Combine(
+            System.Environment.GetFolderPath(System.Environment.SpecialFolder.ApplicationData),
+            "PostIt", "tokens.json"));
+
+        var api = new YavscApiClient(settings, tokenStore);
+        var client = new BlogApiClient(api, settings.BlogsApiUrl);
+        var circleClient = new CircleApiClient(api, settings.BlogsApiUrl);
+        var blogAclClient = new BlogAclApiClient(api, settings.BlogsApiUrl);
+        var userSearchClient = new UserSearchClient(api, settings.BlogsApiUrl);
+        var activityClient = new ActivityApiClient(
+            api,
+            settings.ApiUrl,
+            settings.Authentication?.Authority);
+        var billingClient = new BillingApiClient(api, settings.ApiUrl);
+        var userDirectory = new UserDirectory(userSearchClient);
+
+        // Vues
+        services.AddSingleton<MainView>();
+        services.AddSingleton<MainPage>();
+        services.AddSingleton<MainWindow>();
+
+        // SettingsPage is a singleton: there must be one and only one
+        // instance of the settings UI for the lifetime of the app.
+        // This guarantees that (a) the bindings always reflect the
+        // current in-memory Settings state, (b) the page already has
+        // its DataContext wired up at composition-root time (see
+        // below), and (c) PushPageAsync's anti-empilement guard sees
+        // the same instance across pushes, so a second Settings tap
+        // is a no-op rather than re-pushing the page. Transient would
+        // let the user accumulate stale SettingsPage instances on
+        // the navigation stack, each bound to a fresh
+        // SettingsViewModel and missing any in-flight edits.
+        services.AddSingleton<SettingsPage>();
+        services.AddSingleton<HomePage>();
+        services.AddSingleton<SignaturePage>();
+        services.AddSingleton<CirclesPage>();
+        services.AddSingleton<ActivitiesPage>();
+        services.AddTransient<CommandFormsPage>();
+        services.AddTransient<RdvPage>();
+        services.AddTransient<BrushPage>();
+        services.AddTransient<BillingQueriesPage>();
+        // ViewModels
+        services.AddSingleton(settings);
+        services.AddSingleton<YavscApiClient>(api);
+        services.AddSingleton(client);
+        services.AddSingleton(circleClient);
+        services.AddSingleton(blogAclClient);
+        services.AddSingleton(userSearchClient);
+        services.AddSingleton(activityClient);
+        services.AddSingleton(billingClient);
+        services.AddSingleton<IUserDirectory>(userDirectory);
+        services.AddSingleton<HomePageViewModel>();
+        services.AddSingleton<SignaturePageViewModel>();
+        services.AddSingleton<CirclesPageViewModel>();
+        services.AddSingleton<ActivitiesPageViewModel>();
+        services.AddTransient<SelectableHairPrestationItem>();
+
+        // Dialogs (modal-light pages): the ViewLocator resolves
+        // them when a caller pushes a PostAclDialogViewModel or
+        // AddCircleMemberDialogViewModel via App.PushPageAsync.
+        // App.PushPageAsync overwrites the page's DataContext with
+        // the caller-built VM, so the parameterless ctor is enough
+        // here — the parametrised ctors stay for direct test wiring.
+        services.AddTransient<PostAclDialog>();
+        services.AddTransient<AddCircleMemberDialog>();
+        // Persistent session banner: one instance for the lifetime of
+        // the app so the same VM survives page navigation.
+        var sessionStatus = new SessionStatusViewModel { Api = api };
+        sessionStatus.Refresh();
+        services.AddSingleton(sessionStatus);
+        services.AddSingleton<SessionStatusBanner>();
+        services.AddSingleton<MainViewModel>();
+        return services.BuildServiceProvider();
+    }
+}

src/PostIt/PostIt/Helpers/ViewModelBaseHelpers.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using PostIt.ViewModels;
+
+namespace PostIt.Helpers;
+
+public static class ViewModelBaseHelpers
+{
+    public static async Task PushPageAsync(this App app, ViewModelBase vm)
+    {
+        var window = app.View;
+        if (window is null)
+        {
+            throw new InvalidOperationException("MainWindow is not initialized yet.");
+        }
+
+        var template = app.DataTemplates.FirstOrDefault(t => t.Match(vm));
+        if (template is null)
+        {
+            throw new InvalidOperationException($"No IDataTemplate found for {vm.GetType().Name}.");
+        }
+
+        var view = template.Build(vm);
+        if (view is null)
+        {
+            throw new InvalidOperationException(
+                $"Template for {vm.GetType().Name} returned <null>.");
+        }
+
+        var page = view as Page;
+        if (page is null)
+        {
+            // NavigationPage expects Page instances. Wrap any fallback control
+            // (e.g. ViewLocator error TextBlock) into a ContentPage so it can render.
+            page = new ContentPage { Content = view };
+        }
+
+        page.DataContext = vm;
+
+        // Avoid stacking the same singleton page twice (e.g. SettingsPage).
+        var stack = window.NavRoot.NavigationStack;
+        if (stack.Count > 0 && ReferenceEquals(stack[stack.Count - 1], page))
+        {
+            return;
+        }
+
+        await window.NavRoot.PushAsync(page);
+    }
+}

src/PostIt/PostIt/PostIt.csproj

@@ -3,30 +3,14 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <AssemblyVersion>1.1.0.0</AssemblyVersion>
     <FileVersion>1.1.0.0</FileVersion>
-    <InformationalVersion>1.1.0-beta.1+2.Branch.release-1.0.7-rc1.Sha.6e50967702ba9d310017c86a2d7ee636a9e94ada</InformationalVersion>
+    <InformationalVersion>1.1.0-beta.1+183.Branch.release-1.0.8-rc8.Sha.6cff3db32ecf72c0d2d430b7002fa7816a34e070</InformationalVersion>
     <Version>1.1.0-beta.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Avalonia" />
-    <PackageReference Include="Avalonia.Themes.Fluent" />
-    <PackageReference Include="Avalonia.Fonts.Inter" />
-    <PackageReference Include="Avalonia.AvaloniaEdit" />
-    <PackageReference Include="AvaloniaUI.DiagnosticsSupport">
-      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
-      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="IdentityModel.OidcClient" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
-    <ProjectReference Include="../../Yavsc.Api.Client/Yavsc.Api.Client.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="postit-settings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -38,6 +22,19 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <PackageReference Include="AvaloniaUI.DiagnosticsSupport">
+      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="IdentityModel.OidcClient" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../Yavsc.Abstract/Yavsc.Abstract.csproj" />
+    <ProjectReference Include="../../Yavsc.Api.Client/Yavsc.Api.Client.csproj" />
   </ItemGroup>
 </Project>

src/PostIt/PostIt/Services/ContactService.Desktop.cs

@@ -1,36 +0,0 @@
-#if !ANDROID && !IOS
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace PostIt.Services;
-
-/// <summary>
-/// Desktop stub for <see cref="IContactService"/>.
-///
-/// <para>The desktop has no equivalent of the mobile address
-/// book (no <c>Contacts.Default</c>, no CardDAV out of the
-/// box). Rather than synthesise a list from a different
-/// source, this provider returns an empty list and lets the
-/// UI render an honest "no local contacts on this platform"
-/// message.</para>
-///
-/// <para>If desktop users want to invite people who aren't
-/// Yavsc members, that flow goes through a separate path
-/// (manual email entry + invitation endpoint) — not through
-/// <see cref="IContactService"/>. Finding existing Yavsc
-/// members is <see cref="IUserDirectory"/>'s job, not this
-/// one's.</para>
-///
-/// <para>Future CardDAV / Google Contacts / Exchange
-/// providers can plug in here as additional
-/// <see cref="IContactService"/> implementations selected
-/// from DI by configuration.</para>
-/// </summary>
-public sealed class ContactService : IContactService
-{
-    public Task<IReadOnlyList<ContactDto>> GetDeviceContactsAsync(CancellationToken ct = default)
-        => Task.FromResult<IReadOnlyList<ContactDto>>(Array.Empty<ContactDto>());
-}
-#endif

src/PostIt/PostIt/Services/ContactService.Mobile.cs

@@ -1,82 +0,0 @@
-#if ANDROID || IOS
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Maui.ApplicationModel.Communication;
-using Microsoft.Maui.ApplicationModel;
-using Microsoft.Maui.Devices;
-
-namespace PostIt.Services;
-
-/// <summary>
-/// Mobile implementation backed by MAUI Essentials
-/// <c>Contacts.Default</c>.
-///
-/// <para>Compiled only for ANDROID and IOS. On desktop targets,
-/// see <c>ContactService.Desktop.cs</c> (the stub that wins at
-/// compile time).</para>
-///
-/// <para>Note: at runtime, this class throws
-/// <c>NotImplementedInReferenceAssemblyException</c> unless
-/// the host application project also references the
-/// platform-specific Microsoft.Maui.Essentials implementation
-/// (typically <c>PostIt.Android</c>). On iOS the same is
-/// required via <c>PostIt.iOS</c>. On desktop the stub is used
-/// and this file is excluded.</para>
-/// </summary>
-public sealed class ContactService : IContactService
-{
-    public async Task<IReadOnlyList<ContactDto>> GetDeviceContactsAsync(CancellationToken ct = default)
-    {
-        if (DeviceInfo.Current.Platform == DevicePlatform.Unknown)
-            return Array.Empty<ContactDto>();
-
-        try
-        {
-            var status = await Permissions.RequestAsync<Permissions.ContactsRead>();
-            if (status != PermissionStatus.Granted)
-                return Array.Empty<ContactDto>();
-
-            var contacts = await Contacts.Default.GetAllAsync();
-            if (contacts is null) return Array.Empty<ContactDto>();
-
-            // Carry the per-contact email list as-is. A real
-            // device contact can carry several addresses (home /
-            // work / other); the UI use case ("invite / add to a
-            // circle") can then decide which address to use, or
-            // let the user pick. The platform-neutral ContactDto
-            // shape is intentionally richer than the Yavsc
-            // directory's single-Email shape — the two flows
-            // answer different questions.
-            var result = new List<ContactDto>(contacts.Count);
-            foreach (var c in contacts)
-            {
-                var emails = ExtractEmails(c.Emails);
-                result.Add(new ContactDto(
-                    c.Id,
-                    c.DisplayName ?? string.Empty,
-                    emails));
-            }
-            return result;
-        }
-        catch (Exception ex)
-        {
-            System.Diagnostics.Debug.WriteLine($"ContactService: {ex.Message}");
-            return Array.Empty<ContactDto>();
-        }
-    }
-
-    private static IReadOnlyList<string> ExtractEmails(IEnumerable<EmailAddress>? emails)
-    {
-        if (emails is null) return Array.Empty<string>();
-        var list = new List<string>();
-        foreach (var e in emails)
-        {
-            if (!string.IsNullOrEmpty(e.EmailAddress))
-                list.Add(e.EmailAddress);
-        }
-        return list;
-    }
-}
-#endif

src/PostIt/PostIt/Services/CurrentLocationResult.cs

@@ -0,0 +1,28 @@
+namespace PostIt.Services;
+
+public sealed class CurrentLocationResult
+{
+    private CurrentLocationResult(bool isSuccess, bool isPermissionDenied, double? latitude, double? longitude, string message)
+    {
+        IsSuccess = isSuccess;
+        IsPermissionDenied = isPermissionDenied;
+        Latitude = latitude;
+        Longitude = longitude;
+        Message = message;
+    }
+
+    public bool IsSuccess { get; }
+    public bool IsPermissionDenied { get; }
+    public double? Latitude { get; }
+    public double? Longitude { get; }
+    public string Message { get; }
+
+    public static CurrentLocationResult Success(double latitude, double longitude, string? message = null)
+        => new(true, false, latitude, longitude, message ?? "Position récupérée.");
+
+    public static CurrentLocationResult PermissionDenied(string? message = null)
+        => new(false, true, null, null, message ?? "La géolocalisation n'est pas autorisée.");
+
+    public static CurrentLocationResult Unavailable(string? message = null)
+        => new(false, false, null, null, message ?? "La géolocalisation n'est pas disponible sur cette plateforme.");
+}

src/PostIt/PostIt/Services/Platform.cs

@@ -1,4 +1,7 @@
+using System;
 using IdentityModel.OidcClient.Browser;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace PostIt.Services;
 
@@ -21,14 +24,14 @@ public static class Platform
     /// override this property at startup (e.g. PostIt.Android sets
     /// it to <c>android://postit-signin</c>).
     /// </summary>
-    public static string DefaultRedirectUri { get; set; } = "postit://callback";
+    public const string RedirectUri = "postit://callback";
 
     /// <summary>
     /// Scheme prefix the <see cref="CustomSchemeBrowser"/> matches
     /// against <c>BrowserOptions.EndUrl</c>. Overridable for apps
     /// that want to register their own scheme.
     /// </summary>
-    public static string CustomScheme { get; set; } = "postit";
+    public const string CustomScheme = "postit";
 
     /// <summary>
     /// Constructs a fresh <see cref="IBrowser"/> for the running platform.
@@ -37,4 +40,12 @@ public static class Platform
     /// </summary>
     public static System.Func<IBrowser?>? CreateBrowser { get; set; } =
         () => new CustomSchemeBrowser(CustomScheme);
+
+    /// <summary>
+    /// Optional platform hook used by the shared billing form to request a
+    /// current device position. Platforms that do not expose a native
+    /// location provider can leave the default delegate in place.
+    /// </summary>
+    public static Func<CancellationToken, Task<CurrentLocationResult>> TryGetCurrentLocationAsync { get; set; } =
+        _ => Task.FromResult(CurrentLocationResult.Unavailable());
 }

src/PostIt/PostIt/Services/UiDispatcher.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Threading;
-
-namespace PostIt.Services;
-
-/// <summary>
-/// Tiny marshalling helper around <see cref="Dispatcher.UIThread"/> so
-/// the rest of the codebase does not have to import Avalonia.Threading
-/// directly. We want exactly one place that decides "is the current
-/// thread the Avalonia UI thread, and if not, post there" so that
-/// <see cref="ObservableObject"/>-derived types (Settings, the various
-/// ViewModels) can fire <c>PropertyChanged</c> safely from background
-/// work — which is exactly the cross-thread case that previously blew
-/// up inside <c>DataValidationErrors.SetErrors</c> on Avalonia 11.
-///
-/// The helper is intentionally tiny: a sync post when we are off the
-/// UI thread, a no-op when we are already on it, and an async fire-
-/// and-forget variant for places where awaiting would deadlock the
-/// caller (e.g. <c>Settings.Load</c> continuation paths).
-/// </summary>
-public static class UiDispatcher
-{
-    /// <summary>
-    /// True when the calling thread is the Avalonia UI thread. Property
-    /// setters that touch bindings should check this before mutating
-    /// state; the safe path is <see cref="InvokeIfNeeded"/>.
-    /// </summary>
-    public static bool IsOnUiThread => Dispatcher.UIThread.CheckAccess();
-
-    /// <summary>
-    /// Run <paramref name="action"/> on the UI thread. If the caller is
-    /// already on the UI thread, run synchronously to preserve stack
-    /// traces and ordering; otherwise post to the dispatcher and wait.
-    /// Never throws on shutdown — a missing dispatcher is treated as
-    /// "best-effort skipped", matching Avalonia's own behaviour when
-    /// the application lifetime has been torn down.
-    /// </summary>
-    public static void InvokeIfNeeded(Action action)
-    {
-        if (action is null) return;
-        if (IsOnUiThread) { action(); return; }
-        try { Dispatcher.UIThread.Post(action, DispatcherPriority.Normal); }
-        catch (InvalidOperationException) { /* dispatcher gone, nothing to do */ }
-    }
-
-    /// <summary>
-    /// Fire-and-forget variant: schedules <paramref name="action"/> on
-    /// the UI thread but does not block the caller. Use this from
-    /// background workers (OIDC discovery, HTTP callbacks, file I/O)
-    /// where awaiting the dispatcher would deadlock the calling sync
-    /// context.
-    /// </summary>
-    public static void Post(Action action)
-    {
-        if (action is null) return;
-        try { Dispatcher.UIThread.Post(action, DispatcherPriority.Normal); }
-        catch (InvalidOperationException) { /* dispatcher gone */ }
-    }
-
-    /// <summary>
-    /// Awaitable variant. Useful inside <c>async</c> ViewModel methods
-    /// that must touch bindings only after the dispatcher has processed
-    /// a queued update (e.g. "load file then refresh observable state").
-    /// </summary>
-    public static Task InvokeAsync(Action action)
-    {
-        if (action is null) return Task.CompletedTask;
-        if (IsOnUiThread) { action(); return Task.CompletedTask; }
-        return Dispatcher.UIThread.InvokeAsync(action, DispatcherPriority.Normal).GetTask();
-    }
-}

src/PostIt/PostIt/Services/YavscApiClient.cs

@@ -1,9 +1,9 @@
 using System;
+using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
-using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -352,6 +352,77 @@ public class YavscApiClient : IYavscApiClient, IAsyncDisposable
         _store.Save(_tokens);
     }
 
+    /// <summary>
+    /// Upload a user avatar to the Yavsc API. The server expects a
+    /// single multipart file named <c>file</c> and validates the image
+    /// content type before persisting it.
+    /// </summary>
+    public async Task<string> SetAvatarAsync(
+        Stream imageStream,
+        string fileName,
+        string? contentType = null,
+        CancellationToken ct = default)
+    {
+        if (imageStream is null)
+            throw new ArgumentNullException(nameof(imageStream));
+        if (string.IsNullOrWhiteSpace(fileName))
+            throw new ArgumentException("A file name is required.", nameof(fileName));
+
+        var endpoint = new Uri(new Uri(Settings.ApiUrl.TrimEnd('/') + "/", UriKind.Absolute), "account/set-avatar");
+
+        await EnsureFreshTokenAsync(ct).ConfigureAwait(false);
+
+        var attemptUpload = async () =>
+        {
+            if (imageStream.CanSeek)
+                imageStream.Position = 0;
+
+            using var content = new MultipartFormDataContent();
+            using var fileContent = new StreamContent(imageStream);
+            fileContent.Headers.ContentType = new MediaTypeHeaderValue(
+                string.IsNullOrWhiteSpace(contentType) ? "application/octet-stream" : contentType);
+            content.Add(fileContent, "file", fileName);
+
+            using var request = new HttpRequestMessage(HttpMethod.Post, endpoint)
+            {
+                Content = content,
+            };
+
+            return await Http.SendAsync(request, ct).ConfigureAwait(false);
+        };
+
+        var response = await attemptUpload().ConfigureAwait(false);
+        if (response.StatusCode == HttpStatusCode.Unauthorized)
+        {
+            response.Dispose();
+            await ForceRefreshAsync(ct).ConfigureAwait(false);
+            response = await attemptUpload().ConfigureAwait(false);
+        }
+
+        await EnsureSuccessOrThrowAsync(response, ct).ConfigureAwait(false);
+
+        var payload = await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false);
+        if (string.IsNullOrWhiteSpace(payload))
+            return "Avatar mis à jour.";
+
+        try
+        {
+            using var json = JsonDocument.Parse(payload);
+            if (json.RootElement.TryGetProperty("message", out var msgEl))
+            {
+                var message = msgEl.GetString();
+                if (!string.IsNullOrWhiteSpace(message))
+                    return message;
+            }
+        }
+        catch (JsonException)
+        {
+            // Keep a user-friendly fallback when the API payload is not JSON.
+        }
+
+        return "Avatar mis à jour.";
+    }
+
     public async Task LogoutAsync()
     {
         _store.Clear();

src/PostIt/PostIt/ViewLocator.cs

@@ -1,33 +1,54 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Microsoft.Extensions.DependencyInjection;
 using PostIt.ViewModels;
+using PostIt.ViewModels.Commands;
 using PostIt.Views;
+using PostIt.Views.Commands;
 
 namespace PostIt;
 
 /// <summary>
 /// Given a view model, returns the corresponding view if possible.
 /// </summary>
-
+[RequiresUnreferencedCode(
+    "Default implementation of ViewLocator involves reflection which may be trimmed away.",
+    Url = "https://docs.avaloniaui.net/docs/concepts/view-locator")]
 public class ViewLocator : IDataTemplate
 {
-     private readonly IServiceProvider _services;
-
-    public ViewLocator(IServiceProvider services)
-    {
-        _services = services;
-    }
 
      public Control Build(object? data)
     {
+        try
+        {
+            return BuildCore(data);
+        }
+        catch (Exception ex)
+        {
+            return new TextBlock { Text = $"ViewLocator threw: {ex}" };
+        }
+    }
+
+
+    private Control BuildCore(object? data)
+    {
+        var app = App.Current as App;
+        var services = app!.ServiceProvider!;
         return data switch
         {
-            MainPageViewModel => _services.GetRequiredService<MainPage>(),
+            MainViewModel => services.GetRequiredService<MainPage>(),
-            Settings => _services.GetRequiredService<SettingsPage>(),
+            Settings => services.GetRequiredService<SettingsPage>(),
-            HomePageViewModel => _services.GetRequiredService<HomePage>(),
+            HomePageViewModel => services.GetRequiredService<HomePage>(),
-            SignaturePageViewModel => _services.GetRequiredService<SignaturePage>(),
+            ActivitiesPageViewModel => services.GetRequiredService<ActivitiesPage>(),
+            CommandFormsPageViewModel => services.GetRequiredService<CommandFormsPage>(),
+            BrushViewModel => services.GetRequiredService<BrushPage>(),
+            RdvViewModel => services.GetRequiredService<RdvPage>(),
+            SignaturePageViewModel => services.GetRequiredService<SignaturePage>(),
+            AddCircleMemberDialogViewModel => services.GetRequiredService<AddCircleMemberDialog>(),
+            CirclesPageViewModel => services.GetRequiredService<CirclesPage>(),
+            PostAclDialogViewModel => services.GetRequiredService<PostAclDialog>(),
             null => new TextBlock { Text = "No view for <null>" },
             _ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
         };

src/PostIt/PostIt/ViewModels/ActivitiesPageViewModel.cs

@@ -0,0 +1,275 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public partial class ActivitiesPageViewModel : ViewModelBase
+{
+    private readonly ActivityApiClient _client;
+    private readonly BillingApiClient _billingClient;
+    private bool _syncingSelection;
+
+    [ObservableProperty]
+    public partial ObservableCollection<ActivityInfo> Activities { get; set; } = new();
+
+    [ObservableProperty]
+    public partial ActivityInfo? SelectedActivity { get; set; }
+
+    [ObservableProperty]
+    public partial ObservableCollection<ActivityInfo> Specializations { get; set; } = new();
+
+    [ObservableProperty]
+    public partial ActivityInfo? SelectedSpecialization { get; set; }
+
+    [ObservableProperty]
+    public partial ObservableCollection<ActivityUserDisplayItem> Performers { get; set; } = new();
+
+    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenCommandFormsCommand))]
+    public partial ActivityUserDisplayItem? SelectedPerformer { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    [ObservableProperty]
+    public partial string StatusMessage { get; set; } = "Choisissez une activité.";
+
+    public ActivityInfo? CurrentActivity => SelectedSpecialization ?? SelectedActivity;
+    public string SelectedActivityLabel => SelectedActivity?.Name ?? "(aucune activité)";
+    public string CurrentActivityLabel => CurrentActivity?.Name ?? "(aucune)";
+    public int CurrentFormCount => CurrentActivity?.Forms?.Count ?? 0;
+
+    public override bool CanNavigateNext
+    {
+        get => false;
+        protected set { _ = value; }
+    }
+
+    public override bool CanNavigatePrevious
+    {
+        get => true;
+        protected set { _ = value; }
+    }
+
+    public ActivitiesPageViewModel(ActivityApiClient client, BillingApiClient billingClient)
+    {
+        _client = client ?? throw new ArgumentNullException(nameof(client));
+        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+    }
+
+    partial void OnSelectedActivityChanged(ActivityInfo? value)
+    {
+        if (_syncingSelection) return;
+        _ = ShowActivitySafeAsync(value);
+    }
+
+    partial void OnSelectedSpecializationChanged(ActivityInfo? value)
+    {
+        if (_syncingSelection) return;
+        _ = ShowSpecializationSafeAsync(value);
+    }
+
+    private async Task ShowActivitySafeAsync(ActivityInfo? value)
+    {
+        try
+        {
+            await ShowActivityAsync(value);
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur: {ex.Message}";
+        }
+    }
+
+    private async Task ShowSpecializationSafeAsync(ActivityInfo? value)
+    {
+        try
+        {
+            await ShowSpecializationAsync(value);
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur: {ex.Message}";
+        }
+    }
+
+    [RelayCommand]
+    public async Task RefreshAsync()
+    {
+        IsBusy = true;
+        try
+        {
+            var list = await _client.GetCatalogAsync();
+            Activities = new ObservableCollection<ActivityInfo>(list ?? new());
+
+            var first = Activities.FirstOrDefault();
+            await ShowActivityAsync(first);
+            if (first is null)
+            {
+                StatusMessage = "Aucune activité disponible.";
+            }
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            Activities = new ObservableCollection<ActivityInfo>();
+            Specializations = new ObservableCollection<ActivityInfo>();
+            Performers = new ObservableCollection<ActivityUserDisplayItem>();
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            Activities = new ObservableCollection<ActivityInfo>();
+            Specializations = new ObservableCollection<ActivityInfo>();
+            Performers = new ObservableCollection<ActivityUserDisplayItem>();
+            StatusMessage = $"Erreur: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    public async Task ShowActivityAsync(ActivityInfo? activity)
+    {
+        _syncingSelection = true;
+        try
+        {
+            SelectedActivity = activity;
+            SelectedSpecialization = null;
+        }
+        finally
+        {
+            _syncingSelection = false;
+        }
+
+        OnPropertyChanged(nameof(CurrentActivity));
+        OnPropertyChanged(nameof(SelectedActivityLabel));
+        OnPropertyChanged(nameof(CurrentActivityLabel));
+        OnPropertyChanged(nameof(CurrentFormCount));
+        Specializations = new ObservableCollection<ActivityInfo>(activity?.Children ?? new());
+
+        if (activity is null)
+        {
+            Performers = new ObservableCollection<ActivityUserDisplayItem>();
+            SelectedPerformer = null;
+            return;
+        }
+
+        await LoadPerformersAsync(activity);
+    }
+
+    public async Task ShowSpecializationAsync(ActivityInfo? specialization)
+    {
+        _syncingSelection = true;
+        try
+        {
+            SelectedSpecialization = specialization;
+        }
+        finally
+        {
+            _syncingSelection = false;
+        }
+
+        OnPropertyChanged(nameof(CurrentActivity));
+        OnPropertyChanged(nameof(CurrentActivityLabel));
+        OnPropertyChanged(nameof(CurrentFormCount));
+
+        if (specialization is null)
+        {
+            if (SelectedActivity is not null)
+            {
+                await LoadPerformersAsync(SelectedActivity);
+            }
+            return;
+        }
+
+        await LoadPerformersAsync(specialization);
+    }
+
+    private async Task LoadPerformersAsync(ActivityInfo activity)
+    {
+        IsBusy = true;
+        try
+        {
+            var list = await _client.GetUsersAsync(activity.Code);
+            var items = (list ?? new())
+                .Select(dto => ActivityUserDisplayItem.FromDto(dto, _client.BuildAvatarXsUrl(dto.UserName)))
+                .ToList();
+
+            await Task.WhenAll(items.Select(async item =>
+            {
+                if (string.IsNullOrWhiteSpace(item.AvatarXsUrl))
+                {
+                    return;
+                }
+
+                if (!Uri.TryCreate(item.AvatarXsUrl, UriKind.Absolute, out var avatarUri))
+                {
+                    return;
+                }
+
+                item.AvatarImage = await ImageHelper.LoadFromWeb(avatarUri);
+            }));
+
+            Performers = new ObservableCollection<ActivityUserDisplayItem>(items);
+            SelectedPerformer = null;
+            StatusMessage = $"{activity.Name} · {Performers.Count} utilisateur(s)";
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            Performers = new ObservableCollection<ActivityUserDisplayItem>();
+            SelectedPerformer = null;
+            StatusMessage = "Accès refusé pour les activités (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            Performers = new ObservableCollection<ActivityUserDisplayItem>();
+            SelectedPerformer = null;
+            StatusMessage = $"Erreur: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+            OpenCommandFormsCommand.NotifyCanExecuteChanged();
+        }
+    }
+
+    private bool CanOpenCommandForms()
+        => SelectedPerformer is not null && CurrentActivity?.Forms?.Count > 0;
+
+    [RelayCommand(CanExecute = nameof(CanOpenCommandForms))]
+    private async Task OpenCommandFormsAsync()
+    {
+        if (SelectedPerformer is null || CurrentActivity is null)
+        {
+            StatusMessage = "Sélectionnez un utilisateur et une activité avec formulaire.";
+            return;
+        }
+
+        var app = (App?)Application.Current;
+        if (app is null)
+        {
+            throw new InvalidOperationException("Application PostIt indisponible.");
+        }
+
+        var vm = new CommandFormsPageViewModel(CurrentActivity, SelectedPerformer, _billingClient);
+        await app.PushPageAsync(vm);
+    }
+}

src/PostIt/PostIt/ViewModels/ActivityUserDisplayItem.cs

@@ -0,0 +1,50 @@
+using Avalonia.Media.Imaging;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Abstract.Workflow;
+
+namespace PostIt.ViewModels;
+
+public sealed partial class ActivityUserDisplayItem : ObservableObject
+{
+    public string PerformerId { get; init; } = string.Empty;
+    public string AvatarXsUrl { get; init; } = string.Empty;
+    public bool HasPerformerProfile { get; init; }
+    public string PerformerBadgeLabel { get; init; } = "Profil pro";
+    public bool IsPerformerActive { get; init; }
+    public string PerformerStatusBadgeLabel { get; init; } = "Inactif";
+    public string PerformerStatusBadgeBackground { get; init; } = "#FDECEA";
+    public string PerformerStatusBadgeBorder { get; init; } = "#C62828";
+    public string PerformerStatusBadgeForeground { get; init; } = "#8E0000";
+    public string UserName { get; init; } = string.Empty;
+    public string AvatarFallbackLabel { get; init; } = "?";
+    public string WebSite { get; init; } = string.Empty;
+    public int ExtraActivityCount { get; init; }
+    public string ExtraActivityLabel { get; init; } = "Pas d'autre activité";
+
+    [ObservableProperty]
+    public partial Bitmap? AvatarImage { get; set; }
+
+    public static ActivityUserDisplayItem FromDto(PerformerActivity dto, string avatarXsUrl)
+    {
+        return new ActivityUserDisplayItem
+        {
+            PerformerId = dto.PerformerId,
+            AvatarXsUrl = avatarXsUrl,
+            HasPerformerProfile = dto.HasPerformerProfile,
+            UserName = dto.UserName,
+            AvatarFallbackLabel = string.IsNullOrWhiteSpace(dto.UserName)
+                ? "?"
+                : dto.UserName.Trim()[0].ToString().ToUpperInvariant(),
+            WebSite = dto.WebSite,
+            IsPerformerActive = dto.Active,
+            PerformerStatusBadgeLabel = dto.Active ? "Actif" : "Inactif",
+            PerformerStatusBadgeBackground = dto.Active ? "#E6F7EC" : "#FDECEA",
+            PerformerStatusBadgeBorder = dto.Active ? "#2E7D32" : "#C62828",
+            PerformerStatusBadgeForeground = dto.Active ? "#1B5E20" : "#8E0000",
+            ExtraActivityCount = dto.ExtraActivityCount,
+            ExtraActivityLabel = dto.ExtraActivityCount == 0
+                ? "Pas d'autre activité"
+                : $"Autres spécialisations: {dto.ExtraActivityCount}"
+        };
+    }
+}

src/PostIt/PostIt/ViewModels/AddCircleMemberDialogViewModel.cs

@@ -106,7 +106,7 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
     /// UI from firing an event with a null payload.
     /// </summary>
     [RelayCommand]
-    public void Add()
+    public async Task AddAsync()
     {
         if (Selected is null)
         {
@@ -114,5 +114,14 @@ public partial class AddCircleMemberDialogViewModel : ViewModelBase
             return;
         }
         Confirmed?.Invoke(this, Selected);
+        var app = App.Current as App;
+        await app.GoBackAsync();
+    }
+
+    [RelayCommand]
+    public async Task CloseAsync()
+    {
+        var app = App.Current as App;
+        await app.GoBackAsync();
     }
 }

src/PostIt/PostIt/ViewModels/BillingQueriesPageViewModel.cs

@@ -0,0 +1,173 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc;
+using Yavsc.Api.Client;
+using Yavsc.Abstract.Workflow;
+
+namespace PostIt.ViewModels;
+
+public partial class BillingQueriesPageViewModel : ViewModelBase
+{
+    private readonly BillingApiClient _billingClient;
+
+    public ActivityInfo Activity { get; }
+    public ActivityUserDisplayItem Performer { get; }
+    public CommandFormSummary Form { get; }
+    public bool IsReadOnly { get; }
+    public bool OngoingOnly { get; }
+
+    [ObservableProperty]
+    public partial ObservableCollection<BillingQueryDisplayItem> Queries { get; set; } = new();
+
+    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedQueryCommand))]
+    public partial BillingQueryDisplayItem? SelectedQuery { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    [ObservableProperty]
+    public partial string StatusMessage { get; set; } = "Chargement des commandes...";
+
+    public string Title => IsReadOnly
+        ? $"Demandes en cours ({Form.Title})"
+        : $"Commandes {Form.Title}";
+    public string ContextLabel => $"{Performer.UserName} · {Activity.Name}";
+    public bool CanOpenDetails => !IsReadOnly;
+
+    public override bool CanNavigateNext
+    {
+        get => false;
+        protected set { _ = value; }
+    }
+
+    public override bool CanNavigatePrevious
+    {
+        get => true;
+        protected set { _ = value; }
+    }
+
+    public BillingQueriesPageViewModel(
+        ActivityInfo activity,
+        ActivityUserDisplayItem performer,
+        CommandFormSummary form,
+        BillingApiClient billingClient,
+        bool isReadOnly = false,
+        bool ongoingOnly = false)
+    {
+        Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+        Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+        Form = form ?? throw new ArgumentNullException(nameof(form));
+        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+        IsReadOnly = isReadOnly;
+        OngoingOnly = ongoingOnly;
+    }
+
+    public Task InitializeAsync() => RefreshAsync();
+
+    private bool CanOpenSelectedQuery() => !IsReadOnly && SelectedQuery is not null;
+
+    [RelayCommand]
+    public async Task RefreshAsync()
+    {
+        IsBusy = true;
+        try
+        {
+            var list = await _billingClient.GetQuerySummariesAsync(Form.ActionName).ConfigureAwait(true);
+            var filtered = (list ?? new())
+                .Where(q => q.ActivityCode == Activity.Code && q.PerformerId == Performer.PerformerId)
+                .Where(q => !OngoingOnly || IsOngoingStatus(q.Status))
+                .OrderByDescending(q => q.EventDate ?? DateTime.MinValue)
+                .ThenByDescending(q => q.Id)
+                .Select(BillingQueryDisplayItem.FromDto)
+                .ToList();
+
+            Queries = new ObservableCollection<BillingQueryDisplayItem>(filtered);
+            StatusMessage = BuildLoadedStatusMessage(filtered.Count);
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            Queries = new ObservableCollection<BillingQueryDisplayItem>();
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            Queries = new ObservableCollection<BillingQueryDisplayItem>();
+            StatusMessage = $"Erreur: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    [RelayCommand(CanExecute = nameof(CanOpenSelectedQuery))]
+    public async Task OpenSelectedQueryAsync()
+    {
+        if (IsReadOnly)
+        {
+            StatusMessage = "Mode lecture seule: l'ouverture en modification est désactivée.";
+            return;
+        }
+
+        if (SelectedQuery is null)
+        {
+            StatusMessage = "Sélectionnez une commande.";
+            return;
+        }
+
+        var app = (App?)Application.Current;
+        if (app is null)
+        {
+            throw new InvalidOperationException("Application PostIt indisponible.");
+        }
+
+        IsBusy = true;
+        try
+        {
+            var details = await _billingClient.GetQueryAsync(Form.ActionName, SelectedQuery.Id).ConfigureAwait(true);
+            var vm = Form.CreateCommandPageViewModel(Activity, Performer, _billingClient);
+            await vm!.InitializeAsync(details).ConfigureAwait(true);
+            await app.PushPageAsync(vm).ConfigureAwait(true);
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur lors de l'ouverture: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private string BuildLoadedStatusMessage(int count)
+    {
+        if (count == 0)
+        {
+            return OngoingOnly
+                ? "Aucune demande en cours pour ce formulaire."
+                : "Aucune commande trouvée pour ce formulaire.";
+        }
+
+        if (OngoingOnly)
+        {
+            return $"{count} demande(s) en cours chargée(s) (lecture seule).";
+        }
+
+        return $"{count} commande(s) chargée(s).";
+    }
+
+    private static bool IsOngoingStatus(QueryStatus status)
+        => status is QueryStatus.Inserted or QueryStatus.Accepted or QueryStatus.InProgress;
+}

src/PostIt/PostIt/ViewModels/BillingQueryDisplayItem.cs

@@ -0,0 +1,35 @@
+using System;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public sealed class BillingQueryDisplayItem
+{
+    public long Id { get; init; }
+    public string Description { get; init; } = string.Empty;
+    public string Summary { get; init; } = string.Empty;
+    public string StatusLabel { get; init; } = string.Empty;
+    public string EventDateLabel { get; init; } = string.Empty;
+    public string BillingCode { get; init; } = string.Empty;
+
+    public static BillingQueryDisplayItem FromDto(BillingQuerySummaryDto dto)
+    {
+        var summary = !string.IsNullOrWhiteSpace(dto.Reason)
+            ? dto.Reason
+            : !string.IsNullOrWhiteSpace(dto.AdditionalInfo)
+                ? dto.AdditionalInfo
+                : dto.Description;
+
+        return new BillingQueryDisplayItem
+        {
+            Id = dto.Id,
+            Description = string.IsNullOrWhiteSpace(dto.Description)
+                ? $"Commande #{dto.Id}"
+                : dto.Description,
+            Summary = summary,
+            StatusLabel = dto.Status.ToString(),
+            EventDateLabel = dto.EventDate?.ToLocalTime().ToString("g") ?? "Date non précisée",
+            BillingCode = dto.BillingCode,
+        };
+    }
+}

src/PostIt/PostIt/ViewModels/CirclesPageViewModel.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Threading.Tasks;
+using Avalonia;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
+using PostIt.Helpers;
 using PostIt.Services;
 using Yavsc.Api.Client;
 using Yavsc.Api.Client.Dtos;
@@ -63,12 +65,6 @@ public partial class CirclesPageViewModel : ViewModelBase
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = string.Empty;
 
-    /// <summary>
-    /// Raised when the user wants to add a member to the
-    /// currently selected circle. The view listens to this
-    /// event and opens <c>AddCircleMemberDialog</c>.
-    /// </summary>
-    public event EventHandler? AddMemberRequested;
 
     public CirclesPageViewModel(CircleApiClient client)
     {
@@ -116,6 +112,27 @@ public partial class CirclesPageViewModel : ViewModelBase
         }
     }
 
+    [RelayCommand]
+    internal async Task OpenAddMemberAsync()
+    {
+        var app = Application.Current as App;
+        var services = app?.ServiceProvider;
+        var directory = services.GetRequiredService<IUserDirectory>();
+        AddCircleMemberDialogViewModel model =
+        new AddCircleMemberDialogViewModel(directory);
+        // Wire the dialog's Confirmed event to OnAddMemberConfirmedAsync.
+        // Without this, the dialog's "Ajouter" button fires the event
+        // into the void: no subscriber, the picked user is silently
+        // dropped, and nothing is added to the circle. The dialog
+        // stays open until the user uses the back gesture — which is
+        // how the user noticed the button was a no-op.
+        // Async-void is intentional here: Confirmed is an
+        // EventHandler<T> (returns void), and bridging to the
+        // async Task OnAddMemberConfirmedAsync requires it.
+        model.Confirmed += async (_, picked) =>
+            await OnAddMemberConfirmedAsync(_, picked);
+        await app.PushPageAsync(model);
+    }
     /// <summary>
     /// Load the members of one of the caller's circles. The
     /// server scopes the endpoint with a 404 when the circle
@@ -231,22 +248,6 @@ public partial class CirclesPageViewModel : ViewModelBase
         }
     }
 
-    /// <summary>
-    /// Fire the <see cref="AddMemberRequested"/> event so
-    /// the view opens <c>AddCircleMemberDialog</c>. The view
-    /// forwards the dialog's <c>Confirmed</c> event back to
-    /// <see cref="OnAddMemberConfirmedAsync"/>.
-    /// </summary>
-    [RelayCommand]
-    public void OpenAddMember()
-    {
-        if (SelectedCircle is null)
-        {
-            StatusMessage = "Sélectionnez d'abord un cercle";
-            return;
-        }
-        AddMemberRequested?.Invoke(this, EventArgs.Empty);
-    }
 
     /// <summary>
     /// Called by the view when the dialog confirms a

src/PostIt/PostIt/ViewModels/CommandFormsPageViewModel.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Helpers;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels;
+
+public partial class CommandFormsPageViewModel : ViewModelBase
+{
+    private readonly BillingApiClient _billingClient;
+
+    public ActivityInfo Activity { get; }
+    public ActivityUserDisplayItem Performer { get; }
+
+    [ObservableProperty]
+    public partial ObservableCollection<CommandFormSummary> Forms { get; set; }
+
+    [ObservableProperty, NotifyCanExecuteChangedFor(nameof(OpenSelectedFormCommand)), NotifyCanExecuteChangedFor(nameof(OpenQueriesCommand)), NotifyCanExecuteChangedFor(nameof(OpenOngoingQueriesCommand))]
+    public partial CommandFormSummary? SelectedForm { get; set; }
+
+    [ObservableProperty]
+    public partial string StatusMessage { get; set; }
+
+    public string Title => $"Formulaires pour {Performer.UserName}";
+    public string ContextLabel => $"{Activity.Name} · {Forms.Count} formulaire(s)";
+
+    public override bool CanNavigateNext
+    {
+        get => false;
+        protected set { _ = value; }
+    }
+
+    public override bool CanNavigatePrevious
+    {
+        get => true;
+        protected set { _ = value; }
+    }
+
+    public CommandFormsPageViewModel(
+        ActivityInfo activity,
+        ActivityUserDisplayItem performer,
+        BillingApiClient billingClient)
+    {
+        Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+        Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+
+        Forms = new ObservableCollection<CommandFormSummary>((activity.Forms ?? new())
+            .OrderBy(f => f.Title)
+            .ThenBy(f => f.ActionName));
+        SelectedForm = Forms.FirstOrDefault();
+        StatusMessage = Forms.Count == 0
+            ? "Aucun formulaire n'est disponible pour cette activité."
+            : "Choisissez le formulaire à utiliser.";
+    }
+
+    private bool CanOpenSelectedForm() => SelectedForm is not null;
+
+    private bool CanOpenQueries() => SelectedForm is not null;
+
+    private bool CanOpenOngoingQueries() => SelectedForm is not null;
+
+    [RelayCommand(CanExecute = nameof(CanOpenSelectedForm))]
+    private async Task OpenSelectedFormAsync()
+    {
+        if (SelectedForm is null)
+        {
+            StatusMessage = "Sélectionnez un formulaire.";
+            return;
+        }
+
+        var app = (App?)Application.Current;
+        if (app is null)
+        {
+            throw new InvalidOperationException("Application PostIt indisponible.");
+        }
+
+        var vm =  SelectedForm.CreateCommandPageViewModel(
+            Activity, Performer, _billingClient);
+        await vm!.InitializeAsync();
+        await app.PushPageAsync(vm);
+    }
+
+    [RelayCommand(CanExecute = nameof(CanOpenQueries))]
+    private async Task OpenQueriesAsync()
+    {
+        if (SelectedForm is null)
+        {
+            StatusMessage = "Sélectionnez un formulaire.";
+            return;
+        }
+
+        var app = (App?)Application.Current;
+        if (app is null)
+        {
+            throw new InvalidOperationException("Application PostIt indisponible.");
+        }
+
+        var vm = new BillingQueriesPageViewModel(Activity, Performer, SelectedForm, _billingClient);
+        await vm.InitializeAsync();
+        await app.PushPageAsync(vm);
+    }
+
+    [RelayCommand(CanExecute = nameof(CanOpenOngoingQueries))]
+    private async Task OpenOngoingQueriesAsync()
+    {
+        if (SelectedForm is null)
+        {
+            StatusMessage = "Sélectionnez un formulaire.";
+            return;
+        }
+
+        var app = (App?)Application.Current;
+        if (app is null)
+        {
+            throw new InvalidOperationException("Application PostIt indisponible.");
+        }
+
+        var vm = new BillingQueriesPageViewModel(
+            Activity,
+            Performer,
+            SelectedForm,
+            _billingClient,
+            isReadOnly: true,
+            ongoingOnly: true);
+        await vm.InitializeAsync();
+        await app.PushPageAsync(vm);
+    }
+}

src/PostIt/PostIt/ViewModels/Commands/BillingCommandPageViewModel.cs

@@ -0,0 +1,108 @@
+using System;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Yavsc;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Billing;
+
+namespace PostIt.ViewModels;
+
+public abstract partial class BillingCommandPageViewModel : RemoteViewModelBase
+{
+    protected readonly BillingApiClient _billingClient;
+
+    public ActivityInfo Activity { get; }
+    public ActivityUserDisplayItem Performer { get; }
+    public CommandFormSummary Form { get; }
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    [ObservableProperty]
+    public partial string StatusMessage { get; set; }
+
+    [ObservableProperty]
+    public partial string Reason { get; set; } = string.Empty;
+
+
+
+    [ObservableProperty]
+    public partial bool Consent { get; set; } = true;
+
+
+    [ObservableProperty]
+    public partial string AdditionalInfo { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial long? ExistingQueryId { get; set; }
+
+    [ObservableProperty]
+    public partial QueryStatus CommandStatus { get; set; } = QueryStatus.Inserted;
+
+    public bool CanUseCurrentLocation => IsSupported && !IsBusy;
+
+    public string Title => Form.Title;
+    public string PerformerLabel => Performer.UserName;
+    public string ActivityLabel => Activity.Name;
+    public virtual bool IsSupported => true;
+    public string BillingRoute => $"/billing/{Form.ActionName}";
+    public bool IsEditingExisting => ExistingQueryId.HasValue;
+    public string SubmitLabel => IsEditingExisting ? "Mettre à jour la commande" : "Poster la commande";
+    public virtual string SupportMessage => $"Le formulaire {Form.ActionName} n'est pas encore pris en charge dans PostIt.";
+
+    public override bool CanNavigateNext
+    {
+        get => false;
+        protected set { _ = value; }
+    }
+
+    public override bool CanNavigatePrevious
+    {
+        get => true;
+        protected set { _ = value; }
+    }
+
+    public BillingCommandPageViewModel(
+        ActivityInfo activity,
+        ActivityUserDisplayItem performer,
+        CommandFormSummary form,
+        BillingApiClient billingClient)
+    {
+        Activity = activity ?? throw new ArgumentNullException(nameof(activity));
+        Performer = performer ?? throw new ArgumentNullException(nameof(performer));
+        Form = form ?? throw new ArgumentNullException(nameof(form));
+        _billingClient = billingClient ?? throw new ArgumentNullException(nameof(billingClient));
+
+        StatusMessage = SupportMessage;
+    }
+
+    partial void OnExistingQueryIdChanged(long? value)
+    {
+        OnPropertyChanged(nameof(IsEditingExisting));
+        OnPropertyChanged(nameof(SubmitLabel));
+    }
+
+    partial void OnIsBusyChanged(bool value)
+    {
+        OnPropertyChanged(nameof(CanUseCurrentLocation));
+    }
+
+    public async Task InitializeAsync(BillingQueryDetailsDto? existingQuery = null)
+    {
+        await LoadAsync();
+        if (existingQuery is not null)
+        {
+            ApplyExistingQuery(existingQuery);
+            return;
+        }
+    }
+
+    protected abstract void ApplyExistingQuery(BillingQueryDetailsDto existingQuery);
+
+
+
+    [RelayCommand]
+    protected abstract Task SubmitAsync();
+}

src/PostIt/PostIt/ViewModels/Commands/BrushViewModel.cs

@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Billing;
+using Yavsc.Models.Haircut;
+namespace PostIt.ViewModels.Commands;
+
+public partial class BrushViewModel : RdvViewModel
+{
+    public override string SupportMessage => "Choisissez une prestation coiffure puis postez la commande.";
+
+    [ObservableProperty]
+    public partial ObservableCollection<HairPrestationDto> AvailablePrestations { get; set; } = new();
+
+    [ObservableProperty]
+    public partial HairPrestationDto? SelectedPrestation { get; set; }
+
+    public BrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
+        : base(activity, performer, form, billingClient)
+    {
+    }
+
+    public override async Task LoadAsync()
+    {
+        var prestations = await _billingClient.GetHairPrestationsAsync(Form.ActionName);
+
+        AvailablePrestations = new ObservableCollection<HairPrestationDto>
+            (prestations ?? new List<HairPrestationDto>());
+
+        if (SelectedPrestation is null)
+        {
+            SelectedPrestation = AvailablePrestations.FirstOrDefault();
+        }
+
+    }
+
+    protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
+    {
+        base.ApplyExistingQuery(existingQuery);
+
+        if (existingQuery.PrestationId is not null)
+        {
+            SelectedPrestation = AvailablePrestations.FirstOrDefault(x => x.Id == existingQuery.PrestationId.Value);
+        }
+
+        IsBusy = true;
+        try
+        {
+            if (SelectedPrestation is null)
+            {
+                SelectedPrestation = AvailablePrestations.FirstOrDefault();
+            }
+
+            StatusMessage = AvailablePrestations.Count == 0
+                ? "Aucune prestation coiffure disponible."
+                : SupportMessage;
+        }
+        catch (HttpRequestException ex)
+        when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé au catalogue de prestations (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur lors du chargement des prestations: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    protected override async Task SubmitAsync()
+    {
+        if (!Consent)
+        {
+            StatusMessage = "Le consentement est requis pour poster la commande.";
+            return;
+        }
+
+        if (string.IsNullOrWhiteSpace(Address))
+        {
+            StatusMessage = "L'adresse du rendez-vous est requise.";
+            return;
+        }
+
+        if (SelectedPrestation is null)
+        {
+            StatusMessage = "Sélectionnez une prestation coiffure.";
+            return;
+        }
+
+        IsBusy = true;
+        try
+        {
+            var address = Address.Trim();
+            var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
+
+            var payload = new BillingQueryDetailsDto
+            {
+                Id = ExistingQueryId ?? 0,
+                BillingCode = Form.ActionName,
+                ActivityCode = Activity.Code,
+                PerformerId = Performer.PerformerId,
+                Consent = Consent,
+                EventDate = EventDate,
+                Status = CommandStatus,
+                Reason = Reason.Trim(),
+                AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
+                Location = new BillingLocationDto
+                {
+                    Address = address,
+                    Latitude = Latitude,
+                    Longitude = Longitude,
+                }
+            };
+
+            payload.PrestationId = SelectedPrestation.Id;
+
+            if (IsEditingExisting)
+            {
+                await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+            }
+            else
+            {
+                await _billingClient.CreateAsync(Form.ActionName, new
+                {
+                    ActivityCode = Activity.Code,
+                    PerformerId = Performer.PerformerId,
+                    Consent,
+                    EventDate = (DateTime?)EventDate,
+                    Location = locationPayload,
+                    PrestationId = SelectedPrestation.Id,
+                    AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? null : AdditionalInfo.Trim(),
+                    Status = payload.Status,
+                }).ConfigureAwait(true);
+            }
+
+            StatusMessage = IsEditingExisting
+                ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
+                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
+        }
+        catch (HttpRequestException ex)
+        when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+
+    }
+}

src/PostIt/PostIt/ViewModels/Commands/MBrushViewModel.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+using Yavsc.Models.Billing;
+
+namespace PostIt.ViewModels.Commands;
+
+public partial class MBrushViewModel : BrushViewModel
+{
+    public override string SupportMessage => "Choisissez une ou plusieurs prestations coiffure puis postez la commande.";
+
+    [ObservableProperty]
+    public partial ObservableCollection<SelectableHairPrestationItem> MultiPrestations { get; set; } = new();
+
+    public MBrushViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
+        : base(activity, performer, form, billingClient)
+    {
+    }
+
+    public override async Task LoadAsync()
+    {
+        await base.LoadAsync().ConfigureAwait(true);
+        MultiPrestations = new ObservableCollection<SelectableHairPrestationItem>(
+            AvailablePrestations.Select(SelectableHairPrestationItem.FromDto));
+    }
+
+    protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
+    {
+        base.ApplyExistingQuery(existingQuery);
+
+        var selectedIds = existingQuery.PrestationIds is null
+            ? new HashSet<long>()
+            : new HashSet<long>(existingQuery.PrestationIds);
+
+        foreach (var item in MultiPrestations)
+        {
+            item.IsSelected = selectedIds.Contains(item.Id);
+        }
+    }
+
+    protected override async Task SubmitAsync()
+    {
+        if (!Consent)
+        {
+            StatusMessage = "Le consentement est requis pour poster la commande.";
+            return;
+        }
+
+        if (string.IsNullOrWhiteSpace(Address))
+        {
+            StatusMessage = "L'adresse du rendez-vous est requise.";
+            return;
+        }
+
+        var selectedPrestations = MultiPrestations.Where(x => x.IsSelected).ToList();
+        if (selectedPrestations.Count == 0)
+        {
+            StatusMessage = "Sélectionnez au moins une prestation coiffure.";
+            return;
+        }
+
+        IsBusy = true;
+        try
+        {
+            var address = Address.Trim();
+            var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
+
+            var payload = new BillingQueryDetailsDto
+            {
+                Id = ExistingQueryId ?? 0,
+                BillingCode = Form.ActionName,
+                ActivityCode = Activity.Code,
+                PerformerId = Performer.PerformerId,
+                Consent = Consent,
+                EventDate = EventDate,
+                Status = CommandStatus,
+                Reason = Reason.Trim(),
+                Location = new BillingLocationDto
+                {
+                    Address = address,
+                    Latitude = Latitude,
+                    Longitude = Longitude,
+                },
+                PrestationIds = selectedPrestations.Select(x => x.Id).ToList(),
+            };
+
+            if (IsEditingExisting)
+            {
+                await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+            }
+            else
+            {
+                await _billingClient.CreateAsync(Form.ActionName, new
+                {
+                    ActivityCode = Activity.Code,
+                    PerformerId = Performer.PerformerId,
+                    Consent,
+                    EventDate = EventDate,
+                    Location = locationPayload,
+                    Prestations = selectedPrestations.Select(x => new { PrestationId = x.Id }).ToList(),
+                    Status = payload.Status,
+                }).ConfigureAwait(true);
+            }
+
+            StatusMessage = IsEditingExisting
+                ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
+                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
+        }
+        catch (HttpRequestException ex)
+            when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur lors de l'envoi de la commande: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+}

src/PostIt/PostIt/ViewModels/Commands/RdvViewModel.cs

@@ -0,0 +1,211 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using PostIt.Services;
+using Yavsc.Abstract.Workflow;
+using Yavsc.Api.Client;
+
+namespace PostIt.ViewModels.Commands;
+
+public partial class RdvViewModel : BillingCommandPageViewModel
+{
+    public override string SupportMessage => "Complétez les informations du rendez-vous puis postez la commande.";
+
+    [ObservableProperty]
+    public partial string Address { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial double? Latitude { get; set; }
+
+    [ObservableProperty]
+    public partial double? Longitude { get; set; }
+
+
+    [ObservableProperty]
+    public partial DateTime EventDate { get; set; }
+
+    public RdvViewModel(ActivityInfo activity, ActivityUserDisplayItem performer, CommandFormSummary form, BillingApiClient billingClient)
+        : base(activity, performer, form, billingClient)
+    {
+        EventDate = DateTime.Now.AddDays(1);
+    }
+
+    protected override void ApplyExistingQuery(BillingQueryDetailsDto existingQuery)
+    {
+        ExistingQueryId = existingQuery.Id;
+        CommandStatus = existingQuery.Status;
+        Consent = existingQuery.Consent;
+        Reason = existingQuery.Reason ?? string.Empty;
+        AdditionalInfo = existingQuery.AdditionalInfo ?? string.Empty;
+
+        if (existingQuery.EventDate is not null)
+        {
+            EventDate = existingQuery.EventDate.Value
+                .ToLocalTime();
+        }
+
+        if (existingQuery.Location is not null)
+        {
+            Address = existingQuery.Location.Address ?? string.Empty;
+            Latitude = existingQuery.Location.Latitude;
+            Longitude = existingQuery.Location.Longitude;
+        }
+
+        StatusMessage = $"Commande #{existingQuery.Id} chargée.";
+    }
+
+    [RelayCommand(CanExecute = nameof(CanUseCurrentLocation))]
+    private async Task UseCurrentLocationAsync()
+    {
+        if (!CanUseCurrentLocation)
+        {
+            return;
+        }
+
+        IsBusy = true;
+        try
+        {
+            var result = await Platform.TryGetCurrentLocationAsync(default).ConfigureAwait(true);
+            if (!result.IsSuccess || !result.Latitude.HasValue || !result.Longitude.HasValue)
+            {
+                StatusMessage = result.Message;
+                return;
+            }
+
+            Latitude = result.Latitude.Value;
+            Longitude = result.Longitude.Value;
+            StatusMessage = string.IsNullOrWhiteSpace(Address)
+                ? "Position récupérée. Complétez l'adresse puis envoyez la commande."
+                : result.Message;
+        }
+        catch (OperationCanceledException)
+        {
+            StatusMessage = "La récupération de la position a été annulée.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Impossible de récupérer la position: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    protected static object BuildLocationPayload(string address, double? latitude, double? longitude)
+    {
+        if (latitude.HasValue && longitude.HasValue)
+        {
+            return new
+            {
+                Address = address,
+                Latitude = latitude.Value,
+                Longitude = longitude.Value,
+            };
+        }
+
+        return new
+        {
+            Address = address,
+        };
+    }
+
+
+    protected override async Task SubmitAsync()
+    {
+        if (!IsSupported)
+        {
+            StatusMessage = SupportMessage;
+            return;
+        }
+
+        if (!Consent)
+        {
+            StatusMessage = "Le consentement est requis pour poster la commande.";
+            return;
+        }
+
+        if (string.IsNullOrWhiteSpace(Address))
+        {
+            StatusMessage = "L'adresse du rendez-vous est requise.";
+            return;
+        }
+
+
+        if (string.IsNullOrWhiteSpace(Reason))
+        {
+            StatusMessage = "Le motif du rendez-vous est requis.";
+            return;
+        }
+
+
+
+        IsBusy = true;
+        try
+        {
+            var address = Address.Trim();
+            var locationPayload = BuildLocationPayload(address, Latitude, Longitude);
+
+            var payload = new BillingQueryDetailsDto
+            {
+                Id = ExistingQueryId ?? 0,
+                BillingCode = Form.ActionName,
+                ActivityCode = Activity.Code,
+                PerformerId = Performer.PerformerId,
+                Consent = Consent,
+                EventDate = EventDate,
+                Status = CommandStatus,
+                Reason = Reason.Trim(),
+                AdditionalInfo = string.IsNullOrWhiteSpace(AdditionalInfo) ? string.Empty : AdditionalInfo.Trim(),
+                Location = new BillingLocationDto
+                {
+                    Address = address,
+                    Latitude = Latitude,
+                    Longitude = Longitude,
+                }
+            };
+
+            if (IsEditingExisting)
+            {
+                await _billingClient.UpdateAsync(Form.ActionName, ExistingQueryId!.Value, payload).ConfigureAwait(true);
+            }
+            else
+            {
+                await _billingClient.CreateAsync(Form.ActionName, new
+                {
+                    ActivityCode = Activity.Code,
+                    PerformerId = Performer.PerformerId,
+                    Consent,
+                    EventDate = EventDate,
+                    Location = locationPayload,
+                    Reason = payload.Reason,
+                    Status = payload.Status,
+                }).ConfigureAwait(true);
+            }
+
+            StatusMessage = IsEditingExisting
+                ? $"Commande #{ExistingQueryId} mise à jour sur {BillingRoute} pour {Performer.UserName}."
+                : $"Commande transmise sur {BillingRoute} pour {Performer.UserName}.";
+        }
+        catch (HttpRequestException ex) when (ex.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            StatusMessage = "Accès refusé au billing (scope 'api'). Déconnectez puis reconnectez-vous.";
+        }
+        catch (Exception ex)
+        {
+            StatusMessage = $"Erreur lors de l'envoi: {ex.Message}";
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    public override Task LoadAsync()
+    {
+        return Task.CompletedTask;
+    }
+}

src/PostIt/PostIt/ViewModels/HomePageViewModel.cs

@@ -1,6 +1,9 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
-using PostIt;
+using PostIt.Helpers;
 using PostIt.Services;
 namespace PostIt.ViewModels;
 
@@ -26,8 +29,25 @@ public class HomePageViewModel : ViewModelBase
         Settings = settings;
         SessionStatus = sessionStatus;
 
+        OpenActivities = new AsyncRelayCommand(OpenActivitiesAsync);
+
     }
-    public RelayCommand OpenBlogs { get; set; } = new RelayCommand(() => App.PushMainPageAsync());
+    public IAsyncRelayCommand OpenBlogs { get; } = new AsyncRelayCommand(App.PushBlogsPageAsync);
+    public IAsyncRelayCommand OpenActivities { get; }
+
+    private async Task OpenActivitiesAsync()
+    {
+        var app = (App?)Application.Current;
+        var vm = app?.ServiceProvider?.GetRequiredService<ActivitiesPageViewModel>();
+        if (app is null || vm is null)
+        {
+            throw new InvalidOperationException("Activities page is not available.");
+        }
+
+        await vm.RefreshAsync();
+        await app.PushPageAsync(vm);
+    }
+
     /// <summary>
     /// Avalonia designer constructor. Builds a self-contained VM
     /// with a freshly-constructed Settings so the XAML preview can

src/PostIt/PostIt/ViewModels/MainViewModel.cs

@@ -2,15 +2,17 @@ using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+using Avalonia;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Blogspot;
 using Yavsc.Api.Client;
-using PostIt.Services;
+using PostIt.Helpers;
 
 namespace PostIt.ViewModels;
 
-public partial class MainPageViewModel : ViewModelBase
+public partial class MainViewModel : ViewModelBase
 {
     /// <summary>Window/tab title. Cosmetic — bound by
     /// <c>MainPage.axaml</c> if at all. Not the post title.</summary>
@@ -46,10 +48,7 @@ public partial class MainPageViewModel : ViewModelBase
     /// mutable field. Toggling is its own action.</summary>
     [ObservableProperty]
     public partial bool DraftIsPublished { get; set; }
-
+    public bool IsLoaded { get; private set; }
-    [ObservableProperty]
-    public partial ViewModelBase? CurrentViewModel { get; set; }
-
     public Settings SettingsModel { get; }
 
     [ObservableProperty]
@@ -73,97 +72,12 @@ public partial class MainPageViewModel : ViewModelBase
     [ObservableProperty]
     public partial Settings Settings { get; private set; }
 
-    /// <summary>
-    /// API surface that hits the Yavsc.Blogs deployment at
-    /// <see cref="Settings.ApiUrl"/>. Owned and constructed by
-    /// <c>App.axaml.cs</c> so the same client (and its token store)
-    /// is shared with the login flow.
-    /// </summary>
-    public BlogApiClient? BlogClient { get; }
-
-    public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
-    public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
-
-
-    public MainPageViewModel()
-    {
-        Init(null);
-        SettingsModel = new Settings();
-        BlogClient = null;
-    }
-
-    private void Init(Settings? settings)
-    {
-        SearchText = string.Empty;
-        Posts = new ObservableCollection<BlogPostDto>();
-        FilteredPosts = new ObservableCollection<BlogPostDto>();
-        SelectedPost = null;
-        IsBusy = false;
-        StatusMessage = "Ready";
-        // Production path: DI injects the canonical Settings singleton
-        // and we use it as-is. Test path: tests call this constructor
-        // without a Settings argument; we fall back to a fresh
-        // instance so the fixture can build a self-contained VM.
-        // The previous "?? new Settings()" silently worked in prod
-        // too, which is what allowed a second Settings instance to
-        // race the singleton and crash the postit://callback binding
-        // sink; that crash is fixed in Settings.OnPropertyChanged
-        // (thread-safe dispatcher marshalling) so the duplicate
-        // instance is now merely wasteful, not dangerous.
-        Settings = settings ?? new Settings();
-        WindowTitle = "PostIt";
-        DraftTitle = string.Empty;
-        DraftArticle = string.Empty;
-        DraftIsPublished = false;
-        CurrentViewModel = this;
-    }
-
-    /// <summary>
-    /// Test-friendly constructor: caller supplies a pre-built
-    /// <see cref="BlogApiClient"/>. Production code uses the
-    /// (Settings, BlogApiClient) overload below.
-    /// </summary>
-    public MainPageViewModel(BlogApiClient blogClient, Settings? settings = null)
-    {
-         SettingsModel = new Settings();
-        BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient));;
-
-        Init(settings);
-        }
-
-    partial void OnSearchTextChanged(string value) => ApplyFilter();
-
-    partial void OnSelectedPostChanged(BlogPostDto? value)
-    {
-        // Mirror the selection into the editor buffer so the
-        // XAML-bound TextBox/TextEditor show the right content
-        // when the user clicks a post in the list. When the
-        // selection is cleared (e.g. after a successful create
-        // rebinds to the server-issued record, or Delete
-        // nulls it out), the buffer is reset so the editor
-        // doesn't show stale content.
-        DraftTitle = value?.Title ?? string.Empty;
-        DraftArticle = value?.Article ?? string.Empty;
-        // Mirror publication state too. Defaults to false on
-        // null selection so a fresh draft starts unpublished.
-        DraftIsPublished = value?.IsPublished ?? false;
-        UpdateCommandStates();
-    }
-
-    partial void OnIsBusyChanged(bool value) => UpdateCommandStates();
-
-    // Save's CanExecute depends on the buffer: the button must
-    // enable as soon as the user has typed a non-whitespace
-    // title, regardless of whether a post is selected.
-    partial void OnDraftTitleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
-    partial void OnDraftArticleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
-
     [RelayCommand]
-    internal async Task LoadPosts()
+    internal async Task RefreshAsync()
     {
         await ExecuteAsync(async () =>
         {
-            var posts = await BlogClient.GetPostsAsync();
+            var posts = await BlogClient!.GetPostsAsync();
             Posts.Clear();
             foreach (var post in posts.OrderByDescending(p => p.DateModified))
             {
@@ -175,10 +89,13 @@ public partial class MainPageViewModel : ViewModelBase
     }
 
     [RelayCommand]
-    internal void Search() => ApplyFilter();
+    internal async Task SearchAsync() {
+        await RefreshAsync();
+        ApplyFilter();
+    }
 
     [RelayCommand]
-    internal async Task Save()
+    internal async Task SaveAsync()
     {
         // The button is already disabled when the title is empty
         // (see CanSave), but the test path (and any programmatic
@@ -211,8 +128,9 @@ public partial class MainPageViewModel : ViewModelBase
                     Article = DraftArticle ?? string.Empty,
                     DateCreated = DateTime.UtcNow,
                     DateModified = DateTime.UtcNow,
+                    IsPublished = DraftIsPublished
                 };
-                var created = await BlogClient.CreatePostAsync(draft);
+                var created = await BlogClient!.CreatePostAsync(draft);
                 if (created is not null)
                 {
                     SelectedPost = created;
@@ -231,7 +149,7 @@ public partial class MainPageViewModel : ViewModelBase
                     DateCreated = SelectedPost.DateCreated,
                     DateModified = DateTime.UtcNow,
                 };
-                await BlogClient.UpdatePostAsync(SelectedPost.Id, update);
+                await BlogClient!.UpdatePostAsync(SelectedPost.Id, update);
                 StatusMessage = $"Saved post {SelectedPost.Id}.";
             }
 
@@ -240,7 +158,7 @@ public partial class MainPageViewModel : ViewModelBase
     }
 
     [RelayCommand]
-    internal async Task Delete()
+    internal async Task DeleteAsync()
     {
         if (SelectedPost is null || SelectedPost.Id == 0)
         {
@@ -250,7 +168,7 @@ public partial class MainPageViewModel : ViewModelBase
 
         await ExecuteAsync(async () =>
         {
-            await BlogClient.DeletePostAsync(SelectedPost.Id);
+            await BlogClient!.DeletePostAsync(SelectedPost.Id);
             StatusMessage = $"Deleted post {SelectedPost.Id}.";
             SelectedPost = null;
             await RefreshPostsAsync();
@@ -272,8 +190,7 @@ public partial class MainPageViewModel : ViewModelBase
     /// overload; the dedicated endpoint keeps the wire
     /// contract clean.</para>
     /// </summary>
-    [RelayCommand]
+    public async Task SetPublishStateAsync(bool publish)
-    internal async Task TogglePublish()
     {
         if (SelectedPost is null || SelectedPost.Id == 0)
         {
@@ -283,29 +200,245 @@ public partial class MainPageViewModel : ViewModelBase
 
         await ExecuteAsync(async () =>
         {
-            var desired = !DraftIsPublished;
+            // The checkbox updates DraftIsPublished before the command is
-            await BlogClient.SetPublishAsync(SelectedPost.Id, desired);
+            // executed. Using the current bound value avoids the
-            DraftIsPublished = desired;
+            // double-toggle bug in which the UI has already flipped the
+            // state and the command flips it again.
+            await BlogClient!.SetPublishAsync(SelectedPost.Id, publish);
+            DraftIsPublished = publish;
             // Mirror into the selected post so a subsequent
             // RefreshPostsAsync() doesn't blow away the
             // locally flipped state until the round-trip
             // re-hydrates it.
-            SelectedPost.IsPublished = desired;
+            SelectedPost.IsPublished = publish;
-            StatusMessage = desired
+            StatusMessage = publish
                 ? $"Billet {SelectedPost.Id} publié."
                 : $"Billet {SelectedPost.Id} remis en brouillon.";
         });
     }
 
     [RelayCommand]
-    internal void OpenSettings()
+    internal async Task TogglePublishAsync()
     {
-        CurrentViewModel = SettingsModel;
+        await SetPublishStateAsync(DraftIsPublished);
     }
 
+    /// <summary>
+    /// DEV ONLY: open the signature capture page. The production
+    /// entry point is a SignalR push from Yavsc.Org ("devis
+    /// received, sign here"); this command is the dev-time
+    /// shortcut to reach the page without that infrastructure.
+    /// Aligned on the same VM-first navigation pattern as
+    /// <see cref="OpenSettings"/>: the VM resolves the target VM
+    /// through <see cref="Services"/>, the <c>ViewLocator</c> picks
+    /// the matching <c>Control</c> at bind time. No
+    /// <c>Click</code> handler, no <c>App.ServiceProvider</c>
+    /// access from the view layer.
+    /// </summary>
+    [RelayCommand]
+    internal async Task OpenSignatureDevAsync()
+    {
+        await ((App)App.Current!).PushPageAsync(SignatureModel).ConfigureAwait(true);
+    }
+
+
+    [RelayCommand(CanExecute = nameof(CanManageAcl))]
+    public async Task ManageAclAsync()
+    {
+        if (SelectedPost is null)
+        {
+            StatusMessage = "Select an existing post before managing ACL.";
+            return;
+        }
+
+        var postForAcl = SelectedPost;
+        try
+        {
+            var detailed = await BlogClient!.GetPostAsync(SelectedPost.Id).ConfigureAwait(true);
+            if (detailed is not null)
+            {
+                postForAcl = detailed;
+                SelectedPost = detailed;
+            }
+        }
+        catch
+        {
+            // Keep the dialog usable even if the detail refresh fails.
+        }
+
+        await ((App)App.Current!).PushPageAsync(GetACLViewModel(postForAcl)).ConfigureAwait(true);
+    }
+
+    [RelayCommand]
+    public async Task OpenCirclesAsync()
+    {
+        var circlesVm = ResolveServices().GetRequiredService<CirclesPageViewModel>();
+        await ((App)App.Current!).PushPageAsync(circlesVm).ConfigureAwait(true);
+    }
+
+    private ViewModelBase GetACLViewModel(BlogPostDto selectedPost)
+    {
+        var sp = ResolveServices();
+        var aclClient = sp.GetRequiredService<BlogAclApiClient>();
+        var circleClient = sp.GetRequiredService<CircleApiClient>();
+        return new PostAclDialogViewModel(selectedPost, aclClient, circleClient);
+    }
+
+    /// <summary>
+    /// API surface that hits the Yavsc.Blogs deployment at
+    /// <see cref="Settings.ApiUrl"/>. Owned and constructed by
+    /// <c>App.axaml.cs</c> so the same client (and its token store)
+    /// is shared with the login flow.
+    /// </summary>
+    public BlogApiClient? BlogClient { get; }
+
+    /// <summary>
+    /// DI container the VM uses to resolve navigation targets
+    /// (other ViewModels) when the user clicks a toolbar button
+    /// that opens a sub-screen. Owned by <c>App.ServiceProvider</c>
+    /// in production; injected directly in tests. The VM resolves
+    /// <em>ViewModels</em> via this provider, never Views — the
+    /// actual <see cref="Control"/> to push is decided by
+    /// <see cref="ViewLocator"/> at bind time, per CONTRIBUTING.md
+    /// §"Navigation (PostIt)".
+    /// </summary>
+    public IServiceProvider? Services { get; }
+
+    private SignaturePageViewModel? _signatureModel;
+
+    /// <summary>
+    /// Resolved on first access. Lazy so the test path (which
+    /// never pushes <c>SignaturePage</c>) does not require a
+    /// fully-built DI graph just to construct the VM. Mirrors the
+    /// pattern of <see cref="SettingsModel"/> for the Settings case.
+    /// </summary>
+    public SignaturePageViewModel SignatureModel =>
+        _signatureModel ??= ResolveSignatureModel();
+
+    public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
+    public override bool CanNavigatePrevious { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
+
+    private SignaturePageViewModel ResolveSignatureModel()
+    {
+        var sp = ResolveServices();
+        return sp.GetRequiredService<SignaturePageViewModel>();
+    }
+
+    private IServiceProvider ResolveServices()
+    {
+        return Services ?? (Application.Current as App)?.ServiceProvider ??
+            throw new InvalidOperationException(
+                "No IServiceProvider available for navigation. Inject one in tests " +
+                "or ensure App.ServiceProvider is initialized in production.");
+    }
+
+
+    public MainViewModel()
+    {
+        SettingsModel = new Settings();
+        Init(SettingsModel);
+        BlogClient = null;
+    }
+
+    private void Init(Settings? settings)
+    {
+        Posts = new ObservableCollection<BlogPostDto>();
+        FilteredPosts = new ObservableCollection<BlogPostDto>();
+        SelectedPost = null;
+        IsBusy = false;
+        StatusMessage = "Ready";
+        Settings = settings ?? new Settings();
+        SearchText = Settings.SearchText;
+        WindowTitle = "PostIt";
+        DraftTitle = string.Empty;
+        DraftArticle = string.Empty;
+        DraftIsPublished = false;
+        IsLoaded = false;
+        // Production path: DI injects the canonical Settings singleton
+        // and we use it as-is. Test path: tests call this constructor
+        // without a Settings argument; we fall back to a fresh
+        // instance so the fixture can build a self-contained VM.
+        // The previous "?? new Settings()" silently worked in prod
+        // too, which is what allowed a second Settings instance to
+        // race the singleton and crash the postit://callback binding
+        // sink; that crash is fixed in Settings.OnPropertyChanged
+        // (thread-safe dispatcher marshalling) so the duplicate
+        // instance is now merely wasteful, not dangerous.
+
+        Settings.PropertyChanged += (s, e) =>
+        {
+            if (e.PropertyName == nameof(Settings.SearchText))
+            {
+                SearchText = Settings.SearchText;
+                ApplyFilter();
+            }
+        };
+
+    }
+
+    /// <summary>Save is enabled as soon as the user has typed
+    /// a non-whitespace title in the editor, regardless of
+    /// whether a post is selected. The "no selection" case is
+    /// the create-new-post path; the "with selection" case is
+    /// the update path. Both read from the editor buffer.
+    /// Previously this also required <c>SelectedPost is not null</c>
+    /// — which contradicted the create-new-post intent and
+    /// forced the buggy "draft with empty title" branch.</summary>
+    private bool CanSave() => !IsBusy && !string.IsNullOrWhiteSpace(DraftTitle);
+    private bool CanDelete() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
+    private bool CanManageAcl() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
+
+    /// <summary>
+    /// Test-friendly constructor: caller supplies a pre-built
+    /// <see cref="BlogApiClient"/>. Production code uses the
+    /// (Settings, BlogApiClient) overload below.
+    /// </summary>
+    public MainViewModel(BlogApiClient blogClient, Settings? settings = null, IServiceProvider? services = null)
+    {
+        SettingsModel = new Settings();
+        BlogClient = blogClient ?? throw new ArgumentNullException(nameof(blogClient)); ;
+        Services = services;
+        Init(settings);
+    }
+
+    partial void OnSearchTextChanged(string value)
+    {
+        if (Settings is not null && Settings.SearchText != value)
+        {
+            Settings.SearchText = value;
+        }
+        ApplyFilter();
+    }
+
+    partial void OnSelectedPostChanged(BlogPostDto? value)
+    {
+        // Mirror the selection into the editor buffer so the
+        // XAML-bound TextBox/TextEditor show the right content
+        // when the user clicks a post in the list. When the
+        // selection is cleared (e.g. after a successful create
+        // rebinds to the server-issued record, or Delete
+        // nulls it out), the buffer is reset so the editor
+        // doesn't show stale content.
+        DraftTitle = value?.Title ?? string.Empty;
+        DraftArticle = value?.Article ?? string.Empty;
+        // Mirror publication state too. Defaults to false on
+        // null selection so a fresh draft starts unpublished.
+        DraftIsPublished = value?.IsPublished ?? false;
+        UpdateCommandStates();
+    }
+
+    partial void OnIsBusyChanged(bool value) => UpdateCommandStates();
+
+    // Save's CanExecute depends on the buffer: the button must
+    // enable as soon as the user has typed a non-whitespace
+    // title, regardless of whether a post is selected.
+    partial void OnDraftTitleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
+    partial void OnDraftArticleChanged(string value) => SaveCommand.NotifyCanExecuteChanged();
+
+
     private async Task RefreshPostsAsync()
     {
-        var posts = await BlogClient.GetPostsAsync();
+        var posts = await BlogClient!.GetPostsAsync();
         Posts.Clear();
         foreach (var post in posts.OrderByDescending(p => p.DateModified))
         {
@@ -358,47 +491,18 @@ public partial class MainPageViewModel : ViewModelBase
 
     private void UpdateCommandStates()
     {
-        LoadPostsCommand.NotifyCanExecuteChanged();
+        RefreshCommand.NotifyCanExecuteChanged();
         SaveCommand.NotifyCanExecuteChanged();
         DeleteCommand.NotifyCanExecuteChanged();
     }
 
-    /// <summary>Save is enabled as soon as the user has typed
-    /// a non-whitespace title in the editor, regardless of
-    /// whether a post is selected. The "no selection" case is
-    /// the create-new-post path; the "with selection" case is
-    /// the update path. Both read from the editor buffer.
-    /// Previously this also required <c>SelectedPost is not null</c>
-    /// — which contradicted the create-new-post intent and
-    /// forced the buggy "draft with empty title" branch.</summary>
-    private bool CanSave() => !IsBusy && !string.IsNullOrWhiteSpace(DraftTitle);
-    private bool CanDelete() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
-    private bool CanManageAcl() => SelectedPost is not null && SelectedPost.Id != 0 && !IsBusy;
 
-    /// <summary>
+    internal async Task InitializeAsync()
-    /// Raised when the user asks to open the "manage ACL" dialog for
-    /// the currently selected post. The <c>MainPage</c> code-behind
-    /// listens to this event and pushes a <c>PostAclDialog</c> on the
-    /// navigation stack. The VM itself can't navigate directly
-    /// because the navigation surface (<c>NavigationPage</c>) lives
-    /// in the View layer.
-    /// </summary>
-    public event EventHandler<BlogPostDto>? ManageAclRequested;
-
-    [RelayCommand(CanExecute = nameof(CanManageAcl))]
-    public void ManageAcl()
     {
-        if (SelectedPost is null) return;
+        if (!IsLoaded)
-        ManageAclRequested?.Invoke(this, SelectedPost);
+        {
+            await RefreshAsync();
+            IsLoaded = true;
+        }
     }
-
-    /// <summary>
-    /// Raised when the user asks to open the circles page (full
-    /// CRUD on their own circles). Same routing as
-    /// <see cref="ManageAclRequested"/>.
-    /// </summary>
-    public event EventHandler? OpenCirclesRequested;
-
-    [RelayCommand]
-    public void OpenCircles() => OpenCirclesRequested?.Invoke(this, EventArgs.Empty);
 }

src/PostIt/PostIt/ViewModels/PostAclDialogViewModel.cs

@@ -2,15 +2,25 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Yavsc.Blogspot;
 using Yavsc.Api.Client;
 using Yavsc.Api.Client.Dtos;
+using Yavsc.Abstract.BlogSpot;
+using Yavsc.Abstract.Identity.Security;
+using System.Net.Http;
 
 namespace PostIt.ViewModels;
 
+public sealed class PostAclEntry
+{
+    public long CircleId { get; init; }
+    public string CircleName { get; init; } = string.Empty;
+}
+
 /// <summary>
 /// View model for the "Gérer l'ACL" modal of a single blog post.
 ///
@@ -37,10 +47,12 @@ public partial class PostAclDialogViewModel : ViewModelBase
     public BlogPostDto Post { get; }
 
     [ObservableProperty]
-    public partial ObservableCollection<CircleDto> MyCircles { get; set; } = new();
+    public partial ObservableCollection<CircleDto>
+    MyCircles { get; set; } = new();
 
     [ObservableProperty]
-    public partial ObservableCollection<CircleAuthorizationDto> AclEntries { get; set; } = new();
+    public partial ObservableCollection<PostAclEntry>
+    AclEntries { get; set; } = new();
 
     [ObservableProperty]
     public partial CircleDto? SelectedCircleToAdd { get; set; }
@@ -51,6 +63,22 @@ public partial class PostAclDialogViewModel : ViewModelBase
     [ObservableProperty]
     public partial string StatusMessage { get; set; } = string.Empty;
 
+    /// <summary>
+    /// Idempotency gate for <see cref="LoadAsync"/>: the dialog
+    /// attaches the load trigger in <c>DataContextChanged</c>,
+    /// which can fire more than once if the page is detached
+    /// and re-attached (dialog re-use, navigation edge cases)
+    /// with a different VM. Without this guard, the second load
+    /// would race against the first and could overwrite
+    /// <see cref="AclEntries"/> mid-edit. Pattern copied from
+    /// <c>Settings.Load</c>.
+    /// </summary>
+    private bool _loaded;
+
+    /// <summary>True once <see cref="LoadAsync"/> has run at least
+    /// once. Exposed for tests; do not bind from XAML.</summary>
+    public bool Loaded => _loaded;
+
     public PostAclDialogViewModel(
         BlogPostDto post,
         BlogAclApiClient aclClient,
@@ -59,6 +87,9 @@ public partial class PostAclDialogViewModel : ViewModelBase
         Post = post ?? throw new ArgumentNullException(nameof(post));
         _aclClient = aclClient ?? throw new ArgumentNullException(nameof(aclClient));
         _circleClient = circleClient ?? throw new ArgumentNullException(nameof(circleClient));
+
+        AclEntries = new ObservableCollection<PostAclEntry>(post.GetACL().Select(a => ToAclEntry(a.CircleId)));
+        SelectedCircleToAdd = null;
     }
 
     public override bool CanNavigateNext { get => throw new NotImplementedException(); protected set => throw new NotImplementedException(); }
@@ -67,24 +98,25 @@ public partial class PostAclDialogViewModel : ViewModelBase
     [RelayCommand]
     public async Task LoadAsync()
     {
+        if (_loaded) return;
+
         IsBusy = true;
         try
         {
-            // Load circles and ACL entries in parallel — both are
+            // Load circles for the picker. ACL entries come from the
-            // independent reads on the same host. The caller's uid
+            // BlogPostDto detail payload (source of truth for initial state).
-            // is implicit in both endpoints.
             var circlesTask = _circleClient.GetMyCirclesAsync();
-            var aclTask = _aclClient.GetMyAclAsync();
+            await Task.WhenAll(circlesTask);
-            await Task.WhenAll(circlesTask, aclTask);
 
             var circles = circlesTask.Result ?? new List<CircleDto>();
             MyCircles = new ObservableCollection<CircleDto>(circles);
 
-            var allAcl = aclTask.Result ?? new List<CircleAuthorizationDto>();
+            // Resolve labels now that circles are available.
-            AclEntries = new ObservableCollection<CircleAuthorizationDto>(
+            AclEntries = new ObservableCollection<PostAclEntry>(AclEntries.Select(a => ToAclEntry(a.CircleId)));
-                allAcl.Where(a => a.BlogPostId == Post.Id));
+
 
             StatusMessage = $"{AclEntries.Count} autorisation(s)";
+            _loaded = true;
         }
         catch (Exception ex)
         {
@@ -108,15 +140,20 @@ public partial class PostAclDialogViewModel : ViewModelBase
         IsBusy = true;
         try
         {
-            var created = await _aclClient.GrantAsync(new CircleAuthorizationDto
+            if (AclEntries.Any(a => a.CircleId == SelectedCircleToAdd.Id))
+            {
+                StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
+                return;
+            }
+
+            var created = await _aclClient.GrantAsync(new PostAccessControlRulePayload
             {
                 CircleId = SelectedCircleToAdd.Id,
-                BlogPostId = Post.Id,
+                BlogPostId = Post.Id
-                Comment = false,
             });
             if (created is not null)
             {
-                AclEntries.Add(created);
+                AclEntries.Add(ToAclEntry(created.CircleId));
                 StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » autorisé";
             }
             else
@@ -124,6 +161,13 @@ public partial class PostAclDialogViewModel : ViewModelBase
                 StatusMessage = "Autorisation refusée par le serveur";
             }
         }
+        catch (HttpRequestException ex) when (ex.StatusCode == HttpStatusCode.Conflict)
+        {
+            // Conflict means the link already exists in backend. Resync
+            // from the dedicated ACL API so the UI reflects server truth.
+            await ReloadAclEntriesFromServerAsync();
+            StatusMessage = $"Cercle « {SelectedCircleToAdd.Name} » déjà autorisé";
+        }
         catch (Exception ex)
         {
             StatusMessage = $"Erreur: {ex.Message}";
@@ -135,14 +179,16 @@ public partial class PostAclDialogViewModel : ViewModelBase
     }
 
     [RelayCommand]
-    public async Task RevokeAsync(CircleAuthorizationDto? acl)
+    public async Task RevokeAsync(PostAclEntry? acl)
     {
         if (acl is null) return;
         IsBusy = true;
         try
         {
             await _aclClient.RevokeAsync(acl.CircleId);
-            AclEntries.Remove(acl);
+            var existing = AclEntries.FirstOrDefault(e => e.CircleId == acl.CircleId);
+            if (existing is not null)
+                AclEntries.Remove(existing);
             StatusMessage = "Autorisation révoquée";
         }
         catch (Exception ex)
@@ -154,4 +200,26 @@ public partial class PostAclDialogViewModel : ViewModelBase
             IsBusy = false;
         }
     }
+
+    private async Task ReloadAclEntriesFromServerAsync()
+    {
+        var allAcl = await _aclClient.GetMyAclAsync();
+        var currentPostAcl = (allAcl ?? new List<PostAccessControlRulePayload>())
+            .Where(a => a.BlogPostId == Post.Id)
+            .Select(a => ToAclEntry(a.CircleId))
+            .GroupBy(a => a.CircleId)
+            .Select(g => g.First())
+            .ToList();
+        AclEntries = new ObservableCollection<PostAclEntry>(currentPostAcl);
+    }
+
+    private PostAclEntry ToAclEntry(long circleId)
+    {
+        var circleName = MyCircles.FirstOrDefault(c => c.Id == circleId)?.Name;
+        return new PostAclEntry
+        {
+            CircleId = circleId,
+            CircleName = string.IsNullOrWhiteSpace(circleName) ? $"Cercle #{circleId}" : circleName
+        };
+    }
 }

src/PostIt/PostIt/ViewModels/RemoteViewModelBase.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace PostIt.ViewModels;
+
+public abstract class RemoteViewModelBase : ViewModelBase
+{
+     public abstract Task LoadAsync();
+
+
+}

src/PostIt/PostIt/ViewModels/SelectableHairPrestationItem.cs

@@ -0,0 +1,22 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Yavsc.Models.Haircut;
+
+namespace PostIt.ViewModels;
+
+public partial class SelectableHairPrestationItem : ObservableObject
+{
+    public long Id { get; init; }
+    public string Title { get; init; } = string.Empty;
+    public string Details { get; init; } = string.Empty;
+
+    [ObservableProperty]
+    public partial bool IsSelected { get; set; }
+
+    public static SelectableHairPrestationItem FromDto(HairPrestationDto dto)
+        => new()
+        {
+            Id = dto.Id,
+            Title = dto.Title,
+            Details = dto.Details,
+        };
+}