mcpill 1.2.4 → 1.5.0

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 };
-}

package/src/compiler/serialize.ts

@@ -1,100 +0,0 @@
-import { writeFileSync, mkdirSync } from 'fs';
-import { join } from 'path';
-import type { ServerDoc, ResourceDoc } from './types.js';
-
-function serializeResources(resources: ResourceDoc[]): string {
-  return resources
-    .map((r) => {
-      let fm = `uri: ${r.uri}`;
-      if (r.name) fm += `\nname: ${r.name}`;
-      if (r.mimeType) fm += `\nmimeType: ${r.mimeType}`;
-      return `${fm}\n---\n${r.content}`;
-    })
-    .join('\n---\n');
-}
-
-export function serializeServerDoc(doc: ServerDoc): string {
-  const configSection =
-    `## Config\n\`\`\`json\n${JSON.stringify(doc.config, null, 2)}\n\`\`\``;
-
-  const toolParts = doc.tools.map((tool) => {
-    let part = `### ${tool.name}\n**Description:** ${tool.description}\n\n`;
-    part += `\`\`\`json\n${JSON.stringify(tool.schema, null, 2)}\n\`\`\``;
-    if (tool.handler !== undefined) {
-      part +=
-        `\n\n\`\`\`js\n// @handler:${tool.name}\n${tool.handler}\n// @end-handler:${tool.name}\n\`\`\``;
-    }
-    return part;
-  });
-  const toolsSection =
-    doc.tools.length > 0
-      ? `## Tools\n\n${toolParts.join('\n\n')}`
-      : `## Tools`;
-
-  const promptsSection =
-    `## Prompts\n\`\`\`json\n${JSON.stringify(doc.prompts, null, 2)}\n\`\`\``;
-
-  const resourcesSection =
-    doc.resources.length > 0
-      ? `## Resources\n${serializeResources(doc.resources)}`
-      : `## Resources`;
-
-  return [configSection, toolsSection, promptsSection, resourcesSection].join('\n\n') + '\n';
-}
-
-export function serializeServerDir(doc: ServerDoc, dir: string): void {
-  mkdirSync(join(dir, 'server', 'tools'), { recursive: true });
-  mkdirSync(join(dir, 'server', 'prompts'), { recursive: true });
-
-  let serverMd = '## Config\n';
-  serverMd += `name: ${doc.config.name}\n`;
-  serverMd += `transport: ${doc.config.transport}\n`;
-  if (doc.config.port !== undefined) serverMd += `port: ${doc.config.port}\n`;
-
-  if (doc.resources.length > 0) {
-    serverMd += `\n## Resources\n${serializeResources(doc.resources)}\n`;
-  } else {
-    serverMd += '\n## Resources\n';
-  }
-
-  writeFileSync(join(dir, 'server.md'), serverMd);
-  console.log('✓ server.md updated');
-
-  for (const tool of doc.tools) {
-    let md = `# ${tool.name}\n\n${tool.description}\n\n## Parameters\n\n`;
-    for (const [pName, pDef] of Object.entries(tool.schema)) {
-      md += `- ${pName} (${pDef.type}): ${pDef.description ?? pName}\n`;
-    }
-    if (tool.handler !== undefined) {
-      const cleanHandler = tool.handler
-        .split('\n')
-        .filter((l) => !l.trim().startsWith('// @handler:') && !l.trim().startsWith('// @end-handler:'))
-        .join('\n')
-        .trim();
-      md += `\n## Handler\n\n\`\`\`js\n${cleanHandler}\n\`\`\`\n`;
-    }
-    writeFileSync(join(dir, 'server', 'tools', `${tool.name}.md`), md);
-  }
-
-  for (const prompt of doc.prompts) {
-    let md = `# ${prompt.name}\n\n`;
-    if (prompt.description) md += `${prompt.description}\n\n`;
-    if (Object.keys(prompt.args).length > 0) {
-      md += '## Args\n\n';
-      for (const [argName, argDef] of Object.entries(prompt.args)) {
-        md += `- ${argName} (${argDef.type}): ${argName}\n`;
-      }
-      md += '\n';
-    }
-    if (prompt.messages.length > 0) {
-      md += '## Message\n\n';
-      for (const msg of prompt.messages) {
-        md += `> ${msg.role}: ${msg.content}\n`;
-      }
-    }
-    writeFileSync(join(dir, 'server', 'prompts', `${prompt.name}.md`), md);
-  }
-
-  console.log(`✓ tools/ updated (${doc.tools.length} files)`);
-  console.log(`✓ prompts/ updated (${doc.prompts.length} files)`);
-}

package/src/compiler/types.ts

@@ -1,27 +0,0 @@
-export type ToolDoc = {
-  name: string;
-  description: string;
-  schema: Record<string, { type: 'string' | 'number' | 'boolean'; description?: string }>;
-  handler?: string;
-};
-
-export type PromptDoc = {
-  name: string;
-  description?: string;
-  args: Record<string, { type: string }>;
-  messages: Array<{ role: string; content: string }>;
-};
-
-export type ResourceDoc = {
-  uri: string;
-  name?: string;
-  mimeType?: string;
-  content: string;
-};
-
-export type ServerDoc = {
-  config: { name: string; transport: 'stdio' | 'http'; port?: number };
-  tools: ToolDoc[];
-  prompts: PromptDoc[];
-  resources: ResourceDoc[];
-};

package/src/loaders/config.ts

@@ -1,25 +0,0 @@
-import fs from "fs";
-import path from "path";
-
-export type CliConfig = {
-  name: string;
-  transport: "stdio" | "http";
-  port: number;
-};
-
-const defaults: CliConfig = {
-  name: "mcpill-server",
-  transport: "stdio",
-  port: 3333,
-};
-
-export async function loadConfig(mcpillDir: string): Promise<CliConfig> {
-  const configPath = path.join(mcpillDir, "mcpill.config.json");
-  if (!fs.existsSync(configPath)) {
-    return { ...defaults };
-  }
-  const raw = JSON.parse(
-    fs.readFileSync(configPath, "utf-8")
-  ) as Partial<CliConfig>;
-  return { ...defaults, ...raw };
-}

package/src/loaders/prompts.ts

@@ -1,60 +0,0 @@
-import fs from "fs";
-import path from "path";
-import { z } from "mcpill-runtime";
-
-type ZodRawShape = Record<string, z.ZodTypeAny>;
-
-export type RawPromptDef = {
-  name: string;
-  description?: string;
-  argsShape: ZodRawShape;
-  messages: Array<{ role: string; content: string }>;
-};
-
-const typeMap: Record<string, z.ZodTypeAny> = {
-  string: z.string(),
-  number: z.number(),
-  boolean: z.boolean(),
-};
-
-export async function loadPrompts(mcpillDir: string): Promise<RawPromptDef[]> {
-  const promptsPath = path.join(mcpillDir, "prompts.json");
-  let raw: unknown;
-  try {
-    const content = fs.readFileSync(promptsPath, "utf-8");
-    raw = JSON.parse(content);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    throw new Error(`prompts.json is not valid JSON: ${msg}`);
-  }
-
-  if (!Array.isArray(raw)) {
-    throw new Error("prompts.json is not valid JSON: must be an array");
-  }
-
-  const prompts: RawPromptDef[] = [];
-
-  for (const entry of raw as Array<Record<string, unknown>>) {
-    const argsShape: ZodRawShape = {};
-    const args = (entry["args"] ?? {}) as Record<string, { type: string }>;
-
-    for (const [argName, argDef] of Object.entries(args)) {
-      const typeName = argDef.type;
-      if (!(typeName in typeMap)) {
-        throw new Error(
-          `Prompt '${entry["name"]}': arg '${argName}' uses unsupported type '${typeName}'. Supported: string, number, boolean`
-        );
-      }
-      argsShape[argName] = typeMap[typeName]!;
-    }
-
-    prompts.push({
-      name: entry["name"] as string,
-      description: entry["description"] as string | undefined,
-      argsShape,
-      messages: entry["messages"] as Array<{ role: string; content: string }>,
-    });
-  }
-
-  return prompts;
-}

package/src/loaders/resources.ts

@@ -1,54 +0,0 @@
-import fs from "fs";
-import path from "path";
-
-export type RawResourceDef = {
-  uri: string;
-  name?: string;
-  mimeType?: string;
-  content: string;
-};
-
-function parseFrontmatter(block: string): Record<string, string> {
-  const result: Record<string, string> = {};
-  for (const line of block.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;
-}
-
-export async function loadResources(mcpillDir: string): Promise<RawResourceDef[]> {
-  const resourcesPath = path.join(mcpillDir, "resources.md");
-  const fileContent = fs.readFileSync(resourcesPath, "utf-8");
-  const blocks = fileContent.split("\n---\n");
-
-  const resources: RawResourceDef[] = [];
-
-  // blocks alternate: [frontmatter, body, frontmatter, body, ...]
-  // even indices (0-indexed) = frontmatter = block N (1-indexed odd)
-  for (let i = 0; i < blocks.length; i += 2) {
-    const frontmatterBlock = blocks[i] ?? "";
-    if (frontmatterBlock.trim() === "") continue;
-
-    const bodyBlock = blocks[i + 1] ?? "";
-    const frontmatter = parseFrontmatter(frontmatterBlock);
-
-    if (!frontmatter["uri"]) {
-      throw new Error(
-        `resources.md block ${i + 1} is missing required frontmatter field: uri`
-      );
-    }
-
-    resources.push({
-      uri: frontmatter["uri"],
-      name: frontmatter["name"],
-      mimeType: frontmatter["mimeType"],
-      content: bodyBlock.trim(),
-    });
-  }
-
-  return resources;
-}

package/src/loaders/tools.ts

@@ -1,68 +0,0 @@
-import { pathToFileURL } from "url";
-import path from "path";
-
-export type RawToolDef = {
-  name: string;
-  description: string;
-  schema: Record<string, unknown>;
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  handler: Function;
-};
-
-export async function loadTools(mcpillDir: string): Promise<RawToolDef[]> {
-  const toolsPath = path.join(mcpillDir, "tools.js");
-  let mod: unknown;
-  try {
-    mod = await import(pathToFileURL(toolsPath).href);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    if (msg.includes("mcpill-runtime")) {
-      throw new Error(
-        "tools.js failed to load: mcpill-runtime not found.\nRun: npm install mcpill-runtime"
-      );
-    }
-    throw new Error(`tools.js failed to load: ${msg}`);
-  }
-
-  const tools = (mod as { default?: unknown }).default;
-  if (!Array.isArray(tools)) {
-    throw new Error("tools.js failed to load: default export must be an array");
-  }
-
-  for (let i = 0; i < tools.length; i++) {
-    const tool = tools[i] as Record<string, unknown>;
-
-    for (const field of ["name", "description", "schema", "handler"] as const) {
-      if (tool[field] === undefined || tool[field] === null) {
-        throw new Error(`Tool at index ${i} is missing required field: ${field}`);
-      }
-    }
-
-    if (typeof tool["name"] !== "string") {
-      throw new Error(`Tool at index ${i} is missing required field: name`);
-    }
-    if (typeof tool["description"] !== "string") {
-      throw new Error(`Tool at index ${i} is missing required field: description`);
-    }
-    if (
-      typeof tool["schema"] !== "object" ||
-      Array.isArray(tool["schema"]) ||
-      tool["schema"] === null
-    ) {
-      throw new Error(`Tool at index ${i} is missing required field: schema`);
-    }
-    const name = tool["name"] as string;
-    for (const [key, value] of Object.entries(tool["schema"] as Record<string, unknown>)) {
-      if (value == null || typeof value !== "object" || !("_def" in (value as object))) {
-        throw new Error(
-          `Tool '${name}': schema field '${key}' must be a Zod type (e.g. z.string()). Got a plain value instead.`
-        );
-      }
-    }
-    if (typeof tool["handler"] !== "function") {
-      throw new Error(`Tool '${tool["name"]}': handler must be a function`);
-    }
-  }
-
-  return tools as RawToolDef[];
-}

package/src/templates/prompts/greeting.md

@@ -1,11 +0,0 @@
-# greeting
-
-Generate a greeting
-
-## Args
-
-- name (string): The name to greet
-
-## Message
-
-> user: Say hello to {{name}}

package/src/templates/server.md

@@ -1,9 +0,0 @@
-## Config
-name: my-server
-transport: stdio
-
-## Resources
-uri: info://status
-name: Status
----
-The server is running.

package/src/templates/tools/echo.md

@@ -1,15 +0,0 @@
-# echo
-
-Echo a message back
-
-## Parameters
-
-- message (string): The message to echo
-
-## Handler
-
-```js
-async ({ message }) => {
-  return { content: [{ type: "text", text: message }] };
-}
-```

package/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "strict": true,
-    "outDir": "dist"
-  },
-  "include": ["src"]
-}

package/tsup.config.ts

@@ -1,13 +0,0 @@
-import { defineConfig } from "tsup";
-
-export default defineConfig({
-  entry: ["src/cli.ts"],
-  format: ["esm"],
-  target: "node18",
-  platform: "node",
-  shims: true,
-  banner: {
-    js: "#!/usr/bin/env node",
-  },
-  clean: true,
-});

package/vitest.config.ts

@@ -1,12 +0,0 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-  test: {
-    globals: true,
-    environment: "node",
-    coverage: {
-      provider: "v8",
-      reporter: ["text", "lcov"],
-    },
-  },
-});