mcpill 1.3.0 → 1.6.0

package/src/commands/run.ts

@@ -1,105 +0,0 @@
-import path from "path";
-import fs from "fs";
-import { z } from "mcpill-runtime";
-import { createServer, applySetup } from "mcpster";
-import { loadConfig } from "../loaders/config.js";
-import { loadTools } from "../loaders/tools.js";
-import { loadPrompts } from "../loaders/prompts.js";
-import { loadResources } from "../loaders/resources.js";
-import { runValidate } from "./validate.js";
-
-type ZodRawShape = Record<string, z.ZodTypeAny>;
-
-export async function runServer(opts: {
-  dir?: string;
-  transport?: "stdio" | "http";
-  port?: number;
-}): Promise<void> {
-  const baseDir = path.resolve(opts.dir ?? process.cwd());
-
-  await runValidate(baseDir);
-
-  const mcpillDir = path.join(baseDir, ".mcpill", "server");
-  if (!fs.existsSync(path.join(mcpillDir, "mcpill.config.json"))) {
-    console.error("No pill found — run mcpill compile first");
-    process.exit(1);
-  };
-
-  const [tools, prompts, resources, config] = await Promise.all([
-    loadTools(mcpillDir),
-    loadPrompts(mcpillDir),
-    loadResources(mcpillDir),
-    loadConfig(mcpillDir),
-  ]);
-
-  const transport = opts.transport ?? config.transport;
-  const port = opts.port ?? config.port;
-  const { name } = config;
-
-  const server = createServer({
-    name,
-    version: "0.1.0",
-    transport,
-    http: { port },
-  });
-
-  for (const { name: toolName, description, schema, handler } of tools) {
-    server.defineTool({
-      name: toolName,
-      description,
-      schema: z.object(schema as ZodRawShape),
-      handler: handler as (input: Record<string, unknown>) => Promise<unknown>,
-    });
-  }
-
-  for (const { name: promptName, description, messages } of prompts) {
-    server.definePrompt({
-      name: promptName,
-      description,
-      handler: async (args: Record<string, string>) =>
-        messages
-          .map((m) =>
-            m.content.replace(
-              /\{\{(\w+)\}\}/g,
-              (_, k: string) => String(args[k] ?? "")
-            )
-          )
-          .join("\n"),
-    });
-  }
-
-  for (const { uri, name: resourceName, content } of resources) {
-    server.defineResource({
-      uri,
-      description: resourceName ?? uri,
-      resolver: async () => content,
-    });
-  }
-
-  applySetup(name, tools.map((t) => t.name), {
-    projectPath: baseDir,
-    permissions: 'restrictive',
-    register: true,
-    cmdOverride: {
-      command: 'mcpill',
-      args: ['run', '--dir', baseDir],
-    },
-  })
-
-  try {
-    await server.start();
-  } catch (err) {
-    const nodeErr = err as NodeJS.ErrnoException;
-    if (nodeErr.code === "EADDRINUSE") {
-      console.error(
-        `Port ${port} is already in use. Use --port to specify another.`
-      );
-      process.exit(1);
-    }
-    throw err;
-  }
-
-  process.stderr.write(
-    `✓ MCPill running — ${tools.length} tools, ${prompts.length} prompts, ${resources.length} resources [${transport}]\n`
-  );
-}

package/src/commands/validate.ts

@@ -1,87 +0,0 @@
-import fs from "fs";
-import path from "path";
-import { loadConfig } from "../loaders/config.js";
-import { loadTools } from "../loaders/tools.js";
-import { loadPrompts } from "../loaders/prompts.js";
-import { loadResources } from "../loaders/resources.js";
-import { parseAgentMdTools } from "../compiler/hooks.js";
-
-async function validateOne(mcpillDir: string): Promise<void> {
-  const errors: string[] = [];
-  let toolCount = 0;
-  let promptCount = 0;
-  let resourceCount = 0;
-
-  try {
-    const tools = await loadTools(mcpillDir);
-    toolCount = tools.length;
-  } catch (err) {
-    errors.push(err instanceof Error ? err.message : String(err));
-  }
-
-  try {
-    const prompts = await loadPrompts(mcpillDir);
-    promptCount = prompts.length;
-  } catch (err) {
-    errors.push(err instanceof Error ? err.message : String(err));
-  }
-
-  try {
-    const resources = await loadResources(mcpillDir);
-    resourceCount = resources.length;
-  } catch (err) {
-    errors.push(err instanceof Error ? err.message : String(err));
-  }
-
-  try {
-    await loadConfig(mcpillDir);
-  } catch (err) {
-    errors.push(err instanceof Error ? err.message : String(err));
-  }
-
-  if (errors.length > 0) {
-    for (const error of errors) {
-      console.error(error);
-    }
-    process.exit(1);
-  }
-
-  console.log(`✓ Valid: ${toolCount} tools, ${promptCount} prompts, ${resourceCount} resources`);
-}
-
-export async function runValidate(baseDir: string): Promise<void> {
-  const mcpillDir = path.join(baseDir, ".mcpill");
-  const serverDir = path.join(mcpillDir, "server");
-  if (!fs.existsSync(path.join(serverDir, "mcpill.config.json"))) {
-    console.error("No pill directories found — run mcpill compile first");
-    process.exit(1);
-  }
-
-  await validateOne(serverDir);
-
-  // Non-fatal: warn if AGENT.md declares replacements but no hook is present
-  if (!fs.existsSync(path.join(mcpillDir, ".no-hooks"))) {
-    const agentMdPath = fs.existsSync(path.join(baseDir, "AGENT.md"))
-      ? path.join(baseDir, "AGENT.md")
-      : fs.existsSync(path.join(mcpillDir, "AGENT.md"))
-      ? path.join(mcpillDir, "AGENT.md")
-      : null;
-
-    if (agentMdPath) {
-      const tools = parseAgentMdTools(fs.readFileSync(agentMdPath, "utf-8"));
-      if (tools.length > 0) {
-        const settingsPath = path.join(baseDir, ".claude", "settings.json");
-        let hasHook = false;
-        if (fs.existsSync(settingsPath)) {
-          const settings = JSON.parse(fs.readFileSync(settingsPath, "utf-8")) as {
-            hooks?: { PreToolUse?: unknown[] };
-          };
-          hasHook = Array.isArray(settings?.hooks?.PreToolUse) && settings.hooks.PreToolUse.length > 0;
-        }
-        if (!hasHook) {
-          console.warn("⚠  No PreToolUse hook in .claude/settings.json — run mcpill compile to add it");
-        }
-      }
-    }
-  }
-}

package/src/compiler/hooks.ts

@@ -1,140 +0,0 @@
-import { readFileSync, existsSync, writeFileSync, mkdirSync } from 'fs';
-import { join } from 'path';
-import { parseKvBlock } from './parse.js';
-
-export interface AgentTool {
-  name: string;
-  replaces: string[];
-}
-
-export interface HookEntry {
-  matcher: string;
-  hooks: Array<{ type: string; command: string }>;
-}
-
-function parseMdTableRow(line: string): string[] {
-  return line
-    .split('|')
-    .slice(1, -1)
-    .map((c) => c.trim());
-}
-
-export function parsePillMdTools(content: string): AgentTool[] {
-  const tools: AgentTool[] = [];
-  const pieces = ('\n' + content).split('\n## ');
-  for (const piece of pieces) {
-    if (!piece.toLowerCase().startsWith('tool:')) continue;
-    const nlIdx = piece.indexOf('\n');
-    const sectionTitle = piece.slice(0, nlIdx === -1 ? undefined : nlIdx).trim();
-    const toolName = sectionTitle.slice('tool:'.length).trim();
-    if (!toolName) continue;
-    const body = nlIdx === -1 ? '' : piece.slice(nlIdx + 1);
-    const kv = parseKvBlock(body);
-    const replaces = (kv['replaces'] ?? '')
-      .split(',')
-      .map((s) => s.trim())
-      .filter(Boolean);
-    if (replaces.length > 0) {
-      tools.push({ name: toolName, replaces });
-    }
-  }
-  return tools;
-}
-
-export function parseAgentMdTools(content: string): AgentTool[] {
-  const sections = ('\n' + content).split(/\n## /);
-  const toolsSection = sections.find((s) => /^Tools\s*\n/.test(s));
-  if (!toolsSection) return [];
-
-  const lines = toolsSection.split('\n');
-  let headerIdx = -1;
-  let replacesColIdx = -1;
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i]!.trim();
-    if (!line.startsWith('|')) continue;
-    const cells = parseMdTableRow(line);
-    const idx = cells.findIndex((c) => c.toLowerCase() === 'replaces');
-    if (idx !== -1) {
-      headerIdx = i;
-      replacesColIdx = idx;
-      break;
-    }
-  }
-  if (headerIdx === -1) return [];
-
-  const tools: AgentTool[] = [];
-  for (let i = headerIdx + 1; i < lines.length; i++) {
-    const line = lines[i]!.trim();
-    if (!line.startsWith('|')) break;
-    // Skip separator rows like |---|---|
-    if (/^\|[\s\-:|]+\|$/.test(line)) continue;
-
-    const cells = parseMdTableRow(line);
-    const name = cells[0];
-    if (!name) continue;
-
-    const replacesCell = cells[replacesColIdx] ?? '';
-    const replaces = replacesCell
-      .split(',')
-      .map((s) => s.trim())
-      .filter(Boolean);
-
-    if (replaces.length > 0) {
-      tools.push({ name, replaces });
-    }
-  }
-
-  return tools;
-}
-
-export function buildHookEntry(pillName: string, tools: AgentTool[]): HookEntry | null {
-  const nativeToolSet = new Set<string>();
-  for (const tool of tools) {
-    for (const native of tool.replaces) {
-      nativeToolSet.add(native);
-    }
-  }
-  if (nativeToolSet.size === 0) return null;
-
-  const summary = tools.map((t) => `${t.name}→${t.replaces.join(',')}`).join('; ');
-  const matcher = Array.from(nativeToolSet).join('|');
-  const message = `[mcpill:${pillName}] Use pill tools instead: ${summary}. See .mcpill/AGENT.md.`;
-
-  return {
-    matcher,
-    hooks: [{ type: 'command', command: `echo ${JSON.stringify(message)}` }],
-  };
-}
-
-interface SettingsJson {
-  hooks?: {
-    PreToolUse?: HookEntry[];
-    [key: string]: unknown;
-  };
-  [key: string]: unknown;
-}
-
-export function mergeHookIntoSettings(baseDir: string, hookEntry: HookEntry): void {
-  const claudeDir = join(baseDir, '.claude');
-  const settingsPath = join(claudeDir, 'settings.json');
-
-  let settings: SettingsJson = {};
-  if (existsSync(settingsPath)) {
-    settings = JSON.parse(readFileSync(settingsPath, 'utf-8')) as SettingsJson;
-  }
-
-  if (!settings.hooks) settings.hooks = {};
-  if (!settings.hooks.PreToolUse) settings.hooks.PreToolUse = [];
-
-  // Merge by matcher identity: replace existing entry, otherwise append
-  const idx = settings.hooks.PreToolUse.findIndex((e) => e.matcher === hookEntry.matcher);
-  if (idx !== -1) {
-    settings.hooks.PreToolUse[idx] = hookEntry;
-  } else {
-    settings.hooks.PreToolUse.push(hookEntry);
-  }
-
-  mkdirSync(claudeDir, { recursive: true });
-  writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
-}

package/src/compiler/merge-tools.ts

@@ -1,99 +0,0 @@
-import type { ServerDoc } from './types.js';
-
-function dedent(s: string): string {
-  const lines = s.split('\n');
-  const nonEmpty = lines.filter((l) => l.trim());
-  if (nonEmpty.length === 0) return s;
-  const minIndent = nonEmpty.reduce((min, l) => {
-    const m = l.match(/^([ \t]*)/);
-    return Math.min(min, m?.[1]?.length ?? 0);
-  }, Infinity);
-  return lines.map((l) => l.slice(minIndent === Infinity ? 0 : minIndent)).join('\n');
-}
-
-export function extractHandlers(toolsJsContent: string): Map<string, string> {
-  const result = new Map<string, string>();
-
-  // Marker-based extraction: // @handler:name ... // @end-handler:name
-  // Allow leading whitespace before the // so indented markers in tools.js are matched.
-  const markerRegex = /[ \t]*\/\/ @handler:([^\n]+)\n([\s\S]*?)\n[ \t]*\/\/ @end-handler:[^\n]+/g;
-  let match: RegExpExecArray | null;
-  while ((match = markerRegex.exec(toolsJsContent)) !== null) {
-    result.set(match[1]!.trim(), dedent(match[2]!).trim());
-  }
-
-  if (result.size > 0) return result;
-
-  // Fallback: find name: "toolname" then locate handler: expression via brace counting
-  const nameRegex = /name:\s*["']([^"']+)["']/g;
-  while ((match = nameRegex.exec(toolsJsContent)) !== null) {
-    const toolName = match[1]!;
-    const handlerKeyIdx = toolsJsContent.indexOf('handler:', match.index);
-    if (handlerKeyIdx === -1) continue;
-    const expr = extractExpression(toolsJsContent, handlerKeyIdx + 'handler:'.length);
-    if (expr) result.set(toolName, expr);
-  }
-
-  return result;
-}
-
-function extractExpression(src: string, start: number): string | null {
-  let i = start;
-  while (i < src.length && /[ \t]/.test(src[i]!)) i++;
-  const exprStart = i;
-  let depth = 0;
-  let inStr: string | null = null;
-
-  while (i < src.length) {
-    const ch = src[i]!;
-    if (inStr) {
-      if (ch === '\\') { i += 2; continue; }
-      if (ch === inStr) inStr = null;
-    } else if (ch === '"' || ch === "'" || ch === '`') {
-      inStr = ch;
-    } else if (ch === '{' || ch === '(' || ch === '[') {
-      depth++;
-    } else if (ch === '}' || ch === ')' || ch === ']') {
-      depth--;
-      if (depth === 0) {
-        // Peek ahead: if followed by => this is an arrow function params group,
-        // so continue scanning to capture the body too.
-        const rest = src.slice(i + 1);
-        const arrowMatch = rest.match(/^[ \t]*=>/);
-        if (arrowMatch) {
-          i += 1 + arrowMatch[0].length;
-          while (i < src.length && /[ \t]/.test(src[i]!)) i++;
-          // Reset depth — next balanced group is the body
-          continue;
-        }
-        return src.slice(exprStart, i + 1).trim();
-      }
-    } else if (depth === 0 && (ch === ',' || ch === ';' || ch === '\n')) {
-      break;
-    }
-    i++;
-  }
-
-  if (i > exprStart) return src.slice(exprStart, i).trim();
-  return null;
-}
-
-export function mergeHandlers(
-  doc: ServerDoc,
-  existing: Map<string, string>,
-): { doc: ServerDoc; stubbed: string[] } {
-  const stubbed: string[] = [];
-
-  const tools = doc.tools.map((tool) => {
-    if (tool.handler !== undefined) return tool;
-    const found = existing.get(tool.name);
-    if (found !== undefined) return { ...tool, handler: found };
-    stubbed.push(tool.name);
-    return {
-      ...tool,
-      handler: `async () => ({ content: [{ type: 'text', text: 'TODO: implement ${tool.name}' }] })`,
-    };
-  });
-
-  return { doc: { ...doc, tools }, stubbed };
-}

package/src/compiler/parse.ts

@@ -1,236 +0,0 @@
-import { readdirSync, readFileSync } from 'fs';
-import { join } from 'path';
-import type { ServerDoc, ToolDoc, PromptDoc, ResourceDoc } from './types.js';
-
-function extractSections(content: string): Map<string, string> {
-  const sections = new Map<string, string>();
-  const pieces = ('\n' + content).split('\n## ');
-  for (const piece of pieces) {
-    if (!piece.trim()) continue;
-    const nlIdx = piece.indexOf('\n');
-    if (nlIdx === -1) continue;
-    const name = piece.slice(0, nlIdx).trim();
-    const body = piece.slice(nlIdx + 1);
-    sections.set(name, body);
-  }
-  return sections;
-}
-
-function extractFencedBlock(body: string, lang: string): string | null {
-  // Match ``` + lang followed immediately by a newline to avoid matching
-  // a longer lang identifier (e.g. ```json when looking for ```js).
-  const startMarker = '```' + lang + '\n';
-  const start = body.indexOf(startMarker);
-  if (start === -1) return null;
-  const contentStart = start + startMarker.length;
-  const end = body.indexOf('\n```', contentStart);
-  if (end === -1) return body.slice(contentStart).trim();
-  return body.slice(contentStart, end).trim();
-}
-
-export function parseKvBlock(body: string): Record<string, string> {
-  const result: Record<string, string> = {};
-  for (const line of body.split('\n')) {
-    const colonIdx = line.indexOf(':');
-    if (colonIdx === -1) continue;
-    const key = line.slice(0, colonIdx).trim();
-    const value = line.slice(colonIdx + 1).trim();
-    if (key) result[key] = value;
-  }
-  return result;
-}
-
-function parseFrontmatter(block: string): Record<string, string> {
-  return parseKvBlock(block);
-}
-
-function stripHandlerMarkers(jsContent: string): string {
-  return jsContent
-    .split('\n')
-    .filter((l) => !l.trim().startsWith('// @handler:') && !l.trim().startsWith('// @end-handler:'))
-    .join('\n')
-    .trim();
-}
-
-function parseToolsSection(body: string): ToolDoc[] {
-  const tools: ToolDoc[] = [];
-  const pieces = ('\n' + body).split('\n### ');
-  for (const piece of pieces.slice(1)) {
-    const nlIdx = piece.indexOf('\n');
-    const name = (nlIdx === -1 ? piece : piece.slice(0, nlIdx)).trim();
-    const rest = nlIdx === -1 ? '' : piece.slice(nlIdx + 1);
-
-    const descMatch = rest.match(/\*\*Description:\*\*\s*(.+)/);
-    const description = descMatch?.[1]?.trim() ?? '';
-
-    const schemaStr = extractFencedBlock(rest, 'json');
-    const schema = schemaStr
-      ? (JSON.parse(schemaStr) as ToolDoc['schema'])
-      : {};
-
-    const jsBlock = extractFencedBlock(rest, 'js');
-    // Strip @handler/@end-handler markers so ToolDoc.handler holds only the function source.
-    const handler = jsBlock !== null ? stripHandlerMarkers(jsBlock) : undefined;
-
-    tools.push({ name, description, schema, handler });
-  }
-  return tools;
-}
-
-function parseResourcesSection(body: string): ResourceDoc[] {
-  const resources: ResourceDoc[] = [];
-  const blocks = body.split('\n---\n');
-  for (let i = 0; i < blocks.length; i += 2) {
-    const frontmatterBlock = (blocks[i] ?? '').trim();
-    if (!frontmatterBlock) continue;
-    const bodyBlock = blocks[i + 1] ?? '';
-    const frontmatter = parseFrontmatter(frontmatterBlock);
-    if (!frontmatter['uri']) continue;
-    resources.push({
-      uri: frontmatter['uri'],
-      name: frontmatter['name'],
-      mimeType: frontmatter['mimeType'],
-      content: bodyBlock.trim(),
-    });
-  }
-  return resources;
-}
-
-function parseToolFile(content: string): ToolDoc {
-  const lines = content.split('\n');
-
-  const h1Line = lines.find((l) => l.startsWith('# '));
-  const name = h1Line ? h1Line.slice(2).trim() : '';
-
-  let h1Seen = false;
-  let description = '';
-  for (const line of lines) {
-    if (line.startsWith('# ')) { h1Seen = true; continue; }
-    if (!h1Seen) continue;
-    if (line.startsWith('#')) break;
-    const trimmed = line.trim();
-    if (trimmed) { description = trimmed; break; }
-  }
-
-  const sections = extractSections(content);
-
-  const parametersBody = sections.get('Parameters') ?? '';
-  const schema: ToolDoc['schema'] = {};
-  for (const line of parametersBody.split('\n')) {
-    if (!line.startsWith('- ')) continue;
-    const m = line.match(/^- (\w+) \(([^)]+)\): (.+)/);
-    if (!m) continue;
-    const pName = m[1]!;
-    const typeStr = m[2]!.split(',')[0]!.trim() as 'string' | 'number' | 'boolean';
-    const desc = m[3]!.trim();
-    schema[pName] = { type: typeStr, description: desc };
-  }
-
-  const handlerBody = sections.get('Handler') ?? '';
-  const handler = extractFencedBlock(handlerBody, 'js') ?? undefined;
-
-  return { name, description, schema, handler };
-}
-
-function parsePromptFile(content: string): PromptDoc {
-  const lines = content.split('\n');
-
-  const h1Line = lines.find((l) => l.startsWith('# '));
-  const name = h1Line ? h1Line.slice(2).trim() : '';
-
-  let h1Seen = false;
-  let description = '';
-  for (const line of lines) {
-    if (line.startsWith('# ')) { h1Seen = true; continue; }
-    if (!h1Seen) continue;
-    if (line.startsWith('#')) break;
-    const trimmed = line.trim();
-    if (trimmed) { description = trimmed; break; }
-  }
-
-  const sections = extractSections(content);
-
-  const argsBody = sections.get('Args') ?? '';
-  const args: PromptDoc['args'] = {};
-  for (const line of argsBody.split('\n')) {
-    if (!line.startsWith('- ')) continue;
-    const m = line.match(/^- (\w+) \(([^)]+)\): .+/);
-    if (!m) continue;
-    args[m[1]!] = { type: m[2]!.trim() };
-  }
-
-  const messageBody = sections.get('Message') ?? '';
-  const messages: PromptDoc['messages'] = [];
-  for (const line of messageBody.split('\n')) {
-    if (!line.startsWith('> ')) continue;
-    const colonIdx = line.indexOf(': ', 2);
-    if (colonIdx === -1) continue;
-    const role = line.slice(2, colonIdx).trim();
-    const msgContent = line.slice(colonIdx + 2).trim();
-    messages.push({ role, content: msgContent });
-  }
-
-  return { name, description, args, messages };
-}
-
-export function parseServerDoc(content: string): ServerDoc {
-  const sections = extractSections(content);
-
-  const configBody = sections.get('Config') ?? '';
-  const configStr = extractFencedBlock(configBody, 'json') ?? '{}';
-  const config = JSON.parse(configStr) as ServerDoc['config'];
-
-  const toolsBody = sections.get('Tools') ?? '';
-  const tools = parseToolsSection(toolsBody);
-
-  const promptsBody = sections.get('Prompts') ?? '';
-  const promptsStr = extractFencedBlock(promptsBody, 'json') ?? '[]';
-  const prompts = JSON.parse(promptsStr) as PromptDoc[];
-
-  const resourcesBody = sections.get('Resources') ?? '';
-  const resources = parseResourcesSection(resourcesBody);
-
-  return { config, tools, prompts, resources };
-}
-
-export function parseServerDir(dir: string): ServerDoc {
-  const serverMdContent = readFileSync(join(dir, 'server.md'), 'utf-8');
-  const sections = extractSections(serverMdContent);
-
-  const configBody = sections.get('Config') ?? '';
-  const configKv = parseKvBlock(configBody);
-  const config: ServerDoc['config'] = {
-    name: configKv['name'] ?? '',
-    transport: (configKv['transport'] ?? 'stdio') as 'stdio' | 'http',
-    ...(configKv['port'] ? { port: parseInt(configKv['port'], 10) } : {}),
-  };
-
-  const resourcesBody = sections.get('Resources') ?? '';
-  const resources = parseResourcesSection(resourcesBody);
-
-  const toolsDir = join(dir, 'server', 'tools');
-  const tools: ToolDoc[] = [];
-  let toolFiles: string[] = [];
-  try {
-    toolFiles = readdirSync(toolsDir).filter((f) => f.endsWith('.md'));
-  } catch {
-    // tools/ dir doesn't exist — no tools
-  }
-  for (const file of toolFiles) {
-    tools.push(parseToolFile(readFileSync(join(toolsDir, file), 'utf-8')));
-  }
-
-  const promptsDir = join(dir, 'server', 'prompts');
-  const prompts: PromptDoc[] = [];
-  let promptFiles: string[] = [];
-  try {
-    promptFiles = readdirSync(promptsDir).filter((f) => f.endsWith('.md'));
-  } catch {
-    // prompts/ dir doesn't exist — no prompts
-  }
-  for (const file of promptFiles) {
-    prompts.push(parsePromptFile(readFileSync(join(promptsDir, file), 'utf-8')));
-  }
-
-  return { config, tools, prompts, resources };
-}