diff --git a/agents-api/agents_api/models/tools/__init__.py b/agents-api/agents_api/models/tools/__init__.py
index 98f3a5e3a..b1775f1a9 100644
--- a/agents-api/agents_api/models/tools/__init__.py
+++ b/agents-api/agents_api/models/tools/__init__.py
@@ -14,6 +14,7 @@
 from .create_tools import create_tools
 from .delete_tool import delete_tool
 from .get_tool import get_tool
+from .get_tool_args_from_metadata import get_tool_args_from_metadata
 from .list_tools import list_tools
 from .patch_tool import patch_tool
 from .update_tool import update_tool
diff --git a/agents-api/agents_api/models/tools/get_tool_args_from_metadata.py b/agents-api/agents_api/models/tools/get_tool_args_from_metadata.py
new file mode 100644
index 000000000..08882ae6f
--- /dev/null
+++ b/agents-api/agents_api/models/tools/get_tool_args_from_metadata.py
@@ -0,0 +1,126 @@
+from uuid import UUID
+
+from beartype import beartype
+from fastapi import HTTPException
+from pycozo.client import QueryException
+from pydantic import ValidationError
+
+from ..utils import (
+    cozo_query,
+    partialclass,
+    rewrap_exceptions,
+    verify_developer_id_query,
+    verify_developer_owns_resource_query,
+    wrap_in_class,
+)
+
+
+def tool_args_for_task(
+    *,
+    developer_id: UUID,
+    agent_id: UUID,
+    task_id: UUID,
+) -> tuple[list[str], dict]:
+    agent_id = str(agent_id)
+    task_id = str(task_id)
+
+    get_query = """
+        input[agent_id, task_id] <- [[to_uuid($agent_id), to_uuid($task_id)]]
+
+        ?[args] :=
+            input[agent_id, task_id],
+            *tasks {
+                task_id,
+                metadata: task_metadata,
+            },
+            *agents {
+                agent_id,
+                metadata: agent_metadata,
+            },
+            task_args = get(task_metadata, "x-tool-args", {}),
+            agent_args = get(agent_metadata, "x-tool-args", {}),
+
+            # Right values overwrite left values
+            # See: https://docs.cozodb.org/en/latest/functions.html#Func.Vector.concat
+            args = concat(agent_args, task_args),
+    """
+
+    queries = [
+        verify_developer_id_query(developer_id),
+        verify_developer_owns_resource_query(
+            developer_id, "tasks", task_id=task_id, parents=[("agents", "agent_id")]
+        ),
+        get_query,
+    ]
+
+    return (queries, {"agent_id": agent_id, "task_id": task_id})
+
+
+def tool_args_for_session(
+    *,
+    developer_id: UUID,
+    session_id: UUID,
+    agent_id: UUID,
+) -> tuple[list[str], dict]:
+    session_id = str(session_id)
+
+    get_query = """
+        input[session_id, agent_id] <- [[to_uuid($session_id), to_uuid($agent_id)]]
+
+        ?[args] :=
+            input[session_id, agent_id],
+            *sessions {
+                session_id,
+                metadata: session_metadata,
+            },
+            *agents {
+                agent_id,
+                metadata: agent_metadata,
+            },
+            session_args = get(session_metadata, "x-tool-args"),
+            agent_args = get(agent_metadata, "x-tool-args"),
+
+            # Right values overwrite left values
+            # See: https://docs.cozodb.org/en/latest/functions.html#Func.Vector.concat
+            args = concat(agent_args, session_args),  
+    """
+
+    queries = [
+        verify_developer_id_query(developer_id),
+        verify_developer_owns_resource_query(
+            developer_id, "sessions", session_id=session_id
+        ),
+        get_query,
+    ]
+
+    return (queries, {"agent_id": agent_id, "session_id": session_id})
+
+
+@rewrap_exceptions(
+    {
+        QueryException: partialclass(HTTPException, status_code=400),
+        ValidationError: partialclass(HTTPException, status_code=400),
+        TypeError: partialclass(HTTPException, status_code=400),
+    }
+)
+@wrap_in_class(dict, transform=lambda x: x["args"], one=True)
+@cozo_query
+@beartype
+def get_tool_args_from_metadata(
+    *,
+    developer_id: UUID,
+    agent_id: UUID,
+    session_id: UUID | None = None,
+    task_id: UUID | None = None,
+) -> tuple[list[str], dict]:
+    match session_id, task_id:
+        case (None, task_id) if task_id is not None:
+            return tool_args_for_task(
+                developer_id=developer_id, agent_id=agent_id, task_id=task_id
+            )
+        case (session_id, None) if session_id is not None:
+            return tool_args_for_session(
+                developer_id=developer_id, agent_id=agent_id, session_id=session_id
+            )
+        case (_, _):
+            raise ValueError("Either session_id or task_id must be provided")