pi-ghwebhook 0.1.0 → 0.2.0

package/src/config/loader.ts

@@ -2,7 +2,7 @@ import { readFile, access } from "node:fs/promises";
 import { join } from "node:path";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-import type { GhWebhookConfig } from "../types/schema.js";
+import type { GhWebhookWorkflow } from "../types/schema.js";
 
 const execFileAsync = promisify(execFile);
 
@@ -23,14 +23,14 @@ async function fileExists(path: string): Promise<boolean> {
 
 export async function loadProjectConfig(
   cwd: string,
-): Promise<GhWebhookConfig | null> {
+): Promise<GhWebhookWorkflow | null> {
   for (const relPath of CONFIG_CANDIDATES) {
     const fullPath = join(cwd, relPath);
     if (await fileExists(fullPath)) {
       try {
         const content = await readFile(fullPath, "utf8");
-        const parsed = JSON.parse(content) as GhWebhookConfig;
-        if (parsed && typeof parsed === "object" && parsed.version === 1) {
+        const parsed = JSON.parse(content) as GhWebhookWorkflow;
+        if (parsed && typeof parsed === "object" && parsed.on && parsed.jobs) {
           return parsed;
         }
       } catch (err) {

package/src/index.ts

@@ -30,7 +30,7 @@ export default function ghWebhookExtension(pi: ExtensionAPI): void {
   pi.on("session_start", async (_event, ctx) => {
     // 1. 工作区探测：若当前项目无 .pi/ghwebhook.json，则静默休眠，零资源占用
     const config = await loadProjectConfig(ctx.cwd);
-    if (!config || !config.enabled) {
+    if (!config) {
       return;
     }
 
@@ -51,8 +51,8 @@ export default function ghWebhookExtension(pi: ExtensionAPI): void {
       return;
     }
 
-    // 3. 构建表驱动事件总线
-    const bus = new WebhookEventBus(config.subscriptions);
+    // 3. 构建 GitHub Actions Workflow 事件总线
+    const bus = new WebhookEventBus(config);
 
     // 4. 启动随机端口本地回环服务器
     loopback = new LoopbackServer({
@@ -80,7 +80,7 @@ export default function ghWebhookExtension(pi: ExtensionAPI): void {
       return;
     }
 
-    // 5. 托管 gh webhook forward 长连接子进程（默认全量监听 --events=*）
+    // 5. 托管 gh webhook forward 长连接子进程（全量监听）
     forwarder = new GhForwarder({
       repo,
       url: loopback.getUrl(),
@@ -93,8 +93,9 @@ export default function ghWebhookExtension(pi: ExtensionAPI): void {
     forwarder.start();
 
     if (ctx.hasUI) {
+      const displayName = config.name ? `[${config.name}]` : "[pi-ghwebhook]";
       ctx.ui.notify(
-        `[pi-ghwebhook] 已监听 ${repo} (${currentBranch}) GitHub 事件流 (端口: ${loopback.getPort()})`,
+        `${displayName} 已监听 ${repo} (${currentBranch}) 事件流 (端口: ${loopback.getPort()})`,
         "info",
       );
     }

package/src/types/schema.ts

@@ -1,91 +1,50 @@
 import { Type, type Static } from "typebox";
 
-export const FilterSchema = Type.Object(
+export const EventTriggerSchema = Type.Object(
   {
-    branch: Type.Optional(
-      Type.String({ description: "Target branch name or '@current'" }),
+    types: Type.Optional(
+      Type.Array(Type.String(), { description: "Event activity types" }),
     ),
-    conclusion: Type.Optional(
-      Type.String({
-        description: "Conclusion filter (e.g. 'failure', 'success')",
-      }),
-    ),
-    workflow: Type.Optional(
-      Type.String({ description: "Workflow name filter (e.g. 'CI')" }),
-    ),
-    state: Type.Optional(
-      Type.String({
-        description:
-          "Review or PR state filter (e.g. 'changes_requested', 'approved')",
+    branches: Type.Optional(
+      Type.Array(Type.String(), {
+        description: "Branch filters, supports '@current' and globs",
       }),
     ),
-    senders: Type.Optional(
-      Type.Array(Type.String(), { description: "Allowed sender logins" }),
-    ),
-    isBot: Type.Optional(
-      Type.Boolean({
-        description: "Filter for bot (true) or human (false) senders",
-      }),
-    ),
-    match: Type.Optional(
-      Type.Record(
-        Type.String(),
-        Type.Union([Type.String(), Type.Number(), Type.Boolean()]),
-        {
-          description:
-            "Arbitrary field matching on payload (dot-separated path)",
-        },
-      ),
-    ),
-  },
-  { additionalProperties: false },
-);
-
-export type FilterConfig = Static<typeof FilterSchema>;
-
-export const ActionSchema = Type.Object(
-  {
-    prompt: Type.String({
-      description: "Template string to dispatch to agent",
-    }),
-    deliverAs: Type.Optional(
-      Type.Union([Type.Literal("steer"), Type.Literal("followUp")], {
-        description:
-          "Delivery urgency: steer interrupts turn, followUp queues next",
-      }),
+    workflows: Type.Optional(
+      Type.Array(Type.String(), { description: "Workflow names filter" }),
     ),
   },
-  { additionalProperties: false },
+  { additionalProperties: true },
 );
 
-export type ActionConfig = Static<typeof ActionSchema>;
+export type EventTriggerConfig = Static<typeof EventTriggerSchema>;
 
-export const SubscriptionRuleSchema = Type.Object(
+export const JobSchema = Type.Object(
   {
-    event: Type.Optional(
+    name: Type.Optional(Type.String({ description: "Optional job name" })),
+    if: Type.Optional(
       Type.String({
-        description:
-          "Upstream GitHub Webhook event identifier (e.g. 'workflow_run.completed', 'push', 'issues.opened')",
+        description: "Condition expression (e.g. \"conclusion == 'failure'\")",
       }),
     ),
-    topic: Type.Optional(
-      Type.String({
+    prompt: Type.String({ description: "Template string sent to Pi Agent" }),
+    deliverAs: Type.Optional(
+      Type.Union([Type.Literal("steer"), Type.Literal("followUp")], {
         description:
-          "Alias for 'event' (e.g. 'workflow_run.completed' or 'github.workflow_run.completed')",
+          "Delivery urgency: steer interrupts turn, followUp queues next",
+        default: "followUp",
       }),
     ),
-    filters: Type.Optional(FilterSchema),
-    action: ActionSchema,
   },
   { additionalProperties: false },
 );
 
-export type SubscriptionRule = Static<typeof SubscriptionRuleSchema>;
+export type JobConfig = Static<typeof JobSchema>;
 
-export const ConfigSchema = Type.Object(
+export const WorkflowSchema = Type.Object(
   {
-    version: Type.Literal(1, { description: "Schema version" }),
-    enabled: Type.Boolean({ default: true }),
+    $schema: Type.Optional(Type.String()),
+    name: Type.Optional(Type.String({ description: "Workflow display name" })),
     repo: Type.Optional(
       Type.String({
         default: "auto",
@@ -95,11 +54,20 @@ export const ConfigSchema = Type.Object(
     secret: Type.Optional(
       Type.String({ description: "Optional Webhook HMAC secret" }),
     ),
-    subscriptions: Type.Array(SubscriptionRuleSchema, {
-      description: "List of declarative webhook event subscriptions",
-    }),
+    on: Type.Union(
+      [
+        Type.String(),
+        Type.Array(Type.String()),
+        Type.Record(
+          Type.String(),
+          Type.Union([Type.Null(), EventTriggerSchema]),
+        ),
+      ],
+      { description: "GitHub event triggers specification" },
+    ),
+    jobs: Type.Record(Type.String(), JobSchema, { description: "Jobs map" }),
   },
   { additionalProperties: false },
 );
 
-export type GhWebhookConfig = Static<typeof ConfigSchema>;
+export type GhWebhookWorkflow = Static<typeof WorkflowSchema>;

package/src/bus/guards.ts

@@ -1,118 +0,0 @@
-import type { WebhookPayload } from "../types/payload.js";
-import type { FilterConfig } from "../types/schema.js";
-
-export interface FilterContext {
-  currentBranch: string;
-  payload: WebhookPayload;
-}
-
-export type GuardPredicate = (
-  expectedValue: unknown,
-  ctx: FilterContext,
-) => boolean;
-
-function resolvePayloadBranch(payload: WebhookPayload): string | undefined {
-  return (
-    payload.workflow_run?.head_branch ??
-    payload.pull_request?.head?.ref ??
-    payload.check_suite?.head_branch ??
-    payload.workflow_job?.head_branch ??
-    (typeof payload.ref === "string"
-      ? payload.ref.replace("refs/heads/", "")
-      : undefined)
-  );
-}
-
-function resolvePayloadSender(payload: WebhookPayload): string | undefined {
-  return (
-    payload.sender?.login ??
-    payload.review?.user?.login ??
-    payload.comment?.user?.login
-  );
-}
-
-function getNestedValue(obj: Record<string, any>, path: string): unknown {
-  const parts = path.split(".");
-  let current: any = obj;
-  for (const part of parts) {
-    if (current == null || typeof current !== "object") return undefined;
-    current = current[part];
-  }
-  return current;
-}
-
-const branchGuard: GuardPredicate = (expected, { currentBranch, payload }) => {
-  const target = expected === "@current" ? currentBranch : expected;
-  const actualBranch = resolvePayloadBranch(payload);
-  return typeof target === "string" && actualBranch === target;
-};
-
-const conclusionGuard: GuardPredicate = (expected, { payload }) => {
-  const actual =
-    payload.workflow_run?.conclusion ??
-    payload.check_suite?.conclusion ??
-    payload.workflow_job?.conclusion;
-  return typeof expected === "string" && actual === expected;
-};
-
-const workflowGuard: GuardPredicate = (expected, { payload }) => {
-  const workflowName =
-    payload.workflow_run?.name ?? payload.workflow_job?.workflow_name;
-  return typeof expected === "string" && workflowName === expected;
-};
-
-const stateGuard: GuardPredicate = (expected, { payload }) => {
-  const actual = payload.review?.state ?? payload.pull_request?.state;
-  return typeof expected === "string" && actual === expected;
-};
-
-const sendersGuard: GuardPredicate = (allowedList, { payload }) => {
-  if (!Array.isArray(allowedList)) return true;
-  const sender = resolvePayloadSender(payload);
-  return typeof sender === "string" && allowedList.includes(sender);
-};
-
-const isBotGuard: GuardPredicate = (expected, { payload }) => {
-  const senderType = payload.review?.user?.type ?? payload.sender?.type;
-  const login = payload.review?.user?.login ?? payload.sender?.login ?? "";
-  const isBot = senderType === "Bot" || login.endsWith("[bot]");
-  return isBot === Boolean(expected);
-};
-
-const matchGuard: GuardPredicate = (matchObj, { payload }) => {
-  if (!matchObj || typeof matchObj !== "object") return true;
-  for (const [path, expected] of Object.entries(
-    matchObj as Record<string, unknown>,
-  )) {
-    const actual = getNestedValue(payload, path);
-    if (actual !== expected) return false;
-  }
-  return true;
-};
-
-export const GUARDS: ReadonlyMap<keyof FilterConfig, GuardPredicate> = new Map([
-  ["branch", branchGuard],
-  ["conclusion", conclusionGuard],
-  ["workflow", workflowGuard],
-  ["state", stateGuard],
-  ["senders", sendersGuard],
-  ["isBot", isBotGuard],
-  ["match", matchGuard],
-]);
-
-export function evaluateGuards(
-  filters: FilterConfig | undefined,
-  ctx: FilterContext,
-): boolean {
-  if (!filters) return true;
-
-  for (const [key, value] of Object.entries(filters)) {
-    if (value === undefined) continue;
-    const guard = GUARDS.get(key as keyof FilterConfig);
-    if (guard && !guard(value, ctx)) {
-      return false;
-    }
-  }
-
-  return true;
-}

package/src/bus/normalizer.ts

@@ -1,32 +0,0 @@
-import type { WebhookPayload } from "../types/payload.js";
-
-/**
- * Normalizes an event identifier by stripping optional "github." prefix.
- * e.g. "github.workflow_run.completed" -> "workflow_run.completed"
- */
-export function normalizeEventKey(key: string): string {
-  const trimmed = key.trim();
-  return trimmed.startsWith("github.") ? trimmed.slice(7) : trimmed;
-}
-
-/**
- * Resolves candidate event keys from an incoming GitHub Webhook event and payload.
- * Upstream convention:
- * 1. If payload has action: `${event}.${action}` (e.g. "workflow_run.completed", "pull_request.opened")
- * 2. Wildcard/base event: `${event}` (e.g. "workflow_run", "push", "issues")
- */
-export function resolveIncomingEventKeys(
-  event: string,
-  payload: WebhookPayload,
-): string[] {
-  const normalizedEvent = normalizeEventKey(event);
-  const action =
-    typeof payload.action === "string" ? payload.action.trim() : undefined;
-
-  const keys: string[] = [];
-  if (action) {
-    keys.push(`${normalizedEvent}.${action}`);
-  }
-  keys.push(normalizedEvent);
-  return keys;
-}