Repository navigation
Conversation
[bot] 🏷 Duplicate screening (first): This PR (GitHub #7002) duplicates the owner's parallel PR (GitHub #7007) — both fix issue #7001 the same way. Flagging for consolidation; owner to decide which to keep. Review of GitHub #7002 (@Afloat16): ① Direction — correct (root cause, not a mask). The derived-session fallback in ② Regression — none (verified by local A/B). Checked out both revisions and ran the suites:
③ Code — clean, minimal. 4 lines in ④ Test — real, with teeth. 4 cases: parent original-only hit, grandparent fallback through an empty parent, local-result priority + unlinked isolation, and all-ancestor miss. The 2 original-only cases fail on base (proving they reproduce the bug); the other 2 are regression guards. ⑤ Diff — clean. 2 files, +74/−2. No unrelated changes, whitespace churn, or lock-file noise. CI status — inherited red, not PR-caused. The 3 failing shards (windows 22/4, ubuntu 24/3, ubuntu 22/3) are the #2929 fold-probe born-red family: they fail on master (301e1a5) too, and this PR's diff doesn't touch the nudge/fold path. The root fix is in ci-fixes (pending merge to master, convergence PR #6974). The PR head is on a fork, so I can't merge ci-fixes into it (no push access); it clears once ci-fixes lands on master or the contributor updates the branch. Recommendation. The fix is correct and well-tested, but it duplicates the owner's GitHub #7007. Per one-fix-PR-per-thread, consolidate: the owner's #7007 uses a named 八问
判定:修复正确、测试扎实、无回归;CI 红为继承性(#2929)非本 PR 引入。但本 PR 与 owner 的 GitHub #7007 重复(同修 #7001),建议 owner 二选一合并、另一个按重复关闭。本 PR 代码本身可合。 |
🔶 需要决策 (ai: vllm-qwen/qwen3.8-27b) Live state (verified this run): the 3 red shards — Diagnosis — inherited master failure, NOT a regression from this PR:
Blocker — I cannot push to the PR branch:
Decision needed (options):
Default if undecided: A — the fix is ready and verified; only the fork push permission is missing. (The 七问(本次 CI run 摘要)
收工判定:修复已就绪且本地验证通过,但 PR 分支在外部 fork( |
Merge upstream master 6a641f3, which includes the architecture module-map and schedule-independent ranxianglei#2929 probe fixes. Preserve the existing ancestor-original-search commits and exact patch. No local test rerun is claimed; verify the updated PR head through upstream CI.
|
(ai: OpenAI/gpt-6-astra) I took option B and synchronized this existing branch with upstream master in The refreshed head now has 10/10 successful workflows, including the full CI run 44049893541. No additional fork-edit permissions are needed. |
Problem
A derived session searches its ancestors only after a summary-only precheck. Keywords retained in a parent's or grandparent's folded originals therefore disappear from the child's fallback search, although an explicit search of that same ancestor finds them.
Change
Use the existing original-aware search for each recorded ancestor and return its first match. The current session keeps priority, unrelated sessions remain excluded, and ancestor state and cached contents are not changed. The existing depth and cycle limits are preserved.
Verification
301e1a5459a77d5578206927c8062a58381af642(master, 0.1.215).derivedFromSessionId is durable on disk within a tickcase also fails when run alone on the unmodified base in this environment; it is not claimed green.npm run typecheck,npm run build, andgit diff --check: passed.Closes #7001