xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 7 Wiki Activity

ci: 自动格式化修复区分Agent/人提交，人提交的PR仅诊断不自动修改 #694

Merged
xiaoxia merged 1 commits from ci/autofix-distinguish-agent into develop 2026-07-22 08:12:53 +08:00
Conversation 3 Commits 1 Files Changed 1
+42
xiaoxia commented 2026-07-22 01:12:43 +08:00
Owner
Copy Link
Copy Source

背景

四层防御方案第2.1项：lint/format自动修复需要区分场景。

之前所有PR的validate失败都会触发自动修复并推送，存在问题：

  • 人提交的PR被自动修改，可能不符合作者意图（PR #661的isort问题）
  • 修复推送后可能引入额外的不确定性

改动

修改 scripts/ci/auto_fix_formatting.py，增加PR作者判断：

Agent提交的PR（actions / auto-approve-bot等bot账号）

  • ✅ 自动修复（black + isort + prettier）
  • ✅ 自动推送到原分支
  • ✅ 触发新的CI检查

人提交的PR（xiaoxia等真人账号）

  • ✅ 仍然运行格式化扫描
  • ✅ 输出格式问题诊断报告（列出有问题的文件）
  • ❌ 不自动修改代码
  • ❌ 不推送
  • ❌ 以非0状态码退出，CI继续报失败（提醒人手动修复）

收益

  • Agent提交的格式问题：全自动解决，零人工介入
  • 人提交的代码：尊重作者意图，只给诊断不自动改
  • 避免"为什么我的代码被改了"的困惑
## 背景 四层防御方案第2.1项：lint/format自动修复需要区分场景。 之前所有PR的validate失败都会触发自动修复并推送，存在问题： - 人提交的PR被自动修改，可能不符合作者意图（PR #661的isort问题） - 修复推送后可能引入额外的不确定性 ## 改动 修改 `scripts/ci/auto_fix_formatting.py`，增加PR作者判断： ### Agent提交的PR（actions / auto-approve-bot等bot账号） - ✅ 自动修复（black + isort + prettier） - ✅ 自动推送到原分支 - ✅ 触发新的CI检查 ### 人提交的PR（xiaoxia等真人账号） - ✅ 仍然运行格式化扫描 - ✅ 输出格式问题诊断报告（列出有问题的文件） - ❌ **不自动修改代码** - ❌ **不推送** - ❌ 以非0状态码退出，CI继续报失败（提醒人手动修复） ## 收益 - Agent提交的格式问题：全自动解决，零人工介入 - 人提交的代码：尊重作者意图，只给诊断不自动改 - 避免"为什么我的代码被改了"的困惑
xiaoxia added 1 commit 2026-07-22 01:12:43 +08:00
ci: 自动修复区分Agent/人提交，人提交的PR仅诊断不自动修
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 25s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m34s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 44s
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 4m10s
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m23s
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
AI Code Review / AI Code Review (pull_request) Successful in 4m0s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m20s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m26s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 7m47s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 6m50s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 21m35s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 6m15s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 22s
Details
c4f00c44e0
gitea-actions bot commented 2026-07-22 01:15:00 +08:00
Copy Link
Copy Source

🚀 预览环境已部署

项目 详情
PR号 #694
预览链接 https://pr-694.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后，预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #694 | | 预览链接 | [https://pr-694.preview.xiaoxiajianji.com](https://pr-694.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据，请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后，预览环境会自动清理。
auto-approve-bot commented 2026-07-22 01:17:32 +08:00
Collaborator
Copy Link
Copy Source

代码审查结果 - PR #694

⚠️ 问题（1个需要修改）

  1. scripts/ci/auto_fix_formatting.py 第174行：变量 repo 和 token 在定义前被使用。原代码中这两个变量是在第196行才通过 os.environ.get 赋值的。在 Python 中，这会导致 NameError（如果在之前作用域未定义）或使用空字符串拼接 URL，导致 API 请求路径错误（如 //pulls/）从而请求失败。

💡 建议（1个可选）

  1. scripts/ci/auto_fix_formatting.py 第176行：网络请求未做异常捕获。如果 GitHub API 请求超时、鉴权失败（401）或资源不存在（404），urllib.request.urlopen 会抛出异常导致脚本崩溃。建议增加 try-except 捕获 urllib.error.URLError 和 HTTPError，并打印友好的错误信息后退出。

❌ 格式检查通过 | ❌ 逻辑审查需修改 | ✅ 建议关注性能

🤖 由 AI 代码审查机器人自动生成 | 2026-07-22 01:17:32 | 模型:

## 代码审查结果 - PR #694 ### ⚠️ 问题（1个需要修改） 1. **scripts/ci/auto_fix_formatting.py 第174行**：变量 `repo` 和 `token` 在定义前被使用。原代码中这两个变量是在第196行才通过 `os.environ.get` 赋值的。在 Python 中，这会导致 `NameError`（如果在之前作用域未定义）或使用空字符串拼接 URL，导致 API 请求路径错误（如 `//pulls/`）从而请求失败。 ### 💡 建议（1个可选） 1. **scripts/ci/auto_fix_formatting.py 第176行**：网络请求未做异常捕获。如果 GitHub API 请求超时、鉴权失败（401）或资源不存在（404），`urllib.request.urlopen` 会抛出异常导致脚本崩溃。建议增加 `try-except` 捕获 `urllib.error.URLError` 和 `HTTPError`，并打印友好的错误信息后退出。 --- ❌ 格式检查通过 | ❌ 逻辑审查需修改 | ✅ 建议关注性能 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-07-22 01:17:32 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
xiaoxia merged commit b59cf8aab5 into develop 2026-07-22 08:12:53 +08:00
gitea-actions bot commented 2026-07-22 08:15:11 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #694 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #694 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#694
Delete Branch "ci/autofix-distinguish-agent"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?