fix(wire-shape): validator now discovers unannotated Jackson fields

The Java validator's source-discovery only saw fields with
@JsonProperty(...) annotations. Many Java SDK POJOs declare fields
without the annotation and rely on Jackson's default name-mapping
(which works correctly when the Java field name matches the wire
key — `id`, `threshold`, `message`, `name`, etc.). The validator
under-counted SDK fields in those cases.

Three changes to lib.py:

- _FIELD_DECL_RE matches plain field declarations:
  modifier-prefix + type-expression + field-name + `;`/`=`. Captures
  the modifier sequence so the next change can post-filter.
- Filter out declarations whose modifier sequence contains `static`
  (those are class-level constants — never wire-serialized).
- _extract_types_from_java now collects both annotated (@JsonProperty)
  AND plain field decls. Each plain field's "claim" on a preceding
  @JsonProperty within a 250-char lookback window is consumed —
  whichever annotation/field pair is closest. Annotation wins on
  the wire-name when a field is annotated; field name is used
  directly when the field is unannotated.

Synthetic tests cover:
- Mixed annotated + unannotated POJO (BudgetAlert pattern)
- `private static final String CONST = "..."` excluded
- Methods (have `(`) excluded
- Generics like `Map<String, Object>` and `List<String>`
- Record params with `@JsonProperty`
- Class with both constants and fields

Effect on Java SDK baseline:
- registered_types: 70 → 73 (3 types newly visible; previously had
  no @JsonProperty annotations so the validator skipped them)
- per_type_drift: 37 → 39 (newly visible types surfaced 2 more
  drift entries; previously hidden coverage gaps)

The drift increase is the validator working correctly for the
first time — the previous count was an under-measurement, not a
real "no drift" signal.

Author: saurabhjain1592

scripts/wire_shape/lib.py

@@ -54,6 +54,34 @@ class whose body contains them.
 )
 _JSON_PROPERTY_RE = re.compile(r'@JsonProperty\(\s*"([^"]+)"\s*\)')
 
+# Matches a Java instance field declaration that uses Jackson's
+# default field-name mapping (no @JsonProperty alias). The pattern:
+#   - the leading modifier sequence (group 1) — captured so we can
+#     post-filter declarations that include `static` (constants
+#     don't go on the wire)
+#   - a type expression: identifier with optional `.qualifier`,
+#     optional `<...>` generics, optional `[]` array
+#   - the field name (group 2)
+#   - terminated by `;` or `=` (initializer)
+#
+# `static` IS allowed in the modifier set (otherwise the regex would
+# anchor at `final` in `private static final ...`); we drop the
+# match in code when `static` appears in group 1.
+# Methods are excluded by the absence of `(` before the terminator.
+_FIELD_DECL_RE = re.compile(
+    r"((?:(?:private|protected|public|static|final|transient|volatile)\s+)+)"
+    r"(?:[\w.]+(?:\s*<[^<>;]*>)?(?:\s*\[\s*\])?)\s+"
+    r"(\w+)\s*[;=]"
+)
+# Cap on lookback distance from a field declaration to a
+# preceding @JsonProperty(...) annotation: if the most recent
+# annotation sits within this many characters of the field's
+# declaration position, the field is considered "annotated" and we
+# defer to the @JsonProperty value rather than the field name.
+# 250 chars covers an annotation on the line immediately above plus
+# JavaDoc and other annotations like @JsonInclude in between.
+_JSON_PROPERTY_LOOKBACK = 250
+
 
 def load_all_schemas(spec_dir: Path) -> tuple[
     dict[str, list[str]],
@@ -258,12 +286,58 @@ def _extract_types_from_java(content: str) -> dict[str, list[str]]:
     # blanked range (string literal, comment, text block) — the
     # cleaner replaces those with whitespace, so cleaned[m.start()]
     # is a space rather than the original `@`.
-    props: list[tuple[int, str]] = [
+    annot_props: list[tuple[int, str]] = [
         (m.start(), m.group(1))
         for m in _JSON_PROPERTY_RE.finditer(content)
         if m.start() < len(cleaned) and cleaned[m.start()] == "@"
     ]
 
+    # Plain (unannotated) field declarations. Jackson defaults to
+    # using the field name as the wire key when @JsonProperty is
+    # absent. Without this discovery, the wire-shape gate
+    # under-counts SDK fields wherever the SDK relies on Jackson's
+    # default name-mapping (which is correct for fields whose Java
+    # name already matches the wire — `id`, `threshold`, `message`,
+    # etc.). Match on the cleaned text so commented-out or in-string
+    # field-shaped patterns don't false-fire. Skip declarations
+    # whose modifier sequence contains `static` — those are
+    # class-level constants, never serialized.
+    field_decls = [
+        fm for fm in _FIELD_DECL_RE.finditer(cleaned)
+        if "static" not in fm.group(1)
+    ]
+
+    # Build the merged property stream. Each entry is (position,
+    # wire_name). For plain field decls, "absorb" any @JsonProperty
+    # whose position falls within the look-back window — that pair
+    # is annotated and the annotation's wire name takes precedence.
+    consumed_annot_indices: set[int] = set()
+    plain_props: list[tuple[int, str]] = []
+    for fm in field_decls:
+        field_pos = fm.start()
+        field_name = fm.group(2)
+        # Find the latest annotation that hasn't been consumed and is
+        # within the lookback window.
+        annotated = False
+        for idx, (ap, _) in enumerate(annot_props):
+            if idx in consumed_annot_indices:
+                continue
+            if ap >= field_pos:
+                break
+            if field_pos - ap <= _JSON_PROPERTY_LOOKBACK:
+                consumed_annot_indices.add(idx)
+                annotated = True
+                # Don't break — multiple annotations can stack
+                # (e.g. @JsonInclude + @JsonProperty); keep marking
+                # them consumed so they don't double-attribute.
+        if not annotated:
+            plain_props.append((field_pos, field_name))
+
+    # The full property stream is annotation-derived names + plain
+    # field names, ordered by source position so the depth walker
+    # attributes them in declaration order.
+    props: list[tuple[int, str]] = sorted(annot_props + plain_props)
+
     # Walk the cleaned source. Two queues: decls already seen but
     # whose body `{` hasn't been hit yet (pending), and active type
     # frames (stack). Annotations attribute to the innermost pending

tests/fixtures/wire-shape-baseline.json

@@ -202,23 +202,14 @@
       "spec_only": []
     },
     "Budget": {
-      "sdk_only": [],
+      "sdk_only": [
+        "enabled"
+      ],
       "spec_only": [
-        "id",
-        "name",
         "org_id",
-        "period",
-        "scope",
         "tenant_id"
       ]
     },
-    "BudgetStatus": {
-      "sdk_only": [],
-      "spec_only": [
-        "budget",
-        "percentage"
-      ]
-    },
     "CancelPlanResponse": {
       "sdk_only": [
         "message"
@@ -260,16 +251,8 @@
         "organization_id"
       ],
       "spec_only": [
-        "action",
-        "category",
-        "description",
-        "enabled",
-        "name",
-        "pattern",
         "priority",
-        "severity",
-        "tags",
-        "tier"
+        "tags"
       ]
     },
     "CreateWorkflowResponse": {
@@ -283,18 +266,15 @@
     },
     "DynamicPolicy": {
       "sdk_only": [
+        "category",
         "created_at",
         "organization_id",
+        "priority",
+        "tier",
+        "type",
         "updated_at"
       ],
-      "spec_only": [
-        "actions",
-        "conditions",
-        "description",
-        "enabled",
-        "id",
-        "name"
-      ]
+      "spec_only": []
     },
     "DynamicPolicyInfo": {
       "sdk_only": [
@@ -427,6 +407,15 @@
         "workflow_execution_id"
       ]
     },
+    "PolicyAction": {
+      "sdk_only": [
+        "value"
+      ],
+      "spec_only": [
+        "config",
+        "type"
+      ]
+    },
     "PolicyInfo": {
       "sdk_only": [
         "code_artifact",
@@ -446,7 +435,9 @@
       ]
     },
     "PolicyOverride": {
-      "sdk_only": [],
+      "sdk_only": [
+        "active"
+      ],
       "spec_only": [
         "enabled_override",
         "id"
@@ -462,8 +453,7 @@
         "change_summary",
         "id",
         "policy_id",
-        "snapshot",
-        "version"
+        "snapshot"
       ]
     },
     "ResumePlanResponse": {
@@ -482,19 +472,8 @@
     "StaticPolicy": {
       "sdk_only": [],
       "spec_only": [
-        "action",
-        "category",
-        "description",
-        "enabled",
-        "id",
-        "name",
-        "override",
-        "pattern",
         "policy_id",
-        "priority",
-        "severity",
-        "tier",
-        "version"
+        "priority"
       ]
     },
     "StepGateRequest": {
@@ -517,38 +496,50 @@
         "metadata"
       ]
     },
+    "UpdateStaticPolicyRequest": {
+      "sdk_only": [
+        "category"
+      ],
+      "spec_only": [
+        "priority",
+        "tags"
+      ]
+    },
     "UsageBreakdown": {
       "sdk_only": [
+        "period",
         "period_end",
         "period_start"
       ],
-      "spec_only": [
-        "items"
-      ]
+      "spec_only": []
     },
     "UsageBreakdownItem": {
       "sdk_only": [],
       "spec_only": [
-        "group_by",
-        "percentage"
+        "group_by"
       ]
     },
     "UsageRecord": {
-      "sdk_only": [],
+      "sdk_only": [
+        "timestamp"
+      ],
       "spec_only": [
         "created_at",
         "error_message",
-        "id",
         "latency_ms",
-        "model",
-        "provider",
         "success",
         "team_id",
         "tenant_id",
         "user_id",
         "workflow_id"
       ]
     },
+    "UsageSummary": {
+      "sdk_only": [
+        "period"
+      ],
+      "spec_only": []
+    },
     "WorkflowStatusResponse": {
       "sdk_only": [],
       "spec_only": [
@@ -608,12 +599,14 @@
     "PlanVersionEntry",
     "PlanVersionsResponse",
     "PlatformCapability",
+    "PolicyAction",
     "PolicyEvaluationResult",
     "PolicyInfo",
     "PolicyMatch",
     "PolicyMatchInfo",
     "PolicyOverride",
     "PolicyVersion",
+    "PricingInfo",
     "RateLimitInfo",
     "ResumeFromCheckpointResponse",
     "ResumePlanResponse",
@@ -627,6 +620,7 @@
     "ToolContext",
     "UpdatePlanRequest",
     "UpdatePlanResponse",
+    "UpdateStaticPolicyRequest",
     "UpdateWebhookRequest",
     "UsageBreakdown",
     "UsageBreakdownItem",