From b02f03c0deab600941fb4c2f25c5ac22f324a05f Mon Sep 17 00:00:00 2001
From: ahmad-ajmal <ahmadajmal1514@gmail.com>
Date: Wed, 30 Sep 2026 13:28:00 +0100
Subject: [PATCH] fix: keep chat-started Agent App setups resumable (#448)

---
 app/agent_app/manager.py                      |   8 +
 app/agent_app/origin_notices.py               |  94 +++++++
 app/agent_app/pending_setups.py               | 179 ++++++++++++++
 app/agent_app/wizard.py                       |   5 +-
 app/agent_base.py                             |   1 +
 app/data/action/agent_app_actions.py          | 100 +++++---
 app/session/session_manager.py                |  10 +
 app/triggers/sources.py                       |   3 +
 app/ui_layer/adapters/browser_adapter.py      |  80 ++++--
 .../frontend/src/components/Chat/Chat.tsx     |  15 ++
 .../Chat/ResumeSetupCard.module.css           |  77 ++++++
 .../src/components/Chat/ResumeSetupCard.tsx   |  42 ++++
 .../frontend/src/components/layout/NavBar.tsx |   5 +
 .../src/components/ui/ChatSetupHost.tsx       | 101 ++++++++
 .../src/components/ui/CreateAgentAppModal.tsx |  54 +---
 .../src/components/ui/CreateCustomWizard.tsx  |  53 ++--
 .../browser/frontend/src/locales/en/chat.json |   8 +
 .../frontend/src/locales/en/components.json   |   4 +
 .../browser/frontend/src/locales/es/chat.json |   8 +
 .../frontend/src/locales/es/components.json   |   4 +
 .../browser/frontend/src/locales/id/chat.json |   8 +
 .../frontend/src/locales/id/components.json   |   4 +
 .../browser/frontend/src/locales/ja/chat.json |   8 +
 .../frontend/src/locales/ja/components.json   |   4 +
 .../browser/frontend/src/locales/ko/chat.json |   8 +
 .../frontend/src/locales/ko/components.json   |   4 +
 .../frontend/src/locales/zh-CN/chat.json      |   8 +
 .../src/locales/zh-CN/components.json         |   4 +
 .../frontend/src/locales/zh-TW/chat.json      |   8 +
 .../src/locales/zh-TW/components.json         |   4 +
 .../browser/frontend/src/store/index.ts       |   2 +
 .../src/store/resources/ResourceSync.ts       |   1 +
 .../frontend/src/store/resources/catalog.ts   |   8 +
 .../src/store/selectors/agentAppSetup.ts      |  30 +++
 .../src/store/slices/agentAppSetupSlice.ts    | 139 +++++++++++
 .../frontend/src/store/uiState/catalog.ts     |   7 +-
 .../browser/frontend/src/types/index.ts       |  36 +++
 app/ui_layer/events/resource_changes.py       |  11 +
 tests/test_agent_app_pending_setups.py        | 232 ++++++++++++++++++
 tests/test_resource_changes.py                |   5 +
 tests/test_ws_auth.py                         |   5 +-
 41 files changed, 1244 insertions(+), 143 deletions(-)
 create mode 100644 app/agent_app/origin_notices.py
 create mode 100644 app/agent_app/pending_setups.py
 create mode 100644 app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.module.css
 create mode 100644 app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.tsx
 create mode 100644 app/ui_layer/browser/frontend/src/components/ui/ChatSetupHost.tsx
 create mode 100644 app/ui_layer/browser/frontend/src/store/selectors/agentAppSetup.ts
 create mode 100644 app/ui_layer/browser/frontend/src/store/slices/agentAppSetupSlice.ts
 create mode 100644 tests/test_agent_app_pending_setups.py

diff --git a/app/agent_app/manager.py b/app/agent_app/manager.py
index 2be97b48..140742c6 100644
--- a/app/agent_app/manager.py
+++ b/app/agent_app/manager.py
@@ -267,6 +267,14 @@ def __init__(self, workspace_root: Path):
             self.workspace_root / "agent_app_instances.json", self.ports
         )
 
+        # Chat-started setup interviews not yet finalized or cancelled
+        # (pending_setups.py). Persisted so a closed popup can be resumed.
+        from app.agent_app.pending_setups import PendingSetupRegistry
+
+        self.pending_setups = PendingSetupRegistry(
+            self.workspace_root / "agent_app_pending_setups.json"
+        )
+
         # Session and trigger management (set via bind_session_manager)
         self._session_manager: Optional["SessionManager"] = None
         self._trigger_service: Optional["TriggerService"] = None
diff --git a/app/agent_app/origin_notices.py b/app/agent_app/origin_notices.py
new file mode 100644
index 00000000..402b4605
--- /dev/null
+++ b/app/agent_app/origin_notices.py
@@ -0,0 +1,94 @@
+"""Notices to the ORIGIN session: the chat that ran ``agent_app_scaffold``.
+
+After the scaffold hands the setup questions to the user, that chat's agent
+has ended its turn and only hears back through these triggers. This module is
+the single place that writes their text, so the agent's view of a pending
+setup (pending_setups.py) has exactly two endings: created or cancelled.
+
+Both are best-effort. A failed notice is logged and never breaks the
+finalize or cancel it reports.
+"""
+
+from __future__ import annotations
+
+from typing import Any, Optional
+
+from .pending_setups import PendingSetup
+
+try:
+    from loguru import logger
+except ImportError:  # pragma: no cover - loguru is always present in-app
+    import logging
+
+    logger = logging.getLogger(__name__)
+
+
+async def notify_setup_created(
+    trigger_service: Optional[Any], session_id: str, project_id: str, project_name: str
+) -> None:
+    """The setup questions were answered and the project now exists."""
+    from app.triggers import TriggerSource
+
+    await _emit(
+        trigger_service,
+        TriggerSource.AGENT_APP_CREATED,
+        session_id,
+        (
+            f"FYI: the setup questions were answered — Agent App "
+            f"'{project_name}' (project_id {project_id}) has been created and "
+            "its build is running in its own session. No action and no "
+            "message needed: acknowledge silently with end_turn unless the "
+            "user has asked for something. Remember the project_id for "
+            "future requests about this app."
+        ),
+        {"project_id": project_id},
+    )
+
+
+async def notify_setup_cancelled(
+    trigger_service: Optional[Any], setup: PendingSetup
+) -> None:
+    """The user cancelled the setup, so no project will be created."""
+    from app.triggers import TriggerSource
+
+    await _emit(
+        trigger_service,
+        TriggerSource.AGENT_APP_SETUP_CANCELLED,
+        setup.origin_session_id,
+        (
+            f"FYI: the user cancelled the setup for Agent App '{setup.name}'. "
+            "No project was created. Do not ask the setup questions again or "
+            "call agent_app_scaffold for it unless the user asks. No message "
+            "needed: acknowledge silently with end_turn unless the user has "
+            "asked for something."
+        ),
+        {"wizard_id": setup.wizard_id},
+    )
+
+
+async def _emit(
+    trigger_service: Optional[Any],
+    source: Any,
+    session_id: str,
+    description: str,
+    payload: dict,
+) -> None:
+    if not trigger_service or not session_id:
+        return
+    try:
+        from app.triggers import TriggerSpec
+
+        await trigger_service.emit(
+            TriggerSpec(
+                source=source,
+                description=description,
+                priority=10,
+                session_id=session_id,
+                payload=payload,
+            )
+        )
+    except Exception as e:
+        logger.debug(f"[AGENT_APP:SETUP] origin-session notice failed: {e}")
+
+
+__all__ = ["notify_setup_created", "notify_setup_cancelled"]
diff --git a/app/agent_app/pending_setups.py b/app/agent_app/pending_setups.py
new file mode 100644
index 00000000..db57d9f0
--- /dev/null
+++ b/app/agent_app/pending_setups.py
@@ -0,0 +1,179 @@
+"""Pending chat-started setups: setup interviews the user has not finished.
+
+When the agent runs ``agent_app_scaffold`` from a chat and the wizard has
+questions, no project exists yet; the user answers in the Create Custom
+wizard and finalize creates the project. Until then the setup lives here, so
+closing the popup, reloading the page or connecting a new tab never loses it
+(issue #448, docs/plans/agent-app-setup-resume-plan.md).
+
+Lifecycle::
+
+    opened ──► (hidden ⇄ shown)* ──► finalized  (project created; record removed)
+                                   └► cancelled  (record removed; origin agent told)
+
+Hiding and showing the popup are browser-only; the record is created by the
+scaffold action and removed by finalize, cancel, or deletion of the chat that
+started it.
+
+This module owns persistence only. It knows nothing about browsers, triggers
+or the agent: the UI layer turns the surrounding messages into resource
+invalidations, and ``origin_notices`` tells the agent. The setup is Agent App
+state, which is why it is not stored as a chat message.
+
+Only the chat path persists setups. The "+" modal's Create Custom flow is
+opened by the user, so closing it is a cancel and nothing is kept.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import threading
+import time
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any, Dict, List, Optional
+
+try:
+    from loguru import logger
+except ImportError:  # pragma: no cover - loguru is always present in-app
+    import logging
+
+    logger = logging.getLogger(__name__)
+
+
+def _name_key(name: str) -> str:
+    """Case- and whitespace-insensitive app-name key used for dedup."""
+    return " ".join(str(name or "").split()).casefold()
+
+
+@dataclass(frozen=True)
+class PendingSetup:
+    """A chat-started setup interview the user has not finished yet."""
+
+    wizard_id: str
+    origin_session_id: str
+    name: str
+    config: Dict[str, Any]
+    questions: List[Dict[str, Any]]
+    created_at: float = field(default_factory=time.time)
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Wire shape: the same fields ``agent_app_wizard_open`` carries."""
+        return {
+            "wizardId": self.wizard_id,
+            "originSessionId": self.origin_session_id,
+            "name": self.name,
+            "config": self.config,
+            "questions": self.questions,
+            "createdAt": self.created_at,
+        }
+
+    @classmethod
+    def from_dict(cls, d: Dict[str, Any]) -> "PendingSetup":
+        return cls(
+            wizard_id=str(d["wizardId"]),
+            origin_session_id=str(d.get("originSessionId") or ""),
+            name=str(d.get("name") or ""),
+            config=dict(d.get("config") or {}),
+            questions=list(d.get("questions") or []),
+            created_at=float(d.get("createdAt") or time.time()),
+        )
+
+
+class PendingSetupRegistry:
+    """Persisted pending chat setups, keyed by wizard id. Thread-safe."""
+
+    def __init__(self, path: Path) -> None:
+        self._path = Path(path)
+        self._lock = threading.RLock()
+        self._by_id: Dict[str, PendingSetup] = {}
+        self._load()
+
+    def add(self, setup: PendingSetup) -> None:
+        with self._lock:
+            self._by_id[setup.wizard_id] = setup
+            self._save()
+
+    def get(self, wizard_id: str) -> Optional[PendingSetup]:
+        with self._lock:
+            return self._by_id.get(wizard_id)
+
+    def find(self, origin_session_id: str, name: str) -> Optional[PendingSetup]:
+        """The pending setup this session already opened for an app of this
+        name, so a repeated scaffold reopens it instead of re-interviewing."""
+        key = _name_key(name)
+        with self._lock:
+            for setup in self._by_id.values():
+                if (
+                    setup.origin_session_id == origin_session_id
+                    and _name_key(setup.name) == key
+                ):
+                    return setup
+        return None
+
+    def remove(self, wizard_id: str) -> Optional[PendingSetup]:
+        """Drop a setup; returns it, or None when it was already gone."""
+        with self._lock:
+            setup = self._by_id.pop(wizard_id, None)
+            if setup is not None:
+                self._save()
+            return setup
+
+    def remove_for_session(self, session_id: str) -> List[PendingSetup]:
+        """Drop every setup started from ``session_id`` (the chat was deleted)."""
+        with self._lock:
+            removed = [
+                s for s in self._by_id.values() if s.origin_session_id == session_id
+            ]
+            for setup in removed:
+                del self._by_id[setup.wizard_id]
+            if removed:
+                self._save()
+            return removed
+
+    def list(self) -> List[PendingSetup]:
+        """All pending setups, oldest first."""
+        with self._lock:
+            return sorted(self._by_id.values(), key=lambda s: s.created_at)
+
+    # ── persistence ─────────────────────────────────────────────────────
+
+    def _load(self) -> None:
+        try:
+            raw = json.loads(self._path.read_text(encoding="utf-8"))
+        except FileNotFoundError:
+            return
+        except Exception as e:
+            logger.warning(f"[PENDING_SETUPS] unreadable registry, starting empty: {e}")
+            return
+        for d in raw.get("setups", []):
+            try:
+                setup = PendingSetup.from_dict(d)
+            except Exception as e:
+                logger.warning(f"[PENDING_SETUPS] skipping malformed record: {e}")
+                continue
+            self._by_id[setup.wizard_id] = setup
+
+    def _save(self) -> None:
+        # Write-then-replace so a crash mid-write never truncates the file.
+        try:
+            self._path.parent.mkdir(parents=True, exist_ok=True)
+            payload = {"setups": [s.to_dict() for s in self._by_id.values()]}
+            tmp = self._path.with_suffix(self._path.suffix + ".tmp")
+            tmp.write_text(json.dumps(payload, indent=2) + "\n", encoding="utf-8")
+            os.replace(tmp, self._path)
+        except Exception as e:
+            logger.error(f"[PENDING_SETUPS] could not persist registry: {e}")
+
+
+def get_pending_setups() -> Optional[PendingSetupRegistry]:
+    """The process-wide registry owned by the Agent App manager, or None
+    before the manager exists (early boot, headless)."""
+    from app.agent_app import get_agent_app_manager
+
+    mgr = get_agent_app_manager()
+    return getattr(mgr, "pending_setups", None) if mgr is not None else None
+
+
+__all__ = ["PendingSetup", "PendingSetupRegistry", "get_pending_setups"]
diff --git a/app/agent_app/wizard.py b/app/agent_app/wizard.py
index 3c46ed41..bede90de 100644
--- a/app/agent_app/wizard.py
+++ b/app/agent_app/wizard.py
@@ -15,8 +15,11 @@
      saved to <project>/reference/requirements.md.
 
 Everything here runs BEFORE the project or its session exists — no
-project is created until the wizard finalizes, so a cancelled wizard
+project is created until the wizard finalizes, so a cancelled modal wizard
 leaves nothing behind except its staging folder (swept opportunistically).
+The chat path (agent_app_scaffold) is the exception: its unfinished
+interview is kept as a PendingSetup (pending_setups.py) until the user
+finishes or cancels it, so closing the popup never loses it.
 
 Attachments upload to a staging area (agent_app/_staging/wizard/<id>)
 and move into the project at finalize time.
diff --git a/app/agent_base.py b/app/agent_base.py
index 96c2aea4..c261c9b6 100644
--- a/app/agent_base.py
+++ b/app/agent_base.py
@@ -161,6 +161,7 @@ class TriggerData:
     TriggerSource.AGENT_APP_CRASH_FIX.value,
     TriggerSource.AGENT_APP_IMPORT.value,
     TriggerSource.AGENT_APP_CREATED.value,
+    TriggerSource.AGENT_APP_SETUP_CANCELLED.value,
     TriggerSource.AGENT_APP_APP_REQUEST.value,
 }
 
diff --git a/app/data/action/agent_app_actions.py b/app/data/action/agent_app_actions.py
index 58a4bf39..590355df 100644
--- a/app/data/action/agent_app_actions.py
+++ b/app/data/action/agent_app_actions.py
@@ -19,9 +19,11 @@
         "allocates ports, registers the project in the user's Agent App list, "
         "and runs a requirements check: if the chat already answers everything "
         "a builder needs, the build is dispatched immediately — otherwise "
-        "setup questions open in a popup in the user's browser (the same "
-        "interview the Create Agent App wizard uses) and the build starts "
-        "automatically when the user answers them. Follow the returned "
+        "setup questions open in the user's browser (the same interview the "
+        "Create Agent App wizard uses, resumable from a card in the chat) and "
+        "the build starts automatically when the user answers them. Calling "
+        "it again for an app whose setup is still pending reopens the same "
+        "questions. Follow the returned "
         "message either way. Do NOT write project files or call "
         "agent_app_notify_ready yourself."
     ),
@@ -89,9 +91,9 @@
             "type": "string",
             "example": "abc12345",
             "description": (
-                "The created project ID. ABSENT when setup questions opened "
-                "in the user's browser instead — the project is created when "
-                "they answer."
+                "The created project ID. ABSENT when setup questions are "
+                "pending in the user's browser instead — the project is "
+                "created when they answer."
             ),
         },
         "project_path": {
@@ -162,9 +164,44 @@ async def agent_app_scaffold(input_data: dict) -> dict:
         # ONLY what the chat left genuinely open (marketplace reuse check
         # included). Open questions → NO project is created here; the
         # wizard UI is summoned and its finalize creates the project
-        # exactly as the Add Agent App modal does. A cancelled popup, like
-        # a cancelled modal wizard, leaves nothing behind.
-        from app.agent_app import wizard
+        # exactly as the Add Agent App modal does. Until then the setup is
+        # a persisted PendingSetup (app/agent_app/pending_setups.py): the
+        # user can close the popup and resume it from a card pinned in this
+        # chat, or cancel it, which notifies this session.
+        from agent_core.core.session import MAIN_SESSION_ID
+        from app.agent_app import broadcast_agent_app_wizard_open, wizard
+        from app.agent_app.pending_setups import PendingSetup
+
+        origin_session = input_data.get("_session_id") or MAIN_SESSION_ID
+        pending_message = (
+            "No project created yet: {count} setup question(s) are open in "
+            "the user's browser and stay pinned in this chat as a 'Resume "
+            "setup' card until answered or cancelled. The project is created "
+            "and the build starts automatically when the user answers them — "
+            "you will be notified with the project_id then (and "
+            "agent_app_list_projects finds any project later); if they "
+            "cancel, you will be told that instead. Tell the user to answer "
+            "the setup questions, then end your turn. Do NOT relay the "
+            "questions in chat and do NOT build anything. If the user says "
+            "the questions are gone, point them to the Resume setup card "
+            "above the chat input, or call this action again for the same "
+            "app, which reopens the same questions."
+        )
+
+        # Already pending for this app in this chat (the user closed the
+        # popup and asked for it back): reopen the SAME questions. No new
+        # interview call, so the questions cannot change under the user.
+        existing = manager.pending_setups.find(origin_session, name)
+        if existing is not None:
+            try:
+                if await broadcast_agent_app_wizard_open(existing.to_dict()):
+                    return {
+                        "status": "success",
+                        "message": "Reopened the pending setup. "
+                        + pending_message.format(count=len(existing.questions)),
+                    }
+            except Exception:
+                pass
 
         chat_context = str(input_data.get("chat_context") or "").strip()
         wizard_config = {
@@ -194,44 +231,33 @@ async def agent_app_scaffold(input_data: dict) -> dict:
 
         if questions:
             # Summon the SAME Create Custom wizard UI the Add Agent App
-            # modal uses, opened at the interview step. Fail-open: no
-            # browser to show the popup (headless) → fall through and
-            # build without questions.
+            # modal uses, opened at the interview step. Persisted first, so
+            # a tab that connects later (or reloads) still gets it; the
+            # wizard round-trips originSessionId to finalize, which notifies
+            # this session of the created project. Fail-open: no browser
+            # adapter (headless) → drop the record and build without
+            # questions.
             import uuid as _uuid
 
-            from app.agent_app import broadcast_agent_app_wizard_open
-
+            setup = PendingSetup(
+                wizard_id=f"chat_{_uuid.uuid4().hex[:12]}",
+                origin_session_id=origin_session,
+                name=name,
+                config=wizard_config,
+                questions=questions,
+            )
+            manager.pending_setups.add(setup)
             _opened = False
             try:
-                _opened = await broadcast_agent_app_wizard_open(
-                    {
-                        "wizardId": f"chat_{_uuid.uuid4().hex[:12]}",
-                        "config": wizard_config,
-                        "questions": questions,
-                        # Round-tripped through the wizard to finalize, which
-                        # notifies this session of the created project.
-                        "originSessionId": input_data.get("_session_id") or "",
-                    }
-                )
+                _opened = await broadcast_agent_app_wizard_open(setup.to_dict())
             except Exception:
                 _opened = False
             if _opened:
                 return {
                     "status": "success",
-                    "message": (
-                        f"No project created yet: {len(questions)} setup "
-                        "question(s) just opened in a popup in the user's "
-                        "browser. The project is created and the build "
-                        "starts automatically when the user answers them — "
-                        "you will be notified with the project_id then "
-                        "(and agent_app_list_projects finds any project "
-                        "later). Tell the user to answer the setup "
-                        "questions that just appeared, then end your turn. "
-                        "Do NOT relay the questions in chat, do NOT build "
-                        "anything, and do NOT call this action again for "
-                        "the same app."
-                    ),
+                    "message": pending_message.format(count=len(questions)),
                 }
+            manager.pending_setups.remove(setup.wizard_id)
 
         project = await manager.create_project(
             name=name,
diff --git a/app/session/session_manager.py b/app/session/session_manager.py
index ad805c37..b00fa2ee 100644
--- a/app/session/session_manager.py
+++ b/app/session/session_manager.py
@@ -122,6 +122,16 @@ def _on_session_delete(session_id: str) -> None:
         logger.warning(
             f"[SessionManager] Failed to clear activity rows for {session_id}: {e}"
         )
+    try:
+        from app.agent_app.pending_setups import get_pending_setups
+
+        registry = get_pending_setups()
+        if registry is not None:
+            registry.remove_for_session(session_id)
+    except Exception as e:
+        logger.warning(
+            f"[SessionManager] Failed to drop pending setups for {session_id}: {e}"
+        )
 
 
 class SessionManager(_SessionManager):
diff --git a/app/triggers/sources.py b/app/triggers/sources.py
index 06495d82..ebad90f6 100644
--- a/app/triggers/sources.py
+++ b/app/triggers/sources.py
@@ -41,6 +41,9 @@ class TriggerSource(str, Enum):
     # tells that agent the wizard finalized and which project resulted, so
     # later references ("add data to it") resolve without asking the user.
     AGENT_APP_CREATED = "agent_app_created"
+    # Also lands in the ORIGIN session: the user cancelled a pending chat
+    # setup (pending_setups.py), so the agent stops asking for answers.
+    AGENT_APP_SETUP_CANCELLED = "agent_app_setup_cancelled"
     # An Agent App app fired a declared trigger at the agent (spec
     # TRIGGERS-PLAN): a validated agent_requests row exists and the bridge's
     # capability/consent/era gates all passed. Lands in the project's session.
diff --git a/app/ui_layer/adapters/browser_adapter.py b/app/ui_layer/adapters/browser_adapter.py
index 2a171d2a..13243e55 100644
--- a/app/ui_layer/adapters/browser_adapter.py
+++ b/app/ui_layer/adapters/browser_adapter.py
@@ -1335,6 +1335,10 @@ async def _websocket_handler(
                     },
                 }
             )
+            # Pending chat setups, pushed for the same reason: a setup summoned
+            # while no tab was open (or before a reload) must still show its
+            # Resume card.
+            channel.send_json(self._agent_app_setup_list_message())
         except Exception:
             self._ws_clients.discard(ws)
             self._channels.pop(ws, None)
@@ -2105,6 +2109,12 @@ async def _handle_ws_message(self, data: Dict[str, Any], ws=None) -> None:
         elif msg_type == "agent_app_wizard_finalize":
             await self._handle_agent_app_wizard_finalize(data)
 
+        elif msg_type == "agent_app_setup_list":
+            await self._send_to(ws, self._agent_app_setup_list_message())
+
+        elif msg_type == "agent_app_setup_cancel":
+            await self._handle_agent_app_setup_cancel(data)
+
         elif msg_type == "agent_app_theme_update":
             await self._handle_agent_app_theme_update(data)
 
@@ -2923,6 +2933,37 @@ async def _handle_agent_app_wizard_interview(self, data: Dict[str, Any]) -> None
                 }
             )
 
+    def _agent_app_setup_list_message(self) -> Dict[str, Any]:
+        """Every pending chat setup (pending_setups.py), as the reply to
+        ``agent_app_setup_list`` and the connect push."""
+        return {
+            "type": "agent_app_setup_list",
+            "data": {
+                "setups": [
+                    s.to_dict() for s in self._agent_app_manager.pending_setups.list()
+                ],
+            },
+        }
+
+    async def _handle_agent_app_setup_cancel(self, data: Dict[str, Any]) -> None:
+        """The user cancelled a pending chat setup: drop it and tell the chat
+        that started it, so its agent stops asking for answers. Closing the
+        popup is not a cancel (it stays resumable) and never reaches here."""
+        from app.agent_app.origin_notices import notify_setup_cancelled
+
+        wizard_id = str(data.get("wizardId") or "")
+        setup = self._agent_app_manager.pending_setups.remove(wizard_id)
+        if setup is not None:
+            await notify_setup_cancelled(
+                self._agent_app_manager._trigger_service, setup
+            )
+        await self._broadcast(
+            {
+                "type": "agent_app_setup_cancel",
+                "data": {"success": setup is not None, "wizardId": wizard_id},
+            }
+        )
+
     async def _handle_agent_app_wizard_finalize(self, data: Dict[str, Any]) -> None:
         """Wizard step 3: synthesize the requirements document, create the
         project, move staged attachments in, queue the build run in the
@@ -3002,6 +3043,11 @@ async def _handle_agent_app_wizard_finalize(self, data: Dict[str, Any]) -> None:
                 auth_mode=auth_mode,
                 style_pack=style_pack,
             )
+            # The project exists, so the setup is finished: drop its pending
+            # record now, before any later step can fail and leave a Resume
+            # card that would create a duplicate. Chat path only; a "+" modal
+            # wizard never had a record, so this is a no-op there.
+            self._agent_app_manager.pending_setups.remove(wizard_id)
 
             # Staged files: uploaded icon → app favicon, references →
             # <project>/reference/. An uploaded icon wins over a lucide pick.
@@ -3100,32 +3146,14 @@ async def _handle_agent_app_wizard_finalize(self, data: Dict[str, Any]) -> None:
                     get_factory_host().set_origin_session(project.id, origin_session)
                 except Exception as e:
                     logger.debug(f"[AGENT_APP:WIZARD] origin persist failed: {e}")
-                try:
-                    from app.triggers import TriggerSource, TriggerSpec
-
-                    await self._agent_app_manager._trigger_service.emit(
-                        TriggerSpec(
-                            source=TriggerSource.AGENT_APP_CREATED,
-                            description=(
-                                f"FYI: the setup questions were answered — "
-                                f"Agent App '{project.name}' (project_id "
-                                f"{project.id}) has been created and its "
-                                "build is running in its own session. No "
-                                "action and no message needed: acknowledge "
-                                "silently with end_turn unless the user has "
-                                "asked for something. Remember the "
-                                "project_id for future requests about this "
-                                "app."
-                            ),
-                            priority=10,
-                            session_id=origin_session,
-                            payload={"project_id": project.id},
-                        )
-                    )
-                except Exception as e:
-                    logger.debug(
-                        f"[AGENT_APP:WIZARD] origin-session notify failed: {e}"
-                    )
+                from app.agent_app.origin_notices import notify_setup_created
+
+                await notify_setup_created(
+                    self._agent_app_manager._trigger_service,
+                    origin_session,
+                    project.id,
+                    project.name,
+                )
 
             await self._broadcast(
                 {
diff --git a/app/ui_layer/browser/frontend/src/components/Chat/Chat.tsx b/app/ui_layer/browser/frontend/src/components/Chat/Chat.tsx
index f56cf906..2e4a9080 100644
--- a/app/ui_layer/browser/frontend/src/components/Chat/Chat.tsx
+++ b/app/ui_layer/browser/frontend/src/components/Chat/Chat.tsx
@@ -41,6 +41,9 @@ import {
   selectPendingQuestions,
 } from '../../store/selectors/messages'
 import { QuestionBox } from './QuestionBox'
+import { ResumeSetupCard } from './ResumeSetupCard'
+import { selectSetupsForSession } from '../../store/selectors/agentAppSetup'
+import { requestCancelSetup, showSetup } from '../../store/slices/agentAppSetupSlice'
 import { mergeTimeline, type TimelineEntry } from './timeline'
 import { selectSessionActivity } from '../../store/selectors/activity'
 import { selectSessionBusy, selectSessionRunState } from '../../store/selectors/agent'
@@ -187,6 +190,9 @@ export function Chat({ sessionId, placeholder }: ChatProps) {
   // Unanswered agent questions (oldest first). The first one is pinned in a
   // QuestionBox above the composer; answering/dismissing advances the queue.
   const pendingQuestions = useAppSelector(state => selectPendingQuestions(state, sessionId))
+  // Agent App setups this chat started and the user hasn't finished: the
+  // oldest gets a Resume card under the question box (ChatSetupHost shows it).
+  const pendingSetups = useAppSelector(state => selectSetupsForSession(state, sessionId))
   const hasMoreMessages = useAppSelector(state => selectSessionHasMoreMessages(state, sessionId))
   const historyStatus = useAppSelector(state => selectSessionHistoryStatus(state, sessionId))
   const loadingOlderMessages = useAppSelector(state => selectSessionLoadingOlderMessages(state, sessionId))
@@ -1429,6 +1435,15 @@ export function Chat({ sessionId, placeholder }: ChatProps) {
             onDismiss={handleQuestionDismiss}
           />
         )}
+        {pendingSetups.length > 0 && (
+          <ResumeSetupCard
+            key={pendingSetups[0].wizardId}
+            setup={pendingSetups[0]}
+            queueTotal={pendingSetups.length}
+            onResume={() => dispatch(showSetup(pendingSetups[0].wizardId))}
+            onCancel={() => dispatch(requestCancelSetup(pendingSetups[0].wizardId))}
+          />
+        )}
         <input ref={fileInputRef} type="file" multiple className={styles.hiddenFileInput} onChange={handleFileSelect} />
         <div
           className={`${styles.inputShell}${isDragOver ? ` ${styles.inputShellDragOver}` : ''}`}
diff --git a/app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.module.css b/app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.module.css
new file mode 100644
index 00000000..b5a20cca
--- /dev/null
+++ b/app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.module.css
@@ -0,0 +1,77 @@
+/* Pinned "Resume setup" card above the composer. Same slot and surface as
+   QuestionBox (QuestionBox.module.css), laid out as a single row. */
+.card {
+  display: flex;
+  align-items: center;
+  gap: var(--space-2);
+  margin-bottom: var(--space-2);
+  padding: var(--space-2) var(--space-3);
+  background: var(--bg-secondary);
+  border: 1px solid var(--border-primary);
+  border-radius: var(--radius-md);
+  animation: resumeSetupCardIn 0.18s ease-out;
+}
+
+@keyframes resumeSetupCardIn {
+  from {
+    opacity: 0;
+    transform: translateY(6px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.icon {
+  color: var(--color-primary);
+  flex-shrink: 0;
+}
+
+.text {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-width: 0;
+}
+
+.title {
+  font-size: var(--text-sm);
+  font-weight: var(--font-medium);
+  color: var(--text-primary);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.hint {
+  font-size: var(--text-xs);
+  color: var(--text-muted);
+}
+
+.queueBadge {
+  font-size: var(--text-xs);
+  color: var(--text-muted);
+  border: 1px solid var(--border-primary);
+  border-radius: var(--radius-sm);
+  padding: 1px var(--space-2);
+  flex-shrink: 0;
+}
+
+.actions {
+  display: flex;
+  gap: var(--space-2);
+  flex-shrink: 0;
+}
+
+/* Narrow screens: the buttons drop below the text. */
+@media (max-width: 480px) {
+  .card {
+    flex-wrap: wrap;
+  }
+
+  .actions {
+    width: 100%;
+    justify-content: flex-end;
+  }
+}
diff --git a/app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.tsx b/app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.tsx
new file mode 100644
index 00000000..d4e07551
--- /dev/null
+++ b/app/ui_layer/browser/frontend/src/components/Chat/ResumeSetupCard.tsx
@@ -0,0 +1,42 @@
+import { useTranslation } from 'react-i18next'
+import { Sparkles } from 'lucide-react'
+import { Button } from '../ui'
+import type { PendingAgentAppSetup } from '../../types'
+import styles from './ResumeSetupCard.module.css'
+
+interface ResumeSetupCardProps {
+  /** The oldest pending setup started from this chat. */
+  setup: PendingAgentAppSetup
+  /** Pending setups from this chat (this one included): "1 of N" when > 1. */
+  queueTotal: number
+  /** Reopen the setup's questions where the user left off. */
+  onResume: () => void
+  /** Ask to end the setup for good (the caller confirms). */
+  onCancel: () => void
+}
+
+/**
+ * Pinned above the chat composer while an Agent App setup this chat started
+ * is unanswered, so closing its popup never loses it (issue #448). Sits in
+ * the same slot as QuestionBox and shares its look.
+ */
+export function ResumeSetupCard({ setup, queueTotal, onResume, onCancel }: ResumeSetupCardProps) {
+  const { t } = useTranslation(['chat'])
+
+  return (
+    <div className={styles.card} role="region" aria-label={t('chat:setupResume.aria')}>
+      <Sparkles size={14} className={styles.icon} />
+      <div className={styles.text}>
+        <span className={styles.title}>{t('chat:setupResume.title', { name: setup.name })}</span>
+        <span className={styles.hint}>{t('chat:setupResume.hint')}</span>
+      </div>
+      {queueTotal > 1 && (
+        <span className={styles.queueBadge}>{t('chat:setupResume.queuePosition', { total: queueTotal })}</span>
+      )}
+      <div className={styles.actions}>
+        <Button variant="ghost" size="sm" onClick={onCancel}>{t('chat:setupResume.cancel')}</Button>
+        <Button variant="primary" size="sm" onClick={onResume}>{t('chat:setupResume.resume')}</Button>
+      </div>
+    </div>
+  )
+}
diff --git a/app/ui_layer/browser/frontend/src/components/layout/NavBar.tsx b/app/ui_layer/browser/frontend/src/components/layout/NavBar.tsx
index 773d09f7..0031f382 100644
--- a/app/ui_layer/browser/frontend/src/components/layout/NavBar.tsx
+++ b/app/ui_layer/browser/frontend/src/components/layout/NavBar.tsx
@@ -33,6 +33,7 @@ import { ConfirmModal } from '../ui/ConfirmModal'
 import { tourAnchorProps, useTourEnvAction, type TourAnchorId } from '../../tour'
 import { usePersistedState, useSkillCreator } from '../../hooks'
 import { CreateAgentAppModal } from '../ui/CreateAgentAppModal'
+import { ChatSetupHost } from '../ui/ChatSetupHost'
 import { SkillCreatorModal } from '../ui/SkillCreatorModal'
 import { AgentAppIcon } from '../ui/AgentAppIcon'
 import type { SessionInfo } from '../../types'
@@ -967,6 +968,10 @@ export function NavBar({ collapsed = false, onToggleCollapsed }: NavBarProps) {
         onInstalled={handleProjectCreated}
       />
 
+      {/* Setups the agent started from a chat: independent of the "+" modal,
+          so neither can hide the other. */}
+      <ChatSetupHost onCreated={handleProjectCreated} />
+
       <ConfirmModal
         isOpen={agentDelete !== null}
         title={t('agentapp:page.deleteModalTitle')}
diff --git a/app/ui_layer/browser/frontend/src/components/ui/ChatSetupHost.tsx b/app/ui_layer/browser/frontend/src/components/ui/ChatSetupHost.tsx
new file mode 100644
index 00000000..3c77a527
--- /dev/null
+++ b/app/ui_layer/browser/frontend/src/components/ui/ChatSetupHost.tsx
@@ -0,0 +1,101 @@
+import { Sparkles } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+import { usePersistedState } from '../../hooks'
+import { useAppDispatch, useAppSelector } from '../../store/hooks'
+import { selectSetupPendingCancel, selectShownSetup } from '../../store/selectors/agentAppSetup'
+import {
+  cancelSetup,
+  clearSetupProgress,
+  dismissCancelSetup,
+  hideSetup,
+  requestCancelSetup,
+} from '../../store/slices/agentAppSetupSlice'
+import { UI_STATE } from '../../store/uiState'
+import type { PendingAgentAppSetup } from '../../types'
+import { useSettingsWebSocket } from '../../pages/Settings/useSettingsWebSocket'
+import { ConfirmModal } from './ConfirmModal'
+import { CreateCustomWizard } from './CreateCustomWizard'
+import { Modal } from './Modal'
+import styles from './CreateAgentAppModal.module.css'
+
+export interface ChatSetupHostProps {
+  /** A setup finished and its project exists (the caller navigates to it). */
+  onCreated: (projectId: string) => void
+}
+
+/**
+ * Presents pending chat-started Agent App setups (agentAppSetupSlice).
+ *
+ * Always mounted, so a setup the agent summons pops up wherever the user is.
+ * The X only hides the popup: the setup stays pending and the Resume card in
+ * its chat reopens it with the answers given so far. Cancelling asks for
+ * confirmation here, whichever surface (wizard or card) asked for it.
+ */
+export function ChatSetupHost({ onCreated }: ChatSetupHostProps) {
+  const { t } = useTranslation(['components'])
+  const dispatch = useAppDispatch()
+  const shown = useAppSelector(selectShownSetup)
+  const pendingCancel = useAppSelector(selectSetupPendingCancel)
+
+  return (
+    <>
+      {shown && <ChatSetupModal key={shown.wizardId} setup={shown} onCreated={onCreated} />}
+      <ConfirmModal
+        isOpen={pendingCancel !== undefined}
+        title={t('components:createAgentApp.cancelSetupTitle')}
+        message={t('components:createAgentApp.cancelSetupMessage', { name: pendingCancel?.name ?? '' })}
+        confirmText={t('components:createAgentApp.cancelSetupConfirm')}
+        cancelText={t('components:createAgentApp.keepSetup')}
+        variant="danger"
+        onConfirm={() => { if (pendingCancel) dispatch(cancelSetup(pendingCancel.wizardId)) }}
+        onCancel={() => dispatch(dismissCancelSetup())}
+      />
+    </>
+  )
+}
+
+interface ChatSetupModalProps {
+  setup: PendingAgentAppSetup
+  onCreated: (projectId: string) => void
+}
+
+/** One setup's wizard, entered at the interview step. Mount with key={wizardId}. */
+function ChatSetupModal({ setup, onCreated }: ChatSetupModalProps) {
+  const { t } = useTranslation(['components'])
+  const dispatch = useAppDispatch()
+  const { send, onMessage } = useSettingsWebSocket()
+  // The wizard reads `progress` only when it mounts, then reports changes back.
+  const [progress, setProgress] = usePersistedState(UI_STATE.agentApp.setupProgress(setup.wizardId))
+
+  const hide = () => dispatch(hideSetup())
+
+  return (
+    <Modal
+      isOpen={true}
+      onClose={hide}
+      size="full"
+      closeOnOverlayClick={false}
+      closeOnEsc={false}
+      title={
+        <>
+          <Sparkles size={20} className={styles.headerIcon} />
+          {t('components:createAgentApp.setupQuestions', { name: setup.name || String(setup.config?.name || 'Agent App') })}
+        </>
+      }
+    >
+      <CreateCustomWizard
+        send={send}
+        onMessage={onMessage}
+        initial={setup}
+        progress={progress}
+        onProgress={setProgress}
+        onClose={hide}
+        onCancel={() => dispatch(requestCancelSetup(setup.wizardId))}
+        onCreated={(projectId: string) => {
+          dispatch(clearSetupProgress(setup.wizardId))
+          onCreated(projectId)
+        }}
+      />
+    </Modal>
+  )
+}
diff --git a/app/ui_layer/browser/frontend/src/components/ui/CreateAgentAppModal.tsx b/app/ui_layer/browser/frontend/src/components/ui/CreateAgentAppModal.tsx
index 65ce7266..dc4c05a7 100644
--- a/app/ui_layer/browser/frontend/src/components/ui/CreateAgentAppModal.tsx
+++ b/app/ui_layer/browser/frontend/src/components/ui/CreateAgentAppModal.tsx
@@ -81,25 +81,6 @@ export function CreateAgentAppModal({ isOpen, onClose, onInstalled }: CreateAgen
     }
   })
 
-  // Chat-path requirements phase: agent_app_scaffold generated setup
-  // questions (creating nothing yet) and the backend summons the SAME
-  // Create Custom wizard, pre-seeded and opened at the interview step
-  // (agent_app_wizard_open); its finalize creates the project as usual.
-  const [chatWizard, setChatWizard] = useState<{
-    wizardId: string
-    config: Record<string, any>
-    questions: any[]
-    originSessionId?: string
-  } | null>(null)
-  useEffect(
-    () =>
-      onMessage('agent_app_wizard_open', (data: any) => {
-        if (data?.wizardId && Array.isArray(data.questions) && data.questions.length > 0) {
-          setChatWizard(data)
-        }
-      }),
-    [onMessage]
-  )
   // Accumulate projectIds from completed installs — navigate only when all installs finish
   const pendingNavigationsRef = useRef<string[]>([])
 
@@ -337,41 +318,8 @@ export function CreateAgentAppModal({ isOpen, onClose, onInstalled }: CreateAgen
 
   // Escape key intentionally does NOT close this modal — user must use the X button
 
-  // Chat-summoned wizard: same component, entered at the interview step.
-  // Renders regardless of isOpen — the summons comes from the backend, not
-  // the "+" button. Closing it mid-interview leaves nothing behind (no
-  // project exists until finalize), same as cancelling the modal wizard.
-  if (chatWizard && !isOpen) {
-    return (
-      <Modal
-        isOpen={true}
-        onClose={() => setChatWizard(null)}
-        size="full"
-        closeOnOverlayClick={false}
-        closeOnEsc={false}
-        title={
-          <>
-            <Sparkles size={20} className={styles.headerIcon} />
-            {t('components:createAgentApp.setupQuestions', { name: String(chatWizard.config?.name || 'Agent App') })}
-          </>
-        }
-      >
-        <CreateCustomWizard
-          send={send}
-          onMessage={onMessage}
-          initial={chatWizard}
-          onClose={() => setChatWizard(null)}
-          onCreated={(projectId: string) => {
-            setChatWizard(null)
-            onInstalledRef.current?.(projectId)
-          }}
-        />
-      </Modal>
-    )
-  }
-
   // Fully unmount when closed and no installs pending; stay mounted (invisible) while installs run
-  if (!isOpen && installingIds.size === 0 && !chatWizard) return null
+  if (!isOpen && installingIds.size === 0) return null
   if (!isOpen) return <></> // mounted but invisible — keeps onMessage listeners alive
 
   const tabsConfig = [
diff --git a/app/ui_layer/browser/frontend/src/components/ui/CreateCustomWizard.tsx b/app/ui_layer/browser/frontend/src/components/ui/CreateCustomWizard.tsx
index fa2b6728..766e347b 100644
--- a/app/ui_layer/browser/frontend/src/components/ui/CreateCustomWizard.tsx
+++ b/app/ui_layer/browser/frontend/src/components/ui/CreateCustomWizard.tsx
@@ -8,6 +8,7 @@ import { Button } from './Button'
 import { AGENT_APP_ICONS } from './AgentAppIcon'
 import { PRESET_THEMES, ThemeMiniPreview } from '../../pages/AgentApp/themeCatalog'
 import { formatNumber } from '../../i18n/format'
+import type { AgentAppInterviewQuestion, AgentAppSetupProgress, PendingAgentAppSetup } from '../../types'
 import styles from './CreateCustomWizard.module.css'
 
 /**
@@ -29,28 +30,23 @@ interface CreateCustomWizardProps {
   onMessage: (type: string, handler: (data: any) => void) => () => void
   onClose: () => void
   onCreated?: (projectId: string) => void
-  /** Chat-path entry (agent_app_wizard_open broadcast): the scaffold action
-   *  generated round-1 questions without creating anything — open at the
+  /** Chat-path entry (a pending setup from agent_app_scaffold): round-1
+   *  questions were generated without creating anything — open at the
    *  interview step with config pre-seeded. Finalize then creates the
    *  project exactly as the modal path does (Chat → Interview → Finalize →
-   *  Scaffold); a cancelled popup leaves nothing behind. */
-  initial?: {
-    wizardId: string
-    config: Record<string, any>
-    questions: InterviewQuestion[]
-    /** Session that ran agent_app_scaffold — round-tripped to finalize so
-     *  the backend can tell that agent which project was created. */
-    originSessionId?: string
-  }
+   *  Scaffold). originSessionId is round-tripped to finalize so the backend
+   *  can tell that chat's agent which project was created. */
+  initial?: Pick<PendingAgentAppSetup, 'wizardId' | 'config' | 'questions' | 'originSessionId'>
+  /** Chat path: where the user got to last time, restored on resume. */
+  progress?: AgentAppSetupProgress | null
+  /** Chat path: called as the interview advances, so the caller can keep it. */
+  onProgress?: (progress: AgentAppSetupProgress) => void
+  /** Chat path: the configure step's Cancel ends the setup for good. Without
+   *  it (the "+" modal), Cancel just closes, like the X. */
+  onCancel?: () => void
 }
 
-interface InterviewQuestion {
-  id: string
-  question: string
-  why?: string
-  multiSelect: boolean
-  options: string[]
-}
+type InterviewQuestion = AgentAppInterviewQuestion
 
 const MAX_WORDS = 5000
 
@@ -154,7 +150,9 @@ function newWizardId(): string {
 
 // ── component ───────────────────────────────────────────────────────────────
 
-export function CreateCustomWizard({ send, onMessage, onClose, onCreated, initial }: CreateCustomWizardProps) {
+export function CreateCustomWizard({
+  send, onMessage, onClose, onCreated, initial, progress, onProgress, onCancel,
+}: CreateCustomWizardProps) {
   const { t } = useTranslation(['components', 'common', 'agentapp'])
 
   // Explicit (type-checked) key literals for the configure-step vocabulary.
@@ -199,13 +197,20 @@ export function CreateCustomWizard({ send, onMessage, onClose, onCreated, initia
   // — interview state —
   const [interviewLoading, setInterviewLoading] = useState(false)
   const [interviewError, setInterviewError] = useState<string | null>(null)
-  const [questions, setQuestions] = useState<InterviewQuestion[]>(initial?.questions || [])
-  const [qIndex, setQIndex] = useState(0)
-  const [answers, setAnswers] = useState<Record<string, string[]>>({})
+  const [questions, setQuestions] = useState<InterviewQuestion[]>(progress?.questions || initial?.questions || [])
+  const [qIndex, setQIndex] = useState(progress?.qIndex ?? 0)
+  const [answers, setAnswers] = useState<Record<string, string[]>>(progress?.answers || {})
   const [freeText, setFreeText] = useState('')
   // True once the backend has run its one adapt follow-up round — sent back
   // on finalize so it never loops.
-  const [followupDone, setFollowupDone] = useState(false)
+  const [followupDone, setFollowupDone] = useState(progress?.followupDone ?? false)
+
+  // Report interview progress (chat path) so a closed popup resumes here.
+  const onProgressRef = useRef(onProgress)
+  onProgressRef.current = onProgress
+  useEffect(() => {
+    onProgressRef.current?.({ questions, answers, qIndex, followupDone })
+  }, [questions, answers, qIndex, followupDone])
 
   // — creating state —
   const [createError, setCreateError] = useState<string | null>(null)
@@ -731,7 +736,7 @@ export function CreateCustomWizard({ send, onMessage, onClose, onCreated, initia
       </div>
 
       <div className={styles.footer}>
-        <Button variant="secondary" type="button" onClick={onClose}>{t('common:actions.cancel')}</Button>
+        <Button variant="secondary" type="button" onClick={onCancel ?? onClose}>{t('common:actions.cancel')}</Button>
         <Button
           variant="primary"
           type="button"
diff --git a/app/ui_layer/browser/frontend/src/locales/en/chat.json b/app/ui_layer/browser/frontend/src/locales/en/chat.json
index 58d1b790..18283925 100644
--- a/app/ui_layer/browser/frontend/src/locales/en/chat.json
+++ b/app/ui_layer/browser/frontend/src/locales/en/chat.json
@@ -69,6 +69,14 @@
     "freeTextPlaceholder": "Or type your own answer...",
     "sendAnswer": "Send answer"
   },
+  "setupResume": {
+    "aria": "Pending Agent App setup",
+    "title": "Setup questions for {{name}} are waiting",
+    "hint": "The app is created once you answer them.",
+    "resume": "Resume setup",
+    "cancel": "Cancel setup",
+    "queuePosition": "1 of {{total}}"
+  },
   "message": {
     "hideReceived": "Hide received message",
     "showReceived": "Show received message",
diff --git a/app/ui_layer/browser/frontend/src/locales/en/components.json b/app/ui_layer/browser/frontend/src/locales/en/components.json
index daf89c1c..6e3aca87 100644
--- a/app/ui_layer/browser/frontend/src/locales/en/components.json
+++ b/app/ui_layer/browser/frontend/src/locales/en/components.json
@@ -155,6 +155,10 @@
   "createAgentApp": {
     "addTitle": "Add Agent App",
     "setupQuestions": "{{name}} — setup questions",
+    "cancelSetupTitle": "Cancel setup?",
+    "cancelSetupMessage": "The setup questions for {{name}} will be discarded and no app will be created. The agent will be told you cancelled.",
+    "cancelSetupConfirm": "Cancel setup",
+    "keepSetup": "Keep setup",
     "tabMarketplace": "Marketplace",
     "tabCustom": "Create Custom",
     "tabImport": "Import",
diff --git a/app/ui_layer/browser/frontend/src/locales/es/chat.json b/app/ui_layer/browser/frontend/src/locales/es/chat.json
index 2236e221..edf9acb2 100644
--- a/app/ui_layer/browser/frontend/src/locales/es/chat.json
+++ b/app/ui_layer/browser/frontend/src/locales/es/chat.json
@@ -69,6 +69,14 @@
     "freeTextPlaceholder": "O escribe tu propia respuesta...",
     "sendAnswer": "Enviar respuesta"
   },
+  "setupResume": {
+    "aria": "Configuración pendiente de Agent App",
+    "title": "Las preguntas de configuración de {{name}} están esperando",
+    "hint": "La app se crea cuando las respondas.",
+    "resume": "Reanudar configuración",
+    "cancel": "Cancelar configuración",
+    "queuePosition": "1 de {{total}}"
+  },
   "message": {
     "hideReceived": "Ocultar mensaje recibido",
     "showReceived": "Mostrar mensaje recibido",
diff --git a/app/ui_layer/browser/frontend/src/locales/es/components.json b/app/ui_layer/browser/frontend/src/locales/es/components.json
index e89bb7ff..33a59af7 100644
--- a/app/ui_layer/browser/frontend/src/locales/es/components.json
+++ b/app/ui_layer/browser/frontend/src/locales/es/components.json
@@ -155,6 +155,10 @@
   "createAgentApp": {
     "addTitle": "Añadir Agent App",
     "setupQuestions": "{{name}} — preguntas de configuración",
+    "cancelSetupTitle": "¿Cancelar la configuración?",
+    "cancelSetupMessage": "Se descartarán las preguntas de configuración de {{name}} y no se creará ninguna app. Se avisará al agente de que cancelaste.",
+    "cancelSetupConfirm": "Cancelar configuración",
+    "keepSetup": "Mantener configuración",
     "tabMarketplace": "Marketplace",
     "tabCustom": "Crear personalizada",
     "tabImport": "Importar",
diff --git a/app/ui_layer/browser/frontend/src/locales/id/chat.json b/app/ui_layer/browser/frontend/src/locales/id/chat.json
index 2c2ec0c2..b1bb343d 100644
--- a/app/ui_layer/browser/frontend/src/locales/id/chat.json
+++ b/app/ui_layer/browser/frontend/src/locales/id/chat.json
@@ -69,6 +69,14 @@
     "freeTextPlaceholder": "Atau ketik jawaban Anda sendiri...",
     "sendAnswer": "Kirim jawaban"
   },
+  "setupResume": {
+    "aria": "Penyiapan Agent App tertunda",
+    "title": "Pertanyaan penyiapan untuk {{name}} sedang menunggu",
+    "hint": "Aplikasi dibuat setelah Anda menjawabnya.",
+    "resume": "Lanjutkan penyiapan",
+    "cancel": "Batalkan penyiapan",
+    "queuePosition": "1 dari {{total}}"
+  },
   "message": {
     "hideReceived": "Sembunyikan pesan yang diterima",
     "showReceived": "Tampilkan pesan yang diterima",
diff --git a/app/ui_layer/browser/frontend/src/locales/id/components.json b/app/ui_layer/browser/frontend/src/locales/id/components.json
index 2738c4fa..fd036a81 100644
--- a/app/ui_layer/browser/frontend/src/locales/id/components.json
+++ b/app/ui_layer/browser/frontend/src/locales/id/components.json
@@ -155,6 +155,10 @@
   "createAgentApp": {
     "addTitle": "Tambah Agent App",
     "setupQuestions": "{{name}} — pertanyaan penyiapan",
+    "cancelSetupTitle": "Batalkan penyiapan?",
+    "cancelSetupMessage": "Pertanyaan penyiapan untuk {{name}} akan dibuang dan tidak ada aplikasi yang dibuat. Agen akan diberi tahu bahwa Anda membatalkan.",
+    "cancelSetupConfirm": "Batalkan penyiapan",
+    "keepSetup": "Simpan penyiapan",
     "tabMarketplace": "Pasar",
     "tabCustom": "Buat Kustom",
     "tabImport": "Impor",
diff --git a/app/ui_layer/browser/frontend/src/locales/ja/chat.json b/app/ui_layer/browser/frontend/src/locales/ja/chat.json
index b6125efe..4746e4bf 100644
--- a/app/ui_layer/browser/frontend/src/locales/ja/chat.json
+++ b/app/ui_layer/browser/frontend/src/locales/ja/chat.json
@@ -69,6 +69,14 @@
     "freeTextPlaceholder": "または自分の回答を入力...",
     "sendAnswer": "回答を送信"
   },
+  "setupResume": {
+    "aria": "保留中の Agent App セットアップ",
+    "title": "{{name}} のセットアップの質問が回答を待っています",
+    "hint": "回答するとアプリが作成されます。",
+    "resume": "セットアップを再開",
+    "cancel": "セットアップをキャンセル",
+    "queuePosition": "1 / {{total}}"
+  },
   "message": {
     "hideReceived": "受信メッセージを非表示",
     "showReceived": "受信メッセージを表示",
diff --git a/app/ui_layer/browser/frontend/src/locales/ja/components.json b/app/ui_layer/browser/frontend/src/locales/ja/components.json
index 54c35f46..05c1b40d 100644
--- a/app/ui_layer/browser/frontend/src/locales/ja/components.json
+++ b/app/ui_layer/browser/frontend/src/locales/ja/components.json
@@ -155,6 +155,10 @@
   "createAgentApp": {
     "addTitle": "Agent App を追加",
     "setupQuestions": "{{name}} — セットアップの質問",
+    "cancelSetupTitle": "セットアップをキャンセルしますか？",
+    "cancelSetupMessage": "{{name}} のセットアップの質問は破棄され、アプリは作成されません。キャンセルしたことはエージェントに通知されます。",
+    "cancelSetupConfirm": "セットアップをキャンセル",
+    "keepSetup": "セットアップを続ける",
     "tabMarketplace": "マーケットプレイス",
     "tabCustom": "カスタム作成",
     "tabImport": "インポート",
diff --git a/app/ui_layer/browser/frontend/src/locales/ko/chat.json b/app/ui_layer/browser/frontend/src/locales/ko/chat.json
index d2f242ac..dae6b086 100644
--- a/app/ui_layer/browser/frontend/src/locales/ko/chat.json
+++ b/app/ui_layer/browser/frontend/src/locales/ko/chat.json
@@ -69,6 +69,14 @@
     "freeTextPlaceholder": "또는 직접 답변을 입력하세요...",
     "sendAnswer": "답변 보내기"
   },
+  "setupResume": {
+    "aria": "대기 중인 Agent App 설정",
+    "title": "{{name}}의 설정 질문이 답변을 기다리고 있습니다",
+    "hint": "답변하면 앱이 생성됩니다.",
+    "resume": "설정 재개",
+    "cancel": "설정 취소",
+    "queuePosition": "{{total}}개 중 1"
+  },
   "message": {
     "hideReceived": "받은 메시지 숨기기",
     "showReceived": "받은 메시지 보기",
diff --git a/app/ui_layer/browser/frontend/src/locales/ko/components.json b/app/ui_layer/browser/frontend/src/locales/ko/components.json
index a65d6e7f..2a72be38 100644
--- a/app/ui_layer/browser/frontend/src/locales/ko/components.json
+++ b/app/ui_layer/browser/frontend/src/locales/ko/components.json
@@ -155,6 +155,10 @@
   "createAgentApp": {
     "addTitle": "Agent App 추가",
     "setupQuestions": "{{name}} — 설정 질문",
+    "cancelSetupTitle": "설정을 취소할까요?",
+    "cancelSetupMessage": "{{name}}의 설정 질문이 삭제되고 앱이 생성되지 않습니다. 취소했다는 사실이 에이전트에게 전달됩니다.",
+    "cancelSetupConfirm": "설정 취소",
+    "keepSetup": "설정 유지",
     "tabMarketplace": "마켓플레이스",
     "tabCustom": "사용자 지정 만들기",
     "tabImport": "가져오기",
diff --git a/app/ui_layer/browser/frontend/src/locales/zh-CN/chat.json b/app/ui_layer/browser/frontend/src/locales/zh-CN/chat.json
index df7a5b04..defc7588 100644
--- a/app/ui_layer/browser/frontend/src/locales/zh-CN/chat.json
+++ b/app/ui_layer/browser/frontend/src/locales/zh-CN/chat.json
@@ -69,6 +69,14 @@
     "freeTextPlaceholder": "或输入你自己的答案…",
     "sendAnswer": "发送答案"
   },
+  "setupResume": {
+    "aria": "待完成的 Agent App 设置",
+    "title": "{{name}} 的设置问题正在等待回答",
+    "hint": "回答后即会创建应用。",
+    "resume": "继续设置",
+    "cancel": "取消设置",
+    "queuePosition": "第 1 个，共 {{total}} 个"
+  },
   "message": {
     "hideReceived": "隐藏收到的消息",
     "showReceived": "显示收到的消息",
diff --git a/app/ui_layer/browser/frontend/src/locales/zh-CN/components.json b/app/ui_layer/browser/frontend/src/locales/zh-CN/components.json
index 70ceda44..ac180eb4 100644
--- a/app/ui_layer/browser/frontend/src/locales/zh-CN/components.json
+++ b/app/ui_layer/browser/frontend/src/locales/zh-CN/components.json
@@ -155,6 +155,10 @@
   "createAgentApp": {
     "addTitle": "添加 Agent App",
     "setupQuestions": "{{name}} — 设置问题",
+    "cancelSetupTitle": "取消设置？",
+    "cancelSetupMessage": "{{name}} 的设置问题将被丢弃，不会创建应用。系统会告知智能体你已取消。",
+    "cancelSetupConfirm": "取消设置",
+    "keepSetup": "保留设置",
     "tabMarketplace": "市场",
     "tabCustom": "自定义创建",
     "tabImport": "导入",
diff --git a/app/ui_layer/browser/frontend/src/locales/zh-TW/chat.json b/app/ui_layer/browser/frontend/src/locales/zh-TW/chat.json
index 7a006d1c..083be4be 100644
--- a/app/ui_layer/browser/frontend/src/locales/zh-TW/chat.json
+++ b/app/ui_layer/browser/frontend/src/locales/zh-TW/chat.json
@@ -69,6 +69,14 @@
     "freeTextPlaceholder": "或輸入你自己的回答…",
     "sendAnswer": "傳送回答"
   },
+  "setupResume": {
+    "aria": "待完成的 Agent App 設定",
+    "title": "{{name}} 的設定問題正在等待回答",
+    "hint": "回答後即會建立應用程式。",
+    "resume": "繼續設定",
+    "cancel": "取消設定",
+    "queuePosition": "第 1 個，共 {{total}} 個"
+  },
   "message": {
     "hideReceived": "隱藏收到的訊息",
     "showReceived": "顯示收到的訊息",
diff --git a/app/ui_layer/browser/frontend/src/locales/zh-TW/components.json b/app/ui_layer/browser/frontend/src/locales/zh-TW/components.json
index 49717065..579821d4 100644
--- a/app/ui_layer/browser/frontend/src/locales/zh-TW/components.json
+++ b/app/ui_layer/browser/frontend/src/locales/zh-TW/components.json
@@ -155,6 +155,10 @@
   "createAgentApp": {
     "addTitle": "新增 Agent App",
     "setupQuestions": "{{name}} — 設定問題",
+    "cancelSetupTitle": "取消設定？",
+    "cancelSetupMessage": "{{name}} 的設定問題將被捨棄，不會建立應用程式。系統會告知代理你已取消。",
+    "cancelSetupConfirm": "取消設定",
+    "keepSetup": "保留設定",
     "tabMarketplace": "市集",
     "tabCustom": "自訂建立",
     "tabImport": "匯入",
diff --git a/app/ui_layer/browser/frontend/src/store/index.ts b/app/ui_layer/browser/frontend/src/store/index.ts
index 1da895c7..209939fb 100644
--- a/app/ui_layer/browser/frontend/src/store/index.ts
+++ b/app/ui_layer/browser/frontend/src/store/index.ts
@@ -7,6 +7,7 @@ import dashboardReducer from './slices/dashboardSlice'
 import onboardingReducer from './slices/onboardingSlice'
 import localLlmReducer from './slices/localLlmSlice'
 import agentAppReducer from './slices/agentAppSlice'
+import agentAppSetupReducer from './slices/agentAppSetupSlice'
 import agentReducer from './slices/agentSlice'
 import workspaceReducer from './slices/workspaceSlice'
 import mcpSettingsReducer from './slices/mcpSettingsSlice'
@@ -48,6 +49,7 @@ export const store = configureStore({
     onboarding: onboardingReducer,
     localLlm: localLlmReducer,
     agentApp: agentAppReducer,
+    agentAppSetup: agentAppSetupReducer,
     agent: agentReducer,
     workspace: workspaceReducer,
     mcpSettings: mcpSettingsReducer,
diff --git a/app/ui_layer/browser/frontend/src/store/resources/ResourceSync.ts b/app/ui_layer/browser/frontend/src/store/resources/ResourceSync.ts
index 8a32e138..4092c72c 100644
--- a/app/ui_layer/browser/frontend/src/store/resources/ResourceSync.ts
+++ b/app/ui_layer/browser/frontend/src/store/resources/ResourceSync.ts
@@ -5,6 +5,7 @@
  */
 export type ResourceName =
   | 'agent_apps'
+  | 'agent_app_setups'
   | 'sessions'
   | 'workspace_files'
   | 'skills'
diff --git a/app/ui_layer/browser/frontend/src/store/resources/catalog.ts b/app/ui_layer/browser/frontend/src/store/resources/catalog.ts
index b1333396..484cb857 100644
--- a/app/ui_layer/browser/frontend/src/store/resources/catalog.ts
+++ b/app/ui_layer/browser/frontend/src/store/resources/catalog.ts
@@ -20,6 +20,14 @@ export const RESOURCES = {
     pushedOnConnect: true,
     request: (send) => send({ type: 'agent_app_list' }),
   },
+  /** Pending chat-started setups (Resume setup cards). Pushed on connect. */
+  agentAppSetups: {
+    key: 'agentAppSetups',
+    resource: 'agent_app_setups',
+    liveness: 'always',
+    pushedOnConnect: true,
+    request: (send) => send({ type: 'agent_app_setup_list' }),
+  },
   /** Sidebar sessions (order follows last activity). Pushed in `init`. */
   sessions: {
     key: 'sessions',
diff --git a/app/ui_layer/browser/frontend/src/store/selectors/agentAppSetup.ts b/app/ui_layer/browser/frontend/src/store/selectors/agentAppSetup.ts
new file mode 100644
index 00000000..08a2f6fa
--- /dev/null
+++ b/app/ui_layer/browser/frontend/src/store/selectors/agentAppSetup.ts
@@ -0,0 +1,30 @@
+import { createSelector } from '@reduxjs/toolkit'
+import type { RootState } from '../index'
+import type { PendingAgentAppSetup } from '../../types'
+import { setupsAdapter } from '../slices/agentAppSetupSlice'
+
+const adapterSelectors = setupsAdapter.getSelectors((state: RootState) => state.agentAppSetup.setups)
+
+/** Every pending chat setup, oldest first. */
+export const selectPendingSetups = adapterSelectors.selectAll
+
+export const selectPendingSetupById = (state: RootState, wizardId: string): PendingAgentAppSetup | undefined =>
+  adapterSelectors.selectById(state, wizardId)
+
+/** Pending setups started from one chat, oldest first (its Resume card queue). */
+export const selectSetupsForSession = createSelector(
+  [selectPendingSetups, (_: RootState, sessionId: string) => sessionId],
+  (setups, sessionId): PendingAgentAppSetup[] => setups.filter(s => s.originSessionId === sessionId),
+)
+
+/** The setup whose wizard popup is on screen, if any. */
+export const selectShownSetup = (state: RootState): PendingAgentAppSetup | undefined => {
+  const id = state.agentAppSetup.shownId
+  return id ? adapterSelectors.selectById(state, id) : undefined
+}
+
+/** The setup awaiting cancel confirmation, if any. */
+export const selectSetupPendingCancel = (state: RootState): PendingAgentAppSetup | undefined => {
+  const id = state.agentAppSetup.confirmCancelId
+  return id ? adapterSelectors.selectById(state, id) : undefined
+}
diff --git a/app/ui_layer/browser/frontend/src/store/slices/agentAppSetupSlice.ts b/app/ui_layer/browser/frontend/src/store/slices/agentAppSetupSlice.ts
new file mode 100644
index 00000000..7f431220
--- /dev/null
+++ b/app/ui_layer/browser/frontend/src/store/slices/agentAppSetupSlice.ts
@@ -0,0 +1,139 @@
+import { createEntityAdapter, createSlice, PayloadAction } from '@reduxjs/toolkit'
+import type { PendingAgentAppSetup } from '../../types'
+import type { AppDispatch } from '../index'
+import { register } from '../socket/messageRegistry'
+import { getSocketClient } from '../socket/socketInstance'
+import { UI_STATE } from '../uiState'
+import { setUiState } from './uiSlice'
+
+// Pending chat-started Agent App setups (issue #448).
+//
+// agent_app_scaffold asks its setup questions in the Create Custom wizard and
+// creates nothing until the user answers. The backend keeps each unfinished
+// setup (app/agent_app/pending_setups.py) and pushes the list on connect; this
+// slice mirrors it. Closing the popup only hides it (`shownId`), so the
+// Resume card in the originating chat can bring it back. Only finalize or an
+// explicit cancel ends a setup.
+
+export const setupsAdapter = createEntityAdapter<PendingAgentAppSetup, string>({
+  selectId: setup => setup.wizardId,
+  sortComparer: (a, b) => a.createdAt - b.createdAt,
+})
+
+interface AgentAppSetupState {
+  setups: ReturnType<typeof setupsAdapter.getInitialState>
+  /** The setup whose wizard popup is on screen. */
+  shownId: string | null
+  /** The setup the user asked to cancel, awaiting confirmation. */
+  confirmCancelId: string | null
+}
+
+const initialState: AgentAppSetupState = {
+  setups: setupsAdapter.getInitialState(),
+  shownId: null,
+  confirmCancelId: null,
+}
+
+const agentAppSetupSlice = createSlice({
+  name: 'agentAppSetup',
+  initialState,
+  reducers: {
+    setSetups(state, action: PayloadAction<PendingAgentAppSetup[]>) {
+      setupsAdapter.setAll(state.setups, action.payload)
+      if (state.shownId && !state.setups.entities[state.shownId]) state.shownId = null
+      if (state.confirmCancelId && !state.setups.entities[state.confirmCancelId]) state.confirmCancelId = null
+    },
+    /** A live summons from the agent: store it and pop it up. */
+    setupOpened(state, action: PayloadAction<PendingAgentAppSetup>) {
+      setupsAdapter.upsertOne(state.setups, action.payload)
+      state.shownId = action.payload.wizardId
+    },
+    setupEnded(state, action: PayloadAction<string>) {
+      setupsAdapter.removeOne(state.setups, action.payload)
+      if (state.shownId === action.payload) state.shownId = null
+      if (state.confirmCancelId === action.payload) state.confirmCancelId = null
+    },
+    sessionSetupsRemoved(state, action: PayloadAction<string>) {
+      const ids = Object.values(state.setups.entities)
+        .filter(s => s?.originSessionId === action.payload)
+        .map(s => s!.wizardId)
+      setupsAdapter.removeMany(state.setups, ids)
+      if (state.shownId && ids.includes(state.shownId)) state.shownId = null
+      if (state.confirmCancelId && ids.includes(state.confirmCancelId)) state.confirmCancelId = null
+    },
+    showSetup(state, action: PayloadAction<string>) {
+      if (state.setups.entities[action.payload]) state.shownId = action.payload
+    },
+    /** Close the popup; the setup stays pending and resumable. */
+    hideSetup(state) {
+      state.shownId = null
+    },
+    requestCancelSetup(state, action: PayloadAction<string>) {
+      state.confirmCancelId = action.payload
+    },
+    dismissCancelSetup(state) {
+      state.confirmCancelId = null
+    },
+  },
+})
+
+export const {
+  setSetups,
+  setupOpened,
+  setupEnded,
+  sessionSetupsRemoved,
+  showSetup,
+  hideSetup,
+  requestCancelSetup,
+  dismissCancelSetup,
+} = agentAppSetupSlice.actions
+export default agentAppSetupSlice.reducer
+
+/** End a setup's saved answers (this tab's draft of it). */
+export function clearSetupProgress(wizardId: string) {
+  return setUiState(UI_STATE.agentApp.setupProgress(wizardId), null)
+}
+
+/**
+ * Cancel a setup for good: the backend drops it and tells the chat that
+ * started it. Removed here right away; the broadcast reply removes it in
+ * every other tab.
+ */
+export function cancelSetup(wizardId: string) {
+  return (dispatch: AppDispatch) => {
+    getSocketClient().send('agent_app_setup_cancel', { wizardId })
+    dispatch(setupEnded(wizardId))
+    dispatch(clearSetupProgress(wizardId))
+  }
+}
+
+// --- inbound message handlers --------------------------------------------
+
+register('agent_app_setup_list', (data, dispatch) => {
+  const d = data as { setups?: PendingAgentAppSetup[] } | undefined
+  dispatch(setSetups(d?.setups || []))
+})
+
+register('agent_app_wizard_open', (data, dispatch) => {
+  const d = data as PendingAgentAppSetup | undefined
+  if (d?.wizardId && Array.isArray(d.questions) && d.questions.length > 0) {
+    dispatch(setupOpened(d))
+  }
+})
+
+register('agent_app_setup_cancel', (data, dispatch) => {
+  const d = data as { wizardId?: string } | undefined
+  if (d?.wizardId) dispatch(setupEnded(d.wizardId))
+})
+
+// A successful finalize created the project; the setup is over everywhere.
+// Follow-up rounds (followupQuestions) and failures keep it pending.
+register('agent_app_wizard_finalize', (data, dispatch) => {
+  const d = data as { success?: boolean; wizardId?: string; projectId?: string } | undefined
+  if (d?.success && d.projectId && d.wizardId) dispatch(setupEnded(d.wizardId))
+})
+
+register('session_deleted', (data, dispatch) => {
+  const d = data as { sessionId?: string } | undefined
+  if (d?.sessionId) dispatch(sessionSetupsRemoved(d.sessionId))
+})
diff --git a/app/ui_layer/browser/frontend/src/store/uiState/catalog.ts b/app/ui_layer/browser/frontend/src/store/uiState/catalog.ts
index 46c85793..0a8da931 100644
--- a/app/ui_layer/browser/frontend/src/store/uiState/catalog.ts
+++ b/app/ui_layer/browser/frontend/src/store/uiState/catalog.ts
@@ -1,4 +1,4 @@
-import type { MetricsTimePeriod } from '../../types'
+import type { AgentAppSetupProgress, MetricsTimePeriod } from '../../types'
 import type { DashboardLayoutsStorage } from '../../pages/Dashboard/layout/types'
 import type { SettingsCategory } from '../../pages/Settings/types'
 import { defineUiState, defineUiStateFamily, oneOf } from './defineUiState'
@@ -87,6 +87,11 @@ export const UI_STATE = {
     chatPanelWidth: defineUiState('agentApp.chatPanelWidth', 350, 'preference'),
     /** Mobile chat panel height as a share of the page. */
     chatPanelMobileRatio: defineUiState('agentApp.chatPanelMobileRatio', 0.4, 'preference'),
+    /** By wizard id: answers given so far in a chat-started setup, so
+     *  closing and resuming the popup (or reloading) keeps them. */
+    setupProgress: defineUiStateFamily<AgentAppSetupProgress | null>('agentApp.setupProgress', null, 'session', {
+      isValid: value => value === null || typeof value === 'object',
+    }),
   },
 
   memory: {
diff --git a/app/ui_layer/browser/frontend/src/types/index.ts b/app/ui_layer/browser/frontend/src/types/index.ts
index a11de1b6..b56d9f43 100644
--- a/app/ui_layer/browser/frontend/src/types/index.ts
+++ b/app/ui_layer/browser/frontend/src/types/index.ts
@@ -197,6 +197,9 @@ export type WSMessageType =
   | 'agent_app_build_event'
   | 'agent_app_build_events_replay'
   | 'agent_app_error'
+  // Pending chat-started setups (agentAppSetupSlice)
+  | 'agent_app_setup_list'
+  | 'agent_app_setup_cancel'
   | 'prompt_enhanced'
 
 export interface WSMessage {
@@ -837,6 +840,39 @@ export interface AgentAppComponentState {
   children?: AgentAppComponentState[]
 }
 
+/** One setup-interview question (option chips + free text). */
+export interface AgentAppInterviewQuestion {
+  id: string
+  question: string
+  why?: string
+  multiSelect: boolean
+  options: string[]
+}
+
+/**
+ * A chat-started Agent App setup the user has not finished: the questions
+ * agent_app_scaffold generated, persisted server-side until finalize or
+ * cancel (app/agent_app/pending_setups.py).
+ */
+export interface PendingAgentAppSetup {
+  wizardId: string
+  /** The chat that ran agent_app_scaffold; its Resume card lives there. */
+  originSessionId: string
+  name: string
+  config: Record<string, any>
+  questions: AgentAppInterviewQuestion[]
+  createdAt: number
+}
+
+/** How far the user got through a setup interview (kept per browser tab). */
+export interface AgentAppSetupProgress {
+  /** Round-1 questions plus any follow-up round the backend appended. */
+  questions: AgentAppInterviewQuestion[]
+  answers: Record<string, string[]>
+  qIndex: number
+  followupDone: boolean
+}
+
 // Response types for Agent App operations
 export interface AgentAppCreateResponse {
   success: boolean
diff --git a/app/ui_layer/events/resource_changes.py b/app/ui_layer/events/resource_changes.py
index 88796abf..c0f475ab 100644
--- a/app/ui_layer/events/resource_changes.py
+++ b/app/ui_layer/events/resource_changes.py
@@ -26,6 +26,7 @@ class Resource(str, Enum):
     ``store/resources`` catalog; extended as views are migrated."""
 
     AGENT_APPS = "agent_apps"
+    AGENT_APP_SETUPS = "agent_app_setups"  # pending chat setups; ids = wizard ids
     SESSIONS = "sessions"
     WORKSPACE_FILES = "workspace_files"  # ids = directory paths
     SKILLS = "skills"  # skill list, skill meta and slash commands
@@ -129,6 +130,15 @@ def _flush(self) -> None:
         ),
         Resource.AGENT_APPS,
     ),
+    # A chat setup opens, is cancelled, or finalizes (pending_setups.py).
+    **dict.fromkeys(
+        (
+            "agent_app_wizard_open",
+            "agent_app_setup_cancel",
+            "agent_app_wizard_finalize",
+        ),
+        Resource.AGENT_APP_SETUPS,
+    ),
     "session_updated": Resource.SESSIONS,
     **dict.fromkeys(
         (
@@ -207,6 +217,7 @@ def _flush(self) -> None:
 # paths reach into nested objects; the first non-empty value wins.
 _ID_FIELDS: Dict[Resource, Tuple[str, ...]] = {
     Resource.AGENT_APPS: ("projectId", "project.id"),
+    Resource.AGENT_APP_SETUPS: ("wizardId",),
     Resource.SESSIONS: ("sessionId", "session.id"),
     Resource.PROACTIVE: ("taskId",),
     Resource.MEMORY: ("itemId", "item.id"),
diff --git a/tests/test_agent_app_pending_setups.py b/tests/test_agent_app_pending_setups.py
new file mode 100644
index 00000000..b87373d9
--- /dev/null
+++ b/tests/test_agent_app_pending_setups.py
@@ -0,0 +1,232 @@
+# -*- coding: utf-8 -*-
+"""A chat-started Agent App setup survives the popup being closed.
+
+Regression cover for issue #448: the setup questions lived only in the
+browser, so closing the popup lost them, and the agent kept asking the user to
+answer questions nobody could see. The setup is now a persisted PendingSetup
+that ends only on finalize, cancel, or deletion of the chat that started it
+(docs/plans/agent-app-setup-resume-plan.md).
+"""
+
+import asyncio
+import json
+import threading
+import types
+
+import pytest
+
+from app.agent_app.pending_setups import PendingSetup, PendingSetupRegistry
+from app.triggers import TriggerSource
+
+
+def _setup(wizard_id="chat_1", session="s1", name="Stock Forecaster", t=1.0):
+    return PendingSetup(
+        wizard_id=wizard_id,
+        origin_session_id=session,
+        name=name,
+        config={"name": name, "description": "d"},
+        questions=[{"id": "q1", "question": "Which data?"}],
+        created_at=t,
+    )
+
+
+@pytest.fixture
+def registry(tmp_path):
+    return PendingSetupRegistry(tmp_path / "agent_app_pending_setups.json")
+
+
+# ── registry ────────────────────────────────────────────────────────────────
+
+
+def test_round_trips_across_restarts(tmp_path, registry):
+    registry.add(_setup())
+    reloaded = PendingSetupRegistry(tmp_path / "agent_app_pending_setups.json")
+    assert reloaded.get("chat_1") == _setup()
+
+
+def test_find_ignores_case_and_whitespace_but_not_session(registry):
+    registry.add(_setup(name="Stock  Forecaster"))
+    assert registry.find("s1", " stock forecaster ").wizard_id == "chat_1"
+    assert registry.find("s2", "Stock Forecaster") is None
+    assert registry.find("s1", "Other App") is None
+
+
+def test_remove_returns_the_record_once(registry):
+    registry.add(_setup())
+    assert registry.remove("chat_1").wizard_id == "chat_1"
+    assert registry.remove("chat_1") is None
+    assert registry.list() == []
+
+
+def test_remove_for_session_only_touches_that_session(registry):
+    registry.add(_setup("chat_a", session="s1"))
+    registry.add(_setup("chat_b", session="s2"))
+    removed = registry.remove_for_session("s1")
+    assert [s.wizard_id for s in removed] == ["chat_a"]
+    assert [s.wizard_id for s in registry.list()] == ["chat_b"]
+
+
+def test_list_is_oldest_first(registry):
+    registry.add(_setup("chat_new", t=2.0))
+    registry.add(_setup("chat_old", t=1.0))
+    assert [s.wizard_id for s in registry.list()] == ["chat_old", "chat_new"]
+
+
+def test_missing_or_corrupt_file_loads_empty(tmp_path):
+    path = tmp_path / "agent_app_pending_setups.json"
+    assert PendingSetupRegistry(path).list() == []
+    path.write_text("{not json", encoding="utf-8")
+    assert PendingSetupRegistry(path).list() == []
+    path.write_text(json.dumps({"setups": [{"noWizardId": 1}]}), encoding="utf-8")
+    assert PendingSetupRegistry(path).list() == []
+
+
+def test_concurrent_adds_are_all_persisted(tmp_path, registry):
+    threads = [
+        threading.Thread(target=registry.add, args=(_setup(f"chat_{i}", t=i),))
+        for i in range(20)
+    ]
+    for t in threads:
+        t.start()
+    for t in threads:
+        t.join()
+    reloaded = PendingSetupRegistry(tmp_path / "agent_app_pending_setups.json")
+    assert len(reloaded.list()) == 20
+
+
+# ── agent_app_scaffold ──────────────────────────────────────────────────────
+
+
+class _Wizard:
+    def __init__(self, questions):
+        self.questions = questions
+        self.calls = 0
+
+    async def generate_interview(self, config, image_notes, allow_empty=False):
+        self.calls += 1
+        return list(self.questions)
+
+
+@pytest.fixture
+def scaffold_env(monkeypatch, registry):
+    """The scaffold action with a stub manager, interviewer and browser."""
+    import app.agent_app as agent_app_pkg
+
+    manager = types.SimpleNamespace(pending_setups=registry)
+    interviewer = _Wizard([{"id": "q1", "question": "Which data?"}])
+    opened = []
+
+    async def _open(payload):
+        opened.append(payload)
+        return True
+
+    monkeypatch.setattr(agent_app_pkg, "get_agent_app_manager", lambda: manager)
+    monkeypatch.setattr(agent_app_pkg, "broadcast_agent_app_wizard_open", _open)
+    import app.agent_app.wizard as wizard_mod
+
+    monkeypatch.setattr(wizard_mod, "generate_interview", interviewer.generate_interview)
+    return types.SimpleNamespace(registry=registry, interviewer=interviewer, opened=opened)
+
+
+def _scaffold(session="s1", name="Stock Forecaster"):
+    from app.data.action.agent_app_actions import agent_app_scaffold
+
+    return asyncio.run(
+        agent_app_scaffold(
+            {"name": name, "description": "Forecasts stocks.", "_session_id": session}
+        )
+    )
+
+
+def test_scaffold_persists_the_setup_and_opens_it(scaffold_env):
+    out = _scaffold()
+    assert out["status"] == "success" and "project_id" not in out
+    assert "Resume setup" in out["message"]
+    [setup] = scaffold_env.registry.list()
+    assert setup.origin_session_id == "s1"
+    assert scaffold_env.opened == [setup.to_dict()]
+
+
+def test_scaffold_again_reopens_the_same_questions(scaffold_env):
+    _scaffold()
+    out = _scaffold(name="stock forecaster")
+    assert scaffold_env.interviewer.calls == 1, "no second interview call"
+    assert len(scaffold_env.registry.list()) == 1
+    first, second = scaffold_env.opened
+    assert first == second
+    assert out["message"].startswith("Reopened the pending setup.")
+
+
+def test_scaffold_without_a_browser_keeps_no_record(scaffold_env, monkeypatch):
+    import app.agent_app as agent_app_pkg
+
+    async def _no_browser(payload):
+        return False
+
+    async def _create_project(**kwargs):
+        raise RuntimeError("stop here: build path reached")
+
+    monkeypatch.setattr(agent_app_pkg, "broadcast_agent_app_wizard_open", _no_browser)
+    agent_app_pkg.get_agent_app_manager().create_project = _create_project
+    out = _scaffold()
+    assert out["status"] == "error" and "build path reached" in out["message"]
+    assert scaffold_env.registry.list() == []
+
+
+# ── cancel handler ──────────────────────────────────────────────────────────
+
+
+class _Triggers:
+    def __init__(self):
+        self.specs = []
+
+    async def emit(self, spec):
+        self.specs.append(spec)
+
+
+def _adapter(registry):
+    from app.ui_layer.adapters.browser_adapter import BrowserAdapter
+
+    sent = []
+
+    async def _broadcast(message):
+        sent.append(message)
+
+    fake = types.SimpleNamespace(
+        _agent_app_manager=types.SimpleNamespace(
+            pending_setups=registry, _trigger_service=_Triggers()
+        ),
+        _broadcast=_broadcast,
+    )
+    cancel = BrowserAdapter._handle_agent_app_setup_cancel.__get__(fake)
+    list_message = BrowserAdapter._agent_app_setup_list_message.__get__(fake)
+    return fake, sent, cancel, list_message
+
+
+def test_cancel_drops_the_setup_and_tells_the_origin_chat(registry):
+    registry.add(_setup())
+    fake, sent, cancel, _ = _adapter(registry)
+    asyncio.run(cancel({"wizardId": "chat_1"}))
+    assert registry.list() == []
+    [spec] = fake._agent_app_manager._trigger_service.specs
+    assert spec.source == TriggerSource.AGENT_APP_SETUP_CANCELLED
+    assert spec.session_id == "s1"
+    assert sent == [
+        {"type": "agent_app_setup_cancel", "data": {"success": True, "wizardId": "chat_1"}}
+    ]
+
+
+def test_cancel_of_an_unknown_setup_notifies_nobody(registry):
+    fake, sent, cancel, _ = _adapter(registry)
+    asyncio.run(cancel({"wizardId": "chat_gone"}))
+    assert fake._agent_app_manager._trigger_service.specs == []
+    assert sent[0]["data"]["success"] is False
+
+
+def test_setup_list_message_carries_every_pending_setup(registry):
+    registry.add(_setup())
+    _, _, _, list_message = _adapter(registry)
+    assert list_message() == {
+        "type": "agent_app_setup_list",
+        "data": {"setups": [_setup().to_dict()]},
+    }
diff --git a/tests/test_resource_changes.py b/tests/test_resource_changes.py
index 40d3fba7..e3c1a86a 100644
--- a/tests/test_resource_changes.py
+++ b/tests/test_resource_changes.py
@@ -190,6 +190,11 @@ def test_mutation_replies_map_to_their_resource_with_ids():
             Resource.AGENT_FILES,
             ["USER.md"],
         ),
+        (
+            {"type": "agent_app_setup_cancel", "data": {"wizardId": "chat_1"}},
+            Resource.AGENT_APP_SETUPS,
+            ["chat_1"],
+        ),
     ]
     for message, resource, ids in cases:
         assert resource_change_for_message(message) == (resource, ids), message["type"]
diff --git a/tests/test_ws_auth.py b/tests/test_ws_auth.py
index 2bd6a348..293e0b39 100644
--- a/tests/test_ws_auth.py
+++ b/tests/test_ws_auth.py
@@ -88,7 +88,10 @@ def _stub_adapter() -> BrowserAdapter:
     adapter._ws_prepare_failures = 0
     adapter._get_initial_state = lambda: {"stub": True}
     adapter._get_skill_meta = lambda: {}
-    adapter._agent_app_manager = SimpleNamespace(list_projects=lambda: [])
+    adapter._agent_app_manager = SimpleNamespace(
+        list_projects=lambda: [],
+        pending_setups=SimpleNamespace(list=lambda: []),
+    )
     return adapter