diff --git a/agent.py b/agent.py
index 425c318..da22662 100644
--- a/agent.py
+++ b/agent.py
@@ -522,7 +522,7 @@ class CustomerIntegrationEngineer(A2AAgent[CustomerIntegrationEngineerConfig, No
         )
 
     @a2a.tool(description="Generate a minimal workspace-contained connector scaffold with no deployment or repository mutation", input_schema=_GENERATE_INPUT_SCHEMA, timeout_seconds=120, idempotent=True, max_retries=0, cost_class="deterministic", grant_outputs_prefix="outputs", grant_write_prefixes=("outputs/integrations",))
-    async def generate_connector(self, ctx: RunContext[NoAuth], request: GenerateConnectorRequest) -> dict[str, Any]:
+    async def generate_connector(self, ctx: RunContext[NoAuth], request: GenerateConnectorRequest) -> GenerateConnectorResult:
         req = request.requirements.model_copy(
             update={"dry_run": _effective_dry_run(self, request.dry_run, request.requirements.dry_run)}
         )
@@ -669,7 +669,7 @@ class CustomerIntegrationEngineer(A2AAgent[CustomerIntegrationEngineerConfig, No
         )
 
     @a2a.tool(description="Prepare rollout, rollback, monitoring, and operator handoff documentation with approval-gated delivery planning", input_schema=_HANDOFF_INPUT_SCHEMA, timeout_seconds=120, idempotent=True, max_retries=0, cost_class="deterministic", grant_outputs_prefix="outputs", grant_write_prefixes=("outputs/integrations",))
-    async def prepare_handoff(self, ctx: RunContext[NoAuth], request: PrepareHandoffRequest) -> PrepareHandoffResult:
+    async def prepare_handoff(self, ctx: RunContext[NoAuth], request: PrepareHandoffRequest) -> dict[str, Any]:
         dry_run = _effective_dry_run(self, request.dry_run)
         audit = [_audit("handoff_started", request.integration_id, {"dry_run": dry_run, "delivery_actions": len(request.delivery_actions)})]
         await _emit(ctx, audit[-1])