From 40f8e766875b5a830fe471776b78ec549278efee Mon Sep 17 00:00:00 2001
From: EcstaceeLOR <abdulmuizademola9@gmail.com>
Date: Thu, 10 Sep 2026 18:42:28 +0100
Subject: [PATCH] fix: resolve recovered smoke incidents

---
 .github/workflows/smoke.yml                   | 18 ++++++++++++++++++
 scripts/test/smoke-incident-workflow.test.mjs | 12 ++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 scripts/test/smoke-incident-workflow.test.mjs

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 3e59475..aa7c0c2 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -25,6 +25,24 @@ jobs:
           SMOKE_API_KEY: ${{ secrets.SMOKE_API_KEY }}
           SMOKE_PLAN: "true"
         run: node scripts/production-smoke.mjs
+      - name: Resolve recovered smoke incidents
+        if: success()
+        env: { GH_TOKEN: "${{ github.token }}" }
+        run: |
+          gh issue list \
+            --repo "$GITHUB_REPOSITORY" \
+            --label incident \
+            --state open \
+            --search '"Production smoke test failure" in:title' \
+            --json number \
+            --jq '.[].number' |
+          while read -r issue_number; do
+            test -n "$issue_number" || continue
+            gh issue comment "$issue_number" \
+              --repo "$GITHUB_REPOSITORY" \
+              --body "Resolved automatically after production checks recovered in [run $GITHUB_RUN_ID]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
+            gh issue close "$issue_number" --repo "$GITHUB_REPOSITORY" --reason completed
+          done
       - name: Open public incident on failure
         if: failure()
         env: { GH_TOKEN: "${{ github.token }}" }
diff --git a/scripts/test/smoke-incident-workflow.test.mjs b/scripts/test/smoke-incident-workflow.test.mjs
new file mode 100644
index 0000000..b2d1b6c
--- /dev/null
+++ b/scripts/test/smoke-incident-workflow.test.mjs
@@ -0,0 +1,12 @@
+import assert from "node:assert/strict";
+import { readFile } from "node:fs/promises";
+import test from "node:test";
+
+const workflow = await readFile(new URL("../../.github/workflows/smoke.yml", import.meta.url), "utf8");
+
+test("production smoke incidents follow the probe state", () => {
+  assert.match(workflow, /Open public incident on failure[\s\S]*if: failure\(\)/);
+  assert.match(workflow, /Resolve recovered smoke incidents[\s\S]*if: success\(\)/);
+  assert.match(workflow, /gh issue comment[\s\S]*Resolved automatically/);
+  assert.match(workflow, /gh issue close[\s\S]*--reason completed/);
+});