bellwether 0.0.1

package/dist/github/repo.js

@@ -0,0 +1,72 @@
+import { spawnSync } from "node:child_process";
+import { ghFetch } from "./fetch.js";
+function spawnText(cmd) {
+    const [command, ...args] = cmd;
+    if (!command) {
+        return null;
+    }
+    const result = spawnSync(command, args, { encoding: "utf-8" });
+    if (result.status !== 0) {
+        return null;
+    }
+    return result.stdout.trim();
+}
+// ---------------------------------------------------------------------------
+// Local git state
+// ---------------------------------------------------------------------------
+export function getRepoRoot() {
+    return spawnText(["git", "rev-parse", "--show-toplevel"]);
+}
+export function getRepoInfo() {
+    const envRepo = process.env.GH_REPO;
+    if (envRepo) {
+        const match = envRepo.match(/^([^/]+)\/([^/]+)$/);
+        if (match?.[1] && match[2]) {
+            return { owner: match[1], repo: match[2] };
+        }
+    }
+    const remoteUrl = spawnText(["git", "remote", "get-url", "origin"]);
+    if (!remoteUrl) {
+        return null;
+    }
+    // SSH, HTTPS, and proxy URL formats
+    const sshMatch = remoteUrl.match(/git@github\.com:([^/]+)\/(.+?)(?:\.git)?$/);
+    const httpsMatch = remoteUrl.match(/github\.com\/([^/]+)\/(.+?)(?:\.git)?$/);
+    const proxyMatch = remoteUrl.match(/\/git\/([^/]+)\/([^/]+)$/);
+    const match = sshMatch ?? httpsMatch ?? proxyMatch;
+    if (match?.[1] && match[2]) {
+        return { owner: match[1], repo: match[2].replace(/\.git$/, "") };
+    }
+    return null;
+}
+export function getCurrentBranch() {
+    return spawnText(["git", "rev-parse", "--abbrev-ref", "HEAD"]);
+}
+export async function findPRForBranch(owner, repo, branch, token, proxyFetch) {
+    const response = await ghFetch(`https://api.github.com/repos/${owner}/${repo}/pulls?head=${owner}:${branch}&state=open`, token, proxyFetch);
+    if (!response.ok) {
+        throw new Error(`Failed to find PR: ${response.status}`);
+    }
+    const prs = (await response.json());
+    return prs[0] ?? null;
+}
+export async function listOpenPRs(owner, repo, token, proxyFetch) {
+    const response = await ghFetch(`https://api.github.com/repos/${owner}/${repo}/pulls?state=open&per_page=30`, token, proxyFetch);
+    if (!response.ok) {
+        throw new Error(`Failed to list PRs: ${response.status}`);
+    }
+    return (await response.json());
+}
+export async function fetchPRMergeState(owner, repo, prNumber, token, proxyFetch) {
+    const response = await ghFetch(`https://api.github.com/repos/${owner}/${repo}/pulls/${prNumber}`, token, proxyFetch);
+    if (!response.ok) {
+        throw new Error(`Failed to fetch PR merge state: ${response.status}`);
+    }
+    const pr = (await response.json());
+    return {
+        state: pr.merged ? "merged" : pr.state,
+        mergeable: pr.mergeable,
+        mergeableState: pr.mergeable_state ?? "unknown",
+    };
+}
+//# sourceMappingURL=repo.js.map

package/dist/github/repo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repo.js","sourceRoot":"","sources":["../../src/github/repo.ts"],"names":[],"mappings":"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"}

package/hooks/hooks.json

@@ -0,0 +1,29 @@
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Bash",
+        "hooks": [
+          {
+            "type": "command",
+            "if": "Bash(git push*)",
+            "command": "npx -y bellwether@latest hook-check",
+            "timeout": 15
+          },
+          {
+            "type": "command",
+            "if": "Bash(gh pr create*)",
+            "command": "npx -y bellwether@latest hook-check",
+            "timeout": 15
+          },
+          {
+            "type": "command",
+            "if": "Bash(gh pr ready*)",
+            "command": "npx -y bellwether@latest hook-check",
+            "timeout": 15
+          }
+        ]
+      }
+    ]
+  }
+}

package/package.json

@@ -0,0 +1,65 @@
+{
+  "name": "bellwether",
+  "type": "module",
+  "version": "0.0.1",
+  "description": "Drive GitHub PRs to merge-ready: watch CI, fix failures, resolve review comments.",
+  "private": false,
+  "author": {
+    "name": "Roderik van der Veer",
+    "url": "https://github.com/roderik"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/roderik/bellwether.git"
+  },
+  "bugs": {
+    "url": "https://github.com/roderik/bellwether/issues"
+  },
+  "homepage": "https://github.com/roderik/bellwether#readme",
+  "keywords": [
+    "ci",
+    "pr",
+    "review",
+    "merge",
+    "github",
+    "claude",
+    "agent",
+    "skill"
+  ],
+  "bin": {
+    "bellwether": "./dist/bin.js"
+  },
+  "files": [
+    "dist",
+    "src",
+    "skills",
+    "hooks",
+    ".claude-plugin",
+    "SKILL.md"
+  ],
+  "devDependencies": {
+    "@types/node": "latest",
+    "@vitest/coverage-v8": "^4.1.2",
+    "oxfmt": "^0.42.0",
+    "oxlint": "^1.57.0",
+    "oxlint-tsgolint": "^0.18.1",
+    "vitest": "^4.1.2",
+    "zile": "latest",
+    "typescript": "^6.0.2"
+  },
+  "dependencies": {
+    "@clack/prompts": "^1.1.0",
+    "incur": "^0.3.13"
+  },
+  "scripts": {
+    "build": "zile",
+    "dev": "zile dev",
+    "format": "oxfmt --write",
+    "check": "oxlint",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage"
+  },
+  "license": "MIT",
+  "sideEffects": false,
+  "exports": {}
+}

package/skills/bellwether/SKILL.md

@@ -0,0 +1,92 @@
+---
+name: bellwether
+description: >-
+  Bring the current PR to a mergeable state: CI green, all review comments resolved,
+  no merge conflicts. Self-contained — watches CI, fixes issues, watches again until
+  merge-ready. Use when the user wants to keep a PR green, auto-fix CI, resolve
+  review comments, or says "get this merged".
+user-invocable: true
+---
+
+# Bellwether — Drive PR to Merge-Ready
+
+Self-contained cycle: watch CI → fix failures → address reviews → watch again → until merge-ready.
+
+## The Loop
+
+```
+1. npx -y bellwether@latest check --watch        (blocks until CI completes)
+2. If pr.ready=true → done, report "merge-ready"
+3. If pr.state=merged|closed → done, report status
+4. If CI failures → fix them (Step 2), push, go to 1
+5. If unresolved reviews → address them (Step 3), push, go to 1
+6. If pr.mergeable=dirty|behind → /sync, push, go to 1
+7. If timed out → go to 1 (restart watch)
+```
+
+## What `npx -y bellwether@latest check --watch` returns
+
+Three sections:
+
+- **pr** — `state` (open/closed/merged), `mergeable` (clean/dirty/behind/blocked/unstable), `ready` (true when all conditions met)
+- **ci** — SHA, check summary, and for each failing check: the filtered error log with file paths and line numbers
+- **reviews** — unresolved review comments with full body, file path, and line number
+
+## Step 2: Fix CI failures
+
+For each `FAIL` key in the CI section:
+
+1. **Read the error log** — it contains actual compiler/test output with file paths and line numbers.
+2. **Fix the code** — minimal change that resolves the root cause.
+3. **Verify locally** — run the same check that failed.
+4. **Stage, commit, push** — stage files by name (never `git add -A`).
+5. **Go to step 1** — restart the watch. New CI runs, new bot comments may arrive.
+
+## Step 3: Address review comments
+
+For each `REVIEW` key in the reviews section:
+
+### Classify
+
+**Bot comments** (CodeRabbit, Copilot, Cursor Bugbot):
+- **True positive** — real bug → fix the code
+- **False positive** — bot doesn't understand the pattern → won't fix
+- **Uncertain** — ask the user
+
+**Human comments**:
+- **Actionable** — fix the code
+- **Discussion** — ask the user
+- **Already addressed** — reply only
+
+### Fix and commit
+
+Fix all true positives and actionable items in a single commit. Verify locally, push.
+
+### Reply
+
+For inline code review comments (with file path), reply individually with `--resolve`:
+
+```bash
+npx -y bellwether@latest check --reply "<id>:Fixed in <hash>. <description>" --resolve
+```
+
+For top-level bot comments (no file path), post a single summary reply:
+
+```
+Addressed review findings in <hash>:
+- REVIEW 456: Fixed null check in src/foo.ts
+- REVIEW 789: Won't fix — pattern is intentional
+```
+
+Every comment gets a response. Use `--resolve` on every reply.
+
+After all replies, go to step 1 — restart the watch.
+
+## Principles
+
+- **One fix per watch cycle** — fix CI OR reviews, not both. Push and restart watch.
+- **Minimal changes** — don't refactor unrelated code.
+- **Every comment gets a response** — no silent ignores.
+- **Ask when uncertain** — don't guess on architectural questions.
+- **Verify before pushing** — always run the failing check locally first.
+- **Never stop until terminal** — if `pr.ready` is false, keep going.

package/src/bin.ts

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+
+const cmd = process.argv[2];
+
+// Fast path for hook commands — bypass incur entirely for speed
+if (cmd === "hook-check") {
+  const { run } = await import("./commands/hook-check.js");
+  await run();
+} else if (cmd === "hook-add") {
+  const { run } = await import("./commands/hook-add.js");
+  await run();
+} else {
+  const { cli } = await import("./cli.js");
+  void cli.serve();
+}

package/src/cli.ts

@@ -0,0 +1,39 @@
+import { Cli, z } from "incur";
+import { bootstrap, type Context } from "./context.js";
+import { checkCommand } from "./commands/check.js";
+
+const cli = Cli.create("bellwether", {
+  version: "0.0.1",
+  description: "Monitor GitHub PRs — review comments and CI status",
+  vars: z.object({
+    ctx: z.custom<Context>(),
+  }),
+  env: z.object({
+    GITHUB_TOKEN: z
+      .string()
+      .optional()
+      .describe("GitHub personal access token (also reads GH_TOKEN, .env.local, gh CLI)"),
+    GH_TOKEN: z.string().optional().describe("Alternative GitHub token env var"),
+    GH_REPO: z.string().optional().describe("Override repository in owner/repo format"),
+    HTTPS_PROXY: z.string().optional().describe("HTTPS proxy URL for corporate/cloud environments"),
+  }),
+  sync: {
+    include: ["_root"],
+    suggestions: [
+      "check CI and reviews for this PR",
+      "check CI and reviews for PR 123",
+      "watch CI until complete",
+      "reply to review comment 12345",
+    ],
+  },
+});
+
+cli.use(async (c, next) => {
+  c.set("ctx", await bootstrap());
+  await next();
+});
+
+cli.command("check", checkCommand as unknown as Parameters<typeof cli.command>[1]);
+
+export { cli };
+export default cli;

package/src/commands/check.ts

@@ -0,0 +1,251 @@
+import { z } from "incur";
+import { resolvePR, type Context } from "../context.js";
+import { fetchPRMergeState, type PRMergeState, type CIStatus } from "../github/index.js";
+import { getCISection } from "./ci.js";
+import {
+  getReviewsList,
+  getReviewDetail,
+  postReply,
+  formatReviewsSection,
+  commentSchema,
+} from "./reviews.js";
+
+function buildPRSection(
+  mergeState: PRMergeState,
+  ciStatus: CIStatus,
+  unresolvedCount: number,
+): { state: string; mergeable: string; ready: boolean } {
+  return {
+    state: mergeState.state,
+    mergeable: mergeState.mergeableState,
+    ready:
+      mergeState.state === "open" &&
+      mergeState.mergeableState === "clean" &&
+      ciStatus.failing === 0 &&
+      ciStatus.pending === 0 &&
+      unresolvedCount === 0,
+  };
+}
+
+interface CheckCommandContext {
+  var: { ctx: Context };
+  args: { pr?: number };
+  options: {
+    watch: boolean;
+    interval: number;
+    timeout: number;
+    unresolved: boolean;
+    unanswered: boolean;
+    botsOnly: boolean;
+    humansOnly: boolean;
+    reply?: string;
+    resolve: boolean;
+    detail?: number;
+  };
+  ok: (data: Record<string, unknown>, meta?: Record<string, unknown>) => unknown;
+  error: (data: { message: string }) => unknown;
+}
+
+export const checkCommand = {
+  description: "Show CI status and review comments for a PR",
+  hint: "Combines CI checks and review comments. Use --reply and --detail for review actions. With --watch, polls until CI completes.",
+  args: z.object({
+    pr: z.coerce.number().optional().describe("PR number (auto-detects from branch)"),
+  }),
+  options: z.object({
+    watch: z.boolean().default(false).describe("Poll until CI completes"),
+    interval: z.coerce.number().default(30).describe("Poll interval in seconds"),
+    timeout: z.coerce.number().default(1800).describe("Timeout in seconds"),
+    unresolved: z.boolean().default(false).describe("Show only unresolved comments"),
+    unanswered: z.boolean().default(false).describe("Show only unanswered comments"),
+    botsOnly: z.boolean().default(false).describe("Only bot comments"),
+    humansOnly: z.boolean().default(false).describe("Only human comments"),
+    reply: z.string().optional().describe("Reply to comment: <id>:<message>"),
+    resolve: z.boolean().default(false).describe("Resolve thread after replying"),
+    detail: z.coerce.number().optional().describe("Show full detail for comment ID"),
+  }),
+  alias: {
+    watch: "w",
+    interval: "i",
+    unresolved: "u",
+    unanswered: "a",
+    botsOnly: "b",
+    humansOnly: "H",
+    reply: "r",
+    detail: "d",
+  },
+  usage: [
+    {},
+    { args: { pr: true } },
+    { options: { watch: true } },
+    { options: { detail: true } },
+    { options: { reply: true } },
+    { options: { reply: true, resolve: true } },
+  ],
+  output: z.object({
+    pr: z
+      .object({
+        state: z.string().describe("open | closed | merged"),
+        mergeable: z
+          .string()
+          .describe("Merge state: clean, dirty, blocked, behind, unstable, unknown, has_hooks"),
+        ready: z
+          .boolean()
+          .describe(
+            "true when state=open, mergeableState=clean, all CI passing, zero unresolved reviews",
+          ),
+      })
+      .optional(),
+    ci: z.record(z.string(), z.union([z.string(), z.number(), z.boolean()])).optional(),
+    reviews: z.record(z.string(), z.union([z.string(), z.number()])).optional(),
+    comment: commentSchema.optional(),
+    replied: z.boolean().optional(),
+    commentId: z.number().optional(),
+    message: z.string().optional(),
+    url: z.string().optional(),
+    resolved: z.boolean().optional(),
+    allPassing: z.boolean().optional(),
+    timedOut: z.boolean().optional(),
+  }),
+  examples: [
+    { description: "CI status + review comments for current branch" },
+    { options: { watch: true }, description: "Watch until CI completes" },
+    { options: { unresolved: true }, description: "Show only unresolved reviews" },
+    { options: { detail: 456 }, description: "Full detail for comment 456" },
+    { options: { reply: "456:Fixed in latest commit" }, description: "Reply to comment" },
+    { options: { reply: "456:Done", resolve: true }, description: "Reply and resolve" },
+  ],
+  async run(c: CheckCommandContext) {
+    const ctx: Context = c.var.ctx;
+    const { prNumber, headSha } = await resolvePR(ctx, c.args.pr);
+    const opts = c.options;
+
+    // Reply mode — no CI fetch needed
+    if (opts.reply) {
+      const result = await postReply(ctx, prNumber, opts.reply, opts.resolve);
+      return c.ok(result);
+    }
+
+    // Detail mode — no CI fetch needed
+    if (opts.detail) {
+      const comment = await getReviewDetail(ctx, prNumber, opts.detail);
+      if (!comment) {
+        return c.error({ message: `Comment ${opts.detail} not found` });
+      }
+      return c.ok({ comment });
+    }
+
+    const filterOpts = {
+      unresolved: opts.unresolved,
+      unanswered: opts.unanswered,
+      botsOnly: opts.botsOnly,
+      humansOnly: opts.humansOnly,
+    };
+
+    // Watch mode — poll until CI terminal
+    if (opts.watch) {
+      const start = Date.now();
+      while (true) {
+        const [mergeState, { status, flat: ciFlat }, reviewData] = await Promise.all([
+          fetchPRMergeState(
+            ctx.repoInfo.owner,
+            ctx.repoInfo.repo,
+            prNumber,
+            ctx.token,
+            ctx.proxyFetch,
+          ),
+          getCISection(ctx, prNumber, headSha),
+          getReviewsList(ctx, prNumber, filterOpts),
+        ]);
+
+        const reviewsFlat = formatReviewsSection(reviewData.comments);
+        const unresolvedCount = reviewData.comments.filter(
+          (cm) => !(cm.isResolved || cm.hasHumanReply),
+        ).length;
+        const prSection = buildPRSection(mergeState, status, unresolvedCount);
+
+        if (status.failing === 0 && status.pending === 0) {
+          return c.ok({
+            pr: prSection,
+            ci: { ...ciFlat, allPassing: true },
+            reviews: reviewsFlat,
+          });
+        }
+
+        if (status.failing > 0 && status.pending === 0) {
+          return c.ok(
+            {
+              pr: prSection,
+              ci: { ...ciFlat, allPassing: false },
+              reviews: reviewsFlat,
+            },
+            {
+              cta: {
+                description: "Failed checks detected:",
+                commands: [
+                  { command: "check --unresolved", description: "Show unresolved reviews" },
+                ],
+              },
+            },
+          );
+        }
+
+        if ((Date.now() - start) / 1000 >= opts.timeout) {
+          return c.ok(
+            {
+              pr: prSection,
+              ci: { ...ciFlat, timedOut: true },
+              reviews: reviewsFlat,
+            },
+            {
+              cta: {
+                description: "Timed out, checks still running:",
+                commands: [
+                  {
+                    command: `check --watch --timeout ${opts.timeout * 2}`,
+                    description: "Retry with longer timeout",
+                  },
+                ],
+              },
+            },
+          );
+        }
+
+        await new Promise<void>((r) => setTimeout(r, opts.interval * 1000));
+      }
+    }
+
+    // Default: fetch all in parallel
+    const [mergeState, { status, flat: ciFlat }, reviewData] = await Promise.all([
+      fetchPRMergeState(ctx.repoInfo.owner, ctx.repoInfo.repo, prNumber, ctx.token, ctx.proxyFetch),
+      getCISection(ctx, prNumber, headSha),
+      getReviewsList(ctx, prNumber, filterOpts),
+    ]);
+
+    const reviewsFlat = formatReviewsSection(reviewData.comments);
+    const unresolvedCount = reviewData.comments.filter(
+      (cm) => !(cm.isResolved || cm.hasHumanReply),
+    ).length;
+    const prSection = buildPRSection(mergeState, status, unresolvedCount);
+
+    return c.ok(
+      { pr: prSection, ci: ciFlat, reviews: reviewsFlat },
+      {
+        cta:
+          status.pending > 0
+            ? {
+                description: "Checks still running:",
+                commands: [{ command: "check --watch", description: "Watch until complete" }],
+              }
+            : status.failing > 0
+              ? {
+                  description: "Checks failing:",
+                  commands: [
+                    { command: "check --unresolved", description: "Show unresolved reviews" },
+                  ],
+                }
+              : undefined,
+      },
+    );
+  },
+};

package/src/commands/ci.ts

@@ -0,0 +1,44 @@
+import { type Context } from "../context.js";
+import { fetchCIStatus, type CIStatus } from "../github/index.js";
+
+export function flatten(
+  status: CIStatus,
+  extra?: Record<string, boolean>,
+): Record<string, string | number | boolean> {
+  const out: Record<string, string | number | boolean> = {
+    sha: status.sha,
+    checks: `${status.total} total, ${status.passing} passing, ${status.failing} failing, ${status.pending} pending`,
+  };
+  if (status.passed.length > 0) {
+    out.passed = status.passed.join(", ");
+  }
+  if (status.in_progress.length > 0) {
+    out.in_progress = status.in_progress.join(", ");
+  }
+  for (const f of status.failures) {
+    const label =
+      f.conclusion === "failure" ? `FAIL ${f.name}` : `${f.conclusion.toUpperCase()} ${f.name}`;
+    out[label] = f.log;
+  }
+  if (extra) {
+    Object.assign(out, extra);
+  }
+  return out;
+}
+
+export async function getCISection(
+  ctx: Context,
+  prNumber: number,
+  headSha?: string,
+): Promise<{ status: CIStatus; flat: Record<string, string | number | boolean> }> {
+  const { token, repoInfo, proxyFetch } = ctx;
+  const status = await fetchCIStatus(
+    repoInfo.owner,
+    repoInfo.repo,
+    prNumber,
+    token,
+    proxyFetch,
+    headSha,
+  );
+  return { status, flat: flatten(status) };
+}