@@ -698,18 +698,31 @@ QJsonValue fitToQuestion(const Question &q, const QJsonValue &v)
     return {};
 }
 
-QString summaryText(int answered, int total, int changed, int clarify)
+QString summaryText(int answered, int total, int changed, int clarify, bool hasNote)
 {
     const QString head = answered == total
         ? QStringLiteral("Answered %1 question%2").arg(total).arg(total == 1 ? QString() : QStringLiteral("s"))
         : QStringLiteral("Answered %1 of %2 questions").arg(answered).arg(total);
     QString out = head + QStringLiteral(" · %1 changed").arg(changed);
     if (clarify > 0)
         out += QStringLiteral(" · %1 to clarify").arg(clarify);
+    if (hasNote)
+        out += QStringLiteral(" · note");
     return out;
 }
 
 constexpr QLatin1String kNeedsClarification("needs clarification");
+// Never a question line: those start `<id> "`.
+constexpr QLatin1String kUserNoteLead("Note from the user: ");
+
+// The form note as a prompt line; continuation lines are indented so the
+// summary and overview parsers never read them as questions.
+QString userNoteLine(const QString &note)
+{
+    QString text = note.trimmed();
+    text.replace(QLatin1Char('\n'), QStringLiteral("\n  "));
+    return kUserNoteLead + text;
+}
 
 } // namespace
 
@@ -767,7 +780,7 @@ QVector<Answer> carryOver(const Spec &next, const QVector<Answer> &previous)
     return out;
 }
 
-QString formatAnswers(const Spec &spec, const QVector<Answer> &answers)
+QString formatAnswers(const Spec &spec, const QVector<Answer> &answers, const QString &note)
 {
     QString out = QLatin1String(kAnswersHeader) + QLatin1Char('\n');
     if (!spec.title.isEmpty())
@@ -801,6 +814,8 @@ QString formatAnswers(const Spec &spec, const QVector<Answer> &answers)
             out += QStringLiteral("  note: ") + indented + QLatin1Char('\n');
         }
     }
+    if (!note.trimmed().isEmpty())
+        out += userNoteLine(note) + QLatin1Char('\n');
     // No `": ` in this line: the summary and overview parsers skip it.
     if (!unclear.isEmpty()) {
         out += QStringLiteral("To clarify: %1. Explain them in the user's language, then call ask_user again "
@@ -810,7 +825,7 @@ QString formatAnswers(const Spec &spec, const QVector<Answer> &answers)
     return out;
 }
 
-QString answerSummary(const Spec &spec, const QVector<Answer> &answers)
+QString answerSummary(const Spec &spec, const QVector<Answer> &answers, const QString &note)
 {
     int answered = 0;
     int changed = 0;
@@ -827,7 +842,8 @@ QString answerSummary(const Spec &spec, const QVector<Answer> &answers)
         if (isChanged(q, *a))
             ++changed;
     }
-    return summaryText(answered, static_cast<int>(spec.questions.size()), changed, clarify);
+    return summaryText(answered, static_cast<int>(spec.questions.size()), changed, clarify,
+                       !note.trimmed().isEmpty());
 }
 
 QString summaryFromAnswersText(const QString &text)
@@ -841,16 +857,23 @@ QString summaryFromAnswersText(const QString &text)
             return QStringLiteral("Asked to clarify ") + text.mid(from + kLead.size(), to - from - kLead.size());
         return QStringLiteral("Asked to clarify a question");
     }
-    if (text.contains(QLatin1String(kDismissedLine)))
-        return QStringLiteral("Dismissed the form");
+    if (text.contains(QLatin1String(kDismissedLine))) {
+        const bool hasNote = text.contains(QString(QLatin1Char('\n')) + kUserNoteLead);
+        return hasNote ? QStringLiteral("Dismissed the form · note") : QStringLiteral("Dismissed the form");
+    }
     int total = 0;
     int answered = 0;
     int changed = 0;
     int clarify = 0;
+    bool hasNote = false;
     static const QString kClarifyEnd = QStringLiteral("\": ") + kNeedsClarification;
     const QStringList lines = text.split(QLatin1Char('\n'));
     for (int i = 1; i < lines.size(); ++i) { // line 0 is the header
         const QString &line = lines.at(i);
+        if (line.startsWith(kUserNoteLead)) {
+            hasNote = true;
+            continue;
+        }
         if (line.isEmpty() || line.at(0).isSpace() || line.startsWith(QLatin1String("Form: "))
             || !line.contains(QLatin1String("\": "))) {
             continue;
@@ -866,7 +889,7 @@ QString summaryFromAnswersText(const QString &text)
         if (line.contains(QStringLiteral(" — changed (recommended: ")))
             ++changed;
     }
-    return summaryText(answered, total, changed, clarify);
+    return summaryText(answered, total, changed, clarify, hasNote);
 }
 
 namespace {
@@ -1116,9 +1139,25 @@ QStringList answerOverview(const QString &text, int maxAnswerChars)
         return out;
     static const QLatin1String kRecommended(" (recommended)");
     static const QString kChanged = QStringLiteral(" — changed (recommended: ");
+    auto cut = [maxAnswerChars](QString s) {
+        if (maxAnswerChars > 1 && s.size() > maxAnswerChars)
+            s = s.left(maxAnswerChars - 1) + QStringLiteral("…");
+        return s;
+    };
     const QStringList lines = text.split(QLatin1Char('\n'));
     for (int i = 1; i < lines.size(); ++i) {
         const QString &line = lines.at(i);
+        if (line.startsWith(kUserNoteLead)) {
+            // The form note on one line: its indented continuation joins it.
+            QString note = line.mid(kUserNoteLead.size());
+            while (i + 1 < lines.size() && lines.at(i + 1).startsWith(QLatin1String("  "))) {
+                const QString more = lines.at(++i).trimmed();
+                if (!more.isEmpty())
+                    note += QLatin1Char(' ') + more;
+            }
+            out.append(QStringLiteral("Note → ") + cut(note));
+            continue;
+        }
         if (line.isEmpty() || line.at(0).isSpace() || line.startsWith(QLatin1String("Form: ")))
             continue;
         const qsizetype space = line.indexOf(QLatin1Char(' '));
@@ -1150,8 +1189,7 @@ QStringList answerOverview(const QString &text, int maxAnswerChars)
                 item = displayItem(item);
             shown = items.join(QStringLiteral(", "));
         }
-        if (maxAnswerChars > 1 && shown.size() > maxAnswerChars)
-            shown = shown.left(maxAnswerChars - 1) + QStringLiteral("…");
+        shown = cut(shown);
         out.append(QStringLiteral("%1 %2 → %3").arg(id, title, shown)
                    + (changed ? QStringLiteral(" · changed") : QString()));
     }
@@ -1162,7 +1200,7 @@ QString dismissPrompt(const QString &note)
 {
     QString out = QLatin1String(kAnswersHeader) + QLatin1Char('\n') + QLatin1String(kDismissedLine);
     if (!note.trimmed().isEmpty())
-        out += QStringLiteral("\nNote from the user: ") + note.trimmed();
+        out += QLatin1Char('\n') + userNoteLine(note);
     return out;
 }
 
 
@@ -148,15 +148,20 @@ bool hasAnswer(const Question &q, const Answer &a);
 // The answer differs from a defined recommendation.
 bool isChanged(const Question &q, const Answer &a);
 
-// The prompt sent to the agent after Submit.
-QString formatAnswers(const Spec &spec, const QVector<Answer> &answers);
+// The prompt sent to the agent after Submit. `note`: the form-level note the
+// user adds below the questions, sent as "Note from the user: …" after the
+// answers (omitted when blank).
+QString formatAnswers(const Spec &spec, const QVector<Answer> &answers, const QString &note = {});
 // One line for the collapsed bubble: "Answered 10 questions · 3 changed",
-// plus " · 2 to clarify" when the user flagged questions.
-QString answerSummary(const Spec &spec, const QVector<Answer> &answers);
+// plus " · 2 to clarify" when the user flagged questions and " · note" when
+// the form note is not blank.
+QString answerSummary(const Spec &spec, const QVector<Answer> &answers, const QString &note = {});
 // Same summary, recomputed from the prompt text (restored history).
 QString summaryFromAnswersText(const QString &text);
 // One line per question from the prompt text: "Q1 Title → answer[ · changed]",
-// answers cut to `maxAnswerChars`. Empty for dismiss and legacy clarify prompts.
+// then "Note → text" for the form note; answers and the note cut to
+// `maxAnswerChars`. Legacy clarify prompts have none; a dismiss prompt has
+// only its note line, if any.
 QStringList answerOverview(const QString &text, int maxAnswerChars = 90);
 
 QString dismissPrompt(const QString &note);
 
@@ -1086,6 +1086,7 @@ void AcpSessionView::rebind(AcpSessionModel *model, AcpConnection *connection)
     m_askUserCandidates.clear();
     m_askUserShown.clear();
     m_carryAnswers.clear();
+    m_carryNote.clear();
 
     clearBanner();
     if (m_usageIndicator) {
@@ -2482,13 +2483,15 @@ void AcpSessionView::presentForm(const AskUserForm::Spec &spec, FormSource sourc
 {
     if (m_pendingForm) {
         m_carryAnswers = m_pendingForm->answers();
+        m_carryNote = m_pendingForm->note();
         settlePendingForm(AskUserFormWidget::State::Superseded, {}, QStringLiteral("decline"));
     }
     // Revised ask_user rounds keep what the user already chose (same ids).
     const QVector<AskUserForm::Answer> initial = source == FormSource::ToolCall && !m_carryAnswers.isEmpty()
         ? AskUserForm::carryOver(spec, m_carryAnswers)
         : AskUserForm::defaultAnswers(spec);
     m_carryAnswers.clear();
+    const QString carriedNote = std::exchange(m_carryNote, QString());
 
     auto *form = new AskUserFormWidget(spec, initial, m_transcriptHost);
     form->setChatFont(chatFont());
@@ -2508,6 +2511,7 @@ void AcpSessionView::presentForm(const AskUserForm::Spec &spec, FormSource sourc
         return;
     }
 
+    form->setNote(carriedNote);
     m_pendingForm = form;
     m_pendingFormSource = source;
     m_pendingFormKey = key;
@@ -2569,10 +2573,11 @@ void AcpSessionView::onFormSubmitted(const QVector<AskUserForm::Answer> &answers
     const AskUserForm::Spec spec = m_pendingForm->spec();
     const FormSource source = m_pendingFormSource;
     const QString key = m_pendingFormKey;
+    const QString note = m_pendingForm->note();
     const bool clarify = std::any_of(answers.cbegin(), answers.cend(),
                                      [](const AskUserForm::Answer &a) { return a.clarify; });
     settlePendingForm(clarify ? AskUserFormWidget::State::ClarifyRequested : AskUserFormWidget::State::Answered,
-                      AskUserForm::answerSummary(spec, answers));
+                      AskUserForm::answerSummary(spec, answers, note));
     if (source == FormSource::Elicitation) {
         if (m_connection) {
             m_connection->respondToElicitation(key, QStringLiteral("accept"),
@@ -2582,7 +2587,8 @@ void AcpSessionView::onFormSubmitted(const QVector<AskUserForm::Answer> &answers
         // The agent re-asks the flagged questions: keep what the user chose.
         if (clarify)
             m_carryAnswers = answers;
-        sendHostPrompt(AskUserForm::formatAnswers(spec, answers), QLatin1String(AskUserForm::kMarkerAnswers));
+        sendHostPrompt(AskUserForm::formatAnswers(spec, answers, note),
+                       QLatin1String(AskUserForm::kMarkerAnswers));
     }
     if (m_input)
         m_input->setFocus();
@@ -2594,12 +2600,13 @@ void AcpSessionView::onFormDismissed()
         return;
     const FormSource source = m_pendingFormSource;
     const QString key = m_pendingFormKey;
+    const QString note = m_pendingForm->note();
     settlePendingForm(AskUserFormWidget::State::Dismissed);
     if (source == FormSource::Elicitation) {
         if (m_connection)
             m_connection->respondToElicitation(key, QStringLiteral("decline"));
     } else {
-        sendHostPrompt(AskUserForm::dismissPrompt({}), QLatin1String(AskUserForm::kMarkerAnswers));
+        sendHostPrompt(AskUserForm::dismissPrompt(note), QLatin1String(AskUserForm::kMarkerAnswers));
     }
 }
 
 
@@ -483,6 +483,8 @@ private slots:
     QSet<QString> m_askUserShown;
     // Answers of a form that was superseded or sent for clarification.
     QVector<AskUserForm::Answer> m_carryAnswers;
+    // Form note of a superseded form (never sent). A sent note is not carried.
+    QString m_carryNote;
     bool m_scheduledUnattended = false;
 
     bool m_updatingSelectors = false;
 
@@ -10,6 +10,7 @@
 
 #include "AskUserFormWidget.h"
 
+#include <QAbstractTextDocumentLayout>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
@@ -33,9 +34,12 @@
 #include <QStyledItemDelegate>
 #include <QWheelEvent>
 #include <QStyle>
+#include <QTextDocument>
 #include <QToolButton>
 #include <QVBoxLayout>
 
+#include <algorithm>
+#include <cmath>
 #include <utility>
 
 using AskUserForm::Answer;
@@ -45,6 +49,7 @@ using AskUserForm::QuestionType;
 namespace {
 
 constexpr int kTextareaLines = 4;
+constexpr int kNoteMaxLines = 6; // the form note scrolls past this
 constexpr qreal kClarifyOpacity = 0.45; // controls of a flagged question: not sent
 constexpr int kOtherButtonId = 1 << 20; // past any option index; never a Qt auto id
 
@@ -456,6 +461,19 @@ void AskUserFormWidget::buildUi()
     m_rows.resize(m_spec.questions.size());
     for (int i = 0; i < m_spec.questions.size(); ++i)
         bodyLayout->addWidget(buildQuestion(i));
+    // Anything the user remembers that no question asked. Elicitation answers
+    // are a fixed schema with no place for it.
+    if (m_spec.source == AskUserForm::Source::AskUser) {
+        m_formNoteEdit = new QPlainTextEdit(m_body);
+        m_formNoteEdit->setPlaceholderText(tr("Anything else the agent should know? (optional)"));
+        m_formNoteEdit->setTabChangesFocus(true);
+        m_formNoteEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        bodyLayout->addWidget(m_formNoteEdit);
+        watch(m_formNoteEdit);
+        connect(m_formNoteEdit->document()->documentLayout(), &QAbstractTextDocumentLayout::documentSizeChanged,
+                this, &AskUserFormWidget::fitNote);
+        fitNote();
+    }
     root->addWidget(m_body);
 
     m_footer = new QWidget(this);
@@ -839,6 +857,30 @@ void AskUserFormWidget::setClarify(int index, bool on)
     updateProgress();
 }
 
+void AskUserFormWidget::fitNote()
+{
+    if (!m_formNoteEdit)
+        return;
+    // A plain-text document layout measures its height in lines.
+    const int lines = static_cast<int>(std::ceil(m_formNoteEdit->document()->size().height()));
+    // No scroll bar while the box fits its text: one would narrow it, rewrap
+    // the text and resize the box again.
+    m_formNoteEdit->setVerticalScrollBarPolicy(lines > kNoteMaxLines ? Qt::ScrollBarAsNeeded
+                                                                 : Qt::ScrollBarAlwaysOff);
+    fitLines(m_formNoteEdit, std::clamp(lines, 1, kNoteMaxLines));
+}
+
+QString AskUserFormWidget::note() const
+{
+    return m_formNoteEdit ? m_formNoteEdit->toPlainText().trimmed() : QString();
+}
+
+void AskUserFormWidget::setNote(const QString &note)
+{
+    if (m_formNoteEdit)
+        m_formNoteEdit->setPlainText(note);
+}
+
 void AskUserFormWidget::updateProgress()
 {
     if (m_building || !m_progressLabel)
@@ -1030,6 +1072,9 @@ void AskUserFormWidget::trySubmit()
 
 bool AskUserFormWidget::eventFilter(QObject *watched, QEvent *event)
 {
+    // The style sheet's frame width applies after the first fit (at polish).
+    if (watched == m_formNoteEdit && (event->type() == QEvent::Polish || event->type() == QEvent::StyleChange))
+        fitNote();
     if (event->type() != QEvent::KeyPress || !isPending())
         return QFrame::eventFilter(watched, event);
     auto *ke = static_cast<QKeyEvent *>(event);
@@ -1093,6 +1138,9 @@ void AskUserFormWidget::setState(State state, const QString &detail)
     setProperty("pending", pending);
     repolish(this);
     m_body->setEnabled(pending);
+    // A settled form keeps its note on show, and no empty box.
+    if (m_formNoteEdit)
+        m_formNoteEdit->setVisible(pending || !note().isEmpty());
     // Settled forms collapse to their status line; the chevron shows them.
     m_toggle->setVisible(!pending);
     m_toggle->setChecked(pending);
@@ -1119,6 +1167,7 @@ void AskUserFormWidget::setChatFont(const QFont &font)
         if (row.textEdit)
             fitLines(row.textEdit, kTextareaLines);
     }
+    fitNote();
 }
 
 QWidget *AskUserFormWidget::inputOf(int index) const
 
@@ -58,6 +58,10 @@ class AskUserFormWidget : public QFrame
     // `detail` overrides the default status text (e.g. the cancel reason).
     void setState(State state, const QString &detail = {});
     QVector<AskUserForm::Answer> answers() const;
+    // The form-level note below the questions (trimmed; always empty for
+    // elicitation, whose answers are a fixed schema).
+    QString note() const;
+    void setNote(const QString &note);
 
     void setChatFont(const QFont &font);
     void focusFirstQuestion();
@@ -103,6 +107,8 @@ class AskUserFormWidget : public QFrame
     void watch(QWidget *w);
     void updateProposalEditor(int index);
     void setClarify(int index, bool on);
+    // Grows the note box with its text, one line up to kNoteMaxLines.
+    void fitNote();
     void updateProgress();
     void setExpanded(bool expanded);
     void applyTheme();
@@ -120,6 +126,7 @@ class AskUserFormWidget : public QFrame
     QLabel *m_statusLabel = nullptr;
     QToolButton *m_toggle = nullptr;
     QWidget *m_body = nullptr;
+    QPlainTextEdit *m_formNoteEdit = nullptr; // ask_user only
     QWidget *m_footer = nullptr;
     QLabel *m_progressLabel = nullptr;
     QPushButton *m_submitButton = nullptr;