From b0b79966e957bd5e4fc014978dbf7e9dbebeac61 Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Mon, 16 Mar 2026 22:11:34 +0000
Subject: fix: prefix SW registration path with BASE_PATH

The app is served at /claudomator/ so the SW and scope must use
BASE_PATH + '/api/push/sw.js' and BASE_PATH + '/' respectively.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 internal/api/webhook.go | 57 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 13 deletions(-)

(limited to 'internal/api/webhook.go')

diff --git a/internal/api/webhook.go b/internal/api/webhook.go
index 8bf1676..0530f3e 100644
--- a/internal/api/webhook.go
+++ b/internal/api/webhook.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -17,17 +18,26 @@ import (
 	"github.com/thepeterstone/claudomator/internal/task"
 )
 
+// prRef is a minimal pull request entry used to extract branch names.
+type prRef struct {
+	Head struct {
+		Ref string `json:"ref"`
+	} `json:"head"`
+}
+
 // checkRunPayload is the GitHub check_run webhook payload.
 type checkRunPayload struct {
 	Action   string `json:"action"`
 	CheckRun struct {
-		Name       string `json:"name"`
-		Conclusion string `json:"conclusion"`
-		HTMLURL    string `json:"html_url"`
-		HeadSHA    string `json:"head_sha"`
-		CheckSuite struct {
+		Name         string  `json:"name"`
+		Conclusion   string  `json:"conclusion"`
+		HTMLURL      string  `json:"html_url"`
+		DetailsURL   string  `json:"details_url"`
+		HeadSHA      string  `json:"head_sha"`
+		CheckSuite   struct {
 			HeadBranch string `json:"head_branch"`
 		} `json:"check_suite"`
+		PullRequests []prRef `json:"pull_requests"`
 	} `json:"check_run"`
 	Repository struct {
 		Name     string `json:"name"`
@@ -39,11 +49,12 @@ type checkRunPayload struct {
 type workflowRunPayload struct {
 	Action      string `json:"action"`
 	WorkflowRun struct {
-		Name       string `json:"name"`
-		Conclusion string `json:"conclusion"`
-		HTMLURL    string `json:"html_url"`
-		HeadSHA    string `json:"head_sha"`
-		HeadBranch string `json:"head_branch"`
+		Name         string  `json:"name"`
+		Conclusion   string  `json:"conclusion"`
+		HTMLURL      string  `json:"html_url"`
+		HeadSHA      string  `json:"head_sha"`
+		HeadBranch   string  `json:"head_branch"`
+		PullRequests []prRef `json:"pull_requests"`
 	} `json:"workflow_run"`
 	Repository struct {
 		Name     string `json:"name"`
@@ -97,6 +108,7 @@ func (s *Server) handleGitHubWebhook(w http.ResponseWriter, r *http.Request) {
 	}
 
 	eventType := r.Header.Get("X-GitHub-Event")
+	slog.Info("github webhook received", "event", eventType, "bytes", len(body))
 	switch eventType {
 	case "check_run":
 		s.handleCheckRunEvent(w, body)
@@ -117,13 +129,22 @@ func (s *Server) handleCheckRunEvent(w http.ResponseWriter, body []byte) {
 		w.WriteHeader(http.StatusNoContent)
 		return
 	}
+	branch := p.CheckRun.CheckSuite.HeadBranch
+	if branch == "" && len(p.CheckRun.PullRequests) > 0 {
+		branch = p.CheckRun.PullRequests[0].Head.Ref
+	}
+	htmlURL := p.CheckRun.HTMLURL
+	if htmlURL == "" {
+		htmlURL = p.CheckRun.DetailsURL
+	}
+	slog.Info("check_run webhook", "repo", p.Repository.FullName, "conclusion", p.CheckRun.Conclusion, "branch", branch, "html_url", htmlURL)
 	s.createCIFailureTask(w,
 		p.Repository.Name,
 		p.Repository.FullName,
-		p.CheckRun.CheckSuite.HeadBranch,
+		branch,
 		p.CheckRun.HeadSHA,
 		p.CheckRun.Name,
-		p.CheckRun.HTMLURL,
+		htmlURL,
 	)
 }
 
@@ -141,10 +162,15 @@ func (s *Server) handleWorkflowRunEvent(w http.ResponseWriter, body []byte) {
 		w.WriteHeader(http.StatusNoContent)
 		return
 	}
+	branch := p.WorkflowRun.HeadBranch
+	if branch == "" && len(p.WorkflowRun.PullRequests) > 0 {
+		branch = p.WorkflowRun.PullRequests[0].Head.Ref
+	}
+	slog.Info("workflow_run webhook", "repo", p.Repository.FullName, "conclusion", p.WorkflowRun.Conclusion, "branch", branch, "html_url", p.WorkflowRun.HTMLURL)
 	s.createCIFailureTask(w,
 		p.Repository.Name,
 		p.Repository.FullName,
-		p.WorkflowRun.HeadBranch,
+		branch,
 		p.WorkflowRun.HeadSHA,
 		p.WorkflowRun.Name,
 		p.WorkflowRun.HTMLURL,
@@ -154,6 +180,10 @@ func (s *Server) handleWorkflowRunEvent(w http.ResponseWriter, body []byte) {
 func (s *Server) createCIFailureTask(w http.ResponseWriter, repoName, fullName, branch, sha, checkName, htmlURL string) {
 	project := matchProject(s.projects, repoName)
 
+	if htmlURL == "" && fullName != "" && sha != "" {
+		htmlURL = fmt.Sprintf("https://github.com/%s/commit/%s", fullName, sha)
+	}
+
 	instructions := fmt.Sprintf(
 		"A CI failure has been detected and requires investigation.\n\n"+
 			"Repository: %s\n"+
@@ -175,6 +205,7 @@ func (s *Server) createCIFailureTask(w http.ResponseWriter, repoName, fullName,
 		Name: fmt.Sprintf("Fix CI failure: %s on %s", checkName, branch),
 		Agent: task.AgentConfig{
 			Type:         "claude",
+			Model:        "sonnet",
 			Instructions: instructions,
 			MaxBudgetUSD: 3.0,
 			AllowedTools: []string{"Read", "Edit", "Bash", "Glob", "Grep"},
-- 
cgit v1.2.3