mcp-google-ads/.fork-sync-ignore at main · PM-Labs/mcp-google-ads · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
# .fork-sync-ignore — upstream commits fork-sync must skip.
#
# One SHA per line, optional reason after whitespace.
# Blank lines and # comments allowed.
#
# See CLAUDE.md in pmin-mcpinfrastructure for the full convention. When an
# upstream commit is listed here, the weekly sync cron on mcp-server will
# silently skip it instead of tripping a merge conflict.
#
# Listed SHAs must exist in `upstream/main` — otherwise the sync script
# will log a warning and treat the entry as a no-op.

# --- mcp-google-ads: reject upstream OAuth reimplementation (2026-04-13) ---
# Upstream implemented their own OAuth proxy in googleads/mcp-google-ads#46
# (commit 3e0d25c + its PR merge 320dd4c). We already have our own OAuth proxy
# plus the no-session-resurrection fix (PM-Labs/mcp-google-ads b2b6a33..246ac3d),
# which is incompatible with upstream's approach. Keep ours.
#
# The standalone non-merge commits contributing to the OAuth change and related
# packaging/lint noise that we also don't want:

3e0d25c  upstream OAuth proxy implementation — we have our own + session-resurrection fix
958f8b8  MANIFEST.in .txt addition — we build via docker, not pypi
45f609d  README-only update for upstream OAuth docs — not relevant to our fork
de051e6  upstream lint pass — noise, not worth the conflict surface

# --- mcp-google-ads: skip Windows deadlock fix (2026-06-07) ---
# f953ff4 adds a context manager to prevent stdio handle inheritance on Windows.
# We run Linux containers — this is a no-op on Linux and conflicts with our fork.
f953ff4  Windows-only stdio deadlock fix — not applicable to Linux containers

# --- mcp-google-ads: configurable-tools upstream PR (2026-06-11) ---
# Upstream PR #82 added tools_config.yaml configurable tools across 5 commits.
# All 5 are already cherry-picked into our fork under different SHAs
# (19fb66c, 6a6353d, ff8ecb4, db7ba7e, 88eeebc) with minor patch divergence.
5df2a4e  already applied as 19fb66c (Make the exposed tools configurable with the tools_config.yaml file)
cb681d7  already applied as 6a6353d (Ensure the schema generated for the search tool)
45f42be  already applied as ff8ecb4 (Make the exposed tools configurable — second commit)
fdda341  already applied as db7ba7e (Rename the search tool in tests)
cb80934  already applied as 88eeebc (fix: bundle default tools_config.yaml)

# --- mcp-google-ads: PbMessage serialization fix (2026-07-26) ---
# Upstream 8594723 adds serialization of bare PbMessage instances.
# Already applied to our fork as 1a8f2e9 (cherry-pick with minor patch divergence).
8594723fddbdac0c58badd9b557f7e507e29eb4b  already applied as 1a8f2e9 (serialize bare PbMessage instances in format_output_value)

# --- mcp-google-ads: upstream commit 2d01b97e (2026-07-26) ---
# This commit conflicts with our OAuth proxy implementation (our fork has a custom
# OAuth flow via PM-Labs/mcp-google-ads b2b6a33..246ac3d; upstream's 2d01b97 adds
# credential logging changes that diverge from our approach).
# TODO: manually cherry-pick the non-OAuth parts if needed in a future session.
2d01b97e  skip — conflicts with our OAuth proxy implementation

# --- mcp-google-ads: FastMCP production auth configuration (2026-08-11) ---
# Upstream PR #95 (f8130b1) adds configurable JWT token storage backends
# (filetree/redis/memory) and wires jwt_signing_key into FastMCP GoogleProvider.
# Our fork removed GoogleProvider entirely — we auth at the Cloudflare/Caddy
# proxy level. f8130b1 conflicts with our coordinator.py and provides no benefit.
f8130b1  skip — conflicts with coordinator.py; we auth at proxy level not via FastMCP GoogleProvider
150bbce  merge commit for PR #95 (production auth configuration) — listed for audit hygiene

# --- mcp-google-ads: remove account-performance-diagnostics skill (2026-08-11) ---
# Upstream PR #97 (38ac5b1) removes the skill (moved to upstream skills repo).
# Applied cleanly to our fork as 4bd4696.
38ac5b1  applied as 4bd4696 (remove account-performance-diagnostics SKILL.md)
91beff7  merge commit for PR #97 — listed for audit hygiene

# --- mcp-google-ads: Firestore storage backend (2026-08-27) ---
# 8e164ff was manually cherry-picked on 2026-08-26 as fork commit 6f4d1b5.
# Patch equivalence did not match the resolved cherry-pick; listed to suppress re-detection.
8e164ff59e8c49b29b2fd8e6149f9b80cdc9f5aa  already applied as 6f4d1b5
f0735c1  merge commit for upstream PR 104 - audit hygiene

# a11b95b applied manually as 6bd18f1 with conflict resolution (v25 token snapshot diffs)
a11b95b8ad9e8dba0482746a4e7d0ba086f27220

# 32c804f applied manually as 7ef080e with conflict resolution (FastMCP 4.0.3 upgrade)
32c804f15126db32e85d47fa3215626fb79d7893

# ab43e83 applied manually as b5a42d5 with conflict resolution (utils_test.py: kept HEAD developer_token tests)
ab43e83dcaa5f36f74bdd90fa988671c86925882

# f28c5bb applied manually as a7e053f with conflict resolution (Add automated package release workflow (add/add release.yml conflict resolved))
f28c5bb3e421556418e531a021f921217e88ac2e
8728d27

# Auto-blocked by security scanner 2026-10-09T19:52:12+00:00
80e92461a86f54f9707341faeb5de091c67150dd  # security-scan: suspiciously long line (>300 chars, possible obfuscation)

# Auto-blocked by security scanner 2026-10-09T19:52:16+00:00
20cbb3b73b12ee67d4a0e8aa05cdd22adbf9cf77  # security-scan: suspiciously long line (>300 chars, possible obfuscation)

# Auto-blocked by security scanner 2026-10-09T19:52:19+00:00
844541a8d993a562415b456924c7ea9f3ff981b9  # security-scan: suspiciously long line (>300 chars, possible obfuscation)

# b50d31e9 — docs only: reorganise MCP HTTP interoperability doc (README.md diverges; no code changes)
b50d31e9298d45b6d5f941cb1bcdf0ee1ce6b774

# ad3453a6 — docs only: clarify MCP client and Quadlet security config (README.md + mcp-http-interoperability.md diverge)
ad3453a6f7e10669afac48967560f576ffdaf1b6

# e8612507 — smoke test golden file update (annotations/title shape); our fork's golden files diverge due to different tool set
e8612507753f12622e858090353b71a644f1289f

# 08a6fa96 — deletes .gitattributes + docs/mcp-http-interoperability.md + README lines; docs-only deletions that conflict with our fork's content
08a6fa9658d17a60b35381a44d67a29b0dbaa8e6

# 73e5ce3d — add optional login-customer-id param to all tools; applied as e1cfd2f (conflict: dup clean_customer_id + llm_cases token counts)
73e5ce3d487ecadb30b70feb1432a4e140c4811b

# 12573f01 — adds GoogleTokenVerifier test to server_test.py; our fork removed GoogleProvider entirely (auth at proxy level)
12573f01837b6f562791918cc0b3e6adbe33ffd8

# 01258609 — fastmcp>=4.0.3→4.0.6 (stop OAuth tokens being logged); applied as 5959a30 (kept mcp[cli]>=1.2.0 not upstream's ==2.0.0 pin)
01258609c5157b827dc7b1260919568d47f080a4

# 17778d6 — removes configure_safe_http_logging (fastmcp fixed upstream); no-op for our fork (never had it); upstream's GoogleProvider tests also skipped
17778d6566434471a9486d6459bc42ced2bc1e48

# 184f4493 — upstream version bump + add author to pyproject.toml; we manage our own versioning
184f449325616afa3ef99b8a41db1c456e4cde19