pi-ui-extension 1.1.4 → 1.1.6

package/README.md

@@ -6,6 +6,9 @@
 
 The package can be installed from npm or Git, and uses GitHub Actions for type checking, automated tests, and npm Trusted Publishing via OIDC.
 
+> [!IMPORTANT]
+> `pi-ui-extension` is designed for **Pi fullscreen mode**. Please run Pi in fullscreen mode when using this extension. In non-fullscreen mode, sidebar panels, layout sizing, and related UI behavior may be unavailable or displayed incorrectly.
+
 ## Preview
 
 <img width="1377" height="671" alt="pi-ui-extension preview" src="https://github.com/user-attachments/assets/ddea5dc9-8796-433a-abfc-c7ea2adec089" />
@@ -22,7 +25,7 @@ The extension mounts a right-side sidebar in Pi's fullscreen TUI. It contains th
 
 The sidebar supports mouse interaction, wheel scrolling, and terminal resize handling. Panels shrink or become scrollable when vertical space is limited.
 
-> The sidebar depends on Pi fullscreen TUI mode. In non-fullscreen mode, the extension degrades safely and does not force layout replacement.
+> The sidebar depends on **Pi fullscreen mode**. Non-fullscreen mode is not a supported display mode for this extension; sidebar panels, layout sizing, and related UI behavior may be unavailable or displayed incorrectly.
 
 ### 2. Session management
 

package/README.zh-CN.md

@@ -6,6 +6,9 @@
 
 当前包同时支持通过 npm 或 Git 安装，并使用 GitHub Actions 完成类型检查、自动化测试和 npm Trusted Publishing（OIDC）发布。
 
+> [!IMPORTANT]
+> `pi-ui-extension` **需要在 Pi 的 fullscreen 模式下使用**。请在 fullscreen 模式下运行 Pi；非 fullscreen 模式不属于本扩展的支持范围，Sidebar、面板尺寸计算及相关布局可能无法正常显示。
+
 ## 界面预览
 
 <img width="1377" height="671" alt="pi-ui-extension 界面预览" src="https://github.com/user-attachments/assets/ddea5dc9-8796-433a-abfc-c7ea2adec089" />
@@ -22,7 +25,7 @@
 
 Sidebar 支持鼠标交互、滚轮滚动和终端尺寸变化。终端高度不足时，各区域会根据可用空间自动收缩或出现滚动区域。
 
-> 右侧 Sidebar 依赖 Pi fullscreen TUI。非 fullscreen 场景下不会强行替换布局。
+> 右侧 Sidebar 依赖 **Pi fullscreen 模式**。非 fullscreen 模式不属于本扩展的支持范围，Sidebar、面板尺寸计算及相关布局可能无法正常显示。
 
 ### 2. Sessions 会话管理
 

package/extensions/index.ts

@@ -13,7 +13,7 @@ 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 { mcpResourceEntriesFromStatus } from "./mcp/resources.ts";
+import { mcpResourceEntriesFromConfig, mcpResourceEntriesFromStatus, mergeMcpResourceEntries } from "./mcp/resources.ts";
 import {
   createDefaultSidebarPanels,
   SESSION_PANEL_ID,
@@ -185,6 +185,9 @@ 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 toolViewMode: ToolViewMode | undefined;
   let footer: FooterController | undefined;
   let sidebar: SidebarController | undefined;
@@ -219,7 +222,8 @@ 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) => {
-    mcpResources = mcpResourceEntriesFromStatus(value);
+    liveMcpResources = mcpResourceEntriesFromStatus(value);
+    mcpResources = mergeMcpResourceEntries(mcpResources, liveMcpResources);
     const branch = getCurrentBranch?.();
     if (branch) toolUsage?.resetSession(branch, getMcpServerNames(), { preserveExchange: true });
     sidebar?.refresh();
@@ -452,6 +456,7 @@ 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());
     toolViewMode = toolView.getMode();
     getCurrentBranch = () => ctx.sessionManager.getBranch();
     const branch = ctx.sessionManager.getBranch();
@@ -529,7 +534,7 @@ 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, mcpResources, ctx.isProjectTrusted(), button)
+            void loadResourceEntries(pi, ctx.cwd, button === "mcp" ? currentMcpResources(ctx.cwd, ctx.isProjectTrusted()) : mcpResources, ctx.isProjectTrusted(), button)
               .then((rows) => {
                 if (!rows || rows.length === 0) {
                   ctx.ui.notify("No resources of this kind loaded", "info");

package/extensions/mcp/integration.test.ts

@@ -25,7 +25,7 @@ test("entry wires early/late MCP status into restored and live usage without dou
     events: { on(name: string, fn: any) { bus.set(name, fn); return () => bus.delete(name); } },
   };
   const ctx: any = {
-    mode: "tui", cwd: directory, getSystemPrompt: () => "", getContextUsage: () => undefined,
+    mode: "tui", cwd: directory, isProjectTrusted: () => true, getSystemPrompt: () => "", getContextUsage: () => undefined,
     sessionManager: { getBranch: () => branch, buildContextEntries: () => [], getSessionId: () => "test", getSessionDir: () => directory },
     ui: { setStatus() {}, setFooter(factory: any) { footer?.dispose(); footer = factory?.(tui, theme, { onBranchChange: () => () => {}, getGitBranch: () => null }); } },
   };

package/extensions/mcp/resources.test.ts

@@ -1,6 +1,29 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import { mcpResourceEntriesFromStatus } from "./resources.ts";
+import { mcpResourceEntriesFromConfig, mcpResourceEntriesFromStatus, mergeMcpResourceEntries } from "./resources.ts";
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+test("discovers global and trusted project MCP configs without exposing secrets", () => {
+  const root = mkdtempSync(join(tmpdir(), "mcp-resource-"));
+  const agent = join(root, "agent"), cwd = join(root, "project");
+  mkdirSync(agent); mkdirSync(join(cwd, ".pi"), { recursive: true });
+  try {
+    writeFileSync(join(agent, "mcp.json"), JSON.stringify({ mcpServers: {
+      context7: { url: "https://secret.invalid", headers: { Authorization: "secret" } },
+      disabled: { disabled: true },
+    } }));
+    writeFileSync(join(cwd, ".pi", "mcp.json"), JSON.stringify({ mcpServers: { "chrome-devtools": { command: "secret" } } }));
+    const untrusted = mcpResourceEntriesFromConfig(agent, cwd, false);
+    assert.deepEqual(untrusted.map(x => x.name), ["context7"]);
+    const trusted = mcpResourceEntriesFromConfig(agent, cwd, true);
+    assert.deepEqual(trusted.map(x => x.name), ["context7", "chrome-devtools"]);
+    assert.doesNotMatch(JSON.stringify(trusted), /secret/);
+    assert.deepEqual(mergeMcpResourceEntries(trusted, mcpResourceEntriesFromStatus({ version: 1, servers: [{ name: "context7" }] }))
+      .map(x => x.description), ["MCP server loaded in the current Pi session", "Configured MCP server (connection not verified)"]);
+  } finally { rmSync(root, { recursive: true, force: true }); }
+});
 
 test("builds MCP resource rows from the adapter status snapshot", () => {
   assert.deepEqual(

package/extensions/mcp/resources.ts

@@ -1,8 +1,40 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+
 export type McpResourceEntry = {
   readonly name: string;
   readonly description: string;
 };
 
+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()];
+}
+
+export function mergeMcpResourceEntries(configured: readonly McpResourceEntry[], live: readonly McpResourceEntry[]): readonly McpResourceEntry[] {
+  const rows = new Map(configured.map((entry) => [entry.name, entry]));
+  for (const entry of live) rows.set(entry.name, entry);
+  return [...rows.values()];
+}
+
 type McpStatusServer = {
   readonly name?: unknown;
   readonly disabled?: unknown;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ui-extension",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "type": "module",
   "description": "Pi terminal UI extension with session management, context inspection, Tool/MCP usage tracking, sidebar panels, and a compact footer",
   "keywords": [