decorated-pi 0.7.2 → 0.8.0

package/index.ts

@@ -23,8 +23,12 @@ import { createSkeleton } from "./hooks/skeleton.js";
 import { setupRedact, REDACT_GUIDANCE } from "./hooks/redact.js";
 import { externalizeModule } from "./hooks/externalize.js";
 import { normalizeCodeblocksModule } from "./hooks/normalize-codeblocks.js";
+import { thinkingLabelStripModule } from "./hooks/thinking-label-strip.js";
 import { trackMtimeModule } from "./hooks/track-mtime.js";
-import { injectAgentsMdModule, INJECT_AGENTS_MD_GUIDANCE } from "./hooks/inject-agents-md.js";
+import {
+    injectAgentsMdModule,
+    INJECT_AGENTS_MD_GUIDANCE,
+} from "./hooks/inject-agents-md.js";
 import { imageVisionModule } from "./hooks/image-vision.js";
 import { smartAtModule } from "./hooks/smart-at.js";
 import { sessionTitleModule } from "./hooks/session-title.js";
@@ -39,7 +43,11 @@ 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, collectMcpDependencyStatuses } 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";
@@ -56,80 +64,98 @@ import { captureModuleSnapshot, isModuleEnabled } from "./settings.js";
 // its constant and pushing it here. No priority / sort logic — just push.
 
 const BASE_GUIDANCE = [
-  "## Decorated Pi Guidance",
-  "",
-  "### Workflow, how to approach tasks",
-  "- Before acting on a prompt, do sufficient research on the existing state — read files, search, investigate — and only proceed once you have a clear picture.",
-  "- Exercise caution when performing any **write** operations, especially when you are in a research or exploration phase.",
-  "- Before modifying code, match the user's existing code style (naming, formatting, patterns). Do not re-modify lines the user has manually edited since your last change.",
-  "",
-  "### Filesystem Safety, where NOT to write",
-  "- CAUTION: Do not perform write operations in the following directories unless explicitly instructed: `node_modules`, `venv`, `env`, `__pycache__`, `.git` or any other hidden directories.",
+    "## Decorated Pi Guidance",
+    "",
+    "### Workflow, how to approach tasks",
+    "- Before acting on a prompt, do sufficient research on the existing state — read files, search, investigate — and only proceed once you have a clear picture.",
+    "- Exercise caution when performing any **write** operations, especially when you are in a research or exploration phase.",
+    "- Before modifying code, match the user's existing code style (naming, formatting, patterns). Do not re-modify lines the user has manually edited since your last change.",
+    "",
+    "### Filesystem Safety, where NOT to write",
+    "- 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");
+
+// Adapted from hexiecs/talk-normal (MIT), prompt-chatgpt.md v0.6.2.
+const TALK_NORMAL_GUIDANCE = [
+    "## Your talking style",
+    "",
+    "- Be direct and informative. No filler, no fluff, but give enough to be useful.",
+    "- Lead with the answer; add context only if it helps.",
+    "- Prefer direct positive claims. Avoid negation-based contrastive phrasing like `不是X，而是Y` / `it's not X, it's Y`; state the positive claim directly.",
+    "- Kill filler: `I'd be happy to`, `Great question`, `It's worth noting`, `Certainly`, `Of course`, `首先`, `值得注意的是`, `综上所述`.",
+    "- Never restate the question.",
+    "- Yes/no questions: answer first, then give one sentence of reasoning.",
+    "- Comparisons: give a recommendation with brief reasoning, not a balanced essay.",
+    "- Code: give the code plus a usage example when non-trivial. Skip preambles like `Certainly! Here is...`.",
+    "- Use bullets or numbered lists only when the content has real parallel or sequential structure.",
+    "- Do not end with conditional follow-up offers like `If you want, I can...` / `如果你愿意，我还可以...`; take the real next step or name it directly.",
+    "- Do not use summary-stamp closings like `In summary`, `Hope this helps`, `一句话总结`, `总结一下`, `简而言之`; state the final claim directly.",
 ].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;
+    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++;
     }
-    out.push(line);
-    i++;
-  }
-  return out.join("\n");
+    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 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>"));
-  };
+    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)));
+    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;
+    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.
@@ -139,142 +165,153 @@ export function sortSkillsInSystemPrompt(prompt: string): string {
  *  injected). The mcp module check lives in `resolveMcpConfigs`, so this
  *  code only needs to look at the server's own `enabled` flag. */
 function buildGuidelines(): string[] {
-  const out: string[] = [
-    BASE_GUIDANCE,
-    INJECT_AGENTS_MD_GUIDANCE,   // from hooks/inject-agents-md.ts — always on
-  ];
-  if (isModuleEnabled("secretRedaction")) out.push(REDACT_GUIDANCE);
-  return out;
+    const out: string[] = [
+        BASE_GUIDANCE,
+        TALK_NORMAL_GUIDANCE,
+        INJECT_AGENTS_MD_GUIDANCE, // from hooks/inject-agents-md.ts — always on
+    ];
+    if (isModuleEnabled("secretRedaction")) out.push(REDACT_GUIDANCE);
+    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;
+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))];
+    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(),
-  }));
+    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. */
 function installGuidelines(pi: ExtensionAPI): void {
-  const blocks = buildGuidelines();
-  const joined = blocks.join("\n\n");
-  const marker = "## Decorated Pi Guidance";
-
-  pi.on("before_agent_start", async (event: any) => {
-    if (!event.systemPrompt) return undefined;
-    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}` };
-  });
+    const blocks = buildGuidelines();
+    const joined = blocks.join("\n\n");
+    const marker = "## Decorated Pi Guidance";
+
+    pi.on("before_agent_start", async (event: any) => {
+        if (!event.systemPrompt) return undefined;
+        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}` };
+    });
 }
 
 export default async function (pi: ExtensionAPI) {
-  // Snapshot the module settings that pi is about to load. /dp-settings
-  // compares against this to avoid prompting for reload when the user
-  // has only returned the settings to the currently-loaded state.
-  captureModuleSnapshot();
-
-  // ── Skeleton (hooks) ───────────────────────────────────────────────────
-  const sk = createSkeleton();
-
-  // Order matters for tool_result compose chain:
-  //   1. redact → normalize-codeblocks → externalize → track-mtime → inject-agents-md → image-vision → wakatime
-  // The first module registered for a given event runs first (compose chain).
-  if (isModuleEnabled("secretRedaction")) setupRedact(sk);
-  sk.register(normalizeCodeblocksModule);
-  sk.register(externalizeModule);
-  sk.register(trackMtimeModule);
-  sk.register(injectAgentsMdModule);
-  sk.register(imageVisionModule);
-
-  // session_start handlers (parallel)
-  // pi-tool-filter must register first so native tools are dropped before
-  // anything else inspects the tool list.
-  sk.register(piToolFilterModule);
-  sk.register(sessionTitleModule);
-  if (isModuleEnabled("atOverride")) sk.register(smartAtModule);
-  if (isModuleEnabled("wakatime")) sk.register(wakatimeModule);
-
-  // Compaction + RTK (these also install their own pi.on via setup<>()).
-  setupCompaction(sk);
-  if (isModuleEnabled("rtk")) setupRtk(sk, pi);
-  if (isModuleEnabled("wakatime")) setupWakatime(sk, pi);
-
-  // ── Tools (conditional on module switches) ────────────────────────────
-  if (isModuleEnabled("patchOverrideEdit")) registerPatchTool(pi);
-  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
-  // module means no session_start handler runs, no tools register, no
-  // /mcp command is available, and no background connections are attempted.
-  if (isModuleEnabled("mcp")) {
-    // One-time migration: legacy global MCP configs in
-    // ~/.pi/agent/decorated-pi.json move to ~/.pi/agent/mcp.json. Run
-    // 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"),
-      });
+    // Snapshot the module settings that pi is about to load. /dp-settings
+    // compares against this to avoid prompting for reload when the user
+    // has only returned the settings to the currently-loaded state.
+    captureModuleSnapshot();
+
+    // ── Skeleton (hooks) ───────────────────────────────────────────────────
+    const sk = createSkeleton();
+
+    // Order matters for tool_result compose chain:
+    //   1. redact → normalize-codeblocks → externalize → track-mtime → inject-agents-md → image-vision → wakatime
+    // The first module registered for a given event runs first (compose chain).
+    if (isModuleEnabled("secretRedaction")) setupRedact(sk);
+    sk.register(normalizeCodeblocksModule);
+    sk.register(thinkingLabelStripModule);
+    sk.register(externalizeModule);
+    sk.register(trackMtimeModule);
+    sk.register(injectAgentsMdModule);
+    sk.register(imageVisionModule);
+
+    // session_start handlers (parallel)
+    // pi-tool-filter must register first so native tools are dropped before
+    // anything else inspects the tool list.
+    sk.register(piToolFilterModule);
+    sk.register(sessionTitleModule);
+    if (isModuleEnabled("atOverride")) sk.register(smartAtModule);
+    if (isModuleEnabled("wakatime")) sk.register(wakatimeModule);
+
+    // Compaction + RTK (these also install their own pi.on via setup<>()).
+    setupCompaction(sk);
+    if (isModuleEnabled("rtk")) setupRtk(sk);
+    if (isModuleEnabled("wakatime")) setupWakatime(sk, pi);
+
+    // ── Tools (conditional on module switches) ────────────────────────────
+    if (isModuleEnabled("patchOverrideEdit")) registerPatchTool(pi);
+    if (isModuleEnabled("lsp")) {
+        const lspDeps = collectLspDependencyStatuses(process.cwd());
+        if (lspDeps.some((d) => d.state === "ok")) {
+            registerLspTools(pi, new LspServerManager());
+        }
+        for (const dep of lspDeps) {
+            if (dep.state !== "ok") {
+                sk.declareMissing({
+                    name: dep.label,
+                    module: "lsp",
+                    hint: dep.detail,
+                });
+            }
+        }
     }
-    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());
+    if (isModuleEnabled("ask")) registerAskTool(pi);
+
+    // MCP: hook, tools, and /mcp command are gated together. Disabling the
+    // module means no session_start handler runs, no tools register, no
+    // /mcp command is available, and no background connections are attempted.
+    if (isModuleEnabled("mcp")) {
+        // One-time migration: legacy global MCP configs in
+        // ~/.pi/agent/decorated-pi.json move to ~/.pi/agent/mcp.json. Run
+        // explicitly here so `loadGlobalMcpConfigs` stays pure.
+        migrateLegacyGlobalMcpConfig();
+        sk.register(mcpModule);
+        const mcpDeps = collectMcpDependencyStatuses(process.cwd());
+        for (const dep of mcpDeps) {
+            if (dep.state !== "ok") {
+                sk.declareMissing({
+                    name: dep.label, // binary name (e.g. "codegraph")
+                    module: "mcp",
+                    hint: dep.detail,
+                });
+            }
+        }
+        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);
     }
-    registerMcpStatusCommand(pi);
-  }
 
-  // ── Builtin skills (travel with the plugin in every project) ─────────────
-  installBuiltinSkills(pi);
+    // ── Builtin skills (travel with the plugin in every project) ─────────────
+    installBuiltinSkills(pi);
 
-  // ── System-prompt guidelines (single handler, array order = prompt order) ──
-  installGuidelines(pi);
+    // ── System-prompt guidelines (single handler, array order = prompt order) ──
+    installGuidelines(pi);
 
-  // ── Commands ──────────────────────────────────────────────────────────
-  registerDpModelCommand(pi);
-  registerDpSettingsCommand(pi);
-  if (isModuleEnabled("retry")) registerRetryCommand(pi);
-  if (isModuleEnabled("usage")) registerUsageCommand(pi);
+    // ── Commands ──────────────────────────────────────────────────────────
+    registerDpModelCommand(pi);
+    registerDpSettingsCommand(pi);
+    if (isModuleEnabled("retry")) registerRetryCommand(pi);
+    if (isModuleEnabled("usage")) registerUsageCommand(pi);
 
-  // ── Install skeleton (last) ────────────────────────────────────────────
-  sk.install(pi);
+    // ── Install skeleton (last) ────────────────────────────────────────────
+    sk.install(pi);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "decorated-pi",
-    "version": "0.7.2",
+    "version": "0.8.0",
     "description": "decorated-pi is a practical enhancement pack for pi coding agent — token-efficient workflow, cache-friendly design, and smarter tools.",
     "keywords": [
         "pi",
@@ -26,7 +26,9 @@
     "dependencies": {
         "@ff-labs/fff-node": "^0.9.4",
         "@modelcontextprotocol/sdk": "^1.29.0",
+        "chardet": "^2.2.0",
         "file-type": "^21.3.4",
+        "iconv-lite": "^0.7.2",
         "openai": "^6.37.0"
     },
     "peerDependencies": {