Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(knowledge_writer): start merge checks from signed merged-PR deliveries (#129752)

John C. Waters923eeef9b4fe
diff --git a/.github/workflows/knowledge-writer-merge.yml b/.github/workflows/knowledge-writer-merge.yml
deleted file mode 100644
index 5ffcc09a2427..000000000000
--- a/.github/workflows/knowledge-writer-merge.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Knowledge writer merge doorbell
-
-on:
- push:
- branches:
- - master
-
-permissions: {}
-
-jobs:
- ring:
- name: Tell PostHog about the merge
- runs-on: ubuntu-24.04
- timeout-minutes: 2
- if: github.repository == 'PostHog/posthog' && vars.KNOWLEDGE_WRITER_MERGE_PUSHES_URL != ''
- steps:
- - name: Post every merged commit sha
- env:
- KNOWLEDGE_WRITER_API_TOKEN: ${{ secrets.KNOWLEDGE_WRITER_API_TOKEN }}
- KNOWLEDGE_WRITER_MERGE_PUSHES_URL: ${{ vars.KNOWLEDGE_WRITER_MERGE_PUSHES_URL }}
- run: |
- set -euo pipefail
- failed_commit_shas=()
- for commit_sha in $(jq -r '.commits[].id' "$GITHUB_EVENT_PATH"); do
- curl --fail-with-body --silent --show-error --retry 3 --retry-all-errors --max-time 10 \
- -H "Authorization: Bearer $KNOWLEDGE_WRITER_API_TOKEN" -H "Content-Type: application/json" \
- --data "{\"commit_sha\": \"$commit_sha\"}" "$KNOWLEDGE_WRITER_MERGE_PUSHES_URL" \
- || failed_commit_shas+=("$commit_sha")
- done
- [ ${#failed_commit_shas[@]} -eq 0 ] || echo "::warning::Knowledge writer merge check not delivered for: ${failed_commit_shas[*]}"
diff --git a/posthog/ingress/README.md b/posthog/ingress/README.md
index 3ee42961e66c..afc4514403b0 100644
--- a/posthog/ingress/README.md
+++ b/posthog/ingress/README.md
@@ -65,21 +65,21 @@ Three duties fall on the incarnation rather than on `BearerJwt`, and none is enf
## Endpoints
-| Provider | Path | App | Consumers | Product code |
-| ------------ | ------------------------------------------------------- | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------- |
-| `github` | `/webhooks/github`, `/webhooks/github/pr` | `posthog` | `installation_lifecycle`, `installation_repositories` (core), `commands`, `conversations`, `error_tracking_external_references`, `loops`, `review_hog_authored_prs`, `tasks_pr_backstop`, `tasks_pr_review`, `workflows` | `products/{commands,conversations,error_tracking,review_hog,tasks,workflows}/backend/webhook_consumers.py` |
-| `github` | `/webhooks/stamphog/github` | `stamphog` | `stamphog_review` | `products/stamphog/backend/webhook_consumers.py` |
-| `slack` | `/api/conversations/v1/slack/events` | `supporthog` | `conversations_slack` | `products/conversations/backend/webhook_consumers.py` |
-| `slack` | `/api/conversations/v1/slack/interactivity` | `supporthog_interactivity` | `conversations_slack_interactivity` | `products/conversations/backend/webhook_consumers.py` |
-| `teams` | `/api/conversations/v1/teams/events` | `supporthog` | `conversations_teams` | `products/conversations/backend/webhook_consumers.py` |
-| `pandadoc` | `/api/legal_documents/pandadoc` | `default` | `legal_documents_signatures` | `products/legal_documents/backend/webhook_consumers.py` |
-| `mailgun` | `/api/conversations/v1/email/inbound` | `inbound` | `conversations_email_inbound` | `products/conversations/backend/webhook_consumers.py` |
-| `mailgun` | `/api/conversations/v1/email/outbound` | `outbound` | `conversations_email_outbound` | `products/conversations/backend/webhook_consumers.py` |
-| `mailgun` | `/api/conversations/v1/email/capture` | `capture` | `conversations_email_capture` | `products/conversations/backend/webhook_consumers.py` |
-| `sns` | `/webhooks/workflows/ses-events` | `default` | `workflows_ses_events` | `products/workflows/backend/webhook_consumers.py` |
-| `customerio` | `/api/projects/<team_id>/messaging/customerio/webhook/` | none | none, it is the DRF adapter path | `products/messaging/backend/api/customerio_webhook.py` |
-| `vercel` | `/webhooks/vercel` | `marketplace` | `vercel_marketplace` | `ee/api/vercel/webhook_consumers.py` |
-| `linear` | `/webhooks/linear` | `posthog` | `error_tracking_linear_status_sync` | `products/error_tracking/backend/webhook_consumers.py` |
+| Provider | Path | App | Consumers | Product code |
+| ------------ | ------------------------------------------------------- | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
+| `github` | `/webhooks/github`, `/webhooks/github/pr` | `posthog` | `installation_lifecycle`, `installation_repositories` (core), `commands`, `conversations`, `error_tracking_external_references`, `knowledge_writer_merged_pull_requests`, `loops`, `review_hog_authored_prs`, `tasks_pr_backstop`, `tasks_pr_review`, `workflows` | `products/{commands,conversations,error_tracking,knowledge_writer,review_hog,tasks,workflows}/backend/webhook_consumers.py` |
+| `github` | `/webhooks/stamphog/github` | `stamphog` | `stamphog_review` | `products/stamphog/backend/webhook_consumers.py` |
+| `slack` | `/api/conversations/v1/slack/events` | `supporthog` | `conversations_slack` | `products/conversations/backend/webhook_consumers.py` |
+| `slack` | `/api/conversations/v1/slack/interactivity` | `supporthog_interactivity` | `conversations_slack_interactivity` | `products/conversations/backend/webhook_consumers.py` |
+| `teams` | `/api/conversations/v1/teams/events` | `supporthog` | `conversations_teams` | `products/conversations/backend/webhook_consumers.py` |
+| `pandadoc` | `/api/legal_documents/pandadoc` | `default` | `legal_documents_signatures` | `products/legal_documents/backend/webhook_consumers.py` |
+| `mailgun` | `/api/conversations/v1/email/inbound` | `inbound` | `conversations_email_inbound` | `products/conversations/backend/webhook_consumers.py` |
+| `mailgun` | `/api/conversations/v1/email/outbound` | `outbound` | `conversations_email_outbound` | `products/conversations/backend/webhook_consumers.py` |
+| `mailgun` | `/api/conversations/v1/email/capture` | `capture` | `conversations_email_capture` | `products/conversations/backend/webhook_consumers.py` |
+| `sns` | `/webhooks/workflows/ses-events` | `default` | `workflows_ses_events` | `products/workflows/backend/webhook_consumers.py` |
+| `customerio` | `/api/projects/<team_id>/messaging/customerio/webhook/` | none | none, it is the DRF adapter path | `products/messaging/backend/api/customerio_webhook.py` |
+| `vercel` | `/webhooks/vercel` | `marketplace` | `vercel_marketplace` | `ee/api/vercel/webhook_consumers.py` |
+| `linear` | `/webhooks/linear` | `posthog` | `error_tracking_linear_status_sync` | `products/error_tracking/backend/webhook_consumers.py` |
The owner of the third-party App registration owns the route.
The customer-facing GitHub App is shared across products, so its two endpoints are declared in `posthog/urls.py`.
diff --git a/posthog/ingress/github/README.md b/posthog/ingress/github/README.md
index 200d1b3c1e8d..5934ad6d1f11 100644
--- a/posthog/ingress/github/README.md
+++ b/posthog/ingress/github/README.md
@@ -49,7 +49,7 @@ See [Regional forwarding](../README.md#regional-forwarding) for the lane the pro
## Consumers
- `posthog/ingress/github/provider.py` registers `installation_lifecycle` and `installation_repositories` on the `posthog` app.
-- `products/{commands,conversations,error_tracking,review_hog,tasks,workflows}/backend/webhook_consumers.py` register the product consumers on the `posthog` app.
+- `products/{commands,conversations,error_tracking,knowledge_writer,review_hog,tasks,workflows}/backend/webhook_consumers.py` register the product consumers on the `posthog` app.
- `products/stamphog/backend/webhook_consumers.py` registers `stamphog_review` on the `stamphog` app.
The Error Tracking consumer handles opened and edited issues and pull requests from repository owners, members, and collaborators.
diff --git a/posthog/temporal/schedule.py b/posthog/temporal/schedule.py
index 808184f0feef..12d63643b793 100644
--- a/posthog/temporal/schedule.py
+++ b/posthog/temporal/schedule.py
@@ -124,6 +124,7 @@ from products.growth.backend.temporal.signup_enrichment.schedule import (
create_harmonic_status_poll_schedule,
create_icp_reenrichment_sweep_schedule,
)
+from products.knowledge_writer.backend.facade.temporal import create_knowledge_writer_merge_reconcile_schedule
from products.logs.backend.facade.temporal import disable_logs_volume_tick_schedule
from products.managed_warehouse.backend.facade.temporal import DucklakeCompactionInput
from products.metrics.backend.facade.temporal import create_suggested_dashboards_discovery_schedule
@@ -1041,6 +1042,7 @@ schedules = [
create_replay_vision_highlight_rebuild_schedule,
create_github_job_logs_coordinator_schedule,
create_review_hog_finding_outcomes_schedule,
+ create_knowledge_writer_merge_reconcile_schedule,
create_ci_signals_coordinator_schedule,
create_cleanup_data_quality_check_runs_schedule,
create_reconcile_metric_schedules_schedule,
diff --git a/products/knowledge_writer/README.md b/products/knowledge_writer/README.md
index 2a9518872a70..1f0110b9d9e3 100644
--- a/products/knowledge_writer/README.md
+++ b/products/knowledge_writer/README.md
@@ -4,3 +4,24 @@ An internal tool for now: it opens posthog.com docs pull requests for changes me
- `KNOWLEDGE_WRITER_TEAM_ID`, `KNOWLEDGE_WRITER_USER_ID` and `KNOWLEDGE_WRITER_DOCS_REPOSITORY` configure the one writer. `writer_settings()` in `backend/settings.py` is their only reader, and nothing runs while any of them is unset.
- Turning it into a customer feature means replacing `writer_settings()` with a team-scoped model and triggering from the GitHub App webhook, since a customer can't add a workflow and a secret to every repository.
+
+## Rollout
+
+Every gate below fails closed without an error, so a missing one looks like a quiet day of merges rather than a failure.
+Check each one before reading silence as "no docs needed".
+
+Production needs, before any stage:
+
+- The settings in the first bullet above, for the writer team.
+- A GitHub integration on the writer team for each repository owner it touches: `PostHog`, to read merges, and the owner of `KNOWLEDGE_WRITER_DOCS_REPOSITORY`, to publish. [backend/README.md](backend/README.md) covers how one is picked.
+- `GITHUB_APP_SLUG`, without which no open docs pull request counts as the writer's, so joining and the open pull request cap stop working.
+- `AI_GATEWAY_URL` and `AI_GATEWAY_API_KEY`, which the merge check's judge needs.
+- The `knowledge_writer_merged_pull_requests` webhook consumer and the `knowledge-writer-merge-reconcile-schedule` Temporal schedule, which start the merge checks.
+
+Stages, in order:
+
+1. Shadow. Turn on [`knowledge-writer`](https://us.posthog.com/project/2/feature-flags/1036127), the kill switch, and keep [`knowledge-writer-agent-launch`](https://us.posthog.com/project/2/feature-flags/1036128) off. Every `master` merge gets a `knowledge_writer verdict` event, and intake returns `shadow` for each `needs_docs` one instead of starting a run. Before stage 2, check that verdicts arrive for each merge, that `reason: merge_check_failed` is rare, and that `needs_docs` verdicts name the right pages.
+2. Launch. Turn on `knowledge-writer-agent-launch`. A `needs_docs` verdict starts a writer run that opens a draft pull request on `KNOWLEDGE_WRITER_DOCS_REPOSITORY`, held to `DAILY_RUN_CAP` and `OPEN_PULL_REQUEST_CAP` in `backend/logic/caps.py`. Check that runs finish with a pushed branch and a draft pull request, that no task carries a `knowledge_writer_pull_request_failure` state entry, and which `WriterCapReached` alerts error tracking shows.
+
+To back out, turn off `knowledge-writer-agent-launch` to stop new runs, which still lets runs already going open their pull requests.
+Turn off `knowledge-writer` to stop everything, publishing included.
diff --git a/products/knowledge_writer/backend/facade/api.py b/products/knowledge_writer/backend/facade/api.py
index 8bed0da0f1fc..060437817aba 100644
--- a/products/knowledge_writer/backend/facade/api.py
+++ b/products/knowledge_writer/backend/facade/api.py
@@ -1,13 +1,15 @@
-import re
+from collections.abc import Mapping
+from typing import Any
+from posthog.github.installations import installation_team_ids
+
+from ...merge_check.sources import POSTHOG_REPOSITORY, merged_mainline_commit
from ..adapters.registry import REGISTRY
from ..logic import intake
from ..settings import writer_settings
from .contracts import DocsCommandRequest, IntakeOutcome
from .enums import DocsRequestSource
-COMMIT_SHA_PATTERN = re.compile(r"^[0-9a-f]{40}$")
-
def writer_team_id() -> int | None:
writer = writer_settings()
@@ -19,10 +21,17 @@ def request_docs_for_pull_request(command: DocsCommandRequest, *, team_id: int)
return intake.submit(verdict, team_id=team_id)
-def record_merge_push(commit_sha: str) -> None:
+def record_merged_pull_request(payload: Mapping[str, Any]) -> None:
from ..temporal.client import start_merge_check # noqa: PLC0415 — keeps temporalio off the facade import path
+ if payload.get("action") != "closed":
+ return
+ if (payload.get("repository") or {}).get("full_name") != POSTHOG_REPOSITORY:
+ return
+ commit_sha = merged_mainline_commit(payload.get("pull_request") or {})
+ if commit_sha is None:
+ return
team_id = writer_team_id()
- if team_id is None or not COMMIT_SHA_PATTERN.match(commit_sha):
+ if team_id is None or team_id not in installation_team_ids(dict(payload)):
return
start_merge_check(commit_sha, team_id=team_id)
diff --git a/products/knowledge_writer/backend/facade/temporal.py b/products/knowledge_writer/backend/facade/temporal.py
index ab2c7b45defa..fedb43330554 100644
--- a/products/knowledge_writer/backend/facade/temporal.py
+++ b/products/knowledge_writer/backend/facade/temporal.py
@@ -1,3 +1,6 @@
from products.knowledge_writer.backend.temporal import ACTIVITIES, WORKFLOWS
+from products.knowledge_writer.backend.temporal.reconcile_schedule import (
+ create_knowledge_writer_merge_reconcile_schedule,
+)
-__all__ = ["ACTIVITIES", "WORKFLOWS"]
+__all__ = ["ACTIVITIES", "WORKFLOWS", "create_knowledge_writer_merge_reconcile_schedule"]
diff --git a/products/knowledge_writer/backend/presentation/__init__.py b/products/knowledge_writer/backend/presentation/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/products/knowledge_writer/backend/presentation/views.py b/products/knowledge_writer/backend/presentation/views.py
deleted file mode 100644
index 53b191e84e90..000000000000
--- a/products/knowledge_writer/backend/presentation/views.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from drf_spectacular.utils import OpenApiResponse, extend_schema
-from rest_framework import serializers, status, viewsets
-from rest_framework.request import Request
-from rest_framework.response import Response
-
-from posthog.api.routing import TeamAndOrgViewSetMixin
-
-from ..facade import api
-
-
-class MergePushSerializer(serializers.Serializer):
- commit_sha = serializers.RegexField(
- api.COMMIT_SHA_PATTERN, help_text="The 40-character SHA of the master merge commit."
- )
-
-
-class MergePushResponseSerializer(serializers.Serializer):
- status = serializers.CharField(help_text="Always accepted; the merge check runs in the background.")
-
-
-class MergePushViewSet(TeamAndOrgViewSetMixin, viewsets.GenericViewSet):
- scope_object = "knowledge_writer"
- scope_object_write_actions = ["create"]
- scope_object_read_actions: list[str] = []
-
- @extend_schema(
- request=MergePushSerializer,
- responses={202: OpenApiResponse(response=MergePushResponseSerializer)},
- )
- def create(self, request: Request, **kwargs) -> Response:
- if api.writer_team_id() != self.team_id:
- return Response({"detail": "The knowledge writer does not run in this project."}, status=404)
- merge_push = MergePushSerializer(data=request.data)
- merge_push.is_valid(raise_exception=True)
- api.record_merge_push(merge_push.validated_data["commit_sha"])
- return Response({"status": "accepted"}, status=status.HTTP_202_ACCEPTED)
diff --git a/products/knowledge_writer/backend/routes.py b/products/knowledge_writer/backend/routes.py
deleted file mode 100644
index 742ef5dc2cd3..000000000000
--- a/products/knowledge_writer/backend/routes.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from posthog.api.routing import RouterRegistry
-
-from products.knowledge_writer.backend.presentation.views import MergePushViewSet
-
-
-def register_routes(routers: RouterRegistry) -> None:
- routers.projects.register(
- r"knowledge_writer/merge_pushes",
- MergePushViewSet,
- "project_knowledge_writer_merge_pushes",
- ["project_id"],
- )
diff --git a/products/knowledge_writer/backend/temporal/__init__.py b/products/knowledge_writer/backend/temporal/__init__.py
index f1ee2fe5b5af..b94d0b91ddd1 100644
--- a/products/knowledge_writer/backend/temporal/__init__.py
+++ b/products/knowledge_writer/backend/temporal/__init__.py
@@ -1,5 +1,11 @@
from .merge_workflow import MergeCheckWorkflow, run_merge_check_activity
from .publish_workflow import PublishWorkflow, publish_docs_pull_request_activity, settle_publication_activity
+from .reconcile_workflow import MergeReconcileWorkflow, reconcile_merged_pull_requests_activity
-WORKFLOWS = [PublishWorkflow, MergeCheckWorkflow]
-ACTIVITIES = [publish_docs_pull_request_activity, settle_publication_activity, run_merge_check_activity]
+WORKFLOWS = [PublishWorkflow, MergeCheckWorkflow, MergeReconcileWorkflow]
+ACTIVITIES = [
+ publish_docs_pull_request_activity,
+ settle_publication_activity,
+ run_merge_check_activity,
+ reconcile_merged_pull_requests_activity,
+]
diff --git a/products/knowledge_writer/backend/temporal/client.py b/products/knowledge_writer/backend/temporal/client.py
index 22b7e2d6b31c..bdc722c834ef 100644
--- a/products/knowledge_writer/backend/temporal/client.py
+++ b/products/knowledge_writer/backend/temporal/client.py
@@ -3,6 +3,7 @@ from uuid import UUID
from django.conf import settings
+from temporalio.client import Client
from temporalio.common import WorkflowIDConflictPolicy, WorkflowIDReusePolicy
from temporalio.exceptions import WorkflowAlreadyStartedError
@@ -45,10 +46,10 @@ def start_merge_check(commit_sha: str, *, team_id: int) -> None:
asyncio.run(asyncio.wait_for(start_merge_check_workflow(commit_sha, team_id=team_id), START_TIMEOUT_SECONDS))
-async def start_merge_check_workflow(commit_sha: str, *, team_id: int) -> None:
- client = await async_connect()
+async def start_merge_check_workflow(commit_sha: str, *, team_id: int, client: Client | None = None) -> None:
+ temporal = client or await async_connect()
try:
- await client.start_workflow(
+ await temporal.start_workflow(
MergeCheckWorkflow.run,
MergeCheckInputs(commit_sha=commit_sha, team_id=team_id),
id=merge_check_workflow_id(commit_sha),
diff --git a/products/knowledge_writer/backend/temporal/reconcile_schedule.py b/products/knowledge_writer/backend/temporal/reconcile_schedule.py
new file mode 100644
index 000000000000..d50703ac62df
--- /dev/null
+++ b/products/knowledge_writer/backend/temporal/reconcile_schedule.py
@@ -0,0 +1,40 @@
+from datetime import timedelta
+
+from django.conf import settings
+
+from temporalio.client import (
+ Client,
+ Schedule,
+ ScheduleActionStartWorkflow,
+ ScheduleIntervalSpec,
+ ScheduleOverlapPolicy,
+ SchedulePolicy,
+ ScheduleSpec,
+)
+
+from posthog.temporal.common.schedule import a_create_schedule, a_schedule_exists, a_update_schedule
+
+from .reconcile_workflow import RECONCILE_WORKFLOW_NAME
+
+SCHEDULE_ID = "knowledge-writer-merge-reconcile-schedule"
+SCHEDULE_INTERVAL = timedelta(hours=1)
+
+
+async def create_knowledge_writer_merge_reconcile_schedule(client: Client) -> None:
+ schedule = Schedule(
+ action=ScheduleActionStartWorkflow(
+ RECONCILE_WORKFLOW_NAME,
+ id=SCHEDULE_ID,
+ task_queue=settings.VIDEO_EXPORT_TASK_QUEUE,
+ ),
+ spec=ScheduleSpec(
+ intervals=[ScheduleIntervalSpec(every=SCHEDULE_INTERVAL, offset=timedelta(minutes=17))],
+ jitter=timedelta(minutes=5),
+ ),
+ policy=SchedulePolicy(overlap=ScheduleOverlapPolicy.SKIP, catchup_window=SCHEDULE_INTERVAL),
+ )
+
+ if await a_schedule_exists(client, SCHEDULE_ID):
+ await a_update_schedule(client, SCHEDULE_ID, schedule)
+ return
+ await a_create_schedule(client, SCHEDULE_ID, schedule, trigger_immediately=False)
diff --git a/products/knowledge_writer/backend/temporal/reconcile_workflow.py b/products/knowledge_writer/backend/temporal/reconcile_workflow.py
new file mode 100644
index 000000000000..4f7236a89370
--- /dev/null
+++ b/products/knowledge_writer/backend/temporal/reconcile_workflow.py
@@ -0,0 +1,96 @@
+from datetime import datetime, timedelta
+
+from django.utils import timezone
+from django.utils.dateparse import parse_datetime
+
+from temporalio import activity, workflow
+from temporalio.common import RetryPolicy
+
+from posthog.exceptions_capture import capture_exception
+from posthog.sync import database_sync_to_async
+from posthog.temporal.common.client import async_connect
+from posthog.temporal.common.utils import close_db_connections
+
+from ...merge_check.sources import (
+ POSTHOG_MAINLINE,
+ POSTHOG_REPOSITORY,
+ GitHubReader,
+ merged_mainline_commit,
+ read_github,
+)
+from ..logic.pull_requests import source_repository_github
+from ..settings import writer_settings
+from .client import start_merge_check_workflow
+
+RECONCILE_WORKFLOW_NAME = "knowledge-writer-merge-reconcile"
+RECONCILE_WINDOW = timedelta(hours=3)
+RECONCILE_MAX_PAGES = 10
+PULL_REQUESTS_PER_PAGE = 100
+
+
+class ReconcileWindowTruncated(Exception):
+ pass
+
+
+def _is_before(timestamp: str | None, window_start: datetime) -> bool:
+ parsed = parse_datetime(timestamp or "")
+ return parsed is None or parsed < window_start
+
+
+def merged_commits_since(github: GitHubReader, window_start: datetime) -> list[str]:
+ commit_shas: list[str] = []
+ for page in range(1, RECONCILE_MAX_PAGES + 1):
+ listed = read_github(
+ github,
+ f"/repos/{POSTHOG_REPOSITORY}/pulls",
+ endpoint="/repos/{owner}/{repo}/pulls",
+ params={
+ "state": "closed",
+ "base": POSTHOG_MAINLINE,
+ "sort": "updated",
+ "direction": "desc",
+ "per_page": PULL_REQUESTS_PER_PAGE,
+ "page": page,
+ },
+ ).json()
+ for pull_request in listed:
+ commit_sha = merged_mainline_commit(pull_request)
+ if commit_sha and not _is_before(pull_request.get("merged_at"), window_start):
+ commit_shas.append(commit_sha)
+ if len(listed) < PULL_REQUESTS_PER_PAGE or _is_before(listed[-1].get("updated_at"), window_start):
+ return commit_shas
+ capture_exception(ReconcileWindowTruncated(f"more than {RECONCILE_MAX_PAGES} pages of closed pull requests"))
+ return commit_shas
+
+
+def list_unreconciled_merges() -> tuple[int, list[str]] | None:
+ writer = writer_settings()
+ if writer is None:
+ return None
+ github = source_repository_github(writer.team_id)
+ if github is None:
+ return None
+ return writer.team_id, merged_commits_since(github, timezone.now() - RECONCILE_WINDOW)
+
+
+@close_db_connections
+async def reconcile_merged_pull_requests_activity() -> None:
+ merges = await database_sync_to_async(list_unreconciled_merges, thread_sensitive=False)()
+ if merges is None:
+ return
+ team_id, commit_shas = merges
+ client = await async_connect()
+ for commit_sha in commit_shas:
+ await start_merge_check_workflow(commit_sha, team_id=team_id, client=client)
+
+
[email protected](name=RECONCILE_WORKFLOW_NAME)
+class MergeReconcileWorkflow:
+ @workflow.run
+ async def run(self) -> None:
+ await workflow.execute_activity(
+ reconcile_merged_pull_requests_activity,
+ start_to_close_timeout=timedelta(minutes=5),
+ retry_policy=RetryPolicy(maximum_attempts=3),
+ )
diff --git a/products/knowledge_writer/backend/tests/test_merge_workflow.py b/products/knowledge_writer/backend/tests/test_merge_workflow.py
index 4c9487461377..35a807cb89f7 100644
--- a/products/knowledge_writer/backend/tests/test_merge_workflow.py
+++ b/products/knowledge_writer/backend/tests/test_merge_workflow.py
@@ -1,15 +1,43 @@
import os
+import hmac
+import json
+from datetime import timedelta
import pytest
-from unittest.mock import patch
+from unittest.mock import AsyncMock, MagicMock, patch
-COMMIT_SHA = "b" * 40
+from django.core.cache import caches
+from django.test import RequestFactory
+from django.utils import timezone
+
+from temporalio.testing import ActivityEnvironment
+
+from posthog.ingress.dispatch.dedup import INGRESS_DEDUP_CACHE_ALIAS
+from posthog.ingress.dispatch.dispatcher import WebhookDispatcher
+from posthog.ingress.dispatch.loading import reset_consumer_registry
+from posthog.ingress.dispatch.registry import ConsumerRegistry
+from posthog.ingress.github.provider import SPECS, build_github_provider
+from posthog.ingress.views import build_webhook_view
+from posthog.models.integration import Integration
+
+from products.knowledge_writer.backend.temporal.client import merge_check_workflow_id
+from products.knowledge_writer.backend.temporal.reconcile_workflow import (
+ PULL_REQUESTS_PER_PAGE,
+ reconcile_merged_pull_requests_activity,
+)
+from products.knowledge_writer.backend.webhook_consumers import WEBHOOK_CONSUMERS
+
+MERGE_COMMIT_SHA = "b" * 40
+WEBHOOK_SECRET = "test-knowledge-writer-webhook-secret"
+LINKED_INSTALLATION_ID = 1234
START_MERGE_CHECK = "products.knowledge_writer.backend.temporal.client.start_merge_check"
KNOWLEDGE_WRITER_ENABLED = "products.knowledge_writer.backend.settings.is_writer_enabled"
+RECONCILE_MODULE = "products.knowledge_writer.backend.temporal.reconcile_workflow"
@pytest.fixture
def writer_env(team, user):
+ Integration.objects.create(team=team, kind="github", integration_id=str(LINKED_INSTALLATION_ID), config={})
with patch.dict(
os.environ,
{
@@ -21,32 +49,162 @@ def writer_env(team, user):
yield
+def github_webhook_view():
+ reset_consumer_registry()
+ caches[INGRESS_DEDUP_CACHE_ALIAS].clear()
+ dispatcher = WebhookDispatcher(ConsumerRegistry(providers=SPECS, consumers=WEBHOOK_CONSUMERS))
+ with (
+ patch("posthog.ingress.views.get_dispatcher", return_value=dispatcher),
+ patch("posthog.credentials_service.instance_settings.get_instance_setting", return_value=WEBHOOK_SECRET),
+ ):
+ yield build_webhook_view(build_github_provider("posthog"))
+ reset_consumer_registry()
+ caches[INGRESS_DEDUP_CACHE_ALIAS].clear()
+
+
+def _pull_request_delivery(
+ *,
+ action: str = "closed",
+ merged_at: str | None = "2026-11-05T12:00:00Z",
+ repository: str = "PostHog/posthog",
+ base_ref: str = "master",
+ installation_id: int = LINKED_INSTALLATION_ID,
+) -> dict[str, object]:
+ return {
+ "action": action,
+ "installation": {"id": installation_id},
+ "repository": {"full_name": repository},
+ "pull_request": {
+ "number": 42,
+ "merged_at": merged_at,
+ "merge_commit_sha": MERGE_COMMIT_SHA,
+ "base": {"ref": base_ref},
+ },
+ }
+
+
+def _post_signed(view, payload: dict[str, object], *, delivery_id: str = "delivery-1"):
+ body = json.dumps(payload).encode("utf-8")
+ request = RequestFactory().post(
+ "/webhooks/github/",
+ data=body,
+ content_type="application/json",
+ headers={
+ "X-GitHub-Event": "pull_request",
+ "X-GitHub-Delivery": delivery_id,
+ "X-Hub-Signature-256": "sha256=" + hmac.digest(WEBHOOK_SECRET.encode(), body, "sha256").hex(),
+ },
+ )
+ return view(request)
+
+
@pytest.mark.django_db
@pytest.mark.parametrize(
- "commit_sha, is_writer_enabled, expected_status_code",
+ "delivery, starts_merge_check",
[
- pytest.param(COMMIT_SHA, True, 202, id="merge"),
- pytest.param("not-a-sha", True, 400, id="invalid"),
- pytest.param(COMMIT_SHA, False, 404, id="flagged_off"),
+ pytest.param(_pull_request_delivery(), True, id="merged_into_master"),
+ pytest.param(_pull_request_delivery(merged_at=None), False, id="closed_unmerged"),
+ pytest.param(_pull_request_delivery(action="opened"), False, id="not_closed"),
+ pytest.param(_pull_request_delivery(repository="PostHog/posthog.com"), False, id="other_repository"),
+ pytest.param(_pull_request_delivery(base_ref="release"), False, id="other_base"),
+ pytest.param(_pull_request_delivery(installation_id=9999), False, id="installation_not_linked"),
],
)
-def test_merge_pushes_endpoint_starts_the_merge_check(
- client, team, user, writer_env, commit_sha, is_writer_enabled, expected_status_code
+def test_a_signed_merged_pull_request_starts_the_merge_check(
+ team, writer_env, github_webhook_view, delivery, starts_merge_check
) -> None:
- client.force_login(user)
-
with (
- patch(KNOWLEDGE_WRITER_ENABLED, return_value=is_writer_enabled),
+ patch(KNOWLEDGE_WRITER_ENABLED, return_value=True),
patch(START_MERGE_CHECK) as start_merge_check,
):
- response = client.post(
- f"/api/projects/{team.id}/knowledge_writer/merge_pushes/",
- {"commit_sha": commit_sha},
- content_type="application/json",
- )
-
- assert response.status_code == expected_status_code
- if expected_status_code != 202:
+ response = _post_signed(github_webhook_view, delivery)
+
+ assert response.status_code == 202
+ if not starts_merge_check:
start_merge_check.assert_not_called()
return
- start_merge_check.assert_called_once_with(COMMIT_SHA, team_id=team.id)
+ start_merge_check.assert_called_once_with(MERGE_COMMIT_SHA, team_id=team.id)
+
+
+def test_a_redelivered_merge_starts_one_merge_check(team, writer_env, github_webhook_view) -> None:
+ with (
+ patch(KNOWLEDGE_WRITER_ENABLED, return_value=True),
+ patch(START_MERGE_CHECK) as start_merge_check,
+ ):
+ for _ in range(2):
+ assert _post_signed(github_webhook_view, _pull_request_delivery()).status_code == 202
+
+ start_merge_check.assert_called_once_with(MERGE_COMMIT_SHA, team_id=team.id)
+
+
+def test_the_merge_pushes_endpoint_is_gone(client, team, user, writer_env) -> None:
+ client.force_login(user)
+
+ response = client.post(
+ f"/api/projects/{team.id}/knowledge_writer/merge_pushes/",
+ {"commit_sha": MERGE_COMMIT_SHA},
+ content_type="application/json",
+ )
+
+ assert response.status_code == 404
+
+
+class ClosedPullRequestPages:
+ def __init__(self, pages: list[list[dict[str, object]]]) -> None:
+ self.pages = pages
+ self.requested_pages: list[int] = []
+
+ def api_request(self, method, path, *, endpoint, params=None, headers=None, priority=None):
+ page = int(params["page"])
+ self.requested_pages.append(page)
+ response = MagicMock()
+ response.json.return_value = self.pages[page - 1]
+ return response
+
+
+def _closed_pull_request(
+ commit_sha: str, *, merged_hours_ago: float | None, updated_hours_ago: float
+) -> dict[str, object]:
+ now = timezone.now()
+ merged_at = None if merged_hours_ago is None else (now - timedelta(hours=merged_hours_ago)).isoformat()
+ return {
+ "merged_at": merged_at,
+ "merge_commit_sha": commit_sha,
+ "updated_at": (now - timedelta(hours=updated_hours_ago)).isoformat(),
+ "base": {"ref": "master"},
+ }
+
+
[email protected]_db(transaction=True)
+async def test_the_hourly_reconcile_starts_merge_checks_for_recent_merges_on_one_client(team, writer_env) -> None:
+ recent_merges = ["1" * 40, "2" * 40]
+ filler = [_closed_pull_request("3" * 40, merged_hours_ago=None, updated_hours_ago=1)] * (
+ PULL_REQUESTS_PER_PAGE - len(recent_merges)
+ )
+ github = ClosedPullRequestPages(
+ [
+ [
+ _closed_pull_request(recent_merges[0], merged_hours_ago=0.5, updated_hours_ago=0.5),
+ *filler,
+ _closed_pull_request(recent_merges[1], merged_hours_ago=2, updated_hours_ago=2),
+ ],
+ [_closed_pull_request("4" * 40, merged_hours_ago=5, updated_hours_ago=5)],
+ [_closed_pull_request("5" * 40, merged_hours_ago=0.1, updated_hours_ago=0.1)],
+ ]
+ )
+ temporal = MagicMock(start_workflow=AsyncMock())
+
+ with (
+ patch(KNOWLEDGE_WRITER_ENABLED, return_value=True),
+ patch(f"{RECONCILE_MODULE}.source_repository_github", return_value=github),
+ patch(f"{RECONCILE_MODULE}.async_connect", AsyncMock(return_value=temporal)) as async_connect,
+ ):
+ await ActivityEnvironment().run(reconcile_merged_pull_requests_activity)
+
+ assert github.requested_pages == [1, 2]
+ async_connect.assert_awaited_once()
+ started_workflow_ids = [call.kwargs["id"] for call in temporal.start_workflow.await_args_list]
+ assert started_workflow_ids == [merge_check_workflow_id(commit_sha) for commit_sha in recent_merges]
diff --git a/products/knowledge_writer/backend/webhook_consumers.py b/products/knowledge_writer/backend/webhook_consumers.py
new file mode 100644
index 000000000000..9e668288660f
--- /dev/null
+++ b/products/knowledge_writer/backend/webhook_consumers.py
@@ -0,0 +1,20 @@
+from posthog.ingress.contracts import WebhookConsumer, WebhookDelivery
+
+
+def _record_merged_pull_request(delivery: WebhookDelivery) -> None:
+ from products.knowledge_writer.backend.facade.api import ( # noqa: PLC0415 - keeps product models off the registry import path
+ record_merged_pull_request,
+ )
+
+ record_merged_pull_request(delivery.payload)
+
+
+WEBHOOK_CONSUMERS = (
+ WebhookConsumer(
+ name="knowledge_writer_merged_pull_requests",
+ provider="github",
+ app="posthog",
+ event_types=frozenset({"pull_request"}),
+ handler=_record_merged_pull_request,
+ ),
+)
diff --git a/products/knowledge_writer/frontend/generated/api.schemas.ts b/products/knowledge_writer/frontend/generated/api.schemas.ts
deleted file mode 100644
index 68cf06b1d67c..000000000000
--- a/products/knowledge_writer/frontend/generated/api.schemas.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Auto-generated from the Django backend OpenAPI schema.
- * To modify these types, update the Django serializers or views, then run:
- * hogli build:openapi
- * Questions or issues? #team-devex on Slack
- *
- * PostHog API - generated
- * OpenAPI spec version: 1.0.0
- */
-export interface MergePushApi {
- /**
- * The 40-character SHA of the master merge commit.
- * @pattern ^[0-9a-f]{40}$
- */
- commit_sha: string
-}
-
-export interface MergePushResponseApi {
- /** Always accepted; the merge check runs in the background. */
- status: string
-}
diff --git a/products/knowledge_writer/frontend/generated/api.ts b/products/knowledge_writer/frontend/generated/api.ts
deleted file mode 100644
index 50456b31e162..000000000000
--- a/products/knowledge_writer/frontend/generated/api.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { apiMutator } from '../../../../frontend/src/lib/api-orval-mutator'
-/**
- * Auto-generated from the Django backend OpenAPI schema.
- * To modify these types, update the Django serializers or views, then run:
- * hogli build:openapi
- * Questions or issues? #team-devex on Slack
- *
- * PostHog API - generated
- * OpenAPI spec version: 1.0.0
- */
-import type { MergePushApi, MergePushResponseApi } from './api.schemas'
-
-export const getKnowledgeWriterMergePushesCreateUrl = (projectId: string) => {
- return `/api/projects/${projectId}/knowledge_writer/merge_pushes/`
-}
-
-export const knowledgeWriterMergePushesCreate = async (
- projectId: string,
- mergePushApi: MergePushApi,
- options?: RequestInit
-): Promise<MergePushResponseApi> => {
- return apiMutator<MergePushResponseApi>(getKnowledgeWriterMergePushesCreateUrl(projectId), {
- ...options,
- method: 'POST',
- headers: { 'Content-Type': 'application/json', ...options?.headers },
- body: JSON.stringify(mergePushApi),
- })
-}
diff --git a/products/knowledge_writer/frontend/generated/api.zod.ts b/products/knowledge_writer/frontend/generated/api.zod.ts
deleted file mode 100644
index 1ba127d19aa6..000000000000
--- a/products/knowledge_writer/frontend/generated/api.zod.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Auto-generated Zod validation schemas from the Django backend OpenAPI schema.
- * To modify these schemas, update the Django serializers or views, then run:
- * hogli build:openapi
- * Questions or issues? #team-devex on Slack
- *
- * PostHog API - generated
- * OpenAPI spec version: 1.0.0
- */
-import * as zod from 'zod'
-
-export const knowledgeWriterMergePushesCreateBodyCommitShaRegExp = new RegExp('^[0-9a-f]{40}$')
-
-export const KnowledgeWriterMergePushesCreateBody = /* @__PURE__ */ zod.object({
- commit_sha: zod
- .string()
- .regex(knowledgeWriterMergePushesCreateBodyCommitShaRegExp)
- .describe('The 40-character SHA of the master merge commit.'),
-})
diff --git a/products/knowledge_writer/merge_check/sources.py b/products/knowledge_writer/merge_check/sources.py
index 99112c1f9747..994d28f54c30 100644
--- a/products/knowledge_writer/merge_check/sources.py
+++ b/products/knowledge_writer/merge_check/sources.py
@@ -1,7 +1,8 @@
import re
import fnmatch
+from collections.abc import Mapping
from dataclasses import dataclass
-from typing import Protocol
+from typing import Any, Protocol
import httpx
import requests
@@ -11,6 +12,7 @@ from posthog.egress.limiter.policies import Priority
POSTHOG_REPOSITORY = "PostHog/posthog"
POSTHOG_MAINLINE = "master"
+COMMIT_SHA_PATTERN = re.compile(r"^[0-9a-f]{40}$")
GITHUB_API_URL = "https://api.github.com"
GITHUB_EGRESS_SOURCE = "knowledge_writer"
SITEMAP_URL = "https://posthog.com/sitemap/sitemap-0.xml"
@@ -88,6 +90,15 @@ def read_github(
return response
+def merged_mainline_commit(pull_request: Mapping[str, Any]) -> str | None:
+ commit_sha = pull_request.get("merge_commit_sha")
+ if not pull_request.get("merged_at") or not isinstance(commit_sha, str):
+ return None
+ if (pull_request.get("base") or {}).get("ref") != POSTHOG_MAINLINE:
+ return None
+ return commit_sha if COMMIT_SHA_PATTERN.match(commit_sha) else None
+
+
def find_merged_pull_request(github: GitHubReader, commit_sha: str) -> MergedPullRequest | None:
response = read_github(
github,
@@ -95,12 +106,7 @@ def find_merged_pull_request(github: GitHubReader, commit_sha: str) -> MergedPul
endpoint="/repos/{owner}/{repo}/commits/{sha}/pulls",
)
for listed in response.json():
- is_merge_into_mainline = (
- listed.get("merge_commit_sha") == commit_sha
- and listed.get("merged_at")
- and (listed.get("base") or {}).get("ref") == POSTHOG_MAINLINE
- )
- if not is_merge_into_mainline:
+ if merged_mainline_commit(listed) != commit_sha:
continue
return MergedPullRequest(
number=listed["number"],
diff --git a/services/mcp/src/api/generated.ts b/services/mcp/src/api/generated.ts
index 51ad061854b9..d8a2304888e0 100644
--- a/services/mcp/src/api/generated.ts
+++ b/services/mcp/src/api/generated.ts
@@ -66182,19 +66182,6 @@ export namespace Schemas {
results: MemberProjectAccess[];
}
- export interface MergePush {
- /**
- * The 40-character SHA of the master merge commit.
- * @pattern ^[0-9a-f]{40}$
- */
- commit_sha: string;
- }
-
- export interface MergePushResponse {
- /** Always accepted; the merge check runs in the background. */
- status: string;
- }
-
export type MessageContextualTools = { [key: string]: unknown };
/**