Skip to content

fix: feishu-drill 账本 add 加 -f(W3-F1 实测缺陷之二) - #449

Merged
randypanding merged 1 commit into
mainfrom
fix/feishu-drill-add-f
Aug 29, 2026
Merged

fix: feishu-drill 账本 add 加 -f(W3-F1 实测缺陷之二)#449
randypanding merged 1 commit into
mainfrom
fix/feishu-drill-add-f

Conversation

@randypanding

@randypanding randypanding commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

Card: #416
ADR: ADR-0103(决策 7)

缺陷

run 33252965116:governance/feishu/shadow-evidence.jsonl 在 .gitignore(守护工作树 ephemeral 副本),feishu-ledger 分支首建时该文件未被跟踪,git add 被 ignore 拒绝 → exit 1。

修复

账本分支是持久化真源,git add -f 显式强制(跟踪后幂等,与 butler-ledger 既有形态一致)。

Summary by CodeRabbit

  • 修复
    • 修复影子账本文件无法持久化的问题。
    • 现在即使文件路径被忽略,也能正常纳入提交流程。

.gitignore 守护的是工作树 ephemeral 影子;feishu-ledger 分支是持久化真源,
首建时文件未被跟踪,无 -f 的 git add 被 ignore 拒绝。
Copilot AI lite review requested due to automatic review settings August 29, 2026 12:38

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.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@qodo-code-review

Copy link
Copy Markdown

PR Summary by Qodo

Force-add ignored Feishu shadow evidence to the ledger branch

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

Grey Divider

AI Description

• Force-stages ignored Feishu shadow evidence during first ledger-branch creation.
• Preserves idempotent commits after the shadow file becomes tracked.
• Documents why the persistent ledger intentionally overrides worktree ignore rules.
Diagram

graph TD
  A["Feishu drill"] --> B["Shadow evidence"] --> C["Ledger clone"] --> D["Force stage"] --> E["Ledger commit"] --> F["Ledger push"]
Loading
High-Level Assessment

The localized git add -f is the appropriate approach: the path must remain ignored in the ephemeral main worktree while being explicitly persisted on the authoritative ledger branch. Changing .gitignore would weaken that separation, and conditional staging would add complexity without improving safety or idempotency.

Files changed (1) +3 / -1

Bug fix (1) +3 / -1
feishu-drill.ymlForce-stage ignored evidence on the Feishu ledger branch +3/-1

Force-stage ignored evidence on the Feishu ledger branch

• Changes the ledger staging command to 'git add -f' so first-time branch creation can track the ignored shadow evidence file. Adds comments explaining the intentional distinction between the ephemeral worktree copy and persistent ledger source of truth.

.github/workflows/feishu-drill.yml

@coderabbitai

coderabbitai Bot commented Aug 29, 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: c4abb555-b1c3-405e-a290-fe869b5b79ce

📥 Commits

Reviewing files that changed from the base of the PR and between 1448c33 and a7f8be0.

📒 Files selected for processing (1)
  • .github/workflows/feishu-drill.yml

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


📝 Walkthrough

Walkthrough

工作流更新影子账本的 Git 暂存步骤。该步骤使用 git add -f,因此被 .gitignore 忽略的影子账本路径也可以加入 feishu-ledger 分支。

Changes

影子账本持久化

Layer / File(s) Summary
强制添加影子账本文件
.github/workflows/feishu-drill.yml
工作流使用 git add -f 添加影子账本文件,使被 .gitignore 忽略的路径仍可加入分支。

Suggested labels: security, bug

Merge Risk: ⚪ Minimal · up to a7f8b

This change updates the Feishu drill workflow to force-add the ledger evidence file when it is ignored, preserving the intended persistent ledger behavior. No actionable merge-blocking risk remains beyond normal checks and review.

🚥 Pre-merge checks | ✅ 2
✅ Passed checks (2 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed 标题以有效的 Conventional Commits 前缀“fix:”开头,长度为 43 个字符,且准确描述了将 feishu-drill 账本的 Git add 改为强制添加的修复。
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/feishu-drill-add-f

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

@coderabbitai coderabbitai Bot added bug Something isn't working security labels Aug 29, 2026
@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 group findings by type and pick your Finding display, from Minimal to Full

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Grey Divider

Qodo Logo

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants