From 9fa923051cca62be9f5101375c0dc953a592fc6c Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Tue, 10 Feb 2026 15:23:29 +0200
Subject: [PATCH 01/42] add stub create_notion_page tool

---
 .../new_chat/tools/create_notion_page.py      | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 surfsense_backend/app/agents/new_chat/tools/create_notion_page.py

diff --git a/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py b/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
new file mode 100644
index 000000000..bc3d2b81f
--- /dev/null
+++ b/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
@@ -0,0 +1,29 @@
+from typing import Any
+
+from langchain_core.tools import tool
+
+
+def create_create_notion_page_tool():
+    @tool
+    async def create_notion_page(
+        title: str,
+        content: str,
+    ) -> dict[str, Any]:
+        """Create a new page in Notion with the given title and content.
+
+        Use this tool when the user asks you to create, save, or publish
+        something to Notion. The page will be created in the user's
+        configured Notion workspace.
+
+        Args:
+            title: The title of the Notion page.
+            content: The markdown content for the page body.
+        """
+        return {
+            "status": "success",
+            "page_id": "stub-page-id-12345",
+            "title": title,
+            "url": "https://www.notion.so/stub-page-12345",
+        }
+
+    return create_notion_page

From c9542c86035287924f50f1e08e9cff0397e0f376 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Tue, 10 Feb 2026 15:27:47 +0200
Subject: [PATCH 02/42] register create_notion_page tool with interrupt_on

---
 .../app/agents/new_chat/chat_deepagent.py          |  1 +
 .../app/agents/new_chat/tools/registry.py          | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/chat_deepagent.py b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
index d58a0fadb..525b18e7c 100644
--- a/surfsense_backend/app/agents/new_chat/chat_deepagent.py
+++ b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
@@ -273,6 +273,7 @@ async def create_surfsense_deep_agent(
         system_prompt=system_prompt,
         context_schema=SurfSenseContextSchema,
         checkpointer=checkpointer,
+        interrupt_on={"create_notion_page": True},
     )
 
     return agent
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index 8092a6104..3716a19b6 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -45,6 +45,7 @@ from langchain_core.tools import BaseTool
 
 from app.db import ChatVisibility
 
+from .create_notion_page import create_create_notion_page_tool
 from .display_image import create_display_image_tool
 from .generate_image import create_generate_image_tool
 from .knowledge_base import create_search_knowledge_base_tool
@@ -202,13 +203,12 @@ BUILTIN_TOOLS: list[ToolDefinition] = [
     # =========================================================================
     # ADD YOUR CUSTOM TOOLS BELOW
     # =========================================================================
-    # Example:
-    # ToolDefinition(
-    #     name="my_custom_tool",
-    #     description="What my tool does",
-    #     factory=lambda deps: create_my_custom_tool(...),
-    #     requires=["search_space_id"],
-    # ),
+    ToolDefinition(
+        name="create_notion_page",
+        description="Create a new page in the user's Notion workspace",
+        factory=lambda deps: create_create_notion_page_tool(),
+        requires=[],
+    ),
 ]
 
 

From 9751918e41468cd30d4123cc32dcdea2f49346f8 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Tue, 10 Feb 2026 15:35:42 +0200
Subject: [PATCH 03/42] add interrupt detection, SSE event, and resume schemas

---
 surfsense_backend/app/schemas/new_chat.py            | 12 +++++++++++-
 .../app/services/new_streaming_service.py            | 12 ++++++++++++
 surfsense_backend/app/tasks/chat/stream_new_chat.py  | 11 +++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/surfsense_backend/app/schemas/new_chat.py b/surfsense_backend/app/schemas/new_chat.py
index aa95e49e6..a7200903e 100644
--- a/surfsense_backend/app/schemas/new_chat.py
+++ b/surfsense_backend/app/schemas/new_chat.py
@@ -7,7 +7,7 @@ These schemas follow the assistant-ui ThreadHistoryAdapter pattern:
 """
 
 from datetime import datetime
-from typing import Any
+from typing import Any, Literal
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field
@@ -193,6 +193,16 @@ class RegenerateRequest(BaseModel):
     mentioned_surfsense_doc_ids: list[int] | None = None
 
 
+class ResumeDecision(BaseModel):
+    type: Literal["approve", "edit", "reject"]
+    edited_action: dict[str, Any] | None = None
+
+
+class ResumeRequest(BaseModel):
+    search_space_id: int
+    decisions: list[ResumeDecision]
+
+
 # =============================================================================
 # Public Chat Snapshot Schemas
 # =============================================================================
diff --git a/surfsense_backend/app/services/new_streaming_service.py b/surfsense_backend/app/services/new_streaming_service.py
index 57fbc9663..aa14dec7d 100644
--- a/surfsense_backend/app/services/new_streaming_service.py
+++ b/surfsense_backend/app/services/new_streaming_service.py
@@ -504,6 +504,18 @@ class VercelStreamingService:
             },
         )
 
+    def format_interrupt_request(self, interrupt_value: dict[str, Any]) -> str:
+        """Format an interrupt request for human-in-the-loop approval.
+
+        Args:
+            interrupt_value: The interrupt payload from HumanInTheLoopMiddleware
+                containing action_requests and review_configs.
+
+        Returns:
+            str: SSE formatted interrupt request data part
+        """
+        return self.format_data("interrupt-request", interrupt_value)
+
     # =========================================================================
     # Error Part
     # =========================================================================
diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 31e67c7ff..801d140be 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -1175,6 +1175,17 @@ async def stream_new_chat(
         if completion_event:
             yield completion_event
 
+        # Check if the graph was interrupted (human-in-the-loop)
+        state = await agent.aget_state(config)
+        is_interrupted = state.tasks and any(task.interrupts for task in state.tasks)
+        if is_interrupted:
+            interrupt_value = state.tasks[0].interrupts[0].value
+            yield streaming_service.format_interrupt_request(interrupt_value)
+            yield streaming_service.format_finish_step()
+            yield streaming_service.format_finish()
+            yield streaming_service.format_done()
+            return
+
         # Generate LLM title for new chats after first response
         # Check if this is the first assistant response by counting existing assistant messages
         from sqlalchemy import func

From 39ee4742d2cb91f2fbd7aca24b5c9ffd52287621 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Tue, 10 Feb 2026 15:43:52 +0200
Subject: [PATCH 04/42] add stream_resume_chat and POST /threads/{id}/resume
 endpoint

---
 .../app/routes/new_chat_routes.py             |  78 ++-
 .../app/tasks/chat/stream_new_chat.py         | 620 ++++++++++++++++++
 2 files changed, 697 insertions(+), 1 deletion(-)

diff --git a/surfsense_backend/app/routes/new_chat_routes.py b/surfsense_backend/app/routes/new_chat_routes.py
index ecb1c2a6f..53e6c8e09 100644
--- a/surfsense_backend/app/routes/new_chat_routes.py
+++ b/surfsense_backend/app/routes/new_chat_routes.py
@@ -43,11 +43,12 @@ from app.schemas.new_chat import (
     PublicChatSnapshotCreateResponse,
     PublicChatSnapshotListResponse,
     RegenerateRequest,
+    ResumeRequest,
     ThreadHistoryLoadResponse,
     ThreadListItem,
     ThreadListResponse,
 )
-from app.tasks.chat.stream_new_chat import stream_new_chat
+from app.tasks.chat.stream_new_chat import stream_new_chat, stream_resume_chat
 from app.users import current_active_user
 from app.utils.rbac import check_permission
 
@@ -1326,3 +1327,78 @@ async def regenerate_response(
             status_code=500,
             detail=f"An unexpected error occurred during regeneration: {e!s}",
         ) from None
+
+
+# =============================================================================
+# Resume Interrupted Chat Endpoint
+# =============================================================================
+
+
+@router.post("/threads/{thread_id}/resume")
+async def resume_chat(
+    thread_id: int,
+    request: ResumeRequest,
+    session: AsyncSession = Depends(get_async_session),
+    user: User = Depends(current_active_user),
+):
+    try:
+        result = await session.execute(
+            select(NewChatThread).filter(NewChatThread.id == thread_id)
+        )
+        thread = result.scalars().first()
+
+        if not thread:
+            raise HTTPException(status_code=404, detail="Thread not found")
+
+        await check_permission(
+            session,
+            user,
+            thread.search_space_id,
+            Permission.CHATS_CREATE.value,
+            "You don't have permission to chat in this search space",
+        )
+
+        await check_thread_access(session, thread, user)
+
+        search_space_result = await session.execute(
+            select(SearchSpace).filter(SearchSpace.id == request.search_space_id)
+        )
+        search_space = search_space_result.scalars().first()
+
+        if not search_space:
+            raise HTTPException(status_code=404, detail="Search space not found")
+
+        llm_config_id = (
+            search_space.agent_llm_id if search_space.agent_llm_id is not None else -1
+        )
+
+        decisions = [d.model_dump() for d in request.decisions]
+
+        return StreamingResponse(
+            stream_resume_chat(
+                chat_id=thread_id,
+                search_space_id=request.search_space_id,
+                decisions=decisions,
+                session=session,
+                user_id=str(user.id),
+                llm_config_id=llm_config_id,
+                thread_visibility=thread.visibility,
+            ),
+            media_type="text/event-stream",
+            headers={
+                "Cache-Control": "no-cache",
+                "Connection": "keep-alive",
+                "X-Accel-Buffering": "no",
+            },
+        )
+
+    except HTTPException:
+        raise
+    except Exception as e:
+        import traceback
+
+        traceback.print_exc()
+        raise HTTPException(
+            status_code=500,
+            detail=f"An unexpected error occurred during resume: {e!s}",
+        ) from None
diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 801d140be..852793230 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -1268,3 +1268,623 @@ async def stream_new_chat(
     finally:
         # Clear AI responding state for live collaboration
         await clear_ai_responding(session, chat_id)
+
+
+async def stream_resume_chat(
+    chat_id: int,
+    search_space_id: int,
+    decisions: list[dict],
+    session: AsyncSession,
+    user_id: str | None = None,
+    llm_config_id: int = -1,
+    thread_visibility: ChatVisibility | None = None,
+) -> AsyncGenerator[str, None]:
+    streaming_service = VercelStreamingService()
+    current_text_id: str | None = None
+
+    try:
+        if user_id:
+            await set_ai_responding(session, chat_id, UUID(user_id))
+
+        agent_config: AgentConfig | None = None
+        if llm_config_id >= 0:
+            agent_config = await load_agent_config(
+                session=session,
+                config_id=llm_config_id,
+                search_space_id=search_space_id,
+            )
+            if not agent_config:
+                yield streaming_service.format_error(
+                    f"Failed to load NewLLMConfig with id {llm_config_id}"
+                )
+                yield streaming_service.format_done()
+                return
+            llm = create_chat_litellm_from_agent_config(agent_config)
+        else:
+            llm_config = load_llm_config_from_yaml(llm_config_id=llm_config_id)
+            if not llm_config:
+                yield streaming_service.format_error(
+                    f"Failed to load LLM config with id {llm_config_id}"
+                )
+                yield streaming_service.format_done()
+                return
+            llm = create_chat_litellm_from_config(llm_config)
+            agent_config = AgentConfig.from_yaml_config(llm_config)
+
+        if not llm:
+            yield streaming_service.format_error("Failed to create LLM instance")
+            yield streaming_service.format_done()
+            return
+
+        connector_service = ConnectorService(session, search_space_id=search_space_id)
+
+        from app.db import SearchSourceConnectorType
+
+        firecrawl_api_key = None
+        webcrawler_connector = await connector_service.get_connector_by_type(
+            SearchSourceConnectorType.WEBCRAWLER_CONNECTOR, search_space_id
+        )
+        if webcrawler_connector and webcrawler_connector.config:
+            firecrawl_api_key = webcrawler_connector.config.get("FIRECRAWL_API_KEY")
+
+        checkpointer = await get_checkpointer()
+        visibility = thread_visibility or ChatVisibility.PRIVATE
+
+        agent = await create_surfsense_deep_agent(
+            llm=llm,
+            search_space_id=search_space_id,
+            db_session=session,
+            connector_service=connector_service,
+            checkpointer=checkpointer,
+            user_id=user_id,
+            thread_id=chat_id,
+            agent_config=agent_config,
+            firecrawl_api_key=firecrawl_api_key,
+            thread_visibility=visibility,
+        )
+
+        from langgraph.types import Command
+
+        config = {
+            "configurable": {"thread_id": str(chat_id)},
+            "recursion_limit": 80,
+        }
+
+        yield streaming_service.format_message_start()
+        yield streaming_service.format_start_step()
+
+        accumulated_text = ""
+        thinking_step_counter = 0
+        tool_step_ids: dict[str, str] = {}
+        completed_step_ids: set[str] = set()
+        last_active_step_id: str | None = None
+        last_active_step_title = ""
+        last_active_step_items: list[str] = []
+        just_finished_tool = False
+
+        def next_thinking_step_id() -> str:
+            nonlocal thinking_step_counter
+            thinking_step_counter += 1
+            return f"thinking-resume-{thinking_step_counter}"
+
+        def complete_current_step() -> str | None:
+            nonlocal last_active_step_id
+            if last_active_step_id and last_active_step_id not in completed_step_ids:
+                completed_step_ids.add(last_active_step_id)
+                event = streaming_service.format_thinking_step(
+                    step_id=last_active_step_id,
+                    title=last_active_step_title,
+                    status="completed",
+                    items=last_active_step_items,
+                )
+                last_active_step_id = None
+                return event
+            return None
+
+        async for event in agent.astream_events(
+            Command(resume={"decisions": decisions}), config=config, version="v2"
+        ):
+            event_type = event.get("event", "")
+
+            if event_type == "on_chat_model_stream":
+                chunk = event.get("data", {}).get("chunk")
+                if chunk and hasattr(chunk, "content"):
+                    content = chunk.content
+                    if content and isinstance(content, str):
+                        if current_text_id is None:
+                            completion_event = complete_current_step()
+                            if completion_event:
+                                yield completion_event
+                            if just_finished_tool:
+                                last_active_step_id = None
+                                last_active_step_title = ""
+                                last_active_step_items = []
+                                just_finished_tool = False
+                            current_text_id = streaming_service.generate_text_id()
+                            yield streaming_service.format_text_start(current_text_id)
+                        yield streaming_service.format_text_delta(
+                            current_text_id, content
+                        )
+                        accumulated_text += content
+
+            elif event_type == "on_tool_start":
+                tool_name = event.get("name", "unknown_tool")
+                run_id = event.get("run_id", "")
+                tool_input = event.get("data", {}).get("input", {})
+
+                if current_text_id is not None:
+                    yield streaming_service.format_text_end(current_text_id)
+                    current_text_id = None
+
+                if last_active_step_title != "Synthesizing response":
+                    completion_event = complete_current_step()
+                    if completion_event:
+                        yield completion_event
+
+                just_finished_tool = False
+                tool_step_id = next_thinking_step_id()
+                tool_step_ids[run_id] = tool_step_id
+                last_active_step_id = tool_step_id
+
+                if tool_name == "search_knowledge_base":
+                    query = (
+                        tool_input.get("query", "")
+                        if isinstance(tool_input, dict)
+                        else str(tool_input)
+                    )
+                    last_active_step_title = "Searching knowledge base"
+                    last_active_step_items = [
+                        f"Query: {query[:100]}{'...' if len(query) > 100 else ''}"
+                    ]
+                    yield streaming_service.format_thinking_step(
+                        step_id=tool_step_id,
+                        title="Searching knowledge base",
+                        status="in_progress",
+                        items=last_active_step_items,
+                    )
+                elif tool_name == "link_preview":
+                    url = (
+                        tool_input.get("url", "")
+                        if isinstance(tool_input, dict)
+                        else str(tool_input)
+                    )
+                    last_active_step_title = "Fetching link preview"
+                    last_active_step_items = [
+                        f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
+                    ]
+                    yield streaming_service.format_thinking_step(
+                        step_id=tool_step_id,
+                        title="Fetching link preview",
+                        status="in_progress",
+                        items=last_active_step_items,
+                    )
+                elif tool_name == "display_image":
+                    src = (
+                        tool_input.get("src", "")
+                        if isinstance(tool_input, dict)
+                        else str(tool_input)
+                    )
+                    title = (
+                        tool_input.get("title", "")
+                        if isinstance(tool_input, dict)
+                        else ""
+                    )
+                    last_active_step_title = "Analyzing the image"
+                    last_active_step_items = [
+                        f"Analyzing: {title[:50] if title else src[:50]}{'...' if len(title or src) > 50 else ''}"
+                    ]
+                    yield streaming_service.format_thinking_step(
+                        step_id=tool_step_id,
+                        title="Analyzing the image",
+                        status="in_progress",
+                        items=last_active_step_items,
+                    )
+                elif tool_name == "scrape_webpage":
+                    url = (
+                        tool_input.get("url", "")
+                        if isinstance(tool_input, dict)
+                        else str(tool_input)
+                    )
+                    last_active_step_title = "Scraping webpage"
+                    last_active_step_items = [
+                        f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
+                    ]
+                    yield streaming_service.format_thinking_step(
+                        step_id=tool_step_id,
+                        title="Scraping webpage",
+                        status="in_progress",
+                        items=last_active_step_items,
+                    )
+                elif tool_name == "generate_podcast":
+                    podcast_title = (
+                        tool_input.get("podcast_title", "SurfSense Podcast")
+                        if isinstance(tool_input, dict)
+                        else "SurfSense Podcast"
+                    )
+                    content_len = len(
+                        tool_input.get("source_content", "")
+                        if isinstance(tool_input, dict)
+                        else ""
+                    )
+                    last_active_step_title = "Generating podcast"
+                    last_active_step_items = [
+                        f"Title: {podcast_title}",
+                        f"Content: {content_len:,} characters",
+                        "Preparing audio generation...",
+                    ]
+                    yield streaming_service.format_thinking_step(
+                        step_id=tool_step_id,
+                        title="Generating podcast",
+                        status="in_progress",
+                        items=last_active_step_items,
+                    )
+                else:
+                    last_active_step_title = f"Using {tool_name.replace('_', ' ')}"
+                    last_active_step_items = []
+                    yield streaming_service.format_thinking_step(
+                        step_id=tool_step_id,
+                        title=last_active_step_title,
+                        status="in_progress",
+                    )
+
+                tool_call_id = (
+                    f"call_{run_id[:32]}"
+                    if run_id
+                    else streaming_service.generate_tool_call_id()
+                )
+                yield streaming_service.format_tool_input_start(tool_call_id, tool_name)
+                yield streaming_service.format_tool_input_available(
+                    tool_call_id,
+                    tool_name,
+                    tool_input
+                    if isinstance(tool_input, dict)
+                    else {"input": tool_input},
+                )
+
+            elif event_type == "on_tool_end":
+                run_id = event.get("run_id", "")
+                tool_name = event.get("name", "unknown_tool")
+                raw_output = event.get("data", {}).get("output", "")
+
+                if hasattr(raw_output, "content"):
+                    content = raw_output.content
+                    if isinstance(content, str):
+                        try:
+                            tool_output = json.loads(content)
+                        except (json.JSONDecodeError, TypeError):
+                            tool_output = {"result": content}
+                    elif isinstance(content, dict):
+                        tool_output = content
+                    else:
+                        tool_output = {"result": str(content)}
+                elif isinstance(raw_output, dict):
+                    tool_output = raw_output
+                else:
+                    tool_output = {
+                        "result": str(raw_output) if raw_output else "completed"
+                    }
+
+                tool_call_id = f"call_{run_id[:32]}" if run_id else "call_unknown"
+                original_step_id = tool_step_ids.get(
+                    run_id, f"thinking-unknown-{run_id[:8]}"
+                )
+                completed_step_ids.add(original_step_id)
+
+                if tool_name == "search_knowledge_base":
+                    result_info = "Search completed"
+                    if isinstance(tool_output, dict):
+                        result_len = tool_output.get("result_length", 0)
+                        if result_len > 0:
+                            result_info = (
+                                f"Found relevant information ({result_len} chars)"
+                            )
+                    completed_items = [*last_active_step_items, result_info]
+                    yield streaming_service.format_thinking_step(
+                        step_id=original_step_id,
+                        title="Searching knowledge base",
+                        status="completed",
+                        items=completed_items,
+                    )
+                elif tool_name == "link_preview":
+                    if isinstance(tool_output, dict):
+                        title = tool_output.get("title", "Link")
+                        domain = tool_output.get("domain", "")
+                        has_error = "error" in tool_output
+                        if has_error:
+                            completed_items = [
+                                *last_active_step_items,
+                                f"Error: {tool_output.get('error', 'Failed to fetch')}",
+                            ]
+                        else:
+                            completed_items = [
+                                *last_active_step_items,
+                                f"Title: {title[:60]}{'...' if len(title) > 60 else ''}",
+                                f"Domain: {domain}" if domain else "Preview loaded",
+                            ]
+                    else:
+                        completed_items = [*last_active_step_items, "Preview loaded"]
+                    yield streaming_service.format_thinking_step(
+                        step_id=original_step_id,
+                        title="Fetching link preview",
+                        status="completed",
+                        items=completed_items,
+                    )
+                elif tool_name == "display_image":
+                    if isinstance(tool_output, dict):
+                        title = tool_output.get("title", "")
+                        alt = tool_output.get("alt", "Image")
+                        display_name = title or alt
+                        completed_items = [
+                            *last_active_step_items,
+                            f"Analyzed: {display_name[:50]}{'...' if len(display_name) > 50 else ''}",
+                        ]
+                    else:
+                        completed_items = [*last_active_step_items, "Image analyzed"]
+                    yield streaming_service.format_thinking_step(
+                        step_id=original_step_id,
+                        title="Analyzing the image",
+                        status="completed",
+                        items=completed_items,
+                    )
+                elif tool_name == "scrape_webpage":
+                    if isinstance(tool_output, dict):
+                        title = tool_output.get("title", "Webpage")
+                        word_count = tool_output.get("word_count", 0)
+                        has_error = "error" in tool_output
+                        if has_error:
+                            completed_items = [
+                                *last_active_step_items,
+                                f"Error: {tool_output.get('error', 'Failed to scrape')[:50]}",
+                            ]
+                        else:
+                            completed_items = [
+                                *last_active_step_items,
+                                f"Title: {title[:50]}{'...' if len(title) > 50 else ''}",
+                                f"Extracted: {word_count:,} words",
+                            ]
+                    else:
+                        completed_items = [*last_active_step_items, "Content extracted"]
+                    yield streaming_service.format_thinking_step(
+                        step_id=original_step_id,
+                        title="Scraping webpage",
+                        status="completed",
+                        items=completed_items,
+                    )
+                elif tool_name == "generate_podcast":
+                    podcast_status = (
+                        tool_output.get("status", "unknown")
+                        if isinstance(tool_output, dict)
+                        else "unknown"
+                    )
+                    podcast_title = (
+                        tool_output.get("title", "Podcast")
+                        if isinstance(tool_output, dict)
+                        else "Podcast"
+                    )
+                    if podcast_status == "processing":
+                        completed_items = [
+                            f"Title: {podcast_title}",
+                            "Audio generation started",
+                            "Processing in background...",
+                        ]
+                    elif podcast_status == "already_generating":
+                        completed_items = [
+                            f"Title: {podcast_title}",
+                            "Podcast already in progress",
+                            "Please wait for it to complete",
+                        ]
+                    elif podcast_status == "error":
+                        error_msg = (
+                            tool_output.get("error", "Unknown error")
+                            if isinstance(tool_output, dict)
+                            else "Unknown error"
+                        )
+                        completed_items = [
+                            f"Title: {podcast_title}",
+                            f"Error: {error_msg[:50]}",
+                        ]
+                    else:
+                        completed_items = last_active_step_items
+                    yield streaming_service.format_thinking_step(
+                        step_id=original_step_id,
+                        title="Generating podcast",
+                        status="completed",
+                        items=completed_items,
+                    )
+                elif tool_name == "ls":
+                    if isinstance(tool_output, dict):
+                        result = tool_output.get("result", "")
+                    elif isinstance(tool_output, str):
+                        result = tool_output
+                    else:
+                        result = str(tool_output) if tool_output else ""
+                    file_names = []
+                    if result:
+                        for line in result.strip().split("\n"):
+                            line = line.strip()
+                            if line:
+                                name = line.rstrip("/").split("/")[-1]
+                                if name and len(name) <= 40:
+                                    file_names.append(name)
+                                elif name:
+                                    file_names.append(name[:37] + "...")
+                    if file_names:
+                        if len(file_names) <= 5:
+                            completed_items = [f"[{name}]" for name in file_names]
+                        else:
+                            completed_items = [f"[{name}]" for name in file_names[:4]]
+                            completed_items.append(f"(+{len(file_names) - 4} more)")
+                    else:
+                        completed_items = ["No files found"]
+                    yield streaming_service.format_thinking_step(
+                        step_id=original_step_id,
+                        title="Exploring files",
+                        status="completed",
+                        items=completed_items,
+                    )
+                else:
+                    yield streaming_service.format_thinking_step(
+                        step_id=original_step_id,
+                        title=f"Using {tool_name.replace('_', ' ')}",
+                        status="completed",
+                        items=last_active_step_items,
+                    )
+
+                just_finished_tool = True
+                last_active_step_id = None
+                last_active_step_title = ""
+                last_active_step_items = []
+
+                if tool_name == "generate_podcast":
+                    yield streaming_service.format_tool_output_available(
+                        tool_call_id,
+                        tool_output
+                        if isinstance(tool_output, dict)
+                        else {"result": tool_output},
+                    )
+                    if (
+                        isinstance(tool_output, dict)
+                        and tool_output.get("status") == "success"
+                    ):
+                        yield streaming_service.format_terminal_info(
+                            f"Podcast generated successfully: {tool_output.get('title', 'Podcast')}",
+                            "success",
+                        )
+                    else:
+                        error_msg = (
+                            tool_output.get("error", "Unknown error")
+                            if isinstance(tool_output, dict)
+                            else "Unknown error"
+                        )
+                        yield streaming_service.format_terminal_info(
+                            f"Podcast generation failed: {error_msg}",
+                            "error",
+                        )
+                elif tool_name == "link_preview":
+                    yield streaming_service.format_tool_output_available(
+                        tool_call_id,
+                        tool_output
+                        if isinstance(tool_output, dict)
+                        else {"result": tool_output},
+                    )
+                    if isinstance(tool_output, dict) and "error" not in tool_output:
+                        title = tool_output.get("title", "Link")
+                        yield streaming_service.format_terminal_info(
+                            f"Link preview loaded: {title[:50]}{'...' if len(title) > 50 else ''}",
+                            "success",
+                        )
+                    else:
+                        error_msg = (
+                            tool_output.get("error", "Failed to fetch")
+                            if isinstance(tool_output, dict)
+                            else "Failed to fetch"
+                        )
+                        yield streaming_service.format_terminal_info(
+                            f"Link preview failed: {error_msg}",
+                            "error",
+                        )
+                elif tool_name == "display_image":
+                    yield streaming_service.format_tool_output_available(
+                        tool_call_id,
+                        tool_output
+                        if isinstance(tool_output, dict)
+                        else {"result": tool_output},
+                    )
+                    if isinstance(tool_output, dict):
+                        title = tool_output.get("title") or tool_output.get(
+                            "alt", "Image"
+                        )
+                        yield streaming_service.format_terminal_info(
+                            f"Image analyzed: {title[:40]}{'...' if len(title) > 40 else ''}",
+                            "success",
+                        )
+                elif tool_name == "scrape_webpage":
+                    if isinstance(tool_output, dict):
+                        display_output = {
+                            k: v for k, v in tool_output.items() if k != "content"
+                        }
+                        if "content" in tool_output:
+                            content = tool_output.get("content", "")
+                            display_output["content_preview"] = (
+                                content[:500] + "..." if len(content) > 500 else content
+                            )
+                        yield streaming_service.format_tool_output_available(
+                            tool_call_id,
+                            display_output,
+                        )
+                    else:
+                        yield streaming_service.format_tool_output_available(
+                            tool_call_id,
+                            {"result": tool_output},
+                        )
+                    if isinstance(tool_output, dict) and "error" not in tool_output:
+                        title = tool_output.get("title", "Webpage")
+                        word_count = tool_output.get("word_count", 0)
+                        yield streaming_service.format_terminal_info(
+                            f"Scraped: {title[:40]}{'...' if len(title) > 40 else ''} ({word_count:,} words)",
+                            "success",
+                        )
+                    else:
+                        error_msg = (
+                            tool_output.get("error", "Failed to scrape")
+                            if isinstance(tool_output, dict)
+                            else "Failed to scrape"
+                        )
+                        yield streaming_service.format_terminal_info(
+                            f"Scrape failed: {error_msg}",
+                            "error",
+                        )
+                elif tool_name == "search_knowledge_base":
+                    yield streaming_service.format_tool_output_available(
+                        tool_call_id,
+                        {"status": "completed", "result_length": len(str(tool_output))},
+                    )
+                    yield streaming_service.format_terminal_info(
+                        "Knowledge base search completed", "success"
+                    )
+                else:
+                    yield streaming_service.format_tool_output_available(
+                        tool_call_id,
+                        {"status": "completed", "result_length": len(str(tool_output))},
+                    )
+                    yield streaming_service.format_terminal_info(
+                        f"Tool {tool_name} completed", "success"
+                    )
+
+            elif event_type in ("on_chain_end", "on_agent_end"):
+                if current_text_id is not None:
+                    yield streaming_service.format_text_end(current_text_id)
+                    current_text_id = None
+
+        if current_text_id is not None:
+            yield streaming_service.format_text_end(current_text_id)
+
+        completion_event = complete_current_step()
+        if completion_event:
+            yield completion_event
+
+        state = await agent.aget_state(config)
+        is_interrupted = state.tasks and any(task.interrupts for task in state.tasks)
+        if is_interrupted:
+            interrupt_value = state.tasks[0].interrupts[0].value
+            yield streaming_service.format_interrupt_request(interrupt_value)
+
+        yield streaming_service.format_finish_step()
+        yield streaming_service.format_finish()
+        yield streaming_service.format_done()
+
+    except Exception as e:
+        import traceback
+
+        error_message = f"Error during resume: {e!s}"
+        print(f"[stream_resume_chat] {error_message}")
+        print(f"[stream_resume_chat] Traceback:\n{traceback.format_exc()}")
+        if current_text_id is not None:
+            yield streaming_service.format_text_end(current_text_id)
+        yield streaming_service.format_error(error_message)
+        yield streaming_service.format_finish_step()
+        yield streaming_service.format_finish()
+        yield streaming_service.format_done()
+
+    finally:
+        await clear_ai_responding(session, chat_id)

From 2343fecf977c6e0d26f7bc8074b023c79b7be16c Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Tue, 10 Feb 2026 18:05:01 +0200
Subject: [PATCH 05/42] add frontend HITL: approval UI, SSE handler, and resume
 flow

- Create CreateNotionPageToolUI component with approval card (approve/reject)
- Handle data-interrupt-request SSE event in page.tsx
- Add handleResume callback to POST decisions and stream continuation
- Skip message persistence for interrupted messages (handleResume persists)
- Stamp __decided__ on tool results for immutable post-decision state
- Sync pendingInterrupt ID after message persistence rename
---
 .../new-chat/[[...chat_id]]/page.tsx          | 443 +++++++++++++++++-
 .../components/tool-ui/create-notion-page.tsx | 185 ++++++++
 surfsense_web/components/tool-ui/index.ts     |   1 +
 3 files changed, 623 insertions(+), 6 deletions(-)
 create mode 100644 surfsense_web/components/tool-ui/create-notion-page.tsx

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index bc5aca91e..2db00a03d 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -32,6 +32,7 @@ import { membersAtom } from "@/atoms/members/members-query.atoms";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
 import { Thread } from "@/components/assistant-ui/thread";
 import { ChatHeader } from "@/components/new-chat/chat-header";
+import { CreateNotionPageToolUI } from "@/components/tool-ui/create-notion-page";
 import type { ThinkingStep } from "@/components/tool-ui/deepagent-thinking";
 import { DisplayImageToolUI } from "@/components/tool-ui/display-image";
 import { GeneratePodcastToolUI } from "@/components/tool-ui/generate-podcast";
@@ -120,6 +121,7 @@ const TOOLS_WITH_UI = new Set([
 	"link_preview",
 	"display_image",
 	"scrape_webpage",
+	"create_notion_page",
 	// "write_todos", // Disabled for now
 ]);
 
@@ -147,6 +149,11 @@ export default function NewChatPage() {
 		new Map()
 	);
 	const abortControllerRef = useRef<AbortController | null>(null);
+	const [pendingInterrupt, setPendingInterrupt] = useState<{
+		threadId: number;
+		assistantMsgId: string;
+		interruptData: Record<string, unknown>;
+	} | null>(null);
 
 	// Get mentioned document IDs from the composer
 	const mentionedDocumentIds = useAtomValue(mentionedDocumentIdsAtom);
@@ -545,6 +552,7 @@ export default function NewChatPage() {
 						result?: unknown;
 				  };
 			const contentParts: ContentPart[] = [];
+			let wasInterrupted = false;
 
 			// Track the current text segment index (for appending text deltas)
 			let currentTextPartIndex = -1;
@@ -816,27 +824,69 @@ export default function NewChatPage() {
 														String(titleData.threadId),
 													],
 												});
+										}
+											break;
+										}
+
+										case "data-interrupt-request": {
+											wasInterrupted = true;
+											const interruptData = parsed.data as Record<string, unknown>;
+											const actionRequests = (interruptData.action_requests ?? []) as Array<{
+												name: string;
+												args: Record<string, unknown>;
+											}>;
+											for (const action of actionRequests) {
+												const existingIdx = Array.from(toolCallIndices.entries()).find(
+													([, idx]) => {
+														const part = contentParts[idx];
+														return part?.type === "tool-call" && part.toolName === action.name;
+													}
+												);
+												if (existingIdx) {
+													updateToolCall(existingIdx[0], {
+														result: { __interrupt__: true, ...interruptData },
+													});
+												} else {
+													const tcId = `interrupt-${action.name}`;
+													addToolCall(tcId, action.name, action.args);
+													updateToolCall(tcId, {
+														result: { __interrupt__: true, ...interruptData },
+													});
+												}
+											}
+											setMessages((prev) =>
+												prev.map((m) =>
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+												)
+											);
+											if (currentThreadId) {
+												setPendingInterrupt({
+													threadId: currentThreadId,
+													assistantMsgId,
+													interruptData,
+												});
 											}
 											break;
 										}
 
 										case "error":
 											throw new Error(parsed.errorText || "Server error");
-									}
-								} catch (e) {
-									if (e instanceof SyntaxError) continue;
-									throw e;
 								}
+							} catch (e) {
+								if (e instanceof SyntaxError) continue;
+								throw e;
 							}
 						}
 					}
-				} finally {
+				}
+			} finally {
 					reader.releaseLock();
 				}
 
 				// Persist assistant message (with thinking steps for restoration on refresh)
+				// Skip persistence for interrupted messages -- handleResume will persist the final version
 				const finalContent = buildContentForPersistence();
-				if (contentParts.length > 0) {
+				if (contentParts.length > 0 && !wasInterrupted) {
 					try {
 						const savedMessage = await appendMessage(currentThreadId, {
 							role: "assistant",
@@ -849,6 +899,13 @@ export default function NewChatPage() {
 							prev.map((m) => (m.id === assistantMsgId ? { ...m, id: newMsgId } : m))
 						);
 
+						// Update pending interrupt with the new persisted message ID
+						setPendingInterrupt((prev) =>
+							prev && prev.assistantMsgId === assistantMsgId
+								? { ...prev, assistantMsgId: newMsgId }
+								: prev
+						);
+
 						// Also update thinking steps map with new ID
 						setMessageThinkingSteps((prev) => {
 							const steps = prev.get(assistantMsgId);
@@ -941,6 +998,379 @@ export default function NewChatPage() {
 		]
 	);
 
+	const handleResume = useCallback(
+		async (decisions: Array<{ type: string; message?: string }>) => {
+			if (!pendingInterrupt) return;
+			const { threadId: resumeThreadId, assistantMsgId } = pendingInterrupt;
+			setPendingInterrupt(null);
+			setIsRunning(true);
+
+			const token = getBearerToken();
+			if (!token) {
+				toast.error("Not authenticated. Please log in again.");
+				setIsRunning(false);
+				return;
+			}
+
+			const controller = new AbortController();
+			abortControllerRef.current = controller;
+
+			const currentThinkingSteps = new Map<string, ThinkingStepData>(
+				(messageThinkingSteps.get(assistantMsgId) ?? []).map((s) => [s.id, s])
+			);
+
+			type ContentPart =
+				| { type: "text"; text: string }
+				| {
+						type: "tool-call";
+						toolCallId: string;
+						toolName: string;
+						args: Record<string, unknown>;
+						result?: unknown;
+				  };
+			const contentParts: ContentPart[] = [];
+			let currentTextPartIndex = -1;
+			const toolCallIndices = new Map<string, number>();
+
+			const existingMsg = messages.find((m) => m.id === assistantMsgId);
+			if (existingMsg && Array.isArray(existingMsg.content)) {
+				for (const part of existingMsg.content) {
+					if (typeof part === "object" && part !== null) {
+						const p = part as Record<string, unknown>;
+						if (p.type === "text") {
+							contentParts.push({ type: "text", text: String(p.text ?? "") });
+							currentTextPartIndex = contentParts.length - 1;
+						} else if (p.type === "tool-call") {
+							toolCallIndices.set(String(p.toolCallId), contentParts.length);
+							contentParts.push({
+								type: "tool-call",
+								toolCallId: String(p.toolCallId),
+								toolName: String(p.toolName),
+								args: (p.args as Record<string, unknown>) ?? {},
+								result: p.result as unknown,
+							});
+							currentTextPartIndex = -1;
+						}
+					}
+				}
+			}
+
+			const decisionType = decisions[0]?.type as "approve" | "reject" | undefined;
+			if (decisionType) {
+				for (const part of contentParts) {
+					if (
+						part.type === "tool-call" &&
+						typeof part.result === "object" &&
+						part.result !== null &&
+						"__interrupt__" in (part.result as Record<string, unknown>)
+					) {
+						part.result = {
+							...(part.result as Record<string, unknown>),
+							__decided__: decisionType,
+						};
+					}
+				}
+			}
+
+			const appendText = (delta: string) => {
+				if (currentTextPartIndex >= 0 && contentParts[currentTextPartIndex]?.type === "text") {
+					(contentParts[currentTextPartIndex] as { type: "text"; text: string }).text += delta;
+				} else {
+					contentParts.push({ type: "text", text: delta });
+					currentTextPartIndex = contentParts.length - 1;
+				}
+			};
+
+			const addToolCall = (toolCallId: string, toolName: string, args: Record<string, unknown>) => {
+				if (TOOLS_WITH_UI.has(toolName)) {
+					contentParts.push({
+						type: "tool-call",
+						toolCallId,
+						toolName,
+						args,
+					});
+					toolCallIndices.set(toolCallId, contentParts.length - 1);
+					currentTextPartIndex = -1;
+				}
+			};
+
+			const updateToolCall = (
+				toolCallId: string,
+				update: { args?: Record<string, unknown>; result?: unknown }
+			) => {
+				const index = toolCallIndices.get(toolCallId);
+				if (index !== undefined && contentParts[index]?.type === "tool-call") {
+					const tc = contentParts[index] as ContentPart & { type: "tool-call" };
+					if (update.args) tc.args = update.args;
+					if (update.result !== undefined) tc.result = update.result;
+				}
+			};
+
+			const buildContentForUI = (): ThreadMessageLike["content"] => {
+				const filtered = contentParts.filter((part) => {
+					if (part.type === "text") return part.text.length > 0;
+					if (part.type === "tool-call") return TOOLS_WITH_UI.has(part.toolName);
+					return false;
+				});
+				return filtered.length > 0
+					? (filtered as ThreadMessageLike["content"])
+					: [{ type: "text", text: "" }];
+			};
+
+			const buildContentForPersistence = (): unknown[] => {
+				const parts: unknown[] = [];
+				if (currentThinkingSteps.size > 0) {
+					parts.push({
+						type: "thinking-steps",
+						steps: Array.from(currentThinkingSteps.values()),
+					});
+				}
+				for (const part of contentParts) {
+					if (part.type === "text" && part.text.length > 0) {
+						parts.push(part);
+					} else if (part.type === "tool-call" && TOOLS_WITH_UI.has(part.toolName)) {
+						parts.push(part);
+					}
+				}
+				return parts.length > 0 ? parts : [{ type: "text", text: "" }];
+			};
+
+			try {
+				const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
+				const response = await fetch(`${backendUrl}/api/v1/threads/${resumeThreadId}/resume`, {
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+						Authorization: `Bearer ${token}`,
+					},
+					body: JSON.stringify({
+						search_space_id: searchSpaceId,
+						decisions,
+					}),
+					signal: controller.signal,
+				});
+
+				if (!response.ok) {
+					throw new Error(`Backend error: ${response.status}`);
+				}
+
+				if (!response.body) {
+					throw new Error("No response body");
+				}
+
+				const reader = response.body.getReader();
+				const decoder = new TextDecoder();
+				let buffer = "";
+
+				try {
+					while (true) {
+						const { done, value } = await reader.read();
+						if (done) break;
+
+						buffer += decoder.decode(value, { stream: true });
+						const events = buffer.split(/\r?\n\r?\n/);
+						buffer = events.pop() || "";
+
+						for (const event of events) {
+							const lines = event.split(/\r?\n/);
+							for (const line of lines) {
+								if (!line.startsWith("data: ")) continue;
+								const data = line.slice(6).trim();
+								if (!data || data === "[DONE]") continue;
+
+								try {
+									const parsed = JSON.parse(data);
+
+									switch (parsed.type) {
+										case "text-delta":
+											appendText(parsed.delta);
+											setMessages((prev) =>
+												prev.map((m) =>
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+												)
+											);
+											break;
+
+										case "tool-input-start":
+											addToolCall(parsed.toolCallId, parsed.toolName, {});
+											setMessages((prev) =>
+												prev.map((m) =>
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+												)
+											);
+											break;
+
+										case "tool-input-available":
+											if (toolCallIndices.has(parsed.toolCallId)) {
+												updateToolCall(parsed.toolCallId, {
+													args: parsed.input || {},
+												});
+											} else {
+												addToolCall(parsed.toolCallId, parsed.toolName, parsed.input || {});
+											}
+											setMessages((prev) =>
+												prev.map((m) =>
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+												)
+											);
+											break;
+
+										case "tool-output-available":
+											updateToolCall(parsed.toolCallId, {
+												result: parsed.output,
+											});
+											setMessages((prev) =>
+												prev.map((m) =>
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+												)
+											);
+											break;
+
+										case "data-thinking-step": {
+											const stepData = parsed.data as ThinkingStepData;
+											if (stepData?.id) {
+												currentThinkingSteps.set(stepData.id, stepData);
+												setMessageThinkingSteps((prev) => {
+													const newMap = new Map(prev);
+													newMap.set(assistantMsgId, Array.from(currentThinkingSteps.values()));
+													return newMap;
+												});
+											}
+											break;
+										}
+
+										case "data-interrupt-request": {
+											const interruptData = parsed.data as Record<string, unknown>;
+											const actionRequests = (interruptData.action_requests ?? []) as Array<{
+												name: string;
+												args: Record<string, unknown>;
+											}>;
+											for (const action of actionRequests) {
+												const existingIdx = Array.from(toolCallIndices.entries()).find(
+													([, idx]) => {
+														const part = contentParts[idx];
+														return part?.type === "tool-call" && part.toolName === action.name;
+													}
+												);
+												if (existingIdx) {
+													updateToolCall(existingIdx[0], {
+														result: {
+															__interrupt__: true,
+															...interruptData,
+														},
+													});
+												} else {
+													const tcId = `interrupt-${action.name}`;
+													addToolCall(tcId, action.name, action.args);
+													updateToolCall(tcId, {
+														result: {
+															__interrupt__: true,
+															...interruptData,
+														},
+													});
+												}
+											}
+											setMessages((prev) =>
+												prev.map((m) =>
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+												)
+											);
+											setPendingInterrupt({
+												threadId: resumeThreadId,
+												assistantMsgId,
+												interruptData,
+											});
+											break;
+										}
+
+										case "error":
+											throw new Error(parsed.errorText || "Server error");
+									}
+								} catch (e) {
+									if (e instanceof SyntaxError) continue;
+									throw e;
+								}
+							}
+						}
+					}
+				} finally {
+					reader.releaseLock();
+				}
+
+				const finalContent = buildContentForPersistence();
+				if (contentParts.length > 0) {
+					try {
+						const savedMessage = await appendMessage(resumeThreadId, {
+							role: "assistant",
+							content: finalContent,
+						});
+						const newMsgId = `msg-${savedMessage.id}`;
+						setMessages((prev) =>
+							prev.map((m) => (m.id === assistantMsgId ? { ...m, id: newMsgId } : m))
+						);
+						setMessageThinkingSteps((prev) => {
+							const steps = prev.get(assistantMsgId);
+							if (steps) {
+								const newMap = new Map(prev);
+								newMap.delete(assistantMsgId);
+								newMap.set(newMsgId, steps);
+								return newMap;
+							}
+							return prev;
+						});
+					} catch (err) {
+						console.error("Failed to persist resumed assistant message:", err);
+					}
+				}
+			} catch (error) {
+				if (error instanceof Error && error.name === "AbortError") {
+					return;
+				}
+				console.error("[NewChatPage] Resume error:", error);
+				toast.error("Failed to resume. Please try again.");
+			} finally {
+				setIsRunning(false);
+				abortControllerRef.current = null;
+			}
+		},
+		[pendingInterrupt, messages, searchSpaceId, messageThinkingSteps]
+	);
+
+	useEffect(() => {
+		const handler = (e: Event) => {
+			const detail = (e as CustomEvent).detail as {
+				decisions: Array<{ type: string; message?: string }>;
+			};
+			if (detail?.decisions && pendingInterrupt) {
+				const decisionType = detail.decisions[0]?.type as "approve" | "reject";
+				setMessages((prev) =>
+					prev.map((m) => {
+						if (m.id !== pendingInterrupt.assistantMsgId) return m;
+						const parts = m.content as unknown as Array<Record<string, unknown>>;
+						const newContent = parts.map((part) => {
+							if (
+								part.type === "tool-call" &&
+								typeof part.result === "object" &&
+								part.result !== null &&
+								"__interrupt__" in part.result
+							) {
+								return {
+									...part,
+									result: { ...(part.result as Record<string, unknown>), __decided__: decisionType },
+								};
+							}
+							return part;
+						});
+						return { ...m, content: newContent as unknown as ThreadMessageLike["content"] };
+					})
+				);
+				handleResume(detail.decisions);
+			}
+		};
+		window.addEventListener("hitl-decision", handler);
+		return () => window.removeEventListener("hitl-decision", handler);
+	}, [handleResume, pendingInterrupt]);
+
 	// Convert message (pass through since already in correct format)
 	const convertMessage = useCallback(
 		(message: ThreadMessageLike): ThreadMessageLike => message,
@@ -1432,6 +1862,7 @@ export default function NewChatPage() {
 			<ScrapeWebpageToolUI />
 			<SaveMemoryToolUI />
 			<RecallMemoryToolUI />
+			<CreateNotionPageToolUI />
 			{/* <WriteTodosToolUI /> Disabled for now */}
 			<div className="flex flex-col h-[calc(100dvh-64px)] overflow-hidden">
 				<Thread
diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
new file mode 100644
index 000000000..9f69067b1
--- /dev/null
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -0,0 +1,185 @@
+"use client";
+
+import { makeAssistantToolUI } from "@assistant-ui/react";
+import { CheckIcon, FileTextIcon, Loader2Icon, XIcon } from "lucide-react";
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+
+interface InterruptResult {
+	__interrupt__: true;
+	__decided__?: "approve" | "reject";
+	action_requests: Array<{
+		name: string;
+		args: Record<string, unknown>;
+		description?: string;
+	}>;
+	review_configs: Array<{
+		action_name: string;
+		allowed_decisions: Array<"approve" | "edit" | "reject">;
+	}>;
+}
+
+interface SuccessResult {
+	status: string;
+	page_id: string;
+	title: string;
+	url: string;
+}
+
+type CreateNotionPageResult = InterruptResult | SuccessResult;
+
+function isInterruptResult(result: unknown): result is InterruptResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"__interrupt__" in result &&
+		(result as InterruptResult).__interrupt__ === true
+	);
+}
+
+function ApprovalCard({
+	args,
+	interruptData,
+	onDecision,
+}: {
+	args: Record<string, unknown>;
+	interruptData: InterruptResult;
+	onDecision: (decision: { type: "approve" | "reject"; message?: string }) => void;
+}) {
+	const [decided, setDecided] = useState<"approve" | "reject" | null>(
+		interruptData.__decided__ ?? null
+	);
+	const reviewConfig = interruptData.review_configs[0];
+	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
+
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
+			<div className="flex items-center gap-3 border-b border-border px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-primary/10">
+					<FileTextIcon className="size-4 text-primary" />
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className="text-sm font-medium">Create Notion Page</p>
+					<p className="truncate text-xs text-muted-foreground">
+						Requires your approval to proceed
+					</p>
+				</div>
+			</div>
+
+		<div className="space-y-2 px-4 py-3">
+			{args.title != null && (
+				<div>
+					<p className="text-xs font-medium text-muted-foreground">Title</p>
+					<p className="text-sm">{String(args.title)}</p>
+				</div>
+			)}
+			{args.content != null && (
+				<div>
+					<p className="text-xs font-medium text-muted-foreground">Content</p>
+					<p className="line-clamp-4 text-sm whitespace-pre-wrap">{String(args.content)}</p>
+				</div>
+			)}
+		</div>
+
+			<div className="flex items-center gap-2 border-t border-border px-4 py-3">
+				{decided ? (
+					<p className="flex items-center gap-1.5 text-sm text-muted-foreground">
+						{decided === "approve" ? (
+							<>
+								<CheckIcon className="size-3.5 text-green-500" />
+								Approved
+							</>
+						) : (
+							<>
+								<XIcon className="size-3.5 text-destructive" />
+								Rejected
+							</>
+						)}
+					</p>
+				) : (
+					<>
+						{allowedDecisions.includes("approve") && (
+							<Button
+								size="sm"
+								onClick={() => {
+									setDecided("approve");
+									onDecision({ type: "approve" });
+								}}
+							>
+								<CheckIcon />
+								Approve
+							</Button>
+						)}
+						{allowedDecisions.includes("reject") && (
+							<Button
+								size="sm"
+								variant="outline"
+								onClick={() => {
+									setDecided("reject");
+									onDecision({ type: "reject", message: "User rejected the action." });
+								}}
+							>
+								<XIcon />
+								Reject
+							</Button>
+						)}
+					</>
+				)}
+			</div>
+		</div>
+	);
+}
+
+function SuccessCard({ result }: { result: SuccessResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
+			<div className="flex items-center gap-3 px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-green-500/10">
+					<CheckIcon className="size-4 text-green-500" />
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className="text-sm font-medium">{result.title}</p>
+					<p className="text-xs text-muted-foreground">Notion page created</p>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+export const CreateNotionPageToolUI = makeAssistantToolUI<
+	{ title: string; content: string },
+	CreateNotionPageResult
+>({
+	toolName: "create_notion_page",
+	render: function CreateNotionPageUI({ args, result, status }) {
+		if (status.type === "running") {
+			return (
+				<div className="my-4 flex max-w-md items-center gap-3 rounded-xl border border-border bg-card px-4 py-3">
+					<Loader2Icon className="size-4 animate-spin text-muted-foreground" />
+					<p className="text-sm text-muted-foreground">Preparing Notion page...</p>
+				</div>
+			);
+		}
+
+		if (!result) {
+			return null;
+		}
+
+		if (isInterruptResult(result)) {
+			return (
+				<ApprovalCard
+					args={args}
+					interruptData={result}
+					onDecision={(decision) => {
+						const event = new CustomEvent("hitl-decision", {
+							detail: { decisions: [decision] },
+						});
+						window.dispatchEvent(event);
+					}}
+				/>
+			);
+		}
+
+		return <SuccessCard result={result as SuccessResult} />;
+	},
+});
diff --git a/surfsense_web/components/tool-ui/index.ts b/surfsense_web/components/tool-ui/index.ts
index 5b4ea0a34..56e5c975b 100644
--- a/surfsense_web/components/tool-ui/index.ts
+++ b/surfsense_web/components/tool-ui/index.ts
@@ -16,6 +16,7 @@ export {
 	type SerializableArticle,
 } from "./article";
 export { Audio } from "./audio";
+export { CreateNotionPageToolUI } from "./create-notion-page";
 export {
 	type DeepAgentThinkingArgs,
 	type DeepAgentThinkingResult,

From 8f81c9859dcebbd2b1f7d8da06bb06df0043e8d5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Tue, 10 Feb 2026 19:47:10 +0200
Subject: [PATCH 06/42] deduplicate backend streaming loop into shared
 _stream_agent_events helper

---
 .../app/tasks/chat/stream_new_chat.py         | 1852 ++++++-----------
 1 file changed, 582 insertions(+), 1270 deletions(-)

diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 852793230..2cd05e80c 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -11,6 +11,8 @@ Supports loading LLM configurations from:
 
 import json
 from collections.abc import AsyncGenerator
+from dataclasses import dataclass
+from typing import Any
 from uuid import UUID
 
 from langchain_core.messages import HumanMessage
@@ -178,6 +180,550 @@ def extract_todos_from_deepagents(command_output) -> dict:
     return {"todos": todos_data}
 
 
+@dataclass
+class StreamResult:
+    accumulated_text: str = ""
+    is_interrupted: bool = False
+    interrupt_value: dict[str, Any] | None = None
+
+
+async def _stream_agent_events(
+    agent: Any,
+    config: dict[str, Any],
+    input_data: Any,
+    streaming_service: VercelStreamingService,
+    result: StreamResult,
+    step_prefix: str = "thinking",
+    initial_step_id: str | None = None,
+    initial_step_title: str = "",
+    initial_step_items: list[str] | None = None,
+) -> AsyncGenerator[str, None]:
+    """Shared async generator that streams and formats astream_events from the agent.
+
+    Yields SSE-formatted strings. After exhausting, inspect the ``result``
+    object for accumulated_text and interrupt state.
+
+    Args:
+        agent: The compiled LangGraph agent.
+        config: LangGraph config dict (must include configurable.thread_id).
+        input_data: The input to pass to agent.astream_events (dict or Command).
+        streaming_service: VercelStreamingService instance for formatting events.
+        result: Mutable StreamResult populated with accumulated_text / interrupt info.
+        step_prefix: Prefix for thinking step IDs (e.g. "thinking" or "thinking-resume").
+        initial_step_id: If set, the helper inherits an already-active thinking step.
+        initial_step_title: Title of the inherited thinking step.
+        initial_step_items: Items of the inherited thinking step.
+
+    Yields:
+        SSE-formatted strings for each event.
+    """
+    accumulated_text = ""
+    current_text_id: str | None = None
+    thinking_step_counter = 1 if initial_step_id else 0
+    tool_step_ids: dict[str, str] = {}
+    completed_step_ids: set[str] = set()
+    last_active_step_id: str | None = initial_step_id
+    last_active_step_title: str = initial_step_title
+    last_active_step_items: list[str] = initial_step_items or []
+    just_finished_tool: bool = False
+
+    def next_thinking_step_id() -> str:
+        nonlocal thinking_step_counter
+        thinking_step_counter += 1
+        return f"{step_prefix}-{thinking_step_counter}"
+
+    def complete_current_step() -> str | None:
+        nonlocal last_active_step_id
+        if last_active_step_id and last_active_step_id not in completed_step_ids:
+            completed_step_ids.add(last_active_step_id)
+            event = streaming_service.format_thinking_step(
+                step_id=last_active_step_id,
+                title=last_active_step_title,
+                status="completed",
+                items=last_active_step_items if last_active_step_items else None,
+            )
+            last_active_step_id = None
+            return event
+        return None
+
+    async for event in agent.astream_events(input_data, config=config, version="v2"):
+        event_type = event.get("event", "")
+
+        if event_type == "on_chat_model_stream":
+            chunk = event.get("data", {}).get("chunk")
+            if chunk and hasattr(chunk, "content"):
+                content = chunk.content
+                if content and isinstance(content, str):
+                    if current_text_id is None:
+                        completion_event = complete_current_step()
+                        if completion_event:
+                            yield completion_event
+                        if just_finished_tool:
+                            last_active_step_id = None
+                            last_active_step_title = ""
+                            last_active_step_items = []
+                            just_finished_tool = False
+                        current_text_id = streaming_service.generate_text_id()
+                        yield streaming_service.format_text_start(current_text_id)
+                    yield streaming_service.format_text_delta(current_text_id, content)
+                    accumulated_text += content
+
+        elif event_type == "on_tool_start":
+            tool_name = event.get("name", "unknown_tool")
+            run_id = event.get("run_id", "")
+            tool_input = event.get("data", {}).get("input", {})
+
+            if current_text_id is not None:
+                yield streaming_service.format_text_end(current_text_id)
+                current_text_id = None
+
+            if last_active_step_title != "Synthesizing response":
+                completion_event = complete_current_step()
+                if completion_event:
+                    yield completion_event
+
+            just_finished_tool = False
+            tool_step_id = next_thinking_step_id()
+            tool_step_ids[run_id] = tool_step_id
+            last_active_step_id = tool_step_id
+
+            if tool_name == "search_knowledge_base":
+                query = (
+                    tool_input.get("query", "")
+                    if isinstance(tool_input, dict)
+                    else str(tool_input)
+                )
+                last_active_step_title = "Searching knowledge base"
+                last_active_step_items = [
+                    f"Query: {query[:100]}{'...' if len(query) > 100 else ''}"
+                ]
+                yield streaming_service.format_thinking_step(
+                    step_id=tool_step_id,
+                    title="Searching knowledge base",
+                    status="in_progress",
+                    items=last_active_step_items,
+                )
+            elif tool_name == "link_preview":
+                url = (
+                    tool_input.get("url", "")
+                    if isinstance(tool_input, dict)
+                    else str(tool_input)
+                )
+                last_active_step_title = "Fetching link preview"
+                last_active_step_items = [
+                    f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
+                ]
+                yield streaming_service.format_thinking_step(
+                    step_id=tool_step_id,
+                    title="Fetching link preview",
+                    status="in_progress",
+                    items=last_active_step_items,
+                )
+            elif tool_name == "display_image":
+                src = (
+                    tool_input.get("src", "")
+                    if isinstance(tool_input, dict)
+                    else str(tool_input)
+                )
+                title = (
+                    tool_input.get("title", "") if isinstance(tool_input, dict) else ""
+                )
+                last_active_step_title = "Analyzing the image"
+                last_active_step_items = [
+                    f"Analyzing: {title[:50] if title else src[:50]}{'...' if len(title or src) > 50 else ''}"
+                ]
+                yield streaming_service.format_thinking_step(
+                    step_id=tool_step_id,
+                    title="Analyzing the image",
+                    status="in_progress",
+                    items=last_active_step_items,
+                )
+            elif tool_name == "scrape_webpage":
+                url = (
+                    tool_input.get("url", "")
+                    if isinstance(tool_input, dict)
+                    else str(tool_input)
+                )
+                last_active_step_title = "Scraping webpage"
+                last_active_step_items = [
+                    f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
+                ]
+                yield streaming_service.format_thinking_step(
+                    step_id=tool_step_id,
+                    title="Scraping webpage",
+                    status="in_progress",
+                    items=last_active_step_items,
+                )
+            elif tool_name == "generate_podcast":
+                podcast_title = (
+                    tool_input.get("podcast_title", "SurfSense Podcast")
+                    if isinstance(tool_input, dict)
+                    else "SurfSense Podcast"
+                )
+                content_len = len(
+                    tool_input.get("source_content", "")
+                    if isinstance(tool_input, dict)
+                    else ""
+                )
+                last_active_step_title = "Generating podcast"
+                last_active_step_items = [
+                    f"Title: {podcast_title}",
+                    f"Content: {content_len:,} characters",
+                    "Preparing audio generation...",
+                ]
+                yield streaming_service.format_thinking_step(
+                    step_id=tool_step_id,
+                    title="Generating podcast",
+                    status="in_progress",
+                    items=last_active_step_items,
+                )
+            else:
+                last_active_step_title = f"Using {tool_name.replace('_', ' ')}"
+                last_active_step_items = []
+                yield streaming_service.format_thinking_step(
+                    step_id=tool_step_id,
+                    title=last_active_step_title,
+                    status="in_progress",
+                )
+
+            tool_call_id = (
+                f"call_{run_id[:32]}"
+                if run_id
+                else streaming_service.generate_tool_call_id()
+            )
+            yield streaming_service.format_tool_input_start(tool_call_id, tool_name)
+            yield streaming_service.format_tool_input_available(
+                tool_call_id,
+                tool_name,
+                tool_input if isinstance(tool_input, dict) else {"input": tool_input},
+            )
+
+        elif event_type == "on_tool_end":
+            run_id = event.get("run_id", "")
+            tool_name = event.get("name", "unknown_tool")
+            raw_output = event.get("data", {}).get("output", "")
+
+            if hasattr(raw_output, "content"):
+                content = raw_output.content
+                if isinstance(content, str):
+                    try:
+                        tool_output = json.loads(content)
+                    except (json.JSONDecodeError, TypeError):
+                        tool_output = {"result": content}
+                elif isinstance(content, dict):
+                    tool_output = content
+                else:
+                    tool_output = {"result": str(content)}
+            elif isinstance(raw_output, dict):
+                tool_output = raw_output
+            else:
+                tool_output = {"result": str(raw_output) if raw_output else "completed"}
+
+            tool_call_id = f"call_{run_id[:32]}" if run_id else "call_unknown"
+            original_step_id = tool_step_ids.get(
+                run_id, f"{step_prefix}-unknown-{run_id[:8]}"
+            )
+            completed_step_ids.add(original_step_id)
+
+            if tool_name == "search_knowledge_base":
+                result_info = "Search completed"
+                if isinstance(tool_output, dict):
+                    result_len = tool_output.get("result_length", 0)
+                    if result_len > 0:
+                        result_info = f"Found relevant information ({result_len} chars)"
+                completed_items = [*last_active_step_items, result_info]
+                yield streaming_service.format_thinking_step(
+                    step_id=original_step_id,
+                    title="Searching knowledge base",
+                    status="completed",
+                    items=completed_items,
+                )
+            elif tool_name == "link_preview":
+                if isinstance(tool_output, dict):
+                    title = tool_output.get("title", "Link")
+                    domain = tool_output.get("domain", "")
+                    has_error = "error" in tool_output
+                    if has_error:
+                        completed_items = [
+                            *last_active_step_items,
+                            f"Error: {tool_output.get('error', 'Failed to fetch')}",
+                        ]
+                    else:
+                        completed_items = [
+                            *last_active_step_items,
+                            f"Title: {title[:60]}{'...' if len(title) > 60 else ''}",
+                            f"Domain: {domain}" if domain else "Preview loaded",
+                        ]
+                else:
+                    completed_items = [*last_active_step_items, "Preview loaded"]
+                yield streaming_service.format_thinking_step(
+                    step_id=original_step_id,
+                    title="Fetching link preview",
+                    status="completed",
+                    items=completed_items,
+                )
+            elif tool_name == "display_image":
+                if isinstance(tool_output, dict):
+                    title = tool_output.get("title", "")
+                    alt = tool_output.get("alt", "Image")
+                    display_name = title or alt
+                    completed_items = [
+                        *last_active_step_items,
+                        f"Analyzed: {display_name[:50]}{'...' if len(display_name) > 50 else ''}",
+                    ]
+                else:
+                    completed_items = [*last_active_step_items, "Image analyzed"]
+                yield streaming_service.format_thinking_step(
+                    step_id=original_step_id,
+                    title="Analyzing the image",
+                    status="completed",
+                    items=completed_items,
+                )
+            elif tool_name == "scrape_webpage":
+                if isinstance(tool_output, dict):
+                    title = tool_output.get("title", "Webpage")
+                    word_count = tool_output.get("word_count", 0)
+                    has_error = "error" in tool_output
+                    if has_error:
+                        completed_items = [
+                            *last_active_step_items,
+                            f"Error: {tool_output.get('error', 'Failed to scrape')[:50]}",
+                        ]
+                    else:
+                        completed_items = [
+                            *last_active_step_items,
+                            f"Title: {title[:50]}{'...' if len(title) > 50 else ''}",
+                            f"Extracted: {word_count:,} words",
+                        ]
+                else:
+                    completed_items = [*last_active_step_items, "Content extracted"]
+                yield streaming_service.format_thinking_step(
+                    step_id=original_step_id,
+                    title="Scraping webpage",
+                    status="completed",
+                    items=completed_items,
+                )
+            elif tool_name == "generate_podcast":
+                podcast_status = (
+                    tool_output.get("status", "unknown")
+                    if isinstance(tool_output, dict)
+                    else "unknown"
+                )
+                podcast_title = (
+                    tool_output.get("title", "Podcast")
+                    if isinstance(tool_output, dict)
+                    else "Podcast"
+                )
+                if podcast_status == "processing":
+                    completed_items = [
+                        f"Title: {podcast_title}",
+                        "Audio generation started",
+                        "Processing in background...",
+                    ]
+                elif podcast_status == "already_generating":
+                    completed_items = [
+                        f"Title: {podcast_title}",
+                        "Podcast already in progress",
+                        "Please wait for it to complete",
+                    ]
+                elif podcast_status == "error":
+                    error_msg = (
+                        tool_output.get("error", "Unknown error")
+                        if isinstance(tool_output, dict)
+                        else "Unknown error"
+                    )
+                    completed_items = [
+                        f"Title: {podcast_title}",
+                        f"Error: {error_msg[:50]}",
+                    ]
+                else:
+                    completed_items = last_active_step_items
+                yield streaming_service.format_thinking_step(
+                    step_id=original_step_id,
+                    title="Generating podcast",
+                    status="completed",
+                    items=completed_items,
+                )
+            elif tool_name == "ls":
+                if isinstance(tool_output, dict):
+                    ls_output = tool_output.get("result", "")
+                elif isinstance(tool_output, str):
+                    ls_output = tool_output
+                else:
+                    ls_output = str(tool_output) if tool_output else ""
+                file_names: list[str] = []
+                if ls_output:
+                    for line in ls_output.strip().split("\n"):
+                        line = line.strip()
+                        if line:
+                            name = line.rstrip("/").split("/")[-1]
+                            if name and len(name) <= 40:
+                                file_names.append(name)
+                            elif name:
+                                file_names.append(name[:37] + "...")
+                if file_names:
+                    if len(file_names) <= 5:
+                        completed_items = [f"[{name}]" for name in file_names]
+                    else:
+                        completed_items = [f"[{name}]" for name in file_names[:4]]
+                        completed_items.append(f"(+{len(file_names) - 4} more)")
+                else:
+                    completed_items = ["No files found"]
+                yield streaming_service.format_thinking_step(
+                    step_id=original_step_id,
+                    title="Exploring files",
+                    status="completed",
+                    items=completed_items,
+                )
+            else:
+                yield streaming_service.format_thinking_step(
+                    step_id=original_step_id,
+                    title=f"Using {tool_name.replace('_', ' ')}",
+                    status="completed",
+                    items=last_active_step_items,
+                )
+
+            just_finished_tool = True
+            last_active_step_id = None
+            last_active_step_title = ""
+            last_active_step_items = []
+
+            if tool_name == "generate_podcast":
+                yield streaming_service.format_tool_output_available(
+                    tool_call_id,
+                    tool_output
+                    if isinstance(tool_output, dict)
+                    else {"result": tool_output},
+                )
+                if (
+                    isinstance(tool_output, dict)
+                    and tool_output.get("status") == "success"
+                ):
+                    yield streaming_service.format_terminal_info(
+                        f"Podcast generated successfully: {tool_output.get('title', 'Podcast')}",
+                        "success",
+                    )
+                else:
+                    error_msg = (
+                        tool_output.get("error", "Unknown error")
+                        if isinstance(tool_output, dict)
+                        else "Unknown error"
+                    )
+                    yield streaming_service.format_terminal_info(
+                        f"Podcast generation failed: {error_msg}",
+                        "error",
+                    )
+            elif tool_name == "link_preview":
+                yield streaming_service.format_tool_output_available(
+                    tool_call_id,
+                    tool_output
+                    if isinstance(tool_output, dict)
+                    else {"result": tool_output},
+                )
+                if isinstance(tool_output, dict) and "error" not in tool_output:
+                    title = tool_output.get("title", "Link")
+                    yield streaming_service.format_terminal_info(
+                        f"Link preview loaded: {title[:50]}{'...' if len(title) > 50 else ''}",
+                        "success",
+                    )
+                else:
+                    error_msg = (
+                        tool_output.get("error", "Failed to fetch")
+                        if isinstance(tool_output, dict)
+                        else "Failed to fetch"
+                    )
+                    yield streaming_service.format_terminal_info(
+                        f"Link preview failed: {error_msg}",
+                        "error",
+                    )
+            elif tool_name == "display_image":
+                yield streaming_service.format_tool_output_available(
+                    tool_call_id,
+                    tool_output
+                    if isinstance(tool_output, dict)
+                    else {"result": tool_output},
+                )
+                if isinstance(tool_output, dict):
+                    title = tool_output.get("title") or tool_output.get("alt", "Image")
+                    yield streaming_service.format_terminal_info(
+                        f"Image analyzed: {title[:40]}{'...' if len(title) > 40 else ''}",
+                        "success",
+                    )
+            elif tool_name == "scrape_webpage":
+                if isinstance(tool_output, dict):
+                    display_output = {
+                        k: v for k, v in tool_output.items() if k != "content"
+                    }
+                    if "content" in tool_output:
+                        content = tool_output.get("content", "")
+                        display_output["content_preview"] = (
+                            content[:500] + "..." if len(content) > 500 else content
+                        )
+                    yield streaming_service.format_tool_output_available(
+                        tool_call_id,
+                        display_output,
+                    )
+                else:
+                    yield streaming_service.format_tool_output_available(
+                        tool_call_id,
+                        {"result": tool_output},
+                    )
+                if isinstance(tool_output, dict) and "error" not in tool_output:
+                    title = tool_output.get("title", "Webpage")
+                    word_count = tool_output.get("word_count", 0)
+                    yield streaming_service.format_terminal_info(
+                        f"Scraped: {title[:40]}{'...' if len(title) > 40 else ''} ({word_count:,} words)",
+                        "success",
+                    )
+                else:
+                    error_msg = (
+                        tool_output.get("error", "Failed to scrape")
+                        if isinstance(tool_output, dict)
+                        else "Failed to scrape"
+                    )
+                    yield streaming_service.format_terminal_info(
+                        f"Scrape failed: {error_msg}",
+                        "error",
+                    )
+            elif tool_name == "search_knowledge_base":
+                yield streaming_service.format_tool_output_available(
+                    tool_call_id,
+                    {"status": "completed", "result_length": len(str(tool_output))},
+                )
+                yield streaming_service.format_terminal_info(
+                    "Knowledge base search completed", "success"
+                )
+            else:
+                yield streaming_service.format_tool_output_available(
+                    tool_call_id,
+                    {"status": "completed", "result_length": len(str(tool_output))},
+                )
+                yield streaming_service.format_terminal_info(
+                    f"Tool {tool_name} completed", "success"
+                )
+
+        elif event_type in ("on_chain_end", "on_agent_end"):
+            if current_text_id is not None:
+                yield streaming_service.format_text_end(current_text_id)
+                current_text_id = None
+
+    if current_text_id is not None:
+        yield streaming_service.format_text_end(current_text_id)
+
+    completion_event = complete_current_step()
+    if completion_event:
+        yield completion_event
+
+    result.accumulated_text = accumulated_text
+
+    state = await agent.aget_state(config)
+    is_interrupted = state.tasks and any(task.interrupts for task in state.tasks)
+    if is_interrupted:
+        result.is_interrupted = True
+        result.interrupt_value = state.tasks[0].interrupts[0].value
+        yield streaming_service.format_interrupt_request(result.interrupt_value)
+
+
 async def stream_new_chat(
     user_query: str,
     search_space_id: int,
@@ -215,9 +761,6 @@ async def stream_new_chat(
     """
     streaming_service = VercelStreamingService()
 
-    # Track the current text block for streaming (defined early for exception handling)
-    current_text_id: str | None = None
-
     try:
         # Mark AI as responding to this user for live collaboration
         if user_id:
@@ -394,63 +937,18 @@ async def stream_new_chat(
         yield streaming_service.format_message_start()
         yield streaming_service.format_start_step()
 
-        # Reset text tracking for this stream
-        accumulated_text = ""
-
-        # Track thinking steps for chain-of-thought display
-        thinking_step_counter = 0
-        # Map run_id -> step_id for tool calls so we can update them on completion
-        tool_step_ids: dict[str, str] = {}
-        # Track the last active step so we can mark it complete at the end
-        last_active_step_id: str | None = None
-        last_active_step_title: str = ""
-        last_active_step_items: list[str] = []
-        # Track which steps have been completed to avoid duplicate completions
-        completed_step_ids: set[str] = set()
-        # Track if we just finished a tool (text flows silently after tools)
-        just_finished_tool: bool = False
-        # Track write_todos calls to show "Creating plan" vs "Updating plan"
-        # Disabled for now
-        # write_todos_call_count: int = 0
-
-        def next_thinking_step_id() -> str:
-            nonlocal thinking_step_counter
-            thinking_step_counter += 1
-            return f"thinking-{thinking_step_counter}"
-
-        def complete_current_step() -> str | None:
-            """Complete the current active step and return the completion event, if any."""
-            nonlocal last_active_step_id, last_active_step_title, last_active_step_items
-            if last_active_step_id and last_active_step_id not in completed_step_ids:
-                completed_step_ids.add(last_active_step_id)
-                return streaming_service.format_thinking_step(
-                    step_id=last_active_step_id,
-                    title=last_active_step_title,
-                    status="completed",
-                    items=last_active_step_items if last_active_step_items else None,
-                )
-            return None
-
         # Initial thinking step - analyzing the request
-        analyze_step_id = next_thinking_step_id()
-        last_active_step_id = analyze_step_id
-
-        # Determine step title and action verb based on context
         if mentioned_documents or mentioned_surfsense_docs:
-            last_active_step_title = "Analyzing referenced content"
+            initial_title = "Analyzing referenced content"
             action_verb = "Analyzing"
         else:
-            last_active_step_title = "Understanding your request"
+            initial_title = "Understanding your request"
             action_verb = "Processing"
 
-        # Build the message with inline context about referenced documents
         processing_parts = []
-
-        # Add the user query
         query_text = user_query[:80] + ("..." if len(user_query) > 80 else "")
         processing_parts.append(query_text)
 
-        # Add mentioned document names inline
         if mentioned_documents:
             doc_names = []
             for doc in mentioned_documents:
@@ -463,7 +961,6 @@ async def stream_new_chat(
             else:
                 processing_parts.append(f"[{len(doc_names)} documents]")
 
-        # Add mentioned SurfSense docs inline
         if mentioned_surfsense_docs:
             doc_names = []
             for doc in mentioned_surfsense_docs:
@@ -476,716 +973,38 @@ async def stream_new_chat(
             else:
                 processing_parts.append(f"[{len(doc_names)} docs]")
 
-        last_active_step_items = [f"{action_verb}: {' '.join(processing_parts)}"]
+        initial_items = [f"{action_verb}: {' '.join(processing_parts)}"]
+        initial_step_id = "thinking-1"
 
         yield streaming_service.format_thinking_step(
-            step_id=analyze_step_id,
-            title=last_active_step_title,
+            step_id=initial_step_id,
+            title=initial_title,
             status="in_progress",
-            items=last_active_step_items,
+            items=initial_items,
         )
 
-        # Stream the agent response with thread config for memory
-        async for event in agent.astream_events(
-            input_state, config=config, version="v2"
+        stream_result = StreamResult()
+        async for sse in _stream_agent_events(
+            agent=agent,
+            config=config,
+            input_data=input_state,
+            streaming_service=streaming_service,
+            result=stream_result,
+            step_prefix="thinking",
+            initial_step_id=initial_step_id,
+            initial_step_title=initial_title,
+            initial_step_items=initial_items,
         ):
-            event_type = event.get("event", "")
+            yield sse
 
-            # Handle chat model stream events (text streaming)
-            if event_type == "on_chat_model_stream":
-                chunk = event.get("data", {}).get("chunk")
-                if chunk and hasattr(chunk, "content"):
-                    content = chunk.content
-                    if content and isinstance(content, str):
-                        # Start a new text block if needed
-                        if current_text_id is None:
-                            # Complete any previous step
-                            completion_event = complete_current_step()
-                            if completion_event:
-                                yield completion_event
-
-                            if just_finished_tool:
-                                # Clear the active step tracking - text flows without a dedicated step
-                                last_active_step_id = None
-                                last_active_step_title = ""
-                                last_active_step_items = []
-                                just_finished_tool = False
-
-                            current_text_id = streaming_service.generate_text_id()
-                            yield streaming_service.format_text_start(current_text_id)
-
-                        # Stream the text delta
-                        yield streaming_service.format_text_delta(
-                            current_text_id, content
-                        )
-                        accumulated_text += content
-
-            # Handle tool calls
-            elif event_type == "on_tool_start":
-                tool_name = event.get("name", "unknown_tool")
-                run_id = event.get("run_id", "")
-                tool_input = event.get("data", {}).get("input", {})
-
-                # End current text block if any
-                if current_text_id is not None:
-                    yield streaming_service.format_text_end(current_text_id)
-                    current_text_id = None
-
-                # Complete any previous step EXCEPT "Synthesizing response"
-                # (we want to reuse the Synthesizing step after tools complete)
-                if last_active_step_title != "Synthesizing response":
-                    completion_event = complete_current_step()
-                    if completion_event:
-                        yield completion_event
-
-                # Reset the just_finished_tool flag since we're starting a new tool
-                just_finished_tool = False
-
-                # Create thinking step for the tool call and store it for later update
-                tool_step_id = next_thinking_step_id()
-                tool_step_ids[run_id] = tool_step_id
-                last_active_step_id = tool_step_id
-                if tool_name == "search_knowledge_base":
-                    query = (
-                        tool_input.get("query", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    last_active_step_title = "Searching knowledge base"
-                    last_active_step_items = [
-                        f"Query: {query[:100]}{'...' if len(query) > 100 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Searching knowledge base",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                elif tool_name == "link_preview":
-                    url = (
-                        tool_input.get("url", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    last_active_step_title = "Fetching link preview"
-                    last_active_step_items = [
-                        f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Fetching link preview",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                elif tool_name == "display_image":
-                    src = (
-                        tool_input.get("src", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    title = (
-                        tool_input.get("title", "")
-                        if isinstance(tool_input, dict)
-                        else ""
-                    )
-                    last_active_step_title = "Analyzing the image"
-                    last_active_step_items = [
-                        f"Analyzing: {title[:50] if title else src[:50]}{'...' if len(title or src) > 50 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Analyzing the image",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                elif tool_name == "scrape_webpage":
-                    url = (
-                        tool_input.get("url", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    last_active_step_title = "Scraping webpage"
-                    last_active_step_items = [
-                        f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Scraping webpage",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                # elif tool_name == "write_todos":  # Disabled for now
-                #     # Track write_todos calls for better messaging
-                #     write_todos_call_count += 1
-                #     todos = (
-                #         tool_input.get("todos", [])
-                #         if isinstance(tool_input, dict)
-                #         else []
-                #     )
-                #     todo_count = len(todos) if isinstance(todos, list) else 0
-
-                #     if write_todos_call_count == 1:
-                #         # First call - creating the plan
-                #         last_active_step_title = "Creating plan"
-                #         last_active_step_items = [f"Defining {todo_count} tasks..."]
-                #     else:
-                #         # Subsequent calls - updating the plan
-                #         # Try to provide context about what's being updated
-                #         in_progress_count = (
-                #             sum(
-                #                 1
-                #                 for t in todos
-                #                 if isinstance(t, dict)
-                #                 and t.get("status") == "in_progress"
-                #             )
-                #             if isinstance(todos, list)
-                #             else 0
-                #         )
-                #         completed_count = (
-                #             sum(
-                #                 1
-                #                 for t in todos
-                #                 if isinstance(t, dict)
-                #                 and t.get("status") == "completed"
-                #             )
-                #             if isinstance(todos, list)
-                #             else 0
-                #         )
-
-                #         last_active_step_title = "Updating progress"
-                #         last_active_step_items = (
-                #             [
-                #                 f"Progress: {completed_count}/{todo_count} completed",
-                #                 f"In progress: {in_progress_count} tasks",
-                #             ]
-                #             if completed_count > 0
-                #             else [f"Working on {todo_count} tasks"]
-                #         )
-
-                #     yield streaming_service.format_thinking_step(
-                #         step_id=tool_step_id,
-                #         title=last_active_step_title,
-                #         status="in_progress",
-                #         items=last_active_step_items,
-                #     )
-                elif tool_name == "generate_podcast":
-                    podcast_title = (
-                        tool_input.get("podcast_title", "SurfSense Podcast")
-                        if isinstance(tool_input, dict)
-                        else "SurfSense Podcast"
-                    )
-                    # Get content length for context
-                    content_len = len(
-                        tool_input.get("source_content", "")
-                        if isinstance(tool_input, dict)
-                        else ""
-                    )
-                    last_active_step_title = "Generating podcast"
-                    last_active_step_items = [
-                        f"Title: {podcast_title}",
-                        f"Content: {content_len:,} characters",
-                        "Preparing audio generation...",
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Generating podcast",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                # elif tool_name == "ls":
-                #     last_active_step_title = "Exploring files"
-                #     last_active_step_items = []
-                #     yield streaming_service.format_thinking_step(
-                #         step_id=tool_step_id,
-                #         title="Exploring files",
-                #         status="in_progress",
-                #         items=None,
-                #     )
-                else:
-                    last_active_step_title = f"Using {tool_name.replace('_', ' ')}"
-                    last_active_step_items = []
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title=last_active_step_title,
-                        status="in_progress",
-                    )
-
-                # Stream tool info
-                tool_call_id = (
-                    f"call_{run_id[:32]}"
-                    if run_id
-                    else streaming_service.generate_tool_call_id()
-                )
-                yield streaming_service.format_tool_input_start(tool_call_id, tool_name)
-                yield streaming_service.format_tool_input_available(
-                    tool_call_id,
-                    tool_name,
-                    tool_input
-                    if isinstance(tool_input, dict)
-                    else {"input": tool_input},
-                )
-
-            elif event_type == "on_tool_end":
-                run_id = event.get("run_id", "")
-                tool_name = event.get("name", "unknown_tool")
-                raw_output = event.get("data", {}).get("output", "")
-
-                # Handle deepagents' write_todos Command object specially
-                # Disabled for now
-                # if tool_name == "write_todos" and hasattr(raw_output, "update"):
-                #     # deepagents returns a Command object - extract todos directly
-                #     tool_output = extract_todos_from_deepagents(raw_output)
-                # elif hasattr(raw_output, "content"):
-                if hasattr(raw_output, "content"):
-                    # It's a ToolMessage object - extract the content
-                    content = raw_output.content
-                    # If content is a string that looks like JSON, try to parse it
-                    if isinstance(content, str):
-                        try:
-                            tool_output = json.loads(content)
-                        except (json.JSONDecodeError, TypeError):
-                            tool_output = {"result": content}
-                    elif isinstance(content, dict):
-                        tool_output = content
-                    else:
-                        tool_output = {"result": str(content)}
-                elif isinstance(raw_output, dict):
-                    tool_output = raw_output
-                else:
-                    tool_output = {
-                        "result": str(raw_output) if raw_output else "completed"
-                    }
-
-                tool_call_id = f"call_{run_id[:32]}" if run_id else "call_unknown"
-
-                # Get the original tool step ID to update it (not create a new one)
-                original_step_id = tool_step_ids.get(
-                    run_id, f"thinking-unknown-{run_id[:8]}"
-                )
-
-                # Mark the tool thinking step as completed using the SAME step ID
-                # Also add to completed set so we don't try to complete it again
-                completed_step_ids.add(original_step_id)
-                if tool_name == "search_knowledge_base":
-                    # Get result count if available
-                    result_info = "Search completed"
-                    if isinstance(tool_output, dict):
-                        result_len = tool_output.get("result_length", 0)
-                        if result_len > 0:
-                            result_info = (
-                                f"Found relevant information ({result_len} chars)"
-                            )
-                    # Include original query in completed items
-                    completed_items = [*last_active_step_items, result_info]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Searching knowledge base",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "link_preview":
-                    # Build completion items based on link preview result
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title", "Link")
-                        domain = tool_output.get("domain", "")
-                        has_error = "error" in tool_output
-                        if has_error:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Error: {tool_output.get('error', 'Failed to fetch')}",
-                            ]
-                        else:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Title: {title[:60]}{'...' if len(title) > 60 else ''}",
-                                f"Domain: {domain}" if domain else "Preview loaded",
-                            ]
-                    else:
-                        completed_items = [*last_active_step_items, "Preview loaded"]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Fetching link preview",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "display_image":
-                    # Build completion items for image analysis
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title", "")
-                        alt = tool_output.get("alt", "Image")
-                        display_name = title or alt
-                        completed_items = [
-                            *last_active_step_items,
-                            f"Analyzed: {display_name[:50]}{'...' if len(display_name) > 50 else ''}",
-                        ]
-                    else:
-                        completed_items = [*last_active_step_items, "Image analyzed"]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Analyzing the image",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "scrape_webpage":
-                    # Build completion items for webpage scraping
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title", "Webpage")
-                        word_count = tool_output.get("word_count", 0)
-                        has_error = "error" in tool_output
-                        if has_error:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Error: {tool_output.get('error', 'Failed to scrape')[:50]}",
-                            ]
-                        else:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Title: {title[:50]}{'...' if len(title) > 50 else ''}",
-                                f"Extracted: {word_count:,} words",
-                            ]
-                    else:
-                        completed_items = [*last_active_step_items, "Content extracted"]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Scraping webpage",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "generate_podcast":
-                    # Build detailed completion items based on podcast status
-                    podcast_status = (
-                        tool_output.get("status", "unknown")
-                        if isinstance(tool_output, dict)
-                        else "unknown"
-                    )
-                    podcast_title = (
-                        tool_output.get("title", "Podcast")
-                        if isinstance(tool_output, dict)
-                        else "Podcast"
-                    )
-
-                    if podcast_status == "processing":
-                        completed_items = [
-                            f"Title: {podcast_title}",
-                            "Audio generation started",
-                            "Processing in background...",
-                        ]
-                    elif podcast_status == "already_generating":
-                        completed_items = [
-                            f"Title: {podcast_title}",
-                            "Podcast already in progress",
-                            "Please wait for it to complete",
-                        ]
-                    elif podcast_status == "error":
-                        error_msg = (
-                            tool_output.get("error", "Unknown error")
-                            if isinstance(tool_output, dict)
-                            else "Unknown error"
-                        )
-                        completed_items = [
-                            f"Title: {podcast_title}",
-                            f"Error: {error_msg[:50]}",
-                        ]
-                    else:
-                        completed_items = last_active_step_items
-
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Generating podcast",
-                        status="completed",
-                        items=completed_items,
-                    )
-                # elif tool_name == "write_todos":  # Disabled for now
-                #     # Build completion items for planning/updating
-                #     if isinstance(tool_output, dict):
-                #         todos = tool_output.get("todos", [])
-                #         todo_count = len(todos) if isinstance(todos, list) else 0
-                #         completed_count = (
-                #             sum(
-                #                 1
-                #                 for t in todos
-                #                 if isinstance(t, dict)
-                #                 and t.get("status") == "completed"
-                #             )
-                #             if isinstance(todos, list)
-                #             else 0
-                #         )
-                #         in_progress_count = (
-                #             sum(
-                #                 1
-                #                 for t in todos
-                #                 if isinstance(t, dict)
-                #                 and t.get("status") == "in_progress"
-                #             )
-                #             if isinstance(todos, list)
-                #             else 0
-                #         )
-
-                #         # Use context-aware completion message
-                #         if last_active_step_title == "Creating plan":
-                #             completed_items = [f"Created {todo_count} tasks"]
-                #         else:
-                #             # Updating progress - show stats
-                #             completed_items = [
-                #                 f"Progress: {completed_count}/{todo_count} completed",
-                #             ]
-                #             if in_progress_count > 0:
-                #                 # Find the currently in-progress task name
-                #                 in_progress_task = next(
-                #                     (
-                #                         t.get("content", "")[:40]
-                #                         for t in todos
-                #                         if isinstance(t, dict)
-                #                         and t.get("status") == "in_progress"
-                #                     ),
-                #                     None,
-                #                 )
-                #                 if in_progress_task:
-                #                     completed_items.append(
-                #                         f"Current: {in_progress_task}..."
-                #                     )
-                #     else:
-                #         completed_items = ["Plan updated"]
-                #     yield streaming_service.format_thinking_step(
-                #         step_id=original_step_id,
-                #         title=last_active_step_title,
-                #         status="completed",
-                #         items=completed_items,
-                #     )
-                elif tool_name == "ls":
-                    # Build completion items showing file names found
-                    if isinstance(tool_output, dict):
-                        result = tool_output.get("result", "")
-                    elif isinstance(tool_output, str):
-                        result = tool_output
-                    else:
-                        result = str(tool_output) if tool_output else ""
-
-                    # Parse file paths and extract just the file names
-                    file_names = []
-                    if result:
-                        # The ls tool returns paths, extract just the file/folder names
-                        for line in result.strip().split("\n"):
-                            line = line.strip()
-                            if line:
-                                # Get just the filename from the path
-                                name = line.rstrip("/").split("/")[-1]
-                                if name and len(name) <= 40:
-                                    file_names.append(name)
-                                elif name:
-                                    file_names.append(name[:37] + "...")
-
-                    # Build display items - wrap file names in brackets for icon rendering
-                    if file_names:
-                        if len(file_names) <= 5:
-                            # Wrap each file name in brackets for styled tile rendering
-                            completed_items = [f"[{name}]" for name in file_names]
-                        else:
-                            # Show first few with brackets and count
-                            completed_items = [f"[{name}]" for name in file_names[:4]]
-                            completed_items.append(f"(+{len(file_names) - 4} more)")
-                    else:
-                        completed_items = ["No files found"]
-
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Exploring files",
-                        status="completed",
-                        items=completed_items,
-                    )
-                else:
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title=f"Using {tool_name.replace('_', ' ')}",
-                        status="completed",
-                        items=last_active_step_items,
-                    )
-
-                # Mark that we just finished a tool - "Synthesizing response" will be created
-                # when text actually starts flowing (not immediately)
-                just_finished_tool = True
-                # Clear the active step since the tool is done
-                last_active_step_id = None
-                last_active_step_title = ""
-                last_active_step_items = []
-
-                # Handle different tool outputs
-                if tool_name == "generate_podcast":
-                    # Stream the full podcast result so frontend can render the audio player
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        tool_output
-                        if isinstance(tool_output, dict)
-                        else {"result": tool_output},
-                    )
-                    # Send appropriate terminal message based on status
-                    if (
-                        isinstance(tool_output, dict)
-                        and tool_output.get("status") == "success"
-                    ):
-                        yield streaming_service.format_terminal_info(
-                            f"Podcast generated successfully: {tool_output.get('title', 'Podcast')}",
-                            "success",
-                        )
-                    else:
-                        error_msg = (
-                            tool_output.get("error", "Unknown error")
-                            if isinstance(tool_output, dict)
-                            else "Unknown error"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Podcast generation failed: {error_msg}",
-                            "error",
-                        )
-                elif tool_name == "link_preview":
-                    # Stream the full link preview result so frontend can render the MediaCard
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        tool_output
-                        if isinstance(tool_output, dict)
-                        else {"result": tool_output},
-                    )
-                    # Send appropriate terminal message
-                    if isinstance(tool_output, dict) and "error" not in tool_output:
-                        title = tool_output.get("title", "Link")
-                        yield streaming_service.format_terminal_info(
-                            f"Link preview loaded: {title[:50]}{'...' if len(title) > 50 else ''}",
-                            "success",
-                        )
-                    else:
-                        error_msg = (
-                            tool_output.get("error", "Failed to fetch")
-                            if isinstance(tool_output, dict)
-                            else "Failed to fetch"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Link preview failed: {error_msg}",
-                            "error",
-                        )
-                elif tool_name == "display_image":
-                    # Stream the full image result so frontend can render the Image component
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        tool_output
-                        if isinstance(tool_output, dict)
-                        else {"result": tool_output},
-                    )
-                    # Send terminal message
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title") or tool_output.get(
-                            "alt", "Image"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Image analyzed: {title[:40]}{'...' if len(title) > 40 else ''}",
-                            "success",
-                        )
-                elif tool_name == "scrape_webpage":
-                    # Stream the scrape result so frontend can render the Article component
-                    # Note: We send metadata for display, but content goes to LLM for processing
-                    if isinstance(tool_output, dict):
-                        # Create a display-friendly output (without full content for the card)
-                        display_output = {
-                            k: v for k, v in tool_output.items() if k != "content"
-                        }
-                        # But keep a truncated content preview
-                        if "content" in tool_output:
-                            content = tool_output.get("content", "")
-                            display_output["content_preview"] = (
-                                content[:500] + "..." if len(content) > 500 else content
-                            )
-                        yield streaming_service.format_tool_output_available(
-                            tool_call_id,
-                            display_output,
-                        )
-                    else:
-                        yield streaming_service.format_tool_output_available(
-                            tool_call_id,
-                            {"result": tool_output},
-                        )
-                    # Send terminal message
-                    if isinstance(tool_output, dict) and "error" not in tool_output:
-                        title = tool_output.get("title", "Webpage")
-                        word_count = tool_output.get("word_count", 0)
-                        yield streaming_service.format_terminal_info(
-                            f"Scraped: {title[:40]}{'...' if len(title) > 40 else ''} ({word_count:,} words)",
-                            "success",
-                        )
-                    else:
-                        error_msg = (
-                            tool_output.get("error", "Failed to scrape")
-                            if isinstance(tool_output, dict)
-                            else "Failed to scrape"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Scrape failed: {error_msg}",
-                            "error",
-                        )
-                elif tool_name == "search_knowledge_base":
-                    # Don't stream the full output for search (can be very large), just acknowledge
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        {"status": "completed", "result_length": len(str(tool_output))},
-                    )
-                    yield streaming_service.format_terminal_info(
-                        "Knowledge base search completed", "success"
-                    )
-                # elif tool_name == "write_todos":  # Disabled for now
-                #     # Stream the full write_todos result so frontend can render the Plan component
-                #     yield streaming_service.format_tool_output_available(
-                #         tool_call_id,
-                #         tool_output
-                #         if isinstance(tool_output, dict)
-                #         else {"result": tool_output},
-                #     )
-                #     # Send terminal message with plan info
-                #     if isinstance(tool_output, dict):
-                #         todos = tool_output.get("todos", [])
-                #         todo_count = len(todos) if isinstance(todos, list) else 0
-                #         yield streaming_service.format_terminal_info(
-                #             f"Plan created ({todo_count} tasks)",
-                #             "success",
-                #         )
-                #     else:
-                #         yield streaming_service.format_terminal_info(
-                #             "Plan created",
-                #             "success",
-                #         )
-                else:
-                    # Default handling for other tools
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        {"status": "completed", "result_length": len(str(tool_output))},
-                    )
-                    yield streaming_service.format_terminal_info(
-                        f"Tool {tool_name} completed", "success"
-                    )
-
-            # Handle chain/agent end to close any open text blocks
-            elif event_type in ("on_chain_end", "on_agent_end"):
-                if current_text_id is not None:
-                    yield streaming_service.format_text_end(current_text_id)
-                    current_text_id = None
-
-        # Ensure text block is closed
-        if current_text_id is not None:
-            yield streaming_service.format_text_end(current_text_id)
-
-        # Mark the last active thinking step as completed using the same title
-        completion_event = complete_current_step()
-        if completion_event:
-            yield completion_event
-
-        # Check if the graph was interrupted (human-in-the-loop)
-        state = await agent.aget_state(config)
-        is_interrupted = state.tasks and any(task.interrupts for task in state.tasks)
-        if is_interrupted:
-            interrupt_value = state.tasks[0].interrupts[0].value
-            yield streaming_service.format_interrupt_request(interrupt_value)
+        if stream_result.is_interrupted:
             yield streaming_service.format_finish_step()
             yield streaming_service.format_finish()
             yield streaming_service.format_done()
             return
 
+        accumulated_text = stream_result.accumulated_text
+
         # Generate LLM title for new chats after first response
         # Check if this is the first assistant response by counting existing assistant messages
         from sqlalchemy import func
@@ -1256,10 +1075,6 @@ async def stream_new_chat(
         print(f"[stream_new_chat] Exception type: {type(e).__name__}")
         print(f"[stream_new_chat] Traceback:\n{traceback.format_exc()}")
 
-        # Close any open text block
-        if current_text_id is not None:
-            yield streaming_service.format_text_end(current_text_id)
-
         yield streaming_service.format_error(error_message)
         yield streaming_service.format_finish_step()
         yield streaming_service.format_finish()
@@ -1280,7 +1095,6 @@ async def stream_resume_chat(
     thread_visibility: ChatVisibility | None = None,
 ) -> AsyncGenerator[str, None]:
     streaming_service = VercelStreamingService()
-    current_text_id: str | None = None
 
     try:
         if user_id:
@@ -1353,521 +1167,21 @@ async def stream_resume_chat(
         yield streaming_service.format_message_start()
         yield streaming_service.format_start_step()
 
-        accumulated_text = ""
-        thinking_step_counter = 0
-        tool_step_ids: dict[str, str] = {}
-        completed_step_ids: set[str] = set()
-        last_active_step_id: str | None = None
-        last_active_step_title = ""
-        last_active_step_items: list[str] = []
-        just_finished_tool = False
-
-        def next_thinking_step_id() -> str:
-            nonlocal thinking_step_counter
-            thinking_step_counter += 1
-            return f"thinking-resume-{thinking_step_counter}"
-
-        def complete_current_step() -> str | None:
-            nonlocal last_active_step_id
-            if last_active_step_id and last_active_step_id not in completed_step_ids:
-                completed_step_ids.add(last_active_step_id)
-                event = streaming_service.format_thinking_step(
-                    step_id=last_active_step_id,
-                    title=last_active_step_title,
-                    status="completed",
-                    items=last_active_step_items,
-                )
-                last_active_step_id = None
-                return event
-            return None
-
-        async for event in agent.astream_events(
-            Command(resume={"decisions": decisions}), config=config, version="v2"
+        stream_result = StreamResult()
+        async for sse in _stream_agent_events(
+            agent=agent,
+            config=config,
+            input_data=Command(resume={"decisions": decisions}),
+            streaming_service=streaming_service,
+            result=stream_result,
+            step_prefix="thinking-resume",
         ):
-            event_type = event.get("event", "")
-
-            if event_type == "on_chat_model_stream":
-                chunk = event.get("data", {}).get("chunk")
-                if chunk and hasattr(chunk, "content"):
-                    content = chunk.content
-                    if content and isinstance(content, str):
-                        if current_text_id is None:
-                            completion_event = complete_current_step()
-                            if completion_event:
-                                yield completion_event
-                            if just_finished_tool:
-                                last_active_step_id = None
-                                last_active_step_title = ""
-                                last_active_step_items = []
-                                just_finished_tool = False
-                            current_text_id = streaming_service.generate_text_id()
-                            yield streaming_service.format_text_start(current_text_id)
-                        yield streaming_service.format_text_delta(
-                            current_text_id, content
-                        )
-                        accumulated_text += content
-
-            elif event_type == "on_tool_start":
-                tool_name = event.get("name", "unknown_tool")
-                run_id = event.get("run_id", "")
-                tool_input = event.get("data", {}).get("input", {})
-
-                if current_text_id is not None:
-                    yield streaming_service.format_text_end(current_text_id)
-                    current_text_id = None
-
-                if last_active_step_title != "Synthesizing response":
-                    completion_event = complete_current_step()
-                    if completion_event:
-                        yield completion_event
-
-                just_finished_tool = False
-                tool_step_id = next_thinking_step_id()
-                tool_step_ids[run_id] = tool_step_id
-                last_active_step_id = tool_step_id
-
-                if tool_name == "search_knowledge_base":
-                    query = (
-                        tool_input.get("query", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    last_active_step_title = "Searching knowledge base"
-                    last_active_step_items = [
-                        f"Query: {query[:100]}{'...' if len(query) > 100 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Searching knowledge base",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                elif tool_name == "link_preview":
-                    url = (
-                        tool_input.get("url", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    last_active_step_title = "Fetching link preview"
-                    last_active_step_items = [
-                        f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Fetching link preview",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                elif tool_name == "display_image":
-                    src = (
-                        tool_input.get("src", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    title = (
-                        tool_input.get("title", "")
-                        if isinstance(tool_input, dict)
-                        else ""
-                    )
-                    last_active_step_title = "Analyzing the image"
-                    last_active_step_items = [
-                        f"Analyzing: {title[:50] if title else src[:50]}{'...' if len(title or src) > 50 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Analyzing the image",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                elif tool_name == "scrape_webpage":
-                    url = (
-                        tool_input.get("url", "")
-                        if isinstance(tool_input, dict)
-                        else str(tool_input)
-                    )
-                    last_active_step_title = "Scraping webpage"
-                    last_active_step_items = [
-                        f"URL: {url[:80]}{'...' if len(url) > 80 else ''}"
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Scraping webpage",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                elif tool_name == "generate_podcast":
-                    podcast_title = (
-                        tool_input.get("podcast_title", "SurfSense Podcast")
-                        if isinstance(tool_input, dict)
-                        else "SurfSense Podcast"
-                    )
-                    content_len = len(
-                        tool_input.get("source_content", "")
-                        if isinstance(tool_input, dict)
-                        else ""
-                    )
-                    last_active_step_title = "Generating podcast"
-                    last_active_step_items = [
-                        f"Title: {podcast_title}",
-                        f"Content: {content_len:,} characters",
-                        "Preparing audio generation...",
-                    ]
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title="Generating podcast",
-                        status="in_progress",
-                        items=last_active_step_items,
-                    )
-                else:
-                    last_active_step_title = f"Using {tool_name.replace('_', ' ')}"
-                    last_active_step_items = []
-                    yield streaming_service.format_thinking_step(
-                        step_id=tool_step_id,
-                        title=last_active_step_title,
-                        status="in_progress",
-                    )
-
-                tool_call_id = (
-                    f"call_{run_id[:32]}"
-                    if run_id
-                    else streaming_service.generate_tool_call_id()
-                )
-                yield streaming_service.format_tool_input_start(tool_call_id, tool_name)
-                yield streaming_service.format_tool_input_available(
-                    tool_call_id,
-                    tool_name,
-                    tool_input
-                    if isinstance(tool_input, dict)
-                    else {"input": tool_input},
-                )
-
-            elif event_type == "on_tool_end":
-                run_id = event.get("run_id", "")
-                tool_name = event.get("name", "unknown_tool")
-                raw_output = event.get("data", {}).get("output", "")
-
-                if hasattr(raw_output, "content"):
-                    content = raw_output.content
-                    if isinstance(content, str):
-                        try:
-                            tool_output = json.loads(content)
-                        except (json.JSONDecodeError, TypeError):
-                            tool_output = {"result": content}
-                    elif isinstance(content, dict):
-                        tool_output = content
-                    else:
-                        tool_output = {"result": str(content)}
-                elif isinstance(raw_output, dict):
-                    tool_output = raw_output
-                else:
-                    tool_output = {
-                        "result": str(raw_output) if raw_output else "completed"
-                    }
-
-                tool_call_id = f"call_{run_id[:32]}" if run_id else "call_unknown"
-                original_step_id = tool_step_ids.get(
-                    run_id, f"thinking-unknown-{run_id[:8]}"
-                )
-                completed_step_ids.add(original_step_id)
-
-                if tool_name == "search_knowledge_base":
-                    result_info = "Search completed"
-                    if isinstance(tool_output, dict):
-                        result_len = tool_output.get("result_length", 0)
-                        if result_len > 0:
-                            result_info = (
-                                f"Found relevant information ({result_len} chars)"
-                            )
-                    completed_items = [*last_active_step_items, result_info]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Searching knowledge base",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "link_preview":
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title", "Link")
-                        domain = tool_output.get("domain", "")
-                        has_error = "error" in tool_output
-                        if has_error:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Error: {tool_output.get('error', 'Failed to fetch')}",
-                            ]
-                        else:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Title: {title[:60]}{'...' if len(title) > 60 else ''}",
-                                f"Domain: {domain}" if domain else "Preview loaded",
-                            ]
-                    else:
-                        completed_items = [*last_active_step_items, "Preview loaded"]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Fetching link preview",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "display_image":
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title", "")
-                        alt = tool_output.get("alt", "Image")
-                        display_name = title or alt
-                        completed_items = [
-                            *last_active_step_items,
-                            f"Analyzed: {display_name[:50]}{'...' if len(display_name) > 50 else ''}",
-                        ]
-                    else:
-                        completed_items = [*last_active_step_items, "Image analyzed"]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Analyzing the image",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "scrape_webpage":
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title", "Webpage")
-                        word_count = tool_output.get("word_count", 0)
-                        has_error = "error" in tool_output
-                        if has_error:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Error: {tool_output.get('error', 'Failed to scrape')[:50]}",
-                            ]
-                        else:
-                            completed_items = [
-                                *last_active_step_items,
-                                f"Title: {title[:50]}{'...' if len(title) > 50 else ''}",
-                                f"Extracted: {word_count:,} words",
-                            ]
-                    else:
-                        completed_items = [*last_active_step_items, "Content extracted"]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Scraping webpage",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "generate_podcast":
-                    podcast_status = (
-                        tool_output.get("status", "unknown")
-                        if isinstance(tool_output, dict)
-                        else "unknown"
-                    )
-                    podcast_title = (
-                        tool_output.get("title", "Podcast")
-                        if isinstance(tool_output, dict)
-                        else "Podcast"
-                    )
-                    if podcast_status == "processing":
-                        completed_items = [
-                            f"Title: {podcast_title}",
-                            "Audio generation started",
-                            "Processing in background...",
-                        ]
-                    elif podcast_status == "already_generating":
-                        completed_items = [
-                            f"Title: {podcast_title}",
-                            "Podcast already in progress",
-                            "Please wait for it to complete",
-                        ]
-                    elif podcast_status == "error":
-                        error_msg = (
-                            tool_output.get("error", "Unknown error")
-                            if isinstance(tool_output, dict)
-                            else "Unknown error"
-                        )
-                        completed_items = [
-                            f"Title: {podcast_title}",
-                            f"Error: {error_msg[:50]}",
-                        ]
-                    else:
-                        completed_items = last_active_step_items
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Generating podcast",
-                        status="completed",
-                        items=completed_items,
-                    )
-                elif tool_name == "ls":
-                    if isinstance(tool_output, dict):
-                        result = tool_output.get("result", "")
-                    elif isinstance(tool_output, str):
-                        result = tool_output
-                    else:
-                        result = str(tool_output) if tool_output else ""
-                    file_names = []
-                    if result:
-                        for line in result.strip().split("\n"):
-                            line = line.strip()
-                            if line:
-                                name = line.rstrip("/").split("/")[-1]
-                                if name and len(name) <= 40:
-                                    file_names.append(name)
-                                elif name:
-                                    file_names.append(name[:37] + "...")
-                    if file_names:
-                        if len(file_names) <= 5:
-                            completed_items = [f"[{name}]" for name in file_names]
-                        else:
-                            completed_items = [f"[{name}]" for name in file_names[:4]]
-                            completed_items.append(f"(+{len(file_names) - 4} more)")
-                    else:
-                        completed_items = ["No files found"]
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title="Exploring files",
-                        status="completed",
-                        items=completed_items,
-                    )
-                else:
-                    yield streaming_service.format_thinking_step(
-                        step_id=original_step_id,
-                        title=f"Using {tool_name.replace('_', ' ')}",
-                        status="completed",
-                        items=last_active_step_items,
-                    )
-
-                just_finished_tool = True
-                last_active_step_id = None
-                last_active_step_title = ""
-                last_active_step_items = []
-
-                if tool_name == "generate_podcast":
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        tool_output
-                        if isinstance(tool_output, dict)
-                        else {"result": tool_output},
-                    )
-                    if (
-                        isinstance(tool_output, dict)
-                        and tool_output.get("status") == "success"
-                    ):
-                        yield streaming_service.format_terminal_info(
-                            f"Podcast generated successfully: {tool_output.get('title', 'Podcast')}",
-                            "success",
-                        )
-                    else:
-                        error_msg = (
-                            tool_output.get("error", "Unknown error")
-                            if isinstance(tool_output, dict)
-                            else "Unknown error"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Podcast generation failed: {error_msg}",
-                            "error",
-                        )
-                elif tool_name == "link_preview":
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        tool_output
-                        if isinstance(tool_output, dict)
-                        else {"result": tool_output},
-                    )
-                    if isinstance(tool_output, dict) and "error" not in tool_output:
-                        title = tool_output.get("title", "Link")
-                        yield streaming_service.format_terminal_info(
-                            f"Link preview loaded: {title[:50]}{'...' if len(title) > 50 else ''}",
-                            "success",
-                        )
-                    else:
-                        error_msg = (
-                            tool_output.get("error", "Failed to fetch")
-                            if isinstance(tool_output, dict)
-                            else "Failed to fetch"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Link preview failed: {error_msg}",
-                            "error",
-                        )
-                elif tool_name == "display_image":
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        tool_output
-                        if isinstance(tool_output, dict)
-                        else {"result": tool_output},
-                    )
-                    if isinstance(tool_output, dict):
-                        title = tool_output.get("title") or tool_output.get(
-                            "alt", "Image"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Image analyzed: {title[:40]}{'...' if len(title) > 40 else ''}",
-                            "success",
-                        )
-                elif tool_name == "scrape_webpage":
-                    if isinstance(tool_output, dict):
-                        display_output = {
-                            k: v for k, v in tool_output.items() if k != "content"
-                        }
-                        if "content" in tool_output:
-                            content = tool_output.get("content", "")
-                            display_output["content_preview"] = (
-                                content[:500] + "..." if len(content) > 500 else content
-                            )
-                        yield streaming_service.format_tool_output_available(
-                            tool_call_id,
-                            display_output,
-                        )
-                    else:
-                        yield streaming_service.format_tool_output_available(
-                            tool_call_id,
-                            {"result": tool_output},
-                        )
-                    if isinstance(tool_output, dict) and "error" not in tool_output:
-                        title = tool_output.get("title", "Webpage")
-                        word_count = tool_output.get("word_count", 0)
-                        yield streaming_service.format_terminal_info(
-                            f"Scraped: {title[:40]}{'...' if len(title) > 40 else ''} ({word_count:,} words)",
-                            "success",
-                        )
-                    else:
-                        error_msg = (
-                            tool_output.get("error", "Failed to scrape")
-                            if isinstance(tool_output, dict)
-                            else "Failed to scrape"
-                        )
-                        yield streaming_service.format_terminal_info(
-                            f"Scrape failed: {error_msg}",
-                            "error",
-                        )
-                elif tool_name == "search_knowledge_base":
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        {"status": "completed", "result_length": len(str(tool_output))},
-                    )
-                    yield streaming_service.format_terminal_info(
-                        "Knowledge base search completed", "success"
-                    )
-                else:
-                    yield streaming_service.format_tool_output_available(
-                        tool_call_id,
-                        {"status": "completed", "result_length": len(str(tool_output))},
-                    )
-                    yield streaming_service.format_terminal_info(
-                        f"Tool {tool_name} completed", "success"
-                    )
-
-            elif event_type in ("on_chain_end", "on_agent_end"):
-                if current_text_id is not None:
-                    yield streaming_service.format_text_end(current_text_id)
-                    current_text_id = None
-
-        if current_text_id is not None:
-            yield streaming_service.format_text_end(current_text_id)
-
-        completion_event = complete_current_step()
-        if completion_event:
-            yield completion_event
-
-        state = await agent.aget_state(config)
-        is_interrupted = state.tasks and any(task.interrupts for task in state.tasks)
-        if is_interrupted:
-            interrupt_value = state.tasks[0].interrupts[0].value
-            yield streaming_service.format_interrupt_request(interrupt_value)
+            yield sse
+        if stream_result.is_interrupted:
+            yield streaming_service.format_finish_step()
+            yield streaming_service.format_finish()
+            yield streaming_service.format_done()
+            return
 
         yield streaming_service.format_finish_step()
         yield streaming_service.format_finish()
@@ -1879,8 +1193,6 @@ async def stream_resume_chat(
         error_message = f"Error during resume: {e!s}"
         print(f"[stream_resume_chat] {error_message}")
         print(f"[stream_resume_chat] Traceback:\n{traceback.format_exc()}")
-        if current_text_id is not None:
-            yield streaming_service.format_text_end(current_text_id)
         yield streaming_service.format_error(error_message)
         yield streaming_service.format_finish_step()
         yield streaming_service.format_finish()

From 5d1c386105a329404eaa8a36c2637c6cd345de3c Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 13:50:46 +0200
Subject: [PATCH 07/42] extract shared streaming helpers from page.tsx into
 streaming-state.ts

Move duplicated types (ThinkingStepData, ContentPart), content-part helpers
(appendText, addToolCall, updateToolCall, buildContentForUI,
buildContentForPersistence), and SSE read loop (readSSEStream) into a
shared module. Removes ~395 lines of tripled code from page.tsx.
---
 .../new-chat/[[...chat_id]]/page.tsx          | 446 ++----------------
 surfsense_web/lib/chat/streaming-state.ts     | 184 ++++++++
 2 files changed, 235 insertions(+), 395 deletions(-)
 create mode 100644 surfsense_web/lib/chat/streaming-state.ts

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index 2db00a03d..448148229 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -12,6 +12,7 @@ import { useParams, useSearchParams } from "next/navigation";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import { z } from "zod";
+import { addToolCall, appendText, buildContentForPersistence, buildContentForUI, type ContentPart, type ContentPartsState, readSSEStream, type ThinkingStepData, updateToolCall } from "@/lib/chat/streaming-state";
 import {
 	clearTargetCommentIdAtom,
 	currentThreadAtom,
@@ -125,15 +126,6 @@ const TOOLS_WITH_UI = new Set([
 	// "write_todos", // Disabled for now
 ]);
 
-/**
- * Type for thinking step data from the backend
- */
-interface ThinkingStepData {
-	id: string;
-	title: string;
-	status: "pending" | "in_progress" | "completed";
-	items: string[];
-}
 
 export default function NewChatPage() {
 	const params = useParams();
@@ -540,102 +532,11 @@ export default function NewChatPage() {
 			const assistantMsgId = `msg-assistant-${Date.now()}`;
 			const currentThinkingSteps = new Map<string, ThinkingStepData>();
 
-			// Ordered content parts to preserve inline tool call positions
-			// Each part is either a text segment or a tool call
-			type ContentPart =
-				| { type: "text"; text: string }
-				| {
-						type: "tool-call";
-						toolCallId: string;
-						toolName: string;
-						args: Record<string, unknown>;
-						result?: unknown;
-				  };
-			const contentParts: ContentPart[] = [];
+			const contentPartsState: ContentPartsState = { contentParts: [], currentTextPartIndex: -1, toolCallIndices: new Map() };
+			const { contentParts, toolCallIndices } = contentPartsState;
 			let wasInterrupted = false;
 
-			// Track the current text segment index (for appending text deltas)
-			let currentTextPartIndex = -1;
 
-			// Map to track tool call indices for updating results
-			const toolCallIndices = new Map<string, number>();
-
-			// Helper to get or create the current text part for appending text
-			const appendText = (delta: string) => {
-				if (currentTextPartIndex >= 0 && contentParts[currentTextPartIndex]?.type === "text") {
-					// Append to existing text part
-					(contentParts[currentTextPartIndex] as { type: "text"; text: string }).text += delta;
-				} else {
-					// Create new text part
-					contentParts.push({ type: "text", text: delta });
-					currentTextPartIndex = contentParts.length - 1;
-				}
-			};
-
-			// Helper to add a tool call (this "breaks" the current text segment)
-			const addToolCall = (toolCallId: string, toolName: string, args: Record<string, unknown>) => {
-				if (TOOLS_WITH_UI.has(toolName)) {
-					contentParts.push({
-						type: "tool-call",
-						toolCallId,
-						toolName,
-						args,
-					});
-					toolCallIndices.set(toolCallId, contentParts.length - 1);
-					// Reset text part index so next text creates a new segment
-					currentTextPartIndex = -1;
-				}
-			};
-
-			// Helper to update a tool call's args or result
-			const updateToolCall = (
-				toolCallId: string,
-				update: { args?: Record<string, unknown>; result?: unknown }
-			) => {
-				const index = toolCallIndices.get(toolCallId);
-				if (index !== undefined && contentParts[index]?.type === "tool-call") {
-					const tc = contentParts[index] as ContentPart & { type: "tool-call" };
-					if (update.args) tc.args = update.args;
-					if (update.result !== undefined) tc.result = update.result;
-				}
-			};
-
-			// Helper to build content for UI (without thinking-steps to avoid assistant-ui errors)
-			const buildContentForUI = (): ThreadMessageLike["content"] => {
-				// Filter to only include text parts with content and tool-calls with UI
-				const filtered = contentParts.filter((part) => {
-					if (part.type === "text") return part.text.length > 0;
-					if (part.type === "tool-call") return TOOLS_WITH_UI.has(part.toolName);
-					return false;
-				});
-				return filtered.length > 0
-					? (filtered as ThreadMessageLike["content"])
-					: [{ type: "text", text: "" }];
-			};
-
-			// Helper to build content for persistence (includes thinking-steps for restoration)
-			const buildContentForPersistence = (): unknown[] => {
-				const parts: unknown[] = [];
-
-				// Include thinking steps for persistence
-				if (currentThinkingSteps.size > 0) {
-					parts.push({
-						type: "thinking-steps",
-						steps: Array.from(currentThinkingSteps.values()),
-					});
-				}
-
-				// Add content parts (filtered)
-				for (const part of contentParts) {
-					if (part.type === "text" && part.text.length > 0) {
-						parts.push(part);
-					} else if (part.type === "tool-call" && TOOLS_WITH_UI.has(part.toolName)) {
-						parts.push(part);
-					}
-				}
-
-				return parts.length > 0 ? parts : [{ type: "text", text: "" }];
-			};
 
 			// Add placeholder assistant message
 			setMessages((prev) => [
@@ -701,50 +602,23 @@ export default function NewChatPage() {
 					throw new Error(`Backend error: ${response.status}`);
 				}
 
-				if (!response.body) {
-					throw new Error("No response body");
-				}
-
-				// Parse SSE stream
-				const reader = response.body.getReader();
-				const decoder = new TextDecoder();
-				let buffer = "";
-
-				try {
-					while (true) {
-						const { done, value } = await reader.read();
-						if (done) break;
-
-						buffer += decoder.decode(value, { stream: true });
-						const events = buffer.split(/\r?\n\r?\n/);
-						buffer = events.pop() || "";
-
-						for (const event of events) {
-							const lines = event.split(/\r?\n/);
-							for (const line of lines) {
-								if (!line.startsWith("data: ")) continue;
-								const data = line.slice(6).trim();
-								if (!data || data === "[DONE]") continue;
-
-								try {
-									const parsed = JSON.parse(data);
-
+				for await (const parsed of readSSEStream(response)) {
 									switch (parsed.type) {
 										case "text-delta":
-											appendText(parsed.delta);
+											appendText(contentPartsState, parsed.delta);
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
 
 										case "tool-input-start":
 											// Add tool call inline - this breaks the current text segment
-											addToolCall(parsed.toolCallId, parsed.toolName, {});
+											addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
@@ -752,13 +626,13 @@ export default function NewChatPage() {
 										case "tool-input-available": {
 											// Update existing tool call's args, or add if not exists
 											if (toolCallIndices.has(parsed.toolCallId)) {
-												updateToolCall(parsed.toolCallId, { args: parsed.input || {} });
+												updateToolCall(contentPartsState, parsed.toolCallId, { args: parsed.input || {} });
 											} else {
-												addToolCall(parsed.toolCallId, parsed.toolName, parsed.input || {});
+												addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, parsed.input || {});
 											}
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
@@ -766,7 +640,7 @@ export default function NewChatPage() {
 
 										case "tool-output-available": {
 											// Update the tool call with its result
-											updateToolCall(parsed.toolCallId, { result: parsed.output });
+											updateToolCall(contentPartsState, parsed.toolCallId, { result: parsed.output });
 											// Handle podcast-specific logic
 											if (parsed.output?.status === "pending" && parsed.output?.podcast_id) {
 												// Check if this is a podcast tool by looking at the content part
@@ -780,7 +654,7 @@ export default function NewChatPage() {
 											}
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
@@ -843,20 +717,20 @@ export default function NewChatPage() {
 													}
 												);
 												if (existingIdx) {
-													updateToolCall(existingIdx[0], {
+													updateToolCall(contentPartsState, existingIdx[0], {
 														result: { __interrupt__: true, ...interruptData },
 													});
 												} else {
 													const tcId = `interrupt-${action.name}`;
-													addToolCall(tcId, action.name, action.args);
-													updateToolCall(tcId, {
+													addToolCall(contentPartsState, TOOLS_WITH_UI, tcId, action.name, action.args);
+													updateToolCall(contentPartsState, tcId, {
 														result: { __interrupt__: true, ...interruptData },
 													});
 												}
 											}
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											if (currentThreadId) {
@@ -872,20 +746,11 @@ export default function NewChatPage() {
 										case "error":
 											throw new Error(parsed.errorText || "Server error");
 								}
-							} catch (e) {
-								if (e instanceof SyntaxError) continue;
-								throw e;
-							}
-						}
-					}
-				}
-			} finally {
-					reader.releaseLock();
 				}
 
 				// Persist assistant message (with thinking steps for restoration on refresh)
 				// Skip persistence for interrupted messages -- handleResume will persist the final version
-				const finalContent = buildContentForPersistence();
+				const finalContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
 				if (contentParts.length > 0 && !wasInterrupted) {
 					try {
 						const savedMessage = await appendMessage(currentThreadId, {
@@ -933,7 +798,7 @@ export default function NewChatPage() {
 							(part.type === "tool-call" && TOOLS_WITH_UI.has(part.toolName))
 					);
 					if (hasContent && currentThreadId) {
-						const partialContent = buildContentForPersistence();
+						const partialContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
 						try {
 							const savedMessage = await appendMessage(currentThreadId, {
 								role: "assistant",
@@ -1019,18 +884,8 @@ export default function NewChatPage() {
 				(messageThinkingSteps.get(assistantMsgId) ?? []).map((s) => [s.id, s])
 			);
 
-			type ContentPart =
-				| { type: "text"; text: string }
-				| {
-						type: "tool-call";
-						toolCallId: string;
-						toolName: string;
-						args: Record<string, unknown>;
-						result?: unknown;
-				  };
-			const contentParts: ContentPart[] = [];
-			let currentTextPartIndex = -1;
-			const toolCallIndices = new Map<string, number>();
+			const contentPartsState: ContentPartsState = { contentParts: [], currentTextPartIndex: -1, toolCallIndices: new Map() };
+			const { contentParts, toolCallIndices } = contentPartsState;
 
 			const existingMsg = messages.find((m) => m.id === assistantMsgId);
 			if (existingMsg && Array.isArray(existingMsg.content)) {
@@ -1039,7 +894,7 @@ export default function NewChatPage() {
 						const p = part as Record<string, unknown>;
 						if (p.type === "text") {
 							contentParts.push({ type: "text", text: String(p.text ?? "") });
-							currentTextPartIndex = contentParts.length - 1;
+							contentPartsState.currentTextPartIndex = contentParts.length - 1;
 						} else if (p.type === "tool-call") {
 							toolCallIndices.set(String(p.toolCallId), contentParts.length);
 							contentParts.push({
@@ -1049,7 +904,7 @@ export default function NewChatPage() {
 								args: (p.args as Record<string, unknown>) ?? {},
 								result: p.result as unknown,
 							});
-							currentTextPartIndex = -1;
+							contentPartsState.currentTextPartIndex = -1;
 						}
 					}
 				}
@@ -1072,68 +927,7 @@ export default function NewChatPage() {
 				}
 			}
 
-			const appendText = (delta: string) => {
-				if (currentTextPartIndex >= 0 && contentParts[currentTextPartIndex]?.type === "text") {
-					(contentParts[currentTextPartIndex] as { type: "text"; text: string }).text += delta;
-				} else {
-					contentParts.push({ type: "text", text: delta });
-					currentTextPartIndex = contentParts.length - 1;
-				}
-			};
 
-			const addToolCall = (toolCallId: string, toolName: string, args: Record<string, unknown>) => {
-				if (TOOLS_WITH_UI.has(toolName)) {
-					contentParts.push({
-						type: "tool-call",
-						toolCallId,
-						toolName,
-						args,
-					});
-					toolCallIndices.set(toolCallId, contentParts.length - 1);
-					currentTextPartIndex = -1;
-				}
-			};
-
-			const updateToolCall = (
-				toolCallId: string,
-				update: { args?: Record<string, unknown>; result?: unknown }
-			) => {
-				const index = toolCallIndices.get(toolCallId);
-				if (index !== undefined && contentParts[index]?.type === "tool-call") {
-					const tc = contentParts[index] as ContentPart & { type: "tool-call" };
-					if (update.args) tc.args = update.args;
-					if (update.result !== undefined) tc.result = update.result;
-				}
-			};
-
-			const buildContentForUI = (): ThreadMessageLike["content"] => {
-				const filtered = contentParts.filter((part) => {
-					if (part.type === "text") return part.text.length > 0;
-					if (part.type === "tool-call") return TOOLS_WITH_UI.has(part.toolName);
-					return false;
-				});
-				return filtered.length > 0
-					? (filtered as ThreadMessageLike["content"])
-					: [{ type: "text", text: "" }];
-			};
-
-			const buildContentForPersistence = (): unknown[] => {
-				const parts: unknown[] = [];
-				if (currentThinkingSteps.size > 0) {
-					parts.push({
-						type: "thinking-steps",
-						steps: Array.from(currentThinkingSteps.values()),
-					});
-				}
-				for (const part of contentParts) {
-					if (part.type === "text" && part.text.length > 0) {
-						parts.push(part);
-					} else if (part.type === "tool-call" && TOOLS_WITH_UI.has(part.toolName)) {
-						parts.push(part);
-					}
-				}
-				return parts.length > 0 ? parts : [{ type: "text", text: "" }];
-			};
 
 			try {
 				const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
@@ -1154,74 +948,48 @@ export default function NewChatPage() {
 					throw new Error(`Backend error: ${response.status}`);
 				}
 
-				if (!response.body) {
-					throw new Error("No response body");
-				}
-
-				const reader = response.body.getReader();
-				const decoder = new TextDecoder();
-				let buffer = "";
-
-				try {
-					while (true) {
-						const { done, value } = await reader.read();
-						if (done) break;
-
-						buffer += decoder.decode(value, { stream: true });
-						const events = buffer.split(/\r?\n\r?\n/);
-						buffer = events.pop() || "";
-
-						for (const event of events) {
-							const lines = event.split(/\r?\n/);
-							for (const line of lines) {
-								if (!line.startsWith("data: ")) continue;
-								const data = line.slice(6).trim();
-								if (!data || data === "[DONE]") continue;
-
-								try {
-									const parsed = JSON.parse(data);
-
+				for await (const parsed of readSSEStream(response)) {
 									switch (parsed.type) {
 										case "text-delta":
-											appendText(parsed.delta);
+											appendText(contentPartsState, parsed.delta);
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
 
 										case "tool-input-start":
-											addToolCall(parsed.toolCallId, parsed.toolName, {});
+											addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
 
 										case "tool-input-available":
 											if (toolCallIndices.has(parsed.toolCallId)) {
-												updateToolCall(parsed.toolCallId, {
+												updateToolCall(contentPartsState, parsed.toolCallId, {
 													args: parsed.input || {},
 												});
 											} else {
-												addToolCall(parsed.toolCallId, parsed.toolName, parsed.input || {});
+												addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, parsed.input || {});
 											}
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
 
 										case "tool-output-available":
-											updateToolCall(parsed.toolCallId, {
+											updateToolCall(contentPartsState, parsed.toolCallId, {
 												result: parsed.output,
 											});
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
@@ -1253,7 +1021,7 @@ export default function NewChatPage() {
 													}
 												);
 												if (existingIdx) {
-													updateToolCall(existingIdx[0], {
+													updateToolCall(contentPartsState, existingIdx[0], {
 														result: {
 															__interrupt__: true,
 															...interruptData,
@@ -1261,8 +1029,8 @@ export default function NewChatPage() {
 													});
 												} else {
 													const tcId = `interrupt-${action.name}`;
-													addToolCall(tcId, action.name, action.args);
-													updateToolCall(tcId, {
+													addToolCall(contentPartsState, TOOLS_WITH_UI, tcId, action.name, action.args);
+													updateToolCall(contentPartsState, tcId, {
 														result: {
 															__interrupt__: true,
 															...interruptData,
@@ -1272,7 +1040,7 @@ export default function NewChatPage() {
 											}
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											setPendingInterrupt({
@@ -1285,19 +1053,10 @@ export default function NewChatPage() {
 
 										case "error":
 											throw new Error(parsed.errorText || "Server error");
-									}
-								} catch (e) {
-									if (e instanceof SyntaxError) continue;
-									throw e;
 								}
-							}
-						}
-					}
-				} finally {
-					reader.releaseLock();
 				}
 
-				const finalContent = buildContentForPersistence();
+				const finalContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
 				if (contentParts.length > 0) {
 					try {
 						const savedMessage = await appendMessage(resumeThreadId, {
@@ -1456,77 +1215,10 @@ export default function NewChatPage() {
 			const assistantMsgId = `msg-assistant-${Date.now()}`;
 			const currentThinkingSteps = new Map<string, ThinkingStepData>();
 
-			// Content parts tracking (same as onNew)
-			type ContentPart =
-				| { type: "text"; text: string }
-				| {
-						type: "tool-call";
-						toolCallId: string;
-						toolName: string;
-						args: Record<string, unknown>;
-						result?: unknown;
-				  };
-			const contentParts: ContentPart[] = [];
-			let currentTextPartIndex = -1;
-			const toolCallIndices = new Map<string, number>();
+			const contentPartsState: ContentPartsState = { contentParts: [], currentTextPartIndex: -1, toolCallIndices: new Map() };
+			const { contentParts, toolCallIndices } = contentPartsState;
 
-			const appendText = (delta: string) => {
-				if (currentTextPartIndex >= 0 && contentParts[currentTextPartIndex]?.type === "text") {
-					(contentParts[currentTextPartIndex] as { type: "text"; text: string }).text += delta;
-				} else {
-					contentParts.push({ type: "text", text: delta });
-					currentTextPartIndex = contentParts.length - 1;
-				}
-			};
 
-			const addToolCall = (toolCallId: string, toolName: string, args: Record<string, unknown>) => {
-				if (TOOLS_WITH_UI.has(toolName)) {
-					contentParts.push({ type: "tool-call", toolCallId, toolName, args });
-					toolCallIndices.set(toolCallId, contentParts.length - 1);
-					currentTextPartIndex = -1;
-				}
-			};
-
-			const updateToolCall = (
-				toolCallId: string,
-				update: { args?: Record<string, unknown>; result?: unknown }
-			) => {
-				const index = toolCallIndices.get(toolCallId);
-				if (index !== undefined && contentParts[index]?.type === "tool-call") {
-					const tc = contentParts[index] as ContentPart & { type: "tool-call" };
-					if (update.args) tc.args = update.args;
-					if (update.result !== undefined) tc.result = update.result;
-				}
-			};
-
-			const buildContentForUI = (): ThreadMessageLike["content"] => {
-				const filtered = contentParts.filter((part) => {
-					if (part.type === "text") return part.text.length > 0;
-					if (part.type === "tool-call") return TOOLS_WITH_UI.has(part.toolName);
-					return false;
-				});
-				return filtered.length > 0
-					? (filtered as ThreadMessageLike["content"])
-					: [{ type: "text", text: "" }];
-			};
-
-			const buildContentForPersistence = (): unknown[] => {
-				const parts: unknown[] = [];
-				if (currentThinkingSteps.size > 0) {
-					parts.push({
-						type: "thinking-steps",
-						steps: Array.from(currentThinkingSteps.values()),
-					});
-				}
-				for (const part of contentParts) {
-					if (part.type === "text" && part.text.length > 0) {
-						parts.push(part);
-					} else if (part.type === "tool-call" && TOOLS_WITH_UI.has(part.toolName)) {
-						parts.push(part);
-					}
-				}
-				return parts.length > 0 ? parts : [{ type: "text", text: "" }];
-			};
 
 			// Add placeholder messages to UI
 			// Always add back the user message (with new query for edit, or original content for reload)
@@ -1570,68 +1262,41 @@ export default function NewChatPage() {
 					throw new Error(`Backend error: ${response.status}`);
 				}
 
-				if (!response.body) {
-					throw new Error("No response body");
-				}
-
-				// Parse SSE stream (same logic as onNew)
-				const reader = response.body.getReader();
-				const decoder = new TextDecoder();
-				let buffer = "";
-
-				try {
-					while (true) {
-						const { done, value } = await reader.read();
-						if (done) break;
-
-						buffer += decoder.decode(value, { stream: true });
-						const events = buffer.split(/\r?\n\r?\n/);
-						buffer = events.pop() || "";
-
-						for (const event of events) {
-							const lines = event.split(/\r?\n/);
-							for (const line of lines) {
-								if (!line.startsWith("data: ")) continue;
-								const data = line.slice(6).trim();
-								if (!data || data === "[DONE]") continue;
-
-								try {
-									const parsed = JSON.parse(data);
-
+				for await (const parsed of readSSEStream(response)) {
 									switch (parsed.type) {
 										case "text-delta":
-											appendText(parsed.delta);
+											appendText(contentPartsState, parsed.delta);
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
 
 										case "tool-input-start":
-											addToolCall(parsed.toolCallId, parsed.toolName, {});
+											addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
 
 										case "tool-input-available":
 											if (toolCallIndices.has(parsed.toolCallId)) {
-												updateToolCall(parsed.toolCallId, { args: parsed.input || {} });
+												updateToolCall(contentPartsState, parsed.toolCallId, { args: parsed.input || {} });
 											} else {
-												addToolCall(parsed.toolCallId, parsed.toolName, parsed.input || {});
+												addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, parsed.input || {});
 											}
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
 
 										case "tool-output-available":
-											updateToolCall(parsed.toolCallId, { result: parsed.output });
+											updateToolCall(contentPartsState, parsed.toolCallId, { result: parsed.output });
 											if (parsed.output?.status === "pending" && parsed.output?.podcast_id) {
 												const idx = toolCallIndices.get(parsed.toolCallId);
 												if (idx !== undefined) {
@@ -1643,7 +1308,7 @@ export default function NewChatPage() {
 											}
 											setMessages((prev) =>
 												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI() } : m
+													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
 												)
 											);
 											break;
@@ -1663,20 +1328,11 @@ export default function NewChatPage() {
 
 										case "error":
 											throw new Error(parsed.errorText || "Server error");
-									}
-								} catch (e) {
-									if (e instanceof SyntaxError) continue;
-									throw e;
 								}
-							}
-						}
-					}
-				} finally {
-					reader.releaseLock();
 				}
 
 				// Persist messages after streaming completes
-				const finalContent = buildContentForPersistence();
+				const finalContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
 				if (contentParts.length > 0) {
 					try {
 						// Persist user message (for both edit and reload modes, since backend deleted it)
diff --git a/surfsense_web/lib/chat/streaming-state.ts b/surfsense_web/lib/chat/streaming-state.ts
new file mode 100644
index 000000000..7165cd9f3
--- /dev/null
+++ b/surfsense_web/lib/chat/streaming-state.ts
@@ -0,0 +1,184 @@
+import type { ThreadMessageLike } from "@assistant-ui/react";
+
+/**
+ * Extracted from page.tsx lines 131-136.
+ * Used across onNew, handleResume, and handleRegenerate.
+ */
+export interface ThinkingStepData {
+	id: string;
+	title: string;
+	status: "pending" | "in_progress" | "completed";
+	items: string[];
+}
+
+/**
+ * Extracted from page.tsx lines 537-545.
+ * Duplicated in onNew, handleResume, and handleRegenerate.
+ */
+export type ContentPart =
+	| { type: "text"; text: string }
+	| {
+			type: "tool-call";
+			toolCallId: string;
+			toolName: string;
+			args: Record<string, unknown>;
+			result?: unknown;
+	  };
+
+/**
+ * Mutable state shared by the content-part helpers (appendText, addToolCall, etc.).
+ * All handlers create this same set of variables -- this groups them into one object
+ * so helpers can read/write them by reference.
+ */
+export interface ContentPartsState {
+	contentParts: ContentPart[];
+	currentTextPartIndex: number;
+	toolCallIndices: Map<string, number>;
+}
+
+/**
+ * Extracted from page.tsx lines 556-573 (onNew).
+ * Identical in handleResume (lines 1057-1064) and handleRegenerate (lines 1445-1452).
+ */
+export function appendText(state: ContentPartsState, delta: string): void {
+	if (state.currentTextPartIndex >= 0 && state.contentParts[state.currentTextPartIndex]?.type === "text") {
+		(state.contentParts[state.currentTextPartIndex] as { type: "text"; text: string }).text += delta;
+	} else {
+		state.contentParts.push({ type: "text", text: delta });
+		state.currentTextPartIndex = state.contentParts.length - 1;
+	}
+}
+
+/**
+ * Extracted from page.tsx line 540 (onNew).
+ * Identical in handleResume (line 1029) and handleRegenerate (line 1407).
+ */
+export function addToolCall(
+	state: ContentPartsState,
+	toolsWithUI: Set<string>,
+	toolCallId: string,
+	toolName: string,
+	args: Record<string, unknown>
+): void {
+	if (toolsWithUI.has(toolName)) {
+		state.contentParts.push({
+			type: "tool-call",
+			toolCallId,
+			toolName,
+			args,
+		});
+		state.toolCallIndices.set(toolCallId, state.contentParts.length - 1);
+		state.currentTextPartIndex = -1;
+	}
+}
+
+/**
+ * Extracted from page.tsx line 540 (onNew).
+ * Identical in handleResume (line 1027) and handleRegenerate (line 1387).
+ */
+export function updateToolCall(
+	state: ContentPartsState,
+	toolCallId: string,
+	update: { args?: Record<string, unknown>; result?: unknown }
+): void {
+	const index = state.toolCallIndices.get(toolCallId);
+	if (index !== undefined && state.contentParts[index]?.type === "tool-call") {
+		const tc = state.contentParts[index] as ContentPart & { type: "tool-call" };
+		if (update.args) tc.args = update.args;
+		if (update.result !== undefined) tc.result = update.result;
+	}
+}
+
+/**
+ * Extracted from page.tsx line 539 (onNew).
+ * Identical in handleResume and handleRegenerate.
+ */
+export function buildContentForUI(
+	state: ContentPartsState,
+	toolsWithUI: Set<string>
+): ThreadMessageLike["content"] {
+	const filtered = state.contentParts.filter((part) => {
+		if (part.type === "text") return part.text.length > 0;
+		if (part.type === "tool-call") return toolsWithUI.has(part.toolName);
+		return false;
+	});
+	return filtered.length > 0
+		? (filtered as ThreadMessageLike["content"])
+		: [{ type: "text", text: "" }];
+}
+
+/**
+ * Extracted from page.tsx line 553 (onNew).
+ * Identical in handleResume and handleRegenerate.
+ */
+export function buildContentForPersistence(
+	state: ContentPartsState,
+	toolsWithUI: Set<string>,
+	currentThinkingSteps: Map<string, ThinkingStepData>
+): unknown[] {
+	const parts: unknown[] = [];
+
+	if (currentThinkingSteps.size > 0) {
+		parts.push({
+			type: "thinking-steps",
+			steps: Array.from(currentThinkingSteps.values()),
+		});
+	}
+
+	for (const part of state.contentParts) {
+		if (part.type === "text" && part.text.length > 0) {
+			parts.push(part);
+		} else if (part.type === "tool-call" && toolsWithUI.has(part.toolName)) {
+			parts.push(part);
+		}
+	}
+
+	return parts.length > 0 ? parts : [{ type: "text", text: "" }];
+}
+
+/**
+ * Async generator that reads an SSE stream and yields parsed JSON objects.
+ * Handles buffering, event splitting, and skips malformed JSON / [DONE] lines.
+ *
+ * Extracted from the identical SSE reading boilerplate in onNew, handleResume,
+ * and handleRegenerate.
+ */
+// biome-ignore lint/suspicious/noExplicitAny: matches JSON.parse return type
+export async function* readSSEStream(response: Response): AsyncGenerator<any> {
+	if (!response.body) {
+		throw new Error("No response body");
+	}
+
+	const reader = response.body.getReader();
+	const decoder = new TextDecoder();
+	let buffer = "";
+
+	try {
+		while (true) {
+			const { done, value } = await reader.read();
+			if (done) break;
+
+			buffer += decoder.decode(value, { stream: true });
+			const events = buffer.split(/\r?\n\r?\n/);
+			buffer = events.pop() || "";
+
+			for (const event of events) {
+				const lines = event.split(/\r?\n/);
+				for (const line of lines) {
+					if (!line.startsWith("data: ")) continue;
+					const data = line.slice(6).trim();
+					if (!data || data === "[DONE]") continue;
+
+					try {
+						yield JSON.parse(data);
+					} catch (e) {
+						if (e instanceof SyntaxError) continue;
+						throw e;
+					}
+				}
+			}
+		}
+	} finally {
+		reader.releaseLock();
+	}
+}

From 2ef24740587ccddfd6fe010d95d2e12e2bdf88d7 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 15:43:07 +0200
Subject: [PATCH 08/42] add HITL tool argument editing with approval UI

Enables users to edit tool call arguments before execution in human-in-the-loop
workflows. Adds edit mode UI with form fields, grayscale styling, and subtle
pulse animations for pending approvals. Backend stub enhanced to verify edited
arguments are correctly passed through.
---
 .../new_chat/tools/create_notion_page.py      |  13 +-
 .../new-chat/[[...chat_id]]/page.tsx          |  28 ++-
 surfsense_web/app/globals.css                 |  16 ++
 .../components/tool-ui/create-notion-page.tsx | 186 +++++++++++++++---
 surfsense_web/lib/chat/streaming-state.ts     |  44 +----
 5 files changed, 216 insertions(+), 71 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py b/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
index bc3d2b81f..bbbab81c3 100644
--- a/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
@@ -1,3 +1,4 @@
+import hashlib
 from typing import Any
 
 from langchain_core.tools import tool
@@ -19,11 +20,19 @@ def create_create_notion_page_tool():
             title: The title of the Notion page.
             content: The markdown content for the page body.
         """
+        # Generate a unique page ID based on title for testing
+        # This helps verify if edited args were used
+        page_hash = hashlib.md5(title.encode()).hexdigest()[:8]
+        
+        # Return detailed response showing what was actually received
         return {
             "status": "success",
-            "page_id": "stub-page-id-12345",
+            "page_id": f"stub-page-{page_hash}",
             "title": title,
-            "url": "https://www.notion.so/stub-page-12345",
+            "content_preview": content[:100] + "..." if len(content) > 100 else content,
+            "content_length": len(content),
+            "url": f"https://www.notion.so/stub-page-{page_hash}",
+            "message": f"✅ Created Notion page '{title}' with {len(content)} characters",
         }
 
     return create_notion_page
diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index 448148229..045626307 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -864,7 +864,7 @@ export default function NewChatPage() {
 	);
 
 	const handleResume = useCallback(
-		async (decisions: Array<{ type: string; message?: string }>) => {
+		async (decisions: Array<{ type: string; message?: string; edited_action?: { name: string; args: Record<string, unknown> } }>) => {
 			if (!pendingInterrupt) return;
 			const { threadId: resumeThreadId, assistantMsgId } = pendingInterrupt;
 			setPendingInterrupt(null);
@@ -1098,10 +1098,16 @@ export default function NewChatPage() {
 	useEffect(() => {
 		const handler = (e: Event) => {
 			const detail = (e as CustomEvent).detail as {
-				decisions: Array<{ type: string; message?: string }>;
+				decisions: Array<{ 
+					type: string; 
+					message?: string; 
+					edited_action?: { name: string; args: Record<string, unknown> };
+				}>;
 			};
 			if (detail?.decisions && pendingInterrupt) {
-				const decisionType = detail.decisions[0]?.type as "approve" | "reject";
+				const decision = detail.decisions[0];
+				const decisionType = decision?.type as "approve" | "reject" | "edit";
+				
 				setMessages((prev) =>
 					prev.map((m) => {
 						if (m.id !== pendingInterrupt.assistantMsgId) return m;
@@ -1113,9 +1119,23 @@ export default function NewChatPage() {
 								part.result !== null &&
 								"__interrupt__" in part.result
 							) {
+								// For edit decisions, also update the displayed args
+								if (decisionType === "edit" && decision.edited_action) {
+									return {
+										...part,
+										args: decision.edited_action.args,  // Update displayed args
+										result: { 
+											...(part.result as Record<string, unknown>), 
+											__decided__: decisionType 
+										},
+									};
+								}
 								return {
 									...part,
-									result: { ...(part.result as Record<string, unknown>), __decided__: decisionType },
+									result: { 
+										...(part.result as Record<string, unknown>), 
+										__decided__: decisionType 
+									},
 								};
 							}
 							return part;
diff --git a/surfsense_web/app/globals.css b/surfsense_web/app/globals.css
index cf6f48437..475bcb1b4 100644
--- a/surfsense_web/app/globals.css
+++ b/surfsense_web/app/globals.css
@@ -187,5 +187,21 @@ button {
 	background-color: hsl(var(--muted-foreground) / 0.4);
 }
 
+/* Human-in-the-loop approval card animations */
+@keyframes pulse-subtle {
+	0%, 100% {
+		opacity: 1;
+		box-shadow: 0 0 0 0 rgb(0 0 0 / 0.15);
+	}
+	50% {
+		opacity: 1;
+		box-shadow: 0 0 20px 4px rgb(0 0 0 / 0.12);
+	}
+}
+
+.animate-pulse-subtle {
+	animation: pulse-subtle 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+}
+
 @source '../node_modules/@llamaindex/chat-ui/**/*.{ts,tsx}';
 @source '../node_modules/streamdown/dist/*.js';
diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
index 9f69067b1..a1cf67109 100644
--- a/surfsense_web/components/tool-ui/create-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -1,13 +1,15 @@
 "use client";
 
 import { makeAssistantToolUI } from "@assistant-ui/react";
-import { CheckIcon, FileTextIcon, Loader2Icon, XIcon } from "lucide-react";
+import { AlertTriangleIcon, CheckIcon, FileTextIcon, Loader2Icon, PencilIcon, XIcon } from "lucide-react";
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
 
 interface InterruptResult {
 	__interrupt__: true;
-	__decided__?: "approve" | "reject";
+	__decided__?: "approve" | "reject" | "edit";
 	action_requests: Array<{
 		name: string;
 		args: Record<string, unknown>;
@@ -24,6 +26,9 @@ interface SuccessResult {
 	page_id: string;
 	title: string;
 	url: string;
+	content_preview?: string;
+	content_length?: number;
+	message?: string;
 }
 
 type CreateNotionPageResult = InterruptResult | SuccessResult;
@@ -44,50 +49,114 @@ function ApprovalCard({
 }: {
 	args: Record<string, unknown>;
 	interruptData: InterruptResult;
-	onDecision: (decision: { type: "approve" | "reject"; message?: string }) => void;
+	onDecision: (decision: { type: "approve" | "reject" | "edit"; message?: string; edited_action?: { name: string; args: Record<string, unknown> } }) => void;
 }) {
-	const [decided, setDecided] = useState<"approve" | "reject" | null>(
+	const [decided, setDecided] = useState<"approve" | "reject" | "edit" | null>(
 		interruptData.__decided__ ?? null
 	);
+	const [isEditing, setIsEditing] = useState(false);
+	const [editedArgs, setEditedArgs] = useState<Record<string, unknown>>(args);
+	
 	const reviewConfig = interruptData.review_configs[0];
 	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
+	const canEdit = allowedDecisions.includes("edit");
 
 	return (
-		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
-			<div className="flex items-center gap-3 border-b border-border px-4 py-3">
-				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-primary/10">
-					<FileTextIcon className="size-4 text-primary" />
+		<div className={`my-4 max-w-full overflow-hidden rounded-xl transition-all duration-300 ${
+			decided 
+				? "border border-border bg-card shadow-sm" 
+				: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
+		}`}>
+			<div className={`flex items-center gap-3 border-b ${
+				decided
+					? "border-border bg-card"
+					: "border-foreground/15 bg-muted/40 dark:bg-muted/20"
+			} px-4 py-3`}>
+				<div className={`flex size-9 shrink-0 items-center justify-center rounded-lg ${
+					decided
+						? "bg-muted"
+						: "bg-muted animate-pulse"
+				}`}>
+					<AlertTriangleIcon className={`size-4 ${
+						decided
+							? "text-muted-foreground"
+							: "text-foreground"
+					}`} />
 				</div>
 				<div className="min-w-0 flex-1">
-					<p className="text-sm font-medium">Create Notion Page</p>
-					<p className="truncate text-xs text-muted-foreground">
-						Requires your approval to proceed
+					<p className={`text-sm font-medium ${
+						decided
+							? "text-foreground"
+							: "text-foreground"
+					}`}>Create Notion Page</p>
+					<p className={`truncate text-xs ${
+						decided
+							? "text-muted-foreground"
+							: "text-muted-foreground"
+					}`}>
+						{isEditing ? "You can edit the arguments below" : "Requires your approval to proceed"}
 					</p>
 				</div>
 			</div>
 
-		<div className="space-y-2 px-4 py-3">
-			{args.title != null && (
-				<div>
-					<p className="text-xs font-medium text-muted-foreground">Title</p>
-					<p className="text-sm">{String(args.title)}</p>
+			{/* Display mode - show args as read-only */}
+			{!isEditing && (
+				<div className="space-y-2 px-4 py-3 bg-card">
+					{args.title != null && (
+						<div>
+							<p className="text-xs font-medium text-muted-foreground">Title</p>
+							<p className="text-sm text-foreground">{String(args.title)}</p>
+						</div>
+					)}
+					{args.content != null && (
+						<div>
+							<p className="text-xs font-medium text-muted-foreground">Content</p>
+							<p className="line-clamp-4 text-sm whitespace-pre-wrap text-foreground">{String(args.content)}</p>
+						</div>
+					)}
 				</div>
 			)}
-			{args.content != null && (
-				<div>
-					<p className="text-xs font-medium text-muted-foreground">Content</p>
-					<p className="line-clamp-4 text-sm whitespace-pre-wrap">{String(args.content)}</p>
-				</div>
-			)}
-		</div>
 
-			<div className="flex items-center gap-2 border-t border-border px-4 py-3">
+			{/* Edit mode - show editable form fields */}
+			{isEditing && (
+				<div className="space-y-3 px-4 py-3 bg-card">
+					<div>
+						<label className="text-xs font-medium text-muted-foreground mb-1.5 block">
+							Title
+						</label>
+						<Input
+							value={String(editedArgs.title ?? "")}
+							onChange={(e) => setEditedArgs({ ...editedArgs, title: e.target.value })}
+							placeholder="Enter page title"
+						/>
+					</div>
+					<div>
+						<label className="text-xs font-medium text-muted-foreground mb-1.5 block">
+							Content
+						</label>
+						<Textarea
+							value={String(editedArgs.content ?? "")}
+							onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value })}
+							placeholder="Enter page content"
+							rows={6}
+							className="resize-none"
+						/>
+					</div>
+				</div>
+			)}
+
+			{/* Action buttons */}
+			<div className={`flex items-center gap-2 border-t ${
+				decided
+					? "border-border bg-card"
+					: "border-foreground/15 bg-muted/20 dark:bg-muted/10"
+			} px-4 py-3`}>
 				{decided ? (
 					<p className="flex items-center gap-1.5 text-sm text-muted-foreground">
-						{decided === "approve" ? (
+						{decided === "approve" || decided === "edit" ? (
 							<>
 								<CheckIcon className="size-3.5 text-green-500" />
-								Approved
+								{decided === "edit" ? "Approved with Changes" : "Approved"}
 							</>
 						) : (
 							<>
@@ -96,6 +165,35 @@ function ApprovalCard({
 							</>
 						)}
 					</p>
+				) : isEditing ? (
+					<>
+						<Button
+							size="sm"
+							onClick={() => {
+								setDecided("edit");
+								onDecision({
+									type: "edit",
+									edited_action: {
+										name: interruptData.action_requests[0].name,
+										args: editedArgs,
+									},
+								});
+							}}
+						>
+							<CheckIcon />
+							Approve with Changes
+						</Button>
+						<Button
+							size="sm"
+							variant="outline"
+							onClick={() => {
+								setIsEditing(false);
+								setEditedArgs(args); // Reset to original args
+							}}
+						>
+							Cancel
+						</Button>
+					</>
 				) : (
 					<>
 						{allowedDecisions.includes("approve") && (
@@ -110,6 +208,16 @@ function ApprovalCard({
 								Approve
 							</Button>
 						)}
+						{canEdit && (
+							<Button
+								size="sm"
+								variant="outline"
+								onClick={() => setIsEditing(true)}
+							>
+								<PencilIcon />
+								Edit
+							</Button>
+						)}
 						{allowedDecisions.includes("reject") && (
 							<Button
 								size="sm"
@@ -133,15 +241,37 @@ function ApprovalCard({
 function SuccessCard({ result }: { result: SuccessResult }) {
 	return (
 		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
-			<div className="flex items-center gap-3 px-4 py-3">
+			<div className="flex items-center gap-3 border-b border-border px-4 py-3">
 				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-green-500/10">
 					<CheckIcon className="size-4 text-green-500" />
 				</div>
 				<div className="min-w-0 flex-1">
 					<p className="text-sm font-medium">{result.title}</p>
-					<p className="text-xs text-muted-foreground">Notion page created</p>
+					<p className="text-xs text-muted-foreground">
+						{result.message || "Notion page created successfully"}
+					</p>
 				</div>
 			</div>
+			
+			{/* Show details to verify the arguments were used */}
+			<div className="space-y-2 px-4 py-3 text-xs">
+				<div>
+					<span className="font-medium text-muted-foreground">Page ID: </span>
+					<span className="font-mono">{result.page_id}</span>
+				</div>
+				{result.content_length != null && (
+					<div>
+						<span className="font-medium text-muted-foreground">Content: </span>
+						<span>{result.content_length} characters</span>
+					</div>
+				)}
+				{result.content_preview && (
+					<div>
+						<span className="font-medium text-muted-foreground">Preview: </span>
+						<span className="text-muted-foreground italic">{result.content_preview}</span>
+					</div>
+				)}
+			</div>
 		</div>
 	);
 }
diff --git a/surfsense_web/lib/chat/streaming-state.ts b/surfsense_web/lib/chat/streaming-state.ts
index 7165cd9f3..e6385bf9c 100644
--- a/surfsense_web/lib/chat/streaming-state.ts
+++ b/surfsense_web/lib/chat/streaming-state.ts
@@ -1,9 +1,5 @@
 import type { ThreadMessageLike } from "@assistant-ui/react";
 
-/**
- * Extracted from page.tsx lines 131-136.
- * Used across onNew, handleResume, and handleRegenerate.
- */
 export interface ThinkingStepData {
 	id: string;
 	title: string;
@@ -11,10 +7,7 @@ export interface ThinkingStepData {
 	items: string[];
 }
 
-/**
- * Extracted from page.tsx lines 537-545.
- * Duplicated in onNew, handleResume, and handleRegenerate.
- */
+
 export type ContentPart =
 	| { type: "text"; text: string }
 	| {
@@ -25,21 +18,14 @@ export type ContentPart =
 			result?: unknown;
 	  };
 
-/**
- * Mutable state shared by the content-part helpers (appendText, addToolCall, etc.).
- * All handlers create this same set of variables -- this groups them into one object
- * so helpers can read/write them by reference.
- */
+
 export interface ContentPartsState {
 	contentParts: ContentPart[];
 	currentTextPartIndex: number;
 	toolCallIndices: Map<string, number>;
 }
 
-/**
- * Extracted from page.tsx lines 556-573 (onNew).
- * Identical in handleResume (lines 1057-1064) and handleRegenerate (lines 1445-1452).
- */
+
 export function appendText(state: ContentPartsState, delta: string): void {
 	if (state.currentTextPartIndex >= 0 && state.contentParts[state.currentTextPartIndex]?.type === "text") {
 		(state.contentParts[state.currentTextPartIndex] as { type: "text"; text: string }).text += delta;
@@ -49,10 +35,7 @@ export function appendText(state: ContentPartsState, delta: string): void {
 	}
 }
 
-/**
- * Extracted from page.tsx line 540 (onNew).
- * Identical in handleResume (line 1029) and handleRegenerate (line 1407).
- */
+
 export function addToolCall(
 	state: ContentPartsState,
 	toolsWithUI: Set<string>,
@@ -72,10 +55,7 @@ export function addToolCall(
 	}
 }
 
-/**
- * Extracted from page.tsx line 540 (onNew).
- * Identical in handleResume (line 1027) and handleRegenerate (line 1387).
- */
+
 export function updateToolCall(
 	state: ContentPartsState,
 	toolCallId: string,
@@ -89,10 +69,7 @@ export function updateToolCall(
 	}
 }
 
-/**
- * Extracted from page.tsx line 539 (onNew).
- * Identical in handleResume and handleRegenerate.
- */
+
 export function buildContentForUI(
 	state: ContentPartsState,
 	toolsWithUI: Set<string>
@@ -107,10 +84,7 @@ export function buildContentForUI(
 		: [{ type: "text", text: "" }];
 }
 
-/**
- * Extracted from page.tsx line 553 (onNew).
- * Identical in handleResume and handleRegenerate.
- */
+
 export function buildContentForPersistence(
 	state: ContentPartsState,
 	toolsWithUI: Set<string>,
@@ -139,11 +113,7 @@ export function buildContentForPersistence(
 /**
  * Async generator that reads an SSE stream and yields parsed JSON objects.
  * Handles buffering, event splitting, and skips malformed JSON / [DONE] lines.
- *
- * Extracted from the identical SSE reading boilerplate in onNew, handleResume,
- * and handleRegenerate.
  */
-// biome-ignore lint/suspicious/noExplicitAny: matches JSON.parse return type
 export async function* readSSEStream(response: Response): AsyncGenerator<any> {
 	if (!response.body) {
 		throw new Error("No response body");

From c492505876cb41bdf90f248afc34dd4489c8af89 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 16:11:46 +0200
Subject: [PATCH 09/42] add write operations to notion connector

---
 .../app/connectors/notion_history.py          | 300 ++++++++++++++++++
 1 file changed, 300 insertions(+)

diff --git a/surfsense_backend/app/connectors/notion_history.py b/surfsense_backend/app/connectors/notion_history.py
index 525b0b4c3..b560ee20e 100644
--- a/surfsense_backend/app/connectors/notion_history.py
+++ b/surfsense_backend/app/connectors/notion_history.py
@@ -777,3 +777,303 @@ class NotionHistoryConnector:
 
         # Return empty string for unsupported block types
         return ""
+
+    # =========================================================================
+    # WRITE OPERATIONS (create, update, delete pages)
+    # =========================================================================
+
+    def _markdown_to_blocks(self, markdown: str) -> list[dict[str, Any]]:
+        """
+        Convert markdown content to Notion blocks.
+
+        This is a simple converter that handles basic markdown.
+        For more complex markdown, consider using a proper markdown parser.
+
+        Args:
+            markdown: Markdown content
+
+        Returns:
+            List of Notion block objects
+        """
+        blocks = []
+        lines = markdown.split("\n")
+
+        for line in lines:
+            line = line.strip()
+
+            if not line:
+                continue
+
+            # Heading 1
+            if line.startswith("# "):
+                blocks.append({
+                    "object": "block",
+                    "type": "heading_1",
+                    "heading_1": {
+                        "rich_text": [{"type": "text", "text": {"content": line[2:]}}]
+                    },
+                })
+            # Heading 2
+            elif line.startswith("## "):
+                blocks.append({
+                    "object": "block",
+                    "type": "heading_2",
+                    "heading_2": {
+                        "rich_text": [{"type": "text", "text": {"content": line[3:]}}]
+                    },
+                })
+            # Heading 3
+            elif line.startswith("### "):
+                blocks.append({
+                    "object": "block",
+                    "type": "heading_3",
+                    "heading_3": {
+                        "rich_text": [{"type": "text", "text": {"content": line[4:]}}]
+                    },
+                })
+            # Bullet list
+            elif line.startswith("- ") or line.startswith("* "):
+                blocks.append({
+                    "object": "block",
+                    "type": "bulleted_list_item",
+                    "bulleted_list_item": {
+                        "rich_text": [{"type": "text", "text": {"content": line[2:]}}]
+                    },
+                })
+            # Numbered list
+            elif len(line) > 2 and line[0].isdigit() and line[1:3] == ". ":
+                blocks.append({
+                    "object": "block",
+                    "type": "numbered_list_item",
+                    "numbered_list_item": {
+                        "rich_text": [{"type": "text", "text": {"content": line[3:]}}]
+                    },
+                })
+            # Regular paragraph
+            else:
+                blocks.append({
+                    "object": "block",
+                    "type": "paragraph",
+                    "paragraph": {
+                        "rich_text": [{"type": "text", "text": {"content": line}}]
+                    },
+                })
+
+        return blocks
+
+    async def create_page(
+        self, title: str, content: str, parent_page_id: str | None = None
+    ) -> dict[str, Any]:
+        """
+        Create a new Notion page.
+
+        Args:
+            title: Page title
+            content: Page content (markdown format)
+            parent_page_id: Optional parent page ID (creates as subpage if provided)
+
+        Returns:
+            Dictionary with page details:
+            - page_id: Created page ID
+            - url: Page URL
+            - title: Page title
+            - status: "success" or "error"
+            - message: Success/error message
+
+        Raises:
+            APIResponseError: If Notion API returns an error
+        """
+        try:
+            # Get Notion client
+            notion = await self._get_notion_client()
+
+            # Convert markdown content to Notion blocks
+            children = self._markdown_to_blocks(content)
+
+            # Prepare parent
+            if parent_page_id:
+                parent = {"type": "page_id", "page_id": parent_page_id}
+            else:
+                # Try to use workspace root
+                # Note: This requires proper permissions
+                result = await self._session.execute(
+                    select(SearchSourceConnector).filter(
+                        SearchSourceConnector.id == self._connector_id
+                    )
+                )
+                connector = result.scalars().first()
+                if connector and connector.config.get("workspace_id"):
+                    parent = {"type": "workspace", "workspace": True}
+                else:
+                    raise ValueError(
+                        "parent_page_id is required. "
+                        "Please specify a parent page where the new page should be created."
+                    )
+
+            # Create the page
+            response = await notion.pages.create(
+                parent=parent,
+                properties={
+                    "title": {
+                        "title": [{"type": "text", "text": {"content": title}}]
+                    }
+                },
+                children=children[:100],  # Notion API limit: 100 blocks per request
+            )
+
+            page_id = response["id"]
+            page_url = response["url"]
+
+            # If content has more than 100 blocks, append them
+            if len(children) > 100:
+                for i in range(100, len(children), 100):
+                    batch = children[i : i + 100]
+                    await notion.blocks.children.append(
+                        block_id=page_id, children=batch
+                    )
+
+            return {
+                "status": "success",
+                "page_id": page_id,
+                "url": page_url,
+                "title": title,
+                "message": f"✅ Created Notion page '{title}'",
+            }
+
+        except APIResponseError as e:
+            logger.error(f"Notion API error creating page: {e}")
+            error_msg = e.body.get("message", str(e)) if hasattr(e, "body") else str(e)
+            return {
+                "status": "error",
+                "message": f"Failed to create Notion page: {error_msg}",
+            }
+        except Exception as e:
+            logger.error(f"Unexpected error creating Notion page: {e}")
+            return {
+                "status": "error",
+                "message": f"Failed to create Notion page: {str(e)}",
+            }
+
+    async def update_page(
+        self, page_id: str, title: str | None = None, content: str | None = None
+    ) -> dict[str, Any]:
+        """
+        Update an existing Notion page.
+
+        Args:
+            page_id: Page ID to update
+            title: New page title (optional)
+            content: New page content in markdown (optional)
+
+        Returns:
+            Dictionary with update result
+
+        Raises:
+            APIResponseError: If Notion API returns an error
+        """
+        try:
+            notion = await self._get_notion_client()
+
+            # Update title if provided
+            if title:
+                await notion.pages.update(
+                    page_id=page_id,
+                    properties={
+                        "title": {
+                            "title": [{"type": "text", "text": {"content": title}}]
+                        }
+                    },
+                )
+
+            # Update content if provided
+            if content:
+                # First, get existing blocks
+                existing_blocks = await notion.blocks.children.list(block_id=page_id)
+
+                # Delete existing blocks
+                for block in existing_blocks.get("results", []):
+                    await notion.blocks.delete(block_id=block["id"])
+
+                # Add new content
+                children = self._markdown_to_blocks(content)
+                for i in range(0, len(children), 100):
+                    batch = children[i : i + 100]
+                    await notion.blocks.children.append(
+                        block_id=page_id, children=batch
+                    )
+
+            # Get updated page
+            response = await notion.pages.retrieve(page_id=page_id)
+            page_url = response["url"]
+            page_title = response["properties"]["title"]["title"][0]["text"]["content"]
+
+            return {
+                "status": "success",
+                "page_id": page_id,
+                "url": page_url,
+                "title": page_title,
+                "message": f"✅ Updated Notion page '{page_title}'",
+            }
+
+        except APIResponseError as e:
+            logger.error(f"Notion API error updating page: {e}")
+            error_msg = e.body.get("message", str(e)) if hasattr(e, "body") else str(e)
+            return {
+                "status": "error",
+                "message": f"Failed to update Notion page: {error_msg}",
+            }
+        except Exception as e:
+            logger.error(f"Unexpected error updating Notion page: {e}")
+            return {
+                "status": "error",
+                "message": f"Failed to update Notion page: {str(e)}",
+            }
+
+    async def delete_page(self, page_id: str) -> dict[str, Any]:
+        """
+        Delete (archive) a Notion page.
+
+        Note: Notion doesn't truly delete pages, it archives them.
+
+        Args:
+            page_id: Page ID to delete
+
+        Returns:
+            Dictionary with deletion result
+
+        Raises:
+            APIResponseError: If Notion API returns an error
+        """
+        try:
+            notion = await self._get_notion_client()
+
+            # Archive the page (Notion's way of "deleting")
+            response = await notion.pages.update(page_id=page_id, archived=True)
+
+            page_title = "Unknown"
+            try:
+                page_title = response["properties"]["title"]["title"][0]["text"][
+                    "content"
+                ]
+            except (KeyError, IndexError):
+                pass
+
+            return {
+                "status": "success",
+                "page_id": page_id,
+                "message": f"✅ Deleted Notion page '{page_title}'",
+            }
+
+        except APIResponseError as e:
+            logger.error(f"Notion API error deleting page: {e}")
+            error_msg = e.body.get("message", str(e)) if hasattr(e, "body") else str(e)
+            return {
+                "status": "error",
+                "message": f"Failed to delete Notion page: {error_msg}",
+            }
+        except Exception as e:
+            logger.error(f"Unexpected error deleting Notion page: {e}")
+            return {
+                "status": "error",
+                "message": f"Failed to delete Notion page: {str(e)}",
+            }

From 8649ca7ac017764b13bc289769307d14dcdf3c3d Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 16:11:53 +0200
Subject: [PATCH 10/42] add notion tools for create/update/delete pages

---
 .../new_chat/tools/create_notion_page.py      |  38 ------
 .../agents/new_chat/tools/notion/__init__.py  |  11 ++
 .../new_chat/tools/notion/create_page.py      | 110 +++++++++++++++++
 .../new_chat/tools/notion/delete_page.py      | 102 +++++++++++++++
 .../new_chat/tools/notion/update_page.py      | 116 ++++++++++++++++++
 .../app/agents/new_chat/tools/registry.py     |  33 ++++-
 6 files changed, 368 insertions(+), 42 deletions(-)
 delete mode 100644 surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
 create mode 100644 surfsense_backend/app/agents/new_chat/tools/notion/__init__.py
 create mode 100644 surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
 create mode 100644 surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
 create mode 100644 surfsense_backend/app/agents/new_chat/tools/notion/update_page.py

diff --git a/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py b/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
deleted file mode 100644
index bbbab81c3..000000000
--- a/surfsense_backend/app/agents/new_chat/tools/create_notion_page.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import hashlib
-from typing import Any
-
-from langchain_core.tools import tool
-
-
-def create_create_notion_page_tool():
-    @tool
-    async def create_notion_page(
-        title: str,
-        content: str,
-    ) -> dict[str, Any]:
-        """Create a new page in Notion with the given title and content.
-
-        Use this tool when the user asks you to create, save, or publish
-        something to Notion. The page will be created in the user's
-        configured Notion workspace.
-
-        Args:
-            title: The title of the Notion page.
-            content: The markdown content for the page body.
-        """
-        # Generate a unique page ID based on title for testing
-        # This helps verify if edited args were used
-        page_hash = hashlib.md5(title.encode()).hexdigest()[:8]
-        
-        # Return detailed response showing what was actually received
-        return {
-            "status": "success",
-            "page_id": f"stub-page-{page_hash}",
-            "title": title,
-            "content_preview": content[:100] + "..." if len(content) > 100 else content,
-            "content_length": len(content),
-            "url": f"https://www.notion.so/stub-page-{page_hash}",
-            "message": f"✅ Created Notion page '{title}' with {len(content)} characters",
-        }
-
-    return create_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/__init__.py b/surfsense_backend/app/agents/new_chat/tools/notion/__init__.py
new file mode 100644
index 000000000..97d66b84b
--- /dev/null
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/__init__.py
@@ -0,0 +1,11 @@
+"""Notion tools for creating, updating, and deleting pages."""
+
+from .create_page import create_create_notion_page_tool
+from .delete_page import create_delete_notion_page_tool
+from .update_page import create_update_notion_page_tool
+
+__all__ = [
+    "create_create_notion_page_tool",
+    "create_update_notion_page_tool",
+    "create_delete_notion_page_tool",
+]
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
new file mode 100644
index 000000000..0f4ea1784
--- /dev/null
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -0,0 +1,110 @@
+from typing import Any
+
+from langchain_core.tools import tool
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.connectors.notion_history import NotionHistoryConnector
+
+
+def create_create_notion_page_tool(
+    db_session: AsyncSession | None = None,
+    search_space_id: int | None = None,
+    connector_id: int | None = None,
+):
+    """
+    Factory function to create the create_notion_page tool.
+
+    Args:
+        db_session: Database session for accessing Notion connector
+        search_space_id: Search space ID to find the Notion connector
+        connector_id: Optional specific connector ID (if known)
+
+    Returns:
+        Configured create_notion_page tool
+    """
+
+    @tool
+    async def create_notion_page(
+        title: str,
+        content: str,
+        parent_page_id: str | None = None,
+    ) -> dict[str, Any]:
+        """Create a new page in Notion with the given title and content.
+
+        Use this tool when the user asks you to create, save, or publish
+        something to Notion. The page will be created in the user's
+        configured Notion workspace.
+
+        Args:
+            title: The title of the Notion page.
+            content: The markdown content for the page body (supports headings, lists, paragraphs).
+            parent_page_id: Optional parent page ID to create as a subpage.
+                           If not provided, will ask for one.
+
+        Returns:
+            Dictionary with:
+            - status: "success" or "error"
+            - page_id: Created page ID
+            - url: URL to the created page
+            - title: Page title
+            - message: Success or error message
+
+        Examples:
+            - "Create a Notion page titled 'Meeting Notes' with content 'Discussed project timeline'"
+            - "Save this to Notion with title 'Research Summary'"
+        """
+        if db_session is None or search_space_id is None:
+            return {
+                "status": "error",
+                "message": "Notion tool not properly configured. Please contact support.",
+            }
+
+        try:
+            # Get connector ID if not provided
+            if connector_id is None:
+                from sqlalchemy.future import select
+
+                from app.db import SearchSourceConnector, SearchSourceConnectorType
+
+                result = await db_session.execute(
+                    select(SearchSourceConnector).filter(
+                        SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.connector_type
+                        == SearchSourceConnectorType.NOTION_CONNECTOR,
+                        SearchSourceConnector.is_enabled == True,
+                    )
+                )
+                connector = result.scalars().first()
+
+                if not connector:
+                    return {
+                        "status": "error",
+                        "message": "No Notion connector found. Please connect Notion in your workspace settings.",
+                    }
+
+                connector_id = connector.id
+
+            # Create connector instance
+            notion_connector = NotionHistoryConnector(
+                session=db_session,
+                connector_id=connector_id,
+            )
+
+            # Create the page
+            result = await notion_connector.create_page(
+                title=title, content=content, parent_page_id=parent_page_id
+            )
+            return result
+
+        except ValueError as e:
+            return {
+                "status": "error",
+                "message": str(e),
+            }
+        except Exception as e:
+            return {
+                "status": "error",
+                "message": f"Unexpected error creating Notion page: {str(e)}",
+            }
+
+    return create_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
new file mode 100644
index 000000000..18cc21da7
--- /dev/null
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
@@ -0,0 +1,102 @@
+from typing import Any
+
+from langchain_core.tools import tool
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.connectors.notion_history import NotionHistoryConnector
+
+
+def create_delete_notion_page_tool(
+    db_session: AsyncSession | None = None,
+    search_space_id: int | None = None,
+    connector_id: int | None = None,
+):
+    """
+    Factory function to create the delete_notion_page tool.
+
+    Args:
+        db_session: Database session for accessing Notion connector
+        search_space_id: Search space ID to find the Notion connector
+        connector_id: Optional specific connector ID (if known)
+
+    Returns:
+        Configured delete_notion_page tool
+    """
+
+    @tool
+    async def delete_notion_page(
+        page_id: str,
+    ) -> dict[str, Any]:
+        """Delete (archive) a Notion page.
+
+        Use this tool when the user asks you to delete, remove, or archive
+        a Notion page. Note that Notion doesn't permanently delete pages,
+        it archives them (they can be restored from trash).
+
+        Args:
+            page_id: The ID of the Notion page to delete (required).
+
+        Returns:
+            Dictionary with:
+            - status: "success" or "error"
+            - page_id: Deleted page ID
+            - message: Success or error message
+
+        Examples:
+            - "Delete the Notion page abc123"
+            - "Remove the page xyz789 from Notion"
+            - "Archive this Notion page: abc123"
+        """
+        if db_session is None or search_space_id is None:
+            return {
+                "status": "error",
+                "message": "Notion tool not properly configured. Please contact support.",
+            }
+
+        try:
+            # Get connector ID if not provided
+            if connector_id is None:
+                from sqlalchemy.future import select
+
+                from app.db import SearchSourceConnector, SearchSourceConnectorType
+
+                result = await db_session.execute(
+                    select(SearchSourceConnector).filter(
+                        SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.connector_type
+                        == SearchSourceConnectorType.NOTION_CONNECTOR,
+                        SearchSourceConnector.is_enabled == True,
+                    )
+                )
+                connector = result.scalars().first()
+
+                if not connector:
+                    return {
+                        "status": "error",
+                        "message": "No Notion connector found. Please connect Notion in your workspace settings.",
+                    }
+
+                connector_id = connector.id
+
+            # Create connector instance
+            notion_connector = NotionHistoryConnector(
+                session=db_session,
+                connector_id=connector_id,
+            )
+
+            # Delete the page
+            result = await notion_connector.delete_page(page_id=page_id)
+            return result
+
+        except ValueError as e:
+            return {
+                "status": "error",
+                "message": str(e),
+            }
+        except Exception as e:
+            return {
+                "status": "error",
+                "message": f"Unexpected error deleting Notion page: {str(e)}",
+            }
+
+    return delete_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
new file mode 100644
index 000000000..4c23363e2
--- /dev/null
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -0,0 +1,116 @@
+from typing import Any
+
+from langchain_core.tools import tool
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.connectors.notion_history import NotionHistoryConnector
+
+
+def create_update_notion_page_tool(
+    db_session: AsyncSession | None = None,
+    search_space_id: int | None = None,
+    connector_id: int | None = None,
+):
+    """
+    Factory function to create the update_notion_page tool.
+
+    Args:
+        db_session: Database session for accessing Notion connector
+        search_space_id: Search space ID to find the Notion connector
+        connector_id: Optional specific connector ID (if known)
+
+    Returns:
+        Configured update_notion_page tool
+    """
+
+    @tool
+    async def update_notion_page(
+        page_id: str,
+        title: str | None = None,
+        content: str | None = None,
+    ) -> dict[str, Any]:
+        """Update an existing Notion page's title and/or content.
+
+        Use this tool when the user asks you to modify, edit, or update
+        a Notion page. At least one of title or content must be provided.
+
+        Args:
+            page_id: The ID of the Notion page to update (required).
+            title: New title for the page (optional).
+            content: New markdown content for the page body (optional).
+                    If provided, replaces all existing content.
+
+        Returns:
+            Dictionary with:
+            - status: "success" or "error"
+            - page_id: Updated page ID
+            - url: URL to the updated page
+            - title: Current page title
+            - message: Success or error message
+
+        Examples:
+            - "Update the Notion page abc123 with title 'Updated Meeting Notes'"
+            - "Change the content of page xyz789 to 'New content here'"
+            - "Update page abc123 with new title 'Final Report' and content '# Summary...'"
+        """
+        if db_session is None or search_space_id is None:
+            return {
+                "status": "error",
+                "message": "Notion tool not properly configured. Please contact support.",
+            }
+
+        if not title and not content:
+            return {
+                "status": "error",
+                "message": "At least one of 'title' or 'content' must be provided to update the page.",
+            }
+
+        try:
+            # Get connector ID if not provided
+            if connector_id is None:
+                from sqlalchemy.future import select
+
+                from app.db import SearchSourceConnector, SearchSourceConnectorType
+
+                result = await db_session.execute(
+                    select(SearchSourceConnector).filter(
+                        SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.connector_type
+                        == SearchSourceConnectorType.NOTION_CONNECTOR,
+                        SearchSourceConnector.is_enabled == True,
+                    )
+                )
+                connector = result.scalars().first()
+
+                if not connector:
+                    return {
+                        "status": "error",
+                        "message": "No Notion connector found. Please connect Notion in your workspace settings.",
+                    }
+
+                connector_id = connector.id
+
+            # Create connector instance
+            notion_connector = NotionHistoryConnector(
+                session=db_session,
+                connector_id=connector_id,
+            )
+
+            # Update the page
+            result = await notion_connector.update_page(
+                page_id=page_id, title=title, content=content
+            )
+            return result
+
+        except ValueError as e:
+            return {
+                "status": "error",
+                "message": str(e),
+            }
+        except Exception as e:
+            return {
+                "status": "error",
+                "message": f"Unexpected error updating Notion page: {str(e)}",
+            }
+
+    return update_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index 3716a19b6..5e61cd7b8 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -45,12 +45,16 @@ from langchain_core.tools import BaseTool
 
 from app.db import ChatVisibility
 
-from .create_notion_page import create_create_notion_page_tool
 from .display_image import create_display_image_tool
 from .generate_image import create_generate_image_tool
 from .knowledge_base import create_search_knowledge_base_tool
 from .link_preview import create_link_preview_tool
 from .mcp_tool import load_mcp_tools
+from .notion import (
+    create_create_notion_page_tool,
+    create_delete_notion_page_tool,
+    create_update_notion_page_tool,
+)
 from .podcast import create_generate_podcast_tool
 from .scrape_webpage import create_scrape_webpage_tool
 from .search_surfsense_docs import create_search_surfsense_docs_tool
@@ -201,13 +205,34 @@ BUILTIN_TOOLS: list[ToolDefinition] = [
         requires=["user_id", "search_space_id", "db_session", "thread_visibility"],
     ),
     # =========================================================================
-    # ADD YOUR CUSTOM TOOLS BELOW
+    # NOTION TOOLS - create, update, delete pages
     # =========================================================================
     ToolDefinition(
         name="create_notion_page",
         description="Create a new page in the user's Notion workspace",
-        factory=lambda deps: create_create_notion_page_tool(),
-        requires=[],
+        factory=lambda deps: create_create_notion_page_tool(
+            db_session=deps["db_session"],
+            search_space_id=deps["search_space_id"],
+        ),
+        requires=["db_session", "search_space_id"],
+    ),
+    ToolDefinition(
+        name="update_notion_page",
+        description="Update an existing Notion page's title or content",
+        factory=lambda deps: create_update_notion_page_tool(
+            db_session=deps["db_session"],
+            search_space_id=deps["search_space_id"],
+        ),
+        requires=["db_session", "search_space_id"],
+    ),
+    ToolDefinition(
+        name="delete_notion_page",
+        description="Delete (archive) a Notion page",
+        factory=lambda deps: create_delete_notion_page_tool(
+            db_session=deps["db_session"],
+            search_space_id=deps["search_space_id"],
+        ),
+        requires=["db_session", "search_space_id"],
     ),
 ]
 

From 04ea40f0c8c5f71ea35aaf12422057dfd8b3557a Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 17:18:59 +0200
Subject: [PATCH 11/42] fix notion write tools and add retry wrapper

---
 .../new_chat/tools/notion/create_page.py      |  19 ++-
 .../new_chat/tools/notion/delete_page.py      |   1 -
 .../new_chat/tools/notion/update_page.py      |   1 -
 .../app/connectors/notion_history.py          | 126 ++++++++++++------
 4 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
index 0f4ea1784..1164ccbc7 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -1,3 +1,4 @@
+import logging
 from typing import Any
 
 from langchain_core.tools import tool
@@ -5,6 +6,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.connectors.notion_history import NotionHistoryConnector
 
+logger = logging.getLogger(__name__)
+
 
 def create_create_notion_page_tool(
     db_session: AsyncSession | None = None,
@@ -53,7 +56,10 @@ def create_create_notion_page_tool(
             - "Create a Notion page titled 'Meeting Notes' with content 'Discussed project timeline'"
             - "Save this to Notion with title 'Research Summary'"
         """
+        logger.info(f"create_notion_page called: title='{title}', parent_page_id={parent_page_id}")
+        
         if db_session is None or search_space_id is None:
+            logger.error("Notion tool not properly configured - missing db_session or search_space_id")
             return {
                 "status": "error",
                 "message": "Notion tool not properly configured. Please contact support.",
@@ -61,7 +67,8 @@ def create_create_notion_page_tool(
 
         try:
             # Get connector ID if not provided
-            if connector_id is None:
+            actual_connector_id = connector_id
+            if actual_connector_id is None:
                 from sqlalchemy.future import select
 
                 from app.db import SearchSourceConnector, SearchSourceConnectorType
@@ -71,37 +78,41 @@ def create_create_notion_page_tool(
                         SearchSourceConnector.search_space_id == search_space_id,
                         SearchSourceConnector.connector_type
                         == SearchSourceConnectorType.NOTION_CONNECTOR,
-                        SearchSourceConnector.is_enabled == True,
                     )
                 )
                 connector = result.scalars().first()
 
                 if not connector:
+                    logger.warning(f"No Notion connector found for search_space_id={search_space_id}")
                     return {
                         "status": "error",
                         "message": "No Notion connector found. Please connect Notion in your workspace settings.",
                     }
 
-                connector_id = connector.id
+                actual_connector_id = connector.id
+                logger.info(f"Found Notion connector: id={actual_connector_id}")
 
             # Create connector instance
             notion_connector = NotionHistoryConnector(
                 session=db_session,
-                connector_id=connector_id,
+                connector_id=actual_connector_id,
             )
 
             # Create the page
             result = await notion_connector.create_page(
                 title=title, content=content, parent_page_id=parent_page_id
             )
+            logger.info(f"create_page result: {result.get('status')} - {result.get('message', '')}")
             return result
 
         except ValueError as e:
+            logger.error(f"ValueError creating Notion page: {e}")
             return {
                 "status": "error",
                 "message": str(e),
             }
         except Exception as e:
+            logger.error(f"Unexpected error creating Notion page: {e}", exc_info=True)
             return {
                 "status": "error",
                 "message": f"Unexpected error creating Notion page: {str(e)}",
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
index 18cc21da7..2f923eb13 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
@@ -65,7 +65,6 @@ def create_delete_notion_page_tool(
                         SearchSourceConnector.search_space_id == search_space_id,
                         SearchSourceConnector.connector_type
                         == SearchSourceConnectorType.NOTION_CONNECTOR,
-                        SearchSourceConnector.is_enabled == True,
                     )
                 )
                 connector = result.scalars().first()
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
index 4c23363e2..b09598e97 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -77,7 +77,6 @@ def create_update_notion_page_tool(
                         SearchSourceConnector.search_space_id == search_space_id,
                         SearchSourceConnector.connector_type
                         == SearchSourceConnectorType.NOTION_CONNECTOR,
-                        SearchSourceConnector.is_enabled == True,
                     )
                 )
                 connector = result.scalars().first()
diff --git a/surfsense_backend/app/connectors/notion_history.py b/surfsense_backend/app/connectors/notion_history.py
index b560ee20e..5fc9f2122 100644
--- a/surfsense_backend/app/connectors/notion_history.py
+++ b/surfsense_backend/app/connectors/notion_history.py
@@ -10,7 +10,6 @@ from sqlalchemy.future import select
 
 from app.config import config
 from app.db import SearchSourceConnector
-from app.routes.notion_add_connector_route import refresh_notion_token
 from app.schemas.notion_auth_credentials import NotionAuthCredentialsBase
 from app.utils.oauth_security import TokenEncryption
 
@@ -219,6 +218,7 @@ class NotionHistoryConnector:
                     )
 
                 # Refresh token
+                from app.routes.notion_add_connector_route import refresh_notion_token
                 connector = await refresh_notion_token(self._session, connector)
 
                 # Reload credentials after refresh
@@ -782,6 +782,34 @@ class NotionHistoryConnector:
     # WRITE OPERATIONS (create, update, delete pages)
     # =========================================================================
 
+    async def _get_first_accessible_parent(self) -> str | None:
+        """
+        Get the first accessible page ID that can be used as a parent.
+
+        Returns:
+            Page ID string, or None if no accessible pages found
+        """
+        try:
+            notion = await self._get_client()
+
+            # Search for pages, get most recently edited first
+            response = await self._api_call_with_retry(
+                notion.search,
+                filter={"property": "object", "value": "page"},
+                sort={"direction": "descending", "timestamp": "last_edited_time"},
+                page_size=1,  # We only need the first one
+            )
+
+            results = response.get("results", [])
+            if results:
+                return results[0]["id"]
+            
+            return None
+
+        except Exception as e:
+            logger.error(f"Error finding accessible parent page: {e}")
+            return None
+
     def _markdown_to_blocks(self, markdown: str) -> list[dict[str, Any]]:
         """
         Convert markdown content to Notion blocks.
@@ -884,40 +912,40 @@ class NotionHistoryConnector:
             APIResponseError: If Notion API returns an error
         """
         try:
+            logger.info(f"Creating Notion page: title='{title}', parent_page_id={parent_page_id}")
+            
             # Get Notion client
-            notion = await self._get_notion_client()
+            notion = await self._get_client()
 
             # Convert markdown content to Notion blocks
             children = self._markdown_to_blocks(content)
 
-            # Prepare parent
-            if parent_page_id:
-                parent = {"type": "page_id", "page_id": parent_page_id}
-            else:
-                # Try to use workspace root
-                # Note: This requires proper permissions
-                result = await self._session.execute(
-                    select(SearchSourceConnector).filter(
-                        SearchSourceConnector.id == self._connector_id
-                    )
-                )
-                connector = result.scalars().first()
-                if connector and connector.config.get("workspace_id"):
-                    parent = {"type": "workspace", "workspace": True}
-                else:
-                    raise ValueError(
-                        "parent_page_id is required. "
-                        "Please specify a parent page where the new page should be created."
-                    )
-
-            # Create the page
-            response = await notion.pages.create(
-                parent=parent,
-                properties={
-                    "title": {
-                        "title": [{"type": "text", "text": {"content": title}}]
+            # Prepare parent - find first available page if not provided
+            if not parent_page_id:
+                logger.info("No parent_page_id provided, searching for first accessible page...")
+                parent_page_id = await self._get_first_accessible_parent()
+                if not parent_page_id:
+                    logger.warning("No accessible parent pages found")
+                    return {
+                        "status": "error",
+                        "message": "Could not find any accessible Notion pages to use as parent. "
+                                  "Please make sure your Notion integration has access to at least one page.",
                     }
-                },
+                logger.info(f"Using parent_page_id: {parent_page_id}")
+
+            parent = {"type": "page_id", "page_id": parent_page_id}
+
+            # Create the page with standard title property
+            properties = {
+                "title": {
+                    "title": [{"type": "text", "text": {"content": title}}]
+                }
+            }
+
+            response = await self._api_call_with_retry(
+                notion.pages.create,
+                parent=parent,
+                properties=properties,
                 children=children[:100],  # Notion API limit: 100 blocks per request
             )
 
@@ -928,8 +956,10 @@ class NotionHistoryConnector:
             if len(children) > 100:
                 for i in range(100, len(children), 100):
                     batch = children[i : i + 100]
-                    await notion.blocks.children.append(
-                        block_id=page_id, children=batch
+                    await self._api_call_with_retry(
+                        notion.blocks.children.append,
+                        block_id=page_id,
+                        children=batch
                     )
 
             return {
@@ -972,11 +1002,12 @@ class NotionHistoryConnector:
             APIResponseError: If Notion API returns an error
         """
         try:
-            notion = await self._get_notion_client()
+            notion = await self._get_client()
 
             # Update title if provided
             if title:
-                await notion.pages.update(
+                await self._api_call_with_retry(
+                    notion.pages.update,
                     page_id=page_id,
                     properties={
                         "title": {
@@ -988,22 +1019,33 @@ class NotionHistoryConnector:
             # Update content if provided
             if content:
                 # First, get existing blocks
-                existing_blocks = await notion.blocks.children.list(block_id=page_id)
+                existing_blocks = await self._api_call_with_retry(
+                    notion.blocks.children.list,
+                    block_id=page_id
+                )
 
                 # Delete existing blocks
                 for block in existing_blocks.get("results", []):
-                    await notion.blocks.delete(block_id=block["id"])
+                    await self._api_call_with_retry(
+                        notion.blocks.delete,
+                        block_id=block["id"]
+                    )
 
                 # Add new content
                 children = self._markdown_to_blocks(content)
                 for i in range(0, len(children), 100):
                     batch = children[i : i + 100]
-                    await notion.blocks.children.append(
-                        block_id=page_id, children=batch
+                    await self._api_call_with_retry(
+                        notion.blocks.children.append,
+                        block_id=page_id,
+                        children=batch
                     )
 
             # Get updated page
-            response = await notion.pages.retrieve(page_id=page_id)
+            response = await self._api_call_with_retry(
+                notion.pages.retrieve,
+                page_id=page_id
+            )
             page_url = response["url"]
             page_title = response["properties"]["title"]["title"][0]["text"]["content"]
 
@@ -1045,10 +1087,14 @@ class NotionHistoryConnector:
             APIResponseError: If Notion API returns an error
         """
         try:
-            notion = await self._get_notion_client()
+            notion = await self._get_client()
 
             # Archive the page (Notion's way of "deleting")
-            response = await notion.pages.update(page_id=page_id, archived=True)
+            response = await self._api_call_with_retry(
+                notion.pages.update,
+                page_id=page_id,
+                archived=True
+            )
 
             page_title = "Unknown"
             try:

From 79d1f7d603f7ffc31944b98859cedbb83c06bba2 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 17:38:42 +0200
Subject: [PATCH 12/42] pass full notion tool output in stream

---
 surfsense_backend/app/tasks/chat/stream_new_chat.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 2cd05e80c..204bbb54a 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -693,6 +693,11 @@ async def _stream_agent_events(
                 yield streaming_service.format_terminal_info(
                     "Knowledge base search completed", "success"
                 )
+            elif tool_name in ("create_notion_page", "update_notion_page", "delete_notion_page"):
+                yield streaming_service.format_tool_output_available(
+                    tool_call_id,
+                    tool_output if isinstance(tool_output, dict) else {"result": tool_output},
+                )
             else:
                 yield streaming_service.format_tool_output_available(
                     tool_call_id,

From 4da689241648e6465ebbacc121b38dfa88b108a5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 17:58:08 +0200
Subject: [PATCH 13/42] add error card for notion tool failures

---
 .../components/tool-ui/create-notion-page.tsx | 143 ++++++++++++------
 1 file changed, 93 insertions(+), 50 deletions(-)

diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
index a1cf67109..256d6a7c9 100644
--- a/surfsense_web/components/tool-ui/create-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { makeAssistantToolUI } from "@assistant-ui/react";
-import { AlertTriangleIcon, CheckIcon, FileTextIcon, Loader2Icon, PencilIcon, XIcon } from "lucide-react";
+import { AlertTriangleIcon, CheckIcon, Loader2Icon, PencilIcon, XIcon } from "lucide-react";
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
@@ -22,7 +22,7 @@ interface InterruptResult {
 }
 
 interface SuccessResult {
-	status: string;
+	status: "success";
 	page_id: string;
 	title: string;
 	url: string;
@@ -31,7 +31,12 @@ interface SuccessResult {
 	message?: string;
 }
 
-type CreateNotionPageResult = InterruptResult | SuccessResult;
+interface ErrorResult {
+	status: "error";
+	message: string;
+}
+
+type CreateNotionPageResult = InterruptResult | SuccessResult | ErrorResult;
 
 function isInterruptResult(result: unknown): result is InterruptResult {
 	return (
@@ -42,6 +47,15 @@ function isInterruptResult(result: unknown): result is InterruptResult {
 	);
 }
 
+function isErrorResult(result: unknown): result is ErrorResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"status" in result &&
+		(result as ErrorResult).status === "error"
+	);
+}
+
 function ApprovalCard({
 	args,
 	interruptData,
@@ -49,51 +63,53 @@ function ApprovalCard({
 }: {
 	args: Record<string, unknown>;
 	interruptData: InterruptResult;
-	onDecision: (decision: { type: "approve" | "reject" | "edit"; message?: string; edited_action?: { name: string; args: Record<string, unknown> } }) => void;
+	onDecision: (decision: {
+		type: "approve" | "reject" | "edit";
+		message?: string;
+		edited_action?: { name: string; args: Record<string, unknown> };
+	}) => void;
 }) {
 	const [decided, setDecided] = useState<"approve" | "reject" | "edit" | null>(
 		interruptData.__decided__ ?? null
 	);
 	const [isEditing, setIsEditing] = useState(false);
 	const [editedArgs, setEditedArgs] = useState<Record<string, unknown>>(args);
-	
+
 	const reviewConfig = interruptData.review_configs[0];
 	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
 	const canEdit = allowedDecisions.includes("edit");
 
 	return (
-		<div className={`my-4 max-w-full overflow-hidden rounded-xl transition-all duration-300 ${
-			decided 
-				? "border border-border bg-card shadow-sm" 
-				: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
-		}`}>
-			<div className={`flex items-center gap-3 border-b ${
+		<div
+			className={`my-4 max-w-full overflow-hidden rounded-xl transition-all duration-300 ${
 				decided
-					? "border-border bg-card"
-					: "border-foreground/15 bg-muted/40 dark:bg-muted/20"
-			} px-4 py-3`}>
-				<div className={`flex size-9 shrink-0 items-center justify-center rounded-lg ${
-					decided
-						? "bg-muted"
-						: "bg-muted animate-pulse"
-				}`}>
-					<AlertTriangleIcon className={`size-4 ${
-						decided
-							? "text-muted-foreground"
-							: "text-foreground"
-					}`} />
+					? "border border-border bg-card shadow-sm"
+					: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
+			}`}
+		>
+			<div
+				className={`flex items-center gap-3 border-b ${
+					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/40 dark:bg-muted/20"
+				} px-4 py-3`}
+			>
+				<div
+					className={`flex size-9 shrink-0 items-center justify-center rounded-lg ${
+						decided ? "bg-muted" : "bg-muted animate-pulse"
+					}`}
+				>
+					<AlertTriangleIcon
+						className={`size-4 ${decided ? "text-muted-foreground" : "text-foreground"}`}
+					/>
 				</div>
 				<div className="min-w-0 flex-1">
-					<p className={`text-sm font-medium ${
-						decided
-							? "text-foreground"
-							: "text-foreground"
-					}`}>Create Notion Page</p>
-					<p className={`truncate text-xs ${
-						decided
-							? "text-muted-foreground"
-							: "text-muted-foreground"
-					}`}>
+					<p className={`text-sm font-medium ${decided ? "text-foreground" : "text-foreground"}`}>
+						Create Notion Page
+					</p>
+					<p
+						className={`truncate text-xs ${
+							decided ? "text-muted-foreground" : "text-muted-foreground"
+						}`}
+					>
 						{isEditing ? "You can edit the arguments below" : "Requires your approval to proceed"}
 					</p>
 				</div>
@@ -111,7 +127,9 @@ function ApprovalCard({
 					{args.content != null && (
 						<div>
 							<p className="text-xs font-medium text-muted-foreground">Content</p>
-							<p className="line-clamp-4 text-sm whitespace-pre-wrap text-foreground">{String(args.content)}</p>
+							<p className="line-clamp-4 text-sm whitespace-pre-wrap text-foreground">
+								{String(args.content)}
+							</p>
 						</div>
 					)}
 				</div>
@@ -121,20 +139,28 @@ function ApprovalCard({
 			{isEditing && (
 				<div className="space-y-3 px-4 py-3 bg-card">
 					<div>
-						<label className="text-xs font-medium text-muted-foreground mb-1.5 block">
+						<label
+							htmlFor="notion-title"
+							className="text-xs font-medium text-muted-foreground mb-1.5 block"
+						>
 							Title
 						</label>
 						<Input
+							id="notion-title"
 							value={String(editedArgs.title ?? "")}
 							onChange={(e) => setEditedArgs({ ...editedArgs, title: e.target.value })}
 							placeholder="Enter page title"
 						/>
 					</div>
 					<div>
-						<label className="text-xs font-medium text-muted-foreground mb-1.5 block">
+						<label
+							htmlFor="notion-content"
+							className="text-xs font-medium text-muted-foreground mb-1.5 block"
+						>
 							Content
 						</label>
 						<Textarea
+							id="notion-content"
 							value={String(editedArgs.content ?? "")}
 							onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value })}
 							placeholder="Enter page content"
@@ -146,11 +172,11 @@ function ApprovalCard({
 			)}
 
 			{/* Action buttons */}
-			<div className={`flex items-center gap-2 border-t ${
-				decided
-					? "border-border bg-card"
-					: "border-foreground/15 bg-muted/20 dark:bg-muted/10"
-			} px-4 py-3`}>
+			<div
+				className={`flex items-center gap-2 border-t ${
+					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/20 dark:bg-muted/10"
+				} px-4 py-3`}
+			>
 				{decided ? (
 					<p className="flex items-center gap-1.5 text-sm text-muted-foreground">
 						{decided === "approve" || decided === "edit" ? (
@@ -209,11 +235,7 @@ function ApprovalCard({
 							</Button>
 						)}
 						{canEdit && (
-							<Button
-								size="sm"
-								variant="outline"
-								onClick={() => setIsEditing(true)}
-							>
+							<Button size="sm" variant="outline" onClick={() => setIsEditing(true)}>
 								<PencilIcon />
 								Edit
 							</Button>
@@ -238,6 +260,24 @@ function ApprovalCard({
 	);
 }
 
+function ErrorCard({ result }: { result: ErrorResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-destructive/50 bg-card">
+			<div className="flex items-center gap-3 border-b border-destructive/50 px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
+					<XIcon className="size-4 text-destructive" />
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className="text-sm font-medium text-destructive">Failed to create Notion page</p>
+				</div>
+			</div>
+			<div className="px-4 py-3">
+				<p className="text-sm text-muted-foreground">{result.message}</p>
+			</div>
+		</div>
+	);
+}
+
 function SuccessCard({ result }: { result: SuccessResult }) {
 	return (
 		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
@@ -246,13 +286,12 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 					<CheckIcon className="size-4 text-green-500" />
 				</div>
 				<div className="min-w-0 flex-1">
-					<p className="text-sm font-medium">{result.title}</p>
-					<p className="text-xs text-muted-foreground">
+					<p className=" text-[.8rem] text-muted-foreground">
 						{result.message || "Notion page created successfully"}
 					</p>
 				</div>
 			</div>
-			
+
 			{/* Show details to verify the arguments were used */}
 			<div className="space-y-2 px-4 py-3 text-xs">
 				<div>
@@ -310,6 +349,10 @@ export const CreateNotionPageToolUI = makeAssistantToolUI<
 			);
 		}
 
+		if (isErrorResult(result)) {
+			return <ErrorCard result={result} />;
+		}
+
 		return <SuccessCard result={result as SuccessResult} />;
 	},
 });

From 8e6fa2ee584e7bccc3cbebad6c79199b185354f7 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 18:20:51 +0200
Subject: [PATCH 14/42] add delete notion page approval ui

---
 .../app/agents/new_chat/chat_deepagent.py     |   5 +-
 .../agents/new_chat/tools/notion/__init__.py  |   2 +-
 .../new_chat/tools/notion/create_page.py      |   2 +-
 .../new_chat/tools/notion/delete_page.py      |   9 +-
 .../new_chat/tools/notion/update_page.py      |   9 +-
 .../app/connectors/notion_history.py          |   6 +-
 .../new-chat/[[...chat_id]]/page.tsx          | 734 ++++++++++--------
 .../components/tool-ui/delete-notion-page.tsx | 240 ++++++
 8 files changed, 666 insertions(+), 341 deletions(-)
 create mode 100644 surfsense_web/components/tool-ui/delete-notion-page.tsx

diff --git a/surfsense_backend/app/agents/new_chat/chat_deepagent.py b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
index 525b18e7c..3e7287c07 100644
--- a/surfsense_backend/app/agents/new_chat/chat_deepagent.py
+++ b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
@@ -273,7 +273,10 @@ async def create_surfsense_deep_agent(
         system_prompt=system_prompt,
         context_schema=SurfSenseContextSchema,
         checkpointer=checkpointer,
-        interrupt_on={"create_notion_page": True},
+        interrupt_on={
+            "create_notion_page": True,
+            "delete_notion_page": {"allowed_decisions": ["approve", "reject"]},
+        },
     )
 
     return agent
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/__init__.py b/surfsense_backend/app/agents/new_chat/tools/notion/__init__.py
index 97d66b84b..6ce825dca 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/__init__.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/__init__.py
@@ -6,6 +6,6 @@ from .update_page import create_update_notion_page_tool
 
 __all__ = [
     "create_create_notion_page_tool",
-    "create_update_notion_page_tool",
     "create_delete_notion_page_tool",
+    "create_update_notion_page_tool",
 ]
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
index 1164ccbc7..497f43ffa 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -115,7 +115,7 @@ def create_create_notion_page_tool(
             logger.error(f"Unexpected error creating Notion page: {e}", exc_info=True)
             return {
                 "status": "error",
-                "message": f"Unexpected error creating Notion page: {str(e)}",
+                "message": f"Unexpected error creating Notion page: {e!s}",
             }
 
     return create_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
index 2f923eb13..2ae7dc564 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
@@ -55,7 +55,8 @@ def create_delete_notion_page_tool(
 
         try:
             # Get connector ID if not provided
-            if connector_id is None:
+            actual_connector_id = connector_id
+            if actual_connector_id is None:
                 from sqlalchemy.future import select
 
                 from app.db import SearchSourceConnector, SearchSourceConnectorType
@@ -75,12 +76,12 @@ def create_delete_notion_page_tool(
                         "message": "No Notion connector found. Please connect Notion in your workspace settings.",
                     }
 
-                connector_id = connector.id
+                actual_connector_id = connector.id
 
             # Create connector instance
             notion_connector = NotionHistoryConnector(
                 session=db_session,
-                connector_id=connector_id,
+                connector_id=actual_connector_id,
             )
 
             # Delete the page
@@ -95,7 +96,7 @@ def create_delete_notion_page_tool(
         except Exception as e:
             return {
                 "status": "error",
-                "message": f"Unexpected error deleting Notion page: {str(e)}",
+                "message": f"Unexpected error deleting Notion page: {e!s}",
             }
 
     return delete_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
index b09598e97..2e4a10d4b 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -67,7 +67,8 @@ def create_update_notion_page_tool(
 
         try:
             # Get connector ID if not provided
-            if connector_id is None:
+            actual_connector_id = connector_id
+            if actual_connector_id is None:
                 from sqlalchemy.future import select
 
                 from app.db import SearchSourceConnector, SearchSourceConnectorType
@@ -87,12 +88,12 @@ def create_update_notion_page_tool(
                         "message": "No Notion connector found. Please connect Notion in your workspace settings.",
                     }
 
-                connector_id = connector.id
+                actual_connector_id = connector.id
 
             # Create connector instance
             notion_connector = NotionHistoryConnector(
                 session=db_session,
-                connector_id=connector_id,
+                connector_id=actual_connector_id,
             )
 
             # Update the page
@@ -109,7 +110,7 @@ def create_update_notion_page_tool(
         except Exception as e:
             return {
                 "status": "error",
-                "message": f"Unexpected error updating Notion page: {str(e)}",
+                "message": f"Unexpected error updating Notion page: {e!s}",
             }
 
     return update_notion_page
diff --git a/surfsense_backend/app/connectors/notion_history.py b/surfsense_backend/app/connectors/notion_history.py
index 5fc9f2122..8b19157de 100644
--- a/surfsense_backend/app/connectors/notion_history.py
+++ b/surfsense_backend/app/connectors/notion_history.py
@@ -967,7 +967,7 @@ class NotionHistoryConnector:
                 "page_id": page_id,
                 "url": page_url,
                 "title": title,
-                "message": f"✅ Created Notion page '{title}'",
+                "message": f"Created Notion page '{title}'",
             }
 
         except APIResponseError as e:
@@ -1054,7 +1054,7 @@ class NotionHistoryConnector:
                 "page_id": page_id,
                 "url": page_url,
                 "title": page_title,
-                "message": f"✅ Updated Notion page '{page_title}'",
+                "message": f"Updated Notion page '{page_title}'",
             }
 
         except APIResponseError as e:
@@ -1107,7 +1107,7 @@ class NotionHistoryConnector:
             return {
                 "status": "success",
                 "page_id": page_id,
-                "message": f"✅ Deleted Notion page '{page_title}'",
+                "message": f"Deleted Notion page '{page_title}'",
             }
 
         except APIResponseError as e:
diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index 045626307..45c3b3313 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -12,7 +12,6 @@ import { useParams, useSearchParams } from "next/navigation";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import { z } from "zod";
-import { addToolCall, appendText, buildContentForPersistence, buildContentForUI, type ContentPart, type ContentPartsState, readSSEStream, type ThinkingStepData, updateToolCall } from "@/lib/chat/streaming-state";
 import {
 	clearTargetCommentIdAtom,
 	currentThreadAtom,
@@ -35,6 +34,7 @@ import { Thread } from "@/components/assistant-ui/thread";
 import { ChatHeader } from "@/components/new-chat/chat-header";
 import { CreateNotionPageToolUI } from "@/components/tool-ui/create-notion-page";
 import type { ThinkingStep } from "@/components/tool-ui/deepagent-thinking";
+import { DeleteNotionPageToolUI } from "@/components/tool-ui/delete-notion-page";
 import { DisplayImageToolUI } from "@/components/tool-ui/display-image";
 import { GeneratePodcastToolUI } from "@/components/tool-ui/generate-podcast";
 import { LinkPreviewToolUI } from "@/components/tool-ui/link-preview";
@@ -52,6 +52,17 @@ import {
 	looksLikePodcastRequest,
 	setActivePodcastTaskId,
 } from "@/lib/chat/podcast-state";
+import {
+	addToolCall,
+	appendText,
+	buildContentForPersistence,
+	buildContentForUI,
+	type ContentPart,
+	type ContentPartsState,
+	readSSEStream,
+	type ThinkingStepData,
+	updateToolCall,
+} from "@/lib/chat/streaming-state";
 import {
 	appendMessage,
 	createThread,
@@ -121,12 +132,12 @@ const TOOLS_WITH_UI = new Set([
 	"generate_podcast",
 	"link_preview",
 	"display_image",
+	"delete_notion_page",
 	"scrape_webpage",
 	"create_notion_page",
 	// "write_todos", // Disabled for now
 ]);
 
-
 export default function NewChatPage() {
 	const params = useParams();
 	const queryClient = useQueryClient();
@@ -532,12 +543,14 @@ export default function NewChatPage() {
 			const assistantMsgId = `msg-assistant-${Date.now()}`;
 			const currentThinkingSteps = new Map<string, ThinkingStepData>();
 
-			const contentPartsState: ContentPartsState = { contentParts: [], currentTextPartIndex: -1, toolCallIndices: new Map() };
+			const contentPartsState: ContentPartsState = {
+				contentParts: [],
+				currentTextPartIndex: -1,
+				toolCallIndices: new Map(),
+			};
 			const { contentParts, toolCallIndices } = contentPartsState;
 			let wasInterrupted = false;
 
-
-
 			// Add placeholder assistant message
 			setMessages((prev) => [
 				...prev,
@@ -603,154 +616,170 @@ export default function NewChatPage() {
 				}
 
 				for await (const parsed of readSSEStream(response)) {
-									switch (parsed.type) {
-										case "text-delta":
-											appendText(contentPartsState, parsed.delta);
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+					switch (parsed.type) {
+						case "text-delta":
+							appendText(contentPartsState, parsed.delta);
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-input-start":
-											// Add tool call inline - this breaks the current text segment
-											addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+						case "tool-input-start":
+							// Add tool call inline - this breaks the current text segment
+							addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-input-available": {
-											// Update existing tool call's args, or add if not exists
-											if (toolCallIndices.has(parsed.toolCallId)) {
-												updateToolCall(contentPartsState, parsed.toolCallId, { args: parsed.input || {} });
-											} else {
-												addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, parsed.input || {});
-											}
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
-										}
+						case "tool-input-available": {
+							// Update existing tool call's args, or add if not exists
+							if (toolCallIndices.has(parsed.toolCallId)) {
+								updateToolCall(contentPartsState, parsed.toolCallId, { args: parsed.input || {} });
+							} else {
+								addToolCall(
+									contentPartsState,
+									TOOLS_WITH_UI,
+									parsed.toolCallId,
+									parsed.toolName,
+									parsed.input || {}
+								);
+							}
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
+						}
 
-										case "tool-output-available": {
-											// Update the tool call with its result
-											updateToolCall(contentPartsState, parsed.toolCallId, { result: parsed.output });
-											// Handle podcast-specific logic
-											if (parsed.output?.status === "pending" && parsed.output?.podcast_id) {
-												// Check if this is a podcast tool by looking at the content part
-												const idx = toolCallIndices.get(parsed.toolCallId);
-												if (idx !== undefined) {
-													const part = contentParts[idx];
-													if (part?.type === "tool-call" && part.toolName === "generate_podcast") {
-														setActivePodcastTaskId(String(parsed.output.podcast_id));
-													}
-												}
-											}
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
-										}
-
-										case "data-thinking-step": {
-											// Handle thinking step events for chain-of-thought display
-											const stepData = parsed.data as ThinkingStepData;
-											if (stepData?.id) {
-												currentThinkingSteps.set(stepData.id, stepData);
-												// Update thinking steps state for rendering
-												// The ThinkingStepsScrollHandler in Thread component
-												// will handle auto-scrolling when this state changes
-												setMessageThinkingSteps((prev) => {
-													const newMap = new Map(prev);
-													newMap.set(assistantMsgId, Array.from(currentThinkingSteps.values()));
-													return newMap;
-												});
-											}
-											break;
-										}
-
-										case "data-thread-title-update": {
-											// Handle thread title update from LLM-generated title
-											const titleData = parsed.data as { threadId: number; title: string };
-											if (titleData?.title && titleData?.threadId === currentThreadId) {
-												// Update current thread state with new title
-												setCurrentThread((prev) =>
-													prev ? { ...prev, title: titleData.title } : prev
-												);
-												// Invalidate thread list to refresh sidebar
-												queryClient.invalidateQueries({
-													queryKey: ["threads", String(searchSpaceId)],
-												});
-												// Invalidate thread detail for breadcrumb update
-												queryClient.invalidateQueries({
-													queryKey: [
-														"threads",
-														String(searchSpaceId),
-														"detail",
-														String(titleData.threadId),
-													],
-												});
-										}
-											break;
-										}
-
-										case "data-interrupt-request": {
-											wasInterrupted = true;
-											const interruptData = parsed.data as Record<string, unknown>;
-											const actionRequests = (interruptData.action_requests ?? []) as Array<{
-												name: string;
-												args: Record<string, unknown>;
-											}>;
-											for (const action of actionRequests) {
-												const existingIdx = Array.from(toolCallIndices.entries()).find(
-													([, idx]) => {
-														const part = contentParts[idx];
-														return part?.type === "tool-call" && part.toolName === action.name;
-													}
-												);
-												if (existingIdx) {
-													updateToolCall(contentPartsState, existingIdx[0], {
-														result: { __interrupt__: true, ...interruptData },
-													});
-												} else {
-													const tcId = `interrupt-${action.name}`;
-													addToolCall(contentPartsState, TOOLS_WITH_UI, tcId, action.name, action.args);
-													updateToolCall(contentPartsState, tcId, {
-														result: { __interrupt__: true, ...interruptData },
-													});
-												}
-											}
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											if (currentThreadId) {
-												setPendingInterrupt({
-													threadId: currentThreadId,
-													assistantMsgId,
-													interruptData,
-												});
-											}
-											break;
-										}
-
-										case "error":
-											throw new Error(parsed.errorText || "Server error");
+						case "tool-output-available": {
+							// Update the tool call with its result
+							updateToolCall(contentPartsState, parsed.toolCallId, { result: parsed.output });
+							// Handle podcast-specific logic
+							if (parsed.output?.status === "pending" && parsed.output?.podcast_id) {
+								// Check if this is a podcast tool by looking at the content part
+								const idx = toolCallIndices.get(parsed.toolCallId);
+								if (idx !== undefined) {
+									const part = contentParts[idx];
+									if (part?.type === "tool-call" && part.toolName === "generate_podcast") {
+										setActivePodcastTaskId(String(parsed.output.podcast_id));
+									}
 								}
+							}
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
+						}
+
+						case "data-thinking-step": {
+							// Handle thinking step events for chain-of-thought display
+							const stepData = parsed.data as ThinkingStepData;
+							if (stepData?.id) {
+								currentThinkingSteps.set(stepData.id, stepData);
+								// Update thinking steps state for rendering
+								// The ThinkingStepsScrollHandler in Thread component
+								// will handle auto-scrolling when this state changes
+								setMessageThinkingSteps((prev) => {
+									const newMap = new Map(prev);
+									newMap.set(assistantMsgId, Array.from(currentThinkingSteps.values()));
+									return newMap;
+								});
+							}
+							break;
+						}
+
+						case "data-thread-title-update": {
+							// Handle thread title update from LLM-generated title
+							const titleData = parsed.data as { threadId: number; title: string };
+							if (titleData?.title && titleData?.threadId === currentThreadId) {
+								// Update current thread state with new title
+								setCurrentThread((prev) => (prev ? { ...prev, title: titleData.title } : prev));
+								// Invalidate thread list to refresh sidebar
+								queryClient.invalidateQueries({
+									queryKey: ["threads", String(searchSpaceId)],
+								});
+								// Invalidate thread detail for breadcrumb update
+								queryClient.invalidateQueries({
+									queryKey: [
+										"threads",
+										String(searchSpaceId),
+										"detail",
+										String(titleData.threadId),
+									],
+								});
+							}
+							break;
+						}
+
+						case "data-interrupt-request": {
+							wasInterrupted = true;
+							const interruptData = parsed.data as Record<string, unknown>;
+							const actionRequests = (interruptData.action_requests ?? []) as Array<{
+								name: string;
+								args: Record<string, unknown>;
+							}>;
+							for (const action of actionRequests) {
+								const existingIdx = Array.from(toolCallIndices.entries()).find(([, idx]) => {
+									const part = contentParts[idx];
+									return part?.type === "tool-call" && part.toolName === action.name;
+								});
+								if (existingIdx) {
+									updateToolCall(contentPartsState, existingIdx[0], {
+										result: { __interrupt__: true, ...interruptData },
+									});
+								} else {
+									const tcId = `interrupt-${action.name}`;
+									addToolCall(contentPartsState, TOOLS_WITH_UI, tcId, action.name, action.args);
+									updateToolCall(contentPartsState, tcId, {
+										result: { __interrupt__: true, ...interruptData },
+									});
+								}
+							}
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							if (currentThreadId) {
+								setPendingInterrupt({
+									threadId: currentThreadId,
+									assistantMsgId,
+									interruptData,
+								});
+							}
+							break;
+						}
+
+						case "error":
+							throw new Error(parsed.errorText || "Server error");
+					}
 				}
 
 				// Persist assistant message (with thinking steps for restoration on refresh)
 				// Skip persistence for interrupted messages -- handleResume will persist the final version
-				const finalContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
+				const finalContent = buildContentForPersistence(
+					contentPartsState,
+					TOOLS_WITH_UI,
+					currentThinkingSteps
+				);
 				if (contentParts.length > 0 && !wasInterrupted) {
 					try {
 						const savedMessage = await appendMessage(currentThreadId, {
@@ -798,7 +827,11 @@ export default function NewChatPage() {
 							(part.type === "tool-call" && TOOLS_WITH_UI.has(part.toolName))
 					);
 					if (hasContent && currentThreadId) {
-						const partialContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
+						const partialContent = buildContentForPersistence(
+							contentPartsState,
+							TOOLS_WITH_UI,
+							currentThinkingSteps
+						);
 						try {
 							const savedMessage = await appendMessage(currentThreadId, {
 								role: "assistant",
@@ -864,7 +897,13 @@ export default function NewChatPage() {
 	);
 
 	const handleResume = useCallback(
-		async (decisions: Array<{ type: string; message?: string; edited_action?: { name: string; args: Record<string, unknown> } }>) => {
+		async (
+			decisions: Array<{
+				type: string;
+				message?: string;
+				edited_action?: { name: string; args: Record<string, unknown> };
+			}>
+		) => {
 			if (!pendingInterrupt) return;
 			const { threadId: resumeThreadId, assistantMsgId } = pendingInterrupt;
 			setPendingInterrupt(null);
@@ -884,7 +923,11 @@ export default function NewChatPage() {
 				(messageThinkingSteps.get(assistantMsgId) ?? []).map((s) => [s.id, s])
 			);
 
-			const contentPartsState: ContentPartsState = { contentParts: [], currentTextPartIndex: -1, toolCallIndices: new Map() };
+			const contentPartsState: ContentPartsState = {
+				contentParts: [],
+				currentTextPartIndex: -1,
+				toolCallIndices: new Map(),
+			};
 			const { contentParts, toolCallIndices } = contentPartsState;
 
 			const existingMsg = messages.find((m) => m.id === assistantMsgId);
@@ -927,8 +970,6 @@ export default function NewChatPage() {
 				}
 			}
 
-
-
 			try {
 				const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
 				const response = await fetch(`${backendUrl}/api/v1/threads/${resumeThreadId}/resume`, {
@@ -949,114 +990,132 @@ export default function NewChatPage() {
 				}
 
 				for await (const parsed of readSSEStream(response)) {
-									switch (parsed.type) {
-										case "text-delta":
-											appendText(contentPartsState, parsed.delta);
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+					switch (parsed.type) {
+						case "text-delta":
+							appendText(contentPartsState, parsed.delta);
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-input-start":
-											addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+						case "tool-input-start":
+							addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-input-available":
-											if (toolCallIndices.has(parsed.toolCallId)) {
-												updateToolCall(contentPartsState, parsed.toolCallId, {
-													args: parsed.input || {},
-												});
-											} else {
-												addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, parsed.input || {});
-											}
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+						case "tool-input-available":
+							if (toolCallIndices.has(parsed.toolCallId)) {
+								updateToolCall(contentPartsState, parsed.toolCallId, {
+									args: parsed.input || {},
+								});
+							} else {
+								addToolCall(
+									contentPartsState,
+									TOOLS_WITH_UI,
+									parsed.toolCallId,
+									parsed.toolName,
+									parsed.input || {}
+								);
+							}
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-output-available":
-											updateToolCall(contentPartsState, parsed.toolCallId, {
-												result: parsed.output,
-											});
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+						case "tool-output-available":
+							updateToolCall(contentPartsState, parsed.toolCallId, {
+								result: parsed.output,
+							});
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "data-thinking-step": {
-											const stepData = parsed.data as ThinkingStepData;
-											if (stepData?.id) {
-												currentThinkingSteps.set(stepData.id, stepData);
-												setMessageThinkingSteps((prev) => {
-													const newMap = new Map(prev);
-													newMap.set(assistantMsgId, Array.from(currentThinkingSteps.values()));
-													return newMap;
-												});
-											}
-											break;
-										}
+						case "data-thinking-step": {
+							const stepData = parsed.data as ThinkingStepData;
+							if (stepData?.id) {
+								currentThinkingSteps.set(stepData.id, stepData);
+								setMessageThinkingSteps((prev) => {
+									const newMap = new Map(prev);
+									newMap.set(assistantMsgId, Array.from(currentThinkingSteps.values()));
+									return newMap;
+								});
+							}
+							break;
+						}
 
-										case "data-interrupt-request": {
-											const interruptData = parsed.data as Record<string, unknown>;
-											const actionRequests = (interruptData.action_requests ?? []) as Array<{
-												name: string;
-												args: Record<string, unknown>;
-											}>;
-											for (const action of actionRequests) {
-												const existingIdx = Array.from(toolCallIndices.entries()).find(
-													([, idx]) => {
-														const part = contentParts[idx];
-														return part?.type === "tool-call" && part.toolName === action.name;
-													}
-												);
-												if (existingIdx) {
-													updateToolCall(contentPartsState, existingIdx[0], {
-														result: {
-															__interrupt__: true,
-															...interruptData,
-														},
-													});
-												} else {
-													const tcId = `interrupt-${action.name}`;
-													addToolCall(contentPartsState, TOOLS_WITH_UI, tcId, action.name, action.args);
-													updateToolCall(contentPartsState, tcId, {
-														result: {
-															__interrupt__: true,
-															...interruptData,
-														},
-													});
-												}
-											}
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											setPendingInterrupt({
-												threadId: resumeThreadId,
-												assistantMsgId,
-												interruptData,
-											});
-											break;
-										}
-
-										case "error":
-											throw new Error(parsed.errorText || "Server error");
+						case "data-interrupt-request": {
+							const interruptData = parsed.data as Record<string, unknown>;
+							const actionRequests = (interruptData.action_requests ?? []) as Array<{
+								name: string;
+								args: Record<string, unknown>;
+							}>;
+							for (const action of actionRequests) {
+								const existingIdx = Array.from(toolCallIndices.entries()).find(([, idx]) => {
+									const part = contentParts[idx];
+									return part?.type === "tool-call" && part.toolName === action.name;
+								});
+								if (existingIdx) {
+									updateToolCall(contentPartsState, existingIdx[0], {
+										result: {
+											__interrupt__: true,
+											...interruptData,
+										},
+									});
+								} else {
+									const tcId = `interrupt-${action.name}`;
+									addToolCall(contentPartsState, TOOLS_WITH_UI, tcId, action.name, action.args);
+									updateToolCall(contentPartsState, tcId, {
+										result: {
+											__interrupt__: true,
+											...interruptData,
+										},
+									});
 								}
+							}
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							setPendingInterrupt({
+								threadId: resumeThreadId,
+								assistantMsgId,
+								interruptData,
+							});
+							break;
+						}
+
+						case "error":
+							throw new Error(parsed.errorText || "Server error");
+					}
 				}
 
-				const finalContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
+				const finalContent = buildContentForPersistence(
+					contentPartsState,
+					TOOLS_WITH_UI,
+					currentThinkingSteps
+				);
 				if (contentParts.length > 0) {
 					try {
 						const savedMessage = await appendMessage(resumeThreadId, {
@@ -1098,16 +1157,16 @@ export default function NewChatPage() {
 	useEffect(() => {
 		const handler = (e: Event) => {
 			const detail = (e as CustomEvent).detail as {
-				decisions: Array<{ 
-					type: string; 
-					message?: string; 
+				decisions: Array<{
+					type: string;
+					message?: string;
 					edited_action?: { name: string; args: Record<string, unknown> };
 				}>;
 			};
 			if (detail?.decisions && pendingInterrupt) {
 				const decision = detail.decisions[0];
 				const decisionType = decision?.type as "approve" | "reject" | "edit";
-				
+
 				setMessages((prev) =>
 					prev.map((m) => {
 						if (m.id !== pendingInterrupt.assistantMsgId) return m;
@@ -1123,18 +1182,18 @@ export default function NewChatPage() {
 								if (decisionType === "edit" && decision.edited_action) {
 									return {
 										...part,
-										args: decision.edited_action.args,  // Update displayed args
-										result: { 
-											...(part.result as Record<string, unknown>), 
-											__decided__: decisionType 
+										args: decision.edited_action.args, // Update displayed args
+										result: {
+											...(part.result as Record<string, unknown>),
+											__decided__: decisionType,
 										},
 									};
 								}
 								return {
 									...part,
-									result: { 
-										...(part.result as Record<string, unknown>), 
-										__decided__: decisionType 
+									result: {
+										...(part.result as Record<string, unknown>),
+										__decided__: decisionType,
 									},
 								};
 							}
@@ -1235,11 +1294,13 @@ export default function NewChatPage() {
 			const assistantMsgId = `msg-assistant-${Date.now()}`;
 			const currentThinkingSteps = new Map<string, ThinkingStepData>();
 
-			const contentPartsState: ContentPartsState = { contentParts: [], currentTextPartIndex: -1, toolCallIndices: new Map() };
+			const contentPartsState: ContentPartsState = {
+				contentParts: [],
+				currentTextPartIndex: -1,
+				toolCallIndices: new Map(),
+			};
 			const { contentParts, toolCallIndices } = contentPartsState;
 
-
-
 			// Add placeholder messages to UI
 			// Always add back the user message (with new query for edit, or original content for reload)
 			const userMessage: ThreadMessageLike = {
@@ -1283,76 +1344,94 @@ export default function NewChatPage() {
 				}
 
 				for await (const parsed of readSSEStream(response)) {
-									switch (parsed.type) {
-										case "text-delta":
-											appendText(contentPartsState, parsed.delta);
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+					switch (parsed.type) {
+						case "text-delta":
+							appendText(contentPartsState, parsed.delta);
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-input-start":
-											addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+						case "tool-input-start":
+							addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, {});
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-input-available":
-											if (toolCallIndices.has(parsed.toolCallId)) {
-												updateToolCall(contentPartsState, parsed.toolCallId, { args: parsed.input || {} });
-											} else {
-												addToolCall(contentPartsState, TOOLS_WITH_UI, parsed.toolCallId, parsed.toolName, parsed.input || {});
-											}
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
+						case "tool-input-available":
+							if (toolCallIndices.has(parsed.toolCallId)) {
+								updateToolCall(contentPartsState, parsed.toolCallId, { args: parsed.input || {} });
+							} else {
+								addToolCall(
+									contentPartsState,
+									TOOLS_WITH_UI,
+									parsed.toolCallId,
+									parsed.toolName,
+									parsed.input || {}
+								);
+							}
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
 
-										case "tool-output-available":
-											updateToolCall(contentPartsState, parsed.toolCallId, { result: parsed.output });
-											if (parsed.output?.status === "pending" && parsed.output?.podcast_id) {
-												const idx = toolCallIndices.get(parsed.toolCallId);
-												if (idx !== undefined) {
-													const part = contentParts[idx];
-													if (part?.type === "tool-call" && part.toolName === "generate_podcast") {
-														setActivePodcastTaskId(String(parsed.output.podcast_id));
-													}
-												}
-											}
-											setMessages((prev) =>
-												prev.map((m) =>
-													m.id === assistantMsgId ? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) } : m
-												)
-											);
-											break;
-
-										case "data-thinking-step": {
-											const stepData = parsed.data as ThinkingStepData;
-											if (stepData?.id) {
-												currentThinkingSteps.set(stepData.id, stepData);
-												setMessageThinkingSteps((prev) => {
-													const newMap = new Map(prev);
-													newMap.set(assistantMsgId, Array.from(currentThinkingSteps.values()));
-													return newMap;
-												});
-											}
-											break;
-										}
-
-										case "error":
-											throw new Error(parsed.errorText || "Server error");
+						case "tool-output-available":
+							updateToolCall(contentPartsState, parsed.toolCallId, { result: parsed.output });
+							if (parsed.output?.status === "pending" && parsed.output?.podcast_id) {
+								const idx = toolCallIndices.get(parsed.toolCallId);
+								if (idx !== undefined) {
+									const part = contentParts[idx];
+									if (part?.type === "tool-call" && part.toolName === "generate_podcast") {
+										setActivePodcastTaskId(String(parsed.output.podcast_id));
+									}
 								}
+							}
+							setMessages((prev) =>
+								prev.map((m) =>
+									m.id === assistantMsgId
+										? { ...m, content: buildContentForUI(contentPartsState, TOOLS_WITH_UI) }
+										: m
+								)
+							);
+							break;
+
+						case "data-thinking-step": {
+							const stepData = parsed.data as ThinkingStepData;
+							if (stepData?.id) {
+								currentThinkingSteps.set(stepData.id, stepData);
+								setMessageThinkingSteps((prev) => {
+									const newMap = new Map(prev);
+									newMap.set(assistantMsgId, Array.from(currentThinkingSteps.values()));
+									return newMap;
+								});
+							}
+							break;
+						}
+
+						case "error":
+							throw new Error(parsed.errorText || "Server error");
+					}
 				}
 
 				// Persist messages after streaming completes
-				const finalContent = buildContentForPersistence(contentPartsState, TOOLS_WITH_UI, currentThinkingSteps);
+				const finalContent = buildContentForPersistence(
+					contentPartsState,
+					TOOLS_WITH_UI,
+					currentThinkingSteps
+				);
 				if (contentParts.length > 0) {
 					try {
 						// Persist user message (for both edit and reload modes, since backend deleted it)
@@ -1539,6 +1618,7 @@ export default function NewChatPage() {
 			<SaveMemoryToolUI />
 			<RecallMemoryToolUI />
 			<CreateNotionPageToolUI />
+			<DeleteNotionPageToolUI />
 			{/* <WriteTodosToolUI /> Disabled for now */}
 			<div className="flex flex-col h-[calc(100dvh-64px)] overflow-hidden">
 				<Thread
diff --git a/surfsense_web/components/tool-ui/delete-notion-page.tsx b/surfsense_web/components/tool-ui/delete-notion-page.tsx
new file mode 100644
index 000000000..1defe72a4
--- /dev/null
+++ b/surfsense_web/components/tool-ui/delete-notion-page.tsx
@@ -0,0 +1,240 @@
+"use client";
+
+import { makeAssistantToolUI } from "@assistant-ui/react";
+import { AlertTriangleIcon, CheckIcon, Loader2Icon, XIcon } from "lucide-react";
+import { useState } from "react";
+import { Button } from "@/components/ui/button";
+
+interface InterruptResult {
+	__interrupt__: true;
+	__decided__?: "approve" | "reject";
+	action_requests: Array<{
+		name: string;
+		args: Record<string, unknown>;
+		description?: string;
+	}>;
+	review_configs: Array<{
+		action_name: string;
+		allowed_decisions: Array<"approve" | "reject">;
+	}>;
+}
+
+interface SuccessResult {
+	status: "success";
+	page_id: string;
+	message?: string;
+}
+
+interface ErrorResult {
+	status: "error";
+	message: string;
+}
+
+type DeleteNotionPageResult = InterruptResult | SuccessResult | ErrorResult;
+
+function isInterruptResult(result: unknown): result is InterruptResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"__interrupt__" in result &&
+		(result as InterruptResult).__interrupt__ === true
+	);
+}
+
+function isErrorResult(result: unknown): result is ErrorResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"status" in result &&
+		(result as ErrorResult).status === "error"
+	);
+}
+
+function ApprovalCard({
+	args,
+	interruptData,
+	onDecision,
+}: {
+	args: Record<string, unknown>;
+	interruptData: InterruptResult;
+	onDecision: (decision: { type: "approve" | "reject"; message?: string }) => void;
+}) {
+	const [decided, setDecided] = useState<"approve" | "reject" | null>(
+		interruptData.__decided__ ?? null
+	);
+
+	return (
+		<div
+			className={`my-4 max-w-full overflow-hidden rounded-xl transition-all duration-300 ${
+				decided
+					? "border border-border bg-card shadow-sm"
+					: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
+			}`}
+		>
+			<div
+				className={`flex items-center gap-3 border-b ${
+					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/40 dark:bg-muted/20"
+				} px-4 py-3`}
+			>
+				<div
+					className={`flex size-9 shrink-0 items-center justify-center rounded-lg ${
+						decided ? "bg-muted" : "bg-muted animate-pulse"
+					}`}
+				>
+					<AlertTriangleIcon
+						className={`size-4 ${decided ? "text-muted-foreground" : "text-foreground"}`}
+					/>
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className={`text-sm font-medium ${decided ? "text-foreground" : "text-foreground"}`}>
+						Delete Notion Page
+					</p>
+					<p
+						className={`truncate text-xs ${decided ? "text-muted-foreground" : "text-muted-foreground"}`}
+					>
+						Requires your approval to proceed
+					</p>
+				</div>
+			</div>
+
+			<div className="space-y-2 px-4 py-3 bg-card">
+				{args.page_id != null && (
+					<div>
+						<p className="text-xs font-medium text-muted-foreground">Page ID</p>
+						<p className="text-sm text-foreground font-mono">{String(args.page_id)}</p>
+					</div>
+				)}
+			</div>
+
+			<div
+				className={`flex items-center gap-2 border-t ${
+					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/20 dark:bg-muted/10"
+				} px-4 py-3`}
+			>
+				{decided ? (
+					<p className="flex items-center gap-1.5 text-sm text-muted-foreground">
+						{decided === "approve" ? (
+							<>
+								<CheckIcon className="size-3.5 text-green-500" />
+								Approved
+							</>
+						) : (
+							<>
+								<XIcon className="size-3.5 text-destructive" />
+								Rejected
+							</>
+						)}
+					</p>
+				) : (
+					<>
+						<Button
+							size="sm"
+							onClick={() => {
+								setDecided("approve");
+								onDecision({ type: "approve" });
+							}}
+						>
+							<CheckIcon />
+							Approve
+						</Button>
+						<Button
+							size="sm"
+							variant="outline"
+							onClick={() => {
+								setDecided("reject");
+								onDecision({ type: "reject", message: "User rejected the action." });
+							}}
+						>
+							<XIcon />
+							Reject
+						</Button>
+					</>
+				)}
+			</div>
+		</div>
+	);
+}
+
+function ErrorCard({ result }: { result: ErrorResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-destructive/50 bg-card">
+			<div className="flex items-center gap-3 border-b border-destructive/50 px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
+					<XIcon className="size-4 text-destructive" />
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className="text-sm font-medium text-destructive">Failed to delete Notion page</p>
+				</div>
+			</div>
+			<div className="px-4 py-3">
+				<p className="text-sm text-muted-foreground">{result.message}</p>
+			</div>
+		</div>
+	);
+}
+
+function SuccessCard({ result }: { result: SuccessResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
+			<div className="flex items-center gap-3 border-b border-border px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-green-500/10">
+					<CheckIcon className="size-4 text-green-500" />
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className=" text-[.8rem] text-muted-foreground">
+						{result.message || "Notion page deleted successfully"}
+					</p>
+				</div>
+			</div>
+
+			<div className="space-y-2 px-4 py-3 text-xs">
+				<div>
+					<span className="font-medium text-muted-foreground">Page ID: </span>
+					<span className="font-mono">{result.page_id}</span>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+export const DeleteNotionPageToolUI = makeAssistantToolUI<
+	{ page_id: string },
+	DeleteNotionPageResult
+>({
+	toolName: "delete_notion_page",
+	render: function DeleteNotionPageUI({ args, result, status }) {
+		if (status.type === "running") {
+			return (
+				<div className="my-4 flex max-w-md items-center gap-3 rounded-xl border border-border bg-card px-4 py-3">
+					<Loader2Icon className="size-4 animate-spin text-muted-foreground" />
+					<p className="text-sm text-muted-foreground">Deleting Notion page...</p>
+				</div>
+			);
+		}
+
+		if (!result) {
+			return null;
+		}
+
+		if (isInterruptResult(result)) {
+			return (
+				<ApprovalCard
+					args={args}
+					interruptData={result}
+					onDecision={(decision) => {
+						const event = new CustomEvent("hitl-decision", {
+							detail: { decisions: [decision] },
+						});
+						window.dispatchEvent(event);
+					}}
+				/>
+			);
+		}
+
+		if (isErrorResult(result)) {
+			return <ErrorCard result={result} />;
+		}
+
+		return <SuccessCard result={result as SuccessResult} />;
+	},
+});

From a833dad6abcf52bf320e8aab650abb13fc3844b1 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 11 Feb 2026 19:58:02 +0200
Subject: [PATCH 15/42] improve notion update_page error handling and numbered
 list parsing

---
 .../app/connectors/notion_history.py          | 97 ++++++++++++++++---
 1 file changed, 81 insertions(+), 16 deletions(-)

diff --git a/surfsense_backend/app/connectors/notion_history.py b/surfsense_backend/app/connectors/notion_history.py
index 8b19157de..74b6f1796 100644
--- a/surfsense_backend/app/connectors/notion_history.py
+++ b/surfsense_backend/app/connectors/notion_history.py
@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import re
 from collections.abc import Awaitable, Callable
 from typing import Any, TypeVar
 
@@ -869,12 +870,13 @@ class NotionHistoryConnector:
                     },
                 })
             # Numbered list
-            elif len(line) > 2 and line[0].isdigit() and line[1:3] == ". ":
+            elif (match := re.match(r'^(\d+)\.\s+(.*)$', line)):
+                content = match.group(2)  # Extract text after "number. "
                 blocks.append({
                     "object": "block",
                     "type": "numbered_list_item",
                     "numbered_list_item": {
-                        "rich_text": [{"type": "text", "text": {"content": line[3:]}}]
+                        "rich_text": [{"type": "text", "text": {"content": content}}]
                     },
                 })
             # Regular paragraph
@@ -1024,22 +1026,85 @@ class NotionHistoryConnector:
                     block_id=page_id
                 )
 
-                # Delete existing blocks
-                for block in existing_blocks.get("results", []):
-                    await self._api_call_with_retry(
-                        notion.blocks.delete,
-                        block_id=block["id"]
-                    )
+                # Convert new content to blocks 
+                try:
+                    children = self._markdown_to_blocks(content)
+                    if not children:
+                        logger.warning("No blocks generated from content, skipping update")
+                        return {
+                            "status": "error",
+                            "message": "Content conversion failed: no valid blocks generated",
+                        }
+                except Exception as e:
+                    logger.error(f"Failed to convert markdown to blocks: {e}")
+                    return {
+                        "status": "error",
+                        "message": f"Failed to parse content: {str(e)}",
+                    }
 
-                # Add new content
-                children = self._markdown_to_blocks(content)
-                for i in range(0, len(children), 100):
-                    batch = children[i : i + 100]
-                    await self._api_call_with_retry(
-                        notion.blocks.children.append,
-                        block_id=page_id,
-                        children=batch
+                # Store block count for logging
+                block_count = len(existing_blocks.get("results", []))
+                
+                # Delete existing blocks
+                try:
+                    for block in existing_blocks.get("results", []):
+                        await self._api_call_with_retry(
+                            notion.blocks.delete,
+                            block_id=block["id"]
+                        )
+                    logger.info(f"Deleted {block_count} existing blocks from page {page_id}")
+                except Exception as e:
+                    logger.error(f"Failed to delete existing blocks: {e}")
+                    return {
+                        "status": "error",
+                        "message": f"Failed to clear existing content: {str(e)}",
+                    }
+
+                # Add new content (CRITICAL: if this fails, content is lost) Need improvement to handle this better.
+                try:
+                    for i in range(0, len(children), 100):
+                        batch = children[i : i + 100]
+                        await self._api_call_with_retry(
+                            notion.blocks.children.append,
+                            block_id=page_id,
+                            children=batch
+                        )
+                    logger.info(f"Successfully added {len(children)} new blocks to page {page_id}")
+                except Exception as e:
+                    # CRITICAL ERROR: Content was deleted but new content failed to add
+                    logger.error(
+                        f"CRITICAL: Failed to add new content after deleting {block_count} blocks. "
+                        f"Page {page_id} content is lost! Error: {e}"
                     )
+                    
+                    # Attempt to add an error placeholder block so page isn't completely empty
+                    try:
+                        await self._api_call_with_retry(
+                            notion.blocks.children.append,
+                            block_id=page_id,
+                            children=[{
+                                "object": "block",
+                                "type": "paragraph",
+                                "paragraph": {
+                                    "rich_text": [{
+                                        "type": "text",
+                                        "text": {
+                                            "content": "[ERROR] Content update failed. Original content was lost. "
+                                                      "Please check your SurfSense logs for details."
+                                        }
+                                    }]
+                                },
+                            }]
+                        )
+                        logger.info(f"Added error placeholder to page {page_id}")
+                    except Exception as placeholder_error:
+                        logger.error(f"Failed to add error placeholder: {placeholder_error}")
+                    
+                    return {
+                        "status": "error",
+                        "message": f"CRITICAL: Failed to update page content. Original content ({block_count} blocks) "
+                                  f"was deleted but new content could not be added: {str(e)}",
+                    }
 
             # Get updated page
             response = await self._api_call_with_retry(

From c9b0e55ce9aa66d4b67d7a36eef51a22ff1ae7a2 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 15:21:18 +0200
Subject: [PATCH 16/42] add notion tool metadata service

---
 .../app/services/notion/__init__.py           |  11 +
 .../services/notion/tool_metadata_service.py  | 205 ++++++++++++++++++
 2 files changed, 216 insertions(+)
 create mode 100644 surfsense_backend/app/services/notion/__init__.py
 create mode 100644 surfsense_backend/app/services/notion/tool_metadata_service.py

diff --git a/surfsense_backend/app/services/notion/__init__.py b/surfsense_backend/app/services/notion/__init__.py
new file mode 100644
index 000000000..3818d1af3
--- /dev/null
+++ b/surfsense_backend/app/services/notion/__init__.py
@@ -0,0 +1,11 @@
+from app.services.notion.tool_metadata_service import (
+    NotionAccount,
+    NotionPage,
+    NotionToolMetadataService,
+)
+
+__all__ = [
+    "NotionAccount",
+    "NotionPage",
+    "NotionToolMetadataService",
+]
diff --git a/surfsense_backend/app/services/notion/tool_metadata_service.py b/surfsense_backend/app/services/notion/tool_metadata_service.py
new file mode 100644
index 000000000..73b969b40
--- /dev/null
+++ b/surfsense_backend/app/services/notion/tool_metadata_service.py
@@ -0,0 +1,205 @@
+from dataclasses import dataclass
+
+from sqlalchemy import and_, func
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.future import select
+
+from app.db import (
+    Document,
+    DocumentType,
+    SearchSourceConnector,
+    SearchSourceConnectorType,
+)
+
+
+@dataclass
+class NotionAccount:
+    id: int
+    name: str
+    workspace_id: str | None
+    workspace_name: str
+    workspace_icon: str
+
+    @classmethod
+    def from_connector(cls, connector: SearchSourceConnector) -> "NotionAccount":
+        return cls(
+            id=connector.id,
+            name=connector.name,
+            workspace_id=connector.config.get("workspace_id"),
+            workspace_name=connector.config.get("workspace_name", "Unnamed Workspace"),
+            workspace_icon=connector.config.get("workspace_icon", "📄"),
+        )
+
+    def to_dict(self) -> dict:
+        return {
+            "id": self.id,
+            "name": self.name,
+            "workspace_id": self.workspace_id,
+            "workspace_name": self.workspace_name,
+            "workspace_icon": self.workspace_icon,
+        }
+
+
+@dataclass
+class NotionPage:
+    page_id: str
+    title: str
+    connector_id: int
+    document_id: int
+
+    @classmethod
+    def from_document(cls, document: Document) -> "NotionPage":
+        return cls(
+            page_id=document.document_metadata.get("page_id"),
+            title=document.title,
+            connector_id=document.connector_id,
+            document_id=document.id,
+        )
+
+    def to_dict(self) -> dict:
+        return {
+            "page_id": self.page_id,
+            "title": self.title,
+            "connector_id": self.connector_id,
+            "document_id": self.document_id,
+        }
+
+
+class NotionToolMetadataService:
+    def __init__(self, db_session: AsyncSession):
+        self._db_session = db_session
+
+    async def get_creation_context(self, search_space_id: int, user_id: str) -> dict:
+        accounts = await self._get_notion_accounts(search_space_id, user_id)
+
+        if not accounts:
+            return {
+                "accounts": [],
+                "parent_pages": {},
+                "total_pages_per_account": {},
+                "error": "No Notion accounts connected",
+            }
+
+        parent_pages = await self._get_parent_pages_by_account(search_space_id, accounts)
+        page_counts = await self._get_page_counts_by_account(search_space_id, accounts)
+
+        return {
+            "accounts": [acc.to_dict() for acc in accounts],
+            "parent_pages": parent_pages,
+            "total_pages_per_account": page_counts,
+        }
+
+    async def get_update_context(
+        self, search_space_id: int, user_id: str, page_id: str
+    ) -> dict:
+        result = await self._db_session.execute(
+            select(Document).filter(
+                and_(
+                    Document.search_space_id == search_space_id,
+                    Document.document_type == DocumentType.NOTION_CONNECTOR,
+                    Document.document_metadata["page_id"].astext == page_id,
+                )
+            )
+        )
+        document = result.scalars().first()
+
+        if not document:
+            return {"error": f"Page {page_id} not found in indexed documents"}
+
+        if not document.connector_id:
+            return {"error": "Document has no associated connector"}
+
+        result = await self._db_session.execute(
+            select(SearchSourceConnector).filter(
+                SearchSourceConnector.id == document.connector_id
+            )
+        )
+        connector = result.scalars().first()
+
+        if not connector:
+            return {"error": "Connector not found"}
+
+        account = NotionAccount.from_connector(connector)
+
+        return {
+            "account": account.to_dict(),
+            "page_id": page_id,
+            "current_title": document.title,
+            "current_content": document.content,
+            "document_id": document.id,
+            "indexed_at": document.document_metadata.get("indexed_at"),
+        }
+
+    async def get_delete_context(
+        self, search_space_id: int, user_id: str, page_id: str
+    ) -> dict:
+        return await self.get_update_context(search_space_id, user_id, page_id)
+
+    async def _get_notion_accounts(
+        self, search_space_id: int, user_id: str
+    ) -> list[NotionAccount]:
+        result = await self._db_session.execute(
+            select(SearchSourceConnector)
+            .filter(
+                and_(
+                    SearchSourceConnector.search_space_id == search_space_id,
+                    SearchSourceConnector.user_id == user_id,
+                    SearchSourceConnector.connector_type
+                    == SearchSourceConnectorType.NOTION_CONNECTOR,
+                )
+            )
+            .order_by(SearchSourceConnector.last_indexed_at.desc())
+        )
+        connectors = result.scalars().all()
+        return [NotionAccount.from_connector(conn) for conn in connectors]
+
+    async def _get_parent_pages_by_account(
+        self, search_space_id: int, accounts: list[NotionAccount]
+    ) -> dict:
+        parent_pages = {}
+
+        for account in accounts:
+            result = await self._db_session.execute(
+                select(Document)
+                .filter(
+                    and_(
+                        Document.search_space_id == search_space_id,
+                        Document.connector_id == account.id,
+                        Document.document_type == DocumentType.NOTION_CONNECTOR,
+                    )
+                )
+                .order_by(Document.updated_at.desc())
+                .limit(50)
+            )
+            documents = result.scalars().all()
+
+            parent_pages[account.id] = [
+                {
+                    "page_id": doc.document_metadata.get("page_id"),
+                    "title": doc.title,
+                    "document_id": doc.id,
+                }
+                for doc in documents
+            ]
+
+        return parent_pages
+
+    async def _get_page_counts_by_account(
+        self, search_space_id: int, accounts: list[NotionAccount]
+    ) -> dict:
+        counts = {}
+
+        for account in accounts:
+            result = await self._db_session.execute(
+                select(func.count(Document.id)).filter(
+                    and_(
+                        Document.search_space_id == search_space_id,
+                        Document.connector_id == account.id,
+                        Document.document_type == DocumentType.NOTION_CONNECTOR,
+                    )
+                )
+            )
+            count = result.scalar()
+            counts[account.id] = count
+
+        return counts

From 066fb6dbfbd8ced38e9155461011bf17ee9a6674 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 15:29:41 +0200
Subject: [PATCH 17/42] use interrupt primitive with db context for notion page
 creation

---
 .../app/agents/new_chat/chat_deepagent.py     |  1 -
 .../new_chat/tools/notion/create_page.py      | 91 ++++++++++++++++---
 .../app/agents/new_chat/tools/registry.py     |  3 +-
 .../app/connectors/notion_history.py          | 12 +--
 4 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/chat_deepagent.py b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
index 3e7287c07..656137f30 100644
--- a/surfsense_backend/app/agents/new_chat/chat_deepagent.py
+++ b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
@@ -274,7 +274,6 @@ async def create_surfsense_deep_agent(
         context_schema=SurfSenseContextSchema,
         checkpointer=checkpointer,
         interrupt_on={
-            "create_notion_page": True,
             "delete_notion_page": {"allowed_decisions": ["approve", "reject"]},
         },
     )
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
index 497f43ffa..0586deeed 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -2,9 +2,11 @@ import logging
 from typing import Any
 
 from langchain_core.tools import tool
+from langgraph.types import interrupt
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.connectors.notion_history import NotionHistoryConnector
+from app.services.notion import NotionToolMetadataService
 
 logger = logging.getLogger(__name__)
 
@@ -12,6 +14,7 @@ logger = logging.getLogger(__name__)
 def create_create_notion_page_tool(
     db_session: AsyncSession | None = None,
     search_space_id: int | None = None,
+    user_id: str | None = None,
     connector_id: int | None = None,
 ):
     """
@@ -20,6 +23,7 @@ def create_create_notion_page_tool(
     Args:
         db_session: Database session for accessing Notion connector
         search_space_id: Search space ID to find the Notion connector
+        user_id: User ID for fetching user-specific context
         connector_id: Optional specific connector ID (if known)
 
     Returns:
@@ -58,16 +62,74 @@ def create_create_notion_page_tool(
         """
         logger.info(f"create_notion_page called: title='{title}', parent_page_id={parent_page_id}")
         
-        if db_session is None or search_space_id is None:
-            logger.error("Notion tool not properly configured - missing db_session or search_space_id")
+        if db_session is None or search_space_id is None or user_id is None:
+            logger.error("Notion tool not properly configured - missing required parameters")
             return {
                 "status": "error",
                 "message": "Notion tool not properly configured. Please contact support.",
             }
 
         try:
-            # Get connector ID if not provided
-            actual_connector_id = connector_id
+            metadata_service = NotionToolMetadataService(db_session)
+            context = await metadata_service.get_creation_context(search_space_id, user_id)
+            
+            if "error" in context:
+                logger.error(f"Failed to fetch creation context: {context['error']}")
+                return {
+                    "status": "error",
+                    "message": context["error"],
+                }
+            
+            logger.info("Requesting approval for creating Notion page")
+            approval = interrupt({
+                "type": "notion_page_creation",
+                "message": f"Approve creating Notion page: '{title}'",
+                "action": {
+                    "tool": "create_notion_page",
+                    "params": {
+                        "title": title,
+                        "content": content,
+                        "parent_page_id": parent_page_id,
+                        "connector_id": connector_id,
+                    },
+                },
+                "context": context,
+            })
+            
+            decisions = approval.get("decisions", [])
+            if not decisions:
+                logger.warning("No approval decision received")
+                return {
+                    "status": "error",
+                    "message": "No approval decision received",
+                }
+            
+            decision = decisions[0]
+            decision_type = decision.get("decision_type")
+            
+            if decision_type == "reject":
+                logger.info("Notion page creation rejected by user")
+                return {
+                    "status": "rejected",
+                    "message": "Page creation was rejected",
+                }
+            
+            edited_action = decision.get("edited_action", {})
+            final_params = edited_action if edited_action else {
+                "title": title,
+                "content": content,
+                "parent_page_id": parent_page_id,
+                "connector_id": connector_id,
+            }
+            
+            final_title = final_params.get("title", title)
+            final_content = final_params.get("content", content)
+            final_parent_page_id = final_params.get("parent_page_id", parent_page_id)
+            final_connector_id = final_params.get("connector_id", connector_id)
+            
+            logger.info(f"Creating Notion page with final params: title='{final_title}'")
+            
+            actual_connector_id = final_connector_id
             if actual_connector_id is None:
                 from sqlalchemy.future import select
 
@@ -92,30 +154,29 @@ def create_create_notion_page_tool(
                 actual_connector_id = connector.id
                 logger.info(f"Found Notion connector: id={actual_connector_id}")
 
-            # Create connector instance
             notion_connector = NotionHistoryConnector(
                 session=db_session,
                 connector_id=actual_connector_id,
             )
 
-            # Create the page
             result = await notion_connector.create_page(
-                title=title, content=content, parent_page_id=parent_page_id
+                title=final_title,
+                content=final_content,
+                parent_page_id=final_parent_page_id,
             )
             logger.info(f"create_page result: {result.get('status')} - {result.get('message', '')}")
             return result
 
-        except ValueError as e:
-            logger.error(f"ValueError creating Notion page: {e}")
-            return {
-                "status": "error",
-                "message": str(e),
-            }
         except Exception as e:
-            logger.error(f"Unexpected error creating Notion page: {e}", exc_info=True)
+            from langgraph.errors import GraphInterrupt
+            
+            if isinstance(e, GraphInterrupt):
+                raise
+            
+            logger.error(f"Error creating Notion page: {e}", exc_info=True)
             return {
                 "status": "error",
-                "message": f"Unexpected error creating Notion page: {e!s}",
+                "message": str(e) if isinstance(e, ValueError) else f"Unexpected error: {e!s}",
             }
 
     return create_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index 5e61cd7b8..47f3d4e12 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -213,8 +213,9 @@ BUILTIN_TOOLS: list[ToolDefinition] = [
         factory=lambda deps: create_create_notion_page_tool(
             db_session=deps["db_session"],
             search_space_id=deps["search_space_id"],
+            user_id=deps["user_id"],
         ),
-        requires=["db_session", "search_space_id"],
+        requires=["db_session", "search_space_id", "user_id"],
     ),
     ToolDefinition(
         name="update_notion_page",
diff --git a/surfsense_backend/app/connectors/notion_history.py b/surfsense_backend/app/connectors/notion_history.py
index 74b6f1796..83fcbd037 100644
--- a/surfsense_backend/app/connectors/notion_history.py
+++ b/surfsense_backend/app/connectors/notion_history.py
@@ -983,7 +983,7 @@ class NotionHistoryConnector:
             logger.error(f"Unexpected error creating Notion page: {e}")
             return {
                 "status": "error",
-                "message": f"Failed to create Notion page: {str(e)}",
+                "message": f"Failed to create Notion page: {e!s}",
             }
 
     async def update_page(
@@ -1039,7 +1039,7 @@ class NotionHistoryConnector:
                     logger.error(f"Failed to convert markdown to blocks: {e}")
                     return {
                         "status": "error",
-                        "message": f"Failed to parse content: {str(e)}",
+                        "message": f"Failed to parse content: {e!s}",
                     }
 
                 # Store block count for logging
@@ -1057,7 +1057,7 @@ class NotionHistoryConnector:
                     logger.error(f"Failed to delete existing blocks: {e}")
                     return {
                         "status": "error",
-                        "message": f"Failed to clear existing content: {str(e)}",
+                        "message": f"Failed to clear existing content: {e!s}",
                     }
 
                 # Add new content (CRITICAL: if this fails, content is lost) Need improvement to handle this better.
@@ -1103,7 +1103,7 @@ class NotionHistoryConnector:
                     return {
                         "status": "error",
                         "message": f"CRITICAL: Failed to update page content. Original content ({block_count} blocks) "
-                                  f"was deleted but new content could not be added: {str(e)}",
+                                  f"was deleted but new content could not be added: {e!s}",
                     }
 
             # Get updated page
@@ -1133,7 +1133,7 @@ class NotionHistoryConnector:
             logger.error(f"Unexpected error updating Notion page: {e}")
             return {
                 "status": "error",
-                "message": f"Failed to update Notion page: {str(e)}",
+                "message": f"Failed to update Notion page: {e!s}",
             }
 
     async def delete_page(self, page_id: str) -> dict[str, Any]:
@@ -1186,5 +1186,5 @@ class NotionHistoryConnector:
             logger.error(f"Unexpected error deleting Notion page: {e}")
             return {
                 "status": "error",
-                "message": f"Failed to delete Notion page: {str(e)}",
+                "message": f"Failed to delete Notion page: {e!s}",
             }

From d4aa61a12a83f4bcb6049ffedbf2049730afa95f Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 15:44:03 +0200
Subject: [PATCH 18/42] add interrupt payload normalization for interrupt()
 primitive

---
 .../app/services/new_streaming_service.py     | 48 +++++++++++++++++--
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/surfsense_backend/app/services/new_streaming_service.py b/surfsense_backend/app/services/new_streaming_service.py
index aa14dec7d..e2c3f0840 100644
--- a/surfsense_backend/app/services/new_streaming_service.py
+++ b/surfsense_backend/app/services/new_streaming_service.py
@@ -508,13 +508,55 @@ class VercelStreamingService:
         """Format an interrupt request for human-in-the-loop approval.
 
         Args:
-            interrupt_value: The interrupt payload from HumanInTheLoopMiddleware
-                containing action_requests and review_configs.
+            interrupt_value: The interrupt payload from either:
+                - interrupt_on config: {action_requests: [...], review_configs: [...]}
+                - interrupt() primitive: {type: "...", message: "...", action: {...}, context: {...}}
 
         Returns:
             str: SSE formatted interrupt request data part
         """
-        return self.format_data("interrupt-request", interrupt_value)
+        normalized_payload = self._normalize_interrupt_payload(interrupt_value)
+        return self.format_data("interrupt-request", normalized_payload)
+
+    def _normalize_interrupt_payload(self, interrupt_value: dict[str, Any]) -> dict[str, Any]:
+        """Normalize interrupt payloads from different sources into a consistent format.
+
+        Handles two interrupt sources:
+        1. interrupt_on config (Deep Agent built-in): Already has action_requests/review_configs
+        2. interrupt() primitive (custom tool code): Has type/message/action/context
+
+        Args:
+            interrupt_value: Raw interrupt payload from Deep Agent
+
+        Returns:
+            dict: Normalized payload with action_requests, review_configs, and optional context
+        """
+        if "action_requests" in interrupt_value and "review_configs" in interrupt_value:
+            return interrupt_value
+
+        interrupt_type = interrupt_value.get("type", "unknown")
+        message = interrupt_value.get("message", "Approval required")
+        action = interrupt_value.get("action", {})
+        context = interrupt_value.get("context", {})
+
+        normalized = {
+            "action_requests": [
+                {
+                    "name": action.get("tool", "unknown_tool"),
+                    "args": action.get("params", {}),
+                }
+            ],
+            "review_configs": [
+                {
+                    "action_name": action.get("tool", "unknown_tool"),
+                    "allowed_decisions": ["approve", "edit", "reject"],
+                }
+            ],
+            "interrupt_type": interrupt_type,
+            "message": message,
+            "context": context,
+        }
+        return normalized
 
     # =========================================================================
     # Error Part

From f5e5e36de44f6f96e629f1a84a4c59702d85000a Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 15:55:34 +0200
Subject: [PATCH 19/42] add account and parent page selection to notion
 approval ui

---
 .../components/tool-ui/create-notion-page.tsx | 142 +++++++++++++++++-
 1 file changed, 139 insertions(+), 3 deletions(-)

diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
index 256d6a7c9..45fe1dc63 100644
--- a/surfsense_web/components/tool-ui/create-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -2,9 +2,16 @@
 
 import { makeAssistantToolUI } from "@assistant-ui/react";
 import { AlertTriangleIcon, CheckIcon, Loader2Icon, PencilIcon, XIcon } from "lucide-react";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import {
+	Select,
+	SelectContent,
+	SelectItem,
+	SelectTrigger,
+	SelectValue,
+} from "@/components/ui/select";
 import { Textarea } from "@/components/ui/textarea";
 
 interface InterruptResult {
@@ -19,6 +26,27 @@ interface InterruptResult {
 		action_name: string;
 		allowed_decisions: Array<"approve" | "edit" | "reject">;
 	}>;
+	interrupt_type?: string;
+	message?: string;
+	context?: {
+		accounts?: Array<{
+			id: number;
+			name: string;
+			workspace_id: string | null;
+			workspace_name: string;
+			workspace_icon: string;
+		}>;
+		parent_pages?: Record<
+			number,
+			Array<{
+				page_id: string;
+				title: string;
+				document_id: number;
+			}>
+		>;
+		total_pages_per_account?: Record<number, number>;
+		error?: string;
+	};
 }
 
 interface SuccessResult {
@@ -75,6 +103,26 @@ function ApprovalCard({
 	const [isEditing, setIsEditing] = useState(false);
 	const [editedArgs, setEditedArgs] = useState<Record<string, unknown>>(args);
 
+	const accounts = interruptData.context?.accounts ?? [];
+	const parentPages = interruptData.context?.parent_pages ?? {};
+	const totalPagesPerAccount = interruptData.context?.total_pages_per_account ?? {};
+
+	const defaultAccountId = useMemo(() => {
+		if (args.connector_id) return String(args.connector_id);
+		if (accounts.length === 1) return String(accounts[0].id);
+		return "";
+	}, [args.connector_id, accounts]);
+
+	const [selectedAccountId, setSelectedAccountId] = useState<string>(defaultAccountId);
+	const [selectedParentPageId, setSelectedParentPageId] = useState<string>(
+		args.parent_page_id ? String(args.parent_page_id) : ""
+	);
+
+	const availableParentPages = useMemo(() => {
+		if (!selectedAccountId) return [];
+		return parentPages[Number(selectedAccountId)] ?? [];
+	}, [selectedAccountId, parentPages]);
+
 	const reviewConfig = interruptData.review_configs[0];
 	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
 	const canEdit = allowedDecisions.includes("edit");
@@ -115,6 +163,79 @@ function ApprovalCard({
 				</div>
 			</div>
 
+			{/* Context section - account and parent page selection */}
+			{!decided && interruptData.context && (
+				<div className="border-b border-border px-4 py-3 bg-muted/30 space-y-3">
+					{interruptData.message && (
+						<p className="text-sm text-foreground">{interruptData.message}</p>
+					)}
+
+					{interruptData.context.error ? (
+						<p className="text-sm text-destructive">{interruptData.context.error}</p>
+					) : (
+						<>
+							{accounts.length > 0 && (
+								<div className="space-y-2">
+									<label className="text-xs font-medium text-muted-foreground">
+										Notion Account <span className="text-destructive">*</span>
+									</label>
+									<Select
+										value={selectedAccountId}
+										onValueChange={(value) => {
+											setSelectedAccountId(value);
+											setSelectedParentPageId("");
+										}}
+									>
+										<SelectTrigger className="w-full">
+											<SelectValue placeholder="Select an account" />
+										</SelectTrigger>
+										<SelectContent>
+											{accounts.map((account) => (
+												<SelectItem key={account.id} value={String(account.id)}>
+													<div className="flex items-center gap-2">
+														<span>{account.workspace_icon}</span>
+														<span>{account.workspace_name}</span>
+														<span className="text-xs text-muted-foreground">
+															({totalPagesPerAccount[account.id] ?? 0} pages)
+														</span>
+													</div>
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+								</div>
+							)}
+
+							{selectedAccountId && (
+								<div className="space-y-2">
+									<label className="text-xs font-medium text-muted-foreground">
+										Parent Page (optional)
+									</label>
+									<Select value={selectedParentPageId} onValueChange={setSelectedParentPageId}>
+										<SelectTrigger className="w-full">
+											<SelectValue placeholder="None (create at root level)" />
+										</SelectTrigger>
+										<SelectContent>
+											<SelectItem value="">None (create at root level)</SelectItem>
+											{availableParentPages.map((page) => (
+												<SelectItem key={page.page_id} value={page.page_id}>
+													📄 {page.title}
+												</SelectItem>
+											))}
+										</SelectContent>
+									</Select>
+									{availableParentPages.length === 0 && selectedAccountId && (
+										<p className="text-xs text-muted-foreground">
+											No pages available. Page will be created at root level.
+										</p>
+									)}
+								</div>
+							)}
+						</>
+					)}
+				</div>
+			)}
+
 			{/* Display mode - show args as read-only */}
 			{!isEditing && (
 				<div className="space-y-2 px-4 py-3 bg-card">
@@ -201,7 +322,11 @@ function ApprovalCard({
 									type: "edit",
 									edited_action: {
 										name: interruptData.action_requests[0].name,
-										args: editedArgs,
+										args: {
+											...editedArgs,
+											connector_id: selectedAccountId ? Number(selectedAccountId) : null,
+											parent_page_id: selectedParentPageId || null,
+										},
 									},
 								});
 							}}
@@ -227,8 +352,19 @@ function ApprovalCard({
 								size="sm"
 								onClick={() => {
 									setDecided("approve");
-									onDecision({ type: "approve" });
+									onDecision({
+										type: "approve",
+										edited_action: {
+											name: interruptData.action_requests[0].name,
+											args: {
+												...args,
+												connector_id: selectedAccountId ? Number(selectedAccountId) : null,
+												parent_page_id: selectedParentPageId || null,
+											},
+										},
+									});
 								}}
+								disabled={!selectedAccountId}
 							>
 								<CheckIcon />
 								Approve

From 08154b321d728630947e0536ad28a9c5fd43b9eb Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 16:29:18 +0200
Subject: [PATCH 20/42] remove page counts and fix workspace icon display

---
 .../services/notion/tool_metadata_service.py  | 25 +------------------
 .../components/tool-ui/create-notion-page.tsx | 20 +++++----------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/surfsense_backend/app/services/notion/tool_metadata_service.py b/surfsense_backend/app/services/notion/tool_metadata_service.py
index 73b969b40..eeb8eb86a 100644
--- a/surfsense_backend/app/services/notion/tool_metadata_service.py
+++ b/surfsense_backend/app/services/notion/tool_metadata_service.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from sqlalchemy import and_, func
+from sqlalchemy import and_
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
@@ -76,17 +76,14 @@ class NotionToolMetadataService:
             return {
                 "accounts": [],
                 "parent_pages": {},
-                "total_pages_per_account": {},
                 "error": "No Notion accounts connected",
             }
 
         parent_pages = await self._get_parent_pages_by_account(search_space_id, accounts)
-        page_counts = await self._get_page_counts_by_account(search_space_id, accounts)
 
         return {
             "accounts": [acc.to_dict() for acc in accounts],
             "parent_pages": parent_pages,
-            "total_pages_per_account": page_counts,
         }
 
     async def get_update_context(
@@ -183,23 +180,3 @@ class NotionToolMetadataService:
             ]
 
         return parent_pages
-
-    async def _get_page_counts_by_account(
-        self, search_space_id: int, accounts: list[NotionAccount]
-    ) -> dict:
-        counts = {}
-
-        for account in accounts:
-            result = await self._db_session.execute(
-                select(func.count(Document.id)).filter(
-                    and_(
-                        Document.search_space_id == search_space_id,
-                        Document.connector_id == account.id,
-                        Document.document_type == DocumentType.NOTION_CONNECTOR,
-                    )
-                )
-            )
-            count = result.scalar()
-            counts[account.id] = count
-
-        return counts
diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
index 45fe1dc63..f62390e9f 100644
--- a/surfsense_web/components/tool-ui/create-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -44,7 +44,6 @@ interface InterruptResult {
 				document_id: number;
 			}>
 		>;
-		total_pages_per_account?: Record<number, number>;
 		error?: string;
 	};
 }
@@ -105,7 +104,6 @@ function ApprovalCard({
 
 	const accounts = interruptData.context?.accounts ?? [];
 	const parentPages = interruptData.context?.parent_pages ?? {};
-	const totalPagesPerAccount = interruptData.context?.total_pages_per_account ?? {};
 
 	const defaultAccountId = useMemo(() => {
 		if (args.connector_id) return String(args.connector_id);
@@ -115,7 +113,7 @@ function ApprovalCard({
 
 	const [selectedAccountId, setSelectedAccountId] = useState<string>(defaultAccountId);
 	const [selectedParentPageId, setSelectedParentPageId] = useState<string>(
-		args.parent_page_id ? String(args.parent_page_id) : ""
+		args.parent_page_id ? String(args.parent_page_id) : "__none__"
 	);
 
 	const availableParentPages = useMemo(() => {
@@ -183,7 +181,7 @@ function ApprovalCard({
 										value={selectedAccountId}
 										onValueChange={(value) => {
 											setSelectedAccountId(value);
-											setSelectedParentPageId("");
+											setSelectedParentPageId("__none__");
 										}}
 									>
 										<SelectTrigger className="w-full">
@@ -192,13 +190,7 @@ function ApprovalCard({
 										<SelectContent>
 											{accounts.map((account) => (
 												<SelectItem key={account.id} value={String(account.id)}>
-													<div className="flex items-center gap-2">
-														<span>{account.workspace_icon}</span>
-														<span>{account.workspace_name}</span>
-														<span className="text-xs text-muted-foreground">
-															({totalPagesPerAccount[account.id] ?? 0} pages)
-														</span>
-													</div>
+												{account.workspace_name}
 												</SelectItem>
 											))}
 										</SelectContent>
@@ -216,7 +208,7 @@ function ApprovalCard({
 											<SelectValue placeholder="None (create at root level)" />
 										</SelectTrigger>
 										<SelectContent>
-											<SelectItem value="">None (create at root level)</SelectItem>
+											<SelectItem value="__none__">None (create at root level)</SelectItem>
 											{availableParentPages.map((page) => (
 												<SelectItem key={page.page_id} value={page.page_id}>
 													📄 {page.title}
@@ -325,7 +317,7 @@ function ApprovalCard({
 										args: {
 											...editedArgs,
 											connector_id: selectedAccountId ? Number(selectedAccountId) : null,
-											parent_page_id: selectedParentPageId || null,
+											parent_page_id: selectedParentPageId === "__none__" ? null : selectedParentPageId,
 										},
 									},
 								});
@@ -359,7 +351,7 @@ function ApprovalCard({
 											args: {
 												...args,
 												connector_id: selectedAccountId ? Number(selectedAccountId) : null,
-												parent_page_id: selectedParentPageId || null,
+												parent_page_id: selectedParentPageId === "__none__" ? null : selectedParentPageId,
 											},
 										},
 									});

From c47171e218962528eccbf4f5e2cae2c4878d80c0 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 16:38:08 +0200
Subject: [PATCH 21/42] fix edited action args extraction for notion page
 creation

---
 .../app/agents/new_chat/tools/notion/create_page.py        | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
index 0586deeed..6dcf4d733 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -115,12 +115,7 @@ def create_create_notion_page_tool(
                 }
             
             edited_action = decision.get("edited_action", {})
-            final_params = edited_action if edited_action else {
-                "title": title,
-                "content": content,
-                "parent_page_id": parent_page_id,
-                "connector_id": connector_id,
-            }
+            final_params = edited_action.get("args", {}) if edited_action else {}
             
             final_title = final_params.get("title", title)
             final_content = final_params.get("content", content)

From 9023f2656b82ae125b8429c56e1071b3b038b5e3 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 17:35:27 +0200
Subject: [PATCH 22/42] Improve notion page creation approval UI

---
 .../new_chat/tools/notion/create_page.py      | 22 ++++++-----
 .../app/services/new_streaming_service.py     |  9 +++--
 .../components/tool-ui/create-notion-page.tsx | 39 ++++++++++++-------
 3 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
index 6dcf4d733..4825c2aed 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -50,11 +50,15 @@ def create_create_notion_page_tool(
 
         Returns:
             Dictionary with:
-            - status: "success" or "error"
-            - page_id: Created page ID
-            - url: URL to the created page
-            - title: Page title
-            - message: Success or error message
+            - status: "success", "rejected", or "error"
+            - page_id: Created page ID (if success)
+            - url: URL to the created page (if success)
+            - title: Page title (if success)
+            - message: Result message
+            
+            IMPORTANT: If status is "rejected", the user explicitly declined the action.
+            Respond with a brief acknowledgment (e.g., "Understood, I didn't create the page.") 
+            and move on. Do NOT ask for parent page IDs, troubleshoot, or suggest alternatives.
 
         Examples:
             - "Create a Notion page titled 'Meeting Notes' with content 'Discussed project timeline'"
@@ -80,10 +84,9 @@ def create_create_notion_page_tool(
                     "message": context["error"],
                 }
             
-            logger.info("Requesting approval for creating Notion page")
+            logger.info(f"Requesting approval for creating Notion page: '{title}'")
             approval = interrupt({
                 "type": "notion_page_creation",
-                "message": f"Approve creating Notion page: '{title}'",
                 "action": {
                     "tool": "create_notion_page",
                     "params": {
@@ -105,13 +108,14 @@ def create_create_notion_page_tool(
                 }
             
             decision = decisions[0]
-            decision_type = decision.get("decision_type")
+            decision_type = decision.get("type") or decision.get("decision_type")
+            logger.info(f"User decision: {decision_type}")
             
             if decision_type == "reject":
                 logger.info("Notion page creation rejected by user")
                 return {
                     "status": "rejected",
-                    "message": "Page creation was rejected",
+                    "message": "User declined. The page was not created. Do not ask again or suggest alternatives.",
                 }
             
             edited_action = decision.get("edited_action", {})
diff --git a/surfsense_backend/app/services/new_streaming_service.py b/surfsense_backend/app/services/new_streaming_service.py
index e2c3f0840..4bb5530ce 100644
--- a/surfsense_backend/app/services/new_streaming_service.py
+++ b/surfsense_backend/app/services/new_streaming_service.py
@@ -523,19 +523,19 @@ class VercelStreamingService:
 
         Handles two interrupt sources:
         1. interrupt_on config (Deep Agent built-in): Already has action_requests/review_configs
-        2. interrupt() primitive (custom tool code): Has type/message/action/context
+        2. interrupt() primitive (custom tool code): Has type/action/context (message is optional)
 
         Args:
             interrupt_value: Raw interrupt payload from Deep Agent
 
         Returns:
-            dict: Normalized payload with action_requests, review_configs, and optional context
+            dict: Normalized payload with action_requests, review_configs, and optional context/message
         """
         if "action_requests" in interrupt_value and "review_configs" in interrupt_value:
             return interrupt_value
 
         interrupt_type = interrupt_value.get("type", "unknown")
-        message = interrupt_value.get("message", "Approval required")
+        message = interrupt_value.get("message")
         action = interrupt_value.get("action", {})
         context = interrupt_value.get("context", {})
 
@@ -553,9 +553,10 @@ class VercelStreamingService:
                 }
             ],
             "interrupt_type": interrupt_type,
-            "message": message,
             "context": context,
         }
+        if message:
+            normalized["message"] = message
         return normalized
 
     # =========================================================================
diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
index f62390e9f..f810343ea 100644
--- a/surfsense_web/components/tool-ui/create-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -164,19 +164,15 @@ function ApprovalCard({
 			{/* Context section - account and parent page selection */}
 			{!decided && interruptData.context && (
 				<div className="border-b border-border px-4 py-3 bg-muted/30 space-y-3">
-					{interruptData.message && (
-						<p className="text-sm text-foreground">{interruptData.message}</p>
-					)}
-
 					{interruptData.context.error ? (
 						<p className="text-sm text-destructive">{interruptData.context.error}</p>
 					) : (
 						<>
 							{accounts.length > 0 && (
 								<div className="space-y-2">
-									<label className="text-xs font-medium text-muted-foreground">
+									<div className="text-xs font-medium text-muted-foreground">
 										Notion Account <span className="text-destructive">*</span>
-									</label>
+									</div>
 									<Select
 										value={selectedAccountId}
 										onValueChange={(value) => {
@@ -190,7 +186,7 @@ function ApprovalCard({
 										<SelectContent>
 											{accounts.map((account) => (
 												<SelectItem key={account.id} value={String(account.id)}>
-												{account.workspace_name}
+													{account.workspace_name}
 												</SelectItem>
 											))}
 										</SelectContent>
@@ -200,15 +196,15 @@ function ApprovalCard({
 
 							{selectedAccountId && (
 								<div className="space-y-2">
-									<label className="text-xs font-medium text-muted-foreground">
+									<div className="text-xs font-medium text-muted-foreground">
 										Parent Page (optional)
-									</label>
+									</div>
 									<Select value={selectedParentPageId} onValueChange={setSelectedParentPageId}>
 										<SelectTrigger className="w-full">
-											<SelectValue placeholder="None (create at root level)" />
+											<SelectValue placeholder="None" />
 										</SelectTrigger>
 										<SelectContent>
-											<SelectItem value="__none__">None (create at root level)</SelectItem>
+											<SelectItem value="__none__">None</SelectItem>
 											{availableParentPages.map((page) => (
 												<SelectItem key={page.page_id} value={page.page_id}>
 													📄 {page.title}
@@ -218,7 +214,7 @@ function ApprovalCard({
 									</Select>
 									{availableParentPages.length === 0 && selectedAccountId && (
 										<p className="text-xs text-muted-foreground">
-											No pages available. Page will be created at root level.
+											No pages available. Page will be created at workspace root.
 										</p>
 									)}
 								</div>
@@ -249,7 +245,7 @@ function ApprovalCard({
 			)}
 
 			{/* Edit mode - show editable form fields */}
-			{isEditing && (
+			{isEditing && !decided && (
 				<div className="space-y-3 px-4 py-3 bg-card">
 					<div>
 						<label
@@ -310,6 +306,7 @@ function ApprovalCard({
 							size="sm"
 							onClick={() => {
 								setDecided("edit");
+								setIsEditing(false);
 								onDecision({
 									type: "edit",
 									edited_action: {
@@ -317,11 +314,13 @@ function ApprovalCard({
 										args: {
 											...editedArgs,
 											connector_id: selectedAccountId ? Number(selectedAccountId) : null,
-											parent_page_id: selectedParentPageId === "__none__" ? null : selectedParentPageId,
+											parent_page_id:
+												selectedParentPageId === "__none__" ? null : selectedParentPageId,
 										},
 									},
 								});
 							}}
+							disabled={!selectedAccountId}
 						>
 							<CheckIcon />
 							Approve with Changes
@@ -351,7 +350,8 @@ function ApprovalCard({
 											args: {
 												...args,
 												connector_id: selectedAccountId ? Number(selectedAccountId) : null,
-												parent_page_id: selectedParentPageId === "__none__" ? null : selectedParentPageId,
+												parent_page_id:
+													selectedParentPageId === "__none__" ? null : selectedParentPageId,
 											},
 										},
 									});
@@ -477,6 +477,15 @@ export const CreateNotionPageToolUI = makeAssistantToolUI<
 			);
 		}
 
+		if (
+			typeof result === "object" &&
+			result !== null &&
+			"status" in result &&
+			(result as { status: string }).status === "rejected"
+		) {
+			return null;
+		}
+
 		if (isErrorResult(result)) {
 			return <ErrorCard result={result} />;
 		}

From 67473bbb783c0dfd5c3d8892f9b1ffafc4906da5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 17:51:11 +0200
Subject: [PATCH 23/42] Add validation for title and connector in notion page
 creation

---
 .../new_chat/tools/notion/create_page.py      | 35 ++++++++++++++++---
 .../components/tool-ui/create-notion-page.tsx | 15 ++++++--
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
index 4825c2aed..48baaf69c 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -126,14 +126,21 @@ def create_create_notion_page_tool(
             final_parent_page_id = final_params.get("parent_page_id", parent_page_id)
             final_connector_id = final_params.get("connector_id", connector_id)
             
+            if not final_title or not final_title.strip():
+                logger.error("Title is empty or contains only whitespace")
+                return {
+                    "status": "error",
+                    "message": "Page title cannot be empty. Please provide a valid title.",
+                }
+            
             logger.info(f"Creating Notion page with final params: title='{final_title}'")
             
+            from sqlalchemy.future import select
+
+            from app.db import SearchSourceConnector, SearchSourceConnectorType
+
             actual_connector_id = final_connector_id
             if actual_connector_id is None:
-                from sqlalchemy.future import select
-
-                from app.db import SearchSourceConnector, SearchSourceConnectorType
-
                 result = await db_session.execute(
                     select(SearchSourceConnector).filter(
                         SearchSourceConnector.search_space_id == search_space_id,
@@ -152,6 +159,26 @@ def create_create_notion_page_tool(
 
                 actual_connector_id = connector.id
                 logger.info(f"Found Notion connector: id={actual_connector_id}")
+            else:
+                result = await db_session.execute(
+                    select(SearchSourceConnector).filter(
+                        SearchSourceConnector.id == actual_connector_id,
+                        SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.connector_type
+                        == SearchSourceConnectorType.NOTION_CONNECTOR,
+                    )
+                )
+                connector = result.scalars().first()
+
+                if not connector:
+                    logger.error(
+                        f"Invalid connector_id={actual_connector_id} for search_space_id={search_space_id}"
+                    )
+                    return {
+                        "status": "error",
+                        "message": "Selected Notion account is invalid or has been disconnected. Please select a valid account.",
+                    }
+                logger.info(f"Validated Notion connector: id={actual_connector_id}")
 
             notion_connector = NotionHistoryConnector(
                 session=db_session,
diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
index f810343ea..74004d894 100644
--- a/surfsense_web/components/tool-ui/create-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -121,6 +121,11 @@ function ApprovalCard({
 		return parentPages[Number(selectedAccountId)] ?? [];
 	}, [selectedAccountId, parentPages]);
 
+	const isTitleValid = useMemo(() => {
+		const currentTitle = isEditing ? editedArgs.title : args.title;
+		return currentTitle && typeof currentTitle === "string" && currentTitle.trim().length > 0;
+	}, [isEditing, editedArgs.title, args.title]);
+
 	const reviewConfig = interruptData.review_configs[0];
 	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
 	const canEdit = allowedDecisions.includes("edit");
@@ -252,14 +257,18 @@ function ApprovalCard({
 							htmlFor="notion-title"
 							className="text-xs font-medium text-muted-foreground mb-1.5 block"
 						>
-							Title
+							Title <span className="text-destructive">*</span>
 						</label>
 						<Input
 							id="notion-title"
 							value={String(editedArgs.title ?? "")}
 							onChange={(e) => setEditedArgs({ ...editedArgs, title: e.target.value })}
 							placeholder="Enter page title"
+							className={!isTitleValid ? "border-destructive" : ""}
 						/>
+						{!isTitleValid && (
+							<p className="text-xs text-destructive mt-1">Title is required and cannot be empty</p>
+						)}
 					</div>
 					<div>
 						<label
@@ -320,7 +329,7 @@ function ApprovalCard({
 									},
 								});
 							}}
-							disabled={!selectedAccountId}
+							disabled={!selectedAccountId || !isTitleValid}
 						>
 							<CheckIcon />
 							Approve with Changes
@@ -356,7 +365,7 @@ function ApprovalCard({
 										},
 									});
 								}}
-								disabled={!selectedAccountId}
+								disabled={!selectedAccountId || !isTitleValid}
 							>
 								<CheckIcon />
 								Approve

From f7411b97378fbc97261120b8d0941828d809885e Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 18:14:26 +0200
Subject: [PATCH 24/42] Add user_id filter to prevent cross-user document
 access

---
 .../app/services/notion/tool_metadata_service.py  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/surfsense_backend/app/services/notion/tool_metadata_service.py b/surfsense_backend/app/services/notion/tool_metadata_service.py
index eeb8eb86a..306d9a204 100644
--- a/surfsense_backend/app/services/notion/tool_metadata_service.py
+++ b/surfsense_backend/app/services/notion/tool_metadata_service.py
@@ -90,31 +90,37 @@ class NotionToolMetadataService:
         self, search_space_id: int, user_id: str, page_id: str
     ) -> dict:
         result = await self._db_session.execute(
-            select(Document).filter(
+            select(Document)
+            .join(SearchSourceConnector, Document.connector_id == SearchSourceConnector.id)
+            .filter(
                 and_(
                     Document.search_space_id == search_space_id,
                     Document.document_type == DocumentType.NOTION_CONNECTOR,
                     Document.document_metadata["page_id"].astext == page_id,
+                    SearchSourceConnector.user_id == user_id,
                 )
             )
         )
         document = result.scalars().first()
 
         if not document:
-            return {"error": f"Page {page_id} not found in indexed documents"}
+            return {"error": f"Page {page_id} not found in your indexed documents"}
 
         if not document.connector_id:
             return {"error": "Document has no associated connector"}
 
         result = await self._db_session.execute(
             select(SearchSourceConnector).filter(
-                SearchSourceConnector.id == document.connector_id
+                and_(
+                    SearchSourceConnector.id == document.connector_id,
+                    SearchSourceConnector.user_id == user_id,
+                )
             )
         )
         connector = result.scalars().first()
 
         if not connector:
-            return {"error": "Connector not found"}
+            return {"error": "Connector not found or access denied"}
 
         account = NotionAccount.from_connector(connector)
 
@@ -177,6 +183,7 @@ class NotionToolMetadataService:
                     "document_id": doc.id,
                 }
                 for doc in documents
+                if doc.document_metadata.get("page_id")
             ]
 
         return parent_pages

From f15e6aeb5e5bf571afcd91ab8f9ff7161b122757 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 18:42:11 +0200
Subject: [PATCH 25/42] Add HIL to update notion page tool

---
 .../new_chat/tools/notion/update_page.py      | 111 ++++++++++++++----
 .../app/agents/new_chat/tools/registry.py     |   3 +-
 2 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
index 2e4a10d4b..6a122bd50 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -1,14 +1,17 @@
 from typing import Any
 
 from langchain_core.tools import tool
+from langgraph.types import interrupt
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.connectors.notion_history import NotionHistoryConnector
+from app.services.notion import NotionToolMetadataService
 
 
 def create_update_notion_page_tool(
     db_session: AsyncSession | None = None,
     search_space_id: int | None = None,
+    user_id: str | None = None,
     connector_id: int | None = None,
 ):
     """
@@ -17,6 +20,7 @@ def create_update_notion_page_tool(
     Args:
         db_session: Database session for accessing Notion connector
         search_space_id: Search space ID to find the Notion connector
+        user_id: User ID for fetching user-specific context
         connector_id: Optional specific connector ID (if known)
 
     Returns:
@@ -42,18 +46,22 @@ def create_update_notion_page_tool(
 
         Returns:
             Dictionary with:
-            - status: "success" or "error"
-            - page_id: Updated page ID
-            - url: URL to the updated page
-            - title: Current page title
-            - message: Success or error message
+            - status: "success", "rejected", or "error"
+            - page_id: Updated page ID (if success)
+            - url: URL to the updated page (if success)
+            - title: Current page title (if success)
+            - message: Result message
+
+            IMPORTANT: If status is "rejected", the user explicitly declined the action.
+            Respond with a brief acknowledgment (e.g., "Understood, I didn't update the page.")
+            and move on. Do NOT ask for alternatives or troubleshoot.
 
         Examples:
             - "Update the Notion page abc123 with title 'Updated Meeting Notes'"
             - "Change the content of page xyz789 to 'New content here'"
             - "Update page abc123 with new title 'Final Report' and content '# Summary...'"
         """
-        if db_session is None or search_space_id is None:
+        if db_session is None or search_space_id is None or user_id is None:
             return {
                 "status": "error",
                 "message": "Notion tool not properly configured. Please contact support.",
@@ -66,16 +74,71 @@ def create_update_notion_page_tool(
             }
 
         try:
-            # Get connector ID if not provided
-            actual_connector_id = connector_id
-            if actual_connector_id is None:
-                from sqlalchemy.future import select
+            metadata_service = NotionToolMetadataService(db_session)
+            context = await metadata_service.get_update_context(
+                search_space_id, user_id, page_id
+            )
 
-                from app.db import SearchSourceConnector, SearchSourceConnectorType
+            if "error" in context:
+                return {
+                    "status": "error",
+                    "message": context["error"],
+                }
 
+            approval = interrupt({
+                "type": "notion_page_update",
+                "action": {
+                    "tool": "update_notion_page",
+                    "params": {
+                        "page_id": page_id,
+                        "title": title,
+                        "content": content,
+                    },
+                },
+                "context": context,
+            })
+
+            decisions = approval.get("decisions", [])
+            if not decisions:
+                return {
+                    "status": "error",
+                    "message": "No approval decision received",
+                }
+
+            decision = decisions[0]
+            decision_type = decision.get("type") or decision.get("decision_type")
+
+            if decision_type == "reject":
+                return {
+                    "status": "rejected",
+                    "message": "User declined. The page was not updated. Do not ask again or suggest alternatives.",
+                }
+
+            edited_action = decision.get("edited_action", {})
+            final_params = edited_action.get("args", {}) if edited_action else {}
+
+            final_page_id = final_params.get("page_id", page_id)
+            final_title = final_params.get("title", title)
+            final_content = final_params.get("content", content)
+
+            if final_title and (not final_title or not final_title.strip()):
+                return {
+                    "status": "error",
+                    "message": "Page title cannot be empty. Please provide a valid title.",
+                }
+
+            from sqlalchemy.future import select
+
+            from app.db import SearchSourceConnector, SearchSourceConnectorType
+
+            connector_id_from_context = context.get("account", {}).get("id")
+            
+            if connector_id_from_context:
                 result = await db_session.execute(
                     select(SearchSourceConnector).filter(
+                        SearchSourceConnector.id == connector_id_from_context,
                         SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.user_id == user_id,
                         SearchSourceConnector.connector_type
                         == SearchSourceConnectorType.NOTION_CONNECTOR,
                     )
@@ -85,32 +148,36 @@ def create_update_notion_page_tool(
                 if not connector:
                     return {
                         "status": "error",
-                        "message": "No Notion connector found. Please connect Notion in your workspace settings.",
+                        "message": "Selected Notion account is invalid or has been disconnected. Please select a valid account.",
                     }
-
                 actual_connector_id = connector.id
+            else:
+                return {
+                    "status": "error",
+                    "message": "No connector found for this page.",
+                }
 
-            # Create connector instance
             notion_connector = NotionHistoryConnector(
                 session=db_session,
                 connector_id=actual_connector_id,
             )
 
-            # Update the page
             result = await notion_connector.update_page(
-                page_id=page_id, title=title, content=content
+                page_id=final_page_id,
+                title=final_title,
+                content=final_content,
             )
             return result
 
-        except ValueError as e:
-            return {
-                "status": "error",
-                "message": str(e),
-            }
         except Exception as e:
+            from langgraph.errors import GraphInterrupt
+
+            if isinstance(e, GraphInterrupt):
+                raise
+
             return {
                 "status": "error",
-                "message": f"Unexpected error updating Notion page: {e!s}",
+                "message": str(e) if isinstance(e, ValueError) else f"Unexpected error: {e!s}",
             }
 
     return update_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index 47f3d4e12..5384cdce0 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -223,8 +223,9 @@ BUILTIN_TOOLS: list[ToolDefinition] = [
         factory=lambda deps: create_update_notion_page_tool(
             db_session=deps["db_session"],
             search_space_id=deps["search_space_id"],
+            user_id=deps["user_id"],
         ),
-        requires=["db_session", "search_space_id"],
+        requires=["db_session", "search_space_id", "user_id"],
     ),
     ToolDefinition(
         name="delete_notion_page",

From 43c6c784abff99ab2b7f9969f95e22974d20b875 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 19:22:45 +0200
Subject: [PATCH 26/42] Add update notion page UI component

---
 .../components/tool-ui/update-notion-page.tsx | 572 ++++++++++++++++++
 1 file changed, 572 insertions(+)
 create mode 100644 surfsense_web/components/tool-ui/update-notion-page.tsx

diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
new file mode 100644
index 000000000..671509077
--- /dev/null
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -0,0 +1,572 @@
+"use client";
+
+import { makeAssistantToolUI } from "@assistant-ui/react";
+import {
+	AlertTriangleIcon,
+	CheckIcon,
+	Loader2Icon,
+	Maximize2Icon,
+	PencilIcon,
+	XIcon,
+} from "lucide-react";
+import { useMemo, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+
+interface InterruptResult {
+	__interrupt__: true;
+	__decided__?: "approve" | "reject" | "edit";
+	action_requests: Array<{
+		name: string;
+		args: Record<string, unknown>;
+		description?: string;
+	}>;
+	review_configs: Array<{
+		action_name: string;
+		allowed_decisions: Array<"approve" | "edit" | "reject">;
+	}>;
+	interrupt_type?: string;
+	message?: string;
+	context?: {
+		account?: {
+			id: number;
+			name: string;
+			workspace_id: string | null;
+			workspace_name: string;
+			workspace_icon: string;
+		};
+		page_id?: string;
+		current_title?: string;
+		current_content?: string;
+		document_id?: number;
+		indexed_at?: string;
+		error?: string;
+	};
+}
+
+interface SuccessResult {
+	status: "success";
+	page_id: string;
+	title: string;
+	url: string;
+	message?: string;
+}
+
+interface ErrorResult {
+	status: "error";
+	message: string;
+}
+
+type UpdateNotionPageResult = InterruptResult | SuccessResult | ErrorResult;
+
+function isInterruptResult(result: unknown): result is InterruptResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"__interrupt__" in result &&
+		(result as InterruptResult).__interrupt__ === true
+	);
+}
+
+function isErrorResult(result: unknown): result is ErrorResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"status" in result &&
+		(result as ErrorResult).status === "error"
+	);
+}
+
+function PageContextDisplay({
+	account,
+	currentTitle,
+	currentContent,
+}: {
+	account?: {
+		id: number;
+		name: string;
+		workspace_id: string | null;
+		workspace_name: string;
+		workspace_icon: string;
+	};
+	currentTitle?: string;
+	currentContent?: string;
+}) {
+	return (
+		<>
+			{account && (
+				<div className="space-y-2">
+					<div className="text-xs font-medium text-muted-foreground">Notion Account</div>
+					<div className="text-sm text-foreground p-2 bg-card rounded border border-border">
+						{account.workspace_name}
+					</div>
+				</div>
+			)}
+
+			{currentTitle && (
+				<div className="space-y-2">
+					<div className="text-xs font-medium text-muted-foreground">Current Page Title</div>
+					<div className="text-sm text-foreground p-2 bg-card rounded border border-border">
+						{currentTitle}
+					</div>
+				</div>
+			)}
+
+			{currentContent && (
+				<div className="space-y-2">
+					<div className="text-xs font-medium text-muted-foreground">
+						Current Content (first 200 chars)
+					</div>
+					<div className="text-sm text-muted-foreground p-2 bg-card rounded border border-border font-mono text-xs">
+						{currentContent.slice(0, 200)}
+						{currentContent.length > 200 && "..."}
+					</div>
+				</div>
+			)}
+		</>
+	);
+}
+
+function EditFormFields({
+	editedArgs,
+	setEditedArgs,
+	isTitleValid,
+	idPrefix = "",
+	rows = 8,
+}: {
+	editedArgs: Record<string, unknown>;
+	setEditedArgs: (args: Record<string, unknown>) => void;
+	isTitleValid: boolean;
+	idPrefix?: string;
+	rows?: number;
+}) {
+	return (
+		<>
+			<div>
+				<label
+					htmlFor={`${idPrefix}notion-title`}
+					className="text-xs font-medium text-muted-foreground mb-1.5 block"
+				>
+					Title <span className="text-destructive">*</span>
+				</label>
+				<Input
+					id={`${idPrefix}notion-title`}
+					value={String(editedArgs.title ?? "")}
+					onChange={(e) => setEditedArgs({ ...editedArgs, title: e.target.value })}
+					placeholder="Enter page title"
+					className={!isTitleValid ? "border-destructive" : ""}
+				/>
+				{!isTitleValid && (
+					<p className="text-xs text-destructive mt-1">Title is required and cannot be empty</p>
+				)}
+			</div>
+			<div>
+				<label
+					htmlFor={`${idPrefix}notion-content`}
+					className="text-xs font-medium text-muted-foreground mb-1.5 block"
+				>
+					Content (optional)
+				</label>
+				<Textarea
+					id={`${idPrefix}notion-content`}
+					value={String(editedArgs.content ?? "")}
+					onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value })}
+					placeholder="Enter page content"
+					rows={rows}
+					className="resize-none font-mono text-xs"
+				/>
+			</div>
+		</>
+	);
+}
+
+function ApprovalCard({
+	args,
+	interruptData,
+	onDecision,
+}: {
+	args: Record<string, unknown>;
+	interruptData: InterruptResult;
+	onDecision: (decision: {
+		type: "approve" | "reject" | "edit";
+		message?: string;
+		edited_action?: { name: string; args: Record<string, unknown> };
+	}) => void;
+}) {
+	const [decided, setDecided] = useState<"approve" | "reject" | "edit" | null>(
+		interruptData.__decided__ ?? null
+	);
+	const [isEditing, setIsEditing] = useState(false);
+	const [isFullScreen, setIsFullScreen] = useState(false);
+
+	const account = interruptData.context?.account;
+	const currentTitle = interruptData.context?.current_title;
+	const currentContent = interruptData.context?.current_content;
+
+	const [editedArgs, setEditedArgs] = useState<Record<string, unknown>>({
+		...args,
+		title: args.title || currentTitle || "",
+		content: args.content || currentContent || "",
+	});
+
+	const isTitleValid = useMemo((): boolean => {
+		const title = isEditing ? editedArgs.title : args.title || currentTitle;
+		return Boolean(title && typeof title === "string" && title.trim().length > 0);
+	}, [isEditing, editedArgs.title, args.title, currentTitle]);
+
+	const reviewConfig = interruptData.review_configs[0];
+	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
+	const canEdit = allowedDecisions.includes("edit");
+
+	return (
+		<div
+			className={`my-4 max-w-full overflow-hidden rounded-xl transition-all duration-300 ${
+				decided
+					? "border border-border bg-card shadow-sm"
+					: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
+			}`}
+		>
+			<div
+				className={`flex items-center gap-3 border-b ${
+					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/40 dark:bg-muted/20"
+				} px-4 py-3`}
+			>
+				<div
+					className={`flex size-9 shrink-0 items-center justify-center rounded-lg ${
+						decided ? "bg-muted" : "bg-muted animate-pulse"
+					}`}
+				>
+					<AlertTriangleIcon
+						className={`size-4 ${decided ? "text-muted-foreground" : "text-foreground"}`}
+					/>
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className={`text-sm font-medium ${decided ? "text-foreground" : "text-foreground"}`}>
+						Update Notion Page
+					</p>
+					<p
+						className={`truncate text-xs ${
+							decided ? "text-muted-foreground" : "text-muted-foreground"
+						}`}
+					>
+						{isEditing ? "You can edit the arguments below" : "Requires your approval to proceed"}
+					</p>
+				</div>
+				{canEdit && !decided && !isEditing && (
+					<>
+						<Button size="sm" variant="ghost" onClick={() => setIsFullScreen(true)}>
+							<Maximize2Icon className="size-4" />
+						</Button>
+						<Button size="sm" variant="ghost" onClick={() => setIsEditing(true)}>
+							<PencilIcon className="size-4" />
+							Edit
+						</Button>
+					</>
+				)}
+			</div>
+
+			{!decided && interruptData.context && (
+				<div className="border-b border-border px-4 py-3 bg-muted/30 space-y-3">
+					{interruptData.context.error ? (
+						<p className="text-sm text-destructive">{interruptData.context.error}</p>
+					) : (
+						<PageContextDisplay
+							account={account}
+							currentTitle={currentTitle}
+							currentContent={currentContent}
+						/>
+					)}
+				</div>
+			)}
+
+			{!isEditing && (
+				<div className="space-y-2 px-4 py-3 bg-card">
+					{args.title != null && (
+						<div>
+							<div className="text-xs font-medium text-muted-foreground mb-1.5 block">
+								New Title
+							</div>
+							<p className="text-sm text-foreground">{String(args.title)}</p>
+						</div>
+					)}
+					{args.content != null && (
+						<div>
+							<div className="text-xs font-medium text-muted-foreground mb-1.5 block">
+								New Content
+							</div>
+							<p className="text-sm text-foreground whitespace-pre-wrap font-mono text-xs">
+								{String(args.content).slice(0, 300)}
+								{String(args.content).length > 300 && "..."}
+							</p>
+						</div>
+					)}
+				</div>
+			)}
+
+			{isEditing && !decided && (
+				<div className="space-y-3 px-4 py-3 bg-card">
+					<EditFormFields
+						editedArgs={editedArgs}
+						setEditedArgs={setEditedArgs}
+						isTitleValid={isTitleValid}
+						rows={8}
+					/>
+				</div>
+			)}
+
+			<div
+				className={`flex items-center gap-2 border-t ${
+					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/20 dark:bg-muted/10"
+				} px-4 py-3`}
+			>
+				{decided ? (
+					<p className="flex items-center gap-1.5 text-sm text-muted-foreground">
+						{decided === "approve" || decided === "edit" ? (
+							<>
+								<CheckIcon className="size-3.5 text-green-500" />
+								{decided === "edit" ? "Approved with Changes" : "Approved"}
+							</>
+						) : (
+							<>
+								<XIcon className="size-3.5 text-destructive" />
+								Rejected
+							</>
+						)}
+					</p>
+				) : isEditing ? (
+					<>
+						<Button
+							size="sm"
+							onClick={() => {
+								setDecided("edit");
+								setIsEditing(false);
+								onDecision({
+									type: "edit",
+									edited_action: {
+										name: interruptData.action_requests[0].name,
+										args: editedArgs,
+									},
+								});
+							}}
+							disabled={!isTitleValid}
+						>
+							<CheckIcon />
+							Approve with Changes
+						</Button>
+						<Button
+							size="sm"
+							variant="outline"
+							onClick={() => {
+								setIsEditing(false);
+								setEditedArgs({
+									...args,
+									title: args.title || currentTitle || "",
+									content: args.content || currentContent || "",
+								});
+							}}
+						>
+							Cancel
+						</Button>
+					</>
+				) : (
+					<>
+						{allowedDecisions.includes("approve") && (
+							<Button
+								size="sm"
+								onClick={() => {
+									setDecided("approve");
+									onDecision({
+										type: "approve",
+										edited_action: {
+											name: interruptData.action_requests[0].name,
+											args: args,
+										},
+									});
+								}}
+								disabled={!isTitleValid}
+							>
+								<CheckIcon />
+								Approve
+							</Button>
+						)}
+						{allowedDecisions.includes("reject") && (
+							<Button
+								size="sm"
+								variant="destructive"
+								onClick={() => {
+									setDecided("reject");
+									onDecision({ type: "reject" });
+								}}
+							>
+								<XIcon />
+								Reject
+							</Button>
+						)}
+					</>
+				)}
+			</div>
+
+			<Dialog open={isFullScreen} onOpenChange={setIsFullScreen}>
+				<DialogContent className="max-w-4xl max-h-[90vh] overflow-y-auto">
+					<DialogHeader>
+						<DialogTitle>Update Notion Page</DialogTitle>
+					</DialogHeader>
+
+					<PageContextDisplay
+						account={account}
+						currentTitle={currentTitle}
+						currentContent={undefined}
+					/>
+
+					<div className="space-y-4">
+						<EditFormFields
+							editedArgs={editedArgs}
+							setEditedArgs={setEditedArgs}
+							isTitleValid={isTitleValid}
+							idPrefix="fullscreen-"
+							rows={20}
+						/>
+					</div>
+
+					<div className="flex items-center gap-2 justify-end pt-4 border-t">
+						<Button
+							size="sm"
+							onClick={() => {
+								setDecided("edit");
+								setIsFullScreen(false);
+								onDecision({
+									type: "edit",
+									edited_action: {
+										name: interruptData.action_requests[0].name,
+										args: editedArgs,
+									},
+								});
+							}}
+							disabled={!isTitleValid}
+						>
+							<CheckIcon />
+							Approve with Changes
+						</Button>
+						<Button
+							size="sm"
+							variant="outline"
+							onClick={() => {
+								setIsFullScreen(false);
+								setEditedArgs({
+									...args,
+									title: args.title || currentTitle || "",
+									content: args.content || currentContent || "",
+								});
+							}}
+						>
+							Cancel
+						</Button>
+					</div>
+				</DialogContent>
+			</Dialog>
+		</div>
+	);
+}
+
+function LoadingCard() {
+	return (
+		<div className="my-4 flex items-center gap-3 rounded-xl border-2 border-blue-200 bg-blue-50 px-4 py-3 dark:border-blue-900 dark:bg-blue-950">
+			<Loader2Icon className="size-5 animate-spin text-blue-600 dark:text-blue-400" />
+			<p className="text-sm text-blue-900 dark:text-blue-100">Updating Notion page...</p>
+		</div>
+	);
+}
+
+function SuccessCard({ result }: { result: SuccessResult }) {
+	return (
+		<div className="my-4 rounded-xl border border-green-200 bg-green-50 p-4 dark:border-green-900 dark:bg-green-950">
+			<div className="flex items-start gap-3">
+				<CheckIcon className="size-5 shrink-0 text-green-600 dark:text-green-400" />
+				<div className="flex-1 space-y-2">
+					<p className="text-sm font-medium text-green-900 dark:text-green-100">
+						Updated Notion page '{result.title}'
+					</p>
+					{result.url && (
+						<a
+							href={result.url}
+							target="_blank"
+							rel="noopener noreferrer"
+							className="inline-block text-sm text-green-700 underline hover:text-green-800 dark:text-green-300 dark:hover:text-green-200"
+						>
+							Open in Notion →
+						</a>
+					)}
+				</div>
+			</div>
+		</div>
+	);
+}
+
+function ErrorCard({ result }: { result: ErrorResult }) {
+	return (
+		<div className="my-4 rounded-xl border border-red-200 bg-red-50 p-4 dark:border-red-900 dark:bg-red-950">
+			<div className="flex items-start gap-3">
+				<XIcon className="size-5 shrink-0 text-red-600 dark:text-red-400" />
+				<div className="flex-1">
+					<p className="text-sm font-medium text-red-900 dark:text-red-100">
+						Failed to update page
+					</p>
+					<p className="mt-1 text-sm text-red-700 dark:text-red-300">{result.message}</p>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+export const UpdateNotionPageToolUI = makeAssistantToolUI<
+	{ page_id: string; title?: string | null; content?: string | null },
+	UpdateNotionPageResult
+>({
+	toolName: "update_notion_page",
+	render: function UpdateNotionPageUI({ result, addResult, status }) {
+		if (status.type === "running") {
+			return <LoadingCard />;
+		}
+
+		if (isInterruptResult(result)) {
+			const args = result.action_requests[0]?.args || {};
+
+			return (
+				<ApprovalCard
+					args={args}
+					interruptData={result}
+					onDecision={(decision) => {
+						const event = new CustomEvent("hitl-decision", {
+							detail: { decisions: [decision] },
+						});
+						window.dispatchEvent(event);
+					}}
+				/>
+			);
+		}
+
+		if (
+			typeof result === "object" &&
+			result !== null &&
+			"status" in result &&
+			(result as { status: string }).status === "rejected"
+		) {
+			return null;
+		}
+
+		if (isErrorResult(result)) {
+			return <ErrorCard result={result} />;
+		}
+
+		if (typeof result === "object" && result !== null && "status" in result) {
+			const successResult = result as SuccessResult;
+			if (successResult.status === "success") {
+				return <SuccessCard result={successResult} />;
+			}
+		}
+
+		return null;
+	},
+});

From 2fd082683dd595dcf4e88734de231b4998c702e7 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 19:26:01 +0200
Subject: [PATCH 27/42] Register update notion page UI component

---
 .../[search_space_id]/new-chat/[[...chat_id]]/page.tsx          | 2 ++
 surfsense_web/components/tool-ui/index.ts                       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index 45c3b3313..83ac3ef2b 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -39,6 +39,7 @@ import { DisplayImageToolUI } from "@/components/tool-ui/display-image";
 import { GeneratePodcastToolUI } from "@/components/tool-ui/generate-podcast";
 import { LinkPreviewToolUI } from "@/components/tool-ui/link-preview";
 import { ScrapeWebpageToolUI } from "@/components/tool-ui/scrape-webpage";
+import { UpdateNotionPageToolUI } from "@/components/tool-ui/update-notion-page";
 import { RecallMemoryToolUI, SaveMemoryToolUI } from "@/components/tool-ui/user-memory";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useChatSessionStateSync } from "@/hooks/use-chat-session-state";
@@ -1618,6 +1619,7 @@ export default function NewChatPage() {
 			<SaveMemoryToolUI />
 			<RecallMemoryToolUI />
 			<CreateNotionPageToolUI />
+			<UpdateNotionPageToolUI />
 			<DeleteNotionPageToolUI />
 			{/* <WriteTodosToolUI /> Disabled for now */}
 			<div className="flex flex-col h-[calc(100dvh-64px)] overflow-hidden">
diff --git a/surfsense_web/components/tool-ui/index.ts b/surfsense_web/components/tool-ui/index.ts
index 56e5c975b..5899c4fa1 100644
--- a/surfsense_web/components/tool-ui/index.ts
+++ b/surfsense_web/components/tool-ui/index.ts
@@ -78,6 +78,7 @@ export {
 	ScrapeWebpageResultSchema,
 	ScrapeWebpageToolUI,
 } from "./scrape-webpage";
+export { UpdateNotionPageToolUI } from "./update-notion-page";
 export {
 	type MemoryItem,
 	type RecallMemoryArgs,

From d33c0dd32fb8ee974a1390ec7aece1a0c804b64e Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 12 Feb 2026 19:32:36 +0200
Subject: [PATCH 28/42] fix: use cast() instead of astext for JSONB query

---
 .../app/services/notion/tool_metadata_service.py              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/surfsense_backend/app/services/notion/tool_metadata_service.py b/surfsense_backend/app/services/notion/tool_metadata_service.py
index 306d9a204..9098d6deb 100644
--- a/surfsense_backend/app/services/notion/tool_metadata_service.py
+++ b/surfsense_backend/app/services/notion/tool_metadata_service.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from sqlalchemy import and_
+from sqlalchemy import String, and_, cast
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
@@ -96,7 +96,7 @@ class NotionToolMetadataService:
                 and_(
                     Document.search_space_id == search_space_id,
                     Document.document_type == DocumentType.NOTION_CONNECTOR,
-                    Document.document_metadata["page_id"].astext == page_id,
+                    cast(Document.document_metadata["page_id"], String) == page_id,
                     SearchSourceConnector.user_id == user_id,
                 )
             )

From 0d1b61d7e647212cd48f3def39a9268a10982fd5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 10:45:51 +0200
Subject: [PATCH 29/42] Implement update notion page tool

---
 .../new_chat/tools/notion/update_page.py      |  95 ++--
 .../services/notion/tool_metadata_service.py  |  28 +-
 .../new-chat/[[...chat_id]]/page.tsx          |   1 +
 surfsense_web/app/globals.css                 |   3 +-
 .../components/tool-ui/update-notion-page.tsx | 439 +++++++-----------
 surfsense_web/contexts/LocaleContext.tsx      |   2 +-
 surfsense_web/lib/chat/streaming-state.ts     |  15 +-
 7 files changed, 254 insertions(+), 329 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
index 6a122bd50..09507f465 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -1,3 +1,4 @@
+import logging
 from typing import Any
 
 from langchain_core.tools import tool
@@ -7,6 +8,8 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from app.connectors.notion_history import NotionHistoryConnector
 from app.services.notion import NotionToolMetadataService
 
+logger = logging.getLogger(__name__)
+
 
 def create_update_notion_page_tool(
     db_session: AsyncSession | None = None,
@@ -29,20 +32,20 @@ def create_update_notion_page_tool(
 
     @tool
     async def update_notion_page(
-        page_id: str,
-        title: str | None = None,
-        content: str | None = None,
+        page_title: str,
+        new_title: str | None = None,
+        new_content: str | None = None,
     ) -> dict[str, Any]:
         """Update an existing Notion page's title and/or content.
 
         Use this tool when the user asks you to modify, edit, or update
-        a Notion page. At least one of title or content must be provided.
+        a Notion page. At least one of new_title or new_content must be provided.
 
         Args:
-            page_id: The ID of the Notion page to update (required).
-            title: New title for the page (optional).
-            content: New markdown content for the page body (optional).
-                    If provided, replaces all existing content.
+            page_title: The current title of the Notion page to update (required).
+            new_title: New title for the page (optional).
+            new_content: New markdown content for the page body (optional).
+                        If provided, replaces all existing content.
 
         Returns:
             Dictionary with:
@@ -57,49 +60,61 @@ def create_update_notion_page_tool(
             and move on. Do NOT ask for alternatives or troubleshoot.
 
         Examples:
-            - "Update the Notion page abc123 with title 'Updated Meeting Notes'"
-            - "Change the content of page xyz789 to 'New content here'"
-            - "Update page abc123 with new title 'Final Report' and content '# Summary...'"
+            - "Update the 'Meeting Notes' page with new title 'Updated Meeting Notes'"
+            - "Change the content of 'Project Plan' page to 'New content here'"
+            - "Update 'Weekly Report' with new title 'Final Report' and content '# Summary...'"
         """
+        logger.info(f"update_notion_page called: page_title='{page_title}', new_title={new_title}, has_content={new_content is not None}")
+        
         if db_session is None or search_space_id is None or user_id is None:
+            logger.error("Notion tool not properly configured - missing required parameters")
             return {
                 "status": "error",
                 "message": "Notion tool not properly configured. Please contact support.",
             }
 
-        if not title and not content:
+        if not new_title and not new_content:
             return {
                 "status": "error",
-                "message": "At least one of 'title' or 'content' must be provided to update the page.",
+                "message": "At least one of 'new_title' or 'new_content' must be provided to update the page.",
             }
 
         try:
             metadata_service = NotionToolMetadataService(db_session)
             context = await metadata_service.get_update_context(
-                search_space_id, user_id, page_id
+                search_space_id, user_id, page_title
             )
 
             if "error" in context:
+                logger.error(f"Failed to fetch update context: {context['error']}")
                 return {
                     "status": "error",
                     "message": context["error"],
                 }
 
-            approval = interrupt({
-                "type": "notion_page_update",
-                "action": {
-                    "tool": "update_notion_page",
-                    "params": {
-                        "page_id": page_id,
-                        "title": title,
-                        "content": content,
+            page_id = context.get("page_id")
+            connector_id_from_context = context.get("account", {}).get("id")
+
+            logger.info(f"Requesting approval for updating Notion page: '{page_title}' (page_id={page_id})")
+            approval = interrupt(
+                {
+                    "type": "notion_page_update",
+                    "action": {
+                        "tool": "update_notion_page",
+                        "params": {
+                            "page_id": page_id,
+                            "title": new_title,
+                            "content": new_content,
+                            "connector_id": connector_id_from_context,
+                        },
                     },
-                },
-                "context": context,
-            })
+                    "context": context,
+                }
+            )
 
             decisions = approval.get("decisions", [])
             if not decisions:
+                logger.warning("No approval decision received")
                 return {
                     "status": "error",
                     "message": "No approval decision received",
@@ -107,8 +122,10 @@ def create_update_notion_page_tool(
 
             decision = decisions[0]
             decision_type = decision.get("type") or decision.get("decision_type")
+            logger.info(f"User decision: {decision_type}")
 
             if decision_type == "reject":
+                logger.info("Notion page update rejected by user")
                 return {
                     "status": "rejected",
                     "message": "User declined. The page was not updated. Do not ask again or suggest alternatives.",
@@ -118,25 +135,28 @@ def create_update_notion_page_tool(
             final_params = edited_action.get("args", {}) if edited_action else {}
 
             final_page_id = final_params.get("page_id", page_id)
-            final_title = final_params.get("title", title)
-            final_content = final_params.get("content", content)
+            final_title = final_params.get("title", new_title)
+            final_content = final_params.get("content", new_content)
+            final_connector_id = final_params.get("connector_id", connector_id_from_context)
 
-            if final_title and (not final_title or not final_title.strip()):
+            # Validate title if it's being updated
+            if final_title is not None and not final_title.strip():
+                logger.error("Title is empty or contains only whitespace")
                 return {
                     "status": "error",
                     "message": "Page title cannot be empty. Please provide a valid title.",
                 }
 
+            logger.info(f"Updating Notion page with final params: page_id={final_page_id}, title={final_title}, has_content={final_content is not None}")
+
             from sqlalchemy.future import select
 
             from app.db import SearchSourceConnector, SearchSourceConnectorType
 
-            connector_id_from_context = context.get("account", {}).get("id")
-            
-            if connector_id_from_context:
+            if final_connector_id:
                 result = await db_session.execute(
                     select(SearchSourceConnector).filter(
-                        SearchSourceConnector.id == connector_id_from_context,
+                        SearchSourceConnector.id == final_connector_id,
                         SearchSourceConnector.search_space_id == search_space_id,
                         SearchSourceConnector.user_id == user_id,
                         SearchSourceConnector.connector_type
@@ -146,12 +166,17 @@ def create_update_notion_page_tool(
                 connector = result.scalars().first()
 
                 if not connector:
+                    logger.error(
+                        f"Invalid connector_id={final_connector_id} for search_space_id={search_space_id}"
+                    )
                     return {
                         "status": "error",
                         "message": "Selected Notion account is invalid or has been disconnected. Please select a valid account.",
                     }
                 actual_connector_id = connector.id
+                logger.info(f"Validated Notion connector: id={actual_connector_id}")
             else:
+                logger.error("No connector found for this page")
                 return {
                     "status": "error",
                     "message": "No connector found for this page.",
@@ -167,6 +192,7 @@ def create_update_notion_page_tool(
                 title=final_title,
                 content=final_content,
             )
+            logger.info(f"update_page result: {result.get('status')} - {result.get('message', '')}")
             return result
 
         except Exception as e:
@@ -175,9 +201,12 @@ def create_update_notion_page_tool(
             if isinstance(e, GraphInterrupt):
                 raise
 
+            logger.error(f"Error updating Notion page: {e}", exc_info=True)
             return {
                 "status": "error",
-                "message": str(e) if isinstance(e, ValueError) else f"Unexpected error: {e!s}",
+                "message": str(e)
+                if isinstance(e, ValueError)
+                else f"Unexpected error: {e!s}",
             }
 
     return update_notion_page
diff --git a/surfsense_backend/app/services/notion/tool_metadata_service.py b/surfsense_backend/app/services/notion/tool_metadata_service.py
index 9098d6deb..521bfece0 100644
--- a/surfsense_backend/app/services/notion/tool_metadata_service.py
+++ b/surfsense_backend/app/services/notion/tool_metadata_service.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from sqlalchemy import String, and_, cast
+from sqlalchemy import and_, func
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.future import select
 
@@ -79,7 +79,9 @@ class NotionToolMetadataService:
                 "error": "No Notion accounts connected",
             }
 
-        parent_pages = await self._get_parent_pages_by_account(search_space_id, accounts)
+        parent_pages = await self._get_parent_pages_by_account(
+            search_space_id, accounts
+        )
 
         return {
             "accounts": [acc.to_dict() for acc in accounts],
@@ -87,16 +89,18 @@ class NotionToolMetadataService:
         }
 
     async def get_update_context(
-        self, search_space_id: int, user_id: str, page_id: str
+        self, search_space_id: int, user_id: str, page_title: str
     ) -> dict:
         result = await self._db_session.execute(
             select(Document)
-            .join(SearchSourceConnector, Document.connector_id == SearchSourceConnector.id)
+            .join(
+                SearchSourceConnector, Document.connector_id == SearchSourceConnector.id
+            )
             .filter(
                 and_(
                     Document.search_space_id == search_space_id,
                     Document.document_type == DocumentType.NOTION_CONNECTOR,
-                    cast(Document.document_metadata["page_id"], String) == page_id,
+                    func.lower(Document.title) == func.lower(page_title),
                     SearchSourceConnector.user_id == user_id,
                 )
             )
@@ -104,7 +108,11 @@ class NotionToolMetadataService:
         document = result.scalars().first()
 
         if not document:
-            return {"error": f"Page {page_id} not found in your indexed documents"}
+            return {
+                "error": f"Page '{page_title}' not found in your indexed Notion pages. "
+                "This could mean: (1) the page doesn't exist, (2) it hasn't been indexed yet, "
+                "or (3) the page title is different. Please check the exact page title in Notion."
+            }
 
         if not document.connector_id:
             return {"error": "Document has no associated connector"}
@@ -124,6 +132,10 @@ class NotionToolMetadataService:
 
         account = NotionAccount.from_connector(connector)
 
+        page_id = document.document_metadata.get("page_id")
+        if not page_id:
+            return {"error": "Page ID not found in document metadata"}
+
         return {
             "account": account.to_dict(),
             "page_id": page_id,
@@ -134,9 +146,9 @@ class NotionToolMetadataService:
         }
 
     async def get_delete_context(
-        self, search_space_id: int, user_id: str, page_id: str
+        self, search_space_id: int, user_id: str, page_title: str
     ) -> dict:
-        return await self.get_update_context(search_space_id, user_id, page_id)
+        return await self.get_update_context(search_space_id, user_id, page_title)
 
     async def _get_notion_accounts(
         self, search_space_id: int, user_id: str
diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index 83ac3ef2b..d529e0598 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -136,6 +136,7 @@ const TOOLS_WITH_UI = new Set([
 	"delete_notion_page",
 	"scrape_webpage",
 	"create_notion_page",
+	"update_notion_page",
 	// "write_todos", // Disabled for now
 ]);
 
diff --git a/surfsense_web/app/globals.css b/surfsense_web/app/globals.css
index babbabb0b..422f1b997 100644
--- a/surfsense_web/app/globals.css
+++ b/surfsense_web/app/globals.css
@@ -189,7 +189,8 @@ button {
 
 /* Human-in-the-loop approval card animations */
 @keyframes pulse-subtle {
-	0%, 100% {
+	0%,
+	100% {
 		opacity: 1;
 		box-shadow: 0 0 0 0 rgb(0 0 0 / 0.15);
 	}
diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
index 671509077..7fde7b75e 100644
--- a/surfsense_web/components/tool-ui/update-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -5,14 +5,13 @@ import {
 	AlertTriangleIcon,
 	CheckIcon,
 	Loader2Icon,
-	Maximize2Icon,
+	MaximizeIcon,
+	MinimizeIcon,
 	PencilIcon,
 	XIcon,
 } from "lucide-react";
 import { useMemo, useState } from "react";
 import { Button } from "@/components/ui/button";
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 
 interface InterruptResult {
@@ -51,6 +50,8 @@ interface SuccessResult {
 	page_id: string;
 	title: string;
 	url: string;
+	content_preview?: string;
+	content_length?: number;
 	message?: string;
 }
 
@@ -79,109 +80,6 @@ function isErrorResult(result: unknown): result is ErrorResult {
 	);
 }
 
-function PageContextDisplay({
-	account,
-	currentTitle,
-	currentContent,
-}: {
-	account?: {
-		id: number;
-		name: string;
-		workspace_id: string | null;
-		workspace_name: string;
-		workspace_icon: string;
-	};
-	currentTitle?: string;
-	currentContent?: string;
-}) {
-	return (
-		<>
-			{account && (
-				<div className="space-y-2">
-					<div className="text-xs font-medium text-muted-foreground">Notion Account</div>
-					<div className="text-sm text-foreground p-2 bg-card rounded border border-border">
-						{account.workspace_name}
-					</div>
-				</div>
-			)}
-
-			{currentTitle && (
-				<div className="space-y-2">
-					<div className="text-xs font-medium text-muted-foreground">Current Page Title</div>
-					<div className="text-sm text-foreground p-2 bg-card rounded border border-border">
-						{currentTitle}
-					</div>
-				</div>
-			)}
-
-			{currentContent && (
-				<div className="space-y-2">
-					<div className="text-xs font-medium text-muted-foreground">
-						Current Content (first 200 chars)
-					</div>
-					<div className="text-sm text-muted-foreground p-2 bg-card rounded border border-border font-mono text-xs">
-						{currentContent.slice(0, 200)}
-						{currentContent.length > 200 && "..."}
-					</div>
-				</div>
-			)}
-		</>
-	);
-}
-
-function EditFormFields({
-	editedArgs,
-	setEditedArgs,
-	isTitleValid,
-	idPrefix = "",
-	rows = 8,
-}: {
-	editedArgs: Record<string, unknown>;
-	setEditedArgs: (args: Record<string, unknown>) => void;
-	isTitleValid: boolean;
-	idPrefix?: string;
-	rows?: number;
-}) {
-	return (
-		<>
-			<div>
-				<label
-					htmlFor={`${idPrefix}notion-title`}
-					className="text-xs font-medium text-muted-foreground mb-1.5 block"
-				>
-					Title <span className="text-destructive">*</span>
-				</label>
-				<Input
-					id={`${idPrefix}notion-title`}
-					value={String(editedArgs.title ?? "")}
-					onChange={(e) => setEditedArgs({ ...editedArgs, title: e.target.value })}
-					placeholder="Enter page title"
-					className={!isTitleValid ? "border-destructive" : ""}
-				/>
-				{!isTitleValid && (
-					<p className="text-xs text-destructive mt-1">Title is required and cannot be empty</p>
-				)}
-			</div>
-			<div>
-				<label
-					htmlFor={`${idPrefix}notion-content`}
-					className="text-xs font-medium text-muted-foreground mb-1.5 block"
-				>
-					Content (optional)
-				</label>
-				<Textarea
-					id={`${idPrefix}notion-content`}
-					value={String(editedArgs.content ?? "")}
-					onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value })}
-					placeholder="Enter page content"
-					rows={rows}
-					className="resize-none font-mono text-xs"
-				/>
-			</div>
-		</>
-	);
-}
-
 function ApprovalCard({
 	args,
 	interruptData,
@@ -200,21 +98,14 @@ function ApprovalCard({
 	);
 	const [isEditing, setIsEditing] = useState(false);
 	const [isFullScreen, setIsFullScreen] = useState(false);
+	const [editedArgs, setEditedArgs] = useState<Record<string, unknown>>(args);
 
 	const account = interruptData.context?.account;
 	const currentTitle = interruptData.context?.current_title;
 	const currentContent = interruptData.context?.current_content;
 
-	const [editedArgs, setEditedArgs] = useState<Record<string, unknown>>({
-		...args,
-		title: args.title || currentTitle || "",
-		content: args.content || currentContent || "",
-	});
-
-	const isTitleValid = useMemo((): boolean => {
-		const title = isEditing ? editedArgs.title : args.title || currentTitle;
-		return Boolean(title && typeof title === "string" && title.trim().length > 0);
-	}, [isEditing, editedArgs.title, args.title, currentTitle]);
+	// Title is not editable, so it's always valid
+	const isTitleValid = true;
 
 	const reviewConfig = interruptData.review_configs[0];
 	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
@@ -222,7 +113,7 @@ function ApprovalCard({
 
 	return (
 		<div
-			className={`my-4 max-w-full overflow-hidden rounded-xl transition-all duration-300 ${
+			className={`my-4 ${isFullScreen ? "fixed inset-0 z-50 m-0 flex flex-col bg-background" : "max-w-full"} overflow-hidden rounded-xl transition-all duration-300 ${
 				decided
 					? "border border-border bg-card shadow-sm"
 					: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
@@ -254,68 +145,89 @@ function ApprovalCard({
 						{isEditing ? "You can edit the arguments below" : "Requires your approval to proceed"}
 					</p>
 				</div>
-				{canEdit && !decided && !isEditing && (
-					<>
-						<Button size="sm" variant="ghost" onClick={() => setIsFullScreen(true)}>
-							<Maximize2Icon className="size-4" />
-						</Button>
-						<Button size="sm" variant="ghost" onClick={() => setIsEditing(true)}>
-							<PencilIcon className="size-4" />
-							Edit
-						</Button>
-					</>
+				{isEditing && (
+					<Button
+						size="sm"
+						variant="ghost"
+						onClick={() => setIsFullScreen(!isFullScreen)}
+						className="shrink-0"
+					>
+						{isFullScreen ? <MinimizeIcon className="size-4" /> : <MaximizeIcon className="size-4" />}
+					</Button>
 				)}
 			</div>
 
+			{/* Context section - READ ONLY account and page info */}
 			{!decided && interruptData.context && (
 				<div className="border-b border-border px-4 py-3 bg-muted/30 space-y-3">
 					{interruptData.context.error ? (
 						<p className="text-sm text-destructive">{interruptData.context.error}</p>
 					) : (
-						<PageContextDisplay
-							account={account}
-							currentTitle={currentTitle}
-							currentContent={currentContent}
-						/>
+						<>
+							{account && (
+								<div className="space-y-2">
+									<div className="text-xs font-medium text-muted-foreground">Notion Account</div>
+									<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
+										{account.workspace_icon} {account.workspace_name}
+									</div>
+								</div>
+							)}
+
+							{currentTitle && (
+								<div className="space-y-2">
+									<div className="text-xs font-medium text-muted-foreground">Current Page</div>
+									<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
+										📄 {currentTitle}
+									</div>
+								</div>
+							)}
+						</>
 					)}
 				</div>
 			)}
 
+			{/* Display mode - show proposed changes as read-only */}
 			{!isEditing && (
-				<div className="space-y-2 px-4 py-3 bg-card">
-					{args.title != null && (
-						<div>
-							<div className="text-xs font-medium text-muted-foreground mb-1.5 block">
-								New Title
-							</div>
-							<p className="text-sm text-foreground">{String(args.title)}</p>
-						</div>
-					)}
+				<div
+					className={`space-y-2 px-4 py-3 bg-card ${isFullScreen ? "flex-1 overflow-y-auto" : ""}`}
+				>
 					{args.content != null && (
 						<div>
-							<div className="text-xs font-medium text-muted-foreground mb-1.5 block">
-								New Content
-							</div>
-							<p className="text-sm text-foreground whitespace-pre-wrap font-mono text-xs">
-								{String(args.content).slice(0, 300)}
-								{String(args.content).length > 300 && "..."}
+							<p className="text-xs font-medium text-muted-foreground">New Content</p>
+							<p className="line-clamp-4 text-sm whitespace-pre-wrap text-foreground">
+								{String(args.content)}
 							</p>
 						</div>
 					)}
+					{args.content == null && (
+						<p className="text-sm text-muted-foreground italic">No content update specified</p>
+					)}
 				</div>
 			)}
 
+			{/* Edit mode - show editable form fields */}
 			{isEditing && !decided && (
-				<div className="space-y-3 px-4 py-3 bg-card">
-					<EditFormFields
-						editedArgs={editedArgs}
-						setEditedArgs={setEditedArgs}
-						isTitleValid={isTitleValid}
-						rows={8}
+				<div
+					className={`px-4 py-3 bg-card ${isFullScreen ? "flex-1 flex flex-col overflow-hidden" : ""}`}
+				>
+					<label
+						htmlFor="notion-content"
+						className="text-xs font-medium text-muted-foreground mb-1.5 block"
+					>
+						New Content
+					</label>
+					<Textarea
+						id="notion-content"
+						value={String(editedArgs.content ?? "")}
+						onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value || null })}
+						placeholder={currentContent || "Enter new content"}
+						rows={isFullScreen ? undefined : 12}
+						className={`resize-none ${isFullScreen ? "flex-1 min-h-0" : ""}`}
 					/>
 				</div>
 			)}
 
+			{/* Action buttons */}
 			<div
 				className={`flex items-center gap-2 border-t ${
 					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/20 dark:bg-muted/10"
@@ -342,15 +254,19 @@ function ApprovalCard({
 							onClick={() => {
 								setDecided("edit");
 								setIsEditing(false);
+								setIsFullScreen(false);
 								onDecision({
 									type: "edit",
 									edited_action: {
 										name: interruptData.action_requests[0].name,
-										args: editedArgs,
+										args: {
+											page_id: args.page_id,
+											content: editedArgs.content,
+											connector_id: account?.id,
+										},
 									},
 								});
 							}}
-							disabled={!isTitleValid}
 						>
 							<CheckIcon />
 							Approve with Changes
@@ -360,11 +276,8 @@ function ApprovalCard({
 							variant="outline"
 							onClick={() => {
 								setIsEditing(false);
-								setEditedArgs({
-									...args,
-									title: args.title || currentTitle || "",
-									content: args.content || currentContent || "",
-								});
+								setIsFullScreen(false);
+								setEditedArgs(args); // Reset to original args
 							}}
 						>
 							Cancel
@@ -381,23 +294,32 @@ function ApprovalCard({
 										type: "approve",
 										edited_action: {
 											name: interruptData.action_requests[0].name,
-											args: args,
+											args: {
+												page_id: args.page_id,
+												content: args.content,
+												connector_id: account?.id,
+											},
 										},
 									});
 								}}
-								disabled={!isTitleValid}
 							>
 								<CheckIcon />
 								Approve
 							</Button>
 						)}
+						{canEdit && (
+							<Button size="sm" variant="outline" onClick={() => setIsEditing(true)}>
+								<PencilIcon />
+								Edit
+							</Button>
+						)}
 						{allowedDecisions.includes("reject") && (
 							<Button
 								size="sm"
-								variant="destructive"
+								variant="outline"
 								onClick={() => {
 									setDecided("reject");
-									onDecision({ type: "reject" });
+									onDecision({ type: "reject", message: "User rejected the action." });
 								}}
 							>
 								<XIcon />
@@ -407,114 +329,77 @@ function ApprovalCard({
 					</>
 				)}
 			</div>
-
-			<Dialog open={isFullScreen} onOpenChange={setIsFullScreen}>
-				<DialogContent className="max-w-4xl max-h-[90vh] overflow-y-auto">
-					<DialogHeader>
-						<DialogTitle>Update Notion Page</DialogTitle>
-					</DialogHeader>
-
-					<PageContextDisplay
-						account={account}
-						currentTitle={currentTitle}
-						currentContent={undefined}
-					/>
-
-					<div className="space-y-4">
-						<EditFormFields
-							editedArgs={editedArgs}
-							setEditedArgs={setEditedArgs}
-							isTitleValid={isTitleValid}
-							idPrefix="fullscreen-"
-							rows={20}
-						/>
-					</div>
-
-					<div className="flex items-center gap-2 justify-end pt-4 border-t">
-						<Button
-							size="sm"
-							onClick={() => {
-								setDecided("edit");
-								setIsFullScreen(false);
-								onDecision({
-									type: "edit",
-									edited_action: {
-										name: interruptData.action_requests[0].name,
-										args: editedArgs,
-									},
-								});
-							}}
-							disabled={!isTitleValid}
-						>
-							<CheckIcon />
-							Approve with Changes
-						</Button>
-						<Button
-							size="sm"
-							variant="outline"
-							onClick={() => {
-								setIsFullScreen(false);
-								setEditedArgs({
-									...args,
-									title: args.title || currentTitle || "",
-									content: args.content || currentContent || "",
-								});
-							}}
-						>
-							Cancel
-						</Button>
-					</div>
-				</DialogContent>
-			</Dialog>
-		</div>
-	);
-}
-
-function LoadingCard() {
-	return (
-		<div className="my-4 flex items-center gap-3 rounded-xl border-2 border-blue-200 bg-blue-50 px-4 py-3 dark:border-blue-900 dark:bg-blue-950">
-			<Loader2Icon className="size-5 animate-spin text-blue-600 dark:text-blue-400" />
-			<p className="text-sm text-blue-900 dark:text-blue-100">Updating Notion page...</p>
-		</div>
-	);
-}
-
-function SuccessCard({ result }: { result: SuccessResult }) {
-	return (
-		<div className="my-4 rounded-xl border border-green-200 bg-green-50 p-4 dark:border-green-900 dark:bg-green-950">
-			<div className="flex items-start gap-3">
-				<CheckIcon className="size-5 shrink-0 text-green-600 dark:text-green-400" />
-				<div className="flex-1 space-y-2">
-					<p className="text-sm font-medium text-green-900 dark:text-green-100">
-						Updated Notion page '{result.title}'
-					</p>
-					{result.url && (
-						<a
-							href={result.url}
-							target="_blank"
-							rel="noopener noreferrer"
-							className="inline-block text-sm text-green-700 underline hover:text-green-800 dark:text-green-300 dark:hover:text-green-200"
-						>
-							Open in Notion →
-						</a>
-					)}
-				</div>
-			</div>
 		</div>
 	);
 }
 
 function ErrorCard({ result }: { result: ErrorResult }) {
 	return (
-		<div className="my-4 rounded-xl border border-red-200 bg-red-50 p-4 dark:border-red-900 dark:bg-red-950">
-			<div className="flex items-start gap-3">
-				<XIcon className="size-5 shrink-0 text-red-600 dark:text-red-400" />
-				<div className="flex-1">
-					<p className="text-sm font-medium text-red-900 dark:text-red-100">
-						Failed to update page
-					</p>
-					<p className="mt-1 text-sm text-red-700 dark:text-red-300">{result.message}</p>
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-destructive/50 bg-card">
+			<div className="flex items-center gap-3 border-b border-destructive/50 px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-destructive/10">
+					<XIcon className="size-4 text-destructive" />
 				</div>
+				<div className="min-w-0 flex-1">
+					<p className="text-sm font-medium text-destructive">Failed to update Notion page</p>
+				</div>
+			</div>
+			<div className="px-4 py-3">
+				<p className="text-sm text-muted-foreground">{result.message}</p>
+			</div>
+		</div>
+	);
+}
+
+function SuccessCard({ result }: { result: SuccessResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
+			<div className="flex items-center gap-3 border-b border-border px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-green-500/10">
+					<CheckIcon className="size-4 text-green-500" />
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className="text-[.8rem] text-muted-foreground">
+						{result.message || "Notion page updated successfully"}
+					</p>
+				</div>
+			</div>
+
+			{/* Show details to verify the update */}
+			<div className="space-y-2 px-4 py-3 text-xs">
+				<div>
+					<span className="font-medium text-muted-foreground">Page ID: </span>
+					<span className="font-mono">{result.page_id}</span>
+				</div>
+				<div>
+					<span className="font-medium text-muted-foreground">Title: </span>
+					<span>{result.title}</span>
+				</div>
+				{result.url && (
+					<div>
+						<span className="font-medium text-muted-foreground">URL: </span>
+						<a
+							href={result.url}
+							target="_blank"
+							rel="noopener noreferrer"
+							className="text-primary hover:underline"
+						>
+							Open in Notion
+						</a>
+					</div>
+				)}
+				{result.content_length != null && (
+					<div>
+						<span className="font-medium text-muted-foreground">Content: </span>
+						<span>{result.content_length} characters</span>
+					</div>
+				)}
+				{result.content_preview && (
+					<div>
+						<span className="font-medium text-muted-foreground">Preview: </span>
+						<span className="text-muted-foreground italic">{result.content_preview}</span>
+					</div>
+				)}
 			</div>
 		</div>
 	);
@@ -525,14 +410,21 @@ export const UpdateNotionPageToolUI = makeAssistantToolUI<
 	UpdateNotionPageResult
 >({
 	toolName: "update_notion_page",
-	render: function UpdateNotionPageUI({ result, addResult, status }) {
+	render: function UpdateNotionPageUI({ args, result, status }) {
 		if (status.type === "running") {
-			return <LoadingCard />;
+			return (
+				<div className="my-4 flex max-w-md items-center gap-3 rounded-xl border border-border bg-card px-4 py-3">
+					<Loader2Icon className="size-4 animate-spin text-muted-foreground" />
+					<p className="text-sm text-muted-foreground">Updating Notion page...</p>
+				</div>
+			);
+		}
+
+		if (!result) {
+			return null;
 		}
 
 		if (isInterruptResult(result)) {
-			const args = result.action_requests[0]?.args || {};
-
 			return (
 				<ApprovalCard
 					args={args}
@@ -560,13 +452,6 @@ export const UpdateNotionPageToolUI = makeAssistantToolUI<
 			return <ErrorCard result={result} />;
 		}
 
-		if (typeof result === "object" && result !== null && "status" in result) {
-			const successResult = result as SuccessResult;
-			if (successResult.status === "success") {
-				return <SuccessCard result={successResult} />;
-			}
-		}
-
-		return null;
+		return <SuccessCard result={result as SuccessResult} />;
 	},
 });
diff --git a/surfsense_web/contexts/LocaleContext.tsx b/surfsense_web/contexts/LocaleContext.tsx
index 5b41385e0..405fa4a50 100644
--- a/surfsense_web/contexts/LocaleContext.tsx
+++ b/surfsense_web/contexts/LocaleContext.tsx
@@ -4,8 +4,8 @@ import type React from "react";
 import { createContext, useContext, useEffect, useState } from "react";
 import enMessages from "../messages/en.json";
 import esMessages from "../messages/es.json";
-import ptMessages from "../messages/pt.json";
 import hiMessages from "../messages/hi.json";
+import ptMessages from "../messages/pt.json";
 import zhMessages from "../messages/zh.json";
 
 type Locale = "en" | "es" | "pt" | "hi" | "zh";
diff --git a/surfsense_web/lib/chat/streaming-state.ts b/surfsense_web/lib/chat/streaming-state.ts
index e6385bf9c..4364fd515 100644
--- a/surfsense_web/lib/chat/streaming-state.ts
+++ b/surfsense_web/lib/chat/streaming-state.ts
@@ -7,7 +7,6 @@ export interface ThinkingStepData {
 	items: string[];
 }
 
-
 export type ContentPart =
 	| { type: "text"; text: string }
 	| {
@@ -18,24 +17,25 @@ export type ContentPart =
 			result?: unknown;
 	  };
 
-
 export interface ContentPartsState {
 	contentParts: ContentPart[];
 	currentTextPartIndex: number;
 	toolCallIndices: Map<string, number>;
 }
 
-
 export function appendText(state: ContentPartsState, delta: string): void {
-	if (state.currentTextPartIndex >= 0 && state.contentParts[state.currentTextPartIndex]?.type === "text") {
-		(state.contentParts[state.currentTextPartIndex] as { type: "text"; text: string }).text += delta;
+	if (
+		state.currentTextPartIndex >= 0 &&
+		state.contentParts[state.currentTextPartIndex]?.type === "text"
+	) {
+		(state.contentParts[state.currentTextPartIndex] as { type: "text"; text: string }).text +=
+			delta;
 	} else {
 		state.contentParts.push({ type: "text", text: delta });
 		state.currentTextPartIndex = state.contentParts.length - 1;
 	}
 }
 
-
 export function addToolCall(
 	state: ContentPartsState,
 	toolsWithUI: Set<string>,
@@ -55,7 +55,6 @@ export function addToolCall(
 	}
 }
 
-
 export function updateToolCall(
 	state: ContentPartsState,
 	toolCallId: string,
@@ -69,7 +68,6 @@ export function updateToolCall(
 	}
 }
 
-
 export function buildContentForUI(
 	state: ContentPartsState,
 	toolsWithUI: Set<string>
@@ -84,7 +82,6 @@ export function buildContentForUI(
 		: [{ type: "text", text: "" }];
 }
 
-
 export function buildContentForPersistence(
 	state: ContentPartsState,
 	toolsWithUI: Set<string>,

From 9411edf05775a301ca3dcf1b47a699e69494cf1d Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 13:07:19 +0200
Subject: [PATCH 30/42] Refactor update_notion_page to append-only with
 simplified parameters

---
 .../new_chat/tools/notion/update_page.py      | 48 ++++------
 .../app/agents/new_chat/tools/registry.py     |  2 +-
 .../app/connectors/notion_history.py          | 92 +++----------------
 .../services/notion/tool_metadata_service.py  |  1 -
 .../components/tool-ui/update-notion-page.tsx |  6 +-
 5 files changed, 34 insertions(+), 115 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
index 09507f465..2fbc0a5f3 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -33,19 +33,16 @@ def create_update_notion_page_tool(
     @tool
     async def update_notion_page(
         page_title: str,
-        new_title: str | None = None,
-        new_content: str | None = None,
+        content: str,
     ) -> dict[str, Any]:
-        """Update an existing Notion page's title and/or content.
+        """Update an existing Notion page by appending new content.
 
-        Use this tool when the user asks you to modify, edit, or update
-        a Notion page. At least one of new_title or new_content must be provided.
+        Use this tool when the user asks you to add content to, modify, or update
+        a Notion page. The new content will be appended to the existing page content.
 
         Args:
-            page_title: The current title of the Notion page to update (required).
-            new_title: New title for the page (optional).
-            new_content: New markdown content for the page body (optional).
-                        If provided, replaces all existing content.
+            page_title: The title of the Notion page to update.
+            content: The markdown content to append to the page body (supports headings, lists, paragraphs).
 
         Returns:
             Dictionary with:
@@ -54,17 +51,16 @@ def create_update_notion_page_tool(
             - url: URL to the updated page (if success)
             - title: Current page title (if success)
             - message: Result message
-
+            
             IMPORTANT: If status is "rejected", the user explicitly declined the action.
-            Respond with a brief acknowledgment (e.g., "Understood, I didn't update the page.")
+            Respond with a brief acknowledgment (e.g., "Understood, I didn't update the page.") 
             and move on. Do NOT ask for alternatives or troubleshoot.
 
         Examples:
-            - "Update the 'Meeting Notes' page with new title 'Updated Meeting Notes'"
-            - "Change the content of 'Project Plan' page to 'New content here'"
-            - "Update 'Weekly Report' with new title 'Final Report' and content '# Summary...'"
+            - "Add 'New meeting notes from today' to the 'Meeting Notes' page"
+            - "Append the following to 'Project Plan': '# Status Update\n\nCompleted phase 1'"
         """
-        logger.info(f"update_notion_page called: page_title='{page_title}', new_title={new_title}, has_content={new_content is not None}")
+        logger.info(f"update_notion_page called: page_title='{page_title}', content_length={len(content) if content else 0}")
         
         if db_session is None or search_space_id is None or user_id is None:
             logger.error("Notion tool not properly configured - missing required parameters")
@@ -73,10 +69,11 @@ def create_update_notion_page_tool(
                 "message": "Notion tool not properly configured. Please contact support.",
             }
 
-        if not new_title and not new_content:
+        if not content or not content.strip():
+            logger.error(f"Empty content provided for page '{page_title}'")
             return {
                 "status": "error",
-                "message": "At least one of 'new_title' or 'new_content' must be provided to update the page.",
+                "message": "Content is required to update the page. Please provide the actual content you want to add.",
             }
 
         try:
@@ -103,8 +100,7 @@ def create_update_notion_page_tool(
                         "tool": "update_notion_page",
                         "params": {
                             "page_id": page_id,
-                            "title": new_title,
-                            "content": new_content,
+                            "content": content,
                             "connector_id": connector_id_from_context,
                         },
                     },
@@ -135,19 +131,10 @@ def create_update_notion_page_tool(
             final_params = edited_action.get("args", {}) if edited_action else {}
 
             final_page_id = final_params.get("page_id", page_id)
-            final_title = final_params.get("title", new_title)
-            final_content = final_params.get("content", new_content)
+            final_content = final_params.get("content", content)
             final_connector_id = final_params.get("connector_id", connector_id_from_context)
 
-            # Validate title if it's being updated
-            if final_title is not None and not final_title.strip():
-                logger.error("Title is empty or contains only whitespace")
-                return {
-                    "status": "error",
-                    "message": "Page title cannot be empty. Please provide a valid title.",
-                }
-
-            logger.info(f"Updating Notion page with final params: page_id={final_page_id}, title={final_title}, has_content={final_content is not None}")
+            logger.info(f"Updating Notion page with final params: page_id={final_page_id}, has_content={final_content is not None}")
 
             from sqlalchemy.future import select
 
@@ -189,7 +176,6 @@ def create_update_notion_page_tool(
 
             result = await notion_connector.update_page(
                 page_id=final_page_id,
-                title=final_title,
                 content=final_content,
             )
             logger.info(f"update_page result: {result.get('status')} - {result.get('message', '')}")
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index 5384cdce0..bcbd5220c 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -219,7 +219,7 @@ BUILTIN_TOOLS: list[ToolDefinition] = [
     ),
     ToolDefinition(
         name="update_notion_page",
-        description="Update an existing Notion page's title or content",
+        description="Append new content to an existing Notion page",
         factory=lambda deps: create_update_notion_page_tool(
             db_session=deps["db_session"],
             search_space_id=deps["search_space_id"],
diff --git a/surfsense_backend/app/connectors/notion_history.py b/surfsense_backend/app/connectors/notion_history.py
index 83fcbd037..b6fda8b8b 100644
--- a/surfsense_backend/app/connectors/notion_history.py
+++ b/surfsense_backend/app/connectors/notion_history.py
@@ -987,15 +987,16 @@ class NotionHistoryConnector:
             }
 
     async def update_page(
-        self, page_id: str, title: str | None = None, content: str | None = None
+        self, page_id: str, content: str | None = None
     ) -> dict[str, Any]:
         """
-        Update an existing Notion page.
+        Update an existing Notion page by appending new content.
+        
+        Note: Content is appended to the page, not replaced.
 
         Args:
             page_id: Page ID to update
-            title: New page title (optional)
-            content: New page content in markdown (optional)
+            content: New markdown content to append to the page (optional)
 
         Returns:
             Dictionary with update result
@@ -1006,31 +1007,13 @@ class NotionHistoryConnector:
         try:
             notion = await self._get_client()
 
-            # Update title if provided
-            if title:
-                await self._api_call_with_retry(
-                    notion.pages.update,
-                    page_id=page_id,
-                    properties={
-                        "title": {
-                            "title": [{"type": "text", "text": {"content": title}}]
-                        }
-                    },
-                )
-
-            # Update content if provided
+            # Append content if provided
             if content:
-                # First, get existing blocks
-                existing_blocks = await self._api_call_with_retry(
-                    notion.blocks.children.list,
-                    block_id=page_id
-                )
-
-                # Convert new content to blocks 
+                # Convert new content to blocks
                 try:
                     children = self._markdown_to_blocks(content)
                     if not children:
-                        logger.warning("No blocks generated from content, skipping update")
+                        logger.warning("No blocks generated from content, skipping append")
                         return {
                             "status": "error",
                             "message": "Content conversion failed: no valid blocks generated",
@@ -1042,25 +1025,7 @@ class NotionHistoryConnector:
                         "message": f"Failed to parse content: {e!s}",
                     }
 
-                # Store block count for logging
-                block_count = len(existing_blocks.get("results", []))
-                
-                # Delete existing blocks
-                try:
-                    for block in existing_blocks.get("results", []):
-                        await self._api_call_with_retry(
-                            notion.blocks.delete,
-                            block_id=block["id"]
-                        )
-                    logger.info(f"Deleted {block_count} existing blocks from page {page_id}")
-                except Exception as e:
-                    logger.error(f"Failed to delete existing blocks: {e}")
-                    return {
-                        "status": "error",
-                        "message": f"Failed to clear existing content: {e!s}",
-                    }
-
-                # Add new content (CRITICAL: if this fails, content is lost) Need improvement to handle this better.
+                # Append new content blocks
                 try:
                     for i in range(0, len(children), 100):
                         batch = children[i : i + 100]
@@ -1069,44 +1034,15 @@ class NotionHistoryConnector:
                             block_id=page_id,
                             children=batch
                         )
-                    logger.info(f"Successfully added {len(children)} new blocks to page {page_id}")
+                    logger.info(f"Successfully appended {len(children)} new blocks to page {page_id}")
                 except Exception as e:
-                    # CRITICAL ERROR: Content was deleted but new content failed to add
-                    logger.error(
-                        f"CRITICAL: Failed to add new content after deleting {block_count} blocks. "
-                        f"Page {page_id} content is lost! Error: {e}"
-                    )
-                    
-                    # Attempt to add an error placeholder block so page isn't completely empty
-                    try:
-                        await self._api_call_with_retry(
-                            notion.blocks.children.append,
-                            block_id=page_id,
-                            children=[{
-                                "object": "block",
-                                "type": "paragraph",
-                                "paragraph": {
-                                    "rich_text": [{
-                                        "type": "text",
-                                        "text": {
-                                            "content": "[ERROR] Content update failed. Original content was lost. "
-                                                      "Please check your SurfSense logs for details."
-                                        }
-                                    }]
-                                },
-                            }]
-                        )
-                        logger.info(f"Added error placeholder to page {page_id}")
-                    except Exception as placeholder_error:
-                        logger.error(f"Failed to add error placeholder: {placeholder_error}")
-                    
+                    logger.error(f"Failed to append content blocks: {e}")
                     return {
                         "status": "error",
-                        "message": f"CRITICAL: Failed to update page content. Original content ({block_count} blocks) "
-                                  f"was deleted but new content could not be added: {e!s}",
+                        "message": f"Failed to append content: {e!s}",
                     }
 
-            # Get updated page
+            # Get updated page info
             response = await self._api_call_with_retry(
                 notion.pages.retrieve,
                 page_id=page_id
@@ -1119,7 +1055,7 @@ class NotionHistoryConnector:
                 "page_id": page_id,
                 "url": page_url,
                 "title": page_title,
-                "message": f"Updated Notion page '{page_title}'",
+                "message": f"Updated Notion page '{page_title}' (content appended)",
             }
 
         except APIResponseError as e:
diff --git a/surfsense_backend/app/services/notion/tool_metadata_service.py b/surfsense_backend/app/services/notion/tool_metadata_service.py
index 521bfece0..c3caed358 100644
--- a/surfsense_backend/app/services/notion/tool_metadata_service.py
+++ b/surfsense_backend/app/services/notion/tool_metadata_service.py
@@ -140,7 +140,6 @@ class NotionToolMetadataService:
             "account": account.to_dict(),
             "page_id": page_id,
             "current_title": document.title,
-            "current_content": document.content,
             "document_id": document.id,
             "indexed_at": document.document_metadata.get("indexed_at"),
         }
diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
index 7fde7b75e..405b1177d 100644
--- a/surfsense_web/components/tool-ui/update-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -38,7 +38,6 @@ interface InterruptResult {
 		};
 		page_id?: string;
 		current_title?: string;
-		current_content?: string;
 		document_id?: number;
 		indexed_at?: string;
 		error?: string;
@@ -102,7 +101,6 @@ function ApprovalCard({
 
 	const account = interruptData.context?.account;
 	const currentTitle = interruptData.context?.current_title;
-	const currentContent = interruptData.context?.current_content;
 
 	// Title is not editable, so it's always valid
 	const isTitleValid = true;
@@ -220,7 +218,7 @@ function ApprovalCard({
 						id="notion-content"
 						value={String(editedArgs.content ?? "")}
 						onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value || null })}
-						placeholder={currentContent || "Enter new content"}
+						placeholder="Enter content to append to the page"
 						rows={isFullScreen ? undefined : 12}
 						className={`resize-none ${isFullScreen ? "flex-1 min-h-0" : ""}`}
 					/>
@@ -406,7 +404,7 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 }
 
 export const UpdateNotionPageToolUI = makeAssistantToolUI<
-	{ page_id: string; title?: string | null; content?: string | null },
+	{ page_id: string; content: string },
 	UpdateNotionPageResult
 >({
 	toolName: "update_notion_page",

From da451ffff76c9071f2082c2b0d53bfd0f3cf23de Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 13:22:52 +0200
Subject: [PATCH 31/42] Handle page not found as informational status instead
 of error

---
 .../new_chat/tools/notion/update_page.py      | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
index 2fbc0a5f3..f705bc1d0 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -46,15 +46,20 @@ def create_update_notion_page_tool(
 
         Returns:
             Dictionary with:
-            - status: "success", "rejected", or "error"
+            - status: "success", "rejected", "not_found", or "error"
             - page_id: Updated page ID (if success)
             - url: URL to the updated page (if success)
             - title: Current page title (if success)
             - message: Result message
             
-            IMPORTANT: If status is "rejected", the user explicitly declined the action.
-            Respond with a brief acknowledgment (e.g., "Understood, I didn't update the page.") 
-            and move on. Do NOT ask for alternatives or troubleshoot.
+            IMPORTANT: 
+            - If status is "rejected", the user explicitly declined the action.
+              Respond with a brief acknowledgment (e.g., "Understood, I didn't update the page.") 
+              and move on. Do NOT ask for alternatives or troubleshoot.
+            - If status is "not_found", inform the user conversationally using the exact message provided.
+              Example: "I couldn't find the page '[page_title]' in your indexed Notion pages. [message details]"
+              Do NOT treat this as an error. Do NOT invent information. Simply relay the message and 
+              ask the user to verify the page title or check if it's been indexed.
 
         Examples:
             - "Add 'New meeting notes from today' to the 'Meeting Notes' page"
@@ -83,11 +88,20 @@ def create_update_notion_page_tool(
             )
 
             if "error" in context:
-                logger.error(f"Failed to fetch update context: {context['error']}")
-                return {
-                    "status": "error",
-                    "message": context["error"],
-                }
+                error_msg = context["error"]
+                # Check if it's a "not found" error (softer handling for LLM)
+                if "not found" in error_msg.lower():
+                    logger.warning(f"Page not found: {error_msg}")
+                    return {
+                        "status": "not_found",
+                        "message": error_msg,
+                    }
+                else:
+                    logger.error(f"Failed to fetch update context: {error_msg}")
+                    return {
+                        "status": "error",
+                        "message": error_msg,
+                    }
 
             page_id = context.get("page_id")
             connector_id_from_context = context.get("account", {}).get("id")

From 2bbb8e6a3a5e3ccbd18ee27447815768c23175ed Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 13:35:33 +0200
Subject: [PATCH 32/42] Add InfoCard for not_found status with amber warning
 styling

---
 .../components/tool-ui/update-notion-page.tsx | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
index 405b1177d..01fe5308f 100644
--- a/surfsense_web/components/tool-ui/update-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -4,6 +4,7 @@ import { makeAssistantToolUI } from "@assistant-ui/react";
 import {
 	AlertTriangleIcon,
 	CheckIcon,
+	InfoIcon,
 	Loader2Icon,
 	MaximizeIcon,
 	MinimizeIcon,
@@ -59,7 +60,12 @@ interface ErrorResult {
 	message: string;
 }
 
-type UpdateNotionPageResult = InterruptResult | SuccessResult | ErrorResult;
+interface InfoResult {
+	status: "not_found";
+	message: string;
+}
+
+type UpdateNotionPageResult = InterruptResult | SuccessResult | ErrorResult | InfoResult;
 
 function isInterruptResult(result: unknown): result is InterruptResult {
 	return (
@@ -79,6 +85,15 @@ function isErrorResult(result: unknown): result is ErrorResult {
 	);
 }
 
+function isInfoResult(result: unknown): result is InfoResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"status" in result &&
+		(result as InfoResult).status === "not_found"
+	);
+}
+
 function ApprovalCard({
 	args,
 	interruptData,
@@ -349,6 +364,21 @@ function ErrorCard({ result }: { result: ErrorResult }) {
 	);
 }
 
+function InfoCard({ result }: { result: InfoResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-amber-500/50 bg-card">
+			<div className="flex items-start gap-3 px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-amber-500/10">
+					<InfoIcon className="size-4 text-amber-500" />
+				</div>
+				<div className="min-w-0 flex-1 pt-2">
+					<p className="text-sm text-muted-foreground">{result.message}</p>
+				</div>
+			</div>
+		</div>
+	);
+}
+
 function SuccessCard({ result }: { result: SuccessResult }) {
 	return (
 		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
@@ -446,6 +476,10 @@ export const UpdateNotionPageToolUI = makeAssistantToolUI<
 			return null;
 		}
 
+		if (isInfoResult(result)) {
+			return <InfoCard result={result} />;
+		}
+
 		if (isErrorResult(result)) {
 			return <ErrorCard result={result} />;
 		}

From 254ed5ed11aedd99bfaa934827f1765a7a16c289 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 13:46:47 +0200
Subject: [PATCH 33/42] Unify SuccessCard for create and update tools to show
 only title and URL

---
 .../components/tool-ui/create-notion-page.tsx | 25 +++++++++----------
 .../components/tool-ui/update-notion-page.tsx | 18 -------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/surfsense_web/components/tool-ui/create-notion-page.tsx b/surfsense_web/components/tool-ui/create-notion-page.tsx
index 74004d894..e148c71ba 100644
--- a/surfsense_web/components/tool-ui/create-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/create-notion-page.tsx
@@ -423,28 +423,27 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 					<CheckIcon className="size-4 text-green-500" />
 				</div>
 				<div className="min-w-0 flex-1">
-					<p className=" text-[.8rem] text-muted-foreground">
+					<p className="text-[.8rem] text-muted-foreground">
 						{result.message || "Notion page created successfully"}
 					</p>
 				</div>
 			</div>
 
-			{/* Show details to verify the arguments were used */}
 			<div className="space-y-2 px-4 py-3 text-xs">
 				<div>
-					<span className="font-medium text-muted-foreground">Page ID: </span>
-					<span className="font-mono">{result.page_id}</span>
+					<span className="font-medium text-muted-foreground">Title: </span>
+					<span>{result.title}</span>
 				</div>
-				{result.content_length != null && (
+				{result.url && (
 					<div>
-						<span className="font-medium text-muted-foreground">Content: </span>
-						<span>{result.content_length} characters</span>
-					</div>
-				)}
-				{result.content_preview && (
-					<div>
-						<span className="font-medium text-muted-foreground">Preview: </span>
-						<span className="text-muted-foreground italic">{result.content_preview}</span>
+						<a
+							href={result.url}
+							target="_blank"
+							rel="noopener noreferrer"
+							className="text-primary hover:underline"
+						>
+							Open in Notion
+						</a>
 					</div>
 				)}
 			</div>
diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
index 01fe5308f..5bf5a45a9 100644
--- a/surfsense_web/components/tool-ui/update-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -393,19 +393,13 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 				</div>
 			</div>
 
-			{/* Show details to verify the update */}
 			<div className="space-y-2 px-4 py-3 text-xs">
-				<div>
-					<span className="font-medium text-muted-foreground">Page ID: </span>
-					<span className="font-mono">{result.page_id}</span>
-				</div>
 				<div>
 					<span className="font-medium text-muted-foreground">Title: </span>
 					<span>{result.title}</span>
 				</div>
 				{result.url && (
 					<div>
-						<span className="font-medium text-muted-foreground">URL: </span>
 						<a
 							href={result.url}
 							target="_blank"
@@ -416,18 +410,6 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 						</a>
 					</div>
 				)}
-				{result.content_length != null && (
-					<div>
-						<span className="font-medium text-muted-foreground">Content: </span>
-						<span>{result.content_length} characters</span>
-					</div>
-				)}
-				{result.content_preview && (
-					<div>
-						<span className="font-medium text-muted-foreground">Preview: </span>
-						<span className="text-muted-foreground italic">{result.content_preview}</span>
-					</div>
-				)}
 			</div>
 		</div>
 	);

From eca5332d81557e7dc377d6772faf99c0a30b4fe5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 15:26:19 +0200
Subject: [PATCH 34/42] Improve full-screen mode with modal popup and backdrop

---
 .../components/tool-ui/update-notion-page.tsx | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
index 5bf5a45a9..383dc3066 100644
--- a/surfsense_web/components/tool-ui/update-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -117,21 +117,28 @@ function ApprovalCard({
 	const account = interruptData.context?.account;
 	const currentTitle = interruptData.context?.current_title;
 
-	// Title is not editable, so it's always valid
-	const isTitleValid = true;
-
 	const reviewConfig = interruptData.review_configs[0];
 	const allowedDecisions = reviewConfig?.allowed_decisions ?? ["approve", "reject"];
 	const canEdit = allowedDecisions.includes("edit");
 
 	return (
-		<div
-			className={`my-4 ${isFullScreen ? "fixed inset-0 z-50 m-0 flex flex-col bg-background" : "max-w-full"} overflow-hidden rounded-xl transition-all duration-300 ${
-				decided
-					? "border border-border bg-card shadow-sm"
-					: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
-			}`}
-		>
+		<>
+			{/* Backdrop for full-screen mode */}
+			{isFullScreen && (
+				<div className="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm" onClick={() => setIsFullScreen(false)} />
+			)}
+			
+			<div
+				className={`${
+					isFullScreen 
+						? "fixed left-1/2 top-1/2 z-50 h-[90vh] flex max-h-300 w-[90vw] max-w-350 -translate-x-1/2 -translate-y-1/2 flex-col" 
+						: "my-4 max-w-full"
+				} overflow-hidden rounded-xl bg-background shadow-xl transition-all duration-300 ${
+					decided
+						? "border border-border bg-card shadow-sm"
+						: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
+				}`}
+			>
 			<div
 				className={`flex items-center gap-3 border-b ${
 					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/40 dark:bg-muted/20"
@@ -343,6 +350,7 @@ function ApprovalCard({
 				)}
 			</div>
 		</div>
+		</>
 	);
 }
 

From 2327ec93267896c2e01ef09fe621e3eeb5e166b5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 15:32:38 +0200
Subject: [PATCH 35/42] Fix UpdateNotionPageToolUI args type to match backend
 signature

---
 surfsense_web/components/tool-ui/update-notion-page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
index 383dc3066..e84c6622b 100644
--- a/surfsense_web/components/tool-ui/update-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -424,7 +424,7 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 }
 
 export const UpdateNotionPageToolUI = makeAssistantToolUI<
-	{ page_id: string; content: string },
+	{ page_title: string; content: string },
 	UpdateNotionPageResult
 >({
 	toolName: "update_notion_page",

From 45de7d546c6258ffde72053ba773b5cab19060b6 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 15:52:50 +0200
Subject: [PATCH 36/42] Refactor delete_notion_page: use page_title, add HITL,
 logging, not_found status

---
 .../new_chat/tools/notion/delete_page.py      | 101 +++++++++++++-----
 .../new_chat/tools/notion/update_page.py      |   4 +-
 2 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
index 2ae7dc564..c1656a1e8 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
@@ -1,14 +1,20 @@
+import logging
 from typing import Any
 
 from langchain_core.tools import tool
+from langgraph.types import interrupt
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.connectors.notion_history import NotionHistoryConnector
+from app.services.notion.tool_metadata_service import NotionToolMetadataService
+
+logger = logging.getLogger(__name__)
 
 
 def create_delete_notion_page_tool(
     db_session: AsyncSession | None = None,
     search_space_id: int | None = None,
+    user_id: str | None = None,
     connector_id: int | None = None,
 ):
     """
@@ -17,6 +23,7 @@ def create_delete_notion_page_tool(
     Args:
         db_session: Database session for accessing Notion connector
         search_space_id: Search space ID to find the Notion connector
+        user_id: User ID for finding the correct Notion connector
         connector_id: Optional specific connector ID (if known)
 
     Returns:
@@ -25,7 +32,7 @@ def create_delete_notion_page_tool(
 
     @tool
     async def delete_notion_page(
-        page_id: str,
+        page_title: str,
     ) -> dict[str, Any]:
         """Delete (archive) a Notion page.
 
@@ -34,7 +41,7 @@ def create_delete_notion_page_tool(
         it archives them (they can be restored from trash).
 
         Args:
-            page_id: The ID of the Notion page to delete (required).
+            page_title: The title of the Notion page to delete.
 
         Returns:
             Dictionary with:
@@ -43,57 +50,101 @@ def create_delete_notion_page_tool(
             - message: Success or error message
 
         Examples:
-            - "Delete the Notion page abc123"
-            - "Remove the page xyz789 from Notion"
-            - "Archive this Notion page: abc123"
+            - "Delete the 'Meeting Notes' Notion page"
+            - "Remove the 'Old Project Plan' Notion page"
+            - "Archive the 'Draft Ideas' Notion page"
         """
-        if db_session is None or search_space_id is None:
+        logger.info(f"delete_notion_page called: page_title='{page_title}'")
+        
+        if db_session is None or search_space_id is None or user_id is None:
+            logger.error("Notion tool not properly configured - missing required parameters")
             return {
                 "status": "error",
                 "message": "Notion tool not properly configured. Please contact support.",
             }
 
         try:
-            # Get connector ID if not provided
-            actual_connector_id = connector_id
-            if actual_connector_id is None:
-                from sqlalchemy.future import select
+            # Get page context (page_id, account, title) from indexed data
+            metadata_service = NotionToolMetadataService(db_session)
+            context = await metadata_service.get_delete_context(
+                search_space_id, user_id, page_title
+            )
 
-                from app.db import SearchSourceConnector, SearchSourceConnectorType
-
-                result = await db_session.execute(
-                    select(SearchSourceConnector).filter(
-                        SearchSourceConnector.search_space_id == search_space_id,
-                        SearchSourceConnector.connector_type
-                        == SearchSourceConnectorType.NOTION_CONNECTOR,
-                    )
-                )
-                connector = result.scalars().first()
-
-                if not connector:
+            if "error" in context:
+                error_msg = context["error"]
+                # Check if it's a "not found" error (softer handling for LLM)
+                if "not found" in error_msg.lower():
+                    logger.warning(f"Page not found: {error_msg}")
+                    return {
+                        "status": "not_found",
+                        "message": error_msg,
+                    }
+                else:
+                    logger.error(f"Failed to fetch delete context: {error_msg}")
                     return {
                         "status": "error",
-                        "message": "No Notion connector found. Please connect Notion in your workspace settings.",
+                        "message": error_msg,
                     }
 
-                actual_connector_id = connector.id
+            page_id = context.get("page_id")
+            connector_id_from_context = context.get("account", {}).get("id")
+
+            logger.info(f"Requesting approval for deleting Notion page: '{page_title}' (page_id={page_id})")
+            # Request approval before deleting
+            approval = interrupt(
+                {
+                    "type": "notion_page_deletion",
+                    "action": {
+                        "tool": "delete_notion_page",
+                        "params": {
+                            "page_id": page_id,
+                            "connector_id": connector_id_from_context,
+                        },
+                    },
+                    "context": context,
+                }
+            )
+
+            decisions = approval.get("decisions", [])
+            if not decisions:
+                logger.warning("No approval decision received")
+                return {
+                    "status": "error",
+                    "message": "No approval decision received",
+                }
+
+            decision = decisions[0]
+            decision_type = decision.get("type") or decision.get("decision_type")
+            logger.info(f"User decision: {decision_type}")
+
+            if decision_type == "reject":
+                logger.info("Notion page deletion rejected by user")
+                return {
+                    "status": "rejected",
+                    "message": "User declined. The page was not deleted. Do not ask again or suggest alternatives.",
+                }
+
+            logger.info(f"Deleting Notion page: page_id={page_id}")
 
             # Create connector instance
             notion_connector = NotionHistoryConnector(
                 session=db_session,
-                connector_id=actual_connector_id,
+                connector_id=connector_id_from_context,
             )
 
             # Delete the page
             result = await notion_connector.delete_page(page_id=page_id)
+            logger.info(f"delete_page result: {result.get('status')} - {result.get('message', '')}")
             return result
 
         except ValueError as e:
+            logger.error(f"ValueError in delete_notion_page: {e}")
             return {
                 "status": "error",
                 "message": str(e),
             }
         except Exception as e:
+            logger.error(f"Unexpected error in delete_notion_page: {e}")
             return {
                 "status": "error",
                 "message": f"Unexpected error deleting Notion page: {e!s}",
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
index f705bc1d0..5e948e458 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/update_page.py
@@ -62,8 +62,8 @@ def create_update_notion_page_tool(
               ask the user to verify the page title or check if it's been indexed.
 
         Examples:
-            - "Add 'New meeting notes from today' to the 'Meeting Notes' page"
-            - "Append the following to 'Project Plan': '# Status Update\n\nCompleted phase 1'"
+            - "Add 'New meeting notes from today' to the 'Meeting Notes' Notion page"
+            - "Append the following to the 'Project Plan' Notion page: '# Status Update\n\nCompleted phase 1'"
         """
         logger.info(f"update_notion_page called: page_title='{page_title}', content_length={len(content) if content else 0}")
         

From cc36780c6789fe29ff19fd71ad16c31d1c72528c Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 16:08:06 +0200
Subject: [PATCH 37/42] Add delete_from_db parameter and DB deletion logic to
 delete_notion_page

---
 .../new_chat/tools/notion/delete_page.py      | 51 +++++++++++++++++--
 .../app/agents/new_chat/tools/registry.py     |  5 +-
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
index c1656a1e8..05b0fbfe8 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
@@ -33,6 +33,7 @@ def create_delete_notion_page_tool(
     @tool
     async def delete_notion_page(
         page_title: str,
+        delete_from_db: bool = False,
     ) -> dict[str, Any]:
         """Delete (archive) a Notion page.
 
@@ -42,19 +43,23 @@ def create_delete_notion_page_tool(
 
         Args:
             page_title: The title of the Notion page to delete.
+            delete_from_db: Whether to also remove the page from the knowledge base.
+                          Default is False (in Notion).
+                          Set to True to permanently remove from both Notion and knowledge base.
 
         Returns:
             Dictionary with:
-            - status: "success" or "error"
-            - page_id: Deleted page ID
+            - status: "success", "rejected", "not_found", or "error"
+            - page_id: Deleted page ID (if success)
             - message: Success or error message
+            - deleted_from_db: Whether the page was also removed from knowledge base (if success)
 
         Examples:
             - "Delete the 'Meeting Notes' Notion page"
             - "Remove the 'Old Project Plan' Notion page"
             - "Archive the 'Draft Ideas' Notion page"
         """
-        logger.info(f"delete_notion_page called: page_title='{page_title}'")
+        logger.info(f"delete_notion_page called: page_title='{page_title}', delete_from_db={delete_from_db}")
         
         if db_session is None or search_space_id is None or user_id is None:
             logger.error("Notion tool not properly configured - missing required parameters")
@@ -88,8 +93,9 @@ def create_delete_notion_page_tool(
 
             page_id = context.get("page_id")
             connector_id_from_context = context.get("account", {}).get("id")
+            document_id = context.get("document_id")
 
-            logger.info(f"Requesting approval for deleting Notion page: '{page_title}' (page_id={page_id})")
+            logger.info(f"Requesting approval for deleting Notion page: '{page_title}' (page_id={page_id}, delete_from_db={delete_from_db})")
             # Request approval before deleting
             approval = interrupt(
                 {
@@ -99,6 +105,7 @@ def create_delete_notion_page_tool(
                         "params": {
                             "page_id": page_id,
                             "connector_id": connector_id_from_context,
+                            "delete_from_db": delete_from_db,
                         },
                     },
                     "context": context,
@@ -132,9 +139,43 @@ def create_delete_notion_page_tool(
                 connector_id=connector_id_from_context,
             )
 
-            # Delete the page
+            # Delete the page from Notion
             result = await notion_connector.delete_page(page_id=page_id)
             logger.info(f"delete_page result: {result.get('status')} - {result.get('message', '')}")
+            
+            # If deletion was successful and user wants to delete from DB
+            deleted_from_db = False
+            if result.get("status") == "success" and delete_from_db and document_id:
+                try:
+                    from sqlalchemy.future import select
+
+                    from app.db import Document
+
+                    # Get the document
+                    doc_result = await db_session.execute(
+                        select(Document).filter(Document.id == document_id)
+                    )
+                    document = doc_result.scalars().first()
+
+                    if document:
+                        await db_session.delete(document)
+                        await db_session.commit()
+                        deleted_from_db = True
+                        logger.info(f"Deleted document {document_id} from knowledge base")
+                    else:
+                        logger.warning(f"Document {document_id} not found in DB")
+                except Exception as e:
+                    logger.error(f"Failed to delete document from DB: {e}")
+                    # Don't fail the whole operation if DB deletion fails
+                    # The page is already deleted from Notion, so inform the user
+                    result["warning"] = f"Page deleted from Notion, but failed to remove from knowledge base: {e!s}"
+
+            # Update result with DB deletion status
+            if result.get("status") == "success":
+                result["deleted_from_db"] = deleted_from_db
+                if deleted_from_db:
+                    result["message"] = f"{result.get('message', '')} (also removed from knowledge base)"
+            
             return result
 
         except ValueError as e:
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index bcbd5220c..8da9ee116 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -229,12 +229,13 @@ BUILTIN_TOOLS: list[ToolDefinition] = [
     ),
     ToolDefinition(
         name="delete_notion_page",
-        description="Delete (archive) a Notion page",
+        description="Delete a Notion page by title",
         factory=lambda deps: create_delete_notion_page_tool(
             db_session=deps["db_session"],
             search_space_id=deps["search_space_id"],
+            user_id=deps["user_id"],
         ),
-        requires=["db_session", "search_space_id"],
+        requires=["db_session", "search_space_id", "user_id"],
     ),
 ]
 

From 11e1c018472154966d38c54cac0cb2fb038b77e5 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 16:25:19 +0200
Subject: [PATCH 38/42] Add delete_from_db checkbox and update ApprovalCard UI
 for delete tool

---
 .../components/tool-ui/delete-notion-page.tsx |  69 +++-
 .../components/tool-ui/update-notion-page.tsx | 363 +++++++++---------
 2 files changed, 248 insertions(+), 184 deletions(-)

diff --git a/surfsense_web/components/tool-ui/delete-notion-page.tsx b/surfsense_web/components/tool-ui/delete-notion-page.tsx
index 1defe72a4..59d04f2b7 100644
--- a/surfsense_web/components/tool-ui/delete-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/delete-notion-page.tsx
@@ -17,6 +17,20 @@ interface InterruptResult {
 		action_name: string;
 		allowed_decisions: Array<"approve" | "reject">;
 	}>;
+	context?: {
+		account?: {
+			id: number;
+			name: string;
+			workspace_id: string | null;
+			workspace_name: string;
+			workspace_icon: string;
+		};
+		page_id?: string;
+		current_title?: string;
+		document_id?: number;
+		indexed_at?: string;
+		error?: string;
+	};
 }
 
 interface SuccessResult {
@@ -57,11 +71,16 @@ function ApprovalCard({
 }: {
 	args: Record<string, unknown>;
 	interruptData: InterruptResult;
-	onDecision: (decision: { type: "approve" | "reject"; message?: string }) => void;
+	onDecision: (decision: {
+		type: "approve" | "reject";
+		message?: string;
+		edited_action?: { name: string; args: Record<string, unknown> };
+	}) => void;
 }) {
 	const [decided, setDecided] = useState<"approve" | "reject" | null>(
 		interruptData.__decided__ ?? null
 	);
+	const [deleteFromDb, setDeleteFromDb] = useState(false);
 
 	return (
 		<div
@@ -98,14 +117,43 @@ function ApprovalCard({
 			</div>
 
 			<div className="space-y-2 px-4 py-3 bg-card">
-				{args.page_id != null && (
+				{interruptData.context?.account && (
 					<div>
-						<p className="text-xs font-medium text-muted-foreground">Page ID</p>
-						<p className="text-sm text-foreground font-mono">{String(args.page_id)}</p>
+						<p className="text-xs font-medium text-muted-foreground">Notion Account</p>
+						<p className="text-sm text-foreground">
+							{interruptData.context.account.workspace_icon}{" "}
+							{interruptData.context.account.workspace_name}
+						</p>
+					</div>
+				)}
+				{interruptData.context?.current_title && (
+					<div>
+						<p className="text-xs font-medium text-muted-foreground">Page</p>
+						<p className="text-sm text-foreground">📄 {interruptData.context.current_title}</p>
 					</div>
 				)}
 			</div>
 
+			{/* Checkbox for deleting from knowledge base */}
+			{!decided && (
+				<div className="px-4 py-3 border-t border-border bg-muted/20">
+					<label className="flex items-start gap-2 cursor-pointer">
+						<input
+							type="checkbox"
+							checked={deleteFromDb}
+							onChange={(e) => setDeleteFromDb(e.target.checked)}
+							className="mt-0.5"
+						/>
+						<div className="flex-1">
+							<span className="text-sm text-foreground">Also remove from knowledge base</span>
+							<p className="text-xs text-muted-foreground mt-1">
+								⚠️ This will permanently delete the page from your knowledge base (cannot be undone)
+							</p>
+						</div>
+					</label>
+				</div>
+			)}
+
 			<div
 				className={`flex items-center gap-2 border-t ${
 					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/20 dark:bg-muted/10"
@@ -131,7 +179,16 @@ function ApprovalCard({
 							size="sm"
 							onClick={() => {
 								setDecided("approve");
-								onDecision({ type: "approve" });
+								onDecision({
+									type: "approve",
+									edited_action: {
+										name: interruptData.action_requests[0].name,
+										args: {
+											...interruptData.action_requests[0].args,
+											delete_from_db: deleteFromDb,
+										},
+									},
+								});
 							}}
 						>
 							<CheckIcon />
@@ -198,7 +255,7 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 }
 
 export const DeleteNotionPageToolUI = makeAssistantToolUI<
-	{ page_id: string },
+	{ page_title: string; delete_from_db?: boolean },
 	DeleteNotionPageResult
 >({
 	toolName: "delete_notion_page",
diff --git a/surfsense_web/components/tool-ui/update-notion-page.tsx b/surfsense_web/components/tool-ui/update-notion-page.tsx
index e84c6622b..0242057ff 100644
--- a/surfsense_web/components/tool-ui/update-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/update-notion-page.tsx
@@ -125,198 +125,170 @@ function ApprovalCard({
 		<>
 			{/* Backdrop for full-screen mode */}
 			{isFullScreen && (
-				<div className="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm" onClick={() => setIsFullScreen(false)} />
+				<div
+					className="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
+					onClick={() => setIsFullScreen(false)}
+				/>
 			)}
-			
+
 			<div
 				className={`${
-					isFullScreen 
-						? "fixed left-1/2 top-1/2 z-50 h-[90vh] flex max-h-300 w-[90vw] max-w-350 -translate-x-1/2 -translate-y-1/2 flex-col" 
+					isFullScreen
+						? "fixed left-1/2 top-1/2 z-50 h-[90vh] flex max-h-300 w-[90vw] max-w-350 -translate-x-1/2 -translate-y-1/2 flex-col"
 						: "my-4 max-w-full"
 				} overflow-hidden rounded-xl bg-background shadow-xl transition-all duration-300 ${
 					decided
 						? "border border-border bg-card shadow-sm"
 						: "border-2 border-foreground/20 bg-muted/30 dark:bg-muted/10 shadow-lg animate-pulse-subtle"
 				}`}
-			>
-			<div
-				className={`flex items-center gap-3 border-b ${
-					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/40 dark:bg-muted/20"
-				} px-4 py-3`}
 			>
 				<div
-					className={`flex size-9 shrink-0 items-center justify-center rounded-lg ${
-						decided ? "bg-muted" : "bg-muted animate-pulse"
-					}`}
+					className={`flex items-center gap-3 border-b ${
+						decided ? "border-border bg-card" : "border-foreground/15 bg-muted/40 dark:bg-muted/20"
+					} px-4 py-3`}
 				>
-					<AlertTriangleIcon
-						className={`size-4 ${decided ? "text-muted-foreground" : "text-foreground"}`}
-					/>
-				</div>
-				<div className="min-w-0 flex-1">
-					<p className={`text-sm font-medium ${decided ? "text-foreground" : "text-foreground"}`}>
-						Update Notion Page
-					</p>
-					<p
-						className={`truncate text-xs ${
-							decided ? "text-muted-foreground" : "text-muted-foreground"
+					<div
+						className={`flex size-9 shrink-0 items-center justify-center rounded-lg ${
+							decided ? "bg-muted" : "bg-muted animate-pulse"
 						}`}
 					>
-						{isEditing ? "You can edit the arguments below" : "Requires your approval to proceed"}
-					</p>
-				</div>
-				{isEditing && (
-					<Button
-						size="sm"
-						variant="ghost"
-						onClick={() => setIsFullScreen(!isFullScreen)}
-						className="shrink-0"
-					>
-						{isFullScreen ? <MinimizeIcon className="size-4" /> : <MaximizeIcon className="size-4" />}
-					</Button>
-				)}
-			</div>
-
-			{/* Context section - READ ONLY account and page info */}
-			{!decided && interruptData.context && (
-				<div className="border-b border-border px-4 py-3 bg-muted/30 space-y-3">
-					{interruptData.context.error ? (
-						<p className="text-sm text-destructive">{interruptData.context.error}</p>
-					) : (
-						<>
-							{account && (
-								<div className="space-y-2">
-									<div className="text-xs font-medium text-muted-foreground">Notion Account</div>
-									<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
-										{account.workspace_icon} {account.workspace_name}
-									</div>
-								</div>
+						<AlertTriangleIcon
+							className={`size-4 ${decided ? "text-muted-foreground" : "text-foreground"}`}
+						/>
+					</div>
+					<div className="min-w-0 flex-1">
+						<p className={`text-sm font-medium ${decided ? "text-foreground" : "text-foreground"}`}>
+							Update Notion Page
+						</p>
+						<p
+							className={`truncate text-xs ${
+								decided ? "text-muted-foreground" : "text-muted-foreground"
+							}`}
+						>
+							{isEditing ? "You can edit the arguments below" : "Requires your approval to proceed"}
+						</p>
+					</div>
+					{isEditing && (
+						<Button
+							size="sm"
+							variant="ghost"
+							onClick={() => setIsFullScreen(!isFullScreen)}
+							className="shrink-0"
+						>
+							{isFullScreen ? (
+								<MinimizeIcon className="size-4" />
+							) : (
+								<MaximizeIcon className="size-4" />
 							)}
-
-							{currentTitle && (
-								<div className="space-y-2">
-									<div className="text-xs font-medium text-muted-foreground">Current Page</div>
-									<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
-										📄 {currentTitle}
-									</div>
-								</div>
-							)}
-						</>
+						</Button>
 					)}
 				</div>
-			)}
 
-			{/* Display mode - show proposed changes as read-only */}
-			{!isEditing && (
-				<div
-					className={`space-y-2 px-4 py-3 bg-card ${isFullScreen ? "flex-1 overflow-y-auto" : ""}`}
-				>
-					{args.content != null && (
-						<div>
-							<p className="text-xs font-medium text-muted-foreground">New Content</p>
-							<p className="line-clamp-4 text-sm whitespace-pre-wrap text-foreground">
-								{String(args.content)}
-							</p>
-						</div>
-					)}
-					{args.content == null && (
-						<p className="text-sm text-muted-foreground italic">No content update specified</p>
-					)}
-				</div>
-			)}
-
-			{/* Edit mode - show editable form fields */}
-			{isEditing && !decided && (
-				<div
-					className={`px-4 py-3 bg-card ${isFullScreen ? "flex-1 flex flex-col overflow-hidden" : ""}`}
-				>
-					<label
-						htmlFor="notion-content"
-						className="text-xs font-medium text-muted-foreground mb-1.5 block"
-					>
-						New Content
-					</label>
-					<Textarea
-						id="notion-content"
-						value={String(editedArgs.content ?? "")}
-						onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value || null })}
-						placeholder="Enter content to append to the page"
-						rows={isFullScreen ? undefined : 12}
-						className={`resize-none ${isFullScreen ? "flex-1 min-h-0" : ""}`}
-					/>
-				</div>
-			)}
-
-			{/* Action buttons */}
-			<div
-				className={`flex items-center gap-2 border-t ${
-					decided ? "border-border bg-card" : "border-foreground/15 bg-muted/20 dark:bg-muted/10"
-				} px-4 py-3`}
-			>
-				{decided ? (
-					<p className="flex items-center gap-1.5 text-sm text-muted-foreground">
-						{decided === "approve" || decided === "edit" ? (
-							<>
-								<CheckIcon className="size-3.5 text-green-500" />
-								{decided === "edit" ? "Approved with Changes" : "Approved"}
-							</>
+				{/* Context section - READ ONLY account and page info */}
+				{!decided && interruptData.context && (
+					<div className="border-b border-border px-4 py-3 bg-muted/30 space-y-3">
+						{interruptData.context.error ? (
+							<p className="text-sm text-destructive">{interruptData.context.error}</p>
 						) : (
 							<>
-								<XIcon className="size-3.5 text-destructive" />
-								Rejected
+								{account && (
+									<div className="space-y-2">
+										<div className="text-xs font-medium text-muted-foreground">Notion Account</div>
+										<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
+											{account.workspace_icon} {account.workspace_name}
+										</div>
+									</div>
+								)}
+
+								{currentTitle && (
+									<div className="space-y-2">
+										<div className="text-xs font-medium text-muted-foreground">Current Page</div>
+										<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
+											📄 {currentTitle}
+										</div>
+									</div>
+								)}
 							</>
 						)}
-					</p>
-				) : isEditing ? (
-					<>
-						<Button
-							size="sm"
-							onClick={() => {
-								setDecided("edit");
-								setIsEditing(false);
-								setIsFullScreen(false);
-								onDecision({
-									type: "edit",
-									edited_action: {
-										name: interruptData.action_requests[0].name,
-										args: {
-											page_id: args.page_id,
-											content: editedArgs.content,
-											connector_id: account?.id,
-										},
-									},
-								});
-							}}
+					</div>
+				)}
+
+				{/* Display mode - show proposed changes as read-only */}
+				{!isEditing && (
+					<div
+						className={`space-y-2 px-4 py-3 bg-card ${isFullScreen ? "flex-1 overflow-y-auto" : ""}`}
+					>
+						{args.content != null && (
+							<div>
+								<p className="text-xs font-medium text-muted-foreground">New Content</p>
+								<p className="line-clamp-4 text-sm whitespace-pre-wrap text-foreground">
+									{String(args.content)}
+								</p>
+							</div>
+						)}
+						{args.content == null && (
+							<p className="text-sm text-muted-foreground italic">No content update specified</p>
+						)}
+					</div>
+				)}
+
+				{/* Edit mode - show editable form fields */}
+				{isEditing && !decided && (
+					<div
+						className={`px-4 py-3 bg-card ${isFullScreen ? "flex-1 flex flex-col overflow-hidden" : ""}`}
+					>
+						<label
+							htmlFor="notion-content"
+							className="text-xs font-medium text-muted-foreground mb-1.5 block"
 						>
-							<CheckIcon />
-							Approve with Changes
-						</Button>
-						<Button
-							size="sm"
-							variant="outline"
-							onClick={() => {
-								setIsEditing(false);
-								setIsFullScreen(false);
-								setEditedArgs(args); // Reset to original args
-							}}
-						>
-							Cancel
-						</Button>
-					</>
-				) : (
-					<>
-						{allowedDecisions.includes("approve") && (
+							New Content
+						</label>
+						<Textarea
+							id="notion-content"
+							value={String(editedArgs.content ?? "")}
+							onChange={(e) => setEditedArgs({ ...editedArgs, content: e.target.value || null })}
+							placeholder="Enter content to append to the page"
+							rows={isFullScreen ? undefined : 12}
+							className={`resize-none ${isFullScreen ? "flex-1 min-h-0" : ""}`}
+						/>
+					</div>
+				)}
+
+				{/* Action buttons */}
+				<div
+					className={`flex items-center gap-2 border-t ${
+						decided ? "border-border bg-card" : "border-foreground/15 bg-muted/20 dark:bg-muted/10"
+					} px-4 py-3`}
+				>
+					{decided ? (
+						<p className="flex items-center gap-1.5 text-sm text-muted-foreground">
+							{decided === "approve" || decided === "edit" ? (
+								<>
+									<CheckIcon className="size-3.5 text-green-500" />
+									{decided === "edit" ? "Approved with Changes" : "Approved"}
+								</>
+							) : (
+								<>
+									<XIcon className="size-3.5 text-destructive" />
+									Rejected
+								</>
+							)}
+						</p>
+					) : isEditing ? (
+						<>
 							<Button
 								size="sm"
 								onClick={() => {
-									setDecided("approve");
+									setDecided("edit");
+									setIsEditing(false);
+									setIsFullScreen(false);
 									onDecision({
-										type: "approve",
+										type: "edit",
 										edited_action: {
 											name: interruptData.action_requests[0].name,
 											args: {
 												page_id: args.page_id,
-												content: args.content,
+												content: editedArgs.content,
 												connector_id: account?.id,
 											},
 										},
@@ -324,32 +296,67 @@ function ApprovalCard({
 								}}
 							>
 								<CheckIcon />
-								Approve
+								Approve with Changes
 							</Button>
-						)}
-						{canEdit && (
-							<Button size="sm" variant="outline" onClick={() => setIsEditing(true)}>
-								<PencilIcon />
-								Edit
-							</Button>
-						)}
-						{allowedDecisions.includes("reject") && (
 							<Button
 								size="sm"
 								variant="outline"
 								onClick={() => {
-									setDecided("reject");
-									onDecision({ type: "reject", message: "User rejected the action." });
+									setIsEditing(false);
+									setIsFullScreen(false);
+									setEditedArgs(args); // Reset to original args
 								}}
 							>
-								<XIcon />
-								Reject
+								Cancel
 							</Button>
-						)}
-					</>
-				)}
+						</>
+					) : (
+						<>
+							{allowedDecisions.includes("approve") && (
+								<Button
+									size="sm"
+									onClick={() => {
+										setDecided("approve");
+										onDecision({
+											type: "approve",
+											edited_action: {
+												name: interruptData.action_requests[0].name,
+												args: {
+													page_id: args.page_id,
+													content: args.content,
+													connector_id: account?.id,
+												},
+											},
+										});
+									}}
+								>
+									<CheckIcon />
+									Approve
+								</Button>
+							)}
+							{canEdit && (
+								<Button size="sm" variant="outline" onClick={() => setIsEditing(true)}>
+									<PencilIcon />
+									Edit
+								</Button>
+							)}
+							{allowedDecisions.includes("reject") && (
+								<Button
+									size="sm"
+									variant="outline"
+									onClick={() => {
+										setDecided("reject");
+										onDecision({ type: "reject", message: "User rejected the action." });
+									}}
+								>
+									<XIcon />
+									Reject
+								</Button>
+							)}
+						</>
+					)}
+				</div>
 			</div>
-		</div>
 		</>
 	);
 }

From 97d5b046d43b16292aff8ff616c8e69b769eb439 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 18:50:14 +0200
Subject: [PATCH 39/42] Fix delete notion page tool implementation

---
 .../app/agents/new_chat/chat_deepagent.py     |   3 -
 .../new_chat/tools/notion/delete_page.py      |  68 +++++--
 .../app/agents/new_chat/tools/registry.py     |   2 +-
 .../app/connectors/notion_history.py          |   9 +-
 .../components/tool-ui/delete-notion-page.tsx | 178 +++++++++++++++---
 5 files changed, 216 insertions(+), 44 deletions(-)

diff --git a/surfsense_backend/app/agents/new_chat/chat_deepagent.py b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
index 656137f30..d58a0fadb 100644
--- a/surfsense_backend/app/agents/new_chat/chat_deepagent.py
+++ b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
@@ -273,9 +273,6 @@ async def create_surfsense_deep_agent(
         system_prompt=system_prompt,
         context_schema=SurfSenseContextSchema,
         checkpointer=checkpointer,
-        interrupt_on={
-            "delete_notion_page": {"allowed_decisions": ["approve", "reject"]},
-        },
     )
 
     return agent
diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
index 05b0fbfe8..4e992d87c 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/delete_page.py
@@ -96,6 +96,7 @@ def create_delete_notion_page_tool(
             document_id = context.get("document_id")
 
             logger.info(f"Requesting approval for deleting Notion page: '{page_title}' (page_id={page_id}, delete_from_db={delete_from_db})")
+            
             # Request approval before deleting
             approval = interrupt(
                 {
@@ -131,21 +132,63 @@ def create_delete_notion_page_tool(
                     "message": "User declined. The page was not deleted. Do not ask again or suggest alternatives.",
                 }
 
-            logger.info(f"Deleting Notion page: page_id={page_id}")
+            # Extract edited action arguments (if user modified the checkbox)
+            edited_action = decision.get("edited_action", {})
+            final_params = edited_action.get("args", {}) if edited_action else {}
+
+            final_page_id = final_params.get("page_id", page_id)
+            final_connector_id = final_params.get("connector_id", connector_id_from_context)
+            final_delete_from_db = final_params.get("delete_from_db", delete_from_db)
+            
+            logger.info(f"Deleting Notion page with final params: page_id={final_page_id}, connector_id={final_connector_id}, delete_from_db={final_delete_from_db}")
+
+            from sqlalchemy.future import select
+
+            from app.db import SearchSourceConnector, SearchSourceConnectorType
+
+            # Validate the connector
+            if final_connector_id:
+                result = await db_session.execute(
+                    select(SearchSourceConnector).filter(
+                        SearchSourceConnector.id == final_connector_id,
+                        SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.user_id == user_id,
+                        SearchSourceConnector.connector_type
+                        == SearchSourceConnectorType.NOTION_CONNECTOR,
+                    )
+                )
+                connector = result.scalars().first()
+
+                if not connector:
+                    logger.error(
+                        f"Invalid connector_id={final_connector_id} for search_space_id={search_space_id}"
+                    )
+                    return {
+                        "status": "error",
+                        "message": "Selected Notion account is invalid or has been disconnected. Please select a valid account.",
+                    }
+                actual_connector_id = connector.id
+                logger.info(f"Validated Notion connector: id={actual_connector_id}")
+            else:
+                logger.error("No connector found for this page")
+                return {
+                    "status": "error",
+                    "message": "No connector found for this page.",
+                }
 
             # Create connector instance
             notion_connector = NotionHistoryConnector(
                 session=db_session,
-                connector_id=connector_id_from_context,
+                connector_id=actual_connector_id,
             )
 
             # Delete the page from Notion
-            result = await notion_connector.delete_page(page_id=page_id)
+            result = await notion_connector.delete_page(page_id=final_page_id)
             logger.info(f"delete_page result: {result.get('status')} - {result.get('message', '')}")
             
             # If deletion was successful and user wants to delete from DB
             deleted_from_db = False
-            if result.get("status") == "success" and delete_from_db and document_id:
+            if result.get("status") == "success" and final_delete_from_db and document_id:
                 try:
                     from sqlalchemy.future import select
 
@@ -178,17 +221,18 @@ def create_delete_notion_page_tool(
             
             return result
 
-        except ValueError as e:
-            logger.error(f"ValueError in delete_notion_page: {e}")
-            return {
-                "status": "error",
-                "message": str(e),
-            }
         except Exception as e:
-            logger.error(f"Unexpected error in delete_notion_page: {e}")
+            from langgraph.errors import GraphInterrupt
+
+            if isinstance(e, GraphInterrupt):
+                raise
+
+            logger.error(f"Error deleting Notion page: {e}", exc_info=True)
             return {
                 "status": "error",
-                "message": f"Unexpected error deleting Notion page: {e!s}",
+                "message": str(e)
+                if isinstance(e, ValueError)
+                else f"Unexpected error: {e!s}",
             }
 
     return delete_notion_page
diff --git a/surfsense_backend/app/agents/new_chat/tools/registry.py b/surfsense_backend/app/agents/new_chat/tools/registry.py
index 8da9ee116..3e71299a0 100644
--- a/surfsense_backend/app/agents/new_chat/tools/registry.py
+++ b/surfsense_backend/app/agents/new_chat/tools/registry.py
@@ -229,7 +229,7 @@ BUILTIN_TOOLS: list[ToolDefinition] = [
     ),
     ToolDefinition(
         name="delete_notion_page",
-        description="Delete a Notion page by title",
+        description="Delete an existing Notion page",
         factory=lambda deps: create_delete_notion_page_tool(
             db_session=deps["db_session"],
             search_space_id=deps["search_space_id"],
diff --git a/surfsense_backend/app/connectors/notion_history.py b/surfsense_backend/app/connectors/notion_history.py
index b6fda8b8b..6b2dff586 100644
--- a/surfsense_backend/app/connectors/notion_history.py
+++ b/surfsense_backend/app/connectors/notion_history.py
@@ -1113,7 +1113,14 @@ class NotionHistoryConnector:
 
         except APIResponseError as e:
             logger.error(f"Notion API error deleting page: {e}")
-            error_msg = e.body.get("message", str(e)) if hasattr(e, "body") else str(e)
+            # Handle both dict and string body formats
+            if hasattr(e, "body"):
+                if isinstance(e.body, dict):
+                    error_msg = e.body.get("message", str(e))
+                else:
+                    error_msg = str(e.body) if e.body else str(e)
+            else:
+                error_msg = str(e)
             return {
                 "status": "error",
                 "message": f"Failed to delete Notion page: {error_msg}",
diff --git a/surfsense_web/components/tool-ui/delete-notion-page.tsx b/surfsense_web/components/tool-ui/delete-notion-page.tsx
index 59d04f2b7..70c07c00b 100644
--- a/surfsense_web/components/tool-ui/delete-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/delete-notion-page.tsx
@@ -1,7 +1,14 @@
 "use client";
 
 import { makeAssistantToolUI } from "@assistant-ui/react";
-import { AlertTriangleIcon, CheckIcon, Loader2Icon, XIcon } from "lucide-react";
+import {
+	AlertTriangleIcon,
+	CheckIcon,
+	InfoIcon,
+	Loader2Icon,
+	TriangleAlertIcon,
+	XIcon,
+} from "lucide-react";
 import { useState } from "react";
 import { Button } from "@/components/ui/button";
 
@@ -17,6 +24,8 @@ interface InterruptResult {
 		action_name: string;
 		allowed_decisions: Array<"approve" | "reject">;
 	}>;
+	interrupt_type?: string;
+	message?: string;
 	context?: {
 		account?: {
 			id: number;
@@ -36,7 +45,9 @@ interface InterruptResult {
 interface SuccessResult {
 	status: "success";
 	page_id: string;
+	title?: string;
 	message?: string;
+	deleted_from_db?: boolean;
 }
 
 interface ErrorResult {
@@ -44,7 +55,20 @@ interface ErrorResult {
 	message: string;
 }
 
-type DeleteNotionPageResult = InterruptResult | SuccessResult | ErrorResult;
+interface InfoResult {
+	status: "not_found";
+	message: string;
+}
+
+interface WarningResult {
+	status: "success";
+	warning: string;
+	page_id?: string;
+	title?: string;
+	message?: string;
+}
+
+type DeleteNotionPageResult = InterruptResult | SuccessResult | ErrorResult | InfoResult | WarningResult;
 
 function isInterruptResult(result: unknown): result is InterruptResult {
 	return (
@@ -64,6 +88,26 @@ function isErrorResult(result: unknown): result is ErrorResult {
 	);
 }
 
+function isInfoResult(result: unknown): result is InfoResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"status" in result &&
+		(result as InfoResult).status === "not_found"
+	);
+}
+
+function isWarningResult(result: unknown): result is WarningResult {
+	return (
+		typeof result === "object" &&
+		result !== null &&
+		"status" in result &&
+		(result as WarningResult).status === "success" &&
+		"warning" in result &&
+		typeof (result as WarningResult).warning === "string"
+	);
+}
+
 function ApprovalCard({
 	args,
 	interruptData,
@@ -82,6 +126,9 @@ function ApprovalCard({
 	);
 	const [deleteFromDb, setDeleteFromDb] = useState(false);
 
+	const account = interruptData.context?.account;
+	const currentTitle = interruptData.context?.current_title;
+
 	return (
 		<div
 			className={`my-4 max-w-full overflow-hidden rounded-xl transition-all duration-300 ${
@@ -116,23 +163,34 @@ function ApprovalCard({
 				</div>
 			</div>
 
-			<div className="space-y-2 px-4 py-3 bg-card">
-				{interruptData.context?.account && (
-					<div>
-						<p className="text-xs font-medium text-muted-foreground">Notion Account</p>
-						<p className="text-sm text-foreground">
-							{interruptData.context.account.workspace_icon}{" "}
-							{interruptData.context.account.workspace_name}
-						</p>
-					</div>
-				)}
-				{interruptData.context?.current_title && (
-					<div>
-						<p className="text-xs font-medium text-muted-foreground">Page</p>
-						<p className="text-sm text-foreground">📄 {interruptData.context.current_title}</p>
-					</div>
-				)}
-			</div>
+			{/* Context section - READ ONLY account and page info */}
+			{!decided && interruptData.context && (
+				<div className="border-b border-border px-4 py-3 bg-muted/30 space-y-3">
+					{interruptData.context.error ? (
+						<p className="text-sm text-destructive">{interruptData.context.error}</p>
+					) : (
+						<>
+							{account && (
+								<div className="space-y-2">
+									<div className="text-xs font-medium text-muted-foreground">Notion Account</div>
+									<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
+										{account.workspace_icon} {account.workspace_name}
+									</div>
+								</div>
+							)}
+
+							{currentTitle && (
+								<div className="space-y-2">
+									<div className="text-xs font-medium text-muted-foreground">Page to Delete</div>
+									<div className="w-full rounded-md border border-input bg-muted/50 px-3 py-2 text-sm">
+										📄 {currentTitle}
+									</div>
+								</div>
+							)}
+						</>
+					)}
+				</div>
+			)}
 
 			{/* Checkbox for deleting from knowledge base */}
 			{!decided && (
@@ -184,7 +242,8 @@ function ApprovalCard({
 									edited_action: {
 										name: interruptData.action_requests[0].name,
 										args: {
-											...interruptData.action_requests[0].args,
+											page_id: interruptData.context?.page_id,
+											connector_id: account?.id,
 											delete_from_db: deleteFromDb,
 										},
 									},
@@ -230,6 +289,45 @@ function ErrorCard({ result }: { result: ErrorResult }) {
 	);
 }
 
+function InfoCard({ result }: { result: InfoResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-amber-500/50 bg-card">
+			<div className="flex items-start gap-3 px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-amber-500/10">
+					<InfoIcon className="size-4 text-amber-500" />
+				</div>
+				<div className="min-w-0 flex-1 pt-2">
+					<p className="text-sm text-muted-foreground">{result.message}</p>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+function WarningCard({ result }: { result: WarningResult }) {
+	return (
+		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-amber-500/50 bg-card">
+			<div className="flex items-center gap-3 border-b border-amber-500/50 px-4 py-3">
+				<div className="flex size-9 shrink-0 items-center justify-center rounded-lg bg-amber-500/10">
+					<TriangleAlertIcon className="size-4 text-amber-500" />
+				</div>
+				<div className="min-w-0 flex-1">
+					<p className="text-sm font-medium text-amber-600 dark:text-amber-500">Partial success</p>
+				</div>
+			</div>
+			<div className="space-y-2 px-4 py-3 text-xs">
+				<p className="text-sm text-muted-foreground">{result.warning}</p>
+				{result.title && (
+					<div className="pt-2">
+						<span className="font-medium text-muted-foreground">Deleted page: </span>
+						<span>{result.title}</span>
+					</div>
+				)}
+			</div>
+		</div>
+	);
+}
+
 function SuccessCard({ result }: { result: SuccessResult }) {
 	return (
 		<div className="my-4 max-w-md overflow-hidden rounded-xl border border-border bg-card">
@@ -238,18 +336,27 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 					<CheckIcon className="size-4 text-green-500" />
 				</div>
 				<div className="min-w-0 flex-1">
-					<p className=" text-[.8rem] text-muted-foreground">
+					<p className="text-[.8rem] text-muted-foreground">
 						{result.message || "Notion page deleted successfully"}
 					</p>
 				</div>
 			</div>
-
+{result.deleted_from_db || result.title && (
 			<div className="space-y-2 px-4 py-3 text-xs">
-				<div>
-					<span className="font-medium text-muted-foreground">Page ID: </span>
-					<span className="font-mono">{result.page_id}</span>
-				</div>
-			</div>
+				{result.title && (
+					<div>
+						<span className="font-medium text-muted-foreground">Deleted page: </span>
+						<span>{result.title}</span>
+					</div>
+				)}
+				{result.deleted_from_db && (
+					<div className="pt-1">
+						<span className="text-green-600 dark:text-green-500">
+							✓ Also removed from knowledge base
+						</span>
+					</div>
+				)}
+			</div>)}
 		</div>
 	);
 }
@@ -288,6 +395,23 @@ export const DeleteNotionPageToolUI = makeAssistantToolUI<
 			);
 		}
 
+		if (
+			typeof result === "object" &&
+			result !== null &&
+			"status" in result &&
+			(result as { status: string }).status === "rejected"
+		) {
+			return null;
+		}
+
+		if (isInfoResult(result)) {
+			return <InfoCard result={result} />;
+		}
+
+		if (isWarningResult(result)) {
+			return <WarningCard result={result} />;
+		}
+
 		if (isErrorResult(result)) {
 			return <ErrorCard result={result} />;
 		}

From 743b40ece66d050b7af4640b9377d8862a361aa9 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 19:15:17 +0200
Subject: [PATCH 40/42] fix: add user_id filter to create_notion_page connector
 lookup

---
 .../app/agents/new_chat/tools/notion/create_page.py             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
index 48baaf69c..1a09fb355 100644
--- a/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
+++ b/surfsense_backend/app/agents/new_chat/tools/notion/create_page.py
@@ -144,6 +144,7 @@ def create_create_notion_page_tool(
                 result = await db_session.execute(
                     select(SearchSourceConnector).filter(
                         SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.user_id == user_id,
                         SearchSourceConnector.connector_type
                         == SearchSourceConnectorType.NOTION_CONNECTOR,
                     )
@@ -164,6 +165,7 @@ def create_create_notion_page_tool(
                     select(SearchSourceConnector).filter(
                         SearchSourceConnector.id == actual_connector_id,
                         SearchSourceConnector.search_space_id == search_space_id,
+                        SearchSourceConnector.user_id == user_id,
                         SearchSourceConnector.connector_type
                         == SearchSourceConnectorType.NOTION_CONNECTOR,
                     )

From 2a15e0d337890b86169a47e5f434d30929a85c3d Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 19:17:36 +0200
Subject: [PATCH 41/42] fix: resolve race condition and add cleanup in HITL
 flow

---
 .../new-chat/[[...chat_id]]/page.tsx          | 51 +++++++++++++------
 .../components/tool-ui/delete-notion-page.tsx |  2 +-
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index d529e0598..19c5682e1 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -390,6 +390,16 @@ export default function NewChatPage() {
 		}));
 	}, [currentThread, setCurrentThreadState]);
 
+	// Cleanup on unmount - abort any in-flight requests
+	useEffect(() => {
+		return () => {
+			if (abortControllerRef.current) {
+				abortControllerRef.current.abort();
+				abortControllerRef.current = null;
+			}
+		};
+	}, []);
+
 	// Cancel ongoing request
 	const cancelRun = useCallback(async () => {
 		if (abortControllerRef.current) {
@@ -952,25 +962,36 @@ export default function NewChatPage() {
 							contentPartsState.currentTextPartIndex = -1;
 						}
 					}
-				}
 			}
+		}
 
-			const decisionType = decisions[0]?.type as "approve" | "reject" | undefined;
-			if (decisionType) {
-				for (const part of contentParts) {
-					if (
-						part.type === "tool-call" &&
-						typeof part.result === "object" &&
-						part.result !== null &&
-						"__interrupt__" in (part.result as Record<string, unknown>)
-					) {
-						part.result = {
-							...(part.result as Record<string, unknown>),
-							__decided__: decisionType,
-						};
-					}
+		// Merge edited args if present to fix race condition
+		if (decisions.length > 0 && decisions[0].type === "edit" && decisions[0].edited_action) {
+			const editedAction = decisions[0].edited_action;
+			for (const part of contentParts) {
+				if (part.type === "tool-call" && part.toolName === editedAction.name) {
+					part.args = { ...part.args, ...editedAction.args };
+					break;
 				}
 			}
+		}
+
+		const decisionType = decisions[0]?.type as "approve" | "reject" | undefined;
+		if (decisionType) {
+			for (const part of contentParts) {
+				if (
+					part.type === "tool-call" &&
+					typeof part.result === "object" &&
+					part.result !== null &&
+					"__interrupt__" in (part.result as Record<string, unknown>)
+				) {
+					part.result = {
+						...(part.result as Record<string, unknown>),
+						__decided__: decisionType,
+					};
+				}
+			}
+		}
 
 			try {
 				const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
diff --git a/surfsense_web/components/tool-ui/delete-notion-page.tsx b/surfsense_web/components/tool-ui/delete-notion-page.tsx
index 70c07c00b..c7a9b282e 100644
--- a/surfsense_web/components/tool-ui/delete-notion-page.tsx
+++ b/surfsense_web/components/tool-ui/delete-notion-page.tsx
@@ -341,7 +341,7 @@ function SuccessCard({ result }: { result: SuccessResult }) {
 					</p>
 				</div>
 			</div>
-{result.deleted_from_db || result.title && (
+{(result.deleted_from_db || result.title) && (
 			<div className="space-y-2 px-4 py-3 text-xs">
 				{result.title && (
 					<div>

From d8d62ab2c5655d520c30ef55522e3ba5ad085a86 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Fri, 13 Feb 2026 19:52:48 +0200
Subject: [PATCH 42/42] Disable Notion tools when connector not configured

---
 .../app/agents/new_chat/chat_deepagent.py             | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/surfsense_backend/app/agents/new_chat/chat_deepagent.py b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
index d58a0fadb..619282daf 100644
--- a/surfsense_backend/app/agents/new_chat/chat_deepagent.py
+++ b/surfsense_backend/app/agents/new_chat/chat_deepagent.py
@@ -243,11 +243,20 @@ async def create_surfsense_deep_agent(
         "available_document_types": available_document_types,
     }
 
+    # Disable Notion action tools if no Notion connector is configured
+    modified_disabled_tools = list(disabled_tools) if disabled_tools else []
+    has_notion_connector = (
+        available_connectors is not None and "NOTION_CONNECTOR" in available_connectors
+    )
+    if not has_notion_connector:
+        notion_tools = ["create_notion_page", "update_notion_page", "delete_notion_page"]
+        modified_disabled_tools.extend(notion_tools)
+
     # Build tools using the async registry (includes MCP tools)
     tools = await build_tools_async(
         dependencies=dependencies,
         enabled_tools=enabled_tools,
-        disabled_tools=disabled_tools,
+        disabled_tools=modified_disabled_tools,
         additional_tools=list(additional_tools) if additional_tools else None,
     )