@zibby/workflow-templates 0.10.4 → 0.10.10

package/sentry-triage/nodes/open-pr-node.js

@@ -0,0 +1,180 @@
+/**
+ * open_pr node — open a PR (GitHub) / MR (GitLab) off the branch `fix` pushed.
+ *
+ * Adapted from code-fix/nodes/create-pr-node.js (which was GitHub-only) and
+ * extended to GitLab — the fix scenario clones+pushes either provider, so PR
+ * creation must cover both. Output contract: { pr_url, branch }.
+ *
+ * Conditional: if `fix` produced no branch (agent made no changes, or clone/fix
+ * failed) we SKIP — the graph routes here only when fix.success && fix.branch,
+ * but we keep a defensive guard for direct invocation / replay.
+ *
+ * Stops here by design: the engine has no approval/pause primitive, so the open
+ * PR/MR IS the approval — a human reviews + merges. We never auto-merge.
+ */
+
+import axios from 'axios';
+import { z } from 'zod';
+
+const OpenPROutputSchema = z.object({
+  success: z.boolean(),
+  pr_url: z.string().optional(),
+  branch: z.string().optional(),
+  number: z.number().optional(),
+  repo: z.string().optional(),
+  provider: z.enum(['github', 'gitlab']).optional(),
+  skippedReason: z.string().optional(),
+});
+
+/**
+ * Detect provider + owner/repo from the clone URL. Returns null for an
+ * unrecognized host (open_pr then skips — the branch is still pushed).
+ */
+export function parseRepo(url) {
+  let m = (url || '').match(/github\.com[/:]([^/]+)\/([^/]+?)(?:\.git)?$/);
+  if (m) return { provider: 'github', owner: m[1], repo: m[2] };
+  m = (url || '').match(/gitlab\.com[/:](.+?)\/([^/]+?)(?:\.git)?$/);
+  if (m) return { provider: 'gitlab', owner: m[1], repo: m[2] };
+  return null;
+}
+
+function resolveRepoUrl(state) {
+  return (state?.repoUrl && String(state.repoUrl).trim())
+    || (process.env.REPO_URL && String(process.env.REPO_URL).trim())
+    || '';
+}
+
+function buildPRBody(state) {
+  const issue = state?.fetch_issue?.issue || {};
+  const fix = state?.fix || {};
+  const testLine = fix.tested
+    ? (fix.testsPassed
+      ? `✅ Test-gate: \`${fix.testCommand}\` passing (${fix.attempts || 1} attempt${(fix.attempts || 1) > 1 ? 's' : ''}).`
+      : `⚠️ Test-gate: \`${fix.testCommand}\` still FAILING after ${fix.attempts || 1} attempt(s) — needs human review.`)
+    : 'ℹ️ No test command detected — change not gated by tests.';
+
+  const md = issue.metadata || {};
+  const errLine = (md.type || md.value) ? `\`${[md.type, md.value].filter(Boolean).join(': ')}\`` : '';
+
+  return `## 🐛 Sentry ${issue.shortId || issue.id || ''}: ${issue.title || ''}
+
+${errLine ? `**Error:** ${errLine}\n` : ''}${issue.culprit ? `**Culprit:** \`${issue.culprit}\`\n` : ''}${issue.permalink ? `**Sentry:** ${issue.permalink}\n` : ''}
+
+## 🔧 Change
+
+${testLine}
+
+${fix.diffStat ? '```\n' + fix.diffStat.trim() + '\n```' : ''}
+
+${(fix.changedFiles || []).length ? '### Files\n' + fix.changedFiles.map((f) => `- \`${f}\``).join('\n') : ''}
+
+---
+🤖 Automated fix by [Zibby sentry-triage](https://zibby.dev). A human should review before merging.
+`;
+}
+
+export const openPRNode = {
+  name: 'open_pr',
+  outputSchema: OpenPROutputSchema,
+  execute: async (context) => {
+    const state = (context?.state && typeof context.state.getAll === 'function')
+      ? context.state.getAll()
+      : context;
+
+    console.log('\n🔀 Opening pull/merge request…');
+
+    const fix = state?.fix || {};
+    const branch = fix.branch;
+    const repoUrl = resolveRepoUrl(state);
+    const token = state?.githubToken || state?.gitlabToken || state?.gitToken;
+    const issue = state?.fetch_issue?.issue || {};
+
+    // Defensive guard (the conditional edge already gates on this).
+    if (!fix.success || !branch) {
+      const reason = 'fix produced no branch (no changes committed).';
+      console.log(`⏭️  Skipping PR: ${reason}`);
+      return { success: false, skippedReason: reason };
+    }
+    if (!token) {
+      const reason = 'No git token — cannot open PR/MR. Connect the GitHub or GitLab integration.';
+      console.log(`⏭️  Skipping PR: ${reason}`);
+      return { success: false, branch, skippedReason: reason };
+    }
+
+    const parsed = parseRepo(repoUrl);
+    if (!parsed) {
+      const reason = `Unrecognized repo host: ${repoUrl}. open_pr supports github.com and gitlab.com.`;
+      console.log(`⏭️  Skipping PR: ${reason}`);
+      return { success: false, branch, skippedReason: reason };
+    }
+
+    const title = `fix: ${issue.title || branch}`;
+    const base = process.env.PR_BASE || 'main';
+
+    // ── GitHub ───────────────────────────────────────────────────────
+    if (parsed.provider === 'github') {
+      try {
+        const resp = await axios.post(
+          `https://api.github.com/repos/${parsed.owner}/${parsed.repo}/pulls`,
+          { title, head: branch, base, body: buildPRBody(state), draft: false },
+          {
+            headers: {
+              Authorization: `token ${token}`,
+              Accept: 'application/vnd.github.v3+json',
+              'Content-Type': 'application/json',
+            },
+          },
+        );
+        const pr = resp.data;
+        console.log(`✅ PR opened: ${pr.html_url} (#${pr.number})`);
+        return {
+          success: true,
+          pr_url: pr.html_url,
+          branch,
+          number: pr.number,
+          repo: `${parsed.owner}/${parsed.repo}`,
+          provider: 'github',
+        };
+      } catch (err) {
+        const msg = err.response?.data?.message || err.message;
+        throw new Error(`Failed to open GitHub PR for ${parsed.owner}/${parsed.repo}: ${msg}`, { cause: err });
+      }
+    }
+
+    // ── GitLab ───────────────────────────────────────────────────────
+    // The project id is the URL-encoded "owner/repo" path; GitLab accepts it
+    // in place of the numeric id on every project endpoint.
+    const projectId = encodeURIComponent(`${parsed.owner}/${parsed.repo}`);
+    try {
+      const resp = await axios.post(
+        `https://gitlab.com/api/v4/projects/${projectId}/merge_requests`,
+        {
+          source_branch: branch,
+          target_branch: base,
+          title,
+          description: buildPRBody(state),
+          remove_source_branch: true,
+        },
+        {
+          headers: {
+            'PRIVATE-TOKEN': token,
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+      const mr = resp.data;
+      console.log(`✅ MR opened: ${mr.web_url} (!${mr.iid})`);
+      return {
+        success: true,
+        pr_url: mr.web_url,
+        branch,
+        number: mr.iid,
+        repo: `${parsed.owner}/${parsed.repo}`,
+        provider: 'gitlab',
+      };
+    } catch (err) {
+      const msg = err.response?.data?.message || err.response?.data?.error || err.message;
+      throw new Error(`Failed to open GitLab MR for ${parsed.owner}/${parsed.repo}: ${msg}`, { cause: err });
+    }
+  },
+};

package/sentry-triage/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "type": "module",
-  "description": "Hourly Sentry issue triage bot — LLM-classifies new issues by severity and pings Slack OR Lark for anything ≥ threshold.",
+  "description": "Sentry issue triage + auto-fix bot — scheduled triage digests (Slack/Lark), plus a 'fix' scenario that clones the repo, lets a coding agent fix one issue with a test-gate, and opens a PR/MR.",
   "main": "graph.mjs",
   "scripts": {
     "test": "vitest run"
@@ -11,6 +11,7 @@
   "dependencies": {
     "@zibby/core": "^0.5.1",
     "@zibby/skills": "^0.1.26",
+    "axios": "^1.6.0",
     "zod": "^3.23.0"
   },
   "devDependencies": {

package/sentry-triage/state.js

@@ -1,17 +1,32 @@
 /**
- * sentry-triage — input + context schemas.
+ * sentry-triage — input + context schemas. MULTI-SCENARIO.
  *
- * Trigger payload (inputSchema) is intentionally tiny: just sinceMinutes,
- * the one per-run dial. Everything else is deploy-time ENV-tab config:
+ * One deployed agent handles BOTH scenarios, selected by an entry decision on
+ * `state.trigger` (mirrors github-code-review's entry route):
  *
- *   Required (set ONE — at least one chat target):
+ *   trigger:'fix'  → FIX scenario   (fetch ONE issue → clone+fix+test+push →
+ *                                     open PR/MR → notify). Needs `issueId` +
+ *                                     a repo (repoUrl input OR REPO_URL env).
+ *   else (default) → TRIAGE scenario (the unchanged scheduled hourly triage:
+ *                                     list issues → classify → dispatch digest).
+ *
+ * Trigger payload (inputSchema) is intentionally small. Everything else is
+ * deploy-time ENV-tab config:
+ *
+ *   TRIAGE — chat target (set ONE; required for the digest):
  *     SLACK_CHANNEL          channel id "C012345" or "#name"
  *     LARK_RECEIVE_ID        oc_… chat id, ou_… open id, or email
- *
- *   Optional:
+ *   TRIAGE — optional:
  *     SEVERITY_THRESHOLD     NOISE|LOW|MEDIUM|HIGH|CRITICAL (default MEDIUM)
  *     SLACK_MENTIONS         JSON array — appended to CRITICAL Slack alerts only
  *     LARK_MENTIONS          JSON array — appended to CRITICAL Lark alerts only
+ *
+ *   FIX — repo + PR config:
+ *     REPO_URL               repo to fix (used when `repoUrl` input is absent)
+ *     TEST_COMMAND           override the auto-detected test command
+ *     PR_BASE                base branch for the PR/MR (default "main")
+ *   FIX — chat (optional, reuses the TRIAGE target):
+ *     SLACK_CHANNEL / LARK_RECEIVE_ID — where the "auto-fixed / couldn't fix" ping goes
  */
 
 import { z } from 'zod';
@@ -27,13 +42,106 @@ export function meetsSeverityThreshold(severity, threshold) {
 }
 
 export const sentryTriageInputSchema = z.object({
+  // ── Scenario selector (entry route) ──────────────────────────────
+  // 'fix' → FIX scenario; anything else (incl. absent → default 'triage') →
+  // the scheduled TRIAGE scenario. A Sentry "issue alert" webhook (or a manual
+  // run) sets trigger:'fix' + issueId to ask for an auto-fix attempt.
+  trigger: z.enum(['triage', 'fix']).default('triage')
+    .describe("Scenario selector: 'fix' = clone+fix+PR for one issue; else the scheduled triage digest."),
+
+  // ── TRIAGE scenario ──────────────────────────────────────────────
   sinceMinutes: z.number().int().min(5).max(1440).default(60)
-    .describe('Lookback minutes (5–1440)'),
+    .describe('TRIAGE: lookback minutes (5–1440).'),
+
+  // ── FIX scenario ─────────────────────────────────────────────────
+  // issueId is required-WHEN-fix (enforced in fetch_issue, not the schema, so a
+  // triage run never has to carry it). repoUrl is the repo to fix; when absent
+  // the fix node falls back to the REPO_URL ENV-tab var.
+  issueId: z.string().min(1).optional()
+    .describe('FIX: the Sentry issue id (numeric or shortId) to auto-fix. Required when trigger="fix".'),
+  repoUrl: z.string().url().optional()
+    .describe('FIX: repository to fix (github.com/… or gitlab.com/…). Falls back to the REPO_URL env var.'),
+  model: z.string().default('auto')
+    .describe('FIX: LLM model override for the coding agent. Default auto-selects.'),
 });
 
 export const sentryTriageContextSchema = z.object({
   workspace: z.string().optional()
-    .describe('Workspace path — runner-injected; triage doesn\'t need it but graph.run requires it.'),
+    .describe('Workspace path — runner-injected. TRIAGE ignores it; the FIX scenario clones the repo here.'),
+
+  // Runner-injected git tokens (FIX scenario) — from the project's connected
+  // GitHub/GitLab integration. Spliced into the clone/push URL + used to open
+  // the PR/MR. Absent on the triage path. (githubToken matches code-fix's name;
+  // gitlabToken/gitToken are accepted as fallbacks.)
+  githubToken: z.string().optional()
+    .describe('FIX: GitHub token — runner-injected. Clones private repos + opens the PR.'),
+  gitlabToken: z.string().optional()
+    .describe('FIX: GitLab token — runner-injected. Clones private repos + opens the MR.'),
+  gitToken: z.string().optional()
+    .describe('FIX: provider-agnostic git token fallback — runner-injected.'),
+
+  // ── FIX scenario node outputs ────────────────────────────────────
+  fetch_issue: z.object({
+    found: z.boolean(),
+    issue: z.object({
+      id: z.string(),
+      shortId: z.string().optional(),
+      title: z.string(),
+      culprit: z.string().optional(),
+      level: z.string().optional(),
+      status: z.string().optional(),
+      count: z.union([z.string(), z.number()]).optional(),
+      userCount: z.number().optional(),
+      firstSeen: z.string().optional(),
+      lastSeen: z.string().optional(),
+      permalink: z.string().optional(),
+      metadata: z.object({
+        type: z.string().optional(),
+        value: z.string().optional(),
+        filename: z.string().optional(),
+      }).optional(),
+      suspectCommits: z.array(z.object({
+        id: z.string().optional(),
+        shortId: z.string().optional(),
+        message: z.string().optional(),
+        authorEmail: z.string().optional(),
+        authorName: z.string().optional(),
+      })).optional(),
+      latestEventStacktrace: z.string().optional(),
+    }).optional(),
+    fetchedAt: z.string().optional(),
+  }).optional().describe('FIX: output of fetch_issue — the one full Sentry issue.'),
+
+  fix: z.object({
+    success: z.boolean(),
+    branch: z.string().optional(),
+    repoPath: z.string().optional(),
+    cloneError: z.string().optional(),
+    tested: z.boolean(),
+    testsPassed: z.boolean().optional(),
+    attempts: z.number().optional(),
+    testCommand: z.string().optional(),
+    changedFiles: z.array(z.string()).optional(),
+    diffStat: z.string().optional(),
+    commitMessage: z.string().optional(),
+  }).optional().describe('FIX: output of the fix node — branch + inline test-gate result.'),
+
+  open_pr: z.object({
+    success: z.boolean(),
+    pr_url: z.string().optional(),
+    branch: z.string().optional(),
+    number: z.number().optional(),
+    repo: z.string().optional(),
+    provider: z.enum(['github', 'gitlab']).optional(),
+    skippedReason: z.string().optional(),
+  }).optional().describe('FIX: output of open_pr — { pr_url, branch }.'),
+
+  notify_fix: z.object({
+    sent: z.boolean(),
+    target: z.string().optional(),
+    skipped: z.string().optional(),
+    detail: z.string().optional(),
+  }).optional().describe('FIX: output of the fix-scenario notify node.'),
 
   fetch_issues: z.object({
     issues: z.array(z.object({