@becrafter/prompt-manager 0.1.18 → 0.1.20

package/env.example

@@ -7,7 +7,7 @@ PROMPTS_DIR=$HOME/.prompt-manager/prompts
 
 # MCP服务器配置
 MCP_SERVER_NAME=prompt-manager
-MCP_SERVER_VERSION=0.1.18
+MCP_SERVER_VERSION=0.1.20
 
 # 日志级别 (error, warn, info, debug)
 LOG_LEVEL=info

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becrafter/prompt-manager",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Remote MCP Server for managing prompts",
   "publishConfig": {
     "access": "public"
@@ -55,7 +55,8 @@
     "format": "cd packages/server && npm run format",
     "format:check": "cd packages/server && npm run format:check",
     "check:env": "bash scripts/check-env.sh",
-    "setup:env": "node scripts/preinstall-check.js"
+    "setup:env": "node scripts/preinstall-check.js",
+    "postinstall": "npm rebuild node-pty && chmod +x node_modules/node-pty/prebuilds/*/pty.node node_modules/node-pty/prebuilds/*/spawn-helper 2>/dev/null || true"
   },
   "keywords": [
     "mcp",
@@ -89,12 +90,23 @@
     "zod": "^3.23.8"
   },
   "files": [
-    "app/",
-    "packages/server/",
-    "packages/resources/",
+    "app/cli/",
+    "packages/server/index.js",
+    "packages/server/server.js",
+    "packages/server/app.js",
+    "packages/server/services/*.js",
+    "packages/server/mcp/*.js",
+    "packages/server/mcp/**/*.js",
+    "packages/server/api/*.js",
+    "packages/server/utils/*.js",
+    "packages/server/middlewares/*.js",
+    "packages/server/toolm/*.js",
+    "packages/server/toolm/**/*.js",
+    "packages/server/configs/**/*.yaml",
+    "packages/resources/tools/**/*.js",
+    "packages/resources/tools/**/*.md",
     "packages/web/",
-    "packages/configs/",
-    "examples/",
+    "examples/**/*.yaml",
     "env.example",
     "README.md",
     "LICENSE"

package/packages/server/server.js

@@ -73,7 +73,8 @@ async function _handleConfig(options) {
   promptManager.promptsDir = promptsDir;
   await config.ensurePromptsDir();
   await util.seedPromptsIfEmpty();
-  await util.seedBuiltInConfigsIfEmpty();
+  // 内置配置不需要同步到用户目录，直接从 packages/server/configs/ 读取
+  // await util.seedBuiltInConfigsIfEmpty();
   await config.validate();
   config.showConfig();
 }

package/packages/server/services/TerminalService.js

@@ -17,9 +17,10 @@ let PTY_AVAILABLE = false;
 let PTY_LOAD_ERROR = null;
 
 /**
- * 尝试加载 node-pty 模块
+ * 尝试加载 node-pty 模块，如果失败则尝试自动修复
  */
 async function tryLoadNodePty() {
+  logger.info('开始尝试加载 node-pty 模块...');
   try {
     const ptyModule = await import('node-pty');
     pty = ptyModule;
@@ -30,10 +31,52 @@ async function tryLoadNodePty() {
       return true;
     }
   } catch (error) {
+    logger.info('node-pty 模块加载失败，准备自动修复...');
     PTY_LOAD_ERROR = error;
     PTY_AVAILABLE = false;
-    logger.warn('node-pty 模块不可用，终端功能将被禁用:', error.message);
-    logger.warn('提示: 运行 "npm rebuild node-pty" 来修复此问题');
+    logger.warn('node-pty 模块不可用，尝试自动修复...');
+
+    // 尝试自动修复
+    try {
+      const { spawn } = await import('child_process');
+      const { promisify } = await import('util');
+      const exec = promisify(spawn);
+
+      logger.info('正在重新编译 node-pty...');
+      const rebuildProcess = spawn('npm', ['rebuild', 'node-pty'], {
+        stdio: 'inherit',
+        cwd: process.cwd()
+      });
+
+      await new Promise((resolve, reject) => {
+        rebuildProcess.on('close', (code) => {
+          if (code === 0) {
+            resolve();
+          } else {
+            reject(new Error(`npm rebuild 失败，退出码: ${code}`));
+          }
+        });
+        rebuildProcess.on('error', reject);
+      });
+
+      // 重新尝试加载
+      try {
+        const ptyModule = await import('node-pty');
+        pty = ptyModule;
+        if (pty && pty.default && pty.default.spawn) {
+          PTY_AVAILABLE = true;
+          logger.info('node-pty 模块修复成功！');
+          return true;
+        }
+      } catch (retryError) {
+        logger.error('自动修复失败，请手动运行: npm rebuild node-pty');
+      }
+    } catch (fixError) {
+      logger.error('自动修复过程失败:', fixError.message);
+      logger.error('请手动运行: npm rebuild node-pty');
+    }
+
+    logger.warn('终端功能将被禁用，请修复 node-pty 后再重启服务');
     return false;
   }
   return false;
@@ -192,6 +235,64 @@ export class TerminalService {
     }, 60000); // 每分钟检查一次
     
     logger.info('TerminalService initialized');
+    
+    // 修复 node-pty 二进制文件权限
+    this.fixNodePtyPermissions();
+  }
+  
+  /**
+   * 修复 node-pty 二进制文件权限
+   * 这是解决 posix_spawnp failed 错误的关键
+   */
+  async fixNodePtyPermissions() {
+    try {
+      const { execSync } = await import('child_process');
+      const platform = process.platform;
+      
+      // 只在 Unix-like 系统上修复权限（macOS, Linux）
+      if (platform !== 'win32') {
+        logger.info('🔧 检查并修复 node-pty 二进制文件权限...');
+        
+        // 尝试多个可能的 node-pty 路径
+        const possiblePaths = [
+          // 路径1: 在包的 node_modules 中（开发环境）
+          path.join(path.dirname(path.dirname(new URL(import.meta.url).pathname)), 'node_modules', 'node-pty', 'prebuilds'),
+          // 路径2: 在根 node_modules 中（npm 安装环境）
+          path.join(process.cwd(), 'node_modules', 'node-pty', 'prebuilds'),
+          // 路径3: 相对于当前工作目录
+          path.join(process.cwd(), 'node_modules', '@becrafter', 'prompt-manager', 'node_modules', 'node-pty', 'prebuilds')
+        ];
+        
+        let ptyPath = null;
+        const fs = await import('fs');
+        
+        for (const possiblePath of possiblePaths) {
+          if (fs.existsSync(possiblePath)) {
+            ptyPath = possiblePath;
+            break;
+          }
+        }
+        
+        if (ptyPath) {
+          try {
+            // 添加执行权限 - 使用 find 命令来处理所有平台
+            execSync(`find ${ptyPath} -type f -name "*.node" -o -name "spawn-helper" | xargs chmod +x 2>/dev/null || true`, {
+              stdio: 'pipe',
+              timeout: 5000
+            });
+            logger.info('✅ node-pty 权限修复完成');
+          } catch (error) {
+            // 静默失败，不影响服务启动
+            logger.debug('node-pty 权限修复失败:', error.message);
+          }
+        } else {
+          logger.debug('未找到 node-pty prebuilds 目录，跳过权限修复');
+        }
+      }
+    } catch (error) {
+      // 静默失败，不影响服务启动
+      logger.debug('node-pty 权限修复失败:', error.message);
+    }
   }
 
   /**
@@ -252,17 +353,148 @@ export class TerminalService {
     const shell = options.shell || this.getDefaultShellForPlatform();
     const args = this.getShellArgs(shell);
     const cwd = options.workingDirectory || os.homedir();
-    const env = { ...process.env, ...options.environment };
 
-    logger.debug(`Creating PTY with shell: ${shell}, args: ${args.join(' ')}, cwd: ${cwd}`);
+    // 确保环境变量正确，特别是 PATH
+    const env = {
+      ...process.env,
+      ...options.environment,
+      // 确保 SHELL 环境变量正确设置
+      SHELL: shell,
+      // 确保 LANG 和 LC_* 变量设置
+      LANG: process.env.LANG || 'en_US.UTF-8',
+      LC_ALL: process.env.LC_ALL || process.env.LANG || 'en_US.UTF-8',
+      LC_CTYPE: process.env.LC_CTYPE || process.env.LANG || 'en_US.UTF-8',
+      // 确保 TERM 变量设置
+      TERM: process.env.TERM || 'xterm-256color'
+    };
 
-    return pty.default.spawn(shell, args, {
-      name: 'xterm-color',
-      cols: options.size.cols,
-      rows: options.size.rows,
-      cwd: cwd,
-      env: env
-    });
+    logger.info(`🔧 创建终端会话 - Shell: ${shell}, Args: [${args.join(', ')}], CWD: ${cwd}`);
+    logger.info(`🔧 环境变量 - SHELL: ${env.SHELL}, TERM: ${env.TERM}, LANG: ${env.LANG}`);
+    logger.info(`🔧 Shell 可执行性检查: ${shell} ${args.join(' ')}`);
+
+    // 检查 shell 是否可执行
+    try {
+      const fs = await import('fs');
+      if (!fs.existsSync(shell)) {
+        throw new Error(`Shell 不存在: ${shell}`);
+      }
+
+      const stats = fs.statSync(shell);
+      if (!stats.isFile()) {
+        throw new Error(`Shell 不是文件: ${shell}`);
+      }
+
+      if (!(stats.mode & parseInt('111', 8))) {
+        throw new Error(`Shell 没有执行权限: ${shell}`);
+      }
+
+      logger.info(`✅ Shell 验证通过: ${shell}`);
+    } catch (error) {
+      logger.error(`❌ Shell 验证失败:`, error.message);
+      throw error;
+    }
+
+    // 创建 PTY 进程 - 使用多级回退机制
+    logger.info(`🔧 尝试创建 PTY 进程...`);
+
+    // 定义尝试策略的优先级
+    const strategies = [
+      // 策略 1: 使用用户指定的 shell 和 xterm-256color
+      {
+        name: 'User shell with xterm-256color',
+        shell: shell,
+        args: args,
+        term: 'xterm-256color'
+      },
+      // 策略 2: 使用用户指定的 shell 和 xterm
+      {
+        name: 'User shell with xterm',
+        shell: shell,
+        args: args,
+        term: 'xterm'
+      },
+      // 策略 3: 使用 /bin/sh 和 xterm-256color
+      {
+        name: '/bin/sh with xterm-256color',
+        shell: '/bin/sh',
+        args: [],
+        term: 'xterm-256color'
+      },
+      // 策略 4: 使用 /bin/sh 和 xterm
+      {
+        name: '/bin/sh with xterm',
+        shell: '/bin/sh',
+        args: [],
+        term: 'xterm'
+      },
+      // 策略 5: 使用 /bin/sh 和 ansi
+      {
+        name: '/bin/sh with ansi',
+        shell: '/bin/sh',
+        args: [],
+        term: 'ansi'
+      }
+    ];
+
+    let lastError = null;
+
+    for (let i = 0; i < strategies.length; i++) {
+      const strategy = strategies[i];
+      
+      try {
+        logger.info(`🔄 尝试策略 ${i + 1}/${strategies.length}: ${strategy.name}`);
+        
+        const ptyProcess = pty.default.spawn(strategy.shell, strategy.args, {
+          name: strategy.term,
+          cols: options.size.cols,
+          rows: options.size.rows,
+          cwd: cwd,
+          env: {
+            ...env,
+            TERM: strategy.term,
+            SHELL: strategy.shell
+          }
+        });
+
+        logger.info(`✅ PTY 进程创建成功，PID: ${ptyProcess.pid}`);
+        logger.info(`✅ 使用策略: ${strategy.name}`);
+        
+        // 更新会话选项以反映实际使用的 shell
+        options.shell = strategy.shell;
+        
+        return ptyProcess;
+
+      } catch (error) {
+        lastError = error;
+        logger.warn(`❌ 策略 ${i + 1} 失败: ${error.message}`);
+        
+        // 继续尝试下一个策略
+        continue;
+      }
+    }
+
+    // 所有策略都失败了
+    logger.error(`❌ 所有 PTY 创建策略都失败了`);
+    logger.error(`❌ 最后一个错误: ${lastError?.message}`);
+    logger.error(`❌ 系统信息 - 平台: ${process.platform}, Node: ${process.version}`);
+    logger.error(`❌ 环境信息 - SHELL: ${env.SHELL}, TERM: ${env.TERM}`);
+    logger.error(`❌ 原始 Shell 路径: ${shell}, 参数: [${args.join(', ')}]`);
+    logger.error(`❌ 工作目录: ${cwd}`);
+
+    // 提供用户友好的错误信息
+    const error = new Error(
+      `终端创建失败：所有 PTY 创建策略都失败了。\n` +
+      `最后一个错误: ${lastError?.message}\n` +
+      `建议解决方案:\n` +
+      `1. 运行: npm rebuild node-pty\n` +
+      `2. 检查系统权限和 macOS 安全设置\n` +
+      `3. 确认 shell 路径正确: ${shell}\n` +
+      `4. 重启系统后再试\n` +
+      `5. 检查是否有其他进程占用了 PTY 资源`
+    );
+    error.code = 'TERMINAL_CREATION_FAILED';
+    error.originalError = lastError;
+    throw error;
   }
 
   /**
@@ -291,7 +523,9 @@ export class TerminalService {
       }
       return ['/c'];
     }
-    return ['-l'];
+    // 不使用 -l 参数，避免 login shell 导致的 posix_spawnp 失败
+    // 如果需要交互式 shell，可以通过环境变量或 shell 配置来实现
+    return [];
   }
 
   /**

package/packages/server/toolm/tool-sync.service.js

@@ -116,6 +116,14 @@ export async function syncSystemTools() {
         const sandboxToolFile = path.join(sandboxDir, `${toolName}.tool.js`);
         await fs.copyFile(toolFile, sandboxToolFile);
         
+        // 复制 README.md 文件（如果存在）
+        const readmeFile = path.join(toolDir, 'README.md');
+        if (await pathExists(readmeFile)) {
+          const sandboxReadmeFile = path.join(sandboxDir, 'README.md');
+          await fs.copyFile(readmeFile, sandboxReadmeFile);
+          logger.debug(`已复制 README.md: ${toolName}`);
+        }
+        
         // 创建或更新 package.json
         const packageJsonPath = path.join(sandboxDir, 'package.json');
         let packageJson = {};

package/packages/server/utils/config.js

@@ -121,7 +121,7 @@ export class Config {
 
     // 其他配置
     this.serverName = process.env.MCP_SERVER_NAME || 'prompt-manager';
-    this.serverVersion = process.env.MCP_SERVER_VERSION || '0.1.18';
+    this.serverVersion = process.env.MCP_SERVER_VERSION || '0.1.20';
     this.logLevel = process.env.LOG_LEVEL || 'info';
     this.maxPrompts = parseInt(process.env.MAX_PROMPTS) || 1000;
     this.recursiveScan = process.env.RECURSIVE_SCAN !== 'false'; // 默认启用递归扫描

package/packages/web/css/{main.3b61356b384d2f11f47f.css → main.196f434e6a88cd448158.css}

@@ -891,6 +891,7 @@ aside {
   display: flex;
   align-items: center;
   justify-content: center;
+  pointer-events: none;
 }
 
 .prompt-item:hover {
@@ -991,6 +992,7 @@ aside {
     rgba(238, 238, 238, 0.6) 60%,
     rgba(238, 238, 238, 0) 100%);
   z-index: 1;
+  pointer-events: auto;
 }
 
 .prompt-item {
@@ -5323,6 +5325,10 @@ body .xterm.theme-dark .xterm-selection .xterm-char {
   transition: all 0.3s ease;
 }
 
+.recommended-prompt-modal.hidden {
+  display: none !important;
+}
+
 .recommended-prompt-modal.active {
   opacity: 1;
   visibility: visible;
@@ -5496,6 +5502,10 @@ body .xterm.theme-dark .xterm-selection .xterm-char {
   transition: all 0.3s ease;
 }
 
+.sync-prompt-modal.hidden {
+  display: none !important;
+}
+
 .sync-prompt-modal.active {
   opacity: 1;
   visibility: visible;

package/packages/web/index.html

@@ -1,3 +1,3 @@
 <!doctype html><html lang="zh-CN"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Prompt Manager 后台</title><link rel="stylesheet" href="./css/codemirror.css"><link rel="stylesheet" href="./css/codemirror-theme_xq-light.css"><link rel="stylesheet" href="./css/terminal-fix.css"><style>.hidden {
       display: none;
-    }</style><script defer="defer" src="main.77c2c4b553ca3fac223b.js"></script><link href="css/main.3b61356b384d2f11f47f.css" rel="stylesheet"></head><body><div id="login-wrapper"></div><div id="main" style="display: none; height: 100vh; flex-direction: column;"><div id="header-wrapper"></div><main><div id="primary-nav-wrapper"></div><div id="sidebar-wrapper"></div><div id="tools-area-wrapper"></div><div id="terminal-area-wrapper"></div><div id="prompts-area-wrapper"></div></main></div><div id="toastContainer" class="toast-container"></div></body></html>
+    }</style><script defer="defer" src="main.b427a9e6f77a32a2f87f.js"></script><link href="css/main.196f434e6a88cd448158.css" rel="stylesheet"></head><body><div id="login-wrapper"></div><div id="main" style="display: none; height: 100vh; flex-direction: column;"><div id="header-wrapper"></div><main><div id="primary-nav-wrapper"></div><div id="sidebar-wrapper"></div><div id="tools-area-wrapper"></div><div id="terminal-area-wrapper"></div><div id="prompts-area-wrapper"></div></main></div><div id="toastContainer" class="toast-container"></div></body></html>