chore: bump version to 1.3.35

desiorac · desiorac · commit 0eeff6cd5da6 · 2026-04-16T01:40:09.000Z
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -67,6 +67,8 @@ def _isolate_data(tmp_path, monkeypatch):
     monkeypatch.setattr(app_mod, "ARKFORGE_PUBLIC_KEY", test_pubkey)
     monkeypatch.setattr(app_mod, "PROOF_ACCESS_LOG", tmp_path / "data" / "proof_access_log.jsonl")
     monkeypatch.setattr(app_mod, "WEBHOOK_IDEMPOTENCY_FILE", tmp_path / "data" / "webhook_idempotency.jsonl")
+    monkeypatch.setattr(app_mod, "FUNNEL_EVENTS_LOG", tmp_path / "data" / "funnel_events.jsonl")
+    monkeypatch.setattr(app_mod, "CONVERSION_EVENTS_LOG", tmp_path / "data" / "conversion_events.jsonl")
 
     # DNS rebinding mock — prevent real DNS resolution in proxy tests
     monkeypatch.setattr(proxy_mod, "_check_no_private_dns", AsyncMock(return_value=None))
@@ -98,6 +100,10 @@ def _isolate_data(tmp_path, monkeypatch):
     monkeypatch.setattr(assess_mod, "MCP_BASELINES_DIR", tmp_path / "data" / "mcp_baselines")
     monkeypatch.setattr(assess_mod, "ASSESSMENTS_DIR", tmp_path / "data" / "assessments")
 
+    import trust_layer.routers.assess as assess_router_mod
+    monkeypatch.setattr(assess_router_mod, "SCAN_EVENTS_LOG", tmp_path / "data" / "scan_events.jsonl")
+    monkeypatch.setattr(assess_router_mod, "FUNNEL_EVENTS_LOG", tmp_path / "data" / "funnel_events.jsonl")
+
     import trust_layer.proof_index as pidx_mod
     monkeypatch.setattr(pidx_mod, "PROOF_INDEX_FILE", tmp_path / "data" / "proof_index.jsonl")
     # Reset proof_index singleton so each test gets a fresh File backend pointing to tmp_path
diff --git a/tests/test_funnel_metrics.py b/tests/test_funnel_metrics.py
@@ -0,0 +1,126 @@
+"""Tests for funnel metrics instrumentation (cta_impression, register_page_visit, register_completion)."""
+
+import json
+from pathlib import Path
+from unittest.mock import patch, AsyncMock
+
+import pytest
+from fastapi.testclient import TestClient
+
+
+@pytest.fixture
+def client():
+    from trust_layer.app import app
+    return TestClient(app)
+
+
+@pytest.fixture
+def internal_key(tmp_path):
+    from trust_layer.keys import create_api_key
+    key = create_api_key("", "internal_test", "internal@arkforge.tech", test_mode=False, plan="internal")
+    return key
+
+
+@pytest.fixture
+def free_key(tmp_path):
+    from trust_layer.keys import create_api_key
+    key = create_api_key("", "free_test", "free@test.com", test_mode=False, plan="free")
+    return key
+
+
+def _read_funnel_events(tmp_path) -> list:
+    log = tmp_path / "data" / "funnel_events.jsonl"
+    if not log.exists():
+        return []
+    events = []
+    for line in log.read_text().splitlines():
+        if line.strip():
+            events.append(json.loads(line))
+    return events
+
+
+class TestCtaImpression:
+    def test_assess_logs_cta_impression(self, client, free_key, tmp_path):
+        resp = client.post(
+            "/v1/assess",
+            json={"server_id": "test-mcp", "manifest": {"tools": [{"name": "t1"}]}},
+            headers={"X-Api-Key": free_key},
+        )
+        assert resp.status_code == 200
+        events = _read_funnel_events(tmp_path)
+        cta_events = [e for e in events if e["event"] == "cta_impression"]
+        assert len(cta_events) == 1
+        assert cta_events[0]["server_id"] == "test-mcp"
+        assert cta_events[0]["assess_id"].startswith("asr_")
+
+
+class TestRegisterPageVisit:
+    def test_register_get_logs_visit(self, client, tmp_path):
+        resp = client.get("/register?scan_id=asr_20260416_120000_abc123")
+        assert resp.status_code == 200
+        events = _read_funnel_events(tmp_path)
+        visit_events = [e for e in events if e["event"] == "register_page_visit"]
+        assert len(visit_events) == 1
+        assert visit_events[0]["scan_id"] == "asr_20260416_120000_abc123"[:32]
+
+    def test_register_get_without_scan_id(self, client, tmp_path):
+        resp = client.get("/register")
+        assert resp.status_code == 200
+        events = _read_funnel_events(tmp_path)
+        visit_events = [e for e in events if e["event"] == "register_page_visit"]
+        assert len(visit_events) == 1
+        assert visit_events[0]["scan_id"] == ""
+
+
+class TestRegisterCompletion:
+    def test_register_post_logs_completion(self, client, tmp_path):
+        resp = client.post(
+            "/api/register",
+            json={"email": "newuser@example.com", "source": "web_register", "scan_id": "asr_test_123"},
+        )
+        assert resp.status_code == 200
+        data = resp.json()
+        assert "api_key" in data
+
+        events = _read_funnel_events(tmp_path)
+        completion_events = [e for e in events if e["event"] == "register_completion"]
+        assert len(completion_events) == 1
+        assert completion_events[0]["source"] == "web_register"
+        assert completion_events[0]["scan_id"] == "asr_test_123"
+
+    def test_existing_key_no_completion_event(self, client, tmp_path):
+        client.post("/api/register", json={"email": "dup@example.com", "source": "web_register"})
+        events_before = len(_read_funnel_events(tmp_path))
+
+        resp = client.post("/api/register", json={"email": "dup@example.com", "source": "web_register"})
+        assert resp.status_code == 200
+        assert resp.json().get("already_existed") is True
+
+        events_after = _read_funnel_events(tmp_path)
+        completions_after = [e for e in events_after if e["event"] == "register_completion"]
+        assert len(completions_after) == 1
+
+
+class TestFunnelMetricsEndpoint:
+    def test_requires_internal_key(self, client, free_key):
+        resp = client.get("/v1/funnel-metrics", headers={"X-Api-Key": free_key})
+        assert resp.status_code == 403
+
+    def test_returns_aggregated_counts(self, client, internal_key, free_key, tmp_path):
+        client.post(
+            "/v1/assess",
+            json={"server_id": "s1", "manifest": {"tools": [{"name": "t1"}]}},
+            headers={"X-Api-Key": free_key},
+        )
+        client.get("/register?scan_id=asr_test")
+        client.post("/api/register", json={"email": "agg@example.com", "source": "web_register"})
+
+        resp = client.get("/v1/funnel-metrics", headers={"X-Api-Key": internal_key})
+        assert resp.status_code == 200
+        data = resp.json()
+        assert data["cta_impressions"] >= 1
+        assert data["register_page_visits"] >= 1
+        assert data["register_completions"] >= 1
+        assert data["cta_to_visit_rate"] is not None
+        assert data["visit_to_completion_rate"] is not None
+        assert "by_day" in data
diff --git a/trust_layer/__init__.py b/trust_layer/__init__.py
@@ -1,3 +1,3 @@
 """ArkForge Trust Layer — Certifying proxy for agent-to-agent payments."""
 
-__version__ = "1.3.34"
+__version__ = "1.3.35"
diff --git a/trust_layer/app.py b/trust_layer/app.py
@@ -123,6 +123,7 @@ async def dispatch(self, request: Request, call_next):
     ARKFORGE_PUBLIC_KEY,
     WEBHOOK_IDEMPOTENCY_FILE,
     CONVERSION_EVENTS_LOG,
+    FUNNEL_EVENTS_LOG,
     CORS_ALLOWED_ORIGINS,
     PRO_OVERAGE_PRICE,
     ENTERPRISE_OVERAGE_PRICE,
@@ -1009,6 +1010,113 @@ async def free_signup(request: Request):
     }
 
 
+# --- GET /register (inline CTA from MCP scan results) ---
+
+@app.get("/register")
+async def register_form(request: Request, scan_id: str = ""):
+    """Minimal registration form linked from MCP scan output."""
+    scan_id_safe = scan_id[:32] if scan_id else ""
+
+    # --- Funnel event: register page visit ---
+    try:
+        client_ip = (
+            request.headers.get("x-real-ip")
+            or (request.client.host if request.client else "unknown")
+        )
+        with open(FUNNEL_EVENTS_LOG, "a") as _f:
+            _f.write(json.dumps({
+                "ts": datetime.now(timezone.utc).isoformat(),
+                "event": "register_page_visit",
+                "scan_id": scan_id_safe,
+                "client_ip_hash": hashlib.sha256(client_ip.encode()).hexdigest()[:12],
+                "referrer": (request.headers.get("referer") or "")[:200],
+            }) + "\n")
+    except Exception:
+        pass
+
+    html = f"""<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Save Your Scan Results - ArkForge</title>
+<style>
+*{{margin:0;padding:0;box-sizing:border-box}}
+body{{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;background:#0a0a0f;color:#e0e0e0;min-height:100vh;display:flex;align-items:center;justify-content:center}}
+.card{{background:#14141f;border:1px solid #2a2a3a;border-radius:12px;padding:2.5rem;max-width:420px;width:90%}}
+h1{{font-size:1.4rem;margin-bottom:.5rem;color:#fff}}
+p{{font-size:.9rem;color:#a0a0b0;margin-bottom:1.5rem;line-height:1.5}}
+label{{font-size:.85rem;color:#c0c0d0;display:block;margin-bottom:.4rem}}
+input[type=email]{{width:100%;padding:.75rem 1rem;border:1px solid #2a2a3a;border-radius:8px;background:#0a0a0f;color:#fff;font-size:1rem;outline:none;transition:border-color .2s}}
+input[type=email]:focus{{border-color:#4f8cff}}
+button{{width:100%;padding:.75rem;margin-top:1rem;border:none;border-radius:8px;background:#4f8cff;color:#fff;font-size:1rem;font-weight:600;cursor:pointer;transition:background .2s}}
+button:hover{{background:#3a7aef}}
+button:disabled{{background:#333;cursor:wait}}
+.result{{margin-top:1rem;padding:1rem;border-radius:8px;font-size:.9rem;line-height:1.5}}
+.result.ok{{background:#0d2818;border:1px solid #1a5c2e;color:#6fcf97}}
+.result.err{{background:#2d1215;border:1px solid #5c1a1f;color:#cf6f6f}}
+.key-box{{font-family:monospace;background:#0a0a0f;padding:.5rem .75rem;border-radius:6px;margin-top:.5rem;word-break:break-all;display:flex;align-items:center;gap:.5rem}}
+.copy-btn{{background:none;border:1px solid #2a2a3a;color:#a0a0b0;padding:.25rem .5rem;border-radius:4px;cursor:pointer;font-size:.75rem;width:auto;margin:0}}
+.copy-btn:hover{{border-color:#4f8cff;color:#4f8cff;background:none}}
+.features{{list-style:none;margin-top:1.5rem;font-size:.85rem;color:#a0a0b0}}
+.features li::before{{content:'\\2713 ';color:#6fcf97}}
+.features li{{margin-bottom:.35rem}}
+</style>
+</head>
+<body>
+<div class="card">
+<h1>Save your scan results</h1>
+<p>Get a free API key. No password, no credit card.</p>
+<form id="regform">
+<label for="email">Email address</label>
+<input type="email" id="email" name="email" placeholder="you@company.com" required autofocus>
+<input type="hidden" id="scan_id" value="{scan_id_safe}">
+<button type="submit" id="btn">Get free API key</button>
+</form>
+<div id="result" style="display:none"></div>
+<ul class="features">
+<li>Scan history across sessions</li>
+<li>Compliance trend tracking</li>
+<li>CI/CD integration (GitHub Actions, GitLab CI)</li>
+</ul>
+</div>
+<script>
+document.getElementById('regform').addEventListener('submit', async(e)=>{{
+e.preventDefault();
+const btn=document.getElementById('btn');
+const res=document.getElementById('result');
+const email=document.getElementById('email').value.trim();
+const scanId=document.getElementById('scan_id').value;
+if(!email)return;
+btn.disabled=true;btn.textContent='Activating...';
+res.style.display='none';
+try{{
+const r=await fetch('/api/register',{{
+method:'POST',
+headers:{{'Content-Type':'application/json'}},
+body:JSON.stringify({{email:email,source:'web_register',scan_id:scanId}})
+}});
+const d=await r.json();
+if(r.ok&&d.api_key){{
+res.className='result ok';
+res.innerHTML='API key activated!<div class="key-box"><span>'+d.api_key+'</span><button class="copy-btn" onclick="navigator.clipboard.writeText(\\''+d.api_key+'\\');this.textContent=\\'Copied\\'">Copy</button></div><p style="margin-top:.75rem;font-size:.85rem;color:#a0a0b0">Also sent to '+email+'</p>';
+btn.textContent='Done';
+}}else{{
+throw new Error(d.detail||d.error||'Registration failed');
+}}
+}}catch(err){{
+res.className='result err';
+res.textContent=err.message;
+btn.disabled=false;btn.textContent='Get free API key';
+}}
+res.style.display='block';
+}});
+</script>
+</body>
+</html>"""
+    return HTMLResponse(content=html)
+
+
 # --- POST /api/register (MCP phone-home) ---
 
 _MCP_REGISTER_RATE: dict = {}
@@ -1073,15 +1181,31 @@ async def mcp_register(request: Request):
     except (OSError, RuntimeError) as e:
         logger.warning("Welcome email failed for MCP register %s: %s", email, e)
 
+    # --- Funnel event: register completion ---
+    source = body.get("source", "mcp_phonehome")
+    scan_id = body.get("scan_id", "")
+    try:
+        with open(FUNNEL_EVENTS_LOG, "a") as _f:
+            _f.write(json.dumps({
+                "ts": datetime.now(timezone.utc).isoformat(),
+                "event": "register_completion",
+                "scan_id": scan_id[:32] if scan_id else "",
+                "source": source,
+                "client_ip_hash": hashlib.sha256(client_ip.encode()).hexdigest()[:12],
+                "email_hash": email[:3] + "***" if email else "",
+            }) + "\n")
+    except Exception:
+        pass
+
     try:
-        source = body.get("source", "mcp_phonehome")
         with open(CONVERSION_EVENTS_LOG, "a") as _cel:
             _cel.write(json.dumps({
                 "ts": datetime.now(timezone.utc).isoformat(),
                 "event": "signup_attributed",
                 "plan": "free",
                 "email_hash": email[:3] + "***" if email else "",
                 "source": source,
+                "scan_id": scan_id[:32] if scan_id else "",
                 "client_ip_hash": hashlib.sha256(client_ip.encode()).hexdigest()[:12],
             }) + "\n")
     except OSError:
@@ -1692,6 +1816,64 @@ async def health():
     return resp
 
 
+# --- GET /v1/funnel-metrics (internal — aggregated funnel counters) ---
+
+@app.get("/v1/funnel-metrics")
+async def funnel_metrics(
+    request: Request,
+    days: int = 7,
+    x_api_key: Optional[str] = Header(None),
+    authorization: Optional[str] = Header(None),
+):
+    api_key = _get_api_key(authorization, x_api_key)
+    if not api_key:
+        return _error_response("invalid_api_key", "API key required", 401)
+    key_info = validate_api_key(api_key)
+    if not key_info or not is_internal_key(api_key):
+        return _error_response("forbidden", "Internal key required", 403)
+
+    from datetime import timedelta
+    cutoff = (datetime.now(timezone.utc) - timedelta(days=min(days, 90))).isoformat()
+    counts = {"cta_impression": 0, "register_page_visit": 0, "register_completion": 0}
+    by_day: dict = {}
+
+    try:
+        with open(FUNNEL_EVENTS_LOG) as f:
+            for line in f:
+                line = line.strip()
+                if not line:
+                    continue
+                try:
+                    entry = json.loads(line)
+                except (json.JSONDecodeError, ValueError):
+                    continue
+                ts = entry.get("ts", "")
+                if ts < cutoff:
+                    continue
+                evt = entry.get("event", "")
+                if evt in counts:
+                    counts[evt] += 1
+                    day = ts[:10]
+                    by_day.setdefault(day, {"cta_impression": 0, "register_page_visit": 0, "register_completion": 0})
+                    by_day[day][evt] += 1
+    except FileNotFoundError:
+        pass
+
+    cta = counts["cta_impression"]
+    visits = counts["register_page_visit"]
+    completions = counts["register_completion"]
+    return {
+        "window_days": min(days, 90),
+        "cta_impressions": cta,
+        "register_page_visits": visits,
+        "register_completions": completions,
+        "cta_to_visit_rate": round(visits / cta, 4) if cta > 0 else None,
+        "visit_to_completion_rate": round(completions / visits, 4) if visits > 0 else None,
+        "cta_to_completion_rate": round(completions / cta, 4) if cta > 0 else None,
+        "by_day": dict(sorted(by_day.items())),
+    }
+
+
 # --- POST /v1/keys/overage ---
 
 @app.post("/v1/keys/overage")
diff --git a/trust_layer/config.py b/trust_layer/config.py
@@ -17,6 +17,7 @@
 BACKGROUND_TASKS_LOG = DATA_DIR / "background_tasks_log.jsonl"
 PROOF_ACCESS_LOG = DATA_DIR / "proof_access_log.jsonl"
 CONVERSION_EVENTS_LOG = DATA_DIR / "conversion_events.jsonl"
+FUNNEL_EVENTS_LOG = DATA_DIR / "funnel_events.jsonl"
 IDEMPOTENCY_DIR = DATA_DIR / "idempotency"
 AGENTS_DIR = DATA_DIR / "agents"
 SERVICES_DIR = DATA_DIR / "services"
diff --git a/trust_layer/routers/assess.py b/trust_layer/routers/assess.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""ArkForge Trust Layer — Certifying proxy for agent-to-agent payments."""`
`2`	`2`
`3`		`-__version__ = "1.3.34"`
	`3`	`+__version__ = "1.3.35"`