adloop 0.21.0__tar.gz → 0.22.0__tar.gz

{adloop-0.21.0 → adloop-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: adloop
-Version: 0.21.0
+Version: 0.22.0
 Summary: The AI command center for Google Ads, Reddit Ads, GA4, and tracking code.
 Keywords: mcp,google-ads,reddit-ads,google-analytics,ga4,cursor,marketing
 Author: Daniel Klose
@@ -67,7 +67,7 @@ Both versions run the same tools with the same safety model. The difference is w
 | **Works with** | claude.ai, ChatGPT, Claude Code, Cursor, Gemini | Claude Code, Cursor, Claude Desktop, any local MCP client |
 | **Where your data flows** | EU servers (Germany), GDPR-first, DPA included | 100% your machine — nothing leaves it |
 | **Updates** | Automatic | `pip install -U adloop` |
-| **Price** | Free plan, no card; [paid plans](https://getadloop.com/preise) for more accounts and volume | Free forever (MIT) |
+| **Price** | Free plan, no card; [paid plans](https://getadloop.com/pricing) for more accounts and volume | Free forever (MIT) |
 
 **Not sure? [Start with Cloud](https://getadloop.com)** — it's the fastest way to see what AdLoop can do, and it's the only way to use AdLoop from claude.ai or ChatGPT. Self-host when you want everything on your own machine or need to modify the code. And if you're here to hack on AdLoop itself: welcome, keep scrolling.
 
@@ -110,17 +110,19 @@ The best features come from real workflows. If you're using AdLoop and find your
 | Tool | What It Does |
 |------|-------------|
 | `get_account_summaries` | List GA4 accounts and properties |
-| `run_ga4_report` | Custom reports — sessions, users, conversions, page performance |
+| `run_ga4_report` | Custom reports: sessions, users, key events, page performance. Optional dimension and metric filters, ordering, paging, and a comparison period |
 | `run_realtime_report` | Live data — verify tracking fires after deploys |
 | `get_tracking_events` | All configured events and their volume |
+| `list_key_events` | The property's key events (conversions) with counting method, create time and whether they can be deleted |
+| `list_ga4_dimensions_and_metrics` | Every dimension and metric the property can report on, including custom ones, with search |
 
 ### Google Ads Read Tools
 
 | Tool | What It Does |
 |------|-------------|
 | `list_accounts` | Discover accessible Ads accounts |
-| `get_campaign_performance` | Campaign metrics — impressions, clicks, cost, conversions, CPA |
-| `get_ad_performance` | Ad copy analysis — headlines, descriptions, CTR |
+| `get_campaign_performance` | Campaign metrics: impressions, clicks, cost, conversions, CPA, Search impression share and share lost to budget/rank |
+| `get_ad_performance` | Ad copy analysis: headlines, descriptions, CTR, policy approval status and topics |
 | `get_keyword_performance` | Keywords — quality scores, competitive metrics |
 | `get_search_terms` | What users actually searched before clicking |
 | `get_negative_keywords` | List direct campaign-level negative keywords |
@@ -132,6 +134,7 @@ The best features come from real workflows. If you're using AdLoop and find your
 | `get_pmax_assets` | Per-asset details for PMax — field type, serving status, content |
 | `get_detailed_asset_performance` | Top-performing asset combinations — which headline+description+image combos Google selects most |
 | `get_audience_performance` | Audience segment performance — remarketing, in-market, affinity, demographics |
+| `get_change_history` | What changed before the drop: who changed what and when, through which client (UI, API, scripts, auto-applied recommendations), last 30 days |
 | `get_demographic_targeting` | List demographic criteria (age/gender/parental status/income) on an ad group or campaign |
 | `suggest_brands` | Resolve a brand name to the brands Google recognizes — brand ID, name, state, URLs |
 | `check_brand_names` | Check a shortlist of brand names against Google's brand knowledge graph (max 25 per call) |
@@ -178,15 +181,16 @@ These tools read the live GTM container and join it with the codebase + GA4 to f
 | `audit_event_coverage` | **The flagship.** Three-way join: codebase events ↔ GTM tags ↔ GA4 actual fires. For each event name in `expected_events`, returns one of 10 statuses (`ok`, `no_tag_no_fire`, `tag_paused`, `tag_active_but_not_firing`, `gtm_only_firing`, `ga4_only`, etc.) plus auto-generated insights for the gaps. |
 | `list_gtm_accounts` | Discover accessible GTM accounts |
 | `list_gtm_containers` | List containers under an account — returns numeric `container_id` (needed by other tools), public `GTM-XXXXXXX` ID, and usage context (web/iOS/Android/server) |
-| `list_gtm_tags` | Every tag in the live container with parsed event names and resolved firing/blocking trigger names |
+| `list_gtm_tags` | Every tag in the live container with parsed event names and resolved firing/blocking trigger names. Pass `workspace_id` to read a workspace's unpublished state instead, so a just-drafted tag is visible (also on `get_gtm_tag`, `list_gtm_triggers`, `get_gtm_trigger`, `list_gtm_variables`) |
 | `get_gtm_tag` | Full raw config for a single tag — every parameter, firing/blocking triggers with filter conditions, priority, pause status, sampling |
 | `list_gtm_triggers` | Every trigger with filter conditions parsed to readable text (e.g. `{{Page Path}} contains service-promotions`, `{{Form ID}} NOT contains wf-form-...`). Renders the `negate` flag explicitly. |
 | `get_gtm_trigger` | Full trigger config + reverse lookup of every tag that uses it. Includes parsed `element_visibility` block (selector, on-screen ratio, firing frequency) for elementVisibility triggers and `group_member_trigger_ids` for triggerGroup types |
 | `list_gtm_variables` | Custom variables (data layer, constants, JS) plus enabled built-in variables |
 | `list_gtm_workspaces` | List drafts (workspaces) under a container — workspace IDs are needed by `get_gtm_workspace_diff` |
 | `get_gtm_workspace_diff` | Drafted-but-not-published changes — common cause of "I edited a tag but nothing happened". Returns `is_clean: true` when nothing is pending. |
-| `list_gtm_versions` | Publish history with version IDs and entity counts. Use to correlate a metric drop with a recent publish. |
-| `get_gtm_version` | Full metadata + tag/trigger names for a single historical container version |
+| `list_gtm_versions` | Version history, newest first, with version IDs and entity counts. The Tag Manager API returns no timestamps or author for versions. |
+| `get_gtm_version` | Name, notes and tag/trigger names for a single historical container version |
+| `get_gtm_version_diff` | What a publish changed: added, removed and changed tags, triggers and variables with the changed fields, plus built-in variables enabled or disabled. Defaults to the live version against the one before it; two or three API calls. |
 
 #### GTM write tools (opt-in)
 
@@ -198,13 +202,14 @@ Off by default. Set `gtm.write_enabled: true` in `~/.adloop/config.yaml` and res
 | `draft_gtm_trigger` | Create a trigger, or update one by `trigger_id` (type is immutable). `custom_event_name` wires a `customEvent` trigger to a dataLayer event. |
 | `draft_delete_gtm_entity` | Delete a workspace tag or trigger. Triggers still referenced by a tag are refused up front, with the tags listed. |
 | `draft_publish_gtm_workspace` | Publish a workspace live. The preview lists every pending change, including edits other people made in the GTM UI. |
+| `draft_rollback_gtm_version` | Republish an older container version live. The preview is the diff from the live version to the target; the plan pins the live version, so apply refuses if someone publishes in between. Workspaces are left as they are. |
 
 Safety gates specific to GTM:
 - **Custom HTML** runs arbitrary JavaScript on your site, so creating or editing an `html` tag — or publishing a workspace that adds or changes one — is refused unless `gtm.allow_custom_html: true` is also set. Pausing or deleting one is always allowed.
 - **No stale writes.** Updates and deletes pin the entity's fingerprint from the preview, and publish pins the workspace's pending changes; if someone edits the container in between, apply refuses and you re-draft.
 - Publishing stops on merge conflicts or GTM compiler errors. The dry run runs a Tag Manager **quick preview** first (Tag Manager has no validate-only mode), so compiler errors surface before a version is even created. That preview is a POST and stores a preview version in the container — nothing is published and no live tag changes; the rest of the dry run only reads.
-- The publish result names the version it replaced (`previous_live_version_id`), so rolling back is one step: publish that version again in the GTM UI. If the version was created but publishing it failed, the error carries both the created version id and the still-live one.
-- Per-operation names for `safety.blocked_operations`: `gtm_create_tag`, `gtm_update_tag`, `gtm_delete_tag`, `gtm_create_trigger`, `gtm_update_trigger`, `gtm_delete_trigger`, `gtm_publish_workspace`.
+- The publish and rollback results name the version they replaced (`previous_live_version_id`), so rolling back is one step: `draft_rollback_gtm_version` with that id. If the version was created but publishing it failed, the error carries both the created version id and the still-live one.
+- Per-operation names for `safety.blocked_operations`: `gtm_create_tag`, `gtm_update_tag`, `gtm_delete_tag`, `gtm_create_trigger`, `gtm_update_trigger`, `gtm_delete_trigger`, `gtm_publish_workspace`, `gtm_rollback_version`.
 
 The Google account also needs **Edit** permission on the container (and **Publish** to publish) under Admin → User Management.
 
@@ -215,13 +220,13 @@ The Google account also needs **Edit** permission on the container (and **Publis
 | Tool | What It Does |
 |------|-------------|
 | `list_gsc_sites` | List Search Console properties the connected account can access |
-| `run_gsc_report` | Organic search analytics — clicks, impressions, CTR, position by query/page/country/device/date |
+| `run_gsc_report` | Organic search analytics: clicks, impressions, CTR, position by query/page/country/device/date/searchAppearance/hour. Supports fresh data (`data_state="all"`), `aggregation_type`, and paging past 25,000 rows with `start_row` |
 
 ### Web Performance Tools
 
 | Tool | What It Does |
 |------|-------------|
-| `analyze_page_speed` | PageSpeed Insights for landing pages — Lighthouse score, Core Web Vitals, real-user CrUX data, top fixes. No OAuth needed (optional API key). |
+| `analyze_page_speed` | PageSpeed Insights for landing pages: Lighthouse score, Core Web Vitals, real-user CrUX data (falls back to origin-wide data, labelled as such, when the page has too little traffic), top fixes. No OAuth needed (optional API key). |
 
 ### Merchant Center Tools
 
@@ -280,6 +285,7 @@ All write operations follow a **draft → preview → confirm** workflow. Nothin
 | `add_negative_keywords` | Propose negative keywords directly on a campaign |
 | `add_negative_locations` | Propose negative geo exclusions on a campaign — exclude cities/regions while keeping broader positive targets |
 | `draft_key_event` | Mark a GA4 event as a key event (conversion) — the fix for "fires but isn't tracked as a conversion" |
+| `draft_delete_key_event` | Remove a GA4 key event. The event keeps firing but no longer counts as a conversion, for future data only |
 | `draft_demographic_targeting` | Propose demographic criteria (age, gender, parental status, income) — exclusions by default |
 | `propose_negative_keyword_list` | Draft a shared negative keyword list (SharedSet) and attach it to a campaign — reusable across multiple campaigns |
 | `propose_brand_list` | Draft a brand list (SharedSet of type BRANDS) from Commercial KG MIDs and optionally attach it to campaigns — `negative=true` (default) excludes the brands, `false` restricts targeting to them |
@@ -614,7 +620,7 @@ MIT — see [LICENSE](LICENSE).
 
 ## Privacy
 
-The open-source version runs entirely on your machine. No data is collected, stored, or transmitted to any server. See [PRIVACY.md](PRIVACY.md) for the full privacy policy. AdLoop Cloud has its own [privacy policy](https://getadloop.com/datenschutz) and [DPA](https://getadloop.com/avv).
+The open-source version runs entirely on your machine. No data is collected, stored, or transmitted to any server. See [PRIVACY.md](PRIVACY.md) for the full privacy policy. AdLoop Cloud has its own [privacy policy](https://getadloop.com/privacy) and [DPA](https://getadloop.com/avv).
 
 ---
 

{adloop-0.21.0 → adloop-0.22.0}/README.md

@@ -39,7 +39,7 @@ Both versions run the same tools with the same safety model. The difference is w
 | **Works with** | claude.ai, ChatGPT, Claude Code, Cursor, Gemini | Claude Code, Cursor, Claude Desktop, any local MCP client |
 | **Where your data flows** | EU servers (Germany), GDPR-first, DPA included | 100% your machine — nothing leaves it |
 | **Updates** | Automatic | `pip install -U adloop` |
-| **Price** | Free plan, no card; [paid plans](https://getadloop.com/preise) for more accounts and volume | Free forever (MIT) |
+| **Price** | Free plan, no card; [paid plans](https://getadloop.com/pricing) for more accounts and volume | Free forever (MIT) |
 
 **Not sure? [Start with Cloud](https://getadloop.com)** — it's the fastest way to see what AdLoop can do, and it's the only way to use AdLoop from claude.ai or ChatGPT. Self-host when you want everything on your own machine or need to modify the code. And if you're here to hack on AdLoop itself: welcome, keep scrolling.
 
@@ -82,17 +82,19 @@ The best features come from real workflows. If you're using AdLoop and find your
 | Tool | What It Does |
 |------|-------------|
 | `get_account_summaries` | List GA4 accounts and properties |
-| `run_ga4_report` | Custom reports — sessions, users, conversions, page performance |
+| `run_ga4_report` | Custom reports: sessions, users, key events, page performance. Optional dimension and metric filters, ordering, paging, and a comparison period |
 | `run_realtime_report` | Live data — verify tracking fires after deploys |
 | `get_tracking_events` | All configured events and their volume |
+| `list_key_events` | The property's key events (conversions) with counting method, create time and whether they can be deleted |
+| `list_ga4_dimensions_and_metrics` | Every dimension and metric the property can report on, including custom ones, with search |
 
 ### Google Ads Read Tools
 
 | Tool | What It Does |
 |------|-------------|
 | `list_accounts` | Discover accessible Ads accounts |
-| `get_campaign_performance` | Campaign metrics — impressions, clicks, cost, conversions, CPA |
-| `get_ad_performance` | Ad copy analysis — headlines, descriptions, CTR |
+| `get_campaign_performance` | Campaign metrics: impressions, clicks, cost, conversions, CPA, Search impression share and share lost to budget/rank |
+| `get_ad_performance` | Ad copy analysis: headlines, descriptions, CTR, policy approval status and topics |
 | `get_keyword_performance` | Keywords — quality scores, competitive metrics |
 | `get_search_terms` | What users actually searched before clicking |
 | `get_negative_keywords` | List direct campaign-level negative keywords |
@@ -104,6 +106,7 @@ The best features come from real workflows. If you're using AdLoop and find your
 | `get_pmax_assets` | Per-asset details for PMax — field type, serving status, content |
 | `get_detailed_asset_performance` | Top-performing asset combinations — which headline+description+image combos Google selects most |
 | `get_audience_performance` | Audience segment performance — remarketing, in-market, affinity, demographics |
+| `get_change_history` | What changed before the drop: who changed what and when, through which client (UI, API, scripts, auto-applied recommendations), last 30 days |
 | `get_demographic_targeting` | List demographic criteria (age/gender/parental status/income) on an ad group or campaign |
 | `suggest_brands` | Resolve a brand name to the brands Google recognizes — brand ID, name, state, URLs |
 | `check_brand_names` | Check a shortlist of brand names against Google's brand knowledge graph (max 25 per call) |
@@ -150,15 +153,16 @@ These tools read the live GTM container and join it with the codebase + GA4 to f
 | `audit_event_coverage` | **The flagship.** Three-way join: codebase events ↔ GTM tags ↔ GA4 actual fires. For each event name in `expected_events`, returns one of 10 statuses (`ok`, `no_tag_no_fire`, `tag_paused`, `tag_active_but_not_firing`, `gtm_only_firing`, `ga4_only`, etc.) plus auto-generated insights for the gaps. |
 | `list_gtm_accounts` | Discover accessible GTM accounts |
 | `list_gtm_containers` | List containers under an account — returns numeric `container_id` (needed by other tools), public `GTM-XXXXXXX` ID, and usage context (web/iOS/Android/server) |
-| `list_gtm_tags` | Every tag in the live container with parsed event names and resolved firing/blocking trigger names |
+| `list_gtm_tags` | Every tag in the live container with parsed event names and resolved firing/blocking trigger names. Pass `workspace_id` to read a workspace's unpublished state instead, so a just-drafted tag is visible (also on `get_gtm_tag`, `list_gtm_triggers`, `get_gtm_trigger`, `list_gtm_variables`) |
 | `get_gtm_tag` | Full raw config for a single tag — every parameter, firing/blocking triggers with filter conditions, priority, pause status, sampling |
 | `list_gtm_triggers` | Every trigger with filter conditions parsed to readable text (e.g. `{{Page Path}} contains service-promotions`, `{{Form ID}} NOT contains wf-form-...`). Renders the `negate` flag explicitly. |
 | `get_gtm_trigger` | Full trigger config + reverse lookup of every tag that uses it. Includes parsed `element_visibility` block (selector, on-screen ratio, firing frequency) for elementVisibility triggers and `group_member_trigger_ids` for triggerGroup types |
 | `list_gtm_variables` | Custom variables (data layer, constants, JS) plus enabled built-in variables |
 | `list_gtm_workspaces` | List drafts (workspaces) under a container — workspace IDs are needed by `get_gtm_workspace_diff` |
 | `get_gtm_workspace_diff` | Drafted-but-not-published changes — common cause of "I edited a tag but nothing happened". Returns `is_clean: true` when nothing is pending. |
-| `list_gtm_versions` | Publish history with version IDs and entity counts. Use to correlate a metric drop with a recent publish. |
-| `get_gtm_version` | Full metadata + tag/trigger names for a single historical container version |
+| `list_gtm_versions` | Version history, newest first, with version IDs and entity counts. The Tag Manager API returns no timestamps or author for versions. |
+| `get_gtm_version` | Name, notes and tag/trigger names for a single historical container version |
+| `get_gtm_version_diff` | What a publish changed: added, removed and changed tags, triggers and variables with the changed fields, plus built-in variables enabled or disabled. Defaults to the live version against the one before it; two or three API calls. |
 
 #### GTM write tools (opt-in)
 
@@ -170,13 +174,14 @@ Off by default. Set `gtm.write_enabled: true` in `~/.adloop/config.yaml` and res
 | `draft_gtm_trigger` | Create a trigger, or update one by `trigger_id` (type is immutable). `custom_event_name` wires a `customEvent` trigger to a dataLayer event. |
 | `draft_delete_gtm_entity` | Delete a workspace tag or trigger. Triggers still referenced by a tag are refused up front, with the tags listed. |
 | `draft_publish_gtm_workspace` | Publish a workspace live. The preview lists every pending change, including edits other people made in the GTM UI. |
+| `draft_rollback_gtm_version` | Republish an older container version live. The preview is the diff from the live version to the target; the plan pins the live version, so apply refuses if someone publishes in between. Workspaces are left as they are. |
 
 Safety gates specific to GTM:
 - **Custom HTML** runs arbitrary JavaScript on your site, so creating or editing an `html` tag — or publishing a workspace that adds or changes one — is refused unless `gtm.allow_custom_html: true` is also set. Pausing or deleting one is always allowed.
 - **No stale writes.** Updates and deletes pin the entity's fingerprint from the preview, and publish pins the workspace's pending changes; if someone edits the container in between, apply refuses and you re-draft.
 - Publishing stops on merge conflicts or GTM compiler errors. The dry run runs a Tag Manager **quick preview** first (Tag Manager has no validate-only mode), so compiler errors surface before a version is even created. That preview is a POST and stores a preview version in the container — nothing is published and no live tag changes; the rest of the dry run only reads.
-- The publish result names the version it replaced (`previous_live_version_id`), so rolling back is one step: publish that version again in the GTM UI. If the version was created but publishing it failed, the error carries both the created version id and the still-live one.
-- Per-operation names for `safety.blocked_operations`: `gtm_create_tag`, `gtm_update_tag`, `gtm_delete_tag`, `gtm_create_trigger`, `gtm_update_trigger`, `gtm_delete_trigger`, `gtm_publish_workspace`.
+- The publish and rollback results name the version they replaced (`previous_live_version_id`), so rolling back is one step: `draft_rollback_gtm_version` with that id. If the version was created but publishing it failed, the error carries both the created version id and the still-live one.
+- Per-operation names for `safety.blocked_operations`: `gtm_create_tag`, `gtm_update_tag`, `gtm_delete_tag`, `gtm_create_trigger`, `gtm_update_trigger`, `gtm_delete_trigger`, `gtm_publish_workspace`, `gtm_rollback_version`.
 
 The Google account also needs **Edit** permission on the container (and **Publish** to publish) under Admin → User Management.
 
@@ -187,13 +192,13 @@ The Google account also needs **Edit** permission on the container (and **Publis
 | Tool | What It Does |
 |------|-------------|
 | `list_gsc_sites` | List Search Console properties the connected account can access |
-| `run_gsc_report` | Organic search analytics — clicks, impressions, CTR, position by query/page/country/device/date |
+| `run_gsc_report` | Organic search analytics: clicks, impressions, CTR, position by query/page/country/device/date/searchAppearance/hour. Supports fresh data (`data_state="all"`), `aggregation_type`, and paging past 25,000 rows with `start_row` |
 
 ### Web Performance Tools
 
 | Tool | What It Does |
 |------|-------------|
-| `analyze_page_speed` | PageSpeed Insights for landing pages — Lighthouse score, Core Web Vitals, real-user CrUX data, top fixes. No OAuth needed (optional API key). |
+| `analyze_page_speed` | PageSpeed Insights for landing pages: Lighthouse score, Core Web Vitals, real-user CrUX data (falls back to origin-wide data, labelled as such, when the page has too little traffic), top fixes. No OAuth needed (optional API key). |
 
 ### Merchant Center Tools
 
@@ -252,6 +257,7 @@ All write operations follow a **draft → preview → confirm** workflow. Nothin
 | `add_negative_keywords` | Propose negative keywords directly on a campaign |
 | `add_negative_locations` | Propose negative geo exclusions on a campaign — exclude cities/regions while keeping broader positive targets |
 | `draft_key_event` | Mark a GA4 event as a key event (conversion) — the fix for "fires but isn't tracked as a conversion" |
+| `draft_delete_key_event` | Remove a GA4 key event. The event keeps firing but no longer counts as a conversion, for future data only |
 | `draft_demographic_targeting` | Propose demographic criteria (age, gender, parental status, income) — exclusions by default |
 | `propose_negative_keyword_list` | Draft a shared negative keyword list (SharedSet) and attach it to a campaign — reusable across multiple campaigns |
 | `propose_brand_list` | Draft a brand list (SharedSet of type BRANDS) from Commercial KG MIDs and optionally attach it to campaigns — `negative=true` (default) excludes the brands, `false` restricts targeting to them |
@@ -586,7 +592,7 @@ MIT — see [LICENSE](LICENSE).
 
 ## Privacy
 
-The open-source version runs entirely on your machine. No data is collected, stored, or transmitted to any server. See [PRIVACY.md](PRIVACY.md) for the full privacy policy. AdLoop Cloud has its own [privacy policy](https://getadloop.com/datenschutz) and [DPA](https://getadloop.com/avv).
+The open-source version runs entirely on your machine. No data is collected, stored, or transmitted to any server. See [PRIVACY.md](PRIVACY.md) for the full privacy policy. AdLoop Cloud has its own [privacy policy](https://getadloop.com/privacy) and [DPA](https://getadloop.com/avv).
 
 ---
 

{adloop-0.21.0 → adloop-0.22.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adloop"
-version = "0.21.0"
+version = "0.22.0"
 description = "The AI command center for Google Ads, Reddit Ads, GA4, and tracking code."
 readme = "README.md"
 requires-python = ">=3.11"

{adloop-0.21.0 → adloop-0.22.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "adloop"
-version = "0.21.0"
+version = "0.22.0"
 description = "The AI command center for Google Ads, Reddit Ads, GA4, and tracking code."
 readme = "README.md"
 authors = [

{adloop-0.21.0 → adloop-0.22.0}/src/adloop/ads/conversion_actions.py

@@ -1142,17 +1142,35 @@ def _parse_call_conversion_csv(
 
 
 def _redact_caller_id(caller_id: str) -> str:
-    """Mask an E.164 phone for display/logging: keep the leading digits and
-    the last 4, star the middle. e.g. '+15555550142' -> '+155***0142'.
+    """Mask an E.164 phone for display/logging: the country code plus the last
+    two digits. e.g. '+14155550142' -> '+1***42'.
+
+    Two trailing digits are enough to sanity-check that the right number was
+    parsed. Everything between them is what would make the hint worth
+    attacking, and this string reaches the preview, the model's context and the
+    audit log.
     """
     s = (caller_id or "").strip()
     if not s:
         return ""
-    if len(s) <= 6:
+    if not s.startswith("+") or len(s) < 5:
         return "***"
-    head = s[:4]
-    tail = s[-4:]
-    return f"{head}***{tail}"
+    return f"+{_dialling_country_code(s)}***{s[-2:]}"
+
+
+def _dialling_country_code(e164: str) -> str:
+    """The dialling country code of an E.164 number, "" when it is unknown.
+
+    libphonenumber knows where the country code ends (`+1` vs `+49` vs `+49`
+    inside `+49151…`); a hand-rolled slice cannot. Failing to resolve it only
+    costs the prefix of a display hint, so this never raises.
+    """
+    try:
+        import phonenumbers
+
+        return str(phonenumbers.parse(e164, None).country_code or "")
+    except Exception:  # noqa: BLE001 — display helper, never fatal
+        return ""
 
 
 def draft_upload_call_conversions(
@@ -2417,10 +2435,14 @@ def draft_upload_enhanced_conversions_for_leads(
             ),
             "sample_rows": [
                 {
-                    "email_sha256": (r["email_sha256"][:16] + "...")
-                    if r["email_sha256"] else "",
-                    "phone_sha256": (r["phone_sha256"][:16] + "...")
-                    if r["phone_sha256"] else "",
+                    # A marker, not a prefix: the sample only has to show that
+                    # an identifier was there. 16 hex characters are 64 bits,
+                    # which is enough to confirm a guessed address from a word
+                    # list — in a preview that lands in a model's context and
+                    # in the audit log. The full hashes stay in
+                    # apply_only_payload, where the upload needs them.
+                    "email_sha256": "sha256:set" if r["email_sha256"] else "",
+                    "phone_sha256": "sha256:set" if r["phone_sha256"] else "",
                     "conversion_name": r["conversion_name"],
                     "conversion_value": r["conversion_value"],
                     "conversion_time": r["conversion_time"],

{adloop-0.21.0 → adloop-0.22.0}/src/adloop/ads/gaql.py

@@ -160,6 +160,12 @@ def _to_python(obj: object) -> object:
         if type(obj) is not int and hasattr(obj, "name"):
             return obj.name
         return obj
+    # FieldMask (change_event.changed_fields): its JSON form is one
+    # comma-joined camelCase string, which hides the snake_case paths the
+    # rest of the API uses. Return the paths as they are.
+    descriptor = getattr(obj, "DESCRIPTOR", None)
+    if getattr(descriptor, "full_name", "") == "google.protobuf.FieldMask":
+        return list(obj.paths)
     # Repeated fields (headlines, final_urls, etc.)
     try:
         return [_to_python(item) for item in obj]