diff --git a/examples/tutorials/10_agentic/00_base/040_other_sdks/project/acp.py b/examples/tutorials/10_agentic/00_base/040_other_sdks/project/acp.py
index 3ca3b2150..3e6467ac7 100644
--- a/examples/tutorials/10_agentic/00_base/040_other_sdks/project/acp.py
+++ b/examples/tutorials/10_agentic/00_base/040_other_sdks/project/acp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import json
 from typing import Dict, List, Optional
diff --git a/examples/tutorials/10_agentic/00_base/080_batch_events/dev.ipynb b/examples/tutorials/10_agentic/00_base/080_batch_events/dev.ipynb
index b0ad98d92..5bb98625c 100644
--- a/examples/tutorials/10_agentic/00_base/080_batch_events/dev.ipynb
+++ b/examples/tutorials/10_agentic/00_base/080_batch_events/dev.ipynb
@@ -7,6 +7,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from __future__ import annotations\n",
+    "\n",
     "from agentex import Agentex\n",
     "\n",
     "client = Agentex(base_url=\"http://localhost:5003\")"
diff --git a/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/orchestrator.py b/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/orchestrator.py
index 5000f8c3d..8f1f74224 100644
--- a/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/orchestrator.py
+++ b/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/orchestrator.py
@@ -1,4 +1,5 @@
 # Orchestrator Agent - Coordinates the multi-agent content creation workflow
+from __future__ import annotations
 
 import sys
 import json
diff --git a/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/state_machines/content_workflow.py b/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/state_machines/content_workflow.py
index 1a042ef24..389b05751 100644
--- a/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/state_machines/content_workflow.py
+++ b/examples/tutorials/10_agentic/00_base/090_multi_agent_non_temporal/project/state_machines/content_workflow.py
@@ -1,4 +1,6 @@
 # ruff: noqa: ARG002
+from __future__ import annotations
+
 import json
 import asyncio
 from enum import Enum
diff --git a/examples/tutorials/10_agentic/10_temporal/020_state_machine/project/workflows/deep_research/waiting_for_user_input.py b/examples/tutorials/10_agentic/10_temporal/020_state_machine/project/workflows/deep_research/waiting_for_user_input.py
index 2520771ab..842c5c423 100644
--- a/examples/tutorials/10_agentic/10_temporal/020_state_machine/project/workflows/deep_research/waiting_for_user_input.py
+++ b/examples/tutorials/10_agentic/10_temporal/020_state_machine/project/workflows/deep_research/waiting_for_user_input.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import override
 
 from temporalio import workflow
diff --git a/examples/tutorials/10_agentic/10_temporal/050_agent_chat_guardrails/project/workflow.py b/examples/tutorials/10_agentic/10_temporal/050_agent_chat_guardrails/project/workflow.py
index 066359c26..c6d2f11ff 100644
--- a/examples/tutorials/10_agentic/10_temporal/050_agent_chat_guardrails/project/workflow.py
+++ b/examples/tutorials/10_agentic/10_temporal/050_agent_chat_guardrails/project/workflow.py
@@ -1,4 +1,6 @@
 # ruff: noqa: ARG001
+from __future__ import annotations
+
 import os
 import json
 from typing import Any, Dict, List, override
diff --git a/src/agentex/lib/adk/_modules/acp.py b/src/agentex/lib/adk/_modules/acp.py
index 7627a9e05..0c8cff05a 100644
--- a/src/agentex/lib/adk/_modules/acp.py
+++ b/src/agentex/lib/adk/_modules/acp.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from datetime import timedelta
 from typing import Any, List
 
diff --git a/src/agentex/lib/adk/_modules/agent_task_tracker.py b/src/agentex/lib/adk/_modules/agent_task_tracker.py
index b978efce3..733372ec7 100644
--- a/src/agentex/lib/adk/_modules/agent_task_tracker.py
+++ b/src/agentex/lib/adk/_modules/agent_task_tracker.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
diff --git a/src/agentex/lib/adk/_modules/events.py b/src/agentex/lib/adk/_modules/events.py
index f2b4831b3..4995ae172 100644
--- a/src/agentex/lib/adk/_modules/events.py
+++ b/src/agentex/lib/adk/_modules/events.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
diff --git a/src/agentex/lib/adk/_modules/messages.py b/src/agentex/lib/adk/_modules/messages.py
index ad4d5b892..e81749b9a 100644
--- a/src/agentex/lib/adk/_modules/messages.py
+++ b/src/agentex/lib/adk/_modules/messages.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
diff --git a/src/agentex/lib/adk/_modules/state.py b/src/agentex/lib/adk/_modules/state.py
index c3e1b2e03..a5a343e92 100644
--- a/src/agentex/lib/adk/_modules/state.py
+++ b/src/agentex/lib/adk/_modules/state.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from datetime import timedelta
 from typing import Any
 
diff --git a/src/agentex/lib/adk/_modules/streaming.py b/src/agentex/lib/adk/_modules/streaming.py
index 9f293fec5..ab53ed68c 100644
--- a/src/agentex/lib/adk/_modules/streaming.py
+++ b/src/agentex/lib/adk/_modules/streaming.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from temporalio.common import RetryPolicy
 
 from agentex import AsyncAgentex  # noqa: F401
diff --git a/src/agentex/lib/adk/_modules/tasks.py b/src/agentex/lib/adk/_modules/tasks.py
index 202b012ee..10c6405d3 100644
--- a/src/agentex/lib/adk/_modules/tasks.py
+++ b/src/agentex/lib/adk/_modules/tasks.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from datetime import timedelta
 
 from temporalio.common import RetryPolicy
diff --git a/src/agentex/lib/adk/_modules/tracing.py b/src/agentex/lib/adk/_modules/tracing.py
index 0b16b127e..93fd2365e 100644
--- a/src/agentex/lib/adk/_modules/tracing.py
+++ b/src/agentex/lib/adk/_modules/tracing.py
@@ -1,5 +1,6 @@
 # ruff: noqa: I001
 # Import order matters - AsyncTracer must come after client import to avoid circular imports
+from __future__ import annotations
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 from datetime import timedelta
diff --git a/src/agentex/lib/adk/providers/_modules/litellm.py b/src/agentex/lib/adk/providers/_modules/litellm.py
index a127e0e7f..de19c1d32 100644
--- a/src/agentex/lib/adk/providers/_modules/litellm.py
+++ b/src/agentex/lib/adk/providers/_modules/litellm.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import timedelta
 from collections.abc import AsyncGenerator
 
diff --git a/src/agentex/lib/adk/providers/_modules/openai.py b/src/agentex/lib/adk/providers/_modules/openai.py
index d2e0b34d0..ac9f7907c 100644
--- a/src/agentex/lib/adk/providers/_modules/openai.py
+++ b/src/agentex/lib/adk/providers/_modules/openai.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Literal
 from datetime import timedelta
 
diff --git a/src/agentex/lib/adk/providers/_modules/sgp.py b/src/agentex/lib/adk/providers/_modules/sgp.py
index 3917ddde5..e57e75e19 100644
--- a/src/agentex/lib/adk/providers/_modules/sgp.py
+++ b/src/agentex/lib/adk/providers/_modules/sgp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import timedelta
 
 from scale_gp import SGPClient, SGPClientError
diff --git a/src/agentex/lib/adk/utils/_modules/templating.py b/src/agentex/lib/adk/utils/_modules/templating.py
index 578435052..29e6b6b2b 100644
--- a/src/agentex/lib/adk/utils/_modules/templating.py
+++ b/src/agentex/lib/adk/utils/_modules/templating.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 from datetime import timedelta
 
diff --git a/src/agentex/lib/cli/commands/agents.py b/src/agentex/lib/cli/commands/agents.py
index eac8a7f40..18d7812a0 100644
--- a/src/agentex/lib/cli/commands/agents.py
+++ b/src/agentex/lib/cli/commands/agents.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import builtins
 from pathlib import Path
 
diff --git a/src/agentex/lib/cli/commands/init.py b/src/agentex/lib/cli/commands/init.py
index a9699665f..38398f304 100644
--- a/src/agentex/lib/cli/commands/init.py
+++ b/src/agentex/lib/cli/commands/init.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any, Dict
 from pathlib import Path
diff --git a/src/agentex/lib/cli/commands/secrets.py b/src/agentex/lib/cli/commands/secrets.py
index 741b7e8e2..ee5e5477e 100644
--- a/src/agentex/lib/cli/commands/secrets.py
+++ b/src/agentex/lib/cli/commands/secrets.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 
 import typer
diff --git a/src/agentex/lib/cli/commands/uv.py b/src/agentex/lib/cli/commands/uv.py
index 592155b8a..e192b0e53 100644
--- a/src/agentex/lib/cli/commands/uv.py
+++ b/src/agentex/lib/cli/commands/uv.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import sys
 import subprocess
diff --git a/src/agentex/lib/cli/handlers/deploy_handlers.py b/src/agentex/lib/cli/handlers/deploy_handlers.py
index 775897fb4..1ff4f4e30 100644
--- a/src/agentex/lib/cli/handlers/deploy_handlers.py
+++ b/src/agentex/lib/cli/handlers/deploy_handlers.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import tempfile
 import subprocess
diff --git a/src/agentex/lib/cli/handlers/run_handlers.py b/src/agentex/lib/cli/handlers/run_handlers.py
index 718808924..8c59a72a9 100644
--- a/src/agentex/lib/cli/handlers/run_handlers.py
+++ b/src/agentex/lib/cli/handlers/run_handlers.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import sys
 import asyncio
diff --git a/src/agentex/lib/cli/handlers/secret_handlers.py b/src/agentex/lib/cli/handlers/secret_handlers.py
index da5bbef51..c424de0ec 100644
--- a/src/agentex/lib/cli/handlers/secret_handlers.py
+++ b/src/agentex/lib/cli/handlers/secret_handlers.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import base64
 from typing import Any
diff --git a/src/agentex/lib/cli/utils/auth_utils.py b/src/agentex/lib/cli/utils/auth_utils.py
index e572f9e0b..a323d1e25 100644
--- a/src/agentex/lib/cli/utils/auth_utils.py
+++ b/src/agentex/lib/cli/utils/auth_utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import base64
 from typing import Any, Dict
diff --git a/src/agentex/lib/cli/utils/cli_utils.py b/src/agentex/lib/cli/utils/cli_utils.py
index 46be43759..43b3fba62 100644
--- a/src/agentex/lib/cli/utils/cli_utils.py
+++ b/src/agentex/lib/cli/utils/cli_utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import typer
 from rich.console import Console
 
diff --git a/src/agentex/lib/cli/utils/kubectl_utils.py b/src/agentex/lib/cli/utils/kubectl_utils.py
index c271acc66..4213233cd 100644
--- a/src/agentex/lib/cli/utils/kubectl_utils.py
+++ b/src/agentex/lib/cli/utils/kubectl_utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 
 from kubernetes import client, config
diff --git a/src/agentex/lib/cli/utils/kubernetes_secrets_utils.py b/src/agentex/lib/cli/utils/kubernetes_secrets_utils.py
index a96d8dc42..0a67a31e4 100644
--- a/src/agentex/lib/cli/utils/kubernetes_secrets_utils.py
+++ b/src/agentex/lib/cli/utils/kubernetes_secrets_utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import base64
 
 from kubernetes import client
diff --git a/src/agentex/lib/cli/utils/path_utils.py b/src/agentex/lib/cli/utils/path_utils.py
index 6217ead7f..7aee3a65d 100644
--- a/src/agentex/lib/cli/utils/path_utils.py
+++ b/src/agentex/lib/cli/utils/path_utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Dict
 from pathlib import Path
 
diff --git a/src/agentex/lib/core/adapters/llm/adapter_sgp.py b/src/agentex/lib/core/adapters/llm/adapter_sgp.py
index 0920a02e4..31098246e 100644
--- a/src/agentex/lib/core/adapters/llm/adapter_sgp.py
+++ b/src/agentex/lib/core/adapters/llm/adapter_sgp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 from typing import override
 from collections.abc import Generator, AsyncGenerator
diff --git a/src/agentex/lib/core/adapters/streams/adapter_redis.py b/src/agentex/lib/core/adapters/streams/adapter_redis.py
index 51967a942..7b355ee94 100644
--- a/src/agentex/lib/core/adapters/streams/adapter_redis.py
+++ b/src/agentex/lib/core/adapters/streams/adapter_redis.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import json
 import asyncio
diff --git a/src/agentex/lib/core/adapters/streams/port.py b/src/agentex/lib/core/adapters/streams/port.py
index b2e58cd5e..31b5eda61 100644
--- a/src/agentex/lib/core/adapters/streams/port.py
+++ b/src/agentex/lib/core/adapters/streams/port.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from typing import Any
 from collections.abc import AsyncIterator
diff --git a/src/agentex/lib/core/clients/temporal/temporal_client.py b/src/agentex/lib/core/clients/temporal/temporal_client.py
index bdf118103..76b419b2b 100644
--- a/src/agentex/lib/core/clients/temporal/temporal_client.py
+++ b/src/agentex/lib/core/clients/temporal/temporal_client.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 from datetime import timedelta
 from collections.abc import Callable
diff --git a/src/agentex/lib/core/clients/temporal/types.py b/src/agentex/lib/core/clients/temporal/types.py
index 4cd912ae6..8ce596d77 100644
--- a/src/agentex/lib/core/clients/temporal/types.py
+++ b/src/agentex/lib/core/clients/temporal/types.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from datetime import timedelta
 
diff --git a/src/agentex/lib/core/clients/temporal/utils.py b/src/agentex/lib/core/clients/temporal/utils.py
index 26bb122ef..ffdb04b64 100644
--- a/src/agentex/lib/core/clients/temporal/utils.py
+++ b/src/agentex/lib/core/clients/temporal/utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from temporalio.client import Client, Plugin as ClientPlugin
diff --git a/src/agentex/lib/core/services/adk/acp/acp.py b/src/agentex/lib/core/services/adk/acp/acp.py
index 5ba3e39f9..956e1b5db 100644
--- a/src/agentex/lib/core/services/adk/acp/acp.py
+++ b/src/agentex/lib/core/services/adk/acp/acp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, List, cast
 
 from agentex import AsyncAgentex
diff --git a/src/agentex/lib/core/services/adk/agent_task_tracker.py b/src/agentex/lib/core/services/adk/agent_task_tracker.py
index d7f2e1b81..54ee4f72f 100644
--- a/src/agentex/lib/core/services/adk/agent_task_tracker.py
+++ b/src/agentex/lib/core/services/adk/agent_task_tracker.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from agentex import AsyncAgentex
 from agentex.lib.utils.logging import make_logger
 from agentex.lib.core.tracing.tracer import AsyncTracer
diff --git a/src/agentex/lib/core/services/adk/events.py b/src/agentex/lib/core/services/adk/events.py
index 713c83498..fbed9e5af 100644
--- a/src/agentex/lib/core/services/adk/events.py
+++ b/src/agentex/lib/core/services/adk/events.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from agentex import AsyncAgentex
 from agentex.types.event import Event
 from agentex.lib.utils.logging import make_logger
diff --git a/src/agentex/lib/core/services/adk/messages.py b/src/agentex/lib/core/services/adk/messages.py
index 4a4183f2a..ef1a13449 100644
--- a/src/agentex/lib/core/services/adk/messages.py
+++ b/src/agentex/lib/core/services/adk/messages.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 from typing import Any, Coroutine
 
diff --git a/src/agentex/lib/core/services/adk/providers/litellm.py b/src/agentex/lib/core/services/adk/providers/litellm.py
index 1ff24343d..5df03f4f0 100644
--- a/src/agentex/lib/core/services/adk/providers/litellm.py
+++ b/src/agentex/lib/core/services/adk/providers/litellm.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import AsyncGenerator
 
 from agentex import AsyncAgentex
diff --git a/src/agentex/lib/core/services/adk/providers/openai.py b/src/agentex/lib/core/services/adk/providers/openai.py
index e70c2d047..82d420a87 100644
--- a/src/agentex/lib/core/services/adk/providers/openai.py
+++ b/src/agentex/lib/core/services/adk/providers/openai.py
@@ -1,4 +1,6 @@
 # Standard library imports
+from __future__ import annotations
+
 from typing import Any, Literal
 from contextlib import AsyncExitStack, asynccontextmanager
 
diff --git a/src/agentex/lib/core/services/adk/providers/sgp.py b/src/agentex/lib/core/services/adk/providers/sgp.py
index dce8ecff5..69f765aa7 100644
--- a/src/agentex/lib/core/services/adk/providers/sgp.py
+++ b/src/agentex/lib/core/services/adk/providers/sgp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import base64
 import tempfile
diff --git a/src/agentex/lib/core/services/adk/state.py b/src/agentex/lib/core/services/adk/state.py
index 49ae18251..6b8364530 100644
--- a/src/agentex/lib/core/services/adk/state.py
+++ b/src/agentex/lib/core/services/adk/state.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Dict
 
 from agentex import AsyncAgentex
diff --git a/src/agentex/lib/core/services/adk/streaming.py b/src/agentex/lib/core/services/adk/streaming.py
index 4fa9f8b36..9fc3fc959 100644
--- a/src/agentex/lib/core/services/adk/streaming.py
+++ b/src/agentex/lib/core/services/adk/streaming.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from typing import Literal
 
diff --git a/src/agentex/lib/core/services/adk/tasks.py b/src/agentex/lib/core/services/adk/tasks.py
index 6c3ff7df4..0d85aa577 100644
--- a/src/agentex/lib/core/services/adk/tasks.py
+++ b/src/agentex/lib/core/services/adk/tasks.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from agentex import AsyncAgentex
 from agentex.types.task import Task
 from agentex.types.shared import DeleteResponse
diff --git a/src/agentex/lib/core/services/adk/tracing.py b/src/agentex/lib/core/services/adk/tracing.py
index f14cbc120..7e55c7501 100644
--- a/src/agentex/lib/core/services/adk/tracing.py
+++ b/src/agentex/lib/core/services/adk/tracing.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from agentex.types.span import Span
diff --git a/src/agentex/lib/core/services/adk/utils/templating.py b/src/agentex/lib/core/services/adk/utils/templating.py
index 032aac279..1cd0ebbfc 100644
--- a/src/agentex/lib/core/services/adk/utils/templating.py
+++ b/src/agentex/lib/core/services/adk/utils/templating.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 from datetime import datetime
 
diff --git a/src/agentex/lib/core/temporal/activities/activity_helpers.py b/src/agentex/lib/core/temporal/activities/activity_helpers.py
index ca812479d..53ec3a451 100644
--- a/src/agentex/lib/core/temporal/activities/activity_helpers.py
+++ b/src/agentex/lib/core/temporal/activities/activity_helpers.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, TypeVar
 from datetime import timedelta
 
diff --git a/src/agentex/lib/core/temporal/activities/adk/acp/acp_activities.py b/src/agentex/lib/core/temporal/activities/adk/acp/acp_activities.py
index d3739f4d4..634892ec5 100644
--- a/src/agentex/lib/core/temporal/activities/adk/acp/acp_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/acp/acp_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any, List
 
diff --git a/src/agentex/lib/core/temporal/activities/adk/agent_task_tracker_activities.py b/src/agentex/lib/core/temporal/activities/adk/agent_task_tracker_activities.py
index a88520e7a..e20e4dd1d 100644
--- a/src/agentex/lib/core/temporal/activities/adk/agent_task_tracker_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/agent_task_tracker_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 
 from temporalio import activity
diff --git a/src/agentex/lib/core/temporal/activities/adk/agents_activities.py b/src/agentex/lib/core/temporal/activities/adk/agents_activities.py
index 590bcfbf6..7b7e2b7af 100644
--- a/src/agentex/lib/core/temporal/activities/adk/agents_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/agents_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Optional
 
diff --git a/src/agentex/lib/core/temporal/activities/adk/events_activities.py b/src/agentex/lib/core/temporal/activities/adk/events_activities.py
index 76d64d0d2..59d5b3601 100644
--- a/src/agentex/lib/core/temporal/activities/adk/events_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/events_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 
 from temporalio import activity
diff --git a/src/agentex/lib/core/temporal/activities/adk/messages_activities.py b/src/agentex/lib/core/temporal/activities/adk/messages_activities.py
index a61849dbd..69e2d7aba 100644
--- a/src/agentex/lib/core/temporal/activities/adk/messages_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/messages_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 
 from temporalio import activity
diff --git a/src/agentex/lib/core/temporal/activities/adk/providers/litellm_activities.py b/src/agentex/lib/core/temporal/activities/adk/providers/litellm_activities.py
index 492ee305e..3252769b5 100644
--- a/src/agentex/lib/core/temporal/activities/adk/providers/litellm_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/providers/litellm_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 
 from temporalio import activity
diff --git a/src/agentex/lib/core/temporal/activities/adk/providers/openai_activities.py b/src/agentex/lib/core/temporal/activities/adk/providers/openai_activities.py
index 39b6f0bdb..be20c99c2 100644
--- a/src/agentex/lib/core/temporal/activities/adk/providers/openai_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/providers/openai_activities.py
@@ -1,4 +1,6 @@
 # Standard library imports
+from __future__ import annotations
+
 import base64
 from enum import Enum
 from typing import Any, Literal, Optional
diff --git a/src/agentex/lib/core/temporal/activities/adk/state_activities.py b/src/agentex/lib/core/temporal/activities/adk/state_activities.py
index f16a8cf79..4eaf83fb2 100644
--- a/src/agentex/lib/core/temporal/activities/adk/state_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/state_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any
 
diff --git a/src/agentex/lib/core/temporal/activities/adk/streaming_activities.py b/src/agentex/lib/core/temporal/activities/adk/streaming_activities.py
index bc54c4dd5..2d9faf352 100644
--- a/src/agentex/lib/core/temporal/activities/adk/streaming_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/streaming_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 
 from temporalio import activity
diff --git a/src/agentex/lib/core/temporal/activities/adk/tasks_activities.py b/src/agentex/lib/core/temporal/activities/adk/tasks_activities.py
index db00a9998..f1b508c34 100644
--- a/src/agentex/lib/core/temporal/activities/adk/tasks_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/tasks_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 
 from temporalio import activity
diff --git a/src/agentex/lib/core/temporal/activities/adk/tracing_activities.py b/src/agentex/lib/core/temporal/activities/adk/tracing_activities.py
index 3f0121081..65afcded0 100644
--- a/src/agentex/lib/core/temporal/activities/adk/tracing_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/tracing_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any
 
diff --git a/src/agentex/lib/core/temporal/activities/adk/utils/templating_activities.py b/src/agentex/lib/core/temporal/activities/adk/utils/templating_activities.py
index a91c89638..a2cc4ff10 100644
--- a/src/agentex/lib/core/temporal/activities/adk/utils/templating_activities.py
+++ b/src/agentex/lib/core/temporal/activities/adk/utils/templating_activities.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any
 
diff --git a/src/agentex/lib/core/temporal/services/temporal_task_service.py b/src/agentex/lib/core/temporal/services/temporal_task_service.py
index 2e6be3474..c95217191 100644
--- a/src/agentex/lib/core/temporal/services/temporal_task_service.py
+++ b/src/agentex/lib/core/temporal/services/temporal_task_service.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from agentex.types.task import Task
diff --git a/src/agentex/lib/core/temporal/workers/worker.py b/src/agentex/lib/core/temporal/workers/worker.py
index 4a8fee9ec..6a92d3051 100644
--- a/src/agentex/lib/core/temporal/workers/worker.py
+++ b/src/agentex/lib/core/temporal/workers/worker.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import uuid
 import datetime
diff --git a/src/agentex/lib/core/tracing/trace.py b/src/agentex/lib/core/tracing/trace.py
index 0d0988f24..2ba1d489e 100644
--- a/src/agentex/lib/core/tracing/trace.py
+++ b/src/agentex/lib/core/tracing/trace.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import uuid
 import asyncio
 from typing import Any, AsyncGenerator
diff --git a/src/agentex/lib/core/tracing/tracer.py b/src/agentex/lib/core/tracing/tracer.py
index b9aa4ff55..da77bec95 100644
--- a/src/agentex/lib/core/tracing/tracer.py
+++ b/src/agentex/lib/core/tracing/tracer.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from agentex import Agentex, AsyncAgentex
 from agentex.lib.core.tracing.trace import Trace, AsyncTrace
 from agentex.lib.core.tracing.tracing_processor_manager import (
diff --git a/src/agentex/lib/core/tracing/tracing_processor_manager.py b/src/agentex/lib/core/tracing/tracing_processor_manager.py
index d6d9d8847..14b0ce39b 100644
--- a/src/agentex/lib/core/tracing/tracing_processor_manager.py
+++ b/src/agentex/lib/core/tracing/tracing_processor_manager.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 from threading import Lock
 
diff --git a/src/agentex/lib/sdk/config/agent_config.py b/src/agentex/lib/sdk/config/agent_config.py
index 288bb3a7a..7651cb753 100644
--- a/src/agentex/lib/sdk/config/agent_config.py
+++ b/src/agentex/lib/sdk/config/agent_config.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Literal
 
 from pydantic import Field
diff --git a/src/agentex/lib/sdk/config/build_config.py b/src/agentex/lib/sdk/config/build_config.py
index 5b8d994bb..96a7f92e5 100644
--- a/src/agentex/lib/sdk/config/build_config.py
+++ b/src/agentex/lib/sdk/config/build_config.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pydantic import Field
 
 from agentex.lib.utils.model_utils import BaseModel
diff --git a/src/agentex/lib/sdk/config/deployment_config.py b/src/agentex/lib/sdk/config/deployment_config.py
index 0d6c4e4e5..1ba5b348f 100644
--- a/src/agentex/lib/sdk/config/deployment_config.py
+++ b/src/agentex/lib/sdk/config/deployment_config.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Dict
 
 from pydantic import Field
diff --git a/src/agentex/lib/sdk/config/local_development_config.py b/src/agentex/lib/sdk/config/local_development_config.py
index 72532c6f5..061500ab7 100644
--- a/src/agentex/lib/sdk/config/local_development_config.py
+++ b/src/agentex/lib/sdk/config/local_development_config.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 
 from pydantic import Field, validator
diff --git a/src/agentex/lib/sdk/config/project_config.py b/src/agentex/lib/sdk/config/project_config.py
index b9b8df6b6..0621ae37a 100644
--- a/src/agentex/lib/sdk/config/project_config.py
+++ b/src/agentex/lib/sdk/config/project_config.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import re
 from typing import Any, TypeVar
diff --git a/src/agentex/lib/sdk/config/validation.py b/src/agentex/lib/sdk/config/validation.py
index 4395c93db..4b00a682c 100644
--- a/src/agentex/lib/sdk/config/validation.py
+++ b/src/agentex/lib/sdk/config/validation.py
@@ -4,6 +4,7 @@
 This module provides validation functions for agent configurations,
 with clear error messages and best practices enforcement.
 """
+from __future__ import annotations
 
 from typing import Any, Dict, List, Optional
 from pathlib import Path
diff --git a/src/agentex/lib/sdk/fastacp/base/base_acp_server.py b/src/agentex/lib/sdk/fastacp/base/base_acp_server.py
index ad04d2a71..42fc15200 100644
--- a/src/agentex/lib/sdk/fastacp/base/base_acp_server.py
+++ b/src/agentex/lib/sdk/fastacp/base/base_acp_server.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import uuid
 import asyncio
 import inspect
diff --git a/src/agentex/lib/sdk/fastacp/fastacp.py b/src/agentex/lib/sdk/fastacp/fastacp.py
index ddcb3603f..fd9433828 100644
--- a/src/agentex/lib/sdk/fastacp/fastacp.py
+++ b/src/agentex/lib/sdk/fastacp/fastacp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import inspect
 from typing import Literal
diff --git a/src/agentex/lib/sdk/fastacp/impl/sync_acp.py b/src/agentex/lib/sdk/fastacp/impl/sync_acp.py
index 1e3485dff..4898a9637 100644
--- a/src/agentex/lib/sdk/fastacp/impl/sync_acp.py
+++ b/src/agentex/lib/sdk/fastacp/impl/sync_acp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, override
 from collections.abc import AsyncGenerator
 
diff --git a/src/agentex/lib/sdk/fastacp/impl/temporal_acp.py b/src/agentex/lib/sdk/fastacp/impl/temporal_acp.py
index efce91d6d..698c4055f 100644
--- a/src/agentex/lib/sdk/fastacp/impl/temporal_acp.py
+++ b/src/agentex/lib/sdk/fastacp/impl/temporal_acp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Callable, AsyncGenerator, override
 from contextlib import asynccontextmanager
 
diff --git a/src/agentex/lib/sdk/fastacp/tests/conftest.py b/src/agentex/lib/sdk/fastacp/tests/conftest.py
index 8b75cf2ee..e0460659a 100644
--- a/src/agentex/lib/sdk/fastacp/tests/conftest.py
+++ b/src/agentex/lib/sdk/fastacp/tests/conftest.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 import socket
 import asyncio
diff --git a/src/agentex/lib/sdk/state_machine/noop_workflow.py b/src/agentex/lib/sdk/state_machine/noop_workflow.py
index e43f820f9..a7c54cfb9 100644
--- a/src/agentex/lib/sdk/state_machine/noop_workflow.py
+++ b/src/agentex/lib/sdk/state_machine/noop_workflow.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import TYPE_CHECKING, override
 
 from pydantic import BaseModel
diff --git a/src/agentex/lib/sdk/state_machine/state_machine.py b/src/agentex/lib/sdk/state_machine/state_machine.py
index 18736650f..6f2acded7 100644
--- a/src/agentex/lib/sdk/state_machine/state_machine.py
+++ b/src/agentex/lib/sdk/state_machine/state_machine.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from typing import Any, Generic, TypeVar
 
diff --git a/src/agentex/lib/sdk/state_machine/state_workflow.py b/src/agentex/lib/sdk/state_machine/state_workflow.py
index 403d23cd9..cca7f46ad 100644
--- a/src/agentex/lib/sdk/state_machine/state_workflow.py
+++ b/src/agentex/lib/sdk/state_machine/state_workflow.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING
 
diff --git a/src/agentex/lib/sdk/utils/messages.py b/src/agentex/lib/sdk/utils/messages.py
index 91edeb608..bddd81050 100644
--- a/src/agentex/lib/sdk/utils/messages.py
+++ b/src/agentex/lib/sdk/utils/messages.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from abc import ABC, abstractmethod
 from typing import Any, Literal, override
diff --git a/src/agentex/lib/types/acp.py b/src/agentex/lib/types/acp.py
index 67fa132eb..d719b4fd5 100644
--- a/src/agentex/lib/types/acp.py
+++ b/src/agentex/lib/types/acp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from enum import Enum
 from typing import Any
 
diff --git a/src/agentex/lib/types/agent_configs.py b/src/agentex/lib/types/agent_configs.py
index 806136de5..7a3a0f091 100644
--- a/src/agentex/lib/types/agent_configs.py
+++ b/src/agentex/lib/types/agent_configs.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pydantic import Field, BaseModel, validator, model_validator
 
 
diff --git a/src/agentex/lib/types/agent_results.py b/src/agentex/lib/types/agent_results.py
index 9b3703e0c..909593c18 100644
--- a/src/agentex/lib/types/agent_results.py
+++ b/src/agentex/lib/types/agent_results.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from pydantic import BaseModel
diff --git a/src/agentex/lib/types/converters.py b/src/agentex/lib/types/converters.py
index 1114b74c2..1e3676b55 100644
--- a/src/agentex/lib/types/converters.py
+++ b/src/agentex/lib/types/converters.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 from agents import TResponseInputItem
diff --git a/src/agentex/lib/types/fastacp.py b/src/agentex/lib/types/fastacp.py
index 6b3dfa476..5a2428ad4 100644
--- a/src/agentex/lib/types/fastacp.py
+++ b/src/agentex/lib/types/fastacp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Literal
 
 from pydantic import Field, BaseModel, field_validator
diff --git a/src/agentex/lib/types/json_rpc.py b/src/agentex/lib/types/json_rpc.py
index 15db316d8..b89e9d6b2 100644
--- a/src/agentex/lib/types/json_rpc.py
+++ b/src/agentex/lib/types/json_rpc.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Literal
 
 from agentex.lib.utils.model_utils import BaseModel
diff --git a/src/agentex/lib/types/llm_messages.py b/src/agentex/lib/types/llm_messages.py
index fa23a047e..706939f15 100644
--- a/src/agentex/lib/types/llm_messages.py
+++ b/src/agentex/lib/types/llm_messages.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Literal
 
 try:
diff --git a/src/agentex/lib/types/tracing.py b/src/agentex/lib/types/tracing.py
index 4791d6b2b..721d87794 100644
--- a/src/agentex/lib/types/tracing.py
+++ b/src/agentex/lib/types/tracing.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Literal, Annotated
 
 from pydantic import Field
diff --git a/src/agentex/lib/utils/completions.py b/src/agentex/lib/utils/completions.py
index a479309e8..f33495c1a 100644
--- a/src/agentex/lib/utils/completions.py
+++ b/src/agentex/lib/utils/completions.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from copy import deepcopy
 from typing import Any
 from functools import reduce, singledispatch
diff --git a/src/agentex/lib/utils/console.py b/src/agentex/lib/utils/console.py
index 50c0d5d3e..eab21efa8 100644
--- a/src/agentex/lib/utils/console.py
+++ b/src/agentex/lib/utils/console.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from rich import box
 from rich.table import Table
 from rich.console import Console
diff --git a/src/agentex/lib/utils/io.py b/src/agentex/lib/utils/io.py
index 11e2378a7..f8dfcc463 100644
--- a/src/agentex/lib/utils/io.py
+++ b/src/agentex/lib/utils/io.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 import yaml
diff --git a/src/agentex/lib/utils/iterables.py b/src/agentex/lib/utils/iterables.py
index d3dc452c1..7119ddb6a 100644
--- a/src/agentex/lib/utils/iterables.py
+++ b/src/agentex/lib/utils/iterables.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 from collections.abc import AsyncGenerator
 
diff --git a/src/agentex/lib/utils/json_schema.py b/src/agentex/lib/utils/json_schema.py
index b657b658b..6c8fa5c37 100644
--- a/src/agentex/lib/utils/json_schema.py
+++ b/src/agentex/lib/utils/json_schema.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 import jsonref
diff --git a/src/agentex/lib/utils/mcp.py b/src/agentex/lib/utils/mcp.py
index e8f63d66a..bebe9364b 100644
--- a/src/agentex/lib/utils/mcp.py
+++ b/src/agentex/lib/utils/mcp.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any
 
 from mcp import StdioServerParameters
diff --git a/src/agentex/lib/utils/model_utils.py b/src/agentex/lib/utils/model_utils.py
index 91f09bd62..8826ba121 100644
--- a/src/agentex/lib/utils/model_utils.py
+++ b/src/agentex/lib/utils/model_utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, TypeVar
 from datetime import datetime
 from collections.abc import Mapping, Iterable
diff --git a/src/agentex/types/agent_rpc_response.py b/src/agentex/types/agent_rpc_response.py
index fdeeddcb5..84fbab706 100644
--- a/src/agentex/types/agent_rpc_response.py
+++ b/src/agentex/types/agent_rpc_response.py
@@ -1,4 +1,5 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+from __future__ import annotations
 
 from typing import Union, Optional
 from typing_extensions import Literal
diff --git a/tests/test_function_tool.py b/tests/test_function_tool.py
index 595c1504c..91312e227 100644
--- a/tests/test_function_tool.py
+++ b/tests/test_function_tool.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from typing import Any, override
 
diff --git a/tests/test_header_forwarding.py b/tests/test_header_forwarding.py
index f1d25f260..9faacbf65 100644
--- a/tests/test_header_forwarding.py
+++ b/tests/test_header_forwarding.py
@@ -1,4 +1,5 @@
 # ruff: noqa: I001
+from __future__ import annotations
 from typing import Any, override
 import sys
 import types