march-cli 0.1.21 → 0.1.23

package/src/mcp/index.mjs

@@ -1,48 +1,48 @@
-export { loadMcpConfig, loadMcpConfigHierarchical, detectTransport, validateMcpConfig, serverDisplayName } from "./config.mjs";
-export { McpClientManager } from "./client.mjs";
-export { buildMcpToolName, parseMcpToolName, convertMcpTool, convertAllMcpTools } from "./tools.mjs";
-
-/**
- * Initialize MCP: load config, connect to servers, discover tools.
- * Returns { clientManager, mcpTools, mcpInjections, errors }.
- */
-export async function initializeMcp({ projectDir }) {
-  const { loadMcpConfig } = await import("./config.mjs");
-  const { McpClientManager } = await import("./client.mjs");
-  const { convertAllMcpTools } = await import("./tools.mjs");
-
-  const servers = loadMcpConfig(projectDir);
-  if (servers.size === 0) {
-    return { clientManager: null, mcpTools: [], mcpInjections: [], errors: [] };
-  }
-
-  const clientManager = new McpClientManager();
-  const errors = [];
-  const mcpInjections = [];
-
-  for (const [name, config] of servers) {
-    if (config.enabled === false) continue;
-    try {
-      await clientManager.connect(name, config);
-      await clientManager.discoverTools(name);
-      const injection = buildMcpInstructionsInjection(name, config);
-      if (injection) mcpInjections.push(injection);
-    } catch (err) {
-      errors.push({ server: name, error: err.message });
-    }
-  }
-
-  const mcpTools = convertAllMcpTools(clientManager);
-  return { clientManager, mcpTools, mcpInjections, errors };
-}
-
-export function buildMcpInstructionsInjection(serverName, config) {
-  if (typeof config?.instructions !== "string") return null;
-  const content = config.instructions.trim();
-  if (!content) return null;
-  return {
-    type: "mcp_server",
-    source: serverName,
-    content,
-  };
-}
+export { loadMcpConfig, loadMcpConfigHierarchical, detectTransport, validateMcpConfig, serverDisplayName } from "./config.mjs";
+export { McpClientManager } from "./client.mjs";
+export { buildMcpToolName, parseMcpToolName, convertMcpTool, convertAllMcpTools } from "./tools.mjs";
+
+/**
+ * Initialize MCP: load config, connect to servers, discover tools.
+ * Returns { clientManager, mcpTools, mcpInjections, errors }.
+ */
+export async function initializeMcp({ projectDir }) {
+  const { loadMcpConfig } = await import("./config.mjs");
+  const { McpClientManager } = await import("./client.mjs");
+  const { convertAllMcpTools } = await import("./tools.mjs");
+
+  const servers = loadMcpConfig(projectDir);
+  if (servers.size === 0) {
+    return { clientManager: null, mcpTools: [], mcpInjections: [], errors: [] };
+  }
+
+  const clientManager = new McpClientManager();
+  const errors = [];
+  const mcpInjections = [];
+
+  for (const [name, config] of servers) {
+    if (config.enabled === false) continue;
+    try {
+      await clientManager.connect(name, config);
+      await clientManager.discoverTools(name);
+      const injection = buildMcpInstructionsInjection(name, config);
+      if (injection) mcpInjections.push(injection);
+    } catch (err) {
+      errors.push({ server: name, error: err.message });
+    }
+  }
+
+  const mcpTools = convertAllMcpTools(clientManager);
+  return { clientManager, mcpTools, mcpInjections, errors };
+}
+
+export function buildMcpInstructionsInjection(serverName, config) {
+  if (typeof config?.instructions !== "string") return null;
+  const content = config.instructions.trim();
+  if (!content) return null;
+  return {
+    type: "mcp_server",
+    source: serverName,
+    content,
+  };
+}

package/src/mcp/tools.mjs

@@ -1,98 +1,98 @@
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-
-/**
- * Build a tool name from server + tool: mcp__{server}__{tool}
- */
-export function buildMcpToolName(server, tool) {
-  return `mcp__${sanitize(server)}__${sanitize(tool)}`;
-}
-
-/**
- * Parse an MCP tool name back into { server, tool }.
- */
-export function parseMcpToolName(name) {
-  const match = name.match(/^mcp__([^_]+(?:_[^_]+)*?)__([^_]+(?:_.+)?)$/);
-  if (!match) return null;
-  return { server: match[1], tool: match[2] };
-}
-
-function sanitize(s) {
-  return s.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/__+/g, "_");
-}
-
-/**
- * Map JSON Schema type to TypeBox type.
- * Handles the common MCP parameter schemas.
- */
-function schemaToTypeBox(schema) {
-  if (!schema || !schema.properties) return Type.Object({});
-
-  const props = {};
-  const required = new Set(schema.required ?? []);
-
-  for (const [key, prop] of Object.entries(schema.properties)) {
-    let box;
-    switch (prop.type) {
-      case "string":
-        box = Type.String();
-        break;
-      case "number":
-      case "integer":
-        box = Type.Number();
-        break;
-      case "boolean":
-        box = Type.Boolean();
-        break;
-      case "array":
-        box = Type.Array(
-          prop.items ? schemaToTypeBox(prop.items) : Type.Any(),
-        );
-        break;
-      case "object":
-        box = schemaToTypeBox(prop);
-        break;
-      default:
-        box = Type.Any();
-    }
-    if (prop.description) box = box({ description: prop.description });
-    if (!required.has(key)) box = Type.Optional(box);
-    props[key] = box;
-  }
-
-  return Type.Object(props);
-}
-
-/**
- * Convert an MCP tool definition to a March-compatible tool.
- */
-export function convertMcpTool(serverName, mcpTool, clientManager) {
-  const fullName = buildMcpToolName(serverName, mcpTool.name);
-  const description = mcpTool.description ?? `MCP tool: ${serverName}/${mcpTool.name}`;
-
-  return defineTool({
-    name: fullName,
-    label: `MCP:${serverName}/${mcpTool.name}`,
-    description: `[MCP ${serverName}] ${description}`,
-    parameters: schemaToTypeBox(mcpTool.inputSchema),
-    execute: async (_toolCallId, params) => {
-      const result = await clientManager.callTool(serverName, mcpTool.name, params);
-      return {
-        content: [{ type: "text", text: result.content }],
-        details: result.details,
-      };
-    },
-  });
-}
-
-/**
- * Batch-convert all tools from all connected servers.
- */
-export function convertAllMcpTools(clientManager) {
-  const tools = [];
-  const allTools = clientManager.getAllTools();
-  for (const { server, tool } of allTools) {
-    tools.push(convertMcpTool(server, tool, clientManager));
-  }
-  return tools;
-}
+import { defineTool } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+
+/**
+ * Build a tool name from server + tool: mcp__{server}__{tool}
+ */
+export function buildMcpToolName(server, tool) {
+  return `mcp__${sanitize(server)}__${sanitize(tool)}`;
+}
+
+/**
+ * Parse an MCP tool name back into { server, tool }.
+ */
+export function parseMcpToolName(name) {
+  const match = name.match(/^mcp__([^_]+(?:_[^_]+)*?)__([^_]+(?:_.+)?)$/);
+  if (!match) return null;
+  return { server: match[1], tool: match[2] };
+}
+
+function sanitize(s) {
+  return s.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/__+/g, "_");
+}
+
+/**
+ * Map JSON Schema type to TypeBox type.
+ * Handles the common MCP parameter schemas.
+ */
+function schemaToTypeBox(schema) {
+  if (!schema || !schema.properties) return Type.Object({});
+
+  const props = {};
+  const required = new Set(schema.required ?? []);
+
+  for (const [key, prop] of Object.entries(schema.properties)) {
+    let box;
+    switch (prop.type) {
+      case "string":
+        box = Type.String();
+        break;
+      case "number":
+      case "integer":
+        box = Type.Number();
+        break;
+      case "boolean":
+        box = Type.Boolean();
+        break;
+      case "array":
+        box = Type.Array(
+          prop.items ? schemaToTypeBox(prop.items) : Type.Any(),
+        );
+        break;
+      case "object":
+        box = schemaToTypeBox(prop);
+        break;
+      default:
+        box = Type.Any();
+    }
+    if (prop.description) box = box({ description: prop.description });
+    if (!required.has(key)) box = Type.Optional(box);
+    props[key] = box;
+  }
+
+  return Type.Object(props);
+}
+
+/**
+ * Convert an MCP tool definition to a March-compatible tool.
+ */
+export function convertMcpTool(serverName, mcpTool, clientManager) {
+  const fullName = buildMcpToolName(serverName, mcpTool.name);
+  const description = mcpTool.description ?? `MCP tool: ${serverName}/${mcpTool.name}`;
+
+  return defineTool({
+    name: fullName,
+    label: `MCP:${serverName}/${mcpTool.name}`,
+    description: `[MCP ${serverName}] ${description}`,
+    parameters: schemaToTypeBox(mcpTool.inputSchema),
+    execute: async (_toolCallId, params) => {
+      const result = await clientManager.callTool(serverName, mcpTool.name, params);
+      return {
+        content: [{ type: "text", text: result.content }],
+        details: result.details,
+      };
+    },
+  });
+}
+
+/**
+ * Batch-convert all tools from all connected servers.
+ */
+export function convertAllMcpTools(clientManager) {
+  const tools = [];
+  const allTools = clientManager.getAllTools();
+  for (const { server, tool } of allTools) {
+    tools.push(convertMcpTool(server, tool, clientManager));
+  }
+  return tools;
+}

package/src/memory/markdown/markdown-delete.mjs

@@ -1,23 +1,23 @@
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { formatMemoryMarkdown, normalizeTags, parseMemoryMarkdown } from "./markdown-format.mjs";
-
-export function softDeleteMemoryFile({ path, entry = null, now = () => new Date() } = {}) {
-  if (!existsSync(path)) throw new Error(`memory not found: ${path}`);
-  const parsed = parseMemoryMarkdown(readFileSync(path, "utf8"));
-  const id = String(parsed.frontmatter.id ?? entry?.id ?? "");
-  if (!id) throw new Error(`memory file is missing id: ${path}`);
-  if (String(parsed.frontmatter.status ?? "active") === "deleted") {
-    return { id, path, status: "deleted", alreadyDeleted: true };
-  }
-  writeFileSync(path, formatMemoryMarkdown({
-    frontmatter: {
-      ...parsed.frontmatter,
-      id,
-      tags: normalizeTags(parsed.frontmatter.tags ?? entry?.tags ?? []),
-      status: "deleted",
-      updated_at: now().toISOString(),
-    },
-    body: parsed.body,
-  }), "utf8");
-  return { id, path, status: "deleted", alreadyDeleted: false };
-}
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { formatMemoryMarkdown, normalizeTags, parseMemoryMarkdown } from "./markdown-format.mjs";
+
+export function softDeleteMemoryFile({ path, entry = null, now = () => new Date() } = {}) {
+  if (!existsSync(path)) throw new Error(`memory not found: ${path}`);
+  const parsed = parseMemoryMarkdown(readFileSync(path, "utf8"));
+  const id = String(parsed.frontmatter.id ?? entry?.id ?? "");
+  if (!id) throw new Error(`memory file is missing id: ${path}`);
+  if (String(parsed.frontmatter.status ?? "active") === "deleted") {
+    return { id, path, status: "deleted", alreadyDeleted: true };
+  }
+  writeFileSync(path, formatMemoryMarkdown({
+    frontmatter: {
+      ...parsed.frontmatter,
+      id,
+      tags: normalizeTags(parsed.frontmatter.tags ?? entry?.tags ?? []),
+      status: "deleted",
+      updated_at: now().toISOString(),
+    },
+    body: parsed.body,
+  }), "utf8");
+  return { id, path, status: "deleted", alreadyDeleted: false };
+}

package/src/memory/markdown/markdown-format.mjs

@@ -1,128 +1,128 @@
-import { randomUUID } from "node:crypto";
-import { existsSync, readdirSync } from "node:fs";
-import { join } from "node:path";
-
-export function parseMemoryMarkdown(content) {
-  if (!content.startsWith("---\n")) return { frontmatter: {}, body: content, title: extractTitle(content) };
-  const end = content.indexOf("\n---", 4);
-  if (end === -1) throw new Error("unterminated frontmatter");
-  const frontmatter = parseFrontmatter(content.slice(4, end));
-  const body = content.slice(content.indexOf("\n", end + 1) + 1);
-  return { frontmatter, body, title: extractTitle(body) };
-}
-
-export function formatMemoryMarkdown({ frontmatter, body }) {
-  const lines = ["---"];
-  for (const key of ["id", "name", "description", "status", "created_at", "updated_at"]) {
-    if (frontmatter[key] != null) lines.push(`${key}: ${formatYamlScalar(frontmatter[key])}`);
-  }
-  lines.push("tags:");
-  for (const tag of frontmatter.tags ?? []) lines.push(`  - ${formatYamlScalar(tag)}`);
-  lines.push("---", "", String(body ?? "").trimEnd(), "");
-  return lines.join("\n");
-}
-
-export function normalizeTags(tags) {
-  const raw = Array.isArray(tags) ? tags : [tags];
-  const out = [];
-  for (const tag of raw) {
-    const value = normalizeTag(tag);
-    if (value && !out.includes(value)) out.push(value);
-  }
-  return out;
-}
-
-export function expandTags(tags) {
-  const terms = [];
-  for (const tag of tags) {
-    terms.push(tag);
-    for (const part of tag.split(/[\/_-]+/)) {
-      if (part) terms.push(part);
-    }
-  }
-  return [...new Set(terms.map(normalizeText).filter(Boolean))];
-}
-
-export function quoteFtsTerm(term) {
-  return `"${String(term).replace(/"/g, '""')}"`;
-}
-
-export function normalizeText(text) {
-  return String(text ?? "").trim().toLowerCase();
-}
-
-export function generateMemoryId() {
-  return `mem_${randomUUID().replace(/-/g, "").slice(0, 16)}`;
-}
-
-export function slugify(value) {
-  return String(value ?? "memory")
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9\u4e00-\u9fff]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .slice(0, 80) || "memory";
-}
-
-export function walkMarkdownFiles(root) {
-  const out = [];
-  if (!existsSync(root)) return out;
-  const walk = (dir) => {
-    for (const entry of readdirSync(dir, { withFileTypes: true })) {
-      const path = join(dir, entry.name);
-      if (entry.isDirectory()) walk(path);
-      else if (entry.isFile() && entry.name.toLowerCase().endsWith(".md")) out.push(path);
-    }
-  };
-  walk(root);
-  return out;
-}
-
-function normalizeTag(tag) {
-  return String(tag ?? "")
-    .trim()
-    .replace(/\s+/g, "-")
-    .replace(/\/{2,}/g, "/")
-    .toLowerCase();
-}
-
-function parseFrontmatter(text) {
-  const result = {};
-  const lines = text.split(/\r?\n/);
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    const match = line.match(/^([A-Za-z0-9_-]+):\s*(.*)$/);
-    if (!match) continue;
-    const key = match[1];
-    const value = match[2];
-    if (value === "") {
-      const items = [];
-      while (i + 1 < lines.length && /^\s+-\s+/.test(lines[i + 1])) {
-        i += 1;
-        items.push(unquoteYaml(lines[i].replace(/^\s+-\s+/, "")));
-      }
-      result[key] = items;
-    } else {
-      result[key] = unquoteYaml(value);
-    }
-  }
-  return result;
-}
-
-function unquoteYaml(value) {
-  const trimmed = String(value ?? "").trim();
-  if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
-    return trimmed.slice(1, -1);
-  }
-  return trimmed;
-}
-
-function formatYamlScalar(value) {
-  const text = String(value ?? "");
-  if (/[:#\n]|^\s|\s$/.test(text)) return JSON.stringify(text);
-  return text;
-}
-
-function extractTitle(body) {
-  return body.split(/\r?\n/).find((line) => line.startsWith("# "))?.slice(2).trim() ?? "";
-}
+import { randomUUID } from "node:crypto";
+import { existsSync, readdirSync } from "node:fs";
+import { join } from "node:path";
+
+export function parseMemoryMarkdown(content) {
+  if (!content.startsWith("---\n")) return { frontmatter: {}, body: content, title: extractTitle(content) };
+  const end = content.indexOf("\n---", 4);
+  if (end === -1) throw new Error("unterminated frontmatter");
+  const frontmatter = parseFrontmatter(content.slice(4, end));
+  const body = content.slice(content.indexOf("\n", end + 1) + 1);
+  return { frontmatter, body, title: extractTitle(body) };
+}
+
+export function formatMemoryMarkdown({ frontmatter, body }) {
+  const lines = ["---"];
+  for (const key of ["id", "name", "description", "status", "created_at", "updated_at"]) {
+    if (frontmatter[key] != null) lines.push(`${key}: ${formatYamlScalar(frontmatter[key])}`);
+  }
+  lines.push("tags:");
+  for (const tag of frontmatter.tags ?? []) lines.push(`  - ${formatYamlScalar(tag)}`);
+  lines.push("---", "", String(body ?? "").trimEnd(), "");
+  return lines.join("\n");
+}
+
+export function normalizeTags(tags) {
+  const raw = Array.isArray(tags) ? tags : [tags];
+  const out = [];
+  for (const tag of raw) {
+    const value = normalizeTag(tag);
+    if (value && !out.includes(value)) out.push(value);
+  }
+  return out;
+}
+
+export function expandTags(tags) {
+  const terms = [];
+  for (const tag of tags) {
+    terms.push(tag);
+    for (const part of tag.split(/[\/_-]+/)) {
+      if (part) terms.push(part);
+    }
+  }
+  return [...new Set(terms.map(normalizeText).filter(Boolean))];
+}
+
+export function quoteFtsTerm(term) {
+  return `"${String(term).replace(/"/g, '""')}"`;
+}
+
+export function normalizeText(text) {
+  return String(text ?? "").trim().toLowerCase();
+}
+
+export function generateMemoryId() {
+  return `mem_${randomUUID().replace(/-/g, "").slice(0, 16)}`;
+}
+
+export function slugify(value) {
+  return String(value ?? "memory")
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9\u4e00-\u9fff]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .slice(0, 80) || "memory";
+}
+
+export function walkMarkdownFiles(root) {
+  const out = [];
+  if (!existsSync(root)) return out;
+  const walk = (dir) => {
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      const path = join(dir, entry.name);
+      if (entry.isDirectory()) walk(path);
+      else if (entry.isFile() && entry.name.toLowerCase().endsWith(".md")) out.push(path);
+    }
+  };
+  walk(root);
+  return out;
+}
+
+function normalizeTag(tag) {
+  return String(tag ?? "")
+    .trim()
+    .replace(/\s+/g, "-")
+    .replace(/\/{2,}/g, "/")
+    .toLowerCase();
+}
+
+function parseFrontmatter(text) {
+  const result = {};
+  const lines = text.split(/\r?\n/);
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const match = line.match(/^([A-Za-z0-9_-]+):\s*(.*)$/);
+    if (!match) continue;
+    const key = match[1];
+    const value = match[2];
+    if (value === "") {
+      const items = [];
+      while (i + 1 < lines.length && /^\s+-\s+/.test(lines[i + 1])) {
+        i += 1;
+        items.push(unquoteYaml(lines[i].replace(/^\s+-\s+/, "")));
+      }
+      result[key] = items;
+    } else {
+      result[key] = unquoteYaml(value);
+    }
+  }
+  return result;
+}
+
+function unquoteYaml(value) {
+  const trimmed = String(value ?? "").trim();
+  if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
+}
+
+function formatYamlScalar(value) {
+  const text = String(value ?? "");
+  if (/[:#\n]|^\s|\s$/.test(text)) return JSON.stringify(text);
+  return text;
+}
+
+function extractTitle(body) {
+  return body.split(/\r?\n/).find((line) => line.startsWith("# "))?.slice(2).trim() ?? "";
+}

package/src/memory/markdown/markdown-recall.mjs

@@ -1,28 +1,28 @@
-import { expandTags, normalizeText } from "./markdown-format.mjs";
-
-export function formatRecallHints(source, hints = []) {
-  if (!hints.length) return "";
-  const lines = [`[memory_hint source="${source}"]`];
-  for (const hint of hints) {
-    lines.push(`- ${hint.id} | ${hint.name} | ${hint.description}`);
-  }
-  return lines.join("\n");
-}
-
-export function scoreEntry(entry, terms, currentProject) {
-  const expanded = expandTags(entry.tags);
-  let score = 0;
-  for (const term of terms) {
-    if (entry.tags.map(normalizeText).includes(term)) score += 10;
-    else if (expanded.includes(term)) score += 5;
-  }
-  if (currentProject) {
-    const projectTag = normalizeText(`project/${currentProject}`);
-    if (entry.tags.map(normalizeText).includes(projectTag)) score += 2;
-  }
-  return score;
-}
-
-export function toHint(entry) {
-  return { id: entry.id, name: entry.name, description: entry.description };
-}
+import { expandTags, normalizeText } from "./markdown-format.mjs";
+
+export function formatRecallHints(source, hints = []) {
+  if (!hints.length) return "";
+  const lines = [`[memory_hint source="${source}"]`];
+  for (const hint of hints) {
+    lines.push(`- ${hint.id} | ${hint.name} | ${hint.description}`);
+  }
+  return lines.join("\n");
+}
+
+export function scoreEntry(entry, terms, currentProject) {
+  const expanded = expandTags(entry.tags);
+  let score = 0;
+  for (const term of terms) {
+    if (entry.tags.map(normalizeText).includes(term)) score += 10;
+    else if (expanded.includes(term)) score += 5;
+  }
+  if (currentProject) {
+    const projectTag = normalizeText(`project/${currentProject}`);
+    if (entry.tags.map(normalizeText).includes(projectTag)) score += 2;
+  }
+  return score;
+}
+
+export function toHint(entry) {
+  return { id: entry.id, name: entry.name, description: entry.description };
+}