diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1f78b139d2..c43969d75f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -160,12 +160,12 @@ jobs:
           path: ./packages/cli/dist
           if-no-files-found: error
 
-      - name: Upload cli skills (docs for agent integration)
+      - name: Upload cli docs
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: ${{ matrix.settings.target == 'x86_64-unknown-linux-gnu' }}
         with:
-          name: cli-skills
-          path: ./packages/cli/skills
+          name: cli-docs
+          path: ./packages/cli/docs
           if-no-files-found: error
 
       - name: Upload LICENSE files
@@ -210,11 +210,11 @@ jobs:
           pattern: cli
           merge-multiple: true
 
-      - name: Download cli skills
+      - name: Download cli docs
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
-          path: packages/cli/skills
-          pattern: cli-skills
+          path: packages/cli/docs
+          pattern: cli-docs
           merge-multiple: true
 
       - name: Download cli binding
diff --git a/packages/cli/.gitignore b/packages/cli/.gitignore
index 1ff8aa7bb3..ad5190c5d2 100644
--- a/packages/cli/.gitignore
+++ b/packages/cli/.gitignore
@@ -1,4 +1,4 @@
 /npm
 /artifacts
 /LICENSE
-/skills/vite-plus/docs
+/docs
diff --git a/packages/cli/AGENTS.md b/packages/cli/AGENTS.md
index 15b47ef93e..ef041769ab 100644
--- a/packages/cli/AGENTS.md
+++ b/packages/cli/AGENTS.md
@@ -4,17 +4,12 @@
 
 This project is using Vite+, a unified toolchain built on top of Vite, Rolldown, Vitest, tsdown, Oxlint, Oxfmt, and Vite Task. Vite+ wraps runtime management, package management, and frontend tooling in a single global CLI called `vp`. Vite+ is distinct from Vite, and it invokes Vite through `vp dev` and `vp build`. Run `vp help` to print a list of commands and `vp <command> --help` for information about a specific command.
 
-## Common Pitfalls
-
-- **Running scripts:** Vite+ built-in commands (`vp lint`, `vp dev`, `vp build`, `vp test`, etc.) always run the Vite+ built-in tool. Use `vp run <script>` to run `package.json` scripts or tasks defined in `vite.config.ts`
-- **Do not install Vitest, Oxlint, Oxfmt, or tsdown directly:** Vite+ wraps these tools. Do not install or upgrade them, use Vite+ directly.
-- **Import JavaScript modules from `vite-plus`:** Import modules from the `vite-plus` dependency, not from `vite` or `vitest`. For example, `import { defineConfig } from 'vite-plus';` or `import { expect, test, vi } from 'vite-plus/test';`. You must not install `vitest` to import test utilities.
+Docs are local at `node_modules/vite-plus/docs` or online at https://viteplus.dev/guide/.
 
 ## Review Checklist
 
 - [ ] Run `vp install` after pulling remote changes and before getting started.
 - [ ] Run `vp check` and `vp test` to format, lint, type check and test changes.
-- [ ] Check if there are tasks or `package.json` scripts necessary for validation, run via `vp run <script>`.
+- [ ] Check if there are `vite.config.ts` tasks or `package.json` scripts necessary for validation, run via `vp run <script>`.
 
-* Docs: https://viteplus.dev/guide/
 <!--VITE PLUS END-->
diff --git a/packages/cli/build.ts b/packages/cli/build.ts
index 81d3da0add..c4be9c3e40 100644
--- a/packages/cli/build.ts
+++ b/packages/cli/build.ts
@@ -7,7 +7,7 @@
  * 3. syncCorePackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-core
  * 4. syncTestPackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-test
  * 5. syncVersionsExport() - Generates ./versions module with bundled tool versions
- * 6. copySkillDocs() - Copies docs into skills/vite-plus/docs for runtime MCP access
+ * 6. copyBundledDocs() - Copies docs into docs/ for bundled package access
  * 7. syncReadmeFromRoot() - Keeps package README in sync
  *
  * The sync functions allow this package to be a drop-in replacement for 'vite' by
@@ -19,9 +19,9 @@
  */
 
 import { execSync } from 'node:child_process';
-import { existsSync, globSync, readdirSync, statSync } from 'node:fs';
-import { copyFile, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
-import { dirname, join } from 'node:path';
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { copyFile, cp, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
+import { dirname, join, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { parseArgs } from 'node:util';
 
@@ -74,7 +74,7 @@ if (!skipTs) {
   await syncTestPackageExports();
   await syncVersionsExport();
 }
-await copySkillDocs();
+await copyBundledDocs();
 await syncReadmeFromRoot();
 
 async function buildNapiBinding() {
@@ -387,42 +387,32 @@ async function syncVersionsExport() {
 }
 
 /**
- * Copy markdown doc files from the monorepo docs/ directory into skills/vite-plus/docs/,
- * preserving the relative directory structure. This keeps stable file paths for
- * skills routing and MCP page slugs.
+ * Copy the docs source tree into docs/, preserving relative paths.
+ * Generated VitePress output and installed dependencies are excluded so the package
+ * only ships authoring sources and referenced assets.
  */
-async function copySkillDocs() {
-  console.log('\nCopying skill docs...');
+async function copyBundledDocs() {
+  console.log('\nCopying bundled docs...');
 
   const docsSourceDir = join(projectDir, '..', '..', 'docs');
-  const docsTargetDir = join(projectDir, 'skills', 'vite-plus', 'docs');
+  const docsTargetDir = join(projectDir, 'docs');
 
   if (!existsSync(docsSourceDir)) {
-    console.log('  Docs source directory not found, skipping skill docs copy');
+    console.log('  Docs source directory not found, skipping docs copy');
     return;
   }
 
-  // Clean and recreate target directory
+  const skipPrefixes = ['node_modules', '.vitepress/cache', '.vitepress/dist'];
   await rm(docsTargetDir, { recursive: true, force: true });
-  await mkdir(docsTargetDir, { recursive: true });
-
-  // Find all markdown files recursively and copy them with their relative paths.
-  const mdFiles = globSync('**/*.md', { cwd: docsSourceDir }).filter(
-    (f) => !f.includes('node_modules') && f !== 'index.md',
-  );
-  // eslint-disable-next-line unicorn/no-array-sort -- sorted traversal keeps output deterministic
-  mdFiles.sort();
-
-  let copied = 0;
-  for (const relPath of mdFiles) {
-    const sourcePath = join(docsSourceDir, relPath);
-    const targetPath = join(docsTargetDir, relPath);
-    await mkdir(dirname(targetPath), { recursive: true });
-    await copyFile(sourcePath, targetPath);
-    copied++;
-  }
+  await cp(docsSourceDir, docsTargetDir, {
+    recursive: true,
+    filter: (src) => {
+      const rel = relative(docsSourceDir, src).replaceAll('\\', '/');
+      return !skipPrefixes.some((prefix) => rel === prefix || rel.startsWith(`${prefix}/`));
+    },
+  });
 
-  console.log(`  Copied ${copied} doc files to skills/vite-plus/docs/ (with paths preserved)`);
+  console.log('  Copied docs to docs/ (with paths preserved)');
 }
 
 async function syncReadmeFromRoot() {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 57d3e84be0..2416708991 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -28,8 +28,8 @@
     "binding/index.d.ts",
     "binding/index.js",
     "dist/test",
+    "docs",
     "rules",
-    "skills",
     "templates"
   ],
   "type": "module",
diff --git a/packages/cli/skills/vite-plus/SKILL.md b/packages/cli/skills/vite-plus/SKILL.md
deleted file mode 100644
index fee9aee737..0000000000
--- a/packages/cli/skills/vite-plus/SKILL.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-name: vite-plus
-description: Vite+ skill for development workflow and CLI operations. Use this skill to route user requests to the appropriate bundled Vite+ docs.
----
-
-# Vite+ Skill
-
-This skill is a router. Open the minimum relevant docs files under `docs/` and execute.
-
-Docs in this skill are bundled from `docs` during `vite-plus` package build and live at:
-
-- `skills/vite-plus/docs/**/*.md`
-
-## Command Naming
-
-Use `vp` in examples and commands in this skill.
-
-## No-Args Behavior
-
-If invoked without a concrete task, do a brief project status check and report:
-
-1. Dev server configuration (`vite.config.ts` or `vite.config.js`).
-2. Tool usage (`vp dev`, `vp build`, `vp test`, `vp lint`, `vp fmt`).
-3. Monorepo structure (workspace detection, package manager).
-4. Build configuration (library mode, SSR, custom config).
-
-Then ask what to do next.
-
-## Task Routing
-
-| User intent                       | Docs file(s)                                          |
-| --------------------------------- | ----------------------------------------------------- |
-| Initial setup, getting started    | `docs/guide/index.md`                                 |
-| Dev server, development workflow  | `docs/guide/dev.md`, `docs/guide/index.md`            |
-| Build configuration, optimization | `docs/guide/build.md`, `docs/config/build.md`         |
-| Testing with Vitest               | `docs/guide/test.md`, `docs/config/test.md`           |
-| Linting with Oxlint               | `docs/guide/lint.md`, `docs/config/lint.md`           |
-| Formatting with Oxfmt             | `docs/guide/fmt.md`, `docs/config/fmt.md`             |
-| Check (format, lint, types)       | `docs/guide/check.md`                                 |
-| Monorepo tasks                    | `docs/guide/run.md`, `docs/config/run.md`             |
-| Migration from existing tools     | `docs/guide/migrate.md`                               |
-| Caching and performance           | `docs/guide/cache.md`                                 |
-| Library mode (pack)               | `docs/guide/pack.md`, `docs/config/pack.md`           |
-| Troubleshooting                   | `docs/guide/troubleshooting.md`                       |
-| Configuration overview            | `docs/config/index.md`                                |
-| Staged files / pre-commit         | `docs/guide/commit-hooks.md`, `docs/config/staged.md` |
-| Install dependencies              | `docs/guide/install.md`                               |
-| Node.js version management        | `docs/guide/env.md`                                   |
-| Create a new project              | `docs/guide/create.md`                                |
-| CI setup                          | `docs/guide/ci.md`                                    |
-| IDE integration                   | `docs/guide/ide-integration.md`                       |
-| Upgrade Vite+                     | `docs/guide/upgrade.md`                               |
-| Execute one-off binaries          | `docs/guide/vpx.md`                                   |
-
-## Working Rules
-
-- For multi-topic tasks, combine only the needed doc files.
-- If docs and memory differ, follow docs.
diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.ts
index 5aecc7905e..276e613617 100644
--- a/packages/cli/src/bin.ts
+++ b/packages/cli/src/bin.ts
@@ -1,7 +1,7 @@
 /**
  * Unified entry point for both the local CLI (via bin/vp) and the global CLI (via Rust vp binary).
  *
- * Global commands (create, migrate, config, mcp, staged, --version) are handled by tsdown-bundled modules.
+ * Global commands (create, migrate, config, staged, --version) are handled by tsdown-bundled modules.
  * All other commands are delegated to the Rust core through NAPI bindings, which
  * uses JavaScript tool resolver functions to locate tool binaries.
  *
@@ -54,8 +54,6 @@ if (command === 'create') {
   await import('./migration/bin.js');
 } else if (command === 'config') {
   await import('./config/bin.js');
-} else if (command === 'mcp') {
-  await import('./mcp/bin.js');
 } else if (command === '--version' || command === '-V') {
   await import('./version.js');
 } else if (command === 'staged') {
diff --git a/packages/cli/src/mcp/bin.ts b/packages/cli/src/mcp/bin.ts
deleted file mode 100644
index 5c30e6ac82..0000000000
--- a/packages/cli/src/mcp/bin.ts
+++ /dev/null
@@ -1,497 +0,0 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-interface DocPage {
-  slug: string;
-  relativePath: string;
-  title: string;
-  content: string;
-}
-
-interface SearchResult {
-  slug: string;
-  title: string;
-  snippet: string;
-  score: number;
-}
-
-interface JsonRpcRequest {
-  jsonrpc: string;
-  id?: number | string | null;
-  method: string;
-  params?: Record<string, unknown>;
-}
-
-interface DocIndex {
-  pages: DocPage[];
-  byAlias: Map<string, DocPage>;
-}
-
-const PROTOCOL_VERSION = '2024-11-05';
-
-const TOOLS = [
-  {
-    name: 'list_pages',
-    description: 'List all Vite+ documentation pages with their slugs and titles',
-    inputSchema: { type: 'object' as const, properties: {} },
-  },
-  {
-    name: 'get_page',
-    description: 'Get the full content of a Vite+ documentation page by slug',
-    inputSchema: {
-      type: 'object' as const,
-      properties: {
-        slug: {
-          type: 'string',
-          description: "Page slug, e.g. 'vite/guide/cli' or 'cli'",
-        },
-      },
-      required: ['slug'],
-    },
-  },
-  {
-    name: 'search_docs',
-    description:
-      'Search Vite+ documentation by keyword query. Returns top 5 matching pages with snippets.',
-    inputSchema: {
-      type: 'object' as const,
-      properties: {
-        query: {
-          type: 'string',
-          description: "Search query, e.g. 'dev server' or 'testing'",
-        },
-      },
-      required: ['query'],
-    },
-  },
-];
-
-function findPackageRoot(from: string): string {
-  let dir = from;
-  while (true) {
-    if (existsSync(join(dir, 'package.json'))) {
-      return dir;
-    }
-    const parent = dirname(dir);
-    if (parent === dir) {
-      break;
-    }
-    dir = parent;
-  }
-  throw new Error('Could not find package.json from: ' + from);
-}
-
-function readPackageVersion(pkgRoot: string): string {
-  const raw = readFileSync(join(pkgRoot, 'package.json'), 'utf8');
-  const pkg = JSON.parse(raw) as { version?: string };
-  return pkg.version ?? '0.0.0';
-}
-
-function resolveDocsDir(pkgRoot: string): string {
-  const bundledDocsDir = join(pkgRoot, 'skills', 'vite-plus', 'docs');
-  if (existsSync(bundledDocsDir)) {
-    return bundledDocsDir;
-  }
-
-  const workspaceDocsDir = join(pkgRoot, '..', '..', 'docs');
-  if (existsSync(workspaceDocsDir)) {
-    return workspaceDocsDir;
-  }
-
-  throw new Error(`Vite+ docs directory not found. Expected bundled docs at: ${bundledDocsDir}`);
-}
-
-function collectMarkdownFiles(rootDir: string, relativeDir = ''): string[] {
-  const currentDir = join(rootDir, relativeDir);
-  const entries = readdirSync(currentDir, { withFileTypes: true });
-  const files: string[] = [];
-
-  for (const entry of entries) {
-    const relPath = relativeDir ? `${relativeDir}/${entry.name}` : entry.name;
-    if (entry.isDirectory()) {
-      if (entry.name === 'node_modules') {
-        continue;
-      }
-      files.push(...collectMarkdownFiles(rootDir, relPath));
-      continue;
-    }
-    if (entry.isFile() && entry.name.endsWith('.md')) {
-      files.push(relPath);
-    }
-  }
-
-  // eslint-disable-next-line unicorn/no-array-sort -- deterministic ordering for stable alias resolution
-  files.sort();
-  return files;
-}
-
-function normalizeDocId(value: string): string {
-  const normalized = value
-    .trim()
-    .replace(/\\/g, '/')
-    .replace(/^docs\//, '')
-    .replace(/\.md$/, '')
-    .replace(/\/index$/, '')
-    .replace(/^\/+|\/+$/g, '');
-  return normalized || 'index';
-}
-
-function createSlug(relativePath: string): string {
-  const withoutExt = relativePath.replace(/\.md$/, '');
-  if (withoutExt === 'index') {
-    return 'index';
-  }
-  if (withoutExt.endsWith('/index')) {
-    return withoutExt.slice(0, -'/index'.length);
-  }
-  return withoutExt;
-}
-
-function buildAliases(page: DocPage, basenameCounts: Map<string, number>): string[] {
-  const aliases = new Set<string>();
-  const relativeNoExt = page.relativePath.replace(/\.md$/, '');
-  const flatSlug = page.slug.replaceAll('/', '-');
-  const baseName = page.slug.split('/').at(-1);
-
-  aliases.add(page.slug);
-  aliases.add(`${page.slug}.md`);
-  aliases.add(relativeNoExt);
-  aliases.add(page.relativePath);
-  aliases.add(`docs/${relativeNoExt}`);
-  aliases.add(`docs/${page.relativePath}`);
-  aliases.add(flatSlug);
-  aliases.add(`${flatSlug}.md`);
-
-  if (baseName && (basenameCounts.get(baseName) ?? 0) === 1) {
-    aliases.add(baseName);
-    aliases.add(`${baseName}.md`);
-  }
-
-  return [...aliases];
-}
-
-function loadDocs(pkgRoot: string): DocIndex {
-  const docsDir = resolveDocsDir(pkgRoot);
-  const files = collectMarkdownFiles(docsDir);
-  const pages: DocPage[] = files.map((relativePath) => {
-    const raw = readFileSync(join(docsDir, relativePath), 'utf8');
-    const content = raw.replace(/^---\n[\s\S]*?\n---\n/, '');
-    const titleMatch = content.match(/^#\s+(.+)/m);
-    const slug = createSlug(relativePath);
-    const title = titleMatch ? titleMatch[1].trim() : slug;
-    return { slug, relativePath, title, content };
-  });
-
-  const basenameCounts = new Map<string, number>();
-  for (const page of pages) {
-    const baseName = page.slug.split('/').at(-1);
-    if (!baseName) {
-      continue;
-    }
-    basenameCounts.set(baseName, (basenameCounts.get(baseName) ?? 0) + 1);
-  }
-
-  const aliasCounts = new Map<string, number>();
-  const aliasSources = new Map<DocPage, string[]>();
-  for (const page of pages) {
-    const aliases = [...new Set(buildAliases(page, basenameCounts).map(normalizeDocId))];
-    aliasSources.set(page, aliases);
-    for (const alias of aliases) {
-      aliasCounts.set(alias, (aliasCounts.get(alias) ?? 0) + 1);
-    }
-  }
-
-  const byAlias = new Map<string, DocPage>();
-  for (const page of pages) {
-    for (const alias of aliasSources.get(page) ?? []) {
-      if ((aliasCounts.get(alias) ?? 0) !== 1) {
-        continue;
-      }
-      byAlias.set(alias, page);
-    }
-  }
-
-  return { pages, byAlias };
-}
-
-function searchDocs(pages: DocPage[], query: string): SearchResult[] {
-  const terms = query
-    .toLowerCase()
-    .split(/\s+/)
-    .filter((term) => term.length > 0);
-  if (terms.length === 0) {
-    return [];
-  }
-
-  const scored: SearchResult[] = [];
-  for (const page of pages) {
-    const titleLower = page.title.toLowerCase();
-    const contentLower = page.content.toLowerCase();
-    let score = 0;
-    let firstMatchIndex = -1;
-
-    for (const term of terms) {
-      let idx = 0;
-      while ((idx = titleLower.indexOf(term, idx)) !== -1) {
-        score += 3;
-        idx += term.length;
-      }
-
-      idx = 0;
-      while ((idx = contentLower.indexOf(term, idx)) !== -1) {
-        score += 1;
-        if (firstMatchIndex === -1) {
-          firstMatchIndex = idx;
-        }
-        idx += term.length;
-      }
-    }
-
-    if (score === 0) {
-      continue;
-    }
-
-    let snippet: string;
-    if (firstMatchIndex !== -1) {
-      const start = Math.max(0, firstMatchIndex - 80);
-      const end = Math.min(page.content.length, firstMatchIndex + 120);
-      snippet =
-        (start > 0 ? '...' : '') +
-        page.content.slice(start, end).trim() +
-        (end < page.content.length ? '...' : '');
-    } else {
-      snippet = page.content.slice(0, 200).trim() + '...';
-    }
-
-    scored.push({ slug: page.slug, title: page.title, snippet, score });
-  }
-
-  scored.sort((a, b) => b.score - a.score);
-  return scored.slice(0, 5);
-}
-
-function resolvePageBySlug(index: DocIndex, rawSlug: string): DocPage | undefined {
-  return index.byAlias.get(normalizeDocId(rawSlug));
-}
-
-function makeErrorResponse(id: number | string | null, code: number, message: string): object {
-  return {
-    jsonrpc: '2.0',
-    id,
-    error: { code, message },
-  };
-}
-
-function handleRequest(index: DocIndex, serverVersion: string, req: JsonRpcRequest): object | null {
-  const { method, id, params } = req;
-
-  if (method === 'initialize') {
-    return {
-      jsonrpc: '2.0',
-      id: id ?? null,
-      result: {
-        protocolVersion: PROTOCOL_VERSION,
-        capabilities: { tools: {} },
-        serverInfo: { name: 'vite-plus', version: serverVersion },
-      },
-    };
-  }
-
-  if (method === 'notifications/initialized' || method === '$/cancelRequest') {
-    return null;
-  }
-
-  if (method === 'ping') {
-    return { jsonrpc: '2.0', id: id ?? null, result: {} };
-  }
-
-  if (method === 'tools/list') {
-    return { jsonrpc: '2.0', id: id ?? null, result: { tools: TOOLS } };
-  }
-
-  if (method === 'tools/call') {
-    const toolName = (params?.name as string | undefined) ?? '';
-    const toolArgs = (params?.arguments as Record<string, unknown> | undefined) ?? {};
-
-    if (toolName === 'list_pages') {
-      const list = index.pages.map((page) => ({
-        slug: page.slug,
-        title: page.title,
-        path: `docs/${page.relativePath}`,
-      }));
-      return {
-        jsonrpc: '2.0',
-        id: id ?? null,
-        result: { content: [{ type: 'text', text: JSON.stringify(list, null, 2) }] },
-      };
-    }
-
-    if (toolName === 'get_page') {
-      const slug = toolArgs.slug;
-      if (typeof slug !== 'string' || slug.trim().length === 0) {
-        return {
-          jsonrpc: '2.0',
-          id: id ?? null,
-          result: {
-            content: [{ type: 'text', text: 'Missing required string argument: slug' }],
-            isError: true,
-          },
-        };
-      }
-      const page = resolvePageBySlug(index, slug);
-      if (!page) {
-        return {
-          jsonrpc: '2.0',
-          id: id ?? null,
-          result: {
-            content: [{ type: 'text', text: `Page not found: ${slug}` }],
-            isError: true,
-          },
-        };
-      }
-      return {
-        jsonrpc: '2.0',
-        id: id ?? null,
-        result: { content: [{ type: 'text', text: page.content }] },
-      };
-    }
-
-    if (toolName === 'search_docs') {
-      const query = toolArgs.query;
-      if (typeof query !== 'string' || query.trim().length === 0) {
-        return {
-          jsonrpc: '2.0',
-          id: id ?? null,
-          result: {
-            content: [{ type: 'text', text: 'Missing required string argument: query' }],
-            isError: true,
-          },
-        };
-      }
-      const results = searchDocs(index.pages, query);
-      return {
-        jsonrpc: '2.0',
-        id: id ?? null,
-        result: { content: [{ type: 'text', text: JSON.stringify(results, null, 2) }] },
-      };
-    }
-
-    if (id === undefined) {
-      return null;
-    }
-    return makeErrorResponse(id, -32601, `Unknown tool: ${toolName}`);
-  }
-
-  if (id === undefined) {
-    return null;
-  }
-  return makeErrorResponse(id, -32601, `Unknown method: ${method}`);
-}
-
-function writeMessage(payload: object): void {
-  const body = JSON.stringify(payload);
-  const header = `Content-Length: ${Buffer.byteLength(body, 'utf8')}\r\n\r\n`;
-  process.stdout.write(header + body);
-}
-
-function findHeadersBoundary(buffer: Buffer): { end: number; separatorLength: 2 | 4 } | null {
-  const crlf = buffer.indexOf('\r\n\r\n');
-  const lf = buffer.indexOf('\n\n');
-
-  if (crlf === -1 && lf === -1) {
-    return null;
-  }
-  if (crlf !== -1 && (lf === -1 || crlf < lf)) {
-    return { end: crlf, separatorLength: 4 };
-  }
-  return { end: lf, separatorLength: 2 };
-}
-
-function parseContentLength(rawHeaders: string): number | null {
-  const lines = rawHeaders.split(/\r?\n/);
-  for (const line of lines) {
-    const match = line.match(/^content-length:\s*(\d+)\s*$/i);
-    if (match) {
-      const value = Number.parseInt(match[1], 10);
-      if (Number.isSafeInteger(value) && value >= 0) {
-        return value;
-      }
-      return null;
-    }
-  }
-  return null;
-}
-
-function startStdioServer(index: DocIndex, serverVersion: string): void {
-  let buffer = Buffer.alloc(0);
-
-  process.stdin.on('error', () => {
-    process.exit(1);
-  });
-
-  process.stdin.on('end', () => {
-    process.exit(0);
-  });
-
-  process.stdin.on('data', (chunk: Buffer) => {
-    buffer = Buffer.concat([buffer, chunk]);
-
-    while (true) {
-      const boundary = findHeadersBoundary(buffer);
-      if (!boundary) {
-        break;
-      }
-
-      const headerText = buffer.subarray(0, boundary.end).toString('utf8');
-      const contentLength = parseContentLength(headerText);
-      const bodyStart = boundary.end + boundary.separatorLength;
-
-      if (contentLength === null) {
-        writeMessage(makeErrorResponse(null, -32600, 'Missing or invalid Content-Length header'));
-        buffer = buffer.subarray(bodyStart);
-        continue;
-      }
-
-      const bodyEnd = bodyStart + contentLength;
-      if (buffer.length < bodyEnd) {
-        break;
-      }
-
-      const body = buffer.subarray(bodyStart, bodyEnd).toString('utf8');
-      buffer = buffer.subarray(bodyEnd);
-
-      let request: JsonRpcRequest;
-      try {
-        request = JSON.parse(body) as JsonRpcRequest;
-      } catch {
-        writeMessage(makeErrorResponse(null, -32700, 'Parse error'));
-        continue;
-      }
-
-      if (typeof request.method !== 'string') {
-        writeMessage(
-          makeErrorResponse(request.id ?? null, -32600, 'Invalid request: missing "method" field'),
-        );
-        continue;
-      }
-
-      const response = handleRequest(index, serverVersion, request);
-      if (response !== null) {
-        writeMessage(response);
-      }
-    }
-  });
-}
-
-try {
-  const packageRoot = findPackageRoot(dirname(fileURLToPath(import.meta.url)));
-  const serverVersion = readPackageVersion(packageRoot);
-  const docs = loadDocs(packageRoot);
-  startStdioServer(docs, serverVersion);
-} catch (err) {
-  process.stderr.write(
-    `[vite-plus mcp] Failed to start: ${err instanceof Error ? err.message : String(err)}\n`,
-  );
-  process.exit(1);
-}
diff --git a/packages/cli/src/utils/agent.ts b/packages/cli/src/utils/agent.ts
index d5aa6853a5..f823cfa5c1 100644
--- a/packages/cli/src/utils/agent.ts
+++ b/packages/cli/src/utils/agent.ts
@@ -7,161 +7,6 @@ import * as prompts from '@voidzero-dev/vite-plus-prompts';
 
 import { pkgRoot } from './path.ts';
 
-// --- Interfaces ---
-
-export interface McpConfigTarget {
-  /** Config file path relative to project root, e.g. ".claude/settings.json" */
-  filePath: string;
-  /** JSON key that holds MCP server entries, e.g. "mcpServers" or "servers" */
-  rootKey: string;
-  /** Extra fields merged into the server entry, e.g. { type: "stdio" } for VS Code */
-  extraFields?: Record<string, string>;
-}
-
-export interface AgentConfig {
-  displayName: string;
-  skillsDir: string;
-  detect: (root: string) => boolean;
-  /** Project-level config files where MCP server entries can be auto-written */
-  mcpConfig?: McpConfigTarget[];
-  /** Fallback hint printed when the agent has no project-level config support */
-  mcpHint?: string;
-}
-
-// --- Agent registry ---
-
-const DEFAULT_MCP_HINT =
-  "Run `npx vp mcp` — this starts a stdio MCP server. See your agent's docs for how to add a local MCP server.";
-
-const agents: Record<string, AgentConfig> = {
-  'claude-code': {
-    displayName: 'Claude Code',
-    skillsDir: '.claude/skills',
-    detect: (root) =>
-      fs.existsSync(path.join(root, '.claude')) || fs.existsSync(path.join(root, 'CLAUDE.md')),
-    mcpConfig: [
-      { filePath: '.claude/settings.json', rootKey: 'mcpServers' },
-      { filePath: '.claude/settings.local.json', rootKey: 'mcpServers' },
-    ],
-  },
-  amp: {
-    displayName: 'Amp',
-    skillsDir: '.agents/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.amp')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  codex: {
-    displayName: 'Codex',
-    skillsDir: '.agents/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.codex')),
-    mcpHint: 'codex mcp add vite-plus -- npx vp mcp',
-  },
-  cursor: {
-    displayName: 'Cursor',
-    skillsDir: '.agents/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.cursor')),
-    mcpConfig: [{ filePath: '.cursor/mcp.json', rootKey: 'mcpServers' }],
-  },
-  windsurf: {
-    displayName: 'Windsurf',
-    skillsDir: '.windsurf/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.windsurf')),
-    mcpConfig: [{ filePath: '.windsurf/mcp.json', rootKey: 'mcpServers' }],
-  },
-  'gemini-cli': {
-    displayName: 'Gemini CLI',
-    skillsDir: '.agents/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.gemini')),
-    mcpHint: 'gemini mcp add vite-plus -- npx vp mcp',
-  },
-  'github-copilot': {
-    displayName: 'GitHub Copilot',
-    skillsDir: '.agents/skills',
-    detect: (root) =>
-      fs.existsSync(path.join(root, '.github', 'copilot-instructions.md')) ||
-      fs.existsSync(path.join(root, '.vscode', 'mcp.json')),
-    mcpConfig: [
-      { filePath: '.vscode/mcp.json', rootKey: 'servers', extraFields: { type: 'stdio' } },
-    ],
-  },
-  cline: {
-    displayName: 'Cline',
-    skillsDir: '.cline/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.cline')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  roo: {
-    displayName: 'Roo Code',
-    skillsDir: '.roo/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.roo')),
-    mcpConfig: [{ filePath: '.roo/mcp.json', rootKey: 'mcpServers' }],
-  },
-  kilo: {
-    displayName: 'Kilo Code',
-    skillsDir: '.kilocode/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.kilocode')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  continue: {
-    displayName: 'Continue',
-    skillsDir: '.continue/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.continue')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  goose: {
-    displayName: 'Goose',
-    skillsDir: '.goose/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.goose')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  opencode: {
-    displayName: 'OpenCode',
-    skillsDir: '.agents/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.opencode')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  trae: {
-    displayName: 'Trae',
-    skillsDir: '.trae/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.trae')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  junie: {
-    displayName: 'Junie',
-    skillsDir: '.junie/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.junie')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  'kiro-cli': {
-    displayName: 'Kiro CLI',
-    skillsDir: '.kiro/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.kiro')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  zencoder: {
-    displayName: 'Zencoder',
-    skillsDir: '.zencoder/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.zencoder')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-  'qwen-code': {
-    displayName: 'Qwen Code',
-    skillsDir: '.qwen/skills',
-    detect: (root) => fs.existsSync(path.join(root, '.qwen')),
-    mcpHint: DEFAULT_MCP_HINT,
-  },
-};
-
-// --- Registry functions ---
-
-export function getAgentById(id: string): AgentConfig | undefined {
-  return agents[id];
-}
-
-export function detectAgents(root: string): AgentConfig[] {
-  return Object.values(agents).filter((a) => a.detect(root));
-}
-
 // --- Backward-compatible exports ---
 
 export const AGENTS = [
diff --git a/packages/cli/src/utils/skills.ts b/packages/cli/src/utils/skills.ts
deleted file mode 100644
index 495120a09b..0000000000
--- a/packages/cli/src/utils/skills.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import {
-  existsSync,
-  lstatSync,
-  mkdirSync,
-  readFileSync,
-  readdirSync,
-  readlinkSync,
-  realpathSync,
-  symlinkSync,
-} from 'node:fs';
-import { join, relative } from 'node:path';
-
-import * as prompts from '@voidzero-dev/vite-plus-prompts';
-
-import { type AgentConfig } from './agent.ts';
-import { VITE_PLUS_NAME } from './constants.ts';
-import { pkgRoot } from './path.ts';
-
-interface SkillInfo {
-  dirName: string;
-  name: string;
-  description: string;
-}
-
-export function parseSkills(skillsDir: string): SkillInfo[] {
-  if (!existsSync(skillsDir)) {
-    return [];
-  }
-  const entries = readdirSync(skillsDir, { withFileTypes: true });
-  const skills: SkillInfo[] = [];
-  for (const entry of entries) {
-    if (!entry.isDirectory()) {
-      continue;
-    }
-    const skillMd = join(skillsDir, entry.name, 'SKILL.md');
-    if (!existsSync(skillMd)) {
-      continue;
-    }
-    const content = readFileSync(skillMd, 'utf-8');
-    const frontmatter = content.match(/^---\n([\s\S]*?)\n---/);
-    if (!frontmatter) {
-      prompts.log.warn(`  Skipping ${entry.name}: SKILL.md is missing valid frontmatter`);
-      continue;
-    }
-    const nameMatch = frontmatter[1].match(/^name:\s*(.+)$/m);
-    const descMatch = frontmatter[1].match(/^description:\s*(.+)$/m);
-    skills.push({
-      dirName: entry.name,
-      name: nameMatch ? nameMatch[1].trim() : entry.name,
-      description: descMatch ? descMatch[1].trim() : '',
-    });
-  }
-  return skills;
-}
-
-/** Check if a path exists on disk, including broken symlinks that existsSync misses. */
-function pathExists(p: string): boolean {
-  try {
-    lstatSync(p);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function linkSkills(
-  root: string,
-  skillsDir: string,
-  skills: SkillInfo[],
-  agentSkillsDir: string,
-): number {
-  const targetDir = join(root, agentSkillsDir);
-  if (!existsSync(targetDir)) {
-    mkdirSync(targetDir, { recursive: true });
-  }
-
-  const isWindows = process.platform === 'win32';
-  const symlinkType = isWindows ? 'junction' : 'dir';
-
-  let linked = 0;
-  for (const skill of skills) {
-    const linkPath = join(targetDir, skill.dirName);
-    const sourcePath = join(skillsDir, skill.dirName);
-    const relativeTarget = relative(targetDir, sourcePath);
-    const symlinkTarget = isWindows ? sourcePath : relativeTarget;
-
-    if (pathExists(linkPath)) {
-      try {
-        const existing = readlinkSync(linkPath);
-        if (existing === symlinkTarget) {
-          prompts.log.info(`  ${skill.name} — already linked`);
-          continue;
-        }
-      } catch (err: unknown) {
-        if ((err as NodeJS.ErrnoException).code !== 'EINVAL') {
-          prompts.log.warn(
-            `  ${skill.name} — failed to read existing path: ${(err as Error).message}`,
-          );
-          continue;
-        }
-      }
-      prompts.log.warn(`  ${skill.name} — path exists but is not the expected symlink, skipping`);
-      continue;
-    }
-
-    try {
-      symlinkSync(symlinkTarget, linkPath, symlinkType);
-    } catch (err: unknown) {
-      prompts.log.warn(`  ${skill.name} — failed to create symlink: ${(err as Error).message}`);
-      continue;
-    }
-    prompts.log.success(`  ${skill.name} — linked`);
-    linked++;
-  }
-  return linked;
-}
-
-function getStableSkillsDir(root: string): string {
-  const resolvedSkillsDir = join(pkgRoot, 'skills');
-  // Prefer the logical node_modules path for a cleaner, stable symlink
-  // (avoids pnpm's versioned .pnpm/pkg@version/... real path)
-  const logicalSkillsDir = join(root, 'node_modules', VITE_PLUS_NAME, 'skills');
-  try {
-    if (realpathSync(logicalSkillsDir) === realpathSync(resolvedSkillsDir)) {
-      return logicalSkillsDir;
-    }
-  } catch {
-    // Fall through to resolved path
-  }
-  return resolvedSkillsDir;
-}
-
-export function linkSkillsForSpecificAgents(root: string, agentConfigs: AgentConfig[]): number {
-  const skillsDir = getStableSkillsDir(root);
-  const skills = parseSkills(skillsDir);
-  if (skills.length === 0) {
-    return 0;
-  }
-
-  if (agentConfigs.length === 0) {
-    return 0;
-  }
-
-  let totalLinked = 0;
-  for (const agent of agentConfigs) {
-    prompts.log.info(`${agent.displayName} → ${agent.skillsDir}`);
-    totalLinked += linkSkills(root, skillsDir, skills, agent.skillsDir);
-  }
-  return totalLinked;
-}
diff --git a/packages/cli/tsdown.config.ts b/packages/cli/tsdown.config.ts
index 1e619c6d2b..d3c18640b5 100644
--- a/packages/cli/tsdown.config.ts
+++ b/packages/cli/tsdown.config.ts
@@ -36,7 +36,6 @@ export default defineConfig([
       'migration/bin': './src/migration/bin.ts',
       version: './src/version.ts',
       'config/bin': './src/config/bin.ts',
-      'mcp/bin': './src/mcp/bin.ts',
       'staged/bin': './src/staged/bin.ts',
     },
     outDir: 'dist',