@oneentry/mcp-server 1.0.1 → 1.1.1

package/dist/config.d.ts

@@ -0,0 +1,6 @@
+export declare const VERSION: string;
+export declare const SERVER_NAME = "oneentry-sdk";
+export declare const USER_AGENT: string;
+export declare const CLAUDE_MD_PATH = "CLAUDE.md";
+export declare const BASE_URL: string;
+export declare const TTL_MS: number;

package/dist/config.js

@@ -0,0 +1,10 @@
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+const pkg = require("../package.json");
+export const VERSION = pkg.version;
+export const SERVER_NAME = "oneentry-sdk";
+export const USER_AGENT = `oneentry-mcp-server/${VERSION}`;
+export const CLAUDE_MD_PATH = "CLAUDE.md";
+export const BASE_URL = process.env.ONEENTRY_MCP_BASE_URL ??
+    "https://raw.githubusercontent.com/ONEENTRY-PLATFORM/oneentry-sdk-rules/main";
+export const TTL_MS = Number(process.env.ONEENTRY_MCP_CACHE_TTL_MS) || 5 * 60 * 1000;

package/dist/content.d.ts

@@ -1,11 +1,2 @@
-/**
- * Fetches content from a remote URL (GitHub raw or any HTTP server).
- * Caches results for TTL_MS to avoid hammering the server.
- *
- * Configure the base URL via env var:
- *   ONEENTRY_MCP_BASE_URL=https://raw.githubusercontent.com/your-org/your-repo/main
- *
- * Default points to the oneentry public repo.
- */
 export declare function fetchContent(path: string): Promise<string>;
 export declare function clearCache(): void;

package/dist/content.js

@@ -1,15 +1,4 @@
-/**
- * Fetches content from a remote URL (GitHub raw or any HTTP server).
- * Caches results for TTL_MS to avoid hammering the server.
- *
- * Configure the base URL via env var:
- *   ONEENTRY_MCP_BASE_URL=https://raw.githubusercontent.com/your-org/your-repo/main
- *
- * Default points to the oneentry public repo.
- */
-const BASE_URL = process.env.ONEENTRY_MCP_BASE_URL ??
-    "https://raw.githubusercontent.com/ONEENTRY-PLATFORM/oneentry-sdk-rules/main";
-const TTL_MS = 5 * 60 * 1000; // 5 minutes
+import { BASE_URL, TTL_MS, USER_AGENT } from "./config.js";
 const cache = new Map();
 export async function fetchContent(path) {
     const cached = cache.get(path);
@@ -19,7 +8,7 @@ export async function fetchContent(path) {
     const url = `${BASE_URL}/${path}`;
     const res = await fetch(url, {
         headers: {
-            "User-Agent": "oneentry-mcp-server/1.0",
+            "User-Agent": USER_AGENT,
         },
     });
     if (!res.ok) {

package/dist/index.js

@@ -1,126 +1,115 @@
 #!/usr/bin/env node
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { ListResourcesRequestSchema, ReadResourceRequestSchema, ListPromptsRequestSchema, GetPromptRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { z } from "zod";
 import { fetchContent } from "./content.js";
 import { RULES, SKILLS } from "./registry.js";
-const CLAUDE_MD_PATH = "CLAUDE.md";
+import { CLAUDE_MD_PATH, SERVER_NAME, VERSION } from "./config.js";
 // ---------------------------------------------------------------------------
 // Server
 // ---------------------------------------------------------------------------
-const server = new Server({ name: "oneentry-sdk", version: "1.0.0" }, {
-    capabilities: {
-        resources: {},
-        prompts: {},
-    },
-});
+const server = new McpServer({ name: SERVER_NAME, version: VERSION });
 // ---------------------------------------------------------------------------
 // Resources — rules + CLAUDE.md
 // ---------------------------------------------------------------------------
-server.setRequestHandler(ListResourcesRequestSchema, async () => ({
-    resources: [
-        {
-            uri: "oneentry://claude-md",
-            name: "OneEntry SDK — Main Instructions (CLAUDE.md)",
-            description: "Full system prompt with OneEntry SDK rules, patterns, anti-hallucination guidelines and module reference",
-            mimeType: "text/markdown",
-        },
-        ...RULES.map((rule) => ({
-            uri: `oneentry://rules/${rule.name}`,
-            name: rule.displayName,
-            description: rule.description,
-            mimeType: "text/markdown",
-        })),
-    ],
-}));
-server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-    const { uri } = request.params;
-    // CLAUDE.md
-    if (uri === "oneentry://claude-md") {
-        const text = await fetchContent(CLAUDE_MD_PATH);
-        return { contents: [{ uri, mimeType: "text/markdown", text }] };
-    }
-    // Rules
-    if (uri.startsWith("oneentry://rules/")) {
-        const name = uri.replace("oneentry://rules/", "");
-        const rule = RULES.find((r) => r.name === name);
-        if (!rule) {
-            throw new Error(`Unknown rule: ${name}`);
-        }
-        const text = await fetchContent(rule.path);
-        return { contents: [{ uri, mimeType: "text/markdown", text }] };
-    }
-    throw new Error(`Unknown resource URI: ${uri}`);
+server.registerResource("OneEntry SDK — Main Instructions (CLAUDE.md)", "oneentry://claude-md", {
+    description: "Full system prompt with OneEntry SDK rules, patterns, anti-hallucination guidelines and module reference",
+    mimeType: "text/markdown",
+}, async (uri) => {
+    const text = await fetchContent(CLAUDE_MD_PATH);
+    return { contents: [{ uri: uri.toString(), mimeType: "text/markdown", text }] };
 });
+for (const rule of RULES) {
+    server.registerResource(rule.displayName, `oneentry://rules/${rule.name}`, { description: rule.description, mimeType: "text/markdown" }, async (uri) => {
+        const text = await fetchContent(rule.path);
+        return { contents: [{ uri: uri.toString(), mimeType: "text/markdown", text }] };
+    });
+}
 // ---------------------------------------------------------------------------
 // Prompts — skills
 // ---------------------------------------------------------------------------
-server.setRequestHandler(ListPromptsRequestSchema, async () => ({
-    prompts: [
-        // Special prompt: load full context from CLAUDE.md
-        {
-            name: "oneentry-context",
-            description: "Load full OneEntry SDK context — system instructions, rules and anti-hallucination guidelines. Use this at the start of a session.",
-            arguments: [],
-        },
-        // All skills
-        ...SKILLS.map((skill) => ({
-            name: skill.name,
-            description: skill.description,
-            arguments: skill.hasArguments
-                ? [
-                    {
-                        name: "arguments",
-                        description: skill.argumentDescription ?? "Optional arguments",
-                        required: false,
-                    },
-                ]
-                : [],
-        })),
-    ],
-}));
-server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-    const { name, arguments: args } = request.params;
-    // Load full CLAUDE.md as system context
-    if (name === "oneentry-context") {
-        const text = await fetchContent(CLAUDE_MD_PATH);
-        return {
-            description: "OneEntry SDK — full system context loaded",
-            messages: [
-                {
-                    role: "user",
-                    content: {
-                        type: "text",
-                        text: `The following are the complete instructions and rules for working with OneEntry SDK. Apply them to all subsequent code generation:\n\n${text}`,
-                    },
-                },
-            ],
-        };
-    }
-    // Skills
-    const skill = SKILLS.find((s) => s.name === name);
-    if (!skill) {
-        throw new Error(`Unknown prompt: ${name}`);
-    }
-    let text = await fetchContent(skill.path);
-    // Replace $ARGUMENTS placeholder (used in inspect-api and create-page skills)
-    const userArguments = args?.["arguments"];
-    if (userArguments) {
-        text = text.replace(/\$ARGUMENTS/g, userArguments);
-    }
+// Special prompt: load full context from CLAUDE.md
+server.registerPrompt("oneentry-context", {
+    description: "Load full OneEntry SDK context — system instructions, rules and anti-hallucination guidelines. Use this at the start of a session.",
+}, async () => {
+    const text = await fetchContent(CLAUDE_MD_PATH);
     return {
-        description: skill.description,
+        description: "OneEntry SDK — full system context loaded",
         messages: [
             {
                 role: "user",
                 content: {
                     type: "text",
-                    text,
+                    text: `The following are the complete instructions and rules for working with OneEntry SDK. Apply them to all subsequent code generation:\n\n${text}`,
                 },
             },
         ],
     };
 });
+// Skills
+for (const skill of SKILLS) {
+    if (skill.hasArguments) {
+        server.registerPrompt(skill.name, {
+            description: skill.description,
+            argsSchema: {
+                arguments: z
+                    .string()
+                    .optional()
+                    .describe(skill.argumentDescription ?? "Optional arguments"),
+            },
+        }, async (args) => {
+            let text = await fetchContent(skill.path);
+            // Replace $ARGUMENTS placeholder (used in inspect-api and create-page skills)
+            if (args.arguments) {
+                text = text.replace(/\$ARGUMENTS/g, args.arguments);
+            }
+            return {
+                description: skill.description,
+                messages: [{ role: "user", content: { type: "text", text } }],
+            };
+        });
+    }
+    else {
+        server.registerPrompt(skill.name, { description: skill.description }, async () => {
+            const text = await fetchContent(skill.path);
+            return {
+                description: skill.description,
+                messages: [{ role: "user", content: { type: "text", text } }],
+            };
+        });
+    }
+}
+// ---------------------------------------------------------------------------
+// Tools
+// ---------------------------------------------------------------------------
+server.registerTool("get-rule", {
+    description: "Fetch the content of a specific OneEntry SDK rule by name",
+    inputSchema: { name: z.string().describe(`Rule name. Available: ${RULES.map((r) => r.name).join(", ")}`) },
+}, async ({ name }) => {
+    const rule = RULES.find((r) => r.name === name);
+    if (!rule) {
+        return { content: [{ type: "text", text: `Unknown rule: ${name}. Available: ${RULES.map((r) => r.name).join(", ")}` }], isError: true };
+    }
+    const text = await fetchContent(rule.path);
+    return { content: [{ type: "text", text }] };
+});
+server.registerTool("get-skill", {
+    description: "Fetch the content of a specific OneEntry skill/slash-command by name",
+    inputSchema: {
+        name: z.string().describe(`Skill name. Available: ${SKILLS.map((s) => s.name).join(", ")}`),
+        arguments: z.string().optional().describe("Optional arguments passed to the skill (replaces $ARGUMENTS placeholder)"),
+    },
+}, async (args) => {
+    const skill = SKILLS.find((s) => s.name === args.name);
+    if (!skill) {
+        return { content: [{ type: "text", text: `Unknown skill: ${args.name}. Available: ${SKILLS.map((s) => s.name).join(", ")}` }], isError: true };
+    }
+    let text = await fetchContent(skill.path);
+    if (args.arguments) {
+        text = text.replace(/\$ARGUMENTS/g, args.arguments);
+    }
+    return { content: [{ type: "text", text }] };
+});
 // ---------------------------------------------------------------------------
 // Start
 // ---------------------------------------------------------------------------

package/dist/registry.js

@@ -1,15 +1,21 @@
 export const RULES = [
     {
-        name: "forms",
-        displayName: "Forms & FormsData",
-        description: "Rules for working with OneEntry Forms API — getFormByMarker, postFormsData, formData types by field type",
-        path: ".claude/rules/forms.md",
+        name: "linting",
+        displayName: "Linting",
+        description: "Rules for working with linters",
+        path: ".claude/rules/linting.md",
     },
     {
-        name: "tokens",
-        displayName: "Tokens & Auth",
-        description: "Rules for auth tokens — makeUserApi, refreshToken, race condition handling, getNewToken",
-        path: ".claude/rules/tokens.md",
+        name: "typescript",
+        displayName: "Typescript",
+        description: "Rules for working with typescript",
+        path: ".claude/rules/typescript.md",
+    },
+    {
+        name: "nextjs-pages",
+        displayName: "Next.js Pages",
+        description: "Rules for Next.js pages with OneEntry — params as Promise, pageUrl vs route, localizeInfos",
+        path: ".claude/rules/nextjs-pages.md",
     },
     {
         name: "attribute-values",
@@ -17,6 +23,12 @@ export const RULES = [
         description: "How to access attributeValues by type — image, text, list, date, timeInterval, etc.",
         path: ".claude/rules/attribute-values.md",
     },
+    {
+        name: "attribute-sets",
+        displayName: "AttributeSets",
+        description: "Rules for AttributesSets — schema vs values, listTitles, additionalFields, validators",
+        path: ".claude/rules/attribute-sets.md",
+    },
     {
         name: "auth-provider",
         displayName: "AuthProvider",
@@ -24,10 +36,10 @@ export const RULES = [
         path: ".claude/rules/auth-provider.md",
     },
     {
-        name: "nextjs-pages",
-        displayName: "Next.js Pages",
-        description: "Rules for Next.js pages with OneEntry — params as Promise, pageUrl vs route, localizeInfos",
-        path: ".claude/rules/nextjs-pages.md",
+        name: "tokens",
+        displayName: "Tokens & Auth",
+        description: "Rules for auth tokens — makeUserApi, refreshToken, race condition handling, getNewToken",
+        path: ".claude/rules/tokens.md",
     },
     {
         name: "server-actions",
@@ -35,38 +47,42 @@ export const RULES = [
         description: "Rules for Next.js Server Actions with OneEntry — getApi() vs makeUserApi(), which methods need SA",
         path: ".claude/rules/server-actions.md",
     },
+    {
+        name: "forms",
+        displayName: "Forms & FormsData",
+        description: "Rules for working with OneEntry Forms API — getFormByMarker, postFormsData, formData types by field type",
+        path: ".claude/rules/forms.md",
+    },
     {
         name: "orders",
         displayName: "Orders & Payments",
         description: "Rules for Orders and Payments — getAllOrdersStorage structure, createOrder, createSession, paymentUrl",
         path: ".claude/rules/orders.md",
     },
-    {
-        name: "attribute-sets",
-        displayName: "AttributeSets",
-        description: "Rules for AttributesSets — schema vs values, listTitles, additionalFields, validators",
-        path: ".claude/rules/attribute-sets.md",
-    },
     {
         name: "localization",
         displayName: "Localization",
         description: "Rules for localization — locale from params, langCode, localizeInfos, useParams in client components",
         path: ".claude/rules/localization.md",
     },
+    {
+        name: "product-statuses",
+        displayName: "Product statuses",
+        description: "Rules product statuses",
+        path: ".claude/rules/product-statuses.md",
+    },
 ];
 export const SKILLS = [
+    {
+        name: "setup-nextjs",
+        description: "Initialize Next.js project — configures nextjs",
+        path: ".claude/skills/setup-nextjs/SKILL.md",
+    },
     {
         name: "setup-oneentry",
         description: "Initialize OneEntry SDK in a Next.js project — creates lib/oneentry.ts with singleton pattern, configures next.config.ts for images",
         path: ".claude/skills/setup-oneentry/SKILL.md",
     },
-    {
-        name: "create-page",
-        description: "Create a Next.js page with content from OneEntry CMS — getPageByUrl, getBlocksByPageUrl, localizeInfos",
-        path: ".claude/skills/create-page/SKILL.md",
-        hasArguments: true,
-        argumentDescription: "pageMarker — the pageUrl marker in OneEntry (e.g. 'home', 'about')",
-    },
     {
         name: "inspect-api",
         description: "Read .env.local and execute curl requests to OneEntry API to get real markers, attributes and data structures before writing code",
@@ -74,6 +90,13 @@ export const SKILLS = [
         hasArguments: true,
         argumentDescription: "pages|menus|forms|products|product-statuses|auth-providers|all",
     },
+    {
+        name: "create-page",
+        description: "Create a Next.js page with content from OneEntry CMS — getPageByUrl, getBlocksByPageUrl, localizeInfos",
+        path: ".claude/skills/create-page/SKILL.md",
+        hasArguments: true,
+        argumentDescription: "pageMarker — the pageUrl marker in OneEntry (e.g. 'home', 'about')",
+    },
     {
         name: "create-auth",
         description: "Create auth/registration form with OneEntry AuthProvider — Server Actions, dynamic fields from Forms API, token sync",
@@ -86,9 +109,14 @@ export const SKILLS = [
     },
     {
         name: "create-product-card",
-        description: "Create a single product page with getProductById, attribute extraction, image gallery, price block, related products",
+        description: "Create a single product card, attribute extraction, image, price, etc",
         path: ".claude/skills/create-product-card/SKILL.md",
     },
+    {
+        name: "create-product-page",
+        description: "Create a single product page with getProductById, attribute extraction, image gallery, price block, related products",
+        path: ".claude/skills/create-product-page/SKILL.md",
+    },
     {
         name: "create-cart-manager",
         description: "Create cart manager — Redux slice + redux-persist, add/remove/quantity, StoreProvider",
@@ -154,4 +182,9 @@ export const SKILLS = [
         description: "Create product price/availability subscription — Events.subscribeByMarker / unsubscribeByMarker",
         path: ".claude/skills/create-subscription-events/SKILL.md",
     },
+    {
+        name: "setup-playwright",
+        description: "Setup playwright testing framework",
+        path: ".claude/skills/setup-playwright/SKILL.md",
+    },
 ];

package/eslint.config.mjs

@@ -0,0 +1,19 @@
+import js from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default tseslint.config(
+  { ignores: ["eslint.config.mjs"] },
+  js.configs.recommended,
+  tseslint.configs.recommended,
+  {
+    languageOptions: {
+      parserOptions: {
+        project: "./tsconfig.json",
+      },
+    },
+    rules: {
+      "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }],
+      "@typescript-eslint/no-explicit-any": "warn",
+    },
+  }
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneentry/mcp-server",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "MCP server for OneEntry SDK — rules and skills for Claude Code",
   "type": "module",
   "main": "dist/index.js",
@@ -10,16 +10,20 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsx src/index.ts",
-    "start": "node dist/index.js"
+    "start": "node dist/index.js",
+    "lint": "eslint src"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.10.1",
-    "zod": "^3.24.1"
+    "@modelcontextprotocol/sdk": "^1.27.1",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@types/node": "^22.0.0",
-    "tsx": "^4.19.0",
-    "typescript": "^5.7.0"
+    "@eslint/js": "^10.0.1",
+    "@types/node": "^25.3.5",
+    "eslint": "^10.0.2",
+    "tsx": "^4.21.0",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.56.1"
   },
   "engines": {
     "node": ">=18"

package/src/config.ts

@@ -0,0 +1,16 @@
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
+const pkg = require("../package.json") as { version: string };
+
+export const VERSION = pkg.version;
+export const SERVER_NAME = "oneentry-sdk";
+export const USER_AGENT = `oneentry-mcp-server/${VERSION}`;
+export const CLAUDE_MD_PATH = "CLAUDE.md";
+
+export const BASE_URL =
+  process.env.ONEENTRY_MCP_BASE_URL ??
+  "https://raw.githubusercontent.com/ONEENTRY-PLATFORM/oneentry-sdk-rules/main";
+
+export const TTL_MS =
+  Number(process.env.ONEENTRY_MCP_CACHE_TTL_MS) || 5 * 60 * 1000;

package/src/content.ts

@@ -1,18 +1,4 @@
-/**
- * Fetches content from a remote URL (GitHub raw or any HTTP server).
- * Caches results for TTL_MS to avoid hammering the server.
- *
- * Configure the base URL via env var:
- *   ONEENTRY_MCP_BASE_URL=https://raw.githubusercontent.com/your-org/your-repo/main
- *
- * Default points to the oneentry public repo.
- */
-
-const BASE_URL =
-  process.env.ONEENTRY_MCP_BASE_URL ??
-  "https://raw.githubusercontent.com/ONEENTRY-PLATFORM/oneentry-sdk-rules/main";
-
-const TTL_MS = 5 * 60 * 1000; // 5 minutes
+import { BASE_URL, TTL_MS, USER_AGENT } from "./config.js";
 
 interface CacheEntry {
   text: string;
@@ -30,7 +16,7 @@ export async function fetchContent(path: string): Promise<string> {
   const url = `${BASE_URL}/${path}`;
   const res = await fetch(url, {
     headers: {
-      "User-Agent": "oneentry-mcp-server/1.0",
+      "User-Agent": USER_AGENT,
     },
   });
 

package/src/index.ts

@@ -1,111 +1,59 @@
 #!/usr/bin/env node
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import {
-  ListResourcesRequestSchema,
-  ReadResourceRequestSchema,
-  ListPromptsRequestSchema,
-  GetPromptRequestSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+import { z } from "zod";
 import { fetchContent } from "./content.js";
 import { RULES, SKILLS } from "./registry.js";
-
-const CLAUDE_MD_PATH = "CLAUDE.md";
+import { CLAUDE_MD_PATH, SERVER_NAME, VERSION } from "./config.js";
 
 // ---------------------------------------------------------------------------
 // Server
 // ---------------------------------------------------------------------------
 
-const server = new Server(
-  { name: "oneentry-sdk", version: "1.0.0" },
-  {
-    capabilities: {
-      resources: {},
-      prompts: {},
-    },
-  }
-);
+const server = new McpServer({ name: SERVER_NAME, version: VERSION });
 
 // ---------------------------------------------------------------------------
 // Resources — rules + CLAUDE.md
 // ---------------------------------------------------------------------------
 
-server.setRequestHandler(ListResourcesRequestSchema, async () => ({
-  resources: [
-    {
-      uri: "oneentry://claude-md",
-      name: "OneEntry SDK — Main Instructions (CLAUDE.md)",
-      description:
-        "Full system prompt with OneEntry SDK rules, patterns, anti-hallucination guidelines and module reference",
-      mimeType: "text/markdown",
-    },
-    ...RULES.map((rule) => ({
-      uri: `oneentry://rules/${rule.name}`,
-      name: rule.displayName,
-      description: rule.description,
-      mimeType: "text/markdown",
-    })),
-  ],
-}));
-
-server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-  const { uri } = request.params;
-
-  // CLAUDE.md
-  if (uri === "oneentry://claude-md") {
+server.registerResource(
+  "OneEntry SDK — Main Instructions (CLAUDE.md)",
+  "oneentry://claude-md",
+  {
+    description:
+      "Full system prompt with OneEntry SDK rules, patterns, anti-hallucination guidelines and module reference",
+    mimeType: "text/markdown",
+  },
+  async (uri) => {
     const text = await fetchContent(CLAUDE_MD_PATH);
-    return { contents: [{ uri, mimeType: "text/markdown", text }] };
+    return { contents: [{ uri: uri.toString(), mimeType: "text/markdown", text }] };
   }
+);
 
-  // Rules
-  if (uri.startsWith("oneentry://rules/")) {
-    const name = uri.replace("oneentry://rules/", "");
-    const rule = RULES.find((r) => r.name === name);
-    if (!rule) {
-      throw new Error(`Unknown rule: ${name}`);
+for (const rule of RULES) {
+  server.registerResource(
+    rule.displayName,
+    `oneentry://rules/${rule.name}`,
+    { description: rule.description, mimeType: "text/markdown" },
+    async (uri) => {
+      const text = await fetchContent(rule.path);
+      return { contents: [{ uri: uri.toString(), mimeType: "text/markdown", text }] };
     }
-    const text = await fetchContent(rule.path);
-    return { contents: [{ uri, mimeType: "text/markdown", text }] };
-  }
-
-  throw new Error(`Unknown resource URI: ${uri}`);
-});
+  );
+}
 
 // ---------------------------------------------------------------------------
 // Prompts — skills
 // ---------------------------------------------------------------------------
 
-server.setRequestHandler(ListPromptsRequestSchema, async () => ({
-  prompts: [
-    // Special prompt: load full context from CLAUDE.md
-    {
-      name: "oneentry-context",
-      description:
-        "Load full OneEntry SDK context — system instructions, rules and anti-hallucination guidelines. Use this at the start of a session.",
-      arguments: [],
-    },
-    // All skills
-    ...SKILLS.map((skill) => ({
-      name: skill.name,
-      description: skill.description,
-      arguments: skill.hasArguments
-        ? [
-            {
-              name: "arguments",
-              description: skill.argumentDescription ?? "Optional arguments",
-              required: false,
-            },
-          ]
-        : [],
-    })),
-  ],
-}));
-
-server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-  const { name, arguments: args } = request.params;
-
-  // Load full CLAUDE.md as system context
-  if (name === "oneentry-context") {
+// Special prompt: load full context from CLAUDE.md
+server.registerPrompt(
+  "oneentry-context",
+  {
+    description:
+      "Load full OneEntry SDK context — system instructions, rules and anti-hallucination guidelines. Use this at the start of a session.",
+  },
+  async () => {
     const text = await fetchContent(CLAUDE_MD_PATH);
     return {
       description: "OneEntry SDK — full system context loaded",
@@ -120,34 +68,90 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
       ],
     };
   }
+);
 
-  // Skills
-  const skill = SKILLS.find((s) => s.name === name);
-  if (!skill) {
-    throw new Error(`Unknown prompt: ${name}`);
+// Skills
+for (const skill of SKILLS) {
+  if (skill.hasArguments) {
+    server.registerPrompt(
+      skill.name,
+      {
+        description: skill.description,
+        argsSchema: {
+          arguments: z
+            .string()
+            .optional()
+            .describe(skill.argumentDescription ?? "Optional arguments"),
+        },
+      },
+      async (args) => {
+        let text = await fetchContent(skill.path);
+        // Replace $ARGUMENTS placeholder (used in inspect-api and create-page skills)
+        if (args.arguments) {
+          text = text.replace(/\$ARGUMENTS/g, args.arguments);
+        }
+        return {
+          description: skill.description,
+          messages: [{ role: "user" as const, content: { type: "text" as const, text } }],
+        };
+      }
+    );
+  } else {
+    server.registerPrompt(
+      skill.name,
+      { description: skill.description },
+      async () => {
+        const text = await fetchContent(skill.path);
+        return {
+          description: skill.description,
+          messages: [{ role: "user" as const, content: { type: "text" as const, text } }],
+        };
+      }
+    );
   }
+}
 
-  let text = await fetchContent(skill.path);
+// ---------------------------------------------------------------------------
+// Tools
+// ---------------------------------------------------------------------------
 
-  // Replace $ARGUMENTS placeholder (used in inspect-api and create-page skills)
-  const userArguments = args?.["arguments"];
-  if (userArguments) {
-    text = text.replace(/\$ARGUMENTS/g, userArguments);
+server.registerTool(
+  "get-rule",
+  {
+    description: "Fetch the content of a specific OneEntry SDK rule by name",
+    inputSchema: { name: z.string().describe(`Rule name. Available: ${RULES.map((r) => r.name).join(", ")}`) },
+  },
+  async ({ name }) => {
+    const rule = RULES.find((r) => r.name === name);
+    if (!rule) {
+      return { content: [{ type: "text" as const, text: `Unknown rule: ${name}. Available: ${RULES.map((r) => r.name).join(", ")}` }], isError: true };
+    }
+    const text = await fetchContent(rule.path);
+    return { content: [{ type: "text" as const, text }] };
   }
+);
 
-  return {
-    description: skill.description,
-    messages: [
-      {
-        role: "user" as const,
-        content: {
-          type: "text" as const,
-          text,
-        },
-      },
-    ],
-  };
-});
+server.registerTool(
+  "get-skill",
+  {
+    description: "Fetch the content of a specific OneEntry skill/slash-command by name",
+    inputSchema: {
+      name: z.string().describe(`Skill name. Available: ${SKILLS.map((s) => s.name).join(", ")}`),
+      arguments: z.string().optional().describe("Optional arguments passed to the skill (replaces $ARGUMENTS placeholder)"),
+    },
+  },
+  async (args) => {
+    const skill = SKILLS.find((s) => s.name === args.name);
+    if (!skill) {
+      return { content: [{ type: "text" as const, text: `Unknown skill: ${args.name}. Available: ${SKILLS.map((s) => s.name).join(", ")}` }], isError: true };
+    }
+    let text = await fetchContent(skill.path);
+    if (args.arguments) {
+      text = text.replace(/\$ARGUMENTS/g, args.arguments);
+    }
+    return { content: [{ type: "text" as const, text }] };
+  }
+);
 
 // ---------------------------------------------------------------------------
 // Start

package/src/registry.ts

@@ -15,16 +15,22 @@ export interface Skill {
 
 export const RULES: Rule[] = [
   {
-    name: "forms",
-    displayName: "Forms & FormsData",
-    description: "Rules for working with OneEntry Forms API — getFormByMarker, postFormsData, formData types by field type",
-    path: ".claude/rules/forms.md",
+    name: "linting",
+    displayName: "Linting",
+    description: "Rules for working with linters",
+    path: ".claude/rules/linting.md",
   },
   {
-    name: "tokens",
-    displayName: "Tokens & Auth",
-    description: "Rules for auth tokens — makeUserApi, refreshToken, race condition handling, getNewToken",
-    path: ".claude/rules/tokens.md",
+    name: "typescript",
+    displayName: "Typescript",
+    description: "Rules for working with typescript",
+    path: ".claude/rules/typescript.md",
+  },
+  {
+    name: "nextjs-pages",
+    displayName: "Next.js Pages",
+    description: "Rules for Next.js pages with OneEntry — params as Promise, pageUrl vs route, localizeInfos",
+    path: ".claude/rules/nextjs-pages.md",
   },
   {
     name: "attribute-values",
@@ -32,6 +38,12 @@ export const RULES: Rule[] = [
     description: "How to access attributeValues by type — image, text, list, date, timeInterval, etc.",
     path: ".claude/rules/attribute-values.md",
   },
+  {
+    name: "attribute-sets",
+    displayName: "AttributeSets",
+    description: "Rules for AttributesSets — schema vs values, listTitles, additionalFields, validators",
+    path: ".claude/rules/attribute-sets.md",
+  },
   {
     name: "auth-provider",
     displayName: "AuthProvider",
@@ -39,10 +51,10 @@ export const RULES: Rule[] = [
     path: ".claude/rules/auth-provider.md",
   },
   {
-    name: "nextjs-pages",
-    displayName: "Next.js Pages",
-    description: "Rules for Next.js pages with OneEntry — params as Promise, pageUrl vs route, localizeInfos",
-    path: ".claude/rules/nextjs-pages.md",
+    name: "tokens",
+    displayName: "Tokens & Auth",
+    description: "Rules for auth tokens — makeUserApi, refreshToken, race condition handling, getNewToken",
+    path: ".claude/rules/tokens.md",
   },
   {
     name: "server-actions",
@@ -50,39 +62,43 @@ export const RULES: Rule[] = [
     description: "Rules for Next.js Server Actions with OneEntry — getApi() vs makeUserApi(), which methods need SA",
     path: ".claude/rules/server-actions.md",
   },
+  {
+    name: "forms",
+    displayName: "Forms & FormsData",
+    description: "Rules for working with OneEntry Forms API — getFormByMarker, postFormsData, formData types by field type",
+    path: ".claude/rules/forms.md",
+  },
   {
     name: "orders",
     displayName: "Orders & Payments",
     description: "Rules for Orders and Payments — getAllOrdersStorage structure, createOrder, createSession, paymentUrl",
     path: ".claude/rules/orders.md",
   },
-  {
-    name: "attribute-sets",
-    displayName: "AttributeSets",
-    description: "Rules for AttributesSets — schema vs values, listTitles, additionalFields, validators",
-    path: ".claude/rules/attribute-sets.md",
-  },
   {
     name: "localization",
     displayName: "Localization",
     description: "Rules for localization — locale from params, langCode, localizeInfos, useParams in client components",
     path: ".claude/rules/localization.md",
   },
+  {
+    name: "product-statuses",
+    displayName: "Product statuses",
+    description: "Rules product statuses",
+    path: ".claude/rules/product-statuses.md",
+  },
 ];
 
 export const SKILLS: Skill[] = [
+  {
+    name: "setup-nextjs",
+    description: "Initialize Next.js project — configures nextjs",
+    path: ".claude/skills/setup-nextjs/SKILL.md",
+  },
   {
     name: "setup-oneentry",
     description: "Initialize OneEntry SDK in a Next.js project — creates lib/oneentry.ts with singleton pattern, configures next.config.ts for images",
     path: ".claude/skills/setup-oneentry/SKILL.md",
   },
-  {
-    name: "create-page",
-    description: "Create a Next.js page with content from OneEntry CMS — getPageByUrl, getBlocksByPageUrl, localizeInfos",
-    path: ".claude/skills/create-page/SKILL.md",
-    hasArguments: true,
-    argumentDescription: "pageMarker — the pageUrl marker in OneEntry (e.g. 'home', 'about')",
-  },
   {
     name: "inspect-api",
     description: "Read .env.local and execute curl requests to OneEntry API to get real markers, attributes and data structures before writing code",
@@ -90,6 +106,13 @@ export const SKILLS: Skill[] = [
     hasArguments: true,
     argumentDescription: "pages|menus|forms|products|product-statuses|auth-providers|all",
   },
+  {
+    name: "create-page",
+    description: "Create a Next.js page with content from OneEntry CMS — getPageByUrl, getBlocksByPageUrl, localizeInfos",
+    path: ".claude/skills/create-page/SKILL.md",
+    hasArguments: true,
+    argumentDescription: "pageMarker — the pageUrl marker in OneEntry (e.g. 'home', 'about')",
+  },
   {
     name: "create-auth",
     description: "Create auth/registration form with OneEntry AuthProvider — Server Actions, dynamic fields from Forms API, token sync",
@@ -102,9 +125,14 @@ export const SKILLS: Skill[] = [
   },
   {
     name: "create-product-card",
-    description: "Create a single product page with getProductById, attribute extraction, image gallery, price block, related products",
+    description: "Create a single product card, attribute extraction, image, price, etc",
     path: ".claude/skills/create-product-card/SKILL.md",
   },
+  {
+    name: "create-product-page",
+    description: "Create a single product page with getProductById, attribute extraction, image gallery, price block, related products",
+    path: ".claude/skills/create-product-page/SKILL.md",
+  },
   {
     name: "create-cart-manager",
     description: "Create cart manager — Redux slice + redux-persist, add/remove/quantity, StoreProvider",
@@ -170,4 +198,9 @@ export const SKILLS: Skill[] = [
     description: "Create product price/availability subscription — Events.subscribeByMarker / unsubscribeByMarker",
     path: ".claude/skills/create-subscription-events/SKILL.md",
   },
+  {
+    name: "setup-playwright",
+    description: "Setup playwright testing framework",
+    path: ".claude/skills/setup-playwright/SKILL.md",
+  },
 ];