decorated-pi 0.5.0 → 0.5.1

package/README.md

@@ -55,12 +55,12 @@ Example redaction on a `read` / `bash` output:
 
 > `*` = known pattern, `#` = config key regex, `?` = entropy heuristic.
 
-### 4. Auxiliary Models (Image + Compact)
+### 4. Auxiliary Models
 
 Offloads auxiliary ops to cheaper models, reducing cost on every session. Configured via `/dp-model`:
 
 - **Image read fallback** — when the model reads an image file, detects type via magic bytes, calls a configured vision-capable model, and replaces the read result with image analysis text (jpeg, png, gif, webp)
-- **Compact model** — uses a configured model for context compaction (instead of the main model), auto-resumes after compaction.
+- **Compact model** — uses a configured model for context compaction (instead of the main model).
 
 ### 5. Progressive Context from `AGENTS.md` / `CLAUDE.md`
 

package/extensions/index.ts

@@ -3,13 +3,15 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
+// Extend prompt cache TTL for all providers: Anthropic 1h, OpenAI 24h
+process.env.PI_CACHE_RETENTION ??= "long";
 import { setupSafety } from "./safety/index.js";
 import { setupModelIntegration } from "./model-integration";
 import { setupSlash } from "./slash";
 import { setupSubdirAgents } from "./subdir-agents";
 import { setupSessionTitle } from "./session-title";
 import { setupIO } from "./io";
-import { setupGuidance } from "./guidance";
 import { setupLsp } from "./lsp/index";
 import { collectLspDependencyStatuses } from "./lsp/servers";
 import { setupProviders } from "./providers/index";
@@ -79,6 +81,60 @@ function setupDependencyReminders(pi: ExtensionAPI) {
   });
 }
 
+const DECORATED_PI_GUIDANCE_MARKER = "## Decorated Pi Guidance";
+
+function setupGuidance(pi: ExtensionAPI) {
+  pi.on("before_agent_start", async (event) => {
+    // Remove "Current date: YYYY-MM-DD" from system prompt to improve cache stability
+    let prompt = event.systemPrompt.replace(/\nCurrent date: \d{4}-\d{2}-\d{2}/, "");
+
+    if (!prompt.includes(DECORATED_PI_GUIDANCE_MARKER)) {
+      const guidance = [
+        DECORATED_PI_GUIDANCE_MARKER,
+        "",
+        "- Before acting on a user's prompt, ensure you fully understand their needs. If the intent is ambiguous, ask clarifying questions. Proceed only when the intent is clear.",
+        "- Look before you leap! Ensure you have conducted thorough research before taking any action.",
+        "- Exercise caution when performing any **write** operations, especially when you are in a research or exploration phase.",
+        "- You don't need to read **AGENTS.md** or **CLAUDE.md** files unless you're explicitly asked to, these files will loaded automatically if neccessary.",
+        "- CAUTION: Do not perform write operations in the following directories unless explicitly instructed: `node_modules`, `venv`, `env`, `__pycache__`, `.git` or any other hidden directories.",
+        "",
+        "### Secret Redaction",
+        "",
+        "- When you see masked secret values (e.g. `sk-***...***` where `*`, `#`, or `?` are mask characters), the real value has been redacted by the system. Do not attempt to read or guess it. If you need the secret, use tools like `jq` or `grep` to extract it from the original source file.",
+      ].join("\n");
+
+      prompt = `${prompt}\n\n${guidance}`;
+    }
+
+    sortSystemPromptOptions(event.systemPromptOptions);
+    return { systemPrompt: prompt };
+  });
+}
+
+/** Sort all fields in systemPromptOptions alphabetically for stable system prompt. */
+export function sortSystemPromptOptions(opts: {
+  toolSnippets?: Record<string, string>;
+  selectedTools?: string[];
+  promptGuidelines?: string[];
+  skills?: Array<{ name: string; description: string; filePath: string }>;
+}) {
+  const sortedToolNames = Object.keys(opts.toolSnippets ?? {}).sort((a, b) => a.localeCompare(b));
+  const sortedToolSnippets: Record<string, string> = {};
+  for (const name of sortedToolNames) {
+    sortedToolSnippets[name] = opts.toolSnippets![name];
+  }
+  opts.toolSnippets = sortedToolSnippets;
+  if (opts.selectedTools) {
+    opts.selectedTools = sortedToolNames;
+  }
+  if (opts.promptGuidelines) {
+    opts.promptGuidelines = [...opts.promptGuidelines].sort((a, b) => a.localeCompare(b));
+  }
+  if (opts.skills) {
+    opts.skills = [...opts.skills].sort((a, b) => a.name.localeCompare(b.name));
+  }
+}
+
 export default function (pi: ExtensionAPI) {
   // Always loaded — core commands and providers
   setupSlash(pi);
@@ -97,4 +153,4 @@ export default function (pi: ExtensionAPI) {
   if (isModuleEnabled("mcp")) setupMcp(pi);
   if (isModuleEnabled("wakatime")) setupWakatime(pi);
   if (isModuleEnabled("rtk") && findSystemRtk()) setupRtkIntegration(pi);
-}
+}

package/extensions/io.ts

@@ -448,6 +448,7 @@ export function setupIO(pi: ExtensionAPI) {
       "Always prefer modifying files with PATCH tool over bash commands or python scripts.",
       "For full-file replacement, always use patch tool to prevent unintended edits or data loss.",
       "To prevent hallucinations: 1. Keep each edit batch ≤ 5 changes; 2. Process remaining revisions in sequential steps",
+      "On repeated failures: read the file first to confirm information accuracy.",
     ],
     parameters: PatchSchema,
     renderShell: "self",

package/extensions/mcp/builtin.ts

@@ -24,116 +24,15 @@ export const BUILTIN_MCP_SERVERS: Omit<McpServerConfig, "source">[] = [
   {
     name: "context7",
     url: "https://mcp.context7.com/mcp",
-    description: "Context7 documentation and code examples",
     enabled: true,
   },
   {
     name: "exa",
     url: "https://mcp.exa.ai/mcp",
-    description: "Exa web search",
     enabled: true,
   },
 ];
 
-/** Builtin tool schemas — hardcoded so builtin servers work without a prior connection. */
-export const BUILTIN_MCP_CACHE: McpCache = {
-  servers: {
-    context7: {
-      description: "Context7 documentation and code examples",
-      tools: [
-        {
-          name: "resolve-library-id",
-          description: "Resolve a library name to its Context7 library ID",
-          inputSchema: {
-            type: "object",
-            properties: {
-              libraryName: {
-                type: "string",
-                description: "Library or framework name to resolve (e.g. 'react', 'vue')",
-              },
-              filters: {
-                type: "array",
-                items: {
-                  type: "object",
-                  properties: {
-                    field: { type: "string" },
-                    operator: { type: "string" },
-                    value: { type: "string" },
-                  },
-                },
-                description: "Optional filters to narrow down results",
-              },
-            },
-            required: ["libraryName"],
-          },
-        },
-        {
-          name: "query-docs",
-          description: "Retrieve and query documentation using a Context7 library ID",
-          inputSchema: {
-            type: "object",
-            properties: {
-              libraryId: {
-                type: "string",
-                description: "Library ID returned by resolve-library-id",
-              },
-              query: {
-                type: "string",
-                description: "Question or topic to search in the documentation",
-              },
-            },
-            required: ["libraryId", "query"],
-          },
-        },
-      ],
-      cachedAt: 0,
-    },
-    exa: {
-      description: "Exa web search",
-      tools: [
-        {
-          name: "web_search_exa",
-          description: "Search the web for any topic and get results",
-          inputSchema: {
-            type: "object",
-            properties: {
-              query: {
-                type: "string",
-                description: "Search query",
-              },
-              numResults: {
-                type: "number",
-                description: "Number of results to return (default: 10)",
-              },
-            },
-            required: ["query"],
-          },
-        },
-        {
-          name: "web_fetch_exa",
-          description: "Read webpage content from specific URLs",
-          inputSchema: {
-            type: "object",
-            properties: {
-              urls: {
-                type: "array",
-                items: { type: "string" },
-                description: "URLs to fetch content from",
-              },
-              maxCharacters: {
-                type: "number",
-                description: "Maximum characters per page to return",
-              },
-            },
-            required: ["urls"],
-          },
-        },
-      ],
-      cachedAt: 0,
-    },
-  },
-};
-
 // ── Project-level config discovery ─────────────────────────────────────────
 
 function readMcpJson(filePath: string): Record<string, { url?: string; command?: string; args?: string[]; env?: Record<string, string>; enabled?: boolean; description?: string }> | null {
@@ -331,9 +230,9 @@ function writeCacheFile(p: string, cache: McpCache): void {
   fs.renameSync(tmp, p);
 }
 
-/** Load merged cache: builtin + global + project. */
+/** Load merged cache: global + project. */
 export function loadMcpCache(cwd?: string): McpCache | null {
-  const merged: McpCache = { servers: { ...BUILTIN_MCP_CACHE.servers } };
+  const merged: McpCache = { servers: {} };
 
   const globalCache = readCacheFile(globalCachePath());
   if (globalCache) {
@@ -428,5 +327,16 @@ function cleanupOneCache(p: string, names: Set<string>): void {
 export function cleanupStaleCache(configs: McpServerConfig[], cwd?: string): void {
   const names = new Set(configs.map(c => c.name));
   cleanupOneCache(globalCachePath(), names);
-  if (cwd) cleanupOneCache(projectCachePath(cwd), names);
+  if (cwd) {
+    const projectCache = projectCachePath(cwd);
+    const projectMcpJson = path.join(cwd, ".pi/agent/mcp.json");
+    // If project mcp.json doesn't exist, remove project cache entirely
+    if (!fs.existsSync(projectMcpJson)) {
+      if (fs.existsSync(projectCache)) {
+        fs.unlinkSync(projectCache);
+      }
+    } else {
+      cleanupOneCache(projectCache, names);
+    }
+  }
 }

package/extensions/mcp/index.ts

@@ -2,21 +2,15 @@ import { keyHint, type ExtensionAPI, type ExtensionContext } from "@earendil-wor
 import { Text } from "@earendil-works/pi-tui";
 import { McpConnection } from "./client.js";
 import {
-  resolveMcpConfigs, saveProjectMcpDescription,
+  resolveMcpConfigs,
   loadMcpCache, updateServerCache, cleanupStaleCache,
   type McpServerConfig, type McpToolCache,
 } from "./builtin.js";
-import {
-  getMcpBrokerModelKey, getCompactModelKey,
-  getMcpDescription, setMcpDescription,
-  parseModelKey,
-} from "../settings.js";
 
 export interface McpServerStatus {
   name: string;
   url: string;
   source: string;
-  description?: string;
   state: "connecting" | "connected" | "failed" | "disabled";
   toolCount: number;
   tools: Array<{ name: string; description?: string; inputSchema?: Record<string, unknown> }>;
@@ -90,10 +84,6 @@ export function updateConfigEnabled(serverName: string, enabled: boolean): void
 
 // ── helpers ───────────────────────────────────────────────────────────────
 
-function serverDescription(s: McpServerConfig): string | undefined {
-  return s.description || getMcpDescription(s.name, cachedCwd);
-}
-
 function makeToolName(serverName: string, toolName: string): string {
   return `${serverName}_${toolName}`;
 }
@@ -108,67 +98,6 @@ function cacheScopeForSource(source: string): "global" | "project" {
   return source === "project" ? "project" : "global";
 }
 
-// ── auto-summary ──────────────────────────────────────────────────────────
-
-async function autoDescribeServer(
-  conn: McpConnection,
-  serverName: string,
-  registry: any,
-): Promise<string> {
-  const descs = conn.tools.map(t => `- ${t.name}: ${t.description || "(no description)"}`).join("\n");
-
-  const prompt = `Describe what this MCP server is and what it does, based on the tools it exposes. Start with action verbs directly, like a capability summary.
-
-Server: "${serverName}"
-Tools:
-${descs}
-
-Respond with ONLY one short sentence. No quotes.`;
-
-  return await summarizeWithBroker(registry, prompt) || `${serverName} MCP server (${conn.tools.length} tools)`;
-}
-
-async function summarizeWithBroker(registry: any, prompt: string): Promise<string | undefined> {
-  if (!registry) return undefined;
-
-  const brokerKey = getMcpBrokerModelKey() || getCompactModelKey();
-  const model = brokerKey
-    ? (() => {
-        const parsed = parseModelKey(brokerKey);
-        return parsed ? registry.find(parsed.provider, parsed.modelId) : undefined;
-      })()
-    : undefined;
-
-  if (!model) return undefined;
-
-  try {
-    const auth = await registry.getApiKeyAndHeaders(model);
-    if (!auth.ok) return undefined;
-
-    const { complete } = await import("@earendil-works/pi-ai");
-    const resp = await complete(model, {
-      systemPrompt: "You are a concise MCP server description generator.",
-      messages: [{
-        role: "user" as const,
-        content: [{ type: "text" as const, text: prompt }],
-        timestamp: Date.now(),
-      }],
-    }, {
-      maxTokens: 128,
-      apiKey: auth.apiKey ?? "",
-      headers: auth.headers,
-      signal: AbortSignal.timeout(15_000),
-    });
-
-    if (resp.stopReason === "error") return undefined;
-    return resp.content
-      .filter((c: any): c is { type: "text"; text: string } => c.type === "text")
-      .map((c: any) => c.text).join(" ").trim() || undefined;
-  } catch {
-    return undefined;
-  }
-}
-
 // ── register cached tools ─────────────────────────────────────────────────
 
 function registerCachedTools(pi: ExtensionAPI, configs: McpServerConfig[]): void {
@@ -218,7 +147,11 @@ function registerCachedTools(pi: ExtensionAPI, configs: McpServerConfig[]): void
 
 // ── connect ───────────────────────────────────────────────────────────────
 
-async function connectAll(configs: McpServerConfig[], registry: any): Promise<void> {
+async function connectAll(configs: McpServerConfig[], ui?: { notify: (msg: string, type: string) => void }): Promise<void> {
+  // Load current cache for comparison
+  const cache = loadMcpCache(cachedCwd);
+  const schemaChanges: string[] = [];
+
   allServers = new Map(
     configs.map((s) => [
       s.name,
@@ -226,7 +159,6 @@ async function connectAll(configs: McpServerConfig[], registry: any): Promise<vo
         name: s.name,
         url: s.url ?? s.command ?? "(unknown)",
         source: s.source,
-        description: serverDescription(s),
         state: "connecting" as const,
         toolCount: 0,
         tools: [],
@@ -243,12 +175,30 @@ async function connectAll(configs: McpServerConfig[], registry: any): Promise<vo
         await conn.connect(30_000);
         activeConnections.push(conn);
 
-        let desc = serverDescription(server);
-        if (!desc) {
-          desc = await autoDescribeServer(conn, server.name, registry);
-          if (desc) {
-            if (server.source === "project") saveProjectMcpDescription(cachedCwd, server.name, desc);
-            else setMcpDescription(server.name, desc);
+        const actualTools = conn.tools.map((t) => ({
+          name: t.name,
+          description: t.description,
+          inputSchema: t.inputSchema,
+        }));
+
+        // Check if schema changed
+        const cachedEntry = cache?.servers[server.name];
+        if (cachedEntry && cachedEntry.tools.length > 0) {
+          const cachedToolNames = new Set(cachedEntry.tools.map(t => t.name));
+          const actualToolNames = new Set(actualTools.map(t => t.name));
+          const added = actualTools.filter(t => !cachedToolNames.has(t.name));
+          const removed = cachedEntry.tools.filter(t => !actualToolNames.has(t.name));
+          const changed = actualTools.filter(t => {
+            const cached = cachedEntry.tools.find(ct => ct.name === t.name);
+            return cached && JSON.stringify(cached.inputSchema) !== JSON.stringify(t.inputSchema);
+          });
+
+          if (added.length > 0 || removed.length > 0 || changed.length > 0) {
+            const parts: string[] = [];
+            if (added.length) parts.push(`${added.length} added`);
+            if (removed.length) parts.push(`${removed.length} removed`);
+            if (changed.length) parts.push(`${changed.length} changed`);
+            schemaChanges.push(`${server.name} (${parts.join(', ')})`);
           }
         }
 
@@ -256,14 +206,9 @@ async function connectAll(configs: McpServerConfig[], registry: any): Promise<vo
           name: server.name,
           url: server.url ?? server.command ?? "(unknown)",
           source: server.source,
-          description: desc,
           state: "connected",
           toolCount: conn.tools.length,
-          tools: conn.tools.map((t) => ({
-            name: t.name,
-            description: t.description,
-            inputSchema: t.inputSchema,
-          })),
+          tools: actualTools,
         });
 
         // Update cache with this server's tools
@@ -274,7 +219,7 @@ async function connectAll(configs: McpServerConfig[], registry: any): Promise<vo
         }));
         updateServerCache(
           server.name,
-          { description: desc, tools, cachedAt: Date.now() },
+          { tools, cachedAt: Date.now() },
           cacheScopeForSource(server.source),
           cachedCwd || undefined,
         );
@@ -284,7 +229,6 @@ async function connectAll(configs: McpServerConfig[], registry: any): Promise<vo
           name: server.name,
           url: server.url ?? server.command ?? "(unknown)",
           source: server.source,
-          description: serverDescription(server),
           state: "failed",
           toolCount: 0,
           tools: [],
@@ -296,6 +240,11 @@ async function connectAll(configs: McpServerConfig[], registry: any): Promise<vo
 
   await connectPromise;
   connectPromise = null;
+
+  // Notify about schema changes
+  if (schemaChanges.length > 0 && ui) {
+    ui.notify(`MCP schema updated: ${schemaChanges.join('; ')}. Run /reload to apply.`, "warning");
+  }
 }
 
 // ── setup ─────────────────────────────────────────────────────────────────
@@ -317,16 +266,8 @@ export function setupMcp(pi: ExtensionAPI) {
     // Register tools from cache — prompt-stable, works even if MCP is down
     registerCachedTools(pi, enabledConfigs);
 
-    const needSummary = enabledConfigs.filter(s => !serverDescription(s));
-
-    if (needSummary.length === 0) {
-      // All servers have descriptions — connect in background, update cache
-      void connectAll(enabledConfigs, ctx.modelRegistry);
-      return;
-    }
-
-    // Some servers lack description — connect and auto-summarize synchronously
-    await connectAll(enabledConfigs, ctx.modelRegistry);
+    // Connect in background, pass UI for schema change notifications
+    void connectAll(enabledConfigs, ctx.hasUI ? ctx.ui : undefined);
   });
 
   pi.on("session_shutdown", () => {
@@ -347,7 +288,6 @@ export function getMcpStatus(): McpServerStatus[] {
         name: config.name,
         url: config.url ?? config.command ?? "(unknown)",
         source: config.source,
-        description: serverDescription(config),
         state: config.enabled ? "connecting" : "disabled",
         toolCount: cachedEntry?.tools.length ?? 0,
         tools: cachedEntry?.tools ?? [],
@@ -382,20 +322,10 @@ export async function refreshServerCache(
     await conn.connect(30_000);
     activeConnections.push(conn);
 
-    let desc = serverDescription(config);
-    if (!desc) {
-      desc = await autoDescribeServer(conn, config.name, registry);
-      if (desc) {
-        if (config.source === "project") saveProjectMcpDescription(cachedCwd, config.name, desc);
-        else setMcpDescription(config.name, desc);
-      }
-    }
-
     allServers.set(config.name, {
       name: config.name,
       url: config.url ?? config.command ?? "(unknown)",
       source: config.source,
-      description: desc,
       state: "connected",
       toolCount: conn.tools.length,
       tools: conn.tools.map(t => ({
@@ -412,7 +342,7 @@ export async function refreshServerCache(
     }));
     updateServerCache(
       config.name,
-      { description: desc, tools, cachedAt: Date.now() },
+      { tools, cachedAt: Date.now() },
       cacheScopeForSource(config.source),
       cachedCwd || undefined,
     );
@@ -424,7 +354,6 @@ export async function refreshServerCache(
       name: config.name,
       url: config.url ?? config.command ?? "(unknown)",
       source: config.source,
-      description: serverDescription(config),
       state: "failed",
       toolCount: 0,
       tools: [],

package/extensions/model-integration.ts

@@ -25,8 +25,8 @@ import { fileTypeFromFile } from "file-type";
 import { isContextOverflow, type Model } from "@earendil-works/pi-ai";
 import {
   loadConfig, saveConfig, parseModelKey, formatModelKey,
-  getImageModelKey, getCompactModelKey, getMcpBrokerModelKey,
-  setImageModelKey, setCompactModelKey, setMcpBrokerModelKey,
+  getImageModelKey, getCompactModelKey,
+  setImageModelKey, setCompactModelKey,
 } from "./settings.js";
 import * as fs from "node:fs";
 import * as os from "node:os";
@@ -172,7 +172,6 @@ function setupImageReadFallback(pi: ExtensionAPI) {
 
 const TAB_IMAGE = 0;
 const TAB_COMPACT = 1;
-const TAB_BROKER = 2;
 
 export class ModelPickerComponent extends Container {
   private searchInput: Input;
@@ -183,7 +182,6 @@ export class ModelPickerComponent extends Container {
   private activeTab = TAB_IMAGE;
   private imageKey: string | null;
   private compactKey: string | null;
-  private brokerKey: string | null;
   private allItems: { label: string; desc: string; model: Model<any> | null; modelName?: string }[] = [];
   private filtered: typeof this.allItems = [];
   private selectedIndex = 0;
@@ -199,7 +197,6 @@ export class ModelPickerComponent extends Container {
     this.onDone = onDone;
     this.imageKey = getImageModelKey();
     this.compactKey = getCompactModelKey();
-    this.brokerKey = getMcpBrokerModelKey();
 
     this.addChild(new DynamicBorder());
     this.addChild(new Spacer(1));
@@ -235,8 +232,8 @@ export class ModelPickerComponent extends Container {
     }
   }
 
-  private currentKey() { return this.activeTab === TAB_IMAGE ? this.imageKey : this.activeTab === TAB_BROKER ? this.brokerKey : this.compactKey; }
-  private currentKind() { return this.activeTab === TAB_IMAGE ? "image" : this.activeTab === TAB_BROKER ? "broker" : "compact"; }
+  private currentKey() { return this.activeTab === TAB_IMAGE ? this.imageKey : this.compactKey; }
+  private currentKind() { return this.activeTab === TAB_IMAGE ? "image" : "compact"; }
 
   private switchTab(tab: number) {
     this.activeTab = tab;
@@ -263,11 +260,9 @@ export class ModelPickerComponent extends Container {
     const t = this.theme;
     const im = this.activeTab === TAB_IMAGE ? t.fg("accent", "●") : "○";
     const cm = this.activeTab === TAB_COMPACT ? t.fg("accent", "●") : "○";
-    const bm = this.activeTab === TAB_BROKER ? t.fg("accent", "●") : "○";
     const il = this.activeTab === TAB_IMAGE ? t.bold("Image") : t.fg("dim", "Image");
     const cl = this.activeTab === TAB_COMPACT ? t.bold("Compact") : t.fg("dim", "Compact");
-    const bl = this.activeTab === TAB_BROKER ? t.bold("Broker") : t.fg("dim", "Broker");
-    this.tabTitle.setText(`${im} ${il}  |  ${cm} ${cl}  |  ${bm} ${bl}`);
+    this.tabTitle.setText(`${im} ${il}  |  ${cm} ${cl}`);
     const key = this.currentKey();
     this.subtitleText.setText(key ? t.fg("warning", `Current ${this.currentKind()} model: ${key}`) : t.fg("warning", `No ${this.currentKind()} model set`));
   }
@@ -275,7 +270,7 @@ export class ModelPickerComponent extends Container {
   handleInput(keyData: string) {
     const kb = getKeybindings();
     if (kb.matches(keyData, "tui.input.tab")) {
-      const next = this.activeTab === TAB_IMAGE ? TAB_COMPACT : this.activeTab === TAB_COMPACT ? TAB_BROKER : TAB_IMAGE;
+      const next = this.activeTab === TAB_IMAGE ? TAB_COMPACT : TAB_IMAGE;
       this.switchTab(next); this.tui.requestRender(); return;
     }
     if (kb.matches(keyData, "tui.select.up")) { this.selectedIndex = this.selectedIndex === 0 ? this.filtered.length - 1 : this.selectedIndex - 1; this.updateList(); return; }
@@ -297,15 +292,12 @@ export class ModelPickerComponent extends Container {
     const kind = this.currentKind();
     if (model) {
       if (kind === "image") setImageModelKey(formatModelKey(model));
-      else if (kind === "broker") setMcpBrokerModelKey(formatModelKey(model));
       else setCompactModelKey(formatModelKey(model));
     } else {
       if (kind === "image") setImageModelKey(null);
-      else if (kind === "broker") setMcpBrokerModelKey(null);
       else setCompactModelKey(null);
     }
     if (kind === "image") this.imageKey = model ? formatModelKey(model) : null;
-    else if (kind === "broker") this.brokerKey = model ? formatModelKey(model) : null;
     else this.compactKey = model ? formatModelKey(model) : null;
     this.switchTab(this.activeTab); this.tui.requestRender();
   }

package/extensions/rtk.ts

@@ -73,32 +73,7 @@ export function buildRtkCommand(raw: string, rtkBinaryPath: string): string {
   return `export PATH=${shellQuote(binDir)}:$PATH && ${raw}`;
 }
 
-export function extractMainCommand(command: string): string {
-  let cmd = command.trim().toLowerCase();
-  cmd = cmd.replace(/^cd\s+\S+\s*(&&|;|\n)\s*/, "");
-  cmd = cmd.replace(/^(?:[a-z_][a-z0-9_]*=\S*\s+)+/, "");
-  const prefixes = ["sudo ", "time ", "nohup ", "nice ", "env "];
-  let changed = true;
-  while (changed) {
-    changed = false;
-    for (const prefix of prefixes) {
-      if (cmd.startsWith(prefix)) {
-        cmd = cmd.slice(prefix.length);
-        changed = true;
-      }
-    }
-  }
-  return cmd;
-}
-
-export function shouldBypassRtkRewrite(command: string): boolean {
-  const main = extractMainCommand(command);
-  if (!main.startsWith("find ") && main !== "find") return false;
-  return /(^|\s)(-o|-or|-a|-and|-not|!|\(|\)|-exec|-ok|-delete|-prune|-printf|-print0)(\s|$)/.test(main);
-}
-
 export function rewriteWithRtk(command: string, rtkPath: string): string | null {
-  if (shouldBypassRtkRewrite(command)) return null;
 
   // NOTE:
   // Some RTK versions return a non-zero exit code even when `rtk rewrite`

package/extensions/settings.ts

@@ -47,8 +47,6 @@ export interface ModuleSettings {
 export interface DecoratedPiConfig {
   imageModelKey?: string | null;
   compactModelKey?: string | null;
-  mcpBrokerModelKey?: string | null;
-  mcpDescriptions?: Record<string, string>;
   providers?: Record<string, ProviderCache>;
   modules?: ModuleSettings;
   mcpServers?: Record<string, McpServerEntry>;
@@ -143,36 +141,6 @@ export function setCompactModelKey(key: string | null) {
   saveConfig({ compactModelKey: key });
 }
 
-export function getMcpBrokerModelKey(): string | null {
-  return loadConfig().mcpBrokerModelKey ?? null;
-}
-
-export function setMcpBrokerModelKey(key: string | null) {
-  saveConfig({ mcpBrokerModelKey: key });
-}
-
-export function getMcpDescription(name: string, cwd?: string): string | undefined {
-  if (cwd) {
-    const projectCfg = loadProjectConfig(cwd);
-    if (projectCfg.mcpDescriptions?.[name]) return projectCfg.mcpDescriptions[name];
-  }
-  return loadConfig().mcpDescriptions?.[name];
-}
-
-export function setMcpDescription(name: string, description: string, cwd?: string) {
-  if (cwd) {
-    const cfg = loadProjectConfig(cwd);
-    const descriptions = { ...cfg.mcpDescriptions };
-    descriptions[name] = description;
-    saveProjectConfig(cwd, { mcpDescriptions: descriptions });
-    return;
-  }
-  const cfg = loadConfig();
-  const descriptions = { ...cfg.mcpDescriptions };
-  descriptions[name] = description;
-  saveConfig({ mcpDescriptions: descriptions });
-}
-
 // ─── Module Switches ──────────────────────────────────────────────────────────
 
 const DEFAULT_MODULES: Required<ModuleSettings> = {

package/extensions/slash.ts

@@ -45,7 +45,7 @@ function getSettingsListTheme(theme: PiTheme): SettingsListTheme {
 
 function setupDpModelCommand(pi: ExtensionAPI) {
   pi.registerCommand("dp-model", {
-    description: "Configure image, compact, and MCP broker models",
+    description: "Configure image and compact models",
     handler: async (_args, ctx) => {
       if (ctx.hasUI) {
         await ctx.ui.custom<void>(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decorated-pi",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "decorated-pi is a practical enhancement pack for pi — smarter tools that are token efficient and cache friendly.",
   "keywords": [
     "pi",

package/extensions/guidance.ts

@@ -1,30 +0,0 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-const DECORATED_PI_GUIDANCE_MARKER = "## Decorated Pi Guidance";
-
-export function setupGuidance(pi: ExtensionAPI) {
-  pi.on("before_agent_start", async (event) => {
-    // Remove "Current date: YYYY-MM-DD" from system prompt to improve cache stability
-    let prompt = event.systemPrompt.replace(/\nCurrent date: \d{4}-\d{2}-\d{2}/, "");
-
-    if (!prompt.includes(DECORATED_PI_GUIDANCE_MARKER)) {
-      const guidance = [
-        DECORATED_PI_GUIDANCE_MARKER,
-        "",
-        "- Before acting on a user's prompt, ensure you fully understand their needs. If the intent is ambiguous, ask clarifying questions. Proceed only when the intent is clear.",
-        "- Look before you leap! Ensure you have conducted thorough research before taking any action.",
-        "- Exercise caution when performing any **write** operations, especially when you are in a research or exploration phase.",
-        "- You don't need to read **AGENTS.md** or **CLAUDE.md** files unless you're explicitly asked to, these files will loaded automatically if neccessary.",
-        "- CAUTION: Do not perform write operations in the following directories unless explicitly instructed: `node_modules`, `venv`, `env`, `__pycache__`, `.git` or any other hidden directories.",
-        "",
-        "### Secret Redaction",
-        "",
-        "- When you see masked secret values (e.g. `sk-***...***` where `*`, `#`, or `?` are mask characters), the real value has been redacted by the system. Do not attempt to read or guess it. If you need the secret, use tools like `jq` or `grep` to extract it from the original source file.",
-      ].join("\n");
-
-      prompt = `${prompt}\n\n${guidance}`;
-    }
-
-    return { systemPrompt: prompt };
-  });
-}