Skip to content

fix(grok): 把 #830 的 pinned native tool boundary 落到 main - #1008

Merged
vansin merged 7 commits into
mainfrom
fix/830-grok-pinned-tool-boundary-landed
Aug 18, 2026
Merged

fix(grok): 把 #830 的 pinned native tool boundary 落到 main#1008
vansin merged 7 commits into
mainfrom
fix/830-grok-pinned-tool-boundary-landed

Conversation

@vansin

@vansin vansin commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

grok 栈 #825 → #826 → #830 → {#836, #867} 的第三层。前两层已落地并关闭：
#825 → #1004（main 89a6164e）、#826 → #1006（main c85dca96）。

没有 force-push #830 那条共享 draft 分支 —— 本 PR 从我自己的分支发。

落地方式（沿用已验证的形状）

git rebase --onto origin/main <#826-head> <#830-head>     # rc=0

它自己的 7 个提交：

f407ed96 fix(grok): deny vendor terminal tool in copresence
78a6de9c docs(tests): record Grok terminal deny evidence
55269527 fix(grok): deny native effectful tool surface
40da92b7 chore(grok): reset superseded terminal deny report
8d20ba20 docs(test): record exact Grok native deny evidence
433b4af4 fix(grok): close pinned native tool inventory
d51a4473 docs(test): record pinned Grok tool boundary

结果：5 files changed, 222 insertions(+), 1 deletion(-)。

门

本地跑今天这套，全部 rc=0，且这一层没有触发任何一道门（前两层各触发过一次
doc-symbol-pins 行号漂移）：

test-suite-registration   rc=0   suites=198 registered=34 orphans=164 baseline=164 new=0
doc-symbol-pins           rc=0
copresence-profile-pin    rc=0
doc-source-pins           rc=0
no-escaped-comments       rc=0
home-path-baseline        rc=0
no-memory-slugs           rc=0
l1-paths-sync             rc=0

栈还剩两层，手法已分别验证

#867  git rebase --onto origin/main <#830-head> <#867-head>   rc=0，7 个提交
#836  🔴 同样形状会失败 —— 它的区间有 49 个提交，其中 48 个已经在 main 上
      （那条分支上有过一次 `Merge remote-tracking branch 'origin/main'`）。
      改用 cherry-pick 它自己那 1 个 `fc221fc5`，rc=0，3 files +25/-2

判据（提前算得出来，不用等 rebase 失败）：

git rev-list --no-merges <base>..<head> --not origin/main | wc -l
# 条数 ≠ 区间条数  ⇒  不能用 range rebase，要 cherry-pick 那几条

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Aug 18, 2026

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@vansin vansin mentioned this pull request Aug 18, 2026
Open
@vansin
vansin merged commit 526163c into main Aug 18, 2026
25 checks passed
@vansin
vansin deleted the fix/830-grok-pinned-tool-boundary-landed branch August 18, 2026 15:09
This was referenced Aug 18, 2026
Closed
Merged
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@vansin