diff --git a/examples/petpassport/README.md b/examples/petpassport/README.md
new file mode 100644
index 0000000..9b06c49
--- /dev/null
+++ b/examples/petpassport/README.md
@@ -0,0 +1,149 @@
+# Pet Passport: Pet-friendly route planner
+
+This directory contains the **Pet Passport** application, a demo of an AI Agent using the Model Context Protocol (MCP) to combine data analysis and real-world location services.
+
+## Demo Overview
+
+Pet Passport helps users plan a perfect day out with their dog based on breed popularity in New York City. The agent uses a "Macro-to-Micro" reasoning chain:
+1.  **Strategic Discovery (BigQuery):** Identifies the NYC Zip Code with the highest population for a specific breed.
+2.  **Local Execution (Maps):** Uses that Zip Code as a location bias to find "pet friendly cafes" and "dog parks".
+3.  **Itinerary Generation:** Combines the data to create a "Pet Passport" itinerary.
+
+The agent is built using the `google-adk` framework and powered by `gemini-3.1`.
+
+## Dataset
+
+This demo uses the [NYC Dog Licensing Dataset](https://data.cityofnewyork.us/Health/NYC-Dog-Licensing-Dataset/nu7n-tubp) from NYC Open Data. It contains records of licensed dogs in New York City.
+
+## Project Structure
+
+```text
+petpassport/
+├── petpassport/
+│   ├── __init__.py
+│   ├── agent.py             # Agent definition using ADK
+│   ├── tools.py             # MCP Tool configuration (BigQuery & Maps)
+│   └── main.py              # FastAPI application exposing the agent
+├── pyproject.toml           # Project dependencies
+└── README.md                # This documentation
+```
+
+## Prerequisites
+
+*   **Python 3.13+**
+*   **Google Cloud Project** with access to BigQuery and Maps MCP endpoints.
+*   **Environment Variables** (Store these in a `.env` file in the project root):
+    *   `MAPS_API_KEY`: Your Google Maps API key.
+    *   `GOOGLE_CLOUD_PROJECT`: Your Google Cloud project ID.
+
+## Deployment Guide
+
+Follow these steps to set up and run the demo.
+
+### 1. Authenticate with Google Cloud
+
+Set your active Google Cloud project and authenticate. This is required for the ADK to access BigQuery.
+
+```bash
+gcloud config set project [YOUR-PROJECT-ID]
+gcloud auth application-default login --project [YOUR-PROJECT-ID]
+```
+
+*Note: If you encounter errors about a different project during authentication, you can bypass it by disabling the quota project and setting it manually:*
+```bash
+gcloud auth application-default login --disable-quota-project
+gcloud auth application-default set-quota-project [YOUR-PROJECT-ID]
+```
+
+### 3. Configure Environment
+
+Run the environment setup script. This script will:
+*   Enable necessary Google Cloud APIs (Maps, BigQuery, remote MCP).
+*   Create a restricted Google Maps Platform API Key.
+*   Create a `.env` file with required environment variables.
+
+```bash
+chmod +x setup/setup_env.sh
+./setup/setup_env.sh
+```
+
+### 4. Provision BigQuery
+
+Run the setup script. This script automates the following:
+*   Creates a Cloud Storage bucket.
+*   Uploads the CSV data files.
+*   Creates the `nyc_dogs` BigQuery dataset.
+*   Loads the data into BigQuery table `licenses`.
+
+```bash
+chmod +x setup/setup_bigquery.sh
+./setup/setup_bigquery.sh
+```
+
+## Installation
+
+1.  Navigate to the project directory:
+    ```bash
+    cd examples/petpassport
+    ```
+
+2.  Create a virtual environment:
+    ```bash
+    python3 -m venv .venv
+    ```
+
+3.  Activate the virtual environment:
+    ```bash
+    source .venv/bin/activate
+    ```
+
+4.  Install dependencies:
+    ```bash
+    pip install google-adk==1.28.0 python-dotenv google-genai pillow
+    ```
+
+## Running the Application Locally
+
+To run the application locally on your machine:
+
+1.  **Install Uvicorn** (if not already installed):
+    ```bash
+    pip install uvicorn
+    ```
+
+2.  **Start the FastAPI server:**
+    ```bash
+    uvicorn petpassport.main:app --reload
+    ```
+
+3.  **Open the UI:**
+    Navigate to `http://127.0.0.1:8000/ui/` in your browser to interact with the Pet Passport interface.
+
+**Sample prompt:** "I have a Labrador Retriever. Where should we go in NYC?"
+
+## Deploying to Cloud Run
+
+To deploy the Pet Passport agent to Google Cloud Run:
+
+1.  **Ensure you are in the project directory**:
+    ```bash
+    cd examples/petpassport
+    ```
+
+2.  **Deploy to Cloud Run**:
+    Use the following pure `gcloud` command to build and deploy the application to Cloud Run. Replace `[YOUR-REGION]` with your desired region (e.g., `us-west1`).
+
+    ```bash
+    gcloud run deploy petpassport \
+      --source petpassport \
+      --region [YOUR-REGION] \
+      --allow-unauthenticated \
+      --labels dev-tutorial=google-mcp
+    ```
+
+    *Note: This command assumes you have the environment variables `MAPS_API_KEY` and `GOOGLE_CLOUD_PROJECT` set in your current shell.*
+
+3.  **Permissions**:
+    Ensure the Cloud Run service account has the following IAM roles:
+    *   `BigQuery Data Viewer` and `BigQuery Job User` (to query BigQuery).
+    *   `Storage Object Admin` on the bucket `pet-passport-data-$PROJECT_ID` (to upload PDFs).
diff --git a/examples/petpassport/petpassport/Dockerfile b/examples/petpassport/petpassport/Dockerfile
new file mode 100644
index 0000000..9f73839
--- /dev/null
+++ b/examples/petpassport/petpassport/Dockerfile
@@ -0,0 +1,23 @@
+FROM python:3.13-slim
+
+WORKDIR /app
+
+# Install system dependencies (required for some Python packages)
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies
+# The adk deploy command looks for requirements.txt in the agent directory
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy application code
+COPY . .
+
+# Expose port (Cloud Run defaults to 8080)
+ENV PORT=8080
+EXPOSE 8080
+
+# Run using uvicorn pointing to main.py in the current directory
+CMD ["sh", "-c", "uvicorn main:app --host 0.0.0.0 --port $PORT"]
diff --git a/examples/petpassport/petpassport/__init__.py b/examples/petpassport/petpassport/__init__.py
new file mode 100644
index 0000000..dd17124
--- /dev/null
+++ b/examples/petpassport/petpassport/__init__.py
@@ -0,0 +1,2 @@
+from . import agent
+from . import tools
diff --git a/examples/petpassport/petpassport/agent.py b/examples/petpassport/petpassport/agent.py
new file mode 100644
index 0000000..1359d1b
--- /dev/null
+++ b/examples/petpassport/petpassport/agent.py
@@ -0,0 +1,54 @@
+import os
+import dotenv
+import tools
+from google.adk.agents import LlmAgent
+
+dotenv.load_dotenv()
+
+PROJECT_ID = os.getenv('GOOGLE_CLOUD_PROJECT', 'project_not_set')
+
+maps_toolset = tools.get_maps_mcp_toolset()
+bigquery_toolset = tools.get_bigquery_mcp_toolset()
+
+root_agent = LlmAgent(
+    model='gemini-2.5-pro',
+    name='root_agent',
+    instruction=f"""
+        You are the Pet Passport Agent. Your goal is to help users find a fun walking route for their dog in NYC.
+        
+        When the user provides a breed and a postal code (and optional preferences like "a cafe"), follow this flow:
+        1.  **Strategic Discovery:** Use BigQuery to find the most popular neighborhood for that breed in NYC.
+        2.  **Personalization:** Consider the user's postal code to suggest a walking path that is closer to them or in a relevant area, balancing breed popularity hubs with proximity.
+        3.  **Local Execution:** Use Maps to build a walking route with specific places (parks, cafes) based on user preferences.
+        
+        **STATE AWARENESS:** If the user asks for a *new* or *different* walking path than one suggested before, you MUST suggest a different set of locations or a different route.
+        
+        Run all BigQuery query jobs using the project ID: {PROJECT_ID}.
+        
+        Here is a concrete example of how to query the dog license data using the project ID variable and the correct schema:
+        ```sql
+        SELECT ZipCode, COUNT(*) AS count
+        FROM `{PROJECT_ID}.nyc_dogs.licenses`
+        WHERE BreedName = 'Labrador Retriever'
+        GROUP BY ZipCode
+        ORDER BY count DESC
+        LIMIT 1;
+        ```
+        
+        Use the BigQuery toolset to query the dog license data.
+        Use the Maps toolset to find places and calculate routes.
+        
+        **CRITICAL RULE FOR PLACES:** `search_places` returns AI-generated place data summaries along with `place_id`, latitude/longitude coordinates, and map links for each place. You must carefully associate each described place to its provided `place_id` or `lat_lng`. You MUST include the Google Maps links in your final itinerary response, and add relevant details about the places (e.g., rating, food type).
+        
+        **CRITICAL ROUTING RULE:** To avoid hallucinating, you MUST provide the `origin` and `destination` using the exact `place_id` string OR `lat_lng` object returned by `search_places`. Do NOT guess or hallucinate an `address` or `place_id` if you do not know the exact name. You MUST use the exact `place_id` and names returned by `search_places`.
+        
+        **NO DIRECTIONS LINKS:** You must NOT include a Google Maps directions link (e.g., `https://www.google.com/maps/dir/...`) in your final response. Only provide links to individual places using the `place_id` or direct links.
+        
+        **IMAGE UPLOAD RULE:** If the user's message indicates they uploaded an image (e.g., contains `[Pet Photo Uploaded: /tmp/... ]`), you MUST use that image path as the `image_path` argument when calling `generate_pet_passport_photo` to generate a new image of the dog in the suggested location! DO NOT just use the uploaded image path as the final result, but use it as a reference to generate a new one! If no image was uploaded, DO NOT generate or suggest any images!
+        
+        **REASONING RULE:** When you query BigQuery to find a popular area for the breed, you MUST explain in your final response *why* you chose that area. Include the exact count of that breed found in that neighborhood from the license table, and if it's not the highest in NYC, mention its rank.
+        
+        After generating the itinerary, you MUST call the `save_pet_passport` tool to save this path to the user's profile. Pass `demo-user` as the `user_id`, the breed, the identified popular ZipCode or neighborhood as the location, a clean markdown version of the itinerary (not the full conversational response) as `route_details`, and the list of image paths (either the uploaded one or empty). The summary should include the popular breed count fact, the list of places with links and details (like rating, description from maps), and a short description of the walk.
+    """,
+    tools=[maps_toolset, bigquery_toolset, tools.generate_pet_passport_photo, tools.save_pet_passport]
+)
diff --git a/examples/petpassport/petpassport/main.py b/examples/petpassport/petpassport/main.py
new file mode 100644
index 0000000..1eaae2a
--- /dev/null
+++ b/examples/petpassport/petpassport/main.py
@@ -0,0 +1,96 @@
+from google.adk.cli.fast_api import get_fast_api_app
+from fastapi.staticfiles import StaticFiles
+from fastapi import FastAPI, Request, HTTPException, File, UploadFile
+import os
+import json
+import shutil
+from google.cloud import storage
+
+# Create the standard ADK app in headless mode (web=False)
+# auto_create_session=True is CRITICAL for custom UIs that generate random session IDs.
+app = get_fast_api_app(agents_dir=".", web=False, auto_create_session=True)
+
+# Mount custom static files
+script_dir = os.path.dirname(os.path.abspath(__file__))
+static_dir = os.path.join(script_dir, "static")
+
+# Ensure the static directory exists
+os.makedirs(static_dir, exist_ok=True)
+
+from fastapi.responses import FileResponse
+
+@app.get("/ui/")
+async def get_ui_index():
+    index_path = os.path.join(static_dir, "index.html")
+    if os.path.exists(index_path):
+        return FileResponse(index_path)
+    raise HTTPException(status_code=404, detail="index.html not found")
+
+app.mount("/ui", StaticFiles(directory=static_dir), name="ui")
+app.mount("/tmp", StaticFiles(directory="/tmp"), name="tmp")
+
+PROJECT_ID = os.getenv('GOOGLE_CLOUD_PROJECT', 'project_not_set')
+BUCKET_NAME = f"pet-passport-data-{PROJECT_ID}"
+print(f"BUCKET_NAME determined as: {BUCKET_NAME}")
+
+import time
+
+@app.post("/api/upload")
+async def upload_file(file: UploadFile = File(...)):
+    try:
+        filename = f"upload_{int(time.time())}_{file.filename}"
+        file_path = f"/tmp/{filename}"
+        with open(file_path, "wb") as buffer:
+            shutil.copyfileobj(file.file, buffer)
+            
+        return {"file_path": file_path}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+def get_storage_client():
+    return storage.Client()
+
+@app.get("/api/paths")
+async def get_paths(user_id: str):
+    try:
+        client = get_storage_client()
+        bucket = client.bucket(BUCKET_NAME)
+        blob = bucket.blob(f"user-{user_id}.json")
+        
+        if not blob.exists():
+            return []
+            
+        content = blob.download_as_text()
+        return json.loads(content)
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        raise HTTPException(status_code=500, detail=str(e))
+
+@app.post("/api/paths")
+async def update_path(user_id: str, path_data: dict):
+    try:
+        client = get_storage_client()
+        bucket = client.bucket(BUCKET_NAME)
+        blob = bucket.blob(f"user-{user_id}.json")
+        
+        paths = []
+        if blob.exists():
+            content = blob.download_as_text()
+            paths = json.loads(content)
+            
+        path_id = path_data.get('id')
+        updated = False
+        for i, p in enumerate(paths):
+            if p.get('id') == path_id:
+                paths[i].update(path_data)
+                updated = True
+                break
+                
+        if not updated:
+            paths.append(path_data)
+            
+        blob.upload_from_string(json.dumps(paths))
+        return {"status": "success"}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
diff --git a/examples/petpassport/petpassport/requirements.txt b/examples/petpassport/petpassport/requirements.txt
new file mode 100644
index 0000000..3235564
--- /dev/null
+++ b/examples/petpassport/petpassport/requirements.txt
@@ -0,0 +1,5 @@
+google-adk==1.28.0
+python-dotenv
+google-genai
+pillow
+reportlab
diff --git a/examples/petpassport/petpassport/static/app.js b/examples/petpassport/petpassport/static/app.js
new file mode 100644
index 0000000..75f34b2
--- /dev/null
+++ b/examples/petpassport/petpassport/static/app.js
@@ -0,0 +1,291 @@
+const userId = 'demo-user';
+const sessionId = 'session-' + Math.random().toString(36).substr(2, 9);
+const appName = 'agent'; // File name in container
+
+const chatMessages = document.getElementById('chat-messages');
+const userInput = document.getElementById('user-input');
+const sendBtn = document.getElementById('send-btn');
+const pathsList = document.getElementById('paths-list');
+const chatContainer = document.getElementById('chat-container');
+const detailsContainer = document.getElementById('details-container');
+const detailsContent = document.getElementById('details-content');
+const backBtn = document.getElementById('back-btn');
+
+// Load initial paths
+loadPaths();
+
+sendBtn.addEventListener('click', sendMessage);
+userInput.addEventListener('keypress', (e) => {
+    if (e.key === 'Enter') sendMessage();
+});
+
+async function loadPaths() {
+    try {
+        const response = await fetch(`/api/paths?user_id=${userId}`);
+        const paths = await response.json();
+        renderPaths(paths);
+    } catch (error) {
+        console.error('Error loading paths:', error);
+    }
+}
+
+function renderPaths(paths) {
+    if (typeof paths === 'string') {
+        try {
+            paths = JSON.parse(paths);
+        } catch (e) {
+            pathsList.innerHTML = `<div class="error">Error parsing paths string: ${e.message}</div>`;
+            return;
+        }
+    }
+
+    if (!Array.isArray(paths)) {
+        pathsList.innerHTML = '<div class="error">Error: paths is not an array</div>';
+        return;
+    }
+
+    if (paths.length === 0) {
+        pathsList.innerHTML = '<div class="empty-state">No paths generated yet.</div>';
+        return;
+    }
+
+    pathsList.innerHTML = '';
+    try {
+        paths.forEach(path => {
+            const card = document.createElement('div');
+            card.className = 'path-card';
+            card.innerHTML = `
+                <h3>${path.breed} Walk</h3>
+                <p>${path.postal_code}</p>
+                <div class="path-actions">
+                    <span class="walked-badge">${path.walked ? 'Walked' : 'Not Walked'}</span>
+                </div>
+            `;
+            card.addEventListener('click', () => {
+                showDetails(path);
+                toggleWalked(path);
+            });
+            pathsList.appendChild(card);
+        });
+    } catch (e) {
+        console.error('Error rendering paths:', e);
+        pathsList.innerHTML = `<div class="error">Error rendering paths: ${e.message}</div>`;
+    }
+}
+
+function showDetails(path) {
+    chatContainer.classList.add('hidden');
+    detailsContainer.classList.remove('hidden');
+
+    let imagesHtml = '';
+    if (path.image_paths && path.image_paths.length > 0) {
+        path.image_paths.forEach(src => {
+            let url = src;
+            if (url.startsWith('file:///tmp/')) {
+                url = url.replace('file:///tmp/', '/tmp/');
+            }
+            imagesHtml += `<img src="${url}" alt="${path.breed} image" style="max-width: 300px; border-radius: 8px; margin-top: 8px;">`;
+        });
+    }
+
+    detailsContent.innerHTML = `
+        <h2>🐾 ${path.breed} Walk Passport 🐾</h2>
+        <p><strong>Location:</strong> ${path.postal_code}</p>
+        <div class="itinerary-content">
+            ${processText(path.route_details)}
+        </div>
+        <div class="images-container">
+            ${imagesHtml}
+        </div>
+        <div class="modal-actions">
+            <span class="walked-badge">${path.walked ? 'Walked' : 'Not Walked'}</span>
+        </div>
+    `;
+}
+
+backBtn.addEventListener('click', () => {
+    detailsContainer.classList.add('hidden');
+    chatContainer.classList.remove('hidden');
+});
+
+async function toggleWalked(path) {
+    path.walked = !path.walked;
+    try {
+        await fetch(`/api/paths?user_id=${userId}`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(path)
+        });
+        loadPaths();
+    } catch (error) {
+        console.error('Error updating path:', error);
+    }
+}
+
+async function sendMessage() {
+    const text = userInput.value.trim();
+    const fileInput = document.getElementById('pet-image');
+    const file = fileInput ? fileInput.files[0] : null;
+
+    if (!text && !file) return;
+
+    let promptText = text;
+
+    if (file) {
+        const formData = new FormData();
+        formData.append('file', file);
+
+        try {
+            const uploadResponse = await fetch('/api/upload', {
+                method: 'POST',
+                body: formData
+            });
+            const uploadData = await uploadResponse.json();
+            promptText += ` [Pet Photo Uploaded: ${uploadData.file_path}]`;
+        } catch (error) {
+            console.error('Error uploading file:', error);
+            appendMessage('agent', '❌ Failed to upload image. Proceeding with text only.');
+        }
+    }
+
+    appendMessage('user', text || 'Uploaded an image');
+    userInput.value = '';
+    if (fileInput) fileInput.value = ''; // Clear file input
+    const uploadLabel = document.getElementById('upload-label');
+    if (uploadLabel) uploadLabel.textContent = '📎'; // Reset label
+
+    const msgDiv = document.createElement('div');
+    msgDiv.className = 'message agent';
+    msgDiv.innerHTML = '<div class="message-content">Thinking...</div>';
+    chatMessages.appendChild(msgDiv);
+    chatMessages.scrollTop = chatMessages.scrollHeight;
+
+    try {
+        const response = await fetch('/run_sse', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                app_name: appName,
+                user_id: userId,
+                session_id: sessionId,
+                new_message: { parts: [{ text: promptText }] },
+                streaming: true
+            })
+        });
+
+        msgDiv.remove();
+
+        const reader = response.body.getReader();
+        const decoder = new TextDecoder();
+
+        while (true) {
+            const { value, done } = await reader.read();
+            if (done) break;
+
+            const chunk = decoder.decode(value, { stream: true });
+            const lines = chunk.split('\n');
+
+            for (const line of lines) {
+                if (line.startsWith('data: ')) {
+                    try {
+                        const data = JSON.parse(line.substring(6));
+                        processEvent(data);
+                    } catch (e) {
+                        console.error('Failed to parse JSON line:', line, e);
+                    }
+                }
+            }
+        }
+
+        // Stream is done! Display the buffered text response.
+        if (currentMessageText) {
+            appendMessage('agent', currentMessageText);
+            currentMessageText = ''; // Reset for next message
+        }
+
+    } catch (error) {
+        console.error('Error sending message:', error);
+        msgDiv.innerHTML = '<div class="message-content">Error: Could not connect to agent.</div>';
+    } finally {
+        loadPaths();
+    }
+}
+
+let currentMessageDiv = null;
+let currentMessageText = '';
+let lastMessageRole = '';
+
+function processEvent(event) {
+    if (event.content && event.content.parts) {
+        event.content.parts.forEach(part => {
+            let messageText = '';
+            let role = 'agent';
+
+            if (part.functionCall) {
+                const args = JSON.stringify(part.functionCall.args);
+                messageText = `🛠️ Tool Call: ${part.functionCall.name} with args: ${args}`;
+                role = 'agent-thought';
+                appendMessage(role, messageText);
+                return;
+            }
+
+            if (part.functionResponse) {
+                const response = part.functionResponse.response;
+                let messageText = '📥 Tool Result: ';
+
+                if (response && response.isError) {
+                    messageText += '❌ Error: ';
+                }
+
+                if (response && response.content && Array.isArray(response.content)) {
+                    const texts = response.content.filter(p => p.type === 'text').map(p => p.text);
+                    messageText += texts.join(' ');
+                } else if (response) {
+                    messageText += JSON.stringify(response);
+                } else {
+                    messageText += 'Empty response';
+                }
+
+                role = 'agent-thought';
+                appendMessage(role, messageText);
+                return;
+            }
+
+            if (part.text) {
+                const hasToolCall = event.content.parts.some(p => p.functionCall);
+                role = hasToolCall ? 'agent-thought' : 'agent';
+                messageText = part.text;
+
+                if (role === 'agent-thought') {
+                    appendMessage(role, messageText);
+                } else {
+                    // Accumulate but do NOT display
+                    currentMessageText += messageText;
+                }
+            }
+        });
+    }
+}
+
+function appendMessage(role, text) {
+    const msgDiv = document.createElement('div');
+    msgDiv.className = `message ${role}`;
+    msgDiv.innerHTML = `<div class="message-content">${processText(text)}</div>`;
+    chatMessages.appendChild(msgDiv);
+    chatMessages.scrollTop = chatMessages.scrollHeight;
+    return msgDiv;
+}
+
+function processText(text) {
+    if (!text) return '';
+    return marked.parse(text);
+}
+
+document.getElementById('pet-image').addEventListener('change', function (e) {
+    const label = document.getElementById('upload-label');
+    if (this.files && this.files.length > 0) {
+        label.textContent = '📎 File selected';
+    } else {
+        label.textContent = '📎';
+    }
+});
diff --git a/examples/petpassport/petpassport/static/index.html b/examples/petpassport/petpassport/static/index.html
new file mode 100644
index 0000000..e4ebd42
--- /dev/null
+++ b/examples/petpassport/petpassport/static/index.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>NYC Pet Passport</title>
+    <link rel="stylesheet" href="style.css">
+    <!-- Google Fonts -->
+    <link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;600&family=Inter:wght@300;400;500&display=swap" rel="stylesheet">
+    <!-- Marked.js for markdown rendering -->
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+</head>
+<body>
+    <div class="app-container">
+        <!-- Sidebar / History -->
+        <div class="sidebar">
+            <div class="sidebar-header">
+                <h1>NYC Pet Passport</h1>
+                <p>Your dog's perfect day out</p>
+            </div>
+            <div class="paths-container">
+                <h2>Your Walking Paths</h2>
+                <div id="paths-list" class="paths-list">
+                    <!-- Paths will be inserted here -->
+                    <div class="empty-state">No paths generated yet.</div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Main Content / Chat -->
+        <div class="main-content">
+            <div class="chat-container" id="chat-container">
+                <div id="chat-messages" class="chat-messages">
+                    <!-- Messages will be inserted here -->
+                    <div class="message agent">
+                        <div class="message-content">
+                            Hello! I'm the Pet Passport Agent. Tell me about your dog (breed, location) and what kind of walk you'd like to plan today!
+                        </div>
+                    </div>
+                </div>
+                <div class="chat-input-container">
+                    <input type="file" id="pet-image" accept="image/*" style="display: none;">
+                    <label for="pet-image" class="upload-btn" id="upload-label">📎</label>
+                    <input type="text" id="user-input" placeholder="Type your message here... (e.g., Labrador in 10001, want a cafe)">
+                    <button id="send-btn">Send</button>
+                </div>
+            </div>
+            
+            <div class="details-container hidden" id="details-container">
+                <div class="details-header">
+                    <button id="back-btn" class="back-btn">← Back to Chat</button>
+                    <h2 id="details-title">🐾 Passport Details 🐾</h2>
+                </div>
+                <div id="details-content" class="details-content pet-theme">
+                    <!-- Details will be inserted here -->
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="app.js"></script>
+</body>
+</html>
diff --git a/examples/petpassport/petpassport/static/style.css b/examples/petpassport/petpassport/static/style.css
new file mode 100644
index 0000000..9f0892b
--- /dev/null
+++ b/examples/petpassport/petpassport/static/style.css
@@ -0,0 +1,325 @@
+:root {
+    --primary: #6366f1;
+    --primary-hover: #4f46e5;
+    --bg-gradient: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+    --glass-bg: rgba(255, 255, 255, 0.1);
+    --glass-border: rgba(255, 255, 255, 0.2);
+    --text-main: #ffffff;
+    --text-muted: rgba(255, 255, 255, 0.7);
+    --card-bg: rgba(255, 255, 255, 0.05);
+}
+
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+body {
+    font-family: 'Inter', sans-serif;
+    background: var(--bg-gradient);
+    color: var(--text-main);
+    height: 100vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+}
+
+.app-container {
+    display: flex;
+    width: 90vw;
+    height: 90vh;
+    max-width: 1200px;
+    background: var(--glass-bg);
+    backdrop-filter: blur(10px);
+    border: 1px solid var(--glass-border);
+    border-radius: 24px;
+    overflow: hidden;
+    box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
+}
+
+/* Sidebar */
+.sidebar {
+    width: 300px;
+    border-right: 1px solid var(--glass-border);
+    display: flex;
+    flex-direction: column;
+    background: rgba(0, 0, 0, 0.2);
+}
+
+.sidebar-header {
+    padding: 24px;
+    border-bottom: 1px solid var(--glass-border);
+}
+
+.sidebar-header h1 {
+    font-family: 'Outfit', sans-serif;
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-bottom: 4px;
+}
+
+.sidebar-header p {
+    font-size: 0.875rem;
+    color: var(--text-muted);
+}
+
+.paths-container {
+    flex: 1;
+    padding: 24px;
+    overflow-y: auto;
+}
+
+.paths-container h2 {
+    font-size: 1rem;
+    font-weight: 600;
+    margin-bottom: 16px;
+    color: var(--text-muted);
+}
+
+.paths-list .empty-state {
+    color: var(--text-muted);
+    font-size: 0.875rem;
+    text-align: center;
+    margin-top: 20px;
+}
+
+/* Main Content / Chat */
+.main-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+.chat-container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    padding: 24px;
+    overflow: hidden;
+}
+
+.chat-messages {
+    flex: 1;
+    overflow-y: auto;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    margin-bottom: 24px;
+}
+
+.message {
+    max-width: 70%;
+    display: flex;
+    flex-direction: column;
+}
+
+.message.agent {
+    align-self: flex-start;
+}
+
+.message.user {
+    align-self: flex-end;
+}
+
+.message-content {
+    padding: 12px 16px;
+    border-radius: 16px;
+    font-size: 0.95rem;
+    line-height: 1.5;
+    overflow-wrap: break-word;
+    word-break: break-word;
+}
+
+.message.agent .message-content {
+    background: var(--card-bg);
+    border: 1px solid var(--glass-border);
+}
+
+.message.user .message-content {
+    background: var(--primary);
+    color: white;
+}
+
+.chat-input-container {
+    display: flex;
+    gap: 12px;
+    background: rgba(255, 255, 255, 0.05);
+    padding: 12px;
+    border-radius: 16px;
+    border: 1px solid var(--glass-border);
+}
+
+.chat-input-container input {
+    flex: 1;
+    background: transparent;
+    border: none;
+    color: white;
+    font-size: 0.95rem;
+    outline: none;
+}
+
+.chat-input-container input::placeholder {
+    color: var(--text-muted);
+}
+
+.chat-input-container button {
+    background: var(--primary);
+    color: white;
+    border: none;
+    padding: 8px 16px;
+    border-radius: 12px;
+    font-weight: 600;
+    cursor: pointer;
+    transition: background 0.2s;
+}
+
+.chat-input-container button:hover {
+    background: var(--primary-hover);
+}
+
+/* Path Card */
+.path-card {
+    background: var(--card-bg);
+    border: 1px solid var(--glass-border);
+    border-radius: 12px;
+    padding: 16px;
+    margin-bottom: 12px;
+    cursor: pointer;
+    transition: transform 0.2s, background 0.2s;
+}
+
+.path-card:hover {
+    transform: translateY(-2px);
+    background: rgba(255, 255, 255, 0.1);
+}
+
+.path-card h3 {
+    font-size: 0.95rem;
+    font-weight: 600;
+    margin-bottom: 4px;
+}
+
+.path-card p {
+    font-size: 0.8rem;
+    color: var(--text-muted);
+    margin-bottom: 8px;
+}
+
+.path-actions {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 0.8rem;
+}
+
+.walked-badge {
+    padding: 2px 6px;
+    border-radius: 4px;
+    background: rgba(16, 185, 129, 0.2);
+    color: #10b981;
+}
+
+.rating {
+    color: #fbbf24;
+}
+
+.message.agent-thought .message-content {
+    background: rgba(255, 255, 255, 0.02);
+    border: 1px dashed var(--glass-border);
+    color: var(--text-muted);
+    font-size: 0.85rem;
+    font-style: italic;
+}
+
+/* Details View Styles */
+.details-container {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    padding: 32px;
+    overflow-y: auto;
+    background: var(--glass-bg);
+    backdrop-filter: blur(20px);
+    border-radius: 24px;
+    margin: 24px;
+    border: 1px solid var(--glass-border);
+}
+
+.details-container.hidden {
+    display: none;
+}
+
+.hidden {
+    display: none;
+}
+
+.details-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 24px;
+}
+
+.back-btn {
+    background: rgba(255, 255, 255, 0.1);
+    color: white;
+    border: 1px solid var(--glass-border);
+    padding: 8px 16px;
+    border-radius: 12px;
+    cursor: pointer;
+    transition: background 0.2s;
+}
+
+.back-btn:hover {
+    background: rgba(255, 255, 255, 0.2);
+}
+
+.details-content {
+    flex: 1;
+}
+
+.pet-theme {
+    /* Cute pet touches */
+    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M10 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-4 4c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm8 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-4 6c-2.2 0-4 1.8-4 4v2h8v-2c0-2.2-1.8-4-4-4z" fill="rgba(255,255,255,0.03)"/></svg>');
+    background-repeat: repeat;
+    padding: 20px;
+    border-radius: 16px;
+    background-color: rgba(0, 0, 0, 0.1);
+}
+
+.details-content h2 {
+    font-family: 'Outfit', sans-serif;
+    margin-bottom: 16px;
+    text-align: center;
+}
+
+.itinerary-content {
+    margin-top: 20px;
+    line-height: 1.6;
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: break-all;
+}
+
+.itinerary-content * {
+    overflow-wrap: break-word;
+    word-wrap: break-word;
+    word-break: break-all;
+}
+
+.images-container {
+    margin-top: 24px;
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+}
+
+.modal-actions {
+    margin-top: 32px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
diff --git a/examples/petpassport/petpassport/tools.py b/examples/petpassport/petpassport/tools.py
new file mode 100644
index 0000000..5395fce
--- /dev/null
+++ b/examples/petpassport/petpassport/tools.py
@@ -0,0 +1,183 @@
+import os
+import dotenv
+import google.auth
+import json
+import time
+import datetime
+from google.cloud import storage
+import glob
+
+from PIL import Image
+from google import genai
+from google.genai import types
+
+from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset
+from google.adk.tools.mcp_tool.mcp_session_manager import StreamableHTTPConnectionParams 
+
+MAPS_MCP_URL = "https://mapstools.googleapis.com/mcp" 
+BIGQUERY_MCP_URL = "https://bigquery.googleapis.com/mcp" 
+
+PROJECT_ID = os.getenv('GOOGLE_CLOUD_PROJECT', 'project_not_set')
+BUCKET_NAME = f"pet-passport-data-{PROJECT_ID}" 
+
+def get_maps_mcp_toolset():
+    dotenv.load_dotenv()
+    maps_api_key = os.getenv('MAPS_API_KEY', 'no_api_found')
+    
+    tools = MCPToolset(
+        connection_params=StreamableHTTPConnectionParams(
+            url=MAPS_MCP_URL,
+            headers={    
+                "X-Goog-Api-Key": maps_api_key
+            },
+            timeout=30.0,          
+            sse_read_timeout=300.0
+        )
+    )
+    print("Maps MCP Toolset configured.")
+    return tools
+
+
+def get_bigquery_mcp_toolset():   
+    credentials, project_id = google.auth.default(
+            scopes=["https://www.googleapis.com/auth/bigquery"]
+    )
+
+    credentials.refresh(google.auth.transport.requests.Request())
+    oauth_token = credentials.token
+        
+    HEADERS_WITH_OAUTH = {
+        "Authorization": f"Bearer {oauth_token}",
+        "x-goog-user-project": project_id
+    }
+
+    tools = MCPToolset(
+        connection_params=StreamableHTTPConnectionParams(
+            url=BIGQUERY_MCP_URL,
+            headers=HEADERS_WITH_OAUTH,
+            timeout=30.0,          
+            sse_read_timeout=300.0
+        )
+    )
+    print("BigQuery MCP Toolset configured.")
+    return tools
+
+def generate_pet_passport_photo(prompt: str, image_path: str = None) -> str:
+    """
+    Generates an image using gemini-3.1-flash-image-preview based on a prompt and a reference image.
+    Use this to create photos of the user's dog in the suggested locations.
+    
+    Args:
+        prompt: The text description of the image to generate.
+        image_path: Optional. The path to the reference image of the dog. If not provided or invalid, the tool will attempt to find the most recent uploaded image in the ADK artifacts directory.
+        
+    Returns:
+        The path to the saved image file.
+    """
+    client = genai.Client()
+    output_path = f"/tmp/pet_passport_{int(time.time())}.png"
+    
+    # Logic to find the uploaded image in artifacts if not explicitly provided
+    if not image_path or not os.path.exists(image_path):
+        # Broad search in /app and /tmp for any uploaded image
+        search_dirs = ["/app", "/tmp"]
+        image_files = []
+        
+        for s_dir in search_dirs:
+            if os.path.exists(s_dir):
+                for root, dirs, files in os.walk(s_dir):
+                    for file in files:
+                        if file.lower().endswith(('.png', '.jpg', '.jpeg', '.webp')):
+                            image_files.append(os.path.join(root, file))
+                            
+        if image_files:
+            # Sort by modification time, newest first
+            image_files.sort(key=os.path.getmtime, reverse=True)
+            image_path = image_files[0]
+            print(f"Discovered image file at: {image_path}")
+        else:
+             raise ValueError("No uploaded image found in /app or /tmp. Please upload an image first.")
+             
+    try:
+        image = Image.open(image_path)
+        
+        response = client.models.generate_content(
+            model="gemini-3.1-flash-image-preview",
+            contents=[prompt, image],
+        )
+        
+        for part in response.parts:
+            if part.inline_data is not None:
+                generated_image = part.as_image()
+                generated_image.save(output_path)
+                
+                # Upload to GCS and generate signed URL
+                try:
+                    storage_client = storage.Client()
+                    bucket = storage_client.bucket(BUCKET_NAME)
+                    blob_name = os.path.basename(output_path)
+                    blob = bucket.blob(blob_name)
+                    
+                    blob.upload_from_filename(output_path)
+                    
+                    url = blob.generate_signed_url(
+                        version="v4",
+                        expiration=datetime.timedelta(hours=24),
+                        method="GET",
+                    )
+                    return url
+                except Exception as e:
+                    print(f"Error uploading image to GCS: {e}")
+                    # Fallback to returning local path if upload fails
+                    return output_path
+                
+        raise ValueError("No image was returned by the model in the response parts.")
+        
+    except Exception as e:
+        print(f"An error occurred during image generation: {e}")
+        raise
+
+
+
+def save_pet_passport(user_id: str, breed: str, postal_code: str, route_details: str, image_paths: list[str] = None) -> str:
+    """
+    Saves the generated pet passport itinerary to GCS for the user.
+    
+    Args:
+        user_id: The ID of the user.
+        breed: The dog breed.
+        postal_code: The user's postal code.
+        route_details: The itinerary details.
+        image_paths: List of paths to generated images.
+        
+    Returns:
+        A success message.
+    """
+
+    
+    try:
+        storage_client = storage.Client()
+        bucket = storage_client.bucket(BUCKET_NAME)
+        blob = bucket.blob(f"user-{user_id}.json")
+        
+        paths = []
+        if blob.exists():
+            content = blob.download_as_text()
+            paths = json.loads(content)
+            
+        new_path = {
+            "id": f"path_{int(time.time())}",
+            "breed": breed,
+            "postal_code": postal_code,
+            "route_details": route_details,
+            "image_paths": image_paths or [],
+            "walked": False,
+            "rating": 0
+        }
+        paths.append(new_path)
+        
+        blob.upload_from_string(json.dumps(paths))
+        return "Path saved successfully."
+    except Exception as e:
+        print(f"Error saving path: {e}")
+        return f"Error saving path: {e}"
diff --git a/examples/petpassport/setup/setup_bigquery.sh b/examples/petpassport/setup/setup_bigquery.sh
new file mode 100755
index 0000000..e7f3a28
--- /dev/null
+++ b/examples/petpassport/setup/setup_bigquery.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Load Project ID from .env file if it exists
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -f "$SCRIPT_DIR/../.env" ]; then
+    PROJECT_ID=$(grep -E '^GOOGLE_CLOUD_PROJECT=' "$SCRIPT_DIR/../.env" | cut -d '=' -f 2)
+fi
+
+# Fallback to gcloud config if not found in .env
+if [ -z "$PROJECT_ID" ]; then
+    PROJECT_ID=$(gcloud config get-value project 2>/dev/null)
+fi
+
+if [ -z "$PROJECT_ID" ]; then
+    echo "Error: Could not determine Google Cloud Project ID."
+    echo "Please set GOOGLE_CLOUD_PROJECT in your .env file or run 'gcloud config set project <PROJECT_ID>'."
+    exit 1
+fi
+
+DATASET_NAME="nyc_dogs"
+LOCATION="US"
+BUCKET_NAME="gs://pet-passport-data-$PROJECT_ID"
+
+echo "----------------------------------------------------------------"
+echo "Pet Passport BigQuery Setup"
+echo "Project: $PROJECT_ID"
+echo "Dataset: $DATASET_NAME"
+echo "Bucket:  $BUCKET_NAME"
+echo "----------------------------------------------------------------"
+
+# 1. Create Bucket if it doesn't exist
+echo "Checking bucket $BUCKET_NAME..."
+if gcloud storage buckets describe $BUCKET_NAME >/dev/null 2>&1; then
+    echo "      Bucket already exists."
+else
+    echo "      Creating bucket $BUCKET_NAME..."
+    gcloud storage buckets create $BUCKET_NAME --location=$LOCATION
+fi
+
+# 2. Download Data
+CSV_URL="https://data.cityofnewyork.us/api/views/nu7n-tubp/rows.csv?accessType=DOWNLOAD"
+mkdir -p "$SCRIPT_DIR/../data"
+echo "Downloading NYC Dog Licensing dataset..."
+curl -L "$CSV_URL" -o "$SCRIPT_DIR/../data/nyc_dog_licenses.csv"
+
+# 3. Upload Data to Bucket
+echo "Uploading data to $BUCKET_NAME..."
+gcloud storage cp "$SCRIPT_DIR/../data/nyc_dog_licenses.csv" $BUCKET_NAME
+
+# 4. Create Dataset
+echo "Creating Dataset '$DATASET_NAME' if it doesn't exist..."
+bq show "$PROJECT_ID:$DATASET_NAME" >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    bq mk --location=$LOCATION --dataset "$PROJECT_ID:$DATASET_NAME"
+    echo "Dataset created."
+else
+    echo "Dataset already exists."
+fi
+
+# 5. Load Data from Bucket
+echo "Loading data into BigQuery table 'licenses'..."
+bq load --source_format=CSV --skip_leading_rows=1 --autodetect --max_bad_records=100 --replace \
+    "$PROJECT_ID:$DATASET_NAME.licenses" "$BUCKET_NAME/nyc_dog_licenses.csv"
+
+echo "----------------------------------------------------------------"
+echo "Setup Complete!"
+echo "----------------------------------------------------------------"
diff --git a/examples/petpassport/setup/setup_env.sh b/examples/petpassport/setup/setup_env.sh
new file mode 100755
index 0000000..fee8df1
--- /dev/null
+++ b/examples/petpassport/setup/setup_env.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Get Google Cloud Project ID
+PROJECT_ID=$(gcloud config get-value project 2>/dev/null)
+
+if [ -z "$PROJECT_ID" ]; then
+    echo "Error: Could not determine Google Cloud Project ID."
+    echo "Please run 'gcloud config set project <PROJECT_ID>' first."
+    exit 1
+fi
+
+echo "Found Project ID: $PROJECT_ID"
+
+# Enable necessary APIs
+echo "Enabling APIs..."
+gcloud services enable bigquery.googleapis.com --project=$PROJECT_ID
+gcloud services enable mapstools.googleapis.com --project=$PROJECT_ID
+gcloud services enable apikeys.googleapis.com --project=$PROJECT_ID
+
+# Enable MCP services
+echo "Enabling MCP services..."
+gcloud --quiet beta services mcp enable bigquery.googleapis.com --project=$PROJECT_ID
+gcloud --quiet beta services mcp enable mapstools.googleapis.com --project=$PROJECT_ID
+
+# Prompt for API Key
+echo "----------------------------------------------------------------"
+echo "Please create a Google Maps Platform API Key in the Cloud Console:"
+echo "https://console.cloud.google.com/apis/credentials"
+echo "----------------------------------------------------------------"
+read -p "Enter your Google Maps Platform API Key: " MAPS_API_KEY
+
+if [ -z "$MAPS_API_KEY" ]; then
+    echo "Error: API Key cannot be empty."
+    exit 1
+fi
+
+# Create .env file in project root
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ENV_FILE="$SCRIPT_DIR/../.env"
+
+cat <<EOF > "$ENV_FILE"
+GOOGLE_CLOUD_PROJECT=$PROJECT_ID
+MAPS_API_KEY=$MAPS_API_KEY
+EOF
+
+echo "Successfully created $ENV_FILE"