RFC: verified upstream patch queue — 42 cherry-pick-ready fixes for the release train (root cause + minimal fix + tests)

[zoahdev]

中文 TL;DR

PR 通道重开后，这里有一份维护者可直接 cherry-pick 的补丁队列：42 个修复，
每个都带根因、最小 diff、定向测试，以及它所对应的 discussion。不是「看看我的
作品」，是一份带逐项验证证据的补丁账本。

• 全绿编译 + typecheck；五补丁全量套件通过 1146 个测试（Windows / Node 24 / pnpm 11）。
• Bug: installing any plugin that depends on @deepseek-ai/dsh-tools breaks every tool call (Cannot read properties of undefined (reading 'prepare')) #1697（模块实例遮蔽）有机制级证明：两份物理 @deepseek-ai/dsh-tools@0.1.0-rc.6
  副本在同一进程，symbol 身份 false → true。
• 逐项账本：https://github.com/zoahdev/dsh-docs/blob/main/docs/specs/upstream-patches.md

优先的四类修复：模块实例遮蔽（#1697，Symbol.for + 协议版本守卫）、预启动诊断
（#1719 dsh doctor）、会话日志鲁棒性（#2068/#2002/#2202/#2342）、跨平台/provider
兼容（#2386/#2405/#2376/#2388）。

兼容性承诺：不改宽任何 peer 范围、不放松任何测试。PR 通道打开后，官方想要一个
整体采纳 PR 还是逐条 PR，我都会把账本 rebase 到最新 master 并保持全绿。

---

TL;DR

When the PR channel reopens, here is a maintainer-facing, ready-to-cherry-pick
queue of 42 fixes, each carrying root cause, a minimal diff, targeted tests,
and the discussion it closes. Not a "look at my repo" post — a patch ledger with
per-entry verification evidence.

What's verified

• Every branch compiles and typechecks (tsc -b tsconfig.host.json / pnpm typecheck clean).
• Every branch carries at least one targeted regression test (counts are in the ledger).
• The five-patch full-suite run (Windows / Node 24 / pnpm 11) passes 1146 tests;
  it includes the Bug: installing any plugin that depends on @deepseek-ai/dsh-tools breaks every tool call (Cannot read properties of undefined (reading 'prepare')) #1697 duplicate-instance regression suite.
• Bug: installing any plugin that depends on @deepseek-ai/dsh-tools breaks every tool call (Cannot read properties of undefined (reading 'prepare')) #1697 has a mechanism-level proof: two physical @deepseek-ai/dsh-tools@0.1.0-rc.6
  copies in one process → symbol identity false before, true after.

Ledger (per-patch detail): https://github.com/zoahdev/dsh-docs/blob/main/docs/specs/upstream-patches.md

Class-level fixes worth prioritizing

1. Module-instance shadowing (Bug: installing any plugin that depends on @deepseek-ai/dsh-tools breaks every tool call (Cannot read properties of undefined (reading 'prepare')) #1697) — Symbol.for shared key +
   TOOL_RUNTIME_SCHEDULER_PROTOCOL_VERSION guard (loud, actionable on version
   skew). Host-first @deepseek-ai/* resolution is the roadmap fix that
   eliminates the whole class, not just this symbol.
2. Pre-boot diagnostics — the companion dsh doctor contract (💡 Idea: Add 'dsh doctor' CLI command for environment & dependency diagnostics #1719) plus
   the profile-shadow tripwire in dsh-plugin-doctor, which catches the Bug: installing any plugin that depends on @deepseek-ai/dsh-tools breaks every tool call (Cannot read properties of undefined (reading 'prepare')) #1697
   precondition before anything boots.
3. Session-log robustness — duplicate-seq tolerance (Bug: two different session events share the same seq — "corrupt session log: seq gap" on load #2068), corrupt-log
   isolation (Issue：`dsh web` 启动时崩溃循环——只要有一个会话文件的首个 Zstandard 帧不是"恰好一行 header"就会挂 #2002), torn-tail false positives (活跃会话读取历史/恢复时偶发误报「corrupt Zstandard session log」 #2202), self-heal ([BUG] 会话日志损坏：关机中断后 seq 序号冲突——"中断收尾"事件与真实事件的 seq 撞号，导致会话无法加载 #2342).
4. Cross-platform / provider compat — Win32 directory picker UTF-16 ([BUG] Windows 目录选择器 readUtf16 把低位字节为 0 的字符误判为 NUL，含「言」等字的路径被截断 #2386),
   cross-platform session restore cwd (跨平台恢复 session 时 cwd 校验误拒合法绝对路径 #2405), cordis_define oneOf stringify
   (tool-cordis: cordis_define plugin param uses oneOf; some LLM providers stringify it, causing permanent validation failure #2376), custom provider supportsDeveloperRole ([Bug] developer role rejected (HTTP 400) by custom domestic (China) OpenAI-compatible providers #2388).

Cherry-pick

Each branch is based on a common master base; the exact branch per fix is in the
ledger. git fetch then git cherry-pick <branch> — no rebase archaeology
required.

Compatibility commitment

No patch widens a peer range or relaxes a test. #1697 specifically adds the
protocol-version guard so a version-skewed duplicate stays loud and
actionable instead of silently mismatching.

Ask

When the channel opens, would you prefer this queue as one adoption PR, or
individual PRs per discussion? I'll keep the ledger rebased to current master
and green either way.

Ledger: https://github.com/zoahdev/dsh-docs/blob/main/docs/specs/upstream-patches.md