Skip to content

fix(governance): Shorts_Director 豁免 SHA 勘误——API 实测真值(ADR-0058) - #183

Merged
randypanding merged 1 commit into
mainfrom
fix-sd-exemption-shas
Aug 21, 2026
Merged

fix(governance): Shorts_Director 豁免 SHA 勘误——API 实测真值(ADR-0058)#183
randypanding merged 1 commit into
mainfrom
fix-sd-exemption-shas

Conversation

@randypanding

@randypanding randypanding commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

动机

direct_push_exemptions.Shorts_Director 两条 SHA 自 #175 起即为拼错的马赛克值(机器人从漂移 issue 文本重建时字符错位),#178 的回归修复未修对。drift-check §8 因此持续将 d81fea9d/014f3898 两条建仓 bootstrap commit 误报为未豁免 P0 直推,诱发机器人反复开修复 PR。

修复

以 GitHub commits API 逐字符核验的真值替换(40 字符全对):

  • d81fea9db47e065fd2bd5211dd1a8e3c26589f41(Initial commit)
  • 014f38986ee5338fe0d7e3ea260c9a4f289af401(Update print statement…)

其余全部豁免条目(.github/agent-tools/Script_Writer/Use-up-Plan/agent-platform/mutual/agent-registry/arbiter/f63baf26)已逐一 API 核验 OK(附在本 PR 评论)。

验证

  • API 解析:两条前缀均解析到真实 commit 且全 SHA 逐字符一致
  • JSON 解析 OK;合并后下轮 drift-check §8 Shorts_Director 应转绿

归属

数据勘误,豁免登记的 ADR 背书不变(ADR-0058/ADR-0021 (b) 类)。回滚=revert。

Summary by CodeRabbit

  • 配置更新
    • 更新 Shorts_Director 的直推豁免提交记录。
    • 替换为最新的两个提交哈希,确保相关提交规则与当前状态一致。

…从漂移文本重建时拼错——d81fea9d/014f3898 与真实 commit 逐字符核对)(ADR-0058)
Copilot AI lite review requested due to automatic review settings August 21, 2026 12:37
@coderabbitai

coderabbitai Bot commented Aug 21, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 65ce673f-2967-48de-82f8-250b75592999

📥 Commits

Reviewing files that changed from the base of the PR and between ccb98f2 and f50b30b.

📒 Files selected for processing (1)
  • governance/expected-state.json

Included review availability: Your plan provides up to 10 included reviews per hour; 0 remain after this review.


📝 Walkthrough

Walkthrough

更新 Shorts_Director 的两个直推豁免提交 SHA。未修改公共声明。

Changes

Shorts_Director 直推豁免

Layer / File(s) Summary
更新直推豁免 SHA
governance/expected-state.json
Shorts_Director 直推豁免列表中的两个旧提交 SHA 替换为新的提交 SHA。

Suggested labels: bug

Merge Risk: ⚪ Minimal · up to f50b3

This narrowly corrects two governance commit identifiers without changing runtime behavior; no actionable merge-blocking risk remains beyond normal checks and review.

🚥 Pre-merge checks | ✅ 1 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning 标题使用了有效的 Conventional Commits 前缀,且准确描述了 SHA 修正,但长度为 62 个字符,超过 50 个字符限制。 将标题缩短至 50 个字符以内,同时保留 fix 前缀和 Shorts_Director SHA 修正的核心信息。
✅ Passed checks (1 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix-sd-exemption-shas

Comment @coderabbitai help to get the list of available commands.

@qodo-code-review

Copy link
Copy Markdown

PR Summary by Qodo

Fix Shorts_Director direct-push exemption SHAs in expected-state.json

🐞 Bug fix ⚙️ Configuration changes 🕐 Less than 10 minutes

Grey Divider

AI Description

• Correct two mis-typed Shorts_Director direct-push exemption commit SHAs.
• Stop drift-check §8 from repeatedly flagging bootstrap commits as non-exempt.
• Align governance expected state with GitHub commits API-verified ground truth.
Diagram

graph TD
  DC(["drift-check §8"]) --> ES["governance/expected-state.json"] --> SD["Shorts_Director exemptions"]
  DC --> GH{{"GitHub commits"}}
  SD -."match SHAs".-> GH

  subgraph Legend
    direction LR
    _svc(["Service"]) ~~~ _file["File"] ~~~ _ext{{"External"}}
  end
Loading
High-Level Assessment

The following are alternative approaches to this PR:

1. Add CI validation for exemption SHAs
  • ➕ Prevents future typos/mosaic SHAs from landing in expected-state.json
  • ➕ Catches drift-check false positives before merge
  • ➖ Requires CI/network access to GitHub API or a local git strategy
  • ➖ Extra maintenance for governance validation rules
2. Derive exemptions from local git objects (rev-parse)
  • ➕ Avoids reliance on external GitHub API availability/rate limits
  • ➕ Works in offline CI if full git history is present
  • ➖ Depends on having the relevant commits/fetch depth in CI
  • ➖ Doesn't validate that SHAs correspond to the intended upstream commits if history is incomplete

Recommendation: The PR’s approach (correct the two incorrect full SHAs) is the right immediate fix because it removes ongoing false positives with minimal blast radius. Consider a follow-up CI check to validate all exemption SHAs (via GitHub API or local rev-parse) to prevent recurrence, but keep this PR scoped to the data correction.

Files changed (1) +2 / -2

Other (1) +2 / -2
expected-state.jsonCorrect two Shorts_Director exemption commit SHAs +2/-2

Correct two Shorts_Director exemption commit SHAs

• Replaces two incorrect direct_push_exemptions.Shorts_Director entries with the GitHub commits API-verified full 40-character SHAs. This prevents drift-check from misclassifying the bootstrap commits as non-exempt direct pushes.

governance/expected-state.json

@coderabbitai coderabbitai Bot added the bug Something isn't working label Aug 21, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR corrects two malformed Shorts_Director bootstrap commit SHA exemptions.

Changes:

  • Replaces both values with verified full commit IDs.
  • Preserves existing exemption entries and governance structure.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@randypanding
randypanding merged commit 50f9a37 into main Aug 21, 2026
13 checks passed
@randypanding
randypanding deleted the fix-sd-exemption-shas branch August 21, 2026 12:41
@qodo-code-review

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Grey Divider

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Grey Divider

Tip of the day
💡 Did you know, you can tweak Display preferences with a live preview to see your comment before it ships

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Grey Divider

Qodo Logo

randypanding pushed a commit that referenced this pull request Aug 21, 2026
…冲突解为 §16→§17(本卡)→§18 段序(§18 头注释已预留 §17 编号给 W1-C3);REPOS.yaml 保留 archive/holdout 新条目+entry_protocol 申报
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants