pi-ui-extension 1.1.9 → 1.1.11

package/README.md

@@ -48,7 +48,18 @@ The bottom of the `SESSIONS` panel exposes four resource categories:
 - `Extensions`
 - `MCP`
 
-These shortcuts let you inspect the resources currently loaded by the project/Pi environment, making it easier to verify which agent instructions, skills, extensions, and MCP servers are actually available.
+These shortcuts let you inspect the resources discovered by the project/Pi environment. The MCP view distinguishes configured and registered servers from confirmed connections.
+
+#### MCP Status Center
+
+Click **MCP** in the sidebar to open a read-only status picker covering global and trusted-project MCP configuration, servers registered by extensions via `pi.registerMcpServer()`, and observations from `pi-mcp-adapter/status/v1`.
+
+- See configuration scope, project overrides, and enabled/disabled state (including native Pi `enabled: false`).
+- Connection health is only shown when an adapter explicitly reports it. **Configured, registered, and loaded do not mean connected.**
+- Commands, endpoints, headers, tokens, environment values, and raw errors are never displayed.
+- Tool usage now attributes native Pi `mcp__server__tool` calls to their MCP server, alongside existing gateway and `mcpScript` counts.
+
+Pi does not currently expose its complete native MCP connection state to ordinary UI extensions. For live connection diagnostics, reconnects, authentication, or configuration changes, use the active `/mcp` manager (built-in or provided by your MCP adapter).
 
 ### 4. CTX context inspection
 
@@ -89,7 +100,22 @@ For tool definitions, the extension prefers the observable provider-request tool
 
 Modes can be changed directly with mouse clicks.
 
-When Fabric takes ownership of tool rendering, the panel remains visible for usage statistics but the local mode selector is hidden and replaced with `View controlled by Fabric`. This avoids conflicting display control.
+Tool View uses Pi's official `pi.registerToolRenderer()` hook for the built-in tools (`read`, `bash`, `edit`, `write`, `grep`, `find`, and `ls`) **and the built-in `codemode` tool**. It never replaces tool definitions or execution functions. Other tools retain their own renderers.
+
+For **Codemode** specifically:
+
+- **Normal** retains Pi's native script, nested-call, and output rendering (including its own expand/collapse behavior).
+- **Compact** uses a two-line, status-colored summary with Chinese labels: a highlighted Codemode title and script line count, followed by grouped execution status, nested-call counts, output size, and duration. It omits script source, nested-call arguments, and actual output, even if the row is expanded or execution fails. On narrow terminals it keeps each part to one row and prioritizes status and failures over less important metrics.
+- **Hidden** removes the Codemode transcript row, including expanded and failed results, without stopping execution or removing Tool/MCP usage accounting.
+
+Example Compact output:
+
+```text
+▸ codemode  8 行代码
+✓ 已完成  │  1 次调用 · 1 成功  │  59 行输出 · 85ms
+```
+
+Changing the Tool View mode also updates previously rendered tool rows in the current session. Other third-party tools are unaffected.
 
 ### 6. Tool / MCP usage statistics
 
@@ -154,7 +180,7 @@ Example configuration:
 To pin a specific version:
 
 ```bash
-pi install npm:pi-ui-extension@1.1.1
+pi install npm:pi-ui-extension@1.1.11
 ```
 
 or:
@@ -162,7 +188,7 @@ or:
 ```json
 {
   "packages": [
-    "npm:pi-ui-extension@1.1.1"
+    "npm:pi-ui-extension@1.1.11"
   ]
 }
 ```
@@ -190,15 +216,15 @@ Configuration form:
 Pin to a Git tag:
 
 ```bash
-pi install git:github.com/1993yihuan/pi-ui-extension@v1.1.1
+pi install git:github.com/1993yihuan/pi-ui-extension@v1.1.11
 ```
 
-### Temporary usage
+### Temporary local-source testing
 
-To load the package for a single Pi launch without modifying `settings.json`:
+To try a local checkout without changing `settings.json`, run from the repository root. Disable automatic extension discovery to avoid loading a previously installed copy of `pi-ui-extension` twice:
 
 ```bash
-pi -e npm:pi-ui-extension
+pi --no-extensions -e builtin:mcp -e ./extensions/index.ts --tui-mode fullscreen
 ```
 
 ### Project-local installation
@@ -289,7 +315,7 @@ npm run typecheck
 npm test
 ```
 
-The test suite covers the main behavior of Sidebar, CTX, Session management, Tool View, MCP resources, Fabric detection, mouse scrolling, and resize handling.
+The test suite covers Sidebar, CTX, Session management, official Tool View renderers, MCP resources, mouse scrolling, and resize handling.
 
 During development, Pi can load the local source directory directly:
 
@@ -314,7 +340,6 @@ pi-ui-extension/
 │   ├── session/             # Session list and actions
 │   ├── sidebar/             # Sidebar layout, scrolling, resize
 │   ├── tool-view/           # Tool View modes and usage statistics
-│   ├── fabric-detection.ts  # Fabric ownership detection
 │   └── index.ts             # Pi Extension entry point
 ├── .github/workflows/
 │   ├── ci.yml               # Automatic checks on push / PR
@@ -337,7 +362,7 @@ Pi's extension entry point is declared explicitly in `package.json`:
 
 ## CI / Release
 
-Every push to `main` and every pull request runs:
+Every push to `main` and every pull request runs on **both Node.js 22.19.0 and 24**:
 
 ```text
 npm ci
@@ -357,6 +382,7 @@ A `v*` tag triggers the release workflow:
 
 ```text
 Checkout
+→ validate release tag format and main ancestry
 → Node.js 24
 → npm ci
 → npm run check
@@ -364,6 +390,7 @@ Checkout
 → npm pack --dry-run
 → npm Trusted Publishing (OIDC)
 → npm publish
+→ verify npm Registry visibility (with retries)
 → GitHub Release
 ```
 
@@ -373,16 +400,16 @@ npm publishing uses GitHub Actions OIDC Trusted Publishing, so no long-lived `NP
 
 - Does not modify Pi Core.
 - `@earendil-works/pi-coding-agent` and `@earendil-works/pi-tui` are host-provided peer dependencies to avoid duplicate runtime instances.
-- Fabric ownership is detected explicitly to avoid conflicting Tool View controls.
+- Tool View changes only how built-in tool calls are rendered, using Pi's public renderer resolver rather than overriding their implementations.
 - Session and resource operations use Pi public APIs wherever possible.
 - Context composition is clearly presented as an estimate, not provider-exact token accounting.
 - Fullscreen sidebar behavior degrades safely when fullscreen layout is unavailable.
 
 ## Requirements
 
-- Pi Coding Agent
+- Pi Coding Agent with the official `registerToolRenderer()` API (tested with `@earendil-works/pi-coding-agent@1.1.0`)
 - Node.js `>= 22.19.0` (use a Node version supported by your Pi installation)
-- Development and CI currently use Node.js 24
+- CI validates Node.js 22.19.0 and 24; releases use Node.js 24
 
 ## License
 

package/README.zh-CN.md

@@ -48,7 +48,18 @@ Sidebar 支持鼠标交互、滚轮滚动和终端尺寸变化。终端高度不
 - `Extensions`
 - `MCP`
 
-点击后可以直接查看当前项目 / 当前 Pi 环境中已加载的相关资源，便于快速确认 Agent 当前实际使用了哪些上下文、Skill、Extension 和 MCP Server。
+点击后可以查看当前项目 / Pi 环境发现的相关资源。其中 MCP 状态中心会区分“已配置 / 已注册”和“已确认连接”，避免把配置存在误认为连接成功。
+
+#### MCP 状态中心
+
+点击 Sidebar 中的 **MCP** 按钮可打开只读状态中心，查看全局和可信项目配置的 MCP Server、扩展通过 `pi.registerMcpServer()` 注册的服务器，以及 `pi-mcp-adapter/status/v1` 提供的运行时观察结果。
+
+- 显示服务器来源、启用/禁用状态与配置覆盖情况；项目级 `enabled: false` 会正确覆盖全局配置。
+- 仅当 Adapter 明确报告连接状态时显示 Connected、Connecting、Failed 等状态；**已配置、已注册或已加载不代表已连接**。
+- 不展示命令、URL、环境变量、请求头、Token 或原始错误内容。
+- 工具调用统计支持 Pi 原生 `mcp__server__tool` 格式，继续兼容既有 MCP Gateway / `mcpScript` 统计。
+
+Pi 目前没有向普通 UI 扩展公开完整的原生 MCP 实时连接状态。查看连接错误、重新连接、登录或启停服务器，请使用当前生效的 `/mcp` 管理界面（Pi 内置或由第三方 MCP Adapter 提供）；本状态中心不执行连接或配置修改。
 
 ### 4. CTX 上下文观察
 
@@ -89,7 +100,22 @@ Composition 会将当前可观测上下文拆分为：
 
 可以直接使用鼠标点击模式进行切换。
 
-当 Fabric 接管工具展示行为时，扩展会保留 Tool View 面板和调用统计，但不再显示本地模式选择器，并提示 `View controlled by Fabric`，避免与 Fabric 的展示逻辑互相抢占。
+Tool View 使用 Pi 官方的 `pi.registerToolRenderer()` 接口管理内置工具（`read`、`bash`、`edit`、`write`、`grep`、`find` 和 `ls`）**以及内置 `codemode` 工具**的展示，不再重注册工具定义或接管工具执行逻辑。其他 Tool 保留其自身的渲染方式。
+
+对于 **Codemode**：
+
+- **Normal**：保留 Pi 原生的脚本、子工具调用、输出详情，以及原生展开 / 收起行为。
+- **Compact**：采用带有状态颜色的双行摘要。第一行突出 Codemode 和代码行数；第二行将状态、子调用统计、输出规模与耗时分组展示，并统一使用中文单位。即使展开或执行失败，也不会展示完整代码、子调用参数或真实输出；终端宽度不足时优先保留状态、失败信息和调用次数，避免摘要自动换成多行。
+- **Hidden**：隐藏 Codemode 工具记录（包括展开和失败结果），但不影响实际执行或 Tool / MCP 调用统计。
+
+Compact 效果示例：
+
+```text
+▸ codemode  8 行代码
+✓ 已完成  │  1 次调用 · 1 成功  │  59 行输出 · 85ms
+```
+
+切换 Tool View 模式也会更新当前会话中已经展示的历史工具记录；其他第三方工具保持原有渲染方式。
 
 ### 6. Tool / MCP 调用统计
 
@@ -154,7 +180,7 @@ Pi 会安装 package，并将声明写入个人配置：
 如果希望固定版本：
 
 ```bash
-pi install npm:pi-ui-extension@1.1.1
+pi install npm:pi-ui-extension@1.1.11
 ```
 
 或者：
@@ -162,7 +188,7 @@ pi install npm:pi-ui-extension@1.1.1
 ```json
 {
   "packages": [
-    "npm:pi-ui-extension@1.1.1"
+    "npm:pi-ui-extension@1.1.11"
   ]
 }
 ```
@@ -190,15 +216,15 @@ pi install git:github.com/1993yihuan/pi-ui-extension
 固定到 Git tag：
 
 ```bash
-pi install git:github.com/1993yihuan/pi-ui-extension@v1.1.1
+pi install git:github.com/1993yihuan/pi-ui-extension@v1.1.11
 ```
 
-### 临时试用
+### 临时加载本地源码
 
-如果只想在一次 Pi 启动中测试，不修改 `settings.json`：
+如果只想在一次 Pi 启动中测试本地源码，不修改 `settings.json`，请在仓库根目录运行。禁用自动扩展发现可以避免与已经安装的 `pi-ui-extension` 重复加载：
 
 ```bash
-pi -e npm:pi-ui-extension
+pi --no-extensions -e builtin:mcp -e ./extensions/index.ts --tui-mode fullscreen
 ```
 
 ### 项目级安装
@@ -289,7 +315,7 @@ npm run typecheck
 npm test
 ```
 
-当前自动化测试覆盖 Sidebar、CTX、Session、Tool View、MCP resource、Fabric detection、鼠标滚轮 / resize 等主要行为。
+当前自动化测试覆盖 Sidebar、CTX、Session、官方 Tool Renderer、MCP resource、鼠标滚轮 / resize 等主要行为。
 
 开发时可以直接让 Pi 加载本地目录：
 
@@ -314,7 +340,6 @@ pi-ui-extension/
 │   ├── session/             # Session 列表与操作
 │   ├── sidebar/             # Sidebar 布局、滚动和 resize
 │   ├── tool-view/           # Tool View 模式与调用统计
-│   ├── fabric-detection.ts  # Fabric 工具接管检测
 │   └── index.ts             # Pi Extension 入口
 ├── .github/workflows/
 │   ├── ci.yml               # push / PR 自动检查
@@ -337,7 +362,7 @@ Pi 的扩展入口在 `package.json` 中显式声明：
 
 ## CI / Release
 
-提交到 `main` 或创建 PR 时，GitHub Actions 会自动执行：
+提交到 `main` 或创建 PR 时，GitHub Actions 会分别在 **Node.js 22.19.0 和 24** 上执行：
 
 ```text
 npm ci
@@ -357,6 +382,7 @@ git push --tags
 
 ```text
 Checkout
+→ 校验版本标签格式、确认提交位于 main 历史
 → Node.js 24
 → npm ci
 → npm run check
@@ -364,6 +390,7 @@ Checkout
 → npm pack --dry-run
 → npm Trusted Publishing (OIDC)
 → npm publish
+→ 重试检查 npm Registry 已可查询新版本
 → GitHub Release
 ```
 
@@ -373,16 +400,16 @@ npm 发布使用 GitHub Actions OIDC Trusted Publishing，不需要在 GitHub Re
 
 - 不修改 Pi Core。
 - Pi host 提供的 `@earendil-works/pi-coding-agent` 和 `@earendil-works/pi-tui` 使用 `peerDependencies`，避免产生重复运行时实例。
-- 对 Fabric 做显式检测，避免 Tool View 模式控制发生冲突。
+- Tool View 只通过 Pi 官方 Renderer Resolver 控制内置工具的显示，不覆写工具定义或执行逻辑。
 - Session 与资源操作尽量通过 Pi 已公开 API 完成。
 - Context composition 明确标记为估算值，不冒充 provider 精确 token 统计。
 - fullscreen Sidebar 不可用时安全降级，不影响 Pi 主流程。
 
 ## Requirements
 
-- Pi Coding Agent
+- 支持官方 `registerToolRenderer()` API 的 Pi Coding Agent（已使用 `@earendil-works/pi-coding-agent@1.1.0` 验证）
 - Node.js `>= 22.19.0`（建议使用当前 Pi 支持的 Node 版本）
-- 开发与 CI 当前使用 Node.js 24
+- CI 覆盖 Node.js 22.19.0 和 24；发布工作流使用 Node.js 24
 
 ## License
 

package/extensions/ctx/README.md

@@ -6,11 +6,11 @@
 
 - approx = 本地可观测文本 UTF-16 长度 / 4，逐消息向上取整；不是模型 tokenizer。已知消息先经公开 SDK `convertToLlm` 转换，再提取文本，因此包含摘要包装、bash 无输出/退出/取消/截断提示；仍按原始角色分类。未知角色安全降级为外层 content 文本，`excludeFromContext` 的 bash 不计入。
 - 六类为 System、Tools、Messages、Tool Results、Summary、Other。百分比分母是已覆盖分类的估算 token 合计，不是模型窗口；pi usage 单独展示，不校准分类。
-- System 使用 ctx.getSystemPrompt() 的可观测字符串；无法取得时 unknown。Tools 通过 pi.getActiveTools()/getAllTools() 仅选取当前启用的工具，逐工具序列化 `{name, description, parameters}`，按 UTF-16 长度 / 4 向上取整后合计，并纳入分类百分比分母。不计 sourceInfo、执行函数及已归入 System 的 promptGuidelines；Fabric 捕获但未直接启用的工具不重复计入。无启用工具为 0；API 不可用、启用工具缺少定义或 schema 无法序列化时保持 unknown，避免显示不完整合计。工具定义在每次现有快照事件刷新时重新读取（包括动态启用/禁用），不在 render 中读取；空闲时注册工具将在下一次快照事件反映。
+- System 使用 ctx.getSystemPrompt() 的可观测字符串；无法取得时 unknown。Tools 通过 pi.getActiveTools()/getAllTools() 仅选取当前启用的工具，逐工具序列化 `{name, description, parameters}`，按 UTF-16 长度 / 4 向上取整后合计，并纳入分类百分比分母。不计 sourceInfo、执行函数及已归入 System 的 promptGuidelines；未直接启用的工具不重复计入。无启用工具为 0；API 不可用、启用工具缺少定义或 schema 无法序列化时保持 unknown，避免显示不完整合计。工具定义在每次现有快照事件刷新时重新读取（包括动态启用/禁用），不在 render 中读取；空闲时注册工具将在下一次快照事件反映。
 - Tools 在 `before_provider_request` 事件后优先统计 provider-specific payload 的 `tools` 字段序列化文本（仍按 UTF-16 长度 / 4 估算）；请求发出前未观察到 payload 时，回退到当前启用工具 schema 的本地估算。它仍不是模型 tokenizer、HTTP 字节数或计费 token，也不包含 headers；如果后续扩展继续改写 payload，面板值可能是本扩展处理时观察到的版本。Images 仅统计图片块数量，不序列化请求或计算未展示的字节数；在 `before_provider_request` 可取得最终 provider payload 时优先统计该 payload，否则统计当前 context 消息；未能观测时显示 `not observed`。
 - context 事件提供调用前的消息快照；session_start/tree/compact、turn_end、agent_settled 使用 buildContextEntries() 重建 compaction-applied active branch。后者显示 active branch，前者显示 context hook。事件之外只读取缓存，不在 render 中扫描历史。
 - Messages 包括 user/assistant 文本、thinking 和 tool call 名称/参数；Tool Results 仅计 content；Summary 包括 compaction/branch summary；Other 包括可发送 custom message 和非排除的用户 bash。
-- Tool Results 按当前快照工具结果文本估算。Fabric 外层 content 只计一次，不遍历内部操作；不读 details、全量 JSONL、沙箱、截断前原始输出或被压缩结果。已返回 content 内的截断提示本身仍属于可发送文本。
+- Tool Results 按当前快照工具结果文本估算。每条 Tool Result 的 content 只计一次，不遍历内部操作；不读 details、全量 JSONL、沙箱、截断前原始输出或被压缩结果。已返回 content 内的截断提示本身仍属于可发送文本。
 
 Composition 的 token 估算使用 `~` 前缀及 K/M 紧凑缩写（四舍五入），百分比保留一位小数。宽度不足时标签与数值拆行；支持的最小侧栏宽 18 可完整显示如 `~100K 100.0%`。
 
@@ -32,4 +32,4 @@ Composition 的 token 估算使用 `~` 前缀及 K/M 紧凑缩写（四舍五入
 
 这是明确标记的本地估算，不宣称最终请求精确统计。后加载扩展仍可能改写 context 或 provider payload；不同 provider 的转换、剔除、包装开销未知。恢复/回合结束时 active branch 可能不同于上次请求经过 context 扩展裁剪后的快照；下一次 context 事件会替换它。模型生成过程中不逐 token 更新分类，最终回合/settled 时更新。只含图片的消息可见文本为零，不代表图片成本为零。
 
-未修改 pi core、Fabric 或全局配置。全屏鼠标/极短终端还应在用户真实终端手工确认。
+未修改 Pi Core 或全局配置。全屏鼠标/极短终端还应在用户真实终端手工确认。

package/extensions/ctx/data.test.ts

@@ -3,8 +3,8 @@ import test from "node:test";
 import { createReadTool, SessionManager } from "@earendil-works/pi-coding-agent";
 import { estimateContext, installContextEstimates, messagesFromContextEntries } from "./data.ts";
 
-const result = (n: number) => ({ role: "toolResult", toolName: "fabric_exec", toolCallId: String(n), content: [{ type: "text", text: "x".repeat(n * 4) }], details: { fullOutput: "x".repeat(100000), operations: [{ toolName: "read" }] } });
-const tool = { name: "fabric_exec", description: "Execute TypeScript", parameters: createReadTool(process.cwd()).parameters };
+const result = (n: number) => ({ role: "toolResult", toolName: "sample_runner", toolCallId: String(n), content: [{ type: "text", text: "x".repeat(n * 4) }], details: { fullOutput: "x".repeat(100000), operations: [{ toolName: "read" }] } });
+const tool = { name: "sample_runner", description: "Execute TypeScript", parameters: createReadTool(process.cwd()).parameters };
 
 test("context estimate keeps tool schemas, summaries, images and active branch semantics", () => {
   const snapshot = estimateContext([{role:"user",content:"abcd"}, result(4), {role:"compactionSummary",summary:"abcd"}], "abcd", "context hook", [tool]);
@@ -16,7 +16,7 @@ test("context estimate keeps tool schemas, summaries, images and active branch s
 
 test("tracker filters active tools, refreshes schemas, caches snapshots and resets", () => {
   const handlers = new Map<string, Function>();
-  let active = ["fabric_exec"];
+  let active = ["sample_runner"];
   let all = [tool];
   const tracker = installContextEstimates({
     on: (name: string, fn: Function) => handlers.set(name, fn),

package/extensions/ctx/tools.test.ts

@@ -3,7 +3,7 @@ import test from "node:test";
 import { createReadTool } from "@earendil-works/pi-coding-agent";
 import { estimateContext, estimateProviderToolsTokens, installContextEstimates } from "./data.ts";
 
-const tool = { name: "fabric_exec", description: "Execute TypeScript", parameters: createReadTool(process.cwd()).parameters };
+const tool = { name: "sample_runner", description: "Execute TypeScript", parameters: createReadTool(process.cwd()).parameters };
 const expected = Math.ceil(JSON.stringify(tool).length / 4);
 const toolsCategory = (snapshot: ReturnType<typeof estimateContext>) => snapshot.categories.find(c => c.name === "Tools")!;
 
@@ -25,7 +25,7 @@ test("Tools counts schema JSON only and contributes to totals and percentages",
 
 test("tracker filters active tools, refreshes dynamic schemas, caches reads and resets", () => {
  const handlers = new Map<string, Function>();
- let active = ["fabric_exec", "fabric_exec"];
+ let active = ["sample_runner", "sample_runner"];
  let all = [tool, {...tool,name:"captured_read",description:"not exposed".repeat(100)}];
  let reads = 0;
  let fail = false;
@@ -44,7 +44,7 @@ test("tracker filters active tools, refreshes dynamic schemas, caches reads and
  assert.ok(toolsCategory(tracker.getSnapshot()).tokens! > expected);
  handlers.get("before_provider_request")!({payload:{tools:[tool]}},ctx);
  assert.equal(toolsCategory(tracker.getSnapshot()).tokens, Math.ceil(JSON.stringify([tool]).length/4));
- all = [{...tool,description:"changed"}]; active = ["fabric_exec"];
+ all = [{...tool,description:"changed"}]; active = ["sample_runner"];
  handlers.get("turn_end")!({},ctx);
  // The last provider payload remains authoritative through active-branch refresh.
  assert.equal(toolsCategory(tracker.getSnapshot()).tokens, Math.ceil(JSON.stringify([tool]).length/4));

package/extensions/index.ts

@@ -12,8 +12,7 @@ import {
 import { installContextEstimates } from "./ctx/data.ts";
 import { createActivityTracker, type ActivityTracker } from "./ctx/activity.ts";
 import { installFooter, type FooterController } from "./footer/index.ts";
-import { isFabricFullCodeMode } from "./fabric-detection.ts";
-import { mcpResourceEntriesFromConfig, mcpResourceEntriesFromStatus, mergeMcpResourceEntries } from "./mcp/resources.ts";
+import { adapterMcpServers, buildMcpStatusSnapshot, describeMcpStatus, type McpStatusSnapshot } from "./mcp/status-center.ts";
 import {
   createDefaultSidebarPanels,
   SESSION_PANEL_ID,
@@ -103,6 +102,49 @@ function showResourceDialog(
   });
 }
 
+/** Read-only MCP status picker; only safe metadata is displayed. */
+export function showMcpStatusDialog(
+  ctx: { ui: { select(title: string, options: string[]): Promise<string | undefined>; editor(title: string, prefill?: string): Promise<string | undefined>; notify(message: string, level: "info" | "warning"): void } },
+  snapshot: McpStatusSnapshot,
+): void {
+  const rows = snapshot.servers.map((server) => ({
+    name: server.name,
+    description: describeMcpStatus(server),
+    details: [
+      `Server: ${server.name}`,
+      `Source: ${server.source}`,
+      `Enabled: ${server.enabled ? "yes" : "no"}`,
+      `Observed by adapter: ${server.loaded ? "yes" : "no"}`,
+      `Status: ${describeMcpStatus(server)}`,
+      "",
+      "Only an adapter's explicit connection state establishes connected/failed.",
+      "Pi native connection health is not exposed to UI extensions.",
+      "Use Pi's built-in /mcp manager for live connection details.",
+    ].join("\n"),
+  }));
+  const warnings = snapshot.warnings.map((warning) => ({
+    name: "⚠ Configuration warning",
+    description: warning,
+    details: `${warning}\nCheck your MCP configuration with Pi's built-in /mcp manager.`,
+  }));
+  const all = [...rows, ...warnings];
+  if (all.length === 0) {
+    ctx.ui.notify("No MCP servers found. Use /mcp to configure servers.", "info");
+    return;
+  }
+  const choices = resourceDialogOptions(all);
+  const enabledCount = snapshot.servers.filter((server) => server.enabled).length;
+  void ctx.ui.select(
+    `MCP Status · ${enabledCount} enabled / ${snapshot.servers.length} total · ↵ details`,
+    choices,
+  ).then((choice) => {
+    if (!choice) return;
+    const index = choices.indexOf(choice);
+    const item = all[index];
+    if (item) void ctx.ui.editor(`${item.name} · MCP (read-only)`, item.details).then(() => {});
+  });
+}
+
 /** Load Agents.md contexts, Skills, and Extensions as display rows. */
 export async function loadResourceEntries(
   pi: ExtensionAPI,
@@ -185,9 +227,11 @@ async function clearOtherSessions(
 export default async function piUiExtension(pi: ExtensionAPI): Promise<void> {
   const toolView = await installToolViewController(pi);
   let mcpResources: readonly ResourceEntry[] = [];
-  let liveMcpResources: readonly ResourceEntry[] = [];
-  const currentMcpResources = (cwd: string, trusted: boolean): readonly ResourceEntry[] =>
-    mergeMcpResourceEntries(mcpResourceEntriesFromConfig(getAgentDir(), cwd, trusted), liveMcpResources);
+  let liveMcpServers: NonNullable<ReturnType<typeof adapterMcpServers>> = [];
+  let registeredServers: unknown = [];
+  let mcpCwd = process.cwd();
+  let mcpTrusted = false;
+  let mcpStatus: McpStatusSnapshot = { servers: [], warnings: [] };
   let toolViewMode: ToolViewMode | undefined;
   let footer: FooterController | undefined;
   let sidebar: SidebarController | undefined;
@@ -221,12 +265,24 @@ export default async function piUiExtension(pi: ExtensionAPI): Promise<void> {
   };
   let switchRequested = false;
   const getMcpServerNames = () => mcpResources.map((server) => server.name);
-  const unsubscribeMcpStatus = pi.events.on("pi-mcp-adapter/status/v1", (value) => {
-    liveMcpResources = mcpResourceEntriesFromStatus(value);
-    mcpResources = mergeMcpResourceEntries(mcpResources, liveMcpResources);
+  const updateMcpStatus = (): void => {
+    mcpStatus = buildMcpStatusSnapshot(getAgentDir(), mcpCwd, mcpTrusted, registeredServers, liveMcpServers);
+    mcpResources = mcpStatus.servers
+      .filter((server) => server.enabled)
+      .map((server) => ({ name: server.name, description: describeMcpStatus(server) }));
     const branch = getCurrentBranch?.();
     if (branch) toolUsage?.resetSession(branch, getMcpServerNames(), { preserveExchange: true });
     sidebar?.refresh();
+  };
+  const unsubscribeMcpStatus = pi.events.on("pi-mcp-adapter/status/v1", (value) => {
+    const observation = adapterMcpServers(value);
+    if (!observation) return;
+    liveMcpServers = observation;
+    updateMcpStatus();
+  });
+  pi.on("mcp_servers_change", (event) => {
+    registeredServers = event.servers;
+    updateMcpStatus();
   });
 
   pi.registerCommand(SESSION_RENAME_COMMAND, {
@@ -456,7 +512,10 @@ export default async function piUiExtension(pi: ExtensionAPI): Promise<void> {
     // Pi resets extension UI before starting/reloading a session. Do not call
     // stale controllers from the previous runtime after that reset.
     clearControllers();
-    mcpResources = currentMcpResources(ctx.cwd, ctx.isProjectTrusted());
+    mcpCwd = ctx.cwd;
+    mcpTrusted = ctx.isProjectTrusted();
+    registeredServers = typeof pi.getMcpServers === "function" ? pi.getMcpServers() : [];
+    updateMcpStatus();
     toolViewMode = toolView.getMode();
     getCurrentBranch = () => ctx.sessionManager.getBranch();
     const branch = ctx.sessionManager.getBranch();
@@ -464,7 +523,6 @@ export default async function piUiExtension(pi: ExtensionAPI): Promise<void> {
     toolUsage = createToolUsageTracker([], getMcpServerNames);
     toolUsage.resetSession(branch);
     if (ctx.mode !== "tui") return;
-    const showToolViewModeSelector = (): boolean => !isFabricFullCodeMode(pi.getActiveTools());
 
     activity = createActivityTracker(ctx.cwd, refreshContextUi);
     footer = installFooter(
@@ -483,7 +541,6 @@ export default async function piUiExtension(pi: ExtensionAPI): Promise<void> {
           onSelectToolViewMode: (mode): void => {
             void toolView.setMode(mode, ctx);
           },
-          showToolViewModeSelector,
           loadSessions: async (): Promise<readonly SessionListItem[]> => {
             const currentSessionId = ctx.sessionManager.getSessionId();
             const sessions = await SessionManager.list(ctx.cwd, ctx.sessionManager.getSessionDir());
@@ -534,7 +591,12 @@ export default async function piUiExtension(pi: ExtensionAPI): Promise<void> {
               ctx.ui.notify("Wait for the current run to finish before opening resources", "warning");
               return;
             }
-            void loadResourceEntries(pi, ctx.cwd, button === "mcp" ? currentMcpResources(ctx.cwd, ctx.isProjectTrusted()) : mcpResources, ctx.isProjectTrusted(), button)
+            if (button === "mcp") {
+              updateMcpStatus();
+              showMcpStatusDialog(ctx, mcpStatus);
+              return;
+            }
+            void loadResourceEntries(pi, ctx.cwd, mcpResources, ctx.isProjectTrusted(), button)
               .then((rows) => {
                 if (!rows || rows.length === 0) {
                   ctx.ui.notify("No resources of this kind loaded", "info");
@@ -568,6 +630,7 @@ export default async function piUiExtension(pi: ExtensionAPI): Promise<void> {
   pi.on("session_shutdown", () => {
     unsubscribeToolViewMode();
     unsubscribeMcpStatus();
+    liveMcpServers = [];
 
     // The sidebar replaces the fullscreen TUI layout root directly, so Pi
     // cannot tear it down on our behalf during session replacement. Dispose

package/extensions/mcp/integration.test.ts

@@ -11,6 +11,7 @@ test("entry wires early/late MCP status into restored and live usage without dou
   const handlers = new Map<string, any[]>(), bus = new Map<string, any>();
   const listeners = new Set<any>();
   let branch: any[] = [], footer: any;
+  let registrations: any[] = [{ name: "native_mcp", config: { command: "not-executed" }, extensionPath: "/extension.ts" }];
   const tui: any = {
     [Symbol.for("@earendil-works/pi-tui/viewport")]: true,
     terminal: { columns: 240, rows: 100 }, layoutRoot: { render: () => [], invalidate() {} }, inputListeners: listeners,
@@ -19,8 +20,9 @@ test("entry wires early/late MCP status into restored and live usage without dou
   };
   const theme: any = { fg: (_: string, text: string) => text, bold: (text: string) => text };
   const pi: any = {
-    registerTool() {}, registerCommand() {}, registerShortcut() {},
+    registerTool() { throw new Error("Tool View must not register tools"); }, registerToolRenderer() {}, registerCommand() {}, registerShortcut() {},
     getCommands: () => [], getActiveTools: () => [], getAllTools: () => [], getThinkingLevel: () => "off",
+    getMcpServers: () => registrations,
     on(name: string, fn: any) { handlers.set(name, [...(handlers.get(name) ?? []), fn]); },
     events: { on(name: string, fn: any) { bus.set(name, fn); return () => bus.delete(name); } },
   };
@@ -41,6 +43,12 @@ test("entry wires early/late MCP status into restored and live usage without dou
     await emit("session_start");
     assert.match(output(), /early\s+0\/1/);
     await emit("before_agent_start", { systemPromptOptions: {} });
+    branch.push({ type: "message", message: { role: "toolResult", toolName: "mcp__native_mcp__ping", details: {} } });
+    await emit("tool_execution_end", { toolCallId: "native-1", toolName: "mcp__native_mcp__ping", isError: false, result: { details: {} } });
+    assert.match(output(), /native_mcp\s+1\/1/);
+    registrations = [];
+    await emit("mcp_servers_change", { servers: [] });
+    assert.doesNotMatch(output(), /native_mcp\s+1\/1/);
     branch.push(saved("late"));
     await emit("tool_execution_end", { toolCallId: "call-1", toolName: "mcpScript", isError: false, result: { details: details("late") } });
     assert.doesNotMatch(output(), /late\s+1\/1/);

package/extensions/mcp/resources.ts

@@ -1,5 +1,4 @@
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
+import { adapterMcpServers, configuredMcpServers } from "./status-center.ts";
 
 export type McpResourceEntry = {
   readonly name: string;
@@ -7,26 +6,9 @@ export type McpResourceEntry = {
 };
 
 export function mcpResourceEntriesFromConfig(agentDir: string, cwd: string, trusted: boolean): readonly McpResourceEntry[] {
-  const paths = [join(agentDir, "mcp.json")];
-  if (trusted) paths.push(join(cwd, ".pi", "mcp.json"));
-  const rows = new Map<string, McpResourceEntry>();
-  for (const path of paths) {
-    try {
-      const config: unknown = JSON.parse(readFileSync(path, "utf8"));
-      if (!config || typeof config !== "object" || Array.isArray(config)) continue;
-      const servers = (config as { mcpServers?: unknown }).mcpServers;
-      if (!servers || typeof servers !== "object" || Array.isArray(servers)) continue;
-      for (const [name, value] of Object.entries(servers)) {
-        if (!name.trim() || !value || typeof value !== "object" || Array.isArray(value)) continue;
-        if ((value as { disabled?: unknown }).disabled === true) {
-          rows.delete(name);
-          continue;
-        }
-        rows.set(name, { name, description: "Configured MCP server (connection not verified)" });
-      }
-    } catch { /* Missing or invalid configuration is not fatal. */ }
-  }
-  return [...rows.values()];
+  return configuredMcpServers(agentDir, cwd, trusted).servers
+    .filter((server) => server.enabled)
+    .map(({ name }) => ({ name, description: "Configured MCP server (connection not verified)" }));
 }
 
 export function mergeMcpResourceEntries(configured: readonly McpResourceEntry[], live: readonly McpResourceEntry[]): readonly McpResourceEntry[] {
@@ -35,29 +17,9 @@ export function mergeMcpResourceEntries(configured: readonly McpResourceEntry[],
   return [...rows.values()];
 }
 
-type McpStatusServer = {
-  readonly name?: unknown;
-  readonly disabled?: unknown;
-};
-
 /** Convert the adapter's read-only status snapshot into configured, enabled MCP rows. */
 export function mcpResourceEntriesFromStatus(value: unknown): readonly McpResourceEntry[] {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) return [];
-  const snapshot = value as { version?: unknown; servers?: unknown };
-  if (snapshot.version !== 1 || !Array.isArray(snapshot.servers)) return [];
-
-  const seen = new Set<string>();
-  const rows: McpResourceEntry[] = [];
-  for (const rawServer of snapshot.servers) {
-    if (typeof rawServer !== "object" || rawServer === null || Array.isArray(rawServer)) continue;
-    const server = rawServer as McpStatusServer;
-    const name = typeof server.name === "string" ? server.name.trim() : "";
-    if (!name || server.disabled === true || seen.has(name)) continue;
-    seen.add(name);
-    rows.push({
-      name,
-      description: "MCP server loaded in the current Pi session",
-    });
-  }
-  return rows;
+  return (adapterMcpServers(value) ?? [])
+    .filter((server) => server.enabled)
+    .map(({ name }) => ({ name, description: "MCP server loaded in the current Pi session" }));
 }