adcontextprotocol
diff --git a/‎src/adcp/server/idempotency/store.py‎
Lines changed: 117 additions & 19 deletions b/‎src/adcp/server/idempotency/store.py‎
Lines changed: 117 additions & 19 deletions
@@ -131,32 +131,49 @@ def capability(self) -> dict[str, Any]:
     def wrap(self, handler: HandlerFn) -> HandlerFn:
         """Decorator that adds idempotency semantics to an AdCP handler method.
 
-        The wrapped handler is called as ``handler(self, params, context)``.
-        ``params`` may be a dict or a Pydantic model — both are normalized to
-        a dict before hashing. The return value is coerced to a dict for
-        caching (via ``model_dump`` if Pydantic).
-
-        The decorator always returns the handler's original object on a cache
-        miss and a best-effort Pydantic re-validation on a hit (when the
-        handler's declared return type exposes ``model_validate``). Callers
-        that return raw dicts get dicts back.
+        Supports three calling conventions the framework dispatches with:
+
+        1. **Positional** ``handler(self, params, context)`` — the
+           default for non-projected tools (``get_products``,
+           ``create_media_buy``, etc.).
+        2. **Keyword** ``handler(self, params=..., context=...)`` —
+           same shape, just kwargs.
+        3. **Arg-projected** ``handler(self, **arg_projector_kwargs, ctx=...)``
+           where ``params`` is split into per-field kwargs by the
+           framework dispatcher (e.g. ``update_media_buy`` is called
+           as ``handler(self, media_buy_id=..., patch=..., ctx=...)``).
+           In this mode the wrap searches the kwargs for a Pydantic
+           model (``patch`` for update_media_buy) to extract the
+           idempotency key and hash payload from. Adopters whose
+           projection contains no Pydantic model (e.g. a method
+           projecting only a list of ids) get fall-through behavior:
+           no key found → handler runs without dedup.
+
+        ``params`` is normalized to a dict before hashing; the return
+        value is coerced to a dict for caching (via ``model_dump`` if
+        Pydantic). The decorator always returns the handler's original
+        object on a cache miss and a best-effort Pydantic
+        re-validation on a hit (when the handler's declared return
+        type exposes ``model_validate``). Callers that return raw
+        dicts get dicts back.
         """
 
         @wraps(handler)
-        async def _wrapped(
-            handler_self: Any,
-            params: Any,
-            context: Any = None,
-            *args: Any,
-            **kwargs: Any,
-        ) -> Any:
-            scope_key, idempotency_key, params_dict = self._prepare(params, context)
+        async def _wrapped(*args: Any, **kwargs: Any) -> Any:
+            handler_self, hash_source, context = _resolve_call_args(args, kwargs)
+
+            scope_key, idempotency_key, params_dict = self._prepare(hash_source, context)
             if scope_key is None or idempotency_key is None:
                 # No key → spec says the server MUST reject with INVALID_REQUEST.
                 # We let the handler run so validation layers above us (Pydantic,
                 # FastAPI, etc.) can reject with a typed error; the middleware's
                 # job is only to dedup when a key IS present.
-                return await handler(handler_self, params, context, *args, **kwargs)
+                #
+                # Forward the call exactly as received so all three calling
+                # conventions (positional / keyword / arg-projected) reach
+                # the inner handler unchanged. The wrap is signature-
+                # transparent on the no-key path.
+                return await handler(*args, **kwargs)
 
             payload_hash = self._hash_fn(params_dict)
 
@@ -183,7 +200,7 @@ async def _wrapped(
                     ],
                 )
 
-            response = await handler(handler_self, params, context, *args, **kwargs)
+            response = await handler(*args, **kwargs)
             # Deep-copy when caching so post-return mutation of the caller's
             # copy can't poison future replays. `_clone_response` also deep-
             # copies on the hit path, giving independent objects per replay.
@@ -287,6 +304,87 @@ def _warn_missing_principal_once(self) -> None:
         )
 
 
+def _resolve_call_args(args: tuple[Any, ...], kwargs: dict[str, Any]) -> tuple[Any, Any, Any]:
+    """Resolve ``(handler_self, hash_source, context)`` across the three
+    calling conventions the framework dispatches with.
+
+    Returns ``hash_source`` — what the wrap should hand to
+    :meth:`IdempotencyStore._prepare` for ``idempotency_key`` extraction
+    and payload hashing. The original ``args`` / ``kwargs`` are
+    untouched and forwarded verbatim to the inner handler.
+
+    Calling conventions::
+
+        # 1. Positional (default for non-projected tools)
+        _wrapped(self, params, ctx)
+        # → handler_self=self, hash_source=params, context=ctx
+
+        # 2. Keyword (same shape, kwargs form)
+        _wrapped(self, params=params, context=ctx)
+        # → handler_self=self, hash_source=params, context=ctx
+
+        # 3. Arg-projected (update_media_buy: params split into kwargs)
+        _wrapped(self, media_buy_id=..., patch=<UpdateMediaBuyRequest>, ctx=...)
+        # → handler_self=self,
+        #   hash_source=<UpdateMediaBuyRequest>  (first kwarg with model_dump),
+        #   context=<ctx>
+
+    For arg-projected calls without a Pydantic-shaped kwarg
+    (e.g. ``arg_projector={"audiences": [...]}``), ``hash_source``
+    falls back to the kwargs dict itself — :meth:`_prepare` will look
+    for ``idempotency_key`` at the top level and skip dedup if absent.
+    Same fall-through as a missing key, no regression.
+    """
+    handler_self = args[0] if args else None
+    rest_args = args[1:]
+
+    # Convention 1: positional ``params, ctx`` after self.
+    if rest_args:
+        params = rest_args[0]
+        context = rest_args[1] if len(rest_args) > 1 else kwargs.get("context")
+        return handler_self, params, context
+
+    # Convention 2: keyword ``params=, context=``. Use ``in`` rather
+    # than ``or`` so an explicitly-passed falsy ``context=`` (None,
+    # an object whose ``__bool__`` returns False) doesn't silently
+    # fall through to ``ctx``.
+    if "params" in kwargs:
+        if "context" in kwargs:
+            context = kwargs["context"]
+        else:
+            context = kwargs.get("ctx")
+        return handler_self, kwargs["params"], context
+
+    # Convention 3: arg-projected. ``ctx`` (not ``context``) is what
+    # dispatch.py:1081 passes; tolerate both for hand-rolled adopters.
+    context = kwargs["ctx"] if "ctx" in kwargs else kwargs.get("context")
+    # Prefer kwargs literally named ``params`` / ``request`` / ``patch``
+    # before falling back to "first kwarg with ``model_dump``". The
+    # named lookup is dict-order-independent and matches the framework's
+    # explicit projection contract: ``update_media_buy`` projects via
+    # ``patch=``; future tools may use ``params=`` or ``request=``.
+    # Without this preference, a tool with two Pydantic kwargs would
+    # hash the wrong one when iteration order ever shifts (Python 3.7+
+    # guarantees dict insertion order, but the call-site insertion
+    # order is the framework's choice, not the handler signature).
+    for preferred_name in ("params", "request", "patch"):
+        candidate = kwargs.get(preferred_name)
+        if candidate is not None and isinstance(candidate, BaseModel):
+            return handler_self, candidate, context
+    # Fall back to first kwarg whose value is a Pydantic ``BaseModel``.
+    # ``isinstance`` is stricter than ``hasattr(model_dump)`` — a
+    # non-Pydantic duck type with a ``model_dump`` method would no
+    # longer accidentally match.
+    for key, value in kwargs.items():
+        if key in ("ctx", "context"):
+            continue
+        if isinstance(value, BaseModel):
+            return handler_self, value, context
+
+    fallback = {k: v for k, v in kwargs.items() if k not in ("ctx", "context")}
+    return handler_self, fallback, context
+
+
 def _scope_log_id(scope_key: str) -> str:
     """Return a non-reversible short identifier for ``scope_key`` log lines.