Skip to content

[PR] DSH top bar tab default name changed to billion-context (no longer conflicts with the "context" label used by plugins su | DSH 顶栏标签页默认名改为 billion-context(不再与 dsh-context 等插件的「上下文」重名) - #6272

Open
ranxianglei wants to merge 3 commits into
masterfrom
dsh-context-tab-default

Conversation

@ranxianglei

Copy link
Copy Markdown
Owner

这是啥问题?

DSH 会话页顶部我们注册的标签页,在没配置 dsh.contextTabLabel 时显示的是内置名「上下文」/「Context」——而同机装了 dsh-context 等其他插件时,它们的标签页也恰好叫「上下文」,两个标签页撞名,用户分不清哪个是哪个。#4237 的改名开关(dsh.contextTabLabel)本来就为了解决这个冲突,但只有手动改名的机器才受益,默认机器照撞。

根本原因

src/agent/dsh-native-client.ts 槽位注册点:label: () => ctxGate.label ?? t("tab_ctx")——没配置时回退到本地化内置词条「上下文」/「Context」,而这个名字正是最容易和其他插件重名的通用词。

怎么解决的

默认显示名直接改成产品名 "billion-context"(产品名不是词条,刻意不做本地化)。配置了非空的 dsh.contextTabLabel 仍然生效(比如改成「压缩账本」)。默认只放在展示层(槽位注册点),配置/快照语义完全不变:没配置就是不携带 contextTabLabel,knobs 与 Web 配置页「留空 = 未设置」的行为保持原样。

同步面:

能否合并?

能。 回归:tests/dsh-settings-ui.test.ts(27 用例,含 #4237 命名覆盖/留空/非字符串三臂)+ tests/dsh-native.test.ts 共 103/103 全绿;tsc --noEmit 干净;npm run build 成功(dist-import-annotations / dist-external 零依赖守卫均 OK)。改动面 7 文件 ±26 行,纯展示层默认值,无行为分支变化,未配置机器刷新页面后标签页从「上下文」变成「billion-context」,配置过 dsh.contextTabLabel 的机器完全不受影响。CI 待跑。

@github-actions

github-actions Bot commented Nov 11, 2026 •

Copy link
Copy Markdown
Contributor

📦 Built Package Artifact

Branch: dsh-context-tab-default (d1f869a)

Latest build — install this exact version

npm install -g billion-context@0.0.9590-pr.6272.0862a55

This exact version is immutable and reproducible. The rolling pr tag tracks the newest test build across all PRs.

Recent builds (commit → version)

commit version build
d1f869a billion-context@0.0.9590-pr.6272.0862a55 build
a800cc8 billion-context@0.0.9482-pr.6272.f603544 build
334d86b billion-context@0.0.9471-pr.6272.57cda14 build
335e679 billion-context@0.0.9232-pr.6272.f4ff8cb build
34b041e billion-context@0.0.9171-pr.6272.84e46ff build

Download artifact

  1. Download the artifact from the Actions run
  2. Extract the tarball and install:
tar xzf billion-context-pr6272.tgz
npm install -g package

Install instructions are refreshed on each push.

@ranxianglei ranxianglei changed the title DSH 顶栏标签页默认名改为 billion-context(不再与 dsh-context 等插件的「上下文」重名) [PR] DSH 顶栏标签页默认名改为 billion-context(不再与 dsh-context 等插件的「上下文」重名) Nov 11, 2026
@ranxianglei ranxianglei changed the title [PR] DSH 顶栏标签页默认名改为 billion-context(不再与 dsh-context 等插件的「上下文」重名) [PR] DSH top bar tab default name changed to billion-context (no longer conflicts with the "context" label used by plugins su | DSH 顶栏标签页默认名改为 billion-context(不再与 dsh-context 等插件的「上下文」重名) Nov 11, 2026
@ranxianglei ranxianglei added bug Something isn't working dsh p3 scope/wiring labels Nov 12, 2026
@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

结论:docs-sync 已修好、CI 全绿,PR 可合并(等人工 merge)

这个 PR 是 agent 之前开的,CI 工程师接手修了 docs-sync 红项后卡死重启了几轮(floor 5–14)。我重新核对了当前 live 状态,没有凭旧记忆作答:

当前状态(已 live 核实)

  • PR head = 335e679(= 原修复 34b041e + CI 工程师补的种子修复 335e679)
  • CI:全 52 项 check 全绿(含 docs-sync: success、docs-coverage、config-surface-guard、architecture-docs、各 guard 全 success,0 failed / 0 pending)
  • mergeable: True(无合并冲突);分支落后 master 90 提交,但 master 这 90 个提交没碰 PR 的核心源文件(dsh-native-client.ts / knobs.ts / i18n.ts / dsh-settings-ui.test.ts / 两个 config-reference YAML 各 0 提交),只有 CHANGELOG.md(3) 与配置文档(各 1) 有重叠且可干净合并——GitHub 合并时会自动处理「behind」状态
  • 标签:此前 PR 无标签,已按交付规范补 bug / dsh / scope/wiring / p3

docs-sync 为什么红、怎么绿的:PR 第一笔 34b041e 手改了生成物 docs/configuration{,.zh-CN}.md,但没更新种子 website/config-reference/*.yaml——而 docs-sync 车道是「从种子重新生成 → 有漂移就红」。CI 工程师在 335e679 把新措辞(默认名 "billion-context")种进 YAML,生成物与种子重新对齐,docs-sync 转绿。我本地也跑了同一命令(node tools/gen-config-docs.mjs generate + git diff --exit-code)复验:零漂移。

八问

  1. 是什么问题:DSH 会话页顶栏我们注册的标签页,没配置 dsh.contextTabLabel 时默认显示「上下文」/「Context」——和同机 dsh-context 等插件的标签页撞名,用户分不清哪个是哪个。[Feature] DSH: The top "Context" tab shares its name with another plugin. Could it be merged into the "Memory System" pa | [Feature] DSH:顶部「上下文」标签页与另一插件重名,能否并入「记忆系统」页 #4237 的改名开关只救手动改名的机器,默认机器照撞。
  2. 什么原因导致的:槽位注册点 src/agent/dsh-native-client.ts 在 dsh.contextTabLabel 未配置时回退到本地化内置词条「上下文」/「Context」——这是个最容易和其他插件重名的通用词,不是产品名。
  3. 影响范围与严重程度:仅影响未配置 dsh.contextTabLabel 的机器上 DSH 顶栏标签页的显示名(纯外观层)。压缩、账本、设置页、/acp 命令一切照常工作,只是两个「上下文」标签页撞名难分辨。严重度 p3(外观/体验瑕疵,不影响功能)。
  4. 怎么修复的:默认显示名直接改成产品名 "billion-context"(产品名不是词条,刻意不做本地化);配置了非空 dsh.contextTabLabel 仍优先(比如改成「压缩账本」)。默认只放展示层(槽位注册点),配置/快照语义完全不变——未配置就是不携带 contextTabLabel 键,knobs 与 Web 配置页「留空 = 未设置」行为原样。
  5. 是否有回归问题:无。纯展示层默认值,无行为分支变化;配置过 dsh.contextTabLabel 的机器完全不受影响。唯一红过的 docs-sync 是独立的种子漂移问题(见上),已修且已绿。
  6. 是否破坏缓存:不涉及。无缓存/重试/增量游标/去重键影响。
  7. 是否改了设计方向:不涉及。无架构/边界/数据流转向。
  8. 是否引入了新的配置:不涉及。无新 env/config/默认值;现有 dsh.contextTabLabel 开关语义不变(仍仅文件层,按 彻底整治环境变了滥用,除非必要都走配置文件 #2030 不设 env 开关)。

判定

可合并,等人工 merge(按规则我不能合 PR)。改动面 9 文件(7 文件 ±26 行 + 2 个 YAML 种子),纯展示层默认值 + 文档同步,无行为分支变化。

一个可选项:分支目前落后 master 90 提交(无冲突、核心文件无重叠,GitHub 合并时会自动带上 master 现状)。如果你希望我把分支 merge 到当前 master 再让 CI 对「PR 改动 × 最新 master」复验一遍,说一声我就做;不说的话就按现状交给你合并。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

进程被强制重启了,但任务在重启前已经完成——完整结论见上一条(八问版),这里只补一句状态确认,不重复全文:

无新增工作、无阻塞。一个可选项:分支落后 master 90 提交(无冲突、核心文件无重叠),如果你希望我把它 merge 到当前 master 再让 CI 对「PR 改动 × 最新 master」复验一遍,说一声就做;不说的话就按现状交给你合并。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

Status: docs-sync already fixed on the current head — no push needed from this run.

The reported docs-sync failure was on the old head 34b041e8. The PR head has since advanced to 335e679b, which already carries the fix commit:

335e679b config-reference: seed the default tab name "billion-context" (docs-sync is seed-generated)

That commit moves the wording into the YAML seeds (dsh.contextTab, dsh.contextLabel incl. default_zh, BILI_DSH_CONTEXT_TAB) so the generator output is byte-identical.

I re-verified live and locally:

  • Live check state (mirror cache, fetched this run): 0 failed, 11 pending — docs-sync is now queued in the fresh run 43301613445 (it will re-run on 335e679b).
  • Local repro of the exact CI command on 335e679b: node tools/gen-config-docs.mjs generate → then git diff --exit-code -- docs/configuration.md docs/configuration.zh-CN.md website/main.js website/docs/index.html → PASS, no drift (node v22, same as CI).

So the failing check is already resolved by the existing branch content; there is nothing for me to fix or push. The new CI run is in progress (docs-sync queued, 11 checks pending).


结构化八问

  1. 是什么问题:docs-sync CI lane 在旧 head(34b041e8)上失败——该 lane 用 tools/gen-config-docs.mjs generate 从 website/config-reference/*.yaml 种子重新生成 docs/configuration{,.zh-CN}.md、website/main.js、website/docs/index.html,再 git diff --exit-code 检测漂移;旧 commit 手改了生成块,与种子生成输出不一致。
  2. 什么原因导致的:上一个 commit(34b041e8)直接手编辑了 docs-sync 生成的 markdown 块,而没有把措辞移入 YAML 种子——生成器输出与手改内容产生字节级漂移。
  3. 影响范围与严重程度:仅 CI 门禁(docs-sync lane 红),不影响运行时行为;PR 在该 lane 转绿前无法合并。属 CI 阻塞,非功能缺陷。
  4. 怎么修复的:当前 head(335e679b)已含修复 commit——把措辞移入种子(dsh.contextTab、dsh.contextTabLabel 含 default_zh、BILI_DSH_CONTEXT_TAB),使生成器输出字节一致。我本地按 CI 原命令验证:generate + git diff --exit-code → 通过、无漂移。修复已在分支上,无需再 push。
  5. 是否有回归问题:不涉及——本次仅核对 docs-sync 修复已在位,未改动任何代码或行为。
  6. 是否破坏缓存:不涉及。
  7. 是否改了设计方向:不涉及。
  8. 是否引入了新的配置:不涉及(dsh.contextTab/dsh.contextTabLabel/BILI_DSH_CONTEXT_TAB 是 PR 本身引入的,非本次 CI 修复新增)。

判定:docs-sync 失败已由分支上的既有 commit 修复且本地验证通过;新 CI run(43301613445)进行中(docs-sync queued、11 项 pending、0 失败)。本轮无需 push,等待 CI 转绿即可。

@ranxianglei
ranxianglei force-pushed the dsh-context-tab-default branch 2 times, most recently from 334d86b to a800cc8 Compare November 13, 2026 05:14
@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

Merge conflict resolved — PR #6272 is no longer dirty.

What I did this run:

  1. Verified live first: the PR was in dirty (merge-conflict) state — head dsh-context-tab-default @ 335e679b, 125 commits behind master.
  2. Rebased onto master. Commit 1 applied clean; the seed commit conflicted in website/config-reference/env-only.yaml + website/config-reference/server.yaml — master had since added desc_ja (Japanese) lines to every seed entry ([PR] docs: add Japanese versions of repository documentation (#6072) #6076 japanese-docs) while the PR's seed predated them.
  3. Resolved by union of intent: kept the PR's updated desc_en/desc_zh, kept master's desc_ja with minimal wording updates so the Japanese text reflects the new "billion-context" default name.
  4. Regenerated docs (tools/gen-config-docs.mjs generate) — only docs/configuration.ja.md drifted (3 rows, expected); amended it into the seed commit.
  5. Master moved again (9 new commits, incl. BILI_PLUGIN_BYPASS x-bili-plugin-bypass: 1 Allow forced specification | x-bili-plugin-bypass: 1 允许强制指定 #6220) while I worked, so I rebased once more onto the current master (fcc2e84848) — clean, no conflicts (changes were in non-overlapping regions).
  6. Verified: docs-sync (no drift), docs-coverage (204 env + 63 keys), config-surface-guard, tsc --noEmit, and tests/dsh-settings-ui.test.ts (27/27) all pass.
  7. Force-pushed (--force-with-lease) after confirming no concurrent push. New head a800cc8898.

Live state now: mergeable_state = blocked (no conflict — waiting on required reviews/checks, a human-only gate I can't and won't clear). CI: 0 failed, 6 success, 17 pending, 7 skipped.

八问

  1. 是什么问题:PR 分支与 master 产生合并冲突(merge state = dirty),无法合并。
  2. 什么原因导致的:master 在 PR 之后新增了日文文档([PR] docs: add Japanese versions of repository documentation (#6072) #6076,给所有 seed 条目加 desc_ja),而本 PR 的 seed 提交早于它,两边都改了 env-only.yaml/server.yaml 的 dsh 条目 → 文本冲突。
  3. 影响范围与严重程度:仅阻塞本 PR 合并;不影响任何运行时行为。属合并阻塞,非功能缺陷。
  4. 怎么修复的:rebase 到 master,按「意图并集」解冲突(保留 PR 的 en/zh 更新 + master 的 ja 行,ja 措辞最小化更新以反映新默认名),用生成器重生成文档;期间 master 又前进 9 个提交,再 rebase 到最新 master(无冲突)后强推。
  5. 是否有回归问题:无。改动仅涉及 dsh 标签页默认名的文档/seed 文案;tsc、docs-sync、docs-coverage、config-surface-guard、dsh-settings-ui 测试(27/27)全绿;未触碰任何运行时逻辑或 wire 行为。
  6. 是否破坏缓存:不涉及。无缓存/重试/游标/去重键相关改动。
  7. 是否改了设计方向:不涉及。纯文档/seed 文案对齐,无架构/数据流变化。
  8. 是否引入了新的配置:不涉及。未新增任何 env/config/CLI 项(本次只改已有 BILI_DSH_CONTEXT_TAB / dsh.contextTab 条目的描述文案)。

判定:冲突已解决,PR 现为 blocked(等待人工 review/checks),CI 无红项。收工。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

No action needed — this event is stale. The merge conflict was already resolved in my previous run (a few minutes ago).

Verified live just now:

  • mergeable: True, mergeable_state: blocked (no conflict — the blocked state is branch-protection waiting on required reviews/checks, a human-only gate).
  • PR head a800cc8898 is rebased onto current master fcc2e84848; master has not moved past it, so no new conflict.
  • CI: 0 failed (6 success, 17 pending, 7 skipped).

The conflict fix (rebase + union-of-intent resolution of the desc_ja seed conflict + doc regeneration) is already pushed and reported in my last comment. Nothing further to do this run.

Previously the conversation.view slot fell back to a localized built-in
("上下文"/"Context") when dsh.contextTabLabel was unset — the same name
dsh-context and friends use on co-installed machines, which is exactly
the collision #4237's rename knob exists for. The default display name
is now the product name "billion-context" (a name, not a word, so it
is deliberately not localized); a configured non-empty
dsh.contextTabLabel still wins. The default lives in the display layer
only (slot registration) — snapshot/config semantics are unchanged:
unset means the key is simply not carried.
…ync is seed-generated)

The docs-sync lane regenerates docs/configuration{,.zh-CN}.md,
website/main.js and website/docs/index.html from
website/config-reference/*.yaml and fails on drift — the previous
commit hand-edited the generated block. Move the wording into the
seeds (dsh.contextTab, dsh.contextTabLabel incl. default_zh,
BILI_DSH_CONTEXT_TAB) so the generator output is byte-identical.
@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

审核结论:APPROVE ✅

改动正确、测试到位、文档一致。DSH 顶栏会话标签页的默认显示名从本地化「上下文」/「Context」改为产品名 billion-context(刻意不本地化),用于避免与 dsh-context 等插件的「上下文」标签页重名;非空 dsh.contextTabLabel 仍优先。纯展示层改动,配置/快照语义不变(留空 = 未设置,各层都保留)。

(注:GitHub 禁止对自己账号的 PR 投 APPROVE review event,故以评论形式给出 APPROVE 判定。)

已顺手修:cfg.q_dsh_ctxtab_label 的 help 标题仍写着旧的「上下文」/「Context」标签页,与已更新的 cfg.q_dsh_ctxtab 开关标题(会话标签页 / conversation tab)不一致——已对齐为「会话标签页」/「conversation tab」 + commit 2d3ef5a

八问

  1. 是什么问题:DSH 顶栏会话标签页的默认显示名「上下文」/「Context」与 dsh-context 等插件的标签页重名,用户分不清哪个是 bili 的。
  2. 什么原因导致的:默认名走本地化 i18n key tab_ctx(zh「上下文」/ en「Context」),撞上了 dsh-context 插件用的同名标签页。
  3. 影响范围与严重程度:仅 DSH 顶栏标签页显示名(展示层)。p3(外观)。未设置 dsh.contextTabLabel 的用户看到 billion-context 而非「上下文」/「Context」;已设置的用户不受影响。
  4. 怎么修复的:把 label 回退从 t("tab_ctx") 改为硬编码产品名 "billion-context"(刻意不本地化);删掉不再使用的 tab_ctx i18n key;同步 docs(en/zh/ja)+ config-reference 种子 + CHANGELOG。
  5. 是否有回归问题:无。「留空 = 未设置」语义在各层都保留——config dsh.contextTabLabel → knob dshContextTabLabel()(空→undefined)→ 快照 __BILI__.contextTabLabel(undefined→省略 key,src/agent/dsh-native.ts:1967)→ readCtxTabFace()(缺失/空/非串→undefined,src/agent/dsh-native-client.ts:583)→ label 回退;非空 dsh.contextTabLabel 仍优先。PR head 无 tab_ctx 悬挂引用(src+tests 干净,t() 仍用于 upstreams_label)。typecheck 干净,定向测试绿(dsh-settings-ui 27/27 + dsh-native 76/76,共 103 与 PR 声明一致),docs-sync 无漂移(gen-config-docs generate + git diff --exit-code)。
  6. 是否破坏缓存:不涉及(未触碰缓存/重试/增量游标/去重键)。
  7. 是否改了设计方向:不涉及(展示层默认名改名;配置/快照语义不变)。
  8. 是否引入了新的配置:不涉及(无新配置字段;dsh.contextTabLabel 语义不变——留空 = 未设置)。

判定:可合(APPROVE)。改动小、正确,测试钉住了新默认名与「非空优先 / 留空回退 / 垃圾值回退」三条路径,文档三语一致。唯一的小不一致(label help 标题)已顺手修掉(commit 2d3ef5a)。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b)

PR #6272 审核收工 — APPROVE ✅(完整八问见上一条评论)

  • 判定:APPROVE。改动正确——DSH 顶栏会话标签页默认显示名 本地化「上下文」/「Context」→ 产品名 billion-context(刻意不本地化),非空 dsh.contextTabLabel 仍优先,纯展示层、配置/快照语义不变(留空=未设置各层保留)。
  • 已顺手修:cfg.q_dsh_ctxtab_label 的 help 标题仍写旧的「上下文」/「Context」标签页,与已更新的 cfg.q_dsh_ctxtab 开关标题(会话标签页/conversation tab)不一致 → 已对齐,commit 2d3ef5a5ca 推回 PR 分支(web-i18n + dsh-settings-ui 38/38 复验绿)。
  • 定向验证:dsh-settings-ui 27/27 + dsh-native 76/76(共 103,与 PR 声明一致)、tsc --noEmit 干净、docs-sync 零漂移(gen-config-docs generate + git diff --exit-code)。
  • 状态:等人工 merge;CI 会在新 head 2d3ef5a5ca 上重跑(2 行 i18n 文案改动,预期保持绿)。

…nversation tab, not Context tab)

The PR updated the cfg.q_dsh_ctxtab toggle heading to "conversation tab
(default name billion-context)" but left the sibling cfg.q_dsh_ctxtab_label
heading on the old "Context tab" / 「上下文」标签页 wording. Align the label
heading so the two help strings describe the same tab consistently.
@ranxianglei
ranxianglei force-pushed the dsh-context-tab-default branch from 2d3ef5a to d1f869a Compare November 13, 2026 15:10
@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

Merge conflict resolved again — PR #6272 is no longer dirty. This run also integrated a concurrent agent's commit so nothing got clobbered.

What I did this run:

  1. Verified live: the PR was dirty again — master had advanced fcc2e84848 → a007974683 (9 new commits: pure-SQLite default [PR] storage: pure-SQLite default — JSON envelopes stop being written unless dual-write is requested (#6479) #6480, announcement-policy [PR] docs(governance): Announcement policy — no broadcast to all, owner confirmation required, specify scope of impact, plugi | docs(governance): 公告政策——禁止全员广播、owner 确认、写明影响范围、插件公告必须触发式 (#6508) #6514, requiresScan gate [PR] fix(notices): gate announcement records on the live conflict scan via requiresScan (#6508) #6509), touching several of the PR's files.
  2. Found a concurrent push: another agent (ci-check) had added commit 2d3ef5a5ca ("align cfg.q_dsh_ctxtab_label heading … conversation tab, not Context tab", a 2-line src/web/i18n.ts fix) on top of my previous head, still based on the old master.
  3. Rebased onto the new master (a007974683). Only CHANGELOG.md conflicted (both sides added entries at the top of ### Changed); resolved by keeping both — master's "存储缺省翻纯 SQLite" entry + the PR's "DSH 顶栏默认名" entry. All code/doc files auto-merged clean.
  4. Cherry-picked the concurrent agent's fix (2d3ef5a5ca → d1f869a434) on top, so their i18n alignment is preserved in the new history.
  5. Verified: docs-sync (no drift), docs-coverage (204 env + 63 keys), config-surface-guard, tsc --noEmit, and tests/dsh-settings-ui.test.ts (27/27) all pass.
  6. Force-pushed (--force-with-lease) after re-fetching and confirming no further concurrent push. New head d1f869a434.

Live state now: mergeable: True, mergeable_state: blocked (no conflict — waiting on required reviews/checks, a human-only gate). The fresh CI run for d1f869a434 is starting (mirror cache not yet populated); local gates are all green.

八问

  1. 是什么问题:master 又前进了 9 个提交(纯 SQLite 缺省 / 公告策略 / requiresScan 门),与本 PR 改了同一批文件,PR 再次进入 dirty(合并冲突)。
  2. 什么原因导致的:双方都在 ### Changed 顶部加 CHANGELOG 条目 + 都改了 knobs.ts/i18n.ts/config-reference/文档 → 文本冲突;另有并发 agent 在旧 master 上追加了一个 i18n 修正提交,使分支与 master 双线分叉。
  3. 影响范围与严重程度:仅阻塞本 PR 合并;不影响任何运行时行为。属合并阻塞,非功能缺陷。
  4. 怎么修复的:rebase 到最新 master,CHANGELOG 按「两条都保留」解冲突;再 cherry-pick 并发 agent 的 i18n 修正(保留其工作,不覆盖);本地全部门禁验证后强推。
  5. 是否有回归问题:无。冲突解法只动 CHANGELOG(并集);代码/文档均为干净自动合并;tsc、docs-sync、docs-coverage、config-surface-guard、dsh-settings-ui(27/27)全绿;未触碰运行时逻辑或 wire 行为。
  6. 是否破坏缓存:不涉及。无缓存/重试/游标/去重键相关改动。
  7. 是否改了设计方向:不涉及。纯合并对齐,无架构/数据流变化。
  8. 是否引入了新的配置:不涉及。未新增任何 env/config/CLI 项(仅保留已有 dsh.contextTab/dsh.contextTabLabel 条目的文案)。

判定:冲突已解决且并发工作已并入,PR 现为 blocked(等待人工 review/checks),本地门禁全绿。收工。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b)

PR #6272 审核已完成(进程卡死重启后补报状态,不重复全文)。

  • 审核结论:APPROVE ✅ —— 完整八问 + 判定见 Floor 36(comment id 80564),此处不重复。
  • 已顺手修:cfg.q_dsh_ctxtab_label 的 help 标题与已更新的 cfg.q_dsh_ctxtab 开关标题不一致(仍写旧的「上下文」/「Context」标签页)→ 已对齐为「会话标签页」/「conversation tab」,commit 已推回 PR 分支。
  • 当前 live 状态(刚核实):CI 工程师已接管「上游 PR 冲突」并把分支 rebase 到最新 master a0079746;PR head 现为 d1f869a4(即我那条 i18n 修复 rebase 后的新 hash,内容不变)。mergeable: true、mergeable_state: blocked(无合并冲突,仅等人工 review/checks 门禁)。
  • 定向验证(重启前已跑):dsh-settings-ui 27/27 + dsh-native 76/76(共 103,与 PR 声明一致)、tsc --noEmit 干净、docs-sync 零漂移。

收工判定:审核完成、APPROVE、无阻塞,等人工 merge。无新增工作。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b) 收工确认:PR #6272 审核 APPROVE(完整八问见 Floor 36);i18n 标题不一致已顺手修并推回(现 head d1f869a4);协调报告已发 #4599(Floor 1302)。当前 mergeable: true / mergeable_state: blocked(无冲突,等人工 merge)。无阻塞、无新增工作。

This branch has not been deployed

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

Labels

bug Something isn't working dsh p3 scope/wiring

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant