mono-pilot 0.2.3 → 0.2.5

package/dist/src/extensions/system-prompt.js

@@ -2,6 +2,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
+import { formatSkillsForPrompt, loadSkills } from "@mariozechner/pi-coding-agent";
 const NO_DESCRIPTION_PLACEHOLDER = "No short description provided.";
 const PROJECT_CONTEXT_HEADER = "# Project Context";
 const CURRENT_DATETIME_PREFIX = "Current date and time:";
@@ -13,6 +14,7 @@ const CURRENT_WORKING_DIRECTORY_TOKEN = "{{CURRENT_WORKING_DIRECTORY}}";
 const PI_README_PATH_TOKEN = "{{PI_README_PATH}}";
 const PI_DOCS_PATH_TOKEN = "{{PI_DOCS_PATH}}";
 const PI_EXAMPLES_PATH_TOKEN = "{{PI_EXAMPLES_PATH}}";
+const SKILLS_BLOCK_TOKEN = "{{SKILLS_BLOCK}}";
 const UNIFIED_SYSTEM_PROMPT_TEMPLATE = `You are an expert coding assistant operating inside MonoPilot (a pi-coding-agent compatibility harness) on a user's computer.
 You help users by reading files, executing commands, editing code, and writing new files.
 
@@ -166,7 +168,8 @@ Your main goal is to follow the USER's instructions at each message, denoted by
 <runtime_context>
 Current date and time: ${CURRENT_DATETIME_TOKEN}
 Current working directory: ${CURRENT_WORKING_DIRECTORY_TOKEN}
-</runtime_context>`;
+</runtime_context>
+${SKILLS_BLOCK_TOKEN}`;
 function getFirstDescriptionLine(description) {
     if (!description)
         return NO_DESCRIPTION_PLACEHOLDER;
@@ -228,7 +231,9 @@ function renderTemplate(template, values) {
         .split(PI_DOCS_PATH_TOKEN)
         .join(values.piDocsPath)
         .split(PI_EXAMPLES_PATH_TOKEN)
-        .join(values.piExamplesPath);
+        .join(values.piExamplesPath)
+        .split(SKILLS_BLOCK_TOKEN)
+        .join(values.skillsBlock);
 }
 function getFallbackDateTimeText() {
     return new Date().toString();
@@ -284,6 +289,10 @@ export default function systemPromptExtension(pi) {
         const projectContext = extractProjectContextBlock(event.systemPrompt) ?? "Project-specific instructions were not provided.";
         const currentDateTime = extractValueAfterPrefix(event.systemPrompt, CURRENT_DATETIME_PREFIX) ?? getFallbackDateTimeText();
         const cwd = extractValueAfterPrefix(event.systemPrompt, CURRENT_WORKING_DIRECTORY_PREFIX) ?? process.cwd();
+        // Load skills directly since pi-mono skips injection when "read" tool
+        // is not in the base tool set (mono-pilot uses "ReadFile" instead).
+        const { skills } = loadSkills({ cwd });
+        const skillsBlock = formatSkillsForPrompt(skills);
         const unifiedPrompt = renderTemplate(UNIFIED_SYSTEM_PROMPT_TEMPLATE, {
             tools,
             projectContext,
@@ -292,6 +301,7 @@ export default function systemPromptExtension(pi) {
             piReadmePath: piDocsPaths.readmePath,
             piDocsPath: piDocsPaths.docsPath,
             piExamplesPath: piDocsPaths.examplesPath,
+            skillsBlock,
         });
         if (unifiedPrompt === event.systemPrompt) {
             return undefined;

package/dist/src/extensions/user-message.js

@@ -1,5 +1,6 @@
 import { existsSync } from "node:fs";
 import { readdir, readFile } from "node:fs/promises";
+import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import process from "node:process";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -138,37 +139,48 @@ async function buildMcpInstructionsEnvelope(workspaceCwd) {
 }
 async function buildRulesEnvelope(workspaceCwd) {
     const rulesDirPath = resolve(workspaceCwd, RULES_RELATIVE_DIR);
-    if (!existsSync(rulesDirPath))
-        return undefined;
-    let directoryEntries;
-    try {
-        directoryEntries = await readdir(rulesDirPath, { withFileTypes: true, encoding: "utf8" });
-    }
-    catch {
-        return undefined;
-    }
-    const ruleFileNames = directoryEntries
-        .filter((entry) => entry.isFile() && entry.name.endsWith(".rule.txt"))
-        .map((entry) => entry.name)
-        .sort((a, b) => a.localeCompare(b));
-    if (ruleFileNames.length === 0)
-        return undefined;
-    const rules = [];
-    for (const ruleFileName of ruleFileNames) {
-        const ruleFilePath = resolve(rulesDirPath, ruleFileName);
+    const userRulesDirPath = resolve(homedir(), RULES_RELATIVE_DIR);
+    const loadRulesFromDir = async (dirPath) => {
+        if (!existsSync(dirPath))
+            return new Map();
+        let directoryEntries;
         try {
-            const content = await readFile(ruleFilePath, "utf-8");
-            const normalized = content.trim();
-            if (normalized.length > 0) {
-                rules.push(normalized);
-            }
+            directoryEntries = await readdir(dirPath, { withFileTypes: true, encoding: "utf8" });
         }
         catch {
-            // Ignore unreadable rule files.
+            return new Map();
+        }
+        const ruleFileNames = directoryEntries
+            .filter((entry) => entry.isFile() && entry.name.endsWith(".rule.txt"))
+            .map((entry) => entry.name)
+            .sort((a, b) => a.localeCompare(b));
+        const rules = new Map();
+        for (const ruleFileName of ruleFileNames) {
+            const ruleFilePath = resolve(dirPath, ruleFileName);
+            try {
+                const content = await readFile(ruleFilePath, "utf-8");
+                const normalized = content.trim();
+                if (normalized.length > 0) {
+                    rules.set(ruleFileName, normalized);
+                }
+            }
+            catch {
+                // Ignore unreadable rule files.
+            }
         }
+        return rules;
+    };
+    const userRules = await loadRulesFromDir(userRulesDirPath);
+    const workspaceRules = await loadRulesFromDir(rulesDirPath);
+    const mergedRules = new Map(userRules);
+    for (const [fileName, content] of workspaceRules) {
+        mergedRules.set(fileName, content);
     }
-    if (rules.length === 0)
+    if (mergedRules.size === 0)
         return undefined;
+    const rules = Array.from(mergedRules.entries())
+        .sort(([a], [b]) => a.localeCompare(b))
+        .map(([, content]) => content);
     const lines = ["<rules>"];
     for (const rule of rules) {
         lines.push("<user_rule>");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mono-pilot",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Cursor-compatible coding agent powered by pi-mono",
   "type": "module",
   "license": "MIT",
@@ -44,10 +44,10 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@mariozechner/pi-agent-core": "^0.55.0",
-    "@mariozechner/pi-ai": "^0.55.0",
-    "@mariozechner/pi-coding-agent": "^0.55.0",
-    "@mariozechner/pi-tui": "^0.55.0",
+    "@mariozechner/pi-agent-core": "^0.55.1",
+    "@mariozechner/pi-ai": "^0.55.1",
+    "@mariozechner/pi-coding-agent": "^0.55.1",
+    "@mariozechner/pi-tui": "^0.55.1",
     "@sinclair/typebox": "^0.34.13",
     "glob": "^13.0.1"
   },