google · jacobsimionato · Dec 10, 2025 · Dec 9, 2025 · Dec 10, 2025 · Dec 10, 2025
diff --git a/.github/workflows/editor_build.yml b/.github/workflows/editor_build.yml
@@ -4,10 +4,10 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
   pull_request:
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
 
 jobs:
   build:

diff --git a/.github/workflows/lit_samples_build.yml b/.github/workflows/lit_samples_build.yml
@@ -4,10 +4,10 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
   pull_request:
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
 
 jobs:
   build:

diff --git a/.github/workflows/ng_build_and_test.yml b/.github/workflows/ng_build_and_test.yml
@@ -4,10 +4,10 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
   pull_request:
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
 
 jobs:
   build-and-test:

diff --git a/.github/workflows/python_samples_build.yml b/.github/workflows/python_samples_build.yml
@@ -5,10 +5,12 @@ on:
     branches:
       - main
     paths:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
+      - 'a2a_agents/python/a2ui_extension/**'
   pull_request:
     paths:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
+      - 'a2a_agents/python/a2ui_extension/**'
 
 jobs:
   build:
@@ -30,17 +32,17 @@ jobs:
           pip install uv
 
       - name: Build contact_lookup
-        working-directory: a2a_agents/python/adk/samples/contact_lookup
+        working-directory: samples/agent/adk/contact_lookup
         run: uv build .
 
       - name: Build orchestrator
-        working-directory: a2a_agents/python/adk/samples/orchestrator
+        working-directory: samples/agent/adk/orchestrator
         run: uv build .
 
       - name: Build restaurant_finder
-        working-directory: a2a_agents/python/adk/samples/restaurant_finder
+        working-directory: samples/agent/adk/restaurant_finder
         run: uv build .
 
       - name: Build rizzcharts
-        working-directory: a2a_agents/python/adk/samples/rizzcharts
+        working-directory: samples/agent/adk/rizzcharts
         run: uv build .
diff --git a/.github/workflows/web_build_and_test.yml b/.github/workflows/web_build_and_test.yml
@@ -4,10 +4,10 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
   pull_request:
     paths-ignore:
-      - 'a2a_agents/python/adk/samples/**'
+      - 'samples/agent/adk/**'
 
 jobs:
   build-and-test:

diff --git a/a2a_agents/python/pyproject.toml b/a2a_agents/python/pyproject.toml
diff --git a/a2a_agents/python/uv.lock b/a2a_agents/python/uv.lock
diff --git a/...thon/adk/samples/contact_lookup/README.md → samples/agent/adk/contact_lookup/README.md b/...thon/adk/samples/contact_lookup/README.md → samples/agent/adk/contact_lookup/README.md
diff --git a/...on/adk/samples/contact_lookup/__init__.py → samples/agent/adk/contact_lookup/__init__.py b/...on/adk/samples/contact_lookup/__init__.py → samples/agent/adk/contact_lookup/__init__.py
diff --git a/...on/adk/samples/contact_lookup/__main__.py → samples/agent/adk/contact_lookup/__main__.py b/...on/adk/samples/contact_lookup/__main__.py → samples/agent/adk/contact_lookup/__main__.py
diff --git a/...k/samples/contact_lookup/a2ui_examples.py → ...agent/adk/contact_lookup/a2ui_examples.py b/...k/samples/contact_lookup/a2ui_examples.py → ...agent/adk/contact_lookup/a2ui_examples.py
diff --git a/...adk/samples/contact_lookup/a2ui_schema.py → ...s/agent/adk/contact_lookup/a2ui_schema.py b/...adk/samples/contact_lookup/a2ui_schema.py → ...s/agent/adk/contact_lookup/a2ui_schema.py
diff --git a/...ython/adk/samples/contact_lookup/agent.py → samples/agent/adk/contact_lookup/agent.py b/...ython/adk/samples/contact_lookup/agent.py → samples/agent/adk/contact_lookup/agent.py
diff --git a/.../samples/contact_lookup/agent_executor.py → ...gent/adk/contact_lookup/agent_executor.py b/.../samples/contact_lookup/agent_executor.py → ...gent/adk/contact_lookup/agent_executor.py
diff --git a/.../samples/contact_lookup/contact_data.json → ...gent/adk/contact_lookup/contact_data.json b/.../samples/contact_lookup/contact_data.json → ...gent/adk/contact_lookup/contact_data.json
diff --git a/...amples/contact_lookup/images/profile1.png → ...nt/adk/contact_lookup/images/profile1.png b/...amples/contact_lookup/images/profile1.png → ...nt/adk/contact_lookup/images/profile1.png
diff --git a/...amples/contact_lookup/images/profile2.png → ...nt/adk/contact_lookup/images/profile2.png b/...amples/contact_lookup/images/profile2.png → ...nt/adk/contact_lookup/images/profile2.png
diff --git a/...amples/contact_lookup/images/profile3.png → ...nt/adk/contact_lookup/images/profile3.png b/...amples/contact_lookup/images/profile3.png → ...nt/adk/contact_lookup/images/profile3.png
diff --git a/.../samples/contact_lookup/prompt_builder.py → ...gent/adk/contact_lookup/prompt_builder.py b/.../samples/contact_lookup/prompt_builder.py → ...gent/adk/contact_lookup/prompt_builder.py
diff --git a/...adk/samples/contact_lookup/pyproject.toml → ...s/agent/adk/contact_lookup/pyproject.toml b/...adk/samples/contact_lookup/pyproject.toml → ...s/agent/adk/contact_lookup/pyproject.toml
@@ -11,8 +11,8 @@ dependencies = [
     "google-genai>=1.27.0",
     "python-dotenv>=1.1.0",
     "litellm",
-    "a2ui",
     "jsonschema>=4.0.0",
+    "a2ui",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -22,5 +22,5 @@ packages = ["."]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.uv.sources]
-a2ui = { workspace = true }
+[tool.hatch.metadata]
+allow-direct-references = true
diff --git a/...ython/adk/samples/contact_lookup/tools.py → samples/agent/adk/contact_lookup/tools.py b/...ython/adk/samples/contact_lookup/tools.py → samples/agent/adk/contact_lookup/tools.py
diff --git a/...python/adk/samples/contact_lookup/uv.lock → samples/agent/adk/contact_lookup/uv.lock b/...python/adk/samples/contact_lookup/uv.lock → samples/agent/adk/contact_lookup/uv.lock
diff --git a/...python/adk/samples/orchestrator/README.md → samples/agent/adk/orchestrator/README.md b/...python/adk/samples/orchestrator/README.md → samples/agent/adk/orchestrator/README.md
@@ -28,24 +28,24 @@ Subagents are configured using RemoteA2aAgent which translates ADK events to A2A
    Open a new terminal for each command
 
    ```bash
-   cd a2a_agents/python/adk/samples/restaurant_finder
+   cd samples/agent/adk/restaurant_finder
    uv run . --port=10003
    ```
 
    ```bash
-   cd a2a_agents/python/adk/samples/contact_lookup
+   cd samples/agent/adk/contact_lookup
    uv run . --port=10004
    ```
 
    ```bash
-   cd a2a_agents/python/adk/samples/rizzcharts
+   cd samples/agent/adk/rizzcharts
    uv run . --port=10005
    ```
 
 3. Run the orchestrator agent:
 
    ```bash
-   cd a2a_agents/python/adk/samples/orchestrator
+   cd samples/agent/adk/orchestrator
    uv run . --port=10002 --subagent_urls=http://localhost:10003 --subagent_urls=http://localhost:10004 --subagent_urls=http://localhost:10005
    ```
 

diff --git a/...thon/adk/samples/orchestrator/__init__.py → samples/agent/adk/orchestrator/__init__.py b/...thon/adk/samples/orchestrator/__init__.py → samples/agent/adk/orchestrator/__init__.py
diff --git a/...thon/adk/samples/orchestrator/__main__.py → samples/agent/adk/orchestrator/__main__.py b/...thon/adk/samples/orchestrator/__main__.py → samples/agent/adk/orchestrator/__main__.py
diff --git a/.../python/adk/samples/orchestrator/agent.py → samples/agent/adk/orchestrator/agent.py b/.../python/adk/samples/orchestrator/agent.py → samples/agent/adk/orchestrator/agent.py
diff --git a/...dk/samples/orchestrator/agent_executor.py → .../agent/adk/orchestrator/agent_executor.py b/...dk/samples/orchestrator/agent_executor.py → .../agent/adk/orchestrator/agent_executor.py
diff --git a/...k/samples/orchestrator/part_converters.py → ...agent/adk/orchestrator/part_converters.py b/...k/samples/orchestrator/part_converters.py → ...agent/adk/orchestrator/part_converters.py
diff --git a/...n/adk/samples/orchestrator/pyproject.toml → ...les/agent/adk/orchestrator/pyproject.toml b/...n/adk/samples/orchestrator/pyproject.toml → ...les/agent/adk/orchestrator/pyproject.toml
@@ -11,8 +11,8 @@ dependencies = [
     "google-genai>=1.27.0",
     "python-dotenv>=1.1.0",
     "litellm",
-    "a2ui",
     "jsonschema>=4.0.0",
+    "a2ui",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -22,6 +22,8 @@ packages = ["."]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.uv.sources]
-a2ui = { workspace = true }
 google-adk = { git = "https://github.com/google/adk-python.git", rev = "143ad44" }
diff --git a/...es/orchestrator/subagent_route_manager.py → ...dk/orchestrator/subagent_route_manager.py b/...es/orchestrator/subagent_route_manager.py → ...dk/orchestrator/subagent_route_manager.py
diff --git a/...s/python/adk/samples/orchestrator/uv.lock → samples/agent/adk/orchestrator/uv.lock b/...s/python/adk/samples/orchestrator/uv.lock → samples/agent/adk/orchestrator/uv.lock
diff --git a/samples/agent/adk/pyproject.toml b/samples/agent/adk/pyproject.toml
@@ -0,0 +1,6 @@
+[tool.uv.workspace]
+members = ["contact_lookup", "orchestrator", "restaurant_finder", "rizzcharts"]
+
+[tool.uv.sources]
+a2ui = { path = "../../../a2a_agents/python/a2ui_extension" }
+
diff --git a/...n/adk/samples/restaurant_finder/README.md → ...les/agent/adk/restaurant_finder/README.md b/...n/adk/samples/restaurant_finder/README.md → ...les/agent/adk/restaurant_finder/README.md
diff --git a/...adk/samples/restaurant_finder/__init__.py → ...s/agent/adk/restaurant_finder/__init__.py b/...adk/samples/restaurant_finder/__init__.py → ...s/agent/adk/restaurant_finder/__init__.py
diff --git a/...adk/samples/restaurant_finder/__main__.py → ...s/agent/adk/restaurant_finder/__main__.py b/...adk/samples/restaurant_finder/__main__.py → ...s/agent/adk/restaurant_finder/__main__.py
diff --git a/...amples/restaurant_finder/a2ui_examples.py → ...nt/adk/restaurant_finder/a2ui_examples.py b/...amples/restaurant_finder/a2ui_examples.py → ...nt/adk/restaurant_finder/a2ui_examples.py
diff --git a/...on/adk/samples/restaurant_finder/agent.py → samples/agent/adk/restaurant_finder/agent.py b/...on/adk/samples/restaurant_finder/agent.py → samples/agent/adk/restaurant_finder/agent.py
diff --git a/...mples/restaurant_finder/agent_executor.py → ...t/adk/restaurant_finder/agent_executor.py b/...mples/restaurant_finder/agent_executor.py → ...t/adk/restaurant_finder/agent_executor.py
diff --git a/...ant_finder/images/Spaghetti Carbonara.png → ...ant_finder/images/Spaghetti Carbonara.png b/...ant_finder/images/Spaghetti Carbonara.png → ...ant_finder/images/Spaghetti Carbonara.png
diff --git a/...estaurant_finder/images/beefbroccoli.jpeg → ...estaurant_finder/images/beefbroccoli.jpeg b/...estaurant_finder/images/beefbroccoli.jpeg → ...estaurant_finder/images/beefbroccoli.jpeg
diff --git a/...aurant_finder/images/classic tiramasu.png → ...aurant_finder/images/classic tiramasu.png b/...aurant_finder/images/classic tiramasu.png → ...aurant_finder/images/classic tiramasu.png
diff --git a/...nt_finder/images/italian restaurant 2.png → ...nt_finder/images/italian restaurant 2.png b/...nt_finder/images/italian restaurant 2.png → ...nt_finder/images/italian restaurant 2.png
diff --git a/...ant_finder/images/italian restaurant1.png → ...ant_finder/images/italian restaurant1.png b/...ant_finder/images/italian restaurant1.png → ...ant_finder/images/italian restaurant1.png
diff --git a/...les/restaurant_finder/images/italian1.png → ...adk/restaurant_finder/images/italian1.png b/...les/restaurant_finder/images/italian1.png → ...adk/restaurant_finder/images/italian1.png
diff --git a/...les/restaurant_finder/images/italian2.png → ...adk/restaurant_finder/images/italian2.png b/...les/restaurant_finder/images/italian2.png → ...adk/restaurant_finder/images/italian2.png
diff --git a/...les/restaurant_finder/images/italian3.png → ...adk/restaurant_finder/images/italian3.png b/...les/restaurant_finder/images/italian3.png → ...adk/restaurant_finder/images/italian3.png
diff --git a/...les/restaurant_finder/images/kungpao.jpeg → ...adk/restaurant_finder/images/kungpao.jpeg b/...les/restaurant_finder/images/kungpao.jpeg → ...adk/restaurant_finder/images/kungpao.jpeg
diff --git a/...ples/restaurant_finder/images/lasagna.png → .../adk/restaurant_finder/images/lasagna.png b/...ples/restaurant_finder/images/lasagna.png → .../adk/restaurant_finder/images/lasagna.png
diff --git a/...samples/restaurant_finder/images/logo.png → ...ent/adk/restaurant_finder/images/logo.png b/...samples/restaurant_finder/images/logo.png → ...ent/adk/restaurant_finder/images/logo.png
diff --git a/...es/restaurant_finder/images/mapotofu.jpeg → ...dk/restaurant_finder/images/mapotofu.jpeg b/...es/restaurant_finder/images/mapotofu.jpeg → ...dk/restaurant_finder/images/mapotofu.jpeg
diff --git a/...s/restaurant_finder/images/margharita.png → ...k/restaurant_finder/images/margharita.png b/...s/restaurant_finder/images/margharita.png → ...k/restaurant_finder/images/margharita.png
diff --git a/...taurant_finder/images/saffron risotto.png → ...taurant_finder/images/saffron risotto.png b/...taurant_finder/images/saffron risotto.png → ...taurant_finder/images/saffron risotto.png
diff --git a/...taurant_finder/images/shrimpchowmein.jpeg → ...taurant_finder/images/shrimpchowmein.jpeg b/...taurant_finder/images/shrimpchowmein.jpeg → ...taurant_finder/images/shrimpchowmein.jpeg
diff --git a/...restaurant_finder/images/springrolls.jpeg → ...restaurant_finder/images/springrolls.jpeg b/...restaurant_finder/images/springrolls.jpeg → ...restaurant_finder/images/springrolls.jpeg
diff --git a/...staurant_finder/images/sweetsourpork.jpeg → ...staurant_finder/images/sweetsourpork.jpeg b/...staurant_finder/images/sweetsourpork.jpeg → ...staurant_finder/images/sweetsourpork.jpeg
diff --git a/...estaurant_finder/images/vegfriedrice.jpeg → ...estaurant_finder/images/vegfriedrice.jpeg b/...estaurant_finder/images/vegfriedrice.jpeg → ...estaurant_finder/images/vegfriedrice.jpeg
diff --git a/...mples/restaurant_finder/prompt_builder.py → ...t/adk/restaurant_finder/prompt_builder.py b/...mples/restaurant_finder/prompt_builder.py → ...t/adk/restaurant_finder/prompt_builder.py
diff --git a/.../samples/restaurant_finder/pyproject.toml → ...gent/adk/restaurant_finder/pyproject.toml b/.../samples/restaurant_finder/pyproject.toml → ...gent/adk/restaurant_finder/pyproject.toml
@@ -11,8 +11,8 @@ dependencies = [
     "google-genai>=1.27.0",
     "python-dotenv>=1.1.0",
     "litellm",
-    "a2ui",
     "jsonschema>=4.0.0",
+    "a2ui",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -22,5 +22,5 @@ packages = ["."]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.uv.sources]
-a2ui = { workspace = true }
+[tool.hatch.metadata]
+allow-direct-references = true
diff --git a/...es/restaurant_finder/restaurant_data.json → ...dk/restaurant_finder/restaurant_data.json b/...es/restaurant_finder/restaurant_data.json → ...dk/restaurant_finder/restaurant_data.json
diff --git a/...on/adk/samples/restaurant_finder/tools.py → samples/agent/adk/restaurant_finder/tools.py b/...on/adk/samples/restaurant_finder/tools.py → samples/agent/adk/restaurant_finder/tools.py
diff --git a/...hon/adk/samples/restaurant_finder/uv.lock → samples/agent/adk/restaurant_finder/uv.lock b/...hon/adk/samples/restaurant_finder/uv.lock → samples/agent/adk/restaurant_finder/uv.lock
diff --git a/...s/python/adk/samples/rizzcharts/README.md → samples/agent/adk/rizzcharts/README.md b/...s/python/adk/samples/rizzcharts/README.md → samples/agent/adk/rizzcharts/README.md
@@ -13,7 +13,7 @@ This sample uses the Agent Development Kit (ADK) along with the A2A protocol to
 1. Navigate to the samples directory:
 
    ```bash
-   cd a2a_agents/python/adk/samples/rizzcharts
+   cd samples/agent/adk/rizzcharts
    ```
 
 2. Create an environment file with your API key:

diff --git a/...python/adk/samples/rizzcharts/__init__.py → samples/agent/adk/rizzcharts/__init__.py b/...python/adk/samples/rizzcharts/__init__.py → samples/agent/adk/rizzcharts/__init__.py
diff --git a/...python/adk/samples/rizzcharts/__main__.py → samples/agent/adk/rizzcharts/__main__.py b/...python/adk/samples/rizzcharts/__main__.py → samples/agent/adk/rizzcharts/__main__.py
diff --git a/...k/samples/rizzcharts/a2ui_session_util.py → ...agent/adk/rizzcharts/a2ui_session_util.py b/...k/samples/rizzcharts/a2ui_session_util.py → ...agent/adk/rizzcharts/a2ui_session_util.py
diff --git a/...on/adk/samples/rizzcharts/a2ui_toolset.py → samples/agent/adk/rizzcharts/a2ui_toolset.py b/...on/adk/samples/rizzcharts/a2ui_toolset.py → samples/agent/adk/rizzcharts/a2ui_toolset.py
diff --git a/...ts/python/adk/samples/rizzcharts/agent.py → samples/agent/adk/rizzcharts/agent.py b/...ts/python/adk/samples/rizzcharts/agent.py → samples/agent/adk/rizzcharts/agent.py
diff --git a/.../adk/samples/rizzcharts/agent_executor.py → ...es/agent/adk/rizzcharts/agent_executor.py b/.../adk/samples/rizzcharts/agent_executor.py → ...es/agent/adk/rizzcharts/agent_executor.py
diff --git a/...s/rizzcharts/component_catalog_builder.py → ...k/rizzcharts/component_catalog_builder.py b/...s/rizzcharts/component_catalog_builder.py → ...k/rizzcharts/component_catalog_builder.py
diff --git a/...ts/examples/rizzcharts_catalog/chart.json → ...ts/examples/rizzcharts_catalog/chart.json b/...ts/examples/rizzcharts_catalog/chart.json → ...ts/examples/rizzcharts_catalog/chart.json
diff --git a/...arts/examples/rizzcharts_catalog/map.json → ...arts/examples/rizzcharts_catalog/map.json b/...arts/examples/rizzcharts_catalog/map.json → ...arts/examples/rizzcharts_catalog/map.json
diff --git a/...arts/examples/standard_catalog/chart.json → ...arts/examples/standard_catalog/chart.json b/...arts/examples/standard_catalog/chart.json → ...arts/examples/standard_catalog/chart.json
diff --git a/...charts/examples/standard_catalog/map.json → ...charts/examples/standard_catalog/map.json b/...charts/examples/standard_catalog/map.json → ...charts/examples/standard_catalog/map.json
diff --git a/.../adk/samples/rizzcharts/part_converter.py → ...es/agent/adk/rizzcharts/part_converter.py b/.../adk/samples/rizzcharts/part_converter.py → ...es/agent/adk/rizzcharts/part_converter.py
diff --git a/...hon/adk/samples/rizzcharts/pyproject.toml → samples/agent/adk/rizzcharts/pyproject.toml b/...hon/adk/samples/rizzcharts/pyproject.toml → samples/agent/adk/rizzcharts/pyproject.toml
@@ -11,8 +11,8 @@ dependencies = [
     "google-genai>=1.27.0",
     "python-dotenv>=1.1.0",
     "litellm",
-    "a2ui",
     "jsonschema>=4.0.0",
+    "a2ui",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -22,5 +22,5 @@ packages = ["."]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.uv.sources]
-a2ui = { workspace = true }
+[tool.hatch.metadata]
+allow-direct-references = true
diff --git a/...charts/rizzcharts_catalog_definition.json → ...charts/rizzcharts_catalog_definition.json b/...charts/rizzcharts_catalog_definition.json → ...charts/rizzcharts_catalog_definition.json
diff --git a/...ts/python/adk/samples/rizzcharts/tools.py → samples/agent/adk/rizzcharts/tools.py b/...ts/python/adk/samples/rizzcharts/tools.py → samples/agent/adk/rizzcharts/tools.py
diff --git a/...nts/python/adk/samples/rizzcharts/uv.lock → samples/agent/adk/rizzcharts/uv.lock b/...nts/python/adk/samples/rizzcharts/uv.lock → samples/agent/adk/rizzcharts/uv.lock