@becrafter/prompt-manager 0.1.16 → 0.1.18

package/app/desktop/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@becrafter/prompt-desktop",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@becrafter/prompt-desktop",
-      "version": "0.1.16",
+      "version": "0.1.18",
       "dependencies": {
         "@becrafter/prompt-manager-core": "file:../../packages/server",
         "@modelcontextprotocol/sdk": "^1.20.2",

package/app/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becrafter/prompt-desktop",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Menu bar desktop wrapper for @becrafter/prompt-manager",
   "author": "BeCrafter",
   "homepage": "https://github.com/BeCrafter/prompt-manager",

package/env.example

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becrafter/prompt-manager",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Remote MCP Server for managing prompts",
   "publishConfig": {
     "access": "public"

package/packages/server/app.js

@@ -104,8 +104,8 @@ async function sendIndexHtml(req, res) {
       // 从 adminUiRoot 中提取 asar 文件路径和相对路径
       const asarPathMatch = adminUiRoot.match(/^(.*?\.asar)(\/.*)?$/);
       const asarFilePath = asarPathMatch ? asarPathMatch[1] : adminUiRoot.replace(/\/.*$/, '.asar');
-      const relativePathInAsar = asarPathMatch && asarPathMatch[2] ? asarPathMatch[2].substring(1) : 'packages/web';
-      const indexPath = path.posix.join(relativePathInAsar, 'admin.html');
+      const relativePathInAsar = asarPathMatch && asarPathMatch[2] ? asarPathMatch[2].substring(1) : 'web';
+      const indexPath = path.posix.join(relativePathInAsar, 'index.html');
       
       // 检查文件是否存在
       const stat = asar.statFile(asarFilePath, indexPath);
@@ -121,17 +121,7 @@ async function sendIndexHtml(req, res) {
       res.status(500).send('Internal Server Error');
     }
   } else {
-    // 优先查找 index.html，如果不存在则使用 admin.html
-    const indexPath = path.join(adminUiRoot, 'index.html');
-    const adminPath = path.join(adminUiRoot, 'admin.html');
-
-    if (fs.existsSync(indexPath)) {
-      res.sendFile(indexPath);
-    } else if (fs.existsSync(adminPath)) {
-      res.sendFile(adminPath);
-    } else {
-      res.status(404).send('Admin UI not found');
-    }
+    res.sendFile(path.join(adminUiRoot, 'index.html'));
   }
 }
 

package/packages/server/services/TerminalService.js

@@ -7,7 +7,6 @@
 
 import { spawn } from 'child_process';
 import { randomUUID } from 'crypto';
-import fs from 'fs';
 import { logger } from '../utils/logger.js';
 import path from 'path';
 import os from 'os';
@@ -69,7 +68,7 @@ class TerminalSession {
       case 'win32':
         return process.env.COMSPEC || 'cmd.exe';
       case 'darwin':
-        return process.env.SHELL || '/bin/zsh';
+        return process.env.SHELL || '/bin/bash';
       case 'linux':
         return process.env.SHELL || '/bin/bash';
       default:
@@ -83,34 +82,15 @@ class TerminalSession {
   setupPtyEvents() {
     if (!this.pty) return;
 
-    // 对于正常的PTY进程
-    if (!this.pty.isFallback) {
-      this.pty.on('data', (data) => {
-        this.lastActivity = new Date();
-        this.emit('data', data);
-      });
-
-      this.pty.on('exit', (exitCode, signal) => {
-        this.isActive = false;
-        this.emit('exit', { exitCode, signal });
-      });
-    } else {
-      // 对于fallback PTY进程（child_process.spawn）
-      this.pty.process.stdout?.on('data', (data) => {
-        this.lastActivity = new Date();
-        this.emit('data', data);
-      });
-
-      this.pty.process.stderr?.on('data', (data) => {
-        this.lastActivity = new Date();
-        this.emit('data', data);
-      });
+    this.pty.on('data', (data) => {
+      this.lastActivity = new Date();
+      this.emit('data', data);
+    });
 
-      this.pty.process.on('exit', (exitCode, signal) => {
-        this.isActive = false;
-        this.emit('exit', { exitCode, signal });
-      });
-    }
+    this.pty.on('exit', (exitCode, signal) => {
+      this.isActive = false;
+      this.emit('exit', { exitCode, signal });
+    });
   }
 
   /**
@@ -120,14 +100,7 @@ class TerminalSession {
     if (!this.isActive || !this.pty) {
       throw new Error('Terminal session is not active');
     }
-
-    if (this.pty.isFallback) {
-      // fallback PTY使用child_process
-      this.pty.process.stdin?.write(data);
-    } else {
-      // 正常PTY
-      this.pty.write(data);
-    }
+    this.pty.write(data);
     this.lastActivity = new Date();
   }
 
@@ -138,14 +111,7 @@ class TerminalSession {
     if (!this.isActive || !this.pty) {
       throw new Error('Terminal session is not active');
     }
-
-    if (this.pty.isFallback) {
-      // fallback PTY不支持resize，记录日志
-      logger.debug(`Fallback PTY resize requested: ${cols}x${rows} (not supported)`);
-    } else {
-      // 正常PTY支持resize
-      this.pty.resize(cols, rows);
-    }
+    this.pty.resize(cols, rows);
     this.size = { cols, rows };
   }
 
@@ -154,13 +120,7 @@ class TerminalSession {
    */
   terminate() {
     if (this.pty) {
-      if (this.pty.isFallback) {
-        // fallback PTY使用child_process
-        this.pty.process.kill();
-      } else {
-        // 正常PTY
-        this.pty.kill();
-      }
+      this.pty.kill();
     }
     this.isActive = false;
   }
@@ -289,122 +249,20 @@ export class TerminalService {
    * 创建PTY进程
    */
   async createPtyProcess(options) {
+    const shell = options.shell || this.getDefaultShellForPlatform();
+    const args = this.getShellArgs(shell);
     const cwd = options.workingDirectory || os.homedir();
     const env = { ...process.env, ...options.environment };
-    const shells = this.getShellCandidates(options.shell);
-    let lastError = null;
-
-    // 在macOS上确保PATH包含常用目录
-    if (process.platform === 'darwin') {
-      const defaultPath = '/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin';
-      if (!env.PATH || env.PATH === '') {
-        env.PATH = defaultPath;
-      } else if (!env.PATH.includes('/usr/local/bin')) {
-        env.PATH = `${env.PATH}:${defaultPath}`;
-      }
-      logger.debug(`macOS PATH configured: ${env.PATH}`);
-    }
-
-    for (const candidate of shells) {
-      if (!candidate) continue;
-      const resolvedShell = this.resolveShellPath(candidate);
-      if (!resolvedShell) {
-        logger.debug(`Shell not found on system: ${candidate}`);
-        continue;
-      }
-
-      const args = this.getShellArgs(resolvedShell);
-      logger.debug(`Creating PTY with shell: ${resolvedShell}, args: ${args.join(' ')}, cwd: ${cwd}`);
 
-      try {
-        const ptyProcess = pty.default.spawn(resolvedShell, args, {
-          name: 'xterm-color',
-          cols: options.size.cols,
-          rows: options.size.rows,
-          cwd: cwd,
-          env: env
-        });
+    logger.debug(`Creating PTY with shell: ${shell}, args: ${args.join(' ')}, cwd: ${cwd}`);
 
-        // 添加PTY进程的事件监听，用于调试
-        ptyProcess.on('data', (data) => {
-          logger.debug(`PTY data received: ${data.length} bytes`);
-        });
-
-        ptyProcess.on('exit', (code, signal) => {
-          logger.debug(`PTY process exited: code=${code}, signal=${signal}`);
-        });
-
-        return ptyProcess;
-      } catch (error) {
-        lastError = error;
-        logger.warn(`Failed to spawn shell ${resolvedShell}: ${error.message}`);
-
-        // 如果是posix_spawnp失败，尝试备用方案
-        if (error.message.includes('posix_spawnp')) {
-          logger.warn('posix_spawnp failed, trying alternative approach...');
-          try {
-            // 尝试使用child_process.spawn作为备用方案
-            const { spawn } = await import('child_process');
-            const child = spawn(resolvedShell, args, {
-              cwd: cwd,
-              env: env,
-              stdio: ['pipe', 'pipe', 'pipe'],
-              shell: false
-            });
-
-            // 包装child_process.spawn的结果以兼容PTY接口
-            return this.createFallbackPtyProcess(child, options);
-          } catch (fallbackError) {
-            logger.warn(`Fallback spawn also failed: ${fallbackError.message}`);
-          }
-        }
-      }
-    }
-
-    throw lastError || new Error('Unable to create PTY session: no suitable shell found');
-  }
-
-  /**
-   * 创建备用PTY进程（使用child_process.spawn）
-   */
-  createFallbackPtyProcess(childProcess, options) {
-    // 创建一个兼容PTY接口的对象
-    const fallbackPty = {
-      pid: childProcess.pid,
+    return pty.default.spawn(shell, args, {
+      name: 'xterm-color',
       cols: options.size.cols,
       rows: options.size.rows,
-      process: childProcess,
-      isFallback: true,
-
-      write(data) {
-        if (childProcess.stdin) {
-          childProcess.stdin.write(data);
-        }
-      },
-
-      resize(cols, rows) {
-        this.cols = cols;
-        this.rows = rows;
-        // child_process不支持resize，记录日志
-        logger.debug(`Fallback PTY resize requested: ${cols}x${rows} (not supported)`);
-      },
-
-      kill(signal = 'SIGTERM') {
-        childProcess.kill(signal);
-      },
-
-      on(event, callback) {
-        if (event === 'data') {
-          childProcess.stdout?.on('data', callback);
-          childProcess.stderr?.on('data', callback);
-        } else if (event === 'exit') {
-          childProcess.on('exit', callback);
-        }
-      }
-    };
-
-    logger.info('Created fallback PTY process (limited functionality)');
-    return fallbackPty;
+      cwd: cwd,
+      env: env
+    });
   }
 
   /**
@@ -415,8 +273,7 @@ export class TerminalService {
       case 'win32':
         return process.env.COMSPEC || 'cmd.exe';
       case 'darwin':
-        // 在 macOS 上优先使用用户的 SHELL 环境变量
-        return process.env.SHELL || '/bin/zsh';
+        return process.env.SHELL || '/bin/bash';
       case 'linux':
         return process.env.SHELL || '/bin/bash';
       default:
@@ -434,63 +291,9 @@ export class TerminalService {
       }
       return ['/c'];
     }
-
-    // 某些精简 shell（如 /bin/sh）不支持 -l
-    if (shell.endsWith('/sh')) {
-      return ['-i'];
-    }
-
     return ['-l'];
   }
 
-  /**
-   * 获取 shell 候选列表（按优先级）
-   */
-  getShellCandidates(preferredShell) {
-    const candidates = [];
-
-    if (preferredShell) candidates.push(preferredShell);
-    if (process.env.SHELL) candidates.push(process.env.SHELL);
-
-    if (process.platform === 'darwin') {
-      candidates.push('/bin/zsh', '/bin/bash', '/bin/sh');
-    } else if (process.platform === 'linux') {
-      candidates.push('/bin/bash', '/bin/sh');
-    } else if (process.platform === 'win32') {
-      candidates.push(process.env.COMSPEC || 'cmd.exe');
-    } else {
-      candidates.push('/bin/sh');
-    }
-
-    return [...new Set(candidates)];
-  }
-
-  /**
-   * 确保 shell 路径在当前系统存在
-   */
-  resolveShellPath(shellPath) {
-    // 绝对路径直接检查
-    if (shellPath.startsWith('/')) {
-      return fs.existsSync(shellPath) ? shellPath : null;
-    }
-
-    // Windows 可执行文件
-    if (process.platform === 'win32') {
-      return shellPath;
-    }
-
-    // 如果是相对路径，尝试在常见目录查找
-    const searchPaths = ['/bin', '/usr/bin', '/usr/local/bin'];
-    for (const base of searchPaths) {
-      const fullPath = path.join(base, shellPath);
-      if (fs.existsSync(fullPath)) {
-        return fullPath;
-      }
-    }
-
-    return null;
-  }
-
   /**
    * 获取会话
    */

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.16';
+    this.serverVersion = process.env.MCP_SERVER_VERSION || '0.1.18';
     this.logLevel = process.env.LOG_LEVEL || 'info';
     this.maxPrompts = parseInt(process.env.MAX_PROMPTS) || 1000;
     this.recursiveScan = process.env.RECURSIVE_SCAN !== 'false'; // 默认启用递归扫描