@matimo/core 0.1.3 → 0.1.4

package/tools/shared/skill-validation.js

@@ -7,234 +7,245 @@
  */
 import fs from 'fs';
 import path from 'path';
-
-// Name validation
+// ── Name Validation ──────────────────────────────────────────────────────────
+/** Spec: lowercase letters, numbers, hyphens only. */
 const VALID_NAME_PATTERN = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
+/** Consecutive hyphens are not allowed. */
 const CONSECUTIVE_HYPHENS = /--/;
+/** Max length for skill name. */
 const MAX_NAME_LENGTH = 64;
+/** Max length for description. */
 const MAX_DESCRIPTION_LENGTH = 1024;
+/** Max length for compatibility field. */
 const MAX_COMPATIBILITY_LENGTH = 500;
+/** Path traversal detection — kept for defense-in-depth. */
 const UNSAFE_NAME_PATTERN = /[/\\]|\.\.|[\x00-\x1f]/;
-
+/**
+ * Validate a skill name against the Agent Skills spec.
+ *
+ * Rules:
+ * - 1–64 characters
+ * - Lowercase letters, numbers, hyphens only
+ * - Must not start or end with a hyphen
+ * - Must not contain consecutive hyphens (--)
+ * - Must not contain path traversal characters
+ */
 export function validateSkillName(name) {
-  if (!name || name.trim().length === 0) {
-    return { valid: false, error: 'Skill name is required' };
-  }
-
-  if (UNSAFE_NAME_PATTERN.test(name)) {
-    return { valid: false, error: 'Skill name contains invalid characters' };
-  }
-
-  if (name.length > MAX_NAME_LENGTH) {
-    return {
-      valid: false,
-      error: `Skill name must be at most ${MAX_NAME_LENGTH} characters (got ${name.length})`,
-    };
-  }
-
-  if (!VALID_NAME_PATTERN.test(name)) {
-    return {
-      valid: false,
-      error:
-        'Skill name must contain only lowercase letters, numbers, and hyphens, and must not start or end with a hyphen',
-    };
-  }
-
-  if (CONSECUTIVE_HYPHENS.test(name)) {
-    return { valid: false, error: 'Skill name must not contain consecutive hyphens (--)' };
-  }
-
-  return { valid: true };
+    if (!name || name.trim().length === 0) {
+        return { valid: false, error: 'Skill name is required' };
+    }
+    if (UNSAFE_NAME_PATTERN.test(name)) {
+        return { valid: false, error: 'Skill name contains invalid characters' };
+    }
+    if (name.length > MAX_NAME_LENGTH) {
+        return { valid: false, error: `Skill name must be at most ${MAX_NAME_LENGTH} characters (got ${name.length})` };
+    }
+    if (!VALID_NAME_PATTERN.test(name)) {
+        return {
+            valid: false,
+            error: 'Skill name must contain only lowercase letters, numbers, and hyphens, and must not start or end with a hyphen',
+        };
+    }
+    if (CONSECUTIVE_HYPHENS.test(name)) {
+        return { valid: false, error: 'Skill name must not contain consecutive hyphens (--)' };
+    }
+    return { valid: true };
 }
-
+/**
+ * Parse YAML frontmatter from SKILL.md content.
+ *
+ * Handles the spec's required fields (name, description) and optional fields
+ * (license, compatibility, metadata, allowed-tools).
+ */
 export function parseSkillContent(content) {
-  if (!content || !content.startsWith('---')) {
-    return { success: false, error: 'Skill content must start with YAML frontmatter (---)' };
-  }
-
-  const endIndex = content.indexOf('---', 3);
-  if (endIndex === -1) {
-    return { success: false, error: 'Skill content must have closing YAML frontmatter (---)' };
-  }
-
-  const frontmatterBlock = content.substring(3, endIndex).trim();
-  const body = content.substring(endIndex + 3).trim();
-
-  const fields = {};
-  let currentMetadata = null;
-  let currentArray = null;
-  let currentArrayKey = null;
-
-  for (const line of frontmatterBlock.split('\n')) {
-    if (currentArray !== null && /^\s*- /.test(line)) {
-      const item = line.trim().substring(2).trim();
-      if (item) {
-        currentArray.push(item.replace(/^["']|["']$/g, ''));
-      }
-      continue;
-    }
-
-    if (currentMetadata !== null && /^\s+\S/.test(line)) {
-      const colonIndex = line.indexOf(':');
-      if (colonIndex !== -1) {
+    if (!content || !content.startsWith('---')) {
+        return { success: false, error: 'Skill content must start with YAML frontmatter (---)' };
+    }
+    const endIndex = content.indexOf('---', 3);
+    if (endIndex === -1) {
+        return { success: false, error: 'Skill content must have closing YAML frontmatter (---)' };
+    }
+    const frontmatterBlock = content.substring(3, endIndex).trim();
+    const body = content.substring(endIndex + 3).trim();
+    // Parse frontmatter lines
+    const fields = {};
+    let currentMetadata = null;
+    let currentArray = null;
+    let currentArrayKey = null;
+    for (const line of frontmatterBlock.split('\n')) {
+        // Detect array elements (prefixed with "- ")
+        if (currentArray !== null && /^\s*- /.test(line)) {
+            const item = line.trim().substring(2).trim();
+            if (item) {
+                currentArray.push(item.replace(/^["']|["']$/g, ''));
+            }
+            continue;
+        }
+        // Detect metadata sub-keys (indented with spaces under "metadata:")
+        if (currentMetadata !== null && /^\s+\S/.test(line)) {
+            const colonIndex = line.indexOf(':');
+            if (colonIndex !== -1) {
+                const key = line.substring(0, colonIndex).trim();
+                const value = line.substring(colonIndex + 1).trim();
+                if (key && value) {
+                    currentMetadata[key] = value.replace(/^["']|["']$/g, '');
+                }
+            }
+            continue;
+        }
+        // Top-level keys
+        currentMetadata = null;
+        currentArray = null;
+        currentArrayKey = null;
+        const colonIndex = line.indexOf(':');
+        if (colonIndex === -1)
+            continue;
         const key = line.substring(0, colonIndex).trim();
         const value = line.substring(colonIndex + 1).trim();
+        if (key === 'metadata' && !value) {
+            // Start collecting metadata sub-keys
+            currentMetadata = {};
+            fields['__metadata__'] = 'MAP';
+            continue;
+        }
+        // Check for array start (value is empty, array items follow on next lines)
+        if (key === 'allowed-tools' && !value) {
+            currentArray = [];
+            currentArrayKey = 'allowed-tools';
+            continue;
+        }
         if (key && value) {
-          currentMetadata[key] = value.replace(/^["']|["']$/g, '');
+            // Strip surrounding quotes (YAML style)
+            fields[key] = value.replace(/^["']|["']$/g, '');
         }
-      }
-      continue;
     }
-
+    // Store any pending array
     if (currentArray !== null && currentArrayKey) {
-      fields[currentArrayKey] = currentArray;
-    }
-    if (currentMetadata !== null) {
-      fields.metadata = currentMetadata;
-    }
-    currentMetadata = null;
-    currentArray = null;
-    currentArrayKey = null;
-    const colonIndex = line.indexOf(':');
-    if (colonIndex === -1) continue;
-
-    const key = line.substring(0, colonIndex).trim();
-    const value = line.substring(colonIndex + 1).trim();
-
-    if (key === 'metadata' && !value) {
-      currentMetadata = {};
-      fields.metadata = currentMetadata;
-      continue;
-    }
-
-    if (key === 'allowed-tools' && !value) {
-      currentArray = [];
-      currentArrayKey = 'allowed-tools';
-      continue;
-    }
-
-    if (key && value) {
-      fields[key] = value.replace(/^["']|["']$/g, '');
-    }
-  }
-
-  if (currentArray !== null && currentArrayKey) {
-    fields[currentArrayKey] = currentArray;
-  }
-
-  const frontmatter = {
-    name: fields.name || '',
-    description: fields.description || '',
-  };
-
-  if (fields.license) frontmatter.license = fields.license;
-  if (fields.compatibility) frontmatter.compatibility = fields.compatibility;
-  if (fields['allowed-tools']) {
-    frontmatter['allowed-tools'] = Array.isArray(fields['allowed-tools'])
-      ? fields['allowed-tools']
-      : fields['allowed-tools'];
-  }
-  if (currentMetadata && Object.keys(currentMetadata).length > 0) {
-    frontmatter.metadata = currentMetadata;
-  }
-
-  return {
-    success: true,
-    parsed: { frontmatter, body, raw: content },
-  };
+        fields[currentArrayKey] = currentArray;
+    }
+    // Build frontmatter object
+    const frontmatter = {
+        name: fields.name || '',
+        description: fields.description || '',
+    };
+    if (fields.license)
+        frontmatter.license = fields.license;
+    if (fields.compatibility)
+        frontmatter.compatibility = fields.compatibility;
+    if (fields['allowed-tools']) {
+        frontmatter['allowed-tools'] = Array.isArray(fields['allowed-tools'])
+            ? fields['allowed-tools']
+            : fields['allowed-tools'];
+    }
+    if (currentMetadata && Object.keys(currentMetadata).length > 0) {
+        frontmatter.metadata = currentMetadata;
+    }
+    return {
+        success: true,
+        parsed: { frontmatter, body, raw: content },
+    };
 }
-
+/**
+ * Validate parsed frontmatter against the Agent Skills spec.
+ *
+ * Checks: name rules, description rules, optional field constraints,
+ * and name/directory consistency (if directoryName provided).
+ */
 export function validateFrontmatter(frontmatter, directoryName) {
-  const issues = [];
-
-  if (!frontmatter.name) {
-    issues.push({
-      field: 'name',
-      message: 'YAML frontmatter must include a "name" field',
-      severity: 'error',
-    });
-  } else {
-    const nameResult = validateSkillName(frontmatter.name);
-    if (!nameResult.valid) {
-      issues.push({ field: 'name', message: nameResult.error, severity: 'error' });
-    }
-  }
-
-  if (!frontmatter.description) {
-    issues.push({
-      field: 'description',
-      message: 'YAML frontmatter must include a "description" field',
-      severity: 'error',
-    });
-  } else if (frontmatter.description.length > MAX_DESCRIPTION_LENGTH) {
-    issues.push({
-      field: 'description',
-      message: `Description must be at most ${MAX_DESCRIPTION_LENGTH} characters (got ${frontmatter.description.length})`,
-      severity: 'error',
-    });
-  }
-
-  if (frontmatter.compatibility && frontmatter.compatibility.length > MAX_COMPATIBILITY_LENGTH) {
-    issues.push({
-      field: 'compatibility',
-      message: `Compatibility must be at most ${MAX_COMPATIBILITY_LENGTH} characters (got ${frontmatter.compatibility.length})`,
-      severity: 'error',
-    });
-  }
-
-  if (directoryName && frontmatter.name && frontmatter.name !== directoryName) {
-    issues.push({
-      field: 'name',
-      message: `Skill name "${frontmatter.name}" must match its directory name "${directoryName}"`,
-      severity: 'error',
-    });
-  }
-
-  return {
-    valid: issues.filter((i) => i.severity === 'error').length === 0,
-    issues,
-  };
+    const issues = [];
+    // Required: name
+    if (!frontmatter.name) {
+        issues.push({ field: 'name', message: 'YAML frontmatter must include a "name" field', severity: 'error' });
+    }
+    else {
+        const nameResult = validateSkillName(frontmatter.name);
+        if (!nameResult.valid) {
+            issues.push({ field: 'name', message: nameResult.error, severity: 'error' });
+        }
+    }
+    // Required: description
+    if (!frontmatter.description) {
+        issues.push({ field: 'description', message: 'YAML frontmatter must include a "description" field', severity: 'error' });
+    }
+    else if (frontmatter.description.length > MAX_DESCRIPTION_LENGTH) {
+        issues.push({
+            field: 'description',
+            message: `Description must be at most ${MAX_DESCRIPTION_LENGTH} characters (got ${frontmatter.description.length})`,
+            severity: 'error',
+        });
+    }
+    // Optional: compatibility
+    if (frontmatter.compatibility && frontmatter.compatibility.length > MAX_COMPATIBILITY_LENGTH) {
+        issues.push({
+            field: 'compatibility',
+            message: `Compatibility must be at most ${MAX_COMPATIBILITY_LENGTH} characters (got ${frontmatter.compatibility.length})`,
+            severity: 'error',
+        });
+    }
+    // name must match directory name (if provided)
+    if (directoryName && frontmatter.name && frontmatter.name !== directoryName) {
+        issues.push({
+            field: 'name',
+            message: `Skill name "${frontmatter.name}" must match its directory name "${directoryName}"`,
+            severity: 'error',
+        });
+    }
+    return {
+        valid: issues.filter(i => i.severity === 'error').length === 0,
+        issues,
+    };
 }
-
+/**
+ * List bundled resources in a skill directory.
+ *
+ * The spec recognizes three standard subdirectories:
+ * - scripts/   — executable code
+ * - references/ — additional documentation
+ * - assets/    — templates, resources
+ *
+ * Any other files (besides SKILL.md) are listed under "other".
+ */
 export function listBundledResources(skillDir) {
-  const resources = {
-    scripts: [],
-    references: [],
-    assets: [],
-    other: [],
-  };
-
-  if (!fs.existsSync(skillDir)) return resources;
-
-  const KNOWN_DIRS = {
-    scripts: 'scripts',
-    references: 'references',
-    assets: 'assets',
-  };
-
-  const entries = fs.readdirSync(skillDir, { withFileTypes: true });
-  for (const entry of entries) {
-    if (entry.name === 'SKILL.md') continue;
-
-    if (entry.isDirectory()) {
-      const category = KNOWN_DIRS[entry.name];
-      if (category) {
-        const subDir = path.join(skillDir, entry.name);
-        const subEntries = fs.readdirSync(subDir);
-        for (const sub of subEntries) {
-          resources[category].push(`${entry.name}/${sub}`);
+    const resources = {
+        scripts: [],
+        references: [],
+        assets: [],
+        other: [],
+    };
+    if (!fs.existsSync(skillDir))
+        return resources;
+    const KNOWN_DIRS = {
+        scripts: 'scripts',
+        references: 'references',
+        assets: 'assets',
+    };
+    const entries = fs.readdirSync(skillDir, { withFileTypes: true });
+    for (const entry of entries) {
+        if (entry.name === 'SKILL.md')
+            continue;
+        if (entry.isDirectory()) {
+            const category = KNOWN_DIRS[entry.name];
+            if (category) {
+                // List files inside the known subdirectory
+                const subDir = path.join(skillDir, entry.name);
+                const subEntries = fs.readdirSync(subDir);
+                for (const sub of subEntries) {
+                    resources[category].push(`${entry.name}/${sub}`);
+                }
+            }
+            else {
+                // Unknown directory — list contents under "other"
+                const subDir = path.join(skillDir, entry.name);
+                const subEntries = fs.readdirSync(subDir);
+                for (const sub of subEntries) {
+                    resources.other.push(`${entry.name}/${sub}`);
+                }
+            }
         }
-      } else {
-        const subDir = path.join(skillDir, entry.name);
-        const subEntries = fs.readdirSync(subDir);
-        for (const sub of subEntries) {
-          resources.other.push(`${entry.name}/${sub}`);
+        else {
+            // Top-level file (not SKILL.md)
+            resources.other.push(entry.name);
         }
-      }
-    } else {
-      resources.other.push(entry.name);
     }
-  }
-
-  return resources;
+    return resources;
 }

package/tools/web/definition.yaml

@@ -55,7 +55,7 @@ parameters:
 
 execution:
   type: function
-  code: './web.ts'
+  code: './web.js'
 
 output_schema:
   type: object

package/tools/web/web.js

@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+/**
+ * Web Tool - Fetch web content from URLs with flexible HTTP methods
+ * Function-type tool: Exports default async function
+ */
+import axios from 'axios';
+import { MatimoError, ErrorCode } from '@matimo/core/runtime';
+/**
+ * Fetch URL and return response with optional JSON parsing
+ */
+export default async function webTool(params) {
+    const { url, method = 'GET', headers, body, timeout = 30000, followRedirects = true, parseJson = true, maxSize = 10485760, } = params;
+    const startTime = Date.now();
+    // Validate required parameter
+    if (!url) {
+        throw new MatimoError('Missing required parameter', ErrorCode.INVALID_PARAMETER, {
+            reason: 'url is required',
+        });
+    }
+    // Validate URL
+    try {
+        new URL(url);
+    }
+    catch {
+        throw new MatimoError('Invalid URL', ErrorCode.INVALID_PARAMETER, {
+            url,
+            reason: 'URL must be valid http or https',
+        });
+    }
+    const requestConfig = {
+        method: method.toUpperCase() || 'GET',
+        url,
+        timeout,
+        maxContentLength: maxSize,
+        maxBodyLength: maxSize,
+        headers: {
+            'User-Agent': 'Matimo/1.0 (AI Agent Tool SDK)',
+            Accept: 'application/json, text/plain, text/html, */*',
+            ...(headers || {}),
+        },
+        validateStatus: () => true, // Don't throw on any status code
+    };
+    if (body && ['POST', 'PUT', 'PATCH'].includes(method.toUpperCase())) {
+        requestConfig.data = body;
+    }
+    if (!followRedirects) {
+        requestConfig.maxRedirects = 0;
+    }
+    try {
+        const response = await axios.request(requestConfig);
+        let content = response.data;
+        // Try to parse JSON if requested and content-type suggests JSON
+        const contentType = response.headers['content-type'];
+        if (parseJson && typeof contentType === 'string' && contentType.includes('application/json')) {
+            try {
+                if (typeof response.data === 'string') {
+                    content = JSON.parse(response.data);
+                }
+                else {
+                    content = response.data;
+                }
+            }
+            catch {
+                // If JSON parsing fails, keep original content
+                content = response.data;
+            }
+        }
+        const result = {
+            success: response.status >= 200 && response.status < 300,
+            url,
+            statusCode: response.status,
+            statusText: response.statusText || '',
+            contentType: response.headers['content-type'] || 'unknown',
+            content,
+            headers: response.headers,
+            size: JSON.stringify(response.data).length,
+            duration: Date.now() - startTime,
+        };
+        return result;
+    }
+    catch (error) {
+        const axiosError = error;
+        throw new MatimoError('HTTP request failed', ErrorCode.NETWORK_ERROR, {
+            url,
+            statusCode: axiosError.response?.status,
+            statusText: axiosError.response?.statusText,
+            originalError: axiosError.message,
+        });
+    }
+}

package/tools/web/web.ts

@@ -92,7 +92,8 @@ export default async function webTool(params: WebParams): Promise<WebResult> {
     let content: unknown = response.data;
 
     // Try to parse JSON if requested and content-type suggests JSON
-    if (parseJson && response.headers['content-type']?.includes('application/json')) {
+    const contentType = response.headers['content-type'];
+    if (parseJson && typeof contentType === 'string' && contentType.includes('application/json')) {
       try {
         if (typeof response.data === 'string') {
           content = JSON.parse(response.data);