From 46e5271c98154cd2c3ae1d5714a08a4b97e5cfad Mon Sep 17 00:00:00 2001
From: Pierre <pierrevoss@arcor.de>
Date: Sun, 12 Jul 2026 23:13:37 +0200
Subject: [PATCH] feat: add safe sprint rollback workflows

---
 .../components/sprints/SprintActionMenu.tsx   |  17 +
 .../src/v2/components/sprints/SprintCell.tsx  |  20 +-
 .../v2/components/sprints/SprintLedger.tsx    |   3 +
 .../v2/components/sprints/SprintLedgerRow.tsx |  17 +-
 .../sprints/SprintRollbackModal.tsx           | 162 ++++++++
 .../__tests__/SprintCell.visual.test.tsx      |  26 ++
 .../SprintLedger.accessibility.test.tsx       |   5 +
 .../__tests__/SprintRollbackModal.test.tsx    | 100 +++++
 dashboard/src/v2/lib/project-api.ts           |  24 ++
 .../src/v2/pages/sprints/SprintsPage.tsx      |  15 +-
 dashboard/src/v2/types.ts                     |  10 +-
 .../docs/architecture-sprint-rollbacks.mdx    |  22 ++
 docs-web/content/docs/registry.ts             |   9 +
 .../content/docs/user-dashboard-sprints.mdx   |  11 +
 docs/SUMMARY.md                               |   1 +
 docs/architecture/sprint-rollbacks.md         |  71 ++++
 docs/architecture/system-overview.md          |   1 +
 docs/dashboard/design-system-sprints.md       |   2 +
 docs/index.md                                 |   4 +-
 docs/sprint-loop/atomic-loop.md               |   6 +
 src/app/dependency-factory.ts                 |   1 +
 .../dependency-factory/dashboard-factory.ts   |  13 +
 .../lifecycle/dashboard-lifecycle-service.ts  |   4 +
 src/cli/management-cli.ts                     |   1 +
 src/contracts/project-management-types.ts     |  33 ++
 .../composer/pr-description-composer.ts       |  13 +-
 .../composer/sprint-pr-input-builder.ts       |   2 +
 .../rollback-finalization-policy.ts           |  16 +
 .../sprint/orchestrator/watch-loop-runner.ts  |  33 +-
 src/repositories/db/app-db-migrations.ts      |   6 +
 src/repositories/db/app-db-schema.ts          |   5 +
 .../project-management-repository.ts          |  36 +-
 .../sprint-summary-query.ts                   |   5 +
 src/server/code-ux-server.ts                  |   4 +
 src/server/dashboard-server.ts                |   5 +
 src/server/sprint-routes.ts                   |  31 ++
 src/services/sprint-rollback-service.ts       | 369 ++++++++++++++++++
 .../composer/pr-description-composer.test.ts  |  14 +
 .../rollback-finalization-policy.test.ts      |  30 ++
 .../repositories/db/app-db-schema.test.ts     |   8 +
 .../project-management-repository.test.ts     |  32 ++
 .../server/sprint-rollback-routes.test.ts     |  67 ++++
 .../services/sprint-rollback-service.test.ts  | 151 +++++++
 43 files changed, 1381 insertions(+), 24 deletions(-)
 create mode 100644 dashboard/src/v2/components/sprints/SprintRollbackModal.tsx
 create mode 100644 dashboard/src/v2/components/sprints/__tests__/SprintRollbackModal.test.tsx
 create mode 100644 docs-web/content/docs/architecture-sprint-rollbacks.mdx
 create mode 100644 docs/architecture/sprint-rollbacks.md
 create mode 100644 src/domain/sprint/orchestrator/rollback-finalization-policy.ts
 create mode 100644 src/services/sprint-rollback-service.ts
 create mode 100644 tests/backend/domain/sprint/orchestrator/rollback-finalization-policy.test.ts
 create mode 100644 tests/backend/server/sprint-rollback-routes.test.ts
 create mode 100644 tests/backend/services/sprint-rollback-service.test.ts

diff --git a/dashboard/src/v2/components/sprints/SprintActionMenu.tsx b/dashboard/src/v2/components/sprints/SprintActionMenu.tsx
index d3df8ad8a2..bd9a3b8e11 100644
--- a/dashboard/src/v2/components/sprints/SprintActionMenu.tsx
+++ b/dashboard/src/v2/components/sprints/SprintActionMenu.tsx
@@ -10,6 +10,7 @@ import {
   Pause,
   Pencil,
   Play,
+  RotateCcw,
   Sparkles,
   Square,
   XCircle,
@@ -38,6 +39,7 @@ export interface SprintActionMenuProps {
   onToggleShowcase?: () => void;
   onOverrides?: () => void;
   onMarkCompleted?: () => void;
+  onRollback?: () => void;
   onDelete?: () => void;
   onClose?: () => void;
   markCompletedIcon?: "square" | "circle";
@@ -68,6 +70,7 @@ export const SprintActionMenu: FunctionComponent<SprintActionMenuProps> = ({
   onToggleShowcase,
   onOverrides,
   onMarkCompleted,
+  onRollback,
   onDelete,
   onClose,
   markCompletedIcon = "circle",
@@ -301,6 +304,20 @@ export const SprintActionMenu: FunctionComponent<SprintActionMenuProps> = ({
           Mark Completed
         </button>
       )}
+      {isCompleted && sprint.kind !== "rollback" && onRollback && (
+        <button
+          type="button"
+          role={role}
+          onClick={() => {
+            onClose?.();
+            onRollback();
+          }}
+          className={`${buttonClassName} text-orange-600 hover:bg-orange-500/10 dark:text-orange-300`}
+        >
+          <RotateCcw className="h-3.5 w-3.5" strokeWidth={2.1} />
+          Rollback Sprint
+        </button>
+      )}
       <button
         type="button"
         role={role}
diff --git a/dashboard/src/v2/components/sprints/SprintCell.tsx b/dashboard/src/v2/components/sprints/SprintCell.tsx
index 42aa3705a1..f6bc49caaf 100644
--- a/dashboard/src/v2/components/sprints/SprintCell.tsx
+++ b/dashboard/src/v2/components/sprints/SprintCell.tsx
@@ -13,6 +13,7 @@ import {
   Maximize2,
   MoreVertical,
   Play,
+  RotateCcw,
   Sparkles,
   Square,
   XCircle,
@@ -81,6 +82,7 @@ interface SprintCellProps {
   onOverrides?: () => void;
   onToggleShowcase?: () => void;
   onMarkCompleted?: () => void;
+  onRollback?: () => void;
 }
 
 const formatSprintKey = (sprint: Sprint, prefix: string = "SPR"): string => (
@@ -114,6 +116,7 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
   onOverrides,
   onToggleShowcase,
   onMarkCompleted,
+  onRollback,
 }) => {
   const reducedMotion = useReducedMotion();
   const interactionTokens = useInteractionTokens();
@@ -122,6 +125,7 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
   const bubbleRef = useRef<HTMLDivElement>(null);
   const [menuOpen, setMenuOpen] = useState(false);
   const state = statusMap[sprint.status];
+  const isRollback = sprint.kind === "rollback";
   const statusPresentation = getSprintStatusPresentation({
     state: sprint.status,
     humanInterventionTitle: humanIntervention?.title ?? null,
@@ -139,7 +143,7 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
 
   let effectiveLabel = statusPresentation.statusLabel;
   let effectiveTextTone = state.text;
-  let effectiveAccentHex = state.accentHex;
+  let effectiveAccentHex = isRollback ? "#F97316" : state.accentHex;
   let StatusIcon = state.icon;
 
   if (effectiveLabel === "QA") {
@@ -226,6 +230,7 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
     <div
       ref={bubbleRef}
       data-sprint-attention={attentionIndicatorState?.kind}
+      data-sprint-kind={sprint.kind}
       onMouseEnter={handleHoverEnter}
       onMouseLeave={handleHoverLeave}
       className="group relative flex h-72 w-72 shrink-0 cursor-pointer items-center justify-center perspective-1000 transition-transform duration-150 [@media(hover:hover)]:hover:-translate-y-px motion-reduce:transition-none motion-reduce:hover:transform-none lg:h-80 lg:w-80"
@@ -237,7 +242,7 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
         style={listReorderStyle}
       >
         <div
-          className={`absolute inset-0 overflow-hidden rounded-[inherit] border border-white/70 backdrop-blur-md transition-colors dark:border-white/[0.06] ${isRunning ? "bg-white/72 dark:bg-void-800/82" : "bg-white/55 dark:bg-void-800/65"}`}
+          className={`absolute inset-0 overflow-hidden rounded-[inherit] border backdrop-blur-md transition-colors ${isRollback ? "border-orange-400/35 bg-orange-50/78 dark:border-orange-400/25 dark:bg-orange-950/24" : `border-white/70 dark:border-white/[0.06] ${isRunning ? "bg-white/72 dark:bg-void-800/82" : "bg-white/55 dark:bg-void-800/65"}`}`}
           style={{
             ...listReorderStyle,
             WebkitMaskImage: "-webkit-radial-gradient(white, black)",
@@ -245,8 +250,8 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
           }}
         >
           <div className="pointer-events-none absolute inset-0 rounded-[inherit] shadow-[inset_0_0_0_1px_rgba(255,255,255,0.5)] dark:shadow-[inset_0_0_0_1px_rgba(255,255,255,0.04)]" />
-          <WaveFluid accentHex={state.accentHex} />
-          <BorderTrace accentHex={state.accentHex} />
+          <WaveFluid accentHex={effectiveAccentHex} />
+          <BorderTrace accentHex={effectiveAccentHex} />
         </div>
       </div>
 
@@ -302,6 +307,12 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
       )}
 
       <div className="relative z-20 flex h-full w-full flex-col items-center justify-center p-8 text-center">
+        {isRollback && (
+          <div className="absolute left-1/2 top-5 inline-flex -translate-x-1/2 items-center gap-1.5 rounded-full border border-orange-500/25 bg-orange-500/10 px-3 py-1 text-[9px] font-bold uppercase tracking-[0.16em] text-orange-700 dark:text-orange-300">
+            <RotateCcw className="h-3 w-3" strokeWidth={2.2} />
+            Rollback
+          </div>
+        )}
         {attentionIndicatorState && (
           <SprintAttentionIndicator
             state={attentionIndicatorState}
@@ -441,6 +452,7 @@ export const SprintCell: FunctionComponent<SprintCellProps> = ({
                 onToggleShowcase={onToggleShowcase}
                 onOverrides={onOverrides}
                 onMarkCompleted={onMarkCompleted}
+                onRollback={onRollback}
                 onDelete={onDelete}
                 onClose={() => setMenuOpen(false)}
                 markCompletedIcon="circle"
diff --git a/dashboard/src/v2/components/sprints/SprintLedger.tsx b/dashboard/src/v2/components/sprints/SprintLedger.tsx
index f90f9bf3c3..7eb0f8a849 100644
--- a/dashboard/src/v2/components/sprints/SprintLedger.tsx
+++ b/dashboard/src/v2/components/sprints/SprintLedger.tsx
@@ -66,6 +66,7 @@ export interface SprintLedgerProps {
   onExportSprint: (sprint: Sprint) => void;
   onOverridesSprint: (sprint: Sprint) => void;
   onMarkCompletedSprint: (sprintId: string) => void;
+  onRollbackSprint?: (sprint: Sprint) => void;
   onDeleteSprint: (sprintId: string) => void;
   onBulkShowcaseEnable: (sprintIds: string[]) => void;
   onBulkShowcaseDisable: (sprintIds: string[]) => void;
@@ -90,6 +91,7 @@ const SprintLedgerComponent: FunctionComponent<SprintLedgerProps> = ({
   onExportSprint,
   onOverridesSprint,
   onMarkCompletedSprint,
+  onRollbackSprint,
   onDeleteSprint,
   onBulkStart,
   onBulkDelete,
@@ -692,6 +694,7 @@ const SprintLedgerComponent: FunctionComponent<SprintLedgerProps> = ({
                   onExport={() => onExportSprint(sprint)}
                   onOverrides={() => onOverridesSprint(sprint)}
                   onMarkCompleted={() => onMarkCompletedSprint(sprint.id)}
+                  onRollback={onRollbackSprint ? () => onRollbackSprint(sprint) : undefined}
                   onDelete={() => { void handleDeleteSprint(sprint); }}
                 />
               ))
diff --git a/dashboard/src/v2/components/sprints/SprintLedgerRow.tsx b/dashboard/src/v2/components/sprints/SprintLedgerRow.tsx
index 4f45aa5cab..af126588a4 100644
--- a/dashboard/src/v2/components/sprints/SprintLedgerRow.tsx
+++ b/dashboard/src/v2/components/sprints/SprintLedgerRow.tsx
@@ -17,6 +17,7 @@ import {
   MoreVertical,
   Pause,
   Play,
+  RotateCcw,
   Square,
 } from "lucide-preact";
 import { useState, useRef, useEffect } from "preact/hooks";
@@ -116,6 +117,7 @@ export interface SprintLedgerRowProps {
   onExport: () => void;
   onOverrides: () => void;
   onMarkCompleted: () => void;
+  onRollback?: () => void;
   onDelete: () => void;
 }
 
@@ -141,6 +143,7 @@ const SprintLedgerRowComponent: FunctionComponent<SprintLedgerRowProps> = ({
   onExport,
   onOverrides,
   onMarkCompleted,
+  onRollback,
   onDelete,
 }) => {
   const [menuOpen, setMenuOpen] = useState(false);
@@ -201,6 +204,8 @@ const SprintLedgerRowComponent: FunctionComponent<SprintLedgerRowProps> = ({
 
   const rowTone = attentionIndicatorState
     ? "border-status-red/55 bg-status-red/[0.055] shadow-[0_14px_36px_rgba(227,0,15,0.14)]"
+    : sprint.kind === "rollback"
+    ? "border-orange-500/30 bg-orange-500/[0.07] shadow-[0_14px_36px_rgba(249,115,22,0.1)]"
     : isSelected
     ? "border-signal-500/35 bg-signal-500/[0.08] shadow-[0_18px_44px_rgba(0,224,160,0.12)]"
     : isEven
@@ -208,6 +213,8 @@ const SprintLedgerRowComponent: FunctionComponent<SprintLedgerRowProps> = ({
       : "border-black/[0.06] bg-slate-50/80 dark:border-white/[0.07] dark:bg-white/[0.03]";
   const desktopCellTone = attentionIndicatorState
     ? "lg:border-status-red/45 lg:bg-status-red/[0.045] dark:lg:border-status-red/45 dark:lg:bg-status-red/[0.06]"
+    : sprint.kind === "rollback"
+    ? "lg:border-orange-500/25 lg:bg-orange-500/[0.065] dark:lg:border-orange-400/20 dark:lg:bg-orange-500/[0.08]"
     : isSelected
     ? "lg:border-signal-500/25 lg:bg-signal-500/[0.08]"
     : isEven
@@ -352,7 +359,14 @@ const SprintLedgerRowComponent: FunctionComponent<SprintLedgerRowProps> = ({
       </TableCell>
       <TableCell className={`min-w-0 max-w-full lg:w-[220px] lg:min-w-[220px] ${desktopCellTone}`} mobileLabel="Sprint">
         <div className="flex flex-wrap items-center gap-2">
-          <div className={`font-display text-base font-semibold leading-tight break-words ${isCompleted ? "text-slate-700 dark:text-slate-300" : "text-[var(--text-primary)]"}`}>{sprint.name}</div>
+          <div className="flex flex-wrap items-center gap-2">
+            <div className={`font-display text-base font-semibold leading-tight break-words ${isCompleted ? "text-slate-700 dark:text-slate-300" : "text-[var(--text-primary)]"}`}>{sprint.name}</div>
+            {sprint.kind === "rollback" && (
+              <span className="inline-flex items-center gap-1 rounded-full border border-orange-500/25 bg-orange-500/10 px-2 py-0.5 text-[9px] font-bold uppercase tracking-[0.13em] text-orange-700 dark:text-orange-300">
+                <RotateCcw className="h-2.5 w-2.5" /> Rollback
+              </span>
+            )}
+          </div>
           {attentionIndicatorState && (
             <SprintAttentionIndicator state={attentionIndicatorState} compact />
           )}
@@ -583,6 +597,7 @@ const SprintLedgerRowComponent: FunctionComponent<SprintLedgerRowProps> = ({
                   onToggleShowcase={() => onToggleShowcase(sprint)}
                   onOverrides={onOverrides}
                   onMarkCompleted={onMarkCompleted}
+                  onRollback={onRollback}
                   onDelete={onDelete}
                   onClose={() => setMenuOpen(false)}
                   markCompletedIcon="square"
diff --git a/dashboard/src/v2/components/sprints/SprintRollbackModal.tsx b/dashboard/src/v2/components/sprints/SprintRollbackModal.tsx
new file mode 100644
index 0000000000..b514482af3
--- /dev/null
+++ b/dashboard/src/v2/components/sprints/SprintRollbackModal.tsx
@@ -0,0 +1,162 @@
+import type { FunctionComponent } from "preact";
+import { useEffect, useRef, useState } from "preact/hooks";
+import { AlertTriangle, Bot, Loader2, RotateCcw, ShieldCheck, X } from "lucide-preact";
+import type { Sprint, SprintRollbackAssessment } from "../../types.js";
+import { assessSprintRollback, createSprintRollback } from "../../lib/project-api.js";
+import { Modal } from "../ui/Modal.js";
+
+interface SprintRollbackModalProps {
+  sprint: Sprint | null;
+  onClose: () => void;
+  onCreated: () => Promise<void> | void;
+}
+
+export const SprintRollbackModal: FunctionComponent<SprintRollbackModalProps> = ({
+  sprint,
+  onClose,
+  onCreated,
+}) => {
+  const [assessment, setAssessment] = useState<SprintRollbackAssessment | null>(null);
+  const [instructions, setInstructions] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const [submitting, setSubmitting] = useState(false);
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+
+  useEffect(() => {
+    if (!sprint) {
+      setAssessment(null);
+      setInstructions("");
+      setError(null);
+      setSubmitting(false);
+      return;
+    }
+    const controller = new AbortController();
+    setAssessment(null);
+    setError(null);
+    void assessSprintRollback(sprint.projectId, sprint.id, controller.signal)
+      .then(setAssessment)
+      .catch((reason) => {
+        if (!controller.signal.aborted) {
+          setError(reason instanceof Error ? reason.message : String(reason));
+        }
+      });
+    return () => controller.abort();
+  }, [sprint?.id, sprint?.projectId]);
+
+  const customScope = instructions.trim().length > 0;
+  const effectiveMode = customScope ? "agent_assisted" : assessment?.recommendedMode;
+
+  const submit = async (): Promise<void> => {
+    if (!sprint || !assessment?.eligible || submitting) return;
+    setSubmitting(true);
+    setError(null);
+    try {
+      await createSprintRollback(sprint.projectId, sprint.id, instructions);
+      await onCreated();
+      onClose();
+    } catch (reason) {
+      setError(reason instanceof Error ? reason.message : String(reason));
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  return (
+    <Modal
+      isOpen={Boolean(sprint)}
+      onClose={submitting ? () => undefined : onClose}
+      disableBackdropClick={submitting}
+      ariaLabelledBy="sprint-rollback-title"
+      ariaDescribedBy="sprint-rollback-description"
+      initialFocusRef={textareaRef}
+      className="w-[min(44rem,calc(100vw-2rem))] overflow-hidden rounded-[1.7rem]"
+    >
+      <div className="relative overflow-hidden border-b border-black/[0.06] bg-[radial-gradient(circle_at_10%_0%,rgba(249,115,22,0.16),transparent_48%),linear-gradient(135deg,rgba(15,23,42,0.04),transparent)] px-6 py-6 dark:border-white/[0.07] dark:bg-[radial-gradient(circle_at_10%_0%,rgba(249,115,22,0.2),transparent_48%)] sm:px-8">
+        <div className="flex items-start justify-between gap-5">
+          <div className="flex min-w-0 items-start gap-4">
+            <div className="flex h-11 w-11 shrink-0 items-center justify-center rounded-2xl border border-orange-500/25 bg-orange-500/12 text-orange-600 shadow-[0_0_24px_rgba(249,115,22,0.14)] dark:text-orange-300">
+              <RotateCcw className="h-5 w-5" strokeWidth={2} />
+            </div>
+            <div className="min-w-0">
+              <div className="text-[10px] font-bold uppercase tracking-[0.2em] text-orange-600 dark:text-orange-300">Dedicated rollback sprint</div>
+              <h2 id="sprint-rollback-title" className="mt-2 font-display text-2xl font-semibold tracking-tight text-slate-900 dark:text-white">
+                Revert {sprint?.name || "sprint"}
+              </h2>
+              <p id="sprint-rollback-description" className="mt-2 max-w-xl text-sm leading-relaxed text-slate-500 dark:text-slate-400">
+                Code UX will preserve the original sprint and create a separately tracked rollback branch, sprint, and remote pull request.
+              </p>
+            </div>
+          </div>
+          <button type="button" onClick={onClose} disabled={submitting} aria-label="Close rollback dialog" className="touch-target flex h-9 w-9 shrink-0 items-center justify-center rounded-full text-slate-500 transition-colors hover:bg-black/[0.05] hover:text-slate-900 disabled:opacity-40 dark:hover:bg-white/[0.06] dark:hover:text-white">
+            <X className="h-4 w-4" />
+          </button>
+        </div>
+      </div>
+
+      <div className="space-y-5 px-6 py-6 sm:px-8">
+        {!assessment && !error && (
+          <div role="status" className="flex items-center gap-3 rounded-2xl border border-black/[0.06] bg-slate-50 px-4 py-4 text-sm text-slate-600 dark:border-white/[0.07] dark:bg-white/[0.035] dark:text-slate-300">
+            <Loader2 className="h-4 w-4 animate-spin text-orange-500 motion-reduce:animate-none" />
+            Inspecting merge history and later sprint work…
+          </div>
+        )}
+
+        {assessment && (
+          <div className={`rounded-2xl border px-4 py-4 ${assessment.eligible && assessment.recommendedMode === "automatic" ? "border-emerald-500/20 bg-emerald-500/[0.07]" : "border-orange-500/20 bg-orange-500/[0.07]"}`}>
+            <div className="flex items-center gap-2 text-sm font-semibold text-slate-900 dark:text-white">
+              {assessment.eligible && assessment.recommendedMode === "automatic" ? <ShieldCheck className="h-4 w-4 text-emerald-500" /> : <Bot className="h-4 w-4 text-orange-500" />}
+              {assessment.eligible
+                ? assessment.recommendedMode === "automatic" ? "Safe automatic rollback available" : "Agent-assisted rollback required"
+                : "Rollback is not available"}
+            </div>
+            <ul className="mt-3 space-y-1.5 text-xs leading-relaxed text-slate-600 dark:text-slate-300">
+              {assessment.reasons.map((reason) => <li key={reason}>• {reason}</li>)}
+            </ul>
+          </div>
+        )}
+
+        <label className="block">
+          <span className="text-[10px] font-bold uppercase tracking-[0.16em] text-slate-500 dark:text-slate-400">Rollback instructions <span className="font-medium normal-case tracking-normal">(optional)</span></span>
+          <textarea
+            ref={textareaRef}
+            value={instructions}
+            onInput={(event) => setInstructions(event.currentTarget.value)}
+            disabled={!assessment?.eligible || submitting}
+            rows={5}
+            maxLength={6000}
+            placeholder="Example: Remove only feature XY from this sprint and keep the database migration."
+            className="mt-2 w-full resize-y rounded-2xl border border-black/[0.08] bg-white px-4 py-3 text-sm leading-relaxed text-slate-900 outline-none transition focus:border-orange-500/40 focus:ring-4 focus:ring-orange-500/10 disabled:cursor-not-allowed disabled:opacity-55 dark:border-white/[0.08] dark:bg-white/[0.04] dark:text-white"
+          />
+          <span className="mt-2 block text-xs text-slate-500 dark:text-slate-400">
+            Adding instructions always invokes an agent so the requested subset can be removed safely.
+          </span>
+        </label>
+
+        {error && (
+          <div role="alert" className="flex items-start gap-2 rounded-2xl border border-status-red/20 bg-status-red/[0.07] px-4 py-3 text-sm text-status-red">
+            <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0" />
+            {error}
+          </div>
+        )}
+
+        <div className="flex flex-col-reverse gap-2 border-t border-black/[0.06] pt-5 dark:border-white/[0.07] sm:flex-row sm:items-center sm:justify-between">
+          <div className="text-xs text-slate-500 dark:text-slate-400">
+            {effectiveMode === "automatic" ? "No coding invocation will be started." : effectiveMode === "agent_assisted" ? "A rollback coding invocation will be started." : ""}
+          </div>
+          <div className="flex gap-2">
+            <button type="button" onClick={onClose} disabled={submitting} className="rounded-full px-4 py-2 text-xs font-semibold text-slate-600 transition hover:bg-black/[0.04] disabled:opacity-40 dark:text-slate-300 dark:hover:bg-white/[0.05]">Cancel</button>
+            <button
+              type="button"
+              onClick={() => void submit()}
+              disabled={!assessment?.eligible || submitting}
+              className="inline-flex min-w-36 items-center justify-center gap-2 rounded-full bg-orange-500 px-5 py-2.5 text-xs font-bold uppercase tracking-[0.12em] text-white shadow-[0_10px_24px_rgba(249,115,22,0.22)] transition hover:-translate-y-px hover:bg-orange-400 focus-visible:ring-2 focus-visible:ring-orange-500/40 disabled:cursor-not-allowed disabled:opacity-45 disabled:hover:translate-y-0"
+            >
+              {submitting ? <Loader2 className="h-4 w-4 animate-spin motion-reduce:animate-none" /> : <RotateCcw className="h-4 w-4" />}
+              {submitting ? "Starting" : customScope ? "Start agent rollback" : "Create rollback"}
+            </button>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  );
+};
diff --git a/dashboard/src/v2/components/sprints/__tests__/SprintCell.visual.test.tsx b/dashboard/src/v2/components/sprints/__tests__/SprintCell.visual.test.tsx
index 940baa245e..8272c38393 100644
--- a/dashboard/src/v2/components/sprints/__tests__/SprintCell.visual.test.tsx
+++ b/dashboard/src/v2/components/sprints/__tests__/SprintCell.visual.test.tsx
@@ -38,6 +38,11 @@ const sprint: Sprint = {
   endDate: null,
   featureBranch: null,
   baseCommitSha: null,
+  kind: "standard",
+  rollbackSourceSprintId: null,
+  rollbackMode: null,
+  rollbackInstructions: null,
+  rollbackSafetyReason: null,
   latestReview: undefined,
   id: "sprint-1",
   number: 1,
@@ -157,4 +162,25 @@ describe("SprintCell visuals", () => {
     expect(container.querySelector("[data-sprint-attention]")).not.toBeInTheDocument();
     expect(container.querySelector("[data-sprint-attention-indicator]")).not.toBeInTheDocument();
   });
+
+  it("renders rollback sprints with a dedicated orange treatment", () => {
+    const { container } = render(
+      <SprintCell
+        sprint={{
+          ...sprint,
+          kind: "rollback",
+          rollbackSourceSprintId: "source-sprint",
+          rollbackMode: "automatic",
+          rollbackSafetyReason: "Safe isolated merge.",
+          name: "Rollback Sprint 1",
+        }}
+        isEven={false}
+        accentColor="text-signal-600 dark:text-signal-300"
+      />,
+    );
+
+    expect(container.querySelector('[data-sprint-kind="rollback"]')).toBeInTheDocument();
+    expect(screen.getByText("Rollback")).toHaveClass("text-orange-700");
+    expect(container.querySelector(".border-orange-400\\/35")).toBeInTheDocument();
+  });
 });
diff --git a/dashboard/src/v2/components/sprints/__tests__/SprintLedger.accessibility.test.tsx b/dashboard/src/v2/components/sprints/__tests__/SprintLedger.accessibility.test.tsx
index 0013cd0840..c476cd4444 100644
--- a/dashboard/src/v2/components/sprints/__tests__/SprintLedger.accessibility.test.tsx
+++ b/dashboard/src/v2/components/sprints/__tests__/SprintLedger.accessibility.test.tsx
@@ -30,6 +30,11 @@ const mockSprint: Sprint = {
   endDate: null,
   featureBranch: null,
   baseCommitSha: null,
+  kind: "standard",
+  rollbackSourceSprintId: null,
+  rollbackMode: null,
+  rollbackInstructions: null,
+  rollbackSafetyReason: null,
   latestReview: undefined,
   id: "sprint-1",
   number: 1,
diff --git a/dashboard/src/v2/components/sprints/__tests__/SprintRollbackModal.test.tsx b/dashboard/src/v2/components/sprints/__tests__/SprintRollbackModal.test.tsx
new file mode 100644
index 0000000000..aaf8a8df33
--- /dev/null
+++ b/dashboard/src/v2/components/sprints/__tests__/SprintRollbackModal.test.tsx
@@ -0,0 +1,100 @@
+// @vitest-environment jsdom
+/// <reference types="@testing-library/jest-dom" />
+import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/preact";
+import * as matchers from "@testing-library/jest-dom/matchers";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { Sprint } from "../../../types.js";
+import { SprintRollbackModal } from "../SprintRollbackModal.js";
+import { assessSprintRollback, createSprintRollback } from "../../../lib/project-api.js";
+
+expect.extend(matchers);
+
+vi.mock("../../../lib/project-api.js", () => ({
+  assessSprintRollback: vi.fn(),
+  createSprintRollback: vi.fn(),
+}));
+vi.mock("../../../hooks/use-reduced-motion.js", () => ({
+  useReducedMotion: () => true,
+  useResolvedMotionDuration: <T,>(duration: T) => duration,
+}));
+vi.mock("gsap", () => ({ default: { fromTo: vi.fn(), set: vi.fn(), to: vi.fn() } }));
+
+const sprint: Sprint = {
+  id: "sprint-1",
+  projectId: "project-1",
+  number: 1,
+  slug: "sprint-1",
+  name: "Feature Sprint",
+  isGeneratedName: false,
+  originalPrompt: null,
+  goal: "Build a feature",
+  status: "completed",
+  showcasePinned: true,
+  startDate: null,
+  endDate: null,
+  featureBranch: "feature/sprint-1",
+  baseCommitSha: "base",
+  kind: "standard",
+  rollbackSourceSprintId: null,
+  rollbackMode: null,
+  rollbackInstructions: null,
+  rollbackSafetyReason: null,
+  tasksCount: 1,
+  completion: 100,
+  linkedIssues: [],
+  createdAt: "2026-01-01T00:00:00.000Z",
+  updatedAt: "2026-01-02T00:00:00.000Z",
+  date: "2026-01-01T00:00:00.000Z",
+};
+
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+describe("SprintRollbackModal", () => {
+  it("explains the automatic path and submits an empty scope", async () => {
+    vi.mocked(assessSprintRollback).mockResolvedValue({
+      sourceSprintId: sprint.id,
+      eligible: true,
+      recommendedMode: "automatic",
+      reasons: ["Safe isolated merge."],
+    });
+    vi.mocked(createSprintRollback).mockResolvedValue({
+      rollbackSprint: { ...sprint, id: "rollback-1", kind: "rollback", rollbackSourceSprintId: sprint.id, rollbackMode: "automatic" },
+      mode: "automatic",
+      assessment: { sourceSprintId: sprint.id, eligible: true, recommendedMode: "automatic", reasons: [] },
+    });
+    const onCreated = vi.fn();
+    render(<SprintRollbackModal sprint={sprint} onClose={vi.fn()} onCreated={onCreated} />);
+
+    expect(await screen.findByText("Safe automatic rollback available")).toBeInTheDocument();
+    expect(screen.getByText("No coding invocation will be started.")).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Create rollback" }));
+    await waitFor(() => expect(createSprintRollback).toHaveBeenCalledWith("project-1", "sprint-1", ""));
+    expect(onCreated).toHaveBeenCalled();
+  });
+
+  it("switches to an agent rollback when instructions are entered", async () => {
+    vi.mocked(assessSprintRollback).mockResolvedValue({
+      sourceSprintId: sprint.id,
+      eligible: true,
+      recommendedMode: "automatic",
+      reasons: ["Safe isolated merge."],
+    });
+    vi.mocked(createSprintRollback).mockResolvedValue({
+      rollbackSprint: { ...sprint, id: "rollback-2", kind: "rollback", rollbackSourceSprintId: sprint.id, rollbackMode: "agent_assisted" },
+      mode: "agent_assisted",
+      assessment: { sourceSprintId: sprint.id, eligible: true, recommendedMode: "agent_assisted", reasons: [] },
+    });
+    render(<SprintRollbackModal sprint={sprint} onClose={vi.fn()} onCreated={vi.fn()} />);
+
+    await screen.findByText("Safe automatic rollback available");
+    fireEvent.input(screen.getByRole("textbox", { name: /Rollback instructions/i }), {
+      target: { value: "Remove only feature XY." },
+    });
+    expect(screen.getByText("A rollback coding invocation will be started.")).toBeInTheDocument();
+    fireEvent.click(screen.getByRole("button", { name: "Start agent rollback" }));
+    await waitFor(() => expect(createSprintRollback).toHaveBeenCalledWith("project-1", "sprint-1", "Remove only feature XY."));
+  });
+});
diff --git a/dashboard/src/v2/lib/project-api.ts b/dashboard/src/v2/lib/project-api.ts
index af083a2a5f..4784845007 100644
--- a/dashboard/src/v2/lib/project-api.ts
+++ b/dashboard/src/v2/lib/project-api.ts
@@ -1,6 +1,7 @@
 import type {
   CreateProjectInput,
   CreateSprintInput,
+  CreateSprintRollbackResult,
   CreateTaskInput,
   IssuePromptContext,
   IssuePromptContextInput,
@@ -21,6 +22,7 @@ import type {
   SprintLinkedIssueInput,
   SprintLinkedIssueRecord,
   SprintRecord,
+  SprintRollbackAssessment,
   TaskRecord,
   UpdateProjectInput,
   UpdateSprintInput,
@@ -362,6 +364,28 @@ export const createSprint = async (projectId: string, input: CreateSprintInput):
   });
 };
 
+export const assessSprintRollback = async (
+  projectId: string,
+  sprintId: string,
+  signal?: AbortSignal,
+): Promise<SprintRollbackAssessment> => fetchJson<SprintRollbackAssessment>(
+  `/api/projects/${encodeURIComponent(projectId)}/sprints/${encodeURIComponent(sprintId)}/rollback/assessment`,
+  { signal },
+);
+
+export const createSprintRollback = async (
+  projectId: string,
+  sprintId: string,
+  instructions: string,
+): Promise<CreateSprintRollbackResult> => fetchJson<CreateSprintRollbackResult>(
+  `/api/projects/${encodeURIComponent(projectId)}/sprints/${encodeURIComponent(sprintId)}/rollback`,
+  {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ instructions: instructions.trim() || undefined }),
+  },
+);
+
 export const improveSprintPrompt = async (
   projectId: string,
   input: ImprovePromptInput,
diff --git a/dashboard/src/v2/pages/sprints/SprintsPage.tsx b/dashboard/src/v2/pages/sprints/SprintsPage.tsx
index c8b1267b74..098b986a98 100644
--- a/dashboard/src/v2/pages/sprints/SprintsPage.tsx
+++ b/dashboard/src/v2/pages/sprints/SprintsPage.tsx
@@ -38,6 +38,7 @@ import { SprintIssueImportModal } from "../../components/sprints/SprintIssueImpo
 import { SprintJiraImportModal } from "../../components/sprints/SprintJiraImportModal.js";
 import { SprintProjectManagementImportModal } from "../../components/sprints/SprintProjectManagementImportModal.js";
 import { SprintCanvasImportModal } from "../../components/sprints/SprintCanvasImportModal.js";
+import { SprintRollbackModal } from "../../components/sprints/SprintRollbackModal.js";
 import { ConfirmDialog } from "../../components/ui/ConfirmDialog.js";
 import { useConfirmDialog } from "../../hooks/use-confirm-dialog.js";
 import { ActionFeedbackRegion } from "../../components/ui/ActionFeedbackRegion.js";
@@ -49,7 +50,7 @@ import { useReducedMotion } from "../../hooks/use-reduced-motion.js";
 import { useRouteProjectSelection } from "../../hooks/use-route-project-selection.js";
 import { PageContainer } from "../../components/layout/PageContainer.js";
 import { PageHeader } from "../../components/layout/PageHeader.js";
-import type { SprintLinkedIssueInput } from "../../types.js";
+import type { Sprint, SprintLinkedIssueInput } from "../../types.js";
 import type { SprintImportedTaskInput } from "../../types.js";
 
 const ACCENT_CYCLE = ["text-signal-500", "text-ember-500", "text-status-green"] as const;
@@ -181,6 +182,7 @@ export const SprintsPage: FunctionComponent = () => {
   const [showAddProjectModal, setShowAddProjectModal] = useState(false);
   const [showSprintGallery, setShowSprintGallery] = useState(readStoredSprintGalleryVisibility);
   const [showIssueImportModal, setShowIssueImportModal] = useState(false);
+  const [rollbackSprint, setRollbackSprint] = useState<Sprint | null>(null);
   const [issueImportProvider, setIssueImportProvider] = useState<RepositoryIssueImportProvider>("github");
   const [isJiraModalOpen, setIsJiraModalOpen] = useState(false);
   const [linkedIssues, setLinkedIssues] = useState<SprintLinkedIssueInput[]>([]);
@@ -401,6 +403,7 @@ export const SprintsPage: FunctionComponent = () => {
     setEditingSprint(null);
     setShowQuicksprint(false);
     setRowMenu(null);
+    setRollbackSprint(null);
     setLinkedIssues([]);
     clearImportedTaskDrafts();
   }, [
@@ -794,6 +797,7 @@ export const SprintsPage: FunctionComponent = () => {
                         onPauseResume={pauseResumeRun ? () => { handleSprintPauseResume(sprint.id); } : undefined}
                         onAddTasks={() => { void handleOpenAppendTasks(sprint); }}
                         onMarkCompleted={() => { void handleMarkCompleted(sprint.id); }}
+                        onRollback={() => setRollbackSprint(sprint)}
                         onEdit={() => {
                       setEditingSprint(sprint);
                       setShowCreateComposer(false);
@@ -966,6 +970,7 @@ export const SprintsPage: FunctionComponent = () => {
                 onExportSprint={handleExportSprintFromLedger}
                 onOverridesSprint={handleOverridesSprintFromLedger}
                 onMarkCompletedSprint={handleMarkCompletedFromLedger}
+                onRollbackSprint={setRollbackSprint}
                 onDeleteSprint={handleDeleteSprintFromLedger}
                 onBulkStart={handleBulkStart}
                 onBulkDelete={handleBulkDelete}
@@ -1142,6 +1147,7 @@ export const SprintsPage: FunctionComponent = () => {
               onMarkCompleted={() => {
                 void handleMarkCompleted(activeRowMenuSprint.id);
               }}
+              onRollback={() => setRollbackSprint(activeRowMenuSprint)}
               onDelete={() => {
                 void requestConfirm({
                   title: "Delete Sprint?",
@@ -1163,6 +1169,13 @@ export const SprintsPage: FunctionComponent = () => {
         </div>,
         document.body
       )}
+      <SprintRollbackModal
+        sprint={rollbackSprint}
+        onClose={() => setRollbackSprint(null)}
+        onCreated={async () => {
+          await Promise.all([refreshSprints(), refreshExecution()]);
+        }}
+      />
     </ExecutionTimelineProvider>
   );
 };
diff --git a/dashboard/src/v2/types.ts b/dashboard/src/v2/types.ts
index c7e3a5bb00..7acd8c4de5 100644
--- a/dashboard/src/v2/types.ts
+++ b/dashboard/src/v2/types.ts
@@ -78,6 +78,8 @@ import type {
 import type {
   CreateProjectInput,
   CreateSprintInput,
+  CreateSprintRollbackInput,
+  CreateSprintRollbackResult,
   CreateTaskInput,
   IssuePromptContext,
   IssuePromptContextInput,
@@ -101,6 +103,7 @@ import type {
   SprintCollectionResponse,
   SprintMarkdownImportTask,
   SprintRecord,
+  SprintRollbackAssessment,
   SprintReviewSummary,
   SprintStatus,
   TaskExecutorType,
@@ -517,6 +520,11 @@ export type {
   NodeDefinitionManifest,
 };
 
-export type { SprintReviewSummary };
+export type {
+  CreateSprintRollbackInput,
+  CreateSprintRollbackResult,
+  SprintReviewSummary,
+  SprintRollbackAssessment,
+};
 
 export type { ProjectInvocationsQuery, ProjectInvocationsQueryResult };
diff --git a/docs-web/content/docs/architecture-sprint-rollbacks.mdx b/docs-web/content/docs/architecture-sprint-rollbacks.mdx
new file mode 100644
index 0000000000..839c7a4a84
--- /dev/null
+++ b/docs-web/content/docs/architecture-sprint-rollbacks.mdx
@@ -0,0 +1,22 @@
+# Sprint Rollbacks
+
+Code UX models a rollback as a new sprint, not as destructive history editing. The original sprint remains auditable, while the rollback receives its own branch, tasks, execution history, visual identity, and remote pull request.
+
+## Choosing the execution path
+
+Before creation, Code UX checks the completed source sprint, remote Git configuration, later sprint activity, and the source merge at the tip of the default branch.
+
+- **Automatic rollback** is offered only for a proven isolated latest merge with no later sprint work. Code UX reverts that merge in a detached worktree and pushes a dedicated rollback branch without starting a coding invocation.
+- **Agent-assisted rollback** is used when later work may depend on the source, merge history is ambiguous, a deterministic revert conflicts, or you enter custom instructions.
+
+Entering instructions always selects the agent path. This is how you request a partial rollback such as “remove only feature XY but keep the migration.” The agent is told to inspect dependencies, preserve compatible work, update tests, and push only to the rollback branch.
+
+## Pull-request guarantee
+
+Every rollback is delivered through a remote pull request. Rollback sprints force live PR tracking even when ordinary sprint PR monitoring is disabled. If the normal main-PR mode is `OFF`, rollback uses `CREATE_PR` behavior and pauses for a human merge. The rollback sprint is completed only after the Git host reports the PR merged.
+
+## Dashboard identity
+
+Rollback gallery cells and ledger rows use an orange treatment, a rollback badge, and distinct action copy. Their normal run status, task progress, CI state, review state, and human-attention indicators remain visible.
+
+See [Sprints](/docs/user-dashboard-sprints) for the operator workflow.
diff --git a/docs-web/content/docs/registry.ts b/docs-web/content/docs/registry.ts
index c346b5dcaf..ddc672638a 100644
--- a/docs-web/content/docs/registry.ts
+++ b/docs-web/content/docs/registry.ts
@@ -95,6 +95,7 @@ export type DocsSlug =
   | 'architecture-system-overview'
   | 'architecture-mcp-server'
   | 'architecture-sprint-engine'
+  | 'architecture-sprint-rollbacks'
   | 'architecture-virtual-workers'
   | 'architecture-ci-integration'
   | 'architecture-dashboard-architecture'
@@ -773,6 +774,13 @@ export const docsRegistry: Record<DocsSlug, DocsRegistryEntry> = {
     title: "Sprint engine",
     description: "The sprint engine is the heart of Code UX. It schedules, dispatches, monitors, gates, and finalises every unit of work.",
   },
+  'architecture-sprint-rollbacks': {
+    id: 'architecture-sprint-rollbacks',
+    path: '/docs/architecture-sprint-rollbacks',
+    section: 'Architecture',
+    title: "Sprint rollbacks",
+    description: "How Code UX assesses, executes, tracks, and PR-gates automatic and agent-assisted sprint rollbacks.",
+  },
   'architecture-virtual-workers': {
     id: 'architecture-virtual-workers',
     path: '/docs/architecture-virtual-workers',
@@ -1036,6 +1044,7 @@ export const orderedDocs: DocsRegistryEntry[] = [
   docsRegistry['architecture-system-overview'],
   docsRegistry['architecture-mcp-server'],
   docsRegistry['architecture-sprint-engine'],
+  docsRegistry['architecture-sprint-rollbacks'],
   docsRegistry['architecture-virtual-workers'],
   docsRegistry['architecture-ci-integration'],
   docsRegistry['architecture-dashboard-architecture'],
diff --git a/docs-web/content/docs/user-dashboard-sprints.mdx b/docs-web/content/docs/user-dashboard-sprints.mdx
index fb039baf78..5539c29768 100644
--- a/docs-web/content/docs/user-dashboard-sprints.mdx
+++ b/docs-web/content/docs/user-dashboard-sprints.mdx
@@ -110,6 +110,17 @@ You can run any sprint multiple times. Each run has its own ID and its own row i
 
 Pausing / cancelling are also exposed as MCP actions via the `manage_sprints` tool (actions `pause`, `cancel`, `force_cancel`).
 
+## Rolling back a completed sprint
+
+Open the action menu of a completed standard sprint and choose **Rollback Sprint**. Code UX first inspects the remote merge history and later sprint work, then explains the selected path:
+
+- **Automatic** means the sprint is the latest proven isolated merge and no later sprint work exists. Code UX creates the revert in a detached worktree without a coding invocation.
+- **Agent-assisted** means later work, ambiguous history, or a revert conflict requires an agent to isolate the safe change set.
+
+Use the optional instruction field for partial rollbacks such as “remove only feature XY.” Any entered instruction starts an agent invocation so dependent behavior can be preserved deliberately.
+
+The original sprint is never rewritten. Every request creates an orange, visibly labelled rollback sprint with its own task history and branch. Every rollback uses a remote pull request, even if ordinary sprint PR monitoring is disabled, and the rollback sprint is not complete until that PR is merged. See [Sprint Rollbacks](/docs/architecture-sprint-rollbacks) for the safety model.
+
 ## Importing & exporting sprints
 
 Sprints support importing issues directly from external providers, as well as being portable as Markdown bundles:
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index a6c74b9e57..cfd54d82db 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -61,6 +61,7 @@
   - [MCP Issue Importer Contract](./mcp/tools-and-contracts.md#manage_sprints-import_issues)
 - [MCP Runtime and Dispatch](./mcp/runtime-and-dispatch.md)
 - [Atomic Sprint Loop](./sprint-loop/atomic-loop.md)
+- [Sprint Rollbacks](./architecture/sprint-rollbacks.md)
 - [Instruction Template System](./instructions/markdown-template-system.md)
 - [Dashboard Guide](./dashboard/dashboard-guide.md)
 - [Dashboard Accessibility Patterns](./dashboard/dashboard-guide.md#accessibility-patterns)
diff --git a/docs/architecture/sprint-rollbacks.md b/docs/architecture/sprint-rollbacks.md
new file mode 100644
index 0000000000..8aa09b7f22
--- /dev/null
+++ b/docs/architecture/sprint-rollbacks.md
@@ -0,0 +1,71 @@
+# Sprint Rollbacks
+
+Sprint rollback is a first-class orchestration mode that reverses an integrated sprint without rewriting the source sprint or the default branch. Every request creates a dedicated rollback sprint, rollback branch, and remote pull request.
+
+## Safety contract
+
+A rollback is eligible only when all of these conditions hold:
+
+- the source belongs to the selected project and is a completed standard sprint;
+- the project uses `REMOTE` git mode;
+- the repository path and recorded source feature branch are available;
+- no active or completed rollback sprint already targets the source.
+
+Code UX recommends the automatic path only when it can additionally prove that:
+
+- no later non-rollback sprint has started or completed;
+- the current `origin/<default>` tip is an isolated merge commit;
+- the merge message or second parent proves that the merge belongs to the source feature branch.
+
+These checks are intentionally conservative. An ambiguous history is not an automatic failure: it selects the agent-assisted path.
+
+## Automatic path
+
+`SprintRollbackService` fetches the default branch, creates a detached temporary worktree, creates a unique `rollback/<source>-<suffix>` branch, and runs `git revert -m 1` against the proven integration merge. The branch is pushed to `origin` only after the revert succeeds. The visible checkout and uncommitted user work are never changed.
+
+The rollback sprint receives one already-settled audit task and starts normal finalization. Automatic rollbacks skip task/sprint provider work, completion QA, and memory-remediation invocation. They still use the normal remote main-merge gate for PR creation, CI observation, conflict repair, and final completion.
+
+If the deterministic revert conflicts or any Git step cannot complete safely, the same rollback sprint is changed to `agent_assisted` and receives a pending rollback task.
+
+## Agent-assisted path
+
+An agent is always used when:
+
+- later sprint work may depend on the source;
+- the integration merge cannot be proven;
+- the automatic revert fails;
+- the user enters rollback instructions, including a partial request such as “remove only feature XY.”
+
+The generated task prompt includes the source sprint key and branch, rollback branch, safety findings, requested scope, preservation requirements, tests, and a prohibition on merging directly to the default branch. The task runs through the existing coding, QA, Git, and CI pipeline.
+
+## Pull-request invariant
+
+Rollback finalization forces remote PR monitoring even if ordinary sprint monitoring is disabled. For a rollback sprint, `mainBranchAutoMergeMode=OFF` behaves as `CREATE_PR`: Code UX creates the PR and pauses until a human merges it. Other configured modes retain their normal CI and auto-merge behavior. A rollback run is not marked complete until the Git host reports the rollback PR merged.
+
+## Persistence
+
+The `sprints` record keeps immutable rollback lineage and execution intent:
+
+- `kind`: `standard` or `rollback`;
+- `rollback_source_sprint_id`;
+- `rollback_mode`: `automatic` or `agent_assisted`;
+- `rollback_instructions`;
+- `rollback_safety_reason`.
+
+The source sprint cannot be deleted while a rollback sprint references it. This preserves audit history and lets the dashboard link the corrective sprint to its cause.
+
+## HTTP surface
+
+- `GET /api/projects/:projectId/sprints/:sprintId/rollback/assessment`
+- `POST /api/projects/:projectId/sprints/:sprintId/rollback` with optional `{ "instructions": "..." }`
+
+The assessment returns eligibility, the recommended mode, and user-facing safety reasons. Creation returns the dedicated rollback sprint, selected mode, and final assessment; HTTP `202` means orchestration was accepted.
+
+## Verification
+
+```bash
+pnpm exec vitest run tests/backend/services/sprint-rollback-service.test.ts tests/backend/server/sprint-rollback-routes.test.ts
+pnpm exec vitest run dashboard/src/v2/components/sprints/__tests__/SprintRollbackModal.test.tsx dashboard/src/v2/components/sprints/__tests__/SprintCell.visual.test.tsx
+pnpm run lint
+pnpm run build
+```
diff --git a/docs/architecture/system-overview.md b/docs/architecture/system-overview.md
index f29106b51b..9184e7d860 100644
--- a/docs/architecture/system-overview.md
+++ b/docs/architecture/system-overview.md
@@ -43,6 +43,7 @@ Code UX is a container-first multi-provider runtime with an integrated dashboard
 - `src/domain/sprint/ci/*`
 - Atomic step modules in `src/sprint/steps/*`
 - Git-mode behavior is split at the final merge gate. REMOTE mode waits for the hosted completion PR to be observed as merged before marking a run complete. LOCAL mode performs the final `feature -> default` merge in the host repository, restores the user's prior checkout afterward, and keeps the run active or paused with merge attention when the local merge fails.
+- Completed REMOTE-mode sprints can be reversed through the [Sprint Rollback](./sprint-rollbacks.md) subsystem. It creates a dedicated rollback sprint and chooses a deterministic detached-worktree revert only when history is provably isolated; otherwise it routes a dependency-aware rollback task through an agent. Both paths end at a required remote PR gate.
 
 ### 4. Instruction template system
 - `src/instructions/instruction-template-service.ts`
diff --git a/docs/dashboard/design-system-sprints.md b/docs/dashboard/design-system-sprints.md
index 43ac5a74f1..8ac3465c79 100644
--- a/docs/dashboard/design-system-sprints.md
+++ b/docs/dashboard/design-system-sprints.md
@@ -34,6 +34,8 @@ This document outlines the design system for the Sprints page and related planni
 
 ### Sprint Action State Management
 
+*   **Rollback identity:** Completed standard sprints expose **Rollback Sprint** in their action menu. The assessment modal explains whether the rollback can run automatically or requires an agent and provides an optional instruction textarea; any non-empty instruction forces the agent path. Rollback sprints use an orange gallery surface, border, badge, and ledger-row treatment with visible `Rollback` text, so color is not the only distinction. The orange identity does not replace normal status, progress, CI, review, or attention semantics.
+
 *   **Sprint Attention Indicator:** `SprintAttentionIndicator` gives gallery cells and ledger rows one attention-state contract derived from the effective sprint status presentation. Failed sprint execution takes precedence and uses a red-bordered outer treatment plus a pulsing exclamation indicator. Eligible human-owned intervention uses the same red outer treatment plus a compact person/`zZZ` waiting indicator. Both states retain the normal status, progress, review, links, and actions. Worker- and system-owned transient pauses must not be presented as human intervention.
 *   **Semantic Labels:** The indicator is a semantic status named `Sprint execution failed` or `Sprint waiting for human intervention`; its icon and decorative `zZZ` text are hidden from assistive technology. Do not replace these labels with color, border, animation, or icon-only meaning.
 *   **Motion And Density:** Attention animation uses the shared motion timing and `motion-safe`/`motion-reduce` contract. Reduced-motion mode removes the failure pulse and waiting bounce while keeping the red border, indicator, visible copy, and semantic status mounted. The ledger variant remains compact, and desktop attention borders continue across every table cell while mobile preserves the complete row border and `mobileLabel` semantics.
diff --git a/docs/index.md b/docs/index.md
index 46669c2146..f482d30009 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -84,7 +84,8 @@ Use this page as the main entrypoint.
 42. [External MCP Worker Client](./architecture/external-mcp-worker-client.md)
 43. [Virtual Workers](./architecture/virtual-workers.md)
 44. [Atomic Sprint Loop](./sprint-loop/atomic-loop.md)
-45. [Instruction Template System](./instructions/markdown-template-system.md)
+45. [Sprint Rollbacks](./architecture/sprint-rollbacks.md)
+46. [Instruction Template System](./instructions/markdown-template-system.md)
 46. [Configuration and Storage](./settings/configuration-and-storage.md)
 47. [Provider Routing](./settings/provider-routing.md)
 48. [Chat Provider Integrations](./settings/chat-provider-integrations.md)
@@ -182,6 +183,7 @@ Use this page as the main entrypoint.
 - [MCP Tools and Contracts](./mcp/tools-and-contracts.md)
 - [MCP Runtime and Dispatch](./mcp/runtime-and-dispatch.md)
 - [Atomic Sprint Loop](./sprint-loop/atomic-loop.md)
+- [Sprint Rollbacks](./architecture/sprint-rollbacks.md)
 - [Instruction Template System](./instructions/markdown-template-system.md)
 - [Dashboard Guide](./dashboard/dashboard-guide.md)
 - [Dashboard Accessibility Patterns](./dashboard/dashboard-guide.md#accessibility-patterns)
diff --git a/docs/sprint-loop/atomic-loop.md b/docs/sprint-loop/atomic-loop.md
index b7c44daf0e..a93206c056 100644
--- a/docs/sprint-loop/atomic-loop.md
+++ b/docs/sprint-loop/atomic-loop.md
@@ -255,6 +255,12 @@ pnpm run test:backend
 pnpm run lint
 ```
 
+## Rollback finalization
+
+Rollback sprints use the same dependency, Git, CI, conflict-repair, and final merge gates as standard sprints. An automatic rollback enters the loop with a settled audit task, skips completion QA and memory-remediation provider work, and proceeds directly to its required remote PR. Agent-assisted rollbacks run their generated rollback task normally. Rollback finalization always enables remote PR tracking; an otherwise disabled main-PR mode becomes `CREATE_PR` for that rollback only.
+
+See [Sprint Rollbacks](../architecture/sprint-rollbacks.md) for safety classification and persistence details.
+
 ## Files and Data Used
 
 - Subtasks directory:
diff --git a/src/app/dependency-factory.ts b/src/app/dependency-factory.ts
index 6f35637b3f..cb3c297f83 100644
--- a/src/app/dependency-factory.ts
+++ b/src/app/dependency-factory.ts
@@ -29,6 +29,7 @@ export interface ServerContext {
   getAppConfig: () => AppConfig;
   getEffectiveJulesApiKey: () => string | undefined;
   getEffectiveGithubToken: () => string | undefined;
+  getEffectiveGitlabToken: () => string | undefined;
   getDashboardPort: () => number;
   isJulesApiConfigured: () => boolean;
   getMissingJulesApiKeyInstruction: () => string;
diff --git a/src/app/dependency-factory/dashboard-factory.ts b/src/app/dependency-factory/dashboard-factory.ts
index 7d0d88244f..26bd93a1fb 100644
--- a/src/app/dependency-factory/dashboard-factory.ts
+++ b/src/app/dependency-factory/dashboard-factory.ts
@@ -29,6 +29,7 @@ import { ChatProviderOutboundService } from "../../services/chat-provider-outbou
 import { SpeechTranscriptionService } from "../../services/speech-transcription-service.js";
 import { SpeechSynthesisService } from "../../services/speech-synthesis-service.js";
 import { SpeechModelManager } from "../../services/speech-model-manager.js";
+import { SprintRollbackService } from "../../services/sprint-rollback-service.js";
 import { NodeFlowRuntimeService } from "../../services/node-flow-runtime-service.js";
 import { NodeFlowService } from "../../services/node-flow-service.js";
 import { NodeFlowRecoveryService } from "../../services/node-flows/node-flow-recovery-service.js";
@@ -72,6 +73,7 @@ export interface DashboardDependencies {
   projectSetupService: ProjectSetupService;
   sprintIssueService: CoreDependencies["sprintIssueService"];
   schedulerService: SchedulerService;
+  sprintRollbackService: SprintRollbackService;
   searchJiraIssues: CoreDependencies["sprintIssueService"]["searchJiraIssues"];
   searchJiraProjectStatuses: CoreDependencies["sprintIssueService"]["searchJiraProjectStatuses"];
   replaceSprintLinkedIssues: CoreDependencies["projectManagementRepository"]["replaceSprintLinkedIssues"];
@@ -132,6 +134,16 @@ export function createDashboardDependencies(
     activeDispatchRegistry,
     logger: logger.child({ component: "execution-invocation-control-service" }),
   });
+  const sprintRollbackService = new SprintRollbackService({
+    projectManagementRepository,
+    settingsRepository,
+    orchestrateSprint: (projectId, sprintId) => executionControlService.orchestrateSprint(projectId, sprintId),
+    getGitAuth: () => ({
+      githubToken: context.getEffectiveGithubToken(),
+      gitlabToken: context.getEffectiveGitlabToken(),
+    }),
+    logger: logger.child({ component: "sprint-rollback-service" }),
+  });
 
   const managementToolHandler = new ManagementToolHandler({
     sprintPreviewService: coreDeps.sprintPreviewService,
@@ -635,6 +647,7 @@ export function createDashboardDependencies(
     projectSetupService,
     sprintIssueService: coreDeps.sprintIssueService,
     schedulerService,
+    sprintRollbackService,
     searchJiraIssues: coreDeps.sprintIssueService.searchJiraIssues.bind(coreDeps.sprintIssueService),
     searchJiraProjectStatuses: coreDeps.sprintIssueService.searchJiraProjectStatuses?.bind(coreDeps.sprintIssueService)
       ?? (() => {
diff --git a/src/app/lifecycle/dashboard-lifecycle-service.ts b/src/app/lifecycle/dashboard-lifecycle-service.ts
index 11f2b19fdb..710f3f7c71 100644
--- a/src/app/lifecycle/dashboard-lifecycle-service.ts
+++ b/src/app/lifecycle/dashboard-lifecycle-service.ts
@@ -57,6 +57,7 @@ import type { ChatProviderOutboundService } from "../../services/chat-provider-o
 import type { QuicksprintService } from "../../services/quicksprint-service.js";
 import type { ProjectSetupService } from "../../services/project-setup-service.js";
 import type { SchedulerService } from "../../services/scheduler-service.js";
+import type { SprintRollbackService } from "../../services/sprint-rollback-service.js";
 import type { ChatProviderIngressService } from "../../services/chat-provider-ingress-service.js";
 import type { SpeechTranscriptionService } from "../../services/speech-transcription-service.js";
 import type { SpeechSynthesisService } from "../../services/speech-synthesis-service.js";
@@ -136,6 +137,7 @@ export interface BootDashboardDeps {
   quicksprintService: QuicksprintService;
   projectSetupService: ProjectSetupService;
   schedulerService: SchedulerService;
+  sprintRollbackService: SprintRollbackService;
   sprintIssueService: SprintIssueService;
   chatThreadRuntimeService: ChatThreadRuntimeService;
   chatProviderIngressService: ChatProviderIngressService;
@@ -727,6 +729,8 @@ export async function bootDashboard(deps: BootDashboardDeps): Promise<DashboardS
     createSprint: (projectId, input) => deps.projectManagementRepository.createSprint(projectId, input),
     updateSprint: (sprintId, input) => deps.projectManagementRepository.updateSprint(sprintId, input),
     deleteSprint: (sprintId) => deps.projectManagementRepository.deleteSprint(sprintId),
+    assessSprintRollback: (projectId, sprintId) => deps.sprintRollbackService.assess(projectId, sprintId),
+    createSprintRollback: (projectId, sprintId, input) => deps.sprintRollbackService.create(projectId, sprintId, input),
     importSprintFromMarkdown: (projectId, input) => deps.sprintMarkdownService.importSprint(projectId, input),
     exportSprintToMarkdown: (projectId, sprintId) => deps.sprintMarkdownService.exportSprint(projectId, sprintId),
     listTasks: (projectId, sprintId) => deps.projectManagementRepository.listTasks(projectId, sprintId),
diff --git a/src/cli/management-cli.ts b/src/cli/management-cli.ts
index 7d95e30552..a0a436f79b 100644
--- a/src/cli/management-cli.ts
+++ b/src/cli/management-cli.ts
@@ -122,6 +122,7 @@ function createCliServerContext(projectRoot: string, appConfig: AppConfig, runti
     getAppConfig: () => appConfig,
     getEffectiveJulesApiKey: () => appConfig.apiKey ?? process.env.JULES_API_KEY?.trim() ?? process.env.JULES_KEY?.trim() ?? undefined,
     getEffectiveGithubToken: () => process.env.GITHUB_TOKEN?.trim() || process.env.GH_TOKEN?.trim() || undefined,
+    getEffectiveGitlabToken: () => process.env.GITLAB_TOKEN?.trim() || process.env.GLAB_TOKEN?.trim() || undefined,
     getDashboardPort: () => appConfig.dashboardPort,
     isJulesApiConfigured: () => Boolean(appConfig.apiKey || process.env.JULES_API_KEY || process.env.JULES_KEY),
     getMissingJulesApiKeyInstruction: () => "Set JULES_API_KEY in your environment or dashboard settings.",
diff --git a/src/contracts/project-management-types.ts b/src/contracts/project-management-types.ts
index a212f9107c..9684adb46a 100644
--- a/src/contracts/project-management-types.ts
+++ b/src/contracts/project-management-types.ts
@@ -6,6 +6,8 @@ import type { ProjectWorkerAssignmentRecord } from "./worker-types.js";
 export type ProjectStatus = "running" | "failed" | "intervention" | "idle";
 export type ProjectSourceType = "local" | "git";
 export type SprintStatus = "running" | "paused" | "completed" | "failed" | "cancelled" | "idle";
+export type SprintKind = "standard" | "rollback";
+export type SprintRollbackMode = "automatic" | "agent_assisted";
 export type TaskStatus = "pending" | "in_progress" | "coding_completed" | "completed" | "QA_REVIEW_FAILED";
 export type TaskPriority = "critical" | "high" | "medium" | "low";
 export type TaskExecutorType = "auto" | "docker_cli" | "jules" | "mcp_worker";
@@ -274,6 +276,11 @@ export interface SprintRecord {
   endDate: string | null;
   featureBranch: string | null;
   baseCommitSha: string | null;
+  kind: SprintKind;
+  rollbackSourceSprintId: string | null;
+  rollbackMode: SprintRollbackMode | null;
+  rollbackInstructions: string | null;
+  rollbackSafetyReason: string | null;
   tasksCount: number;
   completion: number;
   linkedIssues: SprintLinkedIssueRecord[];
@@ -361,6 +368,29 @@ export interface CreateSprintInput {
   endDate?: string | null;
   featureBranch?: string | null;
   baseCommitSha?: string | null;
+  /** Internal metadata used by SprintRollbackService. Dashboard create parsing does not expose it. */
+  kind?: SprintKind;
+  rollbackSourceSprintId?: string | null;
+  rollbackMode?: SprintRollbackMode | null;
+  rollbackInstructions?: string | null;
+  rollbackSafetyReason?: string | null;
+}
+
+export interface SprintRollbackAssessment {
+  sourceSprintId: string;
+  eligible: boolean;
+  recommendedMode: SprintRollbackMode;
+  reasons: string[];
+}
+
+export interface CreateSprintRollbackInput {
+  instructions?: string;
+}
+
+export interface CreateSprintRollbackResult {
+  rollbackSprint: SprintRecord;
+  mode: SprintRollbackMode;
+  assessment: SprintRollbackAssessment;
 }
 
 export interface UpdateSprintInput {
@@ -376,6 +406,9 @@ export interface UpdateSprintInput {
   endDate?: string | null;
   featureBranch?: string | null;
   baseCommitSha?: string | null;
+  /** Internal rollback metadata; public request parsing intentionally omits these fields. */
+  rollbackMode?: SprintRollbackMode | null;
+  rollbackSafetyReason?: string | null;
 }
 
 export interface PlanningOverrides {
diff --git a/src/domain/sprint/composer/pr-description-composer.ts b/src/domain/sprint/composer/pr-description-composer.ts
index d7f0b7fb8c..63b0f3870b 100644
--- a/src/domain/sprint/composer/pr-description-composer.ts
+++ b/src/domain/sprint/composer/pr-description-composer.ts
@@ -1,5 +1,5 @@
 import type { TaskPrTemplateSections, SprintPrTemplateSections, TaskPrSectionKey, SprintPrSectionKey } from "../../../contracts/app-types.js";
-import type { LinkedIssueProvider } from "../../../contracts/project-management-types.js";
+import type { LinkedIssueProvider, SprintKind } from "../../../contracts/project-management-types.js";
 import { formatTaskPrTitle } from "../../git/task-pr-title-template.js";
 import { formatCostUsd, formatDurationMs, formatIsoTimestamp, formatTokenCount, providerDisplayName } from "./pr-description-format-utils.js";
 
@@ -102,6 +102,8 @@ export interface SprintPrLinkedIssueSummary {
 }
 
 export interface SprintPrComposerInput {
+  sprintKind?: SprintKind;
+  rollbackSourceSprintId?: string | null;
   sprintId: string;
   sprintNumber?: number | null;
   sprintName?: string | null;
@@ -371,8 +373,11 @@ export function composeTaskPrTitle(input: TaskPrTitleComposerInput): string {
 }
 
 export function composeSprintPrTitle(
-  input: Pick<SprintPrComposerInput, "sprintNumber" | "sprintName" | "featureBranch" | "defaultBranch">,
+  input: Pick<SprintPrComposerInput, "sprintNumber" | "sprintName" | "featureBranch" | "defaultBranch" | "sprintKind">,
 ): string {
+  if (input.sprintKind === "rollback") {
+    return `${input.sprintName || `Rollback Sprint ${input.sprintNumber ?? "?"}`} — merge ${input.featureBranch} into ${input.defaultBranch}`;
+  }
   const label = input.sprintName
     ? `Sprint ${input.sprintNumber ?? "?"}: ${input.sprintName}`
     : `Sprint ${input.sprintNumber ?? "?"}`;
@@ -395,7 +400,9 @@ export function composeTaskPrBody(input: TaskPrComposerInput): string {
 export function composeSprintPrBody(input: SprintPrComposerInput): string {
   const order = resolveSectionOrder(input.sectionOrder, DEFAULT_SPRINT_SECTION_ORDER);
   const label = sprintLabel(input.sprintNumber, input.sprintName);
-  const parts: string[] = [`## 🚀 Sprint Completion: ${label}\n> Automated sprint completion PR opened by Code UX.`];
+  const parts: string[] = input.sprintKind === "rollback"
+    ? [`## Sprint Rollback: ${label}\n> Dedicated rollback PR opened by Code UX. Source sprint: \`${input.rollbackSourceSprintId || "unknown"}\`.`]
+    : [`## 🚀 Sprint Completion: ${label}\n> Automated sprint completion PR opened by Code UX.`];
 
   for (const key of order) {
     if (!input.sections[key]) continue;
diff --git a/src/domain/sprint/composer/sprint-pr-input-builder.ts b/src/domain/sprint/composer/sprint-pr-input-builder.ts
index a7ed26ba24..d6cff5843b 100644
--- a/src/domain/sprint/composer/sprint-pr-input-builder.ts
+++ b/src/domain/sprint/composer/sprint-pr-input-builder.ts
@@ -72,6 +72,8 @@ export function buildSprintPrComposerInput(args: BuildSprintPrComposerInputArgs)
     : null;
 
   return {
+    sprintKind: sprint.kind,
+    rollbackSourceSprintId: sprint.rollbackSourceSprintId,
     sprintId: sprint.id,
     sprintNumber: sprint.number,
     sprintName: sprint.name,
diff --git a/src/domain/sprint/orchestrator/rollback-finalization-policy.ts b/src/domain/sprint/orchestrator/rollback-finalization-policy.ts
new file mode 100644
index 0000000000..772df8175a
--- /dev/null
+++ b/src/domain/sprint/orchestrator/rollback-finalization-policy.ts
@@ -0,0 +1,16 @@
+import type { CiIntelligenceSettings } from "../../../contracts/app-types.js";
+
+export function resolveRollbackFinalizationCiIntelligence(
+  configured: CiIntelligenceSettings,
+  isRollback: boolean,
+): CiIntelligenceSettings {
+  if (!isRollback) return configured;
+  return {
+    ...configured,
+    enabled: true,
+    enableLivePrMonitoring: true,
+    mainBranchAutoMergeMode: configured.mainBranchAutoMergeMode === "OFF"
+      ? "CREATE_PR"
+      : configured.mainBranchAutoMergeMode,
+  };
+}
diff --git a/src/domain/sprint/orchestrator/watch-loop-runner.ts b/src/domain/sprint/orchestrator/watch-loop-runner.ts
index fcad2e27b0..706fadaaf8 100644
--- a/src/domain/sprint/orchestrator/watch-loop-runner.ts
+++ b/src/domain/sprint/orchestrator/watch-loop-runner.ts
@@ -41,6 +41,7 @@ import type { HeartbeatService } from "../../../services/heartbeat-service.js";
 import type { SprintIssueService } from "../../../services/sprint-issue-service.js";
 import type { SprintRunLifecycleService } from "../../../services/sprint-run-lifecycle-service.js";
 import { getFailedJobLabels, getFailedLogSnippets } from "../../../sprint/ci-status-utils.js";
+import { resolveRollbackFinalizationCiIntelligence } from "./rollback-finalization-policy.js";
 
 
 export type WatchLoopExecutionDependencies = Pick<ExecutionRepository, "appendSprintRunEvent" | "getSprintRun" | "getLatestTaskRun" | "getTaskRunByDispatchId" | "listTaskDispatches" | "listTaskRunEvents">;
@@ -516,11 +517,19 @@ export class WatchLoopRunner {
   }): Promise<{ status: "continue" | "exit" | "wait"; report: string }> {
     const {
       scopedExecutionContext, sprintRunId, repoPath, defaultFeatureBranch, defaultBranch,
-      featureBranchPrefix, githubMode, ciIntelligence, subtasks, runningTasks, readyTasks,
+      featureBranchPrefix, githubMode, ciIntelligence: configuredCiIntelligence, subtasks, runningTasks, readyTasks,
       manualMergeTasks, needsManualMerge, allTasksSettled, allTerminal, noMoreActionPossible,
       activeMainMergeAttentionItems,
     } = params;
 
+    // Rollbacks are never allowed to bypass the remote PR boundary, even when the
+    // project has disabled normal sprint PR monitoring. OFF becomes CREATE_PR so
+    // the rollback pauses for a human merge instead of completing on branch push.
+    const ciIntelligence = resolveRollbackFinalizationCiIntelligence(
+      configuredCiIntelligence,
+      scopedExecutionContext.sprint.kind === "rollback",
+    );
+
     let report = "";
     const mainMergeScope = {
       sprintId: scopedExecutionContext.sprint.id,
@@ -542,6 +551,8 @@ export class WatchLoopRunner {
         githubMode,
       }).settledTasks.length === subtasks.length
     );
+    const isAutomaticRollback = scopedExecutionContext.sprint.kind === "rollback"
+      && scopedExecutionContext.sprint.rollbackMode === "automatic";
 
     this.deps.projectAttentionService.resolveItemsForSprintRun(
       scopedExecutionContext.project.id,
@@ -571,7 +582,7 @@ export class WatchLoopRunner {
 
     if (allTasksSettledForFinalization) {
       try {
-        if (this.deps.qualityAssuranceService) {
+        if (this.deps.qualityAssuranceService && !isAutomaticRollback) {
           const qaOutcome = await this.deps.qualityAssuranceService.reviewSprintCompletion({
             projectId: scopedExecutionContext.project.id,
             sprintId: scopedExecutionContext.sprint.id,
@@ -1050,14 +1061,16 @@ export class WatchLoopRunner {
           sprintRunId,
           "sprint_completed",
         );
-        this.triggerMemoryRemediation({
-          projectId: scopedExecutionContext.project.id,
-          sprintId: scopedExecutionContext.sprint.id,
-          sprintRunId,
-          repoPath,
-          sprintName: scopedExecutionContext.sprint.name,
-          sprintGoal: scopedExecutionContext.sprint.goal,
-        });
+        if (!isAutomaticRollback) {
+          this.triggerMemoryRemediation({
+            projectId: scopedExecutionContext.project.id,
+            sprintId: scopedExecutionContext.sprint.id,
+            sprintRunId,
+            repoPath,
+            sprintName: scopedExecutionContext.sprint.name,
+            sprintGoal: scopedExecutionContext.sprint.goal,
+          });
+        }
         const issueCloseOutcome = await this.deps.sprintIssueService?.closeLinkedIssues(
           scopedExecutionContext.project.id,
           scopedExecutionContext.sprint.id,
diff --git a/src/repositories/db/app-db-migrations.ts b/src/repositories/db/app-db-migrations.ts
index 026edafe55..9a002e7b05 100644
--- a/src/repositories/db/app-db-migrations.ts
+++ b/src/repositories/db/app-db-migrations.ts
@@ -981,6 +981,12 @@ export function runMigrations(db: DatabaseAdapter): void {
   ensureColumn(db, "sprints", "original_prompt", "TEXT");
   ensureColumn(db, "sprints", "base_commit_sha", "TEXT");
   ensureColumn(db, "sprints", "is_generated_name", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "sprints", "kind", "TEXT NOT NULL DEFAULT 'standard'");
+  ensureColumn(db, "sprints", "rollback_source_sprint_id", "TEXT");
+  ensureColumn(db, "sprints", "rollback_mode", "TEXT");
+  ensureColumn(db, "sprints", "rollback_instructions", "TEXT");
+  ensureColumn(db, "sprints", "rollback_safety_reason", "TEXT");
+  ensureIndex(db, "idx_sprints_rollback_source", "sprints", "project_id, rollback_source_sprint_id, created_at DESC");
   ensureColumn(db, "tasks", "executor_type", "TEXT NOT NULL DEFAULT 'auto'");
   ensureColumn(db, "sprint_preview_sessions", "port_mappings_json", "TEXT");
   ensureColumn(db, "sprint_preview_sessions", "environment_overrides_json", "TEXT");
diff --git a/src/repositories/db/app-db-schema.ts b/src/repositories/db/app-db-schema.ts
index 11a01e2682..7908a0667b 100644
--- a/src/repositories/db/app-db-schema.ts
+++ b/src/repositories/db/app-db-schema.ts
@@ -50,6 +50,11 @@ CREATE TABLE IF NOT EXISTS sprints (
         end_date TEXT,
         feature_branch TEXT,
         base_commit_sha TEXT,
+        kind TEXT NOT NULL DEFAULT 'standard',
+        rollback_source_sprint_id TEXT,
+        rollback_mode TEXT,
+        rollback_instructions TEXT,
+        rollback_safety_reason TEXT,
         created_at TEXT NOT NULL,
         updated_at TEXT NOT NULL,
         FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE
diff --git a/src/repositories/project-management-repository.ts b/src/repositories/project-management-repository.ts
index 580b3bea98..d4fafb5fcf 100644
--- a/src/repositories/project-management-repository.ts
+++ b/src/repositories/project-management-repository.ts
@@ -88,6 +88,11 @@ interface SprintRow {
   end_date: string | null;
   feature_branch: string | null;
   base_commit_sha: string | null;
+  kind: SprintRecord["kind"] | null;
+  rollback_source_sprint_id: string | null;
+  rollback_mode: SprintRecord["rollbackMode"];
+  rollback_instructions: string | null;
+  rollback_safety_reason: string | null;
   created_at: string;
   updated_at: string;
 }
@@ -366,8 +371,9 @@ export class ProjectManagementRepository {
 
       this.db.prepare(`
         INSERT INTO sprints (
-          id, project_id, number, slug, name, is_generated_name, original_prompt, goal, status, showcase_pinned, start_date, end_date, feature_branch, base_commit_sha, created_at, updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+          id, project_id, number, slug, name, is_generated_name, original_prompt, goal, status, showcase_pinned, start_date, end_date, feature_branch, base_commit_sha,
+          kind, rollback_source_sprint_id, rollback_mode, rollback_instructions, rollback_safety_reason, created_at, updated_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       `).run(
         id,
         projectId,
@@ -383,6 +389,11 @@ export class ProjectManagementRepository {
         input.endDate || null,
         input.featureBranch || null,
         input.baseCommitSha || null,
+        input.kind || "standard",
+        input.rollbackSourceSprintId || null,
+        input.rollbackMode || null,
+        input.rollbackInstructions?.trim() || null,
+        input.rollbackSafetyReason?.trim() || null,
         now,
         now
       );
@@ -416,7 +427,8 @@ export class ProjectManagementRepository {
 
       this.db.prepare(`
         UPDATE sprints
-        SET number = ?, slug = ?, name = ?, is_generated_name = ?, original_prompt = ?, goal = ?, status = ?, showcase_pinned = ?, start_date = ?, end_date = ?, feature_branch = ?, base_commit_sha = ?, updated_at = ?
+        SET number = ?, slug = ?, name = ?, is_generated_name = ?, original_prompt = ?, goal = ?, status = ?, showcase_pinned = ?, start_date = ?, end_date = ?, feature_branch = ?, base_commit_sha = ?,
+            rollback_mode = ?, rollback_safety_reason = ?, updated_at = ?
         WHERE id = ?
       `).run(
         input.number === undefined ? current.number : input.number,
@@ -431,6 +443,8 @@ export class ProjectManagementRepository {
         input.endDate === undefined ? current.endDate : input.endDate,
         input.featureBranch === undefined ? current.featureBranch : input.featureBranch,
         input.baseCommitSha === undefined ? current.baseCommitSha : input.baseCommitSha,
+        input.rollbackMode === undefined ? current.rollbackMode : input.rollbackMode,
+        input.rollbackSafetyReason === undefined ? current.rollbackSafetyReason : input.rollbackSafetyReason,
         now,
         sprintId
       );
@@ -454,6 +468,15 @@ export class ProjectManagementRepository {
   deleteSprint(sprintId: string): void {
     try {
       const sprint = this.requireSprint(sprintId);
+      const rollbackReference = this.db.prepare(`
+        SELECT id
+        FROM sprints
+        WHERE rollback_source_sprint_id = ?
+        LIMIT 1
+      `).get(sprintId) as { id: string } | undefined;
+      if (rollbackReference) {
+        throw new ValidationError(`Sprint ${sprintId} is retained as the source of rollback sprint ${rollbackReference.id}.`);
+      }
       const activeRun = this.db.prepare(`
         SELECT id, status
         FROM sprint_runs
@@ -1340,6 +1363,13 @@ export class ProjectManagementRepository {
       endDate: row.end_date,
       featureBranch: row.feature_branch,
       baseCommitSha: row.base_commit_sha,
+      kind: row.kind === "rollback" ? "rollback" : "standard",
+      rollbackSourceSprintId: row.rollback_source_sprint_id,
+      rollbackMode: row.rollback_mode === "automatic" || row.rollback_mode === "agent_assisted"
+        ? row.rollback_mode
+        : null,
+      rollbackInstructions: row.rollback_instructions,
+      rollbackSafetyReason: row.rollback_safety_reason,
       tasksCount,
       completion,
       linkedIssues,
diff --git a/src/repositories/project-management/sprint-summary-query.ts b/src/repositories/project-management/sprint-summary-query.ts
index 43b9ff492b..754853f98e 100644
--- a/src/repositories/project-management/sprint-summary-query.ts
+++ b/src/repositories/project-management/sprint-summary-query.ts
@@ -46,6 +46,11 @@ export const sprintSummaryQuery = {
         s.end_date,
         s.feature_branch,
         s.base_commit_sha,
+        s.kind,
+        s.rollback_source_sprint_id,
+        s.rollback_mode,
+        s.rollback_instructions,
+        s.rollback_safety_reason,
         s.created_at,
         s.updated_at
   `,
diff --git a/src/server/code-ux-server.ts b/src/server/code-ux-server.ts
index 0ede0da2c5..22edd18a57 100644
--- a/src/server/code-ux-server.ts
+++ b/src/server/code-ux-server.ts
@@ -205,6 +205,7 @@ export class CodeUxServer {
   private quicksprintService: import("../services/quicksprint-service.js").QuicksprintService;
   private projectSetupService: import("../services/project-setup-service.js").ProjectSetupService;
   private schedulerService: import("../services/scheduler-service.js").SchedulerService;
+  private sprintRollbackService: import("../services/sprint-rollback-service.js").SprintRollbackService;
   private nodeFlowService: import("../services/node-flow-service.js").NodeFlowService;
   private chatThreadRuntimeService: import("../services/chat-thread-runtime-service.js").ChatThreadRuntimeService;
   private chatProviderIngressService: ChatProviderIngressService;
@@ -307,6 +308,7 @@ export class CodeUxServer {
     this.quicksprintService = deps.quicksprintService;
     this.projectSetupService = deps.projectSetupService;
     this.schedulerService = deps.schedulerService;
+    this.sprintRollbackService = deps.sprintRollbackService;
     this.nodeFlowService = deps.nodeFlowService;
     this.chatThreadRuntimeService = deps.chatThreadRuntimeService;
     this.chatProviderIngressService = deps.chatProviderIngressService;
@@ -692,6 +694,7 @@ export class CodeUxServer {
       getAppConfig: () => this.appConfig,
       getEffectiveJulesApiKey: () => this.getEffectiveJulesApiKey(),
       getEffectiveGithubToken: () => this.getEffectiveGithubToken(),
+      getEffectiveGitlabToken: () => this.getEffectiveGitlabToken(),
       getDashboardPort: () => this.getDashboardPort(),
       isJulesApiConfigured: () => this.isJulesApiConfigured(),
       getMissingJulesApiKeyInstruction: () => this.getMissingJulesApiKeyInstruction(),
@@ -1448,6 +1451,7 @@ export class CodeUxServer {
         quicksprintService: this.quicksprintService,
         projectSetupService: this.projectSetupService,
         schedulerService: this.schedulerService,
+        sprintRollbackService: this.sprintRollbackService,
         nodeFlowService: this.nodeFlowService,
         credentialBroker: this.credentialBroker,
         headlessAuthService: this.headlessAuthService,
diff --git a/src/server/dashboard-server.ts b/src/server/dashboard-server.ts
index 2525cb484f..9325a320e6 100644
--- a/src/server/dashboard-server.ts
+++ b/src/server/dashboard-server.ts
@@ -85,6 +85,8 @@ import type {
 import type {
   CreateProjectInput,
   CreateSprintInput,
+  CreateSprintRollbackInput,
+  CreateSprintRollbackResult,
   CreateTaskInput,
   ImprovePromptInput,
   PlanSprintOptions,
@@ -99,6 +101,7 @@ import type {
   SprintMarkdownImportInput,
   SprintImportedTaskInput,
   SprintRecord,
+  SprintRollbackAssessment,
   TaskRecord,
   UpdateProjectInput,
   UpdateSprintInput,
@@ -270,6 +273,8 @@ export interface DashboardServerOptions {
   createSprint: (projectId: string, input: CreateSprintInput) => SprintRecord;
   updateSprint: (sprintId: string, input: UpdateSprintInput) => SprintRecord;
   deleteSprint: (sprintId: string) => void;
+  assessSprintRollback: (projectId: string, sprintId: string) => Promise<SprintRollbackAssessment>;
+  createSprintRollback: (projectId: string, sprintId: string, input: CreateSprintRollbackInput) => Promise<CreateSprintRollbackResult>;
   importSprintFromMarkdown: (projectId: string, input: SprintMarkdownImportInput) => SprintRecord;
   exportSprintToMarkdown: (projectId: string, sprintId: string) => SprintMarkdownExportBundle;
   listTasks: (projectId: string, sprintId?: string) => TaskRecord[];
diff --git a/src/server/sprint-routes.ts b/src/server/sprint-routes.ts
index 3ecc42aa1d..3d0514578d 100644
--- a/src/server/sprint-routes.ts
+++ b/src/server/sprint-routes.ts
@@ -28,6 +28,37 @@ export function registerSprintRoutes(router: Express, deps: DashboardDependencie
     }
   }));
 
+  router.get("/api/projects/:projectId/sprints/:sprintId/rollback/assessment", asyncRoute(async (req, res) => {
+    try {
+      res.json(await deps.assessSprintRollback(
+        requireTrimmedString(req.params.projectId, "projectId"),
+        requireTrimmedString(req.params.sprintId, "sprintId"),
+      ));
+    } catch (error) {
+      res.status(400).json(toErrorResponse(error, "Failed to assess sprint rollback"));
+    }
+  }));
+
+  router.post("/api/projects/:projectId/sprints/:sprintId/rollback", asyncRoute(async (req, res) => {
+    try {
+      if (
+        req.body?.instructions !== undefined
+        && req.body.instructions !== null
+        && typeof req.body.instructions !== "string"
+      ) {
+        throw new Error("Invalid field: instructions must be a string.");
+      }
+      const instructions = parseTrimmedString(req.body?.instructions);
+      res.status(202).json(await deps.createSprintRollback(
+        requireTrimmedString(req.params.projectId, "projectId"),
+        requireTrimmedString(req.params.sprintId, "sprintId"),
+        { instructions },
+      ));
+    } catch (error) {
+      res.status(400).json(toErrorResponse(error, "Failed to create sprint rollback"));
+    }
+  }));
+
   router.get("/api/projects/:projectId/jira/search", asyncRoute(async (req, res) => {
     try {
       const projectId = requireTrimmedString(req.params.projectId, "projectId");
diff --git a/src/services/sprint-rollback-service.ts b/src/services/sprint-rollback-service.ts
new file mode 100644
index 0000000000..0aab23c8df
--- /dev/null
+++ b/src/services/sprint-rollback-service.ts
@@ -0,0 +1,369 @@
+import { randomUUID } from "node:crypto";
+import { mkdtemp, rm } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import type {
+  CreateSprintRollbackInput,
+  CreateSprintRollbackResult,
+  ProjectSummary,
+  SprintRecord,
+  SprintRollbackAssessment,
+  SprintRollbackMode,
+} from "../contracts/project-management-types.js";
+import type { ProjectManagementRepository } from "../repositories/project-management-repository.js";
+import type { SettingsRepository } from "../repositories/settings-repository.js";
+import { ValidationError } from "../repositories/repository-utils.js";
+import { runCommandStrict, type CommandResult } from "./cli-process-runner.js";
+import type { Logger } from "../shared/logging/logger.js";
+import { buildGitHttpAuthEnvForRepoWithFallbacks, type GitHttpAuthOptions } from "./git-http-auth.js";
+
+const GIT_IDENTITY_ARGS = [
+  "-c", "user.name=Code UX",
+  "-c", "user.email=agents@codeux.ai",
+];
+
+export type SprintRollbackGitRunner = (
+  command: string,
+  args: string[],
+  cwd: string,
+  env?: NodeJS.ProcessEnv,
+) => Promise<CommandResult>;
+
+interface SprintRollbackServiceDeps {
+  projectManagementRepository: ProjectManagementRepository;
+  settingsRepository: SettingsRepository;
+  orchestrateSprint: (projectId: string, sprintId: string) => Promise<unknown>;
+  gitRunner?: SprintRollbackGitRunner;
+  getGitAuth?: () => GitHttpAuthOptions;
+  logger?: Logger;
+}
+
+interface RollbackPlan {
+  project: ProjectSummary;
+  sourceSprint: SprintRecord;
+  defaultBranch: string;
+  integrationCommitSha: string | null;
+  assessment: SprintRollbackAssessment;
+}
+
+export class SprintRollbackService {
+  private readonly gitRunner: SprintRollbackGitRunner;
+
+  constructor(private readonly deps: SprintRollbackServiceDeps) {
+    this.gitRunner = deps.gitRunner ?? ((command, args, cwd, env) => (
+      runCommandStrict(command, args, cwd, env ?? process.env, { timeout: 60_000 })
+    ));
+  }
+
+  async assess(projectId: string, sourceSprintId: string): Promise<SprintRollbackAssessment> {
+    return (await this.buildPlan(projectId, sourceSprintId)).assessment;
+  }
+
+  async create(
+    projectId: string,
+    sourceSprintId: string,
+    input: CreateSprintRollbackInput = {},
+  ): Promise<CreateSprintRollbackResult> {
+    const plan = await this.buildPlan(projectId, sourceSprintId);
+    if (!plan.assessment.eligible) {
+      throw new ValidationError(plan.assessment.reasons.join(" "));
+    }
+
+    const instructions = input.instructions?.trim() || "";
+    if (instructions.length > 6000) {
+      throw new ValidationError("Rollback instructions must be 6000 characters or fewer.");
+    }
+    const requestedMode: SprintRollbackMode = instructions
+      ? "agent_assisted"
+      : plan.assessment.recommendedMode;
+    const rollbackBranch = this.buildRollbackBranch(plan.sourceSprint);
+    let mode = requestedMode;
+    let reasons = [...plan.assessment.reasons];
+
+    const rollbackSprint = this.deps.projectManagementRepository.createSprint(projectId, {
+      name: `Rollback Sprint ${plan.sourceSprint.number ?? plan.sourceSprint.slug}`,
+      goal: this.buildRollbackGoal(plan.sourceSprint, instructions),
+      originalPrompt: instructions || null,
+      kind: "rollback",
+      rollbackSourceSprintId: plan.sourceSprint.id,
+      rollbackMode: mode,
+      rollbackInstructions: instructions || null,
+      rollbackSafetyReason: reasons.join(" ") || null,
+      featureBranch: rollbackBranch,
+      status: "idle",
+      showcasePinned: true,
+    });
+
+    if (mode === "automatic" && plan.integrationCommitSha) {
+      try {
+        await this.createAutomatedRollbackBranch({
+          repoPath: plan.project.baseDir,
+          defaultBranch: plan.defaultBranch,
+          rollbackBranch,
+          integrationCommitSha: plan.integrationCommitSha,
+        });
+        this.createAutomatedTask(plan.sourceSprint, rollbackSprint);
+      } catch (error) {
+        mode = "agent_assisted";
+        const detail = error instanceof Error ? error.message : String(error);
+        reasons = [...reasons, `The automated revert dry run was not clean: ${detail}`];
+        this.deps.projectManagementRepository.updateSprint(rollbackSprint.id, {
+          rollbackMode: mode,
+          rollbackSafetyReason: reasons.join(" "),
+        });
+        this.createAgentTask(plan.sourceSprint, rollbackSprint, instructions, reasons);
+      }
+    } else {
+      this.createAgentTask(plan.sourceSprint, rollbackSprint, instructions, reasons);
+    }
+
+    await this.deps.orchestrateSprint(projectId, rollbackSprint.id);
+    const persisted = this.deps.projectManagementRepository.getSprint(rollbackSprint.id) ?? rollbackSprint;
+    const finalAssessment: SprintRollbackAssessment = {
+      ...plan.assessment,
+      recommendedMode: mode,
+      reasons,
+    };
+    this.deps.logger?.info("Created sprint rollback", {
+      projectId,
+      sourceSprintId,
+      rollbackSprintId: rollbackSprint.id,
+      mode,
+    });
+    return { rollbackSprint: persisted, mode, assessment: finalAssessment };
+  }
+
+  private async buildPlan(projectId: string, sourceSprintId: string): Promise<RollbackPlan> {
+    const project = this.deps.projectManagementRepository.getProject(projectId);
+    const sourceSprint = this.deps.projectManagementRepository.getSprint(sourceSprintId);
+    if (!project || !sourceSprint || sourceSprint.projectId !== projectId) {
+      throw new ValidationError(`Sprint ${sourceSprintId} was not found in project ${projectId}.`);
+    }
+
+    const settings = this.deps.settingsRepository.resolveSprintDashboardSettings(projectId, sourceSprintId).settings;
+    const defaultBranch = settings.git.defaultBranch || project.defaultBranch || "main";
+    const reasons: string[] = [];
+    let eligible = true;
+
+    if (settings.git.githubMode !== "REMOTE") {
+      eligible = false;
+      reasons.push("Sprint rollback requires REMOTE git mode because every rollback is delivered through a pull request.");
+    }
+    if (sourceSprint.kind === "rollback") {
+      eligible = false;
+      reasons.push("Rollback sprints cannot be used as rollback sources; select the original sprint instead.");
+    }
+    if (sourceSprint.status !== "completed") {
+      eligible = false;
+      reasons.push("Only completed sprints can be rolled back.");
+    }
+    if (!project.baseDir || !sourceSprint.featureBranch) {
+      eligible = false;
+      reasons.push("The source repository path and sprint feature branch must both be available.");
+    }
+
+    const sprints = this.deps.projectManagementRepository.listSprints(projectId).sprints;
+    const existingRollback = sprints.find((sprint) => (
+      sprint.kind === "rollback"
+      && sprint.rollbackSourceSprintId === sourceSprintId
+      && sprint.status !== "failed"
+      && sprint.status !== "cancelled"
+    ));
+    if (existingRollback) {
+      eligible = false;
+      reasons.push(`Rollback sprint ${existingRollback.number ?? existingRollback.slug} already covers this source sprint.`);
+    }
+
+    const laterWork = sprints.filter((sprint) => (
+      sprint.kind === "standard"
+      && sprint.id !== sourceSprint.id
+      && sprint.number !== null
+      && sourceSprint.number !== null
+      && sprint.number > sourceSprint.number
+      && sprint.status !== "idle"
+      && sprint.status !== "cancelled"
+    ));
+    if (laterWork.length > 0) {
+      reasons.push("Later sprint work exists, so an agent must preserve dependent changes while removing the requested behavior.");
+    }
+
+    let integrationCommitSha: string | null = null;
+    if (eligible && laterWork.length === 0) {
+      try {
+        integrationCommitSha = await this.resolveSafeHeadMerge(
+          project.baseDir,
+          defaultBranch,
+          sourceSprint.featureBranch!,
+        );
+      } catch (error) {
+        reasons.push(error instanceof Error ? error.message : String(error));
+      }
+    }
+
+    const recommendedMode: SprintRollbackMode = eligible
+      && laterWork.length === 0
+      && integrationCommitSha
+      ? "automatic"
+      : "agent_assisted";
+    if (eligible && recommendedMode === "automatic") {
+      reasons.push("The source sprint is the latest isolated merge on the default branch and is eligible for a clean automated revert.");
+    } else if (eligible && reasons.length === 0) {
+      reasons.push("The rollback requires an agent to isolate the safe change set.");
+    }
+
+    return {
+      project,
+      sourceSprint,
+      defaultBranch,
+      integrationCommitSha,
+      assessment: { sourceSprintId, eligible, recommendedMode, reasons },
+    };
+  }
+
+  private async resolveSafeHeadMerge(
+    repoPath: string,
+    defaultBranch: string,
+    featureBranch: string,
+  ): Promise<string> {
+    const authEnv = await buildGitHttpAuthEnvForRepoWithFallbacks(repoPath, this.deps.getGitAuth?.() ?? {});
+    await this.gitRunner("git", ["fetch", "--prune", "origin", defaultBranch], repoPath, authEnv);
+    const head = (await this.gitRunner(
+      "git",
+      ["rev-parse", "--verify", `refs/remotes/origin/${defaultBranch}^{commit}`],
+      repoPath,
+    )).stdout.trim();
+    const details = (await this.gitRunner(
+      "git",
+      ["show", "-s", "--format=%P%x00%s%x00%b", head],
+      repoPath,
+    )).stdout;
+    const [parentText = "", subject = "", body = ""] = details.split("\0");
+    const parents = parentText.trim().split(/\s+/).filter(Boolean);
+    if (parents.length < 2) {
+      throw new Error("The latest default-branch commit is not an isolated merge commit, so an agent must determine the safe rollback range.");
+    }
+
+    const messageMatches = `${subject}\n${body}`.includes(featureBranch);
+    let branchTipMatches = false;
+    try {
+      const branchTip = (await this.gitRunner(
+        "git",
+        ["rev-parse", "--verify", `refs/remotes/origin/${featureBranch}^{commit}`],
+        repoPath,
+      )).stdout.trim();
+      branchTipMatches = parents.slice(1).includes(branchTip);
+    } catch {
+      branchTipMatches = false;
+    }
+    if (!messageMatches && !branchTipMatches) {
+      throw new Error("The latest default-branch merge cannot be proven to belong to this sprint, so an agent must inspect the history.");
+    }
+    return head;
+  }
+
+  private async createAutomatedRollbackBranch(args: {
+    repoPath: string;
+    defaultBranch: string;
+    rollbackBranch: string;
+    integrationCommitSha: string;
+  }): Promise<void> {
+    const worktreePath = await mkdtemp(path.join(os.tmpdir(), "code-ux-rollback-"));
+    const authEnv = await buildGitHttpAuthEnvForRepoWithFallbacks(args.repoPath, this.deps.getGitAuth?.() ?? {});
+    let worktreeAdded = false;
+    try {
+      await this.gitRunner("git", [
+        "worktree", "add", "--detach", worktreePath,
+        `refs/remotes/origin/${args.defaultBranch}`,
+      ], args.repoPath);
+      worktreeAdded = true;
+      await this.gitRunner("git", ["switch", "-c", args.rollbackBranch], worktreePath);
+      await this.gitRunner("git", [
+        ...GIT_IDENTITY_ARGS,
+        "revert", "--no-edit", "-m", "1", args.integrationCommitSha,
+      ], worktreePath);
+      await this.gitRunner("git", [
+        "push", "--set-upstream", "origin", `HEAD:refs/heads/${args.rollbackBranch}`,
+      ], worktreePath, authEnv);
+    } finally {
+      if (worktreeAdded) {
+        await this.gitRunner("git", ["worktree", "remove", "--force", worktreePath], args.repoPath).catch(() => undefined);
+        await this.gitRunner("git", ["worktree", "prune"], args.repoPath).catch(() => undefined);
+      }
+      await rm(worktreePath, { recursive: true, force: true }).catch(() => undefined);
+    }
+  }
+
+  private createAutomatedTask(source: SprintRecord, rollbackSprint: SprintRecord): void {
+    this.deps.projectManagementRepository.createTask(source.projectId, {
+      sprintId: rollbackSprint.id,
+      taskKey: "ROLLBACK",
+      title: `Revert sprint ${source.number ?? source.slug}`,
+      description: "Deterministic rollback commit created and pushed by Code UX.",
+      promptMarkdown: "The source sprint integration merge was reverted automatically in a detached worktree. No provider invocation was used.",
+      status: "completed",
+      priority: "critical",
+      isIndependent: true,
+      isMerged: true,
+      mergeIndicator: "MERGED",
+      sourceType: "sprint_rollback",
+      sourcePath: source.id,
+    });
+  }
+
+  private createAgentTask(
+    source: SprintRecord,
+    rollbackSprint: SprintRecord,
+    instructions: string,
+    reasons: string[],
+  ): void {
+    const requestedScope = instructions || "Fully revert the source sprint while preserving all later compatible work.";
+    const prompt = [
+      "# Sprint rollback",
+      "",
+      `Rollback source sprint: ${source.number ?? source.slug}`,
+      `Source feature branch: ${source.featureBranch || "unavailable"}`,
+      `Rollback branch: ${rollbackSprint.featureBranch || "unavailable"}`,
+      "",
+      "## Requested scope",
+      requestedScope,
+      "",
+      "## Safety context",
+      ...reasons.map((reason) => `- ${reason}`),
+      "",
+      "## Required outcome",
+      "- Inspect the source sprint diff and all later dependent changes before editing.",
+      "- Remove only the requested behavior and preserve compatible later work.",
+      "- Resolve conflicts conservatively and explain anything that cannot be safely removed.",
+      "- Add or update tests for the resulting behavior.",
+      "- Commit and push the rollback changes on the provided rollback branch.",
+      "- Do not merge into the default branch; Code UX will create and gate the rollback pull request.",
+    ].join("\n");
+    this.deps.projectManagementRepository.createTask(source.projectId, {
+      sprintId: rollbackSprint.id,
+      taskKey: "ROLLBACK",
+      title: `Safely rollback sprint ${source.number ?? source.slug}`,
+      description: requestedScope,
+      promptMarkdown: prompt,
+      status: "pending",
+      priority: "critical",
+      executorType: "auto",
+      isIndependent: true,
+      sourceType: "sprint_rollback",
+      sourcePath: source.id,
+    });
+  }
+
+  private buildRollbackGoal(source: SprintRecord, instructions: string): string {
+    const scope = instructions || "Fully revert the sprint's integrated changes.";
+    return `Rollback source sprint ${source.number ?? source.slug} through a dedicated remote pull request. ${scope}`;
+  }
+
+  private buildRollbackBranch(source: SprintRecord): string {
+    const sourceKey = String(source.number ?? source.slug)
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, "-")
+      .replace(/^-+|-+$/g, "")
+      .slice(0, 32) || "sprint";
+    return `rollback/${sourceKey}-${randomUUID().slice(0, 8)}`;
+  }
+}
diff --git a/tests/backend/domain/sprint/composer/pr-description-composer.test.ts b/tests/backend/domain/sprint/composer/pr-description-composer.test.ts
index f59f36a60e..5e61c1b197 100644
--- a/tests/backend/domain/sprint/composer/pr-description-composer.test.ts
+++ b/tests/backend/domain/sprint/composer/pr-description-composer.test.ts
@@ -431,6 +431,20 @@ describe("composeTaskPrTitle", () => {
 });
 
 describe("composeSprintPrTitle", () => {
+  it("labels rollback PRs as corrective work", () => {
+    const input: SprintPrComposerInput = {
+      ...baseSprintInput,
+      sprintKind: "rollback",
+      rollbackSourceSprintId: "source-sprint-1",
+      sprintName: "Rollback Sprint 1",
+      featureBranch: "rollback/1-abcd1234",
+    };
+    expect(composeSprintPrTitle(input)).toBe("Rollback Sprint 1 — merge rollback/1-abcd1234 into main");
+    expect(composeSprintPrBody(input)).toContain("## Sprint Rollback:");
+    expect(composeSprintPrBody(input)).toContain("Source sprint: `source-sprint-1`");
+    expect(composeSprintPrBody(input)).not.toContain("Sprint Completion");
+  });
+
   it("includes the sprint number and name when both are present", () => {
     const title = composeSprintPrTitle({
       sprintNumber: 3,
diff --git a/tests/backend/domain/sprint/orchestrator/rollback-finalization-policy.test.ts b/tests/backend/domain/sprint/orchestrator/rollback-finalization-policy.test.ts
new file mode 100644
index 0000000000..743e578f75
--- /dev/null
+++ b/tests/backend/domain/sprint/orchestrator/rollback-finalization-policy.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from "vitest";
+import type { CiIntelligenceSettings } from "../../../../../src/contracts/app-types.js";
+import { resolveRollbackFinalizationCiIntelligence } from "../../../../../src/domain/sprint/orchestrator/rollback-finalization-policy.js";
+
+const configured = {
+  enabled: false,
+  enableLivePrMonitoring: false,
+  mainBranchAutoMergeMode: "OFF",
+} as CiIntelligenceSettings;
+
+describe("resolveRollbackFinalizationCiIntelligence", () => {
+  it("forces a remote PR handoff for rollback sprints", () => {
+    expect(resolveRollbackFinalizationCiIntelligence(configured, true)).toMatchObject({
+      enabled: true,
+      enableLivePrMonitoring: true,
+      mainBranchAutoMergeMode: "CREATE_PR",
+    });
+  });
+
+  it("preserves configured auto-merge behavior for rollback sprints", () => {
+    expect(resolveRollbackFinalizationCiIntelligence({
+      ...configured,
+      mainBranchAutoMergeMode: "WHEN_GREEN",
+    }, true).mainBranchAutoMergeMode).toBe("WHEN_GREEN");
+  });
+
+  it("does not alter standard sprint settings", () => {
+    expect(resolveRollbackFinalizationCiIntelligence(configured, false)).toBe(configured);
+  });
+});
diff --git a/tests/backend/repositories/db/app-db-schema.test.ts b/tests/backend/repositories/db/app-db-schema.test.ts
index e901b6d164..13178890c7 100644
--- a/tests/backend/repositories/db/app-db-schema.test.ts
+++ b/tests/backend/repositories/db/app-db-schema.test.ts
@@ -231,6 +231,14 @@ describe("AppDbSchema", () => {
       expect(getIndexCount("idx_guardrail_ledger_task_purpose")).toBe(1);
       expect(getIndexCount("idx_memory_claims_project_fingerprint_active")).toBe(1);
       expect(getIndexCount("idx_node_flows_project_updated")).toBe(1);
+      expect(getColumnNames("sprints")).toEqual(expect.arrayContaining([
+        "kind",
+        "rollback_source_sprint_id",
+        "rollback_mode",
+        "rollback_instructions",
+        "rollback_safety_reason",
+      ]));
+      expect(getIndexCount("idx_sprints_rollback_source")).toBe(1);
     } finally {
       storage.close();
     }
diff --git a/tests/backend/repositories/project-management-repository.test.ts b/tests/backend/repositories/project-management-repository.test.ts
index 3bd994b213..7fa590ffcd 100644
--- a/tests/backend/repositories/project-management-repository.test.ts
+++ b/tests/backend/repositories/project-management-repository.test.ts
@@ -117,6 +117,38 @@ describe("ProjectManagementRepository", () => {
     expect(isGeneratedSprintName(customPlaceholder.name)).toBe(true);
   });
 
+  it("persists rollback sprint relationships and retains their source sprint", async () => {
+    const { repository } = await createRepository();
+    const project = repository.createProject({
+      name: "Rollback Metadata Project",
+      sourceType: "local",
+      sourceRef: "/workspace/rollback-metadata",
+    });
+    const source = repository.createSprint(project.id, {
+      name: "Source Sprint",
+      status: "completed",
+      featureBranch: "feature/source",
+    });
+    const rollback = repository.createSprint(project.id, {
+      name: "Rollback Sprint 1",
+      kind: "rollback",
+      rollbackSourceSprintId: source.id,
+      rollbackMode: "agent_assisted",
+      rollbackInstructions: "Remove only feature XY.",
+      rollbackSafetyReason: "Later work exists.",
+      featureBranch: "rollback/1-test",
+    });
+
+    expect(repository.getSprint(rollback.id)).toMatchObject({
+      kind: "rollback",
+      rollbackSourceSprintId: source.id,
+      rollbackMode: "agent_assisted",
+      rollbackInstructions: "Remove only feature XY.",
+      rollbackSafetyReason: "Later work exists.",
+    });
+    expect(() => repository.deleteSprint(source.id)).toThrow("retained as the source");
+  });
+
   it("updates a project and sprint gracefully with empty or partial inputs", async () => {
     const { repository } = await createRepository();
     const project = repository.createProject({
diff --git a/tests/backend/server/sprint-rollback-routes.test.ts b/tests/backend/server/sprint-rollback-routes.test.ts
new file mode 100644
index 0000000000..1dcc1dda88
--- /dev/null
+++ b/tests/backend/server/sprint-rollback-routes.test.ts
@@ -0,0 +1,67 @@
+import express from "express";
+import request from "supertest";
+import { describe, expect, it, vi } from "vitest";
+import { registerSprintRoutes } from "../../../src/server/sprint-routes.js";
+import type { DashboardDependencies } from "../../../src/server/dashboard-server.js";
+
+function createApp(deps: Partial<DashboardDependencies>): express.Express {
+  const app = express();
+  app.use(express.json());
+  registerSprintRoutes(app, deps as DashboardDependencies);
+  return app;
+}
+
+describe("sprint rollback routes", () => {
+  it("returns the rollback safety assessment", async () => {
+    const assessSprintRollback = vi.fn().mockResolvedValue({
+      sourceSprintId: "sprint-1",
+      eligible: true,
+      recommendedMode: "automatic",
+      reasons: ["Safe isolated merge."],
+    });
+    const response = await request(createApp({ assessSprintRollback }))
+      .get("/api/projects/project-1/sprints/sprint-1/rollback/assessment");
+
+    expect(response.status).toBe(200);
+    expect(response.body.recommendedMode).toBe("automatic");
+    expect(assessSprintRollback).toHaveBeenCalledWith("project-1", "sprint-1");
+  });
+
+  it("starts a rollback with scoped user instructions", async () => {
+    const createSprintRollback = vi.fn().mockResolvedValue({
+      mode: "agent_assisted",
+      rollbackSprint: { id: "rollback-1" },
+      assessment: { eligible: true, recommendedMode: "agent_assisted", reasons: [] },
+    });
+    const response = await request(createApp({ createSprintRollback }))
+      .post("/api/projects/project-1/sprints/sprint-1/rollback")
+      .send({ instructions: "Remove only feature XY." });
+
+    expect(response.status).toBe(202);
+    expect(response.body.rollbackSprint.id).toBe("rollback-1");
+    expect(createSprintRollback).toHaveBeenCalledWith("project-1", "sprint-1", {
+      instructions: "Remove only feature XY.",
+    });
+  });
+
+  it("returns validation failures without starting a rollback", async () => {
+    const createSprintRollback = vi.fn().mockRejectedValue(new Error("Only completed sprints can be rolled back."));
+    const response = await request(createApp({ createSprintRollback }))
+      .post("/api/projects/project-1/sprints/sprint-1/rollback")
+      .send({});
+
+    expect(response.status).toBe(400);
+    expect(response.body.error).toContain("Only completed sprints");
+  });
+
+  it("rejects malformed instructions instead of selecting an automatic rollback", async () => {
+    const createSprintRollback = vi.fn();
+    const response = await request(createApp({ createSprintRollback }))
+      .post("/api/projects/project-1/sprints/sprint-1/rollback")
+      .send({ instructions: { scope: "feature XY" } });
+
+    expect(response.status).toBe(400);
+    expect(response.body.error).toContain("instructions must be a string");
+    expect(createSprintRollback).not.toHaveBeenCalled();
+  });
+});
diff --git a/tests/backend/services/sprint-rollback-service.test.ts b/tests/backend/services/sprint-rollback-service.test.ts
new file mode 100644
index 0000000000..fb7de5465e
--- /dev/null
+++ b/tests/backend/services/sprint-rollback-service.test.ts
@@ -0,0 +1,151 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { AppDbStorage } from "../../../src/repositories/app-db-storage.js";
+import { ProjectManagementRepository } from "../../../src/repositories/project-management-repository.js";
+import type { SettingsRepository } from "../../../src/repositories/settings-repository.js";
+import { SprintRollbackService, type SprintRollbackGitRunner } from "../../../src/services/sprint-rollback-service.js";
+
+const tempDirs: string[] = [];
+
+async function createHarness(options: {
+  mode?: "REMOTE" | "LOCAL";
+  failRevert?: boolean;
+} = {}) {
+  const dir = await fs.mkdtemp(path.join(os.tmpdir(), "code-ux-rollback-test-"));
+  tempDirs.push(dir);
+  const storage = new AppDbStorage(path.join(dir, "app.db"));
+  const repository = new ProjectManagementRepository(storage);
+  const project = repository.createProject({
+    name: "Rollback Test Project",
+    sourceType: "local",
+    sourceRef: dir,
+    defaultBranch: "main",
+  });
+  const sourceSprint = repository.createSprint(project.id, {
+    name: "Source Sprint",
+    status: "completed",
+    featureBranch: "feature/source-sprint",
+  });
+  const calls: Array<{ command: string; args: string[]; cwd: string }> = [];
+  const gitRunner: SprintRollbackGitRunner = vi.fn(async (command, args, cwd) => {
+    calls.push({ command, args, cwd });
+    if (args[0] === "rev-parse" && args.join(" ").includes("origin/main")) {
+      return { ok: true, code: 0, stdout: "merge-sha\n", stderr: "" };
+    }
+    if (args[0] === "show") {
+      return {
+        ok: true,
+        code: 0,
+        stdout: "parent-one parent-two\0Merge branch 'feature/source-sprint'\0\n",
+        stderr: "",
+      };
+    }
+    if (args[0] === "rev-parse" && args.join(" ").includes("origin/feature/source-sprint")) {
+      return { ok: true, code: 0, stdout: "parent-two\n", stderr: "" };
+    }
+    if (options.failRevert && args.includes("revert")) {
+      throw new Error("content conflict");
+    }
+    return { ok: true, code: 0, stdout: "", stderr: "" };
+  });
+  const orchestrateSprint = vi.fn().mockResolvedValue({ ok: true });
+  const settingsRepository = {
+    resolveSprintDashboardSettings: () => ({
+      settings: {
+        git: {
+          githubMode: options.mode ?? "REMOTE",
+          defaultBranch: "main",
+        },
+      },
+    }),
+  } as unknown as SettingsRepository;
+  const service = new SprintRollbackService({
+    projectManagementRepository: repository,
+    settingsRepository,
+    orchestrateSprint,
+    gitRunner,
+  });
+  return { storage, repository, project, sourceSprint, service, calls, orchestrateSprint };
+}
+
+afterEach(async () => {
+  vi.restoreAllMocks();
+  await Promise.all(tempDirs.splice(0).map((dir) => fs.rm(dir, { recursive: true, force: true })));
+});
+
+describe("SprintRollbackService", () => {
+  it("creates a deterministic rollback sprint without a provider task invocation", async () => {
+    const { repository, project, sourceSprint, service, calls, orchestrateSprint } = await createHarness();
+
+    const assessment = await service.assess(project.id, sourceSprint.id);
+    expect(assessment).toMatchObject({ eligible: true, recommendedMode: "automatic" });
+
+    const result = await service.create(project.id, sourceSprint.id);
+    expect(result.mode).toBe("automatic");
+    expect(result.rollbackSprint).toMatchObject({
+      kind: "rollback",
+      rollbackSourceSprintId: sourceSprint.id,
+      rollbackMode: "automatic",
+    });
+    expect(repository.listTasks(project.id, result.rollbackSprint.id)).toEqual([
+      expect.objectContaining({ status: "completed", isMerged: true, sourceType: "sprint_rollback" }),
+    ]);
+    expect(calls.some(({ args }) => args.includes("revert") && args.includes("-m") && args.includes("merge-sha"))).toBe(true);
+    expect(calls.some(({ args }) => args[0] === "push" && args.some((arg) => arg.startsWith("HEAD:refs/heads/rollback/")))).toBe(true);
+    expect(orchestrateSprint).toHaveBeenCalledWith(project.id, result.rollbackSprint.id);
+  });
+
+  it("always routes custom rollback instructions through an agent task", async () => {
+    const { repository, project, sourceSprint, service, calls } = await createHarness();
+
+    const result = await service.create(project.id, sourceSprint.id, {
+      instructions: "Remove only feature XY and preserve the schema migration.",
+    });
+
+    expect(result.mode).toBe("agent_assisted");
+    expect(result.rollbackSprint.rollbackInstructions).toContain("feature XY");
+    expect(repository.listTasks(project.id, result.rollbackSprint.id)).toEqual([
+      expect.objectContaining({ status: "pending", isMerged: false, promptMarkdown: expect.stringContaining("preserve the schema migration") }),
+    ]);
+    expect(calls.some(({ args }) => args.includes("revert"))).toBe(false);
+  });
+
+  it("uses an agent when later sprint work may depend on the source", async () => {
+    const { repository, project, sourceSprint, service } = await createHarness();
+    repository.createSprint(project.id, {
+      name: "Later Sprint",
+      status: "completed",
+      featureBranch: "feature/later",
+    });
+
+    const assessment = await service.assess(project.id, sourceSprint.id);
+    expect(assessment).toMatchObject({ eligible: true, recommendedMode: "agent_assisted" });
+    expect(assessment.reasons.join(" ")).toContain("Later sprint work exists");
+  });
+
+  it("falls back to an agent task when the automated revert conflicts", async () => {
+    const { repository, project, sourceSprint, service } = await createHarness({ failRevert: true });
+
+    const result = await service.create(project.id, sourceSprint.id);
+    expect(result.mode).toBe("agent_assisted");
+    expect(result.assessment.reasons.join(" ")).toContain("content conflict");
+    expect(repository.getSprint(result.rollbackSprint.id)?.rollbackMode).toBe("agent_assisted");
+    expect(repository.listTasks(project.id, result.rollbackSprint.id)[0]).toMatchObject({ status: "pending" });
+  });
+
+  it("rejects rollback creation outside remote git mode", async () => {
+    const { project, sourceSprint, service } = await createHarness({ mode: "LOCAL" });
+    const assessment = await service.assess(project.id, sourceSprint.id);
+    expect(assessment).toMatchObject({ eligible: false });
+    await expect(service.create(project.id, sourceSprint.id)).rejects.toThrow("REMOTE git mode");
+  });
+
+  it("rejects oversized rollback instructions before creating a sprint", async () => {
+    const { repository, project, sourceSprint, service } = await createHarness();
+    await expect(service.create(project.id, sourceSprint.id, { instructions: "x".repeat(6001) }))
+      .rejects.toThrow("6000 characters");
+    expect(repository.listSprints(project.id).sprints).toHaveLength(1);
+  });
+});