mcpill 1.3.0 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.5.0
+
+- `mcpill init` scaffolds `.mcpill/server/hooks/` with a commented `example-hook.md` stub covering all four Claude Code event types (`PreToolUse`, `PostToolUse`, `PreCompact`, `Stop`)
+- `PILL.md` template now includes commented-out `## Hook:` and `## Prompt:` section stubs with inline field explanations
+- `mcpill compile` merges user-defined hooks from `PILL.md` `## Hook:` blocks and `.mcpill/server/hooks/*.md` files alongside auto-generated `replaces:` hooks into a unified `.claude/settings.json` list; all four event types supported
+- `pill-agent-guide.md` documents `## Hook:` sections, `.mcpill/server/hooks/*.md` files, and the `--no-hooks` flag
+
+## 1.4.0
+
+- `mcpill compile` and `mcpill validate` now auto-run `npm install` in the server directory when `node_modules` is absent and the server has declared dependencies
+
 ## 1.3.0
 
 - `PILL.md` tool sections now accept a `replaces` field (comma-separated native tool names, e.g. `replaces: Read, Bash`); `mcpill compile` reads these and generates the `PreToolUse` hook without requiring a separate `AGENT.md`

package/README.md

@@ -46,9 +46,10 @@ Scaffolds a new project in the current directory:
 - `.mcpill/pill-agent-guide.md` — agent instructions read by Claude when building from `PILL.md`
 - `.mcpill/server.md` — server config + resources
 - `.mcpill/server/prompts/greeting.md` — example prompt
+- `.mcpill/server/hooks/example-hook.md` — stub hook file (see file for format; all fields commented out by default)
 - `.mcpill/HELLO-MCP.md` — ready-to-run example (copy into `PILL.md` to try it)
 - `.claude/commands/create-pill.md` — `/create-pill` slash command; say `/create-pill` in Claude Code to start the guided pill-creation workflow
-- `package.json` — `{ type: "module", dependencies: { mcpill-runtime } }` — run `npm install`
+- `package.json` — `{ type: "module", dependencies: { mcpill-runtime } }` — deps are installed automatically by `mcpill compile` and `mcpill validate`
 
 ### `mcpill compile`
 

package/dist/cli.js

@@ -3,8 +3,8 @@
 // src/cli.ts
 import { Command } from "commander";
 import { fileURLToPath } from "url";
-import { dirname, join as join5 } from "path";
-import { readFileSync as readFileSync4 } from "fs";
+import { dirname, join as join6 } from "path";
+import { readFileSync as readFileSync5 } from "fs";
 
 // src/commands/init.ts
 import fs from "fs";
@@ -22,6 +22,7 @@ Instructions for building an mcpill MCP server from a filled \`PILL.md\`.
    - \`## Tool: <name>\`     \u2192 one tool per section (repeatable)
    - \`## Resource: <name>\` \u2192 static resource (optional, repeatable)
    - \`## Prompt: <name>\`   \u2192 prompt template (optional, repeatable)
+   - \`## Hook: <name>\`     \u2192 hook definition (optional, repeatable) \u2014 compiled directly by \`mcpill compile\`
 
 2. **Write** the server files into the pre-created scaffold at \`.mcpill/\`:
 
@@ -76,6 +77,16 @@ Instructions for building an mcpill MCP server from a filled \`PILL.md\`.
    \`\`\`
    Omit \`## Args\` if the prompt takes no arguments.
 
+   \`.mcpill/server/hooks/{hook-name}.md\` \u2014 optional; one file per standalone hook (alternative to \`## Hook:\` blocks in PILL.md):
+   \`\`\`
+   trigger: PreToolUse
+   matcher: .*
+   command: echo "example"
+   \`\`\`
+   Valid trigger values: \`PreToolUse\` | \`PostToolUse\` | \`PreCompact\` | \`Stop\`.
+   \`matcher\` is a regex matched against the tool name (PreToolUse/PostToolUse only); omit to match all tools.
+   \`command\` stdout is shown to Claude; exit code != 0 blocks the tool call (PreToolUse only).
+
 3. **Translate** each tool's \`behavior\` field into a working JS async handler.
    - Implement the described logic fully \u2014 no stubs, no TODOs.
    - Handler is self-contained: no top-level imports.
@@ -84,8 +95,9 @@ Instructions for building an mcpill MCP server from a filled \`PILL.md\`.
    - Allowed parameter types: \`string | number | boolean\`. Default unknown types to \`string\`.
 
 4. **Run** \`mcpill compile\`.
-   - If the pill's \`AGENT.md\` has a \`## Tools\` table with a \`replaces\` column, compile also writes a \`PreToolUse\` hook into \`.claude/settings.json\` that warns Claude to use the pill's MCP tools instead of native file tools.
-   - To skip hook generation: \`mcpill compile --no-hooks\`.
+   - If the pill's \`AGENT.md\` has a \`## Tools\` table with a \`replaces\` column, compile writes a \`PreToolUse\` hook into \`.claude/settings.json\` that warns Claude to use the pill's MCP tools instead of native file tools.
+   - If PILL.md has \`## Hook:\` sections (or \`.mcpill/server/hooks/*.md\` files exist), compile writes those hooks into \`.claude/settings.json\` under the corresponding event key. These coexist with the auto-generated \`replaces:\` hooks \u2014 both are merged.
+   - To skip all hook generation: \`mcpill compile --no-hooks\`.
 
 5. **Report** what was generated and show the user the next commands:
    \`\`\`
@@ -153,6 +165,40 @@ behavior: |
 
 ---
 
+<!-- Add a ## Prompt: section to define a reusable prompt template.
+     The build agent creates .mcpill/server/prompts/<name>.md for each.
+     Remove comment markers to activate.
+
+## Prompt: my-prompt
+
+description: Describe what this prompt does.
+args:
+  - query (string): The question or topic.
+behavior: |
+  Research {{query}} and provide a structured summary.
+
+-->
+
+---
+
+<!-- Add a ## Hook: section to run a shell command when Claude Code fires an event.
+     Run: mcpill compile after editing to apply changes to .claude/settings.json.
+     Remove comment markers to activate.
+
+     trigger  \u2014 event that fires the hook: PreToolUse | PostToolUse | PreCompact | Stop
+     matcher  \u2014 regex matched against tool name (PreToolUse/PostToolUse only); blank = all tools
+     command  \u2014 shell command; stdout shown to Claude; exit!=0 blocks (PreToolUse)
+
+## Hook: example-hook
+
+trigger: PreToolUse
+matcher: .*
+command: echo "example hook \u2014 replace this command"
+
+-->
+
+---
+
 ## Next Steps
 
 Fill in your server above (replace or extend the example tools), then tell Claude:
@@ -238,6 +284,37 @@ name: Status
 ---
 The server is running.
 `;
+var EXAMPLE_HOOK_MD = `# example-hook
+
+<!--
+Stub hook file \u2014 fill in the fields below and run: mcpill compile
+
+TRIGGER \u2014 which event fires this hook (required):
+  PreToolUse  \u2014 runs before Claude calls a tool
+  PostToolUse \u2014 runs after a tool returns a result
+  PreCompact  \u2014 runs before Claude compacts/summarizes its context
+  Stop        \u2014 runs when Claude finishes responding
+
+MATCHER \u2014 regex matched against the tool name (optional):
+  Used for PreToolUse and PostToolUse only; ignored for PreCompact and Stop.
+  Omit or leave blank to match all tools.
+  Examples:  Read|Write|Edit   (specific tools)
+             Bash               (Bash tool only)
+             .*                 (all tools \u2014 same as omitting)
+
+COMMAND \u2014 shell command to run when the hook fires (required):
+  stdout is shown to Claude as context before/after the tool call.
+  Exit code != 0 blocks the tool call (PreToolUse only).
+  Examples:  echo "use pill tools instead of native file tools"
+             ./scripts/pre-check.sh
+
+Copy the fields below the closing --> and fill them in to activate this hook:
+
+trigger: PreToolUse
+matcher: .*
+command: echo "example hook \u2014 replace this command"
+-->
+`;
 var GREETING_PROMPT_MD = `# greeting
 
 Generate a greeting
@@ -365,8 +442,10 @@ ${projectName}/
         \u251C\u2500\u2500 mcpill.config.json         \u2190 compiled config
         \u251C\u2500\u2500 tools/                     \u2190 one .md file per tool
         \u2502   \u2514\u2500\u2500 my-tool.md
-        \u2514\u2500\u2500 prompts/                   \u2190 one .md file per prompt (optional)
-            \u2514\u2500\u2500 greeting.md
+        \u251C\u2500\u2500 prompts/                   \u2190 one .md file per prompt (optional)
+        \u2502   \u2514\u2500\u2500 greeting.md
+        \u2514\u2500\u2500 hooks/                     \u2190 one .md file per hook (optional)
+            \u2514\u2500\u2500 example-hook.md
 \`\`\`
 
 ## Editing tools manually
@@ -405,10 +484,12 @@ async function runInit(opts) {
   }
   fs.mkdirSync(path.join(serverDir, "tools"), { recursive: true });
   fs.mkdirSync(path.join(serverDir, "prompts"), { recursive: true });
+  fs.mkdirSync(path.join(serverDir, "hooks"), { recursive: true });
   fs.mkdirSync(path.join(targetDir, ".claude", "commands"), { recursive: true });
   const serverMd = SERVER_MD_TEMPLATE.replace("name: my-server", `name: ${projectName}`);
   fs.writeFileSync(path.join(mcpillDir, "server.md"), serverMd);
   fs.writeFileSync(path.join(serverDir, "prompts", "greeting.md"), GREETING_PROMPT_MD);
+  fs.writeFileSync(path.join(serverDir, "hooks", "example-hook.md"), EXAMPLE_HOOK_MD);
   fs.writeFileSync(
     path.join(serverDir, "mcpill.config.json"),
     JSON.stringify({ name: projectName, transport: "stdio", port: 3333 }, null, 2)
@@ -438,6 +519,7 @@ async function runInit(opts) {
   console.log("\u2713 .mcpill/HELLO-MCP.md           \u2190 copy into PILL.md to see a working example instantly");
   console.log("\u2713 .mcpill/server.md              \u2190 or edit source files directly");
   console.log("\u2713 .mcpill/server/prompts/greeting.md");
+  console.log("\u2713 .mcpill/server/hooks/example-hook.md \u2190 stub hook (see file for format)");
   console.log("\u2713 .mcpill/pill-agent-guide.md    \u2190 agent instructions (read by Claude)");
   console.log("\u2713 .mcpill/pill-user-guide.md     \u2190 start here");
   console.log("\u2713 .claude/commands/create-pill.md \u2190 /create-pill skill (say: /create-pill)");
@@ -610,13 +692,27 @@ async function loadResources(mcpillDir) {
 import fs5 from "fs";
 import path6 from "path";
 
+// src/commands/ensure-deps.ts
+import { execSync } from "child_process";
+import { existsSync, readFileSync } from "fs";
+import { join } from "path";
+function ensureDeps(serverDir) {
+  if (!existsSync(join(serverDir, "mcpill.config.json"))) return;
+  if (!existsSync(join(serverDir, "package.json"))) return;
+  if (existsSync(join(serverDir, "node_modules"))) return;
+  const pkg2 = JSON.parse(readFileSync(join(serverDir, "package.json"), "utf-8"));
+  if (!pkg2.dependencies || Object.keys(pkg2.dependencies).length === 0) return;
+  console.log("Installing server dependencies\u2026");
+  execSync("npm install", { cwd: serverDir, stdio: "inherit" });
+}
+
 // src/compiler/hooks.ts
-import { readFileSync as readFileSync2, existsSync, writeFileSync, mkdirSync } from "fs";
-import { join as join2 } from "path";
+import { readFileSync as readFileSync3, existsSync as existsSync2, writeFileSync, mkdirSync } from "fs";
+import { join as join3 } from "path";
 
 // src/compiler/parse.ts
-import { readdirSync, readFileSync } from "fs";
-import { join } from "path";
+import { readdirSync, readFileSync as readFileSync2 } from "fs";
+import { join as join2 } from "path";
 function extractSections(content) {
   const sections = /* @__PURE__ */ new Map();
   const pieces = ("\n" + content).split("\n## ");
@@ -747,7 +843,7 @@ function parsePromptFile(content) {
   return { name, description, args, messages };
 }
 function parseServerDir(dir) {
-  const serverMdContent = readFileSync(join(dir, "server.md"), "utf-8");
+  const serverMdContent = readFileSync2(join2(dir, "server.md"), "utf-8");
   const sections = extractSections(serverMdContent);
   const configBody = sections.get("Config") ?? "";
   const configKv = parseKvBlock(configBody);
@@ -758,7 +854,7 @@ function parseServerDir(dir) {
   };
   const resourcesBody = sections.get("Resources") ?? "";
   const resources = parseResourcesSection(resourcesBody);
-  const toolsDir = join(dir, "server", "tools");
+  const toolsDir = join2(dir, "server", "tools");
   const tools = [];
   let toolFiles = [];
   try {
@@ -766,9 +862,9 @@ function parseServerDir(dir) {
   } catch {
   }
   for (const file of toolFiles) {
-    tools.push(parseToolFile(readFileSync(join(toolsDir, file), "utf-8")));
+    tools.push(parseToolFile(readFileSync2(join2(toolsDir, file), "utf-8")));
   }
-  const promptsDir = join(dir, "server", "prompts");
+  const promptsDir = join2(dir, "server", "prompts");
   const prompts = [];
   let promptFiles = [];
   try {
@@ -776,7 +872,7 @@ function parseServerDir(dir) {
   } catch {
   }
   for (const file of promptFiles) {
-    prompts.push(parsePromptFile(readFileSync(join(promptsDir, file), "utf-8")));
+    prompts.push(parsePromptFile(readFileSync2(join2(promptsDir, file), "utf-8")));
   }
   return { config, tools, prompts, resources };
 }
@@ -854,12 +950,65 @@ function buildHookEntry(pillName, tools) {
     hooks: [{ type: "command", command: `echo ${JSON.stringify(message)}` }]
   };
 }
+function parsePillMdHooks(content) {
+  const stripped = content.replace(/<!--[\s\S]*?-->/g, "");
+  const hooks = [];
+  const pieces = ("\n" + stripped).split("\n## ");
+  for (const piece of pieces) {
+    if (!piece.toLowerCase().startsWith("hook:")) continue;
+    const nlIdx = piece.indexOf("\n");
+    const body = nlIdx === -1 ? "" : piece.slice(nlIdx + 1);
+    const kv = parseKvBlock(body);
+    const trigger = kv["trigger"]?.trim();
+    const matcher = kv["matcher"]?.trim();
+    const command = kv["command"]?.trim();
+    if (!trigger || !command) continue;
+    hooks.push({ event: trigger, ...matcher ? { matcher } : {}, command });
+  }
+  return hooks;
+}
+function parseHookFile(content) {
+  const stripped = content.replace(/<!--[\s\S]*?-->/g, "");
+  const kv = parseKvBlock(stripped);
+  const trigger = kv["trigger"]?.trim();
+  const matcher = kv["matcher"]?.trim();
+  const command = kv["command"]?.trim();
+  if (!trigger || !command) return null;
+  return { event: trigger, ...matcher ? { matcher } : {}, command };
+}
+function mergeUserHooksIntoSettings(baseDir, hookBlocks) {
+  if (hookBlocks.length === 0) return;
+  const claudeDir = join3(baseDir, ".claude");
+  const settingsPath = join3(claudeDir, "settings.json");
+  let settings = {};
+  if (existsSync2(settingsPath)) {
+    settings = JSON.parse(readFileSync3(settingsPath, "utf-8"));
+  }
+  if (!settings.hooks) settings.hooks = {};
+  for (const block of hookBlocks) {
+    const existing = settings.hooks[block.event] ?? [];
+    const newEntry = {
+      ...block.matcher !== void 0 ? { matcher: block.matcher } : {},
+      hooks: [{ type: "command", command: block.command }]
+    };
+    const matcherKey = block.matcher ?? "";
+    const idx = existing.findIndex((e) => (e.matcher ?? "") === matcherKey);
+    if (idx !== -1) {
+      existing[idx] = newEntry;
+    } else {
+      existing.push(newEntry);
+    }
+    settings.hooks[block.event] = existing;
+  }
+  mkdirSync(claudeDir, { recursive: true });
+  writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+}
 function mergeHookIntoSettings(baseDir, hookEntry) {
-  const claudeDir = join2(baseDir, ".claude");
-  const settingsPath = join2(claudeDir, "settings.json");
+  const claudeDir = join3(baseDir, ".claude");
+  const settingsPath = join3(claudeDir, "settings.json");
   let settings = {};
-  if (existsSync(settingsPath)) {
-    settings = JSON.parse(readFileSync2(settingsPath, "utf-8"));
+  if (existsSync2(settingsPath)) {
+    settings = JSON.parse(readFileSync3(settingsPath, "utf-8"));
   }
   if (!settings.hooks) settings.hooks = {};
   if (!settings.hooks.PreToolUse) settings.hooks.PreToolUse = [];
@@ -917,6 +1066,7 @@ async function runValidate(baseDir) {
     console.error("No pill directories found \u2014 run mcpill compile first");
     process.exit(1);
   }
+  ensureDeps(serverDir);
   await validateOne(serverDir);
   if (!fs5.existsSync(path6.join(mcpillDir, ".no-hooks"))) {
     const agentMdPath = fs5.existsSync(path6.join(baseDir, "AGENT.md")) ? path6.join(baseDir, "AGENT.md") : fs5.existsSync(path6.join(mcpillDir, "AGENT.md")) ? path6.join(mcpillDir, "AGENT.md") : null;
@@ -1017,13 +1167,13 @@ async function runServer(opts) {
 }
 
 // src/commands/compile.ts
-import { resolve, join as join4 } from "path";
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, existsSync as existsSync2 } from "fs";
+import { resolve, join as join5 } from "path";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, existsSync as existsSync3, readdirSync as readdirSync2 } from "fs";
 import { pathToFileURL as pathToFileURL2 } from "url";
 
 // src/compiler/serialize.ts
 import { writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 function serializeResources(resources) {
   return resources.map((r) => {
     let fm = `uri: ${r.uri}`;
@@ -1037,8 +1187,8 @@ ${r.content}`;
   }).join("\n---\n");
 }
 function serializeServerDir(doc, dir) {
-  mkdirSync2(join3(dir, "server", "tools"), { recursive: true });
-  mkdirSync2(join3(dir, "server", "prompts"), { recursive: true });
+  mkdirSync2(join4(dir, "server", "tools"), { recursive: true });
+  mkdirSync2(join4(dir, "server", "prompts"), { recursive: true });
   let serverMd = "## Config\n";
   serverMd += `name: ${doc.config.name}
 `;
@@ -1054,7 +1204,7 @@ ${serializeResources(doc.resources)}
   } else {
     serverMd += "\n## Resources\n";
   }
-  writeFileSync2(join3(dir, "server.md"), serverMd);
+  writeFileSync2(join4(dir, "server.md"), serverMd);
   console.log("\u2713 server.md updated");
   for (const tool of doc.tools) {
     let md = `# ${tool.name}
@@ -1078,7 +1228,7 @@ ${cleanHandler}
 \`\`\`
 `;
     }
-    writeFileSync2(join3(dir, "server", "tools", `${tool.name}.md`), md);
+    writeFileSync2(join4(dir, "server", "tools", `${tool.name}.md`), md);
   }
   for (const prompt of doc.prompts) {
     let md = `# ${prompt.name}
@@ -1102,7 +1252,7 @@ ${cleanHandler}
 `;
       }
     }
-    writeFileSync2(join3(dir, "server", "prompts", `${prompt.name}.md`), md);
+    writeFileSync2(join4(dir, "server", "prompts", `${prompt.name}.md`), md);
   }
   console.log(`\u2713 tools/ updated (${doc.tools.length} files)`);
   console.log(`\u2713 prompts/ updated (${doc.prompts.length} files)`);
@@ -1239,21 +1389,21 @@ ${r.content}`;
 }
 async function runCompile(opts) {
   const baseDir = resolve(opts.dir ?? process.cwd());
-  const mcpillDir = join4(baseDir, ".mcpill");
-  const serverDir = join4(mcpillDir, "server");
+  const mcpillDir = join5(baseDir, ".mcpill");
+  const serverDir = join5(mcpillDir, "server");
   if (opts.toMd) {
-    const configPath = join4(serverDir, "mcpill.config.json");
-    if (!existsSync2(configPath)) {
+    const configPath = join5(serverDir, "mcpill.config.json");
+    if (!existsSync3(configPath)) {
       throw new Error("No pill found \u2014 run mcpill compile first");
     }
     const config = await loadConfig(serverDir);
     const resources = await loadResources(serverDir);
-    const promptsPath = join4(serverDir, "prompts.json");
-    const prompts = JSON.parse(readFileSync3(promptsPath, "utf-8"));
-    const toolsPath = join4(serverDir, "tools.js");
-    const handlers = existsSync2(toolsPath) ? extractHandlers(readFileSync3(toolsPath, "utf-8")) : /* @__PURE__ */ new Map();
+    const promptsPath = join5(serverDir, "prompts.json");
+    const prompts = JSON.parse(readFileSync4(promptsPath, "utf-8"));
+    const toolsPath = join5(serverDir, "tools.js");
+    const handlers = existsSync3(toolsPath) ? extractHandlers(readFileSync4(toolsPath, "utf-8")) : /* @__PURE__ */ new Map();
     let tools = [];
-    if (existsSync2(toolsPath)) {
+    if (existsSync3(toolsPath)) {
       const mod = await import(pathToFileURL2(toolsPath).href);
       tools = mod.default.map((t) => {
         const schema = {};
@@ -1284,13 +1434,13 @@ async function runCompile(opts) {
     return;
   }
   const doc = parseServerDir(mcpillDir);
-  const toolsJsPath = join4(serverDir, "tools.js");
-  const existing = existsSync2(toolsJsPath) ? extractHandlers(readFileSync3(toolsJsPath, "utf-8")) : /* @__PURE__ */ new Map();
+  const toolsJsPath = join5(serverDir, "tools.js");
+  const existing = existsSync3(toolsJsPath) ? extractHandlers(readFileSync4(toolsJsPath, "utf-8")) : /* @__PURE__ */ new Map();
   const { doc: mergedDoc, stubbed } = mergeHandlers(doc, existing);
-  const pillMdPath = join4(baseDir, "PILL.md");
+  const pillMdPath = join5(baseDir, "PILL.md");
   let pillContent = null;
-  if (existsSync2(pillMdPath)) {
-    pillContent = readFileSync3(pillMdPath, "utf-8");
+  if (existsSync3(pillMdPath)) {
+    pillContent = readFileSync4(pillMdPath, "utf-8");
     const serverSection = ("\n" + pillContent).split("\n## ").find((s) => s.startsWith("Server\n"));
     if (serverSection) {
       const kv = parseKvBlock(serverSection.slice("Server\n".length));
@@ -1307,18 +1457,19 @@ async function runCompile(opts) {
     console.warn(`\u26A0  Stub generated for tool: ${name}`);
   }
   mkdirSync3(serverDir, { recursive: true });
-  writeFileSync3(join4(serverDir, "mcpill.config.json"), JSON.stringify(mergedDoc.config, null, 2));
-  writeFileSync3(join4(serverDir, "prompts.json"), JSON.stringify(mergedDoc.prompts, null, 2));
-  writeFileSync3(join4(serverDir, "resources.md"), serializeResourcesMd(mergedDoc.resources));
+  writeFileSync3(join5(serverDir, "mcpill.config.json"), JSON.stringify(mergedDoc.config, null, 2));
+  writeFileSync3(join5(serverDir, "prompts.json"), JSON.stringify(mergedDoc.prompts, null, 2));
+  writeFileSync3(join5(serverDir, "resources.md"), serializeResourcesMd(mergedDoc.resources));
   writeFileSync3(toolsJsPath, generateToolsJs(mergedDoc.tools));
+  ensureDeps(serverDir);
   console.log(`\u2713 .mcpill/server/ updated from .mcpill/server.md, .mcpill/server/tools/, .mcpill/server/prompts/`);
   if (opts.noHooks) {
-    writeFileSync3(join4(mcpillDir, ".no-hooks"), "");
+    writeFileSync3(join5(mcpillDir, ".no-hooks"), "");
     return;
   }
-  const agentMdPath = existsSync2(join4(baseDir, "AGENT.md")) ? join4(baseDir, "AGENT.md") : existsSync2(join4(mcpillDir, "AGENT.md")) ? join4(mcpillDir, "AGENT.md") : null;
+  const agentMdPath = existsSync3(join5(baseDir, "AGENT.md")) ? join5(baseDir, "AGENT.md") : existsSync3(join5(mcpillDir, "AGENT.md")) ? join5(mcpillDir, "AGENT.md") : null;
   const pillTools = pillContent ? parsePillMdTools(pillContent) : [];
-  const agentTools = agentMdPath ? parseAgentMdTools(readFileSync3(agentMdPath, "utf-8")) : [];
+  const agentTools = agentMdPath ? parseAgentMdTools(readFileSync4(agentMdPath, "utf-8")) : [];
   const toolMap = new Map([...pillTools, ...agentTools].map((t) => [t.name, t]));
   const allTools = Array.from(toolMap.values());
   const hookEntry = buildHookEntry(mergedDoc.config.name, allTools);
@@ -1326,6 +1477,25 @@ async function runCompile(opts) {
     mergeHookIntoSettings(baseDir, hookEntry);
     console.log(`\u2713 .claude/settings.json updated with PreToolUse hook`);
   }
+  const pillHooks = pillContent ? parsePillMdHooks(pillContent) : [];
+  const hooksDir = join5(mcpillDir, "server", "hooks");
+  const fileHooks = [];
+  if (existsSync3(hooksDir)) {
+    let hookFiles = [];
+    try {
+      hookFiles = readdirSync2(hooksDir).filter((f) => f.endsWith(".md"));
+    } catch {
+    }
+    for (const file of hookFiles) {
+      const entry = parseHookFile(readFileSync4(join5(hooksDir, file), "utf-8"));
+      if (entry) fileHooks.push(entry);
+    }
+  }
+  const allUserHooks = [...pillHooks, ...fileHooks];
+  if (allUserHooks.length > 0) {
+    mergeUserHooksIntoSettings(baseDir, allUserHooks);
+    console.log(`\u2713 .claude/settings.json updated with ${allUserHooks.length} user-defined hook(s)`);
+  }
 }
 
 // src/commands/pack.ts
@@ -1374,7 +1544,7 @@ async function runPublish(dir, access) {
 // src/cli.ts
 var pkgDir = dirname(fileURLToPath(import.meta.url));
 var pkg = JSON.parse(
-  readFileSync4(join5(pkgDir, "../package.json"), "utf-8")
+  readFileSync5(join6(pkgDir, "../package.json"), "utf-8")
 );
 var program = new Command();
 program.name("mcpill").version(pkg.version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcpill",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "type": "module",
   "description": "CLI for building, validating, and publishing MCP servers using the pill format.",
   "homepage": "https://mcpill.ruco.dev",
@@ -11,6 +11,11 @@
   "bugs": {
     "url": "https://github.com/ruco-dev/mcpill/issues"
   },
+  "files": [
+    "dist",
+    "README.md",
+    "CHANGELOG.md"
+  ],
   "bin": {
     "mcpill": "./dist/cli.js"
   },