Rebase the code in 0521

AGENTS-CN.md

@@ -22,6 +22,7 @@ BitFun 是一个由 Rust workspace 与共享 React 前端组成的项目。
 | 产品领域 crate | `src/crates/product-domains` | [AGENTS.md](src/crates/product-domains/AGENTS.md) |
 | Transport 适配层 | `src/crates/transport` | （使用 core 指南） |
 | API layer | `src/crates/api-layer` | （使用 core 指南） |
+| ACP 集成 | `src/crates/acp` | [AGENTS.md](src/crates/acp/AGENTS.md) |
 | AI adapters | `src/crates/ai-adapters` | [AGENTS.md](src/crates/ai-adapters/AGENTS.md) |
 | 桌面应用 | `src/apps/desktop` | [AGENTS.md](src/apps/desktop/AGENTS.md) |
 | Server | `src/apps/server` | （使用 core 指南） |
@@ -114,14 +115,13 @@ await api.invoke('your_command', { request: { ... } });
 任何 `bitfun-core` 拆解、feature 边界、依赖边界或 Rust 构建提速重构，
 都必须先阅读
 [`docs/architecture/core-decomposition.md`](docs/architecture/core-decomposition.md)。
-该文档定义产品行为不变量、crate 归属目标、禁止依赖方向、feature 安全规则和里程碑验证门禁。
+顶层文档只作为入口；模块级 ownership 细节应放到离代码最近的模块 `AGENTS.md`。
 
-### Tool 归属护栏
+仓库级拆解规则：
 
-- `src/crates/agent-tools` 拥有轻量 tool contract，以及 generic registry / dynamic-provider container。
-- `src/crates/core/src/agentic/tools` 当前负责产品工具组装、`dyn Tool` 适配、snapshot decoration、tool exposure / manifest resolution，以及按需工具说明发现（`GetToolSpec`）。
-- `ToolUseContext` 与具体工具实现继续留在 core，直到有已评审的 port/provider 设计和等价测试。
-- Tool 迁移必须保持 expanded/collapsed exposure、prompt 可见 manifest、`ToolUseContext.unlocked_collapsed_tools`，以及 desktop/MCP/ACP tool catalog 行为等价。
+- 不要把 DTO / contract 抽取误判为 runtime owner 已迁移。
+- 产品表面可以有差异；共享稳定 facts 或 ports，不共享 UI、protocol、lifecycle 或平台实现。
+- 迁移 runtime owner 必须有评审过的 port/provider 设计、旧路径兼容、行为等价测试；如果可能改变行为边界，还需要先确认。
 
 ### DeepReview 护栏
 

AGENTS.md

@@ -18,10 +18,14 @@ Repository rule: **keep product logic platform-agnostic, then expose it through
 |---|---|---|
 | Core (product logic) | `src/crates/core` | [AGENTS.md](src/crates/core/AGENTS.md) |
 | Extracted core support | `src/crates/{core-types,agent-stream,runtime-ports,terminal,tool-runtime}` | (use core guide) |
-| Core owner crates | `src/crates/{services-core,services-integrations,agent-tools,tool-packs}` | (use core guide + decomposition guardrails) |
+| Service core owner crate | `src/crates/services-core` | [AGENTS.md](src/crates/services-core/AGENTS.md) |
+| Service integrations owner crate | `src/crates/services-integrations` | [AGENTS.md](src/crates/services-integrations/AGENTS.md) |
+| Agent tool contracts | `src/crates/agent-tools` | [AGENTS.md](src/crates/agent-tools/AGENTS.md) |
+| Tool pack provider plan | `src/crates/tool-packs` | [AGENTS.md](src/crates/tool-packs/AGENTS.md) |
 | Product domains | `src/crates/product-domains` | [AGENTS.md](src/crates/product-domains/AGENTS.md) |
 | Transport adapters | `src/crates/transport` | (use core guide) |
 | API layer | `src/crates/api-layer` | (use core guide) |
+| ACP integration | `src/crates/acp` | [AGENTS.md](src/crates/acp/AGENTS.md) |
 | AI adapters | `src/crates/ai-adapters` | [AGENTS.md](src/crates/ai-adapters/AGENTS.md) |
 | Desktop app | `src/apps/desktop` | [AGENTS.md](src/apps/desktop/AGENTS.md) |
 | Server | `src/apps/server` | (use core guide) |
@@ -114,59 +118,17 @@ await api.invoke('your_command', { request: { ... } });
 For any `bitfun-core` decomposition, feature-boundary, dependency-boundary, or
 Rust build-speed refactor, read
 [`docs/architecture/core-decomposition.md`](docs/architecture/core-decomposition.md)
-before editing. The guardrail document defines product-behavior invariants,
-crate ownership targets, forbidden dependency directions, feature safety rules,
-and milestone verification gates.
-
-### Tool ownership guardrails
-
-- `src/crates/agent-tools` owns lightweight tool contracts and the generic
-  registry / dynamic-provider container.
-- `src/crates/core/src/agentic/tools` owns product tool assembly, `dyn Tool`
-  adaptation, snapshot decoration, tool exposure / manifest resolution, and
-  on-demand tool spec discovery (`GetToolSpec`) for now.
-- Keep `ToolUseContext` and concrete tool implementations in core until a
-  reviewed port/provider design and equivalence tests exist.
-- Tool migrations must preserve expanded/collapsed exposure, prompt-visible
-  manifests, `ToolUseContext.unlocked_collapsed_tools`, and desktop/MCP/ACP
-  tool catalog behavior.
-
-### Latest-main runtime anchors
-
-- Agent registry migration must preserve mode-scoped subagent availability,
-  hidden/custom/review grouping, and desktop subagent API semantics.
-- DeepResearch report finalization currently relies on the core citation
-  renumber hook; do not move it without preserving `report.md`,
-  `citations.md`, `display_map.json`, and rejected-citation handling.
-- Workspace/search refactors must preserve remote workspace startup guards,
-  remote flashgrep fallback, and search preview/context mapping.
-- ACP timeout handling and Web operation-diff fallback are product-surface
-  behavior; share facts through contracts, not UI/protocol implementation.
-
-### Services/product owner closure
-
-- Remote-SSH path, session identity, mirror path, and unresolved-session layout
-  helpers belong in `bitfun-services-integrations`; core may inject
-  `PathManager` and hold SSH manager / remote FS / terminal assembly.
-- MiniApp storage shape belongs in `bitfun-product-domains`; core storage
-  keeps filesystem IO, worker runtime, `PathManager`, and port adapters until a
-  reviewed runtime migration exists.
-- Remote-connect port baselines live in `bitfun-runtime-ports` and
-  `bitfun-services-integrations`; tracker state and tracker event reduction
-  belong in `bitfun-services-integrations`. Remote command/response wire DTOs,
-  remote model catalog DTOs, poll-response assembly helpers, and model-catalog
-  poll delta policy also belong there. Pure remote image-context
-  fallback/preference, restore-target, cancel-decision, and remote file-transfer
-  size/chunk/name helpers also belong in `bitfun-services-integrations`, while
-  core still owns the adapter back to `ImageContextData`, dispatcher assembly,
-  session restore execution, file IO/path resolution, terminal pre-warm, and
-  product execution routing. Further remote runtime owner migration must
-  preserve the existing migration snapshots for command/response shape,
-  restore, active-turn polling, cancel decisions, image context
-  fallback/preference, tracker fanout, file transfer, and RemoteRelay/Bot queue
-  policy.
-  `AgentSubmissionPort` still rejects generic attachments until
-  image/multimodal equivalence tests and a runtime migration plan are reviewed.
+before editing. Keep this file as an entry point; put module-specific ownership
+details in the nearest module `AGENTS.md`.
+
+Repository-level decomposition rules:
+
+- Do not confuse DTO/contract extraction with runtime owner migration.
+- Product surfaces may diverge; share stable facts or ports, not UI, protocol,
+  lifecycle, or platform implementation.
+- Moving runtime ownership requires a reviewed port/provider design, old-path
+  compatibility, behavior equivalence tests, and explicit confirmation when a
+  behavior boundary could change.
 
 ### DeepReview guardrails