@armstrongnate/april 0.1.0 → 0.1.1

package/dist/processes.js

@@ -48,7 +48,7 @@ function spawnForwarder(config, repoKey, url) {
         const child = spawn("gh", [
             "webhook", "forward",
             `--repo=${repoKey}`,
-            "--events=issues",
+            "--events=issues,pull_request",
             `--url=${url}`,
         ], {
             stdio: ["ignore", "pipe", "pipe"],

package/dist/server.js

@@ -1,7 +1,7 @@
 import Fastify from "fastify";
 import { createLogger } from "./logger.js";
 import { parseWebhookEvent } from "./webhook.js";
-import { isIssueActive } from "./spawner.js";
+import { isIssueActive, handlePrClosed } from "./spawner.js";
 const log = createLogger("server");
 export async function startServer(config, onNewIssue) {
     const app = Fastify({ logger: false });
@@ -28,8 +28,8 @@ export async function startServer(config, onNewIssue) {
             const headers = request.headers;
             const body = request.body;
             const result = parseWebhookEvent(headers, body, config);
-            if (result) {
-                const key = `${result.repo.owner}/${result.repo.name}#${result.issue.number}`;
+            if (result?.kind === "issue_assigned") {
+                const key = `issue:${result.repo.owner}/${result.repo.name}#${result.issue.number}`;
                 if (isIssueActive(result.repo, result.issue.number)) {
                     log.debug(`Issue ${key} already active, ignoring webhook`);
                 }
@@ -44,6 +44,22 @@ export async function startServer(config, onNewIssue) {
                     });
                 }
             }
+            else if (result?.kind === "pr_closed") {
+                const key = `pr:${result.repo.owner}/${result.repo.name}#${result.prNumber}`;
+                if (isRecentlyProcessed(key)) {
+                    log.debug(`PR close ${key} recently processed, debouncing`);
+                }
+                else {
+                    markProcessed(key);
+                    log.info(`Processing webhook for ${key}`);
+                    try {
+                        handlePrClosed(result.repo, result.branch);
+                    }
+                    catch (err) {
+                        log.error(`Error handling PR close: ${err instanceof Error ? err.message : String(err)}`);
+                    }
+                }
+            }
         }
         catch (err) {
             log.error(`Error processing webhook: ${err instanceof Error ? err.message : String(err)}`);

package/dist/spawner.js

@@ -219,6 +219,28 @@ export async function handleNewIssue(repo, issue, config) {
     }
     log.info(`Issue #${issue.number} (${repo.owner}/${repo.name}) is now active`);
 }
+export function handlePrClosed(repo, branch) {
+    log.info(`Cleaning up worktree for branch ${branch} (${repo.owner}/${repo.name})`);
+    try {
+        execFileSync("wt", ["remove", branch, "-f", "-D"], {
+            cwd: repo.path,
+            timeout: 60_000,
+            stdio: "pipe",
+        });
+        log.info(`Removed worktree ${branch}`);
+    }
+    catch (err) {
+        log.warn(`wt remove ${branch} failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    try {
+        execFileSync("tmux", ["kill-session", "-t", branch], { stdio: "pipe" });
+        log.info(`Killed tmux session ${branch}`);
+    }
+    catch {
+        // Session already gone — fine
+    }
+    log.info(`Cleanup complete for ${branch}`);
+}
 export function fetchOpenIssues(repo, config) {
     try {
         const output = execFileSync("gh", [

package/dist/webhook.js

@@ -1,11 +1,26 @@
 import { createLogger } from "./logger.js";
 const log = createLogger("webhook");
-export function parseWebhookEvent(headers, body, config) {
-    const event = headers["x-github-event"];
-    if (event !== "issues") {
-        log.debug(`Ignoring non-issues event: ${event}`);
+const APRIL_BRANCH_RE = /^gh-\d+-/;
+function matchRepo(body, config) {
+    const repository = body.repository;
+    if (!repository) {
+        log.debug("No repository payload found");
+        return null;
+    }
+    const repoOwner = repository.owner?.login;
+    const repoName = repository.name;
+    if (!repoOwner || !repoName) {
+        log.debug("Could not extract repo owner/name from payload");
         return null;
     }
+    const repo = config.repos.find((r) => r.owner.toLowerCase() === repoOwner.toLowerCase() && r.name.toLowerCase() === repoName.toLowerCase());
+    if (!repo) {
+        log.debug(`Repo ${repoOwner}/${repoName} not in config`);
+        return null;
+    }
+    return repo;
+}
+function parseIssuesEvent(body, config) {
     const action = body.action;
     if (action !== "assigned" && action !== "labeled") {
         log.debug(`Ignoring issues action: ${action}`);
@@ -16,37 +31,58 @@ export function parseWebhookEvent(headers, body, config) {
         log.debug("No issue payload found");
         return null;
     }
-    // Check assignees
     const assignees = issue.assignees;
     if (!assignees || !assignees.some((a) => a.login === config.assignee)) {
         log.debug(`Issue not assigned to ${config.assignee}`);
         return null;
     }
-    // Check labels
     const labels = issue.labels;
     if (!labels || !labels.some((l) => l.name === config.label)) {
         log.debug(`Issue does not have label "${config.label}"`);
         return null;
     }
-    // Match repo
-    const repository = body.repository;
-    if (!repository) {
-        log.debug("No repository payload found");
+    const repo = matchRepo(body, config);
+    if (!repo)
+        return null;
+    const number = issue.number;
+    const title = issue.title;
+    log.info(`Matched webhook event: ${repo.owner}/${repo.name}#${number} (${action})`);
+    return { kind: "issue_assigned", repo, issue: { number, title } };
+}
+function parsePullRequestEvent(body, config) {
+    const action = body.action;
+    if (action !== "closed") {
+        log.debug(`Ignoring pull_request action: ${action}`);
         return null;
     }
-    const repoOwner = repository.owner?.login;
-    const repoName = repository.name;
-    if (!repoOwner || !repoName) {
-        log.debug("Could not extract repo owner/name from payload");
+    const pr = body.pull_request;
+    if (!pr) {
+        log.debug("No pull_request payload found");
         return null;
     }
-    const repo = config.repos.find((r) => r.owner.toLowerCase() === repoOwner.toLowerCase() && r.name.toLowerCase() === repoName.toLowerCase());
-    if (!repo) {
-        log.debug(`Repo ${repoOwner}/${repoName} not in config`);
+    const head = pr.head;
+    const branch = head?.ref;
+    const prNumber = pr.number;
+    if (!branch || typeof prNumber !== "number") {
+        log.debug("pull_request missing head.ref or number");
         return null;
     }
-    const number = issue.number;
-    const title = issue.title;
-    log.info(`Matched webhook event: ${repo.owner}/${repo.name}#${number} (${action})`);
-    return { repo, issue: { number, title } };
+    if (!APRIL_BRANCH_RE.test(branch)) {
+        log.debug(`Ignoring pull_request close: not an april branch (${branch})`);
+        return null;
+    }
+    const repo = matchRepo(body, config);
+    if (!repo)
+        return null;
+    log.info(`Matched webhook event: ${repo.owner}/${repo.name}#${prNumber} PR closed (${branch})`);
+    return { kind: "pr_closed", repo, branch, prNumber };
+}
+export function parseWebhookEvent(headers, body, config) {
+    const event = headers["x-github-event"];
+    if (event === "issues")
+        return parseIssuesEvent(body, config);
+    if (event === "pull_request")
+        return parsePullRequestEvent(body, config);
+    log.debug(`Ignoring event: ${event}`);
+    return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armstrongnate/april",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "She does all the work so you don't have to. Watches GitHub issues and spawns coding-agent sessions (Claude Code or Codex) to work them.",
   "type": "module",
   "bin": {