adloop 0.3.0__tar.gz → 0.4.0__tar.gz

{adloop-0.3.0 → adloop-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: adloop
-Version: 0.3.0
+Version: 0.4.0
 Summary: Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped.
 Keywords: mcp,google-ads,google-analytics,ga4,cursor,marketing
 Author: Daniel Klose
@@ -209,28 +209,32 @@ uv sync
 uv run adloop init
 ```
 
-The `adloop init` wizard walks you through everything:
+The `adloop init` wizard walks you through everything. AdLoop ships with built-in Google OAuth credentials, so you don't need to create a Google Cloud project.
 
-1. **Google Cloud checklist** with clickable links to each setup page
-2. **Credentials** — prompts for your OAuth JSON path, validates the file exists
-3. **GA4 Property ID** — validates numeric format
-4. **Developer Token** — from your Google Ads MCC API Center
-5. **Customer IDs** — auto-formats `1234567890` → `123-456-7890`
-6. **Safety defaults** — budget cap and dry-run preference
-7. **OAuth authorization** — optionally opens your browser to complete auth immediately
-8. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
+The wizard:
+
+1. **Developer token** — from your Google Ads MCC ([API Center](https://ads.google.com/aw/apicenter))
+2. **MCC Account ID** — your Manager Account ID (top bar in the MCC UI)
+3. **OAuth sign-in** — opens a browser to sign in with Google (or prints a URL for headless servers)
+4. **Auto-discovers your accounts** — finds your GA4 properties and Ads accounts automatically
+5. **Safety defaults** — budget cap and dry-run preference
+6. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
 
 ### Requirements
 
 - Python 3.11+
-- [uv](https://docs.astral.sh/uv/) for package management
-- A Google Cloud project (free tier works)
 - A Google Ads account with an MCC (Manager Account)
 
-### Manual Setup (If Not Using the Wizard)
+### Headless Servers
+
+Running on a server without a browser (VMs, Docker, SSH)? The wizard automatically detects this and falls back to a manual flow: it prints an authorization URL you can open on any device, then you paste the redirect URL back into the terminal.
+
+### Advanced Setup (Custom Google Cloud Project)
 
 <details>
-<summary>Click to expand manual setup steps</summary>
+<summary>Click to expand — only needed if you want to use your own GCP project instead of AdLoop's built-in credentials</summary>
+
+When you run `adloop init`, choose "No" when asked about built-in credentials. The wizard will guide you through:
 
 #### Step 1 — Google Cloud Project
 
@@ -247,8 +251,6 @@ The `adloop init` wizard walks you through everything:
 3. Select **Desktop app** as the application type, give it any name
 4. Download the JSON file and save it as `~/.adloop/credentials.json`
 
-On first run, AdLoop opens a browser window where you sign in with your Google account and grant access. The resulting token is saved to `~/.adloop/token.json` and refreshed automatically.
-
 > Service accounts are also supported — just place the service account key JSON at the same `credentials_path`. AdLoop detects the file type automatically.
 
 #### Step 3 — Google Ads Developer Token
@@ -261,28 +263,7 @@ Access levels:
 - **Explorer** (automatic) — 2,880 operations/day on production accounts. Enough to get started.
 - **Basic** (requires application) — 15,000 operations/day. Apply through the same API Center page if you need more.
 
-#### Step 4 — Find Your IDs
-
-| ID | Where to Find It |
-|----|-------------------|
-| **GA4 Property ID** | GA4 → Admin → Property Settings (numeric, e.g. `123456789`) |
-| **Google Ads Customer ID** | Google Ads UI → top bar (e.g. `123-456-7890`) |
-| **MCC Account ID** | MCC UI → top bar (e.g. `123-456-7890`) |
-
-#### Step 5 — Install and Configure
-
-```bash
-git clone https://github.com/kLOsk/adloop.git
-cd adloop
-uv sync
-
-mkdir -p ~/.adloop
-cp config.yaml.example ~/.adloop/config.yaml
-```
-
-Edit `~/.adloop/config.yaml` and fill in the values from the previous steps. See [`config.yaml.example`](config.yaml.example) for a fully documented template.
-
-#### Step 6 — Connect to Your Editor
+#### Step 4 — Connect to Your Editor
 
 **Cursor** — Add to your project's `.cursor/mcp.json`:
 
@@ -341,12 +322,12 @@ All configuration lives in `~/.adloop/config.yaml`. See [`config.yaml.example`](
 
 | Section | Key | Default | Description |
 |---------|-----|---------|-------------|
-| `google` | `project_id` | — | Your Google Cloud project ID |
-| `google` | `credentials_path` | `~/.adloop/credentials.json` | Path to OAuth client JSON or service account key |
+| `google` | `project_id` | *(empty)* | Google Cloud project ID (only needed with custom credentials) |
+| `google` | `credentials_path` | *(empty — uses built-in)* | Path to OAuth client JSON or service account key. Leave empty to use AdLoop's built-in credentials. |
 | `google` | `token_path` | `~/.adloop/token.json` | Where to store the OAuth token (auto-created) |
-| `ga4` | `property_id` | — | Your GA4 property ID (found in GA4 Admin → Property Settings) |
+| `ga4` | `property_id` | — | Your GA4 property ID (auto-discovered by `adloop init`) |
 | `ads` | `developer_token` | — | Your Google Ads API developer token |
-| `ads` | `customer_id` | — | Default Google Ads customer ID |
+| `ads` | `customer_id` | — | Default Google Ads customer ID (auto-discovered by `adloop init`) |
 | `ads` | `login_customer_id` | — | Your MCC account ID |
 | `safety` | `max_daily_budget` | `50.00` | Maximum allowed daily budget per campaign |
 | `safety` | `require_dry_run` | `true` | Force all writes to dry-run mode |
@@ -359,7 +340,7 @@ src/adloop/
 ├── __init__.py        # Entry point — routes 'adloop init' to wizard, otherwise starts MCP server
 ├── server.py          # FastMCP server — 38 tool registrations with safety annotations
 ├── config.py          # Config loader (~/.adloop/config.yaml)
-├── auth.py            # OAuth 2.0 Desktop flow + service account support + token refresh handling
+├── auth.py            # OAuth 2.0 flow (bundled + custom credentials, headless fallback) + service accounts
 ├── cli.py             # Interactive 'adloop init' setup wizard
 ├── crossref.py        # Cross-reference tools (GA4 + Ads combined analysis)
 ├── tracking.py        # Tracking validation + code generation tools
@@ -392,6 +373,8 @@ What's been shipped and what's next:
 - ~~Setup wizard (`adloop init`)~~ ✓
 - ~~Claude Code support~~ ✓ — `CLAUDE.md`, `.mcp.json`, `.claude/rules/`, `.claude/commands/`, CLI wizard snippets
 - ~~PyPI package~~ ✓ — `pip install adloop`
+- ~~Bundled OAuth credentials~~ ✓ — no Google Cloud project required, auto-discovery of GA4/Ads accounts
+- ~~Headless server support~~ ✓ — manual URL copy-paste flow for servers without a browser
 - **Community launch** — HN, Indie Hackers, r/cursor, Twitter
 - **Video walkthrough**
 

{adloop-0.3.0 → adloop-0.4.0}/README.md

@@ -185,28 +185,32 @@ uv sync
 uv run adloop init
 ```
 
-The `adloop init` wizard walks you through everything:
+The `adloop init` wizard walks you through everything. AdLoop ships with built-in Google OAuth credentials, so you don't need to create a Google Cloud project.
 
-1. **Google Cloud checklist** with clickable links to each setup page
-2. **Credentials** — prompts for your OAuth JSON path, validates the file exists
-3. **GA4 Property ID** — validates numeric format
-4. **Developer Token** — from your Google Ads MCC API Center
-5. **Customer IDs** — auto-formats `1234567890` → `123-456-7890`
-6. **Safety defaults** — budget cap and dry-run preference
-7. **OAuth authorization** — optionally opens your browser to complete auth immediately
-8. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
+The wizard:
+
+1. **Developer token** — from your Google Ads MCC ([API Center](https://ads.google.com/aw/apicenter))
+2. **MCC Account ID** — your Manager Account ID (top bar in the MCC UI)
+3. **OAuth sign-in** — opens a browser to sign in with Google (or prints a URL for headless servers)
+4. **Auto-discovers your accounts** — finds your GA4 properties and Ads accounts automatically
+5. **Safety defaults** — budget cap and dry-run preference
+6. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
 
 ### Requirements
 
 - Python 3.11+
-- [uv](https://docs.astral.sh/uv/) for package management
-- A Google Cloud project (free tier works)
 - A Google Ads account with an MCC (Manager Account)
 
-### Manual Setup (If Not Using the Wizard)
+### Headless Servers
+
+Running on a server without a browser (VMs, Docker, SSH)? The wizard automatically detects this and falls back to a manual flow: it prints an authorization URL you can open on any device, then you paste the redirect URL back into the terminal.
+
+### Advanced Setup (Custom Google Cloud Project)
 
 <details>
-<summary>Click to expand manual setup steps</summary>
+<summary>Click to expand — only needed if you want to use your own GCP project instead of AdLoop's built-in credentials</summary>
+
+When you run `adloop init`, choose "No" when asked about built-in credentials. The wizard will guide you through:
 
 #### Step 1 — Google Cloud Project
 
@@ -223,8 +227,6 @@ The `adloop init` wizard walks you through everything:
 3. Select **Desktop app** as the application type, give it any name
 4. Download the JSON file and save it as `~/.adloop/credentials.json`
 
-On first run, AdLoop opens a browser window where you sign in with your Google account and grant access. The resulting token is saved to `~/.adloop/token.json` and refreshed automatically.
-
 > Service accounts are also supported — just place the service account key JSON at the same `credentials_path`. AdLoop detects the file type automatically.
 
 #### Step 3 — Google Ads Developer Token
@@ -237,28 +239,7 @@ Access levels:
 - **Explorer** (automatic) — 2,880 operations/day on production accounts. Enough to get started.
 - **Basic** (requires application) — 15,000 operations/day. Apply through the same API Center page if you need more.
 
-#### Step 4 — Find Your IDs
-
-| ID | Where to Find It |
-|----|-------------------|
-| **GA4 Property ID** | GA4 → Admin → Property Settings (numeric, e.g. `123456789`) |
-| **Google Ads Customer ID** | Google Ads UI → top bar (e.g. `123-456-7890`) |
-| **MCC Account ID** | MCC UI → top bar (e.g. `123-456-7890`) |
-
-#### Step 5 — Install and Configure
-
-```bash
-git clone https://github.com/kLOsk/adloop.git
-cd adloop
-uv sync
-
-mkdir -p ~/.adloop
-cp config.yaml.example ~/.adloop/config.yaml
-```
-
-Edit `~/.adloop/config.yaml` and fill in the values from the previous steps. See [`config.yaml.example`](config.yaml.example) for a fully documented template.
-
-#### Step 6 — Connect to Your Editor
+#### Step 4 — Connect to Your Editor
 
 **Cursor** — Add to your project's `.cursor/mcp.json`:
 
@@ -317,12 +298,12 @@ All configuration lives in `~/.adloop/config.yaml`. See [`config.yaml.example`](
 
 | Section | Key | Default | Description |
 |---------|-----|---------|-------------|
-| `google` | `project_id` | — | Your Google Cloud project ID |
-| `google` | `credentials_path` | `~/.adloop/credentials.json` | Path to OAuth client JSON or service account key |
+| `google` | `project_id` | *(empty)* | Google Cloud project ID (only needed with custom credentials) |
+| `google` | `credentials_path` | *(empty — uses built-in)* | Path to OAuth client JSON or service account key. Leave empty to use AdLoop's built-in credentials. |
 | `google` | `token_path` | `~/.adloop/token.json` | Where to store the OAuth token (auto-created) |
-| `ga4` | `property_id` | — | Your GA4 property ID (found in GA4 Admin → Property Settings) |
+| `ga4` | `property_id` | — | Your GA4 property ID (auto-discovered by `adloop init`) |
 | `ads` | `developer_token` | — | Your Google Ads API developer token |
-| `ads` | `customer_id` | — | Default Google Ads customer ID |
+| `ads` | `customer_id` | — | Default Google Ads customer ID (auto-discovered by `adloop init`) |
 | `ads` | `login_customer_id` | — | Your MCC account ID |
 | `safety` | `max_daily_budget` | `50.00` | Maximum allowed daily budget per campaign |
 | `safety` | `require_dry_run` | `true` | Force all writes to dry-run mode |
@@ -335,7 +316,7 @@ src/adloop/
 ├── __init__.py        # Entry point — routes 'adloop init' to wizard, otherwise starts MCP server
 ├── server.py          # FastMCP server — 38 tool registrations with safety annotations
 ├── config.py          # Config loader (~/.adloop/config.yaml)
-├── auth.py            # OAuth 2.0 Desktop flow + service account support + token refresh handling
+├── auth.py            # OAuth 2.0 flow (bundled + custom credentials, headless fallback) + service accounts
 ├── cli.py             # Interactive 'adloop init' setup wizard
 ├── crossref.py        # Cross-reference tools (GA4 + Ads combined analysis)
 ├── tracking.py        # Tracking validation + code generation tools
@@ -368,6 +349,8 @@ What's been shipped and what's next:
 - ~~Setup wizard (`adloop init`)~~ ✓
 - ~~Claude Code support~~ ✓ — `CLAUDE.md`, `.mcp.json`, `.claude/rules/`, `.claude/commands/`, CLI wizard snippets
 - ~~PyPI package~~ ✓ — `pip install adloop`
+- ~~Bundled OAuth credentials~~ ✓ — no Google Cloud project required, auto-discovery of GA4/Ads accounts
+- ~~Headless server support~~ ✓ — manual URL copy-paste flow for servers without a browser
 - **Community launch** — HN, Indie Hackers, r/cursor, Twitter
 - **Video walkthrough**
 

{adloop-0.3.0 → adloop-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adloop"
-version = "0.3.0"
+version = "0.4.0"
 description = "Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped."
 readme = "README.md"
 authors = [

{adloop-0.3.0 → adloop-0.4.0}/src/adloop/__init__.py

@@ -2,7 +2,7 @@
 
 import sys
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 
 def main() -> None:

{adloop-0.3.0 → adloop-0.4.0}/src/adloop/ads/write.py

@@ -987,6 +987,40 @@ def draft_sitelinks(
 # ---------------------------------------------------------------------------
 
 
+def _extract_error_message(exc: Exception) -> str:
+    """Extract a meaningful error message from Google Ads API exceptions.
+
+    GoogleAdsException.__init__ doesn't call super().__init__(), so str(e)
+    returns ''. This function digs into the failure proto to surface the
+    actual error code, message, and trigger values.
+    """
+    try:
+        from google.ads.googleads.errors import GoogleAdsException
+
+        if isinstance(exc, GoogleAdsException) and exc.failure:
+            parts = []
+            for error in exc.failure.errors:
+                error_code = error.error_code
+                code_field = error_code.WhichOneof("error_code")
+                code_value = getattr(error_code, code_field) if code_field else "UNKNOWN"
+                line = f"[{code_field}={code_value.name if hasattr(code_value, 'name') else code_value}]"
+                if error.message:
+                    line += f" {error.message}"
+                if error.trigger and error.trigger.string_value:
+                    line += f" (trigger: {error.trigger.string_value})"
+                parts.append(line)
+            if parts:
+                msg = "; ".join(parts)
+                if exc.request_id:
+                    msg += f" [request_id={exc.request_id}]"
+                return msg
+    except Exception:
+        pass
+
+    fallback = str(exc)
+    return fallback if fallback else repr(exc)
+
+
 def confirm_and_apply(
     config: AdLoopConfig,
     *,
@@ -1036,6 +1070,7 @@ def confirm_and_apply(
     try:
         result = _execute_plan(config, plan)
     except Exception as e:
+        error_message = _extract_error_message(e)
         log_mutation(
             config.safety.log_file,
             operation=plan.operation,
@@ -1045,9 +1080,9 @@ def confirm_and_apply(
             changes=plan.changes,
             dry_run=False,
             result="error",
-            error=str(e),
+            error=error_message,
         )
-        return {"error": str(e), "plan_id": plan.plan_id}
+        return {"error": error_message, "plan_id": plan.plan_id}
 
     log_mutation(
         config.safety.log_file,
@@ -2171,17 +2206,13 @@ def _apply_remove(
         )
 
     elif entity_type == "campaign_asset":
-        # Campaign asset composite ID: {campaign_id}~{asset_id}~{field_type}
-        parts = entity_id.replace(",", "~").split("~")
+        parts = entity_id.split("~")
         if len(parts) != 3:
             raise ValueError(
                 f"campaign_asset entity_id must be "
                 f"'campaignId~assetId~fieldType', got '{entity_id}'"
             )
-        ca_service = client.get_service("CampaignAssetService")
-        resource_name = ca_service.campaign_asset_path(
-            cid, parts[0], parts[1], parts[2]
-        )
+        resource_name = f"customers/{cid}/campaignAssets/{entity_id}"
         ga_service = client.get_service("GoogleAdsService")
         op = client.get_type("MutateOperation")
         op.campaign_asset_operation.remove = resource_name
@@ -2202,14 +2233,13 @@ def _apply_remove(
         )
 
     elif entity_type == "customer_asset":
-        parts = entity_id.replace(",", "~").split("~")
+        parts = entity_id.split("~")
         if len(parts) != 2:
             raise ValueError(
                 f"customer_asset entity_id must be "
                 f"'assetId~fieldType', got '{entity_id}'"
             )
-        ca_service = client.get_service("CustomerAssetService")
-        resource_name = ca_service.customer_asset_path(cid, parts[0], parts[1])
+        resource_name = f"customers/{cid}/customerAssets/{entity_id}"
         ga_service = client.get_service("GoogleAdsService")
         op = client.get_type("MutateOperation")
         op.customer_asset_operation.remove = resource_name

{adloop-0.3.0 → adloop-0.4.0}/src/adloop/auth.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import importlib.resources
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -29,11 +30,39 @@ _ADS_SCOPES = [
 ]
 
 
+def _get_credentials_path(config: AdLoopConfig) -> Path | None:
+    """Resolve OAuth client credentials using a priority chain.
+
+    1. User-provided credentials_path in config (if non-empty and file exists)
+    2. ~/.adloop/credentials.json (if file exists — legacy or manually placed)
+    3. Bundled credentials shipped with the package
+    4. None (caller falls back to Application Default Credentials)
+    """
+    if config.google.credentials_path:
+        user_path = Path(config.google.credentials_path).expanduser()
+        if user_path.exists():
+            return user_path
+
+    local_path = Path("~/.adloop/credentials.json").expanduser()
+    if local_path.exists():
+        return local_path
+
+    try:
+        ref = importlib.resources.files("adloop").joinpath("bundled_credentials.json")
+        with importlib.resources.as_file(ref) as bundled:
+            if bundled.exists():
+                return Path(bundled)
+    except (FileNotFoundError, TypeError):
+        pass
+
+    return None
+
+
 def get_ga4_credentials(config: AdLoopConfig) -> Credentials:
     """Return authenticated credentials for GA4 APIs."""
-    creds_path = Path(config.google.credentials_path).expanduser()
+    creds_path = _get_credentials_path(config)
 
-    if creds_path.exists():
+    if creds_path is not None:
         import json
 
         with open(creds_path) as f:
@@ -47,7 +76,7 @@ def get_ga4_credentials(config: AdLoopConfig) -> Credentials:
                 scopes=_GA4_SCOPES,
             )
 
-        return _oauth_flow(config)
+        return _oauth_flow(config, creds_path)
 
     import google.auth
 
@@ -57,9 +86,9 @@ def get_ga4_credentials(config: AdLoopConfig) -> Credentials:
 
 def get_ads_credentials(config: AdLoopConfig) -> Credentials:
     """Return authenticated credentials for Google Ads API."""
-    creds_path = Path(config.google.credentials_path).expanduser()
+    creds_path = _get_credentials_path(config)
 
-    if creds_path.exists():
+    if creds_path is not None:
         import json
 
         with open(creds_path) as f:
@@ -73,7 +102,7 @@ def get_ads_credentials(config: AdLoopConfig) -> Credentials:
                 scopes=_ADS_SCOPES,
             )
 
-        return _oauth_flow(config)
+        return _oauth_flow(config, creds_path)
 
     import google.auth
 
@@ -81,18 +110,29 @@ def get_ads_credentials(config: AdLoopConfig) -> Credentials:
     return credentials
 
 
-def _oauth_flow(config: AdLoopConfig) -> Credentials:
+def _oauth_flow(
+    config: AdLoopConfig, creds_path: Path | None = None
+) -> Credentials:
     """Run OAuth Desktop flow requesting all scopes (GA4 + Ads).
 
     Uses a single token file for all scopes to avoid conflicts between
     GA4 and Ads auth sharing the same token_path.
+
+    Falls back to a manual copy-paste flow when no browser is available
+    (headless servers, Docker containers, SSH sessions).
     """
     from google.auth.transport.requests import Request
     from google.oauth2.credentials import Credentials as OAuthCredentials
     from google_auth_oauthlib.flow import InstalledAppFlow
 
     token_path = Path(config.google.token_path).expanduser()
-    creds_path = Path(config.google.credentials_path).expanduser()
+    if creds_path is None:
+        creds_path = _get_credentials_path(config)
+    if creds_path is None:
+        raise RuntimeError(
+            "No OAuth credentials found. Run 'adloop init' or place "
+            "credentials.json at ~/.adloop/credentials.json"
+        )
 
     creds = None
     if token_path.exists():
@@ -123,10 +163,34 @@ def _oauth_flow(config: AdLoopConfig) -> Credentials:
         flow = InstalledAppFlow.from_client_secrets_file(
             str(creds_path), _ALL_SCOPES
         )
-        creds = flow.run_local_server(port=0)
+        creds = _run_oauth_with_fallback(flow)
 
     token_path.parent.mkdir(parents=True, exist_ok=True)
     with open(token_path, "w") as f:
         f.write(creds.to_json())
 
     return creds
+
+
+def _run_oauth_with_fallback(flow: object) -> Credentials:
+    """Try browser-based OAuth; fall back to manual URL copy-paste for headless."""
+    try:
+        return flow.run_local_server(port=0)  # type: ignore[union-attr]
+    except Exception:
+        pass
+
+    auth_url, _ = flow.authorization_url(prompt="consent")  # type: ignore[union-attr]
+    print()
+    print("  No browser detected — using manual authorization.")
+    print()
+    print("  Open this URL in a browser on any device:")
+    print()
+    print(f"    {auth_url}")
+    print()
+    print("  Sign in and grant access. Your browser will redirect to a")
+    print("  localhost URL that won't load — that's expected.")
+    print("  Copy the FULL URL from your browser's address bar.")
+    print()
+    redirect_url = input("  Paste the redirect URL here: ").strip()
+    flow.fetch_token(authorization_response=redirect_url)  # type: ignore[union-attr]
+    return flow.credentials  # type: ignore[union-attr]

adloop-0.4.0/src/adloop/bundled_credentials.json

@@ -0,0 +1,12 @@
+{
+  "_comment": "PLACEHOLDER — Replace this file with the real OAuth client JSON downloaded from your GCP project. See the plan in .cursor/plans/ for instructions.",
+  "installed": {
+    "client_id": "REPLACE_ME.apps.googleusercontent.com",
+    "project_id": "REPLACE_ME",
+    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+    "token_uri": "https://oauth2.googleapis.com/token",
+    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+    "client_secret": "REPLACE_ME",
+    "redirect_uris": ["http://localhost"]
+  }
+}

{adloop-0.3.0 → adloop-0.4.0}/src/adloop/cli.py

@@ -119,10 +119,28 @@ def _prompt_property_id(default: str = "") -> str:
         return value
 
 
+def _prompt_choice(label: str, choices: list[tuple[str, str]]) -> str:
+    """Present a numbered list of choices and return the selected value."""
+    _print(f"  {label}")
+    _print()
+    for i, (value, display) in enumerate(choices, 1):
+        _print(f"    {i}. {display}")
+    _print()
+    while True:
+        raw = input(f"  Enter number [1-{len(choices)}]: ").strip()
+        try:
+            idx = int(raw) - 1
+            if 0 <= idx < len(choices):
+                return choices[idx][0]
+        except ValueError:
+            pass
+        _print(f"    ⚠  Please enter a number between 1 and {len(choices)}")
+
+
 def _generate_config_yaml(
     *,
-    project_id: str,
-    credentials_path: str,
+    project_id: str = "",
+    credentials_path: str = "",
     property_id: str,
     developer_token: str,
     customer_id: str,
@@ -131,16 +149,22 @@ def _generate_config_yaml(
     require_dry_run: bool,
 ) -> str:
     dry_run_str = "true" if require_dry_run else "false"
+
+    google_section = "google:\n"
+    if project_id:
+        google_section += f'  project_id: "{project_id}"\n'
+    if credentials_path:
+        google_section += f'  credentials_path: "{credentials_path}"\n'
+    else:
+        google_section += "  # Using built-in credentials (no credentials_path needed)\n"
+    google_section += '  token_path: "~/.adloop/token.json"\n'
+
     return textwrap.dedent(f"""\
         # AdLoop configuration
         # Generated by: adloop init
-        # Docs: https://github.com/your-org/adloop
-
-        google:
-          project_id: "{project_id}"
-          credentials_path: "{credentials_path}"
-          token_path: "~/.adloop/token.json"
+        # Docs: https://github.com/kLOsk/adloop
 
+        {google_section}
         ga4:
           property_id: "{property_id}"
 
@@ -203,6 +227,61 @@ def _step_header(num: int, title: str) -> None:
     _print()
 
 
+def _discover_ga4_properties(config: object) -> list[tuple[str, str]]:
+    """Call GA4 Admin API to discover accessible properties.
+
+    Returns list of (property_id, display_string) tuples.
+    """
+    from adloop.ga4.reports import get_account_summaries
+
+    result = get_account_summaries(config)  # type: ignore[arg-type]
+    properties: list[tuple[str, str]] = []
+    for account in result.get("accounts", []):
+        acct_name = account.get("display_name", "Unknown")
+        for prop in account.get("properties", []):
+            prop_path = prop.get("property", "")
+            prop_name = prop.get("display_name", "Unknown")
+            prop_id = prop_path.replace("properties/", "")
+            properties.append((prop_id, f"{prop_name} ({prop_id}) — {acct_name}"))
+    return properties
+
+
+def _discover_ads_accounts(config: object) -> list[tuple[str, str]]:
+    """Call Google Ads API to discover accessible accounts.
+
+    Returns list of (customer_id_formatted, display_string) tuples.
+    Non-manager accounts only.
+    """
+    from adloop.ads.read import list_accounts
+
+    result = list_accounts(config)  # type: ignore[arg-type]
+    accounts: list[tuple[str, str]] = []
+    for acct in result.get("accounts", []):
+        is_manager = False
+        for key in ("customer_client.manager", "customer.manager"):
+            if acct.get(key) is True:
+                is_manager = True
+                break
+        if is_manager:
+            continue
+
+        raw_id = ""
+        name = "Unknown"
+        for id_key in ("customer_client.id", "customer.id"):
+            if id_key in acct:
+                raw_id = str(acct[id_key])
+                break
+        for name_key in ("customer_client.descriptive_name", "customer.descriptive_name"):
+            if name_key in acct:
+                name = str(acct[name_key])
+                break
+
+        if raw_id:
+            formatted = _format_customer_id(raw_id)
+            accounts.append((formatted, f"{name} ({formatted})"))
+    return accounts
+
+
 def run_init_wizard() -> None:
     """Interactive setup wizard for AdLoop."""
     _print()
@@ -230,53 +309,174 @@ def run_init_wizard() -> None:
             return str(existing_config[section].get(key, fallback))
         return fallback
 
-    # Step 1: Google Cloud instructions
-    _step_header(1, "Google Cloud Setup")
-    _print(_GOOGLE_CLOUD_INSTRUCTIONS)
-    input("  Press Enter when you've completed the steps above...")
-
-    # Step 2: Credentials path
-    _step_header(2, "OAuth Credentials")
-    credentials_path = _prompt_credentials_path(
-        default=_existing("google", "credentials_path", "~/.adloop/credentials.json")
-    )
-
-    # Step 3: Google Cloud Project ID
-    _step_header(3, "Google Cloud Project")
-    project_id = _prompt(
-        "Google Cloud Project ID",
-        default=_existing("google", "project_id"),
-    )
-
-    # Step 4: GA4 Property ID
-    _step_header(4, "Google Analytics (GA4)")
-    _print("  Find your GA4 Property ID at:")
-    _print("  → https://analytics.google.com → Admin → Property Settings")
+    # Step 1: Credentials mode
+    _step_header(1, "Google Credentials")
+    _print("  AdLoop includes built-in Google OAuth credentials so you")
+    _print("  don't need to create your own Google Cloud project.")
     _print()
-    property_id = _prompt_property_id(
-        default=_existing("ga4", "property_id"),
+    use_bundled = _prompt_bool(
+        "Use built-in credentials? (recommended)", default=True
     )
 
-    # Step 5: Developer Token
-    _step_header(5, "Google Ads Developer Token")
+    credentials_path = ""
+    project_id = ""
+    if not use_bundled:
+        _print()
+        _print(_GOOGLE_CLOUD_INSTRUCTIONS)
+        input("  Press Enter when you've completed the steps above...")
+
+        _step_header(2, "OAuth Credentials")
+        credentials_path = _prompt_credentials_path(
+            default=_existing("google", "credentials_path", "~/.adloop/credentials.json")
+        )
+
+        _step_header(3, "Google Cloud Project")
+        project_id = _prompt(
+            "Google Cloud Project ID",
+            default=_existing("google", "project_id"),
+        )
+
+    # Developer token (both paths need this)
+    step_num = 2 if use_bundled else 4
+    _step_header(step_num, "Google Ads Developer Token")
+    _print("  Find your developer token in your MCC account:")
+    _print("  → https://ads.google.com/aw/apicenter")
+    _print()
     developer_token = _prompt(
         "Developer Token",
         default=_existing("ads", "developer_token"),
     )
 
-    # Step 6: Customer ID
-    _step_header(6, "Google Ads Account IDs")
-    customer_id = _prompt_customer_id(
-        "Ads Customer ID (XXX-XXX-XXXX)",
-        default=_existing("ads", "customer_id"),
-    )
+    # MCC Account ID (needed before auto-discovery for Ads API calls)
+    step_num += 1
+    _step_header(step_num, "MCC / Manager Account")
+    _print("  Your MCC (Manager) account ID is in the top bar of your MCC.")
+    _print()
     login_customer_id = _prompt_customer_id(
-        "MCC / Manager Account ID (XXX-XXX-XXXX)",
+        "MCC Account ID (XXX-XXX-XXXX)",
         default=_existing("ads", "login_customer_id"),
     )
 
-    # Step 7: Safety defaults
-    _step_header(7, "Safety Defaults")
+    # OAuth + auto-discovery
+    step_num += 1
+    _step_header(step_num, "Authorization & Account Discovery")
+
+    # Write a minimal temporary config for OAuth + discovery
+    _ADLOOP_DIR.mkdir(parents=True, exist_ok=True)
+    temp_config_yaml = _generate_config_yaml(
+        project_id=project_id,
+        credentials_path=credentials_path,
+        property_id="",
+        developer_token=developer_token,
+        customer_id="",
+        login_customer_id=login_customer_id,
+        max_daily_budget=50.0,
+        require_dry_run=True,
+    )
+    _CONFIG_PATH.write_text(temp_config_yaml)
+
+    # Optional: copy custom credentials to ~/.adloop/
+    if not use_bundled and credentials_path:
+        creds_expanded = Path(credentials_path).expanduser()
+        adloop_creds = _ADLOOP_DIR / "credentials.json"
+        if creds_expanded != adloop_creds and creds_expanded.exists():
+            if _prompt_bool(
+                f"Copy {creds_expanded.name} to {_ADLOOP_DIR}?", default=True
+            ):
+                import shutil
+
+                shutil.copy2(creds_expanded, adloop_creds)
+                _print(f"  ✓ Credentials copied to {adloop_creds}")
+
+    _print("  Signing in with Google (this may open a browser)...")
+    _print()
+    oauth_ok = False
+    try:
+        from adloop.config import load_config
+        from adloop.auth import _oauth_flow
+
+        cfg = load_config(str(_CONFIG_PATH))
+        _oauth_flow(cfg)
+        _print("  ✓ OAuth token saved")
+        oauth_ok = True
+    except Exception as exc:
+        _print(f"  ✗ OAuth failed: {exc}")
+        _print("    You can retry later — any AdLoop tool call will trigger auth.")
+
+    # Auto-discover GA4 properties
+    property_id = ""
+    if oauth_ok:
+        _print()
+        _print("  Discovering GA4 properties...")
+        try:
+            cfg = load_config(str(_CONFIG_PATH))
+            ga4_props = _discover_ga4_properties(cfg)
+            if len(ga4_props) == 1:
+                property_id = ga4_props[0][0]
+                _print(f"  ✓ Found GA4 property: {ga4_props[0][1]}")
+                if not _prompt_bool("Use this property?", default=True):
+                    property_id = _prompt_property_id()
+            elif len(ga4_props) > 1:
+                _print(f"  Found {len(ga4_props)} GA4 properties:")
+                property_id = _prompt_choice(
+                    "Select your GA4 property:", ga4_props
+                )
+            else:
+                _print("  No GA4 properties found. Enter manually:")
+                property_id = _prompt_property_id()
+        except Exception as exc:
+            _print(f"  Could not auto-discover GA4 properties: {exc}")
+            property_id = _prompt_property_id(
+                default=_existing("ga4", "property_id"),
+            )
+    else:
+        step_num += 1
+        _step_header(step_num, "Google Analytics (GA4)")
+        _print("  Find your GA4 Property ID at:")
+        _print("  → https://analytics.google.com → Admin → Property Settings")
+        _print()
+        property_id = _prompt_property_id(
+            default=_existing("ga4", "property_id"),
+        )
+
+    # Auto-discover Ads accounts
+    customer_id = ""
+    if oauth_ok:
+        _print()
+        _print("  Discovering Google Ads accounts...")
+        try:
+            cfg = load_config(str(_CONFIG_PATH))
+            ads_accounts = _discover_ads_accounts(cfg)
+            if len(ads_accounts) == 1:
+                customer_id = ads_accounts[0][0]
+                _print(f"  ✓ Found Ads account: {ads_accounts[0][1]}")
+                if not _prompt_bool("Use this account?", default=True):
+                    customer_id = _prompt_customer_id("Ads Customer ID (XXX-XXX-XXXX)")
+            elif len(ads_accounts) > 1:
+                _print(f"  Found {len(ads_accounts)} Ads accounts:")
+                customer_id = _prompt_choice(
+                    "Select your default Ads account:", ads_accounts
+                )
+            else:
+                _print("  No Ads accounts found. Enter manually:")
+                customer_id = _prompt_customer_id("Ads Customer ID (XXX-XXX-XXXX)")
+        except Exception as exc:
+            _print(f"  Could not auto-discover Ads accounts: {exc}")
+            customer_id = _prompt_customer_id(
+                "Ads Customer ID (XXX-XXX-XXXX)",
+                default=_existing("ads", "customer_id"),
+            )
+    else:
+        step_num += 1
+        _step_header(step_num, "Google Ads Account")
+        customer_id = _prompt_customer_id(
+            "Ads Customer ID (XXX-XXX-XXXX)",
+            default=_existing("ads", "customer_id"),
+        )
+
+    # Safety defaults
+    step_num += 1
+    _step_header(step_num, "Safety Defaults")
     budget_str = _prompt(
         "Max daily budget cap (safety limit)",
         default=str(_existing("safety", "max_daily_budget", "50")),
@@ -293,10 +493,9 @@ def run_init_wizard() -> None:
         default=True,
     )
 
-    # Write config
+    # Write final config
     _print()
     _print("  ── Writing Configuration ──")
-    _ADLOOP_DIR.mkdir(parents=True, exist_ok=True)
 
     config_yaml = _generate_config_yaml(
         project_id=project_id,
@@ -311,35 +510,6 @@ def run_init_wizard() -> None:
     _CONFIG_PATH.write_text(config_yaml)
     _print(f"  ✓ Config written to {_CONFIG_PATH}")
 
-    # Optional: Copy credentials.json to ~/.adloop/ if it's elsewhere
-    creds_expanded = Path(credentials_path).expanduser()
-    adloop_creds = _ADLOOP_DIR / "credentials.json"
-    if creds_expanded != adloop_creds and creds_expanded.exists():
-        if _prompt_bool(
-            f"Copy {creds_expanded.name} to {_ADLOOP_DIR}?", default=True
-        ):
-            import shutil
-
-            shutil.copy2(creds_expanded, adloop_creds)
-            _print(f"  ✓ Credentials copied to {adloop_creds}")
-
-    # Optional OAuth
-    _print()
-    if _prompt_bool("Run OAuth authorization now? (opens browser)", default=True):
-        _print("  Starting OAuth flow...")
-        try:
-            from adloop.config import load_config
-            from adloop.auth import _oauth_flow
-
-            cfg = load_config(str(_CONFIG_PATH))
-            _oauth_flow(cfg)
-            _print("  ✓ OAuth token saved — AdLoop is ready to connect")
-        except Exception as exc:
-            _print(f"  ✗ OAuth failed: {exc}")
-            _print("    You can retry later — any AdLoop tool call will trigger auth.")
-    else:
-        _print("  Skipped — OAuth will run automatically on first tool call.")
-
     # MCP configuration snippets
     _print()
     _print("  ── MCP Configuration ──")

{adloop-0.3.0 → adloop-0.4.0}/src/adloop/config.py

@@ -12,7 +12,7 @@ import yaml
 @dataclass
 class GoogleConfig:
     project_id: str = ""
-    credentials_path: str = "~/.adloop/credentials.json"
+    credentials_path: str = ""  # empty = use bundled credentials shipped with the package
     token_path: str = "~/.adloop/token.json"
 
 
@@ -81,7 +81,7 @@ def load_config(config_path: str | None = None) -> AdLoopConfig:
     return AdLoopConfig(
         google=GoogleConfig(
             project_id=google_raw.get("project_id", ""),
-            credentials_path=google_raw.get("credentials_path", "~/.adloop/credentials.json"),
+            credentials_path=google_raw.get("credentials_path", ""),
             token_path=google_raw.get("token_path", "~/.adloop/token.json"),
         ),
         ga4=GA4Config(