From 303ba4f28bac122b0e663c8e5864b88fdf7bd0af Mon Sep 17 00:00:00 2001 From: Pigbibi <20649888+Pigbibi@users.noreply.github.com> Date: Tue, 12 May 2026 05:51:11 +0800 Subject: [PATCH 1/3] Remove crisis plugin TACO copy --- application/runtime_strategy_adapters.py | 4 ++++ notifications/telegram.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/runtime_strategy_adapters.py b/application/runtime_strategy_adapters.py index 28bf0ed..d1e9894 100644 --- a/application/runtime_strategy_adapters.py +++ b/application/runtime_strategy_adapters.py @@ -49,6 +49,10 @@ def attach_strategy_plugin_report(self, report, *, signals, error: str | None = def translate_strategy_plugin_value(self, category: str, raw_value: str | None) -> str: value = str(raw_value or "").strip() or "unknown" + if category == "route" and value == "taco_fake_crisis": + value = "unknown_route" + elif category == "action" and value == "small_taco": + value = "unknown_action" key = f"strategy_plugin_{category}_{value}" translated = self.translator(key) return translated if translated != key else value diff --git a/notifications/telegram.py b/notifications/telegram.py index ca93469..71e3e13 100644 --- a/notifications/telegram.py +++ b/notifications/telegram.py @@ -101,11 +101,9 @@ "strategy_plugin_mode_shadow": "影子观察", "strategy_plugin_route_no_action": "未触发危机", "strategy_plugin_route_true_crisis": "真危机", - "strategy_plugin_route_taco_fake_crisis": "TACO 假危机", "strategy_plugin_route_unknown_route": "未知状态", "strategy_plugin_action_no_action": "不操作", "strategy_plugin_action_watch_only": "仅通知", - "strategy_plugin_action_small_taco": "小仓 TACO", "strategy_plugin_action_defend": "防守", "strategy_plugin_action_blocked": "已阻断", "strategy_plugin_action_monitor": "持续观察", @@ -197,11 +195,9 @@ "strategy_plugin_mode_shadow": "shadow", "strategy_plugin_route_no_action": "no crisis detected", "strategy_plugin_route_true_crisis": "true crisis", - "strategy_plugin_route_taco_fake_crisis": "TACO fake crisis", "strategy_plugin_route_unknown_route": "unknown status", "strategy_plugin_action_no_action": "no action", "strategy_plugin_action_watch_only": "notify only", - "strategy_plugin_action_small_taco": "small TACO", "strategy_plugin_action_defend": "defend", "strategy_plugin_action_blocked": "blocked", "strategy_plugin_action_monitor": "watch", From c5d2ae011dd7cffad26da372a3a8eabac5e69adc Mon Sep 17 00:00:00 2001 From: Pigbibi <20649888+Pigbibi@users.noreply.github.com> Date: Tue, 12 May 2026 05:51:59 +0800 Subject: [PATCH 2/3] Remove TACO from crisis plugin --- application/runtime_strategy_adapters.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/runtime_strategy_adapters.py b/application/runtime_strategy_adapters.py index d1e9894..28bf0ed 100644 --- a/application/runtime_strategy_adapters.py +++ b/application/runtime_strategy_adapters.py @@ -49,10 +49,6 @@ def attach_strategy_plugin_report(self, report, *, signals, error: str | None = def translate_strategy_plugin_value(self, category: str, raw_value: str | None) -> str: value = str(raw_value or "").strip() or "unknown" - if category == "route" and value == "taco_fake_crisis": - value = "unknown_route" - elif category == "action" and value == "small_taco": - value = "unknown_action" key = f"strategy_plugin_{category}_{value}" translated = self.translator(key) return translated if translated != key else value From c4b9418dab7b8d8ef9cc93155b02dd1d5f91bf6d Mon Sep 17 00:00:00 2001 From: Pigbibi <20649888+Pigbibi@users.noreply.github.com> Date: Tue, 12 May 2026 09:48:18 +0800 Subject: [PATCH 3/3] Add Dependabot auto-merge --- .github/dependabot.yml | 8 +++ .github/workflows/dependabot_auto_merge.yml | 71 +++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 .github/workflows/dependabot_auto_merge.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5860948..2bbf4fc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,8 +5,16 @@ updates: schedule: interval: "weekly" open-pull-requests-limit: 5 + ignore: + - dependency-name: "*" + update-types: + - "version-update:semver-major" - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" open-pull-requests-limit: 5 + ignore: + - dependency-name: "*" + update-types: + - "version-update:semver-major" diff --git a/.github/workflows/dependabot_auto_merge.yml b/.github/workflows/dependabot_auto_merge.yml new file mode 100644 index 0000000..1a3e24b --- /dev/null +++ b/.github/workflows/dependabot_auto_merge.yml @@ -0,0 +1,71 @@ +name: Auto Merge Dependabot PR + +"on": + workflow_run: + workflows: ["CI"] + types: [completed] + +jobs: + auto-merge: + if: github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_branch, 'dependabot/') + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + + steps: + - name: Resolve Dependabot PR + id: pr + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + BRANCH_NAME="${{ github.event.workflow_run.head_branch }}" + PR_NUMBER=$(gh pr list --state open --head "${BRANCH_NAME}" --json number --jq '.[0].number // empty') + if [ -z "${PR_NUMBER}" ]; then + echo "No open Dependabot PR found for ${BRANCH_NAME}." >> "$GITHUB_STEP_SUMMARY" + exit 0 + fi + echo "pr_number=${PR_NUMBER}" >> "$GITHUB_OUTPUT" + + - name: Evaluate merge eligibility + id: merge_guard + if: steps.pr.outputs.pr_number != '' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh pr view "${{ steps.pr.outputs.pr_number }}" --json number,isDraft,author,url,labels > pr.json + python3 - <<'PY' + import json + import os + from pathlib import Path + + pr = json.loads(Path("pr.json").read_text(encoding="utf-8")) + author = (pr.get("author") or {}).get("login") + labels = {item.get("name", "") for item in pr.get("labels", [])} + should_merge = author == "dependabot[bot]" and not pr.get("isDraft") + reason = "ready" if should_merge else "not_dependabot_or_draft" + + summary_lines = [ + "## Auto-Merge Gate", + f"- PR: {pr['url']}", + f"- Author: `{author or ''}`", + f"- Draft: `{ 'yes' if pr.get('isDraft') else 'no' }`", + f"- Dependabot label: `{ 'yes' if 'dependencies' in labels else 'no' }`", + f"- Final merge decision: `{ 'merge' if should_merge else 'skip' }`", + f"- Reason: `{reason}`", + ] + Path("pr-summary.md").write_text("\n".join(summary_lines).strip() + "\n", encoding="utf-8") + with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as output: + print(f"should_merge={'true' if should_merge else 'false'}", file=output) + print(f"reason={reason}", file=output) + PY + + - name: Append merge summary + if: steps.pr.outputs.pr_number != '' + run: cat pr-summary.md >> "$GITHUB_STEP_SUMMARY" + + - name: Merge Dependabot PR + if: steps.merge_guard.outputs.should_merge == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gh pr merge "${{ steps.pr.outputs.pr_number }}" --rebase --delete-branch