Merge dev to get GraphSettings fix

Adds database migration to add the nodeId column which tracks
the node ID in the graph definition for auto-approval tracking.

autogpt_platform/backend/backend/api/features/executions/review/model.py

@@ -41,6 +41,7 @@ class PendingHumanReviewModel(BaseModel):
     graph_exec_id: str = Field(description="Graph execution ID")
     graph_id: str = Field(description="Graph ID")
     graph_version: int = Field(description="Graph version")
+    node_id: str = Field(description="Node ID in the graph definition")
     payload: SafeJsonData = Field(description="The actual data payload awaiting review")
     instructions: str | None = Field(
         description="Instructions or message for the reviewer", default=None
@@ -81,6 +82,7 @@ class PendingHumanReviewModel(BaseModel):
             graph_exec_id=review.graphExecId,
             graph_id=review.graphId,
             graph_version=review.graphVersion,
+            node_id=review.nodeId,
             payload=review.payload,
             instructions=review.instructions,
             editable=review.editable,
@@ -179,6 +181,15 @@ class ReviewRequest(BaseModel):
     reviews: List[ReviewItem] = Field(
         description="All reviews with their approval status, data, and messages"
     )
+    auto_approve_node_ids: List[str] = Field(
+        default_factory=list,
+        description=(
+            "List of node IDs (from the graph definition) to auto-approve for "
+            "the remainder of this execution. Future reviews from these specific "
+            "nodes will be automatically approved. This only affects the current "
+            "execution run."
+        ),
+    )
 
     @model_validator(mode="after")
     def validate_review_completeness(self):

autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py

@@ -41,6 +41,7 @@ def sample_pending_review(test_user_id: str) -> PendingHumanReviewModel:
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_123",
         payload={"data": "test payload", "value": 42},
         instructions="Please review this data",
         editable=True,
@@ -160,6 +161,7 @@ def test_process_review_action_approve_success(
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_123",
         payload={"data": "modified payload", "value": 50},
         instructions="Please review this data",
         editable=True,
@@ -223,6 +225,7 @@ def test_process_review_action_reject_success(
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_123",
         payload={"data": "test payload"},
         instructions="Please review",
         editable=True,
@@ -274,6 +277,7 @@ def test_process_review_action_mixed_success(
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_456",
         payload={"data": "second payload"},
         instructions="Second review",
         editable=False,
@@ -303,6 +307,7 @@ def test_process_review_action_mixed_success(
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_123",
         payload={"data": "modified"},
         instructions="Please review",
         editable=True,
@@ -321,6 +326,7 @@ def test_process_review_action_mixed_success(
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_456",
         payload={"data": "second payload"},
         instructions="Second review",
         editable=False,

autogpt_platform/backend/backend/api/features/executions/review/routes.py

@@ -5,7 +5,7 @@ import autogpt_libs.auth as autogpt_auth_lib
 from fastapi import APIRouter, HTTPException, Query, Security, status
 from prisma.enums import ReviewStatus
 
-from backend.data.execution import get_graph_execution_meta
+from backend.data.execution import ExecutionContext, get_graph_execution_meta
 from backend.data.human_review import (
     get_pending_reviews_for_execution,
     get_pending_reviews_for_user,
@@ -169,10 +169,23 @@ async def process_review_action(
         if not still_has_pending:
             # Resume execution
             try:
+                # If auto_approve_node_ids is set, create a context that will
+                # automatically approve future reviews from these specific nodes
+                execution_context = None
+                if request.auto_approve_node_ids:
+                    execution_context = ExecutionContext(
+                        auto_approved_node_ids=set(request.auto_approve_node_ids),
+                    )
+                    logger.info(
+                        f"Auto-approving future reviews for nodes "
+                        f"{request.auto_approve_node_ids} in execution {graph_exec_id}"
+                    )
+
                 await add_graph_execution(
                     graph_id=first_review.graph_id,
                     user_id=user_id,
                     graph_exec_id=graph_exec_id,
+                    execution_context=execution_context,
                 )
                 logger.info(f"Resumed execution {graph_exec_id}")
             except Exception as e:

autogpt_platform/backend/backend/api/features/store/embeddings.py

@@ -154,16 +154,16 @@ async def store_content_embedding(
 
         # Upsert the embedding
         # WHERE clause in DO UPDATE prevents PostgreSQL 15 bug with NULLS NOT DISTINCT
-        # Use unqualified ::vector - pgvector is in search_path on all environments
+        # Use {pgvector_schema}.vector for explicit pgvector type qualification
         await execute_raw_with_schema(
             """
             INSERT INTO {schema_prefix}"UnifiedContentEmbedding" (
                 "id", "contentType", "contentId", "userId", "embedding", "searchableText", "metadata", "createdAt", "updatedAt"
             )
-            VALUES (gen_random_uuid()::text, $1::{schema_prefix}"ContentType", $2, $3, $4::vector, $5, $6::jsonb, NOW(), NOW())
+            VALUES (gen_random_uuid()::text, $1::{schema_prefix}"ContentType", $2, $3, $4::{pgvector_schema}.vector, $5, $6::jsonb, NOW(), NOW())
             ON CONFLICT ("contentType", "contentId", "userId")
             DO UPDATE SET
-                "embedding" = $4::vector,
+                "embedding" = $4::{pgvector_schema}.vector,
                 "searchableText" = $5,
                 "metadata" = $6::jsonb,
                 "updatedAt" = NOW()
@@ -879,7 +879,8 @@ async def semantic_search(
         min_similarity_idx = len(params) + 1
         params.append(min_similarity)
 
-        # Use unqualified ::vector and <=> operator - pgvector is in search_path on all environments
+        # Use regular string (not f-string) for template to preserve {schema_prefix} and {schema} placeholders
+        # Use OPERATOR({pgvector_schema}.<=>) for explicit operator schema qualification
         sql = (
             """
             SELECT
@@ -887,9 +888,9 @@ async def semantic_search(
                 "contentType" as content_type,
                 "searchableText" as searchable_text,
                 metadata,
-                1 - (embedding <=> '"""
+                1 - (embedding OPERATOR({pgvector_schema}.<=>) '"""
             + embedding_str
-            + """'::vector) as similarity
+            + """'::{pgvector_schema}.vector) as similarity
             FROM {schema_prefix}"UnifiedContentEmbedding"
             WHERE "contentType" IN ("""
             + content_type_placeholders
@@ -897,9 +898,9 @@ async def semantic_search(
             """
             + user_filter
             + """
-            AND 1 - (embedding <=> '"""
+            AND 1 - (embedding OPERATOR({pgvector_schema}.<=>) '"""
             + embedding_str
-            + """'::vector) >= $"""
+            + """'::{pgvector_schema}.vector) >= $"""
             + str(min_similarity_idx)
             + """
             ORDER BY similarity DESC

autogpt_platform/backend/backend/api/features/store/hybrid_search.py

@@ -295,7 +295,7 @@ async def unified_hybrid_search(
                 FROM {{schema_prefix}}"UnifiedContentEmbedding" uce
                 WHERE uce."contentType" = ANY({content_types_param}::{{schema_prefix}}"ContentType"[])
                 {user_filter}
-                ORDER BY uce.embedding <=> {embedding_param}::vector
+                ORDER BY uce.embedding OPERATOR({{pgvector_schema}}.<=>)  {embedding_param}::{{pgvector_schema}}.vector
                 LIMIT 200
             )
         ),
@@ -307,7 +307,7 @@ async def unified_hybrid_search(
                 uce.metadata,
                 uce."updatedAt" as updated_at,
                 -- Semantic score: cosine similarity (1 - distance)
-                COALESCE(1 - (uce.embedding <=> {embedding_param}::vector), 0) as semantic_score,
+                COALESCE(1 - (uce.embedding OPERATOR({{pgvector_schema}}.<=>)  {embedding_param}::{{pgvector_schema}}.vector), 0) as semantic_score,
                 -- Lexical score: ts_rank_cd
                 COALESCE(ts_rank_cd(uce.search, plainto_tsquery('english', {query_param})), 0) as lexical_raw,
                 -- Category match from metadata
@@ -583,7 +583,7 @@ async def hybrid_search(
                 WHERE uce."contentType" = 'STORE_AGENT'::{{schema_prefix}}"ContentType"
                 AND uce."userId" IS NULL
                 AND {where_clause}
-                ORDER BY uce.embedding <=> {embedding_param}::vector
+                ORDER BY uce.embedding OPERATOR({{pgvector_schema}}.<=>)  {embedding_param}::{{pgvector_schema}}.vector
                 LIMIT 200
             ) uce
         ),
@@ -605,7 +605,7 @@ async def hybrid_search(
                 -- Searchable text for BM25 reranking
                 COALESCE(sa.agent_name, '') || ' ' || COALESCE(sa.sub_heading, '') || ' ' || COALESCE(sa.description, '') as searchable_text,
                 -- Semantic score
-                COALESCE(1 - (uce.embedding <=> {embedding_param}::vector), 0) as semantic_score,
+                COALESCE(1 - (uce.embedding OPERATOR({{pgvector_schema}}.<=>)  {embedding_param}::{{pgvector_schema}}.vector), 0) as semantic_score,
                 -- Lexical score (raw, will normalize)
                 COALESCE(ts_rank_cd(uce.search, plainto_tsquery('english', {query_param})), 0) as lexical_raw,
                 -- Category match

autogpt_platform/backend/backend/blocks/helpers/review.py

@@ -55,6 +55,7 @@ class HITLReviewHelper:
     async def _handle_review_request(
         input_data: Any,
         user_id: str,
+        node_id: str,
         node_exec_id: str,
         graph_exec_id: str,
         graph_id: str,
@@ -62,6 +63,7 @@ class HITLReviewHelper:
         execution_context: ExecutionContext,
         block_name: str = "Block",
         editable: bool = False,
+        skip_safe_mode_check: bool = False,
     ) -> Optional[ReviewResult]:
         """
         Handle a review request for a block that requires human review.
@@ -69,6 +71,7 @@ class HITLReviewHelper:
         Args:
             input_data: The input data to be reviewed
             user_id: ID of the user requesting the review
+            node_id: ID of the node in the graph definition
             node_exec_id: ID of the node execution
             graph_exec_id: ID of the graph execution
             graph_id: ID of the graph
@@ -76,6 +79,8 @@ class HITLReviewHelper:
             execution_context: Current execution context
             block_name: Name of the block requesting review
             editable: Whether the reviewer can edit the data
+            skip_safe_mode_check: If True, skip the safe mode check (caller already
+                verified). Used by sensitive action blocks that check their own flag.
 
         Returns:
             ReviewResult if review is complete, None if waiting for human input
@@ -84,7 +89,11 @@ class HITLReviewHelper:
             Exception: If review creation or status update fails
         """
         # Skip review if safe mode is disabled - return auto-approved result
-        if not execution_context.human_in_the_loop_safe_mode:
+        # (unless caller already checked and wants to skip this check)
+        if (
+            not skip_safe_mode_check
+            and not execution_context.human_in_the_loop_safe_mode
+        ):
             logger.info(
                 f"Block {block_name} skipping review for node {node_exec_id} - safe mode disabled"
             )
@@ -96,12 +105,27 @@ class HITLReviewHelper:
                 node_exec_id=node_exec_id,
             )
 
+        # Skip review if this specific node has been auto-approved by the user
+        if node_id in execution_context.auto_approved_node_ids:
+            logger.info(
+                f"Block {block_name} skipping review for node {node_exec_id} - "
+                f"node {node_id} is auto-approved"
+            )
+            return ReviewResult(
+                data=input_data,
+                status=ReviewStatus.APPROVED,
+                message="Auto-approved (user approved all future actions for this block)",
+                processed=True,
+                node_exec_id=node_exec_id,
+            )
+
         result = await HITLReviewHelper.get_or_create_human_review(
             user_id=user_id,
             node_exec_id=node_exec_id,
             graph_exec_id=graph_exec_id,
             graph_id=graph_id,
             graph_version=graph_version,
+            node_id=node_id,
             input_data=input_data,
             message=f"Review required for {block_name} execution",
             editable=editable,
@@ -129,6 +153,7 @@ class HITLReviewHelper:
     async def handle_review_decision(
         input_data: Any,
         user_id: str,
+        node_id: str,
         node_exec_id: str,
         graph_exec_id: str,
         graph_id: str,
@@ -136,6 +161,7 @@ class HITLReviewHelper:
         execution_context: ExecutionContext,
         block_name: str = "Block",
         editable: bool = False,
+        skip_safe_mode_check: bool = False,
     ) -> Optional[ReviewDecision]:
         """
         Handle a review request and return the decision in a single call.
@@ -143,6 +169,7 @@ class HITLReviewHelper:
         Args:
             input_data: The input data to be reviewed
             user_id: ID of the user requesting the review
+            node_id: ID of the node in the graph definition
             node_exec_id: ID of the node execution
             graph_exec_id: ID of the graph execution
             graph_id: ID of the graph
@@ -150,6 +177,8 @@ class HITLReviewHelper:
             execution_context: Current execution context
             block_name: Name of the block requesting review
             editable: Whether the reviewer can edit the data
+            skip_safe_mode_check: If True, skip the safe mode check (caller already
+                verified). Used by sensitive action blocks that check their own flag.
 
         Returns:
             ReviewDecision if review is complete (approved/rejected),
@@ -158,6 +187,7 @@ class HITLReviewHelper:
         review_result = await HITLReviewHelper._handle_review_request(
             input_data=input_data,
             user_id=user_id,
+            node_id=node_id,
             node_exec_id=node_exec_id,
             graph_exec_id=graph_exec_id,
             graph_id=graph_id,
@@ -165,6 +195,7 @@ class HITLReviewHelper:
             execution_context=execution_context,
             block_name=block_name,
             editable=editable,
+            skip_safe_mode_check=skip_safe_mode_check,
         )
 
         if review_result is None:

autogpt_platform/backend/backend/blocks/human_in_the_loop.py

@@ -97,6 +97,7 @@ class HumanInTheLoopBlock(Block):
         input_data: Input,
         *,
         user_id: str,
+        node_id: str,
         node_exec_id: str,
         graph_exec_id: str,
         graph_id: str,
@@ -104,6 +105,16 @@ class HumanInTheLoopBlock(Block):
         execution_context: ExecutionContext,
         **_kwargs,
     ) -> BlockOutput:
+        # Check if this specific node has been auto-approved by the user
+        if node_id in execution_context.auto_approved_node_ids:
+            logger.info(
+                f"HITL block skipping review for node {node_exec_id} - "
+                f"node {node_id} is auto-approved"
+            )
+            yield "approved_data", input_data.data
+            yield "review_message", "Auto-approved (user approved all future actions for this block)"
+            return
+
         if not execution_context.human_in_the_loop_safe_mode:
             logger.info(
                 f"HITL block skipping review for node {node_exec_id} - safe mode disabled"
@@ -115,6 +126,7 @@ class HumanInTheLoopBlock(Block):
         decision = await self.handle_review_decision(
             input_data=input_data.data,
             user_id=user_id,
+            node_id=node_id,
             node_exec_id=node_exec_id,
             graph_exec_id=graph_exec_id,
             graph_id=graph_id,

autogpt_platform/backend/backend/data/block.py

@@ -622,6 +622,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
         input_data: BlockInput,
         *,
         user_id: str,
+        node_id: str,
         node_exec_id: str,
         graph_exec_id: str,
         graph_id: str,
@@ -648,6 +649,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
         decision = await HITLReviewHelper.handle_review_decision(
             input_data=input_data,
             user_id=user_id,
+            node_id=node_id,
             node_exec_id=node_exec_id,
             graph_exec_id=graph_exec_id,
             graph_id=graph_id,

autogpt_platform/backend/backend/data/db.py

@@ -121,14 +121,10 @@ async def _raw_with_schema(
     Supports placeholders:
         - {schema_prefix}: Table/type prefix (e.g., "platform".)
         - {schema}: Raw schema name for application tables (e.g., platform)
-
-    Note on pgvector types:
-        Use unqualified ::vector and <=> operator in queries. PostgreSQL resolves
-        these via search_path, which includes the schema where pgvector is installed
-        on all environments (local, CI, dev).
+        - {pgvector_schema}: Schema where pgvector is installed (defaults to "public")
 
     Args:
-        query_template: SQL query with {schema_prefix} and/or {schema} placeholders
+        query_template: SQL query with {schema_prefix}, {schema}, and/or {pgvector_schema} placeholders
         *args: Query parameters
         execute: If False, executes SELECT query. If True, executes INSERT/UPDATE/DELETE.
         client: Optional Prisma client for transactions (only used when execute=True).
@@ -139,16 +135,20 @@ async def _raw_with_schema(
 
     Example with vector type:
         await execute_raw_with_schema(
-            'INSERT INTO {schema_prefix}"Embedding" (vec) VALUES ($1::vector)',
+            'INSERT INTO {schema_prefix}"Embedding" (vec) VALUES ($1::{pgvector_schema}.vector)',
             embedding_data
         )
     """
     schema = get_database_schema()
     schema_prefix = f'"{schema}".' if schema != "public" else ""
+    # pgvector extension is typically installed in "public" schema
+    # On Supabase it may be in "extensions" but "public" is the common default
+    pgvector_schema = "public"
 
     formatted_query = query_template.format(
         schema_prefix=schema_prefix,
         schema=schema,
+        pgvector_schema=pgvector_schema,
     )
 
     import prisma as prisma_module

autogpt_platform/backend/backend/data/event_bus.py

@@ -103,18 +103,8 @@ class RedisEventBus(BaseRedisEventBus[M], ABC):
         return redis.get_redis()
 
     def publish_event(self, event: M, channel_key: str):
-        """
-        Publish an event to Redis. Gracefully handles connection failures
-        by logging the error instead of raising exceptions.
-        """
-        try:
-            message, full_channel_name = self._serialize_message(event, channel_key)
-            self.connection.publish(full_channel_name, message)
-        except Exception:
-            logger.exception(
-                f"Failed to publish event to Redis channel {channel_key}. "
-                "Event bus operation will continue without Redis connectivity."
-            )
+        message, full_channel_name = self._serialize_message(event, channel_key)
+        self.connection.publish(full_channel_name, message)
 
     def listen_events(self, channel_key: str) -> Generator[M, None, None]:
         pubsub, full_channel_name = self._get_pubsub_channel(
@@ -138,19 +128,9 @@ class AsyncRedisEventBus(BaseRedisEventBus[M], ABC):
         return await redis.get_redis_async()
 
     async def publish_event(self, event: M, channel_key: str):
-        """
-        Publish an event to Redis. Gracefully handles connection failures
-        by logging the error instead of raising exceptions.
-        """
-        try:
-            message, full_channel_name = self._serialize_message(event, channel_key)
-            connection = await self.connection
-            await connection.publish(full_channel_name, message)
-        except Exception:
-            logger.exception(
-                f"Failed to publish event to Redis channel {channel_key}. "
-                "Event bus operation will continue without Redis connectivity."
-            )
+        message, full_channel_name = self._serialize_message(event, channel_key)
+        connection = await self.connection
+        await connection.publish(full_channel_name, message)
 
     async def listen_events(self, channel_key: str) -> AsyncGenerator[M, None]:
         pubsub, full_channel_name = self._get_pubsub_channel(

autogpt_platform/backend/backend/data/event_bus_test.py

@@ -1,56 +0,0 @@
-"""
-Tests for event_bus graceful degradation when Redis is unavailable.
-"""
-
-from unittest.mock import AsyncMock, patch
-
-import pytest
-from pydantic import BaseModel
-
-from backend.data.event_bus import AsyncRedisEventBus
-
-
-class TestEvent(BaseModel):
-    """Test event model."""
-
-    message: str
-
-
-class TestNotificationBus(AsyncRedisEventBus[TestEvent]):
-    """Test implementation of AsyncRedisEventBus."""
-
-    Model = TestEvent
-
-    @property
-    def event_bus_name(self) -> str:
-        return "test_event_bus"
-
-
-@pytest.mark.asyncio
-async def test_publish_event_handles_connection_failure_gracefully():
-    """Test that publish_event logs exception instead of raising when Redis is unavailable."""
-    bus = TestNotificationBus()
-    event = TestEvent(message="test message")
-
-    # Mock get_redis_async to raise connection error
-    with patch(
-        "backend.data.event_bus.redis.get_redis_async",
-        side_effect=ConnectionError("Authentication required."),
-    ):
-        # Should not raise exception
-        await bus.publish_event(event, "test_channel")
-
-
-@pytest.mark.asyncio
-async def test_publish_event_works_with_redis_available():
-    """Test that publish_event works normally when Redis is available."""
-    bus = TestNotificationBus()
-    event = TestEvent(message="test message")
-
-    # Mock successful Redis connection
-    mock_redis = AsyncMock()
-    mock_redis.publish = AsyncMock()
-
-    with patch("backend.data.event_bus.redis.get_redis_async", return_value=mock_redis):
-        await bus.publish_event(event, "test_channel")
-        mock_redis.publish.assert_called_once()

autogpt_platform/backend/backend/data/execution.py

@@ -81,13 +81,12 @@ class ExecutionContext(BaseModel):
     This includes information needed by blocks, sub-graphs, and execution management.
     """
 
-    model_config = {"extra": "ignore"}
-
     human_in_the_loop_safe_mode: bool = True
     sensitive_action_safe_mode: bool = False
     user_timezone: str = "UTC"
     root_execution_id: Optional[str] = None
     parent_execution_id: Optional[str] = None
+    auto_approved_node_ids: set[str] = Field(default_factory=set)
 
 
 # -------------------------- Models -------------------------- #

autogpt_platform/backend/backend/data/graph.py

@@ -64,8 +64,6 @@ logger = logging.getLogger(__name__)
 class GraphSettings(BaseModel):
     # Use Annotated with BeforeValidator to coerce None to default values.
     # This handles cases where the database has null values for these fields.
-    model_config = {"extra": "ignore"}
-
     human_in_the_loop_safe_mode: Annotated[
         bool, BeforeValidator(lambda v: v if v is not None else True)
     ] = True

autogpt_platform/backend/backend/data/human_review.py

@@ -38,6 +38,7 @@ async def get_or_create_human_review(
     graph_exec_id: str,
     graph_id: str,
     graph_version: int,
+    node_id: str,
     input_data: SafeJsonData,
     message: str,
     editable: bool,
@@ -53,6 +54,7 @@ async def get_or_create_human_review(
         graph_exec_id: ID of the graph execution
         graph_id: ID of the graph template
         graph_version: Version of the graph template
+        node_id: ID of the node in the graph definition
         input_data: The data to be reviewed
         message: Instructions for the reviewer
         editable: Whether the data can be edited
@@ -73,6 +75,7 @@ async def get_or_create_human_review(
                     "graphExecId": graph_exec_id,
                     "graphId": graph_id,
                     "graphVersion": graph_version,
+                    "nodeId": node_id,
                     "payload": SafeJson(input_data),
                     "instructions": message,
                     "editable": editable,

autogpt_platform/backend/backend/data/human_review_test.py

@@ -23,6 +23,7 @@ def sample_db_review():
     mock_review.graphExecId = "test_graph_exec_456"
     mock_review.graphId = "test_graph_789"
     mock_review.graphVersion = 1
+    mock_review.nodeId = "node_def_123"
     mock_review.payload = {"data": "test payload"}
     mock_review.instructions = "Please review"
     mock_review.editable = True
@@ -55,6 +56,7 @@ async def test_get_or_create_human_review_new(
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_123",
         input_data={"data": "test payload"},
         message="Please review",
         editable=True,
@@ -84,6 +86,7 @@ async def test_get_or_create_human_review_approved(
         graph_exec_id="test_graph_exec_456",
         graph_id="test_graph_789",
         graph_version=1,
+        node_id="node_def_123",
         input_data={"data": "test payload"},
         message="Please review",
         editable=True,
@@ -183,6 +186,7 @@ async def test_process_all_reviews_for_execution_success(
     updated_review.graphExecId = "test_graph_exec_456"
     updated_review.graphId = "test_graph_789"
     updated_review.graphVersion = 1
+    updated_review.nodeId = "node_def_123"
     updated_review.payload = {"data": "modified"}
     updated_review.instructions = "Please review"
     updated_review.editable = True
@@ -272,6 +276,7 @@ async def test_process_all_reviews_mixed_approval_rejection(
     second_review.graphExecId = "test_graph_exec_456"
     second_review.graphId = "test_graph_789"
     second_review.graphVersion = 1
+    second_review.nodeId = "node_def_456"
     second_review.payload = {"data": "original"}
     second_review.instructions = "Second review"
     second_review.editable = True
@@ -296,6 +301,7 @@ async def test_process_all_reviews_mixed_approval_rejection(
     approved_review.graphExecId = "test_graph_exec_456"
     approved_review.graphId = "test_graph_789"
     approved_review.graphVersion = 1
+    approved_review.nodeId = "node_def_123"
     approved_review.payload = {"data": "modified"}
     approved_review.instructions = "Please review"
     approved_review.editable = True
@@ -313,6 +319,7 @@ async def test_process_all_reviews_mixed_approval_rejection(
     rejected_review.graphExecId = "test_graph_exec_456"
     rejected_review.graphId = "test_graph_789"
     rejected_review.graphVersion = 1
+    rejected_review.nodeId = "node_def_456"
     rejected_review.payload = {"data": "original"}
     rejected_review.instructions = "Please review"
     rejected_review.editable = True

autogpt_platform/backend/migrations/20260109181714_add_docs_embedding/migration.sql

@@ -1,10 +1,9 @@
 -- CreateExtension
 -- Supabase: pgvector must be enabled via Dashboard → Database → Extensions first
--- Creates extension in current schema (determined by search_path from DATABASE_URL ?schema= param)
--- This ensures vector type is in the same schema as tables, making ::vector work without explicit qualification
+-- Create in public schema so vector type is available across all schemas
 DO $$
 BEGIN
-    CREATE EXTENSION IF NOT EXISTS "vector";
+    CREATE EXTENSION IF NOT EXISTS "vector" WITH SCHEMA "public";
 EXCEPTION WHEN OTHERS THEN
     RAISE NOTICE 'vector extension not available or already exists, skipping';
 END $$;
@@ -20,7 +19,7 @@ CREATE TABLE "UnifiedContentEmbedding" (
     "contentType" "ContentType" NOT NULL,
     "contentId" TEXT NOT NULL,
     "userId" TEXT,
-    "embedding" vector(1536) NOT NULL,
+    "embedding" public.vector(1536) NOT NULL,
     "searchableText" TEXT NOT NULL,
     "metadata" JSONB NOT NULL DEFAULT '{}',
 
@@ -46,4 +45,4 @@ CREATE UNIQUE INDEX "UnifiedContentEmbedding_contentType_contentId_userId_key" O
 -- Uses cosine distance operator (<=>), which matches the query in hybrid_search.py
 -- Note: Drop first in case Prisma created a btree index (Prisma doesn't support HNSW)
 DROP INDEX IF EXISTS "UnifiedContentEmbedding_embedding_idx";
-CREATE INDEX "UnifiedContentEmbedding_embedding_idx" ON "UnifiedContentEmbedding" USING hnsw ("embedding" vector_cosine_ops);
+CREATE INDEX "UnifiedContentEmbedding_embedding_idx" ON "UnifiedContentEmbedding" USING hnsw ("embedding" public.vector_cosine_ops);

autogpt_platform/backend/migrations/20260121000000_add_node_id_to_pending_human_review/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "PendingHumanReview" ADD COLUMN "nodeId" TEXT NOT NULL DEFAULT '';

autogpt_platform/backend/schema.prisma

@@ -573,6 +573,7 @@ model PendingHumanReview {
   graphExecId   String
   graphId       String
   graphVersion  Int
+  nodeId        String       // The node ID in the graph definition (for auto-approval tracking)
   payload       Json // The actual payload data to be reviewed
   instructions  String? // Instructions/message for the reviewer
   editable      Boolean      @default(true) // Whether the reviewer can edit the data

autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx

@@ -86,7 +86,6 @@ export function FloatingSafeModeToggle({
   const {
     currentHITLSafeMode,
     showHITLToggle,
-    isHITLStateUndetermined,
     handleHITLToggle,
     currentSensitiveActionSafeMode,
     showSensitiveActionToggle,
@@ -99,16 +98,9 @@ export function FloatingSafeModeToggle({
     return null;
   }
 
-  const showHITL = showHITLToggle && !isHITLStateUndetermined;
-  const showSensitive = showSensitiveActionToggle;
-
-  if (!showHITL && !showSensitive) {
-    return null;
-  }
-
   return (
     <div className={cn("fixed z-50 flex flex-col gap-2", className)}>
-      {showHITL && (
+      {showHITLToggle && (
         <SafeModeButton
           isEnabled={currentHITLSafeMode}
           label="Human in the loop block approval"
@@ -119,7 +111,7 @@ export function FloatingSafeModeToggle({
           fullWidth={fullWidth}
         />
       )}
-      {showSensitive && (
+      {showSensitiveActionToggle && (
         <SafeModeButton
           isEnabled={currentSensitiveActionSafeMode}
           label="Sensitive actions blocks approval"

autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx

@@ -14,6 +14,10 @@ import {
 import { Dialog } from "@/components/molecules/Dialog/Dialog";
 import { useEffect, useRef, useState } from "react";
 import { ScheduleAgentModal } from "../ScheduleAgentModal/ScheduleAgentModal";
+import {
+  AIAgentSafetyPopup,
+  useAIAgentSafetyPopup,
+} from "./components/AIAgentSafetyPopup/AIAgentSafetyPopup";
 import { ModalHeader } from "./components/ModalHeader/ModalHeader";
 import { ModalRunSection } from "./components/ModalRunSection/ModalRunSection";
 import { RunActions } from "./components/RunActions/RunActions";
@@ -83,8 +87,17 @@ export function RunAgentModal({
 
   const [isScheduleModalOpen, setIsScheduleModalOpen] = useState(false);
   const [hasOverflow, setHasOverflow] = useState(false);
+  const [isSafetyPopupOpen, setIsSafetyPopupOpen] = useState(false);
+  const [pendingRunAction, setPendingRunAction] = useState<(() => void) | null>(
+    null,
+  );
   const contentRef = useRef<HTMLDivElement>(null);
 
+  const { shouldShowPopup, dismissPopup } = useAIAgentSafetyPopup(
+    agent.has_sensitive_action,
+    agent.has_human_in_the_loop,
+  );
+
   const hasAnySetupFields =
     Object.keys(agentInputFields || {}).length > 0 ||
     Object.keys(agentCredentialsInputFields || {}).length > 0;
@@ -165,6 +178,24 @@ export function RunAgentModal({
     onScheduleCreated?.(schedule);
   }
 
+  function handleRunWithSafetyCheck() {
+    if (shouldShowPopup) {
+      setPendingRunAction(() => handleRun);
+      setIsSafetyPopupOpen(true);
+    } else {
+      handleRun();
+    }
+  }
+
+  function handleSafetyPopupAcknowledge() {
+    setIsSafetyPopupOpen(false);
+    dismissPopup();
+    if (pendingRunAction) {
+      pendingRunAction();
+      setPendingRunAction(null);
+    }
+  }
+
   return (
     <>
       <Dialog
@@ -248,7 +279,7 @@ export function RunAgentModal({
                 )}
                 <RunActions
                   defaultRunType={defaultRunType}
-                  onRun={handleRun}
+                  onRun={handleRunWithSafetyCheck}
                   isExecuting={isExecuting}
                   isSettingUpTrigger={isSettingUpTrigger}
                   isRunReady={allRequiredInputsAreSet}
@@ -266,6 +297,11 @@ export function RunAgentModal({
           </div>
         </Dialog.Content>
       </Dialog>
+
+      <AIAgentSafetyPopup
+        isOpen={isSafetyPopupOpen}
+        onAcknowledge={handleSafetyPopupAcknowledge}
+      />
     </>
   );
 }

autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AIAgentSafetyPopup/AIAgentSafetyPopup.tsx

@@ -0,0 +1,95 @@
+"use client";
+
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { Key, storage } from "@/services/storage/local-storage";
+import { ShieldCheckIcon } from "@phosphor-icons/react";
+import { useCallback, useEffect, useState } from "react";
+
+interface Props {
+  onAcknowledge: () => void;
+  isOpen: boolean;
+}
+
+export function AIAgentSafetyPopup({ onAcknowledge, isOpen }: Props) {
+  function handleAcknowledge() {
+    // Mark popup as shown so it won't appear again
+    storage.set(Key.AI_AGENT_SAFETY_POPUP_SHOWN, "true");
+    onAcknowledge();
+  }
+
+  if (!isOpen) return null;
+
+  return (
+    <Dialog
+      controlled={{ isOpen, set: () => {} }}
+      styling={{ maxWidth: "480px" }}
+    >
+      <Dialog.Content>
+        <div className="flex flex-col items-center p-6 text-center">
+          <div className="mb-6 flex h-16 w-16 items-center justify-center rounded-full bg-blue-50">
+            <ShieldCheckIcon
+              weight="fill"
+              size={32}
+              className="text-blue-600"
+            />
+          </div>
+
+          <Text variant="h3" className="mb-4">
+            Safety Checks Enabled
+          </Text>
+
+          <Text variant="body" className="mb-2 text-zinc-700">
+            AI-generated agents may take actions that affect your data or
+            external systems.
+          </Text>
+
+          <Text variant="body" className="mb-8 text-zinc-700">
+            AutoGPT includes safety checks so you&apos;ll always have the
+            opportunity to review and approve sensitive actions before they
+            happen.
+          </Text>
+
+          <Button
+            variant="primary"
+            size="large"
+            className="w-full"
+            onClick={handleAcknowledge}
+          >
+            Got it
+          </Button>
+        </div>
+      </Dialog.Content>
+    </Dialog>
+  );
+}
+
+export function useAIAgentSafetyPopup(
+  hasSensitiveAction: boolean,
+  hasHumanInTheLoop: boolean,
+) {
+  const [shouldShowPopup, setShouldShowPopup] = useState(false);
+  const [hasChecked, setHasChecked] = useState(false);
+
+  useEffect(() => {
+    // Only check once after mount (to avoid SSR issues)
+    if (hasChecked) return;
+
+    const hasSeenPopup =
+      storage.get(Key.AI_AGENT_SAFETY_POPUP_SHOWN) === "true";
+    const isRelevantAgent = hasSensitiveAction || hasHumanInTheLoop;
+
+    setShouldShowPopup(!hasSeenPopup && isRelevantAgent);
+    setHasChecked(true);
+  }, [hasSensitiveAction, hasHumanInTheLoop, hasChecked]);
+
+  const dismissPopup = useCallback(() => {
+    setShouldShowPopup(false);
+  }, []);
+
+  return {
+    shouldShowPopup,
+    dismissPopup,
+  };
+}

autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx

@@ -69,7 +69,6 @@ export function SafeModeToggle({ graph, className }: Props) {
   const {
     currentHITLSafeMode,
     showHITLToggle,
-    isHITLStateUndetermined,
     handleHITLToggle,
     currentSensitiveActionSafeMode,
     showSensitiveActionToggle,
@@ -78,20 +77,13 @@ export function SafeModeToggle({ graph, className }: Props) {
     shouldShowToggle,
   } = useAgentSafeMode(graph);
 
-  if (!shouldShowToggle || isHITLStateUndetermined) {
-    return null;
-  }
-
-  const showHITL = showHITLToggle && !isHITLStateUndetermined;
-  const showSensitive = showSensitiveActionToggle;
-
-  if (!showHITL && !showSensitive) {
+  if (!shouldShowToggle) {
     return null;
   }
 
   return (
     <div className={cn("flex gap-1", className)}>
-      {showHITL && (
+      {showHITLToggle && (
         <SafeModeIconButton
           isEnabled={currentHITLSafeMode}
           label="Human-in-the-loop"
@@ -101,7 +93,7 @@ export function SafeModeToggle({ graph, className }: Props) {
           isPending={isPending}
         />
       )}
-      {showSensitive && (
+      {showSensitiveActionToggle && (
         <SafeModeIconButton
           isEnabled={currentSensitiveActionSafeMode}
           label="Sensitive actions"

autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx

@@ -1,15 +1,8 @@
 "use client";
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useState,
-} from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 
 import {
   CredentialsMetaInput,
-  CredentialsType,
   GraphExecutionID,
   GraphMeta,
   LibraryAgentPreset,
@@ -36,11 +29,7 @@ import {
 } from "@/components/__legacy__/ui/icons";
 import { Input } from "@/components/__legacy__/ui/input";
 import { Button } from "@/components/atoms/Button/Button";
-import { CredentialsGroupedView } from "@/components/contextual/CredentialsInput/components/CredentialsGroupedView/CredentialsGroupedView";
-import {
-  findSavedCredentialByProviderAndType,
-  findSavedUserCredentialByProviderAndType,
-} from "@/components/contextual/CredentialsInput/components/CredentialsGroupedView/helpers";
+import { CredentialsInput } from "@/components/contextual/CredentialsInput/CredentialsInput";
 import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";
 import {
   useToast,
@@ -48,7 +37,6 @@ import {
 } from "@/components/molecules/Toast/use-toast";
 import { humanizeCronExpression } from "@/lib/cron-expression-utils";
 import { cn, isEmpty } from "@/lib/utils";
-import { CredentialsProvidersContext } from "@/providers/agent-credentials/credentials-provider";
 import { ClockIcon, CopyIcon, InfoIcon } from "@phosphor-icons/react";
 import { CalendarClockIcon, Trash2Icon } from "lucide-react";
 
@@ -102,7 +90,6 @@ export function AgentRunDraftView({
   const api = useBackendAPI();
   const { toast } = useToast();
   const toastOnFail = useToastOnFail();
-  const allProviders = useContext(CredentialsProvidersContext);
 
   const [inputValues, setInputValues] = useState<Record<string, any>>({});
   const [inputCredentials, setInputCredentials] = useState<
@@ -141,77 +128,6 @@ export function AgentRunDraftView({
     () => graph.credentials_input_schema.properties,
     [graph],
   );
-  const credentialFields = useMemo(
-    function getCredentialFields() {
-      return Object.entries(agentCredentialsInputFields);
-    },
-    [agentCredentialsInputFields],
-  );
-  const requiredCredentials = useMemo(
-    function getRequiredCredentials() {
-      return new Set(
-        (graph.credentials_input_schema?.required as string[]) || [],
-      );
-    },
-    [graph.credentials_input_schema?.required],
-  );
-
-  useEffect(
-    function initializeDefaultCredentials() {
-      if (!allProviders) return;
-      if (!graph.credentials_input_schema?.properties) return;
-      if (requiredCredentials.size === 0) return;
-
-      setInputCredentials(function updateCredentials(currentCreds) {
-        const next = { ...currentCreds };
-        let didAdd = false;
-
-        for (const key of requiredCredentials) {
-          if (next[key]) continue;
-          const schema = graph.credentials_input_schema.properties[key];
-          if (!schema) continue;
-
-          const providerNames = schema.credentials_provider || [];
-          const credentialTypes = schema.credentials_types || [];
-          const requiredScopes = schema.credentials_scopes;
-
-          const userCredential = findSavedUserCredentialByProviderAndType(
-            providerNames,
-            credentialTypes,
-            requiredScopes,
-            allProviders,
-          );
-
-          const savedCredential =
-            userCredential ||
-            findSavedCredentialByProviderAndType(
-              providerNames,
-              credentialTypes,
-              requiredScopes,
-              allProviders,
-            );
-
-          if (!savedCredential) continue;
-
-          next[key] = {
-            id: savedCredential.id,
-            provider: savedCredential.provider,
-            type: savedCredential.type as CredentialsType,
-            title: savedCredential.title,
-          };
-          didAdd = true;
-        }
-
-        if (!didAdd) return currentCreds;
-        return next;
-      });
-    },
-    [
-      allProviders,
-      graph.credentials_input_schema?.properties,
-      requiredCredentials,
-    ],
-  );
 
   const [allRequiredInputsAreSet, missingInputs] = useMemo(() => {
     const nonEmptyInputs = new Set(
@@ -229,35 +145,18 @@ export function AgentRunDraftView({
     );
     return [isSuperset, difference];
   }, [agentInputSchema.required, inputValues]);
-  const [allCredentialsAreSet, missingCredentials] = useMemo(
-    function getCredentialStatus() {
-      const missing = Array.from(requiredCredentials).filter((key) => {
-        const cred = inputCredentials[key];
-        return !cred || !cred.id;
-      });
-      return [missing.length === 0, missing];
-    },
-    [requiredCredentials, inputCredentials],
-  );
-  function addChangedCredentials(prev: Set<keyof LibraryAgentPresetUpdatable>) {
-    const next = new Set(prev);
-    next.add("credentials");
-    return next;
-  }
-
-  function handleCredentialChange(key: string, value?: CredentialsMetaInput) {
-    setInputCredentials(function updateInputCredentials(currentCreds) {
-      const next = { ...currentCreds };
-      if (value === undefined) {
-        delete next[key];
-        return next;
-      }
-      next[key] = value;
-      return next;
-    });
-    setChangedPresetAttributes(addChangedCredentials);
-  }
-
+  const [allCredentialsAreSet, missingCredentials] = useMemo(() => {
+    const availableCredentials = new Set(Object.keys(inputCredentials));
+    const allCredentials = new Set(Object.keys(agentCredentialsInputFields));
+    // Backwards-compatible implementation of isSupersetOf and difference
+    const isSuperset = Array.from(allCredentials).every((item) =>
+      availableCredentials.has(item),
+    );
+    const difference = Array.from(allCredentials).filter(
+      (item) => !availableCredentials.has(item),
+    );
+    return [isSuperset, difference];
+  }, [agentCredentialsInputFields, inputCredentials]);
   const notifyMissingInputs = useCallback(
     (needPresetName: boolean = true) => {
       const allMissingFields = (
@@ -750,6 +649,35 @@ export function AgentRunDraftView({
               </>
             )}
 
+            {/* Credentials inputs */}
+            {Object.entries(agentCredentialsInputFields).map(
+              ([key, inputSubSchema]) => (
+                <CredentialsInput
+                  key={key}
+                  schema={{ ...inputSubSchema, discriminator: undefined }}
+                  selectedCredentials={
+                    inputCredentials[key] ?? inputSubSchema.default
+                  }
+                  onSelectCredentials={(value) => {
+                    setInputCredentials((obj) => {
+                      const newObj = { ...obj };
+                      if (value === undefined) {
+                        delete newObj[key];
+                        return newObj;
+                      }
+                      return {
+                        ...obj,
+                        [key]: value,
+                      };
+                    });
+                    setChangedPresetAttributes((prev) =>
+                      prev.add("credentials"),
+                    );
+                  }}
+                />
+              ),
+            )}
+
             {/* Regular inputs */}
             {Object.entries(agentInputFields).map(([key, inputSubSchema]) => (
               <RunAgentInputs
@@ -767,17 +695,6 @@ export function AgentRunDraftView({
                 data-testid={`agent-input-${key}`}
               />
             ))}
-
-            {/* Credentials inputs */}
-            {credentialFields.length > 0 && (
-              <CredentialsGroupedView
-                credentialFields={credentialFields}
-                requiredCredentials={requiredCredentials}
-                inputCredentials={inputCredentials}
-                inputValues={inputValues}
-                onCredentialChange={handleCredentialChange}
-              />
-            )}
           </CardContent>
         </Card>
       </div>

autogpt_platform/frontend/src/app/api/openapi.json

@@ -8829,6 +8829,11 @@
             "title": "Graph Version",
             "description": "Graph version"
           },
+          "node_id": {
+            "type": "string",
+            "title": "Node Id",
+            "description": "Node ID in the graph definition"
+          },
           "payload": {
             "anyOf": [
               { "additionalProperties": true, "type": "object" },
@@ -8902,6 +8907,7 @@
           "graph_exec_id",
           "graph_id",
           "graph_version",
+          "node_id",
           "payload",
           "editable",
           "status",
@@ -9425,6 +9431,12 @@
             "type": "array",
             "title": "Reviews",
             "description": "All reviews with their approval status, data, and messages"
+          },
+          "auto_approve_node_ids": {
+            "items": { "type": "string" },
+            "type": "array",
+            "title": "Auto Approve Node Ids",
+            "description": "List of node IDs (from the graph definition) to auto-approve for the remainder of this execution. Future reviews from these specific nodes will be automatically approved. This only affects the current execution run."
           }
         },
         "type": "object",

autogpt_platform/frontend/src/components/contextual/CredentialsInput/components/CredentialsGroupedView/helpers.ts

@@ -1,5 +1,5 @@
 import { CredentialsProvidersContextType } from "@/providers/agent-credentials/credentials-provider";
-import { filterSystemCredentials, getSystemCredentials } from "../../helpers";
+import { getSystemCredentials } from "../../helpers";
 
 export type CredentialField = [string, any];
 
@@ -208,42 +208,3 @@ export function findSavedCredentialByProviderAndType(
 
   return undefined;
 }
-
-export function findSavedUserCredentialByProviderAndType(
-  providerNames: string[],
-  credentialTypes: string[],
-  requiredScopes: string[] | undefined,
-  allProviders: CredentialsProvidersContextType | null,
-): SavedCredential | undefined {
-  for (const providerName of providerNames) {
-    const providerData = allProviders?.[providerName];
-    if (!providerData) continue;
-
-    const userCredentials = filterSystemCredentials(
-      providerData.savedCredentials ?? [],
-    );
-
-    const matchingCredentials: SavedCredential[] = [];
-
-    for (const credential of userCredentials) {
-      const typeMatches =
-        credentialTypes.length === 0 ||
-        credentialTypes.includes(credential.type);
-      const scopesMatch = hasRequiredScopes(credential, requiredScopes);
-
-      if (!typeMatches) continue;
-      if (!scopesMatch) continue;
-
-      matchingCredentials.push(credential as SavedCredential);
-    }
-
-    if (matchingCredentials.length === 1) {
-      return matchingCredentials[0];
-    }
-    if (matchingCredentials.length > 1) {
-      return undefined;
-    }
-  }
-
-  return undefined;
-}

autogpt_platform/frontend/src/components/contextual/CredentialsInput/useCredentialsInput.ts

@@ -98,20 +98,24 @@ export function useCredentialsInput({
 
   // Auto-select the first available credential on initial mount
   // Once a user has made a selection, we don't override it
-  useEffect(
-    function autoSelectCredential() {
-      if (readOnly) return;
-      if (!credentials || !("savedCredentials" in credentials)) return;
-      if (selectedCredential?.id) return;
+  useEffect(() => {
+    if (readOnly) return;
+    if (!credentials || !("savedCredentials" in credentials)) return;
 
-      const savedCreds = credentials.savedCredentials;
-      if (savedCreds.length === 0) return;
+    // If already selected, don't auto-select
+    if (selectedCredential?.id) return;
 
-      if (hasAttemptedAutoSelect.current) return;
-      hasAttemptedAutoSelect.current = true;
+    // Only attempt auto-selection once
+    if (hasAttemptedAutoSelect.current) return;
+    hasAttemptedAutoSelect.current = true;
 
-      if (isOptional) return;
+    // If optional, don't auto-select (user can choose "None")
+    if (isOptional) return;
 
+    const savedCreds = credentials.savedCredentials;
+
+    // Auto-select the first credential if any are available
+    if (savedCreds.length > 0) {
       const cred = savedCreds[0];
       onSelectCredential({
         id: cred.id,
@@ -119,15 +123,14 @@ export function useCredentialsInput({
         provider: credentials.provider,
         title: (cred as any).title,
       });
-    },
-    [
-      credentials,
-      selectedCredential?.id,
-      readOnly,
-      isOptional,
-      onSelectCredential,
-    ],
-  );
+    }
+  }, [
+    credentials,
+    selectedCredential?.id,
+    readOnly,
+    isOptional,
+    onSelectCredential,
+  ]);
 
   if (
     !credentials ||

autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx

@@ -37,7 +37,7 @@ export function PendingReviewsList({
   >({});
 
   const [pendingAction, setPendingAction] = useState<
-    "approve" | "reject" | null
+    "approve" | "approve-all" | "reject" | null
   >(null);
 
   const { toast } = useToast();
@@ -92,7 +92,10 @@ export function PendingReviewsList({
     setReviewMessageMap((prev) => ({ ...prev, [nodeExecId]: message }));
   }
 
-  function processReviews(approved: boolean) {
+  function processReviews(
+    approved: boolean,
+    autoApproveFutureActions: boolean = false,
+  ) {
     if (reviews.length === 0) {
       toast({
         title: "No reviews to process",
@@ -102,7 +105,13 @@ export function PendingReviewsList({
       return;
     }
 
-    setPendingAction(approved ? "approve" : "reject");
+    setPendingAction(
+      autoApproveFutureActions
+        ? "approve-all"
+        : approved
+          ? "approve"
+          : "reject",
+    );
     const reviewItems = [];
 
     for (const review of reviews) {
@@ -134,9 +143,15 @@ export function PendingReviewsList({
       });
     }
 
+    // Collect unique node_ids if auto-approving future actions
+    const autoApproveNodeIds = autoApproveFutureActions
+      ? [...new Set(reviews.map((r) => r.node_id))]
+      : [];
+
     reviewActionMutation.mutate({
       data: {
         reviews: reviewItems,
+        auto_approve_node_ids: autoApproveNodeIds,
       },
     });
   }
@@ -191,12 +206,8 @@ export function PendingReviewsList({
         ))}
       </div>
 
-      <div className="space-y-7">
-        <Text variant="body" className="text-textGrey">
-          Note: Changes you make here apply only to this task
-        </Text>
-
-        <div className="flex gap-2">
+      <div className="space-y-4">
+        <div className="flex flex-wrap gap-2">
           <Button
             onClick={() => processReviews(true)}
             disabled={reviewActionMutation.isPending || reviews.length === 0}
@@ -208,6 +219,17 @@ export function PendingReviewsList({
           >
             Approve
           </Button>
+          <Button
+            onClick={() => processReviews(true, true)}
+            disabled={reviewActionMutation.isPending || reviews.length === 0}
+            variant="secondary"
+            className="flex items-center justify-center gap-2 rounded-full px-4 py-3"
+            loading={
+              pendingAction === "approve-all" && reviewActionMutation.isPending
+            }
+          >
+            Approve all future actions
+          </Button>
           <Button
             onClick={() => processReviews(false)}
             disabled={reviewActionMutation.isPending || reviews.length === 0}
@@ -220,6 +242,11 @@ export function PendingReviewsList({
             Reject
           </Button>
         </div>
+
+        <Text variant="small" className="text-textGrey">
+          You can turn auto-approval on or off anytime in this agent&apos;s
+          settings.
+        </Text>
       </div>
     </div>
   );

autogpt_platform/frontend/src/lib/timezone-utils.ts

@@ -106,14 +106,9 @@ export function getTimezoneDisplayName(timezone: string): string {
     const parts = timezone.split("/");
     const city = parts[parts.length - 1].replace(/_/g, " ");
     const abbr = getTimezoneAbbreviation(timezone);
-    if (abbr && abbr !== timezone) {
-      return `${city} (${abbr})`;
-    }
-    // If abbreviation is same as timezone or not found, show timezone with underscores replaced
-    const timezoneDisplay = timezone.replace(/_/g, " ");
-    return `${city} (${timezoneDisplay})`;
+    return abbr ? `${city} (${abbr})` : city;
   } catch {
-    return timezone.replace(/_/g, " ");
+    return timezone;
   }
 }
 

autogpt_platform/frontend/src/services/storage/local-storage.ts

@@ -10,6 +10,7 @@ export enum Key {
   LIBRARY_AGENTS_CACHE = "library-agents-cache",
   CHAT_SESSION_ID = "chat_session_id",
   COOKIE_CONSENT = "autogpt_cookie_consent",
+  AI_AGENT_SAFETY_POPUP_SHOWN = "ai-agent-safety-popup-shown",
 }
 
 function get(key: Key) {

autogpt_platform/frontend/src/tests/marketplace.spec.ts

@@ -4,7 +4,6 @@ import { LoginPage } from "./pages/login.page";
 import { MarketplacePage } from "./pages/marketplace.page";
 import { hasMinCount, hasUrl, isVisible, matchesUrl } from "./utils/assertion";
 
-// Marketplace tests for store agent search functionality
 test.describe("Marketplace – Basic Functionality", () => {
   test("User can access marketplace page when logged out", async ({ page }) => {
     const marketplacePage = new MarketplacePage(page);