decorated-pi 0.7.1 → 0.7.2

package/index.ts

@@ -16,6 +16,7 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { fileURLToPath } from "node:url";
 
 import { createSkeleton } from "./hooks/skeleton.js";
 
@@ -36,8 +37,9 @@ import { setupRtk } from "./hooks/rtk.js";
 import { registerPatchTool } from "./tools/patch/index.js";
 import { registerLspTools } from "./tools/lsp/tools.js";
 import { LspServerManager } from "./tools/lsp/manager.js";
+import { collectLspDependencyStatuses } from "./tools/lsp/servers.js";
 import { registerAskTool } from "./tools/ask/index.js";
-import { resolveMcpConfigs, migrateLegacyGlobalMcpConfig } from "./tools/mcp/config.js";
+import { resolveMcpConfigs, migrateLegacyGlobalMcpConfig, collectMcpDependencyStatuses } from "./tools/mcp/config.js";
 import { ensureMcpServerReady } from "./hooks/mcp.js";
 
 import { registerDpModelCommand } from "./commands/dp-model.js";
@@ -65,6 +67,71 @@ const BASE_GUIDANCE = [
   "- CAUTION: Do not perform write operations in the following directories unless explicitly instructed: `node_modules`, `venv`, `env`, `__pycache__`, `.git` or any other hidden directories.",
 ].join("\n");
 
+/** Remove the injected Pi documentation block from the base system prompt.
+ *  Matches a line containing "Pi documentation" and deletes it plus all
+ *  following non-empty lines, stopping at the first blank line. */
+export function stripPiDocsBlock(prompt: string): string {
+  const lines = prompt.split("\n");
+  const out: string[] = [];
+  let i = 0;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line.includes("Pi documentation")) {
+      i++;
+      while (i < lines.length && lines[i].trim() !== "") i++;
+      // Drop the terminating blank line as well so we don't leave orphan whitespace.
+      if (i < lines.length && lines[i].trim() === "") i++;
+      continue;
+    }
+    out.push(line);
+    i++;
+  }
+  return out.join("\n");
+}
+
+/** Sort the <available_skills> block in the system prompt by skill name.
+ *  Pi core appends extension-provided skills after user/project skills and does
+ *  not sort the XML; this makes the final prompt stable and cache-friendly. */
+export function sortSkillsInSystemPrompt(prompt: string): string {
+  const startMarker = "\n<available_skills>";
+  const endMarker = "</available_skills>";
+  const startIdx = prompt.indexOf(startMarker);
+  if (startIdx === -1) return prompt;
+  const endIdx = prompt.indexOf(endMarker, startIdx);
+  if (endIdx === -1) return prompt;
+
+  const before = prompt.slice(0, startIdx + startMarker.length);
+  const after = prompt.slice(endIdx);
+  const inner = prompt.slice(startIdx + startMarker.length, endIdx);
+
+  const chunks: string[][] = [];
+  let current: string[] = [];
+  for (const line of inner.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "<skill>") {
+      current = [line];
+    } else if (trimmed === "</skill>") {
+      current.push(line);
+      chunks.push(current);
+      current = [];
+    } else if (current.length > 0) {
+      current.push(line);
+    }
+  }
+
+  const nameOf = (chunk: string[]) => {
+    const line = chunk.find((l) => l.trim().startsWith("<name>"));
+    if (!line) return "";
+    const t = line.trim();
+    return t.slice(6, t.indexOf("</name>"));
+  };
+
+  chunks.sort((a, b) => nameOf(a).localeCompare(nameOf(b)));
+
+  const sortedInner = "\n" + chunks.map((chunk) => chunk.join("\n")).join("\n") + "\n";
+  return before + sortedInner + after;
+}
+
 /** Build the list of guideline strings to inject, in prompt order.
  *  Always-on rules first, then per-module guidelines. REDACT_GUIDANCE is
  *  gated by the secretRedaction module; CodeGraph guidance follows the MCP
@@ -80,6 +147,26 @@ function buildGuidelines(): string[] {
   return out;
 }
 
+function canRegisterMcpServer(config: { name: string; command?: string }, deps: Array<{ module: string; state: string }>): boolean {
+  if (!config.command) return true;
+  const dep = deps.find((d) => d.module === `mcp:${config.name}`);
+  return dep ? dep.state === "ok" : true;
+}
+
+/** Absolute path to the plugin's builtin skills directory.
+ *  Used by `resources_discover` so the skill travels with the plugin
+ *  regardless of which project pi is running in. */
+export function getBuiltinSkillPaths(): string[] {
+  return [fileURLToPath(new URL("./skills", import.meta.url))];
+}
+
+/** Register the plugin's builtin skill paths with Pi core. */
+function installBuiltinSkills(pi: ExtensionAPI): void {
+  pi.on("resources_discover", async (_event: any) => ({
+    skillPaths: getBuiltinSkillPaths(),
+  }));
+}
+
 /** Install a single before_agent_start handler that appends every
  *  guideline in order, stripping the volatile "Current date: …" line
  *  for cache stability. Idempotent — re-injection is a no-op via marker. */
@@ -90,7 +177,9 @@ function installGuidelines(pi: ExtensionAPI): void {
 
   pi.on("before_agent_start", async (event: any) => {
     if (!event.systemPrompt) return undefined;
-    let prompt: string = event.systemPrompt.replace(/\nCurrent date: \d{4}-\d{2}-\d{2}/, "");
+    let prompt: string = stripPiDocsBlock(event.systemPrompt);
+    prompt = sortSkillsInSystemPrompt(prompt);
+    prompt = prompt.replace(/\nCurrent date: \d{4}-\d{2}-\d{2}/, "");
     if (prompt.includes(marker)) return undefined; // already injected this turn
     return { systemPrompt: `${prompt}\n\n${joined}` };
   });
@@ -130,7 +219,19 @@ export default async function (pi: ExtensionAPI) {
 
   // ── Tools (conditional on module switches) ────────────────────────────
   if (isModuleEnabled("patchOverrideEdit")) registerPatchTool(pi);
-  if (isModuleEnabled("lsp")) registerLspTools(pi, new LspServerManager());
+  if (isModuleEnabled("lsp")) {
+    const lspDeps = collectLspDependencyStatuses(process.cwd());
+    if (lspDeps.some((d) => d.state === "ok")) {
+      registerLspTools(pi, new LspServerManager());
+    }
+    for (const dep of lspDeps) {
+      sk.declareDependency({
+        label: `lsp:${dep.label}`,
+        module: `lsp:${dep.label}`,
+        check: () => collectLspDependencyStatuses(process.cwd()).some((s) => s.label === dep.label && s.state === "ok"),
+      });
+    }
+  }
   if (isModuleEnabled("ask")) registerAskTool(pi);
 
   // MCP: hook, tools, and /mcp command are gated together. Disabling the
@@ -142,16 +243,29 @@ export default async function (pi: ExtensionAPI) {
     // explicitly here so `loadGlobalMcpConfigs` stays pure.
     migrateLegacyGlobalMcpConfig();
     sk.register(mcpModule);
+    const mcpDeps = collectMcpDependencyStatuses(process.cwd());
+    for (const dep of mcpDeps) {
+      sk.declareDependency({
+        label: dep.module,
+        module: dep.module,
+        check: () => collectMcpDependencyStatuses(process.cwd()).some((s) => s.module === dep.module && s.state === "ok"),
+      });
+    }
     const configs = resolveMcpConfigs(process.cwd()).filter(s => s.enabled);
     // Per-server readiness: cache hit → register from cache (fast).
     // Cache miss → connect synchronously, write cache, then register
     // live tools. This blocks startup only for cache-miss servers.
+    // Skip servers whose binary is missing (dependency not met).
     for (const config of configs) {
+      if (!canRegisterMcpServer(config, mcpDeps)) continue;
       await ensureMcpServerReady(pi, config, process.cwd());
     }
     registerMcpStatusCommand(pi);
   }
 
+  // ── Builtin skills (travel with the plugin in every project) ─────────────
+  installBuiltinSkills(pi);
+
   // ── System-prompt guidelines (single handler, array order = prompt order) ──
   installGuidelines(pi);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "decorated-pi",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "description": "decorated-pi is a practical enhancement pack for pi coding agent — token-efficient workflow, cache-friendly design, and smarter tools.",
     "keywords": [
         "pi",
@@ -14,9 +14,7 @@
         "secret-redaction",
         "codegraph",
         "fff",
-        "smart-at",
-        "fuzzy-search",
-        "file-finder"
+        "fuzzy-search"
     ],
     "license": "MIT",
     "repository": {

package/settings.ts

@@ -82,9 +82,11 @@ export function loadConfig(): DecoratedPiConfig {
   try {
     if (fs.existsSync(CONFIG_FILE)) {
       const config = JSON.parse(fs.readFileSync(CONFIG_FILE, "utf-8")) as DecoratedPiConfig;
-      if (migrateModuleSettings(config)) {
-        saveConfig(config);
-      }
+      // Mutate in place. Do NOT call saveConfig here — saveConfig calls
+      // loadConfig first, which would re-trigger the migration (and the
+      // file on disk hasn't been written yet), causing deep recursion.
+      // The migrated shape is persisted on the next explicit saveConfig.
+      migrateModuleSettings(config);
       return config;
     }
   } catch {}

package/skills/pi-docs/SKILL.md

@@ -0,0 +1,13 @@
+---
+name: pi-docs
+description: pi docs resources
+---
+
+Pi documentation (read only when the user asks about pi itself, its SDK, extensions, themes, skills, or TUI):
+- Main documentation: /home/liuchang/.local/share/fnm/node-versions/v24.14.0/installation/lib/node_modules/@earendil-works/pi-coding-agent/README.md
+- Additional docs: /home/liuchang/.local/share/fnm/node-versions/v24.14.0/installation/lib/node_modules/@earendil-works/pi-coding-agent/docs
+- Examples: /home/liuchang/.local/share/fnm/node-versions/v24.14.0/installation/lib/node_modules/@earendil-works/pi-coding-agent/examples (extensions, custom tools, SDK)
+- When reading pi docs or examples, resolve docs/... under Additional docs and examples/... under Examples, not the current working directory
+- When asked about: extensions (docs/extensions.md, examples/extensions/), themes (docs/themes.md), skills (docs/skills.md), prompt templates (docs/prompt-templates.md), TUI components (docs/tui.md), keybindings (docs/keybindings.md), SDK integrations (docs/sdk.md), custom providers (docs/custom-provider.md), adding models (docs/models.md), pi packages (docs/packages.md)
+- When working on pi topics, read the docs and examples, and follow .md cross-references before implementing
+- Always read pi .md files completely and follow links to related docs (e.g., tui.md for TUI API details)

package/tools/lsp/tools.ts

@@ -69,7 +69,6 @@ function severityLabel(s: number): string {
 // ─── Register tools ───────────────────────────────────────────────────────
 
 export function registerLspTools(pi: ExtensionAPI, manager: LspServerManager) {
-
   // ── lsp_diagnostics ────────────────────────────────────────────────────
   pi.registerTool({
     name: "lsp_diagnostics",

package/tools/mcp/builtin/codegraph.ts

@@ -14,7 +14,7 @@ export const CODEGRAPH_BUILTIN: Omit<McpServerConfig, "source"> = {
     name: "codegraph",
     command: "codegraph",
     args: ["serve", "--mcp"],
-    enabled: false,
+    enabled: true,
     description:
         "Local code knowledge graph (colbymchenry/codegraph). Enable via /mcp.",
     canUseInProject: (cwd: string) => fs.existsSync(path.join(cwd, ".codegraph")),

package/tools/mcp/client.ts

@@ -16,7 +16,7 @@ export class McpConnection {
   client: Client;
   transport: StreamableHTTPClientTransport | SSEClientTransport | StdioClientTransport | undefined;
   tools: McpToolSpec[] = [];
-  private connected = false;
+  connected = false;
 
   source: string = "unknown";
 

package/tools/patch/core.ts

@@ -1521,3 +1521,13 @@ function truncate(s: string, maxLen = 60): string {
   if (firstLine.length <= maxLen) return firstLine;
   return firstLine.slice(0, maxLen - 3) + "...";
 }
+
+// Test exports
+export const __patchCoreTest = {
+  charOffsetToLine,
+  detectTabWidth,
+  normalizeIndentForFuzzy,
+  truncate,
+  collapseSequentialReplacements,
+  generateReplacementDiff,
+};