From 93367a239f59ce434cd02cfdfb3d88d4c59e4158 Mon Sep 17 00:00:00 2001
From: simoleo89 <simoleo89@gmail.com>
Date: Wed, 2 Sep 2026 22:12:58 +0200
Subject: [PATCH] fix(housekeeping): require reasons for destructive changes

---
 .../content/commands/content-commands.ts      |  1 +
 .../content/pages/content-command-form.tsx    | 14 +++---
 .../content/pages/content-pages.test.tsx      | 30 ++++++++++++
 .../content/services/mutations.test.ts        | 48 +++++++++++++++++++
 .../domains/content/services/mutations.ts     | 16 +++++++
 .../economy/commands/economy-commands.ts      |  1 +
 .../economy/pages/economy-command-form.tsx    | 12 +++--
 .../economy/pages/economy-pages.test.tsx      | 41 +++++++++++++++-
 .../economy/services/mutations.test.ts        | 48 +++++++++++++++++++
 .../domains/economy/services/mutations.ts     | 16 +++++++
 .../foundation/commands/confirmation.test.ts  | 23 ++++++++-
 .../foundation/commands/confirmation.ts       | 15 ++++--
 .../foundation/commands/dispatcher.test.ts    | 47 ++++++++++++++++++
 .../foundation/commands/dispatcher.ts         |  2 +
 .../foundation/commands/reason-policy.ts      | 23 +++++++++
 .../foundation/commands/registry.ts           |  1 +
 16 files changed, 323 insertions(+), 15 deletions(-)
 create mode 100644 src/features/housekeeping/foundation/commands/reason-policy.ts

diff --git a/src/features/housekeeping/domains/content/commands/content-commands.ts b/src/features/housekeeping/domains/content/commands/content-commands.ts
index ef28887f..3c83b4ff 100644
--- a/src/features/housekeeping/domains/content/commands/content-commands.ts
+++ b/src/features/housekeeping/domains/content/commands/content-commands.ts
@@ -174,6 +174,7 @@ export function createContentCommands(
 					{
 						correlationId: context.correlationId,
 						expectedActorId: context.capability.actor.id,
+						...(context.reason === undefined ? {} : { reason: context.reason }),
 					},
 					operation,
 					input,
diff --git a/src/features/housekeeping/domains/content/pages/content-command-form.tsx b/src/features/housekeeping/domains/content/pages/content-command-form.tsx
index 09f3303e..c0315aa3 100644
--- a/src/features/housekeeping/domains/content/pages/content-command-form.tsx
+++ b/src/features/housekeeping/domains/content/pages/content-command-form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useActionState, useId } from "react";
+import { requiresHousekeepingReason } from "../../../foundation/commands/reason-policy";
 import type { HousekeepingResult } from "../../../foundation/contracts";
 
 export interface ContentCommandField {
@@ -135,11 +136,11 @@ export async function submitContentCommandForm(
 	formData: FormData,
 ): Promise<ContentCommandFormState> {
 	const fields = configuration.fields ?? [];
-	const submittedValues = readSubmittedValues(
-		fields,
+	const reasonRequired = requiresHousekeepingReason(
 		configuration.requiresReason ?? false,
-		formData,
+		configuration.input,
 	);
+	const submittedValues = readSubmittedValues(fields, reasonRequired, formData);
 	const submittedFields = fields.flatMap((field) => {
 		const value = parseField(field, formData);
 		return value === OMIT_FIELD ? [] : [[field.name, value] as const];
@@ -158,7 +159,7 @@ export async function submitContentCommandForm(
 	const result = await executeHousekeepingCommand({
 		commandId: configuration.commandId,
 		input,
-		...(configuration.requiresReason ? { reason } : {}),
+		...(reasonRequired ? { reason } : {}),
 	});
 	return { result, values: result.ok ? {} : submittedValues };
 }
@@ -190,12 +191,13 @@ export function ContentCommandForm({
 	requiresReason = false,
 }: ContentCommandFormProps) {
 	const formId = useId();
+	const reasonRequired = requiresHousekeepingReason(requiresReason, input);
 	const [state, submit, pending] = useActionState(
 		submitContentCommandForm.bind(null, {
 			commandId,
 			input,
 			fields,
-			requiresReason,
+			requiresReason: reasonRequired,
 		}),
 		initialState,
 	);
@@ -342,7 +344,7 @@ export function ContentCommandForm({
 					</label>
 				);
 			})}
-			{requiresReason ? (
+			{reasonRequired ? (
 				<label htmlFor={`${formId}-reason`} className="block text-sm">
 					Reason
 					<textarea
diff --git a/src/features/housekeeping/domains/content/pages/content-pages.test.tsx b/src/features/housekeeping/domains/content/pages/content-pages.test.tsx
index 691ff01d..975d569c 100644
--- a/src/features/housekeeping/domains/content/pages/content-pages.test.tsx
+++ b/src/features/housekeeping/domains/content/pages/content-pages.test.tsx
@@ -283,6 +283,36 @@ describe("Content actionable form wiring", () => {
 		});
 	});
 
+	it("automatically exposes and submits a required reason for bound delete actions", async () => {
+		const html = renderToStaticMarkup(
+			<ContentCommandForm
+				commandId="content.engagement.event-prize.change"
+				buttonLabel="Remove prize"
+				input={{ action: "delete", id: "7" }}
+			/>,
+		);
+		expect(html).toMatch(/<textarea[^>]*name="reason"[^>]*required/u);
+
+		vi.mocked(executeHousekeepingCommand).mockResolvedValue(
+			ok({ before: { id: "7" }, after: null }, "delete-prize"),
+		);
+		const formData = new FormData();
+		formData.set("reason", "  Duplicate prize  ");
+		await submitContentCommandForm(
+			{
+				commandId: "content.engagement.event-prize.change",
+				input: { action: "delete", id: "7" },
+			},
+			null,
+			formData,
+		);
+		expect(executeHousekeepingCommand).toHaveBeenCalledWith({
+			commandId: "content.engagement.event-prize.change",
+			input: { action: "delete", id: "7" },
+			reason: "Duplicate prize",
+		});
+	});
+
 	it("clears retained values after a successful command", async () => {
 		vi.mocked(executeHousekeepingCommand).mockResolvedValue(
 			ok({ before: null, after: { id: "41" } }, "poll-success"),
diff --git a/src/features/housekeeping/domains/content/services/mutations.test.ts b/src/features/housekeeping/domains/content/services/mutations.test.ts
index 78f65bc5..41c8d543 100644
--- a/src/features/housekeeping/domains/content/services/mutations.test.ts
+++ b/src/features/housekeeping/domains/content/services/mutations.test.ts
@@ -80,6 +80,54 @@ describe("Content mutation service authority", () => {
 		expect(execute).toHaveBeenCalledTimes(CONTENT_MUTATION_OPERATIONS.length);
 	});
 
+	it("requires a reason at the direct service boundary for every generic runtime delete branch", async () => {
+		const deleteCapableOperations = [
+			"article.change",
+			"ad.change",
+			"banner.change",
+			"event-prize.change",
+			"tag.change",
+			"prefix.change",
+			"help-question.change",
+			"writeable-box.change",
+			"email-template.change",
+		] as const;
+		const execute = vi.fn(async () => ({ before: { id: "7" }, after: null }));
+		const service = createContentMutationService({ execute }, async () =>
+			context(Object.values(PERMS)),
+		);
+
+		for (const operation of deleteCapableOperations) {
+			const denied = await service.execute(
+				{ correlationId: `missing-${operation}`, expectedActorId: 42 },
+				operation,
+				{ action: "delete", id: "7" },
+			);
+			expect(denied, operation).toMatchObject({
+				ok: false,
+				error: {
+					code: "VALIDATION",
+					fieldErrors: { reason: ["errors.validation.required"] },
+				},
+			});
+		}
+		expect(execute).not.toHaveBeenCalled();
+
+		for (const operation of deleteCapableOperations) {
+			const allowed = await service.execute(
+				{
+					correlationId: `allowed-${operation}`,
+					expectedActorId: 42,
+					reason: "Remove obsolete resource",
+				},
+				operation,
+				{ action: "delete", id: "7" },
+			);
+			expect(allowed.ok, operation).toBe(true);
+		}
+		expect(execute).toHaveBeenCalledTimes(deleteCapableOperations.length);
+	});
+
 	it("maps adapter failures without exposing storage or template payloads", async () => {
 		const service = createContentMutationService(
 			{
diff --git a/src/features/housekeeping/domains/content/services/mutations.ts b/src/features/housekeeping/domains/content/services/mutations.ts
index 90b97666..7370ebd9 100644
--- a/src/features/housekeeping/domains/content/services/mutations.ts
+++ b/src/features/housekeeping/domains/content/services/mutations.ts
@@ -1,5 +1,9 @@
 import { PERMS } from "@/lib/permission-slugs";
 import { satisfiesCapability } from "../../../foundation/capability-context";
+import {
+	normalizeHousekeepingReason,
+	requiresHousekeepingReason,
+} from "../../../foundation/commands/reason-policy";
 import {
 	anyCapability,
 	fail,
@@ -56,6 +60,7 @@ export interface ContentMutationInvocation {
 	readonly correlationId: string;
 	readonly expectedActorId: number;
 	readonly legacy?: boolean;
+	readonly reason?: string;
 }
 
 export interface ContentMutationContext {
@@ -153,6 +158,17 @@ export function createContentMutationService(
 					invocation.correlationId,
 				);
 			}
+			if (
+				requiresHousekeepingReason(false, input) &&
+				!normalizeHousekeepingReason(invocation.reason)
+			) {
+				return fail(
+					"VALIDATION",
+					"errors.housekeeping.validation",
+					invocation.correlationId,
+					{ reason: ["errors.validation.required"] },
+				);
+			}
 			try {
 				const snapshot = await adapter.execute(operation, input, {
 					capability,
diff --git a/src/features/housekeeping/domains/economy/commands/economy-commands.ts b/src/features/housekeeping/domains/economy/commands/economy-commands.ts
index 0ea7e9b4..b4022958 100644
--- a/src/features/housekeeping/domains/economy/commands/economy-commands.ts
+++ b/src/features/housekeeping/domains/economy/commands/economy-commands.ts
@@ -134,6 +134,7 @@ export function createEconomyCommands(
 					{
 						correlationId: context.correlationId,
 						expectedActorId: context.capability.actor.id,
+						...(context.reason === undefined ? {} : { reason: context.reason }),
 					},
 					operation,
 					input,
diff --git a/src/features/housekeeping/domains/economy/pages/economy-command-form.tsx b/src/features/housekeeping/domains/economy/pages/economy-command-form.tsx
index 1452cb2b..e01ce025 100644
--- a/src/features/housekeeping/domains/economy/pages/economy-command-form.tsx
+++ b/src/features/housekeeping/domains/economy/pages/economy-command-form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useActionState } from "react";
+import { requiresHousekeepingReason } from "../../../foundation/commands/reason-policy";
 import type { HousekeepingResult } from "../../../foundation/contracts";
 
 export interface EconomyCommandField {
@@ -69,6 +70,10 @@ export async function submitEconomyCommandForm(
 	_previous: HousekeepingResult<unknown> | null,
 	formData: FormData,
 ): Promise<HousekeepingResult<unknown>> {
+	const reasonRequired = requiresHousekeepingReason(
+		configuration.requiresReason ?? false,
+		configuration.input,
+	);
 	const submitted = (configuration.fields ?? []).flatMap((field) => {
 		const value = parseField(field, formData);
 		return value === OMIT_FIELD ? [] : [[field.name, value] as const];
@@ -83,7 +88,7 @@ export async function submitEconomyCommandForm(
 	return executeHousekeepingCommand({
 		commandId: configuration.commandId,
 		input: { ...configuration.input, ...Object.fromEntries(submitted) },
-		...(configuration.requiresReason ? { reason } : {}),
+		...(reasonRequired ? { reason } : {}),
 	});
 }
 
@@ -94,12 +99,13 @@ export function EconomyCommandForm({
 	fields = [],
 	requiresReason = false,
 }: EconomyCommandFormProps) {
+	const reasonRequired = requiresHousekeepingReason(requiresReason, input);
 	const [result, submit, pending] = useActionState(
 		submitEconomyCommandForm.bind(null, {
 			commandId,
 			input,
 			fields,
-			requiresReason,
+			requiresReason: reasonRequired,
 		}),
 		initialState,
 	);
@@ -172,7 +178,7 @@ export function EconomyCommandForm({
 					</label>
 				);
 			})}
-			{requiresReason ? (
+			{reasonRequired ? (
 				<label
 					htmlFor={`economy-${commandId}-reason`}
 					className="block text-sm"
diff --git a/src/features/housekeeping/domains/economy/pages/economy-pages.test.tsx b/src/features/housekeeping/domains/economy/pages/economy-pages.test.tsx
index a191ae6b..607f4e5b 100644
--- a/src/features/housekeeping/domains/economy/pages/economy-pages.test.tsx
+++ b/src/features/housekeeping/domains/economy/pages/economy-pages.test.tsx
@@ -1,5 +1,6 @@
 import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
+import { executeHousekeepingCommand } from "@/actions/housekeeping-command";
 import { PERMS } from "@/lib/permission-slugs";
 import {
 	fail,
@@ -8,11 +9,19 @@ import {
 } from "../../../foundation/contracts";
 import { EconomyCatalogPage } from "./catalog";
 import { EconomyCommercePage } from "./commerce";
+import {
+	EconomyCommandForm,
+	submitEconomyCommandForm,
+} from "./economy-command-form";
 import { EconomyHistoryPage } from "./history";
 import { EconomyItemsPage } from "./items";
 import { EconomyRewardsPage } from "./rewards";
 import { EconomyValuePage } from "./value";
 
+vi.mock("@/actions/housekeeping-command", () => ({
+	executeHousekeepingCommand: vi.fn(),
+}));
+
 function context(granted: readonly string[]): HousekeepingCapabilityContext {
 	const permissions = new Set(granted);
 	return {
@@ -77,6 +86,36 @@ describe.each(cases)("Economy %s page", (kind, Component) => {
 });
 
 describe("Economy mutation forms", () => {
+	it("automatically exposes and submits a required reason for bound delete actions", async () => {
+		const html = renderToStaticMarkup(
+			<EconomyCommandForm
+				commandId="economy.commerce.voucher.change"
+				buttonLabel="Delete voucher"
+				input={{ action: "delete", id: "7" }}
+			/>,
+		);
+		expect(html).toMatch(/<textarea[^>]*name="reason"[^>]*required/u);
+
+		vi.mocked(executeHousekeepingCommand).mockResolvedValue(
+			ok({ before: { id: "7" }, after: null }, "delete-voucher"),
+		);
+		const formData = new FormData();
+		formData.set("reason", "  Expired duplicate  ");
+		await submitEconomyCommandForm(
+			{
+				commandId: "economy.commerce.voucher.change",
+				input: { action: "delete", id: "7" },
+			},
+			null,
+			formData,
+		);
+		expect(executeHousekeepingCommand).toHaveBeenCalledWith({
+			commandId: "economy.commerce.voucher.change",
+			input: { action: "delete", id: "7" },
+			reason: "Expired duplicate",
+		});
+	});
+
 	it("renders edit controls only with the exact mutation capability", () => {
 		const result = ok(
 			{
diff --git a/src/features/housekeeping/domains/economy/services/mutations.test.ts b/src/features/housekeeping/domains/economy/services/mutations.test.ts
index ce271085..50603684 100644
--- a/src/features/housekeeping/domains/economy/services/mutations.test.ts
+++ b/src/features/housekeeping/domains/economy/services/mutations.test.ts
@@ -72,6 +72,54 @@ describe("Economy mutation service", () => {
 		});
 	});
 
+	it("requires a reason at the direct service boundary for every generic runtime delete branch", async () => {
+		const deleteCapableOperations = [
+			"catalog-page.change",
+			"bc-page.change",
+			"bc-item.change",
+			"catalog-item.change",
+			"shop-article.change",
+			"voucher.change",
+			"rare-category.change",
+			"rare-value.change",
+			"soundtrack.change",
+		] as const;
+		const execute = vi.fn(async () => ({ before: { id: "7" }, after: null }));
+		const service = createEconomyMutationService({ execute }, async () =>
+			capability(),
+		);
+
+		for (const operation of deleteCapableOperations) {
+			const denied = await service.execute(
+				{ correlationId: `missing-${operation}`, expectedActorId: 42 },
+				operation,
+				{ action: "delete", id: "7" },
+			);
+			expect(denied, operation).toMatchObject({
+				ok: false,
+				error: {
+					code: "VALIDATION",
+					fieldErrors: { reason: ["errors.validation.required"] },
+				},
+			});
+		}
+		expect(execute).not.toHaveBeenCalled();
+
+		for (const operation of deleteCapableOperations) {
+			const allowed = await service.execute(
+				{
+					correlationId: `allowed-${operation}`,
+					expectedActorId: 42,
+					reason: "Remove obsolete resource",
+				},
+				operation,
+				{ action: "delete", id: "7" },
+			);
+			expect(allowed.ok, operation).toBe(true);
+		}
+		expect(execute).toHaveBeenCalledTimes(deleteCapableOperations.length);
+	});
+
 	it("returns snapshots and partial completion from the adapter", async () => {
 		const service = createEconomyMutationService(
 			{
diff --git a/src/features/housekeeping/domains/economy/services/mutations.ts b/src/features/housekeeping/domains/economy/services/mutations.ts
index fc686e59..2b50a4b9 100644
--- a/src/features/housekeeping/domains/economy/services/mutations.ts
+++ b/src/features/housekeeping/domains/economy/services/mutations.ts
@@ -1,5 +1,9 @@
 import { PERMS } from "@/lib/permission-slugs";
 import { satisfiesCapability } from "../../../foundation/capability-context";
+import {
+	normalizeHousekeepingReason,
+	requiresHousekeepingReason,
+} from "../../../foundation/commands/reason-policy";
 import {
 	anyCapability,
 	fail,
@@ -53,6 +57,7 @@ export interface EconomyMutationInvocation {
 	readonly correlationId: string;
 	readonly expectedActorId: number;
 	readonly legacy?: boolean;
+	readonly reason?: string;
 }
 export interface EconomyMutationContext {
 	readonly capability: HousekeepingCapabilityContext;
@@ -129,6 +134,17 @@ export function createEconomyMutationService(
 					invocation.correlationId,
 				);
 			}
+			if (
+				requiresHousekeepingReason(false, input) &&
+				!normalizeHousekeepingReason(invocation.reason)
+			) {
+				return fail(
+					"VALIDATION",
+					"errors.housekeeping.validation",
+					invocation.correlationId,
+					{ reason: ["errors.validation.required"] },
+				);
+			}
 			try {
 				const snapshot = await adapter.execute(operation, input, {
 					capability,
diff --git a/src/features/housekeeping/foundation/commands/confirmation.test.ts b/src/features/housekeeping/foundation/commands/confirmation.test.ts
index 752e504e..eda0bd64 100644
--- a/src/features/housekeeping/foundation/commands/confirmation.test.ts
+++ b/src/features/housekeeping/foundation/commands/confirmation.test.ts
@@ -7,13 +7,13 @@ import type { HousekeepingCommand } from "./registry";
 function command(
 	requiresReason: boolean,
 	risk: "safe" | "sensitive",
-): HousekeepingCommand<Record<string, never>, null> {
+): HousekeepingCommand<Record<string, unknown>, null> {
 	return {
 		id: "system.confirmation.test",
 		owner: "system",
 		risk,
 		capability: anyCapability("admin.settings.edit"),
-		input: z.object({}),
+		input: z.object({}).catchall(z.unknown()),
 		requiresReason,
 		rateLimit: { attempts: 2, windowMs: 60_000 },
 		execute: async (context) => ok(null, context.correlationId),
@@ -75,4 +75,23 @@ describe("housekeeping command confirmation", () => {
 			correlationId: "corr-safe",
 		});
 	});
+
+	it("requires a reason dynamically when parsed input binds a delete action", () => {
+		expect(
+			confirmHousekeepingCommand(
+				command(false, "sensitive"),
+				" \t ",
+				"corr-delete-reason",
+				{ action: "delete", id: "7" },
+			),
+		).toEqual({
+			ok: false,
+			error: {
+				code: "VALIDATION",
+				messageKey: "errors.housekeeping.validation",
+				fieldErrors: { reason: ["errors.validation.required"] },
+			},
+			correlationId: "corr-delete-reason",
+		});
+	});
 });
diff --git a/src/features/housekeeping/foundation/commands/confirmation.ts b/src/features/housekeeping/foundation/commands/confirmation.ts
index 4ea06a62..22a7fbdd 100644
--- a/src/features/housekeeping/foundation/commands/confirmation.ts
+++ b/src/features/housekeeping/foundation/commands/confirmation.ts
@@ -1,4 +1,8 @@
 import { fail, type HousekeepingResult, ok } from "../contracts";
+import {
+	normalizeHousekeepingReason,
+	requiresHousekeepingReason,
+} from "./reason-policy";
 import type { HousekeepingCommand } from "./registry";
 
 export interface HousekeepingCommandConfirmation {
@@ -12,9 +16,14 @@ export function confirmHousekeepingCommand<I, O>(
 	command: HousekeepingCommand<I, O>,
 	reason: string | undefined,
 	correlationId: string,
+	input?: I,
 ): HousekeepingResult<HousekeepingCommandConfirmation> {
-	const normalizedReason = reason?.normalize("NFC").trim() || undefined;
-	if (command.requiresReason && !normalizedReason) {
+	const normalizedReason = normalizeHousekeepingReason(reason);
+	const reasonRequired = requiresHousekeepingReason(
+		command.requiresReason,
+		input,
+	);
+	if (reasonRequired && !normalizedReason) {
 		return fail("VALIDATION", "errors.housekeeping.validation", correlationId, {
 			reason: ["errors.validation.required"],
 		});
@@ -24,7 +33,7 @@ export function confirmHousekeepingCommand<I, O>(
 		{
 			commandId: command.id,
 			risk: command.risk,
-			requiresReason: command.requiresReason,
+			requiresReason: reasonRequired,
 			...(normalizedReason === undefined ? {} : { reason: normalizedReason }),
 		},
 		correlationId,
diff --git a/src/features/housekeeping/foundation/commands/dispatcher.test.ts b/src/features/housekeeping/foundation/commands/dispatcher.test.ts
index af8f760b..e157a444 100644
--- a/src/features/housekeeping/foundation/commands/dispatcher.test.ts
+++ b/src/features/housekeeping/foundation/commands/dispatcher.test.ts
@@ -374,6 +374,53 @@ describe("dispatchHousekeepingCommand", () => {
 		expect(audit.entries.map((entry) => entry.outcome)).toEqual(["denied"]);
 	});
 
+	it("requires and forwards a normalized reason for a dynamically destructive input", async () => {
+		let executionReason: string | undefined;
+		let executions = 0;
+		register(
+			baseCommand("system.dispatch.dynamic-delete-reason", {
+				risk: "sensitive",
+				input: z.object({
+					action: z.enum(["update", "delete"]),
+					id: z.string(),
+				}),
+				execute: async (context) => {
+					executions += 1;
+					executionReason = context.reason;
+					return ok(null, context.correlationId);
+				},
+			}),
+		);
+
+		const denied = await dispatchHousekeepingCommand(
+			{
+				commandId: "system.dispatch.dynamic-delete-reason",
+				input: { action: "delete", id: "7" },
+			},
+			dependencies(),
+		);
+		expect(denied).toMatchObject({
+			ok: false,
+			error: {
+				code: "VALIDATION",
+				fieldErrors: { reason: ["errors.validation.required"] },
+			},
+		});
+		expect(executions).toBe(0);
+
+		const allowed = await dispatchHousekeepingCommand(
+			{
+				commandId: "system.dispatch.dynamic-delete-reason",
+				input: { action: "delete", id: "7" },
+				reason: "  Remove duplicate  ",
+			},
+			dependencies(),
+		);
+		expect(allowed).toMatchObject({ ok: true });
+		expect(executions).toBe(1);
+		expect(executionReason).toBe("Remove duplicate");
+	});
+
 	it("uses actor, IP, command ID, and the approved command limit", async () => {
 		const calls: Array<[string, number, number]> = [];
 		let executed = false;
diff --git a/src/features/housekeeping/foundation/commands/dispatcher.ts b/src/features/housekeeping/foundation/commands/dispatcher.ts
index d4d60158..73746702 100644
--- a/src/features/housekeeping/foundation/commands/dispatcher.ts
+++ b/src/features/housekeeping/foundation/commands/dispatcher.ts
@@ -223,6 +223,7 @@ export async function dispatchHousekeepingCommand(
 			command,
 			commandRequest.reason || undefined,
 			correlationId,
+			parsedInput.data,
 		);
 	} catch (error) {
 		return persistReturnedOutcome(
@@ -277,6 +278,7 @@ export async function dispatchHousekeepingCommand(
 		capability: dependencies.context,
 		correlationId,
 		ipAddress,
+		...(commandRequest.reason ? { reason: commandRequest.reason } : {}),
 	};
 	let correlatedResult: HousekeepingResult<unknown>;
 	try {
diff --git a/src/features/housekeeping/foundation/commands/reason-policy.ts b/src/features/housekeeping/foundation/commands/reason-policy.ts
new file mode 100644
index 00000000..64c81b6a
--- /dev/null
+++ b/src/features/housekeeping/foundation/commands/reason-policy.ts
@@ -0,0 +1,23 @@
+export function normalizeHousekeepingReason(
+	reason: string | undefined,
+): string | undefined {
+	return reason?.normalize("NFC").trim() || undefined;
+}
+
+export function isHousekeepingDeleteInput(input: unknown): boolean {
+	if (typeof input !== "object" || input === null || Array.isArray(input)) {
+		return false;
+	}
+	try {
+		return Reflect.get(input, "action") === "delete";
+	} catch {
+		return false;
+	}
+}
+
+export function requiresHousekeepingReason(
+	commandRequiresReason: boolean,
+	input: unknown,
+): boolean {
+	return commandRequiresReason || isHousekeepingDeleteInput(input);
+}
diff --git a/src/features/housekeeping/foundation/commands/registry.ts b/src/features/housekeeping/foundation/commands/registry.ts
index 680f9dad..af650797 100644
--- a/src/features/housekeeping/foundation/commands/registry.ts
+++ b/src/features/housekeeping/foundation/commands/registry.ts
@@ -14,6 +14,7 @@ export interface HousekeepingCommandContext {
 	readonly capability: HousekeepingCapabilityContext;
 	readonly correlationId: string;
 	readonly ipAddress: string;
+	readonly reason?: string;
 }
 
 export interface HousekeepingCommand<I, O> {