@42ailab/42plugin 0.1.13 → 0.1.16

package/README.md

@@ -200,9 +200,9 @@ CLI                              API                              Browser
    - author/name → TargetType.Plugin
    - author/kit/slug → TargetType.Kit
 
-2. 从 API 获取下载信息
-   - GET /v1/plugins/{author}/{name}/download
-   - GET /v1/kits/{username}/kit/{slug}/download
+2. 从 API 获取下载信息（CLI 专用端点）
+   - GET /cli/v1/download/plugin/{author}/{name}
+   - GET /cli/v1/download/kit/{username}/{slug}
 
 3. 检查本地缓存（plugin_cache 表）
 
@@ -229,13 +229,16 @@ CLI                              API                              Browser
 | `/api/user/installed` | POST | 同步安装记录 |
 | `/api/user/installed/{author}/{name}` | DELETE | 同步卸载记录 |
 
-### 业务 API
+### CLI 专用 API（稳定契约）
 
 | 端点 | 方法 | 说明 |
 |------|------|------|
-| `/v1/plugins/{author}/{name}/download` | GET | 获取插件下载信息 |
-| `/v1/kits/{username}/kit/{slug}/download` | GET | 获取套包下载信息 |
-| `/v1/search?q=` | GET | 搜索 |
+| `/cli/v1/download/plugin/{author}/{name}` | GET | 获取插件下载信息 |
+| `/cli/v1/download/kit/{username}/{slug}` | GET | 获取套包下载信息 |
+| `/cli/v1/search?q=` | GET | 搜索插件 |
+| `/cli/v1/session` | GET | 会话验证 |
+
+> CLI 专用端点直接返回 camelCase 格式，扁平化结构，独立版本控制。
 
 ## 开发命令
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@42ailab/42plugin",
-  "version": "0.1.13",
+  "version": "0.1.16",
   "description": "活水插件",
   "type": "module",
   "main": "src/index.ts",

package/src/api.ts

@@ -121,66 +121,150 @@ class ApiClient {
   }
 
   // ==========================================================================
-  // 插件 API
+  // 插件 API（使用 CLI 专用端点）
   // ==========================================================================
 
+  /**
+   * 获取插件下载信息
+   * 使用 CLI 专用端点 /cli/v1/download/plugin/:author/:name
+   * 响应直接返回 camelCase，无需转换
+   */
   async getPluginDownload(author: string, name: string): Promise<PluginDownload> {
-    return this.request<PluginDownload>(`/v1/plugins/${author}/${name}/download`);
+    // CLI 专用端点直接返回扁平化的下载信息
+    const data = await this.request<{
+      fullName: string;
+      name: string;
+      type: PluginType;
+      version: string;
+      downloadUrl: string;
+      checksum: string;
+      sizeBytes: number;
+      installPath: string;
+      expiresAt: string;
+      requiresAuth: boolean;
+      priceTier: 'free' | 'vip' | 'premium';
+    }>(`/cli/v1/download/plugin/${author}/${name}`);
+
+    // 转换为 PluginDownload 格式（保持与现有代码兼容）
+    return {
+      plugin: {
+        fullName: data.fullName,
+        name: data.name,
+        title: null,
+        description: null,
+        author: author,
+        type: data.type,
+        version: data.version,
+        sourceRepo: null,
+      },
+      download: {
+        fullName: data.fullName,
+        name: data.name,
+        type: data.type,
+        version: data.version,
+        downloadUrl: data.downloadUrl,
+        checksum: data.checksum,
+        sizeBytes: data.sizeBytes,
+        installPath: data.installPath,
+      },
+      priceTier: data.priceTier,
+      isPaid: data.priceTier !== 'free',
+      requiresAuth: data.requiresAuth,
+      expiresAt: data.expiresAt,
+    };
   }
 
   // ==========================================================================
-  // 套包 API
+  // 套包 API（使用 CLI 专用端点）
   // ==========================================================================
 
+  /**
+   * 获取套包下载信息
+   * 使用 CLI 专用端点 /cli/v1/download/kit/:username/:slug
+   * 响应直接返回 camelCase，扁平化结构
+   */
   async getKitDownload(username: string, slugOrId: string): Promise<KitDownload> {
-    const raw = await this.request<KitApiResponse['data']>(
-      `/v1/kits/${username}/kit/${slugOrId}/download`
+    // CLI 专用端点直接返回扁平化的下载信息（camelCase）
+    interface CliKitDownloadResponse {
+      kit: {
+        fullName: string;
+        name: string;
+        priceTier: 'free' | 'vip' | 'premium';
+      };
+      plugins: Array<{
+        fullName: string;
+        name: string;
+        type: PluginType;
+        version: string;
+        downloadUrl: string;
+        checksum: string;
+        sizeBytes: number;
+        installPath: string;
+        required: boolean;
+        reason: string | null;
+      }>;
+      summary: {
+        totalPlugins: number;
+        requiredPlugins: number;
+        optionalPlugins: number;
+        totalSizeBytes: number;
+        expiresAt: string;
+      };
+    }
+
+    const data = await this.request<CliKitDownloadResponse>(
+      `/cli/v1/download/kit/${username}/${slugOrId}`
     );
 
-    // 转换 snake_case -> camelCase
+    // 转换为 KitDownload 格式（保持与现有代码兼容）
     return {
       kit: {
-        fullName: raw.kit.full_name,
-        name: raw.kit.name,
-        description: raw.kit.description,
-        priceTier: raw.kit.price_tier,
-        effectivePriceTier: raw.kit.effective_price_tier,
+        fullName: data.kit.fullName,
+        name: data.kit.name,
+        description: null,
+        priceTier: data.kit.priceTier,
+        effectivePriceTier: data.kit.priceTier,
       },
-      plugins: raw.plugins.map((p) => ({
+      plugins: data.plugins.map((p) => ({
         plugin: {
-          fullName: p.plugin.full_name,
-          name: p.plugin.name,
-          title: p.plugin.title,
-          author: p.plugin.author,
-          type: p.plugin.type,
+          fullName: p.fullName,
+          name: p.name,
+          title: null,
+          author: null,
+          type: p.type,
         },
         download: {
-          fullName: p.download.full_name,
-          name: p.download.name,
-          type: p.download.type,
-          version: p.download.version,
-          downloadUrl: p.download.download_url,
-          checksum: p.download.checksum,
-          sizeBytes: p.download.size_bytes,
-          installPath: p.download.install_path,
+          fullName: p.fullName,
+          name: p.name,
+          type: p.type,
+          version: p.version,
+          downloadUrl: p.downloadUrl,
+          checksum: p.checksum,
+          sizeBytes: p.sizeBytes,
+          installPath: p.installPath,
         },
         required: p.required,
         reason: p.reason,
       })),
       summary: {
-        totalPlugins: raw.summary.total_plugins,
-        requiredPlugins: raw.summary.required_plugins,
-        optionalPlugins: raw.summary.optional_plugins,
-        totalSizeBytes: raw.summary.total_size_bytes,
-        expiresAt: raw.summary.expires_at,
+        totalPlugins: data.summary.totalPlugins,
+        requiredPlugins: data.summary.requiredPlugins,
+        optionalPlugins: data.summary.optionalPlugins,
+        totalSizeBytes: data.summary.totalSizeBytes,
+        expiresAt: data.summary.expiresAt,
       },
     };
   }
 
   // ==========================================================================
-  // 搜索 API
+  // 搜索 API（使用 CLI 专用端点）
   // ==========================================================================
 
+  /**
+   * 搜索插件
+   * 使用 CLI 专用端点 /cli/v1/search
+   * 响应直接返回 camelCase，只返回插件不返回套包
+   */
   async search(params: {
     q: string;
     pluginType?: string;
@@ -189,11 +273,10 @@ class ApiClient {
   }): Promise<SearchResponse> {
     const searchParams = new URLSearchParams();
     searchParams.set('q', params.q);
-    if (params.pluginType) searchParams.set('plugin_type', params.pluginType);
+    if (params.pluginType) searchParams.set('type', params.pluginType);
     if (params.page) searchParams.set('page', String(params.page));
     if (params.perPage) searchParams.set('per_page', String(params.perPage));
 
-    // 搜索 API 直接返回 {data, pagination}，不需要解包
     const headers: Record<string, string> = {
       'Content-Type': 'application/json',
       'User-Agent': '42plugin-cli/1.0.0',
@@ -203,7 +286,8 @@ class ApiClient {
       headers['Authorization'] = `Bearer ${this.sessionToken}`;
     }
 
-    const response = await fetch(`${this.baseUrl}/v1/search?${searchParams}`, {
+    // 使用 CLI 专用搜索端点
+    const response = await fetch(`${this.baseUrl}/cli/v1/search?${searchParams}`, {
       method: 'GET',
       headers,
     });
@@ -213,32 +297,50 @@ class ApiClient {
     if (!response.ok) {
       const error = raw?.error;
       const message = error?.message || `HTTP ${response.status}`;
-      throw new ApiError(response.status, '/v1/search', message, error?.code);
+      throw new ApiError(response.status, '/cli/v1/search', message, error?.code);
     }
 
-    // 转换 API 响应格式为内部格式 (snake_case -> camelCase)
-    const apiData = raw as SearchApiResponse;
-    const plugins = apiData.data?.plugins || [];
+    // CLI 专用端点直接返回 camelCase 格式
+    interface CliSearchResponse {
+      data: Array<{
+        fullName: string;
+        name: string;
+        title: string | null;
+        type: PluginType;
+        version: string;
+        author: string;
+        downloads: number;
+        description: string | null;
+      }>;
+      pagination: {
+        page: number;
+        perPage: number;
+        total: number;
+        totalPages: number;
+      };
+    }
+
+    const apiData = raw as CliSearchResponse;
 
     return {
-      data: plugins.map((p) => ({
-        fullName: p.full_name,
+      data: apiData.data.map((p) => ({
+        fullName: p.fullName,
         name: p.name,
         title: p.title,
-        slogan: p.slogan || null,
+        slogan: null,
         description: p.description,
         type: p.type,
-        version: p.version || '0.0.0',
-        author: p.author,
-        tags: p.tags || [],
+        version: p.version,
+        author: { username: p.author },
+        tags: [],
         downloads: p.downloads,
-        icon: p.icon || null,
+        icon: null,
       })),
       pagination: {
-        page: apiData.pagination?.page || 1,
-        perPage: apiData.pagination?.per_page || 20,
-        total: apiData.pagination?.total || 0,
-        totalPages: Math.ceil((apiData.pagination?.total || 0) / (apiData.pagination?.per_page || 20)),
+        page: apiData.pagination.page,
+        perPage: apiData.pagination.perPage,
+        total: apiData.pagination.total,
+        totalPages: apiData.pagination.totalPages,
       },
     };
   }
@@ -254,6 +356,7 @@ class ApiClient {
         'Content-Type': 'application/json',
         'User-Agent': '42plugin-cli/1.0.0',
         'X-Download-Source': 'cli',
+        'Origin': this.baseUrl, // Better Auth 需要 Origin 头进行来源验证
       },
       body: JSON.stringify({
         client_id: '42plugin-cli',
@@ -280,6 +383,7 @@ class ApiClient {
         'Content-Type': 'application/json',
         'User-Agent': '42plugin-cli/1.0.0',
         'X-Download-Source': 'cli',
+        'Origin': this.baseUrl, // Better Auth 需要 Origin 头进行来源验证
       },
       body: JSON.stringify({
         client_id: '42plugin-cli',
@@ -338,7 +442,36 @@ class ApiClient {
         },
       };
     }
-    return this.request<Session>('/session');
+
+    // CLI 专用端点返回扁平化格式，需要转换
+    interface CliSessionResponse {
+      authenticated: boolean;
+      user: {
+        id: string;
+        username: string | null;
+        name: string | null;
+      } | null;
+      expiresAt: string | null;
+    }
+
+    const data = await this.request<CliSessionResponse>('/cli/v1/session');
+
+    if (!data.authenticated || !data.user) {
+      throw new ApiError(401, '/cli/v1/session', 'Not authenticated', 'UNAUTHORIZED');
+    }
+
+    return {
+      user: {
+        id: data.user.id,
+        name: data.user.name,
+        username: data.user.username,
+        email: null, // CLI 专用端点不返回 email
+      },
+      session: {
+        id: data.user.id, // 使用 user.id 作为 session 标识
+        expiresAt: data.expiresAt || new Date(Date.now() + 86400000).toISOString(),
+      },
+    };
   }
 
   // ==========================================================================

package/src/auth-middleware.ts

@@ -0,0 +1,106 @@
+/**
+ * 认证中间件 - 全局认证检查
+ *
+ * 使用 Commander.js preAction hook 统一处理认证逻辑
+ */
+
+import { Command } from 'commander';
+import chalk from 'chalk';
+import { getSessionToken } from './db';
+import { api, ApiError } from './api';
+import { config } from './config';
+
+/**
+ * 需要强制认证的命令（严格模式）
+ * 特征：必须登录且 session 有效，否则报错退出
+ */
+const REQUIRE_AUTH_COMMANDS = new Set([
+  'publish',
+  'search',
+  'install',
+  'uninstall',
+]);
+
+/**
+ * 不需要认证的命令（跳过模式）
+ * 特征：完全不需要 token
+ */
+const SKIP_AUTH_COMMANDS = new Set([
+  'auth',
+  'list',
+  'check',
+  'completion',
+  'setup',
+  'version',
+]);
+
+/**
+ * 设置全局认证 Hook
+ */
+export function setupAuthHook(program: Command): void {
+  // 使用 preSubcommand 钩子，在子命令执行前运行
+  program.hook('preSubcommand', async (thisCommand, subcommand) => {
+    const commandName = subcommand.name();
+
+    // 跳过帮助命令（--help/-h 应该始终可用）
+    const args = process.argv;
+    if (args.includes('--help') || args.includes('-h')) {
+      return;
+    }
+
+    // 跳过不需要认证的命令
+    if (SKIP_AUTH_COMMANDS.has(commandName)) {
+      return;
+    }
+
+    // 开发模式：跳过所有认证检查
+    if (config.devSkipAuth) {
+      console.log(chalk.cyan('[DEV] 跳过认证检查'));
+      return;
+    }
+
+    // 获取 token
+    const token = await getSessionToken();
+
+    // 严格模式：必须有 token 且有效
+    if (REQUIRE_AUTH_COMMANDS.has(commandName)) {
+      if (!token) {
+        console.error(chalk.red('请先登录: 42plugin auth'));
+        process.exit(1);
+      }
+
+      // 注入 token
+      api.setSessionToken(token);
+
+      // 验证 session 有效性
+      try {
+        const session = await api.getSession();
+
+        // 提示建议设置用户名（仅 publish 命令）
+        if (commandName === 'publish' && !session.user.name) {
+          console.log(chalk.yellow('提示: 建议先设置用户名'));
+        }
+      } catch (error) {
+        // 区分认证错误和网络错误
+        if (error instanceof ApiError && (error.statusCode === 401 || error.statusCode === 403)) {
+          console.error(chalk.red('登录已过期，请重新登录: 42plugin auth'));
+          process.exit(1);
+        }
+        // 网络错误或其他错误，提供更友好的提示
+        const message = error instanceof Error ? error.message : '未知错误';
+        if (message.includes('fetch') || message.includes('network') || message.includes('ECONNREFUSED')) {
+          console.error(chalk.red('网络连接失败，请检查网络后重试'));
+          process.exit(1);
+        }
+        // 其他错误按认证过期处理（保守策略）
+        console.error(chalk.red('登录验证失败，请重新登录: 42plugin auth'));
+        process.exit(1);
+      }
+    } else {
+      // 宽松模式：有 token 就注入，没有也不报错（用于未来扩展）
+      if (token) {
+        api.setSessionToken(token);
+      }
+    }
+  });
+}

package/src/cli.ts

@@ -14,6 +14,7 @@ import {
   publishCommand,
   checkCommand,
 } from './commands';
+import { setupAuthHook } from './auth-middleware';
 
 // 版本号处理：
 // - Homebrew（编译后）：构建时通过 --define __VERSION__ 注入
@@ -63,4 +64,7 @@ program
     console.log(`42plugin v${VERSION}`);
   });
 
+// 注册全局认证 Hook
+setupAuthHook(program);
+
 export { program };

package/src/commands/auth.ts

@@ -66,7 +66,7 @@ async function login(): Promise<void> {
 
       const tokenResponse = await api.pollDeviceToken(deviceCode.deviceCode);
 
-      if (tokenResponse.accessToken && tokenResponse.user) {
+      if (tokenResponse.accessToken) {
         pollSpinner.succeed('授权成功！');
 
         // 保存 token
@@ -74,7 +74,12 @@ async function login(): Promise<void> {
         api.setSessionToken(tokenResponse.accessToken);
 
         console.log();
-        console.log(chalk.green(`欢迎，${tokenResponse.user.name || tokenResponse.user.username || tokenResponse.user.email}！`));
+        try {
+          const session = await api.getSession();
+          console.log(chalk.green(`欢迎，${session.user.name || session.user.username || session.user.email}！`));
+        } catch {
+          console.log(chalk.green('授权成功！'));
+        }
         return;
       }
 

package/src/commands/install.ts

@@ -11,11 +11,12 @@ import { confirm } from '@inquirer/prompts';
 import { api, QuotaExceededError } from '../api';
 import fs from 'fs/promises';
 import {
-  getSessionToken,
   getOrCreateProject,
   addInstallation,
   createLink,
   resolveCachePath,
+  checkInstallConflict,
+  removeInstallation,
 } from '../db';
 import { config } from '../config';
 import { parseTarget, getInstallPath, formatBytes, getTypeIcon } from '../utils';
@@ -29,12 +30,7 @@ export const installCommand = new Command('install')
   .option('--no-cache', '跳过缓存检查')
   .option('--optional', '安装套包时包含可选插件')
   .action(async (target, options) => {
-    // 初始化 API token
-    const token = await getSessionToken();
-    if (token) {
-      api.setSessionToken(token);
-    }
-
+    // token 已在全局 hook 中注入
     try {
       // 检测是否在 home 目录
       const currentPath = path.resolve(process.cwd());
@@ -109,6 +105,33 @@ async function installPlugin(
 
     spinner.text = `安装 ${downloadInfo.fullName}...`;
 
+    // 确定安装路径
+    const projectPath = options.global ? config.globalDir : process.cwd();
+    const linkPath = path.join(projectPath, downloadInfo.installPath);
+
+    // 检查是否有同名冲突（不同插件安装到同一路径）
+    const conflictPlugin = await checkInstallConflict(projectPath, linkPath, downloadInfo.fullName);
+    if (conflictPlugin) {
+      spinner.stop();
+      console.log(chalk.yellow(`\n⚠ 安装路径冲突`));
+      console.log(chalk.gray(`  路径: ${downloadInfo.installPath}`));
+      console.log(chalk.gray(`  已安装: ${conflictPlugin}`));
+      console.log(chalk.gray(`  新插件: ${downloadInfo.fullName}`));
+
+      const shouldReplace = await confirm({
+        message: `是否替换已安装的 ${conflictPlugin}？`,
+        default: false,
+      });
+
+      if (!shouldReplace) {
+        console.log(chalk.gray('已取消安装'));
+        return;
+      }
+      // 删除冲突的旧安装记录
+      await removeInstallation(projectPath, conflictPlugin);
+      spinner.start(`安装 ${downloadInfo.fullName}...`);
+    }
+
     // 解析缓存
     const { cachePath, fromCache } = await resolveCachePath(
       downloadInfo,
@@ -116,11 +139,7 @@ async function installPlugin(
       options.cache !== false
     );
 
-    // 确定安装路径
-    const projectPath = options.global ? config.globalDir : process.cwd();
     const project = await getOrCreateProject(projectPath);
-    const linkPath = path.join(projectPath, downloadInfo.installPath);
-
     await createLink(cachePath, linkPath);
 
     await addInstallation({
@@ -188,6 +207,28 @@ async function installKit(
 
       try {
         const downloadInfo = item.download;
+        const linkPath = path.join(projectPath, downloadInfo.installPath);
+
+        // 检查是否有同名冲突
+        const conflictPlugin = await checkInstallConflict(projectPath, linkPath, downloadInfo.fullName);
+        if (conflictPlugin) {
+          pluginSpinner.stop();
+          console.log(chalk.yellow(`  ⚠ 路径冲突: ${downloadInfo.installPath}`));
+          console.log(chalk.gray(`    已安装: ${conflictPlugin}`));
+
+          const shouldReplace = await confirm({
+            message: `是否替换 ${conflictPlugin}？`,
+            default: false,
+          });
+
+          if (!shouldReplace) {
+            console.log(chalk.gray('    已跳过'));
+            continue;
+          }
+          // 删除冲突的旧安装记录
+          await removeInstallation(projectPath, conflictPlugin);
+          pluginSpinner.start(`  ${item.plugin.fullName}...`);
+        }
 
         const { cachePath, fromCache } = await resolveCachePath(
           downloadInfo,
@@ -195,7 +236,6 @@ async function installKit(
           options.cache !== false
         );
 
-        const linkPath = path.join(projectPath, downloadInfo.installPath);
         await createLink(cachePath, linkPath);
 
         await addInstallation({

package/src/commands/list.ts

@@ -42,8 +42,11 @@ export const listCommand = new Command('list')
         console.log(`${icon} ${chalk.cyan.bold(item.fullName)} ${chalk.gray(`v${item.version}`)}`);
         console.log(chalk.gray(`  → ${item.linkPath}`));
 
-        if (item.source === 'kit' && item.sourceKit) {
-          console.log(chalk.gray(`  来自套包: ${item.sourceKit}`));
+        // 解析所属套包：fullName 格式为 author/kit/plugin
+        const parts = item.fullName.split('/');
+        if (parts.length >= 3) {
+          const kitName = `${parts[0]}/${parts[1]}`;
+          console.log(chalk.gray(`  所属套包: ${kitName}`));
         }
 
         console.log(chalk.gray(`  安装于 ${time}`));

package/src/commands/publish.ts

@@ -5,8 +5,6 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { api } from '../api';
-import { config } from '../config';
-import { getSessionToken } from '../db';
 import { Publisher } from '../services/publisher';
 import { ValidationError, UploadError, AuthRequiredError } from '../errors';
 import { getTypeIcon } from '../utils';
@@ -20,28 +18,7 @@ export const publishCommand = new Command('publish')
   .option('-n, --name <name>', '覆盖插件名称')
   .action(async (pluginPath, options) => {
     try {
-      // 开发模式跳过认证检查
-      if (!config.devSkipAuth) {
-        // 检查登录状态
-        const token = await getSessionToken();
-        if (!token) {
-          throw new AuthRequiredError();
-        }
-        api.setSessionToken(token);
-
-        // 验证 session 有效性
-        try {
-          const session = await api.getSession();
-          if (!session.user.name) {
-            console.log(chalk.yellow('提示: 建议先设置用户名'));
-          }
-        } catch {
-          throw new AuthRequiredError('登录已过期，请重新登录: 42plugin auth');
-        }
-      } else {
-        console.log(chalk.cyan('[DEV] 跳过认证检查'));
-      }
-
+      // 认证检查已在全局 hook 中完成
       // 执行发布
       const publisher = new Publisher();
       const result = await publisher.publish({

package/src/commands/search.ts

@@ -5,33 +5,61 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
-import { checkbox } from '@inquirer/prompts';
+import { checkbox, confirm } from '@inquirer/prompts';
 import { api } from '../api';
-import { getSessionToken } from '../db';
-import { getTypeIcon, getTypeLabel, parseTarget } from '../utils';
-import type { PluginType, SearchResult } from '../types';
+import { getTypeIcon, getTypeLabel } from '../utils';
+import type { SearchResult } from '../types';
+
+const DEFAULT_PAGE_SIZE = 7;
+
+function displayResults(items: SearchResult[], startIndex: number = 0): void {
+  for (const item of items) {
+    const icon = getTypeIcon(item.type);
+    const typeLabel = getTypeLabel(item.type);
+
+    console.log(`${icon} ${chalk.cyan.bold(item.fullName)} ${chalk.gray(`[${typeLabel}]`)}`);
+
+    if (item.title || item.slogan) {
+      console.log(`  ${item.title || item.slogan}`);
+    }
+
+    if (item.description) {
+      const desc = item.description.length > 80
+        ? item.description.slice(0, 80) + '...'
+        : item.description;
+      console.log(chalk.gray(`  ${desc}`));
+    }
+
+    console.log(chalk.gray(`  v${item.version} · ${item.downloads} 下载`));
+    console.log();
+  }
+}
 
 export const searchCommand = new Command('search')
   .description('搜索插件')
   .argument('<keyword>', '搜索关键词')
   .option('-t, --type <type>', '筛选类型 (skill, agent, command, hook, mcp)')
-  .option('-l, --limit <n>', '结果数量', '20')
+  .option('-l, --limit <n>', '每页数量', String(DEFAULT_PAGE_SIZE))
+  .option('-a, --all', '显示所有结果')
   .option('--json', '输出 JSON 格式')
   .option('-i, --interactive', '交互式选择安装')
   .action(async (keyword, options) => {
-    // 初始化 API token
-    const token = await getSessionToken();
-    if (token) {
-      api.setSessionToken(token);
-    }
-
+    // token 已在全局 hook 中注入
     const spinner = ora('搜索中...').start();
 
     try {
+      const pageSize = parseInt(options.limit) || DEFAULT_PAGE_SIZE;
+      let allResults: SearchResult[] = [];
+      let currentPage = 1;
+      let totalResults = 0;
+      let displayedCount = 0;
+
+      // 首次搜索
       const result = await api.search({
         q: keyword,
         pluginType: options.type,
-        perPage: parseInt(options.limit) || 20,
+        perPage: pageSize,
+        page: currentPage,
       });
 
       spinner.stop();
@@ -46,35 +74,60 @@ export const searchCommand = new Command('search')
         return;
       }
 
-      console.log(
-        chalk.gray(`找到 ${result.pagination.total} 个结果，显示第 1-${result.data.length} 个:\n`)
-      );
+      totalResults = result.pagination.total;
+      allResults = result.data;
 
-      for (const item of result.data) {
-        const icon = getTypeIcon(item.type);
-        const typeLabel = getTypeLabel(item.type);
+      console.log(chalk.gray(`找到 ${totalResults} 个结果:\n`));
 
-        console.log(`${icon} ${chalk.cyan.bold(item.fullName)} ${chalk.gray(`[${typeLabel}]`)}`);
+      // 显示首批结果
+      displayResults(allResults);
+      displayedCount = allResults.length;
 
-        if (item.title || item.slogan) {
-          console.log(`  ${item.title || item.slogan}`);
+      // 如果有更多结果，根据模式决定是否继续
+      while (displayedCount < totalResults) {
+        // 非 --all 模式下询问用户
+        if (!options.all) {
+          const remaining = totalResults - displayedCount;
+
+          const loadMore = await confirm({
+            message: `还有 ${remaining} 个结果，是否继续查看？`,
+            default: true,
+          });
+
+          if (!loadMore) {
+            break;
+          }
         }
 
-        if (item.description) {
-          const desc = item.description.length > 80
-            ? item.description.slice(0, 80) + '...'
-            : item.description;
-          console.log(chalk.gray(`  ${desc}`));
+        currentPage++;
+        const moreSpinner = ora('加载更多...').start();
+
+        const moreResult = await api.search({
+          q: keyword,
+          pluginType: options.type,
+          perPage: pageSize,
+          page: currentPage,
+        });
+
+        moreSpinner.stop();
+
+        if (moreResult.data.length === 0) {
+          break;
         }
 
-        console.log(chalk.gray(`  v${item.version} · ${item.downloads} 下载`));
-        console.log();
+        if (!options.all) {
+          console.log();
+        }
+
+        displayResults(moreResult.data);
+        allResults = [...allResults, ...moreResult.data];
+        displayedCount += moreResult.data.length;
       }
 
       // 交互式选择安装
-      if (options.interactive && result.data.length > 0) {
+      if (options.interactive && allResults.length > 0) {
         console.log();
-        const choices = result.data.map((item) => ({
+        const choices = allResults.map((item) => ({
           name: `${getTypeIcon(item.type)} ${item.fullName} - ${item.title || item.slogan || item.description?.slice(0, 30) || ''}`,
           value: item.fullName,
         }));

package/src/commands/uninstall.ts

@@ -6,7 +6,7 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
 import { api } from '../api';
-import { getSessionToken, getInstallations, removeInstallation, removeLink, removeCache } from '../db';
+import { getInstallations, removeInstallation, removeLink, removeCache } from '../db';
 import { parseTarget } from '../utils';
 
 export const uninstallCommand = new Command('uninstall')
@@ -15,12 +15,7 @@ export const uninstallCommand = new Command('uninstall')
   .argument('<target>', '插件名 (author/name)')
   .option('--purge', '同时清除缓存')
   .action(async (target, options) => {
-    // 初始化 API token
-    const token = await getSessionToken();
-    if (token) {
-      api.setSessionToken(token);
-    }
-
+    // token 已在全局 hook 中注入
     const spinner = ora(`卸载 ${target}...`).start();
 
     try {

package/src/db.ts

@@ -252,6 +252,37 @@ export async function removeInstallation(projectPath: string, fullName: string):
   return result.changes > 0;
 }
 
+/**
+ * 检查安装路径是否与已安装的其他插件冲突
+ * @returns 冲突的插件 fullName，如果无冲突返回 null
+ */
+export async function checkInstallConflict(
+  projectPath: string,
+  linkPath: string,
+  newFullName: string
+): Promise<string | null> {
+  const client = await getDb();
+  const absPath = path.resolve(projectPath);
+  // 规范化路径：去掉尾部斜杠以便比较
+  const normalizedLinkPath = path.resolve(linkPath).replace(/\/+$/, '');
+
+  // 查询该项目下所有安装记录，在应用层比较路径
+  const rows = client.prepare(`
+    SELECT i.full_name, i.link_path FROM installations i
+    JOIN projects p ON i.project_id = p.id
+    WHERE p.path = ? AND i.full_name != ?
+  `).all(absPath, newFullName) as { full_name: string; link_path: string }[];
+
+  for (const row of rows) {
+    const existingPath = row.link_path.replace(/\/+$/, '');
+    if (existingPath === normalizedLinkPath) {
+      return row.full_name;
+    }
+  }
+
+  return null;
+}
+
 // ============================================================================
 // 密钥管理
 // ============================================================================