chore(integration): sync main into daemon_mode_b_main (2026-05-24)

[doudouOUC]

Summary

Routine sync — pulls 45 commits from main (since 2026-05-19) into the daemon_mode_b_main integration branch as a prerequisite for the v0.16-alpha F5 release chain (per #4175 2026-05-24 scope freeze and follow-up decisions).

Without this sync, future F5 PRs (PR 27 docs / PR 28 npm publish / PR 30a local launch refs / PR 31 cut) would each carry the same 45-commit delta as conflict surface.

Conflict resolution

3 mechanical import-block conflicts, no semantic overlap:

File	Conflict shape	Resolution
packages/acp-bridge/package.json	version placeholder 0.0.1 vs main release 0.16.1; description shape diverged	Took main's 0.16.1 version (release line wins) + kept daemon_mode_b_main's longer description that reflects post-F1 lift (BridgeClient + spawnChannel + factory + BridgeFileSystem seam)
packages/cli/src/acp-integration/acpAgent.ts	Import block: F2 added WorkspaceMcpBudget; main added restoreWorktreeContext	Union both imports
packages/core/src/config/config.test.ts	Import block: daemon_mode_b_main #4297 added MCPServerConfig + TrustGateError; main Auto-mode PR added APPROVAL_MODES + APPROVAL_MODE_INFO + MCPServerConfig	Union all (alphabetic)

One cross-merge integration fix

packages/cli/src/acp-integration/acpAgent.worktree.test.ts (from main's worktree Phase C #4174) mocks @qwen-code/qwen-code-core but the mock pre-dated F2's MCP pool wiring. After the merge, the QwenAgent constructor (now invoking new McpTransportPool(this.config, { workspaceContext: ..., debugMode: ... })) crashed the test.

Added to the vi.mock block:

• McpTransportPool (constructor stub returning acquire/release/shutdown/on/off)
• WorkspaceMcpBudget (constructor stub returning register/unregister/snapshot)
• MCP_BUDGET_WARN_FRACTION, POOLED_TRANSPORTS_DEFAULT
• getMCPDiscoveryState, getMCPServerStatus, MCPDiscoveryState, MCPServerStatus

Added to both outer mockConfig and inner makeInnerConfig:

• getWorkspaceContext: () => ({ getDirectories, addDirectory })
• getDebugMode: () => false
• getMcpServers: () => ({})
• setMcpBudgetEventCallback: vi.fn()

This is the kind of cross-merge breakage we expected to surface during sync; resolved in this PR so no F5 author has to think about it.

Verification

Run on the synced tree:

Suite	Result
npm run typecheck (all 5 workspaces)	clean
@qwen-code/acp-bridge test:ci	291/291 pass
packages/cli serve + acp-integration	946/946 pass (36 files)

Test plan

• typecheck across all workspaces
• acp-bridge test suite
• cli serve + acp-integration test suite
• CI green
• Maintainer merge into daemon_mode_b_main

Heads-up for downstream PRs

PRs currently based on daemon_mode_b_main will need rebase after this merges:

• @chiga0 Feat/daemon react cli #4380 feat/daemon-react-cli
• @chiga0 feat(sdk/daemon-ui): unified completeness follow-up to #4328 #4353 feat/daemon-ui-completeness-followup

Both are library-only (per 2026-05-21 direction), so the rebase shouldn't surface any further integration issues — the merge here only resolved import-block conflicts and a single test mock gap, neither of which touches the SDK / webui surface those PRs depend on.

cc @wenshao

🤖 Generated with Qwen Code

[Copilot]

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

[wenshao]

⚠️ Downgraded from Approve to Comment: CI failing (review-pr). Sync merge is mechanically correct — conflict resolutions are clean and cross-merge test fix is complete. 4 suggestions below for the post-merge code surface.

[wenshao]

[Suggestion] restoreWorktreeContext is called without an onWarn callback. The function performs destructive side effects (deletes stale/tampered sidecar files via clearWorktreeSession) and emits diagnostic warnings via the optional onWarn parameter. Without it, intermediate warnings (e.g., "worktreePath outside expected parent, treating as tampered" at worktreeSessionService.ts:211) are silently swallowed. The TUI entry point (AppContainer.tsx:567) passes onWarn with console.debug; the ACP path should match.

Suggested change

	const restored = await restoreWorktreeContext(sessionPath);
	const restored = await restoreWorktreeContext(sessionPath, (e) => {
	debugLogger.warn(`ACP worktree restore: ${e}`);
	});

— qwen3.7-max via Qwen Code /review

[wenshao]

[Suggestion] #restoreWorktreeOnResume uses ECMAScript # private syntax, but every other private method in the QwenAgent class (24+ methods including workspaceCwd, safeWorkspaceCwd, mcpTransport, buildMcpDiscoveryPreflightCell, etc.) uses TypeScript's private keyword. This is the sole outlier — consider aligning for consistency.

Suggested change

	async #restoreWorktreeOnResume(
	private async restoreWorktreeOnResume(

— qwen3.7-max via Qwen Code /review

[wenshao]

[Suggestion] The AUTO mode three-layer filter (~65 lines, lines 1940–2005) has zero test coverage in Session.test.ts. The shared functions (evaluateAutoMode, applyAutoModeDecision) are tested in autoMode.test.ts, but the Session.ts integration wiring — branch coverage for the early error response on blocked, denial state tracking via recordAllow/recordBlock, fallback to manual approval, and the autoModeAllowed gate on needsConfirmation — is untested. Consider adding integration tests for at least the blocked and fallback paths.

— qwen3.7-max via Qwen Code /review

[wenshao]

[Suggestion] NotebookEditTool sets getDefaultPermission: 'ask' (routes through AUTO mode classifier) but does not override toAutoClassifierInput. The base class default returns '', so the classifier sees only the tool name with zero visibility into notebook_path, cell_id, edit_mode, or new_source. Every other file-mutating tool with 'ask' permission (edit.ts, write-file.ts, shell.ts, etc.) provides a toAutoClassifierInput override that forwards relevant parameters. Without this, the AUTO classifier cannot distinguish editing a project notebook from editing one at a sensitive path.

Suggested change

	override async getDefaultPermission(): Promise<PermissionDecision> {
	override async getDefaultPermission(): Promise<PermissionDecision> {
	return 'ask';
	}
	override toAutoClassifierInput(params: Record<string, unknown>): string {
	return JSON.stringify({
	notebook_path: params['notebook_path'],
	edit_mode: params['edit_mode'],
	cell_id: params['cell_id'],
	});
	}

— qwen3.7-max via Qwen Code /review

[wenshao]

PR 4469 本地 tmux 验证报告

PR: #4469 chore(integration): sync main into daemon_mode_b_main (2026-05-24)
作者: @doudouOUC
Base: daemon_mode_b_main (0c0430939)
Tip: 4bc526d14（merge commit）
验证时间: 2026-05-24
验证环境: macOS Darwin 25.4.0 / tmux 会话 pr4469（6 个验证窗口）
关联: #4175 F5 release chain 前置 PR

---

1. 总体结论

维度	结果
构建	✅ 全过
Typecheck	✅ 5 个 workspace 全过
ACP bridge 测试	✅ 291/291 passed
CLI serve + acp-integration	✅ 946/946 passed（36 files）
冲突解决	✅ 3 个 import-block 冲突正确合并
跨合并集成修复	✅ worktree test mock 补全

合并建议：✅ 可以合并。sync 干净、冲突解决正确、测试全过，F5 后续 PR 可以 rebase。

---

2. 验证矩阵

Window	用途	结果
0 install	npm ci	EXIT=0
1 build	npm run build	EXIT=0
2 typecheck	npm run typecheck（5 包）	EXIT=0
3 test-acp	packages/acp-bridge test:ci	291 passed, 7 files
4 test-cli	packages/cli serve + acp-integration	946 passed, 36 files
5 verify	冲突审查 + git 状态	通过

---

3. PR 范围

从 main 向 daemon_mode_b_main 同步 46 个 commit（覆盖 2026-05-19 至 2026-05-24），主要包含：

• Worktree Phase C（feat(worktree): Phase C — session persistence, hooksPath, Footer + WorktreeExitDialog, three-mode --resume restore #4174）— session persistence, hooksPath, Footer, restore
• Auto approval mode with LLM classifier（feat(cli,core): add Auto approval mode with LLM classifier #4151, feat(core): extend cross-auth fast models to agents #4153）
• NotebookEdit tool（fix(core): preserve tab-indented notebook formatting #4373, fix(release): move constants above entry point to avoid TDZ error #4398）
• Telemetry Phase 4a — TTFT capture + GenAI semconv（feat(telemetry): Phase 4a — TTFT capture + GenAI semconv dual-emit (#3731) #4417）
• Releases v0.16.0 (chore(release): v0.16.0 #4404), v0.16.1 (fix(build): clean stale outputs before tsc --build to prevent TS5055 #4453)
• ~30 fixes（UI flickering, OOM fix, express 4→5, React reconciler leak, etc.）

---

4. 冲突解决验证（3 处）

4.1 packages/acp-bridge/package.json

-  "version": "0.0.1",
+  "version": "0.16.1",

• ✅ 采用 main 的 0.16.1（release line 优先）
• ✅ 保留 daemon 分支较长的 description（包含 BridgeClient + spawnChannel + BridgeFileSystem seam）

4.2 packages/cli/src/acp-integration/acpAgent.ts

• ✅ Import 块合并：WorkspaceMcpBudget（daemon F2）+ restoreWorktreeContext（main worktree Phase C）
• ✅ 新增 #restoreWorktreeOnResume() 方法，bridge 两个 ACP 入口点（loadSession / unstable_resumeSession）之间的 worktree 恢复路径一致性
• ✅ 方法标记为 best-effort（失败不阻塞 session 加载），与 PR feat(worktree): Phase C — session persistence, hooksPath, Footer + WorktreeExitDialog, three-mode --resume restore #4174 review 反馈一致

4.3 packages/core/src/config/config.test.ts

• ✅ Import 块合并：MCPServerConfig + TrustGateError（daemon fix(serve): post-merge P2 corrections from Codex review on #4282 #4297）+ APPROVAL_MODES + APPROVAL_MODE_INFO（main Auto-mode）
• ✅ Tool 列表新增 NOTEBOOK_EDIT（main fix(release): move constants above entry point to avoid TDZ error #4398）

---

5. 跨合并集成修复

PR 作者在 packages/cli/src/acp-integration/acpAgent.worktree.test.ts 中补全了 vi.mock 块 — 该测试在 merge 后因 QwenAgent 构造函数新增的 McpTransportPool 调用而崩溃。补全内容：

• McpTransportPool stub（acquire/release/shutdown/on/off）
• WorkspaceMcpBudget stub（register/unregister/snapshot）
• MCP_BUDGET_WARN_FRACTION, POOLED_TRANSPORTS_DEFAULT 常量
• MCP discovery/status 辅助函数
• mockConfig 补全 getWorkspaceContext, getDebugMode, getMcpServers, setMcpBudgetEventCallback

✅ 属于预期的跨合并构造变更 — 在 sync PR 中解决正确。

---

6. 测试结果详情

ACP Bridge（7 files / 291 tests）

✓ src/bridge.test.ts             177 tests
✓ src/event-bus.test.ts           ...
✓ src/acp-channel.test.ts         ...
✓ ... (剩余 4 文件)

Test Files  7 passed (7)
Tests       291 passed (291)
Duration    3.86s

CLI Serve + ACP Integration（36 files / 946 tests）

涵盖:
  src/serve/             - HTTP server, session management, SSE streaming
  src/acp-integration/   - ACP agent, session rewriting, permissions, auth
  src/acp-integration/session/rewrite/  - TurnBuffer, config

Test Files  36 passed (36)
Tests       946 passed (946)
Duration    16.16s

零失败，零跳过（serv+acp 子集）。

---

7. 下游影响

以下 PR 需要 rebase 到新的 daemon_mode_b_main：

PR	作者	说明
#4380 feat/daemon-react-cli	@chiga0	library-only
#4353 feat/daemon-ui-completeness-followup	@chiga0	library-only

PR 作者评估两个 PR 都是 library-only，不触及此次冲突涉及的 MCP pool / worktree / approval 路径，rebase 风险低。

---

8. 合并建议

✅ 建议合并。

Sync 质量好 — 3 个冲突解决全部是简单的 import union，无语义重叠。Build / typecheck / test 全部通过。跨合并集成修复（worktree test mock）理由充分、改动正确。

---

9. 复现指引

# 进入 tmux 会话
tmux attach -t pr4469

# 验证环境
cd /tmp/pr4469-test

# 全量验证
npm run typecheck                         # typecheck 跨 5 包
cd packages/acp-bridge && npm run test:ci  # 291 tests
cd packages/cli && npx vitest run --no-coverage src/serve src/acp-integration  # 946 tests

---

报告由 Claude Opus 4.7 在本地 tmux 上完整验证，作为维护者 merge 决策参考。