fix(embed): put back embeds that move themselves

Apps can move, resize, or minimize the embedded window on
their own (Blender .blend size, Win+arrow). Comparing only
to our last request hid those drifts, and SetWindowPos left
iconic/zoomed state untouched. Match the live rect and clear
min/max first so the next tick re-covers the host.

- grill_me: final plan summary is plain chat, not an ask round

Author: nullmastermind

src/EmbeddedWindowWorker.cpp

@@ -79,7 +79,6 @@ void EmbeddedWindowWorker::State::run(const std::shared_ptr<State> &self)
     if (!s.attached)
         return;
     quint64 appliedStamp = 0;
-    quint64 appliedRect = ~quint64(0);
     quint64 appliedActivate = 0;
     quint64 appliedForeground = 0;
     int appliedEnabled = -1;
@@ -103,10 +102,20 @@ void EmbeddedWindowWorker::State::run(const std::shared_ptr<State> &self)
             const quint64 g = s.geometry.load(std::memory_order_relaxed);
             const auto field = [g](int shift) { return static_cast<int>(static_cast<qint16>((g >> shift) & 0xffff)); };
             const bool visible = stamp & 1;
-            // Same rect (a tab switch): only show/hide, so the app gets no
-            // move/size messages at all.
-            const UINT keep = g == appliedRect ? SWP_NOMOVE | SWP_NOSIZE : 0;
-            appliedRect = g;
+            // The app minimized or maximized itself (Win+arrow on the
+            // foreground embed): leave that state through its own window
+            // procedure first, or SetWindowPos only moves the restore rect.
+            if (visible && (IsIconic(s.target) || IsZoomed(s.target)))
+                ShowWindow(s.target, SW_SHOWNOACTIVATE);
+            // Already where it should be (a tab switch): only show/hide, so
+            // the app gets no move/size messages at all. Compare with where
+            // the window is, never with what we last asked for: an app that
+            // moved itself must be put back by the next request.
+            RECT current{};
+            const bool sameRect = GetWindowRect(s.target, &current)
+                && current.left == field(0) && current.top == field(16)
+                && current.right - current.left == field(32) && current.bottom - current.top == field(48);
+            const UINT keep = sameRect ? SWP_NOMOVE | SWP_NOSIZE : 0;
             // NOZORDER: an owned window always stays above its owner; keep its
             // place among our other owned windows (dialogs, menus, docks).
             const UINT flags = SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER | keep;

src/GrillMeForm.cpp

@@ -639,7 +639,12 @@ QJsonObject toolDefinition()
              "`[grill_me answers]`; `no answer` = skipped, re-ask later; `needs clarification` = explain and "
              "re-ask only those questions (same ids), the other answers are final. A chat reply replaces the "
              "form. Once the plan is settled or the user said to implement, stop asking: never ask how or "
-             "whether to proceed or offer invented next-step menus.")},
+             "whether to proceed or offer invented next-step menus. The closing check (\"is this the shared "
+             "understanding?\", the final plan summary to accept) is never a form question: write the settled "
+             "plan as plain text in your reply and let the user confirm or correct it in chat. Once you have "
+             "written that summary, the rounds are over: do not call this tool again for the rest of that "
+             "work (implementation, follow-up questions, next steps) unless the user starts a new question "
+             "round.")},
         {QStringLiteral("inputSchema"), schema},
     };
 }
@@ -661,7 +666,9 @@ constexpr QLatin1String kQuestionRoundCommands[] = {
 
 constexpr QLatin1String kQuestionRoundHint(
     "[NotepadAI note, not part of the request] Deliver each question round of this command through the "
-    "`ask` tool of the `grill_me` MCP server (one call per round, then end your turn), never as plain text.");
+    "`ask` tool of the `grill_me` MCP server (one call per round, then end your turn), never as plain text. "
+    "The final plan summary and its confirmation are not a round: write them as plain text, not through `ask`, "
+    "and never call `ask` again after that summary.");
 
 } // namespace
 

tests/test_embedded_window_win32.cpp

@@ -255,6 +255,8 @@ private slots:
     void embedIsOwnedPopupOutOfTaskbar();
     void followsWindowMoves();
     void hidesWithItsTab();
+    void putsBackAnEmbedThatMovedItself();
+    void restoresAnEmbedThatMinimizedItself();
     void modalDialogDisablesEmbed();
     void blenderGetsModifierKeys();
     void benchmarkNativeSiblingCost();
@@ -975,6 +977,35 @@ void TestEmbeddedWindowWin32::hidesWithItsTab()
     QTRY_VERIFY_WITH_TIMEOUT(hostFilledByChild(), 1500);
 }
 
+// The app moves or resizes its own window (Blender applies the window size a
+// .blend stores, Win+arrow snaps the foreground embed): the watchdog tick
+// (EmbeddedWindowManager::platTick -> sync) must put it back over the host,
+// even though the host itself did not move.
+void TestEmbeddedWindowWin32::putsBackAnEmbedThatMovedItself()
+{
+    QVERIFY(embed());
+    QTRY_VERIFY_WITH_TIMEOUT(hostFilledByChild(), 1500);
+    HWND t = h->target.hwnd();
+    RECT r{};
+    QVERIFY(GetWindowRect(t, &r));
+    QVERIFY(SetWindowPos(t, nullptr, r.left + 400, r.top + 300, 200, 150,
+                         SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER));
+    QVERIFY(!hostFilledByChild(false));
+    QTRY_VERIFY_WITH_TIMEOUT((h->host->sync(), hostFilledByChild()), 1500);
+}
+
+// The app minimizes itself (Win+Down on the foreground embed): the host stays
+// empty unless the tick restores it.
+void TestEmbeddedWindowWin32::restoresAnEmbedThatMinimizedItself()
+{
+    QVERIFY(embed());
+    QTRY_VERIFY_WITH_TIMEOUT(hostFilledByChild(), 1500);
+    HWND t = h->target.hwnd();
+    ShowWindow(t, SW_SHOWMINNOACTIVE);
+    QTRY_VERIFY_WITH_TIMEOUT(IsIconic(t), 1000);
+    QTRY_VERIFY_WITH_TIMEOUT((h->host->sync(), hostFilledByChild()), 1500);
+}
+
 void TestEmbeddedWindowWin32::modalDialogDisablesEmbed()
 {
     QVERIFY(embed());