Skip to content

fix: restore the missing personaNamespace import dropped by the #2731 merge (fix #3064; surfaced by PR #3055) - #3068

Closed
ranxianglei wants to merge 1 commit into
masterfrom
2026-10-13_fix-persona-namespace-import
Closed

ranxianglei wants to merge 1 commit into
masterfrom
2026-10-13_fix-persona-namespace-import

Conversation

@ranxianglei

Copy link
Copy Markdown
Owner

Closes #3064

What happened. Since the #2731 merge (fa7dc4e1b), src/server/handle.ts:811 calls personaNamespace(...) on the new google-lane dsh-persona branch, but the symbol is never imported → tsc fails with TS2304. tsup/esbuild bundles without type-checking, so dist/ still ships — with a free-variable reference that throws ReferenceError (→ 502) whenever the google+dshPersona path executes. First visible casualties: PR #3055's ci-image Typecheck step and its dsh plugin lane.

Root cause (verified against the merge tree). This is not a simple forgotten import in #2731's own branch — that branch was internally consistent (all four wire sites switched to personaNamespace, import included). The damage landed in the MERGE resolution of fa7dc4e1b: for the three pre-existing wire sites (anthropic/openai/responses) it kept the master-side version (personaConversationOrder from session-resolve.js), kept #2731's NEW google branch verbatim (calling personaNamespace), but the import line followed the master side — so the google call became unbound. Commit-by-commit evidence: 623d3078c (pre-merge master) and fc3d91382 (#3056 head) both show 4× personaConversationOrder + the session-resolve import; PR head d66bd9e4d shows 5× personaNamespace + the persona-anchor import; merged fa7dc4e1b/dafff5418 (current master) show the mixed state with NO persona-anchor import.

Fix. One added line in src/server/handle.ts:

import { personaNamespace } from "../persona-anchor.js";

The minimal fix, deliberately NOT re-routing the google site through the personaConversationOrder adapter: the merge resolution already chose which resolver each pre-existing wire keeps, and this PR only restores compilation — it changes zero wire behavior. Whether the google lane should eventually move to the order-based resolver too is an open parity question left to the owner (OP checklist item 1 offered exactly this either/or).

Verification.

  • Local A/B on the exact repro: without the line, tests/side-request-isolation.test.ts subtest e2e: google-lane dsh side request resolves verbatim — no kernel state, no persona fork (#2730) fails (the same 502 seen in fix: self-restart replacement binds-or-dies on the freed port instead of hopping (#3044) #3055's CI); with the line it passes.
  • npm run typecheck: red (single TS2304) → green.
  • Targeted suites green: tests/side-request-isolation.test.ts + tests/dsh-persona-fingerprint.test.ts — 34/34 pass.
  • npm run build green. Full-suite verdict: remote CI on this head.

Behavior-change report (mandatory). Restores intended behavior only; no drift. Old state: master does not typecheck + latent runtime ReferenceError on the google+dshPersona path. New state: that path executes exactly as #2731 wrote it (fingerprint-ladder persona fork, |sub:<fp> keys). No threshold/default/timing/output-format change anywhere. CI lanes: zero workflow/test-gate changes in this PR — all e2e/etc. lanes stay exactly as they were (open), per owner instruction; the push-event typecheck evaluation (issue checklist item 2) is deferred per owner ("后面再搞规矩").

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 核验结论:此 PR 已被先行事件取代——同样的修复已在 master,直接关闭、不合并。

核实过的事实(全部动手验证,非转述):

八问:

  1. 是什么问题:同一定位(fix: key dsh personas on the google lane like the other wires (#2730) #2731 合入漏了 personaNamespace import → handle.ts TS2304)被两条独立流程各提了一个修复 PR,fix: unblock master lanes — restore personaNamespace import + storage-render goldens after #3061 #3067 先落地,本 PR 成为重复项。
  2. 什么原因导致的:master 编译坏了:#2731 合入后漏了 personaNamespace 的 import —— typecheck 红、google-lane e2e 502,连累所有在途 PR #3064 与 master typecheck broken: handle.ts:811 calls unimported personaNamespace (google dsh persona path) #3060 本是同一个缺陷(前者已判重关闭),两条工作单各自派工,产出内容相同、仅注释详略不同的两个 PR。属重复派发,不是代码问题。
  3. 影响范围与严重程度:对代码与行为零影响——master 已含修复且实测绿;唯一代价是 PR 队列里多一条冗余冲突条目。
  4. 怎么修复的:无需修复。按查重规则直接关闭 PR fix: restore the missing personaNamespace import dropped by the #2731 merge (fix #3064; surfaced by PR #3055) #3068(不合并、不改任何代码;如需可重新打开)。
  5. 是否有回归问题:无——本次零改动。
  6. 是否破坏缓存:不涉及。
  7. 是否改了设计方向:不涉及。OP 里留的开放问题(google lane 是否迁到 personaConversationOrder)仍挂 master typecheck broken: handle.ts:811 calls unimported personaNamespace (google dsh persona path) #3060 后续参考,未动。
  8. 是否引入新配置:无。

判定:直接关闭 PR #3068;owner 无需操作。

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

master 编译坏了:#2731 合入后漏了 personaNamespace 的 import —— typecheck 红、google-lane e2e 502,连累所有在途 PR

1 participant