From fe215efbd1507dc6c0ab10581edff676a88c19ac Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Tue, 28 Jul 2026 14:35:36 +0000
Subject: [PATCH] Add audit start and end dates to audits

ISO audits often span a window distinct from certificate validity.
Store optional audit_start_date and audit_end_date on the audit
record and expose them through GraphQL, MCP, CLI, n8n, and console.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
---
 apps/console/src/_locales/en-US.json          |  4 +-
 apps/console/src/_locales/fr-FR.json          |  8 +-
 apps/console/src/hooks/graph/AuditGraph.ts    | 12 +++
 .../organizations/audits/AuditDetailsPage.tsx | 14 +++
 .../audits/dialogs/CreateAuditDialog.tsx      | 14 +++
 e2e/console/audit_test.go                     | 87 +++++++++++++++++++
 .../Probo/actions/audit/create.operation.ts   | 20 +++++
 .../actions/audit/deleteReport.operation.ts   |  2 +
 .../Probo/actions/audit/get.operation.ts      |  2 +
 .../Probo/actions/audit/getAll.operation.ts   |  2 +
 .../Probo/actions/audit/update.operation.ts   | 20 +++++
 .../actions/audit/uploadReport.operation.ts   |  2 +
 pkg/cmd/audit/create/create.go                | 26 ++++--
 pkg/cmd/audit/list/list.go                    | 28 ++++--
 pkg/cmd/audit/update/update.go                | 26 ++++--
 pkg/cmd/audit/view/view.go                    | 28 ++++--
 pkg/coredata/audit.go                         | 30 +++++++
 pkg/coredata/migrations/20260728T142906Z.sql  | 22 +++++
 pkg/probo/audit_service.go                    | 16 ++++
 pkg/server/api/console/v1/audit_resolvers.go  |  4 +
 .../api/console/v1/graphql/audit.graphql      |  6 ++
 pkg/server/api/console/v1/types/audit.go      |  2 +
 pkg/server/api/mcp/v1/schema.resolvers.go     |  4 +
 pkg/server/api/mcp/v1/specification.yaml      | 32 +++++++
 pkg/server/api/mcp/v1/types/audit.go          |  2 +
 25 files changed, 385 insertions(+), 28 deletions(-)
 create mode 100644 pkg/coredata/migrations/20260728T142906Z.sql

diff --git a/apps/console/src/_locales/en-US.json b/apps/console/src/_locales/en-US.json
index 3eabecb88..53acca3f3 100644
--- a/apps/console/src/_locales/en-US.json
+++ b/apps/console/src/_locales/en-US.json
@@ -1670,7 +1670,7 @@
     "messages": { "success": "Success", "error": "Error", "updated": "Audit updated successfully" },
     "deleteReportConfirmation": "This will permanently delete the audit report \"{{name}}\". This action cannot be undone.",
     "states": { "not_started": "Not Started", "in_progress": "In Progress", "completed": "Completed", "rejected": "Rejected", "outdated": "Outdated" },
-    "fields": { "name": "Name", "namePlaceholder": "Audit name", "state": "State", "validFrom": "Valid From", "validUntil": "Valid Until" },
+    "fields": { "name": "Name", "namePlaceholder": "Audit name", "state": "State", "validFrom": "Valid From", "validUntil": "Valid Until", "auditStartDate": "Audit Start Date", "auditEndDate": "Audit End Date" },
     "actions": { "delete": "Delete", "update": "Update", "updating": "Updating...", "download": "Download" },
     "report": { "title": "Audit Report", "uploaded": "Uploaded {{date}}", "uploadDescription": "Upload the final audit report document (PDF recommended)", "dropzoneDescription": "Only PDF up to 25MB are allowed" }
   },
@@ -1691,7 +1691,7 @@
     "errors": { "create": "Failed to create audit" },
     "fileSize": "{{value}} MB",
     "loading": "Loading...",
-    "fields": { "framework": "Framework", "frameworkPlaceholder": "Select a framework", "name": "Name", "namePlaceholder": "Audit name", "state": "State", "validFrom": "Valid From", "validUntil": "Valid Until" },
+    "fields": { "framework": "Framework", "frameworkPlaceholder": "Select a framework", "name": "Name", "namePlaceholder": "Audit name", "state": "State", "validFrom": "Valid From", "validUntil": "Valid Until", "auditStartDate": "Audit Start Date", "auditEndDate": "Audit End Date" },
     "states": { "not_started": "Not Started", "in_progress": "In Progress", "completed": "Completed", "rejected": "Rejected", "outdated": "Outdated" },
     "actions": { "create": "Create" }
   },
diff --git a/apps/console/src/_locales/fr-FR.json b/apps/console/src/_locales/fr-FR.json
index d54de3541..84a875106 100644
--- a/apps/console/src/_locales/fr-FR.json
+++ b/apps/console/src/_locales/fr-FR.json
@@ -3441,7 +3441,9 @@
       "namePlaceholder": "Nom de l’audit",
       "state": "État",
       "validFrom": "Valide à partir de",
-      "validUntil": "Valide jusqu’au"
+      "validUntil": "Valide jusqu’au",
+      "auditStartDate": "Date de début de l’audit",
+      "auditEndDate": "Date de fin de l’audit"
     },
     "actions": {
       "delete": "Supprimer",
@@ -3519,7 +3521,9 @@
       "namePlaceholder": "Nom de l’audit",
       "state": "État",
       "validFrom": "Valide à partir de",
-      "validUntil": "Valide jusqu’au"
+      "validUntil": "Valide jusqu’au",
+      "auditStartDate": "Date de début de l’audit",
+      "auditEndDate": "Date de fin de l’audit"
     },
     "states": {
       "not_started": "Non commencé",
diff --git a/apps/console/src/hooks/graph/AuditGraph.ts b/apps/console/src/hooks/graph/AuditGraph.ts
index 23ec33004..e3c2ed772 100644
--- a/apps/console/src/hooks/graph/AuditGraph.ts
+++ b/apps/console/src/hooks/graph/AuditGraph.ts
@@ -47,6 +47,8 @@ export const auditNodeQuery = graphql`
         name
         validFrom
         validUntil
+        auditStartDate
+        auditEndDate
         reportFile {
           id
           fileName
@@ -91,6 +93,8 @@ export const createAuditMutation = graphql`
           name
           validFrom
           validUntil
+          auditStartDate
+          auditEndDate
           reportFile {
             id
             fileName
@@ -117,6 +121,8 @@ export const updateAuditMutation = graphql`
         name
         validFrom
         validUntil
+        auditStartDate
+        auditEndDate
         reportFile {
           id
           fileName
@@ -186,6 +192,8 @@ export const useCreateAudit = (connectionId: string) => {
     name?: string | null;
     validFrom?: string;
     validUntil?: string;
+    auditStartDate?: string;
+    auditEndDate?: string;
     reportKey?: string;
     state?: string;
     file?: File | null;
@@ -205,6 +213,8 @@ export const useCreateAudit = (connectionId: string) => {
           name: input.name,
           validFrom: input.validFrom,
           validUntil: input.validUntil,
+          auditStartDate: input.auditStartDate,
+          auditEndDate: input.auditEndDate,
           reportKey: input.reportKey,
           state: input.state || "NOT_STARTED",
           file: input.file ? null : undefined,
@@ -226,6 +236,8 @@ export const useUpdateAudit = () => {
     name?: string | null;
     validFrom?: string | null;
     validUntil?: string | null;
+    auditStartDate?: string | null;
+    auditEndDate?: string | null;
     state?: string;
   }) => {
     if (!input.id) {
diff --git a/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx b/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx
index 698724cb2..55adba80d 100644
--- a/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx
+++ b/apps/console/src/pages/organizations/audits/AuditDetailsPage.tsx
@@ -69,6 +69,8 @@ const updateAuditSchema = z.object({
   name: z.string().nullable().optional(),
   validFrom: z.string().optional(),
   validUntil: z.string().optional(),
+  auditStartDate: z.string().optional(),
+  auditEndDate: z.string().optional(),
   state: z.enum([
     "NOT_STARTED",
     "IN_PROGRESS",
@@ -104,6 +106,8 @@ export default function AuditDetailsPage(props: Props) {
         name: auditEntry.name || null,
         validFrom: auditEntry.validFrom?.split("T")[0] || "",
         validUntil: auditEntry.validUntil?.split("T")[0] || "",
+        auditStartDate: auditEntry.auditStartDate?.split("T")[0] || "",
+        auditEndDate: auditEntry.auditEndDate?.split("T")[0] || "",
         state: auditEntry.state || "NOT_STARTED",
       },
     });
@@ -123,6 +127,8 @@ export default function AuditDetailsPage(props: Props) {
         name: formData.name || null,
         validFrom: formatDatetime(formData.validFrom) ?? null,
         validUntil: formatDatetime(formData.validUntil) ?? null,
+        auditStartDate: formatDatetime(formData.auditStartDate) ?? null,
+        auditEndDate: formatDatetime(formData.auditEndDate) ?? null,
         state: formData.state,
       });
       reset(formData);
@@ -243,6 +249,14 @@ export default function AuditDetailsPage(props: Props) {
             <Input {...register("validUntil")} type="date" />
           </Field>
 
+          <Field label={t("auditDetailsPage.fields.auditStartDate")}>
+            <Input {...register("auditStartDate")} type="date" />
+          </Field>
+
+          <Field label={t("auditDetailsPage.fields.auditEndDate")}>
+            <Input {...register("auditEndDate")} type="date" />
+          </Field>
+
           <div className="flex justify-end">
             {formState.isDirty && auditEntry.canUpdate && (
               <Button type="submit" disabled={formState.isSubmitting}>
diff --git a/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx b/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx
index 431c248cc..efc1abf31 100644
--- a/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx
+++ b/apps/console/src/pages/organizations/audits/dialogs/CreateAuditDialog.tsx
@@ -92,6 +92,8 @@ export function CreateAuditDialog({
     name: z.string().optional(),
     validFrom: z.string().optional(),
     validUntil: z.string().optional(),
+    auditStartDate: z.string().optional(),
+    auditEndDate: z.string().optional(),
     state: z.enum([
       "NOT_STARTED",
       "IN_PROGRESS",
@@ -107,6 +109,8 @@ export function CreateAuditDialog({
         name: "",
         validFrom: "",
         validUntil: "",
+        auditStartDate: "",
+        auditEndDate: "",
         state: "NOT_STARTED",
       },
     });
@@ -122,6 +126,8 @@ export function CreateAuditDialog({
         name: data.name || null,
         validFrom: formatDatetime(data.validFrom),
         validUntil: formatDatetime(data.validUntil),
+        auditStartDate: formatDatetime(data.auditStartDate),
+        auditEndDate: formatDatetime(data.auditEndDate),
         state: data.state,
         file: file ?? null,
       });
@@ -229,6 +235,12 @@ export function CreateAuditDialog({
           <Field label={t("createAuditDialog.fields.validUntil")}>
             <Input {...register("validUntil")} type="date" />
           </Field>
+          <Field label={t("createAuditDialog.fields.auditStartDate")}>
+            <Input {...register("auditStartDate")} type="date" />
+          </Field>
+          <Field label={t("createAuditDialog.fields.auditEndDate")}>
+            <Input {...register("auditEndDate")} type="date" />
+          </Field>
         </DialogContent>
         <DialogFooter>
           <Button disabled={formState.isSubmitting} type="submit">
@@ -245,6 +257,8 @@ type FormSchema = {
   name?: string;
   validFrom?: string;
   validUntil?: string;
+  auditStartDate?: string;
+  auditEndDate?: string;
   state: "NOT_STARTED" | "IN_PROGRESS" | "COMPLETED" | "REJECTED" | "OUTDATED";
 };
 
diff --git a/e2e/console/audit_test.go b/e2e/console/audit_test.go
index 9ff86c9c8..d3551ab85 100644
--- a/e2e/console/audit_test.go
+++ b/e2e/console/audit_test.go
@@ -151,6 +151,93 @@ func TestAudit_Create(t *testing.T) {
 	}
 }
 
+func TestAudit_AuditDates(t *testing.T) {
+	t.Parallel()
+	owner := testutil.NewClient(t, testutil.RoleOwner)
+
+	frameworkID := factory.NewFramework(owner).WithName("Framework for Audit Dates").Create()
+
+	const createQuery = `
+		mutation CreateAudit($input: CreateAuditInput!) {
+			createAudit(input: $input) {
+				auditEdge {
+					node {
+						id
+						auditStartDate
+						auditEndDate
+					}
+				}
+			}
+		}
+	`
+
+	input := map[string]any{
+		"organizationId": owner.GetOrganizationID().String(),
+		"frameworkId":    frameworkID,
+		"name":           "Audit with engagement dates",
+		"state":          "NOT_STARTED",
+		"auditStartDate": "2026-03-01T00:00:00Z",
+		"auditEndDate":   "2026-03-15T00:00:00Z",
+	}
+
+	var createResult struct {
+		CreateAudit struct {
+			AuditEdge struct {
+				Node struct {
+					ID             string  `json:"id"`
+					AuditStartDate *string `json:"auditStartDate"`
+					AuditEndDate   *string `json:"auditEndDate"`
+				} `json:"node"`
+			} `json:"auditEdge"`
+		} `json:"createAudit"`
+	}
+
+	err := owner.Execute(createQuery, map[string]any{"input": input}, &createResult)
+	require.NoError(t, err)
+
+	node := createResult.CreateAudit.AuditEdge.Node
+	require.NotNil(t, node.AuditStartDate)
+	require.NotNil(t, node.AuditEndDate)
+	assert.True(t, strings.HasPrefix(*node.AuditStartDate, "2026-03-01"))
+	assert.True(t, strings.HasPrefix(*node.AuditEndDate, "2026-03-15"))
+
+	const updateQuery = `
+		mutation UpdateAudit($input: UpdateAuditInput!) {
+			updateAudit(input: $input) {
+				audit {
+					id
+					auditStartDate
+					auditEndDate
+				}
+			}
+		}
+	`
+
+	updateInput := map[string]any{
+		"id":             node.ID,
+		"auditStartDate": "2026-04-01T00:00:00Z",
+		"auditEndDate":   "2026-04-30T00:00:00Z",
+	}
+
+	var updateResult struct {
+		UpdateAudit struct {
+			Audit struct {
+				AuditStartDate *string `json:"auditStartDate"`
+				AuditEndDate   *string `json:"auditEndDate"`
+			} `json:"audit"`
+		} `json:"updateAudit"`
+	}
+
+	err = owner.Execute(updateQuery, map[string]any{"input": updateInput}, &updateResult)
+	require.NoError(t, err)
+
+	updated := updateResult.UpdateAudit.Audit
+	require.NotNil(t, updated.AuditStartDate)
+	require.NotNil(t, updated.AuditEndDate)
+	assert.True(t, strings.HasPrefix(*updated.AuditStartDate, "2026-04-01"))
+	assert.True(t, strings.HasPrefix(*updated.AuditEndDate, "2026-04-30"))
+}
+
 func TestAudit_Create_Validation(t *testing.T) {
 	t.Parallel()
 	owner := testutil.NewClient(t, testutil.RoleOwner)
diff --git a/packages/n8n-node/nodes/Probo/actions/audit/create.operation.ts b/packages/n8n-node/nodes/Probo/actions/audit/create.operation.ts
index 274c9d89b..5e9aab4fc 100644
--- a/packages/n8n-node/nodes/Probo/actions/audit/create.operation.ts
+++ b/packages/n8n-node/nodes/Probo/actions/audit/create.operation.ts
@@ -113,6 +113,20 @@ export const description: INodeProperties[] = [
 				default: '',
 				description: 'The end date of the audit validity period',
 			},
+			{
+				displayName: 'Audit Start Date',
+				name: 'auditStartDate',
+				type: 'dateTime',
+				default: '',
+				description: 'The start date of the audit engagement',
+			},
+			{
+				displayName: 'Audit End Date',
+				name: 'auditEndDate',
+				type: 'dateTime',
+				default: '',
+				description: 'The end date of the audit engagement',
+			},
 		],
 	},
 ];
@@ -128,6 +142,8 @@ export async function execute(
 		state?: string;
 		validFrom?: string;
 		validUntil?: string;
+		auditStartDate?: string;
+		auditEndDate?: string;
 	};
 
 	const query = `
@@ -140,6 +156,8 @@ export async function execute(
 						state
 						validFrom
 						validUntil
+						auditStartDate
+						auditEndDate
 						reportUrl
 						compliancePortalVisibility
 						createdAt
@@ -158,6 +176,8 @@ export async function execute(
 	if (additionalFields.state) input.state = additionalFields.state;
 	if (additionalFields.validFrom) input.validFrom = additionalFields.validFrom;
 	if (additionalFields.validUntil) input.validUntil = additionalFields.validUntil;
+	if (additionalFields.auditStartDate) input.auditStartDate = additionalFields.auditStartDate;
+	if (additionalFields.auditEndDate) input.auditEndDate = additionalFields.auditEndDate;
 
 	const responseData = await proboApiRequest.call(this, query, { input });
 
diff --git a/packages/n8n-node/nodes/Probo/actions/audit/deleteReport.operation.ts b/packages/n8n-node/nodes/Probo/actions/audit/deleteReport.operation.ts
index 74f2e4bb7..640bd501e 100644
--- a/packages/n8n-node/nodes/Probo/actions/audit/deleteReport.operation.ts
+++ b/packages/n8n-node/nodes/Probo/actions/audit/deleteReport.operation.ts
@@ -53,6 +53,8 @@ export async function execute(
 					state
 					validFrom
 					validUntil
+					auditStartDate
+					auditEndDate
 					reportUrl
 					compliancePortalVisibility
 					createdAt
diff --git a/packages/n8n-node/nodes/Probo/actions/audit/get.operation.ts b/packages/n8n-node/nodes/Probo/actions/audit/get.operation.ts
index 3e37dc42d..5a5d8988f 100644
--- a/packages/n8n-node/nodes/Probo/actions/audit/get.operation.ts
+++ b/packages/n8n-node/nodes/Probo/actions/audit/get.operation.ts
@@ -53,6 +53,8 @@ export async function execute(
 					state
 					validFrom
 					validUntil
+					auditStartDate
+					auditEndDate
 					reportUrl
 					compliancePortalVisibility
 					createdAt
diff --git a/packages/n8n-node/nodes/Probo/actions/audit/getAll.operation.ts b/packages/n8n-node/nodes/Probo/actions/audit/getAll.operation.ts
index 006982b33..b94792fee 100644
--- a/packages/n8n-node/nodes/Probo/actions/audit/getAll.operation.ts
+++ b/packages/n8n-node/nodes/Probo/actions/audit/getAll.operation.ts
@@ -88,6 +88,8 @@ export async function execute(
 								state
 								validFrom
 								validUntil
+								auditStartDate
+								auditEndDate
 								reportUrl
 								compliancePortalVisibility
 								createdAt
diff --git a/packages/n8n-node/nodes/Probo/actions/audit/update.operation.ts b/packages/n8n-node/nodes/Probo/actions/audit/update.operation.ts
index c09191bbd..9a390b1eb 100644
--- a/packages/n8n-node/nodes/Probo/actions/audit/update.operation.ts
+++ b/packages/n8n-node/nodes/Probo/actions/audit/update.operation.ts
@@ -99,6 +99,20 @@ export const description: INodeProperties[] = [
 				default: '',
 				description: 'The end date of the audit validity period',
 			},
+			{
+				displayName: 'Audit Start Date',
+				name: 'auditStartDate',
+				type: 'dateTime',
+				default: '',
+				description: 'The start date of the audit engagement',
+			},
+			{
+				displayName: 'Audit End Date',
+				name: 'auditEndDate',
+				type: 'dateTime',
+				default: '',
+				description: 'The end date of the audit engagement',
+			},
 		],
 	},
 ];
@@ -113,6 +127,8 @@ export async function execute(
 		state?: string;
 		validFrom?: string;
 		validUntil?: string;
+		auditStartDate?: string;
+		auditEndDate?: string;
 	};
 
 	const query = `
@@ -124,6 +140,8 @@ export async function execute(
 					state
 					validFrom
 					validUntil
+					auditStartDate
+					auditEndDate
 					reportUrl
 					compliancePortalVisibility
 					createdAt
@@ -138,6 +156,8 @@ export async function execute(
 	if (updateFields.state) input.state = updateFields.state;
 	if (updateFields.validFrom) input.validFrom = updateFields.validFrom;
 	if (updateFields.validUntil) input.validUntil = updateFields.validUntil;
+	if (updateFields.auditStartDate) input.auditStartDate = updateFields.auditStartDate;
+	if (updateFields.auditEndDate) input.auditEndDate = updateFields.auditEndDate;
 
 	const responseData = await proboApiRequest.call(this, query, { input });
 
diff --git a/packages/n8n-node/nodes/Probo/actions/audit/uploadReport.operation.ts b/packages/n8n-node/nodes/Probo/actions/audit/uploadReport.operation.ts
index b4d5ab88b..a658c9c83 100644
--- a/packages/n8n-node/nodes/Probo/actions/audit/uploadReport.operation.ts
+++ b/packages/n8n-node/nodes/Probo/actions/audit/uploadReport.operation.ts
@@ -74,6 +74,8 @@ export async function execute(
 					state
 					validFrom
 					validUntil
+					auditStartDate
+					auditEndDate
 					reportUrl
 					compliancePortalVisibility
 					createdAt
diff --git a/pkg/cmd/audit/create/create.go b/pkg/cmd/audit/create/create.go
index 1d1d50048..df76d9599 100644
--- a/pkg/cmd/audit/create/create.go
+++ b/pkg/cmd/audit/create/create.go
@@ -40,6 +40,8 @@ mutation($input: CreateAuditInput!) {
         state
         validFrom
         validUntil
+        auditStartDate
+        auditEndDate
       }
     }
   }
@@ -50,11 +52,13 @@ type createResponse struct {
 	CreateAudit struct {
 		AuditEdge struct {
 			Node struct {
-				ID         string  `json:"id"`
-				Name       string  `json:"name"`
-				State      string  `json:"state"`
-				ValidFrom  *string `json:"validFrom"`
-				ValidUntil *string `json:"validUntil"`
+				ID             string  `json:"id"`
+				Name           string  `json:"name"`
+				State          string  `json:"state"`
+				ValidFrom      *string `json:"validFrom"`
+				ValidUntil     *string `json:"validUntil"`
+				AuditStartDate *string `json:"auditStartDate"`
+				AuditEndDate   *string `json:"auditEndDate"`
 			} `json:"node"`
 		} `json:"auditEdge"`
 	} `json:"createAudit"`
@@ -68,6 +72,8 @@ func NewCmdCreate(f *cmdutil.Factory) *cobra.Command {
 		flagState                      string
 		flagValidFrom                  string
 		flagValidUntil                 string
+		flagAuditStartDate             string
+		flagAuditEndDate               string
 		flagCompliancePortalVisibility string
 	)
 
@@ -160,6 +166,14 @@ func NewCmdCreate(f *cmdutil.Factory) *cobra.Command {
 				input["validUntil"] = flagValidUntil
 			}
 
+			if flagAuditStartDate != "" {
+				input["auditStartDate"] = flagAuditStartDate
+			}
+
+			if flagAuditEndDate != "" {
+				input["auditEndDate"] = flagAuditEndDate
+			}
+
 			if flagCompliancePortalVisibility != "" {
 				input["compliancePortalVisibility"] = flagCompliancePortalVisibility
 			}
@@ -195,6 +209,8 @@ func NewCmdCreate(f *cmdutil.Factory) *cobra.Command {
 	cmd.Flags().StringVar(&flagState, "state", "", "Audit state: NOT_STARTED, IN_PROGRESS, COMPLETED, REJECTED, OUTDATED")
 	cmd.Flags().StringVar(&flagValidFrom, "valid-from", "", "Valid from date (e.g. 2026-01-01)")
 	cmd.Flags().StringVar(&flagValidUntil, "valid-until", "", "Valid until date (e.g. 2026-12-31)")
+	cmd.Flags().StringVar(&flagAuditStartDate, "audit-start-date", "", "Audit start date (e.g. 2026-03-01)")
+	cmd.Flags().StringVar(&flagAuditEndDate, "audit-end-date", "", "Audit end date (e.g. 2026-03-15)")
 	cmd.Flags().StringVar(&flagCompliancePortalVisibility, "compliance-portal-visibility", "", "Compliance portal visibility: NONE, PRIVATE, PUBLIC")
 
 	return cmd
diff --git a/pkg/cmd/audit/list/list.go b/pkg/cmd/audit/list/list.go
index 2c8e336e2..f4ff2ab99 100644
--- a/pkg/cmd/audit/list/list.go
+++ b/pkg/cmd/audit/list/list.go
@@ -43,6 +43,8 @@ query($id: ID!, $first: Int, $after: CursorKey, $orderBy: AuditOrder) {
             state
             validFrom
             validUntil
+            auditStartDate
+            auditEndDate
           }
         }
         pageInfo {
@@ -56,11 +58,13 @@ query($id: ID!, $first: Int, $after: CursorKey, $orderBy: AuditOrder) {
 `
 
 type audit struct {
-	ID         string  `json:"id"`
-	Name       string  `json:"name"`
-	State      string  `json:"state"`
-	ValidFrom  *string `json:"validFrom"`
-	ValidUntil *string `json:"validUntil"`
+	ID             string  `json:"id"`
+	Name           string  `json:"name"`
+	State          string  `json:"state"`
+	ValidFrom      *string `json:"validFrom"`
+	ValidUntil     *string `json:"validUntil"`
+	AuditStartDate *string `json:"auditStartDate"`
+	AuditEndDate   *string `json:"auditEndDate"`
 }
 
 func NewCmdList(f *cmdutil.Factory) *cobra.Command {
@@ -180,16 +184,28 @@ func NewCmdList(f *cmdutil.Factory) *cobra.Command {
 					validUntil = *a.ValidUntil
 				}
 
+				auditStartDate := ""
+				if a.AuditStartDate != nil {
+					auditStartDate = *a.AuditStartDate
+				}
+
+				auditEndDate := ""
+				if a.AuditEndDate != nil {
+					auditEndDate = *a.AuditEndDate
+				}
+
 				rows = append(rows, []string{
 					a.ID,
 					a.Name,
 					a.State,
 					validFrom,
 					validUntil,
+					auditStartDate,
+					auditEndDate,
 				})
 			}
 
-			t := cmdutil.NewTable("ID", "NAME", "STATE", "VALID FROM", "VALID UNTIL").Rows(rows...)
+			t := cmdutil.NewTable("ID", "NAME", "STATE", "VALID FROM", "VALID UNTIL", "AUDIT START", "AUDIT END").Rows(rows...)
 
 			_, _ = fmt.Fprintln(f.IOStreams.Out, t)
 
diff --git a/pkg/cmd/audit/update/update.go b/pkg/cmd/audit/update/update.go
index 20e29a7d7..30cdf2f0b 100644
--- a/pkg/cmd/audit/update/update.go
+++ b/pkg/cmd/audit/update/update.go
@@ -38,6 +38,8 @@ mutation($input: UpdateAuditInput!) {
       state
       validFrom
       validUntil
+      auditStartDate
+      auditEndDate
     }
   }
 }
@@ -46,11 +48,13 @@ mutation($input: UpdateAuditInput!) {
 type updateResponse struct {
 	UpdateAudit struct {
 		Audit struct {
-			ID         string  `json:"id"`
-			Name       string  `json:"name"`
-			State      string  `json:"state"`
-			ValidFrom  *string `json:"validFrom"`
-			ValidUntil *string `json:"validUntil"`
+			ID             string  `json:"id"`
+			Name           string  `json:"name"`
+			State          string  `json:"state"`
+			ValidFrom      *string `json:"validFrom"`
+			ValidUntil     *string `json:"validUntil"`
+			AuditStartDate *string `json:"auditStartDate"`
+			AuditEndDate   *string `json:"auditEndDate"`
 		} `json:"audit"`
 	} `json:"updateAudit"`
 }
@@ -61,6 +65,8 @@ func NewCmdUpdate(f *cmdutil.Factory) *cobra.Command {
 		flagState                      string
 		flagValidFrom                  string
 		flagValidUntil                 string
+		flagAuditStartDate             string
+		flagAuditEndDate               string
 		flagCompliancePortalVisibility string
 	)
 
@@ -107,6 +113,14 @@ func NewCmdUpdate(f *cmdutil.Factory) *cobra.Command {
 				input["validUntil"] = flagValidUntil
 			}
 
+			if cmd.Flags().Changed("audit-start-date") {
+				input["auditStartDate"] = flagAuditStartDate
+			}
+
+			if cmd.Flags().Changed("audit-end-date") {
+				input["auditEndDate"] = flagAuditEndDate
+			}
+
 			if cmd.Flags().Changed("compliance-portal-visibility") {
 				input["compliancePortalVisibility"] = flagCompliancePortalVisibility
 			}
@@ -144,6 +158,8 @@ func NewCmdUpdate(f *cmdutil.Factory) *cobra.Command {
 	cmd.Flags().StringVar(&flagState, "state", "", "Audit state: NOT_STARTED, IN_PROGRESS, COMPLETED, REJECTED, OUTDATED")
 	cmd.Flags().StringVar(&flagValidFrom, "valid-from", "", "Valid from date (e.g. 2026-01-01)")
 	cmd.Flags().StringVar(&flagValidUntil, "valid-until", "", "Valid until date (e.g. 2026-12-31)")
+	cmd.Flags().StringVar(&flagAuditStartDate, "audit-start-date", "", "Audit start date (e.g. 2026-03-01)")
+	cmd.Flags().StringVar(&flagAuditEndDate, "audit-end-date", "", "Audit end date (e.g. 2026-03-15)")
 	cmd.Flags().StringVar(&flagCompliancePortalVisibility, "compliance-portal-visibility", "", "Compliance portal visibility: NONE, PRIVATE, PUBLIC")
 
 	return cmd
diff --git a/pkg/cmd/audit/view/view.go b/pkg/cmd/audit/view/view.go
index 67e2bd469..9464c0c36 100644
--- a/pkg/cmd/audit/view/view.go
+++ b/pkg/cmd/audit/view/view.go
@@ -40,6 +40,8 @@ query($id: ID!) {
       state
       validFrom
       validUntil
+      auditStartDate
+      auditEndDate
       createdAt
       updatedAt
     }
@@ -49,14 +51,16 @@ query($id: ID!) {
 
 type viewResponse struct {
 	Node *struct {
-		Typename   string  `json:"__typename"`
-		ID         string  `json:"id"`
-		Name       string  `json:"name"`
-		State      string  `json:"state"`
-		ValidFrom  *string `json:"validFrom"`
-		ValidUntil *string `json:"validUntil"`
-		CreatedAt  string  `json:"createdAt"`
-		UpdatedAt  string  `json:"updatedAt"`
+		Typename       string  `json:"__typename"`
+		ID             string  `json:"id"`
+		Name           string  `json:"name"`
+		State          string  `json:"state"`
+		ValidFrom      *string `json:"validFrom"`
+		ValidUntil     *string `json:"validUntil"`
+		AuditStartDate *string `json:"auditStartDate"`
+		AuditEndDate   *string `json:"auditEndDate"`
+		CreatedAt      string  `json:"createdAt"`
+		UpdatedAt      string  `json:"updatedAt"`
 	} `json:"node"`
 }
 
@@ -134,6 +138,14 @@ func NewCmdView(f *cmdutil.Factory) *cobra.Command {
 				_, _ = fmt.Fprintf(out, "%s%s\n", label.Render("Valid Until:"), *a.ValidUntil)
 			}
 
+			if a.AuditStartDate != nil && *a.AuditStartDate != "" {
+				_, _ = fmt.Fprintf(out, "%s%s\n", label.Render("Audit Start:"), *a.AuditStartDate)
+			}
+
+			if a.AuditEndDate != nil && *a.AuditEndDate != "" {
+				_, _ = fmt.Fprintf(out, "%s%s\n", label.Render("Audit End:"), *a.AuditEndDate)
+			}
+
 			_, _ = fmt.Fprintln(out)
 			_, _ = fmt.Fprintf(out, "%s%s\n", label.Render("Created:"), cmdutil.FormatTime(a.CreatedAt))
 			_, _ = fmt.Fprintf(out, "%s%s\n", label.Render("Updated:"), cmdutil.FormatTime(a.UpdatedAt))
diff --git a/pkg/coredata/audit.go b/pkg/coredata/audit.go
index 4d693f50a..10b9e3ce5 100644
--- a/pkg/coredata/audit.go
+++ b/pkg/coredata/audit.go
@@ -43,6 +43,8 @@ type (
 		ReportFileID               *gid.GID                   `db:"report_file_id"`
 		ValidFrom                  *time.Time                 `db:"valid_from"`
 		ValidUntil                 *time.Time                 `db:"valid_until"`
+		AuditStartDate             *time.Time                 `db:"audit_start_date"`
+		AuditEndDate               *time.Time                 `db:"audit_end_date"`
 		State                      AuditState                 `db:"state"`
 		CompliancePortalVisibility CompliancePortalVisibility `db:"trust_center_visibility"`
 		CreatedAt                  time.Time                  `db:"created_at"`
@@ -122,6 +124,8 @@ SELECT
 	report_file_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
@@ -208,6 +212,8 @@ SELECT
 	report_file_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
@@ -258,6 +264,8 @@ INSERT INTO audits (
 	report_file_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
@@ -271,6 +279,8 @@ INSERT INTO audits (
 	@report_file_id,
 	@valid_from,
 	@valid_until,
+	@audit_start_date,
+	@audit_end_date,
 	@state,
 	@trust_center_visibility,
 	@created_at,
@@ -287,6 +297,8 @@ INSERT INTO audits (
 		"report_file_id":          a.ReportFileID,
 		"valid_from":              a.ValidFrom,
 		"valid_until":             a.ValidUntil,
+		"audit_start_date":        a.AuditStartDate,
+		"audit_end_date":          a.AuditEndDate,
 		"state":                   a.State,
 		"trust_center_visibility": a.CompliancePortalVisibility,
 		"created_at":              a.CreatedAt,
@@ -313,6 +325,8 @@ SET
 	report_file_id = @report_file_id,
 	valid_from = @valid_from,
 	valid_until = @valid_until,
+	audit_start_date = @audit_start_date,
+	audit_end_date = @audit_end_date,
 	state = @state,
 	trust_center_visibility = @trust_center_visibility,
 	updated_at = @updated_at
@@ -329,6 +343,8 @@ WHERE
 		"report_file_id":          a.ReportFileID,
 		"valid_from":              a.ValidFrom,
 		"valid_until":             a.ValidUntil,
+		"audit_start_date":        a.AuditStartDate,
+		"audit_end_date":          a.AuditEndDate,
 		"state":                   a.State,
 		"trust_center_visibility": a.CompliancePortalVisibility,
 		"updated_at":              a.UpdatedAt,
@@ -386,6 +402,8 @@ WITH audits_by_control AS (
 		a.report_file_id,
 		a.valid_from,
 		a.valid_until,
+		a.audit_start_date,
+		a.audit_end_date,
 		a.state,
 		a.trust_center_visibility,
 		a.created_at,
@@ -405,6 +423,8 @@ SELECT
 	report_file_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
@@ -453,6 +473,8 @@ WITH audits_by_finding AS (
 		a.report_file_id,
 		a.valid_from,
 		a.valid_until,
+		a.audit_start_date,
+		a.audit_end_date,
 		a.state,
 		a.trust_center_visibility,
 		a.created_at,
@@ -472,6 +494,8 @@ SELECT
 	report_file_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
@@ -603,6 +627,8 @@ SELECT
 	report_file_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
@@ -652,6 +678,8 @@ SELECT
 	report_file_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
@@ -698,6 +726,8 @@ SELECT
 	report_id,
 	valid_from,
 	valid_until,
+	audit_start_date,
+	audit_end_date,
 	state,
 	trust_center_visibility,
 	created_at,
diff --git a/pkg/coredata/migrations/20260728T142906Z.sql b/pkg/coredata/migrations/20260728T142906Z.sql
new file mode 100644
index 000000000..17e52ba45
--- /dev/null
+++ b/pkg/coredata/migrations/20260728T142906Z.sql
@@ -0,0 +1,22 @@
+-- Copyright (c) 2025-2026 Probo Inc <hello@probo.com>.
+--
+-- Permission is hereby granted, free of charge, to any person obtaining a copy
+-- of this software and associated documentation files (the "Software"), to deal
+-- in the Software without restriction, including without limitation the rights
+-- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-- copies of the Software, and to permit persons to whom the Software is
+-- furnished to do so, subject to the following conditions:
+--
+-- The above copyright notice and this permission notice shall be included in
+-- all copies or substantial portions of the Software.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+-- SOFTWARE.
+
+ALTER TABLE audits ADD COLUMN audit_start_date DATE;
+ALTER TABLE audits ADD COLUMN audit_end_date DATE;
diff --git a/pkg/probo/audit_service.go b/pkg/probo/audit_service.go
index e2e76468d..3f6f92627 100644
--- a/pkg/probo/audit_service.go
+++ b/pkg/probo/audit_service.go
@@ -44,6 +44,8 @@ type (
 		Name                       *string
 		ValidFrom                  *time.Time
 		ValidUntil                 *time.Time
+		AuditStartDate             *time.Time
+		AuditEndDate               *time.Time
 		State                      *coredata.AuditState
 		CompliancePortalVisibility *coredata.CompliancePortalVisibility
 	}
@@ -53,6 +55,8 @@ type (
 		Name                       **string
 		ValidFrom                  *time.Time
 		ValidUntil                 *time.Time
+		AuditStartDate             *time.Time
+		AuditEndDate               *time.Time
 		State                      *coredata.AuditState
 		CompliancePortalVisibility *coredata.CompliancePortalVisibility
 	}
@@ -70,6 +74,7 @@ func (car *CreateAuditRequest) Validate() error {
 	v.Check(car.FrameworkID, "framework_id", validator.Required(), validator.GID(coredata.FrameworkEntityType))
 	v.Check(car.Name, "name", validator.SafeTextNoNewLine(TitleMaxLength))
 	v.Check(car.ValidUntil, "valid_until", validator.After(car.ValidFrom))
+	v.Check(car.AuditEndDate, "audit_end_date", validator.After(car.AuditStartDate))
 	v.Check(car.State, "state", validator.OneOfSlice(coredata.AuditStates()))
 	v.Check(car.CompliancePortalVisibility, "trust_center_visibility", validator.OneOfSlice(coredata.CompliancePortalVisibilities()))
 
@@ -82,6 +87,7 @@ func (uar *UpdateAuditRequest) Validate() error {
 	v.Check(uar.ID, "id", validator.Required(), validator.GID(coredata.AuditEntityType))
 	v.Check(uar.Name, "name", validator.SafeTextNoNewLine(TitleMaxLength))
 	v.Check(uar.ValidUntil, "valid_until", validator.After(uar.ValidFrom))
+	v.Check(uar.AuditEndDate, "audit_end_date", validator.After(uar.AuditStartDate))
 	v.Check(uar.State, "state", validator.OneOfSlice(coredata.AuditStates()))
 	v.Check(uar.CompliancePortalVisibility, "trust_center_visibility", validator.OneOfSlice(coredata.CompliancePortalVisibilities()))
 
@@ -170,6 +176,8 @@ func (s *AuditService) Create(
 		FrameworkID:                req.FrameworkID,
 		ValidFrom:                  req.ValidFrom,
 		ValidUntil:                 req.ValidUntil,
+		AuditStartDate:             req.AuditStartDate,
+		AuditEndDate:               req.AuditEndDate,
 		State:                      coredata.AuditStateNotStarted,
 		CompliancePortalVisibility: coredata.CompliancePortalVisibilityNone,
 		CreatedAt:                  now,
@@ -240,6 +248,14 @@ func (s *AuditService) Update(
 				audit.ValidUntil = req.ValidUntil
 			}
 
+			if req.AuditStartDate != nil {
+				audit.AuditStartDate = req.AuditStartDate
+			}
+
+			if req.AuditEndDate != nil {
+				audit.AuditEndDate = req.AuditEndDate
+			}
+
 			if req.State != nil {
 				audit.State = *req.State
 			}
diff --git a/pkg/server/api/console/v1/audit_resolvers.go b/pkg/server/api/console/v1/audit_resolvers.go
index 346f7030c..d4abaa0c8 100644
--- a/pkg/server/api/console/v1/audit_resolvers.go
+++ b/pkg/server/api/console/v1/audit_resolvers.go
@@ -384,6 +384,8 @@ func (r *mutationResolver) CreateAudit(ctx context.Context, input types.CreateAu
 		Name:                       input.Name,
 		ValidFrom:                  input.ValidFrom,
 		ValidUntil:                 input.ValidUntil,
+		AuditStartDate:             input.AuditStartDate,
+		AuditEndDate:               input.AuditEndDate,
 		State:                      input.State,
 		CompliancePortalVisibility: input.CompliancePortalVisibility,
 	}
@@ -439,6 +441,8 @@ func (r *mutationResolver) UpdateAudit(ctx context.Context, input types.UpdateAu
 		Name:                       gqlutils.UnwrapOmittable(input.Name),
 		ValidFrom:                  input.ValidFrom,
 		ValidUntil:                 input.ValidUntil,
+		AuditStartDate:             input.AuditStartDate,
+		AuditEndDate:               input.AuditEndDate,
 		State:                      input.State,
 		CompliancePortalVisibility: input.CompliancePortalVisibility,
 	}
diff --git a/pkg/server/api/console/v1/graphql/audit.graphql b/pkg/server/api/console/v1/graphql/audit.graphql
index 1b0e65233..7ee17ac4c 100644
--- a/pkg/server/api/console/v1/graphql/audit.graphql
+++ b/pkg/server/api/console/v1/graphql/audit.graphql
@@ -151,6 +151,8 @@ type Audit implements Node {
     framework: Framework @goField(forceResolver: true)
     validFrom: Datetime
     validUntil: Datetime
+    auditStartDate: Datetime
+    auditEndDate: Datetime
     reportFile: File @goField(forceResolver: true)
     state: AuditState!
 
@@ -275,6 +277,8 @@ input CreateAuditInput {
     name: String
     validFrom: Datetime
     validUntil: Datetime
+    auditStartDate: Datetime
+    auditEndDate: Datetime
     state: AuditState
     compliancePortalVisibility: CompliancePortalVisibility
     file: Upload
@@ -285,6 +289,8 @@ input UpdateAuditInput {
     name: String @goField(omittable: true)
     validFrom: Datetime
     validUntil: Datetime
+    auditStartDate: Datetime
+    auditEndDate: Datetime
     state: AuditState
     compliancePortalVisibility: CompliancePortalVisibility
 }
diff --git a/pkg/server/api/console/v1/types/audit.go b/pkg/server/api/console/v1/types/audit.go
index 63f301b2c..260401b06 100644
--- a/pkg/server/api/console/v1/types/audit.go
+++ b/pkg/server/api/console/v1/types/audit.go
@@ -76,6 +76,8 @@ func NewAudit(a *coredata.Audit) *Audit {
 		},
 		ValidFrom:                  a.ValidFrom,
 		ValidUntil:                 a.ValidUntil,
+		AuditStartDate:             a.AuditStartDate,
+		AuditEndDate:               a.AuditEndDate,
 		State:                      a.State,
 		Name:                       a.Name,
 		CompliancePortalVisibility: a.CompliancePortalVisibility,
diff --git a/pkg/server/api/mcp/v1/schema.resolvers.go b/pkg/server/api/mcp/v1/schema.resolvers.go
index a78931425..35035cb78 100644
--- a/pkg/server/api/mcp/v1/schema.resolvers.go
+++ b/pkg/server/api/mcp/v1/schema.resolvers.go
@@ -1499,6 +1499,8 @@ func (r *Resolver) AddAuditTool(ctx context.Context, req *mcp.CallToolRequest, i
 			Name:           input.Name,
 			ValidFrom:      input.ValidFrom,
 			ValidUntil:     input.ValidUntil,
+			AuditStartDate: input.AuditStartDate,
+			AuditEndDate:   input.AuditEndDate,
 			State:          input.State,
 			FrameworkID:    input.FrameworkID,
 		},
@@ -1527,6 +1529,8 @@ func (r *Resolver) UpdateAuditTool(ctx context.Context, req *mcp.CallToolRequest
 			Name:                       UnwrapOmittable(input.Name),
 			ValidFrom:                  input.ValidFrom,
 			ValidUntil:                 input.ValidUntil,
+			AuditStartDate:             input.AuditStartDate,
+			AuditEndDate:               input.AuditEndDate,
 			State:                      input.State,
 			CompliancePortalVisibility: input.CompliancePortalVisibility,
 		},
diff --git a/pkg/server/api/mcp/v1/specification.yaml b/pkg/server/api/mcp/v1/specification.yaml
index f8d00b817..8c5ff18d1 100644
--- a/pkg/server/api/mcp/v1/specification.yaml
+++ b/pkg/server/api/mcp/v1/specification.yaml
@@ -4674,6 +4674,18 @@ components:
             - "null"
           format: date-time
           description: Valid until date
+        audit_start_date:
+          type:
+            - string
+            - "null"
+          format: date-time
+          description: Audit start date
+        audit_end_date:
+          type:
+            - string
+            - "null"
+          format: date-time
+          description: Audit end date
         state:
           $ref: "#/components/schemas/AuditState"
           description: Audit state
@@ -4791,6 +4803,14 @@ components:
           type: string
           format: date-time
           description: Valid until date
+        audit_start_date:
+          type: string
+          format: date-time
+          description: Audit start date
+        audit_end_date:
+          type: string
+          format: date-time
+          description: Audit end date
         state:
           $ref: "#/components/schemas/AuditState"
           description: Audit state
@@ -4827,6 +4847,18 @@ components:
             - "null"
           format: date-time
           description: Valid until date
+        audit_start_date:
+          type:
+            - string
+            - "null"
+          format: date-time
+          description: Audit start date
+        audit_end_date:
+          type:
+            - string
+            - "null"
+          format: date-time
+          description: Audit end date
         state:
           anyOf:
             - $ref: "#/components/schemas/AuditState"
diff --git a/pkg/server/api/mcp/v1/types/audit.go b/pkg/server/api/mcp/v1/types/audit.go
index 35303f995..ec96392cd 100644
--- a/pkg/server/api/mcp/v1/types/audit.go
+++ b/pkg/server/api/mcp/v1/types/audit.go
@@ -36,6 +36,8 @@ func NewAudit(a *coredata.Audit, file *coredata.File) *Audit {
 		HasReport:                  a.ReportFileID != nil,
 		ValidFrom:                  a.ValidFrom,
 		ValidUntil:                 a.ValidUntil,
+		AuditStartDate:             a.AuditStartDate,
+		AuditEndDate:               a.AuditEndDate,
 		CreatedAt:                  a.CreatedAt,
 		UpdatedAt:                  a.UpdatedAt,
 	}