From c1f52e78fb0fe094aade4d38279c935f711981b9 Mon Sep 17 00:00:00 2001
From: Quinten Steenhuis <qsteenhuis@suffolk.edu>
Date: Wed, 7 Oct 2026 20:28:15 -0400
Subject: [PATCH 1/5] Keep upload navigation disabled until documents are ready

---
 efile_app/efile/static/js/upload-documents.js |  35 +++-
 .../templates/efile/upload_documents.html     |  11 +-
 .../efile/tests/test_document_extractions.py  |  22 +++
 efile_app/efile/views/extraction_review.py    |   2 +-
 efile_app/js-tests/upload-documents.test.js   | 161 ++++++++++++++++++
 5 files changed, 219 insertions(+), 12 deletions(-)

diff --git a/efile_app/efile/static/js/upload-documents.js b/efile_app/efile/static/js/upload-documents.js
index c43473c9..af6f2b4c 100644
--- a/efile_app/efile/static/js/upload-documents.js
+++ b/efile_app/efile/static/js/upload-documents.js
@@ -33,6 +33,27 @@
     const aiRememberChoice = document.getElementById("ai-remember-choice");
     const selectedFiles = new Map();
     let nextSelectionId = 0;
+    let uploading = false;
+    let analysisReady = form.dataset.hasLead === "true" && form.dataset.extractionPending !== "true";
+
+    function updateContinue() {
+        const disabled = uploading || !analysisReady;
+        continueButton.classList.toggle("disabled", disabled);
+        if (disabled) {
+            continueButton.setAttribute("aria-disabled", "true");
+            continueButton.setAttribute("tabindex", "-1");
+            continueButton.removeAttribute("href");
+        } else {
+            continueButton.removeAttribute("aria-disabled");
+            continueButton.removeAttribute("tabindex");
+            continueButton.setAttribute("href", continueButton.dataset.continueUrl);
+        }
+    }
+
+    continueButton.addEventListener("click", (event) => {
+        if (uploading || !analysisReady) event.preventDefault();
+    });
+    updateContinue();
     // The "remember this" row is offered only after the filer changes the
     // setting, and only for the rest of this page load. Until then the account
     // preference is not this request's business, so it is left out of the post.
@@ -169,6 +190,9 @@
 
     form.addEventListener("submit", async (event) => {
         event.preventDefault();
+        if (uploading) return;
+        uploading = true;
+        updateContinue();
         errorBox.hidden = true;
         state.hidden = false;
         uploadButton.disabled = true;
@@ -190,14 +214,16 @@
             const result = await response.json();
             if (!response.ok || !result.success) throw new Error(result.error || "Upload failed.");
             stateTitle.textContent = result.extraction_pending ? "Your documents are uploaded" : "Your documents are ready";
-            let pendingDetail = "You can review your PDFs while we read your first file.";
+            let pendingDetail = "Please wait while we read your first file. You can continue when it is ready.";
             if (aiIsOff()) pendingDetail = "AI is off. We are looking for form and case numbers.";
             stateDetail.textContent = result.extraction_pending ?
                 pendingDetail :
                 "Review what we found before you continue.";
             window.setTimeout(() => window.location.reload(), 300);
         } catch (error) {
-            state.hidden = true;
+            uploading = false;
+            updateContinue();
+            state.hidden = form.dataset.extractionPending !== "true" || analysisReady;
             errorBox.textContent = error.message;
             errorBox.hidden = false;
             uploadButton.disabled = false;
@@ -250,9 +276,8 @@
             stateDetail.textContent = result.total_pages > result.pages_analyzed ?
                 `We read the first ${result.pages_analyzed} of ${result.total_pages} pages. ${nextPageNudge}` :
                 nextPageNudge;
-            continueButton.classList.remove("disabled");
-            continueButton.removeAttribute("aria-disabled");
-            continueButton.removeAttribute("tabindex");
+            analysisReady = true;
+            updateContinue();
             const analyzingPill = document.querySelector(".status-pill--analyzing");
             if (analyzingPill) {
                 analyzingPill.classList.replace("status-pill--analyzing", "status-pill--ready");
diff --git a/efile_app/efile/templates/efile/upload_documents.html b/efile_app/efile/templates/efile/upload_documents.html
index 30bcca7f..e562ffce 100644
--- a/efile_app/efile/templates/efile/upload_documents.html
+++ b/efile_app/efile/templates/efile/upload_documents.html
@@ -46,7 +46,9 @@ <h1>{% translate "Upload your court documents" %}</h1>
         </p>
         <form id="document-upload-form"
               enctype="multipart/form-data"
-              data-extraction-status-url="{% url 'document_extraction_status' jurisdiction %}">
+              data-extraction-status-url="{% url 'document_extraction_status' jurisdiction %}"
+              data-has-lead="{{ has_lead_document|yesno:'true,false' }}"
+              data-extraction-pending="{{ extraction_pending|yesno:'true,false' }}">
             {% csrf_token %}
             <label class="drop-zone" id="document-drop-zone" for="documents-input">
                 <input id="documents-input"
@@ -81,7 +83,7 @@ <h2 id="pending-files-heading">{% translate "Selected files" %}</h2>
                 </strong>
                 <span id="upload-state-detail">
                     {% if extraction_pending %}
-                        {% translate "You can leave this page and come back while we work." %}
+                        {% translate "Please wait while we read your first file. You can continue when it is ready." %}
                     {% else %}
                         {% translate "Keep this page open while the files upload." %}
                     {% endif %}
@@ -218,10 +220,7 @@ <h2 id="uploaded-heading">{% translate "Your documents" %}</h2>
             {% else %}
                 <a class="btn btn-outline-secondary" href="{{ workflow_previous_url }}"><i class="fa-solid fa-arrow-left" aria-hidden="true"></i> {% translate "Back" %}</a>
             {% endif %}
-            <a class="btn btn-primary {% if not has_lead_document %}disabled{% endif %}"
-               id="continue-to-analysis"
-               href="{% url 'preview_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}"
-               {% if not has_lead_document %}aria-disabled="true" tabindex="-1"{% endif %}>{% translate "Preview your PDFs" %} <i class="fa-solid fa-arrow-right" aria-hidden="true"></i></a>
+            <a class="btn btn-primary {% if not has_lead_document or extraction_pending %}disabled{% endif %}" id="continue-to-analysis" data-continue-url="{% url 'preview_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}" {% if not has_lead_document or extraction_pending %}aria-disabled="true" tabindex="-1"{% else %}href="{% url 'preview_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}"{% endif %}>{% translate "Preview your PDFs" %} <i class="fa-solid fa-arrow-right" aria-hidden="true"></i></a>
         </div>
     </section>
 {% endblock workflow_content %}
diff --git a/efile_app/efile/tests/test_document_extractions.py b/efile_app/efile/tests/test_document_extractions.py
index c94c3a39..68621ab8 100644
--- a/efile_app/efile/tests/test_document_extractions.py
+++ b/efile_app/efile/tests/test_document_extractions.py
@@ -453,3 +453,25 @@ def test_management_command_processes_and_retries_failures(extraction_draft):
         assert job.status == DocumentExtraction.Status.FAILED
         assert job.attempts == 2
         assert "Document analysis failed" in job.error
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize("status", [None, "pending", "processing", "complete", "failed"])
+def test_upload_continue_waits_for_analysis(client, extraction_draft, status):
+    authorize(client, extraction_draft)
+    if status is not None:
+        document = reviewed_document(draft=extraction_draft, role=FilingDocument.Role.LEAD, name="petition.pdf")
+        DocumentExtraction.objects.create(document=document, status=status)
+    response = client.get(reverse("upload_documents", kwargs={"jurisdiction": "illinois"}))
+    assert response.status_code == 200
+    content = response.content.decode()
+    match = re.search(r'<a\b[^>]*id="continue-to-analysis"[^>]*>', content)
+    assert match is not None
+    link = match.group()
+    if status in {"complete", "failed"}:
+        assert ' href="' in link
+        assert 'aria-disabled="true"' not in link
+    else:
+        assert ' href="' not in link
+        assert 'aria-disabled="true"' in link
+    assert "You can leave this page and come back while we work." not in content
diff --git a/efile_app/efile/views/extraction_review.py b/efile_app/efile/views/extraction_review.py
index 7be71296..292a453c 100644
--- a/efile_app/efile/views/extraction_review.py
+++ b/efile_app/efile/views/extraction_review.py
@@ -174,7 +174,7 @@ def extraction_review(request, jurisdiction):
         DocumentExtraction.Status.PENDING,
         DocumentExtraction.Status.PROCESSING,
     }:
-        messages.info(request, "We are still analyzing your first PDF. You can leave this page and come back.")
+        messages.info(request, "Please wait while we read your first PDF. You can continue when it is ready.")
         return redirect(
             with_return_to(get_step_url(WorkflowStepKey.UPLOAD_DOCUMENTS, jurisdiction), return_target(request))
         )
diff --git a/efile_app/js-tests/upload-documents.test.js b/efile_app/js-tests/upload-documents.test.js
index 704f3713..ea288f31 100644
--- a/efile_app/js-tests/upload-documents.test.js
+++ b/efile_app/js-tests/upload-documents.test.js
@@ -34,4 +34,165 @@ test("removing one pending file leaves the other selected", () => {
 
     assert.equal(remaining.length, 1);
     assert.equal(remaining[0].size, 200);
+});
+const fs = require("node:fs");
+const vm = require("node:vm");
+const path = require("node:path");
+
+function uploadPage({
+    pending = false,
+    hasLead = true,
+    fetch
+}) {
+    const nodes = new Map();
+
+    function node(id) {
+        if (!nodes.has(id)) nodes.set(id, {
+            dataset: {},
+            attributes: new Map(),
+            listeners: {},
+            classList: {
+                toggle() {},
+                add() {},
+                remove() {}
+            },
+            addEventListener(event, callback) {
+                this.listeners[event] = callback;
+            },
+            setAttribute(name, value) {
+                this.attributes.set(name, value);
+            },
+            removeAttribute(name) {
+                this.attributes.delete(name);
+            },
+            querySelector() {
+                return null;
+            }
+        });
+        return nodes.get(id);
+    }
+    node("document-upload-form").dataset = {
+        hasLead: String(hasLead),
+        extractionPending: String(pending),
+        extractionStatusUrl: "/status/"
+    };
+    node("continue-to-analysis").dataset.continueUrl = "/preview/?return_to=review";
+    node("upload-state").hidden = !pending;
+    const timers = [];
+    const context = vm.createContext({
+        document: {
+            getElementById: node,
+            querySelector: () => null,
+            querySelectorAll: () => []
+        },
+        window: {
+            location: {
+                href: "/upload/"
+            },
+            setTimeout: (callback) => timers.push(callback)
+        },
+        apiUtils: {
+            getCSRFToken: () => "csrf"
+        },
+        FormData: class {},
+        fetch
+    });
+    // eslint-disable-next-line sonarjs/code-eval
+    vm.runInContext(fs.readFileSync(path.join(__dirname, "../efile/static/js/upload-documents.js"), "utf8"), context);
+    return {
+        node,
+        timers,
+        submit: () => node("document-upload-form").listeners.submit({
+            preventDefault() {}
+        })
+    };
+}
+
+function reply(data) {
+    return {
+        ok: true,
+        json: async () => ({
+            success: true,
+            ...data
+        })
+    };
+}
+const flush = () => new Promise(resolve => setImmediate(resolve));
+
+test("pending analysis blocks navigation until complete or failed", async () => {
+    for (const status of ["complete", "failed"]) {
+        let finish;
+        const page = uploadPage({
+            pending: true,
+            fetch: () => new Promise(resolve => {
+                finish = resolve;
+            })
+        });
+        const link = page.node("continue-to-analysis");
+        assert.equal(link.attributes.get("aria-disabled"), "true");
+        assert.equal(link.attributes.has("href"), false);
+        let prevented = false;
+        link.listeners.click({
+            preventDefault() {
+                prevented = true;
+            }
+        });
+        assert.equal(prevented, true);
+        finish(reply({
+            ready: true,
+            status
+        }));
+        await flush();
+        assert.equal(link.attributes.has("aria-disabled"), false);
+        assert.equal(link.attributes.get("href"), "/preview/?return_to=review");
+    }
+});
+
+test("a poll finishing during an upload cannot unlock navigation", async () => {
+    let finishPoll;
+    let finishUpload;
+    const page = uploadPage({
+        pending: true,
+        fetch: (url) => new Promise(resolve => {
+            if (url === "/status/") finishPoll = resolve;
+            else finishUpload = resolve;
+        })
+    });
+    const upload = page.submit();
+    finishPoll(reply({
+        ready: true,
+        status: "complete"
+    }));
+    await flush();
+    assert.equal(page.node("continue-to-analysis").attributes.has("href"), false);
+    finishUpload(reply({
+        extraction_pending: false
+    }));
+    await upload;
+    assert.equal(page.node("continue-to-analysis").attributes.has("href"), false);
+});
+
+test("an upload failure restores an already ready filing", async () => {
+    const page = uploadPage({
+        fetch: async () => {
+            throw new Error("Upload failed");
+        }
+    });
+    const upload = page.submit();
+    assert.equal(page.node("continue-to-analysis").attributes.has("href"), false);
+    await upload;
+    assert.equal(page.node("continue-to-analysis").attributes.get("href"), "/preview/?return_to=review");
+    assert.equal(page.node("upload-error").hidden, false);
+});
+
+test("poll failures leave navigation blocked and schedule another check", async () => {
+    const page = uploadPage({
+        pending: true,
+        fetch: async () => {
+            throw new Error("Offline");
+        }
+    });
+    await flush();
+    assert.equal(page.node("continue-to-analysis").attributes.has("href"), false);
+    assert.equal(page.timers.length, 1);
 });
\ No newline at end of file

From 63ec10ea0bfbd30d98636fbfe91bf1540c280c21 Mon Sep 17 00:00:00 2001
From: Quinten Steenhuis <qsteenhuis@suffolk.edu>
Date: Wed, 7 Oct 2026 20:36:39 -0400
Subject: [PATCH 2/5] Check navigation destinations separately from stored link
 targets

---
 efile_app/efile/tests/test_document_previews.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/efile_app/efile/tests/test_document_previews.py b/efile_app/efile/tests/test_document_previews.py
index c5865b0b..fff60234 100644
--- a/efile_app/efile/tests/test_document_previews.py
+++ b/efile_app/efile/tests/test_document_previews.py
@@ -324,7 +324,7 @@ def test_change_files_keeps_where_the_filer_came_from(client, preview_draft):
     assert 'upload-documents/?return_to=review"' in preview
     upload = client.get(url("upload_documents", preview_draft) + "&return_to=review").content.decode()
     # Both ways off the upload page lead back toward Review, not the start.
-    assert upload.count('preview-documents/?return_to=review"') == 2
+    assert upload.count('href="/jurisdiction/vermont/preview-documents/?return_to=review"') == 2
     unknown = client.get(url("upload_documents", preview_draft) + "&return_to=elsewhere").content.decode()
     assert "return_to" not in unknown
 

From 5ca831ab755203c3b93c44c3ab6a53117ba0e297 Mon Sep 17 00:00:00 2001
From: Quinten Steenhuis <qsteenhuis@suffolk.edu>
Date: Wed, 7 Oct 2026 22:26:12 -0400
Subject: [PATCH 3/5] Let filers go on after a two-minute wait for document
 analysis

Continue stayed disabled until the status poll reported the analysis
ready, and extraction review sent filers back while it was pending. If
the extraction worker was down or backed up, or the poll kept failing,
the filer could not move forward at all.

After EXTRACTION_WAIT_LIMIT the filer may continue and enter the case
details by hand. The server enforces the limit in extraction review and
reports the remaining wait to the page, which opens Continue on a timer
so a failing status poll cannot hold it shut. Replacing the lead
restarts the wait. A late result still only fills extracted_guesses.

Also keep the analysis status the upload page shows in one place, so a
failed extra upload goes back to the latest status, including a ready
result that arrived during the upload, rather than an older snapshot.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../efile/services/document_extractions.py    | 17 +++++
 efile_app/efile/static/js/upload-documents.js | 53 ++++++++++++---
 .../templates/efile/upload_documents.html     |  5 +-
 .../efile/tests/test_document_extractions.py  | 36 ++++++++++
 efile_app/efile/views/extraction_review.py    |  7 +-
 efile_app/efile/views/upload_documents.py     | 19 +++++-
 efile_app/js-tests/upload-documents.test.js   | 67 ++++++++++++++++++-
 7 files changed, 184 insertions(+), 20 deletions(-)

diff --git a/efile_app/efile/services/document_extractions.py b/efile_app/efile/services/document_extractions.py
index 31cec426..d9e15554 100644
--- a/efile_app/efile/services/document_extractions.py
+++ b/efile_app/efile/services/document_extractions.py
@@ -44,6 +44,12 @@ class ExtractionSuperseded(Exception):
     """The requested analysis changed; this is not a processing failure."""
 
 
+# How long a filer waits on the upload page for the first file to be read.
+# After that the filer may go on and enter the case details by hand; the
+# analysis keeps running and its guesses are still offered if they arrive.
+EXTRACTION_WAIT_LIMIT = timedelta(minutes=2)
+
+
 def queue_document_extraction(document):
     """Create or reset the one background extraction job for a lead document."""
     if document.role != FilingDocument.Role.LEAD:
@@ -64,11 +70,22 @@ def queue_document_extraction(document):
             "error": "",
             "started_at": None,
             "completed_at": None,
+            # Restart the filer's wait for a replaced lead document.
+            "created_at": timezone.now(),
         },
     )
     return job
 
 
+def extraction_is_waiting(extraction):
+    """Whether the filer should still wait for this analysis before reviewing."""
+    return (
+        extraction is not None
+        and extraction.status in {DocumentExtraction.Status.PENDING, DocumentExtraction.Status.PROCESSING}
+        and extraction.created_at > timezone.now() - EXTRACTION_WAIT_LIMIT
+    )
+
+
 def extraction_for_document(document):
     try:
         return document.extraction
diff --git a/efile_app/efile/static/js/upload-documents.js b/efile_app/efile/static/js/upload-documents.js
index af6f2b4c..bb70ac6e 100644
--- a/efile_app/efile/static/js/upload-documents.js
+++ b/efile_app/efile/static/js/upload-documents.js
@@ -34,10 +34,37 @@
     const selectedFiles = new Map();
     let nextSelectionId = 0;
     let uploading = false;
-    let analysisReady = form.dataset.hasLead === "true" && form.dataset.extractionPending !== "true";
+    const hasLead = form.dataset.hasLead === "true";
+    let analysisReady = hasLead && form.dataset.extractionPending !== "true";
+    // After the server's wait limit the filer may go on without the analysis.
+    let waitOver = hasLead && form.dataset.waitSeconds === "0";
+    // The analysis status the panel shows whenever no upload is in progress.
+    let analysisTitle = stateTitle.textContent;
+    let analysisDetail = stateDetail.textContent;
+
+    function canContinue() {
+        return !uploading && (analysisReady || waitOver);
+    }
+
+    function showAnalysisStatus(title, detail) {
+        analysisTitle = title;
+        analysisDetail = detail;
+        if (uploading) return;
+        stateTitle.textContent = title;
+        stateDetail.textContent = detail;
+    }
+
+    function endWait() {
+        if (waitOver) return;
+        waitOver = true;
+        updateContinue();
+        if (!analysisReady) {
+            showAnalysisStatus(analysisTitle, "This is taking longer than usual. You can continue and enter the case details yourself.");
+        }
+    }
 
     function updateContinue() {
-        const disabled = uploading || !analysisReady;
+        const disabled = !canContinue();
         continueButton.classList.toggle("disabled", disabled);
         if (disabled) {
             continueButton.setAttribute("aria-disabled", "true");
@@ -51,9 +78,10 @@
     }
 
     continueButton.addEventListener("click", (event) => {
-        if (uploading || !analysisReady) event.preventDefault();
+        if (!canContinue()) event.preventDefault();
     });
     updateContinue();
+    if (hasLead && !waitOver) window.setTimeout(endWait, Number(form.dataset.waitSeconds) * 1000);
     // The "remember this" row is offered only after the filer changes the
     // setting, and only for the rest of this page load. Until then the account
     // preference is not this request's business, so it is left out of the post.
@@ -223,7 +251,11 @@
         } catch (error) {
             uploading = false;
             updateContinue();
-            state.hidden = form.dataset.extractionPending !== "true" || analysisReady;
+            // Go back to the first file's analysis status, including any
+            // result that arrived while this upload was running.
+            state.hidden = form.dataset.extractionPending !== "true";
+            stateTitle.textContent = analysisTitle;
+            stateDetail.textContent = analysisDetail;
             errorBox.textContent = error.message;
             errorBox.hidden = false;
             uploadButton.disabled = false;
@@ -262,6 +294,7 @@
             const result = await response.json();
             if (!response.ok || !result.success) throw new Error(result.error || "Could not check document analysis.");
             if (!result.ready) {
+                if (result.wait_seconds === 0) endWait();
                 window.setTimeout(pollExtraction, 2500);
                 return;
             }
@@ -269,14 +302,16 @@
             state.querySelector(".spinner-border")?.remove();
             let readyTitle = "Document analysis is ready";
             if (result.ai_opted_out) readyTitle = "We finished checking your document";
-            stateTitle.textContent = result.status === "failed" ? "Your document is ready for manual review" : readyTitle;
             // Nothing is reviewed on this page: the details are on the next
             // one, so say where the checking actually happens.
             const nextPageNudge = "Review the information carefully on the next page.";
-            stateDetail.textContent = result.total_pages > result.pages_analyzed ?
-                `We read the first ${result.pages_analyzed} of ${result.total_pages} pages. ${nextPageNudge}` :
-                nextPageNudge;
             analysisReady = true;
+            showAnalysisStatus(
+                result.status === "failed" ? "Your document is ready for manual review" : readyTitle,
+                result.total_pages > result.pages_analyzed ?
+                `We read the first ${result.pages_analyzed} of ${result.total_pages} pages. ${nextPageNudge}` :
+                nextPageNudge
+            );
             updateContinue();
             const analyzingPill = document.querySelector(".status-pill--analyzing");
             if (analyzingPill) {
@@ -284,7 +319,7 @@
                 analyzingPill.innerHTML = '<i class="fa-solid fa-check" aria-hidden="true"></i> Ready';
             }
         } catch (error) {
-            stateDetail.textContent = error.message;
+            showAnalysisStatus(analysisTitle, error.message);
             window.setTimeout(pollExtraction, 5000);
         }
     }
diff --git a/efile_app/efile/templates/efile/upload_documents.html b/efile_app/efile/templates/efile/upload_documents.html
index e562ffce..dbfa6818 100644
--- a/efile_app/efile/templates/efile/upload_documents.html
+++ b/efile_app/efile/templates/efile/upload_documents.html
@@ -48,7 +48,8 @@ <h1>{% translate "Upload your court documents" %}</h1>
               enctype="multipart/form-data"
               data-extraction-status-url="{% url 'document_extraction_status' jurisdiction %}"
               data-has-lead="{{ has_lead_document|yesno:'true,false' }}"
-              data-extraction-pending="{{ extraction_pending|yesno:'true,false' }}">
+              data-extraction-pending="{{ extraction_pending|yesno:'true,false' }}"
+              data-wait-seconds="{{ extraction_wait_seconds }}">
             {% csrf_token %}
             <label class="drop-zone" id="document-drop-zone" for="documents-input">
                 <input id="documents-input"
@@ -220,7 +221,7 @@ <h2 id="uploaded-heading">{% translate "Your documents" %}</h2>
             {% else %}
                 <a class="btn btn-outline-secondary" href="{{ workflow_previous_url }}"><i class="fa-solid fa-arrow-left" aria-hidden="true"></i> {% translate "Back" %}</a>
             {% endif %}
-            <a class="btn btn-primary {% if not has_lead_document or extraction_pending %}disabled{% endif %}" id="continue-to-analysis" data-continue-url="{% url 'preview_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}" {% if not has_lead_document or extraction_pending %}aria-disabled="true" tabindex="-1"{% else %}href="{% url 'preview_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}"{% endif %}>{% translate "Preview your PDFs" %} <i class="fa-solid fa-arrow-right" aria-hidden="true"></i></a>
+            <a class="btn btn-primary {% if not has_lead_document or extraction_wait_seconds %}disabled{% endif %}" id="continue-to-analysis" data-continue-url="{% url 'preview_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}" {% if not has_lead_document or extraction_wait_seconds %}aria-disabled="true" tabindex="-1"{% else %}href="{% url 'preview_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}"{% endif %}>{% translate "Preview your PDFs" %} <i class="fa-solid fa-arrow-right" aria-hidden="true"></i></a>
         </div>
     </section>
 {% endblock workflow_content %}
diff --git a/efile_app/efile/tests/test_document_extractions.py b/efile_app/efile/tests/test_document_extractions.py
index 68621ab8..f7d59c19 100644
--- a/efile_app/efile/tests/test_document_extractions.py
+++ b/efile_app/efile/tests/test_document_extractions.py
@@ -1,16 +1,19 @@
 import re
 import shutil
+from datetime import timedelta
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
 import pytest
 from django.test import override_settings
 from django.urls import reverse
+from django.utils import timezone
 from pypdf import PdfReader, PdfWriter
 
 from efile.models import DocumentExtraction, FilingDocument, FilingDraft
 from efile.services.current_drafts import CURRENT_DRAFT_SESSION_KEY
 from efile.services.document_extractions import (
+    EXTRACTION_WAIT_LIMIT,
     claim_next_extraction,
     process_document_extraction,
     queue_document_extraction,
@@ -231,6 +234,7 @@ def test_status_endpoint_reports_when_review_is_ready(client, extraction_draft):
         "status": "complete",
         "ai_opted_out": False,
         "ready": True,
+        "wait_seconds": 0,
         "pages_analyzed": 20,
         "total_pages": 30,
         "review_url": reverse("preview_documents", kwargs={"jurisdiction": "illinois"}),
@@ -475,3 +479,35 @@ def test_upload_continue_waits_for_analysis(client, extraction_draft, status):
         assert ' href="' not in link
         assert 'aria-disabled="true"' in link
     assert "You can leave this page and come back while we work." not in content
+
+
+def _queued_lead(draft, *, waited):
+    document = reviewed_document(draft=draft, role=FilingDocument.Role.LEAD, name="petition.pdf")
+    job = queue_document_extraction(document)
+    DocumentExtraction.objects.filter(pk=job.pk).update(created_at=timezone.now() - waited)
+    return document
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize(("waited", "may_continue"), [(timedelta(0), False), (EXTRACTION_WAIT_LIMIT, True)])
+def test_filer_may_go_on_without_analysis_after_the_wait_limit(client, extraction_draft, waited, may_continue):
+    authorize(client, extraction_draft)
+    _queued_lead(extraction_draft, waited=waited + timedelta(seconds=1) if may_continue else waited)
+
+    page = client.get(reverse("upload_documents", kwargs={"jurisdiction": "illinois"})).content.decode()
+    link = re.search(r'<a\b[^>]*id="continue-to-analysis"[^>]*>', page)
+    assert link is not None
+    assert (' href="' in link.group()) is may_continue
+    wait = client.get(reverse("document_extraction_status", kwargs={"jurisdiction": "illinois"})).json()
+    assert wait["ready"] is False
+    assert (wait["wait_seconds"] == 0) is may_continue
+    assert 0 <= wait["wait_seconds"] <= EXTRACTION_WAIT_LIMIT.total_seconds()
+    review = client.get(reverse("extraction_review", kwargs={"jurisdiction": "illinois"}))
+    assert (review.status_code == 200) is may_continue
+
+
+@pytest.mark.django_db
+def test_replacing_the_lead_restarts_the_wait(extraction_draft):
+    document = _queued_lead(extraction_draft, waited=EXTRACTION_WAIT_LIMIT * 2)
+    job = queue_document_extraction(document)
+    assert job.created_at > timezone.now() - timedelta(seconds=5)
diff --git a/efile_app/efile/views/extraction_review.py b/efile_app/efile/views/extraction_review.py
index 292a453c..1a285e4e 100644
--- a/efile_app/efile/views/extraction_review.py
+++ b/efile_app/efile/views/extraction_review.py
@@ -10,7 +10,7 @@
 from efile.services.account_profile import cached_account_profile
 from efile.services.current_drafts import ensure_current_draft
 from efile.services.document_checklists import resolve_filer_roles
-from efile.services.document_extractions import extraction_for_document
+from efile.services.document_extractions import extraction_for_document, extraction_is_waiting
 from efile.services.document_previews import unreviewed_documents
 from efile.services.drafts import draft_snapshot, write_case_data
 from efile.services.extracted_parties import review_rows, save_reviewed_parties
@@ -170,10 +170,7 @@ def extraction_review(request, jurisdiction):
 
     lead = FilingDocument.objects.filter(draft=draft, role=FilingDocument.Role.LEAD).first()
     extraction = extraction_for_document(lead) if lead else None
-    if extraction is not None and extraction.status in {
-        DocumentExtraction.Status.PENDING,
-        DocumentExtraction.Status.PROCESSING,
-    }:
+    if extraction_is_waiting(extraction):
         messages.info(request, "Please wait while we read your first PDF. You can continue when it is ready.")
         return redirect(
             with_return_to(get_step_url(WorkflowStepKey.UPLOAD_DOCUMENTS, jurisdiction), return_target(request))
diff --git a/efile_app/efile/views/upload_documents.py b/efile_app/efile/views/upload_documents.py
index 7d2ebcbf..b9806bab 100644
--- a/efile_app/efile/views/upload_documents.py
+++ b/efile_app/efile/views/upload_documents.py
@@ -1,15 +1,22 @@
 import logging
+import math
 
 from django.db import transaction
 from django.db.models import Q
 from django.http import JsonResponse
 from django.shortcuts import redirect, render
+from django.utils import timezone
 from django.views.decorators.http import require_http_methods
 
 from efile.api.suffolk_api_views import get_tyler_token
 from efile.models import DocumentExtraction, FilingDocument, FilingDraft
 from efile.services.current_drafts import ensure_current_draft
-from efile.services.document_extractions import extraction_for_document, queue_document_extraction
+from efile.services.document_extractions import (
+    EXTRACTION_WAIT_LIMIT,
+    extraction_for_document,
+    extraction_is_waiting,
+    queue_document_extraction,
+)
 from efile.services.document_preparation import requires_flattening
 from efile.services.document_previews import document_storage_keys
 from efile.services.document_uploads import upload_files
@@ -190,6 +197,7 @@ def upload_documents(request, jurisdiction):
         "extraction": extraction,
         "extraction_pending": extraction is not None
         and extraction.status in {DocumentExtraction.Status.PENDING, DocumentExtraction.Status.PROCESSING},
+        "extraction_wait_seconds": _wait_seconds(extraction),
         "flatten_pdf_forms": requires_flattening(jurisdiction),
         "upload_data": upload_data,
         "ai_opted_out": draft.ai_assistance_opted_out,
@@ -203,6 +211,14 @@ def upload_documents(request, jurisdiction):
     return render(request, "efile/upload_documents.html", context)
 
 
+def _wait_seconds(extraction):
+    """Seconds left before the filer may go on without the analysis."""
+    if not extraction_is_waiting(extraction):
+        return 0
+    remaining = extraction.created_at + EXTRACTION_WAIT_LIMIT - timezone.now()
+    return max(1, math.ceil(remaining.total_seconds()))
+
+
 @require_http_methods(["GET"])
 def document_extraction_status(request, jurisdiction):
     """Poll the current lead's durable background analysis state."""
@@ -228,6 +244,7 @@ def document_extraction_status(request, jurisdiction):
             "status": extraction.status,
             "ai_opted_out": draft.ai_assistance_opted_out,
             "ready": extraction.status in {DocumentExtraction.Status.COMPLETE, DocumentExtraction.Status.FAILED},
+            "wait_seconds": _wait_seconds(extraction),
             "pages_analyzed": extraction.pages_analyzed,
             "total_pages": extraction.total_pages,
             "review_url": with_return_to(
diff --git a/efile_app/js-tests/upload-documents.test.js b/efile_app/js-tests/upload-documents.test.js
index ea288f31..17c452cb 100644
--- a/efile_app/js-tests/upload-documents.test.js
+++ b/efile_app/js-tests/upload-documents.test.js
@@ -42,6 +42,7 @@ const path = require("node:path");
 function uploadPage({
     pending = false,
     hasLead = true,
+    waitSeconds = pending ? 120 : 0,
     fetch
 }) {
     const nodes = new Map();
@@ -74,7 +75,8 @@ function uploadPage({
     node("document-upload-form").dataset = {
         hasLead: String(hasLead),
         extractionPending: String(pending),
-        extractionStatusUrl: "/status/"
+        extractionStatusUrl: "/status/",
+        waitSeconds: String(waitSeconds)
     };
     node("continue-to-analysis").dataset.continueUrl = "/preview/?return_to=review";
     node("upload-state").hidden = !pending;
@@ -89,7 +91,10 @@ function uploadPage({
             location: {
                 href: "/upload/"
             },
-            setTimeout: (callback) => timers.push(callback)
+            setTimeout: (callback, delay) => timers.push({
+                callback,
+                delay
+            })
         },
         apiUtils: {
             getCSRFToken: () => "csrf"
@@ -194,5 +199,61 @@ test("poll failures leave navigation blocked and schedule another check", async
     });
     await flush();
     assert.equal(page.node("continue-to-analysis").attributes.has("href"), false);
-    assert.equal(page.timers.length, 1);
+    assert.equal(page.timers.filter(timer => timer.delay === 5000).length, 1);
+});
+
+test("navigation opens once the wait limit passes, even while checks fail", async () => {
+    const page = uploadPage({
+        pending: true,
+        fetch: async () => {
+            throw new Error("Offline");
+        }
+    });
+    await flush();
+    const link = page.node("continue-to-analysis");
+    assert.equal(link.attributes.has("href"), false);
+    page.timers.find(timer => timer.delay === 120000).callback();
+    assert.equal(link.attributes.get("href"), "/preview/?return_to=review");
+    assert.match(page.node("upload-state-detail").textContent, /taking longer than usual/);
+});
+
+test("the server ending the wait opens navigation and keeps checking", async () => {
+    const page = uploadPage({
+        pending: true,
+        fetch: async () => reply({
+            ready: false,
+            status: "pending",
+            wait_seconds: 0
+        })
+    });
+    await flush();
+    assert.equal(page.node("continue-to-analysis").attributes.get("href"), "/preview/?return_to=review");
+    assert.equal(page.timers.filter(timer => timer.delay === 2500).length, 1);
+});
+
+test("an upload failure keeps a ready result that arrived during the upload", async () => {
+    let finishPoll;
+    let failUpload;
+    const page = uploadPage({
+        pending: true,
+        fetch: (url) => new Promise((resolve, reject) => {
+            if (url === "/status/") finishPoll = resolve;
+            else failUpload = reject;
+        })
+    });
+    const upload = page.submit();
+    finishPoll(reply({
+        ready: true,
+        status: "complete",
+        pages_analyzed: 10,
+        total_pages: 30
+    }));
+    await flush();
+    assert.equal(page.node("upload-state-title").textContent, "Uploading your files…");
+    failUpload(new Error("Upload failed"));
+    await upload;
+    assert.equal(page.node("upload-state").hidden, false);
+    assert.equal(page.node("upload-state-title").textContent, "Document analysis is ready");
+    assert.match(page.node("upload-state-detail").textContent, /first 10 of 30 pages/);
+    assert.equal(page.node("continue-to-analysis").attributes.get("href"), "/preview/?return_to=review");
 });
\ No newline at end of file

From ae263db409a9baaf2624bcfc324d140c378be7dd Mon Sep 17 00:00:00 2001
From: Quinten Steenhuis <qsteenhuis@suffolk.edu>
Date: Wed, 7 Oct 2026 23:10:30 -0400
Subject: [PATCH 4/5] Let the server decide when the upload wait is over

The page opened Continue from its own timer. On a machine whose wall
clock drifted against the browser's timers (about 8% on the WSL2 box
used for end-to-end checks), it did so before the server had ended the
wait, and the click was sent back to upload.

Continue now opens when a status check reports the wait is over. The
page's timer only matters if status checks keep failing: once it has
run, a failed check opens Continue, so a broken connection still cannot
hold the filer on the page.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 efile_app/efile/static/js/upload-documents.js | 11 ++++++++++-
 efile_app/js-tests/upload-documents.test.js   | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/efile_app/efile/static/js/upload-documents.js b/efile_app/efile/static/js/upload-documents.js
index bb70ac6e..29c2beca 100644
--- a/efile_app/efile/static/js/upload-documents.js
+++ b/efile_app/efile/static/js/upload-documents.js
@@ -81,7 +81,15 @@
         if (!canContinue()) event.preventDefault();
     });
     updateContinue();
-    if (hasLead && !waitOver) window.setTimeout(endWait, Number(form.dataset.waitSeconds) * 1000);
+    // The server decides when the wait is over; its status checks open
+    // Continue. This timer only matters if those checks keep failing, so a
+    // broken connection cannot hold the filer here.
+    let waitTimerDone = false;
+    if (hasLead && !waitOver) {
+        window.setTimeout(() => {
+            waitTimerDone = true;
+        }, Number(form.dataset.waitSeconds) * 1000);
+    }
     // The "remember this" row is offered only after the filer changes the
     // setting, and only for the rest of this page load. Until then the account
     // preference is not this request's business, so it is left out of the post.
@@ -320,6 +328,7 @@
             }
         } catch (error) {
             showAnalysisStatus(analysisTitle, error.message);
+            if (waitTimerDone) endWait();
             window.setTimeout(pollExtraction, 5000);
         }
     }
diff --git a/efile_app/js-tests/upload-documents.test.js b/efile_app/js-tests/upload-documents.test.js
index 17c452cb..f50a3cf5 100644
--- a/efile_app/js-tests/upload-documents.test.js
+++ b/efile_app/js-tests/upload-documents.test.js
@@ -213,10 +213,29 @@ test("navigation opens once the wait limit passes, even while checks fail", asyn
     const link = page.node("continue-to-analysis");
     assert.equal(link.attributes.has("href"), false);
     page.timers.find(timer => timer.delay === 120000).callback();
+    assert.equal(link.attributes.has("href"), false);
+    page.timers.filter(timer => timer.delay === 5000).at(-1).callback();
+    await flush();
     assert.equal(link.attributes.get("href"), "/preview/?return_to=review");
     assert.match(page.node("upload-state-detail").textContent, /taking longer than usual/);
 });
 
+test("the page's own timer does not open navigation while the server is still waiting", async () => {
+    const page = uploadPage({
+        pending: true,
+        fetch: async () => reply({
+            ready: false,
+            status: "pending",
+            wait_seconds: 4
+        })
+    });
+    await flush();
+    page.timers.find(timer => timer.delay === 120000).callback();
+    page.timers.filter(timer => timer.delay === 2500).at(-1).callback();
+    await flush();
+    assert.equal(page.node("continue-to-analysis").attributes.has("href"), false);
+});
+
 test("the server ending the wait opens navigation and keeps checking", async () => {
     const page = uploadPage({
         pending: true,

From 0dc53b38fafc632558d8c4b29e9ec252d08adf77 Mon Sep 17 00:00:00 2001
From: Quinten Steenhuis <qsteenhuis@suffolk.edu>
Date: Thu, 8 Oct 2026 12:44:55 -0400
Subject: [PATCH 5/5] Keep extracted amounts as suggestions until the filer
 confirms them

---
 .../efile/services/document_extractions.py    | 11 ++---
 .../efile/tests/test_document_extractions.py  | 45 ++++++++++++++++++-
 efile_app/efile/tests/test_people_flow.py     | 36 ++++++++++++++-
 efile_app/efile/views/case_questions.py       | 14 +++++-
 4 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/efile_app/efile/services/document_extractions.py b/efile_app/efile/services/document_extractions.py
index d9e15554..d216c2d2 100644
--- a/efile_app/efile/services/document_extractions.py
+++ b/efile_app/efile/services/document_extractions.py
@@ -29,7 +29,6 @@
     HierarchicalDocumentClassifier,
     deterministic_form_identity,
     exact_form_crosswalk_matches,
-    primary_amount_in_controversy,
     scan_document_for_form_identifiers,
     summarize_form_crosswalk_matches,
 )
@@ -458,12 +457,10 @@ def check_outbound_permission():
         ).exists()
         if is_current_lead:
             draft.extracted_guesses = guesses
-            update_fields = ["extracted_guesses", "updated_at"]
-            amount = primary_amount_in_controversy(evidence)
-            if amount and not draft.amount_in_controversy:
-                draft.amount_in_controversy = amount
-                update_fields.append("amount_in_controversy")
-            draft.save(update_fields=update_fields)
+            # A filer may already have continued manually after the wait limit.
+            # Keep extracted amounts in evidence until the filer confirms them
+            # on the case-questions form; workers must not change fee inputs.
+            draft.save(update_fields=["extracted_guesses", "updated_at"])
         job.status = DocumentExtraction.Status.COMPLETE
         job.total_pages = total_pages
         job.pages_analyzed = pages_analyzed
diff --git a/efile_app/efile/tests/test_document_extractions.py b/efile_app/efile/tests/test_document_extractions.py
index f7d59c19..7bdc366c 100644
--- a/efile_app/efile/tests/test_document_extractions.py
+++ b/efile_app/efile/tests/test_document_extractions.py
@@ -15,10 +15,12 @@
 from efile.services.document_extractions import (
     EXTRACTION_WAIT_LIMIT,
     claim_next_extraction,
+    extraction_is_waiting,
     process_document_extraction,
     queue_document_extraction,
 )
 from efile.services.extraction_fields import normalize_document_evidence, normalize_extracted_fields
+from efile.services.fee_quotes import fee_fingerprint
 from efile.services.taxonomy_classification import ClassificationRun, HierarchicalDocumentClassifier
 from efile.tests.helpers import reviewed_document
 from efile.workflow import ExistingCase
@@ -193,7 +195,8 @@ def classify_source(_classifier, jurisdiction, evidence, source_text):
     assert job.analysis_metadata["form_identifier_scan_source"] == "pypdf"
     assert job.analysis_metadata["form_identifier_scan_ms"] < 2000
     assert extraction_draft.extracted_guesses["court"] == "Middlesex Probate and Family Court"
-    assert extraction_draft.amount_in_controversy == "1275"
+    assert extraction_draft.amount_in_controversy == ""
+    assert job.evidence["monetary amounts"][0]["amount"] == "1275"
 
 
 @pytest.mark.django_db
@@ -511,3 +514,43 @@ def test_replacing_the_lead_restarts_the_wait(extraction_draft):
     document = _queued_lead(extraction_draft, waited=EXTRACTION_WAIT_LIMIT * 2)
     job = queue_document_extraction(document)
     assert job.created_at > timezone.now() - timedelta(seconds=5)
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize("saved_amount", ["", "500.00"])
+def test_late_analysis_keeps_fee_inputs_unchanged(extraction_draft, saved_amount):
+    _queued_lead(extraction_draft, waited=EXTRACTION_WAIT_LIMIT * 2)
+    claimed = claim_next_extraction()
+    assert not extraction_is_waiting(claimed)
+    extraction_draft.current_step = "review"
+    extraction_draft.amount_in_controversy = saved_amount
+    extraction_draft.save(update_fields=["current_step", "amount_in_controversy"])
+    fingerprint = fee_fingerprint(extraction_draft)
+
+    handler = MagicMock()
+
+    def download(_key, destination):
+        writer = PdfWriter()
+        writer.add_blank_page(width=612, height=792)
+        with open(destination, "wb") as pdf_file:
+            writer.write(pdf_file)
+        return {"success": True}
+
+    handler.download_file.side_effect = download
+    evidence = {"monetary amounts": [{"label": "Amount in controversy", "amount": "1275.00"}]}
+    with (
+        patch("efile.services.document_extractions.S3UploadHandler", return_value=handler),
+        patch(
+            "efile.services.document_extractions.analyze_document",
+            return_value={"guesses": {"document title": "Complaint"}, "evidence": evidence},
+        ),
+    ):
+        process_document_extraction(claimed.pk, claimed.claim_token)
+
+    extraction_draft.refresh_from_db()
+    claimed.refresh_from_db()
+    assert claimed.status == DocumentExtraction.Status.COMPLETE
+    assert claimed.evidence == evidence
+    assert extraction_draft.extracted_guesses == {"document title": "Complaint"}
+    assert extraction_draft.amount_in_controversy == saved_amount
+    assert fee_fingerprint(extraction_draft) == fingerprint
diff --git a/efile_app/efile/tests/test_people_flow.py b/efile_app/efile/tests/test_people_flow.py
index 34b624b0..b37eba61 100644
--- a/efile_app/efile/tests/test_people_flow.py
+++ b/efile_app/efile/tests/test_people_flow.py
@@ -4,7 +4,7 @@
 import pytest
 from django.urls import reverse
 
-from efile.models import FilingDocument, FilingDraft, FilingParty
+from efile.models import DocumentExtraction, FilingDocument, FilingDraft, FilingParty
 from efile.services.current_drafts import CURRENT_DRAFT_SESSION_KEY
 from efile.services.drafts import read_case_data
 from efile.services.party_requirements import AddressRequirement
@@ -526,6 +526,40 @@ def test_case_questions_asks_for_amount_in_controversy_with_no_other_questions(c
     assert b"Amount in controversy" in response.content
 
 
+@pytest.mark.django_db
+@pytest.mark.parametrize("saved_amount", ["", "500.00"])
+def test_extracted_amount_is_only_a_suggestion_until_confirmed(client, people_draft, saved_amount):
+    document = reviewed_document(
+        draft=people_draft,
+        role=FilingDocument.Role.LEAD,
+        name="petition.pdf",
+        filing_requires_amount_in_controversy=True,
+    )
+    DocumentExtraction.objects.create(
+        document=document,
+        status=DocumentExtraction.Status.COMPLETE,
+        evidence={"monetary amounts": [{"label": "Amount in controversy", "amount": "1275.00"}]},
+    )
+    people_draft.amount_in_controversy = saved_amount
+    people_draft.save(update_fields=["amount_in_controversy"])
+    url = reverse("case_questions", kwargs={"jurisdiction": "illinois"})
+    response = client.get(url)
+    assert response.context["amount_in_controversy"] == (saved_amount or "1275.00")
+    people_draft.refresh_from_db()
+    assert people_draft.amount_in_controversy == saved_amount
+
+    # A rejected submission must retain what was typed, not restore the guess.
+    response = client.post(url, {"amount_in_controversy": "invalid amount"})
+    assert response.context["amount_in_controversy"] == "invalid amount"
+    people_draft.refresh_from_db()
+    assert people_draft.amount_in_controversy == saved_amount
+
+    response = client.post(url, {"amount_in_controversy": "1200.00"})
+    assert response.status_code == 302
+    people_draft.refresh_from_db()
+    assert people_draft.amount_in_controversy == "1200.00"
+
+
 @pytest.mark.django_db
 def test_case_questions_saves_a_valid_amount_in_controversy(client, people_draft):
     reviewed_document(
diff --git a/efile_app/efile/views/case_questions.py b/efile_app/efile/views/case_questions.py
index 2baf051e..f5d4b9ed 100644
--- a/efile_app/efile/views/case_questions.py
+++ b/efile_app/efile/views/case_questions.py
@@ -5,10 +5,13 @@
 from django.views.decorators.http import require_http_methods
 
 from efile.api.suffolk_api_views import get_tyler_token
+from efile.models import FilingDocument
 from efile.services.appeals import LOWER_COURT_FIELDS
 from efile.services.current_drafts import ensure_current_draft
+from efile.services.document_extractions import extraction_for_document
 from efile.services.drafts import draft_snapshot
 from efile.services.people import get_case_questions, needs_amount_in_controversy, parse_question_answer
+from efile.services.taxonomy_classification import primary_amount_in_controversy
 from efile.workflow import WorkflowStepKey, continue_step, continue_url, get_workflow_context, return_target
 
 
@@ -101,6 +104,15 @@ def case_questions(request, jurisdiction):
             draft.save(update_fields=update_fields)
             return redirect(continue_url(draft, jurisdiction, return_to, WorkflowStepKey.PAYMENT))
 
+    amount_value = draft.amount_in_controversy
+    if show_amount_field:
+        if request.method == "POST":
+            amount_value = request.POST.get("amount_in_controversy", "")
+        elif not amount_value:
+            lead = FilingDocument.objects.filter(draft=draft, role=FilingDocument.Role.LEAD).first()
+            extraction = extraction_for_document(lead) if lead else None
+            amount_value = primary_amount_in_controversy(extraction.evidence) if extraction else ""
+
     context = {
         "is_logged_in": True,
         "filing_draft": draft_snapshot(draft),
@@ -108,7 +120,7 @@ def case_questions(request, jurisdiction):
         "answers": draft.supplemental_fields or {},
         "return_to": return_target(request),
         "show_amount_field": show_amount_field,
-        "amount_in_controversy": draft.amount_in_controversy,
+        "amount_in_controversy": amount_value,
     }
     context.update(get_workflow_context(WorkflowStepKey.CASE_QUESTIONS, jurisdiction, draft))
     return render(request, "efile/case_questions.html", context)