decorated-pi 0.3.0 → 0.4.0

package/extensions/settings.ts

@@ -25,11 +25,17 @@ export interface ProviderCache {
   models: ProviderModelEntry[];
 }
 
+export interface McpServerEntry {
+  url: string;
+  enabled?: boolean;
+}
+
 export interface ModuleSettings {
   safety?: boolean;
   lsp?: boolean;
   "smart-at"?: boolean;
   patch?: boolean;
+  mcp?: boolean;
 }
 
 export interface DecoratedPiConfig {
@@ -37,6 +43,7 @@ export interface DecoratedPiConfig {
   compactModelKey?: string | null;
   providers?: Record<string, ProviderCache>;
   modules?: ModuleSettings;
+  mcpServers?: Record<string, McpServerEntry>;
 }
 
 export function loadConfig(): DecoratedPiConfig {
@@ -113,6 +120,7 @@ const DEFAULT_MODULES: Required<ModuleSettings> = {
   lsp: true,
   "smart-at": true,
   patch: true,
+  mcp: true,
 };
 
 export function isModuleEnabled(name: keyof ModuleSettings): boolean {

package/extensions/slash.ts

@@ -9,7 +9,8 @@
 import type { ExtensionAPI, ExtensionContext, Theme as PiTheme } from "@earendil-works/pi-coding-agent";
 import { ModelPickerComponent } from "./model-integration.js";
 import { getAllModuleSettings, setModuleEnabled, type ModuleSettings } from "./settings.js";
-import { Container, SettingsList, type TUI, type SettingsListTheme, type Component } from "@earendil-works/pi-tui";
+import { getMcpStatus } from "./mcp/index.js";
+import { Container, SettingsList, Spacer, Text, type TUI, type SettingsListTheme, type Component, getKeybindings } from "@earendil-works/pi-tui";
 
 // ─── Border component (matches native DynamicBorder) ────────────────────────
 
@@ -60,17 +61,19 @@ function setupDpModelCommand(pi: ExtensionAPI) {
 // ─── /dp-settings ──────────────────────────────────────────────────────────
 
 const MODULE_LABELS: Record<keyof ModuleSettings, string> = {
-  patch: "Patch Tool",
-  safety: "Safety Layer",
-  lsp: "LSP Tools",
-  "smart-at": "Smart @ Search",
+  patch: "patch",
+  safety: "Secret Redaction",
+  lsp: "LSP",
+  "smart-at": "@ overload",
+  mcp: "MCP",
 };
 
 const MODULE_DESCS: Record<keyof ModuleSettings, string> = {
   patch: "Replace edit/write with patch tool (old_str/new_str replacement + overwrite)",
-  safety: "Command guard, protected paths, read guard, secret redaction",
+  safety: "Redact secrets from read / bash output before they enter model context",
   lsp: "Language server diagnostics, hover, definition, references, symbols, rename",
   "smart-at": "Project-aware file search replacing default autocomplete",
+  mcp: "MCP client for context7 and exa (zero-config)",
 };
 
 class ModuleSettingsComponent extends Container {
@@ -119,7 +122,7 @@ function setupDpSettingsCommand(pi: ExtensionAPI) {
           (tui, theme, _kb, done) =>
             new ModuleSettingsComponent(tui, theme, () => done(undefined))
         );
-        ctx.ui.notify("Module settings updated. /reload to apply.", "info");
+        ctx.ui.notify("Module settings updated. /reload to apply.", "warning");
         return;
       }
       ctx.ui.notify("dp-settings requires interactive mode.", "warning");
@@ -127,6 +130,156 @@ function setupDpSettingsCommand(pi: ExtensionAPI) {
   });
 }
 
+// ─── /mcp ──────────────────────────────────────────────────────────────────
+
+class McpStatusComponent extends Container {
+  private textComponent: Text;
+  private tui: TUI;
+  private theme: PiTheme;
+  private done: () => void;
+  private timer: ReturnType<typeof setInterval> | null = null;
+
+  constructor(tui: TUI, theme: PiTheme, onDone: () => void) {
+    super();
+    this.tui = tui;
+    this.theme = theme;
+    this.done = onDone;
+
+    this.addChild(new DynamicBorder(theme));
+    this.addChild(new Spacer(1));
+
+    this.textComponent = new Text("", 1, 0);
+    this.addChild(this.textComponent);
+
+    this.addChild(new Spacer(1));
+    this.addChild(new Text(this.theme.fg("dim", "Press q to close."), 1, 0));
+    this.addChild(new Spacer(1));
+    this.addChild(new DynamicBorder(theme));
+
+    this.refresh();
+
+    this.timer = setInterval(() => {
+      this.refresh();
+      const allSettled = getMcpStatus().every((s) => s.state !== "connecting");
+      if (allSettled && this.timer) {
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+    }, 500);
+  }
+
+  private refresh() {
+    const servers = getMcpStatus();
+
+    if (servers.length === 0) {
+      this.textComponent.setText("No MCP servers configured.");
+      this.tui.requestRender();
+      return;
+    }
+
+    const connected = servers.filter((s) => s.state === "connected");
+    const connecting = servers.filter((s) => s.state === "connecting");
+    const failed = servers.filter((s) => s.state === "failed");
+
+    const lines: string[] = [
+      `MCP servers (${servers.length}):`,
+      "",
+    ];
+
+    for (const s of connected) {
+      lines.push(this.theme.fg("accent", `• ${s.name}`) + ` (${s.source})`);
+      lines.push(`  URL: ${s.url}`);
+      lines.push(`  Tools: ${s.toolCount}`);
+      for (const tool of s.tools) {
+        const desc = tool.description ? ` — ${tool.description.slice(0, 60)}` : "";
+        lines.push(`    - ${tool.name}${desc}`);
+      }
+      lines.push("");
+    }
+
+    for (const s of connecting) {
+      lines.push(this.theme.fg("accent", `• ${s.name}`) + ` (${s.source})`);
+      lines.push(`  URL: ${s.url}`);
+      lines.push(`  Status: ${this.theme.fg("warning", "connecting...")}`);
+      lines.push("");
+    }
+
+    for (const s of failed) {
+      lines.push(this.theme.fg("accent", `• ${s.name}`) + ` (${s.source})`);
+      lines.push(`  URL: ${s.url}`);
+      lines.push(`  Status: ${this.theme.fg("error", "failed")} — ${s.error ?? "unknown error"}`);
+      lines.push("");
+    }
+
+    this.textComponent.setText(lines.join("\n"));
+    this.tui.requestRender();
+  }
+
+  handleInput(data: string) {
+    const kb = getKeybindings();
+    if (
+      data === "q" ||
+      data === "\r" ||
+      data === "\n" ||
+      kb.matches(data, "tui.select.cancel")
+    ) {
+      if (this.timer) {
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+      this.done();
+    }
+  }
+
+  dispose() {
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+  }
+}
+
+function setupMcpCommand(pi: ExtensionAPI) {
+  pi.registerCommand("mcp", {
+    description: "Show active MCP servers and their tools",
+    handler: async (_args, ctx) => {
+      if (ctx.hasUI) {
+        await ctx.ui.custom<void>(
+          (tui, theme, _kb, done) => new McpStatusComponent(tui, theme, () => done(undefined))
+        );
+        return;
+      }
+
+      // Fallback for non-interactive (print / RPC) mode.
+      const servers = getMcpStatus();
+      if (servers.length === 0) {
+        ctx.ui.notify("No MCP servers configured.", "info");
+        return;
+      }
+
+      const lines: string[] = [`MCP servers (${servers.length}):`, ""];
+      for (const s of servers) {
+        lines.push(`• ${s.name} (${s.source})`);
+        lines.push(`  URL: ${s.url}`);
+        if (s.state === "connecting") {
+          lines.push(`  Status: connecting...`);
+        } else if (s.state === "failed") {
+          lines.push(`  Status: failed — ${s.error ?? "unknown error"}`);
+        } else {
+          lines.push(`  Tools: ${s.toolCount}`);
+          for (const tool of s.tools) {
+            const desc = tool.description ? ` — ${tool.description.slice(0, 60)}` : "";
+            lines.push(`    - ${tool.name}${desc}`);
+          }
+        }
+        lines.push("");
+      }
+
+      pi.sendMessage({ customType: "mcp-status", content: lines.join("\n"), display: true }, { triggerTurn: false });
+    },
+  });
+}
+
 // ─── /retry ────────────────────────────────────────────────────────────────
 
 function setupRetryCommand(pi: ExtensionAPI) {
@@ -165,5 +318,6 @@ function setupRetryCommand(pi: ExtensionAPI) {
 export function setupSlash(pi: ExtensionAPI) {
   setupDpModelCommand(pi);
   setupDpSettingsCommand(pi);
+  setupMcpCommand(pi);
   setupRetryCommand(pi);
 }

package/extensions/smart-at.ts

@@ -20,7 +20,7 @@
  *   Tier 2 (-300): 在 .* 或 __* 目录下
  *   Tier 3 (-200): 在已知噪音目录下(build/dist/coverage 等)
  *   Tier 4 (-150~-80): 坏扩展名(二进制/编译产物/媒体文件)
- *   Base (always): -depth*2 - name.length
+ *   Base (always): -depth*30 - name.length
  *
  * 匹配:
  *   - 大小写敏感
@@ -104,7 +104,7 @@ function computePenaltyMeta(filePath: string, isDir: boolean, gitIgnored: boolea
     tierPenalty = EXT_PENALTY[ext]!;
   }
 
-  const basePenalty = -(depth * 20) - name.length;
+  const basePenalty = -(depth * 30) - name.length;
   return { tier, penalty: tierPenalty + basePenalty };
 }
 
@@ -306,7 +306,7 @@ function computeMatchScore(candidate: FileCandidate, query: string): number {
   let s = 0;
 
   // 大小写敏感匹配
-  if (stem === query)                                                       s = isDir ? 1500 : 1200;
+  if (stem === query)                                                       s = isDir ? 1500 : 1050;
   else if (name.startsWith(query + ".") || name.startsWith(query + "_"))    s = 1000;
   else if (name.startsWith(query))                                          s = 900;
   else if (name.includes(query))                                            s = 600;
@@ -316,10 +316,10 @@ function computeMatchScore(candidate: FileCandidate, query: string): number {
   if (!s) return 0;
 
   // 目录轻微加成(tiebreaker,不碾压深度)
-  if (isDir) s += 50;
+  if (isDir) s += 100;
 
   // 父目录命中加成
-  if (inDir) s += 250;
+  if (inDir) s += 50;
 
   return s;
 }

package/extensions/subdir-agents.ts

@@ -4,29 +4,49 @@
  * 当 agent 读取或编辑子目录中的文件时，自动发现该目录及父目录中的 AGENTS.md/CLAUDE.md，
  * 将其内容注入到 tool result 中。
  *
- * 状态通过 pi.appendEntry() 持久化到 session JSONL 文件中，resume 时自动恢复。
+ * 状态通过 pi.appendEntry() 持久化到 session JSONL 文件中，resume / reload 时恢复。
+ * compaction 视为上下文边界：仅恢复当前 branch 上最后一个 compaction 之后的已加载状态。
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { dirname, resolve, relative, join } from "node:path";
+import { dirname, resolve, relative, join, normalize } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 
 const CUSTOM_TYPE = "decorated-pi.subdir-agents";
 const AGENTS_NAMES = ["AGENTS.md", "AGENTS.MD", "CLAUDE.md", "CLAUDE.MD"];
 
+interface SessionLikeEntry {
+  type: string;
+  customType?: string;
+  data?: unknown;
+}
+
 const discovered = new Set<string>();
 const pendingPaths = new Map<string, string>();
 let sessionCwd = process.cwd();
 
-function restoreFromSession(ctx: { cwd: string; sessionManager: { getEntries: () => Array<{ type: string; customType?: string; data?: unknown }> } }) {
+function normalizeAbsPath(cwd: string, p: string): string {
+  return normalize(resolve(cwd, p));
+}
+
+function lastCompactionIndex(entries: SessionLikeEntry[]): number {
+  for (let i = entries.length - 1; i >= 0; i--) {
+    if (entries[i]?.type === "compaction") return i;
+  }
+  return -1;
+}
+
+function restoreFromBranch(ctx: { cwd: string; sessionManager: { getBranch: () => Array<SessionLikeEntry> } }) {
   discovered.clear();
-  for (const entry of ctx.sessionManager.getEntries()) {
-    if (entry.type === "custom" && entry.customType === CUSTOM_TYPE) {
-      const paths = entry.data as string[] | undefined;
-      if (paths) {
-        for (const p of paths) {
-          discovered.add(resolve(ctx.cwd, p));
-        }
+  const branch = ctx.sessionManager.getBranch();
+  const start = lastCompactionIndex(branch) + 1;
+  for (const entry of branch.slice(start)) {
+    if (entry.type !== "custom" || entry.customType !== CUSTOM_TYPE) continue;
+    const paths = entry.data as string[] | undefined;
+    if (!Array.isArray(paths)) continue;
+    for (const p of paths) {
+      if (typeof p === "string" && p.trim()) {
+        discovered.add(normalizeAbsPath(ctx.cwd, p));
       }
     }
   }
@@ -34,7 +54,7 @@ function restoreFromSession(ctx: { cwd: string; sessionManager: { getEntries: ()
 
 function findNewAgents(filePath: string, cwd: string): Array<{ path: string; content: string }> {
   const resolvedCwd = resolve(cwd);
-  let dir = dirname(resolve(filePath));
+  let dir = dirname(resolve(cwd, filePath));
   const results: Array<{ path: string; content: string }> = [];
 
   while (true) {
@@ -42,7 +62,7 @@ function findNewAgents(filePath: string, cwd: string): Array<{ path: string; con
     if (rel === "" || rel.startsWith("..")) break;
 
     for (const name of AGENTS_NAMES) {
-      const agentsPath = join(dir, name);
+      const agentsPath = normalize(join(dir, name));
       if (existsSync(agentsPath) && !discovered.has(agentsPath)) {
         try {
           const content = readFileSync(agentsPath, "utf-8");
@@ -65,10 +85,20 @@ function findNewAgents(filePath: string, cwd: string): Array<{ path: string; con
   return results.reverse();
 }
 
+export const __subdirAgentsTest = {
+  restoreFromBranch,
+  findNewAgents,
+};
+
 export function setupSubdirAgents(pi: ExtensionAPI) {
   pi.on("session_start", (_event, ctx) => {
     sessionCwd = ctx.cwd;
-    restoreFromSession(ctx);
+    restoreFromBranch(ctx);
+  });
+
+  pi.on("session_compact", () => {
+    discovered.clear();
+    pendingPaths.clear();
   });
 
   pi.on("tool_call", (event) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decorated-pi",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A pi extension with better work-flow: patch tool, safety gates, secret redaction, smart @ completion, dynamic AGENTS loading, image fallback, and LSP tools",
   "keywords": [
     "pi",
@@ -22,8 +22,7 @@
   "homepage": "https://github.com/lcwecker/decorated-pi#readme",
   "bugs": "https://github.com/lcwecker/decorated-pi/issues",
   "dependencies": {
-    "@spences10/pi-child-env": "0.1.4",
-    "@spences10/pi-project-trust": "0.0.6",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "openai": "^6.37.0"
   },
   "peerDependencies": {

package/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "bundler",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "types": ["node"],
+    "outDir": "dist",
+    "rootDir": ".",
+    "noEmit": true
+  },
+  "include": ["extensions/**/*.ts", "test/**/*.ts"],
+  "exclude": ["node_modules", "dist"]
+}