diff --git a/appinfo/info.xml b/appinfo/info.xml
index b895c7352..8ac28b807 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -314,6 +314,15 @@ Vrij en open source onder de EUPL-1.2-licentie.
                 install has no history to move.
             -->
             <step>OCA\Dossiq\Repair\MigrateAiOversightToHermiq</step>
+            <!--
+                bacAdviceRequest carried the objection id under the name of the
+                SCHEMA it $refs (`objectionProceeding`) instead of the property
+                the schema declares (`bezwaar`) — so a required property was
+                never written, and BezwaarDetail's advice-request widgets, which
+                filter on `bezwaar`, showed nothing at all. Idempotent (rows that
+                already have `bezwaar` are skipped) and non-fatal.
+            -->
+            <step>OCA\Dossiq\Repair\BackfillAdviceRequestObjection</step>
         </post-migration>
         <!--
             FRESH INSTALL. Nextcloud does NOT run post-migration on a first install:
@@ -401,6 +410,7 @@ Vrij en open source onder de EUPL-1.2-licentie.
 
     <commands>
         <command>OCA\Dossiq\Command\BackfillLegalHoldsCommand</command>
+        <command>OCA\Dossiq\Command\MigrateAutomaticActionsToFlowsCommand</command>
         <command>OCA\Dossiq\Command\MigrateTenantsCommand</command>
         <command>OCA\Dossiq\Command\SeedBezwaarBeroepCommand</command>
     </commands>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index a1a9b2af7..27ebec9f7 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -105,9 +105,13 @@
     ['name' => 'subsidie#create', 'url' => '/api/subsidies', 'verb' => 'POST'],
     ['name' => 'subsidie#createTussenrapportage', 'url' => '/api/subsidies/uitvoeringen/{uitvoeringId}/tussenrapportages', 'verb' => 'POST'],
     ['name' => 'subsidie#approveTussenrapportage', 'url' => '/api/subsidies/tussenrapportages/{reportId}/beoordelen', 'verb' => 'POST'],
-    ['name' => 'subsidie#finalizeVaststelling', 'url' => '/api/subsidies/vaststellingen/{vaststellingId}/vast', 'verb' => 'POST'],
-    ['name' => 'subsidie#signBeschikking', 'url' => '/api/subsidies/beschikkingen/{beschikkingId}/sign', 'verb' => 'POST'],
-    ['name' => 'subsidie#publishBeschikking', 'url' => '/api/subsidies/beschikkingen/{beschikkingId}/publish', 'verb' => 'POST'],
+        // The placeholder names bind BY NAME to the method parameters — see the
+        // note on the parafeer-route block below. These three were
+        // {vaststellingId}/{beschikkingId} against $determinationId/$decisionId
+        // and answered HTTP 400 on every call.
+    ['name' => 'subsidie#finalizeVaststelling', 'url' => '/api/subsidies/vaststellingen/{determinationId}/vast', 'verb' => 'POST'],
+    ['name' => 'subsidie#signBeschikking', 'url' => '/api/subsidies/beschikkingen/{decisionId}/sign', 'verb' => 'POST'],
+    ['name' => 'subsidie#publishBeschikking', 'url' => '/api/subsidies/beschikkingen/{decisionId}/publish', 'verb' => 'POST'],
     ['name' => 'subsidie#transition', 'url' => '/api/subsidies/{id}/transition', 'verb' => 'POST'],
     ['name' => 'subsidie#createBeschikking', 'url' => '/api/subsidies/{id}/beschikking', 'verb' => 'POST'],
 
@@ -258,15 +262,32 @@
         // ── Parafeerroute (B&W parafering engine) ───────────────────────
         // CRUD on parafeerroute objects is served by OpenRegister's auto-exposed
         // /api/objects/<register>/<schema> endpoints — only engine routes remain.
-    ['name' => 'parafeerRoute#start',        'url' => '/api/parafeer-route/voorstel/{voorstelId}/start',          'verb' => 'POST'],
-    ['name' => 'parafeerRoute#completeStep', 'url' => '/api/parafeer-route/voorstel/{voorstelId}/complete-step',  'verb' => 'POST'],
-    ['name' => 'parafeerRoute#skipStep',     'url' => '/api/parafeer-route/voorstel/{voorstelId}/skip-step',      'verb' => 'POST'],
-    ['name' => 'parafeerRoute#addStep',      'url' => '/api/parafeer-route/voorstel/{voorstelId}/add-step',       'verb' => 'POST'],
+        // ⚠️ THE PLACEHOLDER NAME IS LOAD-BEARING. Nextcloud's Dispatcher binds a
+        // controller argument by PARAMETER NAME (`$this->request->getParam($param)`),
+        // not by position. These four were `{voorstelId}` while every target method
+        // signs `string $proposalId` — so the argument resolved to null, the string
+        // typehint threw a TypeError, and the Dispatcher answered HTTP 400. Measured
+        // against the running instance before the fix: start, complete-step and
+        // register-besluit all returned 400 with an empty body, on every call, for
+        // any input.
+        //
+        // The Dutch→English vocabulary sweep renamed the method parameters and left
+        // the URLs behind. Nothing caught it: the route exists, the method exists,
+        // and gate-6 (route-reachability) checks that a route's target method is
+        // present — which it is. Only the NAMES disagree.
+        // The four parafeer-route engine routes were RETIRED. They were a second
+        // implementation of a flow /api/parafeer-actie already runs, and they had
+        // never served a request: the placeholder bound no argument, so every call
+        // answered 400. `start` is covered by the `besluitvormingActivate`
+        // transition action, `complete-step` and `skip-step` by parafeeractie's
+        // own `parafered`/`accorded`/`skipped` vocabulary, and `add-step` has no
+        // live equivalent — that button went with them.
 
         // Voorstel → besluit registration delegates to a decidesk report-adoption
         // Decision (dossiq-delegate-remaining-decisions-to-decidesk, ADR-019).
         // The parafeerroute above is untouched; only the besluit decision moves.
-    ['name' => 'voorstelBesluit#registerBesluit', 'url' => '/api/voorstellen/{voorstelId}/register-besluit',       'verb' => 'POST'],
+        // Same placeholder-name defect as the four routes above — see that note.
+    ['name' => 'voorstelBesluit#registerBesluit', 'url' => '/api/voorstellen/{proposalId}/register-besluit',       'verb' => 'POST'],
 
         // NOTE: ParaferingController + ParaferingService were superseded scaffolding
         // that operated entirely in-memory (no persistence, client-supplied state).
@@ -324,7 +345,8 @@
         // Related-case linking — typed peer relations (relevanteAndereZaken).
     ['name' => 'caseRelation#list',    'url' => '/api/cases/{caseId}/relations',                          'verb' => 'GET'],
     ['name' => 'caseRelation#create',  'url' => '/api/cases/{caseId}/relations',                          'verb' => 'POST'],
-    ['name' => 'caseRelation#destroy', 'url' => '/api/cases/{caseId}/relations/{targetId}/{aardRelatie}', 'verb' => 'DELETE'],
+        // {aardRelatie} bound nothing: the method signs $natureRelationship. HTTP 400.
+    ['name' => 'caseRelation#destroy', 'url' => '/api/cases/{caseId}/relations/{targetId}/{natureRelationship}', 'verb' => 'DELETE'],
         // Dashboard KPI aggregation endpoint.
     ['name' => 'kpi#index', 'url' => '/api/dashboard/kpis', 'verb' => 'GET'],
 
@@ -577,8 +599,11 @@
 
         // ── Besluitvorming workflow ──────────────────────────────────────
     ['name' => 'besluitvorming#activateTemplate', 'url' => '/api/besluitvorming/templates/{slug}/activate', 'verb' => 'POST'],
-    ['name' => 'agenda#addToAgenda',              'url' => '/api/besluitvorming/cases/{id}/agenda',         'verb' => 'POST'],
-    ['name' => 'agenda#updateAgendaItem',         'url' => '/api/besluitvorming/cases/{id}/agenda',         'verb' => 'PUT'],
+        // The two `agenda#` routes were removed with the agenda compiler: decidiq
+        // owns agenda-building and meetings, and it surfaces them here through the
+        // `decidesk-decisions` integration leaf. They served only the compiler view
+        // and became unreachable the moment it went, which is the dead-endpoint
+        // shape this programme already retired once on the AVG page.
     ['name' => 'publication#publish',             'url' => '/api/besluitvorming/cases/{id}/publish',        'verb' => 'POST'],
     ['name' => 'mandaat#mandaatCheck',            'url' => '/api/besluitvorming/cases/{id}/mandaat-check',  'verb' => 'GET'],
 
diff --git a/docs/static/screenshots/tutorials/admin/02-automatic-actions-01.png b/docs/static/screenshots/tutorials/admin/02-automatic-actions-01.png
deleted file mode 100644
index 590420a03..000000000
Binary files a/docs/static/screenshots/tutorials/admin/02-automatic-actions-01.png and /dev/null differ
diff --git a/docs/static/screenshots/tutorials/admin/02-automatic-actions-02.png b/docs/static/screenshots/tutorials/admin/02-automatic-actions-02.png
deleted file mode 100644
index 590420a03..000000000
Binary files a/docs/static/screenshots/tutorials/admin/02-automatic-actions-02.png and /dev/null differ
diff --git a/docs/static/screenshots/tutorials/admin/02-automatic-actions-03.png b/docs/static/screenshots/tutorials/admin/02-automatic-actions-03.png
deleted file mode 100644
index 590420a03..000000000
Binary files a/docs/static/screenshots/tutorials/admin/02-automatic-actions-03.png and /dev/null differ
diff --git a/docs/static/screenshots/tutorials/admin/02-automatic-actions-04.png b/docs/static/screenshots/tutorials/admin/02-automatic-actions-04.png
deleted file mode 100644
index 590420a03..000000000
Binary files a/docs/static/screenshots/tutorials/admin/02-automatic-actions-04.png and /dev/null differ
diff --git a/docs/static/screenshots/tutorials/admin/02-automatic-actions-05.png b/docs/static/screenshots/tutorials/admin/02-automatic-actions-05.png
deleted file mode 100644
index 590420a03..000000000
Binary files a/docs/static/screenshots/tutorials/admin/02-automatic-actions-05.png and /dev/null differ
diff --git a/docs/user-guide/admin/02-automatic-actions.md b/docs/user-guide/admin/02-automatic-actions.md
index 723fe6fe2..28a963080 100644
--- a/docs/user-guide/admin/02-automatic-actions.md
+++ b/docs/user-guide/admin/02-automatic-actions.md
@@ -1,59 +1,93 @@
 ---
 sidebar_position: 2
 title: Set up automatic actions
-description: "Create rules that fire on case events: create tasks, send notifications, transition status, kick off integrations."
+description: "Automatic actions are OpenRegister flows. Migrate the old records, then build and run actions in the flow editor."
 ---
 
 # Set up automatic actions
 
-Automatische acties (automatic actions) are the rule engine that turns case events into tasks, notifications, and follow-up transitions. A rule fires on a *trigger* (a status change, a deadline crossing, a document upload), evaluates a *condition* (always, or only when a field matches), and runs an *action* (create a task, send an email, transition the case, post to an integration).
+Automatic actions are **OpenRegister flows**. Dossiq contributes the action nodes — send an email, notify a role, call a webhook, create a document, merge a template, schedule a reminder — and OpenRegister's flow engine runs them.
+
+:::warning What changed, and why this page was wrong
+
+Dossiq used to have its own **Automatische acties** settings page. It has been retired.
+
+An earlier version of this page described a rule engine with *triggers*, *conditions* and a *Last run* column. **None of that existed.** The stored record had no trigger field and no condition field, and nothing in the application ever executed one — the code that fires actions on a status change reads a different, separate definition that lives on the case type. A rule created through that page was saved and then never ran.
+
+If you configured actions there, nothing was lost: the records are still stored, and the migration below turns each into a flow that does run.
+:::
 
 ## Goal
 
-By the end you will have created an automatic action that fires on a specific status transition and creates a task assigned to a role on the case.
+By the end you will have migrated any existing automatic actions to flows, and know where to build new ones.
 
 ## Prerequisites
 
-- Administrator role on the Nextcloud instance.
-- At least one case type configured (see [Configure case types and workflows](./01-configure-case-types.md)).
-- A clear idea of which trigger / condition / action you want to chain.
+- Administrator role on the Nextcloud instance, and shell access for the migration command.
+- OpenRegister installed (Dossiq requires it).
+- The user you migrate as must belong to an organisation — a flow takes its owner and organisation from that user, permanently.
+
+## Migrate existing automatic actions
 
-## Steps
+Run a dry run first. It writes nothing and shows exactly what would be created:
 
-1. From the Dossiq navigation, click **Automatische acties** (in the configuration block). The list opens with the standard Cards/Table toggle and an **Add Item** button.
+```bash
+occ dossiq:actions:migrate-to-flows --user=<uid> --dry-run
+```
 
-   ![Automatic actions list](/screenshots/tutorials/admin/02-automatic-actions-01.png)
+```
+dossiq:actions:migrate-to-flows (dry run — nothing was written)
+  total    = 1
+  created  = 1
+  updated  = 0
+  skipped  = 0
+  failed   = 0
+  [created] dossiq:automaticAction:<tenant>:<slug> — dry run — no write
+```
 
-2. Click **Add Item**. The rule dialog opens with four sections: *Algemeen* (name, description, active toggle), *Trigger*, *Condition*, *Action*.
+Then run it for real:
 
-   ![New automatic action dialog](/screenshots/tutorials/admin/02-automatic-actions-02.png)
+```bash
+occ dossiq:actions:migrate-to-flows --user=<uid>
+```
 
-3. Set the **Trigger**. Pick *Status change* and select the case-type plus the source and target statuses. Other triggers include *Deadline approaching*, *Document uploaded*, *Case created*, *Case closed*.
+The command is safe to re-run: the second run reports `updated` rather than creating a duplicate.
 
-   ![Configuring the trigger](/screenshots/tutorials/admin/02-automatic-actions-03.png)
+:::caution The migrated flows are enabled
+These actions have never fired before. Migrating them makes them runnable, so review each one in the flow editor before triggering it — particularly anything that sends email to an address outside your organisation. Each migrated flow uses a **manual** trigger, so it runs only when someone runs it; it will not start firing on its own.
+:::
 
-4. Set the **Condition** (optional). Leave blank for "always fire" or add a field match (e.g. *Confidentiality = Public*) so the rule only fires on matching cases. Conditions support AND/OR groups.
+Reading the summary:
 
-   ![Conditions](/screenshots/tutorials/admin/02-automatic-actions-04.png)
+| Outcome | Meaning |
+|---|---|
+| `created` | A new flow was made for this action. |
+| `updated` | The flow this command made earlier was refreshed. |
+| `skipped` | No node implements that action's type, so no flow was written. A flow around a node that does not exist would report success and do nothing. |
+| `failed` | The record is missing its tenant or slug and cannot be identified. Fix the record and re-run. |
 
-5. Set the **Action**. Pick *Create task*, fill the task title, description, assignee role, and due-date offset. Save the rule with **Save**. Confirm the rule is *Active* in the list: only active rules fire.
+## Build and run actions
 
-   ![Action and save](/screenshots/tutorials/admin/02-automatic-actions-05.png)
+1. From the Dossiq navigation, open **Automatische acties** in the configuration block. It takes you to OpenRegister's **Flows** page.
+2. Use **New flow**, or open a migrated flow to review it.
+3. A runnable flow needs an entry and an exit: a trigger node, your action node(s), and an end node, wired with edges. The migration builds exactly that shape.
+4. Dossiq's action nodes appear in the node catalogue under `dossiq.action.*`.
 
 ## Verification
 
-You have set up the action correctly when: triggering the configured status transition on a test case produces the new task in the case's **Tasks** sidebar tab, the task is assigned to the configured role, and the rule's *Last run* column in the **Automatische acties** list updates to the most recent fire time.
+You have it working when the flow appears on the **Flows** page with app `dossiq`, and running it produces the effect you configured — the email arrives, the webhook is called, the document is generated.
 
 ## Common issues
 
 | Symptom | Fix |
 |---|---|
-| Rule is configured but never fires | The rule's *Active* toggle is off, or the trigger case-type does not match the case-type you tested on. |
-| Task is created but unassigned | The configured assignee role is not present on the case; add it to the case's Participants or update the rule to use a role that exists. |
-| Action runs but no notification arrives | The notification action uses Nextcloud's mail; SMTP must be configured at the server level (the dev environment intentionally disables outgoing mail: see [PROJECT MEMORY notes on mail](../../#mail-notifications)). |
-| Condition does not match what you expect | Open the rule's *Last run* details: the recorded field values clarify why the condition skipped. |
+| `occ dossiq:actions:migrate-to-flows` says `--user is required` | It has no default on purpose: the created flows inherit that user's identity and organisation permanently. Pass a real uid. |
+| The command reports `OpenRegister exposes no FlowService on this instance` | OpenRegister is missing or too old. Flows live in OpenRegister; Dossiq only contributes nodes. |
+| An action was `skipped` | Its `type` is not one Dossiq implements a node for. The six are `sendEmail`, `notifyRole`, `callWebhook`, `createDocument`, `mergeTemplate` and `scheduleReminder`. |
+| A flow saves but will not run | Check it has both a trigger node and an end node. OpenRegister reports a flow with neither as not runnable. |
+| Actions attached to a status transition are not on this page | Those are a different mechanism: they live on the case type's workflow, not here. See [Configure case types and workflows](./01-configure-case-types.md). |
 
 ## Reference
 
-- [Configure case types and workflows](./01-configure-case-types.md): defines the triggers (statuses, deadlines).
-- [Case management](../../Features/case-management.md): the underlying event stream rules listen to.
+- [Configure case types and workflows](./01-configure-case-types.md): status-transition actions, which are configured on the case type.
+- [Case management](../../Features/case-management.md): the case lifecycle these actions hang off.
diff --git a/lib/AppInfo/Registrar/ListenerRegistrar.php b/lib/AppInfo/Registrar/ListenerRegistrar.php
index dfb9aa507..ce1db70dd 100644
--- a/lib/AppInfo/Registrar/ListenerRegistrar.php
+++ b/lib/AppInfo/Registrar/ListenerRegistrar.php
@@ -60,7 +60,7 @@ public function register(IRegistrationContext $context): void {
 		(new BezwaarListenerRegistrar())->register(context: $context);
 		(new WorkflowListenerRegistrar())->register(context: $context);
 
-		// ADR-065: OpenRegister owns the flow engine; procest contributes the six
+		// ADR-065: OpenRegister owns the flow engine; dossiq contributes the six
 		// things a case can DO, because every one of OpenRegister's own nineteen
 		// nodes is control-flow or data and none of them acts outward.
 		//
@@ -71,7 +71,7 @@ public function register(IRegistrationContext $context): void {
 		if (class_exists(\OCA\OpenRegister\Service\Flow\RegisterFlowNodesEvent::class) === true) {
 			$context->registerEventListener(
 				\OCA\OpenRegister\Service\Flow\RegisterFlowNodesEvent::class,
-				\OCA\Dossiq\Flow\ProcestFlowNodeListener::class
+				\OCA\Dossiq\Flow\DossiqFlowNodeListener::class
 			);
 		}
 	}//end register()
diff --git a/lib/AppInfo/Registrar/WorkflowListenerRegistrar.php b/lib/AppInfo/Registrar/WorkflowListenerRegistrar.php
index 9fa5598f0..f0e7063c8 100644
--- a/lib/AppInfo/Registrar/WorkflowListenerRegistrar.php
+++ b/lib/AppInfo/Registrar/WorkflowListenerRegistrar.php
@@ -41,6 +41,22 @@
  * @spec openspec/changes/termijnbewaking-dwangsom-engine-02-termijn-binding-lifecycle/tasks.md
  */
 class WorkflowListenerRegistrar {
+	/**
+	 * Every spelling of the decision-concluded event, newest first.
+	 *
+	 * A cross-app event class name is a RUNTIME lookup: this app cannot move it,
+	 * only follow it. When the other app renamed its namespace without an alias,
+	 * naming one spelling meant the listener silently stopped registering — so
+	 * both are listed, and the listener attaches to whichever exists. The old
+	 * entry can be dropped once no supported install still ships it.
+	 *
+	 * @var array<int, string>
+	 */
+	private const DECISION_CONCLUDED_EVENTS = [
+		'OCA\Decidiq\Event\DecisionConcludedEvent',
+		'OCA\Decidesk\Event\DecisionConcludedEvent',
+	];
+
 	/**
 	 * Register the termijn and decision listeners.
 	 *
@@ -94,16 +110,26 @@ private function registerTermListeners(IRegistrationContext $context): void {
 	 * @spec openspec/changes/dossiq-delegation-via-events/specs/contract-decision-delegation/spec.md#requirement-req-pdcd-003-the-zgw-besluit-is-materialised-from-the-decisionconcludedevent
 	 */
 	private function registerDecisionListeners(IRegistrationContext $context): void {
-		if (class_exists('\\OCA\\Decidesk\\Event\\DecisionConcludedEvent') === false) {
-			return;
-		}
-
-		// FQN string (not ::class) so there is no hard compile-time dependency
-		// on the optional decidesk app — mirrors the OpenRegister approval-event
+		// BOTH spellings, and the old one is not optional politeness — it is the
+		// only thing that keeps this integration working during an upgrade where
+		// the two apps move at different times.
+		//
+		// The app renamed its namespace from OCA\Decidesk to OCA\Decidiq with no
+		// compatibility alias. This guard named only the OLD class, so from the
+		// moment that landed it returned false, the listener was never
+		// registered, and every concluded decision stopped materialising a ZGW
+		// Besluit here. Nothing errored: a class_exists() guard that goes false
+		// looks exactly like the optional app not being installed.
+		//
+		// FQN strings (not ::class) so there is no hard compile-time dependency
+		// on the optional app — mirrors the OpenRegister approval-event
 		// registration in BezwaarListenerRegistrar.
-		$context->registerEventListener(
-			event: 'OCA\Decidesk\Event\DecisionConcludedEvent',
-			listener: DecisionConcludedListener::class
-		);
+		foreach (self::DECISION_CONCLUDED_EVENTS as $event) {
+			if (class_exists('\\' . $event) === false) {
+				continue;
+			}
+
+			$context->registerEventListener(event: $event, listener: DecisionConcludedListener::class);
+		}
 	}//end registerDecisionListeners()
 }//end class
diff --git a/lib/Command/MigrateAutomaticActionsToFlowsCommand.php b/lib/Command/MigrateAutomaticActionsToFlowsCommand.php
new file mode 100644
index 000000000..02672fee5
--- /dev/null
+++ b/lib/Command/MigrateAutomaticActionsToFlowsCommand.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Dossiq dossiq:actions:migrate-to-flows command.
+ *
+ * Projects stored `automaticAction` objects onto OpenRegister flows, so the
+ * configuration becomes executable. It is a command rather than a repair step
+ * because `FlowService` refuses to create a flow without a signed-in owner and
+ * an active organisation, and an upgrade runs as nobody — see
+ * {@see \OCA\Dossiq\Service\Actions\AutomaticActionFlowMigrator}.
+ *
+ * @category Command
+ * @package  OCA\Dossiq\Command
+ *
+ * @author    Conduction Development Team <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * SPDX-License-Identifier: EUPL-1.2
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ *
+ * @version GIT: <git-id>
+ *
+ * @link https://conduction.nl
+ *
+ * @spec openspec/changes/page-topology-cleanup/tasks.md
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Command;
+
+use OCA\Dossiq\Service\Actions\AutomaticActionFlowMigrator;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Migrate Dossiq automatic actions to OpenRegister flows.
+ *
+ * @spec openspec/changes/page-topology-cleanup/tasks.md
+ */
+class MigrateAutomaticActionsToFlowsCommand extends Command {
+	/**
+	 * Wire the command against the migrator.
+	 *
+	 * @param AutomaticActionFlowMigrator $migrator The migrator.
+	 * @param IUserManager $userManager Resolves the acting user.
+	 */
+	public function __construct(
+		private readonly AutomaticActionFlowMigrator $migrator,
+		private readonly IUserManager $userManager,
+	) {
+		parent::__construct();
+	}//end __construct()
+
+	/**
+	 * Define the command name, description and options.
+	 *
+	 * `--user` is REQUIRED and has no default. The created flows inherit that
+	 * user's identity and organisation permanently, so guessing an owner would
+	 * hand every migrated flow to whoever the guess landed on.
+	 *
+	 * @return void
+	 *
+	 * @spec openspec/changes/page-topology-cleanup/tasks.md
+	 */
+	protected function configure(): void {
+		$this->setName(name: 'dossiq:actions:migrate-to-flows')
+			->setDescription(
+				'Migrate Dossiq automatic actions to OpenRegister flows (idempotent). '
+				. 'The flows are created ENABLED, so actions that never fired before will start firing — '
+				. 'use --dry-run first.'
+			)
+			->addOption(
+				name: 'user',
+				mode: InputOption::VALUE_REQUIRED,
+				description: 'UID the created flows belong to; also supplies the active organisation.'
+			)
+			->addOption(
+				name: 'dry-run',
+				mode: InputOption::VALUE_NONE,
+				description: 'Report what would be created or updated, and write nothing.'
+			);
+	}//end configure()
+
+	/**
+	 * Run the migration and report per-action outcomes.
+	 *
+	 * @param InputInterface $input Console input.
+	 * @param OutputInterface $output Console output.
+	 *
+	 * @return int Symfony command exit code.
+	 *
+	 * @spec openspec/changes/page-topology-cleanup/tasks.md
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$uid = (string)($input->getOption('user') ?? '');
+		if ($uid === '') {
+			$output->writeln('<error>--user is required: a flow needs an owner and an organisation.</error>');
+			return Command::INVALID;
+		}
+
+		$user = $this->userManager->get($uid);
+		if ($user === null) {
+			$output->writeln('<error>No such user: ' . $uid . '</error>');
+			return Command::INVALID;
+		}
+
+		$dryRun = (bool)$input->getOption('dry-run');
+		$summary = $this->migrator->migrate(user: $user, dryRun: $dryRun);
+
+		return $this->report(summary: $summary, dryRun: $dryRun, output: $output);
+	}//end execute()
+
+	/**
+	 * Print the summary, and decide the exit code from it.
+	 *
+	 * A failed row exits non-zero. Reporting success over a partial migration is
+	 * how a caller ends up believing data moved that did not.
+	 *
+	 * @param array<string, mixed> $summary The migrator's summary.
+	 * @param bool $dryRun Whether this was a dry run.
+	 * @param OutputInterface $output Console output.
+	 *
+	 * @return int Symfony command exit code.
+	 */
+	private function report(array $summary, bool $dryRun, OutputInterface $output): int {
+		if (isset($summary['note']) === true && $summary['note'] !== '') {
+			$output->writeln('<comment>' . (string)$summary['note'] . '</comment>');
+			return Command::SUCCESS;
+		}
+
+		$prefix = 'dossiq:actions:migrate-to-flows';
+		if ($dryRun === true) {
+			$prefix .= ' (dry run — nothing was written)';
+		}
+
+		$output->writeln('<info>' . $prefix . '</info>');
+		foreach (['total', 'created', 'updated', 'skipped', 'failed'] as $key) {
+			$output->writeln('  ' . str_pad($key, 8) . ' = ' . (string)$summary[$key]);
+		}
+
+		foreach ($summary['rows'] as $row) {
+			$output->writeln('  [' . $row['outcome'] . '] ' . $row['marker'] . ' — ' . $row['detail']);
+		}
+
+		if ($summary['failed'] > 0) {
+			return Command::FAILURE;
+		}
+
+		return Command::SUCCESS;
+	}//end report()
+}//end class
diff --git a/lib/Controller/AgendaController.php b/lib/Controller/AgendaController.php
deleted file mode 100644
index bf1bb4dfb..000000000
--- a/lib/Controller/AgendaController.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * Dossiq AgendaController
- *
- * REST API controller for besluitvorming agenda management. Adds and updates
- * agenda items on cases (besluitvorming workflow). Authenticated-user only;
- * mandates and per-case authorization are enforced via the underlying
- * OpenRegister object permissions (ADR-022).
- *
- * @category Controller
- * @package  OCA\Dossiq\Controller
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- *
- * @link https://conduction.nl
- *
- * @spec openspec/changes/besluitvorming-workflow/tasks.md#task-4
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Controller;
-
-use OCA\Dossiq\AppInfo\Application;
-use OCA\Dossiq\Service\AgendaService;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\Attribute\NoAdminRequired;
-use OCP\AppFramework\Http\JSONResponse;
-use OCP\IRequest;
-use OCP\IUserSession;
-use Psr\Log\LoggerInterface;
-use Throwable;
-
-/**
- * Controller exposing besluitvorming agenda endpoints.
- *
- * @psalm-suppress UnusedClass
- */
-class AgendaController extends Controller {
-	/**
-	 * Constructor.
-	 *
-	 * @param IRequest $request The request.
-	 * @param AgendaService $agendaService Agenda-item service.
-	 * @param IUserSession $userSession User session for guard.
-	 * @param LoggerInterface $logger Logger.
-	 */
-	public function __construct(
-		IRequest $request,
-		private readonly AgendaService $agendaService,
-		private readonly IUserSession $userSession,
-		private readonly LoggerInterface $logger,
-	) {
-		parent::__construct(appName: Application::APP_ID, request: $request);
-	}//end __construct()
-
-	/**
-	 * Add a new agenda item to a case.
-	 *
-	 * @param string $id The case id.
-	 *
-	 * @return JSONResponse The updated agenda items list.
-	 *
-	 * @psalm-suppress PossiblyUnusedMethod
-	 *
-	 * @spec openspec/changes/besluitvorming-workflow/tasks.md#task-4
-	 */
-	#[NoAdminRequired]
-	public function addToAgenda(string $id): JSONResponse {
-		$unauthorized = $this->requireAuthenticated();
-		if ($unauthorized !== null) {
-			return $unauthorized;
-		}
-
-		$payload = $this->bodyParams();
-
-		try {
-			$result = $this->agendaService->addToAgenda(caseId: $id, item: $payload);
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'AgendaController::addToAgenda failed: ' . $e->getMessage(),
-				['app' => Application::APP_ID, 'caseId' => $id]
-			);
-			return new JSONResponse(
-				['error' => $e->getMessage()],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		return new JSONResponse($result, Http::STATUS_CREATED);
-	}//end addToAgenda()
-
-	/**
-	 * Update an existing agenda item on a case.
-	 *
-	 * @param string $id The case id.
-	 *
-	 * @return JSONResponse The updated agenda items list.
-	 *
-	 * @psalm-suppress PossiblyUnusedMethod
-	 *
-	 * @spec openspec/changes/besluitvorming-workflow/tasks.md#task-4
-	 */
-	#[NoAdminRequired]
-	public function updateAgendaItem(string $id): JSONResponse {
-		$unauthorized = $this->requireAuthenticated();
-		if ($unauthorized !== null) {
-			return $unauthorized;
-		}
-
-		$payload = $this->bodyParams();
-
-		try {
-			$result = $this->agendaService->updateAgendaItem(caseId: $id, patch: $payload);
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'AgendaController::updateAgendaItem failed: ' . $e->getMessage(),
-				['app' => Application::APP_ID, 'caseId' => $id]
-			);
-			return new JSONResponse(
-				['error' => $e->getMessage()],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		return new JSONResponse($result, Http::STATUS_OK);
-	}//end updateAgendaItem()
-
-	/**
-	 * Read JSON / form body params, excluding routing params.
-	 *
-	 * @return array<string, mixed> The body params.
-	 */
-	private function bodyParams(): array {
-		$params = $this->request->getParams();
-		unset($params['id'], $params['_route']);
-		return $params;
-	}//end bodyParams()
-
-	/**
-	 * Require an authenticated user; return a response otherwise.
-	 *
-	 * @return JSONResponse|null Null when authorised, a response when blocked.
-	 */
-	private function requireAuthenticated(): ?JSONResponse {
-		if ($this->userSession->getUser() === null) {
-			return new JSONResponse(
-				['error' => 'Authenticatie vereist'],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		return null;
-	}//end requireAuthenticated()
-}//end class
diff --git a/lib/Controller/ParafeerRouteController.php b/lib/Controller/ParafeerRouteController.php
deleted file mode 100644
index 40d782283..000000000
--- a/lib/Controller/ParafeerRouteController.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-/**
- * Dossiq ParafeerRoute Controller
- *
- * REST endpoints for voorstel-level parafering engine operations
- * (start, complete step, skip step, ad-hoc step). Generic CRUD on
- * parafeerroute objects is delegated to OpenRegister's auto-exposed
- * /api/objects/<register>/<schema> endpoints — this controller only
- * hosts the workflow engine that has business logic beyond storage.
- *
- * @category Controller
- * @package  OCA\Dossiq\Controller
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2024 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2024 Conduction B.V. <info@conduction.nl>
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Controller;
-
-use OCA\Dossiq\Service\ParafeerRouteService;
-use OCA\Dossiq\Settings\AdminSettings;
-use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting;
-use OCP\AppFramework\Http\Attribute\NoAdminRequired;
-use OCP\AppFramework\Http\JSONResponse;
-use OCP\IGroupManager;
-use OCP\IRequest;
-use OCP\IUserSession;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Throwable;
-
-/**
- * Controller for the voorstel parafering routing engine.
- *
- * @spec openspec/changes/parafeerroute-engine/tasks.md#T05
- *
- * @psalm-suppress UnusedClass
- */
-class ParafeerRouteController extends Controller {
-	/**
-	 * Constructor.
-	 *
-	 * @param string $appName App name
-	 * @param IRequest $request Request object
-	 * @param ParafeerRouteService $routeService Route engine service
-	 * @param IUserSession $userSession User session
-	 * @param IGroupManager $groupManager Group manager (admin check)
-	 * @param LoggerInterface $logger Logger
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private readonly ParafeerRouteService $routeService,
-		private readonly IUserSession $userSession,
-		private readonly IGroupManager $groupManager,
-		private readonly LoggerInterface $logger,
-	) {
-		parent::__construct(appName: $appName, request: $request);
-	}//end __construct()
-
-	/**
-	 * Start parafering on a voorstel.
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 *
-	 * @return JSONResponse
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @psalm-suppress PossiblyUnusedMethod
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T05
-	 */
-	public function start(string $proposalId): JSONResponse {
-		if ($this->requireUser() === false) {
-			return new JSONResponse(
-				['error' => 'Authenticatie vereist'],
-				Http::STATUS_UNAUTHORIZED,
-			);
-		}
-
-		try {
-			return new JSONResponse($this->routeService->startParafering($proposalId));
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'Dossiq: failed to start parafering: ' . $e->getMessage(),
-			);
-			return new JSONResponse(
-				['error' => 'Starten van parafering mislukt'],
-				Http::STATUS_INTERNAL_SERVER_ERROR,
-			);
-		}
-	}//end start()
-
-	/**
-	 * Complete the active step on a voorstel.
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 *
-	 * @return JSONResponse
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @psalm-suppress PossiblyUnusedMethod
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T05
-	 */
-	public function completeStep(string $proposalId): JSONResponse {
-		if ($this->requireUser() === false) {
-			return new JSONResponse(
-				['error' => 'Authenticatie vereist'],
-				Http::STATUS_UNAUTHORIZED,
-			);
-		}
-
-		try {
-			$data = $this->getRequestBody();
-			return new JSONResponse($this->routeService->completeStep($proposalId, $data));
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'Dossiq: failed to complete parafering step: ' . $e->getMessage(),
-			);
-			return new JSONResponse(
-				['error' => 'Stap kon niet worden voltooid'],
-				Http::STATUS_INTERNAL_SERVER_ERROR,
-			);
-		}
-	}//end completeStep()
-
-	/**
-	 * Skip a step on a voorstel (manager only; mandatory reason).
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 *
-	 * @return JSONResponse
-	 *
-	 * @psalm-suppress PossiblyUnusedMethod
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T05
-	 */
-	#[AuthorizedAdminSetting(AdminSettings::class)]
-	public function skipStep(string $proposalId): JSONResponse {
-		if ($this->requireAdmin() === false) {
-			return new JSONResponse(
-				['error' => 'Manager-rechten vereist'],
-				Http::STATUS_FORBIDDEN,
-			);
-		}
-
-		try {
-			$data = $this->getRequestBody();
-			$step = (int)($data['step'] ?? 0);
-			$reason = trim((string)($data['reason'] ?? ''));
-
-			if ($step < 1) {
-				return new JSONResponse(
-					['error' => 'Geldig stapnummer is vereist'],
-					Http::STATUS_BAD_REQUEST,
-				);
-			}
-
-			if ($reason === '') {
-				return new JSONResponse(
-					['error' => 'Reden is verplicht bij overslaan'],
-					Http::STATUS_BAD_REQUEST,
-				);
-			}
-
-			return new JSONResponse($this->routeService->skipStep($proposalId, $step, $reason));
-		} catch (RuntimeException $e) {
-			$this->logger->warning(
-				'Dossiq: parafering skip blocked: ' . $e->getMessage(),
-			);
-			return new JSONResponse(
-				['error' => 'Deze stap kan niet worden overgeslagen'],
-				Http::STATUS_BAD_REQUEST,
-			);
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'Dossiq: failed to skip parafering step: ' . $e->getMessage(),
-			);
-			return new JSONResponse(
-				['error' => 'Stap overslaan mislukt'],
-				Http::STATUS_INTERNAL_SERVER_ERROR,
-			);
-		}//end try
-	}//end skipStep()
-
-	/**
-	 * Add an ad-hoc step to a voorstel route snapshot.
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 *
-	 * @return JSONResponse
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @psalm-suppress PossiblyUnusedMethod
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T05
-	 */
-	public function addStep(string $proposalId): JSONResponse {
-		if ($this->requireUser() === false) {
-			return new JSONResponse(
-				['error' => 'Authenticatie vereist'],
-				Http::STATUS_UNAUTHORIZED,
-			);
-		}
-
-		try {
-			$data = $this->getRequestBody();
-			$afterStep = (int)($data['afterStep'] ?? 0);
-			$stepData = $data['stepData'] ?? [];
-			if (is_array($stepData) === false) {
-				$stepData = [];
-			}
-
-			return new JSONResponse(
-				$this->routeService->addAdhocStep($proposalId, $afterStep, $stepData),
-			);
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'Dossiq: failed to add ad-hoc parafering step: ' . $e->getMessage(),
-			);
-			return new JSONResponse(
-				['error' => 'Stap toevoegen mislukt'],
-				Http::STATUS_INTERNAL_SERVER_ERROR,
-			);
-		}
-	}//end addStep()
-
-	/**
-	 * Check whether the current user is in the admin group.
-	 *
-	 * @return bool
-	 */
-	private function requireAdmin(): bool {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return false;
-		}
-
-		return $this->groupManager->isAdmin($user->getUID());
-	}//end requireAdmin()
-
-	/**
-	 * Check whether a session user is available.
-	 *
-	 * @return bool
-	 */
-	private function requireUser(): bool {
-		return $this->userSession->getUser() !== null;
-	}//end requireUser()
-
-	/**
-	 * Parse the request body as a JSON associative array.
-	 *
-	 * @return array<string, mixed>
-	 */
-	private function getRequestBody(): array {
-		$body = file_get_contents('php://input');
-		if ($body === false || $body === '') {
-			return [];
-		}
-
-		$decoded = json_decode($body, true);
-		if (is_array($decoded) === true) {
-			return $decoded;
-		}
-
-		return [];
-	}//end getRequestBody()
-}//end class
diff --git a/lib/Flow/ProcestActionNode.php b/lib/Flow/DossiqActionNode.php
similarity index 56%
rename from lib/Flow/ProcestActionNode.php
rename to lib/Flow/DossiqActionNode.php
index e7d31cb34..c4cc28a6a 100644
--- a/lib/Flow/ProcestActionNode.php
+++ b/lib/Flow/DossiqActionNode.php
@@ -20,26 +20,29 @@
  * Base for the CONFIGURED-ACTION catalogue nodes.
  *
  * `lib/Service/Actions/` — the six reusable actions administered as
- * `automaticAction` objects. They take the `procest.action.*` id space, because
+ * `automaticAction` objects. They take the `dossiq.action.*` id space, because
  * the live transition vocabulary owns the plain names and both systems ship a
  * `sendEmail`.
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-abstract class ProcestActionNode extends ProcestFlowNodeBase {
-
-	/**
-	 * This node's id.
-	 *
-	 * Derived from the handler's own type slug, so it cannot drift from the
-	 * handler it runs.
-	 *
-	 * @return string The namespaced node id.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	protected function nodeId(): string {
-		return 'procest.action.' . $this->handler()->type();
-	}//end nodeId()
+abstract class DossiqActionNode extends DossiqFlowNodeBase {
+
+
+    /**
+     * This node's id.
+     *
+     * Derived from the handler's own type slug, so it cannot drift from the
+     * handler it runs.
+     *
+     * @return string The namespaced node id.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    protected function nodeId(): string {
+        return 'dossiq.action.' . $this->handler()->type();
+
+    }//end nodeId()
+
 
 }//end class
diff --git a/lib/Flow/ProcestCallWebhookNode.php b/lib/Flow/DossiqCallWebhookNode.php
similarity index 94%
rename from lib/Flow/ProcestCallWebhookNode.php
rename to lib/Flow/DossiqCallWebhookNode.php
index 3a62b8065..2abb175fe 100644
--- a/lib/Flow/ProcestCallWebhookNode.php
+++ b/lib/Flow/DossiqCallWebhookNode.php
@@ -26,12 +26,12 @@
  * Flow node for the `callWebhook` action.
  *
  * A thin wrapper: CallWebhookHandler keeps the logic, this presents it to
- * OpenRegister's engine. See ProcestActionNode for why these are contributed
+ * OpenRegister's engine. See DossiqActionNode for why these are contributed
  * nodes rather than a mapping onto OpenRegister's own.
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-class ProcestCallWebhookNode extends ProcestActionNode {
+class DossiqCallWebhookNode extends DossiqActionNode {
 
 	/**
 	 * Constructor.
diff --git a/lib/Flow/ProcestCreateDocumentNode.php b/lib/Flow/DossiqCreateDocumentNode.php
similarity index 94%
rename from lib/Flow/ProcestCreateDocumentNode.php
rename to lib/Flow/DossiqCreateDocumentNode.php
index 0df247d29..a2a787366 100644
--- a/lib/Flow/ProcestCreateDocumentNode.php
+++ b/lib/Flow/DossiqCreateDocumentNode.php
@@ -26,12 +26,12 @@
  * Flow node for the `createDocument` action.
  *
  * A thin wrapper: CreateDocumentHandler keeps the logic, this presents it to
- * OpenRegister's engine. See ProcestActionNode for why these are contributed
+ * OpenRegister's engine. See DossiqActionNode for why these are contributed
  * nodes rather than a mapping onto OpenRegister's own.
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-class ProcestCreateDocumentNode extends ProcestActionNode {
+class DossiqCreateDocumentNode extends DossiqActionNode {
 
 	/**
 	 * Constructor.
diff --git a/lib/Flow/DossiqFlowNodeBase.php b/lib/Flow/DossiqFlowNodeBase.php
new file mode 100644
index 000000000..bd4d73659
--- /dev/null
+++ b/lib/Flow/DossiqFlowNodeBase.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\OpenRegister\Service\Flow\IFlowNode;
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCP\IL10N;
+use OCP\WorkflowEngine\IManager;
+use OCP\IURLGenerator;
+use UnexpectedValueException;
+
+/**
+ * Presents one dossiq action handler to OpenRegister's flow engine.
+ *
+ * Two families extend this: DossiqActionNode for the configured-action
+ * catalogue (`dossiq.action.*`) and DossiqTransitionNode for the live
+ * transition vocabulary (`dossiq.*`). They are siblings rather than one base
+ * with fifteen children because they ARE two systems — and phpmd flagged the
+ * single hierarchy at exactly the point where that stopped being expressible.
+ *
+ * WHY A NODE AND NOT A MAPPING. OpenRegister's engine registers nineteen nodes
+ * and every one of them is control-flow or data — await-signal, batch, filter,
+ * iterate, map, merge, object-read, object-write, route, set-fields, sub-flow,
+ * switch, the three triggers, wait. Not one does anything outward-facing. All
+ * six dossiq actions DO: they send mail, call a webhook, render a document,
+ * notify a role. Mapping them onto existing nodes would mean inventing
+ * behaviour OpenRegister deliberately does not own, so dossiq contributes them
+ * instead — which is what FlowNodeRegistry is built for ("apps present nodes
+ * through OpenRegister"), and what hermiq already does with its agent nodes.
+ *
+ * THE HANDLERS KEEP THEIR LOGIC. This is a wrapper, not a port: each subclass
+ * hands its existing ActionHandlerInterface the same `(actionConfig, case,
+ * transitionContext)` it always got. What changes is who calls it — the flow
+ * engine rather than dossiq's private registry.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+abstract class DossiqFlowNodeBase implements IFlowNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param IL10N         $l10n The localisation service.
+     * @param IURLGenerator $urls The URL generator, for the node icon.
+     *
+     * @return void
+     */
+    public function __construct(
+        protected readonly IL10N $l10n,
+        protected readonly IURLGenerator $urls,
+    ) {
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * A UNION, because dossiq carries two action systems with two interfaces
+     * of the same name in different namespaces. They declare an identical
+     * `handle(array, array, array): ActionResult` and their ActionResults have
+     * an identical shape (succeeded / error / data), so one node body serves
+     * both — and naming both here says so out loud rather than duck-typing it.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    abstract protected function handler(): CatalogueActionHandler|TransitionActionHandler;
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    abstract protected function requiredConfigKeys(): array;
+
+
+    /**
+     * This node's id.
+     *
+     * Stated by the subclass rather than derived, because the two action
+     * systems both ship a `sendEmail` and their ids would collide. The LIVE
+     * transition vocabulary takes the plain `dossiq.<type>` names; the
+     * configured-action catalogue takes `dossiq.action.<type>`.
+     *
+     * @return string The namespaced node id.
+     */
+    abstract protected function nodeId(): string;
+
+
+    /**
+     * The node id.
+     *
+     * @return string The namespaced node id.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getId(): string {
+        return $this->nodeId();
+
+    }//end getId()
+
+
+    /**
+     * The node icon.
+     *
+     * @return string The icon path.
+     */
+    public function getIcon(): string {
+        return $this->urls->imagePath('dossiq', 'app-dark.svg');
+
+    }//end getIcon()
+
+
+    /**
+     * Reject a config this node cannot act on.
+     *
+     * @param array<string, mixed> $config The step config.
+     *
+     * @return void
+     *
+     * @throws UnexpectedValueException When a required key is missing.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function validateConfig(array $config): void {
+        foreach ($this->requiredConfigKeys() as $key) {
+            if (trim((string) ($config[$key] ?? '')) === '') {
+                throw new UnexpectedValueException(
+                    $this->l10n->t('%1$s needs a value for "%2$s".', [$this->getDisplayName(), $key])
+                );
+            }
+        }
+
+    }//end validateConfig()
+
+
+    /**
+     * Run the handler once per item.
+     *
+     * The item's `json` payload is the case; the flow context carries the
+     * transition. A FAILED action THROWS rather than returning the item
+     * untouched: the engine's per-step `onError` policy is what decides, and it
+     * only ever sees failures that propagate out of execute(). Swallowing one
+     * here would make the step a silent pass-through whose output key is simply
+     * absent — and a downstream router would then take its default branch as
+     * though the action had succeeded.
+     *
+     * @param array<int, array<string, mixed>> $items   The items to act on.
+     * @param array<string, mixed>             $config  The step config.
+     * @param array<string, mixed>             $context The run context.
+     *
+     * @return array<int, array<string, mixed>> The items, each carrying the result.
+     *
+     * @throws UnexpectedValueException When the config is unusable.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function execute(array $items, array $config, array $context): array {
+        // ValidateConfig() only runs when a flow is SAVED; a flow imported or
+        // seeded through another path reaches execute() unvalidated. Same shape
+        // of defect hermiq's agent node documents, so the same guard.
+        $this->validateConfig(config: $config);
+
+        $outKey = (string) ($config['output'] ?? 'actionResult');
+        $out    = [];
+
+        foreach ($items as $item) {
+            $case   = (array) ($item['json'] ?? []);
+            $result = $this->handler()->handle(
+                actionConfig: $config,
+                case: $case,
+                transitionContext: $context
+            );
+
+            if ($result->succeeded === false) {
+                throw new UnexpectedValueException(
+                    (string) ($result->error ?? $this->l10n->t('The action did not complete.'))
+                );
+            }
+
+            $item['json'] = array_merge($case, [$outKey => $result->data]);
+            $out[]        = $item;
+        }//end foreach
+
+        return $out;
+
+    }//end execute()
+
+    /**
+     * Where this node may be offered.
+     *
+     * Admin and user scope, matching every other action-bearing node in the
+     * fleet: a case action is not a system-internal step.
+     *
+     * @param integer $scope The Nextcloud workflow scope.
+     *
+     * @return boolean True when available in this scope.
+     */
+    public function isAvailableForScope(int $scope): bool {
+        return in_array($scope, [IManager::SCOPE_ADMIN, IManager::SCOPE_USER], true);
+
+    }//end isAvailableForScope()
+
+
+}//end class
diff --git a/lib/Flow/DossiqFlowNodeListener.php b/lib/Flow/DossiqFlowNodeListener.php
new file mode 100644
index 000000000..a79443e6f
--- /dev/null
+++ b/lib/Flow/DossiqFlowNodeListener.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\OpenRegister\Service\Flow\IFlowNode;
+use OCA\OpenRegister\Service\Flow\RegisterFlowNodesEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+/**
+ * Presents dossiq's case actions to OpenRegister's flow engine.
+ *
+ * ADR-065: OpenRegister owns the flow engine and no leaf app grows a second
+ * one. dossiq does not keep one — it CONTRIBUTES what its cases can do, which
+ * is what FlowNodeRegistry is built for and what hermiq already does.
+ *
+ * TWO VOCABULARIES, DELIBERATELY DISTINCT IDS. dossiq carries two action
+ * systems and both ship a `sendEmail`. The LIVE transition vocabulary — what
+ * SideEffectDispatcher fires on every status change — takes the plain
+ * `dossiq.*` ids; the configured-action catalogue takes `dossiq.action.*`.
+ * Without that split one handler would silently shadow the other and a flow
+ * builder picking "Send email" would get whichever registered last.
+ *
+ * NODES ARE RESOLVED FROM A LIST, not injected one per constructor parameter.
+ * Fifteen named parameters is not a wiring style, it is a coupling problem —
+ * phpmd said so at 15 params and a coupling of 17. A class-string list keeps
+ * adding a node to one line and keeps this class's own dependencies at two.
+ *
+ * @template-implements IEventListener<RegisterFlowNodesEvent>
+ *
+ * @psalm-suppress InvalidTemplateParam RegisterFlowNodesEvent is OpenRegister's,
+ *     loaded at runtime and suppressed as an undefined class in psalm.xml, so
+ *     psalm cannot see that it extends OCP\EventDispatcher\Event and cannot
+ *     check the template argument. The annotation is still correct and is what
+ *     the engine actually dispatches; only the proof is unavailable here.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqFlowNodeListener implements IEventListener {
+
+    /**
+     * The nodes dossiq contributes, in catalogue order.
+     *
+     * The live transition vocabulary first — it is the one that runs.
+     *
+     * @var class-string<IFlowNode>[]
+     *
+     * @psalm-suppress InvalidConstantAssignmentValue Every class listed here
+     *     does implement IFlowNode, but IFlowNode is OpenRegister's and is
+     *     suppressed as undefined (psalm.xml), so psalm cannot verify the
+     *     implements-relationship and rejects the narrowing. The declared type
+     *     is the contract this list must satisfy and is kept deliberately —
+     *     widening it to plain class-string would silence the error by giving
+     *     up the only statement of intent this constant carries.
+     */
+    private const NODES = [
+        // Live: fired by SideEffectDispatcher on every status change.
+        DossiqTxSendEmailNode::class,
+        DossiqTxCreateTaskNode::class,
+        DossiqTxCreateSubCaseNode::class,
+        DossiqTxWebhookNode::class,
+        DossiqTxSetFieldNode::class,
+        DossiqTxNotifyNode::class,
+        DossiqTxBesluitvormingActivateNode::class,
+        DossiqTxBesluitvormingPublishNode::class,
+        DossiqTxEvaluateDecisionNode::class,
+        // The configured-action catalogue.
+        DossiqSendEmailNode::class,
+        DossiqNotifyRoleNode::class,
+        DossiqCallWebhookNode::class,
+        DossiqCreateDocumentNode::class,
+        DossiqMergeTemplateNode::class,
+        DossiqScheduleReminderNode::class,
+    ];
+
+
+    /**
+     * Constructor.
+     *
+     * @param ContainerInterface $container Resolves each node.
+     * @param LoggerInterface    $logger    The logger.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly ContainerInterface $container,
+        private readonly LoggerInterface $logger,
+    ) {
+
+    }//end __construct()
+
+
+    /**
+     * Register dossiq's nodes on the catalogue.
+     *
+     * A node that cannot be constructed is logged and SKIPPED rather than
+     * aborting the loop: one unresolvable dependency must not cost the other
+     * fourteen their place in the catalogue, and a missing node is visible
+     * (the flow editor simply does not offer it) where a failed registration
+     * would take everything down with it.
+     *
+     * @param Event $event The event to handle.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function handle(Event $event): void {
+        if (($event instanceof RegisterFlowNodesEvent) === false) {
+            return;
+        }
+
+        foreach (self::NODES as $class) {
+            try {
+                $node = $this->container->get($class);
+            } catch (Throwable $e) {
+                $this->logger->warning(
+                    'DossiqFlowNodeListener: could not construct a flow node; it will not be offered',
+                    ['node' => $class, 'error' => $e->getMessage()],
+                );
+                continue;
+            }
+
+            if (($node instanceof IFlowNode) === false) {
+                continue;
+            }
+
+            $event->registerNode(node: $node);
+        }//end foreach
+
+    }//end handle()
+
+
+}//end class
diff --git a/lib/Flow/ProcestMergeTemplateNode.php b/lib/Flow/DossiqMergeTemplateNode.php
similarity index 94%
rename from lib/Flow/ProcestMergeTemplateNode.php
rename to lib/Flow/DossiqMergeTemplateNode.php
index a8d9ad2ca..8c2e934ca 100644
--- a/lib/Flow/ProcestMergeTemplateNode.php
+++ b/lib/Flow/DossiqMergeTemplateNode.php
@@ -26,12 +26,12 @@
  * Flow node for the `mergeTemplate` action.
  *
  * A thin wrapper: MergeTemplateHandler keeps the logic, this presents it to
- * OpenRegister's engine. See ProcestActionNode for why these are contributed
+ * OpenRegister's engine. See DossiqActionNode for why these are contributed
  * nodes rather than a mapping onto OpenRegister's own.
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-class ProcestMergeTemplateNode extends ProcestActionNode {
+class DossiqMergeTemplateNode extends DossiqActionNode {
 
 	/**
 	 * Constructor.
diff --git a/lib/Flow/ProcestNotifyRoleNode.php b/lib/Flow/DossiqNotifyRoleNode.php
similarity index 94%
rename from lib/Flow/ProcestNotifyRoleNode.php
rename to lib/Flow/DossiqNotifyRoleNode.php
index 468fc0476..93bc2cbdc 100644
--- a/lib/Flow/ProcestNotifyRoleNode.php
+++ b/lib/Flow/DossiqNotifyRoleNode.php
@@ -26,12 +26,12 @@
  * Flow node for the `notifyRole` action.
  *
  * A thin wrapper: NotifyRoleHandler keeps the logic, this presents it to
- * OpenRegister's engine. See ProcestActionNode for why these are contributed
+ * OpenRegister's engine. See DossiqActionNode for why these are contributed
  * nodes rather than a mapping onto OpenRegister's own.
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-class ProcestNotifyRoleNode extends ProcestActionNode {
+class DossiqNotifyRoleNode extends DossiqActionNode {
 
 	/**
 	 * Constructor.
diff --git a/lib/Flow/ProcestScheduleReminderNode.php b/lib/Flow/DossiqScheduleReminderNode.php
similarity index 94%
rename from lib/Flow/ProcestScheduleReminderNode.php
rename to lib/Flow/DossiqScheduleReminderNode.php
index 64650a346..f7e1b00f5 100644
--- a/lib/Flow/ProcestScheduleReminderNode.php
+++ b/lib/Flow/DossiqScheduleReminderNode.php
@@ -26,12 +26,12 @@
  * Flow node for the `scheduleReminder` action.
  *
  * A thin wrapper: ScheduleReminderHandler keeps the logic, this presents it to
- * OpenRegister's engine. See ProcestActionNode for why these are contributed
+ * OpenRegister's engine. See DossiqActionNode for why these are contributed
  * nodes rather than a mapping onto OpenRegister's own.
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-class ProcestScheduleReminderNode extends ProcestActionNode {
+class DossiqScheduleReminderNode extends DossiqActionNode {
 
 	/**
 	 * Constructor.
diff --git a/lib/Flow/ProcestSendEmailNode.php b/lib/Flow/DossiqSendEmailNode.php
similarity index 94%
rename from lib/Flow/ProcestSendEmailNode.php
rename to lib/Flow/DossiqSendEmailNode.php
index 60f5c36ea..9b4bfc44c 100644
--- a/lib/Flow/ProcestSendEmailNode.php
+++ b/lib/Flow/DossiqSendEmailNode.php
@@ -26,12 +26,12 @@
  * Flow node for the `sendEmail` action.
  *
  * A thin wrapper: SendEmailHandler keeps the logic, this presents it to
- * OpenRegister's engine. See ProcestActionNode for why these are contributed
+ * OpenRegister's engine. See DossiqActionNode for why these are contributed
  * nodes rather than a mapping onto OpenRegister's own.
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-class ProcestSendEmailNode extends ProcestActionNode {
+class DossiqSendEmailNode extends DossiqActionNode {
 
 	/**
 	 * Constructor.
diff --git a/lib/Flow/ProcestTransitionNode.php b/lib/Flow/DossiqTransitionNode.php
similarity index 85%
rename from lib/Flow/ProcestTransitionNode.php
rename to lib/Flow/DossiqTransitionNode.php
index b7695078f..e5a47e421 100644
--- a/lib/Flow/ProcestTransitionNode.php
+++ b/lib/Flow/DossiqTransitionNode.php
@@ -20,7 +20,7 @@
  * Base for the LIVE transition-action nodes.
  *
  * `lib/Service/Transitions/` — the nine actions SideEffectDispatcher fires on
- * every case status change. They take the plain `procest.*` id space because
+ * every case status change. They take the plain `dossiq.*` id space because
  * they are the vocabulary that actually runs.
  *
  * The subclass states its own id: these handlers carry no `type()` of their
@@ -29,6 +29,6 @@
  *
  * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
  */
-abstract class ProcestTransitionNode extends ProcestFlowNodeBase {
+abstract class DossiqTransitionNode extends DossiqFlowNodeBase {
 
 }//end class
diff --git a/lib/Flow/DossiqTxBesluitvormingActivateNode.php b/lib/Flow/DossiqTxBesluitvormingActivateNode.php
new file mode 100644
index 000000000..709b64254
--- /dev/null
+++ b/lib/Flow/DossiqTxBesluitvormingActivateNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\BesluitvormingActivateHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `besluitvormingActivate` transition action.
+ *
+ * A thin wrapper: BesluitvormingActivateHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.besluitvormingActivate` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxBesluitvormingActivateNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param BesluitvormingActivateHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly BesluitvormingActivateHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.besluitvormingActivate';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return [];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Activate decision-making');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Raise the decision-making process for this case.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxBesluitvormingPublishNode.php b/lib/Flow/DossiqTxBesluitvormingPublishNode.php
new file mode 100644
index 000000000..4538e7e73
--- /dev/null
+++ b/lib/Flow/DossiqTxBesluitvormingPublishNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\BesluitvormingPublishHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `besluitvormingPublish` transition action.
+ *
+ * A thin wrapper: BesluitvormingPublishHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.besluitvormingPublish` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxBesluitvormingPublishNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param BesluitvormingPublishHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly BesluitvormingPublishHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.besluitvormingPublish';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return [];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Publish decision');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Publish the decision to DROP/LVBB.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxCreateSubCaseNode.php b/lib/Flow/DossiqTxCreateSubCaseNode.php
new file mode 100644
index 000000000..b020ce842
--- /dev/null
+++ b/lib/Flow/DossiqTxCreateSubCaseNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\CreateSubCaseHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `createSubCase` transition action.
+ *
+ * A thin wrapper: CreateSubCaseHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.createSubCase` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxCreateSubCaseNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param CreateSubCaseHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly CreateSubCaseHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.createSubCase';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return ['caseType'];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Create sub-case');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Open a sub-case when the parent changes status.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxCreateTaskNode.php b/lib/Flow/DossiqTxCreateTaskNode.php
new file mode 100644
index 000000000..e90d56f59
--- /dev/null
+++ b/lib/Flow/DossiqTxCreateTaskNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\CreateTaskHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `createTask` transition action.
+ *
+ * A thin wrapper: CreateTaskHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.createTask` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxCreateTaskNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param CreateTaskHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly CreateTaskHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.createTask';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return ['title'];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Create task');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Create a task on the case when it changes status.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxEvaluateDecisionNode.php b/lib/Flow/DossiqTxEvaluateDecisionNode.php
new file mode 100644
index 000000000..ccbac97a5
--- /dev/null
+++ b/lib/Flow/DossiqTxEvaluateDecisionNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\EvaluateDecisionHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `evaluateDecision` transition action.
+ *
+ * A thin wrapper: EvaluateDecisionHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.evaluateDecision` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxEvaluateDecisionNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param EvaluateDecisionHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly EvaluateDecisionHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.evaluateDecision';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return ['decisionKey'];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Evaluate decision table');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Evaluate a DMN decision table against the case.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxNotifyNode.php b/lib/Flow/DossiqTxNotifyNode.php
new file mode 100644
index 000000000..caccea423
--- /dev/null
+++ b/lib/Flow/DossiqTxNotifyNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\NotifyHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `notify` transition action.
+ *
+ * A thin wrapper: NotifyHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.notify` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxNotifyNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param NotifyHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly NotifyHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.notify';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return ['recipient'];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Notify');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Send a Nextcloud notification about the status change.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxSendEmailNode.php b/lib/Flow/DossiqTxSendEmailNode.php
new file mode 100644
index 000000000..6892e425c
--- /dev/null
+++ b/lib/Flow/DossiqTxSendEmailNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\SendEmailHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `sendEmail` transition action.
+ *
+ * A thin wrapper: SendEmailHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.sendEmail` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxSendEmailNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param SendEmailHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly SendEmailHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.sendEmail';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return ['recipient'];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Send email on transition');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Send a templated email when a case changes status.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxSetFieldNode.php b/lib/Flow/DossiqTxSetFieldNode.php
new file mode 100644
index 000000000..527a6f5df
--- /dev/null
+++ b/lib/Flow/DossiqTxSetFieldNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\SetFieldHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `setField` transition action.
+ *
+ * A thin wrapper: SetFieldHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.setField` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxSetFieldNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param SetFieldHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly SetFieldHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.setField';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return ['field'];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Set field');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('Write a value onto the case as part of the transition.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/DossiqTxWebhookNode.php b/lib/Flow/DossiqTxWebhookNode.php
new file mode 100644
index 000000000..0850e5bcd
--- /dev/null
+++ b/lib/Flow/DossiqTxWebhookNode.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Flow
+ * @package   OCA\Dossiq\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Flow;
+
+use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
+use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
+use OCA\Dossiq\Service\Transitions\WebhookHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+
+/**
+ * Flow node for the live `webhook` transition action.
+ *
+ * A thin wrapper: WebhookHandler keeps the logic. This is the vocabulary
+ * SideEffectDispatcher actually fires on every status change, which is why it
+ * takes the plain `dossiq.webhook` id rather than the `dossiq.action.*`
+ * prefix the configured-action catalogue uses.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqTxWebhookNode extends DossiqTransitionNode {
+
+
+    /**
+     * Constructor.
+     *
+     * @param WebhookHandler $handler The transition handler this node runs.
+     * @param IL10N         $l10n    The localisation service.
+     * @param IURLGenerator $urls    The URL generator.
+     *
+     * @return void
+     */
+    public function __construct(
+        private readonly WebhookHandler $handler,
+        IL10N $l10n,
+        IURLGenerator $urls,
+    ) {
+        parent::__construct(l10n: $l10n, urls: $urls);
+
+    }//end __construct()
+
+
+    /**
+     * The handler this node runs.
+     *
+     * @return CatalogueActionHandler|TransitionActionHandler The action handler.
+     */
+    protected function handler(): CatalogueActionHandler|TransitionActionHandler {
+        return $this->handler;
+
+    }//end handler()
+
+
+    /**
+     * This node's id.
+     *
+     * @return string The namespaced node id.
+     */
+    protected function nodeId(): string {
+        return 'dossiq.webhook';
+
+    }//end nodeId()
+
+
+    /**
+     * Config keys without which this action cannot run.
+     *
+     * @return string[] The required key names.
+     */
+    protected function requiredConfigKeys(): array {
+        return ['url'];
+
+    }//end requiredConfigKeys()
+
+
+    /**
+     * The node's display name.
+     *
+     * @return string The translated name.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDisplayName(): string {
+        return $this->l10n->t('Call webhook on transition');
+
+    }//end getDisplayName()
+
+
+    /**
+     * What the node does.
+     *
+     * @return string The translated description.
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function getDescription(): string {
+        return $this->l10n->t('POST the case to a configured endpoint on a status change.');
+
+    }//end getDescription()
+
+
+}//end class
diff --git a/lib/Flow/ProcestFlowNodeBase.php b/lib/Flow/ProcestFlowNodeBase.php
deleted file mode 100644
index bbc81b8cf..000000000
--- a/lib/Flow/ProcestFlowNodeBase.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\OpenRegister\Service\Flow\IFlowNode;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-use OCP\WorkflowEngine\IManager;
-use UnexpectedValueException;
-
-/**
- * Presents one procest action handler to OpenRegister's flow engine.
- *
- * Two families extend this: ProcestActionNode for the configured-action
- * catalogue (`procest.action.*`) and ProcestTransitionNode for the live
- * transition vocabulary (`procest.*`). They are siblings rather than one base
- * with fifteen children because they ARE two systems — and phpmd flagged the
- * single hierarchy at exactly the point where that stopped being expressible.
- *
- * WHY A NODE AND NOT A MAPPING. OpenRegister's engine registers nineteen nodes
- * and every one of them is control-flow or data — await-signal, batch, filter,
- * iterate, map, merge, object-read, object-write, route, set-fields, sub-flow,
- * switch, the three triggers, wait. Not one does anything outward-facing. All
- * six procest actions DO: they send mail, call a webhook, render a document,
- * notify a role. Mapping them onto existing nodes would mean inventing
- * behaviour OpenRegister deliberately does not own, so procest contributes them
- * instead — which is what FlowNodeRegistry is built for ("apps present nodes
- * through OpenRegister"), and what hermiq already does with its agent nodes.
- *
- * THE HANDLERS KEEP THEIR LOGIC. This is a wrapper, not a port: each subclass
- * hands its existing ActionHandlerInterface the same `(actionConfig, case,
- * transitionContext)` it always got. What changes is who calls it — the flow
- * engine rather than procest's private registry.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-abstract class ProcestFlowNodeBase implements IFlowNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator, for the node icon.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		protected readonly IL10N $l10n,
-		protected readonly IURLGenerator $urls,
-	) {
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * A UNION, because procest carries two action systems with two interfaces
-	 * of the same name in different namespaces. They declare an identical
-	 * `handle(array, array, array): ActionResult` and their ActionResults have
-	 * an identical shape (succeeded / error / data), so one node body serves
-	 * both — and naming both here says so out loud rather than duck-typing it.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	abstract protected function handler(): CatalogueActionHandler|TransitionActionHandler;
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	abstract protected function requiredConfigKeys(): array;
-
-	/**
-	 * This node's id.
-	 *
-	 * Stated by the subclass rather than derived, because the two action
-	 * systems both ship a `sendEmail` and their ids would collide. The LIVE
-	 * transition vocabulary takes the plain `procest.<type>` names; the
-	 * configured-action catalogue takes `procest.action.<type>`.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	abstract protected function nodeId(): string;
-
-	/**
-	 * The node id.
-	 *
-	 * @return string The namespaced node id.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getId(): string {
-		return $this->nodeId();
-	}//end getId()
-
-	/**
-	 * The node icon.
-	 *
-	 * @return string The icon path.
-	 */
-	public function getIcon(): string {
-		return $this->urls->imagePath('dossiq', 'app-dark.svg');
-	}//end getIcon()
-
-	/**
-	 * Reject a config this node cannot act on.
-	 *
-	 * @param array<string, mixed> $config The step config.
-	 *
-	 * @return void
-	 *
-	 * @throws UnexpectedValueException When a required key is missing.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function validateConfig(array $config): void {
-		foreach ($this->requiredConfigKeys() as $key) {
-			if (trim((string)($config[$key] ?? '')) === '') {
-				throw new UnexpectedValueException(
-					$this->l10n->t('%1$s needs a value for "%2$s".', [$this->getDisplayName(), $key])
-				);
-			}
-		}
-
-	}//end validateConfig()
-
-	/**
-	 * Run the handler once per item.
-	 *
-	 * The item's `json` payload is the case; the flow context carries the
-	 * transition. A FAILED action THROWS rather than returning the item
-	 * untouched: the engine's per-step `onError` policy is what decides, and it
-	 * only ever sees failures that propagate out of execute(). Swallowing one
-	 * here would make the step a silent pass-through whose output key is simply
-	 * absent — and a downstream router would then take its default branch as
-	 * though the action had succeeded.
-	 *
-	 * @param array<int, array<string, mixed>> $items The items to act on.
-	 * @param array<string, mixed> $config The step config.
-	 * @param array<string, mixed> $context The run context.
-	 *
-	 * @return array<int, array<string, mixed>> The items, each carrying the result.
-	 *
-	 * @throws UnexpectedValueException When the config is unusable.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function execute(array $items, array $config, array $context): array {
-		// ValidateConfig() only runs when a flow is SAVED; a flow imported or
-		// seeded through another path reaches execute() unvalidated. Same shape
-		// of defect hermiq's agent node documents, so the same guard.
-		$this->validateConfig(config: $config);
-
-		$outKey = (string)($config['output'] ?? 'actionResult');
-		$out = [];
-
-		foreach ($items as $item) {
-			$case = (array)($item['json'] ?? []);
-			$result = $this->handler()->handle(
-				actionConfig: $config,
-				case: $case,
-				transitionContext: $context
-			);
-
-			if ($result->succeeded === false) {
-				throw new UnexpectedValueException(
-					(string)($result->error ?? $this->l10n->t('The action did not complete.'))
-				);
-			}
-
-			$item['json'] = array_merge($case, [$outKey => $result->data]);
-			$out[] = $item;
-		}//end foreach
-
-		return $out;
-	}//end execute()
-
-	/**
-	 * Where this node may be offered.
-	 *
-	 * Admin and user scope, matching every other action-bearing node in the
-	 * fleet: a case action is not a system-internal step.
-	 *
-	 * @param integer $scope The Nextcloud workflow scope.
-	 *
-	 * @return boolean True when available in this scope.
-	 */
-	public function isAvailableForScope(int $scope): bool {
-		return in_array($scope, [IManager::SCOPE_ADMIN, IManager::SCOPE_USER], true);
-	}//end isAvailableForScope()
-
-}//end class
diff --git a/lib/Flow/ProcestFlowNodeListener.php b/lib/Flow/ProcestFlowNodeListener.php
deleted file mode 100644
index 7ef33c968..000000000
--- a/lib/Flow/ProcestFlowNodeListener.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\OpenRegister\Service\Flow\IFlowNode;
-use OCA\OpenRegister\Service\Flow\RegisterFlowNodesEvent;
-use OCP\EventDispatcher\Event;
-use OCP\EventDispatcher\IEventListener;
-use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
-use Throwable;
-
-/**
- * Presents procest's case actions to OpenRegister's flow engine.
- *
- * ADR-065: OpenRegister owns the flow engine and no leaf app grows a second
- * one. procest does not keep one — it CONTRIBUTES what its cases can do, which
- * is what FlowNodeRegistry is built for and what hermiq already does.
- *
- * TWO VOCABULARIES, DELIBERATELY DISTINCT IDS. procest carries two action
- * systems and both ship a `sendEmail`. The LIVE transition vocabulary — what
- * SideEffectDispatcher fires on every status change — takes the plain
- * `procest.*` ids; the configured-action catalogue takes `procest.action.*`.
- * Without that split one handler would silently shadow the other and a flow
- * builder picking "Send email" would get whichever registered last.
- *
- * NODES ARE RESOLVED FROM A LIST, not injected one per constructor parameter.
- * Fifteen named parameters is not a wiring style, it is a coupling problem —
- * phpmd said so at 15 params and a coupling of 17. A class-string list keeps
- * adding a node to one line and keeps this class's own dependencies at two.
- *
- * @template-implements IEventListener<RegisterFlowNodesEvent>
- *
- * @psalm-suppress InvalidTemplateParam RegisterFlowNodesEvent is OpenRegister's,
- *     loaded at runtime and suppressed as an undefined class in psalm.xml, so
- *     psalm cannot see that it extends OCP\EventDispatcher\Event and cannot
- *     check the template argument. The annotation is still correct and is what
- *     the engine actually dispatches; only the proof is unavailable here.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestFlowNodeListener implements IEventListener {
-
-	/**
-	 * The nodes procest contributes, in catalogue order.
-	 *
-	 * The live transition vocabulary first — it is the one that runs.
-	 *
-	 * @var class-string<IFlowNode>[]
-	 *
-	 * @psalm-suppress InvalidConstantAssignmentValue Every class listed here
-	 *     does implement IFlowNode, but IFlowNode is OpenRegister's and is
-	 *     suppressed as undefined (psalm.xml), so psalm cannot verify the
-	 *     implements-relationship and rejects the narrowing. The declared type
-	 *     is the contract this list must satisfy and is kept deliberately —
-	 *     widening it to plain class-string would silence the error by giving
-	 *     up the only statement of intent this constant carries.
-	 */
-	private const NODES = [
-		// Live: fired by SideEffectDispatcher on every status change.
-		ProcestTxSendEmailNode::class,
-		ProcestTxCreateTaskNode::class,
-		ProcestTxCreateSubCaseNode::class,
-		ProcestTxWebhookNode::class,
-		ProcestTxSetFieldNode::class,
-		ProcestTxNotifyNode::class,
-		ProcestTxBesluitvormingActivateNode::class,
-		ProcestTxBesluitvormingPublishNode::class,
-		ProcestTxEvaluateDecisionNode::class,
-		// The configured-action catalogue.
-		ProcestSendEmailNode::class,
-		ProcestNotifyRoleNode::class,
-		ProcestCallWebhookNode::class,
-		ProcestCreateDocumentNode::class,
-		ProcestMergeTemplateNode::class,
-		ProcestScheduleReminderNode::class,
-	];
-
-	/**
-	 * Constructor.
-	 *
-	 * @param ContainerInterface $container Resolves each node.
-	 * @param LoggerInterface $logger The logger.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly ContainerInterface $container,
-		private readonly LoggerInterface $logger,
-	) {
-
-	}//end __construct()
-
-	/**
-	 * Register procest's nodes on the catalogue.
-	 *
-	 * A node that cannot be constructed is logged and SKIPPED rather than
-	 * aborting the loop: one unresolvable dependency must not cost the other
-	 * fourteen their place in the catalogue, and a missing node is visible
-	 * (the flow editor simply does not offer it) where a failed registration
-	 * would take everything down with it.
-	 *
-	 * @param Event $event The event to handle.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function handle(Event $event): void {
-		if (($event instanceof RegisterFlowNodesEvent) === false) {
-			return;
-		}
-
-		foreach (self::NODES as $class) {
-			try {
-				$node = $this->container->get($class);
-			} catch (Throwable $e) {
-				$this->logger->warning(
-					'ProcestFlowNodeListener: could not construct a flow node; it will not be offered',
-					['node' => $class, 'error' => $e->getMessage()],
-				);
-				continue;
-			}
-
-			if (($node instanceof IFlowNode) === false) {
-				continue;
-			}
-
-			$event->registerNode(node: $node);
-		}//end foreach
-
-	}//end handle()
-
-}//end class
diff --git a/lib/Flow/ProcestTxBesluitvormingActivateNode.php b/lib/Flow/ProcestTxBesluitvormingActivateNode.php
deleted file mode 100644
index 583e22cfa..000000000
--- a/lib/Flow/ProcestTxBesluitvormingActivateNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\BesluitvormingActivateHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `besluitvormingActivate` transition action.
- *
- * A thin wrapper: BesluitvormingActivateHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.besluitvormingActivate` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxBesluitvormingActivateNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param BesluitvormingActivateHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly BesluitvormingActivateHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.besluitvormingActivate';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return [];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Activate decision-making');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Raise the decision-making process for this case.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxBesluitvormingPublishNode.php b/lib/Flow/ProcestTxBesluitvormingPublishNode.php
deleted file mode 100644
index aaf07c2d1..000000000
--- a/lib/Flow/ProcestTxBesluitvormingPublishNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\BesluitvormingPublishHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `besluitvormingPublish` transition action.
- *
- * A thin wrapper: BesluitvormingPublishHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.besluitvormingPublish` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxBesluitvormingPublishNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param BesluitvormingPublishHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly BesluitvormingPublishHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.besluitvormingPublish';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return [];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Publish decision');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Publish the decision to DROP/LVBB.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxCreateSubCaseNode.php b/lib/Flow/ProcestTxCreateSubCaseNode.php
deleted file mode 100644
index 44e8610ba..000000000
--- a/lib/Flow/ProcestTxCreateSubCaseNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\CreateSubCaseHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `createSubCase` transition action.
- *
- * A thin wrapper: CreateSubCaseHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.createSubCase` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxCreateSubCaseNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param CreateSubCaseHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly CreateSubCaseHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.createSubCase';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return ['caseType'];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Create sub-case');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Open a sub-case when the parent changes status.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxCreateTaskNode.php b/lib/Flow/ProcestTxCreateTaskNode.php
deleted file mode 100644
index 4649a224f..000000000
--- a/lib/Flow/ProcestTxCreateTaskNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\CreateTaskHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `createTask` transition action.
- *
- * A thin wrapper: CreateTaskHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.createTask` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxCreateTaskNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param CreateTaskHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly CreateTaskHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.createTask';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return ['title'];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Create task');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Create a task on the case when it changes status.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxEvaluateDecisionNode.php b/lib/Flow/ProcestTxEvaluateDecisionNode.php
deleted file mode 100644
index 1a6a2fd3e..000000000
--- a/lib/Flow/ProcestTxEvaluateDecisionNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\EvaluateDecisionHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `evaluateDecision` transition action.
- *
- * A thin wrapper: EvaluateDecisionHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.evaluateDecision` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxEvaluateDecisionNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param EvaluateDecisionHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly EvaluateDecisionHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.evaluateDecision';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return ['decisionKey'];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Evaluate decision table');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Evaluate a DMN decision table against the case.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxNotifyNode.php b/lib/Flow/ProcestTxNotifyNode.php
deleted file mode 100644
index b431defd0..000000000
--- a/lib/Flow/ProcestTxNotifyNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\NotifyHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `notify` transition action.
- *
- * A thin wrapper: NotifyHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.notify` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxNotifyNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param NotifyHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly NotifyHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.notify';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return ['recipient'];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Notify');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Send a Nextcloud notification about the status change.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxSendEmailNode.php b/lib/Flow/ProcestTxSendEmailNode.php
deleted file mode 100644
index 64cbb43e7..000000000
--- a/lib/Flow/ProcestTxSendEmailNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\SendEmailHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `sendEmail` transition action.
- *
- * A thin wrapper: SendEmailHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.sendEmail` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxSendEmailNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param SendEmailHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly SendEmailHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.sendEmail';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return ['recipient'];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Send email on transition');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Send a templated email when a case changes status.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxSetFieldNode.php b/lib/Flow/ProcestTxSetFieldNode.php
deleted file mode 100644
index 5b5fe22a2..000000000
--- a/lib/Flow/ProcestTxSetFieldNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\SetFieldHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `setField` transition action.
- *
- * A thin wrapper: SetFieldHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.setField` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxSetFieldNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param SetFieldHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly SetFieldHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.setField';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return ['field'];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Set field');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('Write a value onto the case as part of the transition.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Flow/ProcestTxWebhookNode.php b/lib/Flow/ProcestTxWebhookNode.php
deleted file mode 100644
index bc49f6aaa..000000000
--- a/lib/Flow/ProcestTxWebhookNode.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Flow
- * @package   OCA\Dossiq\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Flow;
-
-use OCA\Dossiq\Service\Actions\ActionHandlerInterface as CatalogueActionHandler;
-use OCA\Dossiq\Service\Transitions\ActionHandlerInterface as TransitionActionHandler;
-use OCA\Dossiq\Service\Transitions\WebhookHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-
-/**
- * Flow node for the live `webhook` transition action.
- *
- * A thin wrapper: WebhookHandler keeps the logic. This is the vocabulary
- * SideEffectDispatcher actually fires on every status change, which is why it
- * takes the plain `procest.webhook` id rather than the `procest.action.*`
- * prefix the configured-action catalogue uses.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestTxWebhookNode extends ProcestTransitionNode {
-
-	/**
-	 * Constructor.
-	 *
-	 * @param WebhookHandler $handler The transition handler this node runs.
-	 * @param IL10N $l10n The localisation service.
-	 * @param IURLGenerator $urls The URL generator.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly WebhookHandler $handler,
-		IL10N $l10n,
-		IURLGenerator $urls,
-	) {
-		parent::__construct(l10n: $l10n, urls: $urls);
-
-	}//end __construct()
-
-	/**
-	 * The handler this node runs.
-	 *
-	 * @return CatalogueActionHandler|TransitionActionHandler The action handler.
-	 */
-	protected function handler(): CatalogueActionHandler|TransitionActionHandler {
-		return $this->handler;
-	}//end handler()
-
-	/**
-	 * This node's id.
-	 *
-	 * @return string The namespaced node id.
-	 */
-	protected function nodeId(): string {
-		return 'procest.webhook';
-	}//end nodeId()
-
-	/**
-	 * Config keys without which this action cannot run.
-	 *
-	 * @return string[] The required key names.
-	 */
-	protected function requiredConfigKeys(): array {
-		return ['url'];
-	}//end requiredConfigKeys()
-
-	/**
-	 * The node's display name.
-	 *
-	 * @return string The translated name.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDisplayName(): string {
-		return $this->l10n->t('Call webhook on transition');
-	}//end getDisplayName()
-
-	/**
-	 * What the node does.
-	 *
-	 * @return string The translated description.
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function getDescription(): string {
-		return $this->l10n->t('POST the case to a configured endpoint on a status change.');
-	}//end getDescription()
-
-}//end class
diff --git a/lib/Repair/BackfillAdviceRequestObjection.php b/lib/Repair/BackfillAdviceRequestObjection.php
new file mode 100644
index 000000000..fe5630263
--- /dev/null
+++ b/lib/Repair/BackfillAdviceRequestObjection.php
@@ -0,0 +1,197 @@
+<?php
+
+/**
+ * Dossiq repair step: backfill `bacAdviceRequest.bezwaar`.
+ *
+ * `bezwaar` is the schema-declared (and REQUIRED) property naming the objection
+ * an advice request belongs to. `objectionProceeding` is the schema it $refs.
+ * AdvisoryCommitteeService wrote the latter into the object, so every advice
+ * request created before the fix omits a required property and carries an
+ * undeclared one instead.
+ *
+ * The visible cost was on BezwaarDetail: its advice-request stats-blocks and
+ * object-list filter on `bezwaar: @objectId`, so a bezwaar rendered NO advice
+ * requests no matter how many it had. Nothing errored — an empty list is what a
+ * bezwaar without advice requests looks like too.
+ *
+ * @category Repair
+ * @package  OCA\Dossiq\Repair
+ *
+ * @author    Conduction Development Team <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * SPDX-License-Identifier: EUPL-1.2
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ *
+ * @version GIT: <git-id>
+ *
+ * @link https://conduction.nl
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Repair;
+
+use OCA\Dossiq\AppInfo\Application;
+use OCA\Dossiq\Service\SettingsService;
+use OCP\IAppConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+/**
+ * Copy the legacy objection key onto the schema-declared one.
+ *
+ * @spec openspec/changes/page-topology-cleanup/tasks.md
+ */
+class BackfillAdviceRequestObjection implements IRepairStep {
+	/**
+	 * Constructor.
+	 *
+	 * @param SettingsService $settingsService Bridge to OpenRegister.
+	 * @param IAppConfig $appConfig App configuration.
+	 * @param LoggerInterface $logger Logger.
+	 */
+	public function __construct(
+		private readonly SettingsService $settingsService,
+		private readonly IAppConfig $appConfig,
+		private readonly LoggerInterface $logger,
+	) {
+	}//end __construct()
+
+	/**
+	 * Get the name of this repair step.
+	 *
+	 * @return string
+	 *
+	 * @spec openspec/changes/page-topology-cleanup/tasks.md
+	 */
+	public function getName(): string {
+		return 'Backfill bacAdviceRequest.bezwaar from the legacy objectionProceeding key';
+	}//end getName()
+
+	/**
+	 * Run the backfill.
+	 *
+	 * Non-fatal by construction: an upgrade must not fail because a projection
+	 * could not complete, and the legacy key is left in place so a later run can
+	 * repeat the work.
+	 *
+	 * @param IOutput $output Progress reporting.
+	 *
+	 * @return void
+	 *
+	 * @spec openspec/changes/page-topology-cleanup/tasks.md
+	 */
+	public function run(IOutput $output): void {
+		$objectService = $this->settingsService->getObjectService();
+		if ($objectService === null) {
+			$output->info('OpenRegister unavailable — skipping advice-request backfill.');
+			return;
+		}
+
+		$register = $this->appConfig->getValueString(Application::APP_ID, 'register', '');
+		$schema = $this->appConfig->getValueString(Application::APP_ID, 'bac_advice_request_schema', '');
+		if ($register === '' || $schema === '') {
+			$output->info('Advice-request schema not configured — skipping backfill.');
+			return;
+		}
+
+		// A BLOCK closure, not `fn () => ...`. An arrow function implicitly
+		// RETURNS its expression, and returning the result of a void method is a
+		// fatal — which is exactly what the short form did here.
+		$objectService->runAsSystem(
+			function () use ($objectService, $register, $schema, $output): void {
+				$this->backfill(
+					objectService: $objectService,
+					register: $register,
+					schema: $schema,
+					output: $output,
+				);
+			}
+		);
+	}//end run()
+
+	/**
+	 * Walk every advice request and repair the ones missing `bezwaar`.
+	 *
+	 * @param object $objectService OpenRegister's ObjectService.
+	 * @param string $register The register id.
+	 * @param string $schema The schema id.
+	 * @param IOutput $output Progress reporting.
+	 *
+	 * @return void
+	 */
+	private function backfill(object $objectService, string $register, string $schema, IOutput $output): void {
+		$rows = $objectService->findAll(['filters' => ['register' => $register, 'schema' => $schema]]);
+		if (is_array($rows) === false) {
+			$output->info('Advice-request backfill: nothing to read.');
+			return;
+		}
+
+		$tally = ['repaired' => 0, 'skipped' => 0, 'failed' => 0];
+
+		foreach ($rows as $row) {
+			if (is_object($row) === true && method_exists($row, 'jsonSerialize') === true) {
+				$row = $row->jsonSerialize();
+			}
+
+			$outcome = $this->repairRow(
+				row: (array)$row,
+				objectService: $objectService,
+				register: $register,
+				schema: $schema,
+			);
+			$tally[$outcome] = ($tally[$outcome] + 1);
+		}
+
+		$output->info(
+			'Advice-request backfill: ' . $tally['repaired'] . ' repaired, '
+			. $tally['skipped'] . ' already correct, ' . $tally['failed'] . ' failed.'
+		);
+	}//end backfill()
+
+	/**
+	 * Repair one row, returning which tally it belongs to.
+	 *
+	 * @param array<string, mixed> $row The stored advice request.
+	 * @param object $objectService OpenRegister's ObjectService.
+	 * @param string $register The register id.
+	 * @param string $schema The schema id.
+	 *
+	 * @return string One of repaired|skipped|failed.
+	 */
+	private function repairRow(array $row, object $objectService, string $register, string $schema): string {
+		if ((string)($row['bezwaar'] ?? '') !== '') {
+			return 'skipped';
+		}
+
+		// Read WITHOUT a fallback: a row with neither key cannot be repaired, and
+		// defaulting to '' would write an empty required property that looks
+		// repaired while pointing at nothing.
+		$legacy = (string)($row['objectionProceeding'] ?? '');
+		$uuid = (string)($row['id'] ?? ($row['uuid'] ?? ''));
+		if ($legacy === '' || $uuid === '') {
+			return 'skipped';
+		}
+
+		try {
+			$objectService->saveObject(
+				object: ['bezwaar' => $legacy],
+				register: $register,
+				schema: $schema,
+				uuid: $uuid,
+			);
+		} catch (Throwable $e) {
+			$this->logger->error(
+				'Dossiq: advice-request backfill failed for one row',
+				['app' => Application::APP_ID, 'uuid' => $uuid, 'exception' => $e->getMessage()]
+			);
+			return 'failed';
+		}
+
+		return 'repaired';
+	}//end repairRow()
+}//end class
diff --git a/lib/Service/Actions/ActionHandlerLocator.php b/lib/Service/Actions/ActionHandlerLocator.php
deleted file mode 100644
index ffa64793a..000000000
--- a/lib/Service/Actions/ActionHandlerLocator.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * Dossiq ActionHandlerLocator.
- *
- * Owns the automatic-action handler table: the list of handler implementations,
- * their lazy resolution out of the DI container, and the `type` slug index used
- * to dispatch. Split out of ActionRegistry, which is otherwise a read-only
- * lookup over OpenRegister objects and has no business also knowing the
- * concrete handler classes — carrying that list is what pushed ActionRegistry
- * over the CouplingBetweenObjects threshold.
- *
- * Resolution stays lazy and failure-tolerant: a handler that cannot be built is
- * logged at error level and skipped, so one broken handler never takes the whole
- * dispatch table down.
- *
- * @category Service
- * @package  OCA\Dossiq\Service\Actions
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- *
- * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Service\Actions;
-
-use OCA\Dossiq\AppInfo\Application;
-use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
-
-/**
- * Resolves automatic-action handlers by their `type` slug.
- *
- * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
- */
-class ActionHandlerLocator {
-
-	/**
-	 * In-memory handler index keyed by handler `type` slug.
-	 *
-	 * Populated lazily from the DI container the first time a handler is
-	 * requested, so the container stays lean until a transition actually
-	 * dispatches a side effect.
-	 *
-	 * @var array<string, ActionHandlerInterface>|null
-	 */
-	private ?array $handlerIndex = null;
-
-	/**
-	 * Constructor for ActionHandlerLocator.
-	 *
-	 * @param ContainerInterface $container DI container — used to lazily resolve the handler implementations.
-	 * @param LoggerInterface $logger PSR-3 logger for handler-resolution failures.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly ContainerInterface $container,
-		private readonly LoggerInterface $logger,
-	) {
-	}//end __construct()
-
-	/**
-	 * Lookup a registered handler by its `type` slug.
-	 *
-	 * @param string $type Handler `type` slug (matches ActionHandlerInterface::type()).
-	 *
-	 * @return ActionHandlerInterface|null Null when no handler is registered for the slug.
-	 *
-	 * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
-	 */
-	public function get(string $type): ?ActionHandlerInterface {
-		if ($this->handlerIndex === null) {
-			$this->handlerIndex = $this->buildIndex();
-		}
-
-		return ($this->handlerIndex[$type] ?? null);
-	}//end get()
-
-	/**
-	 * Resolve every known handler class and index it by its `type` slug.
-	 *
-	 * Each handler class is registered as a regular DI service and referenced by
-	 * FQCN; they are resolved lazily so the container can stay lean.
-	 *
-	 * @return array<string, ActionHandlerInterface> The handler index, keyed by type slug.
-	 *
-	 * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
-	 */
-	private function buildIndex(): array {
-		$index = [];
-		$candidates = [
-			SendEmailHandler::class,
-			CreateDocumentHandler::class,
-			NotifyRoleHandler::class,
-			CallWebhookHandler::class,
-			MergeTemplateHandler::class,
-			ScheduleReminderHandler::class,
-		];
-
-		foreach ($candidates as $fqcn) {
-			$handler = $this->resolve(fqcn: $fqcn);
-			if ($handler !== null) {
-				$index[$handler->type()] = $handler;
-			}
-		}
-
-		return $index;
-	}//end buildIndex()
-
-	/**
-	 * Resolve one handler out of the container, tolerating a broken handler.
-	 *
-	 * @param string $fqcn Fully-qualified handler class name.
-	 *
-	 * @return ActionHandlerInterface|null The handler, or null when it cannot be built or is not a handler.
-	 *
-	 * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
-	 */
-	private function resolve(string $fqcn): ?ActionHandlerInterface {
-		try {
-			$handler = $this->container->get($fqcn);
-		} catch (\Throwable $e) {
-			$this->logger->error(
-				'ActionRegistry: failed to resolve handler',
-				[
-					'app' => Application::APP_ID,
-					'fqcn' => $fqcn,
-					'exception' => $e->getMessage(),
-				]
-			);
-			return null;
-		}
-
-		if ($handler instanceof ActionHandlerInterface) {
-			return $handler;
-		}
-
-		return null;
-	}//end resolve()
-}//end class
diff --git a/lib/Service/Actions/ActionRegistry.php b/lib/Service/Actions/ActionRegistry.php
deleted file mode 100644
index 2c93e8e84..000000000
--- a/lib/Service/Actions/ActionRegistry.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-
-/**
- * Dossiq Automatic Action Registry
- *
- * Per-tenant slug-based lookup for `automaticAction` objects. Mirrors the
- * status-transition-engine guard registry pattern: handlers register via DI
- * tag, the registry resolves a `(tenantId, slug)` pair to a published action
- * config, and SideEffectDispatcher uses the resolved config to invoke the
- * handler.
- *
- * @category Service
- * @package  OCA\Dossiq\Service\Actions
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2024 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2024 Conduction B.V. <info@conduction.nl>
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- *
- * @spec openspec/specs/automatic-actions/spec.md
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Service\Actions;
-
-use OCA\Dossiq\AppInfo\Application;
-use OCP\IAppConfig;
-use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
-
-/**
- * Resolves `automaticAction` references for SideEffectDispatcher.
- *
- * Resolution rules (REQ-AA-2, REQ-AA-8):
- *  - Only published (`isPublished: true`) actions are returned.
- *  - Cross-tenant lookups return null AND log an error including both the
- *    requested tenantId and the action's owning tenantId.
- *  - Unknown slugs return null and are logged at error level.
- *  - A per-request in-memory cache avoids re-querying OpenRegister for the
- *    same `(tenantId, slug)` pair within a single transition dispatch.
- *
- * Action storage lives in OpenRegister under the dossiq register. CRUD is
- * delegated entirely to the OpenRegister manifest renderer
- * (`/settings/automatic-actions`) — this class is read-only.
- */
-class ActionRegistry {
-
-	/**
-	 * In-process cache keyed by "{tenantId}::{slug}".
-	 *
-	 * Values are either the resolved action array or the sentinel `false`
-	 * for known-miss (so we don't repeatedly log the same unknown slug
-	 * during a single transition).
-	 *
-	 * @var array<string, array|false>
-	 */
-	private array $cache = [];
-
-	/**
-	 * Constructor for ActionRegistry.
-	 *
-	 * @param ContainerInterface $container DI container — used
-	 *                                      to lazily resolve
-	 *                                      OpenRegister's
-	 *                                      ObjectService and to
-	 *                                      discover handler
-	 *                                      implementations.
-	 * @param IAppConfig $appConfig Dossiq app config —
-	 *                              provides the `register` and
-	 *                              `automatic_action_schema`
-	 *                              keys.
-	 * @param LoggerInterface $logger PSR-3 logger for error logging on
-	 *                                unknown slugs, cross-tenant
-	 *                                attempts, and resolution
-	 *                                failures.
-	 * @param ActionHandlerLocator $handlerLocator Owns the handler table and
-	 *                                             resolves handlers by `type` slug.
-	 *
-	 * @return void
-	 */
-	public function __construct(
-		private readonly ContainerInterface $container,
-		private readonly IAppConfig $appConfig,
-		private readonly LoggerInterface $logger,
-		private readonly ActionHandlerLocator $handlerLocator,
-	) {
-	}//end __construct()
-
-	/**
-	 * Resolve a published action by tenant + slug.
-	 *
-	 * @param string $tenantId The tenant the resolution is being attempted in
-	 *                         (derived from the case being transitioned).
-	 * @param string $slug Tenant-unique action slug.
-	 *
-	 * @return array|null The full `automaticAction` array (with decoded
-	 *                    `config`), or null on miss, unpublished, or
-	 *                    cross-tenant attempt.
-	 *
-	 * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
-	 */
-	public function resolve(string $tenantId, string $slug): ?array {
-		$cacheKey = $tenantId . '::' . $slug;
-		if (array_key_exists($cacheKey, $this->cache) === true) {
-			$cached = $this->cache[$cacheKey];
-			if ($cached === false) {
-				return null;
-			}
-
-			return $cached;
-		}
-
-		try {
-			$action = $this->findAction(slug: $slug);
-		} catch (\Throwable $e) {
-			$this->logger->error(
-				'ActionRegistry: failed to load automaticAction',
-				[
-					'app' => Application::APP_ID,
-					'slug' => $slug,
-					'tenantId' => $tenantId,
-					'exception' => $e->getMessage(),
-				]
-			);
-			$this->cache[$cacheKey] = false;
-			return null;
-		}
-
-		if ($action === null) {
-			$this->logger->error(
-				'ActionRegistry: unknown action slug',
-				[
-					'app' => Application::APP_ID,
-					'slug' => $slug,
-					'tenantId' => $tenantId,
-					'reason' => 'not_found',
-				]
-			);
-			$this->cache[$cacheKey] = false;
-			return null;
-		}
-
-		$ownerTenant = (string)($action['tenantId'] ?? '');
-		if ($ownerTenant !== '' && $ownerTenant !== $tenantId) {
-			$this->logger->error(
-				'ActionRegistry: cross-tenant resolution rejected',
-				[
-					'app' => Application::APP_ID,
-					'slug' => $slug,
-					'requestedTenant' => $tenantId,
-					'ownerTenant' => $ownerTenant,
-					'reason' => 'cross_tenant',
-				]
-			);
-			$this->cache[$cacheKey] = false;
-			return null;
-		}
-
-		if (($action['isPublished'] ?? false) !== true) {
-			$this->logger->error(
-				'ActionRegistry: action is not published',
-				[
-					'app' => Application::APP_ID,
-					'slug' => $slug,
-					'tenantId' => $tenantId,
-					'reason' => 'unpublished',
-				]
-			);
-			$this->cache[$cacheKey] = false;
-			return null;
-		}
-
-		$action['config'] = $this->normaliseConfig(action: $action);
-
-		$this->cache[$cacheKey] = $action;
-		return $action;
-	}//end resolve()
-
-	/**
-	 * Normalise a stored `config` value to a decoded array.
-	 *
-	 * OpenRegister stores the config as a JSON string; the dispatcher expects
-	 * a decoded array. Already-decoded configs are passed through for forward
-	 * compatibility, and anything unreadable degrades to an empty array.
-	 *
-	 * @param array $action The stored action carrying the raw `config` value.
-	 *
-	 * @return array The decoded config, or an empty array.
-	 */
-	private function normaliseConfig(array $action): array {
-		$config = ($action['config'] ?? null);
-		if (is_string($config) === true && $config !== '') {
-			$decoded = json_decode($config, true);
-			if (is_array($decoded) === true) {
-				return $decoded;
-			}
-		}
-
-		if (is_array($config) === false) {
-			return [];
-		}
-
-		return $config;
-	}//end normaliseConfig()
-
-	/**
-	 * List all actions for a tenant (used by admin UI and dry-run preview).
-	 *
-	 * @param string $tenantId The current tenant.
-	 * @param string|null $typeFilter Optional `type` filter (e.g. only
-	 *                                `sendEmail`).
-	 *
-	 * @return array<int, array> Tenant-owned actions; published flag is left
-	 *                           on each entry so the UI can render badges.
-	 *
-	 * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
-	 */
-	public function listForTenant(string $tenantId, ?string $typeFilter = null): array {
-		try {
-			$all = $this->fetchAll();
-		} catch (\Throwable $e) {
-			$this->logger->error(
-				'ActionRegistry: failed to list actions for tenant',
-				[
-					'app' => Application::APP_ID,
-					'tenantId' => $tenantId,
-					'exception' => $e->getMessage(),
-				]
-			);
-			return [];
-		}
-
-		$out = [];
-		foreach ($all as $action) {
-			if ((string)($action['tenantId'] ?? '') !== $tenantId) {
-				continue;
-			}
-
-			if ($typeFilter !== null && (string)($action['type'] ?? '') !== $typeFilter) {
-				continue;
-			}
-
-			$out[] = $action;
-		}
-
-		return $out;
-	}//end listForTenant()
-
-	/**
-	 * Lookup a registered handler by its `type` slug.
-	 *
-	 * Used by SideEffectDispatcher and by any dry-run pathway that needs to
-	 * invoke a handler outside the normal transition flow.
-	 *
-	 * @param string $type Handler `type` slug (matches
-	 *                     ActionHandlerInterface::type()).
-	 *
-	 * @return ActionHandlerInterface|null Null when no handler is registered.
-	 *
-	 * @spec openspec/changes/retrofit-2026-05-24-case-management/tasks.md
-	 */
-	public function getHandler(string $type): ?ActionHandlerInterface {
-		return $this->handlerLocator->get(type: $type);
-	}//end getHandler()
-
-	/**
-	 * Find a single action by slug via the OpenRegister object service.
-	 *
-	 * @param string $slug Action slug.
-	 *
-	 * @return array|null
-	 */
-	private function findAction(string $slug): ?array {
-		$objectService = $this->getObjectService();
-		if ($objectService === null) {
-			return null;
-		}
-
-		$register = $this->appConfig->getValueString(
-			Application::APP_ID,
-			'register',
-			''
-		);
-		$schema = $this->appConfig->getValueString(
-			Application::APP_ID,
-			'automatic_action_schema',
-			''
-		);
-
-		if ($register === '' || $schema === '') {
-			return null;
-		}
-
-		// ObjectService::findAll() takes a single $config array — the previous
-		// named-argument form (register:/schema:/filters:/limit:) threw
-		// "Unknown named parameter $register". Register/schema are read from
-		// inside `filters`; limit is a top-level config key. Slug uniqueness is
-		// enforced per-tenant at write time, so a slug match is exact here.
-		$results = $objectService->findAll(
-			[
-				'filters' => [
-					'register' => $register,
-					'schema' => $schema,
-					'slug' => $slug,
-				],
-				'limit' => 1,
-			]
-		);
-
-		if (is_array($results) === false || $results === []) {
-			return null;
-		}
-
-		$first = $results[0];
-		if (is_object($first) === true && method_exists($first, 'jsonSerialize') === true) {
-			$first = $first->jsonSerialize();
-		}
-
-		return (array)$first;
-	}//end findAction()
-
-	/**
-	 * Fetch all automaticAction objects across tenants (filtered downstream).
-	 *
-	 * @return array<int, array>
-	 */
-	private function fetchAll(): array {
-		$objectService = $this->getObjectService();
-		if ($objectService === null) {
-			return [];
-		}
-
-		$register = $this->appConfig->getValueString(
-			Application::APP_ID,
-			'register',
-			''
-		);
-		$schema = $this->appConfig->getValueString(
-			Application::APP_ID,
-			'automatic_action_schema',
-			''
-		);
-
-		if ($register === '' || $schema === '') {
-			return [];
-		}
-
-		// ObjectService::findAll() takes a single $config array — see the note in
-		// findAction(); register/schema are read from inside `filters`.
-		$results = $objectService->findAll(
-			[
-				'filters' => [
-					'register' => $register,
-					'schema' => $schema,
-				],
-			]
-		);
-
-		if (is_array($results) === false) {
-			return [];
-		}
-
-		$out = [];
-		foreach ($results as $entry) {
-			if (is_object($entry) === true && method_exists($entry, 'jsonSerialize') === true) {
-				$entry = $entry->jsonSerialize();
-			}
-
-			$out[] = (array)$entry;
-		}
-
-		return $out;
-	}//end fetchAll()
-
-	/**
-	 * Resolve the OpenRegister ObjectService lazily.
-	 *
-	 * @return object|null
-	 *
-	 * @psalm-suppress MixedReturnStatement
-	 * @psalm-suppress MixedInferredReturnType
-	 */
-	private function getObjectService(): ?object {
-		try {
-			return $this->container->get('OCA\OpenRegister\Service\ObjectService');
-		} catch (\Throwable $e) {
-			$this->logger->error(
-				'ActionRegistry: OpenRegister ObjectService unavailable',
-				[
-					'app' => Application::APP_ID,
-					'exception' => $e->getMessage(),
-				]
-			);
-			return null;
-		}
-	}//end getObjectService()
-}//end class
diff --git a/lib/Service/Actions/AutomaticActionFlowMigrator.php b/lib/Service/Actions/AutomaticActionFlowMigrator.php
new file mode 100644
index 000000000..0fef49328
--- /dev/null
+++ b/lib/Service/Actions/AutomaticActionFlowMigrator.php
@@ -0,0 +1,483 @@
+<?php
+
+/**
+ * Dossiq automaticAction → OpenRegister flow migrator.
+ *
+ * Projects each stored `automaticAction` object onto an OpenRegister flow whose
+ * single action node is the one Dossiq contributes for that action's type. This
+ * is what makes the configuration executable: `automaticAction` objects have
+ * never been fired by anything — `SideEffectDispatcher` runs the SEPARATE
+ * `Service\Transitions` vocabulary — so the admin surface over them described a
+ * capability with no runtime behind it.
+ *
+ * WHY THIS IS NOT A REPAIR STEP. `FlowService` refuses to create a flow without
+ * a signed-in owner AND an active organisation, throwing rather than storing an
+ * orphan that could never be seen, run or edited again. An upgrade runs as
+ * nobody, and `runAsSystem()` elevates RBAC without supplying either. So the
+ * migration is an explicit `occ` command run as a named user, whose identity and
+ * organisation the created flows inherit.
+ *
+ * @category Service
+ * @package  OCA\Dossiq\Service\Actions
+ *
+ * @author    Conduction Development Team <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * SPDX-License-Identifier: EUPL-1.2
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ *
+ * @version GIT: <git-id>
+ *
+ * @link https://conduction.nl
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Service\Actions;
+
+use OCA\Dossiq\AppInfo\Application;
+use OCA\Dossiq\Service\SettingsService;
+use OCP\IAppConfig;
+use OCP\IUser;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+use Throwable;
+
+/**
+ * Turns stored automaticAction objects into runnable OpenRegister flows.
+ *
+ * @spec openspec/changes/page-topology-cleanup/tasks.md
+ */
+class AutomaticActionFlowMigrator {
+	/**
+	 * The flow-node id space Dossiq's configured-action catalogue registers under.
+	 *
+	 * Deliberately NOT `dossiq.*`, which is the live transition vocabulary the
+	 * SideEffectDispatcher fires. Both spaces ship a `sendEmail` implemented by
+	 * different classes with different config keys, so crossing them would run
+	 * the wrong handler against the right config.
+	 */
+	private const NODE_PREFIX = 'dossiq.action.';
+
+	/**
+	 * Prefix of the `notes` marker that ties a flow back to its source action.
+	 *
+	 * Idempotency hangs on this. It is stored on the flow rather than kept in a
+	 * side table so a re-run rediscovers the link from the flow itself, the same
+	 * property that let the Codeberg migration be rebuilt after its state was
+	 * lost.
+	 */
+	private const MARKER_PREFIX = 'dossiq:automaticAction:';
+
+	/**
+	 * How many flows to page through when rebuilding the marker map.
+	 */
+	private const FLOW_PAGE = 100;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param SettingsService $settingsService Bridge to OpenRegister.
+	 * @param ContainerInterface $container Service container, for by-name resolution.
+	 * @param IAppConfig $appConfig App configuration.
+	 * @param LoggerInterface $logger Logger.
+	 */
+	public function __construct(
+		private readonly SettingsService $settingsService,
+		private readonly ContainerInterface $container,
+		private readonly IAppConfig $appConfig,
+		private readonly LoggerInterface $logger,
+	) {
+	}//end __construct()
+
+	/**
+	 * Migrate every automaticAction to a flow, acting as the given user.
+	 *
+	 * @param IUser $user The user the created flows belong to.
+	 * @param bool $dryRun Report what would happen without writing.
+	 *
+	 * @return array<string, mixed> The summary: total, created, updated, skipped, failed, rows.
+	 *
+	 * @spec openspec/changes/page-topology-cleanup/tasks.md
+	 */
+	public function migrate(IUser $user, bool $dryRun): array {
+		$objectService = $this->settingsService->getObjectService();
+		if ($objectService === null) {
+			return $this->emptySummary(note: 'OpenRegister is not available.');
+		}
+
+		$flowService = $this->flowService();
+		if ($flowService === null) {
+			return $this->emptySummary(note: 'OpenRegister exposes no FlowService on this instance.');
+		}
+
+		return $objectService->runAs(
+			$user,
+			fn (): array => $this->migrateAll(flowService: $flowService, dryRun: $dryRun)
+		);
+	}//end migrate()
+
+	/**
+	 * Resolve OpenRegister's FlowService by name, or null when absent.
+	 *
+	 * By name and not by type-hint: Dossiq must install and boot on an instance
+	 * without OpenRegister, where the class does not exist to hint against.
+	 *
+	 * @return object|null The FlowService, or null.
+	 */
+	private function flowService(): ?object {
+		try {
+			return $this->container->get('OCA\OpenRegister\Service\Flow\FlowService');
+		} catch (Throwable $e) {
+			$this->logger->debug(
+				'Dossiq: FlowService could not be resolved',
+				['app' => Application::APP_ID, 'exception' => $e->getMessage()]
+			);
+			return null;
+		}
+	}//end flowService()
+
+	/**
+	 * A summary describing a run that could not start.
+	 *
+	 * @param string $note Why nothing happened.
+	 *
+	 * @return array<string, mixed> The summary.
+	 */
+	private function emptySummary(string $note): array {
+		return [
+			'total' => 0,
+			'created' => 0,
+			'updated' => 0,
+			'skipped' => 0,
+			'failed' => 0,
+			'rows' => [],
+			'note' => $note,
+		];
+	}//end emptySummary()
+
+	/**
+	 * Walk every action and project it, inside the acting user's context.
+	 *
+	 * @param object $flowService OpenRegister's FlowService.
+	 * @param bool $dryRun Report only.
+	 *
+	 * @return array<string, mixed> The summary.
+	 */
+	private function migrateAll(object $flowService, bool $dryRun): array {
+		$actions = $this->fetchActions();
+		$existing = $this->existingByMarker(flowService: $flowService);
+
+		$summary = $this->emptySummary(note: '');
+		$summary['total'] = count($actions);
+		unset($summary['note']);
+
+		foreach ($actions as $action) {
+			$row = $this->migrateOne(
+				action: $action,
+				existing: $existing,
+				flowService: $flowService,
+				dryRun: $dryRun,
+			);
+			$summary[$row['outcome']] = ($summary[$row['outcome']] + 1);
+			$summary['rows'][] = $row;
+		}
+
+		return $summary;
+	}//end migrateAll()
+
+	/**
+	 * Project one action, returning the row that describes what happened.
+	 *
+	 * @param array<string, mixed> $action The stored automaticAction.
+	 * @param array<string, string> $existing Marker → flow uuid.
+	 * @param object $flowService OpenRegister's FlowService.
+	 * @param bool $dryRun Report only.
+	 *
+	 * @return array{outcome: string, marker: string, detail: string} The outcome row.
+	 */
+	private function migrateOne(array $action, array $existing, object $flowService, bool $dryRun): array {
+		$marker = $this->marker(action: $action);
+		if ($marker === null) {
+			return [
+				'outcome' => 'failed',
+				'marker' => '(unidentifiable)',
+				'detail' => 'the action carries no tenantId/slug pair, which the schema requires',
+			];
+		}
+
+		$type = (string)($action['type'] ?? '');
+		$nodeType = self::NODE_PREFIX . $type;
+		if ($this->nodeExists(nodeType: $nodeType) === false) {
+			return [
+				'outcome' => 'skipped',
+				'marker' => $marker,
+				'detail' => 'no node implements "' . $type . '"; a flow around it would never run',
+			];
+		}
+
+		$uuid = ($existing[$marker] ?? null);
+		if ($dryRun === true) {
+			return [
+				'outcome' => $this->outcomeFor(uuid: $uuid),
+				'marker' => $marker,
+				'detail' => 'dry run — no write',
+			];
+		}
+
+		return $this->writeFlow(
+			flowService: $flowService,
+			document: $this->flowDocument(action: $action, marker: $marker, nodeType: $nodeType),
+			marker: $marker,
+			uuid: $uuid,
+		);
+	}//end migrateOne()
+
+	/**
+	 * Write (or rewrite) the flow, converting a throw into a failed row.
+	 *
+	 * One unusable action must never abort the rest of the migration.
+	 *
+	 * @param object $flowService OpenRegister's FlowService.
+	 * @param array<string, mixed> $document The flow document.
+	 * @param string $marker The provenance marker.
+	 * @param string|null $uuid The existing flow uuid, or null to create.
+	 *
+	 * @return array{outcome: string, marker: string, detail: string} The outcome row.
+	 */
+	private function writeFlow(object $flowService, array $document, string $marker, ?string $uuid): array {
+		try {
+			$flow = $flowService->save($document, $uuid);
+		} catch (Throwable $e) {
+			$this->logger->error(
+				'Dossiq: could not migrate an automaticAction to a flow',
+				['app' => Application::APP_ID, 'marker' => $marker, 'exception' => $e->getMessage()]
+			);
+			return ['outcome' => 'failed', 'marker' => $marker, 'detail' => $e->getMessage()];
+		}
+
+		return [
+			'outcome' => $this->outcomeFor(uuid: $uuid),
+			'marker' => $marker,
+			'detail' => 'flow ' . (string)$flow->getUuid(),
+		];
+	}//end writeFlow()
+
+	/**
+	 * Whether writing against this uuid counts as a create or an update.
+	 *
+	 * A method rather than a ternary at both call sites: phpcs.xml forbids
+	 * inline IF, and the summary keys are the two outcomes' names, so getting
+	 * this wrong would mis-tally the run rather than fail it.
+	 *
+	 * @param string|null $uuid The existing flow uuid, or null.
+	 *
+	 * @return string Either `created` or `updated`.
+	 */
+	private function outcomeFor(?string $uuid): string {
+		if ($uuid === null) {
+			return 'created';
+		}
+
+		return 'updated';
+	}//end outcomeFor()
+
+	/**
+	 * Whether OpenRegister's node registry knows this node id.
+	 *
+	 * Checked BEFORE writing, because a flow whose action node does not resolve
+	 * is the exact failure this programme already paid for once: `spawnCase` sat
+	 * in shipped data naming a handler nothing implemented, and every transition
+	 * that ran it reported success while doing nothing.
+	 *
+	 * @param string $nodeType The fully-qualified node id.
+	 *
+	 * @return bool True when a node answers to it.
+	 */
+	private function nodeExists(string $nodeType): bool {
+		try {
+			$registry = $this->container->get('OCA\OpenRegister\Service\Flow\FlowNodeRegistry');
+			$registry->get($nodeType);
+		} catch (Throwable $e) {
+			$this->logger->debug(
+				'Dossiq: no flow node answers to this id',
+				['app' => Application::APP_ID, 'node' => $nodeType, 'exception' => $e->getMessage()]
+			);
+			return false;
+		}
+
+		return true;
+	}//end nodeExists()
+
+	/**
+	 * The flow document one action becomes.
+	 *
+	 * Three nodes, because a flow OpenRegister will run needs an entry and an
+	 * exit: a manual trigger, the action itself, and an end. `enabled` is true —
+	 * the stored configuration said what it wanted and had never been honoured.
+	 *
+	 * @param array<string, mixed> $action The stored automaticAction.
+	 * @param string $marker The provenance marker.
+	 * @param string $nodeType The action node id.
+	 *
+	 * @return array<string, mixed> The flow document.
+	 */
+	private function flowDocument(array $action, string $marker, string $nodeType): array {
+		return [
+			'name' => (string)($action['title'] ?? $action['slug']),
+			'description' => $this->description(action: $action),
+			'app' => Application::APP_ID,
+			'enabled' => true,
+			'trigger' => 'manual',
+			'notes' => $marker,
+			'nodes' => [
+				['id' => 'trigger', 'type' => 'openregister.trigger-manual'],
+				['id' => 'action', 'type' => $nodeType, 'config' => $this->config(action: $action)],
+				['id' => 'end', 'type' => 'openregister.end'],
+			],
+			'edges' => [
+				['id' => 'trigger-action', 'from' => ['trigger'], 'to' => ['action']],
+				['id' => 'action-end', 'from' => ['action'], 'to' => ['end']],
+			],
+		];
+	}//end flowDocument()
+
+	/**
+	 * The flow's description, carrying the provenance a reader needs.
+	 *
+	 * @param array<string, mixed> $action The stored automaticAction.
+	 *
+	 * @return string The description.
+	 */
+	private function description(array $action): string {
+		$own = (string)($action['description'] ?? '');
+		$provenance = 'Migrated from the Dossiq automatic action "' . (string)($action['slug'] ?? '') . '".';
+		if ($own === '') {
+			return $provenance;
+		}
+
+		return $own . ' — ' . $provenance;
+	}//end description()
+
+	/**
+	 * Decode the action's handler config.
+	 *
+	 * Stored as a JSON string by the schema. A value that does not decode to an
+	 * array yields an empty config rather than a fatal: the flow is still worth
+	 * creating so an admin can see and repair it in the flow editor.
+	 *
+	 * @param array<string, mixed> $action The stored automaticAction.
+	 *
+	 * @return array<string, mixed> The handler config.
+	 */
+	private function config(array $action): array {
+		$raw = ($action['config'] ?? '');
+		if (is_array($raw) === true) {
+			return $raw;
+		}
+
+		$decoded = json_decode((string)$raw, true);
+		if (is_array($decoded) === false) {
+			return [];
+		}
+
+		return $decoded;
+	}//end config()
+
+	/**
+	 * The provenance marker for one action, or null when it cannot be identified.
+	 *
+	 * Built from `tenantId` + `slug`, both of which the schema marks required and
+	 * which are together tenant-unique. Read WITHOUT a default: a missing one
+	 * means the row is malformed, and defaulting would silently collapse several
+	 * actions onto a single marker — one flow overwriting the next.
+	 *
+	 * @param array<string, mixed> $action The stored automaticAction.
+	 *
+	 * @return string|null The marker, or null.
+	 */
+	private function marker(array $action): ?string {
+		if (isset($action['tenantId'], $action['slug']) === false) {
+			return null;
+		}
+
+		$tenantId = (string)$action['tenantId'];
+		$slug = (string)$action['slug'];
+		if ($tenantId === '' || $slug === '') {
+			return null;
+		}
+
+		return self::MARKER_PREFIX . $tenantId . ':' . $slug;
+	}//end marker()
+
+	/**
+	 * Map the markers of already-migrated flows to their uuids.
+	 *
+	 * Paged: an instance with more than one page of Dossiq flows would otherwise
+	 * look empty past the first, and every action beyond it would be created a
+	 * second time on the next run.
+	 *
+	 * @param object $flowService OpenRegister's FlowService.
+	 *
+	 * @return array<string, string> Marker → flow uuid.
+	 */
+	private function existingByMarker(object $flowService): array {
+		$map = [];
+		$offset = 0;
+
+		while (true) {
+			$page = $flowService->findAll(Application::APP_ID, null, null, self::FLOW_PAGE, $offset);
+			if (is_array($page) === false || $page === []) {
+				return $map;
+			}
+
+			foreach ($page as $flow) {
+				$notes = (string)($flow->getNotes() ?? '');
+				if (str_starts_with($notes, self::MARKER_PREFIX) === true) {
+					$map[$notes] = (string)$flow->getUuid();
+				}
+			}
+
+			if (count($page) < self::FLOW_PAGE) {
+				return $map;
+			}
+
+			$offset += self::FLOW_PAGE;
+		}
+	}//end existingByMarker()
+
+	/**
+	 * Read every stored automaticAction object.
+	 *
+	 * @return array<int, array<string, mixed>> The actions.
+	 */
+	private function fetchActions(): array {
+		$objectService = $this->settingsService->getObjectService();
+		if ($objectService === null) {
+			return [];
+		}
+
+		$register = $this->appConfig->getValueString(Application::APP_ID, 'register', '');
+		$schema = $this->appConfig->getValueString(Application::APP_ID, 'automatic_action_schema', '');
+		if ($register === '' || $schema === '') {
+			return [];
+		}
+
+		$results = $objectService->findAll(['filters' => ['register' => $register, 'schema' => $schema]]);
+		if (is_array($results) === false) {
+			return [];
+		}
+
+		$out = [];
+		foreach ($results as $entry) {
+			if (is_object($entry) === true && method_exists($entry, 'jsonSerialize') === true) {
+				$entry = $entry->jsonSerialize();
+			}
+
+			$out[] = (array)$entry;
+		}
+
+		return $out;
+	}//end fetchActions()
+}//end class
diff --git a/lib/Service/AgendaService.php b/lib/Service/AgendaService.php
deleted file mode 100644
index b804c36dd..000000000
--- a/lib/Service/AgendaService.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * Dossiq AgendaService
- *
- * Service for managing besluitvorming agenda items on cases. An agenda item
- * represents a scheduled discussion of a case in a college/raad meeting and
- * carries: meetingDate, agendaPoint (sequence), discussionStatus, decisionRef.
- *
- * Agenda items are stored on the case object itself as a JSON-encoded
- * `agendaItems[]` array — the case schema's `relations` field is reused, so
- * no new schema is required. This is the minimal storage that the
- * besluitvorming-workflow spec demands; richer state (vote tallies, attendees)
- * lives in separate meeting/voting objects in shillinq/decidesk.
- *
- * @category Service
- * @package  OCA\Dossiq\Service
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- *
- * @link https://conduction.nl
- *
- * @spec openspec/changes/besluitvorming-workflow/tasks.md#task-4
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Service;
-
-use InvalidArgumentException;
-use OCA\Dossiq\AppInfo\Application;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Throwable;
-
-/**
- * Service for besluitvorming agenda item management.
- */
-class AgendaService {
-	/**
-	 * Constructor.
-	 *
-	 * @param SettingsService $settingsService Settings service (resolves OR).
-	 * @param LoggerInterface $logger Logger.
-	 */
-	public function __construct(
-		private readonly SettingsService $settingsService,
-		private readonly LoggerInterface $logger,
-	) {
-	}//end __construct()
-
-	/**
-	 * Add an agenda item to a case.
-	 *
-	 * @param string $caseId The case id.
-	 * @param array<string, mixed> $item The agenda-item payload: { meetingDate, agendaPoint?,
-	 *                                   discussionStatus?, notes? }.
-	 *
-	 * @return array<string, mixed> The updated case agenda item list.
-	 *
-	 * @throws \RuntimeException When OR is unavailable.
-	 *
-	 * @spec openspec/changes/besluitvorming-workflow/tasks.md#task-4
-	 */
-	public function addToAgenda(string $caseId, array $item): array {
-		$case = $this->loadCase(caseId: $caseId);
-
-		$items = $this->extractItems(case: $case);
-
-		$item['createdAt'] = $item['createdAt'] ?? date(format: 'c');
-		$item['itemId'] = $item['itemId'] ?? uniqid(prefix: 'agenda_', more_entropy: true);
-		$items[] = $item;
-
-		return $this->persistItems(case: $case, items: $items);
-	}//end addToAgenda()
-
-	/**
-	 * Update an agenda item by itemId on a case.
-	 *
-	 * @param string $caseId The case id.
-	 * @param array<string, mixed> $patch The patch payload: must include itemId; fields to merge.
-	 *
-	 * @return array<string, mixed> The updated case agenda item list.
-	 *
-	 * @spec openspec/changes/besluitvorming-workflow/tasks.md#task-4
-	 */
-	public function updateAgendaItem(string $caseId, array $patch): array {
-		$case = $this->loadCase(caseId: $caseId);
-
-		$itemId = (string)($patch['itemId'] ?? '');
-		if ($itemId === '') {
-			throw new InvalidArgumentException('itemId is required');
-		}
-
-		$items = $this->extractItems(case: $case);
-		$found = false;
-		foreach ($items as $i => $existing) {
-			if ((string)($existing['itemId'] ?? '') === $itemId) {
-				$items[$i] = array_merge($existing, $patch, ['itemId' => $itemId]);
-				$found = true;
-				break;
-			}
-		}
-
-		if ($found === false) {
-			throw new RuntimeException('Agenda item not found: ' . $itemId);
-		}
-
-		return $this->persistItems(case: $case, items: $items);
-	}//end updateAgendaItem()
-
-	/**
-	 * Load a case object (raw array).
-	 *
-	 * @param string $caseId The case id.
-	 *
-	 * @return array<string, mixed> The case object.
-	 *
-	 * @throws \RuntimeException When OR is unavailable or case not found.
-	 */
-	private function loadCase(string $caseId): array {
-		$objectService = $this->settingsService->getObjectService();
-		if ($objectService === null) {
-			throw new RuntimeException('OpenRegister is not available');
-		}
-
-		$register = $this->settingsService->getConfigValue('register');
-		$schema = $this->settingsService->getConfigValue('case_schema');
-
-		try {
-			$obj = $objectService->find(
-				id: $caseId,
-				register: $register,
-				schema: $schema
-			);
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'AgendaService::loadCase failed',
-				['app' => Application::APP_ID, 'caseId' => $caseId, 'error' => $e->getMessage()]
-			);
-			throw new RuntimeException('Case not found: ' . $caseId);
-		}
-
-		if ($obj === null) {
-			throw new RuntimeException('Case not found: ' . $caseId);
-		}
-
-		// The OR object may return either a hydrated DTO or array; normalise to array.
-		if (is_object($obj) === true && method_exists($obj, 'jsonSerialize') === true) {
-			return $obj->jsonSerialize();
-		}
-
-		if (is_array($obj) === true) {
-			return $obj;
-		}
-
-		return (array)$obj;
-	}//end loadCase()
-
-	/**
-	 * Extract the existing agenda items list from a case array.
-	 *
-	 * @param array<string, mixed> $case The case object.
-	 *
-	 * @return array<int, array<string, mixed>> The agenda items list.
-	 */
-	private function extractItems(array $case): array {
-		$items = $case['agendaItems'] ?? [];
-		if (is_string($items) === true) {
-			$decoded = json_decode((string)$items, associative: true);
-			$items = [];
-			if (is_array($decoded) === true) {
-				$items = $decoded;
-			}
-		}
-
-		if (is_array($items) === false) {
-			return [];
-		}
-
-		$clean = [];
-		foreach ($items as $item) {
-			if (is_array($item) === true) {
-				$clean[] = $item;
-			}
-		}
-
-		return $clean;
-	}//end extractItems()
-
-	/**
-	 * Persist an updated items list to the case.
-	 *
-	 * @param array<string, mixed> $case The original case object.
-	 * @param array<int, array<string, mixed>> $items The updated items list.
-	 *
-	 * @return array<string, mixed> { caseId, agendaItems }.
-	 */
-	private function persistItems(array $case, array $items): array {
-		$objectService = $this->settingsService->getObjectService();
-		if ($objectService === null) {
-			throw new RuntimeException('OpenRegister is not available');
-		}
-
-		$register = $this->settingsService->getConfigValue('register');
-		$schema = $this->settingsService->getConfigValue('case_schema');
-
-		$case['agendaItems'] = $items;
-		$caseId = (string)($case['id'] ?? ($case['@self']['id'] ?? ''));
-
-		$objectService->saveObject(
-			object: $case,
-			register: $register,
-			schema: $schema,
-		);
-
-		return [
-			'caseId' => $caseId,
-			'agendaItems' => $items,
-		];
-	}//end persistItems()
-}//end class
diff --git a/lib/Service/Bezwaar/AdvisoryCommitteeService.php b/lib/Service/Bezwaar/AdvisoryCommitteeService.php
index f7c8eae13..0413fca8f 100644
--- a/lib/Service/Bezwaar/AdvisoryCommitteeService.php
+++ b/lib/Service/Bezwaar/AdvisoryCommitteeService.php
@@ -42,6 +42,7 @@
 
 use DateTimeImmutable;
 use DateTimeInterface;
+use OCA\Dossiq\AppInfo\Application;
 use OCA\Dossiq\Service\AdviceDelegationService;
 use OCA\Dossiq\Service\SettingsService;
 use OCA\Dossiq\Service\Transitions\GuardFailedException;
@@ -175,7 +176,14 @@ public function assignToCommittee(
 			],
 			$payload,
 			[
-				'objectionProceeding' => $objectionId,
+				// `bezwaar` IS THE PROPERTY NAME. `objectionProceeding` is the
+				// SCHEMA it $refs — the two were confused, and every advice
+				// request written since has omitted a property the schema marks
+				// required while carrying an undeclared one instead. The visible
+				// cost: BezwaarDetail's advice-request stats and list filter on
+				// `bezwaar: @objectId` (src/manifest.json:1852, 1871, 1906), so a
+				// bezwaar showed NO advice requests, however many it had.
+				'bezwaar' => $objectionId,
 				'committee' => $commissieId,
 				'status' => 'assigned',
 				'assignedAt' => $now,
@@ -448,7 +456,7 @@ private function guardDeliberationStart(
 		}
 
 		$independence = $this->independence->check(
-			objectionId: (string)($current['objectionProceeding'] ?? ''),
+			objectionId: $this->objectionIdOf(request: $current),
 			panel: $panel,
 		);
 
@@ -528,7 +536,7 @@ private function issueAdviceDecision(
 				subjectId: (string)$requestId,
 				payload: [
 					'subjectRegister' => $register,
-					'externalReference' => (string)($current['objectionProceeding'] ?? $requestId),
+					'externalReference' => $this->externalReferenceFor(request: $current, requestId: (string)$requestId),
 					'subjectLabel' => (string)($merged['conclusion'] ?? 'BAC-advies'),
 					'adviceType' => (string)($merged['recommendation'] ?? ''),
 					'question' => (string)($merged['conclusion'] ?? ''),
@@ -587,4 +595,58 @@ private function buildTransitionUpdate(
 
 		return $update;
 	}//end buildTransitionUpdate()
+
+	/**
+	 * The objection this advice request belongs to.
+	 *
+	 * `bezwaar` is the schema-declared property; `objectionProceeding` is the
+	 * schema it $refs, and was written into the object by mistake for as long as
+	 * this service has existed. Rows created before the fix carry only the wrong
+	 * key, so the legacy branch stays until `BackfillAdviceRequestObjection` has
+	 * run everywhere.
+	 *
+	 * The legacy branch LOGS. A silent fallback would make the repair step look
+	 * unnecessary — the reads would keep working, the manifest filters would keep
+	 * showing nothing, and the only symptom would stay invisible.
+	 *
+	 * @param array<string, mixed> $request The stored advice request.
+	 *
+	 * @return string The objection id, or '' when neither key is present.
+	 */
+	private function objectionIdOf(array $request): string {
+		$objectionId = (string)($request['bezwaar'] ?? '');
+		if ($objectionId !== '') {
+			return $objectionId;
+		}
+
+		$legacy = (string)($request['objectionProceeding'] ?? '');
+		if ($legacy !== '') {
+			$this->logger->warning(
+				'Dossiq BAC: advice request still carries the legacy objection key; run the backfill repair step',
+				['app' => Application::APP_ID, 'requestId' => ($request['id'] ?? null)]
+			);
+		}
+
+		return $legacy;
+	}//end objectionIdOf()
+
+	/**
+	 * The external reference a raised advice decision carries.
+	 *
+	 * Prefers the objection, falling back to the advice request's own id so the
+	 * decision is never raised with an empty reference.
+	 *
+	 * @param array<string, mixed> $request The stored advice request.
+	 * @param string $requestId The advice request's own id.
+	 *
+	 * @return string The reference.
+	 */
+	private function externalReferenceFor(array $request, string $requestId): string {
+		$objectionId = $this->objectionIdOf(request: $request);
+		if ($objectionId !== '') {
+			return $objectionId;
+		}
+
+		return $requestId;
+	}//end externalReferenceFor()
 }//end class
diff --git a/lib/Service/ContractDecisionDelegationService.php b/lib/Service/ContractDecisionDelegationService.php
index 0413afa9d..a3fce560c 100644
--- a/lib/Service/ContractDecisionDelegationService.php
+++ b/lib/Service/ContractDecisionDelegationService.php
@@ -61,10 +61,24 @@ class ContractDecisionDelegationService {
 	public const DECISION_TYPE_ADVICE = 'advice';
 
 	/**
-	 * The decidesk request-event FQN. Guarded by class_exists so dossiq stays
-	 * installable without decidesk (decidesk is an optional runtime dependency).
+	 * Every spelling of the decision-request event FQN, newest first.
+	 *
+	 * Guarded by class_exists so dossiq stays installable without the decision
+	 * app, which is an optional runtime dependency.
+	 *
+	 * TWO SPELLINGS because a cross-app event class name is a RUNTIME lookup
+	 * this app can only follow, never move. The app renamed its namespace from
+	 * OCA\Decidesk to OCA\Decidiq with no compatibility alias, and this constant
+	 * named only the old one — so the guard below started throwing "decidesk is
+	 * not installed" on an instance where it very much was, and every contract
+	 * decision was blocked by a message that pointed at the wrong problem.
+	 *
+	 * @var array<int, string>
 	 */
-	private const DECISION_REQUESTED_EVENT = '\\OCA\\Decidesk\\Event\\DecisionRequestedEvent';
+	private const DECISION_REQUESTED_EVENTS = [
+		'\\OCA\\Decidiq\\Event\\DecisionRequestedEvent',
+		'\\OCA\\Decidesk\\Event\\DecisionRequestedEvent',
+	];
 
 	/**
 	 * Constructor.
@@ -193,15 +207,21 @@ private function dispatchDecisionRequest(
 		string $actorId,
 		array $payload,
 	): string {
-		$eventClass = self::DECISION_REQUESTED_EVENT;
+		$eventClass = $this->resolveRequestEventClass();
 
-		// REQ-PDCD-002: fail closed when decidesk is not installed.
-		if (class_exists($eventClass) === false) {
+		// REQ-PDCD-002: fail closed when the decision app is not installed.
+		if ($eventClass === null) {
 			$this->logger->error(
-				'ContractDecisionDelegationService: decidesk is not installed (DecisionRequestedEvent missing); failing closed',
-				['externalReference' => $externalReference, 'decisionType' => $decisionType]
+				'ContractDecisionDelegationService: the decision app is not installed (DecisionRequestedEvent missing under any known namespace); failing closed',
+				[
+					'externalReference' => $externalReference,
+					'decisionType' => $decisionType,
+					'tried' => self::DECISION_REQUESTED_EVENTS,
+				]
+			);
+			throw new RuntimeException(
+				'Decision service unavailable: the decision app is not installed. Decision cannot proceed.'
 			);
-			throw new RuntimeException('Decision service unavailable: decidesk is not installed. Decision cannot proceed.');
 		}
 
 		try {
@@ -257,4 +277,23 @@ private function dispatchDecisionRequest(
 
 		return (string)$decisionId;
 	}//end dispatchDecisionRequest()
+	/**
+	 * The first decision-request event class that actually exists.
+	 *
+	 * Returns null when NONE does, which the caller turns into a fail-closed
+	 * refusal. Resolving rather than assuming is the whole point: this app can
+	 * only follow the other app's namespace, and a hard-coded spelling turns a
+	 * rename over there into a broken feature over here.
+	 *
+	 * @return string|null The event FQN, or null when the decision app is absent.
+	 */
+	private function resolveRequestEventClass(): ?string {
+		foreach (self::DECISION_REQUESTED_EVENTS as $candidate) {
+			if (class_exists($candidate) === true) {
+				return $candidate;
+			}
+		}
+
+		return null;
+	}//end resolveRequestEventClass()
 }//end class
diff --git a/lib/Service/ParafeerActieService.php b/lib/Service/ParafeerActieService.php
index 2e41448bf..51465612e 100644
--- a/lib/Service/ParafeerActieService.php
+++ b/lib/Service/ParafeerActieService.php
@@ -149,7 +149,6 @@ class ParafeerActieService {
 	 * @param IRootFolder $rootFolder The Nextcloud root folder (for PDF signing).
 	 * @param LoggerInterface $logger The logger.
 	 * @param IEventDispatcher $eventDispatcher The event dispatcher (parafering transition events).
-	 * @param ParaferingApprovalBridge $approvalBridge Bridge to OpenRegister approval-workflow (ADR-022).
 	 * @param ParaferingActionMapper $actionMapper Pure shaping of action input, payload and route steps.
 	 * @param ParafeerStepGuard $stepGuard Current-step resolution + fail-closed authorisation.
 	 * @param ParafeerVoorstelRepository $proposalRepository Register/schema resolution + voorstel loads.
@@ -160,7 +159,6 @@ public function __construct(
 		private readonly IRootFolder $rootFolder,
 		private readonly LoggerInterface $logger,
 		private readonly IEventDispatcher $eventDispatcher,
-		private readonly ParaferingApprovalBridge $approvalBridge,
 		private readonly ParaferingActionMapper $actionMapper,
 		private readonly ParafeerStepGuard $stepGuard,
 		private readonly ParafeerVoorstelRepository $proposalRepository,
@@ -321,7 +319,6 @@ private function performRecordAction(string $proposalId, array $data, IUser $cur
 		$savedAction = $objectService->saveObject(object: $actionData, register: $register, schema: $actionSchema);
 
 		$this->propagateDecision(
-			proposal: $proposal,
 			proposalId: $proposalId,
 			input: $input,
 			stepOrder: $stepOrder,
@@ -373,7 +370,6 @@ private function performRecordAction(string $proposalId, array $data, IUser $cur
 	/**
 	 * Propagate the step decision to OpenRegister and emit the audit transition.
 	 *
-	 * @param array<string, mixed> $proposal The voorstel array (provides approvalChainUuid).
 	 * @param string $proposalId The voorstel UUID.
 	 * @param array<string, mixed> $input The parsed action inputs.
 	 * @param int $stepOrder The step order this action applies to.
@@ -382,7 +378,6 @@ private function performRecordAction(string $proposalId, array $data, IUser $cur
 	 * @return void
 	 */
 	private function propagateDecision(
-		array $proposal,
 		string $proposalId,
 		array $input,
 		int $stepOrder,
@@ -391,23 +386,15 @@ private function propagateDecision(
 		$action = (string)$input['action'];
 		$comment = (string)$input['comment'];
 
-		// Per ADR-022: delegate the step transition to OpenRegister's
-		// approval-workflow when this voorstel is backed by an OR
-		// ApprovalChain. OpenRegister enforces the step role, advances the
-		// next step, records the decision, and dispatches the approval
-		// events that ParaferingNotificationService observes. The legacy
-		// in-array currentStep/status update below remains the
-		// consumer-facing projection during the migration window.
-		$this->delegateToApprovalWorkflow(
-			proposal: $proposal,
-			proposalId: $proposalId,
-			action: $action,
-			comment: $comment,
-			advice: (string)$input['advice'],
-			onBehalfOf: $input['onBehalfOf'],
-			mandate: $input['mandate'],
-			currentUser: $currentUser,
-		);
+		// ADR-022's delegation to OpenRegister's approval-workflow was REMOVED
+		// here, and with it ParaferingApprovalBridge. It never ran: it required
+		// `proposal.approvalChainUuid`, a property the `proposal` schema does not
+		// declare and that was only ever written inside ParafeerRouteService::
+		// startParafering() — which was itself unreachable, because its route
+		// bound no argument and answered 400. So the bridge short-circuited on
+		// every single call, the "legacy in-array path" it called a migration
+		// window was the only path, and no approval event dossiq raised ever
+		// reached OpenRegister.
 
 		// Emit the parafering transition event for the audit listener.
 		[$transitionType, $actorRoleForAudit] = $this->transitionForAction(action: $action);
@@ -483,95 +470,6 @@ private function applyAccorderingEffects(
 		}
 	}//end applyAccorderingEffects()
 
-	/**
-	 * Delegate a parafering step decision to OpenRegister's approval-workflow.
-	 *
-	 * Maps the dossiq action onto OR's approve/reject endpoints and encodes
-	 * app-specific semantics (actorType, onBehalfOf mandate, advisory text,
-	 * skip reason) into the OR step comment as JSON `_meta`. Only runs when the
-	 * voorstel carries an `approvalChainUuid` and OR's approval-workflow is
-	 * available; otherwise it is a no-op and the legacy in-array path governs.
-	 *
-	 * Best-effort: a failed OR transition is logged and does NOT abort the
-	 * consumer-facing action during the migration window.
-	 *
-	 * @param array<string, mixed> $proposal The voorstel array (provides approvalChainUuid).
-	 * @param string $proposalId The voorstel UUID.
-	 * @param string $action The dossiq action (parafered/advised/accorded/returned/skipped).
-	 * @param string $comment The human-readable comment/reden.
-	 * @param string $advice The advisory text (advies steps).
-	 * @param string|null $onBehalfOf The principal UID when acting as delegate.
-	 * @param string|null $mandate The mandate reference.
-	 * @param IUser $currentUser The authenticated actor.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/migrate-parafering-to-or-approval-workflow/tasks.md#P1.2
-	 */
-	private function delegateToApprovalWorkflow(
-		array $proposal,
-		string $proposalId,
-		string $action,
-		string $comment,
-		string $advice,
-		?string $onBehalfOf,
-		?string $mandate,
-		IUser $currentUser,
-	): void {
-		$chainUuid = (string)($proposal['approvalChainUuid'] ?? '');
-		if ($chainUuid === '' || $this->approvalBridge->isAvailable() === false) {
-			return;
-		}
-
-		// The OR object UUID for the step lookup is the voorstel UUID.
-		$objectUuid = (string)($proposal['id'] ?? $proposal['uuid'] ?? $proposalId);
-		$userId = $currentUser->getUID();
-
-		$actorType = 'user';
-		if ($onBehalfOf !== null) {
-			$actorType = 'delegate';
-		}
-
-		$meta = [
-			'action' => $action,
-			'actorType' => $actorType,
-			'onBehalfOf' => $onBehalfOf,
-			'mandate' => $mandate,
-		];
-
-		$text = $comment;
-		if ($action === self::ACTION_ADVISED) {
-			$meta['advice'] = $advice;
-			if ($text === '') {
-				$text = $advice;
-			}
-		}
-
-		try {
-			if ($action === self::ACTION_RETURNED) {
-				$this->approvalBridge->rejectCurrentStep(
-					voorstelUuid: $objectUuid,
-					userId: $userId,
-					text: $text,
-					meta: $meta,
-				);
-				return;
-			}
-
-			$this->approvalBridge->approveCurrentStep(
-				voorstelUuid: $objectUuid,
-				userId: $userId,
-				text: $text,
-				meta: $meta,
-			);
-		} catch (\Throwable $e) {
-			$this->logger->warning(
-				'Dossiq: approval-workflow delegation failed; legacy path governs',
-				['proposal' => $proposalId, 'action' => $action, 'exception' => $e->getMessage()]
-			);
-		}//end try
-	}//end delegateToApprovalWorkflow()
-
 	/**
 	 * List all parafeeracties for a voorstel, sorted by createdAt ascending.
 	 *
diff --git a/lib/Service/ParafeerRouteService.php b/lib/Service/ParafeerRouteService.php
deleted file mode 100644
index b30c1afa6..000000000
--- a/lib/Service/ParafeerRouteService.php
+++ /dev/null
@@ -1,663 +0,0 @@
-<?php
-
-/**
- * Dossiq ParafeerRoute Service
- *
- * Routing engine for the B&W parafering workflow. Captures route snapshots on
- * voorstel submission, executes sequential step activation (task + notification),
- * advances the voorstel on step completion, and supports authorized override
- * operations (skip step, add ad-hoc step) with audit trail entries.
- *
- * Generic CRUD on parafeerroute objects is delegated to OpenRegister's
- * auto-exposed /api/objects/<register>/<schema> endpoints — this service
- * only owns workflow execution and read-only loads of related entities.
- *
- * @category Service
- * @package  OCA\Dossiq\Service
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2024 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2024 Conduction B.V. <info@conduction.nl>
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Service;
-
-use DateTimeImmutable;
-use DateTimeInterface;
-use OCA\Dossiq\AppInfo\Application;
-use OCA\Dossiq\Event\ParafeerTransitionEvent;
-use OCA\Dossiq\Service\Parafering\ParaferingStepActivator;
-use OCA\Dossiq\Service\Parafering\VoorstelRouteMapper;
-use OCA\Dossiq\Service\Support\ObjectArrayNormalizer;
-use OCP\EventDispatcher\IEventDispatcher;
-use OCP\IUserSession;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Throwable;
-
-/**
- * Service implementing the parafeerroute execution engine.
- *
- * All identity is derived from IUserSession, never trusted from caller-supplied
- * data. Real exception details are logged; callers translate failures to static
- * messages.
- *
- * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
- *
- * @psalm-suppress UnusedClass
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects) — orchestrates ObjectService, IUserSession,
- *   the event dispatcher and the parafering collaborators; still 15 after the step-activation,
- *   route-mapping and array-normalisation seams were extracted.
- */
-class ParafeerRouteService {
-	/**
-	 * Voorstel status when actively in parafering.
-	 */
-	public const STATUS_IN_PARAFERING = 'in_parafering';
-
-	/**
-	 * Voorstel status after the final step accordering completes.
-	 */
-	public const STATUS_GEACCORDEERD = 'geaccordeerd';
-
-	/**
-	 * Parafeeractie action: skipped.
-	 */
-	public const ACTION_SKIPPED = 'skipped';
-
-	/**
-	 * Parafeeractie action: accorded (final accordering step).
-	 */
-	public const ACTION_ACCORDED = 'accorded';
-
-	/**
-	 * Constructor.
-	 *
-	 * @param SettingsService $settingsService The Dossiq settings/config bridge to OpenRegister
-	 * @param IUserSession $userSession The current Nextcloud user session
-	 * @param LoggerInterface $logger The logger
-	 * @param ParaferingStepActivator $stepActivator Step activation + concrete actor resolution
-	 * @param IEventDispatcher $eventDispatcher The event dispatcher
-	 * @param ParaferingApprovalBridge $approvalBridge Bridge to OpenRegister approval-workflow (ADR-022)
-	 * @param VoorstelRouteMapper $routeMapper Route-snapshot / audit-trail shaping
-	 * @param ObjectArrayNormalizer $normalizer Collapses OpenRegister's array-or-entity shape
-	 */
-	public function __construct(
-		private readonly SettingsService $settingsService,
-		private readonly IUserSession $userSession,
-		private readonly LoggerInterface $logger,
-		private readonly ParaferingStepActivator $stepActivator,
-		private readonly IEventDispatcher $eventDispatcher,
-		private readonly ParaferingApprovalBridge $approvalBridge,
-		private readonly VoorstelRouteMapper $routeMapper,
-		private readonly ObjectArrayNormalizer $normalizer,
-	) {
-	}//end __construct()
-
-	/**
-	 * Best-effort dispatch of a ParafeerTransitionEvent.
-	 *
-	 * Failures MUST NOT propagate back to the routing service — operational
-	 * transitions must not be blocked by audit-listener outages.
-	 *
-	 * @param string $proposalId The voorstel UUID/slug
-	 * @param string $action The transition action
-	 * @param string|null $step Step identifier when applicable
-	 * @param string $actor The actor user UID
-	 * @param string $actorRole The actor role
-	 * @param string|null $reason Reason text when applicable
-	 *
-	 * @return void
-	 */
-	private function dispatchTransition(
-		string $proposalId,
-		string $action,
-		?string $step,
-		string $actor,
-		string $actorRole,
-		?string $reason = null,
-	): void {
-		try {
-			$this->eventDispatcher->dispatchTyped(
-				new ParafeerTransitionEvent(
-					proposalId: $proposalId,
-					action: $action,
-					step: $step,
-					actor: $actor,
-					actorRole: $actorRole,
-					reason: $reason,
-				),
-			);
-		} catch (Throwable $e) {
-			$this->logger->warning(
-				'Dossiq: ParafeerTransitionEvent dispatch failed',
-				[
-					'proposal' => $proposalId,
-					'action' => $action,
-					'exception' => $e->getMessage(),
-				],
-			);
-		}//end try
-	}//end dispatchTransition()
-
-	/**
-	 * Start the parafering workflow for a voorstel.
-	 *
-	 * Captures a JSON-encoded snapshot of the linked route's steps onto the
-	 * voorstel, sets currentStep=1, transitions to in_parafering, and
-	 * activates step 1 (task + notification).
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 *
-	 * @return array<string, mixed> The updated voorstel
-	 *
-	 * @throws RuntimeException When voorstel/route cannot be loaded or no steps are defined
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
-	 */
-	public function startParafering(string $proposalId): array {
-		[$objectService, $register, $proposalSchema] = $this->bootstrapVoorstel();
-		$routeSchema = $this->requireConfig(key: 'parafeerroute_schema');
-
-		$proposal = $this->normalizer->toArrayWithCast(value: $objectService->find($proposalId, register: $register, schema: $proposalSchema));
-
-		$routeRef = (string)($proposal['parafeerroute'] ?? '');
-		if ($routeRef === '') {
-			throw new RuntimeException('Voorstel has no linked parafeerroute');
-		}
-
-		$route = $this->normalizer->toArrayWithCast(value: $objectService->find($routeRef, register: $register, schema: $routeSchema));
-		$steps = $this->routeMapper->normalizeSteps(value: $route['steps'] ?? []);
-		if (count($steps) === 0) {
-			throw new RuntimeException('Linked parafeerroute has no steps');
-		}
-
-		$proposal['routeSnapshot'] = json_encode($steps);
-		$proposal['currentStep'] = 1;
-		$proposal['status'] = self::STATUS_IN_PARAFERING;
-
-		// Per ADR-022, the chain-state backend is OpenRegister's approval-workflow.
-		// Create the OpenRegister ApprovalChain and persist its UUID on the voorstel.
-		// No new dossiq-local Parafeerroute row is written for the chain state.
-		$voorstelUuid = (string)($proposal['id'] ?? $proposal['uuid'] ?? $proposalId);
-		$chainUuid = $this->createApprovalChain(voorstelUuid: $voorstelUuid, route: $route, steps: $steps);
-		if ($chainUuid !== null) {
-			$proposal['approvalChainUuid'] = $chainUuid;
-		}
-
-		$proposal = $this->normalizer->toArrayWithCast(
-			value: $objectService->saveObject(object: $proposal, register: $register, schema: $proposalSchema)
-		);
-
-		$this->stepActivator->activateStep(proposal: $proposal, step: 1, steps: $steps);
-
-		$this->dispatchTransition(
-			proposalId: (string)($proposal['id'] ?? $proposal['uuid'] ?? $proposalId),
-			action: 'started',
-			step: '1',
-			actor: $this->requireUserId(),
-			actorRole: 'author',
-		);
-
-		return $proposal;
-	}//end startParafering()
-
-	/**
-	 * Create the OpenRegister ApprovalChain backing this parafering route.
-	 *
-	 * Best-effort: returns the created chain UUID, or null when OpenRegister's
-	 * approval-workflow backend is unavailable (the legacy in-array
-	 * routeSnapshot path then remains the source of truth for this voorstel
-	 * during the migration window).
-	 *
-	 * @param string $voorstelUuid The voorstel UUID.
-	 * @param array<string, mixed> $route The route object (provides the chain name).
-	 * @param array<int, array<string, mixed>> $steps The normalised route steps.
-	 *
-	 * @return string|null The ApprovalChain UUID, or null when unavailable.
-	 *
-	 * @spec openspec/changes/migrate-parafering-to-or-approval-workflow/tasks.md#P1.1
-	 */
-	private function createApprovalChain(string $voorstelUuid, array $route, array $steps): ?string {
-		if ($this->approvalBridge->isAvailable() === false) {
-			return null;
-		}
-
-		try {
-			$name = (string)($route['name'] ?? 'Parafeerroute');
-			return $this->approvalBridge->initializeChainForVoorstel(
-				voorstelUuid: $voorstelUuid,
-				name: $name,
-				steps: $steps,
-			);
-		} catch (Throwable $e) {
-			$this->logger->warning(
-				'Dossiq: ApprovalChain creation failed, falling back to in-array routing',
-				['proposal' => $voorstelUuid, 'exception' => $e->getMessage()]
-			);
-			return null;
-		}
-	}//end createApprovalChain()
-
-	/**
-	 * Complete the current parafering step and advance to the next step.
-	 *
-	 * Records a parafeeractie, advances voorstel.currentStep, and either
-	 * activates the next step or marks the voorstel as geaccordeerd.
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 * @param array<string, mixed> $actionData The parafeeractie payload (action, comment, advice, etc.)
-	 *
-	 * @return array<string, mixed> The updated voorstel
-	 *
-	 * @throws RuntimeException When the voorstel is not active or storage is unavailable
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
-	 */
-	public function completeStep(string $proposalId, array $actionData): array {
-		[$objectService, $register, $proposalSchema] = $this->bootstrapVoorstel();
-		$actionSchema = $this->requireConfig(key: 'parafeeractie_schema');
-
-		$proposal = $this->normalizer->toArrayWithCast(value: $objectService->find($proposalId, register: $register, schema: $proposalSchema));
-		$steps = $this->routeMapper->normalizeSteps(value: $proposal['routeSnapshot'] ?? '[]');
-
-		if (($proposal['status'] ?? '') !== self::STATUS_IN_PARAFERING) {
-			throw new RuntimeException('Voorstel is not in parafering');
-		}
-
-		$currentStep = (int)($proposal['currentStep'] ?? 0);
-		if ($currentStep < 1) {
-			throw new RuntimeException('Voorstel has no active step');
-		}
-
-		$actieData = [
-			'proposal' => $proposal['id'] ?? $proposal['uuid'] ?? $proposalId,
-			'step' => $currentStep,
-			'actor' => $this->requireUserId(),
-			'actorType' => (string)($actionData['actorType'] ?? 'user'),
-			'action' => (string)($actionData['action'] ?? 'parafered'),
-		];
-
-		foreach (['comment', 'advice', 'mandate', 'onBehalfOf'] as $optional) {
-			if (isset($actionData[$optional]) === true && $actionData[$optional] !== '') {
-				$actieData[$optional] = (string)$actionData[$optional];
-			}
-		}
-
-		$objectService->saveObject(object: $actieData, register: $register, schema: $actionSchema);
-
-		$action = (string)($actionData['action'] ?? 'parafered');
-		$transition = 'paraferd';
-		$actorRole = 'parafeerder';
-		if ($action === 'advised') {
-			$transition = 'advised';
-			$actorRole = 'advisor';
-		}
-
-		$this->dispatchTransition(
-			proposalId: (string)($proposal['id'] ?? $proposal['uuid'] ?? $proposalId),
-			action: $transition,
-			step: (string)$currentStep,
-			actor: $actieData['actor'],
-			actorRole: $actorRole,
-		);
-
-		$proposal = $this->advanceProposal(
-			objectService: $objectService,
-			register: $register,
-			proposalSchema: $proposalSchema,
-			proposal: $proposal,
-			steps: $steps,
-			fromStep: $currentStep,
-		);
-
-		return $proposal;
-	}//end completeStep()
-
-	/**
-	 * Skip a (non-mandatory) step on a specific in-flight voorstel.
-	 *
-	 * Records a parafeeractie with action=skipped, appends an audit trail
-	 * entry on the voorstel, and advances currentStep if the skipped step
-	 * is the active one.
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 * @param int $step The step order to skip (1-based)
-	 * @param string $reason Mandatory reason text
-	 *
-	 * @return array<string, mixed> The updated voorstel
-	 *
-	 * @throws RuntimeException When the step is mandatory or input is invalid
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
-	 */
-	public function skipStep(string $proposalId, int $step, string $reason): array {
-		if (trim($reason) === '') {
-			throw new RuntimeException('Reden is verplicht bij overslaan');
-		}
-
-		[$objectService, $register, $proposalSchema] = $this->bootstrapVoorstel();
-		$actionSchema = $this->requireConfig(key: 'parafeeractie_schema');
-
-		$proposal = $this->normalizer->toArrayWithCast(value: $objectService->find($proposalId, register: $register, schema: $proposalSchema));
-		$steps = $this->routeMapper->normalizeSteps(value: $proposal['routeSnapshot'] ?? '[]');
-
-		$target = null;
-		foreach ($steps as $candidate) {
-			if ((int)($candidate['order'] ?? 0) === $step) {
-				$target = $candidate;
-				break;
-			}
-		}
-
-		if ($target === null) {
-			throw new RuntimeException('Stap niet gevonden in routeSnapshot');
-		}
-
-		if (($target['mandatory'] ?? true) === true) {
-			throw new RuntimeException('Deze stap is verplicht en kan niet worden overgeslagen');
-		}
-
-		$userId = $this->requireUserId();
-
-		$objectService->saveObject(
-			object: [
-				'proposal' => $proposal['id'] ?? $proposal['uuid'] ?? $proposalId,
-				'step' => $step,
-				'actor' => $userId,
-				'actorType' => 'user',
-				'action' => self::ACTION_SKIPPED,
-				'comment' => $reason,
-			],
-			register: $register,
-			schema: $actionSchema,
-		);
-
-		$proposal['routeSnapshot'] = json_encode(
-			array_map(
-				static function (array $candidate) use ($step): array {
-					if ((int)($candidate['order'] ?? 0) === $step) {
-						$candidate['skipped'] = true;
-					}
-
-					return $candidate;
-				},
-				$steps,
-			),
-		);
-
-		$proposal = $this->routeMapper->appendAuditTrail(
-			proposal: $proposal,
-			entry: [
-				'action' => 'step_skipped',
-				'actor' => $userId,
-				'timestamp' => (new DateTimeImmutable())->format(DateTimeInterface::ATOM),
-				'step' => $step,
-				'comment' => sprintf(
-					"Stap overgeslagen: '%s' door %s, reden: %s",
-					(string)($target['actor'] ?? ''),
-					$userId,
-					$reason,
-				),
-			],
-		);
-
-		$this->dispatchTransition(
-			proposalId: (string)($proposal['id'] ?? $proposal['uuid'] ?? $proposalId),
-			action: 'route-changed',
-			step: (string)$step,
-			actor: $userId,
-			actorRole: 'beheerder',
-			reason: $reason,
-		);
-
-		if ((int)($proposal['currentStep'] ?? 0) === $step) {
-			return $this->advanceProposal(
-				objectService: $objectService,
-				register: $register,
-				proposalSchema: $proposalSchema,
-				proposal: $proposal,
-				steps: $this->routeMapper->normalizeSteps(value: $proposal['routeSnapshot']),
-				fromStep: $step,
-			);
-		}
-
-		return $this->normalizer->toArrayWithCast(
-			value: $objectService->saveObject(object: $proposal, register: $register, schema: $proposalSchema)
-		);
-	}//end skipStep()
-
-	/**
-	 * Add an ad-hoc step to the routeSnapshot of a specific voorstel.
-	 *
-	 * Inserts the new step after the given order number, renumbers all
-	 * subsequent steps, and appends an audit trail entry. If currentStep
-	 * is already past the insertion point, the step is inserted immediately
-	 * after currentStep instead.
-	 *
-	 * @param string $proposalId The voorstel UUID
-	 * @param int $afterStep The order to insert after
-	 * @param array<string, mixed> $stepData The step fields (type, actor, actorType, mandatory)
-	 *
-	 * @return array<string, mixed> The updated voorstel
-	 *
-	 * @throws RuntimeException When the voorstel cannot be loaded
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
-	 */
-	public function addAdhocStep(string $proposalId, int $afterStep, array $stepData): array {
-		[$objectService, $register, $proposalSchema] = $this->bootstrapVoorstel();
-
-		$proposal = $this->normalizer->toArrayWithCast(value: $objectService->find($proposalId, register: $register, schema: $proposalSchema));
-		$steps = $this->routeMapper->normalizeSteps(value: $proposal['routeSnapshot'] ?? '[]');
-
-		$currentStep = (int)($proposal['currentStep'] ?? 0);
-		$insertAfter = $afterStep;
-		if ($currentStep > 0 && $afterStep < $currentStep) {
-			// Cannot insert before the active step — clamp to immediately after current.
-			$insertAfter = $currentStep;
-		}
-
-		$newStep = [
-			'order' => 0,
-			'type' => (string)($stepData['type'] ?? 'advice'),
-			'actor' => (string)($stepData['actor'] ?? ''),
-			'actorType' => (string)($stepData['actorType'] ?? 'user'),
-			'mandatory' => (bool)($stepData['mandatory'] ?? false),
-		];
-
-		$rebuilt = [];
-		$orderCounter = 1;
-		$inserted = false;
-		foreach ($steps as $candidate) {
-			$candidate['order'] = $orderCounter;
-			$rebuilt[] = $candidate;
-			$orderCounter++;
-			if ((int)$candidate['order'] === $insertAfter && $inserted === false) {
-				$newStep['order'] = $orderCounter;
-				$rebuilt[] = $newStep;
-				$orderCounter++;
-				$inserted = true;
-			}
-		}
-
-		if ($inserted === false) {
-			$newStep['order'] = $orderCounter;
-			$rebuilt[] = $newStep;
-		}
-
-		$proposal['routeSnapshot'] = json_encode($rebuilt);
-
-		$userId = $this->requireUserId();
-		$proposal = $this->routeMapper->appendAuditTrail(
-			proposal: $proposal,
-			entry: [
-				'action' => 'step_added',
-				'actor' => $userId,
-				'timestamp' => (new DateTimeImmutable())->format(DateTimeInterface::ATOM),
-				'step' => $newStep['order'],
-				'comment' => sprintf(
-					"Stap toegevoegd: '%s' door %s na stap %d",
-					$newStep['actor'],
-					$userId,
-					$insertAfter,
-				),
-			],
-		);
-
-		$saved = $this->normalizer->toArrayWithCast(
-			value: $objectService->saveObject(object: $proposal, register: $register, schema: $proposalSchema)
-		);
-
-		$this->dispatchTransition(
-			proposalId: (string)($saved['id'] ?? $saved['uuid'] ?? $proposalId),
-			action: 'route-changed',
-			step: (string)$newStep['order'],
-			actor: $userId,
-			actorRole: 'beheerder',
-			reason: sprintf('Ad-hoc step inserted after step %d', $insertAfter),
-		);
-
-		return $saved;
-	}//end addAdhocStep()
-
-	/**
-	 * Advance the proposal: either activate the next step or mark geaccordeerd.
-	 *
-	 * @param object $objectService The OpenRegister ObjectService
-	 * @param string $register The register slug/UUID
-	 * @param string $proposalSchema The voorstel schema slug/UUID
-	 * @param array<string, mixed> $proposal The current voorstel data
-	 * @param array<int, array<string, mixed>> $steps The decoded routeSnapshot
-	 * @param int $fromStep The step that just completed
-	 *
-	 * @return array<string, mixed>
-	 */
-	private function advanceProposal(
-		object $objectService,
-		string $register,
-		string $proposalSchema,
-		array $proposal,
-		array $steps,
-		int $fromStep,
-	): array {
-		$nextStep = null;
-		foreach ($steps as $candidate) {
-			$order = (int)($candidate['order'] ?? 0);
-			if ($order > $fromStep && ($candidate['skipped'] ?? false) !== true) {
-				$nextStep = $order;
-				break;
-			}
-		}
-
-		if ($nextStep === null) {
-			$proposal['status'] = self::STATUS_GEACCORDEERD;
-			$proposal = $this->normalizer->toArrayWithCast(
-				value: $objectService->saveObject(object: $proposal, register: $register, schema: $proposalSchema)
-			);
-			$this->logger->info(
-				'Dossiq: voorstel {id} fully accorded',
-				[
-					'id' => $proposal['id'] ?? '',
-					'app' => Application::APP_ID,
-				],
-			);
-
-			$this->dispatchTransition(
-				proposalId: (string)($proposal['id'] ?? $proposal['uuid'] ?? ''),
-				action: 'completed',
-				step: (string)$fromStep,
-				actor: $this->safeUserId(),
-				actorRole: 'accorderend',
-			);
-
-			return $proposal;
-		}//end if
-
-		$proposal['currentStep'] = $nextStep;
-		$proposal = $this->normalizer->toArrayWithCast(
-			value: $objectService->saveObject(object: $proposal, register: $register, schema: $proposalSchema)
-		);
-
-		$this->stepActivator->activateStep(proposal: $proposal, step: $nextStep, steps: $steps);
-
-		return $proposal;
-	}//end advanceVoorstel()
-
-	/**
-	 * Resolve ObjectService and the (register, voorstel schema) pair.
-	 *
-	 * @return array{0: object, 1: string, 2: string}
-	 *
-	 * @throws RuntimeException When configuration is missing
-	 */
-	private function bootstrapVoorstel(): array {
-		$objectService = $this->settingsService->getObjectService();
-		if ($objectService === null) {
-			throw new RuntimeException('OpenRegister is niet beschikbaar');
-		}
-
-		$register = $this->requireConfig(key: 'register');
-		$schema = $this->requireConfig(key: 'voorstel_schema');
-
-		return [$objectService, $register, $schema];
-	}//end bootstrapVoorstel()
-
-	/**
-	 * Fetch a required configuration value, throwing when empty.
-	 *
-	 * @param string $key The config key
-	 *
-	 * @return string
-	 *
-	 * @throws RuntimeException When the value is empty
-	 */
-	private function requireConfig(string $key): string {
-		$value = $this->settingsService->getConfigValue($key);
-		if ($value === '') {
-			throw new RuntimeException(sprintf('Dossiq configuration key %s is not set', $key));
-		}
-
-		return $value;
-	}//end requireConfig()
-
-	/**
-	 * Resolve the current user UID. Falls back to "system" only when no
-	 * session user is available — write operations require a real session.
-	 *
-	 * @return string
-	 */
-	private function requireUserId(): string {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			throw new RuntimeException('Authenticated user required');
-		}
-
-		return $user->getUID();
-	}//end requireUserId()
-
-	/**
-	 * Resolve the current user UID, falling back to "system" when no session
-	 * user is present (used by best-effort audit dispatch).
-	 *
-	 * @return string
-	 */
-	private function safeUserId(): string {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return 'system';
-		}
-
-		return $user->getUID();
-	}//end safeUserId()
-}//end class
diff --git a/lib/Service/Parafering/ParaferingStepActivator.php b/lib/Service/Parafering/ParaferingStepActivator.php
deleted file mode 100644
index 2dfb3eb88..000000000
--- a/lib/Service/Parafering/ParaferingStepActivator.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * Dossiq parafering step activator.
- *
- * Activates one step of a parafeerroute: locates the step in the route
- * snapshot, resolves its abstract actor into the concrete set of users that
- * may act on it, and records the activation. Split out of ParafeerRouteService
- * so that service keeps the transition sequencing while the actor question —
- * the one place a routing rule meets the shared RoleResolverService — has a
- * single owner.
- *
- * For role-typed actors the step's actor UUID is treated as the `roleType`
- * parameter of an implicit single-role rule, which is what makes delegation
- * and workload routing apply to parafering steps for free. Resolution failure
- * degrades to the literal actor rather than to an empty set: a step with no
- * resolvable actor would silently strand the voorstel.
- *
- * @category Service
- * @package  OCA\Dossiq\Service\Parafering
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- *
- * @spec openspec/changes/role-based-step-routing/tasks.md#T07
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Service\Parafering;
-
-use OCA\Dossiq\AppInfo\Application;
-use OCA\Dossiq\Service\RoleResolverService;
-use OCA\Dossiq\Service\Routing\RoutingStrategyMissingException;
-use Psr\Log\LoggerInterface;
-use Throwable;
-
-/**
- * Activates a parafering step and resolves its concrete actor set.
- *
- * @psalm-suppress UnusedClass
- *
- * @spec openspec/changes/role-based-step-routing/tasks.md#T07
- */
-class ParaferingStepActivator {
-	/**
-	 * Constructor.
-	 *
-	 * @param RoleResolverService $roleResolver Central role-routing engine.
-	 * @param LoggerInterface $logger The logger.
-	 */
-	public function __construct(
-		private readonly RoleResolverService $roleResolver,
-		private readonly LoggerInterface $logger,
-	) {
-	}//end __construct()
-
-	/**
-	 * Activate the step with the given order within a route snapshot.
-	 *
-	 * A step order that is absent from the snapshot is a no-op, matching the
-	 * pre-split behaviour.
-	 *
-	 * @param array<string, mixed> $proposal The voorstel.
-	 * @param int $step The step order to activate.
-	 * @param array<int, array<string, mixed>> $steps The decoded routeSnapshot.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/role-based-step-routing/tasks.md#T07
-	 */
-	public function activateStep(array $proposal, int $step, array $steps): void {
-		$stepInfo = null;
-		foreach ($steps as $candidate) {
-			if ((int)($candidate['order'] ?? 0) === $step) {
-				$stepInfo = $candidate;
-				break;
-			}
-		}
-
-		if ($stepInfo === null) {
-			return;
-		}
-
-		$resolvedActors = $this->resolveStepActors(stepInfo: $stepInfo, proposal: $proposal);
-
-		$this->logger->info(
-			'Dossiq: activated parafering step {step} of voorstel {voorstelId} for actor {actor}',
-			[
-				'step' => $step,
-				'voorstelId' => $proposal['id'] ?? $proposal['uuid'] ?? '',
-				'actor' => (string)($stepInfo['actor'] ?? ''),
-				'resolved' => $resolvedActors,
-				'app' => Application::APP_ID,
-			],
-		);
-	}//end activateStep()
-
-	/**
-	 * Resolve the concrete actor set for a step.
-	 *
-	 * For role-typed actors, the step's actor UUID is treated as the
-	 * `roleType` parameter of an implicit single-role rule and dispatched to
-	 * the shared RoleResolverService — this inherits delegation + workload
-	 * features automatically. For user-typed actors the original UUID is
-	 * returned as-is.
-	 *
-	 * @param array<string, mixed> $stepInfo The step from routeSnapshot.
-	 * @param array<string, mixed> $proposal The voorstel object (provides caseRef + caseType).
-	 *
-	 * @return array<int, string> The resolved actor UIDs.
-	 *
-	 * @spec openspec/changes/role-based-step-routing/tasks.md#T07
-	 */
-	public function resolveStepActors(array $stepInfo, array $proposal): array {
-		$actorType = (string)($stepInfo['actorType'] ?? 'user');
-		$actor = (string)($stepInfo['actor'] ?? '');
-		if ($actor === '') {
-			return [];
-		}
-
-		if ($actorType !== 'role') {
-			return [$actor];
-		}
-
-		$caseRef = (string)($proposal['case'] ?? ($proposal['zaak'] ?? ''));
-		if ($caseRef === '') {
-			return [$actor];
-		}
-
-		$case = ['id' => $caseRef, 'caseType' => (string)($proposal['caseType'] ?? '')];
-		$rule = $stepInfo['routingRule'] ?? null;
-		if (is_array($rule) === false || isset($rule['strategy']) === false) {
-			$rule = [
-				'strategy' => RoleResolverService::STRATEGY_SINGLE_ROLE,
-				'roleType' => $actor,
-			];
-		}
-
-		try {
-			return $this->roleResolver->resolve($rule, $case);
-		} catch (RoutingStrategyMissingException $e) {
-			$this->logger->warning(
-				'Dossiq: parafering step references unknown routing strategy: ' . $e->getMessage(),
-			);
-			return [$actor];
-		} catch (Throwable $e) {
-			$this->logger->warning(
-				'Dossiq: failed to resolve parafering step actors: ' . $e->getMessage(),
-			);
-			return [$actor];
-		}
-	}//end resolveStepActors()
-}//end class
diff --git a/lib/Service/Parafering/VoorstelRouteMapper.php b/lib/Service/Parafering/VoorstelRouteMapper.php
deleted file mode 100644
index 78679826b..000000000
--- a/lib/Service/Parafering/VoorstelRouteMapper.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * Dossiq voorstel route mapper.
- *
- * Pure shaping of the two voorstel fields the parafering route engine reads
- * and writes as loosely-typed data: `routeSnapshot`, which may arrive as a
- * JSON string or an array and must come back as an order-sorted list of step
- * arrays, and `auditTrail`, which is appended to under the same
- * string-or-array ambiguity. Split out of ParafeerRouteService so that service
- * keeps workflow execution and this conversion has one owner.
- *
- * Every path is total: an unparsable snapshot yields an empty step list and a
- * non-array audit trail is replaced rather than appended to, so a malformed
- * stored value can never make the engine throw mid-transition.
- *
- * @category Service
- * @package  OCA\Dossiq\Service\Parafering
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- *
- * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Service\Parafering;
-
-/**
- * Normalises route snapshots and appends audit-trail entries.
- *
- * @psalm-suppress UnusedClass
- *
- * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
- */
-class VoorstelRouteMapper {
-	/**
-	 * Append an entry to the voorstel auditTrail field.
-	 *
-	 * @param array<string, mixed> $proposal The voorstel.
-	 * @param array<string, mixed> $entry The entry to append.
-	 *
-	 * @return array<string, mixed> The voorstel with the entry appended.
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
-	 */
-	public function appendAuditTrail(array $proposal, array $entry): array {
-		$trail = $proposal['auditTrail'] ?? [];
-		if (is_string($trail) === true) {
-			$decoded = json_decode($trail, true);
-			$trail = [];
-			if (is_array($decoded) === true) {
-				$trail = $decoded;
-			}
-		}
-
-		if (is_array($trail) === false) {
-			$trail = [];
-		}
-
-		$trail[] = $entry;
-		$proposal['auditTrail'] = $trail;
-
-		return $proposal;
-	}//end appendAuditTrail()
-
-	/**
-	 * Normalize a steps value (JSON string or array) to a plain ordered array.
-	 *
-	 * @param mixed $value The raw value from routeSnapshot or schema field.
-	 *
-	 * @return array<int, array<string, mixed>> The steps, sorted by `order`.
-	 *
-	 * @spec openspec/changes/parafeerroute-engine/tasks.md#T04
-	 */
-	public function normalizeSteps(mixed $value): array {
-		if (is_string($value) === true) {
-			$decoded = json_decode($value, true);
-			$value = [];
-			if (is_array($decoded) === true) {
-				$value = $decoded;
-			}
-		}
-
-		if (is_array($value) === false) {
-			return [];
-		}
-
-		$steps = [];
-		foreach ($value as $candidate) {
-			if (is_array($candidate) === true) {
-				$steps[] = $candidate;
-			}
-		}
-
-		usort(
-			$steps,
-			static function (array $left, array $right): int {
-				return ((int)($left['order'] ?? 0)) <=> ((int)($right['order'] ?? 0));
-			},
-		);
-
-		return $steps;
-	}//end normalizeSteps()
-}//end class
diff --git a/lib/Service/ParaferingApprovalBridge.php b/lib/Service/ParaferingApprovalBridge.php
deleted file mode 100644
index 20446036c..000000000
--- a/lib/Service/ParaferingApprovalBridge.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-
-/**
- * Dossiq Parafering Approval Bridge
- *
- * Translates dossiq parafeerroute concepts into OpenRegister's
- * `approval-workflow` abstraction (ApprovalChain / ApprovalStep) and routes
- * all step decisions (paraferen, terugsturen, adviseren, overslaan, delegeren)
- * through OpenRegister's ApprovalService.
- *
- * Per ADR-022 (apps consume OpenRegister abstractions), dossiq no longer owns
- * a bespoke approval-chain state machine: chain-state, role enforcement,
- * advance-on-approval and decision history are delegated to OpenRegister. This
- * bridge is the single seam between dossiq's voorstel/parafeerroute model and
- * OpenRegister's approval store. App-specific parafering semantics (actorType,
- * onBehalfOf mandate, advisory text, skip reason) are encoded in the step
- * `comment` field as a JSON object `{"text": "...", "_meta": {...}}` — the
- * metadata-in-comment pattern from the umbrella design.
- *
- * @category Service
- * @package  OCA\Dossiq\Service
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2024 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2024 Conduction B.V. <info@conduction.nl>
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- *
- * @spec openspec/specs/parafering-via-or-approval/spec.md
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Service;
-
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Throwable;
-
-/**
- * Bridge between dossiq parafering and OpenRegister approval-workflow.
- *
- * Every method degrades gracefully when OpenRegister's ApprovalService is
- * unavailable (fresh install / OR disabled): the bridge reports its
- * availability via isAvailable() so callers can fall back to the legacy
- * in-array routing path during the migration window.
- *
- * @spec openspec/specs/parafering-via-or-approval/spec.md
- *
- * @psalm-suppress UnusedClass
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ParaferingApprovalBridge {
-	/**
-	 * Fully-qualified name of OpenRegister's ApprovalChainMapper.
-	 */
-	private const OR_CHAIN_MAPPER = 'OCA\OpenRegister\Db\ApprovalChainMapper';
-
-	/**
-	 * Fully-qualified name of OpenRegister's ApprovalStepMapper.
-	 */
-	private const OR_STEP_MAPPER = 'OCA\OpenRegister\Db\ApprovalStepMapper';
-
-	/**
-	 * Constructor.
-	 *
-	 * @param SettingsService $settingsService The dossiq settings bridge to OpenRegister.
-	 * @param LoggerInterface $logger The logger.
-	 */
-	public function __construct(
-		private readonly SettingsService $settingsService,
-		private readonly LoggerInterface $logger,
-	) {
-	}//end __construct()
-
-	/**
-	 * Whether OpenRegister's approval-workflow backend is reachable.
-	 *
-	 * @return bool True when the ApprovalService and mappers can be resolved.
-	 *
-	 * @spec openspec/specs/parafering-via-or-approval/spec.md
-	 */
-	public function isAvailable(): bool {
-		return $this->settingsService->getApprovalService() !== null
-			&& $this->settingsService->getOpenRegisterClass(self::OR_CHAIN_MAPPER) !== null
-			&& $this->settingsService->getOpenRegisterClass(self::OR_STEP_MAPPER) !== null;
-	}//end isAvailable()
-
-	/**
-	 * Create an OpenRegister ApprovalChain for a voorstel from its route steps.
-	 *
-	 * Each parafeerroute step (advies/parafering/accordering) maps to one
-	 * ApprovalStep whose `role` is the Nextcloud group bound to the step. The
-	 * created chain is initialised against the voorstel UUID so OpenRegister
-	 * sets step 1 to `pending` and dispatches ApprovalStepInitiatedEvent.
-	 *
-	 * No dossiq-local `Parafeerroute` row is created here — the chain lives in
-	 * OpenRegister's approval store.
-	 *
-	 * @param string $voorstelUuid The voorstel UUID.
-	 * @param string $name A human-readable chain name.
-	 * @param array<int, array<string, mixed>> $steps The route steps (order/type/actor/...).
-	 *
-	 * @return string|null The created ApprovalChain UUID, or null when OpenRegister is unavailable.
-	 *
-	 * @throws RuntimeException When chain creation fails while OpenRegister is available.
-	 *
-	 * @spec openspec/specs/parafering-via-or-approval/spec.md
-	 */
-	public function initializeChainForVoorstel(string $voorstelUuid, string $name, array $steps): ?string {
-		$approvalService = $this->settingsService->getApprovalService();
-		$chainMapper = $this->settingsService->getOpenRegisterClass(self::OR_CHAIN_MAPPER);
-		if ($approvalService === null || $chainMapper === null) {
-			return null;
-		}
-
-		try {
-			$chainSteps = $this->mapStepsToApprovalSteps(steps: $steps);
-			if (count($chainSteps) === 0) {
-				throw new RuntimeException('Cannot create an approval chain with zero steps');
-			}
-
-			// Create the ApprovalChain in OpenRegister via its mapper.
-			$chain = $chainMapper->createFromArray(
-				[
-					'name' => $name,
-					'steps' => $chainSteps,
-					'enabled' => true,
-				]
-			);
-
-			// Initialise the steps against the voorstel UUID (step 1 -> pending).
-			$approvalService->initializeChain($chain, $voorstelUuid);
-
-			$chainUuid = (string)($chain->getUuid() ?? '');
-			$this->logger->info(
-				'Dossiq: parafering ApprovalChain created in OpenRegister',
-				['proposal' => $voorstelUuid, 'chain' => $chainUuid, 'steps' => count($chainSteps)]
-			);
-
-			return $chainUuid;
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'Dossiq: failed to create parafering ApprovalChain',
-				['proposal' => $voorstelUuid, 'exception' => $e->getMessage()]
-			);
-			throw new RuntimeException('Approval chain creation failed');
-		}//end try
-	}//end initializeChainForVoorstel()
-
-	/**
-	 * Approve the currently pending OpenRegister step for a voorstel.
-	 *
-	 * Resolves the pending step for the voorstel UUID, then delegates to
-	 * OpenRegister's ApprovalService::approveStep — which enforces the step
-	 * role, sets the step `approved`, advances the next waiting step to
-	 * `pending`, and dispatches the approval events. App-specific metadata is
-	 * encoded in the comment as JSON.
-	 *
-	 * @param string $voorstelUuid The voorstel UUID.
-	 * @param string $userId The acting user UID (from IUserSession).
-	 * @param string $text The human-readable comment/reden.
-	 * @param array<string, mixed> $meta Machine-readable meta (action, actorType, onBehalfOf, mandate, advice).
-	 *
-	 * @return array<string, mixed>|null The OpenRegister approveStep result, or null when unavailable.
-	 *
-	 * @throws RuntimeException When no pending step exists or the approval fails.
-	 *
-	 * @spec openspec/specs/parafering-via-or-approval/spec.md
-	 */
-	public function approveCurrentStep(string $voorstelUuid, string $userId, string $text, array $meta): ?array {
-		$approvalService = $this->settingsService->getApprovalService();
-		if ($approvalService === null) {
-			return null;
-		}
-
-		$stepId = $this->findPendingStepId(voorstelUuid: $voorstelUuid);
-		if ($stepId === null) {
-			throw new RuntimeException('No pending approval step for voorstel');
-		}
-
-		try {
-			return $approvalService->approveStep($stepId, $userId, $this->encodeComment(text: $text, meta: $meta));
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'Dossiq: ApprovalService::approveStep failed',
-				['proposal' => $voorstelUuid, 'step' => $stepId, 'exception' => $e->getMessage()]
-			);
-			throw new RuntimeException('Approval step transition failed');
-		}
-	}//end approveCurrentStep()
-
-	/**
-	 * Reject (terugsturen) the currently pending OpenRegister step for a voorstel.
-	 *
-	 * @param string $voorstelUuid The voorstel UUID.
-	 * @param string $userId The acting user UID (from IUserSession).
-	 * @param string $text The mandatory rejection reason.
-	 * @param array<string, mixed> $meta Machine-readable meta.
-	 *
-	 * @return array<string, mixed>|null The OpenRegister rejectStep result, or null when unavailable.
-	 *
-	 * @throws RuntimeException When no pending step exists or the rejection fails.
-	 *
-	 * @spec openspec/specs/parafering-via-or-approval/spec.md
-	 */
-	public function rejectCurrentStep(string $voorstelUuid, string $userId, string $text, array $meta): ?array {
-		$approvalService = $this->settingsService->getApprovalService();
-		if ($approvalService === null) {
-			return null;
-		}
-
-		$stepId = $this->findPendingStepId(voorstelUuid: $voorstelUuid);
-		if ($stepId === null) {
-			throw new RuntimeException('No pending approval step for voorstel');
-		}
-
-		try {
-			return $approvalService->rejectStep($stepId, $userId, $this->encodeComment(text: $text, meta: $meta));
-		} catch (Throwable $e) {
-			$this->logger->error(
-				'Dossiq: ApprovalService::rejectStep failed',
-				['proposal' => $voorstelUuid, 'step' => $stepId, 'exception' => $e->getMessage()]
-			);
-			throw new RuntimeException('Rejection step transition failed');
-		}
-	}//end rejectCurrentStep()
-
-	/**
-	 * Map dossiq route steps to OpenRegister ApprovalChain step definitions.
-	 *
-	 * The OpenRegister step `role` is the Nextcloud group ID bound to the
-	 * dossiq step actor. Role-typed actors use the actor as the role group;
-	 * user-typed actors fall back to the actor UID as the role token (the OR
-	 * group check then governs membership).
-	 *
-	 * @param array<int, array<string, mixed>> $steps The dossiq route steps.
-	 *
-	 * @return array<int, array<string, mixed>> The OpenRegister step definitions.
-	 */
-	private function mapStepsToApprovalSteps(array $steps): array {
-		$mapped = [];
-		$order = 1;
-		foreach ($steps as $step) {
-			if (($step['skipped'] ?? false) === true) {
-				continue;
-			}
-
-			$mapped[] = [
-				'order' => (int)($step['order'] ?? $order),
-				'role' => (string)($step['role'] ?? ($step['actor'] ?? '')),
-				'type' => (string)($step['type'] ?? 'parafering'),
-				'statusOnApprove' => (string)($step['statusOnApprove'] ?? 'approved'),
-				'statusOnReject' => (string)($step['statusOnReject'] ?? 'rejected'),
-			];
-			$order++;
-		}//end foreach
-
-		return $mapped;
-	}//end mapStepsToApprovalSteps()
-
-	/**
-	 * Find the pending OpenRegister ApprovalStep id for a voorstel UUID.
-	 *
-	 * @param string $voorstelUuid The voorstel UUID.
-	 *
-	 * @return int|null The pending step id, or null when none is pending.
-	 */
-	private function findPendingStepId(string $voorstelUuid): ?int {
-		$stepMapper = $this->settingsService->getOpenRegisterClass(self::OR_STEP_MAPPER);
-		if ($stepMapper === null) {
-			return null;
-		}
-
-		try {
-			$steps = $stepMapper->findByObjectUuid($voorstelUuid);
-			foreach ($steps as $step) {
-				if ($step->getStatus() === 'pending') {
-					return (int)$step->getId();
-				}
-			}
-		} catch (Throwable $e) {
-			$this->logger->warning(
-				'Dossiq: could not resolve pending approval step',
-				['proposal' => $voorstelUuid, 'exception' => $e->getMessage()]
-			);
-		}
-
-		return null;
-	}//end findPendingStepId()
-
-	/**
-	 * Encode app-specific parafering metadata into the OpenRegister comment field.
-	 *
-	 * When no structured meta is present the plain human-readable text is
-	 * returned as-is (keeps simple paraferingen readable in the OR store);
-	 * otherwise a JSON object `{"text": "...", "_meta": {...}}` is emitted.
-	 *
-	 * @param string $text The human-readable comment.
-	 * @param array<string, mixed> $meta The machine-readable meta (filtered of empty values).
-	 *
-	 * @return string The encoded comment.
-	 */
-	private function encodeComment(string $text, array $meta): string {
-		$filtered = [];
-		foreach ($meta as $key => $value) {
-			if ($value === null || $value === '') {
-				continue;
-			}
-
-			$filtered[$key] = $value;
-		}
-
-		if (count($filtered) === 0) {
-			return $text;
-		}
-
-		$encoded = json_encode(['text' => $text, '_meta' => $filtered]);
-		if ($encoded === false) {
-			return $text;
-		}
-
-		return $encoded;
-	}//end encodeComment()
-}//end class
diff --git a/lib/Service/Subsidie/BeschikkingService.php b/lib/Service/Subsidie/BeschikkingService.php
index b2951cbd0..13837c659 100644
--- a/lib/Service/Subsidie/BeschikkingService.php
+++ b/lib/Service/Subsidie/BeschikkingService.php
@@ -189,7 +189,19 @@ public function sign(string $decisionId): array {
 	public function publish(string $decisionId): array {
 		[$objectService, $register, $schema] = $this->resolve();
 
-		$current = $objectService->find($decisionId, register: $register, schema: $schema);
+		// The lookup is INSIDE a try because OpenRegister's find() THROWS on a
+		// missing object rather than returning a non-array. Outside one, that
+		// throw escaped the controller as an HTML 500 — and the `is_array()`
+		// guard below could never fire, so 'Beschikking niet gevonden' was a
+		// message no caller could ever receive. sign(), directly below, has
+		// always wrapped its call and answers a clean 400; this now matches it.
+		try {
+			$current = $objectService->find($decisionId, register: $register, schema: $schema);
+		} catch (Throwable $e) {
+			$this->logger->error('Dossiq subsidie: publish beschikking lookup failed: ' . $e->getMessage());
+			throw new OCSBadRequestException('Beschikking niet gevonden');
+		}
+
 		if (is_array($current) === false) {
 			throw new OCSBadRequestException('Beschikking niet gevonden');
 		}
diff --git a/lib/Service/Transitions/SideEffectDispatcher.php b/lib/Service/Transitions/SideEffectDispatcher.php
index 34e8765dc..8a3570eb1 100644
--- a/lib/Service/Transitions/SideEffectDispatcher.php
+++ b/lib/Service/Transitions/SideEffectDispatcher.php
@@ -75,7 +75,7 @@ public function dispatch(array $actions, array $case, array $transitionContext):
 			}
 
 			// ADR-065: OpenRegister owns the engine, so a transition side effect
-			// runs the SAME node a flow would — procest contributes those nodes
+			// runs the SAME node a flow would — dossiq contributes those nodes
 			// (lib/Flow) and this is the second caller of identical code, not a
 			// parallel implementation. The local-handler path is the fallback for
 			// an instance without OpenRegister, so a transition never silently
@@ -109,7 +109,7 @@ public function dispatch(array $actions, array $case, array $transitionContext):
 	/**
 	 * OpenRegister's node catalogue, or null when OpenRegister is absent.
 	 *
-	 * Resolved lazily and BY NAME: procest declares no hard dependency on
+	 * Resolved lazily and BY NAME: dossiq declares no hard dependency on
 	 * OpenRegister, and an instance without it must still fire its side effects.
 	 *
 	 * @return FlowNodeRegistry|null The catalogue, or null.
@@ -165,7 +165,7 @@ private function viaNode(
 		array $transitionContext,
 	): array {
 		try {
-			$node = $nodes->get(type: 'procest.' . $type);
+			$node = $nodes->get(type: 'dossiq.' . $type);
 		} catch (Throwable $e) {
 			$this->logger->warning(
 				'SideEffectDispatcher: unknown action type',
@@ -192,7 +192,7 @@ private function viaNode(
 	}//end viaNode()
 
 	/**
-	 * Run one action through procest's own handler registry.
+	 * Run one action through dossiq's own handler registry.
 	 *
 	 * The fallback for an instance without OpenRegister.
 	 *
diff --git a/lib/Settings/dossiq_register.json b/lib/Settings/dossiq_register.json
index 2e23a40ea..ba4b00664 100644
--- a/lib/Settings/dossiq_register.json
+++ b/lib/Settings/dossiq_register.json
@@ -3237,7 +3237,7 @@
                 "version": "1.0.0",
                 "x-schema-org": "schema:Action",
                 "title": "Automatic Action",
-                "description": "Declarative automatic action attached to a status transition. The slug is referenced from transitions[].automaticActions[].ref and resolved at dispatch time by ActionRegistry. Six built-in handler types are supported; per-tenant scoped; unpublished actions are not resolvable.",
+                "description": "Declarative automatic action. HISTORICAL: this description used to say the slug was referenced from transitions[].automaticActions[].ref and resolved at dispatch time — it never was. SideEffectDispatcher runs a separate vocabulary keyed on an inline `type`, and nothing has ever read these objects at run time. They are migrated to OpenRegister flows by `occ dossiq:actions:migrate-to-flows`, where each becomes a flow around the matching dossiq.action.* node; the flow is what executes. Kept for the migration and for reading historical configuration.",
                 "type": "object",
                 "required": [
                     "slug",
@@ -3297,7 +3297,7 @@
                     "isPublished": {
                         "type": "boolean",
                         "default": false,
-                        "description": "Only published actions are dispatched by SideEffectDispatcher",
+                        "description": "Legacy publish flag. It never gated anything: SideEffectDispatcher does not read these objects at all. The migration to OpenRegister flows ignores it — enable or disable the resulting flow instead.",
                         "title": "Is Published"
                     },
                     "active": {
diff --git a/openspec/changes/consume-decidesk-besluitvorming-leaf/tasks.md b/openspec/changes/consume-decidesk-besluitvorming-leaf/tasks.md
index 8a4342de7..b2c9845e2 100644
--- a/openspec/changes/consume-decidesk-besluitvorming-leaf/tasks.md
+++ b/openspec/changes/consume-decidesk-besluitvorming-leaf/tasks.md
@@ -22,4 +22,6 @@
 - [x] 4.1 Build dossiq against published nc-vue beta.138 (USE_LOCAL_LIB=false); lint clean (0 errors); `appinfo/info.xml` at 0.2.20; chown js to 1000:1000; `occ upgrade` (no-op — DB already 0.2.20). Built `js/dossiq-main.js` serves with version cache-bust and contains `decidesk-decisions` + `besluitvorming-leaf-tab`.
 - [x] 4.2 Verify (server-side — browser MCP unavailable this session): manifest `CaseDetail.config.sidebarTabs` carries `besluitvorming → BesluitvormingLeafTab` (order 35); `menu-layout.json#removals` contains `BesluitvormingGroup/Voorstellen/Advice/BesluitvormingAgenda` with their stale relocations dropped; all former page routes (`/voorstellen`, `/voorstellen/:id`, `/advice`, `/advice/:id`, `/besluitvorming/agenda`, `/besluitvorming/vergaderingen/:id`) remain registered (ADR-044). dossiq app page returns HTTP 200.
 - [x] 4.3 decidesk write-path: fixed schema-96 `decisionType` `format:uuid` mis-import on this dev instance; decision `POST /api/objects/18/96` now returns 201 (was 422). See proposal caveat #2.
-- [ ] 4.4 BLOCKED (decidesk-side, not dossiq): the real decidesk leaf does not render at runtime until decidesk PR #100 (`d4940267`, the `Util::addInitScript('decidesk','decidesk-integration-init')` wiring) is merged to decidesk `development` and deployed. Until then dossiq's leaf shows the graceful "Besluitvorming unavailable" fallback. See proposal caveat #1.
+- [x] 4.4 UNBLOCKED and verified at runtime 2026-08-24. The wiring is on decidiq `development` and deployed here — `lib/AppInfo/Application.php` calls `Util::addInitScript(self::APP_ID, 'decidiq-integration-init')` and `js/decidiq-integration-init.js` is built. Verified in the browser ON A DOSSIQ PAGE, not by reading code: `OCA.OpenRegister.integrations.list()` returns 28 leaves including `decidesk-decisions` (label "Besluitvorming") with `tab`, `widget`, `widgetCompact`, `widgetExpanded` and `widgetEntity` surfaces. The fallback is no longer what a user sees.
+      ⚠️ The PR reference above was wrong: `#100` in both `decidesk` and `decidiq` is "chore(spec): merge p2-minutes-and-decisions-other-t2", merged 2026-04-19 — a different change entirely. The wiring was confirmed BY CONTENT instead, which is the only check that would have caught this.
+      🔑 The leaf id stays `decidesk-decisions` on the OLD app name. It is a cross-app runtime lookup, so it can only move when the registration on decidiq's side moves.
diff --git a/openspec/changes/page-topology-cleanup/PLAN-RESUME.md b/openspec/changes/page-topology-cleanup/PLAN-RESUME.md
index 1486d0bc6..e3a259a25 100644
--- a/openspec/changes/page-topology-cleanup/PLAN-RESUME.md
+++ b/openspec/changes/page-topology-cleanup/PLAN-RESUME.md
@@ -1,20 +1,42 @@
 # Resume plan — page-topology-cleanup
 
-> Written 2026-08-22 so the remaining work survives a context compaction.
-> **23 of 44 tasks done.** Blocks A, B, C1 and E1 are complete and in review;
-> C2 and D1–D4 were deferred on the flow-engine consolidation, which has now
-> landed, so they are unblocked.
+> Updated 2026-08-24. **Blocks A, B, C1, C2, D1 and E1 are done and on
+> `development` or in review.** D2 and D3 turned out not to be migrations at all
+> — both target models had to be BUILT in decidiq first — and that work is now
+> open as decidiq#874.
 
 ## Where things stand
 
 | Item | State |
 |---|---|
-| **A** — three dashboards converted | done · on `chore/page-topology-cleanup-specs` |
-| **B** — administration surface | done · same branch |
-| **C1** — verwerkingen retired | done · same branch |
-| **E1** — AI oversight → hermiq | done · hermiq#514 + #517 **merged**; dossiq#1328 **merged** into the branch |
-| **C2** — automatic actions → OR flows | **NOW UNBLOCKED** |
-| **D1–D4** — besluitvorming/committees/parafeerroutes → decidiq | **NOW UNBLOCKED**, but D1 still waits on `consume-decidesk-besluitvorming-leaf` |
+| **A** — three dashboards converted | ✅ merged (dossiq#1323) |
+| **B** — administration surface | ✅ merged (dossiq#1323) |
+| **C1** — verwerkingen retired | ✅ merged (dossiq#1323) |
+| **E1** — AI oversight → hermiq | ✅ merged (hermiq#514/#517 + dossiq#1323) |
+| **C2** — automatic actions → OR flows | ✅ in review (dossiq#1343) |
+| **D1** — agenda compiler retired | ✅ in review (dossiq#1343) |
+| **D2** — bezwaaradviescommissie | 🚧 decidiq side in review (decidiq#874); dossiq migration NOT started |
+| **D3** — parafeerroute | 🚧 decidiq side in review (decidiq#874); dossiq migration NOT started |
+| **D4** — case leaf render-and-read only | ⬜ not started |
+| **F/G** — e2e + final verification | ✅ retirement e2e added; blok G open |
+
+### 🔴 D2/D3 were mis-scoped, and the correction matters
+
+Both were planned as "move a schema to decidiq". Measured on 2026-08-24, neither
+target existed:
+
+- **`governance-body` could not represent a bezwaaradviescommissie.** Six
+  blocking gaps, the worst being no `active` flag — the ONE field dossiq's live
+  code reads and throws on. And decidiq's cross-app API was GET-only, so there
+  was no supported way to write a body at all.
+- **`DecisionStage` had no engine.** Zero writers across `lib/`, and a route tab
+  whose own header says read-only. `routedDocumentsJoin.js` is a red herring: it
+  routes documents onto a meeting AGENDA, not for sign-off.
+
+decidiq#874 builds both: the four committee fields + a scoped write path, and
+`ApprovalRoute` / `ApprovalAction` / `ApprovalRouteService` with a fail-closed
+engine. **The dossiq-side migrations remain to do, and cannot start until it
+merges.**
 
 ### Open PR
 
diff --git a/phpstan.neon b/phpstan.neon
index 35515db06..15ef48987 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -21,7 +21,7 @@ parameters:
         # Declaration-only stubs for OpenRegister / decidesk / hermiq contracts —
         # soft runtime dependencies, resolved only when those apps are installed.
         # SCANNED, never analysed and never autoloaded at runtime (PSR-4 maps only
-        # OCA\Procest\ -> lib/), so the real classes win whenever the owning app
+        # OCA\Dossiq\ -> lib/), so the real classes win whenever the owning app
         # is enabled.
         #
         # Needed rather than an ignoreErrors entry: phpstan REFUSES to ignore the
@@ -30,13 +30,24 @@ parameters:
         # case-action nodes implement — has to be resolvable.
         #
         # SCOPED TO Flow/, NOT the whole tests/Stubs tree. hermiq can scan all of
-        # its stubs because they are declaration-only for absent apps; procest's
+        # its stubs because they are declaration-only for absent apps; dossiq's
         # tree also holds stubs that SHADOW REAL CLASSES (HttpClientStubs.php
         # redeclares OCP\Http\Client shapes for tests). Scanning the parent made
         # phpstan prefer those narrower stubs over the real OCP classes and
         # reported 57 false errors against a clean baseline — e.g. "Call to an
         # undefined method OCP\Http\Client\IClient::delete()".
         - tests/Stubs/Flow
+        # The decision app's event contract, under BOTH namespaces it has
+        # shipped (OCA\Decidiq, formerly OCA\Decidesk). Scanned for the same
+        # reason as Flow/ and with the same scoping discipline: these are
+        # declaration-only stubs for an absent app, so they shadow nothing.
+        #
+        # Needed because the production code resolves whichever class EXISTS.
+        # With neither namespace on the analysis path, phpstan proved the
+        # class_exists() call always false and reported the resilient lookup as
+        # dead code — turning a fix for a real outage into a CI failure.
+        - tests/Stubs/Decidiq
+        - tests/Stubs/Decidesk
 
     typeAliases:
         # OCP declares `@psalm-type DataResponseType = ...` in the DataResponse
diff --git a/src/components/besluitvorming/AgendaItem.vue b/src/components/besluitvorming/AgendaItem.vue
deleted file mode 100644
index 3e6e3e133..000000000
--- a/src/components/besluitvorming/AgendaItem.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
-  - SPDX-License-Identifier: EUPL-1.2
-  - SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
-  -->
-<template>
-	<div
-		class="agenda-item"
-		:class="{
-			'agenda-item--bespreekstuk': item.handling === 'bespreekstuk',
-		}">
-		<span
-			class="agenda-item__handle"
-			:title="t('dossiq', 'Sleep om te herordenen')"
-			>⋮⋮</span
-		>
-		<span class="agenda-item__number">{{ item.agendanummer || '–' }}</span>
-		<span class="agenda-item__title">{{
-			item.title || t('dossiq', 'Onbenoemd voorstel')
-		}}</span>
-		<div class="agenda-item__toggle">
-			<NcButton
-				:type="item.handling === 'hamerstuk' ? 'primary' : 'secondary'"
-				@click="setBehandeling('hamerstuk')">
-				{{ t('dossiq', 'Hamerstuk') }}
-			</NcButton>
-			<NcButton
-				:type="item.handling === 'bespreekstuk' ? 'primary' : 'secondary'"
-				@click="setBehandeling('bespreekstuk')">
-				{{ t('dossiq', 'Bespreekstuk') }}
-			</NcButton>
-		</div>
-	</div>
-</template>
-
-<script>
-import { NcButton } from '@nextcloud/vue'
-
-export default {
-	name: 'AgendaItem',
-	components: { NcButton },
-	props: {
-		item: {
-			type: Object,
-			required: true,
-		},
-	},
-
-	methods: {
-		/**
-		 * Emit a behandeling change for this item.
-		 *
-		 * @param {string} behandeling 'hamerstuk' | 'bespreekstuk'.
-		 */
-		setBehandeling(behandeling) {
-			this.$emit('set-behandeling', { id: this.item.id, behandeling })
-		},
-	},
-}
-</script>
-
-<style scoped>
-.agenda-item {
-	display: flex;
-	align-items: center;
-	gap: 12px;
-	padding: 8px 12px;
-	border: 1px solid var(--color-border);
-	border-radius: var(--border-radius);
-	margin-bottom: 6px;
-	background: var(--color-main-background);
-}
-
-.agenda-item--bespreekstuk {
-	border-left: 4px solid var(--color-primary-element);
-}
-
-.agenda-item__handle {
-	cursor: grab;
-	color: var(--color-text-maxcontrast);
-}
-
-.agenda-item__number {
-	font-weight: bold;
-	min-width: 32px;
-}
-
-.agenda-item__title {
-	flex: 1;
-}
-
-.agenda-item__toggle {
-	display: flex;
-	gap: 6px;
-}
-</style>
diff --git a/src/dialogs/AddStepDialog.vue b/src/dialogs/AddStepDialog.vue
deleted file mode 100644
index 7b1be53c7..000000000
--- a/src/dialogs/AddStepDialog.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<!-- SPDX-License-Identifier: EUPL-1.2 -->
-<!-- SPDX-FileCopyrightText: 2024 Conduction B.V. <info@conduction.nl> -->
-<template>
-	<NcDialog
-		v-if="open"
-		:name="t('dossiq', 'Ad-hoc stap toevoegen')"
-		size="normal"
-		:canClose="!submitting"
-		@closing="onClose">
-		<div class="add-step-dialog">
-			<div class="add-step-dialog__field">
-				<label class="add-step-dialog__label">
-					{{ t('dossiq', 'Invoegen na stap') }}
-				</label>
-				<NcSelect
-					v-model="afterStep"
-					:options="insertionOptions"
-					:aria-label-combobox="t('dossiq', 'Invoegen na stap')"
-					label="label"
-					:reduce="(opt) => opt.value"
-					:placeholder="t('dossiq', 'Select insert position')" />
-			</div>
-			<div class="add-step-dialog__field">
-				<label class="add-step-dialog__label">
-					{{ t('dossiq', 'Stap type') }}
-				</label>
-				<NcSelect
-					v-model="stepType"
-					:options="stepTypeOptions"
-					:aria-label-combobox="t('dossiq', 'Stap type')"
-					:placeholder="t('dossiq', 'Select type')" />
-			</div>
-			<div class="add-step-dialog__field">
-				<label class="add-step-dialog__label">
-					{{ t('dossiq', 'Actor type') }}
-				</label>
-				<NcSelect
-					v-model="actorType"
-					:options="actorTypeOptions"
-					:aria-label-combobox="t('dossiq', 'Actor type')"
-					:placeholder="t('dossiq', 'Select actor type')" />
-			</div>
-			<div class="add-step-dialog__field">
-				<NcTextField
-					:modelValue="actor"
-					:label="t('dossiq', 'Actor (UID, groep of rol)')"
-					required
-					@update:modelValue="(v) => (actor = v)" />
-			</div>
-			<div class="add-step-dialog__field">
-				<NcCheckboxRadioSwitch
-					:modelValue="mandatory"
-					@update:modelValue="(v) => (mandatory = v)">
-					{{ t('dossiq', 'Verplichte stap') }}
-				</NcCheckboxRadioSwitch>
-			</div>
-
-			<NcNoteCard v-if="error" type="error">
-				{{ error }}
-			</NcNoteCard>
-		</div>
-		<template #actions>
-			<NcButton :disabled="submitting" @click="onClose">
-				{{ t('dossiq', 'Annuleren') }}
-			</NcButton>
-			<NcButton type="primary" :disabled="!canSubmit" @click="onSubmit">
-				{{
-					submitting
-						? t('dossiq', 'Bezig...')
-						: t('dossiq', 'Stap toevoegen')
-				}}
-			</NcButton>
-		</template>
-	</NcDialog>
-</template>
-
-<script>
-import {
-	NcButton,
-	NcCheckboxRadioSwitch,
-	NcDialog,
-	NcNoteCard,
-	NcSelect,
-	NcTextField,
-} from '@nextcloud/vue'
-import parafeerRouteApi from '../services/parafeerRouteApi.js'
-
-export default {
-	name: 'AddStepDialog',
-	components: {
-		NcButton,
-		NcCheckboxRadioSwitch,
-		NcDialog,
-		NcNoteCard,
-		NcSelect,
-		NcTextField,
-	},
-
-	props: {
-		open: {
-			type: Boolean,
-			default: false,
-		},
-
-		voorstelId: {
-			type: String,
-			required: true,
-		},
-
-		routeSnapshot: {
-			type: Array,
-			default: () => [],
-		},
-	},
-
-	data() {
-		return {
-			afterStep: null,
-			stepType: 'advice',
-			actorType: 'user',
-			actor: '',
-			mandatory: false,
-			submitting: false,
-			error: '',
-			stepTypeOptions: ['advice', 'parafering', 'accordering'],
-			actorTypeOptions: ['user', 'group', 'role'],
-		}
-	},
-
-	computed: {
-		/** @spec openspec/specs/parafering-actions/spec.md */
-		insertionOptions() {
-			return this.routeSnapshot.map((s) => ({
-				label: this.t('dossiq', 'Na stap {n} — {actor}', {
-					n: s.order,
-					actor: s.actor,
-				}),
-				value: s.order,
-			}))
-		},
-
-		/** @spec openspec/specs/parafering-actions/spec.md */
-		canSubmit() {
-			return (
-				!this.submitting
-				&& this.afterStep !== null
-				&& this.actor.trim().length > 0
-			)
-		},
-	},
-
-	watch: {
-		/**
-		 * @param value
-		 * @spec openspec/specs/parafering-actions/spec.md
-		 */
-		open(value) {
-			if (value) {
-				this.afterStep = null
-				this.stepType = 'advice'
-				this.actorType = 'user'
-				this.actor = ''
-				this.mandatory = false
-				this.error = ''
-			}
-		},
-	},
-
-	methods: {
-		/** @spec openspec/specs/parafering-actions/spec.md */
-		async onSubmit() {
-			if (!this.canSubmit) return
-			this.submitting = true
-			this.error = ''
-			try {
-				await parafeerRouteApi.addStep(this.voorstelId, {
-					afterStep: this.afterStep,
-					stepData: {
-						type: this.stepType,
-						actorType: this.actorType,
-						actor: this.actor.trim(),
-						mandatory: this.mandatory,
-					},
-				})
-				this.$emit('step-added')
-			} catch (err) {
-				this.error = this.t('dossiq', 'Stap toevoegen mislukt')
-				console.error('addStep failed', err)
-			} finally {
-				this.submitting = false
-			}
-		},
-
-		/** @spec openspec/specs/parafering-actions/spec.md */
-		onClose() {
-			if (this.submitting) return
-			this.$emit('close')
-		},
-	},
-}
-</script>
-
-<style scoped>
-.add-step-dialog {
-	display: flex;
-	flex-direction: column;
-	gap: 12px;
-	padding: 12px 0;
-}
-
-.add-step-dialog__field {
-	display: flex;
-	flex-direction: column;
-	gap: 4px;
-}
-
-.add-step-dialog__label {
-	font-weight: 600;
-	font-size: 0.9em;
-}
-</style>
diff --git a/src/dialogs/SkipStepDialog.vue b/src/dialogs/SkipStepDialog.vue
index d175e957b..24c22bbb6 100644
--- a/src/dialogs/SkipStepDialog.vue
+++ b/src/dialogs/SkipStepDialog.vue
@@ -55,7 +55,7 @@
 
 <script>
 import { NcButton, NcDialog, NcNoteCard, NcTextArea } from '@nextcloud/vue'
-import parafeerRouteApi from '../services/parafeerRouteApi.js'
+import { recordAction } from '../services/parafeerActieApi.js'
 
 export default {
 	name: 'SkipStepDialog',
@@ -123,9 +123,18 @@ export default {
 			this.submitting = true
 			this.error = ''
 			try {
-				await parafeerRouteApi.skipStep(this.voorstelId, {
+				// Re-pointed at the LIVE parafeeractie endpoint. This dialog used
+				// to POST to /api/parafeer-route/.../skip-step, which answered 400
+				// on every call — so the button has never once skipped a step.
+				// `skipped` is in the parafeeractie action enum, so the live path
+				// expresses exactly this, and the route API it used has been
+				// retired. `reason` becomes `comment`, which is the field that
+				// endpoint requires for a skip.
+				await recordAction({
+					proposal: this.voorstelId,
 					step: this.step.order,
-					reason: this.reason.trim(),
+					action: 'skipped',
+					comment: this.reason.trim(),
 				})
 				this.$emit('skipped')
 			} catch (err) {
diff --git a/src/manifest.d/50-besluitvorming.json b/src/manifest.d/50-besluitvorming.json
deleted file mode 100644
index 9676861ea..000000000
--- a/src/manifest.d/50-besluitvorming.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-	"pages": [
-		{
-			"id": "AgendaCompiler",
-			"route": "/besluitvorming/agenda",
-			"type": "custom",
-			"title": "Agenda",
-			"_note": "Bespoke agenda compiler — assembles a meeting agenda from selected proposals with drag-ordering and section grouping; the compile-and-reorder workflow is not expressible as a standard index/detail page.",
-			"component": "AgendaCompilerView"
-		},
-		{
-			"id": "VergaderingDetail",
-			"route": "/besluitvorming/vergaderingen/:id",
-			"type": "custom",
-			"title": "Vergadering",
-			"_note": "Bespoke meeting (vergadering) detail — combines agenda, attendees, voting and minutes into one working surface the standard detail type cannot express.",
-			"component": "VergaderingDetailView"
-		}
-	],
-	"menu": [
-		{
-			"id": "BesluitvormingAgenda",
-			"label": "Agenda",
-			"icon": "CalendarTextOutline",
-			"route": "AgendaCompiler",
-			"order": 72,
-			"requiresRole": ["Behandelaar", "Agendabeheerder", "Griffier"]
-		}
-	]
-}
diff --git a/src/manifest.json b/src/manifest.json
index a26695234..4200d6fea 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -207,12 +207,6 @@
 			"route": "CaseMap",
 			"order": 60
 		},
-		{
-			"id": "BesluitvormingGroup",
-			"label": "Decision-making",
-			"icon": "Gavel",
-			"order": 70
-		},
 		{
 			"id": "Voorstellen",
 			"label": "Proposals",
@@ -284,10 +278,10 @@
 			"order": 97
 		},
 		{
-			"id": "AutomaticActionsMenu",
+			"id": "FlowsLink",
 			"label": "Automatic actions",
 			"icon": "Sitemap",
-			"route": "AutomaticActions",
+			"href": "/apps/openregister/#/flows",
 			"section": "settings",
 			"order": 96
 		},
@@ -343,7 +337,7 @@
 			"id": "AdminSettingsLink",
 			"label": "Configuration",
 			"icon": "CogOutline",
-			"href": "/settings/admin/procest",
+			"href": "/settings/admin/dossiq",
 			"section": "settings",
 			"order": 99
 		},
@@ -3419,98 +3413,6 @@
 				}
 			}
 		},
-		{
-			"id": "AutomaticActions",
-			"route": "/settings/automatic-actions",
-			"type": "index",
-			"title": "Automatische acties",
-			"config": {
-				"register": "dossiq",
-				"schema": "automaticAction",
-				"columns": [
-					"slug",
-					"type",
-					"title",
-					"isPublished",
-					"active"
-				],
-				"showViewAction": false,
-				"actions": [
-					"create",
-					"edit",
-					"delete",
-					{
-						"id": "view",
-						"label": "View",
-						"icon": "EyeOutline",
-						"handler": "navigate",
-						"route": "AutomaticActionDetail",
-						"type": "handler"
-					}
-				],
-				"sidebar": {
-					"enabled": true,
-					"showMetadata": true
-				},
-				"documentationUrl": "https://procest.conduction.nl"
-			}
-		},
-		{
-			"id": "AutomaticActionDetail",
-			"route": "/settings/automatic-actions/:id",
-			"type": "detail",
-			"title": "Automatische actie",
-			"config": {
-				"register": "dossiq",
-				"schema": "automaticAction",
-				"_note": "CONFIG/TECHNICAL archetype (workflow automation handler definition — a rule consumed by the workflow engine). No comms, no child schemas, no status enum (isPublished/active are booleans). The single Data widget carries identity + the handler-specific config[] payload (slug, type, title, description, tenantId, version, isPublished, active, config). No object-lists, no content leaves, no lifecycleActions. Audit history (publish/activation changes) is a sidebar tab.",
-				"documentationUrl": "https://procest.conduction.nl",
-				"widgets": [
-					{
-						"id": "automaticaction-data",
-						"type": "data",
-						"title": "Automatische actie",
-						"icon": "Cog",
-						"content": {
-							"columns": 2
-						}
-					}
-				],
-				"layout": [
-					{
-						"id": "1",
-						"widgetId": "automaticaction-data",
-						"gridX": 0,
-						"gridY": 0,
-						"gridWidth": 12,
-						"gridHeight": 5,
-						"showTitle": false
-					}
-				],
-				"sidebar": {
-					"enabled": true,
-					"showMetadata": true,
-					"tabs": [
-						{
-							"id": "audit",
-							"label": "History",
-							"icon": "History",
-							"widgets": [
-								{
-									"type": "audit"
-								}
-							]
-						},
-						{
-							"id": "version-history",
-							"label": "Version history",
-							"icon": "FileCompare",
-							"component": "VersionHistoryLeafTab"
-						}
-					]
-				}
-			}
-		},
 		{
 			"id": "PublicAppointment",
 			"route": "/public/appointments/:id",
diff --git a/src/personalSettings.js b/src/personalSettings.js
index ae110d461..2beeae69b 100644
--- a/src/personalSettings.js
+++ b/src/personalSettings.js
@@ -17,4 +17,4 @@ const app = createApp(SubstitutionSettings)
 app.use(pinia)
 app.config.globalProperties.t = t
 app.config.globalProperties.n = n
-app.mount('#procest-personal-settings')
+app.mount('#dossiq-personal-settings')
diff --git a/src/registry.js b/src/registry.js
index 8822ca8ea..dbb6009ad 100644
--- a/src/registry.js
+++ b/src/registry.js
@@ -44,8 +44,6 @@ import CaseDocumentsTab from './components/tabs/CaseDocumentsTab.vue'
 // Detail-tab components (used as `component:` in sidebarTabs[])
 import CaseTasksTab from './components/tabs/CaseTasksTab.vue'
 import SubstitutionAdminView from './views/admin/SubstitutionAdmin.vue'
-import AgendaCompilerView from './views/besluitvorming/AgendaCompilerView.vue'
-import VergaderingDetailView from './views/besluitvorming/VergaderingDetailView.vue'
 // VTH-specific case detail panels
 import AdviceRequestPanel from './views/cases/components/AdviceRequestPanel.vue'
 import AdviesPanel from './views/cases/components/AdviesPanel.vue'
@@ -230,16 +228,9 @@ const registry = {
 	},
 
 	// --- Besluitvorming workflow views. ---
-	AgendaCompilerView: {
-		kind: 'page',
-		component: AgendaCompilerView,
-		_note: 'Agenda compiler: available vs agenda panels, hamerstuk/bespreekstuk toggle (besluitvorming-workflow).',
-	},
-	VergaderingDetailView: {
-		kind: 'page',
-		component: VergaderingDetailView,
-		_note: 'Decision recording per geagendeerd case: stemuitslag, attending members, aanhouden flow.',
-	},
+	// The agenda compiler and the vergadering detail view were retired: decidiq
+	// owns agenda-building and meetings, and surfaces them on a case through the
+	// `decidesk-decisions` integration leaf rather than through pages here.
 	BesluitPublicatiePanel: {
 		kind: 'page',
 		component: BesluitPublicatiePanel,
diff --git a/src/services/besluitvormingApi.js b/src/services/besluitvormingApi.js
index 21626adab..3b127bf93 100644
--- a/src/services/besluitvormingApi.js
+++ b/src/services/besluitvormingApi.js
@@ -3,10 +3,18 @@
 /**
  * Besluitvorming API service.
  *
- * Wraps the dossiq /api/besluitvorming endpoints (agenda compilation,
- * DROP/LVBB publication, mandaat validation). All HTTP traffic uses
+ * Wraps the dossiq /api/besluitvorming endpoints. All HTTP traffic uses
  * @nextcloud/axios for CSRF + auth interop. Never use raw fetch().
  *
+ * WHAT LEFT AND WHY. `addToAgenda`, `confirmAgenda` and `generateAgenda` went
+ * with the agenda compiler: decidiq owns agenda-building and meetings, and
+ * surfaces them on a case through the `decidesk-decisions` integration leaf.
+ * `mandaatCheck` went too — it had no caller at all, while its route stays live
+ * for the guard that uses it server-side.
+ *
+ * `generateAgenda` was worse than unused: it POSTed to `/agenda/generate`, for
+ * which no route has ever been declared. It could only ever have 404'd.
+ *
  * @spec openspec/specs/besluitvorming-workflow/spec.md
  */
 import axios from '@nextcloud/axios'
@@ -14,49 +22,6 @@ import { generateUrl } from '@nextcloud/router'
 
 const base = (path) => generateUrl('/apps/dossiq/api/besluitvorming' + path)
 
-/**
- * Add a case to an agenda with a classification and order.
- *
- * @param {string} caseId The case UUID.
- * @param {string} behandeling 'hamerstuk' | 'bespreekstuk'.
- * @param {number} order The agenda order position.
- * @return {Promise<object>} The updated agenda item.
- */
-export async function addToAgenda(caseId, behandeling, order) {
-	const response = await axios.post(base('/cases/' + caseId + '/agenda'), {
-		behandeling,
-		order,
-	})
-	return response.data
-}
-
-/**
- * Confirm an agenda for a list of cases on a meeting date.
- *
- * @param {string} vergaderingId The vergadering case UUID.
- * @param {Array<string>} caseIds The ordered case UUIDs.
- * @param {string} meetingDate ISO yyyy-mm-dd meeting date.
- * @return {Promise<object>} The confirmation summary.
- */
-export async function confirmAgenda(vergaderingId, caseIds, meetingDate) {
-	const response = await axios.put(base('/cases/' + vergaderingId + '/agenda'), {
-		caseIds,
-		meetingDate,
-	})
-	return response.data
-}
-
-/**
- * Generate the agenda document (hamerstukken first).
- *
- * @param {Array<string>} caseIds The case UUIDs on the agenda.
- * @return {Promise<object>} The ordered items and optional document id.
- */
-export async function generateAgenda(caseIds) {
-	const response = await axios.post(base('/agenda/generate'), { caseIds })
-	return response.data
-}
-
 /**
  * Trigger (retry) DROP/LVBB publication for a case.
  *
@@ -67,18 +32,3 @@ export async function publishBesluit(caseId) {
 	const response = await axios.post(base('/cases/' + caseId + '/publish'), {})
 	return response.data
 }
-
-/**
- * Validate the signing official's mandate for a case.
- *
- * @param {string} caseId The case UUID.
- * @param {string} [signingUserId] Optional signing user UID.
- * @return {Promise<object>} The validation result.
- */
-export async function mandaatCheck(caseId, signingUserId) {
-	const params = signingUserId ? { signingUserId } : {}
-	const response = await axios.get(base('/cases/' + caseId + '/mandaat-check'), {
-		params,
-	})
-	return response.data
-}
diff --git a/src/services/caseRelationApi.js b/src/services/caseRelationApi.js
index b14182f7a..2f6cb0506 100644
--- a/src/services/caseRelationApi.js
+++ b/src/services/caseRelationApi.js
@@ -5,7 +5,7 @@
  * `lib/Controller/CaseRelationController.php`:
  *   GET    /apps/dossiq/api/cases/{caseId}/relations
  *   POST   /apps/dossiq/api/cases/{caseId}/relations
- *   DELETE /apps/dossiq/api/cases/{caseId}/relations/{targetId}/{aardRelatie}
+ *   DELETE /apps/dossiq/api/cases/{caseId}/relations/{targetId}/{natureRelationship}
  *
  * Relations are typed (`vervolg` | `onderwerp` | `bijdrage`), bidirectionally
  * consistent (written symmetrically server-side), and guarded.
diff --git a/src/services/parafeerRouteApi.js b/src/services/parafeerRouteApi.js
deleted file mode 100644
index be37fdead..000000000
--- a/src/services/parafeerRouteApi.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Dossiq parafeerroute engine API client.
- *
- * Thin wrapper around @nextcloud/axios for the voorstel routing engine
- * endpoints (start, complete-step, skip-step, add-step). Uses axios so
- * CSRF headers are attached automatically — never raw fetch().
- *
- * Generic CRUD on parafeerroute objects (list, read, create, update,
- * delete) is served by OpenRegister's auto-exposed
- * /api/objects/<register>/<schema> endpoints and consumed by the
- * manifest-rendered CnIndexPage / CnDetailPage — not this client.
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2024 Conduction B.V. <info@conduction.nl>
- */
-import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
-
-const baseUrl = () => generateUrl('/apps/dossiq/api/parafeer-route')
-
-/**
- * Start parafering on a voorstel.
- *
- * @param {string} voorstelId Voorstel UUID
- * @return {Promise<object>}
- */
-/**
- * @param voorstelId
- * @spec openspec/specs/parafering-actions/spec.md
- */
-export async function startParafering(voorstelId) {
-	const response = await axios.post(
-		`${baseUrl()}/voorstel/${encodeURIComponent(voorstelId)}/start`,
-	)
-	return response.data
-}
-
-/**
- * Complete the active step on a voorstel.
- *
- * @param {string} voorstelId Voorstel UUID
- * @param {object} data       Parafeeractie payload
- * @return {Promise<object>}
- */
-/**
- * @param voorstelId
- * @param data
- * @spec openspec/specs/parafering-actions/spec.md
- */
-export async function completeStep(voorstelId, data) {
-	const response = await axios.post(
-		`${baseUrl()}/voorstel/${encodeURIComponent(voorstelId)}/complete-step`,
-		data,
-	)
-	return response.data
-}
-
-/**
- * Skip a step on a voorstel.
- *
- * @param {string} voorstelId Voorstel UUID
- * @param {object} data       { step: number, reason: string }
- * @return {Promise<object>}
- */
-/**
- * @param voorstelId
- * @param data
- * @spec openspec/specs/parafering-actions/spec.md
- */
-export async function skipStep(voorstelId, data) {
-	const response = await axios.post(
-		`${baseUrl()}/voorstel/${encodeURIComponent(voorstelId)}/skip-step`,
-		data,
-	)
-	return response.data
-}
-
-/**
- * Insert an ad-hoc step into the voorstel route snapshot.
- *
- * @param {string} voorstelId Voorstel UUID
- * @param {object} data       { afterStep: number, stepData: object }
- * @return {Promise<object>}
- */
-/**
- * @param voorstelId
- * @param data
- * @spec openspec/specs/parafering-actions/spec.md
- */
-export async function addStep(voorstelId, data) {
-	const response = await axios.post(
-		`${baseUrl()}/voorstel/${encodeURIComponent(voorstelId)}/add-step`,
-		data,
-	)
-	return response.data
-}
-
-export default {
-	startParafering,
-	completeStep,
-	skipStep,
-	addStep,
-}
diff --git a/src/views/besluitvorming/AgendaCompilerView.vue b/src/views/besluitvorming/AgendaCompilerView.vue
deleted file mode 100644
index ed2b62c48..000000000
--- a/src/views/besluitvorming/AgendaCompilerView.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<!--
-  - SPDX-License-Identifier: EUPL-1.2
-  - SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
-  -->
-<template>
-	<div class="agenda-compiler">
-		<CnDetailPage
-			:title="t('dossiq', 'Agenda samenstellen')"
-			:subtitle="
-				t(
-					'dossiq',
-					'Compile the meeting agenda from decisions ready for scheduling',
-				)
-			"
-			:loading="loading"
-			:sidebar="false">
-			<template #header-actions>
-				<NcButton
-					type="secondary"
-					:disabled="agenda.length === 0"
-					@click="onGenerate">
-					{{ t('dossiq', 'Agenda genereren') }}
-				</NcButton>
-				<NcButton
-					type="primary"
-					:disabled="agenda.length === 0 || !meetingDate"
-					@click="onConfirm">
-					{{ t('dossiq', 'Agenda bevestigen') }}
-				</NcButton>
-			</template>
-
-			<CnDetailCard :title="t('dossiq', 'Vergadering')">
-				<div class="agenda-compiler__controls">
-					<label for="bvw-gremium">{{
-						t('dossiq', 'Vergadergremium')
-					}}</label>
-					<NcSelect
-						v-model="gremium"
-						inputId="bvw-gremium"
-						:inputLabel="t('dossiq', 'Vergadergremium')"
-						:options="gremiumOptions"
-						@update:modelValue="loadReadyItems" />
-					<label for="bvw-date">{{ t('dossiq', 'Vergaderdatum') }}</label>
-					<input id="bvw-date" v-model="meetingDate" type="date" />
-				</div>
-			</CnDetailCard>
-
-			<div class="agenda-compiler__panels">
-				<CnDetailCard
-					:title="t('dossiq', 'Available for scheduling')"
-					class="agenda-compiler__panel">
-					<NcEmptyContent
-						v-if="available.length === 0"
-						:name="t('dossiq', 'No available items')"
-						:description="
-							t(
-								'dossiq',
-								'No decisions are ready for scheduling for this body.',
-							)
-						" />
-					<div
-						v-for="item in available"
-						:key="item.id"
-						class="agenda-compiler__available-item">
-						<span>{{
-							item.title || t('dossiq', 'Onbenoemd voorstel')
-						}}</span>
-						<NcButton type="tertiary" @click="addItem(item)">
-							{{ t('dossiq', 'Toevoegen') }}
-						</NcButton>
-					</div>
-				</CnDetailCard>
-
-				<CnDetailCard :title="agendaTitle" class="agenda-compiler__panel">
-					<NcEmptyContent
-						v-if="agenda.length === 0"
-						:name="t('dossiq', 'Lege agenda')"
-						:description="
-							t('dossiq', 'Add items from the list on the left.')
-						" />
-					<AgendaItem
-						v-for="item in agenda"
-						:key="item.id"
-						:item="item"
-						@setBehandeling="onSetBehandeling" />
-				</CnDetailCard>
-			</div>
-		</CnDetailPage>
-	</div>
-</template>
-
-<script>
-import { CnDetailCard, CnDetailPage } from '@conduction/nextcloud-vue'
-import { NcButton, NcEmptyContent, NcSelect } from '@nextcloud/vue'
-import AgendaItem from '../../components/besluitvorming/AgendaItem.vue'
-import {
-	addToAgenda,
-	confirmAgenda,
-	generateAgenda,
-} from '../../services/besluitvormingApi.js'
-import { useObjectStore } from '../../store/modules/object.js'
-
-export default {
-	name: 'AgendaCompilerView',
-	components: {
-		NcButton,
-		NcSelect,
-		NcEmptyContent,
-		CnDetailPage,
-		CnDetailCard,
-		AgendaItem,
-	},
-
-	data() {
-		return {
-			loading: false,
-			gremium: 'College-besluit',
-			gremiumOptions: ['College-besluit', 'Raadsbesluit', 'Mandaatbesluit'],
-			meetingDate: '',
-			available: [],
-			agenda: [],
-		}
-	},
-
-	computed: {
-		/** @spec openspec/specs/besluitvorming-workflow/spec.md */
-		objectStore() {
-			return useObjectStore()
-		},
-
-		/**
-		 * Heading for the agenda currently being compiled.
-		 *
-		 * @return {string} The agenda title.
-		 *
-		 * @spec openspec/specs/besluitvorming-workflow/spec.md#requirement-req-bvw-004-agenda-compiler-must-support-hamerstukken-and-bespreekstukken-with-configurable-ordering
-		 */
-		agendaTitle() {
-			const label = this.meetingDate ? ' ' + this.meetingDate : ''
-			return this.t('dossiq', 'Agenda') + label
-		},
-	},
-
-	created() {
-		this.loadReadyItems()
-	},
-
-	methods: {
-		/**
-		 * Load cases that are ready for agendering for the selected gremium.
-		 *
-		 * @spec openspec/specs/besluitvorming-workflow/spec.md
-		 */
-		async loadReadyItems() {
-			this.loading = true
-			try {
-				const gremium =
-					typeof this.gremium === 'string'
-						? this.gremium
-						: this.gremium?.label || this.gremium
-				const results = await this.objectStore.fetchCollection('case', {
-					'_filters[status]': 'gereed_voor_agendering',
-					'_filters[caseTypeTitle]': gremium,
-					_limit: 200,
-				})
-				const rows = Array.isArray(results)
-					? results
-					: results?.results || []
-				const taken = new Set(this.agenda.map((i) => i.id))
-				this.available = rows.filter((r) => !taken.has(r.id))
-			} catch (error) {
-				console.error('Failed to load ready items:', error)
-				this.available = []
-			} finally {
-				this.loading = false
-			}
-		},
-
-		/**
-		 * Move an item from the available list into the agenda.
-		 *
-		 * @param {object} item The case object.
-		 */
-		async addItem(item) {
-			const order = this.agenda.length + 1
-			const entry = {
-				...item,
-				handling: 'hamerstuk',
-				agendanummer: '1.' + order,
-			}
-			this.agenda.push(entry)
-			this.available = this.available.filter((a) => a.id !== item.id)
-			try {
-				await addToAgenda(item.id, 'hamerstuk', order)
-			} catch (error) {
-				console.error('Failed to persist agenda item:', error)
-			}
-		},
-
-		/**
-		 * Update the classification of an agenda item.
-		 *
-		 * @param {object} payload The { id, behandeling } payload.
-		 * @param payload.id
-		 * @param payload.handling
-		 * @param payload.behandeling
-		 */
-		async onSetBehandeling({ id, behandeling }) {
-			const idx = this.agenda.findIndex((i) => i.id === id)
-			if (idx === -1) return
-			this.agenda[idx].handling = behandeling
-			try {
-				await addToAgenda(id, behandeling, idx + 1)
-			} catch (error) {
-				console.error('Failed to update handling:', error)
-			}
-		},
-
-		/**
-		 * Confirm the agenda — transition cases to Geagendeerd.
-		 *
-		 * @spec openspec/specs/besluitvorming-workflow/spec.md
-		 */
-		async onConfirm() {
-			if (!this.meetingDate || this.agenda.length === 0) return
-			try {
-				await confirmAgenda(
-					'agenda-' + this.meetingDate,
-					this.agenda.map((i) => i.id),
-					this.meetingDate,
-				)
-				this.agenda = []
-				await this.loadReadyItems()
-			} catch (error) {
-				console.error('Failed to confirm agenda:', error)
-			}
-		},
-
-		/**
-		 * Generate the ordered agenda document.
-		 *
-		 * @spec openspec/specs/besluitvorming-workflow/spec.md
-		 */
-		async onGenerate() {
-			try {
-				await generateAgenda(this.agenda.map((i) => i.id))
-			} catch (error) {
-				console.error('Failed to generate agenda document:', error)
-			}
-		},
-	},
-}
-</script>
-
-<style scoped>
-.agenda-compiler__panels {
-	display: flex;
-	gap: 16px;
-}
-
-.agenda-compiler__panel {
-	flex: 1;
-}
-
-.agenda-compiler__controls {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-	max-width: 420px;
-}
-
-.agenda-compiler__available-item {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 6px 0;
-	border-bottom: 1px solid var(--color-border);
-}
-</style>
diff --git a/src/views/besluitvorming/VergaderingDetailView.vue b/src/views/besluitvorming/VergaderingDetailView.vue
deleted file mode 100644
index e166d097a..000000000
--- a/src/views/besluitvorming/VergaderingDetailView.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<!--
-  - SPDX-License-Identifier: EUPL-1.2
-  - SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
-  -->
-<template>
-	<div class="vergadering-detail">
-		<CnDetailPage
-			:title="t('dossiq', 'Vergadering')"
-			:subtitle="meetingDate"
-			:loading="loading"
-			:sidebar="false">
-			<CnDetailCard
-				v-for="agendaCase in cases"
-				:key="agendaCase.id"
-				:title="
-					(agendaCase.agendanummer || '') + ' ' + (agendaCase.title || '')
-				">
-				<div class="vergadering-detail__form">
-					<label :for="'besluittype-' + agendaCase.id">{{
-						t('dossiq', 'Decision type')
-					}}</label>
-					<NcSelect
-						v-model="forms[agendaCase.id].decisionType"
-						:inputId="'besluittype-' + agendaCase.id"
-						:inputLabel="t('dossiq', 'Decision type')"
-						:options="decisionTypes" />
-
-					<label :for="'stem-' + agendaCase.id">{{
-						t('dossiq', 'Stemuitslag')
-					}}</label>
-					<input
-						:id="'stem-' + agendaCase.id"
-						v-model="forms[agendaCase.id].stemuitslag"
-						type="text"
-						:placeholder="
-							t('dossiq', 'e.g. Unanimous or 23 for / 8 against')
-						" />
-
-					<label :for="'leden-' + agendaCase.id">{{
-						t('dossiq', 'Aanwezige leden (komma-gescheiden)')
-					}}</label>
-					<input
-						:id="'leden-' + agendaCase.id"
-						v-model="forms[agendaCase.id].attendees"
-						type="text" />
-
-					<label :for="'toelichting-' + agendaCase.id">{{
-						t('dossiq', 'Explanation')
-					}}</label>
-					<textarea
-						:id="'toelichting-' + agendaCase.id"
-						v-model="forms[agendaCase.id].explanation"
-						rows="3" />
-
-					<div class="vergadering-detail__actions">
-						<NcButton
-							type="primary"
-							:disabled="!isComplete(agendaCase.id)"
-							@click="recordBesluit(agendaCase)">
-							{{ t('dossiq', 'Besluit vastleggen') }}
-						</NcButton>
-						<NcButton type="secondary" @click="aanhouden(agendaCase)">
-							{{ t('dossiq', 'Aanhouden') }}
-						</NcButton>
-					</div>
-				</div>
-			</CnDetailCard>
-		</CnDetailPage>
-	</div>
-</template>
-
-<script>
-import { CnDetailCard, CnDetailPage } from '@conduction/nextcloud-vue'
-import { NcButton, NcSelect } from '@nextcloud/vue'
-import { useObjectStore } from '../../store/modules/object.js'
-
-export default {
-	name: 'VergaderingDetailView',
-	components: {
-		NcButton,
-		NcSelect,
-		CnDetailPage,
-		CnDetailCard,
-	},
-
-	props: {
-		id: {
-			type: String,
-			required: true,
-		},
-	},
-
-	data() {
-		return {
-			loading: true,
-			cases: [],
-			forms: {},
-			meetingDate: '',
-			decisionTypes: ['Goedgekeurd', 'Verworpen', 'Aangehouden'],
-		}
-	},
-
-	computed: {
-		/** @spec openspec/specs/besluitvorming-workflow/spec.md */
-		objectStore() {
-			return useObjectStore()
-		},
-	},
-
-	created() {
-		this.loadCases()
-	},
-
-	methods: {
-		/**
-		 * Load all geagendeerde cases for the meeting.
-		 *
-		 * @spec openspec/specs/besluitvorming-workflow/spec.md
-		 */
-		async loadCases() {
-			this.loading = true
-			try {
-				const results = await this.objectStore.fetchCollection('case', {
-					'_filters[status]': 'geagendeerd',
-					'_filters[vergaderdatum]': this.id,
-					_limit: 100,
-				})
-				this.cases = Array.isArray(results)
-					? results
-					: results?.results || []
-				this.meetingDate = this.cases[0]?.vergaderdatum || this.id
-				for (const c of this.cases) {
-					this.forms[c.id] = {
-						decisionType: '',
-						stemuitslag: '',
-						attendees: '',
-						explanation: '',
-					}
-				}
-			} catch (error) {
-				console.error('Failed to load vergadering cases:', error)
-				this.cases = []
-			} finally {
-				this.loading = false
-			}
-		},
-
-		/**
-		 * Whether the required fields for a case are filled.
-		 *
-		 * @param {string} caseId The case UUID.
-		 * @return {boolean} True when all required fields are present.
-		 */
-		isComplete(caseId) {
-			const f = this.forms[caseId]
-			return !!(f && f.decisionType && f.stemuitslag && f.explanation)
-		},
-
-		/**
-		 * Create the decision object and transition the case.
-		 *
-		 * @param {object} agendaCase The case object.
-		 * @spec openspec/specs/besluitvorming-workflow/spec.md
-		 */
-		async recordBesluit(agendaCase) {
-			const f = this.forms[agendaCase.id]
-			if (!this.isComplete(agendaCase.id)) return
-			if (f.decisionType === 'Aangehouden') {
-				await this.aanhouden(agendaCase)
-				return
-			}
-			try {
-				await this.objectStore.createObject('decision', {
-					case: agendaCase.id,
-					decisionDate: new Date().toISOString().slice(0, 10),
-					governingBody: agendaCase.vergadergremium || '',
-					decisionType: f.decisionType,
-					explanation:
-						f.explanation + ' (Stemuitslag: ' + f.stemuitslag + ')',
-				})
-				await this.objectStore.createObject('caseProperty', {
-					case: agendaCase.id,
-					name: 'stemuitslag',
-					value: f.stemuitslag,
-				})
-				await this.recordAttendees(agendaCase.id, f.attendees)
-				await this.loadCases()
-			} catch (error) {
-				console.error('Failed to record decision:', error)
-			}
-		},
-
-		/**
-		 * Record attending members as role objects.
-		 *
-		 * @param {string} caseId The case UUID.
-		 * @param {string} attendees Comma-separated attendee uids.
-		 */
-		async recordAttendees(caseId, attendees) {
-			const list = (attendees || '')
-				.split(',')
-				.map((a) => a.trim())
-				.filter(Boolean)
-			for (const person of list) {
-				await this.objectStore.createObject('role', {
-					case: caseId,
-					roleType: 'Aanwezig lid',
-					person,
-				})
-			}
-		},
-
-		/**
-		 * Defer (aanhouden) — route the case back to Gereed voor agendering.
-		 *
-		 * @param {object} agendaCase The case object.
-		 * @spec openspec/specs/besluitvorming-workflow/spec.md
-		 */
-		async aanhouden(agendaCase) {
-			try {
-				await this.objectStore.saveObject('case', {
-					...agendaCase,
-					status: 'gereed_voor_agendering',
-				})
-				await this.loadCases()
-			} catch (error) {
-				console.error('Failed to defer decision:', error)
-			}
-		},
-	},
-}
-</script>
-
-<style scoped>
-.vergadering-detail__form {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-	max-width: 520px;
-}
-
-.vergadering-detail__actions {
-	display: flex;
-	gap: 8px;
-	margin-top: 8px;
-}
-</style>
diff --git a/src/views/voorstellen/VoorstelDetail.vue b/src/views/voorstellen/VoorstelDetail.vue
index b5f29de4e..784e510c7 100644
--- a/src/views/voorstellen/VoorstelDetail.vue
+++ b/src/views/voorstellen/VoorstelDetail.vue
@@ -61,12 +61,15 @@
 				v-if="canOverrideRoute"
 				:title="t('dossiq', 'Route-aanpassing (manager)')">
 				<div class="voorstel-detail__override-actions">
+					<!--
+						"Stap toevoegen" was removed with the parafeer-route API it
+						called. Adding a step mid-route has no equivalent in the live
+						parafeeractie vocabulary, and the endpoint behind the button
+						answered 400 on every click, so it never added one.
+					-->
 					<NcButton :disabled="!currentStepInfo" @click="openSkipDialog">
 						{{ t('dossiq', 'Stap overslaan') }}
 					</NcButton>
-					<NcButton @click="openAddStepDialog">
-						{{ t('dossiq', 'Stap toevoegen') }}
-					</NcButton>
 				</div>
 			</CnDetailCard>
 
@@ -77,13 +80,6 @@
 				@skipped="onOverrideCompleted"
 				@close="showSkipDialog = false" />
 
-			<AddStepDialog
-				:open="showAddStepDialog"
-				:voorstelId="voorstel.id || voorstelId"
-				:routeSnapshot="steps"
-				@stepAdded="onOverrideCompleted"
-				@close="showAddStepDialog = false" />
-
 			<!-- Resubmit for steller -->
 			<CnDetailCard
 				v-if="voorstel.status === 'teruggestuurd' && isSteller"
@@ -196,7 +192,6 @@
 import { CnDetailCard, CnDetailPage } from '@conduction/nextcloud-vue'
 import { getCurrentUser } from '@nextcloud/auth'
 import { NcButton } from '@nextcloud/vue'
-import AddStepDialog from '../../dialogs/AddStepDialog.vue'
 import BesluitRegistration from '../../dialogs/BesluitRegistration.vue'
 import ParafeerActieDialog from '../../dialogs/ParafeerActieDialog.vue'
 import SkipStepDialog from '../../dialogs/SkipStepDialog.vue'
@@ -235,7 +230,6 @@ export default {
 		AuditTrail,
 		BesluitRegistration,
 		SkipStepDialog,
-		AddStepDialog,
 	},
 
 	props: {
@@ -255,7 +249,6 @@ export default {
 			actieDialogOpen: false,
 			mandates: [],
 			showSkipDialog: false,
-			showAddStepDialog: false,
 		}
 	},
 
@@ -413,15 +406,9 @@ export default {
 			this.showSkipDialog = true
 		},
 
-		/** @spec openspec/specs/parafering-actions/spec.md */
-		openAddStepDialog() {
-			this.showAddStepDialog = true
-		},
-
 		/** @spec openspec/specs/parafering-actions/spec.md */
 		async onOverrideCompleted() {
 			this.showSkipDialog = false
-			this.showAddStepDialog = false
 			await Promise.all([this.loadVoorstel(), this.loadActies()])
 		},
 
diff --git a/templates/settings/personal.php b/templates/settings/personal.php
index 66c683631..1c68b8f28 100644
--- a/templates/settings/personal.php
+++ b/templates/settings/personal.php
@@ -9,4 +9,4 @@
 Util::addScript($appId, $appId . '-shared-nc-vue');
 Util::addScript($appId, $appId . '-personal-settings');
 ?>
-<div id="procest-personal-settings"></div>
+<div id="dossiq-personal-settings"></div>
diff --git a/tests/Stubs/Decidiq/Event/DecisionConcludedEvent.php b/tests/Stubs/Decidiq/Event/DecisionConcludedEvent.php
new file mode 100644
index 000000000..575d73f99
--- /dev/null
+++ b/tests/Stubs/Decidiq/Event/DecisionConcludedEvent.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * Decidiq DecisionConcludedEvent test stub.
+ *
+ * Mirrors decidiq's merged event contract so dossiq's
+ * DecisionConcludedListener can be unit-tested without the decidiq app
+ * installed. The real class ships in decidiq
+ * (`OCA\Decidiq\Event\DecisionConcludedEvent`); this stub is loaded by
+ * tests/bootstrap.php only when the real class is absent.
+ *
+ * @category Tests
+ * @package  OCA\Decidiq\Event
+ *
+ * @author    Conduction Development Team <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * SPDX-License-Identifier: EUPL-1.2
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ *
+ * @link https://decidiq.nl
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Decidiq\Event;
+
+use OCP\EventDispatcher\Event;
+
+/**
+ * Dispatched by decidiq when a Decision reaches a terminal state.
+ */
+class DecisionConcludedEvent extends Event {
+	/**
+	 * Constructor.
+	 *
+	 * @param string $decisionId The decidiq decision id.
+	 * @param string $decisionType The decision type slug.
+	 * @param string $status approved|rejected|withdrawn|pending.
+	 * @param string $outcome The outcome string.
+	 * @param bool $signed Whether the decision was signed.
+	 * @param string|null $signingReference The signing reference.
+	 * @param array<int,mixed> $signers The signers list.
+	 * @param string|null $decidedAt The decided-at timestamp.
+	 * @param string $sourceApp The originating app id.
+	 * @param string|null $subjectRegister The subject register.
+	 * @param string|null $subjectSchema The subject schema.
+	 * @param string|null $subjectId The subject object id.
+	 * @param string $externalReference The external reference.
+	 * @param string $correlationId The correlation id.
+	 */
+	public function __construct(
+		private readonly string $decisionId,
+		private readonly string $decisionType,
+		private readonly string $status,
+		private readonly string $outcome,
+		private readonly bool $signed = false,
+		private readonly ?string $signingReference = null,
+		private readonly array $signers = [],
+		private readonly ?string $decidedAt = null,
+		private readonly string $sourceApp = '',
+		private readonly ?string $subjectRegister = null,
+		private readonly ?string $subjectSchema = null,
+		private readonly ?string $subjectId = null,
+		private readonly string $externalReference = '',
+		private readonly string $correlationId = '',
+	) {
+		parent::__construct();
+	}//end __construct()
+
+	/**
+	 * @return string The decision id.
+	 */
+	public function getDecisionId(): string {
+		return $this->decisionId;
+	}//end getDecisionId()
+
+	/**
+	 * @return string The decision type.
+	 */
+	public function getDecisionType(): string {
+		return $this->decisionType;
+	}//end getDecisionType()
+
+	/**
+	 * @return string The status.
+	 */
+	public function getStatus(): string {
+		return $this->status;
+	}//end getStatus()
+
+	/**
+	 * @return string The outcome.
+	 */
+	public function getOutcome(): string {
+		return $this->outcome;
+	}//end getOutcome()
+
+	/**
+	 * @return bool Whether the decision was signed.
+	 */
+	public function isSigned(): bool {
+		return $this->signed;
+	}//end isSigned()
+
+	/**
+	 * @return string|null The signing reference.
+	 */
+	public function getSigningReference(): ?string {
+		return $this->signingReference;
+	}//end getSigningReference()
+
+	/**
+	 * @return array<int,mixed> The signers.
+	 */
+	public function getSigners(): array {
+		return $this->signers;
+	}//end getSigners()
+
+	/**
+	 * @return string|null The decided-at timestamp.
+	 */
+	public function getDecidedAt(): ?string {
+		return $this->decidedAt;
+	}//end getDecidedAt()
+
+	/**
+	 * @return string The source app id.
+	 */
+	public function getSourceApp(): string {
+		return $this->sourceApp;
+	}//end getSourceApp()
+
+	/**
+	 * @return string|null The subject register.
+	 */
+	public function getSubjectRegister(): ?string {
+		return $this->subjectRegister;
+	}//end getSubjectRegister()
+
+	/**
+	 * @return string|null The subject schema.
+	 */
+	public function getSubjectSchema(): ?string {
+		return $this->subjectSchema;
+	}//end getSubjectSchema()
+
+	/**
+	 * @return string|null The subject id.
+	 */
+	public function getSubjectId(): ?string {
+		return $this->subjectId;
+	}//end getSubjectId()
+
+	/**
+	 * @return string The external reference.
+	 */
+	public function getExternalReference(): string {
+		return $this->externalReference;
+	}//end getExternalReference()
+
+	/**
+	 * @return string The correlation id.
+	 */
+	public function getCorrelationId(): string {
+		return $this->correlationId;
+	}//end getCorrelationId()
+}//end class
diff --git a/tests/Stubs/Decidiq/Event/DecisionRequestedEvent.php b/tests/Stubs/Decidiq/Event/DecisionRequestedEvent.php
new file mode 100644
index 000000000..b618a049d
--- /dev/null
+++ b/tests/Stubs/Decidiq/Event/DecisionRequestedEvent.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * Decidiq DecisionRequestedEvent test stub.
+ *
+ * Mirrors decidiq's merged event contract so dossiq's delegation services can
+ * be unit-tested without the decidiq app installed. The real class ships in
+ * decidiq (`OCA\Decidiq\Event\DecisionRequestedEvent`); this stub is loaded
+ * by tests/bootstrap.php only when the real class is absent.
+ *
+ * @category Tests
+ * @package  OCA\Decidiq\Event
+ *
+ * @author    Conduction Development Team <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * SPDX-License-Identifier: EUPL-1.2
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ *
+ * @link https://decidiq.nl
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Decidiq\Event;
+
+use OCP\EventDispatcher\Event;
+
+/**
+ * Dispatched by a consuming app to request a decidiq Decision. The decidiq
+ * in-process listener writes the result back via setHandled()/setDecisionId().
+ */
+class DecisionRequestedEvent extends Event {
+
+	/**
+	 * Whether decidiq handled the request.
+	 */
+	private bool $handled = false;
+
+	/**
+	 * The created decidiq decision id (null until handled).
+	 */
+	private ?string $decisionId = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $sourceApp The requesting app id.
+	 * @param string $subjectRegister The subject register.
+	 * @param string $subjectSchema The subject schema.
+	 * @param string $subjectId The subject object id.
+	 * @param string $subjectLabel A human-readable subject label.
+	 * @param string $decisionType The decision type slug.
+	 * @param string $actorId The requesting actor id.
+	 * @param array<string,mixed> $payload The decision body payload.
+	 * @param string $externalReference The external reference.
+	 * @param string $correlationId The correlation id.
+	 */
+	public function __construct(
+		private readonly string $sourceApp,
+		private readonly string $subjectRegister,
+		private readonly string $subjectSchema,
+		private readonly string $subjectId,
+		private readonly string $subjectLabel = '',
+		private readonly string $decisionType = 'contract',
+		private readonly string $actorId = '',
+		private readonly array $payload = [],
+		private readonly string $externalReference = '',
+		private readonly string $correlationId = '',
+	) {
+		parent::__construct();
+	}//end __construct()
+
+	/**
+	 * @return string The requesting app id.
+	 */
+	public function getSourceApp(): string {
+		return $this->sourceApp;
+	}//end getSourceApp()
+
+	/**
+	 * @return string The subject register.
+	 */
+	public function getSubjectRegister(): string {
+		return $this->subjectRegister;
+	}//end getSubjectRegister()
+
+	/**
+	 * @return string The subject schema.
+	 */
+	public function getSubjectSchema(): string {
+		return $this->subjectSchema;
+	}//end getSubjectSchema()
+
+	/**
+	 * @return string The subject object id.
+	 */
+	public function getSubjectId(): string {
+		return $this->subjectId;
+	}//end getSubjectId()
+
+	/**
+	 * @return string The subject label.
+	 */
+	public function getSubjectLabel(): string {
+		return $this->subjectLabel;
+	}//end getSubjectLabel()
+
+	/**
+	 * @return string The decision type slug.
+	 */
+	public function getDecisionType(): string {
+		return $this->decisionType;
+	}//end getDecisionType()
+
+	/**
+	 * @return string The requesting actor id.
+	 */
+	public function getActorId(): string {
+		return $this->actorId;
+	}//end getActorId()
+
+	/**
+	 * @return array<string,mixed> The decision body payload.
+	 */
+	public function getPayload(): array {
+		return $this->payload;
+	}//end getPayload()
+
+	/**
+	 * @return string The external reference.
+	 */
+	public function getExternalReference(): string {
+		return $this->externalReference;
+	}//end getExternalReference()
+
+	/**
+	 * @return string The correlation id.
+	 */
+	public function getCorrelationId(): string {
+		return $this->correlationId;
+	}//end getCorrelationId()
+
+	/**
+	 * @return bool Whether decidiq handled the request.
+	 */
+	public function isHandled(): bool {
+		return $this->handled;
+	}//end isHandled()
+
+	/**
+	 * Mark the request handled (called by the decidiq listener).
+	 *
+	 * @param bool $handled Whether the request was handled.
+	 *
+	 * @return void
+	 */
+	public function setHandled(bool $handled): void {
+		$this->handled = $handled;
+	}//end setHandled()
+
+	/**
+	 * @return string|null The created decision id, or null.
+	 */
+	public function getDecisionId(): ?string {
+		return $this->decisionId;
+	}//end getDecisionId()
+
+	/**
+	 * Record the created decision id (called by the decidiq listener).
+	 *
+	 * @param string|null $decisionId The created decision id.
+	 *
+	 * @return void
+	 */
+	public function setDecisionId(?string $decisionId): void {
+		$this->decisionId = $decisionId;
+	}//end setDecisionId()
+}//end class
diff --git a/tests/Stubs/Flow/IFlowNode.php b/tests/Stubs/Flow/IFlowNode.php
index e2d44a313..e31b98e4d 100644
--- a/tests/Stubs/Flow/IFlowNode.php
+++ b/tests/Stubs/Flow/IFlowNode.php
@@ -6,10 +6,10 @@
  *
  * Test stub for OpenRegister's published flow-node contract.
  *
- * procest's nodes implement this interface, so without it the classes cannot be
+ * dossiq's nodes implement this interface, so without it the classes cannot be
  * loaded in a unit test on an instance where OpenRegister is absent. Mirrors
  * openregister lib/Service/Flow/IFlowNode.php — if that contract changes, this
- * stub is where procest finds out.
+ * stub is where dossiq finds out.
  *
  * @category Test
  * @package  OCA\OpenRegister\Service\Flow
diff --git a/tests/Stubs/Flow/RegisterFlowNodesEvent.php b/tests/Stubs/Flow/RegisterFlowNodesEvent.php
index a8c06d69f..73a73d89f 100644
--- a/tests/Stubs/Flow/RegisterFlowNodesEvent.php
+++ b/tests/Stubs/Flow/RegisterFlowNodesEvent.php
@@ -6,12 +6,12 @@
  *
  * Test stub for OpenRegister's node-registration collect event.
  *
- * procest's ProcestFlowNodeListener is typed against it, so without this stub
+ * dossiq's DossiqFlowNodeListener is typed against it, so without this stub
  * the listener cannot be loaded — and phpstan cannot resolve the
  * `IEventListener<RegisterFlowNodesEvent>` generic bound either.
  *
  * DELIBERATELY NOT A FAITHFUL COPY OF THE CONSTRUCTOR. The real event takes
- * OpenRegister's FlowNodeRegistry and hands each node straight to it; procest
+ * OpenRegister's FlowNodeRegistry and hands each node straight to it; dossiq
  * has no such class and does not need one to prove it registers the right six.
  * This stub collects them instead, which is exactly what a consumer-side test
  * needs to assert.
diff --git a/tests/Unit/AppInfo/CrossAppEventNamesTest.php b/tests/Unit/AppInfo/CrossAppEventNamesTest.php
new file mode 100644
index 000000000..1636e1ccd
--- /dev/null
+++ b/tests/Unit/AppInfo/CrossAppEventNamesTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Test
+ * @package   OCA\Dossiq\Tests\Unit\AppInfo
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Tests\Unit\AppInfo;
+
+use OCA\Dossiq\AppInfo\Registrar\WorkflowListenerRegistrar;
+use OCA\Dossiq\Service\ContractDecisionDelegationService;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+
+/**
+ * A cross-app event FQN must name EVERY namespace the other app has used.
+ *
+ * This is the check that was missing. The decision app renamed its namespace
+ * from `OCA\Decidesk` to `OCA\Decidiq` with no compatibility alias, and dossiq
+ * named only the old spelling in two places. The consequences were different
+ * and both bad:
+ *
+ *  - the listener registration is guarded by `class_exists`, so it went false
+ *    and simply stopped registering. Every concluded decision quietly stopped
+ *    materialising a ZGW Besluit. A guard that goes false looks exactly like
+ *    the optional app not being installed, so nothing looked wrong.
+ *  - the dispatch side fails CLOSED, so it threw "decidesk is not installed"
+ *    on an instance where it was installed — blocking every contract decision
+ *    behind a message pointing at the wrong problem.
+ *
+ * An app cannot move another app's class name; it can only follow it. So the
+ * property worth asserting is that these constants LIST the spellings rather
+ * than pin one.
+ */
+class CrossAppEventNamesTest extends TestCase {
+	/**
+	 * Read a private class constant.
+	 *
+	 * @param string $class The class.
+	 * @param string $name The constant name.
+	 *
+	 * @return array<int, string> The value.
+	 */
+	private function constant(string $class, string $name): array {
+		$value = (new ReflectionClass($class))->getConstant($name);
+		$this->assertIsArray($value, $name . ' must be a LIST of spellings, not a single string.');
+
+		return $value;
+	}
+
+	/**
+	 * Both decision-event constants name the current namespace and the old one.
+	 *
+	 * @param string $class The class holding the constant.
+	 * @param string $name The constant name.
+	 *
+	 * @return void
+	 *
+	 * @dataProvider crossAppEventConstants
+	 */
+	public function testEachCrossAppEventListsEveryKnownNamespace(string $class, string $name): void {
+		$spellings = $this->constant(class: $class, name: $name);
+
+		$this->assertGreaterThanOrEqual(
+			2,
+			count($spellings),
+			'Pinning ONE spelling is what broke this: the other app renamed and this side stopped resolving.'
+		);
+
+		$haystack = implode(' ', $spellings);
+		$this->assertStringContainsString(
+			'Decidiq',
+			$haystack,
+			'The CURRENT namespace must be listed, or the integration is dead on a renamed instance.'
+		);
+		$this->assertStringContainsString(
+			'Decidesk',
+			$haystack,
+			'The OLD namespace must stay listed until no supported install ships it — otherwise the '
+			. 'integration breaks in the other direction during a staggered upgrade.'
+		);
+	}
+
+	/**
+	 * The newest spelling is tried FIRST.
+	 *
+	 * Both resolve by "first one that exists", so ordering decides which is used
+	 * on an instance carrying both — and that should be the current one.
+	 *
+	 * @param string $class The class holding the constant.
+	 * @param string $name The constant name.
+	 *
+	 * @return void
+	 *
+	 * @dataProvider crossAppEventConstants
+	 */
+	public function testTheCurrentNamespaceIsPreferred(string $class, string $name): void {
+		$spellings = $this->constant(class: $class, name: $name);
+
+		$this->assertStringContainsString('Decidiq', $spellings[0]);
+	}
+
+	/**
+	 * The constants that carry a cross-app event name.
+	 *
+	 * @return array<int, array<int, string>> The cases.
+	 */
+	public static function crossAppEventConstants(): array {
+		return [
+			[WorkflowListenerRegistrar::class, 'DECISION_CONCLUDED_EVENTS'],
+			[ContractDecisionDelegationService::class, 'DECISION_REQUESTED_EVENTS'],
+		];
+	}
+}
diff --git a/tests/Unit/AppInfo/RoutePlaceholderBindingTest.php b/tests/Unit/AppInfo/RoutePlaceholderBindingTest.php
new file mode 100644
index 000000000..cbf843972
--- /dev/null
+++ b/tests/Unit/AppInfo/RoutePlaceholderBindingTest.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Test
+ * @package   OCA\Dossiq\Tests\Unit\AppInfo
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Tests\Unit\AppInfo;
+
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use ReflectionNamedType;
+
+/**
+ * Every URL placeholder must be named the same as the argument it binds to.
+ *
+ * Nextcloud's Dispatcher resolves a controller argument BY NAME —
+ * `$this->request->getParam($param, $default)` — never by position. So a route
+ * declaring `{voorstelId}` against a method signing `string $proposalId` binds
+ * null, the typehint throws a TypeError, and the request is answered HTTP 400.
+ * For any input. On every call.
+ *
+ * Five routes were in exactly that state, left behind by the Dutch→English
+ * vocabulary sweep, which renamed the method parameters and not the URLs. NO
+ * existing check saw it: the route exists, the controller exists, the method
+ * exists, and gate-6 (route-reachability) verifies precisely those three things.
+ * Only the NAMES disagreed, and a name is not something any of them compared.
+ *
+ * This is the check that compares them.
+ */
+class RoutePlaceholderBindingTest extends TestCase {
+	/**
+	 * Controller-name suffixes that never take a bound URL argument.
+	 *
+	 * @var array<int, string>
+	 */
+	private const CONTROLLER_NS = 'OCA\\Dossiq\\Controller\\';
+
+	/**
+	 * Load the declared routes.
+	 *
+	 * @return array<int, array<string, mixed>> The `routes` list.
+	 */
+	private function routes(): array {
+		$declared = require __DIR__ . '/../../../appinfo/routes.php';
+		$this->assertIsArray($declared, 'appinfo/routes.php did not return an array.');
+		$this->assertArrayHasKey('routes', $declared);
+
+		return $declared['routes'];
+	}
+
+	/**
+	 * Turn `parafeerRoute#start` into its controller class and method.
+	 *
+	 * Nextcloud's own convention: the part before `#` is the controller in
+	 * lowerCamelCase, optionally namespaced with `\`, and gains a `Controller`
+	 * suffix.
+	 *
+	 * @param string $name The route's `name` value.
+	 *
+	 * @return array{0: string, 1: string}|null Class and method, or null when unresolvable.
+	 */
+	private function target(string $name): ?array {
+		if (str_contains($name, '#') === false) {
+			return null;
+		}
+
+		[$controller, $method] = explode('#', $name, 2);
+		$class = self::CONTROLLER_NS . str_replace('\\', '\\', ucfirst($controller)) . 'Controller';
+		if (class_exists($class) === false) {
+			return null;
+		}
+
+		return [$class, $method];
+	}
+
+	/**
+	 * Extract `{placeholder}` names from a route URL.
+	 *
+	 * @param string $url The route URL.
+	 *
+	 * @return array<int, string> The placeholder names, in order.
+	 */
+	private function placeholders(string $url): array {
+		$matches = [];
+		preg_match_all('/\{([A-Za-z_][A-Za-z0-9_]*)\}/', $url, $matches);
+
+		return $matches[1];
+	}
+
+	/**
+	 * Every placeholder names a parameter the target method actually declares.
+	 *
+	 * A placeholder that no parameter answers to is only harmless when the
+	 * method takes it off the request itself; a placeholder bound to a
+	 * NON-NULLABLE scalar parameter that does not exist is the 400.
+	 *
+	 * @return void
+	 */
+	public function testEveryPlaceholderBindsToADeclaredParameter(): void {
+		$offenders = [];
+
+		foreach ($this->routes() as $route) {
+			$name = (string)($route['name'] ?? '');
+			$url = (string)($route['url'] ?? '');
+			$placeholders = $this->placeholders(url: $url);
+			if ($placeholders === []) {
+				continue;
+			}
+
+			$target = $this->target(name: $name);
+			if ($target === null) {
+				continue;
+			}
+
+			[$class, $method] = $target;
+			$reflection = new ReflectionClass($class);
+			if ($reflection->hasMethod($method) === false) {
+				continue;
+			}
+
+			$declared = [];
+			$required = [];
+			foreach ($reflection->getMethod($method)->getParameters() as $parameter) {
+				$declared[] = $parameter->getName();
+				$type = $parameter->getType();
+				$nullable = ($type instanceof ReflectionNamedType) ? $type->allowsNull() : true;
+				if ($parameter->isDefaultValueAvailable() === false && $nullable === false) {
+					$required[] = $parameter->getName();
+				}
+			}
+
+			// A method with a required, non-nullable parameter that NO placeholder
+			// names cannot be satisfied from the URL. That is the 400.
+			foreach ($required as $parameterName) {
+				if (in_array($parameterName, $placeholders, true) === false) {
+					$offenders[] = sprintf(
+						'%s (%s) requires $%s, but the URL offers {%s}',
+						$name,
+						$url,
+						$parameterName,
+						implode('}, {', $placeholders)
+					);
+				}
+			}
+		}
+
+		$this->assertSame(
+			[],
+			$offenders,
+			"These routes answer HTTP 400 for every request — the Dispatcher binds by NAME:\n"
+			. implode("\n", $offenders)
+		);
+	}
+}
diff --git a/tests/Unit/Controller/ParafeerRouteControllerContractTest.php b/tests/Unit/Controller/ParafeerRouteControllerContractTest.php
deleted file mode 100644
index 8c708060f..000000000
--- a/tests/Unit/Controller/ParafeerRouteControllerContractTest.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-/**
- * ParafeerRouteController Wire-Contract Tests
- *
- * Contract coverage for the two `@NoAdminRequired` parafering-engine actions
- * (gate-25): `POST /api/parafeer-route/voorstel/{voorstelId}/complete-step`
- * and `.../add-step`. Their sibling `skipStep()` is admin-gated; these two are
- * not, so the controller's own `requireUser()` is the ONLY barrier between an
- * anonymous POST and a signed-off parafering step. These tests pin:
- *
- *  - both endpoints refuse an unauthenticated caller with 401 BEFORE
- *    ParafeerRouteService is entered — a completed step is an approval
- *    signature, so a missing session check is a forged sign-off;
- *  - the voorstel id from the URL is what the engine acts on;
- *  - `addStep` defaults an absent `afterStep` to 0 and an absent/non-array
- *    `stepData` to an empty array rather than forwarding null into a typed
- *    `int`/`array` parameter (a TypeError would surface as an opaque 500);
- *  - an engine failure is a 500 carrying a GENERIC Dutch message, never the
- *    exception text.
- *
- * Both endpoints read their body through `file_get_contents('php://input')`,
- * which is empty under PHPUnit — so the body-derived arguments asserted here
- * are the documented defaults, which is exactly the path a client that posts
- * an empty body takes.
- *
- * @category Tests
- * @package  OCA\Dossiq\Tests\Unit\Controller
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * @link https://conduction.nl
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Tests\Unit\Controller;
-
-use OCA\Dossiq\Controller\ParafeerRouteController;
-use OCA\Dossiq\Service\ParafeerRouteService;
-use OCP\AppFramework\Http;
-use OCP\IGroupManager;
-use OCP\IRequest;
-use OCP\IUser;
-use OCP\IUserSession;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
-
-/**
- * Wire-contract tests for ParafeerRouteController.
- *
- * @covers \OCA\Dossiq\Controller\ParafeerRouteController
- */
-class ParafeerRouteControllerContractTest extends TestCase {
-
-	/**
-	 * The IRequest mock.
-	 *
-	 * @var IRequest|MockObject
-	 */
-	private IRequest $request;
-
-	/**
-	 * The parafering engine service.
-	 *
-	 * @var ParafeerRouteService|MockObject
-	 */
-	private ParafeerRouteService $routeService;
-
-	/**
-	 * The user session.
-	 *
-	 * @var IUserSession|MockObject
-	 */
-	private IUserSession $userSession;
-
-	/**
-	 * The group manager (admin check, used only by skipStep()).
-	 *
-	 * @var IGroupManager|MockObject
-	 */
-	private IGroupManager $groupManager;
-
-	/**
-	 * The logger.
-	 *
-	 * @var LoggerInterface|MockObject
-	 */
-	private LoggerInterface $logger;
-
-	/**
-	 * The controller under test.
-	 *
-	 * @var ParafeerRouteController
-	 */
-	private ParafeerRouteController $controller;
-
-	/**
-	 * Build the controller with mocked collaborators.
-	 *
-	 * @return void
-	 */
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->request = $this->createMock(IRequest::class);
-		$this->routeService = $this->createMock(ParafeerRouteService::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->controller = new ParafeerRouteController(
-			appName: 'dossiq',
-			request: $this->request,
-			routeService: $this->routeService,
-			userSession: $this->userSession,
-			groupManager: $this->groupManager,
-			logger: $this->logger,
-		);
-	}//end setUp()
-
-	/**
-	 * Put a signed-in, non-admin user on the session.
-	 *
-	 * @return void
-	 */
-	private function signIn(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('paraferende-ambtenaar');
-		$this->userSession->method('getUser')->willReturn($user);
-		$this->groupManager->method('isAdmin')->willReturn(false);
-	}//end signIn()
-
-	/**
-	 * Neither engine action may run without a session.
-	 *
-	 * @return void
-	 */
-	public function testBothEngineActionsRefuseAnUnauthenticatedCallerBeforeTouchingTheRoute(): void {
-		$this->userSession->method('getUser')->willReturn(null);
-		$this->routeService->expects($this->never())->method('completeStep');
-		$this->routeService->expects($this->never())->method('addAdhocStep');
-
-		$complete = $this->controller->completeStep(proposalId: 'voorstel-1');
-		$add = $this->controller->addStep(proposalId: 'voorstel-1');
-
-		$this->assertSame(Http::STATUS_UNAUTHORIZED, $complete->getStatus());
-		$this->assertSame(['error' => 'Authenticatie vereist'], $complete->getData());
-		$this->assertSame(Http::STATUS_UNAUTHORIZED, $add->getStatus());
-		$this->assertSame(['error' => 'Authenticatie vereist'], $add->getData());
-	}//end testBothEngineActionsRefuseAnUnauthenticatedCallerBeforeTouchingTheRoute()
-
-	/**
-	 * completeStep acts on the voorstel from the URL and returns the engine's
-	 * result untouched.
-	 *
-	 * @return void
-	 */
-	public function testCompleteStepCompletesTheStepOnTheVoorstelFromTheUrl(): void {
-		$this->signIn();
-		$result = ['step' => 2, 'status' => 'completed'];
-
-		$this->routeService->expects($this->once())
-			->method('completeStep')
-			->with('voorstel-77', [])
-			->willReturn($result);
-
-		$response = $this->controller->completeStep(proposalId: 'voorstel-77');
-
-		$this->assertSame(Http::STATUS_OK, $response->getStatus());
-		$this->assertSame($result, $response->getData());
-	}//end testCompleteStepCompletesTheStepOnTheVoorstelFromTheUrl()
-
-	/**
-	 * An engine failure on completeStep is a 500 with a generic message that
-	 * does not leak the internal exception text.
-	 *
-	 * @return void
-	 */
-	public function testCompleteStepReturns500WithoutLeakingTheEngineFailure(): void {
-		$this->signIn();
-
-		$this->routeService->method('completeStep')
-			->willThrowException(new \RuntimeException('SQLSTATE[23000] duplicate key parafeerroute_pk'));
-
-		$response = $this->controller->completeStep(proposalId: 'voorstel-77');
-
-		$this->assertSame(Http::STATUS_INTERNAL_SERVER_ERROR, $response->getStatus());
-		$this->assertSame(['error' => 'Stap kon niet worden voltooid'], $response->getData());
-	}//end testCompleteStepReturns500WithoutLeakingTheEngineFailure()
-
-	/**
-	 * addStep forwards typed defaults, never nulls, into the engine's
-	 * `int $afterStep` / `array $stepData` parameters.
-	 *
-	 * @return void
-	 */
-	public function testAddStepForwardsTypedDefaultsForAnEmptyBody(): void {
-		$this->signIn();
-		$snapshot = ['steps' => [['order' => 1], ['order' => 2]]];
-
-		$this->routeService->expects($this->once())
-			->method('addAdhocStep')
-			->with('voorstel-77', $this->identicalTo(0), $this->identicalTo([]))
-			->willReturn($snapshot);
-
-		$response = $this->controller->addStep(proposalId: 'voorstel-77');
-
-		$this->assertSame(Http::STATUS_OK, $response->getStatus());
-		$this->assertSame($snapshot, $response->getData());
-	}//end testAddStepForwardsTypedDefaultsForAnEmptyBody()
-
-	/**
-	 * An engine failure on addStep is a 500 with its own generic message,
-	 * distinct from the completeStep one.
-	 *
-	 * @return void
-	 */
-	public function testAddStepReturns500WithItsOwnGenericMessage(): void {
-		$this->signIn();
-
-		$this->routeService->method('addAdhocStep')
-			->willThrowException(new \RuntimeException('boom'));
-
-		$response = $this->controller->addStep(proposalId: 'voorstel-77');
-
-		$this->assertSame(Http::STATUS_INTERNAL_SERVER_ERROR, $response->getStatus());
-		$this->assertSame(['error' => 'Stap toevoegen mislukt'], $response->getData());
-	}//end testAddStepReturns500WithItsOwnGenericMessage()
-}//end class
diff --git a/tests/Unit/Flow/DossiqActionNodeTest.php b/tests/Unit/Flow/DossiqActionNodeTest.php
new file mode 100644
index 000000000..3ee3a88ba
--- /dev/null
+++ b/tests/Unit/Flow/DossiqActionNodeTest.php
@@ -0,0 +1,237 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Test
+ * @package   OCA\Dossiq\Tests\Unit\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Tests\Unit\Flow;
+
+use OCA\Dossiq\Flow\DossiqSendEmailNode;
+use OCA\Dossiq\Service\Actions\ActionResult;
+use OCA\Dossiq\Service\Actions\SendEmailHandler;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use PHPUnit\Framework\TestCase;
+use UnexpectedValueException;
+
+/**
+ * Covers the action-node wrapper.
+ *
+ * SendEmail stands in for all six — they differ only in their handler and their
+ * required keys, and the behaviour worth pinning lives in the shared base.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqActionNodeTest extends TestCase {
+
+    /**
+     * @var SendEmailHandler&\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $handler;
+
+    /**
+     * @var DossiqSendEmailNode
+     */
+    private DossiqSendEmailNode $node;
+
+
+    /**
+     * Set up the node over a mocked handler.
+     *
+     * @return void
+     */
+    protected function setUp(): void {
+        parent::setUp();
+        $this->handler = $this->createMock(SendEmailHandler::class);
+        $this->handler->method('type')->willReturn('sendEmail');
+
+        $l10n = $this->createMock(IL10N::class);
+        $l10n->method('t')->willReturnCallback(
+            static function (string $text, array $params=[]): string {
+                return vsprintf($text, $params);
+            }
+        );
+        $urls = $this->createMock(IURLGenerator::class);
+        $urls->method('imagePath')->willReturn('/apps/dossiq/img/app-dark.svg');
+
+        $this->node = new DossiqSendEmailNode($this->handler, $l10n, $urls);
+
+    }//end setUp()
+
+
+    /**
+     * A complete config for this node.
+     *
+     * @return array<string, mixed> The config.
+     */
+    private function config(): array {
+        return [
+            'recipientRef'    => 'behandelaar',
+            'subjectTemplate' => 'Zaak {{ title }}',
+            'bodyTemplate'    => 'Uw zaak is bijgewerkt.',
+        ];
+
+    }//end config()
+
+
+    /**
+     * The node id is derived from the handler's own type slug.
+     *
+     * Deriving it is what stops a node id drifting from the handler it runs,
+     * and gives the reference migration one rule instead of six.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testIdIsDerivedFromTheHandlerType(): void {
+        // `dossiq.action.*`, not `dossiq.*`: the LIVE transition vocabulary
+        // owns the plain names and both systems ship a sendEmail. An id
+        // collision here would have one handler silently shadow the other in
+        // the catalogue.
+        $this->assertSame('dossiq.action.sendEmail', $this->node->getId());
+
+    }//end testIdIsDerivedFromTheHandlerType()
+
+
+    /**
+     * A successful action puts its data on the item.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testSuccessfulActionWritesItsResultOntoTheItem(): void {
+        $this->handler->method('handle')->willReturn(new ActionResult(true, null, ['sent' => 1]));
+
+        $out = $this->node->execute(
+            [['json' => ['id' => 'case-1', 'title' => 'Bezwaar']]],
+            $this->config(),
+            []
+        );
+
+        $this->assertCount(1, $out);
+        $this->assertSame(['sent' => 1], $out[0]['json']['actionResult']);
+        $this->assertSame('case-1', $out[0]['json']['id']);
+
+    }//end testSuccessfulActionWritesItsResultOntoTheItem()
+
+
+    /**
+     * The output key is configurable.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testOutputKeyIsConfigurable(): void {
+        $this->handler->method('handle')->willReturn(new ActionResult(true, null, ['sent' => 1]));
+
+        $out = $this->node->execute(
+            [['json' => []]],
+            array_merge($this->config(), ['output' => 'mailResult']),
+            []
+        );
+
+        $this->assertArrayHasKey('mailResult', $out[0]['json']);
+
+    }//end testOutputKeyIsConfigurable()
+
+
+    /**
+     * A FAILED action throws instead of passing the item through.
+     *
+     * This is the one that matters. Returning the item unchanged would leave
+     * the output key absent, and a downstream router would take its default
+     * branch exactly as though the action had succeeded — the engine's onError
+     * policy only ever sees failures that propagate out of execute().
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testFailedActionThrowsRatherThanPassingThrough(): void {
+        $this->handler->method('handle')->willReturn(new ActionResult(false, 'smtp_unavailable'));
+
+        $this->expectException(UnexpectedValueException::class);
+        $this->expectExceptionMessage('smtp_unavailable');
+
+        $this->node->execute([['json' => []]], $this->config(), []);
+
+    }//end testFailedActionThrowsRatherThanPassingThrough()
+
+
+    /**
+     * A config missing a required key is rejected at EXECUTION, not only on save.
+     *
+     * validateConfig() runs when a flow is saved; a seeded or imported flow
+     * reaches execute() without ever having been saved through the editor.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testUnvalidatedConfigIsRejectedAtExecution(): void {
+        $this->handler->expects($this->never())->method('handle');
+
+        $config = $this->config();
+        unset($config['recipientRef']);
+
+        $this->expectException(UnexpectedValueException::class);
+        $this->node->execute([['json' => []]], $config, []);
+
+    }//end testUnvalidatedConfigIsRejectedAtExecution()
+
+
+    /**
+     * validateConfig() names the key it is missing.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testValidateConfigNamesTheMissingKey(): void {
+        $config = $this->config();
+        unset($config['bodyTemplate']);
+
+        $this->expectException(UnexpectedValueException::class);
+        $this->expectExceptionMessage('bodyTemplate');
+
+        $this->node->validateConfig($config);
+
+    }//end testValidateConfigNamesTheMissingKey()
+
+
+    /**
+     * Every item in the batch is acted on.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testEveryItemInTheBatchIsActedOn(): void {
+        $this->handler->expects($this->exactly(3))->method('handle')
+            ->willReturn(new ActionResult(true, null, []));
+
+        $out = $this->node->execute(
+            [['json' => ['id' => 'a']], ['json' => ['id' => 'b']], ['json' => ['id' => 'c']]],
+            $this->config(),
+            []
+        );
+
+        $this->assertCount(3, $out);
+
+    }//end testEveryItemInTheBatchIsActedOn()
+
+
+}//end class
diff --git a/tests/Unit/Flow/DossiqFlowNodeListenerTest.php b/tests/Unit/Flow/DossiqFlowNodeListenerTest.php
new file mode 100644
index 000000000..e2dec307a
--- /dev/null
+++ b/tests/Unit/Flow/DossiqFlowNodeListenerTest.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Test
+ * @package   OCA\Dossiq\Tests\Unit\Flow
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Tests\Unit\Flow;
+
+use OCA\OpenRegister\Service\Flow\IFlowNode;
+use OCA\OpenRegister\Service\Flow\RegisterFlowNodesEvent;
+use OCA\Dossiq\Flow\DossiqCallWebhookNode;
+use OCA\Dossiq\Flow\DossiqCreateDocumentNode;
+use OCA\Dossiq\Flow\DossiqFlowNodeListener;
+use OCA\Dossiq\Flow\DossiqMergeTemplateNode;
+use OCA\Dossiq\Flow\DossiqNotifyRoleNode;
+use OCA\Dossiq\Flow\DossiqScheduleReminderNode;
+use OCA\Dossiq\Flow\DossiqSendEmailNode;
+use OCA\Dossiq\Flow\DossiqTxSendEmailNode;
+use OCA\Dossiq\Flow\DossiqTxCreateTaskNode;
+use OCA\Dossiq\Flow\DossiqTxCreateSubCaseNode;
+use OCA\Dossiq\Flow\DossiqTxWebhookNode;
+use OCA\Dossiq\Flow\DossiqTxSetFieldNode;
+use OCA\Dossiq\Flow\DossiqTxNotifyNode;
+use OCA\Dossiq\Flow\DossiqTxBesluitvormingActivateNode;
+use OCA\Dossiq\Flow\DossiqTxBesluitvormingPublishNode;
+use OCA\Dossiq\Flow\DossiqTxEvaluateDecisionNode;
+use OCP\EventDispatcher\Event;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
+
+/**
+ * Proves dossiq actually contributes all six case actions.
+ *
+ * A node class that exists but is never registered is invisible to the flow
+ * editor — and looks identical to one that works, right up until somebody tries
+ * to build a flow with it.
+ *
+ * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+ */
+class DossiqFlowNodeListenerTest extends TestCase {
+
+    /**
+     * The id each node class reports, in the order the listener registers them.
+     *
+     * @var array<class-string, string>
+     */
+    private const EXPECTED_IDS = [
+        DossiqTxSendEmailNode::class => 'dossiq.sendEmail',
+        DossiqTxCreateTaskNode::class => 'dossiq.createTask',
+        DossiqTxCreateSubCaseNode::class => 'dossiq.createSubCase',
+        DossiqTxWebhookNode::class => 'dossiq.webhook',
+        DossiqTxSetFieldNode::class => 'dossiq.setField',
+        DossiqTxNotifyNode::class => 'dossiq.notify',
+        DossiqTxBesluitvormingActivateNode::class => 'dossiq.besluitvormingActivate',
+        DossiqTxBesluitvormingPublishNode::class => 'dossiq.besluitvormingPublish',
+        DossiqTxEvaluateDecisionNode::class => 'dossiq.evaluateDecision',
+        DossiqSendEmailNode::class => 'dossiq.action.sendEmail',
+        DossiqNotifyRoleNode::class => 'dossiq.action.notifyRole',
+        DossiqCallWebhookNode::class => 'dossiq.action.callWebhook',
+        DossiqCreateDocumentNode::class => 'dossiq.action.createDocument',
+        DossiqMergeTemplateNode::class => 'dossiq.action.mergeTemplate',
+        DossiqScheduleReminderNode::class => 'dossiq.action.scheduleReminder',
+    ];
+
+
+
+    /**
+     * Build the listener over a container that yields id-reporting nodes.
+     *
+     * The listener resolves its nodes from a class-string list, so the test
+     * asserts what reaches the CATALOGUE rather than what was injected — which
+     * is the thing that actually matters: a node class that exists but never
+     * registers is invisible to the flow editor and looks identical to one that
+     * works.
+     *
+     * @param string[] $failing Class names the container should refuse to build.
+     *
+     * @return DossiqFlowNodeListener The listener under test.
+     */
+    private function listener(array $failing=[]): DossiqFlowNodeListener {
+        $container = $this->createMock(ContainerInterface::class);
+        $container->method('get')->willReturnCallback(
+            function (string $class) use ($failing): IFlowNode {
+                if (in_array($class, $failing, true) === true) {
+                    throw new RuntimeException('cannot construct ' . $class);
+                }
+
+                $node = $this->createMock(IFlowNode::class);
+                $node->method('getId')->willReturn(self::EXPECTED_IDS[$class]);
+                return $node;
+            }
+        );
+
+        return new DossiqFlowNodeListener($container, $this->createMock(LoggerInterface::class));
+
+    }//end listener()
+
+
+    /**
+     * All fifteen actions land on the catalogue — both vocabularies.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testAllFifteenActionsAreRegistered(): void {
+        $event = new RegisterFlowNodesEvent();
+        $this->listener()->handle($event);
+
+        $ids = array_map(
+            static fn ($node): string => $node->getId(),
+            $event->getRegisteredNodes()
+        );
+
+        $this->assertSame(
+            array_values(self::EXPECTED_IDS),
+            $ids
+        );
+
+    }//end testAllFifteenActionsAreRegistered()
+
+
+    /**
+     * An unrelated event is ignored rather than half-handled.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testUnrelatedEventIsIgnored(): void {
+        $other = new class extends Event {
+        };
+
+        $this->listener()->handle($other);
+
+        $this->addToAssertionCount(1);
+
+    }//end testUnrelatedEventIsIgnored()
+
+    /**
+     * One unbuildable node does not cost the other fourteen their place.
+     *
+     * The list-based resolution introduced this branch: if a single node's
+     * dependencies cannot be constructed, aborting would empty the whole
+     * catalogue. A skipped node is visible — the editor simply does not offer
+     * it — where a failed registration takes everything down with it.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testOneUnbuildableNodeDoesNotCostTheRest(): void {
+        $event = new RegisterFlowNodesEvent();
+        $this->listener(failing: [DossiqTxSetFieldNode::class])->handle($event);
+
+        $ids = array_map(
+            static fn ($node): string => $node->getId(),
+            $event->getRegisteredNodes()
+        );
+
+        $this->assertCount(14, $ids);
+        $this->assertNotContains('dossiq.setField', $ids);
+        $this->assertContains('dossiq.sendEmail', $ids);
+        $this->assertContains('dossiq.action.sendEmail', $ids);
+
+    }//end testOneUnbuildableNodeDoesNotCostTheRest()
+
+
+}//end class
diff --git a/tests/Unit/Flow/ProcestActionNodeTest.php b/tests/Unit/Flow/ProcestActionNodeTest.php
deleted file mode 100644
index 3218cbb25..000000000
--- a/tests/Unit/Flow/ProcestActionNodeTest.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Test
- * @package   OCA\Dossiq\Tests\Unit\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Tests\Unit\Flow;
-
-use OCA\Dossiq\Flow\ProcestSendEmailNode;
-use OCA\Dossiq\Service\Actions\ActionResult;
-use OCA\Dossiq\Service\Actions\SendEmailHandler;
-use OCP\IL10N;
-use OCP\IURLGenerator;
-use PHPUnit\Framework\TestCase;
-use UnexpectedValueException;
-
-/**
- * Covers the action-node wrapper.
- *
- * SendEmail stands in for all six — they differ only in their handler and their
- * required keys, and the behaviour worth pinning lives in the shared base.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestActionNodeTest extends TestCase {
-
-	/**
-	 * @var SendEmailHandler&\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private $handler;
-
-	/**
-	 * @var ProcestSendEmailNode
-	 */
-	private ProcestSendEmailNode $node;
-
-	/**
-	 * Set up the node over a mocked handler.
-	 *
-	 * @return void
-	 */
-	protected function setUp(): void {
-		parent::setUp();
-		$this->handler = $this->createMock(SendEmailHandler::class);
-		$this->handler->method('type')->willReturn('sendEmail');
-
-		$l10n = $this->createMock(IL10N::class);
-		$l10n->method('t')->willReturnCallback(
-			static function (string $text, array $params = []): string {
-				return vsprintf($text, $params);
-			}
-		);
-		$urls = $this->createMock(IURLGenerator::class);
-		$urls->method('imagePath')->willReturn('/apps/procest/img/app-dark.svg');
-
-		$this->node = new ProcestSendEmailNode($this->handler, $l10n, $urls);
-
-	}//end setUp()
-
-	/**
-	 * A complete config for this node.
-	 *
-	 * @return array<string, mixed> The config.
-	 */
-	private function config(): array {
-		return [
-			'recipientRef' => 'behandelaar',
-			'subjectTemplate' => 'Zaak {{ title }}',
-			'bodyTemplate' => 'Uw zaak is bijgewerkt.',
-		];
-
-	}//end config()
-
-	/**
-	 * The node id is derived from the handler's own type slug.
-	 *
-	 * Deriving it is what stops a node id drifting from the handler it runs,
-	 * and gives the reference migration one rule instead of six.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testIdIsDerivedFromTheHandlerType(): void {
-		// `procest.action.*`, not `procest.*`: the LIVE transition vocabulary
-		// owns the plain names and both systems ship a sendEmail. An id
-		// collision here would have one handler silently shadow the other in
-		// the catalogue.
-		$this->assertSame('procest.action.sendEmail', $this->node->getId());
-
-	}//end testIdIsDerivedFromTheHandlerType()
-
-	/**
-	 * A successful action puts its data on the item.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testSuccessfulActionWritesItsResultOntoTheItem(): void {
-		$this->handler->method('handle')->willReturn(new ActionResult(true, null, ['sent' => 1]));
-
-		$out = $this->node->execute(
-			[['json' => ['id' => 'case-1', 'title' => 'Bezwaar']]],
-			$this->config(),
-			[]
-		);
-
-		$this->assertCount(1, $out);
-		$this->assertSame(['sent' => 1], $out[0]['json']['actionResult']);
-		$this->assertSame('case-1', $out[0]['json']['id']);
-
-	}//end testSuccessfulActionWritesItsResultOntoTheItem()
-
-	/**
-	 * The output key is configurable.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testOutputKeyIsConfigurable(): void {
-		$this->handler->method('handle')->willReturn(new ActionResult(true, null, ['sent' => 1]));
-
-		$out = $this->node->execute(
-			[['json' => []]],
-			array_merge($this->config(), ['output' => 'mailResult']),
-			[]
-		);
-
-		$this->assertArrayHasKey('mailResult', $out[0]['json']);
-
-	}//end testOutputKeyIsConfigurable()
-
-	/**
-	 * A FAILED action throws instead of passing the item through.
-	 *
-	 * This is the one that matters. Returning the item unchanged would leave
-	 * the output key absent, and a downstream router would take its default
-	 * branch exactly as though the action had succeeded — the engine's onError
-	 * policy only ever sees failures that propagate out of execute().
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testFailedActionThrowsRatherThanPassingThrough(): void {
-		$this->handler->method('handle')->willReturn(new ActionResult(false, 'smtp_unavailable'));
-
-		$this->expectException(UnexpectedValueException::class);
-		$this->expectExceptionMessage('smtp_unavailable');
-
-		$this->node->execute([['json' => []]], $this->config(), []);
-
-	}//end testFailedActionThrowsRatherThanPassingThrough()
-
-	/**
-	 * A config missing a required key is rejected at EXECUTION, not only on save.
-	 *
-	 * validateConfig() runs when a flow is saved; a seeded or imported flow
-	 * reaches execute() without ever having been saved through the editor.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testUnvalidatedConfigIsRejectedAtExecution(): void {
-		$this->handler->expects($this->never())->method('handle');
-
-		$config = $this->config();
-		unset($config['recipientRef']);
-
-		$this->expectException(UnexpectedValueException::class);
-		$this->node->execute([['json' => []]], $config, []);
-
-	}//end testUnvalidatedConfigIsRejectedAtExecution()
-
-	/**
-	 * validateConfig() names the key it is missing.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testValidateConfigNamesTheMissingKey(): void {
-		$config = $this->config();
-		unset($config['bodyTemplate']);
-
-		$this->expectException(UnexpectedValueException::class);
-		$this->expectExceptionMessage('bodyTemplate');
-
-		$this->node->validateConfig($config);
-
-	}//end testValidateConfigNamesTheMissingKey()
-
-	/**
-	 * Every item in the batch is acted on.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testEveryItemInTheBatchIsActedOn(): void {
-		$this->handler->expects($this->exactly(3))->method('handle')
-			->willReturn(new ActionResult(true, null, []));
-
-		$out = $this->node->execute(
-			[['json' => ['id' => 'a']], ['json' => ['id' => 'b']], ['json' => ['id' => 'c']]],
-			$this->config(),
-			[]
-		);
-
-		$this->assertCount(3, $out);
-
-	}//end testEveryItemInTheBatchIsActedOn()
-
-}//end class
diff --git a/tests/Unit/Flow/ProcestFlowNodeListenerTest.php b/tests/Unit/Flow/ProcestFlowNodeListenerTest.php
deleted file mode 100644
index a074a86f3..000000000
--- a/tests/Unit/Flow/ProcestFlowNodeListenerTest.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- * SPDX-License-Identifier: EUPL-1.2
- *
- * @category  Test
- * @package   OCA\Dossiq\Tests\Unit\Flow
- * @author    Conduction B.V. <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2
- * @link      https://github.com/ConductionNL/dossiq
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Tests\Unit\Flow;
-
-use OCA\Dossiq\Flow\ProcestCallWebhookNode;
-use OCA\Dossiq\Flow\ProcestCreateDocumentNode;
-use OCA\Dossiq\Flow\ProcestFlowNodeListener;
-use OCA\Dossiq\Flow\ProcestMergeTemplateNode;
-use OCA\Dossiq\Flow\ProcestNotifyRoleNode;
-use OCA\Dossiq\Flow\ProcestScheduleReminderNode;
-use OCA\Dossiq\Flow\ProcestSendEmailNode;
-use OCA\Dossiq\Flow\ProcestTxBesluitvormingActivateNode;
-use OCA\Dossiq\Flow\ProcestTxBesluitvormingPublishNode;
-use OCA\Dossiq\Flow\ProcestTxCreateSubCaseNode;
-use OCA\Dossiq\Flow\ProcestTxCreateTaskNode;
-use OCA\Dossiq\Flow\ProcestTxEvaluateDecisionNode;
-use OCA\Dossiq\Flow\ProcestTxNotifyNode;
-use OCA\Dossiq\Flow\ProcestTxSendEmailNode;
-use OCA\Dossiq\Flow\ProcestTxSetFieldNode;
-use OCA\Dossiq\Flow\ProcestTxWebhookNode;
-use OCA\OpenRegister\Service\Flow\IFlowNode;
-use OCA\OpenRegister\Service\Flow\RegisterFlowNodesEvent;
-use OCP\EventDispatcher\Event;
-use PHPUnit\Framework\TestCase;
-use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-
-/**
- * Proves procest actually contributes all six case actions.
- *
- * A node class that exists but is never registered is invisible to the flow
- * editor — and looks identical to one that works, right up until somebody tries
- * to build a flow with it.
- *
- * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
- */
-class ProcestFlowNodeListenerTest extends TestCase {
-
-	/**
-	 * The id each node class reports, in the order the listener registers them.
-	 *
-	 * @var array<class-string, string>
-	 */
-	private const EXPECTED_IDS = [
-		ProcestTxSendEmailNode::class => 'procest.sendEmail',
-		ProcestTxCreateTaskNode::class => 'procest.createTask',
-		ProcestTxCreateSubCaseNode::class => 'procest.createSubCase',
-		ProcestTxWebhookNode::class => 'procest.webhook',
-		ProcestTxSetFieldNode::class => 'procest.setField',
-		ProcestTxNotifyNode::class => 'procest.notify',
-		ProcestTxBesluitvormingActivateNode::class => 'procest.besluitvormingActivate',
-		ProcestTxBesluitvormingPublishNode::class => 'procest.besluitvormingPublish',
-		ProcestTxEvaluateDecisionNode::class => 'procest.evaluateDecision',
-		ProcestSendEmailNode::class => 'procest.action.sendEmail',
-		ProcestNotifyRoleNode::class => 'procest.action.notifyRole',
-		ProcestCallWebhookNode::class => 'procest.action.callWebhook',
-		ProcestCreateDocumentNode::class => 'procest.action.createDocument',
-		ProcestMergeTemplateNode::class => 'procest.action.mergeTemplate',
-		ProcestScheduleReminderNode::class => 'procest.action.scheduleReminder',
-	];
-
-	/**
-	 * Build the listener over a container that yields id-reporting nodes.
-	 *
-	 * The listener resolves its nodes from a class-string list, so the test
-	 * asserts what reaches the CATALOGUE rather than what was injected — which
-	 * is the thing that actually matters: a node class that exists but never
-	 * registers is invisible to the flow editor and looks identical to one that
-	 * works.
-	 *
-	 * @param string[] $failing Class names the container should refuse to build.
-	 *
-	 * @return ProcestFlowNodeListener The listener under test.
-	 */
-	private function listener(array $failing = []): ProcestFlowNodeListener {
-		$container = $this->createMock(ContainerInterface::class);
-		$container->method('get')->willReturnCallback(
-			function (string $class) use ($failing): IFlowNode {
-				if (in_array($class, $failing, true) === true) {
-					throw new RuntimeException('cannot construct ' . $class);
-				}
-
-				$node = $this->createMock(IFlowNode::class);
-				$node->method('getId')->willReturn(self::EXPECTED_IDS[$class]);
-				return $node;
-			}
-		);
-
-		return new ProcestFlowNodeListener($container, $this->createMock(LoggerInterface::class));
-	}//end listener()
-
-	/**
-	 * All fifteen actions land on the catalogue — both vocabularies.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testAllFifteenActionsAreRegistered(): void {
-		$event = new RegisterFlowNodesEvent();
-		$this->listener()->handle($event);
-
-		$ids = array_map(
-			static fn ($node): string => $node->getId(),
-			$event->getRegisteredNodes()
-		);
-
-		$this->assertSame(
-			array_values(self::EXPECTED_IDS),
-			$ids
-		);
-
-	}//end testAllFifteenActionsAreRegistered()
-
-	/**
-	 * An unrelated event is ignored rather than half-handled.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testUnrelatedEventIsIgnored(): void {
-		$other = new class extends Event {
-		};
-
-		$this->listener()->handle($other);
-
-		$this->addToAssertionCount(1);
-
-	}//end testUnrelatedEventIsIgnored()
-
-	/**
-	 * One unbuildable node does not cost the other fourteen their place.
-	 *
-	 * The list-based resolution introduced this branch: if a single node's
-	 * dependencies cannot be constructed, aborting would empty the whole
-	 * catalogue. A skipped node is visible — the editor simply does not offer
-	 * it — where a failed registration takes everything down with it.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testOneUnbuildableNodeDoesNotCostTheRest(): void {
-		$event = new RegisterFlowNodesEvent();
-		$this->listener(failing: [ProcestTxSetFieldNode::class])->handle($event);
-
-		$ids = array_map(
-			static fn ($node): string => $node->getId(),
-			$event->getRegisteredNodes()
-		);
-
-		$this->assertCount(14, $ids);
-		$this->assertNotContains('procest.setField', $ids);
-		$this->assertContains('procest.sendEmail', $ids);
-		$this->assertContains('procest.action.sendEmail', $ids);
-
-	}//end testOneUnbuildableNodeDoesNotCostTheRest()
-
-}//end class
diff --git a/tests/Unit/Listener/DecisionConcludedListenerTest.php b/tests/Unit/Listener/DecisionConcludedListenerTest.php
index 558da695c..4260db533 100644
--- a/tests/Unit/Listener/DecisionConcludedListenerTest.php
+++ b/tests/Unit/Listener/DecisionConcludedListenerTest.php
@@ -25,7 +25,11 @@
 
 namespace OCA\Dossiq\Tests\Unit\Listener;
 
-use OCA\Decidesk\Event\DecisionConcludedEvent;
+// The CURRENT namespace. The decision app renamed OCA\Decidesk -> OCA\Decidiq
+// with no alias, and the production resolver now prefers the current spelling —
+// so a test importing the OLD class asserts against an object the code no longer
+// builds. CrossAppEventNamesTest guards the ordering these follow.
+use OCA\Decidiq\Event\DecisionConcludedEvent;
 use OCA\Dossiq\Listener\DecisionConcludedListener;
 use OCA\Dossiq\Service\BesluitMaterialisationService;
 use OCA\Dossiq\Service\Bezwaar\AdvisoryCommitteeService;
diff --git a/tests/Unit/Repair/BackfillAdviceRequestObjectionTest.php b/tests/Unit/Repair/BackfillAdviceRequestObjectionTest.php
new file mode 100644
index 000000000..cad6a20ff
--- /dev/null
+++ b/tests/Unit/Repair/BackfillAdviceRequestObjectionTest.php
@@ -0,0 +1,216 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Test
+ * @package   OCA\Dossiq\Tests\Unit\Repair
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Tests\Unit\Repair;
+
+use OCA\Dossiq\Repair\BackfillAdviceRequestObjection;
+use OCA\Dossiq\Service\SettingsService;
+use OCP\IAppConfig;
+use OCP\Migration\IOutput;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Covers the backfill of `bacAdviceRequest.bezwaar`.
+ *
+ * The defect it repairs was invisible: advice requests were written with the
+ * objection id under the name of the SCHEMA it references
+ * (`objectionProceeding`) rather than the property the schema declares
+ * (`bezwaar`), so BezwaarDetail's advice-request widgets — which filter on
+ * `bezwaar` — rendered an empty list. An empty list is also what a bezwaar with
+ * no advice requests looks like, so nothing ever looked wrong.
+ */
+class BackfillAdviceRequestObjectionTest extends TestCase {
+	/**
+	 * An ObjectService stand-in that records saves.
+	 *
+	 * @param array<int, array<string, mixed>> $rows The stored rows.
+	 *
+	 * @return object The fake.
+	 */
+	private function objectServiceFake(array $rows): object {
+		return new class($rows) {
+			/**
+			 * @var array<int, array{uuid: string, object: array<string, mixed>}>
+			 */
+			public array $saves = [];
+
+			/**
+			 * @param array<int, array<string, mixed>> $rows The rows.
+			 */
+			public function __construct(private array $rows) {
+			}
+
+			/**
+			 * Run the callable straight through.
+			 *
+			 * @param callable $operation The operation.
+			 *
+			 * @return mixed The result.
+			 */
+			public function runAsSystem(callable $operation) {
+				return $operation();
+			}
+
+			/**
+			 * Return the configured rows.
+			 *
+			 * @param array<string, mixed> $config The query config.
+			 *
+			 * @return array<int, array<string, mixed>> The rows.
+			 */
+			public function findAll(array $config): array {
+				return $this->rows;
+			}
+
+			/**
+			 * Record the patch.
+			 *
+			 * @param array<string, mixed> $object The patch.
+			 * @param string $register The register.
+			 * @param string $schema The schema.
+			 * @param string $uuid The row uuid.
+			 *
+			 * @return array<string, mixed> The saved object.
+			 */
+			public function saveObject(array $object, string $register, string $schema, string $uuid): array {
+				$this->saves[] = ['uuid' => $uuid, 'object' => $object];
+
+				return $object;
+			}
+		};
+	}
+
+	/**
+	 * Build the repair step around the given rows.
+	 *
+	 * @param object $objectService The ObjectService fake.
+	 *
+	 * @return BackfillAdviceRequestObjection The repair step.
+	 */
+	private function step(object $objectService): BackfillAdviceRequestObjection {
+		$settings = $this->createMock(SettingsService::class);
+		$settings->method('getObjectService')->willReturn($objectService);
+
+		$appConfig = $this->createMock(IAppConfig::class);
+		$appConfig->method('getValueString')->willReturnCallback(
+			static fn (string $app, string $key, string $default = ''): string => ($key === 'register') ? '17' : '143'
+		);
+
+		return new BackfillAdviceRequestObjection(
+			$settings,
+			$appConfig,
+			$this->createMock(LoggerInterface::class),
+		);
+	}
+
+	/**
+	 * A legacy row gets `bezwaar` written from `objectionProceeding`.
+	 *
+	 * @return void
+	 */
+	public function testItCopiesTheLegacyKeyOntoTheDeclaredOne(): void {
+		$objectService = $this->objectServiceFake([
+			['id' => 'req-1', 'objectionProceeding' => 'bezwaar-42', 'status' => 'assigned'],
+		]);
+
+		$this->step($objectService)->run($this->createMock(IOutput::class));
+
+		$this->assertSame(
+			[['uuid' => 'req-1', 'object' => ['bezwaar' => 'bezwaar-42']]],
+			$objectService->saves
+		);
+	}
+
+	/**
+	 * A row that already has `bezwaar` is left alone.
+	 *
+	 * @return void
+	 */
+	public function testItSkipsARowThatIsAlreadyCorrect(): void {
+		$objectService = $this->objectServiceFake([
+			['id' => 'req-1', 'bezwaar' => 'bezwaar-42', 'objectionProceeding' => 'bezwaar-42'],
+		]);
+
+		$this->step($objectService)->run($this->createMock(IOutput::class));
+
+		$this->assertSame([], $objectService->saves, 'A correct row must not be rewritten.');
+	}
+
+	/**
+	 * A row with NEITHER key is skipped, never written with an empty value.
+	 *
+	 * Writing `bezwaar => ''` would satisfy the required property while pointing
+	 * at nothing — a row that looks repaired and still cannot be found by the
+	 * filter that needed it.
+	 *
+	 * @return void
+	 */
+	public function testItSkipsARowItCannotRepair(): void {
+		$objectService = $this->objectServiceFake([['id' => 'req-1', 'status' => 'assigned']]);
+
+		$this->step($objectService)->run($this->createMock(IOutput::class));
+
+		$this->assertSame([], $objectService->saves);
+	}
+
+	/**
+	 * Running twice writes once — the second pass sees the repaired key.
+	 *
+	 * @return void
+	 */
+	public function testItIsIdempotent(): void {
+		$objectService = $this->objectServiceFake([
+			['id' => 'req-1', 'objectionProceeding' => 'bezwaar-42'],
+		]);
+		$step = $this->step($objectService);
+
+		$step->run($this->createMock(IOutput::class));
+		$first = count($objectService->saves);
+
+		// Second pass over the REPAIRED shape, which is what a re-run reads.
+		$repaired = $this->objectServiceFake([
+			['id' => 'req-1', 'bezwaar' => 'bezwaar-42', 'objectionProceeding' => 'bezwaar-42'],
+		]);
+		$this->step($repaired)->run($this->createMock(IOutput::class));
+
+		$this->assertSame(1, $first);
+		$this->assertSame([], $repaired->saves);
+	}
+
+	/**
+	 * With OpenRegister absent the step is a no-op rather than a fatal.
+	 *
+	 * An upgrade must not fail because a projection could not complete.
+	 *
+	 * @return void
+	 */
+	public function testItIsANoOpWithoutOpenRegister(): void {
+		$settings = $this->createMock(SettingsService::class);
+		$settings->method('getObjectService')->willReturn(null);
+
+		$step = new BackfillAdviceRequestObjection(
+			$settings,
+			$this->createMock(IAppConfig::class),
+			$this->createMock(LoggerInterface::class),
+		);
+
+		$output = $this->createMock(IOutput::class);
+		$output->expects($this->once())->method('info');
+
+		$step->run($output);
+	}
+}
diff --git a/tests/Unit/Service/Actions/AutomaticActionFlowMigratorTest.php b/tests/Unit/Service/Actions/AutomaticActionFlowMigratorTest.php
new file mode 100644
index 000000000..b0e0638e2
--- /dev/null
+++ b/tests/Unit/Service/Actions/AutomaticActionFlowMigratorTest.php
@@ -0,0 +1,444 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * @category  Test
+ * @package   OCA\Dossiq\Tests\Unit\Service\Actions
+ * @author    Conduction B.V. <info@conduction.nl>
+ * @copyright 2026 Conduction B.V.
+ * @license   EUPL-1.2
+ * @link      https://github.com/ConductionNL/dossiq
+ */
+
+declare(strict_types=1);
+
+namespace OCA\Dossiq\Tests\Unit\Service\Actions;
+
+use OCA\Dossiq\Service\Actions\AutomaticActionFlowMigrator;
+use OCA\Dossiq\Service\SettingsService;
+use OCA\OpenRegister\Service\Flow\FlowNodeRegistry;
+use OCA\OpenRegister\Service\Flow\IFlowNode;
+use OCP\IAppConfig;
+use OCP\IUser;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Covers the automaticAction → flow projection.
+ *
+ * The migration turns configuration that has never executed into something that
+ * fires, so every branch that decides WHETHER to write is asserted here: an
+ * unimplemented action type must be skipped rather than wrapped in a flow that
+ * cannot run, and a re-run must update the flow it made last time instead of
+ * creating a second one.
+ */
+class AutomaticActionFlowMigratorTest extends TestCase {
+	/**
+	 * A minimal stand-in for OpenRegister's FlowService.
+	 *
+	 * @return object The fake, exposing saves[] and a settable page.
+	 */
+	private function flowServiceFake(): object {
+		return new class {
+			/**
+			 * @var array<int, array{document: array<string, mixed>, uuid: string|null}>
+			 */
+			public array $saves = [];
+
+			/**
+			 * @var array<int, object>
+			 */
+			public array $page = [];
+
+			/**
+			 * Record a save and hand back a flow-like object.
+			 *
+			 * @param array<string, mixed> $document The flow document.
+			 * @param string|null $uuid The flow being updated.
+			 *
+			 * @return object The stored flow.
+			 */
+			public function save(array $document, ?string $uuid = null): object {
+				$this->saves[] = ['document' => $document, 'uuid' => $uuid];
+
+				return new class($uuid ?? 'new-flow-uuid') {
+					/**
+					 * @param string $uuid The uuid.
+					 */
+					public function __construct(private string $uuid) {
+					}
+
+					/**
+					 * @return string The uuid.
+					 */
+					public function getUuid(): string {
+						return $this->uuid;
+					}
+				};
+			}
+
+			/**
+			 * Return the first page of flows, then nothing.
+			 *
+			 * @param string|null $app The owning app.
+			 * @param string|null $applicationSlug Unused.
+			 * @param bool|null $enabled Unused.
+			 * @param int $limit Page size.
+			 * @param int $offset Page offset.
+			 *
+			 * @return array<int, object> The page.
+			 */
+			public function findAll(
+				?string $app = null,
+				?string $applicationSlug = null,
+				?bool $enabled = null,
+				int $limit = 100,
+				int $offset = 0,
+			): array {
+				if ($offset > 0) {
+					return [];
+				}
+
+				return $this->page;
+			}
+		};
+	}
+
+	/**
+	 * A flow-like row carrying a provenance marker.
+	 *
+	 * @param string $notes The notes field.
+	 * @param string $uuid The flow uuid.
+	 *
+	 * @return object The row.
+	 */
+	private function flowRow(string $notes, string $uuid): object {
+		return new class($notes, $uuid) {
+			/**
+			 * @param string $notes The notes.
+			 * @param string $uuid The uuid.
+			 */
+			public function __construct(private string $notes, private string $uuid) {
+			}
+
+			/**
+			 * @return string The notes.
+			 */
+			public function getNotes(): string {
+				return $this->notes;
+			}
+
+			/**
+			 * @return string The uuid.
+			 */
+			public function getUuid(): string {
+				return $this->uuid;
+			}
+		};
+	}
+
+	/**
+	 * An ObjectService stand-in returning the given actions.
+	 *
+	 * @param array<int, array<string, mixed>> $actions The stored actions.
+	 *
+	 * @return object The fake.
+	 */
+	private function objectServiceFake(array $actions): object {
+		return new class($actions) {
+			/**
+			 * @param array<int, array<string, mixed>> $actions The actions.
+			 */
+			public function __construct(private array $actions) {
+			}
+
+			/**
+			 * Run the callable straight through.
+			 *
+			 * @param IUser $user The acting user.
+			 * @param callable $operation The operation.
+			 *
+			 * @return mixed The result.
+			 */
+			public function runAs(IUser $user, callable $operation) {
+				return $operation();
+			}
+
+			/**
+			 * Return the configured actions.
+			 *
+			 * @param array<string, mixed> $config The query config.
+			 *
+			 * @return array<int, array<string, mixed>> The actions.
+			 */
+			public function findAll(array $config): array {
+				return $this->actions;
+			}
+		};
+	}
+
+	/**
+	 * Build the migrator with the given fakes.
+	 *
+	 * @param array<int, array<string, mixed>> $actions Stored actions.
+	 * @param object $flowService The flow-service fake.
+	 * @param array<int, string> $nodeIds Node ids the registry knows.
+	 *
+	 * @return AutomaticActionFlowMigrator The migrator.
+	 */
+	private function migrator(array $actions, object $flowService, array $nodeIds): AutomaticActionFlowMigrator {
+		$registry = new FlowNodeRegistry();
+		foreach ($nodeIds as $id) {
+			$node = $this->createMock(IFlowNode::class);
+			$node->method('getId')->willReturn($id);
+			$registry->register($node);
+		}
+
+		$settings = $this->createMock(SettingsService::class);
+		$settings->method('getObjectService')->willReturn($this->objectServiceFake($actions));
+
+		$container = $this->createMock(ContainerInterface::class);
+		$container->method('get')->willReturnCallback(
+			static function (string $id) use ($flowService, $registry) {
+				if ($id === 'OCA\OpenRegister\Service\Flow\FlowService') {
+					return $flowService;
+				}
+
+				return $registry;
+			}
+		);
+
+		$appConfig = $this->createMock(IAppConfig::class);
+		$appConfig->method('getValueString')->willReturnCallback(
+			static fn (string $app, string $key, string $default = ''): string => ($key === 'register') ? '17' : '115'
+		);
+
+		return new AutomaticActionFlowMigrator(
+			$settings,
+			$container,
+			$appConfig,
+			$this->createMock(LoggerInterface::class),
+		);
+	}
+
+	/**
+	 * One well-formed action becomes one enabled, runnable flow.
+	 *
+	 * @return void
+	 */
+	public function testItCreatesAnEnabledFlowPerAction(): void {
+		$flowService = $this->flowServiceFake();
+		$migrator = $this->migrator(
+			[
+				[
+					'tenantId' => 'tenant-a',
+					'slug' => 'send-decision-email',
+					'title' => 'Send decision email',
+					'type' => 'sendEmail',
+					'config' => '{"subject":"Uw besluit"}',
+				],
+			],
+			$flowService,
+			['dossiq.action.sendEmail'],
+		);
+
+		$summary = $migrator->migrate(user: $this->createMock(IUser::class), dryRun: false);
+
+		$this->assertSame(1, $summary['total']);
+		$this->assertSame(1, $summary['created']);
+		$this->assertCount(1, $flowService->saves);
+
+		$document = $flowService->saves[0]['document'];
+		$this->assertNull($flowService->saves[0]['uuid'], 'A first migration must CREATE, not update.');
+		$this->assertTrue($document['enabled']);
+		$this->assertSame('manual', $document['trigger']);
+		$this->assertSame(
+			['openregister.trigger-manual', 'dossiq.action.sendEmail', 'openregister.end'],
+			array_column($document['nodes'], 'type'),
+			'A flow OpenRegister will run needs an entry and an exit around the action.'
+		);
+		$this->assertSame(['subject' => 'Uw besluit'], $document['nodes'][1]['config']);
+		$this->assertSame('dossiq:automaticAction:tenant-a:send-decision-email', $document['notes']);
+	}
+
+	/**
+	 * An action type no node implements is SKIPPED, never wrapped in a flow.
+	 *
+	 * Writing it would rebuild the exact defect this programme already fixed in
+	 * the VTH catalog: a stored step naming a handler nothing answers to, which
+	 * reports success and does nothing.
+	 *
+	 * @return void
+	 */
+	public function testItSkipsAnActionTypeNoNodeImplements(): void {
+		$flowService = $this->flowServiceFake();
+		$migrator = $this->migrator(
+			[['tenantId' => 't', 'slug' => 'carrier-pigeon', 'title' => 'Pigeon', 'type' => 'sendCarrierPigeon']],
+			$flowService,
+			['dossiq.action.sendEmail'],
+		);
+
+		$summary = $migrator->migrate(user: $this->createMock(IUser::class), dryRun: false);
+
+		$this->assertSame(1, $summary['skipped']);
+		$this->assertSame(0, $summary['created']);
+		$this->assertSame([], $flowService->saves);
+	}
+
+	/**
+	 * A re-run updates the flow it created, rather than making a second one.
+	 *
+	 * @return void
+	 */
+	public function testItUpdatesTheFlowItAlreadyCreated(): void {
+		$flowService = $this->flowServiceFake();
+		$flowService->page = [
+			$this->flowRow('dossiq:automaticAction:tenant-a:send-decision-email', 'existing-uuid'),
+		];
+
+		$migrator = $this->migrator(
+			[
+				[
+					'tenantId' => 'tenant-a',
+					'slug' => 'send-decision-email',
+					'title' => 'Send decision email',
+					'type' => 'sendEmail',
+					'config' => '{}',
+				],
+			],
+			$flowService,
+			['dossiq.action.sendEmail'],
+		);
+
+		$summary = $migrator->migrate(user: $this->createMock(IUser::class), dryRun: false);
+
+		$this->assertSame(1, $summary['updated']);
+		$this->assertSame(0, $summary['created']);
+		$this->assertSame('existing-uuid', $flowService->saves[0]['uuid']);
+	}
+
+	/**
+	 * An action missing tenantId or slug FAILS rather than sharing a marker.
+	 *
+	 * Defaulting the missing half would collapse several actions onto one
+	 * marker, and each migration would overwrite the previous one's flow.
+	 *
+	 * @return void
+	 */
+	public function testItFailsAnActionItCannotIdentify(): void {
+		$flowService = $this->flowServiceFake();
+		$migrator = $this->migrator(
+			[['slug' => 'no-tenant', 'title' => 'Orphan', 'type' => 'sendEmail']],
+			$flowService,
+			['dossiq.action.sendEmail'],
+		);
+
+		$summary = $migrator->migrate(user: $this->createMock(IUser::class), dryRun: false);
+
+		$this->assertSame(1, $summary['failed']);
+		$this->assertSame([], $flowService->saves);
+	}
+
+	/**
+	 * A dry run reports the same outcomes and writes nothing.
+	 *
+	 * @return void
+	 */
+	public function testADryRunWritesNothing(): void {
+		$flowService = $this->flowServiceFake();
+		$migrator = $this->migrator(
+			[['tenantId' => 't', 'slug' => 's', 'title' => 'T', 'type' => 'sendEmail', 'config' => '{}']],
+			$flowService,
+			['dossiq.action.sendEmail'],
+		);
+
+		$summary = $migrator->migrate(user: $this->createMock(IUser::class), dryRun: true);
+
+		$this->assertSame(1, $summary['created']);
+		$this->assertSame([], $flowService->saves, 'A dry run that writes is not a dry run.');
+	}
+
+	/**
+	 * A save that throws is reported as failed and does not abort the rest.
+	 *
+	 * @return void
+	 */
+	public function testOneFailingActionDoesNotAbortTheRest(): void {
+		$flowService = new class($this->flowServiceFake()) {
+			/**
+			 * @var array<int, array{document: array<string, mixed>, uuid: string|null}>
+			 */
+			public array $saves = [];
+
+			/**
+			 * @param object $inner Unused; keeps the shape symmetric.
+			 */
+			public function __construct(private object $inner) {
+			}
+
+			/**
+			 * Throw for the first action, succeed for the second.
+			 *
+			 * @param array<string, mixed> $document The flow document.
+			 * @param string|null $uuid The flow being updated.
+			 *
+			 * @return object The stored flow.
+			 */
+			public function save(array $document, ?string $uuid = null): object {
+				if ($document['name'] === 'Boom') {
+					throw new \RuntimeException('storage exploded');
+				}
+
+				$this->saves[] = ['document' => $document, 'uuid' => $uuid];
+
+				return new class {
+					/**
+					 * @return string The uuid.
+					 */
+					public function getUuid(): string {
+						return 'ok-uuid';
+					}
+				};
+			}
+
+			/**
+			 * No pre-existing flows.
+			 *
+			 * @param string|null $app The owning app.
+			 * @param string|null $applicationSlug Unused.
+			 * @param bool|null $enabled Unused.
+			 * @param int $limit Page size.
+			 * @param int $offset Page offset.
+			 *
+			 * @return array<int, object> The page.
+			 */
+			public function findAll(
+				?string $app = null,
+				?string $applicationSlug = null,
+				?bool $enabled = null,
+				int $limit = 100,
+				int $offset = 0,
+			): array {
+				return [];
+			}
+		};
+
+		$migrator = $this->migrator(
+			[
+				['tenantId' => 't', 'slug' => 'boom', 'title' => 'Boom', 'type' => 'sendEmail', 'config' => '{}'],
+				['tenantId' => 't', 'slug' => 'fine', 'title' => 'Fine', 'type' => 'sendEmail', 'config' => '{}'],
+			],
+			$flowService,
+			['dossiq.action.sendEmail'],
+		);
+
+		$summary = $migrator->migrate(user: $this->createMock(IUser::class), dryRun: false);
+
+		$this->assertSame(1, $summary['failed']);
+		$this->assertSame(1, $summary['created']);
+		$this->assertCount(1, $flowService->saves);
+	}
+}
diff --git a/tests/Unit/Service/AgendaServiceTest.php b/tests/Unit/Service/AgendaServiceTest.php
deleted file mode 100644
index 532245a63..000000000
--- a/tests/Unit/Service/AgendaServiceTest.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-/**
- * AgendaService Unit Tests
- *
- * Tests for the besluitvorming agenda item manager: appending agenda items to
- * a case's agendaItems[] array, item id assignment, patch-by-itemId updates,
- * and the OpenRegister persistence contract (find + saveObject named args).
- *
- * @category Tests
- * @package  OCA\Dossiq\Tests\Unit\Service
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * SPDX-License-Identifier: EUPL-1.2
- * SPDX-FileCopyrightText: 2026 Conduction B.V. <info@conduction.nl>
- *
- * @link https://conduction.nl
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Tests\Unit\Service;
-
-use OCA\Dossiq\Service\AgendaService;
-use OCA\Dossiq\Service\SettingsService;
-use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
-
-/**
- * ObjectService stub matching the named-argument signatures used by AgendaService.
- */
-interface AgendaObjectServiceStub {
-	/**
-	 * Find a single object by id.
-	 *
-	 * @param string $id The object id.
-	 * @param string $register The register slug.
-	 * @param string $schema The schema id.
-	 *
-	 * @return mixed
-	 */
-	public function find(string $id, string $register, string $schema): mixed;
-
-	/**
-	 * Save or update an object.
-	 *
-	 * @param array $object The object payload.
-	 * @param string $register The register slug.
-	 * @param string $schema The schema id.
-	 *
-	 * @return array
-	 */
-	public function saveObject(array $object, string $register, string $schema): array;
-}//end interface
-
-/**
- * Unit tests for AgendaService.
- *
- * @covers \OCA\Dossiq\Service\AgendaService
- */
-class AgendaServiceTest extends TestCase {
-
-	/**
-	 * The mocked settings service.
-	 *
-	 * @var SettingsService|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private SettingsService $settingsService;
-
-	/**
-	 * The service under test.
-	 *
-	 * @var AgendaService
-	 */
-	private AgendaService $service;
-
-	/**
-	 * Set up fixtures.
-	 *
-	 * @return void
-	 */
-	protected function setUp(): void {
-		$this->settingsService = $this->createMock(originalClassName: SettingsService::class);
-		$logger = $this->createMock(originalClassName: LoggerInterface::class);
-
-		$this->settingsService->method('getConfigValue')->willReturnCallback(
-			static function (string $key): string {
-				if ($key === 'register') {
-					return 'reg';
-				}
-
-				return 'schema-' . $key;
-			}
-		);
-
-		$this->service = new AgendaService(settingsService: $this->settingsService, logger: $logger);
-	}//end setUp()
-
-	/**
-	 * AddToAgenda appends an item with a generated itemId + createdAt and persists it.
-	 *
-	 * @return void
-	 */
-	public function testAddToAgendaAppendsAndPersists(): void {
-		$objectService = $this->createMock(originalClassName: AgendaObjectServiceStub::class);
-		$objectService->method('find')->willReturn(['id' => 'c1', 'agendaItems' => []]);
-
-		$saved = null;
-		$objectService->method('saveObject')->willReturnCallback(
-			static function (array $object) use (&$saved): array {
-				$saved = $object;
-				return $object;
-			}
-		);
-
-		$this->settingsService->method('getObjectService')->willReturn($objectService);
-
-		$result = $this->service->addToAgenda('c1', ['meetingDate' => '2026-07-01', 'discussionStatus' => 'planned']);
-
-		$this->assertSame(expected: 'c1', actual: $result['caseId']);
-		$this->assertCount(expectedCount: 1, haystack: $result['agendaItems']);
-		$this->assertArrayHasKey(key: 'itemId', array: $result['agendaItems'][0]);
-		$this->assertArrayHasKey(key: 'createdAt', array: $result['agendaItems'][0]);
-		$this->assertSame(expected: '2026-07-01', actual: $result['agendaItems'][0]['meetingDate']);
-		$this->assertNotNull(actual: $saved);
-		$this->assertSame(expected: $result['agendaItems'], actual: $saved['agendaItems']);
-	}//end testAddToAgendaAppendsAndPersists()
-
-	/**
-	 * AddToAgenda decodes a JSON-string agendaItems field (dossiq string-encoding contract).
-	 *
-	 * @return void
-	 */
-	public function testAddToAgendaDecodesJsonStringItems(): void {
-		$objectService = $this->createMock(originalClassName: AgendaObjectServiceStub::class);
-		$existing = json_encode([['itemId' => 'agenda_old', 'meetingDate' => '2026-06-01']]);
-		$objectService->method('find')->willReturn(['id' => 'c1', 'agendaItems' => $existing]);
-		$objectService->method('saveObject')->willReturnArgument(0);
-
-		$this->settingsService->method('getObjectService')->willReturn($objectService);
-
-		$result = $this->service->addToAgenda('c1', ['meetingDate' => '2026-07-01']);
-
-		$this->assertCount(expectedCount: 2, haystack: $result['agendaItems']);
-		$this->assertSame(expected: 'agenda_old', actual: $result['agendaItems'][0]['itemId']);
-	}//end testAddToAgendaDecodesJsonStringItems()
-
-	/**
-	 * UpdateAgendaItem merges a patch onto an existing item matched by itemId.
-	 *
-	 * @return void
-	 */
-	public function testUpdateAgendaItemMergesByItemId(): void {
-		$objectService = $this->createMock(originalClassName: AgendaObjectServiceStub::class);
-		$objectService->method('find')->willReturn(
-			[
-				'id' => 'c1',
-				'agendaItems' => [
-					['itemId' => 'a1', 'meetingDate' => '2026-06-01', 'discussionStatus' => 'planned'],
-				],
-			]
-		);
-		$objectService->method('saveObject')->willReturnArgument(0);
-
-		$this->settingsService->method('getObjectService')->willReturn($objectService);
-
-		$result = $this->service->updateAgendaItem('c1', ['itemId' => 'a1', 'discussionStatus' => 'behandeld']);
-
-		$this->assertCount(expectedCount: 1, haystack: $result['agendaItems']);
-		$this->assertSame(expected: 'behandeld', actual: $result['agendaItems'][0]['discussionStatus']);
-		$this->assertSame(expected: '2026-06-01', actual: $result['agendaItems'][0]['meetingDate']);
-	}//end testUpdateAgendaItemMergesByItemId()
-
-	/**
-	 * UpdateAgendaItem requires an itemId in the patch.
-	 *
-	 * @return void
-	 */
-	public function testUpdateAgendaItemRequiresItemId(): void {
-		$objectService = $this->createMock(originalClassName: AgendaObjectServiceStub::class);
-		$objectService->method('find')->willReturn(['id' => 'c1', 'agendaItems' => []]);
-		$this->settingsService->method('getObjectService')->willReturn($objectService);
-
-		$this->expectException(exception: \InvalidArgumentException::class);
-		$this->service->updateAgendaItem('c1', ['discussionStatus' => 'behandeld']);
-	}//end testUpdateAgendaItemRequiresItemId()
-
-	/**
-	 * UpdateAgendaItem throws when the itemId is not present on the case.
-	 *
-	 * @return void
-	 */
-	public function testUpdateAgendaItemThrowsWhenNotFound(): void {
-		$objectService = $this->createMock(originalClassName: AgendaObjectServiceStub::class);
-		$objectService->method('find')->willReturn(['id' => 'c1', 'agendaItems' => []]);
-		$this->settingsService->method('getObjectService')->willReturn($objectService);
-
-		$this->expectException(exception: \RuntimeException::class);
-		$this->service->updateAgendaItem('c1', ['itemId' => 'missing']);
-	}//end testUpdateAgendaItemThrowsWhenNotFound()
-
-	/**
-	 * AddToAgenda throws when OpenRegister is unavailable.
-	 *
-	 * @return void
-	 */
-	public function testAddToAgendaThrowsWhenObjectServiceMissing(): void {
-		$this->settingsService->method('getObjectService')->willReturn(null);
-
-		$this->expectException(exception: \RuntimeException::class);
-		$this->service->addToAgenda('c1', ['meetingDate' => '2026-07-01']);
-	}//end testAddToAgendaThrowsWhenObjectServiceMissing()
-}//end class
diff --git a/tests/Unit/Service/ParaferingApprovalBridgeTest.php b/tests/Unit/Service/ParaferingApprovalBridgeTest.php
deleted file mode 100644
index 1c9763729..000000000
--- a/tests/Unit/Service/ParaferingApprovalBridgeTest.php
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-
-/**
- * ParaferingApprovalBridge Unit Tests
- *
- * Verifies that the dossiq -> OpenRegister approval-workflow bridge maps route
- * steps to OpenRegister ApprovalChain steps, routes approve/reject through
- * OpenRegister's ApprovalService against the pending step, encodes app-specific
- * metadata into the comment field, and degrades gracefully when OpenRegister's
- * approval-workflow backend is unavailable.
- *
- * @category Tests
- * @package  OCA\Dossiq\Tests\Unit\Service
- *
- * @author    Conduction Development Team <info@conduction.nl>
- * @copyright 2026 Conduction B.V.
- * @license   EUPL-1.2 https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * @version GIT: <git-id>
- *
- * @link https://conduction.nl
- */
-
-declare(strict_types=1);
-
-namespace OCA\Dossiq\Tests\Unit\Service;
-
-use OCA\Dossiq\Service\ParaferingApprovalBridge;
-use OCA\Dossiq\Service\SettingsService;
-use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-
-/**
- * Unit tests for ParaferingApprovalBridge.
- *
- * @covers \OCA\Dossiq\Service\ParaferingApprovalBridge
- */
-class ParaferingApprovalBridgeTest extends TestCase {
-	/**
-	 * Mocked dossiq settings/OpenRegister bridge.
-	 *
-	 * @var SettingsService|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private SettingsService $settings;
-
-	/**
-	 * Mocked logger.
-	 *
-	 * @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	private LoggerInterface $logger;
-
-	/**
-	 * Set up mocks.
-	 *
-	 * @return void
-	 */
-	protected function setUp(): void {
-		$this->settings = $this->createMock(SettingsService::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-	}//end setUp()
-
-	/**
-	 * Build a fake OpenRegister ApprovalChain entity with a UUID.
-	 *
-	 * @param string $uuid The chain UUID to report.
-	 *
-	 * @return object The fake chain.
-	 */
-	private function fakeChain(string $uuid): object {
-		return new class($uuid) {
-			/**
-			 * @param string $uuid Chain UUID.
-			 */
-			public function __construct(
-				private string $uuid,
-			) {
-			}
-
-			/**
-			 * @return string The chain UUID.
-			 */
-			public function getUuid(): string {
-				return $this->uuid;
-			}
-		};
-	}//end fakeChain()
-
-	/**
-	 * Build a fake OpenRegister ApprovalStep entity.
-	 *
-	 * @param int $id Step id.
-	 * @param string $status Step status.
-	 *
-	 * @return object The fake step.
-	 */
-	private function fakeStep(int $id, string $status): object {
-		return new class($id, $status) {
-			/**
-			 * @param int $id Step id.
-			 * @param string $status Step status.
-			 */
-			public function __construct(
-				private int $id,
-				private string $status,
-			) {
-			}
-
-			/**
-			 * @return int Step id.
-			 */
-			public function getId(): int {
-				return $this->id;
-			}
-
-			/**
-			 * @return string Step status.
-			 */
-			public function getStatus(): string {
-				return $this->status;
-			}
-		};
-	}//end fakeStep()
-
-	/**
-	 * When OpenRegister is unavailable the bridge reports not-available and
-	 * chain creation returns null (legacy path governs).
-	 *
-	 * @return void
-	 */
-	public function testIsAvailableFalseWhenOpenRegisterMissing(): void {
-		$this->settings->method('getApprovalService')->willReturn(null);
-		$this->settings->method('getOpenRegisterClass')->willReturn(null);
-
-		$bridge = new ParaferingApprovalBridge($this->settings, $this->logger);
-
-		$this->assertFalse($bridge->isAvailable());
-		$this->assertNull(
-			$bridge->initializeChainForVoorstel('voorstel-1', 'Route', [['order' => 1, 'role' => 'team']])
-		);
-	}//end testIsAvailableFalseWhenOpenRegisterMissing()
-
-	/**
-	 * Chain creation maps route steps to OpenRegister steps, persists via the
-	 * chain mapper, initialises the chain, and returns the chain UUID.
-	 *
-	 * @return void
-	 */
-	public function testInitializeChainCreatesOrChainAndReturnsUuid(): void {
-		$captured = null;
-
-		$chainMapper = new class($this->fakeChain('chain-uuid-9')) {
-			/** @var object */
-			public static $captured = null;
-
-			/**
-			 * @param object $chain Chain to return.
-			 */
-			public function __construct(
-				private object $chain,
-			) {
-			}
-
-			/**
-			 * @param array<string, mixed> $data Chain data.
-			 *
-			 * @return object The created chain.
-			 */
-			public function createFromArray(array $data): object {
-				self::$captured = $data;
-				return $this->chain;
-			}
-		};
-
-		$approvalService = new class {
-			/** @var array<string, mixed> */
-			public static $init = [];
-
-			/**
-			 * @param object $chain The chain.
-			 * @param string $objectUuid The object UUID.
-			 *
-			 * @return array<int, mixed> Created steps.
-			 */
-			public function initializeChain(object $chain, string $objectUuid): array {
-				self::$init = ['chain' => $chain, 'objectUuid' => $objectUuid];
-				return [];
-			}
-		};
-
-		$this->settings->method('getApprovalService')->willReturn($approvalService);
-		$this->settings->method('getOpenRegisterClass')->willReturnCallback(
-			static function (string $class) use ($chainMapper) {
-				if (str_contains($class, 'ApprovalChainMapper') === true) {
-					return $chainMapper;
-				}
-
-				// Step mapper presence is required for isAvailable().
-				return new \stdClass();
-			}
-		);
-
-		$bridge = new ParaferingApprovalBridge($this->settings, $this->logger);
-
-		$steps = [
-			['order' => 1, 'role' => 'teamleider', 'type' => 'parafering'],
-			['order' => 2, 'role' => 'directeur', 'type' => 'accordering'],
-			['order' => 3, 'role' => 'skipme', 'skipped' => true],
-		];
-
-		$uuid = $bridge->initializeChainForVoorstel('voorstel-abc', 'Collegeadvies', $steps);
-
-		$this->assertSame('chain-uuid-9', $uuid);
-		$this->assertSame('voorstel-abc', $approvalService::$init['objectUuid']);
-
-		$mapped = $chainMapper::$captured;
-		$this->assertSame('Collegeadvies', $mapped['name']);
-		// Skipped step is filtered out; two steps remain.
-		$this->assertCount(2, $mapped['steps']);
-		$this->assertSame('teamleider', $mapped['steps'][0]['role']);
-		$this->assertSame('directeur', $mapped['steps'][1]['role']);
-	}//end testInitializeChainCreatesOrChainAndReturnsUuid()
-
-	/**
-	 * Approving the current step resolves the pending step and calls
-	 * OpenRegister approveStep with a JSON metadata-in-comment payload.
-	 *
-	 * @return void
-	 */
-	public function testApproveCurrentStepDelegatesWithMetaComment(): void {
-		$approvalService = new class {
-			/** @var array<string, mixed> */
-			public static $call = [];
-
-			/**
-			 * @param int $stepId Step id.
-			 * @param string $userId User id.
-			 * @param string $comment Comment.
-			 *
-			 * @return array<string, mixed> Result.
-			 */
-			public function approveStep(int $stepId, string $userId, string $comment): array {
-				self::$call = ['stepId' => $stepId, 'userId' => $userId, 'comment' => $comment];
-				return ['step' => $stepId];
-			}
-		};
-
-		$stepMapper = new class($this->fakeStep(42, 'pending')) {
-			/**
-			 * @param object $step Step to return.
-			 */
-			public function __construct(
-				private object $step,
-			) {
-			}
-
-			/**
-			 * @param string $objectUuid Object UUID.
-			 *
-			 * @return array<int, object> Steps.
-			 */
-			public function findByObjectUuid(string $objectUuid): array {
-				return [$this->step];
-			}
-		};
-
-		$this->settings->method('getApprovalService')->willReturn($approvalService);
-		$this->settings->method('getOpenRegisterClass')->willReturn($stepMapper);
-
-		$bridge = new ParaferingApprovalBridge($this->settings, $this->logger);
-
-		$result = $bridge->approveCurrentStep(
-			'voorstel-abc',
-			'alice',
-			'Akkoord',
-			['action' => 'parafered', 'actorType' => 'delegate', 'onBehalfOf' => 'bob', 'mandate' => 'M-1']
-		);
-
-		$this->assertIsArray($result);
-		$this->assertSame(42, $approvalService::$call['stepId']);
-		$this->assertSame('alice', $approvalService::$call['userId']);
-
-		$decoded = json_decode($approvalService::$call['comment'], true);
-		$this->assertSame('Akkoord', $decoded['text']);
-		$this->assertSame('delegate', $decoded['_meta']['actorType']);
-		$this->assertSame('bob', $decoded['_meta']['onBehalfOf']);
-		$this->assertSame('M-1', $decoded['_meta']['mandate']);
-		$this->assertArrayNotHasKey('advice', $decoded['_meta']);
-	}//end testApproveCurrentStepDelegatesWithMetaComment()
-
-	/**
-	 * Rejecting a step with no pending step raises a RuntimeException.
-	 *
-	 * @return void
-	 */
-	public function testRejectThrowsWhenNoPendingStep(): void {
-		$approvalService = new class {
-			/**
-			 * @param int $stepId Step id.
-			 * @param string $userId User id.
-			 * @param string $comment Comment.
-			 *
-			 * @return array<string, mixed> Result.
-			 */
-			public function rejectStep(int $stepId, string $userId, string $comment): array {
-				return [];
-			}
-		};
-
-		$stepMapper = new class {
-			/**
-			 * @param string $objectUuid Object UUID.
-			 *
-			 * @return array<int, object> Steps (none pending).
-			 */
-			public function findByObjectUuid(string $objectUuid): array {
-				return [];
-			}
-		};
-
-		$this->settings->method('getApprovalService')->willReturn($approvalService);
-		$this->settings->method('getOpenRegisterClass')->willReturn($stepMapper);
-
-		$bridge = new ParaferingApprovalBridge($this->settings, $this->logger);
-
-		$this->expectException(RuntimeException::class);
-		$bridge->rejectCurrentStep('voorstel-abc', 'alice', 'Ontbreekt', ['action' => 'returned']);
-	}//end testRejectThrowsWhenNoPendingStep()
-
-	/**
-	 * A plain comment with no meta is passed through unchanged (no JSON wrap).
-	 *
-	 * @return void
-	 */
-	public function testPlainCommentPassedThroughWhenNoMeta(): void {
-		$approvalService = new class {
-			/** @var string */
-			public static $comment = '';
-
-			/**
-			 * @param int $stepId Step id.
-			 * @param string $userId User id.
-			 * @param string $comment Comment.
-			 *
-			 * @return array<string, mixed> Result.
-			 */
-			public function approveStep(int $stepId, string $userId, string $comment): array {
-				self::$comment = $comment;
-				return [];
-			}
-		};
-
-		$stepMapper = new class($this->fakeStep(7, 'pending')) {
-			/**
-			 * @param object $step Step.
-			 */
-			public function __construct(
-				private object $step,
-			) {
-			}
-
-			/**
-			 * @param string $objectUuid Object UUID.
-			 *
-			 * @return array<int, object> Steps.
-			 */
-			public function findByObjectUuid(string $objectUuid): array {
-				return [$this->step];
-			}
-		};
-
-		$this->settings->method('getApprovalService')->willReturn($approvalService);
-		$this->settings->method('getOpenRegisterClass')->willReturn($stepMapper);
-
-		$bridge = new ParaferingApprovalBridge($this->settings, $this->logger);
-		$bridge->approveCurrentStep('voorstel-abc', 'alice', 'Akkoord', []);
-
-		$this->assertSame('Akkoord', $approvalService::$comment);
-	}//end testPlainCommentPassedThroughWhenNoMeta()
-}//end class
diff --git a/tests/Unit/Service/RemainingDecisionDelegationTest.php b/tests/Unit/Service/RemainingDecisionDelegationTest.php
index dfed0dcf3..d4f87f2ff 100644
--- a/tests/Unit/Service/RemainingDecisionDelegationTest.php
+++ b/tests/Unit/Service/RemainingDecisionDelegationTest.php
@@ -22,7 +22,11 @@
 
 namespace OCA\Dossiq\Tests\Unit\Service;
 
-use OCA\Decidesk\Event\DecisionRequestedEvent;
+// The CURRENT namespace. The decision app renamed OCA\Decidesk -> OCA\Decidiq
+// with no alias, and the production resolver now prefers the current spelling —
+// so a test importing the OLD class asserts against an object the code no longer
+// builds. CrossAppEventNamesTest guards the ordering these follow.
+use OCA\Decidiq\Event\DecisionRequestedEvent;
 use OCA\Dossiq\Service\AdviceDelegationService;
 use OCA\Dossiq\Service\BezwaarDecisionDelegationService;
 use OCA\Dossiq\Service\ContractDecisionDelegationService;
diff --git a/tests/Unit/Service/Transitions/SideEffectDispatcherTest.php b/tests/Unit/Service/Transitions/SideEffectDispatcherTest.php
index b56fe182c..912f0714b 100644
--- a/tests/Unit/Service/Transitions/SideEffectDispatcherTest.php
+++ b/tests/Unit/Service/Transitions/SideEffectDispatcherTest.php
@@ -16,12 +16,12 @@
 
 namespace OCA\Dossiq\Tests\Unit\Service\Transitions;
 
+use OCA\OpenRegister\Service\Flow\FlowNodeRegistry;
+use OCA\OpenRegister\Service\Flow\IFlowNode;
 use OCA\Dossiq\Service\Transitions\ActionHandlerInterface;
 use OCA\Dossiq\Service\Transitions\ActionHandlerRegistry;
 use OCA\Dossiq\Service\Transitions\ActionResult;
 use OCA\Dossiq\Service\Transitions\SideEffectDispatcher;
-use OCA\OpenRegister\Service\Flow\FlowNodeRegistry;
-use OCA\OpenRegister\Service\Flow\IFlowNode;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
@@ -38,180 +38,190 @@
  */
 class SideEffectDispatcherTest extends TestCase {
 
-	/**
-	 * A node that records nothing and either succeeds or throws.
-	 *
-	 * @param string $id The node id.
-	 * @param \Throwable|null $throws Optional failure to raise.
-	 *
-	 * @return IFlowNode The node.
-	 */
-	private function node(string $id, ?\Throwable $throws = null): IFlowNode {
-		$node = $this->createMock(IFlowNode::class);
-		$node->method('getId')->willReturn($id);
-		if ($throws !== null) {
-			$node->method('execute')->willThrowException($throws);
-		} else {
-			$node->method('execute')->willReturnArgument(0);
-		}
-
-		return $node;
-	}//end node()
-
-	/**
-	 * Build the dispatcher over an optional node catalogue.
-	 *
-	 * @param FlowNodeRegistry|null $nodes The catalogue, or null for the fallback path.
-	 * @param ActionHandlerRegistry|null $legacy The local registry.
-	 *
-	 * @return SideEffectDispatcher The dispatcher.
-	 */
-	private function dispatcher(?FlowNodeRegistry $nodes, ?ActionHandlerRegistry $legacy = null): SideEffectDispatcher {
-		$container = $this->createMock(ContainerInterface::class);
-		if ($nodes !== null) {
-			$container->method('get')->willReturn($nodes);
-		} else {
-			$container->method('get')->willThrowException(new RuntimeException('absent'));
-		}
-
-		return new SideEffectDispatcher(
-			$legacy ?? $this->createMock(ActionHandlerRegistry::class),
-			$container,
-			$this->createMock(LoggerInterface::class)
-		);
-
-	}//end dispatcher()
-
-	/**
-	 * With OpenRegister present, a transition action runs the SHARED node.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testActionsRunThroughTheSharedNode(): void {
-		$registry = new FlowNodeRegistry();
-		$registry->register($this->node('procest.sendEmail'));
-
-		$results = $this->dispatcher($registry)->dispatch(
-			[['type' => 'sendEmail']],
-			['id' => 'case-1'],
-			['transition' => 'submitted']
-		);
-
-		$this->assertSame([['type' => 'sendEmail', 'ok' => true]], $results);
-
-	}//end testActionsRunThroughTheSharedNode()
-
-	/**
-	 * The dispatcher resolves the LIVE id space, not the catalogue's.
-	 *
-	 * Both action systems ship a sendEmail. Resolving `procest.action.sendEmail`
-	 * here would run the configured-action handler for a transition — a
-	 * different class with different config keys.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testItResolvesTheLiveIdSpace(): void {
-		$registry = new FlowNodeRegistry();
-		$registry->register($this->node('procest.action.sendEmail'));
-
-		$results = $this->dispatcher($registry)->dispatch([['type' => 'sendEmail']], [], []);
-
-		$this->assertFalse($results[0]['ok']);
-		$this->assertSame('unknown_action_type', $results[0]['error']);
-
-	}//end testItResolvesTheLiveIdSpace()
-
-	/**
-	 * A node that throws becomes a failed row — it does NOT abort the loop.
-	 *
-	 * A node signals failure by throwing, because the flow engine's onError
-	 * policy only sees what propagates. This dispatcher's contract is the
-	 * opposite and predates it: a failed action must not stop the remaining
-	 * ones or roll back the status change.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testAFailedActionDoesNotAbortTheRest(): void {
-		$registry = new FlowNodeRegistry();
-		$registry->register($this->node('procest.sendEmail', new RuntimeException('smtp down')));
-		$registry->register($this->node('procest.createTask'));
-
-		$results = $this->dispatcher($registry)->dispatch(
-			[['type' => 'sendEmail'], ['type' => 'createTask']],
-			[],
-			[]
-		);
-
-		$this->assertCount(2, $results);
-		$this->assertFalse($results[0]['ok']);
-		$this->assertSame('smtp down', $results[0]['error']);
-		$this->assertTrue($results[1]['ok']);
-
-	}//end testAFailedActionDoesNotAbortTheRest()
-
-	/**
-	 * An action type nothing provides is reported, not silently dropped.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testUnknownActionTypeIsReported(): void {
-		$results = $this->dispatcher(new FlowNodeRegistry())->dispatch(
-			[['type' => 'doesNotExist']],
-			[],
-			[]
-		);
-
-		$this->assertSame(
-			[['type' => 'doesNotExist', 'ok' => false, 'error' => 'unknown_action_type']],
-			$results
-		);
-
-	}//end testUnknownActionTypeIsReported()
-
-	/**
-	 * Without OpenRegister the local handlers still fire.
-	 *
-	 * A transition must never silently skip its side effects because a
-	 * neighbouring app is not installed.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testFallsBackToTheLocalHandlersWithoutOpenRegister(): void {
-		$handler = $this->createMock(ActionHandlerInterface::class);
-		$handler->expects($this->once())->method('handle')->willReturn(new ActionResult(true));
-
-		$legacy = $this->createMock(ActionHandlerRegistry::class);
-		$legacy->method('getHandler')->willReturn($handler);
-
-		$results = $this->dispatcher(null, $legacy)->dispatch([['type' => 'sendEmail']], [], []);
-
-		$this->assertSame([['type' => 'sendEmail', 'ok' => true]], $results);
-
-	}//end testFallsBackToTheLocalHandlersWithoutOpenRegister()
-
-	/**
-	 * An action with no type is skipped rather than dispatched blind.
-	 *
-	 * @return void
-	 *
-	 * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
-	 */
-	public function testTypelessActionIsSkipped(): void {
-		$this->assertSame(
-			[],
-			$this->dispatcher(new FlowNodeRegistry())->dispatch([['config' => 1]], [], [])
-		);
-
-	}//end testTypelessActionIsSkipped()
+
+    /**
+     * A node that records nothing and either succeeds or throws.
+     *
+     * @param string          $id     The node id.
+     * @param \Throwable|null $throws Optional failure to raise.
+     *
+     * @return IFlowNode The node.
+     */
+    private function node(string $id, ?\Throwable $throws=null): IFlowNode {
+        $node = $this->createMock(IFlowNode::class);
+        $node->method('getId')->willReturn($id);
+        if ($throws !== null) {
+            $node->method('execute')->willThrowException($throws);
+        } else {
+            $node->method('execute')->willReturnArgument(0);
+        }
+
+        return $node;
+
+    }//end node()
+
+
+    /**
+     * Build the dispatcher over an optional node catalogue.
+     *
+     * @param FlowNodeRegistry|null      $nodes  The catalogue, or null for the fallback path.
+     * @param ActionHandlerRegistry|null $legacy The local registry.
+     *
+     * @return SideEffectDispatcher The dispatcher.
+     */
+    private function dispatcher(?FlowNodeRegistry $nodes, ?ActionHandlerRegistry $legacy=null): SideEffectDispatcher {
+        $container = $this->createMock(ContainerInterface::class);
+        if ($nodes !== null) {
+            $container->method('get')->willReturn($nodes);
+        } else {
+            $container->method('get')->willThrowException(new RuntimeException('absent'));
+        }
+
+        return new SideEffectDispatcher(
+            $legacy ?? $this->createMock(ActionHandlerRegistry::class),
+            $container,
+            $this->createMock(LoggerInterface::class)
+        );
+
+    }//end dispatcher()
+
+
+    /**
+     * With OpenRegister present, a transition action runs the SHARED node.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testActionsRunThroughTheSharedNode(): void {
+        $registry = new FlowNodeRegistry();
+        $registry->register($this->node('dossiq.sendEmail'));
+
+        $results = $this->dispatcher($registry)->dispatch(
+            [['type' => 'sendEmail']],
+            ['id' => 'case-1'],
+            ['transition' => 'submitted']
+        );
+
+        $this->assertSame([['type' => 'sendEmail', 'ok' => true]], $results);
+
+    }//end testActionsRunThroughTheSharedNode()
+
+
+    /**
+     * The dispatcher resolves the LIVE id space, not the catalogue's.
+     *
+     * Both action systems ship a sendEmail. Resolving `dossiq.action.sendEmail`
+     * here would run the configured-action handler for a transition — a
+     * different class with different config keys.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testItResolvesTheLiveIdSpace(): void {
+        $registry = new FlowNodeRegistry();
+        $registry->register($this->node('dossiq.action.sendEmail'));
+
+        $results = $this->dispatcher($registry)->dispatch([['type' => 'sendEmail']], [], []);
+
+        $this->assertFalse($results[0]['ok']);
+        $this->assertSame('unknown_action_type', $results[0]['error']);
+
+    }//end testItResolvesTheLiveIdSpace()
+
+
+    /**
+     * A node that throws becomes a failed row — it does NOT abort the loop.
+     *
+     * A node signals failure by throwing, because the flow engine's onError
+     * policy only sees what propagates. This dispatcher's contract is the
+     * opposite and predates it: a failed action must not stop the remaining
+     * ones or roll back the status change.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testAFailedActionDoesNotAbortTheRest(): void {
+        $registry = new FlowNodeRegistry();
+        $registry->register($this->node('dossiq.sendEmail', new RuntimeException('smtp down')));
+        $registry->register($this->node('dossiq.createTask'));
+
+        $results = $this->dispatcher($registry)->dispatch(
+            [['type' => 'sendEmail'], ['type' => 'createTask']],
+            [],
+            []
+        );
+
+        $this->assertCount(2, $results);
+        $this->assertFalse($results[0]['ok']);
+        $this->assertSame('smtp down', $results[0]['error']);
+        $this->assertTrue($results[1]['ok']);
+
+    }//end testAFailedActionDoesNotAbortTheRest()
+
+
+    /**
+     * An action type nothing provides is reported, not silently dropped.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testUnknownActionTypeIsReported(): void {
+        $results = $this->dispatcher(new FlowNodeRegistry())->dispatch(
+            [['type' => 'doesNotExist']],
+            [],
+            []
+        );
+
+        $this->assertSame(
+            [['type' => 'doesNotExist', 'ok' => false, 'error' => 'unknown_action_type']],
+            $results
+        );
+
+    }//end testUnknownActionTypeIsReported()
+
+
+    /**
+     * Without OpenRegister the local handlers still fire.
+     *
+     * A transition must never silently skip its side effects because a
+     * neighbouring app is not installed.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testFallsBackToTheLocalHandlersWithoutOpenRegister(): void {
+        $handler = $this->createMock(ActionHandlerInterface::class);
+        $handler->expects($this->once())->method('handle')->willReturn(new ActionResult(true));
+
+        $legacy = $this->createMock(ActionHandlerRegistry::class);
+        $legacy->method('getHandler')->willReturn($handler);
+
+        $results = $this->dispatcher(null, $legacy)->dispatch([['type' => 'sendEmail']], [], []);
+
+        $this->assertSame([['type' => 'sendEmail', 'ok' => true]], $results);
+
+    }//end testFallsBackToTheLocalHandlersWithoutOpenRegister()
+
+
+    /**
+     * An action with no type is skipped rather than dispatched blind.
+     *
+     * @return void
+     *
+     * @spec openspec/changes/page-topology-cleanup/specs/automatic-actions-surface/spec.md
+     */
+    public function testTypelessActionIsSkipped(): void {
+        $this->assertSame(
+            [],
+            $this->dispatcher(new FlowNodeRegistry())->dispatch([['config' => 1]], [], [])
+        );
+
+    }//end testTypelessActionIsSkipped()
+
 
 }//end class
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 94753182b..2a0a55d3b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -264,16 +264,21 @@ static function (string $class): bool {
 	include_once __DIR__ . '/Stubs/Mcp/IMcpToolProvider.php';
 }
 
-// Decidesk decision-event stubs — loaded when the decidesk app is absent so the
-// dossiq delegation services + DecisionConcludedListener can be unit-tested
-// against the decidesk event contract. The real classes ship in decidesk
-// (OCA\Decidesk\Event\*); these stubs no-op when the real classes are present.
-if (class_exists('\\OCA\\Decidesk\\Event\\DecisionRequestedEvent') === false) {
-	include_once __DIR__ . '/Stubs/Decidesk/Event/DecisionRequestedEvent.php';
-}
-
-if (class_exists('\\OCA\\Decidesk\\Event\\DecisionConcludedEvent') === false) {
-	include_once __DIR__ . '/Stubs/Decidesk/Event/DecisionConcludedEvent.php';
+// Decision-event stubs — loaded when the decision app is absent so the dossiq
+// delegation services + DecisionConcludedListener can be unit-tested against its
+// event contract. These stubs no-op when the real classes are present.
+//
+// BOTH NAMESPACES are stubbed. The app renamed OCA\Decidesk -> OCA\Decidiq with
+// no alias, and the production code now resolves whichever exists. Stubbing only
+// the old one left the new spelling unknown to static analysis, which then
+// proved the class_exists() call always false — reporting the resilient lookup
+// as dead code. Both must be resolvable for the resolution to analyse as real.
+foreach (['Decidiq', 'Decidesk'] as $stubNamespace) {
+	foreach (['DecisionRequestedEvent', 'DecisionConcludedEvent'] as $stubEvent) {
+		if (class_exists('\\OCA\\' . $stubNamespace . '\\Event\\' . $stubEvent) === false) {
+			include_once __DIR__ . '/Stubs/' . $stubNamespace . '/Event/' . $stubEvent . '.php';
+		}
+	}
 }
 
 // Hermiq's oversight contract. procest resolves it by name so it stays
diff --git a/tests/e2e/docs-screenshots.spec.ts b/tests/e2e/docs-screenshots.spec.ts
index 4ff620262..28ad00ce6 100644
--- a/tests/e2e/docs-screenshots.spec.ts
+++ b/tests/e2e/docs-screenshots.spec.ts
@@ -322,23 +322,15 @@ test.describe('docs: admin track', () => {
 		await shoot(page, 'admin', '01-configure-case-types-05.png')
 	})
 
-	test('A2 automatic-actions', async ({ page }) => {
-		// docs/tutorials/admin/02-automatic-actions.md
-		await go(page, '/settings/automatic-actions')
-		await shoot(page, 'admin', '02-automatic-actions-01.png')
-		const had = await captureCreateDialog(
-			page,
-			'admin',
-			'02-automatic-actions-02.png',
-		)
-		if (!had) {
-			await shoot(page, 'admin', '02-automatic-actions-02.png')
-		}
-		await go(page, '/settings/automatic-actions')
-		await shoot(page, 'admin', '02-automatic-actions-03.png')
-		await shoot(page, 'admin', '02-automatic-actions-04.png')
-		await shoot(page, 'admin', '02-automatic-actions-05.png')
-	})
+	// A2 automatic-actions was retired with the page it captured
+	// (page-topology-cleanup C2). Automatic actions are OpenRegister flows now,
+	// so docs/user-guide/admin/02-automatic-actions.md documents the migration
+	// command and the flow editor instead — neither of which is a Dossiq screen,
+	// and OpenRegister's own capture spec owns the Flows page.
+	//
+	// The five 02-automatic-actions-*.png screenshots this produced are stale in
+	// the same way the old page was: they show a create dialog for a record that
+	// nothing executed. The rewritten tutorial no longer references them.
 
 	test('A3 admin-settings', async ({ page }) => {
 		// docs/tutorials/admin/03-admin-settings.md — Dossiq's admin
diff --git a/tests/e2e/spec-coverage/retired-surfaces.spec.ts b/tests/e2e/spec-coverage/retired-surfaces.spec.ts
new file mode 100644
index 000000000..25d2e2a95
--- /dev/null
+++ b/tests/e2e/spec-coverage/retired-surfaces.spec.ts
@@ -0,0 +1,153 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Dossiq Contributors
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * Coverage for surfaces `page-topology-cleanup` RETIRED, and for what replaced
+ * them.
+ *
+ * A retirement is the one change nothing else in the suite can catch. Every
+ * other spec asserts that something renders; delete a page and those specs stay
+ * green by simply not running. So the risk is the opposite of the usual one —
+ * not "the page broke", but "the page is still there, or the thing that was
+ * supposed to replace it never arrived and nobody noticed".
+ *
+ * These tests therefore assert BOTH halves: the old surface no longer renders
+ * its own view, and the replacement is reachable. Asserting only the first half
+ * would pass just as happily on a build where the capability vanished entirely.
+ */
+
+import { test, expect } from '@playwright/test'
+import { navToRoute } from '../helpers/nav'
+
+// NO trackDossiqErrors HERE, deliberately.
+//
+// A retired route falls through to the app root, so a console-error assertion
+// on it grades the DASHBOARD's network traffic, not the retirement — and the
+// dashboard legitimately 404s on every case/task fetch against an instance
+// whose register is not seeded. That made the first version of this spec fail
+// for a reason that had nothing to do with what it was testing. The specs that
+// own the dashboard assert its console cleanliness; these assert that a view is
+// gone and its replacement is present.
+
+test.describe('Retired: automatic-actions settings page (C2)', () => {
+	// The `automaticAction` objects this page administered were never executed
+	// by anything — SideEffectDispatcher runs a separate vocabulary keyed on an
+	// inline type. They migrate to OpenRegister flows via
+	// `occ dossiq:actions:migrate-to-flows`.
+	//
+	// @e2e openspec/changes/page-topology-cleanup/proposal.md
+	test('the retired route no longer renders an automatic-actions view', async ({
+		page,
+	}) => {
+		await navToRoute(page, '/settings/automatic-actions')
+
+		// The create control the page used to own. Asserting on THIS rather than
+		// on a heading is deliberate: a heading can be absent because a page is
+		// still loading, but the create control only exists when the retired
+		// index view is actually mounted.
+		await expect(
+			page.getByRole('button', { name: 'Add Automatic Action' }),
+		).toHaveCount(0)
+		await expect(page.locator('body')).not.toContainText('Internal Server Error')
+	})
+
+	test('the settings menu deeplinks to OpenRegister flows instead', async ({
+		page,
+	}) => {
+		await navToRoute(page, '/')
+
+		// href, not a click: the target is another app, and following it would
+		// make this a test of OpenRegister's Flows page rather than of dossiq's
+		// menu. The hash is the part that matters — OpenRegister's router is
+		// hash-based, and a link written without it lands on the app root.
+		const link = page.locator('a[href="/apps/openregister/#/flows"]')
+		await expect(link).toHaveCount(1)
+	})
+})
+
+test.describe('Retired: besluitvorming agenda pages (D1)', () => {
+	// decidiq owns agenda-building and meetings, and surfaces them on a case
+	// through the `decidesk-decisions` integration leaf.
+	//
+	// @e2e openspec/changes/page-topology-cleanup/proposal.md
+	test('the agenda compiler route no longer renders its view', async ({
+		page,
+	}) => {
+		await navToRoute(page, '/besluitvorming/agenda')
+
+		// The compiler's own control. A "no error" assertion alone would pass on
+		// a build where the page still renders perfectly well.
+		await expect(
+			page.getByRole('heading', { name: /Agenda ?compiler|Agendacompiler/i }),
+		).toHaveCount(0)
+		// What DOES happen: the router falls through to the app root.
+		await expect(page).toHaveURL(/\/apps\/dossiq\/?$/)
+		await expect(page.locator('body')).not.toContainText('Internal Server Error')
+	})
+
+	test('the vergadering detail route no longer renders its view', async ({
+		page,
+	}) => {
+		await navToRoute(page, '/besluitvorming/vergaderingen/does-not-exist')
+
+		await expect(page).toHaveURL(/\/apps\/dossiq\/?$/)
+		await expect(page.locator('body')).not.toContainText('Internal Server Error')
+	})
+
+	test('decidiq registers the decisions leaf that replaces them', async ({
+		page,
+	}) => {
+		await navToRoute(page, '/')
+
+		// The half that matters. Without it, "the agenda pages are gone" is
+		// indistinguishable from "besluitvorming was deleted": the leaf is what
+		// carries the capability now, and it is registered by decidiq's init
+		// script on every page, not by dossiq.
+		// THREE OUTCOMES, not two. The previous version returned `null` both when
+		// the registry was absent and when the leaf was missing from it, then
+		// reported every null as "registry not present" — so a real missing leaf
+		// would have been described as an environment problem, and an
+		// environment problem (this repo's CI does not install the decision app)
+		// was reported as a missing leaf. A lookup failure must not wear the same
+		// words as a judgement.
+		const probe = await page.evaluate(() => {
+			const registry = (
+				window as unknown as {
+					OCA?: {
+						OpenRegister?: { integrations?: { list?: () => unknown[] } }
+					}
+				}
+			).OCA?.OpenRegister?.integrations
+			if (!registry?.list) {
+				return { registry: false as const }
+			}
+
+			const entries = registry.list() as Array<{ id?: string; tab?: unknown }>
+			const found = entries.find((entry) => entry.id === 'decidesk-decisions')
+			return {
+				registry: true as const,
+				ids: entries.map((entry) => entry.id).filter(Boolean),
+				leaf: found
+					? { id: found.id, hasTab: found.tab !== undefined }
+					: null,
+			}
+		})
+
+		// No registry at all = the decision app is not installed on this
+		// instance. That is an environment fact, not a defect in this repo, and
+		// dossiq's CI does not install it. Skip with the reason stated, rather
+		// than failing red on something this PR cannot affect.
+		test.skip(
+			probe.registry === false,
+			'OpenRegister integration registry absent — the decision app is not installed on this instance',
+		)
+
+		// Registry present: now a missing leaf IS a real finding, and the message
+		// can name what was actually registered instead of guessing.
+		expect(
+			probe.leaf,
+			`decidesk-decisions leaf not registered; registry holds: ${JSON.stringify(probe.ids)}`,
+		).not.toBeNull()
+		expect(probe.leaf).toEqual({ id: 'decidesk-decisions', hasTab: true })
+	})
+})
diff --git a/tests/e2e/spec-coverage/settings-pages.spec.ts b/tests/e2e/spec-coverage/settings-pages.spec.ts
index 520690df7..cea8caa64 100644
--- a/tests/e2e/spec-coverage/settings-pages.spec.ts
+++ b/tests/e2e/spec-coverage/settings-pages.spec.ts
@@ -54,11 +54,13 @@ const SETTINGS_PAGES: Array<{ name: string; route: string; addBtn: string }> = [
 		route: '/settings/parafeerroutes',
 		addBtn: 'Add Endorsement Route',
 	},
-	{
-		name: 'Automatic actions',
-		route: '/settings/automatic-actions',
-		addBtn: 'Add Automatic Action',
-	},
+	// Automatic actions was retired by page-topology-cleanup (C2). The
+	// `automaticAction` objects it administered were never executed by anything
+	// — SideEffectDispatcher runs a separate vocabulary — so the page was a
+	// surface over a capability with no runtime. They migrate to OpenRegister
+	// flows via `occ dossiq:actions:migrate-to-flows`, and the settings menu now
+	// deeplinks to /apps/openregister/#/flows, which OpenRegister's own suite
+	// covers.
 	{
 		name: 'Enforcement strategy',
 		route: '/settings/lhs-matrices',