diff --git a/.gitignore b/.gitignore
index f5480882..8e3c2125 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,6 +113,7 @@ venv.bak/
 # Spyder project settings
 .spyderproject
 .spyproject
+.jwt_secret_key
 
 # Rope project settings
 .ropeproject
diff --git a/application/api/answer/routes.py b/application/api/answer/routes.py
index abc1f9ba..2d889b34 100644
--- a/application/api/answer/routes.py
+++ b/application/api/answer/routes.py
@@ -88,19 +88,28 @@ def run_async_chain(chain, question, chat_history):
 
 def get_agent_key(agent_id, user_id):
     if not agent_id:
-        return None
+        return None, False, None
 
     try:
         agent = agents_collection.find_one({"_id": ObjectId(agent_id)})
         if agent is None:
             raise Exception("Agent not found", 404)
 
-        if agent.get("user") == user_id:
+        is_owner = agent.get("user") == user_id
+
+        if is_owner:
             agents_collection.update_one(
                 {"_id": ObjectId(agent_id)},
                 {"$set": {"lastUsedAt": datetime.datetime.now(datetime.timezone.utc)}},
             )
-            return str(agent["key"])
+            return str(agent["key"]), False, None
+
+        is_shared_with_user = agent.get(
+            "shared_publicly", False
+        ) or user_id in agent.get("shared_with", [])
+
+        if is_shared_with_user:
+            return str(agent["key"]), True, agent.get("shared_token")
 
         raise Exception("Unauthorized access to the agent", 403)
 
@@ -153,6 +162,8 @@ def save_conversation(
     index=None,
     api_key=None,
     agent_id=None,
+    is_shared_usage=False,
+    shared_token=None,
 ):
     current_time = datetime.datetime.now(datetime.timezone.utc)
     if conversation_id is not None and index is not None:
@@ -228,6 +239,9 @@ def save_conversation(
         if api_key:
             if agent_id:
                 conversation_data["agent_id"] = agent_id
+                if is_shared_usage:
+                    conversation_data["is_shared_usage"] = is_shared_usage
+                    conversation_data["shared_token"] = shared_token
             api_key_doc = agents_collection.find_one({"key": api_key})
             if api_key_doc:
                 conversation_data["api_key"] = api_key_doc["key"]
@@ -261,6 +275,8 @@ def complete_stream(
     should_save_conversation=True,
     attachments=None,
     agent_id=None,
+    is_shared_usage=False,
+    shared_token=None,
 ):
     try:
         response_full, thought, source_log_docs, tool_calls = "", "", [], []
@@ -325,6 +341,8 @@ def complete_stream(
                 index,
                 api_key=user_api_key,
                 agent_id=agent_id,
+                is_shared_usage=is_shared_usage,
+                shared_token=shared_token,
             )
         else:
             conversation_id = None
@@ -433,7 +451,9 @@ class Stream(Resource):
             retriever_name = data.get("retriever", "classic")
             agent_id = data.get("agent_id", None)
             agent_type = settings.AGENT_NAME
-            agent_key = get_agent_key(agent_id, request.decoded_token.get("sub"))
+            agent_key, is_shared_usage, shared_token = get_agent_key(
+                agent_id, request.decoded_token.get("sub")
+            )
 
             if agent_key:
                 data.update({"api_key": agent_key})
@@ -448,7 +468,10 @@ class Stream(Resource):
                 retriever_name = data_key.get("retriever", retriever_name)
                 user_api_key = data["api_key"]
                 agent_type = data_key.get("agent_type", agent_type)
-                decoded_token = {"sub": data_key.get("user")}
+                if is_shared_usage:
+                    decoded_token = request.decoded_token
+                else:
+                    decoded_token = {"sub": data_key.get("user")}
 
             elif "active_docs" in data:
                 source = {"active_docs": data["active_docs"]}
@@ -514,6 +537,8 @@ class Stream(Resource):
                     index=index,
                     should_save_conversation=save_conv,
                     agent_id=agent_id,
+                    is_shared_usage=is_shared_usage,
+                    shared_token=shared_token,
                 ),
                 mimetype="text/event-stream",
             )
@@ -881,6 +906,8 @@ def get_attachments_content(attachment_ids, user):
             if attachment_doc:
                 attachments.append(attachment_doc)
         except Exception as e:
-            logger.error(f"Error retrieving attachment {attachment_id}: {e}", exc_info=True)
+            logger.error(
+                f"Error retrieving attachment {attachment_id}: {e}", exc_info=True
+            )
 
     return attachments
diff --git a/application/api/user/routes.py b/application/api/user/routes.py
index 1ca8fc32..bdc01d87 100644
--- a/application/api/user/routes.py
+++ b/application/api/user/routes.py
@@ -29,6 +29,7 @@ from application.tts.google_tts import GoogleTTS
 from application.utils import check_required_fields, validate_function_name
 from application.vectorstore.vector_creator import VectorCreator
 from application.storage.storage_creator import StorageCreator
+
 storage = StorageCreator.get_storage()
 
 mongo = MongoDB.get_client()
@@ -43,6 +44,12 @@ shared_conversations_collections = db["shared_conversations"]
 user_logs_collection = db["user_logs"]
 user_tools_collection = db["user_tools"]
 
+agents_collection.create_index(
+    [("shared", 1)],
+    name="shared_index",
+    background=True,
+)
+
 user = Blueprint("user", __name__)
 user_ns = Namespace("user", description="User related operations", path="/")
 api.add_namespace(user_ns)
@@ -112,7 +119,9 @@ class DeleteConversation(Resource):
                 {"_id": ObjectId(conversation_id), "user": decoded_token["sub"]}
             )
         except Exception as err:
-            current_app.logger.error(f"Error deleting conversation: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error deleting conversation: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
         return make_response(jsonify({"success": True}), 200)
 
@@ -130,7 +139,9 @@ class DeleteAllConversations(Resource):
         try:
             conversations_collection.delete_many({"user": user_id})
         except Exception as err:
-            current_app.logger.error(f"Error deleting all conversations: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error deleting all conversations: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
         return make_response(jsonify({"success": True}), 200)
 
@@ -164,11 +175,15 @@ class GetConversations(Resource):
                     "id": str(conversation["_id"]),
                     "name": conversation["name"],
                     "agent_id": conversation.get("agent_id", None),
+                    "is_shared_usage": conversation.get("is_shared_usage", False),
+                    "shared_token": conversation.get("shared_token", None),
                 }
                 for conversation in conversations
             ]
         except Exception as err:
-            current_app.logger.error(f"Error retrieving conversations: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error retrieving conversations: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
         return make_response(jsonify(list_conversations), 200)
 
@@ -196,12 +211,16 @@ class GetSingleConversation(Resource):
             if not conversation:
                 return make_response(jsonify({"status": "not found"}), 404)
         except Exception as err:
-            current_app.logger.error(f"Error retrieving conversation: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error retrieving conversation: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         data = {
             "queries": conversation["queries"],
             "agent_id": conversation.get("agent_id"),
+            "is_shared_usage": conversation.get("is_shared_usage", False),
+            "shared_token": conversation.get("shared_token", None),
         }
         return make_response(jsonify(data), 200)
 
@@ -238,7 +257,9 @@ class UpdateConversationName(Resource):
                 {"$set": {"name": data["name"]}},
             )
         except Exception as err:
-            current_app.logger.error(f"Error updating conversation name: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error updating conversation name: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(jsonify({"success": True}), 200)
@@ -379,7 +400,9 @@ class DeleteOldIndexes(Resource):
         except FileNotFoundError:
             pass
         except Exception as err:
-            current_app.logger.error(f"Error deleting old indexes: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error deleting old indexes: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         sources_collection.delete_one({"_id": ObjectId(source_id)})
@@ -446,17 +469,25 @@ class UploadFile(Resource):
                 def create_zip_archive(temp_paths, job_name, storage):
                     import tempfile
 
-                    with tempfile.NamedTemporaryFile(delete=False, suffix=".zip") as temp_zip_file:
+                    with tempfile.NamedTemporaryFile(
+                        delete=False, suffix=".zip"
+                    ) as temp_zip_file:
                         zip_output_path = temp_zip_file.name
 
                     with tempfile.TemporaryDirectory() as stage_dir:
                         for path in temp_paths:
                             try:
                                 file_data = storage.get_file(path)
-                                with open(os.path.join(stage_dir, os.path.basename(path)), "wb") as f:
+                                with open(
+                                    os.path.join(stage_dir, os.path.basename(path)),
+                                    "wb",
+                                ) as f:
                                     f.write(file_data.read())
                             except Exception as e:
-                                current_app.logger.error(f"Error processing file {path} for zipping: {e}", exc_info=True)
+                                current_app.logger.error(
+                                    f"Error processing file {path} for zipping: {e}",
+                                    exc_info=True,
+                                )
                                 if os.path.exists(zip_output_path):
                                     os.remove(zip_output_path)
                                 raise
@@ -467,7 +498,9 @@ class UploadFile(Resource):
                                 root_dir=stage_dir,
                             )
                         except Exception as e:
-                            current_app.logger.error(f"Error creating zip archive: {e}", exc_info=True)
+                            current_app.logger.error(
+                                f"Error creating zip archive: {e}", exc_info=True
+                            )
                             if os.path.exists(zip_output_path):
                                 os.remove(zip_output_path)
                             raise
@@ -508,13 +541,16 @@ class UploadFile(Resource):
                         try:
                             storage.delete_file(temp_path)
                         except Exception as e:
-                            current_app.logger.error(f"Error deleting temporary file {temp_path}: {e}", exc_info=True)
+                            current_app.logger.error(
+                                f"Error deleting temporary file {temp_path}: {e}",
+                                exc_info=True,
+                            )
 
                     # Clean up the zip file if it was created
                     if zip_temp_path and os.path.exists(zip_temp_path):
                         os.remove(zip_temp_path)
 
-            else: # Keep this else block for single file upload
+            else:  # Keep this else block for single file upload
                 # For single file
                 file = files[0]
                 filename = secure_filename(file.filename)
@@ -542,7 +578,7 @@ class UploadFile(Resource):
                         ".jpeg",
                     ],
                     job_name,
-                    filename, # Corrected variable for single-file case
+                    filename,  # Corrected variable for single-file case
                     user,
                 )
 
@@ -600,7 +636,9 @@ class UploadRemote(Resource):
                 loader=data["source"],
             )
         except Exception as err:
-            current_app.logger.error(f"Error uploading remote source: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error uploading remote source: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(jsonify({"success": True, "task_id": task.id}), 200)
@@ -712,7 +750,9 @@ class PaginatedSources(Resource):
             return make_response(jsonify(response), 200)
 
         except Exception as err:
-            current_app.logger.error(f"Error retrieving paginated sources: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error retrieving paginated sources: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
 
@@ -1021,17 +1061,30 @@ class GetAgent(Resource):
                 "id": str(agent["_id"]),
                 "name": agent["name"],
                 "description": agent.get("description", ""),
-                "source": (str(source_doc["_id"]) if isinstance(agent.get("source"), DBRef) and (source_doc := db.dereference(agent.get("source"))) else ""),
+                "source": (
+                    str(source_doc["_id"])
+                    if isinstance(agent.get("source"), DBRef)
+                    and (source_doc := db.dereference(agent.get("source")))
+                    else ""
+                ),
                 "chunks": agent["chunks"],
                 "retriever": agent.get("retriever", ""),
-                "prompt_id": agent["prompt_id"],
+                "prompt_id": agent.get("prompt_id", ""),
                 "tools": agent.get("tools", []),
-                "agent_type": agent["agent_type"],
-                "status": agent["status"],
-                "createdAt": agent["createdAt"],
-                "updatedAt": agent["updatedAt"],
-                "lastUsedAt": agent["lastUsedAt"],
-                "key": f"{agent['key'][:4]}...{agent['key'][-4:]}",
+                "agent_type": agent.get("agent_type", ""),
+                "status": agent.get("status", ""),
+                "created_at": agent.get("createdAt", ""),
+                "updated_at": agent.get("updatedAt", ""),
+                "last_used_at": agent.get("lastUsedAt", ""),
+                "key": (
+                    f"{agent['key'][:4]}...{agent['key'][-4:]}"
+                    if "key" in agent
+                    else ""
+                ),
+                "pinned": agent.get("pinned", False),
+                "shared": agent.get("shared_publicly", False),
+                "shared_metadata": agent.get("shared_metadata", {}),
+                "shared_token": agent.get("shared_token", ""),
             }
         except Exception as err:
             current_app.logger.error(f"Error retrieving agent: {err}", exc_info=True)
@@ -1055,17 +1108,30 @@ class GetAgents(Resource):
                     "id": str(agent["_id"]),
                     "name": agent["name"],
                     "description": agent.get("description", ""),
-                    "source": (str(source_doc["_id"]) if isinstance(agent.get("source"), DBRef) and (source_doc := db.dereference(agent.get("source"))) else ""),
+                    "source": (
+                        str(source_doc["_id"])
+                        if isinstance(agent.get("source"), DBRef)
+                        and (source_doc := db.dereference(agent.get("source")))
+                        else ""
+                    ),
                     "chunks": agent["chunks"],
                     "retriever": agent.get("retriever", ""),
-                    "prompt_id": agent["prompt_id"],
+                    "prompt_id": agent.get("prompt_id", ""),
                     "tools": agent.get("tools", []),
-                    "agent_type": agent["agent_type"],
-                    "status": agent["status"],
-                    "created_at": agent["createdAt"],
-                    "updated_at": agent["updatedAt"],
-                    "last_used_at": agent["lastUsedAt"],
-                    "key": f"{agent['key'][:4]}...{agent['key'][-4:]}",
+                    "agent_type": agent.get("agent_type", ""),
+                    "status": agent.get("status", ""),
+                    "created_at": agent.get("createdAt", ""),
+                    "updated_at": agent.get("updatedAt", ""),
+                    "last_used_at": agent.get("lastUsedAt", ""),
+                    "key": (
+                        f"{agent['key'][:4]}...{agent['key'][-4:]}"
+                        if "key" in agent
+                        else ""
+                    ),
+                    "pinned": agent.get("pinned", False),
+                    "shared": agent.get("shared_publicly", False),
+                    "shared_metadata": agent.get("shared_metadata", {}),
+                    "shared_token": agent.get("shared_token", ""),
                 }
                 for agent in agents
                 if "source" in agent or "retriever" in agent
@@ -1156,6 +1222,10 @@ class CreateAgent(Resource):
                 "lastUsedAt": None,
                 "key": key,
             }
+            if new_agent["chunks"] == "":
+                new_agent["chunks"] = "0"
+            if new_agent["source"] == "" and new_agent["retriever"] == "":
+                new_agent["retriever"] = "classic"
 
             resp = agents_collection.insert_one(new_agent)
             new_id = str(resp.inserted_id)
@@ -1211,7 +1281,9 @@ class UpdateAgent(Resource):
             existing_agent = agents_collection.find_one({"_id": oid, "user": user})
         except Exception as err:
             return make_response(
-                current_app.logger.error(f"Error finding agent {agent_id}: {err}", exc_info=True),
+                current_app.logger.error(
+                    f"Error finding agent {agent_id}: {err}", exc_info=True
+                ),
                 jsonify({"success": False, "message": "Database error finding agent"}),
                 500,
             )
@@ -1266,6 +1338,33 @@ class UpdateAgent(Resource):
                         )
                     else:
                         update_fields[field] = ""
+                elif field == "chunks":
+                    chunks_value = data.get("chunks")
+                    if chunks_value == "":
+                        update_fields[field] = "0"
+                    else:
+                        try:
+                            if int(chunks_value) < 0:
+                                return make_response(
+                                    jsonify(
+                                        {
+                                            "success": False,
+                                            "message": "Chunks value must be a positive integer",
+                                        }
+                                    ),
+                                    400,
+                                )
+                            update_fields[field] = chunks_value
+                        except ValueError:
+                            return make_response(
+                                jsonify(
+                                    {
+                                        "success": False,
+                                        "message": "Invalid chunks value provided",
+                                    }
+                                ),
+                                400,
+                            )
                 else:
                     update_fields[field] = data[field]
 
@@ -1334,7 +1433,9 @@ class UpdateAgent(Resource):
                 )
 
         except Exception as err:
-            current_app.logger.error(f"Error updating agent {agent_id}: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error updating agent {agent_id}: {err}", exc_info=True
+            )
             return make_response(
                 jsonify({"success": False, "message": "Database error during update"}),
                 500,
@@ -1383,6 +1484,275 @@ class DeleteAgent(Resource):
         return make_response(jsonify({"id": deleted_id}), 200)
 
 
+@user_ns.route("/api/pinned_agents")
+class PinnedAgents(Resource):
+    @api.doc(description="Get pinned agents for the user")
+    def get(self):
+        decoded_token = request.decoded_token
+        if not decoded_token:
+            return make_response(jsonify({"success": False}), 401)
+        user = decoded_token.get("sub")
+        try:
+            pinned_agents = agents_collection.find({"user": user, "pinned": True})
+            list_pinned_agents = [
+                {
+                    "id": str(agent["_id"]),
+                    "name": agent.get("name", ""),
+                    "description": agent.get("description", ""),
+                    "source": (
+                        str(db.dereference(agent["source"])["_id"])
+                        if "source" in agent and isinstance(agent["source"], DBRef)
+                        else ""
+                    ),
+                    "chunks": agent.get("chunks", ""),
+                    "retriever": agent.get("retriever", ""),
+                    "prompt_id": agent.get("prompt_id", ""),
+                    "tools": agent.get("tools", []),
+                    "agent_type": agent.get("agent_type", ""),
+                    "status": agent.get("status", ""),
+                    "created_at": agent.get("createdAt", ""),
+                    "updated_at": agent.get("updatedAt", ""),
+                    "last_used_at": agent.get("lastUsedAt", ""),
+                    "key": (
+                        f"{agent['key'][:4]}...{agent['key'][-4:]}"
+                        if "key" in agent
+                        else ""
+                    ),
+                    "pinned": agent.get("pinned", False),
+                }
+                for agent in pinned_agents
+                if "source" in agent or "retriever" in agent
+            ]
+        except Exception as err:
+            current_app.logger.error(f"Error retrieving pinned agents: {err}")
+            return make_response(jsonify({"success": False}), 400)
+        return make_response(jsonify(list_pinned_agents), 200)
+
+
+@user_ns.route("/api/pin_agent")
+class PinAgent(Resource):
+    @api.doc(params={"id": "ID of the agent"}, description="Pin or unpin an agent")
+    def post(self):
+        decoded_token = request.decoded_token
+        if not decoded_token:
+            return make_response(jsonify({"success": False}), 401)
+        user = decoded_token.get("sub")
+        agent_id = request.args.get("id")
+        if not agent_id:
+            return make_response(
+                jsonify({"success": False, "message": "ID is required"}), 400
+            )
+
+        try:
+            agent = agents_collection.find_one(
+                {"_id": ObjectId(agent_id), "user": user}
+            )
+            if not agent:
+                return make_response(
+                    jsonify({"success": False, "message": "Agent not found"}), 404
+                )
+
+            pinned_status = not agent.get("pinned", False)
+            agents_collection.update_one(
+                {"_id": ObjectId(agent_id), "user": user},
+                {"$set": {"pinned": pinned_status}},
+            )
+        except Exception as err:
+            current_app.logger.error(f"Error pinning/unpinning agent: {err}")
+            return make_response(jsonify({"success": False}), 400)
+
+        return make_response(jsonify({"success": True}), 200)
+
+
+@user_ns.route("/api/shared_agent")
+class SharedAgent(Resource):
+    @api.doc(
+        params={
+            "token": "Shared token of the agent",
+        },
+        description="Get a shared agent by token or ID",
+    )
+    def get(self):
+        shared_token = request.args.get("token")
+
+        if not shared_token:
+            return make_response(
+                jsonify({"success": False, "message": "Token or ID is required"}), 400
+            )
+
+        try:
+            query = {}
+            query["shared_publicly"] = True
+            query["shared_token"] = shared_token
+
+            shared_agent = agents_collection.find_one(query)
+            if not shared_agent:
+                return make_response(
+                    jsonify({"success": False, "message": "Shared agent not found"}),
+                    404,
+                )
+
+            data = {
+                "id": str(shared_agent["_id"]),
+                "user": shared_agent.get("user", ""),
+                "name": shared_agent.get("name", ""),
+                "description": shared_agent.get("description", ""),
+                "tools": shared_agent.get("tools", []),
+                "agent_type": shared_agent.get("agent_type", ""),
+                "status": shared_agent.get("status", ""),
+                "created_at": shared_agent.get("createdAt", ""),
+                "updated_at": shared_agent.get("updatedAt", ""),
+                "shared": shared_agent.get("shared_publicly", False),
+                "shared_token": shared_agent.get("shared_token", ""),
+                "shared_metadata": shared_agent.get("shared_metadata", {}),
+            }
+
+            if data["tools"]:
+                enriched_tools = []
+                for tool in data["tools"]:
+                    tool_data = user_tools_collection.find_one({"_id": ObjectId(tool)})
+                    if tool_data:
+                        enriched_tools.append(tool_data.get("name", ""))
+                data["tools"] = enriched_tools
+
+        except Exception as err:
+            current_app.logger.error(f"Error retrieving shared agent: {err}")
+            return make_response(jsonify({"success": False}), 400)
+
+        return make_response(jsonify(data), 200)
+
+
+@user_ns.route("/api/shared_agents")
+class SharedAgents(Resource):
+    @api.doc(description="Get shared agents")
+    def get(self):
+        try:
+            decoded_token = request.decoded_token
+            if not decoded_token:
+                return make_response(jsonify({"success": False}), 401)
+            user = decoded_token.get("sub")
+            shared_agents = agents_collection.find(
+                {"shared_publicly": True, "user": {"$ne": user}}
+            )
+            list_shared_agents = [
+                {
+                    "id": str(shared_agent["_id"]),
+                    "name": shared_agent.get("name", ""),
+                    "description": shared_agent.get("description", ""),
+                    "tools": shared_agent.get("tools", []),
+                    "agent_type": shared_agent.get("agent_type", ""),
+                    "status": shared_agent.get("status", ""),
+                    "created_at": shared_agent.get("createdAt", ""),
+                    "updated_at": shared_agent.get("updatedAt", ""),
+                    "shared": shared_agent.get("shared_publicly", False),
+                    "shared_token": shared_agent.get("shared_token", ""),
+                    "shared_metadata": shared_agent.get("shared_metadata", {}),
+                }
+                for shared_agent in shared_agents
+            ]
+        except Exception as err:
+            current_app.logger.error(f"Error retrieving shared agents: {err}")
+            return make_response(jsonify({"success": False}), 400)
+        return make_response(jsonify(list_shared_agents), 200)
+
+
+@user_ns.route("/api/share_agent")
+class ShareAgent(Resource):
+    @api.expect(
+        api.model(
+            "ShareAgentModel",
+            {
+                "id": fields.String(required=True, description="ID of the agent"),
+                "shared": fields.Boolean(
+                    required=True, description="Share or unshare the agent"
+                ),
+                "username": fields.String(
+                    required=False, description="Name of the user"
+                ),
+            },
+        )
+    )
+    @api.doc(description="Share or unshare an agent")
+    def put(self):
+        decoded_token = request.decoded_token
+        if not decoded_token:
+            return make_response(jsonify({"success": False}), 401)
+
+        user = decoded_token.get("sub")
+
+        data = request.get_json()
+        if not data:
+            return make_response(
+                jsonify({"success": False, "message": "Missing JSON body"}), 400
+            )
+
+        agent_id = data.get("id")
+        shared = data.get("shared")
+        username = data.get("username", "")
+
+        if not agent_id:
+            return make_response(
+                jsonify({"success": False, "message": "ID is required"}), 400
+            )
+
+        if shared is None:
+            return make_response(
+                jsonify(
+                    {
+                        "success": False,
+                        "message": "Shared parameter is required and must be true or false",
+                    }
+                ),
+                400,
+            )
+
+        try:
+            try:
+                agent_oid = ObjectId(agent_id)
+            except Exception:
+                return make_response(
+                    jsonify({"success": False, "message": "Invalid agent ID"}), 400
+                )
+
+            agent = agents_collection.find_one({"_id": agent_oid, "user": user})
+            if not agent:
+                return make_response(
+                    jsonify({"success": False, "message": "Agent not found"}), 404
+                )
+
+            if shared:
+                shared_metadata = {
+                    "shared_by": username,
+                    "shared_at": datetime.datetime.now(datetime.timezone.utc),
+                }
+                shared_token = secrets.token_urlsafe(32)
+                agents_collection.update_one(
+                    {"_id": agent_oid, "user": user},
+                    {
+                        "$set": {
+                            "shared_publicly": shared,
+                            "shared_metadata": shared_metadata,
+                            "shared_token": shared_token,
+                        }
+                    },
+                )
+            else:
+                agents_collection.update_one(
+                    {"_id": agent_oid, "user": user},
+                    {"$set": {"shared_publicly": shared, "shared_token": None}},
+                    {"$unset": {"shared_metadata": ""}},
+                )
+
+        except Exception as err:
+            current_app.logger.error(f"Error sharing/unsharing agent: {err}")
+            return make_response(jsonify({"success": False, "error": str(err)}), 400)
+
+        shared_token = shared_token if shared else None
+        return make_response(
+            jsonify({"success": True, "shared_token": shared_token}), 200
+        )
+
+
 @user_ns.route("/api/agent_webhook")
 class AgentWebhook(Resource):
     @api.doc(
@@ -1420,7 +1790,9 @@ class AgentWebhook(Resource):
             full_webhook_url = f"{base_url}/api/webhooks/agents/{webhook_token}"
 
         except Exception as err:
-            current_app.logger.error(f"Error generating webhook URL: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error generating webhook URL: {err}", exc_info=True
+            )
             return make_response(
                 jsonify({"success": False, "message": "Error generating webhook URL"}),
                 400,
@@ -1709,7 +2081,9 @@ class ShareConversation(Resource):
                     201,
                 )
         except Exception as err:
-            current_app.logger.error(f"Error sharing conversation: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error sharing conversation: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
 
@@ -1765,7 +2139,9 @@ class GetPubliclySharedConversations(Resource):
                 res["api_key"] = shared["api_key"]
             return make_response(jsonify(res), 200)
         except Exception as err:
-            current_app.logger.error(f"Error getting shared conversation: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error getting shared conversation: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
 
@@ -1885,7 +2261,9 @@ class GetMessageAnalytics(Resource):
                 daily_messages[entry["_id"]] = entry["count"]
 
         except Exception as err:
-            current_app.logger.error(f"Error getting message analytics: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error getting message analytics: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(
@@ -2044,7 +2422,9 @@ class GetTokenAnalytics(Resource):
                     daily_token_usage[entry["_id"]["day"]] = entry["total_tokens"]
 
         except Exception as err:
-            current_app.logger.error(f"Error getting token analytics: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error getting token analytics: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(
@@ -2209,7 +2589,9 @@ class GetFeedbackAnalytics(Resource):
                 }
 
         except Exception as err:
-            current_app.logger.error(f"Error getting feedback analytics: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error getting feedback analytics: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(
@@ -2345,7 +2727,9 @@ class ManageSync(Resource):
                 update_data,
             )
         except Exception as err:
-            current_app.logger.error(f"Error updating sync frequency: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error updating sync frequency: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(jsonify({"success": True}), 200)
@@ -2406,7 +2790,9 @@ class AvailableTools(Resource):
                     }
                 )
         except Exception as err:
-            current_app.logger.error(f"Error getting available tools: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error getting available tools: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(jsonify({"success": True, "data": tools_metadata}), 200)
@@ -2610,7 +2996,9 @@ class UpdateToolConfig(Resource):
                 {"$set": {"config": data["config"]}},
             )
         except Exception as err:
-            current_app.logger.error(f"Error updating tool config: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error updating tool config: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(jsonify({"success": True}), 200)
@@ -2649,7 +3037,9 @@ class UpdateToolActions(Resource):
                 {"$set": {"actions": data["actions"]}},
             )
         except Exception as err:
-            current_app.logger.error(f"Error updating tool actions: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error updating tool actions: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(jsonify({"success": True}), 200)
@@ -2686,7 +3076,9 @@ class UpdateToolStatus(Resource):
                 {"$set": {"status": data["status"]}},
             )
         except Exception as err:
-            current_app.logger.error(f"Error updating tool status: {err}", exc_info=True)
+            current_app.logger.error(
+                f"Error updating tool status: {err}", exc_info=True
+            )
             return make_response(jsonify({"success": False}), 400)
 
         return make_response(jsonify({"success": True}), 200)
@@ -2980,14 +3372,14 @@ class StoreAttachment(Resource):
             attachment_id = ObjectId()
             original_filename = secure_filename(os.path.basename(file.filename))
             relative_path = f"{settings.UPLOAD_FOLDER}/{user}/attachments/{str(attachment_id)}/{original_filename}"
-            
+
             metadata = storage.save_file(file, relative_path)
-            
+
             file_info = {
                 "filename": original_filename,
                 "attachment_id": str(attachment_id),
                 "path": relative_path,
-                "metadata": metadata
+                "metadata": metadata,
             }
 
             task = store_attachment.delay(file_info, user)
diff --git a/application/requirements.txt b/application/requirements.txt
index 56edab9f..2430a787 100644
--- a/application/requirements.txt
+++ b/application/requirements.txt
@@ -6,19 +6,15 @@ dataclasses-json==0.6.7
 docx2txt==0.8
 duckduckgo-search==7.5.2
 ebooklib==0.18
-elastic-transport==8.17.0
-elasticsearch==8.17.1
 escodegen==1.0.11
 esprima==4.0.1
 esutils==1.0.1
-Flask==3.1.0
+Flask==3.1.1
 faiss-cpu==1.9.0.post1
 flask-restx==1.3.0
 google-genai==1.3.0
-google-generativeai==0.8.5
 gTTS==2.5.4
 gunicorn==23.0.0
-html2text==2024.2.26
 javalang==0.13.0
 jinja2==3.1.6
 jiter==0.8.2
@@ -26,39 +22,33 @@ jmespath==1.0.1
 joblib==1.4.2
 jsonpatch==1.33
 jsonpointer==3.0.0
-jsonschema==4.23.0
-jsonschema-spec==0.2.4
-jsonschema-specifications==2023.7.1
 kombu==5.4.2
 langchain==0.3.20
 langchain-community==0.3.19
-langchain-core==0.3.45
-langchain-openai==0.3.8
-langchain-text-splitters==0.3.6
-langsmith==0.3.19
+langchain-core==0.3.59
+langchain-openai==0.3.16
+langchain-text-splitters==0.3.8
+langsmith==0.3.42
 lazy-object-proxy==1.10.0
 lxml==5.3.1
 markupsafe==3.0.2
 marshmallow==3.26.1
 mpmath==1.3.0
-multidict==6.3.2
+multidict==6.4.3
 mypy-extensions==1.0.0
 networkx==3.4.2
 numpy==2.2.1
-openai==1.66.3
-openapi-schema-validator==0.6.3
-openapi-spec-validator==0.6.0
-openapi3-parser==1.1.19
+openai==1.78.1
+openapi3-parser==1.1.21
 orjson==3.10.14
-packaging==24.1
+packaging==24.2
 pandas==2.2.3
 openpyxl==3.1.5
 pathable==0.4.4
 pillow==11.1.0
-portalocker==2.10.1
+portalocker==3.1.1
 prance==23.6.21.0
-primp==0.14.0
-prompt-toolkit==3.0.50
+prompt-toolkit==3.0.51
 protobuf==5.29.3
 psycopg2-binary==2.9.10
 py==1.11.0
@@ -71,18 +61,17 @@ python-dateutil==2.9.0.post0
 python-dotenv==1.0.1
 python-jose==3.4.0
 python-pptx==1.0.2
-qdrant-client==1.13.2
 redis==5.2.1
-referencing==0.30.2
+referencing==0.36.2
 regex==2024.11.6
 requests==2.32.3
 retry==0.9.2
 sentence-transformers==3.3.1
 tiktoken==0.8.0
 tokenizers==0.21.0
-torch==2.5.1
+torch==2.7.0
 tqdm==4.67.1
-transformers==4.49.0
+transformers==4.51.3
 typing-extensions==4.12.2
 typing-inspect==0.9.0
 tzdata==2024.2
@@ -90,7 +79,7 @@ urllib3==2.3.0
 vine==5.1.0
 wcwidth==0.2.13
 werkzeug==3.1.3
-yarl==1.18.3
+yarl==1.20.0
 markdownify==0.14.1
 tldextract==5.1.3
 websockets==14.1
diff --git a/application/vectorstore/elasticsearch.py b/application/vectorstore/elasticsearch.py
index e393e4a5..dfa0314f 100644
--- a/application/vectorstore/elasticsearch.py
+++ b/application/vectorstore/elasticsearch.py
@@ -1,9 +1,6 @@
 from application.vectorstore.base import BaseVectorStore
 from application.core.settings import settings
 from application.vectorstore.document_class import Document
-import elasticsearch
-
-
 
 
 class ElasticsearchStore(BaseVectorStore):
@@ -26,8 +23,7 @@ class ElasticsearchStore(BaseVectorStore):
             else:
                 raise ValueError("Please provide either elasticsearch_url or cloud_id.")
 
-            
-
+            import elasticsearch
             ElasticsearchStore._es_connection = elasticsearch.Elasticsearch(**connection_params)
             
         self.docsearch = ElasticsearchStore._es_connection
@@ -155,8 +151,6 @@ class ElasticsearchStore(BaseVectorStore):
         **kwargs,
         ):
         
-        from elasticsearch.helpers import BulkIndexError, bulk
-
         bulk_kwargs = bulk_kwargs or {}
         import uuid
         embeddings = []
@@ -189,6 +183,7 @@ class ElasticsearchStore(BaseVectorStore):
 
 
         if len(requests) > 0:
+            from elasticsearch.helpers import BulkIndexError, bulk
             try:
                 success, failed = bulk(
                     self._es_connection,
diff --git a/application/vectorstore/qdrant.py b/application/vectorstore/qdrant.py
index 3f94505f..61a9d63d 100644
--- a/application/vectorstore/qdrant.py
+++ b/application/vectorstore/qdrant.py
@@ -1,11 +1,12 @@
-from langchain_community.vectorstores.qdrant import Qdrant
 from application.vectorstore.base import BaseVectorStore
 from application.core.settings import settings
-from qdrant_client import models
 
 
 class QdrantStore(BaseVectorStore):
     def __init__(self, source_id: str = "", embeddings_key: str = "embeddings"):
+        from qdrant_client import models
+        from langchain_community.vectorstores.qdrant import Qdrant
+
         self._filter = models.Filter(
             must=[
                 models.FieldCondition(
diff --git a/frontend/.env.development b/frontend/.env.development
index 7a87f762..4083d677 100644
--- a/frontend/.env.development
+++ b/frontend/.env.development
@@ -1,3 +1,4 @@
 # Please put appropriate value
-VITE_API_HOST=http://0.0.0.0:7091
+VITE_BASE_URL=http://localhost:5173
+VITE_API_HOST=http://127.0.0.1:7091
 VITE_API_STREAMING=true
\ No newline at end of file
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 58e9c924..715db197 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -2014,7 +2014,7 @@
       "version": "18.3.0",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
       "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@types/react": "*"
       }
@@ -10619,7 +10619,7 @@
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
       "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/frontend/src/Navigation.tsx b/frontend/src/Navigation.tsx
index 02e9f19c..838d665a 100644
--- a/frontend/src/Navigation.tsx
+++ b/frontend/src/Navigation.tsx
@@ -13,12 +13,14 @@ import Expand from './assets/expand.svg';
 import Github from './assets/github.svg';
 import Hamburger from './assets/hamburger.svg';
 import openNewChat from './assets/openNewChat.svg';
+import Pin from './assets/pin.svg';
 import Robot from './assets/robot.svg';
 import SettingGear from './assets/settingGear.svg';
 import Spark from './assets/spark.svg';
 import SpinnerDark from './assets/spinner-dark.svg';
 import Spinner from './assets/spinner.svg';
 import Twitter from './assets/TwitterX.svg';
+import UnPin from './assets/unpin.svg';
 import Help from './components/Help';
 import {
   handleAbort,
@@ -35,16 +37,16 @@ import JWTModal from './modals/JWTModal';
 import { ActiveState } from './models/misc';
 import { getConversations } from './preferences/preferenceApi';
 import {
+  selectAgents,
   selectConversationId,
   selectConversations,
   selectModalStateDeleteConv,
   selectSelectedAgent,
   selectToken,
+  setAgents,
   setConversations,
   setModalStateDeleteConv,
   setSelectedAgent,
-  setAgents,
-  selectAgents,
 } from './preferences/preferenceSlice';
 import Upload from './upload/Upload';
 
@@ -80,24 +82,34 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
 
   async function fetchRecentAgents() {
     try {
-      let recentAgents: Agent[] = [];
+      const response = await userService.getPinnedAgents(token);
+      if (!response.ok) throw new Error('Failed to fetch pinned agents');
+      const pinnedAgents: Agent[] = await response.json();
+      if (pinnedAgents.length >= 3) {
+        setRecentAgents(pinnedAgents);
+        return;
+      }
+      let tempAgents: Agent[] = [];
       if (!agents) {
         const response = await userService.getAgents(token);
         if (!response.ok) throw new Error('Failed to fetch agents');
         const data: Agent[] = await response.json();
         dispatch(setAgents(data));
-        recentAgents = data;
-      } else recentAgents = agents;
-      setRecentAgents(
-        recentAgents
-          .filter((agent: Agent) => agent.status === 'published')
-          .sort(
-            (a: Agent, b: Agent) =>
-              new Date(b.last_used_at ?? 0).getTime() -
-              new Date(a.last_used_at ?? 0).getTime(),
-          )
-          .slice(0, 3),
-      );
+        tempAgents = data;
+      } else tempAgents = agents;
+      const additionalAgents = tempAgents
+        .filter(
+          (agent: Agent) =>
+            agent.status === 'published' &&
+            !pinnedAgents.some((pinned) => pinned.id === agent.id),
+        )
+        .sort(
+          (a: Agent, b: Agent) =>
+            new Date(b.last_used_at ?? 0).getTime() -
+            new Date(a.last_used_at ?? 0).getTime(),
+        )
+        .slice(0, 3 - pinnedAgents.length);
+      setRecentAgents([...pinnedAgents, ...additionalAgents]);
     } catch (error) {
       console.error('Failed to fetch recent agents: ', error);
     }
@@ -116,7 +128,7 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
   }
 
   useEffect(() => {
-    if (token) fetchRecentAgents();
+    fetchRecentAgents();
   }, [agents, token, dispatch]);
 
   useEffect(() => {
@@ -152,12 +164,23 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
     navigate('/');
   };
 
+  const handleTogglePin = (agent: Agent) => {
+    userService.togglePinAgent(agent.id ?? '', token).then((response) => {
+      if (response.ok) {
+        const updatedAgents = agents?.map((a) =>
+          a.id === agent.id ? { ...a, pinned: !a.pinned } : a,
+        );
+        dispatch(setAgents(updatedAgents));
+      }
+    });
+  };
+
   const handleConversationClick = (index: string) => {
+    dispatch(setSelectedAgent(null));
     conversationService
       .getConversation(index, token)
       .then((response) => response.json())
       .then((data) => {
-        navigate('/');
         dispatch(setConversation(data.queries));
         dispatch(
           updateConversationId({
@@ -165,14 +188,30 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
           }),
         );
         if (data.agent_id) {
-          userService.getAgent(data.agent_id, token).then((response) => {
-            if (response.ok) {
-              response.json().then((agent: Agent) => {
-                dispatch(setSelectedAgent(agent));
+          if (data.is_shared_usage) {
+            userService
+              .getSharedAgent(data.shared_token, token)
+              .then((response) => {
+                if (response.ok) {
+                  response.json().then((agent: Agent) => {
+                    navigate(`/agents/shared/${agent.shared_token}`);
+                  });
+                }
               });
-            }
-          });
-        } else dispatch(setSelectedAgent(null));
+          } else {
+            userService.getAgent(data.agent_id, token).then((response) => {
+              if (response.ok) {
+                response.json().then((agent: Agent) => {
+                  navigate('/');
+                  dispatch(setSelectedAgent(agent));
+                });
+              }
+            });
+          }
+        } else {
+          navigate('/');
+          dispatch(setSelectedAgent(null));
+        }
       });
   };
 
@@ -336,23 +375,41 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
                   {recentAgents.map((agent, idx) => (
                     <div
                       key={idx}
-                      className={`mx-4 my-auto mt-4 flex h-9 cursor-pointer items-center gap-2 rounded-3xl pl-4 hover:bg-bright-gray dark:hover:bg-dark-charcoal ${
+                      className={`group mx-4 my-auto mt-4 flex h-9 cursor-pointer items-center justify-between rounded-3xl pl-4 hover:bg-bright-gray dark:hover:bg-dark-charcoal ${
                         agent.id === selectedAgent?.id && !conversationId
                           ? 'bg-bright-gray dark:bg-dark-charcoal'
                           : ''
                       }`}
                       onClick={() => handleAgentClick(agent)}
                     >
-                      <div className="flex w-6 justify-center">
-                        <img
-                          src={agent.image ?? Robot}
-                          alt="agent-logo"
-                          className="h-6 w-6 rounded-full"
-                        />
+                      <div className="flex items-center gap-2">
+                        <div className="flex w-6 justify-center">
+                          <img
+                            src={agent.image ?? Robot}
+                            alt="agent-logo"
+                            className="h-6 w-6"
+                          />
+                        </div>
+                        <p className="overflow-hidden overflow-ellipsis whitespace-nowrap text-sm leading-6 text-eerie-black dark:text-bright-gray">
+                          {agent.name}
+                        </p>
+                      </div>
+                      <div
+                        className={`${isMobile ? 'flex' : 'invisible flex group-hover:visible'} items-center px-3`}
+                      >
+                        <button
+                          className="rounded-full hover:opacity-75"
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            handleTogglePin(agent);
+                          }}
+                        >
+                          <img
+                            src={agent.pinned ? UnPin : Pin}
+                            className="h-4 w-4"
+                          ></img>
+                        </button>
                       </div>
-                      <p className="overflow-hidden overflow-ellipsis whitespace-nowrap text-sm leading-6 text-eerie-black dark:text-bright-gray">
-                        {agent.name}
-                      </p>
                     </div>
                   ))}
                 </div>
diff --git a/frontend/src/agents/AgentCard.tsx b/frontend/src/agents/AgentCard.tsx
new file mode 100644
index 00000000..33691a52
--- /dev/null
+++ b/frontend/src/agents/AgentCard.tsx
@@ -0,0 +1,123 @@
+import { useRef, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+
+import userService from '../api/services/userService';
+import Robot from '../assets/robot.svg';
+import ThreeDots from '../assets/three-dots.svg';
+import ContextMenu, { MenuOption } from '../components/ContextMenu';
+import ConfirmationModal from '../modals/ConfirmationModal';
+import { ActiveState } from '../models/misc';
+import {
+  selectToken,
+  setAgents,
+  setSelectedAgent,
+} from '../preferences/preferenceSlice';
+import { Agent } from './types';
+
+type AgentCardProps = {
+  agent: Agent;
+  agents: Agent[];
+  menuOptions?: MenuOption[];
+  onDelete?: (agentId: string) => void;
+};
+
+export default function AgentCard({
+  agent,
+  agents,
+  menuOptions,
+  onDelete,
+}: AgentCardProps) {
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+  const token = useSelector(selectToken);
+
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const [deleteConfirmation, setDeleteConfirmation] =
+    useState<ActiveState>('INACTIVE');
+
+  const menuRef = useRef<HTMLDivElement>(null);
+
+  const handleCardClick = () => {
+    if (agent.status === 'published') {
+      dispatch(setSelectedAgent(agent));
+      navigate('/');
+    }
+  };
+
+  const defaultDelete = async (agentId: string) => {
+    const response = await userService.deleteAgent(agentId, token);
+    if (!response.ok) throw new Error('Failed to delete agent');
+    const data = await response.json();
+    dispatch(setAgents(agents.filter((prevAgent) => prevAgent.id !== data.id)));
+  };
+
+  return (
+    <div
+      className={`relative flex h-44 w-48 flex-col justify-between rounded-[1.2rem] bg-[#F6F6F6] px-6 py-5 hover:bg-[#ECECEC] dark:bg-[#383838] hover:dark:bg-[#383838]/80 ${
+        agent.status === 'published' ? 'cursor-pointer' : ''
+      }`}
+      onClick={handleCardClick}
+    >
+      <div
+        ref={menuRef}
+        onClick={(e) => {
+          e.stopPropagation();
+          setIsMenuOpen(true);
+        }}
+        className="absolute right-4 top-4 z-10 cursor-pointer"
+      >
+        <img src={ThreeDots} alt="options" className="h-[19px] w-[19px]" />
+        {menuOptions && (
+          <ContextMenu
+            isOpen={isMenuOpen}
+            setIsOpen={setIsMenuOpen}
+            options={menuOptions}
+            anchorRef={menuRef}
+            position="top-right"
+            offset={{ x: 0, y: 0 }}
+          />
+        )}
+      </div>
+
+      <div className="w-full">
+        <div className="flex w-full items-center gap-1 px-1">
+          <img
+            src={agent.image ?? Robot}
+            alt={`${agent.name}`}
+            className="h-7 w-7 rounded-full"
+          />
+          {agent.status === 'draft' && (
+            <p className="text-xs text-black opacity-50 dark:text-[#E0E0E0]">
+              (Draft)
+            </p>
+          )}
+        </div>
+        <div className="mt-2">
+          <p
+            title={agent.name}
+            className="truncate px-1 text-[13px] font-semibold capitalize leading-relaxed text-[#020617] dark:text-[#E0E0E0]"
+          >
+            {agent.name}
+          </p>
+          <p className="mt-1 h-20 overflow-auto px-1 text-[12px] leading-relaxed text-[#64748B] dark:text-sonic-silver-light">
+            {agent.description}
+          </p>
+        </div>
+      </div>
+
+      <ConfirmationModal
+        message="Are you sure you want to delete this agent?"
+        modalState={deleteConfirmation}
+        setModalState={setDeleteConfirmation}
+        submitLabel="Delete"
+        handleSubmit={() => {
+          onDelete ? onDelete(agent.id || '') : defaultDelete(agent.id || '');
+          setDeleteConfirmation('INACTIVE');
+        }}
+        cancelLabel="Cancel"
+        variant="danger"
+      />
+    </div>
+  );
+}
diff --git a/frontend/src/agents/AgentLogs.tsx b/frontend/src/agents/AgentLogs.tsx
index 864a85fe..12638b8e 100644
--- a/frontend/src/agents/AgentLogs.tsx
+++ b/frontend/src/agents/AgentLogs.tsx
@@ -4,10 +4,10 @@ import { useNavigate, useParams } from 'react-router-dom';
 
 import userService from '../api/services/userService';
 import ArrowLeft from '../assets/arrow-left.svg';
+import Spinner from '../components/Spinner';
 import { selectToken } from '../preferences/preferenceSlice';
 import Analytics from '../settings/Analytics';
 import Logs from '../settings/Logs';
-import Spinner from '../components/Spinner';
 import { Agent } from './types';
 
 export default function AgentLogs() {
@@ -54,11 +54,16 @@ export default function AgentLogs() {
         </h1>
       </div>
       <div className="mt-6 flex flex-col gap-3 px-4">
-        <h2 className="text-sm font-semibold text-black dark:text-[#E0E0E0]">
-          Agent Name
-        </h2>
         {agent && (
-          <p className="text-[#28292E] dark:text-[#E0E0E0]">{agent.name}</p>
+          <div className="flex flex-col gap-1">
+            <p className="text-[#28292E] dark:text-[#E0E0E0]">{agent.name}</p>
+            <p className="text-xs text-[#28292E] dark:text-[#E0E0E0]/40">
+              {agent.last_used_at
+                ? 'Last used at ' +
+                  new Date(agent.last_used_at).toLocaleString()
+                : 'No usage history'}
+            </p>
+          </div>
         )}
       </div>
       {loadingAgent ? (
@@ -74,7 +79,7 @@ export default function AgentLogs() {
           <Spinner />
         </div>
       ) : (
-        agent && <Logs agentId={agentId} tableHeader="Agent endpoint logs" />
+        agent && <Logs agentId={agent.id} tableHeader="Agent endpoint logs" />
       )}
     </div>
   );
diff --git a/frontend/src/agents/NewAgent.tsx b/frontend/src/agents/NewAgent.tsx
index 475571cf..464b49fe 100644
--- a/frontend/src/agents/NewAgent.tsx
+++ b/frontend/src/agents/NewAgent.tsx
@@ -102,12 +102,7 @@ export default function NewAgent({ mode }: { mode: 'new' | 'edit' | 'draft' }) {
 
   const isPublishable = () => {
     return (
-      agent.name &&
-      agent.description &&
-      (agent.source || agent.retriever) &&
-      agent.chunks &&
-      agent.prompt_id &&
-      agent.agent_type
+      agent.name && agent.description && agent.prompt_id && agent.agent_type
     );
   };
 
diff --git a/frontend/src/agents/SharedAgent.tsx b/frontend/src/agents/SharedAgent.tsx
new file mode 100644
index 00000000..3fa5f608
--- /dev/null
+++ b/frontend/src/agents/SharedAgent.tsx
@@ -0,0 +1,263 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'react-redux';
+import { useParams } from 'react-router-dom';
+
+import userService from '../api/services/userService';
+import NoFilesDarkIcon from '../assets/no-files-dark.svg';
+import NoFilesIcon from '../assets/no-files.svg';
+import Robot from '../assets/robot.svg';
+import MessageInput from '../components/MessageInput';
+import Spinner from '../components/Spinner';
+import ConversationMessages from '../conversation/ConversationMessages';
+import { Query } from '../conversation/conversationModels';
+import {
+  addQuery,
+  fetchAnswer,
+  resendQuery,
+  selectQueries,
+  selectStatus,
+} from '../conversation/conversationSlice';
+import { useDarkTheme } from '../hooks';
+import { selectToken, setSelectedAgent } from '../preferences/preferenceSlice';
+import { AppDispatch } from '../store';
+import { Agent } from './types';
+
+export default function SharedAgent() {
+  const { t } = useTranslation();
+  const { agentId } = useParams();
+  const dispatch = useDispatch<AppDispatch>();
+  const [isDarkTheme] = useDarkTheme();
+
+  const token = useSelector(selectToken);
+  const queries = useSelector(selectQueries);
+  const status = useSelector(selectStatus);
+
+  const [sharedAgent, setSharedAgent] = useState<Agent>();
+  const [isLoading, setIsLoading] = useState(true);
+  const [input, setInput] = useState('');
+  const [lastQueryReturnedErr, setLastQueryReturnedErr] = useState(false);
+
+  const fetchStream = useRef<any>(null);
+
+  const getSharedAgent = async () => {
+    try {
+      setIsLoading(true);
+      const response = await userService.getSharedAgent(agentId ?? '', token);
+      if (!response.ok) throw new Error('Failed to fetch Shared Agent');
+      const agent: Agent = await response.json();
+      setSharedAgent(agent);
+    } catch (error) {
+      console.error('Error: ', error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const handleFetchAnswer = useCallback(
+    ({ question, index }: { question: string; index?: number }) => {
+      fetchStream.current = dispatch(
+        fetchAnswer({ question, indx: index, isPreview: false }),
+      );
+    },
+    [dispatch],
+  );
+
+  const handleQuestion = useCallback(
+    ({
+      question,
+      isRetry = false,
+      index = undefined,
+    }: {
+      question: string;
+      isRetry?: boolean;
+      index?: number;
+    }) => {
+      const trimmedQuestion = question.trim();
+      if (trimmedQuestion === '') return;
+
+      if (index !== undefined) {
+        if (!isRetry) dispatch(resendQuery({ index, prompt: trimmedQuestion }));
+        handleFetchAnswer({ question: trimmedQuestion, index });
+      } else {
+        if (!isRetry) {
+          const newQuery: Query = { prompt: trimmedQuestion };
+          dispatch(addQuery(newQuery));
+        }
+        handleFetchAnswer({ question: trimmedQuestion, index: undefined });
+      }
+    },
+    [dispatch, handleFetchAnswer],
+  );
+
+  const handleQuestionSubmission = (
+    updatedQuestion?: string,
+    updated?: boolean,
+    indx?: number,
+  ) => {
+    if (
+      updated === true &&
+      updatedQuestion !== undefined &&
+      indx !== undefined
+    ) {
+      handleQuestion({
+        question: updatedQuestion,
+        index: indx,
+        isRetry: false,
+      });
+    } else if (input.trim() && status !== 'loading') {
+      const currentInput = input.trim();
+      if (lastQueryReturnedErr && queries.length > 0) {
+        const lastQueryIndex = queries.length - 1;
+        handleQuestion({
+          question: currentInput,
+          isRetry: true,
+          index: lastQueryIndex,
+        });
+      } else {
+        handleQuestion({
+          question: currentInput,
+          isRetry: false,
+          index: undefined,
+        });
+      }
+      setInput('');
+    }
+  };
+
+  useEffect(() => {
+    if (agentId) getSharedAgent();
+  }, [agentId, token]);
+
+  useEffect(() => {
+    if (sharedAgent) dispatch(setSelectedAgent(sharedAgent));
+  }, [sharedAgent, dispatch]);
+
+  if (isLoading)
+    return (
+      <div className="flex h-full w-full items-center justify-center">
+        <Spinner />
+      </div>
+    );
+  if (!sharedAgent)
+    return (
+      <div className="flex h-full w-full items-center justify-center">
+        <div className="flex w-full flex-col items-center justify-center gap-4">
+          <img
+            src={isDarkTheme ? NoFilesDarkIcon : NoFilesIcon}
+            alt="No agent found"
+            className="mx-auto mb-6 h-32 w-32"
+          />
+          <p className="text-center text-lg text-[#71717A] dark:text-[#949494]">
+            No agent found. Please ensure the agent is shared.
+          </p>
+        </div>
+      </div>
+    );
+  return (
+    <div className="relative h-full w-full">
+      <div className="absolute left-4 top-5 hidden items-center gap-3 sm:flex">
+        <img
+          src={sharedAgent.image ?? Robot}
+          alt="agent-logo"
+          className="h-6 w-6"
+        />
+        <h2 className="text-lg font-semibold text-[#212121] dark:text-[#E0E0E0]">
+          {sharedAgent.name}
+        </h2>
+      </div>
+      <div className="flex h-full w-full flex-col items-center justify-between sm:pt-12">
+        <div className="flex w-full flex-col items-center overflow-y-auto">
+          <ConversationMessages
+            handleQuestion={handleQuestion}
+            handleQuestionSubmission={handleQuestionSubmission}
+            queries={queries}
+            status={status}
+            showHeroOnEmpty={false}
+            headerContent={
+              <div className="flex w-full items-center justify-center py-4">
+                <SharedAgentCard agent={sharedAgent} />
+              </div>
+            }
+          />
+        </div>
+        <div className="flex w-[95%] max-w-[1500px] flex-col items-center gap-4 pb-2 md:w-9/12 lg:w-8/12 xl:w-8/12 2xl:w-6/12">
+          <MessageInput
+            value={input}
+            onChange={(e) => setInput(e.target.value)}
+            onSubmit={() => handleQuestionSubmission()}
+            loading={status === 'loading'}
+            showSourceButton={sharedAgent ? false : true}
+            showToolButton={sharedAgent ? false : true}
+            autoFocus={false}
+          />
+          <p className="hidden w-[100vw] self-center bg-transparent py-2 text-center text-xs text-gray-4000 dark:text-sonic-silver md:inline md:w-full">
+            {t('tagline')}
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function SharedAgentCard({ agent }: { agent: Agent }) {
+  return (
+    <div className="flex w-full max-w-[720px] flex-col rounded-3xl border border-dark-gray p-6 shadow-sm dark:border-grey sm:w-fit sm:min-w-[480px]">
+      <div className="flex items-center gap-3">
+        <div className="flex h-12 w-12 items-center justify-center overflow-hidden rounded-full p-1">
+          <img src={Robot} className="h-full w-full object-contain" />
+        </div>
+        <div className="flex max-h-[92px] w-[80%] flex-col gap-px">
+          <h2 className="text-base font-semibold text-[#212121] dark:text-[#E0E0E0] sm:text-lg">
+            {agent.name}
+          </h2>
+          <p className="overflow-y-auto text-wrap break-all text-xs text-[#71717A] dark:text-[#949494] sm:text-sm">
+            {agent.description}
+          </p>
+        </div>
+      </div>
+      <div className="mt-4 flex items-center gap-8">
+        {agent.shared_metadata?.shared_by && (
+          <p className="text-xs font-light text-[#212121] dark:text-[#E0E0E0] sm:text-sm">
+            by {agent.shared_metadata.shared_by}
+          </p>
+        )}
+        {agent.shared_metadata?.shared_at && (
+          <p className="text-xs font-light text-[#71717A] dark:text-[#949494] sm:text-sm">
+            Shared on{' '}
+            {new Date(agent.shared_metadata.shared_at).toLocaleString('en-US', {
+              month: 'long',
+              day: 'numeric',
+              year: 'numeric',
+              hour: '2-digit',
+              minute: '2-digit',
+              hour12: true,
+            })}
+          </p>
+        )}
+      </div>
+      {agent.tools.length > 0 && (
+        <div className="mt-8">
+          <p className="text-sm font-semibold text-[#212121] dark:text-[#E0E0E0] sm:text-base">
+            Connected Tools
+          </p>
+          <div className="mt-2 flex flex-wrap gap-2">
+            {agent.tools.map((tool, index) => (
+              <span
+                key={index}
+                className="flex items-center gap-1 rounded-full bg-bright-gray px-3 py-1 text-xs font-light text-[#212121] dark:bg-dark-charcoal dark:text-[#E0E0E0]"
+              >
+                <img
+                  src={`/toolIcons/tool_${tool}.svg`}
+                  alt={`${tool} icon`}
+                  className="h-3 w-3"
+                />{' '}
+                {tool}
+              </span>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/frontend/src/agents/index.tsx b/frontend/src/agents/index.tsx
index 4634dc76..18e15df7 100644
--- a/frontend/src/agents/index.tsx
+++ b/frontend/src/agents/index.tsx
@@ -1,27 +1,35 @@
-import React, { SyntheticEvent, useEffect, useRef, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { SyntheticEvent, useEffect, useRef, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { Route, Routes, useNavigate } from 'react-router-dom';
 
 import userService from '../api/services/userService';
 import Edit from '../assets/edit.svg';
 import Monitoring from '../assets/monitoring.svg';
+import Pin from '../assets/pin.svg';
 import Trash from '../assets/red-trash.svg';
 import Robot from '../assets/robot.svg';
+import Link from '../assets/link-gray.svg';
 import ThreeDots from '../assets/three-dots.svg';
+import UnPin from '../assets/unpin.svg';
 import ContextMenu, { MenuOption } from '../components/ContextMenu';
+import Spinner from '../components/Spinner';
+import {
+  setConversation,
+  updateConversationId,
+} from '../conversation/conversationSlice';
 import ConfirmationModal from '../modals/ConfirmationModal';
 import { ActiveState } from '../models/misc';
 import {
-  selectToken,
-  setSelectedAgent,
-  setAgents,
   selectAgents,
   selectSelectedAgent,
+  selectToken,
+  setAgents,
+  setSelectedAgent,
 } from '../preferences/preferenceSlice';
 import AgentLogs from './AgentLogs';
 import NewAgent from './NewAgent';
+import SharedAgent from './SharedAgent';
 import { Agent } from './types';
-import Spinner from '../components/Spinner';
 
 export default function Agents() {
   return (
@@ -30,10 +38,26 @@ export default function Agents() {
       <Route path="/new" element={<NewAgent mode="new" />} />
       <Route path="/edit/:agentId" element={<NewAgent mode="edit" />} />
       <Route path="/logs/:agentId" element={<AgentLogs />} />
+      <Route path="/shared/:agentId" element={<SharedAgent />} />
     </Routes>
   );
 }
 
+const sectionConfig = {
+  user: {
+    title: 'By me',
+    description: 'Agents created or published by you',
+    showNewAgentButton: true,
+    emptyStateDescription: 'You don’t have any created agents yet',
+  },
+  shared: {
+    title: 'Shared with me',
+    description: 'Agents imported by using a public link',
+    showNewAgentButton: false,
+    emptyStateDescription: 'No shared agents found',
+  },
+};
+
 function AgentsList() {
   const navigate = useNavigate();
   const dispatch = useDispatch();
@@ -41,26 +65,47 @@ function AgentsList() {
   const agents = useSelector(selectAgents);
   const selectedAgent = useSelector(selectSelectedAgent);
 
-  const [userAgents, setUserAgents] = useState<Agent[]>(agents || []);
-  const [loading, setLoading] = useState<boolean>(true);
+  const [sharedAgents, setSharedAgents] = useState<Agent[]>([]);
+  const [loadingUserAgents, setLoadingUserAgents] = useState<boolean>(true);
+  const [loadingSharedAgents, setLoadingSharedAgents] = useState<boolean>(true);
 
   const getAgents = async () => {
     try {
-      setLoading(true);
+      setLoadingUserAgents(true);
       const response = await userService.getAgents(token);
       if (!response.ok) throw new Error('Failed to fetch agents');
       const data = await response.json();
-      setUserAgents(data);
       dispatch(setAgents(data));
-      setLoading(false);
+      setLoadingUserAgents(false);
     } catch (error) {
       console.error('Error:', error);
-      setLoading(false);
+      setLoadingUserAgents(false);
+    }
+  };
+
+  const getSharedAgents = async () => {
+    try {
+      setLoadingSharedAgents(true);
+      const response = await userService.getSharedAgents(token);
+      if (!response.ok) throw new Error('Failed to fetch shared agents');
+      const data = await response.json();
+      setSharedAgents(data);
+      setLoadingSharedAgents(false);
+    } catch (error) {
+      console.error('Error:', error);
+      setLoadingSharedAgents(false);
     }
   };
 
   useEffect(() => {
     getAgents();
+    getSharedAgents();
+    dispatch(setConversation([]));
+    dispatch(
+      updateConversationId({
+        query: { conversationId: null },
+      }),
+    );
     if (selectedAgent) dispatch(setSelectedAgent(null));
   }, [token]);
   return (
@@ -70,7 +115,7 @@ function AgentsList() {
       </h1>
       <p className="mt-5 text-[15px] text-[#71717A] dark:text-[#949494]">
         Discover and create custom versions of DocsGPT that combine
-        instructions, extra knowledge, and any combination of skills.
+        instructions, extra knowledge, and any combination of skills
       </p>
       {/* Premade agents section */}
       {/* <div className="mt-6">
@@ -115,44 +160,77 @@ function AgentsList() {
           ))}
         </div>
       </div> */}
-      <div className="mt-8 flex flex-col gap-4">
-        <div className="flex w-full items-center justify-between">
+      <AgentSection
+        agents={agents ?? []}
+        loading={loadingUserAgents}
+        section="user"
+      />
+      <AgentSection
+        agents={sharedAgents ?? []}
+        loading={loadingSharedAgents}
+        section="shared"
+      />
+    </div>
+  );
+}
+
+function AgentSection({
+  agents,
+  loading,
+  section,
+}: {
+  agents: Agent[];
+  loading: boolean;
+  section: keyof typeof sectionConfig;
+}) {
+  const navigate = useNavigate();
+  return (
+    <div className="mt-8 flex flex-col gap-4">
+      <div className="flex w-full items-center justify-between">
+        <div className="flex flex-col gap-2">
           <h2 className="text-[18px] font-semibold text-[#18181B] dark:text-[#E0E0E0]">
-            Created by You
+            {sectionConfig[section].title}
           </h2>
+          <p className="text-[13px] text-[#71717A]">
+            {sectionConfig[section].description}
+          </p>
+        </div>
+        {sectionConfig[section].showNewAgentButton && (
           <button
             className="rounded-full bg-purple-30 px-4 py-2 text-sm text-white hover:bg-violets-are-blue"
             onClick={() => navigate('/agents/new')}
           >
             New Agent
           </button>
-        </div>
-        <div className="grid w-full grid-cols-2 gap-2 md:flex md:flex-wrap md:gap-4">
-          {loading ? (
-            <div className="flex h-72 w-full items-center justify-center">
-              <Spinner />
-            </div>
-          ) : userAgents.length > 0 ? (
-            userAgents.map((agent) => (
-              <AgentCard
-                key={agent.id}
-                agent={agent}
-                agents={userAgents}
-                setUserAgents={setUserAgents}
-              />
-            ))
-          ) : (
-            <div className="flex h-72 w-full flex-col items-center justify-center gap-3 text-base text-[#18181B] dark:text-[#E0E0E0]">
-              <p>You don’t have any created agents yet </p>
+        )}
+      </div>
+      <div className="grid w-full grid-cols-2 gap-2 md:flex md:flex-wrap md:gap-4">
+        {loading ? (
+          <div className="flex h-72 w-full items-center justify-center">
+            <Spinner />
+          </div>
+        ) : agents && agents.length > 0 ? (
+          agents.map((agent) => (
+            <AgentCard
+              key={agent.id}
+              agent={agent}
+              agents={agents}
+              section={section}
+            />
+          ))
+        ) : (
+          <div className="flex h-72 w-full flex-col items-center justify-center gap-3 text-base text-[#18181B] dark:text-[#E0E0E0]">
+            <p>{sectionConfig[section].emptyStateDescription}</p>
+            {sectionConfig[section].showNewAgentButton && (
               <button
                 className="ml-2 rounded-full bg-purple-30 px-4 py-2 text-sm text-white hover:bg-violets-are-blue"
                 onClick={() => navigate('/agents/new')}
               >
                 New Agent
               </button>
-            </div>
-          )}
-        </div>
+            )}
+          </div>
+        )}
       </div>
     </div>
   );
@@ -161,11 +239,11 @@ function AgentsList() {
 function AgentCard({
   agent,
   agents,
-  setUserAgents,
+  section,
 }: {
   agent: Agent;
   agents: Agent[];
-  setUserAgents: React.Dispatch<React.SetStateAction<Agent[]>>;
+  section: keyof typeof sectionConfig;
 }) {
   const navigate = useNavigate();
   const dispatch = useDispatch();
@@ -177,46 +255,94 @@ function AgentCard({
 
   const menuRef = useRef<HTMLDivElement>(null);
 
-  const menuOptions: MenuOption[] = [
-    {
-      icon: Monitoring,
-      label: 'Logs',
-      onClick: (e: SyntheticEvent) => {
-        e.stopPropagation();
-        navigate(`/agents/logs/${agent.id}`);
+  const togglePin = async () => {
+    try {
+      const response = await userService.togglePinAgent(agent.id ?? '', token);
+      if (!response.ok) throw new Error('Failed to pin agent');
+      const updatedAgents = agents.map((prevAgent) => {
+        if (prevAgent.id === agent.id)
+          return { ...prevAgent, pinned: !prevAgent.pinned };
+        return prevAgent;
+      });
+      dispatch(setAgents(updatedAgents));
+    } catch (error) {
+      console.error('Error:', error);
+    }
+  };
+
+  const menuOptionsConfig: Record<string, MenuOption[]> = {
+    user: [
+      {
+        icon: Monitoring,
+        label: 'Logs',
+        onClick: (e: SyntheticEvent) => {
+          e.stopPropagation();
+          navigate(`/agents/logs/${agent.id}`);
+        },
+        variant: 'primary',
+        iconWidth: 14,
+        iconHeight: 14,
       },
-      variant: 'primary',
-      iconWidth: 14,
-      iconHeight: 14,
-    },
-    {
-      icon: Edit,
-      label: 'Edit',
-      onClick: (e: SyntheticEvent) => {
-        e.stopPropagation();
-        navigate(`/agents/edit/${agent.id}`);
+      {
+        icon: Edit,
+        label: 'Edit',
+        onClick: (e: SyntheticEvent) => {
+          e.stopPropagation();
+          navigate(`/agents/edit/${agent.id}`);
+        },
+        variant: 'primary',
+        iconWidth: 14,
+        iconHeight: 14,
       },
-      variant: 'primary',
-      iconWidth: 14,
-      iconHeight: 14,
-    },
-    {
-      icon: Trash,
-      label: 'Delete',
-      onClick: (e: SyntheticEvent) => {
-        e.stopPropagation();
-        setDeleteConfirmation('ACTIVE');
+      {
+        icon: agent.pinned ? UnPin : Pin,
+        label: agent.pinned ? 'Unpin' : 'Pin agent',
+        onClick: (e: SyntheticEvent) => {
+          e.stopPropagation();
+          togglePin();
+        },
+        variant: 'primary',
+        iconWidth: 18,
+        iconHeight: 18,
       },
-      variant: 'danger',
-      iconWidth: 12,
-      iconHeight: 12,
-    },
-  ];
+      {
+        icon: Trash,
+        label: 'Delete',
+        onClick: (e: SyntheticEvent) => {
+          e.stopPropagation();
+          setDeleteConfirmation('ACTIVE');
+        },
+        variant: 'danger',
+        iconWidth: 13,
+        iconHeight: 13,
+      },
+    ],
+    shared: [
+      {
+        icon: Link,
+        label: 'Open',
+        onClick: (e: SyntheticEvent) => {
+          e.stopPropagation();
+          navigate(`/agents/shared/${agent.shared_token}`);
+        },
+        variant: 'primary',
+        iconWidth: 14,
+        iconHeight: 14,
+      },
+    ],
+  };
+
+  const menuOptions = menuOptionsConfig[section] || [];
 
   const handleClick = () => {
-    if (agent.status === 'published') {
-      dispatch(setSelectedAgent(agent));
-      navigate(`/`);
+    if (section === 'user') {
+      if (agent.status === 'published') {
+        dispatch(setSelectedAgent(agent));
+        navigate(`/`);
+      }
+    }
+    if (section === 'shared') {
+      navigate(`/agents/shared/${agent.shared_token}`);
     }
   };
 
@@ -224,9 +350,6 @@ function AgentCard({
     const response = await userService.deleteAgent(agentId, token);
     if (!response.ok) throw new Error('Failed to delete agent');
     const data = await response.json();
-    setUserAgents((prevAgents) =>
-      prevAgents.filter((prevAgent) => prevAgent.id !== data.id),
-    );
     dispatch(setAgents(agents.filter((prevAgent) => prevAgent.id !== data.id)));
   };
   return (
@@ -243,7 +366,7 @@ function AgentCard({
           e.stopPropagation();
           setIsMenuOpen(true);
         }}
-        className="absolute right-4 top-4 z-50 cursor-pointer"
+        className="absolute right-4 top-4 z-10 cursor-pointer"
       >
         <img src={ThreeDots} alt={'use-agent'} className="h-[19px] w-[19px]" />
         <ContextMenu
diff --git a/frontend/src/agents/types/index.ts b/frontend/src/agents/types/index.ts
index 1dea9b52..fe3cb418 100644
--- a/frontend/src/agents/types/index.ts
+++ b/frontend/src/agents/types/index.ts
@@ -11,6 +11,11 @@ export type Agent = {
   agent_type: string;
   status: string;
   key?: string;
+  incoming_webhook_token?: string;
+  pinned?: boolean;
+  shared?: boolean;
+  shared_token?: string;
+  shared_metadata?: any;
   created_at?: string;
   updated_at?: string;
   last_used_at?: string;
diff --git a/frontend/src/api/client.ts b/frontend/src/api/client.ts
index 3db613fc..28707012 100644
--- a/frontend/src/api/client.ts
+++ b/frontend/src/api/client.ts
@@ -1,4 +1,5 @@
-const baseURL = import.meta.env.VITE_API_HOST || 'https://docsapi.arc53.com';
+export const baseURL =
+  import.meta.env.VITE_API_HOST || 'https://docsapi.arc53.com';
 
 const defaultHeaders = {
   'Content-Type': 'application/json',
diff --git a/frontend/src/api/endpoints.ts b/frontend/src/api/endpoints.ts
index 222bdb15..248a88cb 100644
--- a/frontend/src/api/endpoints.ts
+++ b/frontend/src/api/endpoints.ts
@@ -13,6 +13,11 @@ const endpoints = {
     CREATE_AGENT: '/api/create_agent',
     UPDATE_AGENT: (agent_id: string) => `/api/update_agent/${agent_id}`,
     DELETE_AGENT: (id: string) => `/api/delete_agent?id=${id}`,
+    PINNED_AGENTS: '/api/pinned_agents',
+    TOGGLE_PIN_AGENT: (id: string) => `/api/pin_agent?id=${id}`,
+    SHARED_AGENT: (id: string) => `/api/shared_agent?token=${id}`,
+    SHARED_AGENTS: '/api/shared_agents',
+    SHARE_AGENT: `/api/share_agent`,
     AGENT_WEBHOOK: (id: string) => `/api/agent_webhook?id=${id}`,
     PROMPTS: '/api/get_prompts',
     CREATE_PROMPT: '/api/create_prompt',
diff --git a/frontend/src/api/services/userService.ts b/frontend/src/api/services/userService.ts
index 4a0f45d8..f9950835 100644
--- a/frontend/src/api/services/userService.ts
+++ b/frontend/src/api/services/userService.ts
@@ -31,6 +31,16 @@ const userService = {
     apiClient.put(endpoints.USER.UPDATE_AGENT(agent_id), data, token),
   deleteAgent: (id: string, token: string | null): Promise<any> =>
     apiClient.delete(endpoints.USER.DELETE_AGENT(id), token),
+  getPinnedAgents: (token: string | null): Promise<any> =>
+    apiClient.get(endpoints.USER.PINNED_AGENTS, token),
+  togglePinAgent: (id: string, token: string | null): Promise<any> =>
+    apiClient.post(endpoints.USER.TOGGLE_PIN_AGENT(id), {}, token),
+  getSharedAgent: (id: string, token: string | null): Promise<any> =>
+    apiClient.get(endpoints.USER.SHARED_AGENT(id), token),
+  getSharedAgents: (token: string | null): Promise<any> =>
+    apiClient.get(endpoints.USER.SHARED_AGENTS, token),
+  shareAgent: (data: any, token: string | null): Promise<any> =>
+    apiClient.put(endpoints.USER.SHARE_AGENT, data, token),
   getAgentWebhook: (id: string, token: string | null): Promise<any> =>
     apiClient.get(endpoints.USER.AGENT_WEBHOOK(id), token),
   getPrompts: (token: string | null): Promise<any> =>
diff --git a/frontend/src/assets/link-gray.svg b/frontend/src/assets/link-gray.svg
new file mode 100644
index 00000000..75a24932
--- /dev/null
+++ b/frontend/src/assets/link-gray.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 1.5H3C2.46957 1.5 1.96086 1.71071 1.58579 2.08579C1.21071 2.46086 1 2.96957 1 3.5V15.5C1 16.0304 1.21071 16.5391 1.58579 16.9142C1.96086 17.2893 2.46957 17.5 3 17.5H15C15.5304 17.5 16.0391 17.2893 16.4142 16.9142C16.7893 16.5391 17 16.0304 17 15.5V11.5M9 9.5L17 1.5M17 1.5V6.5M17 1.5H12" stroke="#949494" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/frontend/src/assets/pin.svg b/frontend/src/assets/pin.svg
new file mode 100644
index 00000000..4e1d1071
--- /dev/null
+++ b/frontend/src/assets/pin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#747474" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-pin-icon lucide-pin"><path d="M12 17v5"/><path d="M9 10.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V16a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V7a1 1 0 0 1 1-1 2 2 0 0 0 0-4H8a2 2 0 0 0 0 4 1 1 0 0 1 1 1z"/></svg>
\ No newline at end of file
diff --git a/frontend/src/assets/unpin.svg b/frontend/src/assets/unpin.svg
new file mode 100644
index 00000000..edb46d5d
--- /dev/null
+++ b/frontend/src/assets/unpin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#747474" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-pin-off-icon lucide-pin-off"><path d="M12 17v5"/><path d="M15 9.34V7a1 1 0 0 1 1-1 2 2 0 0 0 0-4H7.89"/><path d="m2 2 20 20"/><path d="M9 9v1.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V16a1 1 0 0 0 1 1h11"/></svg>
\ No newline at end of file
diff --git a/frontend/src/components/ContextMenu.tsx b/frontend/src/components/ContextMenu.tsx
index f8359371..762a7828 100644
--- a/frontend/src/components/ContextMenu.tsx
+++ b/frontend/src/components/ContextMenu.tsx
@@ -104,8 +104,8 @@ export default function ContextMenu({
             }}
             className={`flex items-center justify-start gap-4 p-3 transition-colors duration-200 ease-in-out ${index === 0 ? 'rounded-t-xl' : ''} ${index === options.length - 1 ? 'rounded-b-xl' : ''} ${
               option.variant === 'danger'
-                ? 'text-rosso-corsa hover:bg-bright-gray dark:text-red-2000 dark:hover:bg-charcoal-grey'
-                : 'text-eerie-black hover:bg-bright-gray dark:text-bright-gray dark:hover:bg-charcoal-grey'
+                ? 'text-rosso-corsa hover:bg-bright-gray dark:text-red-2000 dark:hover:bg-charcoal-grey/20'
+                : 'text-eerie-black hover:bg-bright-gray dark:text-bright-gray dark:hover:bg-charcoal-grey/20'
             } `}
           >
             {option.icon && (
@@ -115,7 +115,7 @@ export default function ContextMenu({
                   height={option.iconHeight || 16}
                   src={option.icon}
                   alt={option.label}
-                  className={`cursor-pointer hover:opacity-75 ${option.iconClassName || ''}`}
+                  className={`cursor-pointer ${option.iconClassName || ''}`}
                 />
               </div>
             )}
diff --git a/frontend/src/conversation/ConversationMessages.tsx b/frontend/src/conversation/ConversationMessages.tsx
index 4a345e27..5c2150a6 100644
--- a/frontend/src/conversation/ConversationMessages.tsx
+++ b/frontend/src/conversation/ConversationMessages.tsx
@@ -1,4 +1,11 @@
-import { Fragment, useEffect, useRef, useState } from 'react';
+import {
+  Fragment,
+  ReactNode,
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
 import { useTranslation } from 'react-i18next';
 
 import ArrowDown from '../assets/arrow-down.svg';
@@ -8,7 +15,12 @@ import { useDarkTheme } from '../hooks';
 import ConversationBubble from './ConversationBubble';
 import { FEEDBACK, Query, Status } from './conversationModels';
 
-interface ConversationMessagesProps {
+const SCROLL_THRESHOLD = 10;
+const LAST_BUBBLE_MARGIN = 'mb-32';
+const DEFAULT_BUBBLE_MARGIN = 'mb-7';
+const FIRST_QUESTION_BUBBLE_MARGIN_TOP = 'mt-5';
+
+type ConversationMessagesProps = {
   handleQuestion: (params: {
     question: string;
     isRetry?: boolean;
@@ -24,7 +36,8 @@ interface ConversationMessagesProps {
   queries: Query[];
   status: Status;
   showHeroOnEmpty?: boolean;
-}
+  headerContent?: ReactNode;
+};
 
 export default function ConversationMessages({
   handleQuestion,
@@ -33,22 +46,23 @@ export default function ConversationMessages({
   status,
   handleFeedback,
   showHeroOnEmpty = true,
+  headerContent,
 }: ConversationMessagesProps) {
   const [isDarkTheme] = useDarkTheme();
   const { t } = useTranslation();
 
   const conversationRef = useRef<HTMLDivElement>(null);
-  const [atLast, setAtLast] = useState(true);
-  const [eventInterrupt, setEventInterrupt] = useState(false);
+  const [hasScrolledToLast, setHasScrolledToLast] = useState(true);
+  const [userInterruptedScroll, setUserInterruptedScroll] = useState(false);
 
-  const handleUserInterruption = () => {
-    if (!eventInterrupt && status === 'loading') {
-      setEventInterrupt(true);
+  const handleUserScrollInterruption = useCallback(() => {
+    if (!userInterruptedScroll && status === 'loading') {
+      setUserInterruptedScroll(true);
     }
-  };
+  }, [userInterruptedScroll, status]);
 
-  const scrollIntoView = () => {
-    if (!conversationRef?.current || eventInterrupt) return;
+  const scrollConversationToBottom = useCallback(() => {
+    if (!conversationRef.current || userInterruptedScroll) return;
 
     requestAnimationFrame(() => {
       if (!conversationRef?.current) return;
@@ -63,41 +77,67 @@ export default function ConversationMessages({
           conversationRef.current.scrollHeight;
       }
     });
-  };
+  }, [userInterruptedScroll, status, queries]);
 
-  const checkScroll = () => {
+  const checkScrollPosition = useCallback(() => {
     const el = conversationRef.current;
     if (!el) return;
-    const isBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 10;
-    setAtLast(isBottom);
-  };
+    const isAtBottom =
+      el.scrollHeight - el.scrollTop - el.clientHeight < SCROLL_THRESHOLD;
+    setHasScrolledToLast(isAtBottom);
+  }, [setHasScrolledToLast]);
 
   useEffect(() => {
-    !eventInterrupt && scrollIntoView();
-  }, [queries.length, queries[queries.length - 1]]);
+    if (!userInterruptedScroll) {
+      scrollConversationToBottom();
+    }
+  }, [
+    queries.length,
+    queries[queries.length - 1]?.response,
+    queries[queries.length - 1]?.error,
+    queries[queries.length - 1]?.thought,
+    userInterruptedScroll,
+    scrollConversationToBottom,
+  ]);
 
   useEffect(() => {
     if (status === 'idle') {
-      setEventInterrupt(false);
+      setUserInterruptedScroll(false);
     }
   }, [status]);
 
   useEffect(() => {
-    conversationRef.current?.addEventListener('scroll', checkScroll);
+    const currentConversationRef = conversationRef.current;
+    currentConversationRef?.addEventListener('scroll', checkScrollPosition);
     return () => {
-      conversationRef.current?.removeEventListener('scroll', checkScroll);
+      currentConversationRef?.removeEventListener(
+        'scroll',
+        checkScrollPosition,
+      );
     };
-  }, []);
+  }, [checkScrollPosition]);
+
+  const retryIconProps = {
+    width: 12,
+    height: 12,
+    fill: isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)',
+    stroke: isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)',
+    strokeWidth: 10,
+  };
+
+  const renderResponseView = (query: Query, index: number) => {
+    const isLastMessage = index === queries.length - 1;
+    const bubbleMargin = isLastMessage
+      ? LAST_BUBBLE_MARGIN
+      : DEFAULT_BUBBLE_MARGIN;
 
-  const prepResponseView = (query: Query, index: number) => {
-    let responseView;
     if (query.thought || query.response) {
       const isCurrentlyStreaming =
         status === 'loading' && index === queries.length - 1;
-      responseView = (
+      return (
         <ConversationBubble
-          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'}`}
-          key={`${index}ANSWER`}
+          className={bubbleMargin}
+          key={`${index}-ANSWER`}
           message={query.response}
           type={'ANSWER'}
           thought={query.thought}
@@ -112,51 +152,53 @@ export default function ConversationMessages({
           }
         />
       );
-    } else if (query.error) {
-      const retryBtn = (
+    }
+
+    if (query.error) {
+      const retryButton = (
         <button
           className="flex items-center justify-center gap-3 self-center rounded-full px-5 py-3 text-lg text-gray-500 transition-colors delay-100 hover:border-gray-500 disabled:cursor-not-allowed dark:text-bright-gray"
           disabled={status === 'loading'}
           onClick={() => {
+            const questionToRetry = queries[index].prompt;
             handleQuestion({
-              question: queries[queries.length - 1].prompt,
+              question: questionToRetry,
               isRetry: true,
+              indx: index,
             });
           }}
+          aria-label={t('Retry') || 'Retry'}
         >
-          <RetryIcon
-            width={12}
-            height={12}
-            fill={isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)'}
-            stroke={isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)'}
-            strokeWidth={10}
-          />
+          <RetryIcon {...retryIconProps} />
         </button>
       );
-      responseView = (
+      return (
         <ConversationBubble
-          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'} `}
-          key={`${index}ERROR`}
+          className={bubbleMargin}
+          key={`${index}-ERROR`}
           message={query.error}
           type="ERROR"
-          retryBtn={retryBtn}
+          retryBtn={retryButton}
         />
       );
     }
-    return responseView;
+    return null;
   };
 
   return (
     <div
       ref={conversationRef}
-      onWheel={handleUserInterruption}
-      onTouchMove={handleUserInterruption}
+      onWheel={handleUserScrollInterruption}
+      onTouchMove={handleUserScrollInterruption}
       className="flex h-full w-full justify-center overflow-y-auto will-change-scroll sm:pt-6 lg:pt-12"
     >
-      {queries.length > 0 && !atLast && (
+      {queries.length > 0 && !hasScrolledToLast && (
         <button
-          onClick={scrollIntoView}
-          aria-label="scroll to bottom"
+          onClick={() => {
+            setUserInterruptedScroll(false);
+            scrollConversationToBottom();
+          }}
+          aria-label={t('Scroll to bottom') || 'Scroll to bottom'}
           className="fixed bottom-40 right-14 z-10 flex h-7 w-7 items-center justify-center rounded-full border-[0.5px] border-gray-alpha bg-gray-100 bg-opacity-50 dark:bg-gunmetal md:h-9 md:w-9 md:bg-opacity-100"
         >
           <img
@@ -168,19 +210,21 @@ export default function ConversationMessages({
       )}
 
       <div className="w-full max-w-[1300px] px-2 md:w-9/12 lg:w-8/12 xl:w-8/12 2xl:w-6/12">
+        {headerContent && headerContent}
+
         {queries.length > 0 ? (
           queries.map((query, index) => (
-            <Fragment key={index}>
+            <Fragment key={`${index}-query-fragment`}>
               <ConversationBubble
-                className={'first:mt-5'}
-                key={`${index}QUESTION`}
+                className={index === 0 ? FIRST_QUESTION_BUBBLE_MARGIN_TOP : ''}
+                key={`${index}-QUESTION`}
                 message={query.prompt}
                 type="QUESTION"
                 handleUpdatedQuestionSubmission={handleQuestionSubmission}
                 questionNumber={index}
                 sources={query.sources}
               />
-              {prepResponseView(query, index)}
+              {renderResponseView(query, index)}
             </Fragment>
           ))
         ) : showHeroOnEmpty ? (
diff --git a/frontend/src/conversation/conversationHandlers.ts b/frontend/src/conversation/conversationHandlers.ts
index 398f74db..b4ba0439 100644
--- a/frontend/src/conversation/conversationHandlers.ts
+++ b/frontend/src/conversation/conversationHandlers.ts
@@ -142,6 +142,7 @@ export function handleFetchAnswerSteaming(
       .then((response) => {
         if (!response.body) throw Error('No response body');
 
+        let buffer = '';
         const reader = response.body.getReader();
         const decoder = new TextDecoder('utf-8');
         let counterrr = 0;
@@ -157,22 +158,24 @@ export function handleFetchAnswerSteaming(
           counterrr += 1;
 
           const chunk = decoder.decode(value);
+          buffer += chunk;
 
-          const lines = chunk.split('\n');
+          const events = buffer.split('\n\n');
+          buffer = events.pop() ?? '';
 
-          for (let line of lines) {
-            if (line.trim() == '') {
-              continue;
+          for (const event of events) {
+            if (event.trim().startsWith('data:')) {
+              const dataLine: string = event
+                .split('\n')
+                .map((line: string) => line.replace(/^data:\s?/, ''))
+                .join('');
+
+              const messageEvent = new MessageEvent('message', {
+                data: dataLine.trim(),
+              });
+
+              onEvent(messageEvent);
             }
-            if (line.startsWith('data:')) {
-              line = line.substring(5);
-            }
-
-            const messageEvent: MessageEvent = new MessageEvent('message', {
-              data: line,
-            });
-
-            onEvent(messageEvent); // handle each message
           }
 
           reader.read().then(processStream).catch(reject);
diff --git a/frontend/src/conversation/conversationSlice.ts b/frontend/src/conversation/conversationSlice.ts
index 261f9db7..961260ea 100644
--- a/frontend/src/conversation/conversationSlice.ts
+++ b/frontend/src/conversation/conversationSlice.ts
@@ -285,9 +285,7 @@ export const conversationSlice = createSlice({
       action: PayloadAction<{ index: number; query: Partial<Query> }>,
     ) {
       const { index, query } = action.payload;
-      if (!state.queries[index].tool_calls) {
-        state.queries[index].tool_calls = query?.tool_calls;
-      }
+      state.queries[index].tool_calls = query?.tool_calls ?? [];
     },
     updateQuery(
       state,
diff --git a/frontend/src/modals/AgentDetailsModal.tsx b/frontend/src/modals/AgentDetailsModal.tsx
index c10a837b..7d47204c 100644
--- a/frontend/src/modals/AgentDetailsModal.tsx
+++ b/frontend/src/modals/AgentDetailsModal.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 
 import { Agent } from '../agents/types';
@@ -9,6 +9,8 @@ import { ActiveState } from '../models/misc';
 import { selectToken } from '../preferences/preferenceSlice';
 import WrapperModal from './WrapperModal';
 
+const baseURL = import.meta.env.VITE_BASE_URL;
+
 type AgentDetailsModalProps = {
   agent: Agent;
   mode: 'new' | 'edit' | 'draft';
@@ -24,7 +26,9 @@ export default function AgentDetailsModal({
 }: AgentDetailsModalProps) {
   const token = useSelector(selectToken);
 
-  const [publicLink, setPublicLink] = useState<string | null>(null);
+  const [sharedToken, setSharedToken] = useState<string | null>(
+    agent.shared_token ?? null,
+  );
   const [apiKey, setApiKey] = useState<string | null>(null);
   const [webhookUrl, setWebhookUrl] = useState<string | null>(null);
   const [loadingStates, setLoadingStates] = useState({
@@ -40,6 +44,21 @@ export default function AgentDetailsModal({
     setLoadingStates((prev) => ({ ...prev, [key]: state }));
   };
 
+  const handleGeneratePublicLink = async () => {
+    setLoading('publicLink', true);
+    const response = await userService.shareAgent(
+      { id: agent.id ?? '', shared: true },
+      token,
+    );
+    if (!response.ok) {
+      setLoading('publicLink', false);
+      return;
+    }
+    const data = await response.json();
+    setSharedToken(data.shared_token);
+    setLoading('publicLink', false);
+  };
+
   const handleGenerateWebhook = async () => {
     setLoading('webhook', true);
     const response = await userService.getAgentWebhook(agent.id ?? '', token);
@@ -52,6 +71,11 @@ export default function AgentDetailsModal({
     setLoading('webhook', false);
   };
 
+  useEffect(() => {
+    setSharedToken(agent.shared_token ?? null);
+    setApiKey(agent.key ?? null);
+  }, [agent]);
+
   if (modalState !== 'ACTIVE') return null;
   return (
     <WrapperModal
@@ -66,20 +90,45 @@ export default function AgentDetailsModal({
         </h2>
         <div className="mt-8 flex flex-col gap-6">
           <div className="flex flex-col gap-3">
-            <h2 className="text-base font-semibold text-jet dark:text-bright-gray">
-              Public link
-            </h2>
-            <button className="hover:bg-vi</button>olets-are-blue w-28 rounded-3xl border border-solid border-violets-are-blue px-5 py-2 text-sm font-medium text-violets-are-blue transition-colors hover:bg-violets-are-blue hover:text-white">
-              Generate
-            </button>
+            <div className="flex items-center gap-2">
+              <h2 className="text-base font-semibold text-jet dark:text-bright-gray">
+                Public Link
+              </h2>
+              {sharedToken && (
+                <div className="mb-1">
+                  <CopyButton
+                    textToCopy={`${baseURL}/agents/shared/${sharedToken}`}
+                    padding="p-1"
+                  />
+                </div>
+              )}
+            </div>
+            {sharedToken ? (
+              <div className="flex flex-col flex-wrap items-start gap-2">
+                <p className="f break-all font-mono text-sm text-gray-700 dark:text-[#ECECF1]">
+                  {`${baseURL}/agents/shared/${sharedToken}`}
+                </p>
+              </div>
+            ) : (
+              <button
+                className="hover:bg-vi</button>olets-are-blue flex w-28 items-center justify-center rounded-3xl border border-solid border-violets-are-blue px-5 py-2 text-sm font-medium text-violets-are-blue transition-colors hover:bg-violets-are-blue hover:text-white"
+                onClick={handleGeneratePublicLink}
+              >
+                {loadingStates.publicLink ? (
+                  <Spinner size="small" color="#976af3" />
+                ) : (
+                  'Generate'
+                )}
+              </button>
+            )}
           </div>
           <div className="flex flex-col gap-3">
             <h2 className="text-base font-semibold text-jet dark:text-bright-gray">
               API Key
             </h2>
-            {agent.key ? (
+            {apiKey ? (
               <span className="font-mono text-sm text-gray-700 dark:text-[#ECECF1]">
-                {agent.key}
+                {apiKey}
               </span>
             ) : (
               <button className="hover:bg-vi</button>olets-are-blue w-28 rounded-3xl border border-solid border-violets-are-blue px-5 py-2 text-sm font-medium text-violets-are-blue transition-colors hover:bg-violets-are-blue hover:text-white">
diff --git a/md-gen.py b/md-gen.py
new file mode 100644
index 00000000..93754475
--- /dev/null
+++ b/md-gen.py
@@ -0,0 +1,47 @@
+import os
+
+def create_markdown_from_directory(directory=".", output_file="combined.md"):
+    """
+    Recursively traverses the given directory, reads all files (ignoring files/folders in ignore_list),
+    and creates a single markdown file containing the contents of each file, prefixed with the
+    relative path of the file.
+
+    Args:
+        directory (str): The directory to traverse. Defaults to the current directory.
+        output_file (str): The name of the output markdown file. Defaults to 'combined.md'.
+    """
+    ignore_list = [
+        "node_modules", "__pycache__", ".git", ".DS_Store", "inputs", "indexes",
+        "model", "models", ".venv", "temp", ".pytest_cache", ".ruff_cache",
+        "extensions", "dir_tree.py", "map.txt", "signal-desktop-keyring.gpg",
+        ".husky", ".next", "docs", "index.pkl", "index.faiss", "assets", "fonts", "public",
+        "yarn.lock", "package-lock.json",
+        ]
+
+    with open(output_file, "w", encoding="utf-8") as outfile:
+        for root, dirs, files in os.walk(directory):
+            # Filter out directories in ignore_list so they won't be traversed
+            dirs[:] = [d for d in dirs if d not in ignore_list]
+            
+            for filename in files:
+                if filename in ignore_list:
+                    continue
+                filepath = os.path.join(root, filename)
+                
+                try:
+                    with open(filepath, "r", encoding="utf-8") as infile:
+                        content = infile.read()
+                    
+                    # Get a relative path to better indicate file location
+                    rel_path = os.path.relpath(filepath, directory)
+                    outfile.write(f"## File: {rel_path}\n\n")
+                    outfile.write(content)
+                    outfile.write("\n\n---\n\n")  # Separator between files
+
+                except Exception as e:
+                    print(f"Error processing file {filepath}: {e}")
+
+    print(f"Successfully created {output_file}")
+
+if __name__ == "__main__":
+    create_markdown_from_directory()