@becrafter/prompt-manager 0.0.19 → 0.1.2

package/app/desktop/package-lock.json

@@ -1,14 +1,16 @@
 {
   "name": "@becrafter/prompt-desktop",
-  "version": "0.0.19",
+  "version": "0.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@becrafter/prompt-desktop",
-      "version": "0.0.19",
+      "version": "0.1.2",
       "dependencies": {
+        "@becrafter/prompt-manager-core": "file:../../packages/server",
         "@modelcontextprotocol/sdk": "^1.20.2",
+        "http-proxy-middleware": "^3.0.5",
         "tar": "^7.5.2"
       },
       "devDependencies": {
@@ -16,6 +18,31 @@
         "electron-builder": "^24.13.3"
       }
     },
+    "../../packages/server": {
+      "name": "@becrafter/prompt-manager-core",
+      "version": "0.0.24",
+      "license": "MIT",
+      "dependencies": {
+        "@electron/asar": "^4.0.1",
+        "@modelcontextprotocol/sdk": "^1.20.2",
+        "@npmcli/arborist": "^9.0.0",
+        "cors": "^2.8.5",
+        "dotenv": "^17.2.3",
+        "express": "^5.1.0",
+        "fs-extra": "^11.2.0",
+        "http-proxy-middleware": "^3.0.5",
+        "js-yaml": "^4.1.0",
+        "yaml": "^2.4.1",
+        "zod": "^3.23.8"
+      },
+      "devDependencies": {
+        "esbuild": "^0.27.0"
+      }
+    },
+    "node_modules/@becrafter/prompt-manager-core": {
+      "resolved": "../../packages/server",
+      "link": true
+    },
     "node_modules/@develar/schema-utils": {
       "version": "2.6.5",
       "resolved": "https://registry.npmmirror.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz",
@@ -610,6 +637,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.17",
+      "resolved": "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.17.tgz",
+      "integrity": "sha512-ED6LB+Z1AVylNTu7hdzuBqOgMnvG/ld6wGCG8wFnAzKX5uyW2K3WD52v0gnLCTK/VLpXtKckgWuyScYK6cSPaw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
       "resolved": "https://registry.npmmirror.com/@types/keyv/-/keyv-3.1.4.tgz",
@@ -631,7 +667,6 @@
       "version": "22.19.0",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.0.tgz",
       "integrity": "sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.21.0"
@@ -1178,6 +1213,18 @@
         "balanced-match": "^1.0.0"
       }
     },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
@@ -2338,6 +2385,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "license": "MIT"
+    },
     "node_modules/eventsource": {
       "version": "3.0.7",
       "resolved": "https://registry.npmmirror.com/eventsource/-/eventsource-3.0.7.tgz",
@@ -2480,6 +2533,18 @@
         "minimatch": "^5.0.1"
       }
     },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/finalhandler": {
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-2.1.0.tgz",
@@ -2497,6 +2562,26 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/follow-redirects": {
+      "version": "1.15.11",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/foreground-child": {
       "version": "3.3.1",
       "resolved": "https://registry.npmmirror.com/foreground-child/-/foreground-child-3.3.1.tgz",
@@ -2951,6 +3036,20 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmmirror.com/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
@@ -2966,6 +3065,23 @@
         "node": ">= 6"
       }
     },
+    "node_modules/http-proxy-middleware": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz",
+      "integrity": "sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.15",
+        "debug": "^4.3.6",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.3",
+        "is-plain-object": "^5.0.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/http2-wrapper": {
       "version": "1.0.3",
       "resolved": "https://registry.npmmirror.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
@@ -3085,6 +3201,15 @@
         "is-ci": "bin.js"
       }
     },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -3095,6 +3220,36 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-promise": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/is-promise/-/is-promise-4.0.0.tgz",
@@ -3400,6 +3555,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz",
@@ -3694,6 +3862,18 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/pkce-challenge": {
       "version": "5.0.0",
       "resolved": "https://registry.npmmirror.com/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
@@ -3906,6 +4086,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "license": "MIT"
+    },
     "node_modules/resolve-alpn": {
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
@@ -4507,6 +4693,18 @@
         "tmp": "^0.2.0"
       }
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -4572,7 +4770,6 @@
       "version": "6.21.0",
       "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-6.21.0.tgz",
       "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/universalify": {

package/app/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becrafter/prompt-desktop",
-  "version": "0.0.19",
+  "version": "0.1.2",
   "description": "Menu bar desktop wrapper for @becrafter/prompt-manager",
   "author": "BeCrafter",
   "homepage": "https://github.com/BeCrafter/prompt-manager",
@@ -9,7 +9,7 @@
   "scripts": {
     "dev": "electron .",
     "start": "npm run dev",
-    "prebuild": "node ../../scripts/build-icons.js",
+    "prebuild": "cd ../.. && npm run build:icons",
     "build": "electron-builder"
   },
   "devDependencies": {
@@ -17,7 +17,9 @@
     "electron-builder": "^24.13.3"
   },
   "dependencies": {
+    "@becrafter/prompt-manager-core": "file:../../packages/server",
     "@modelcontextprotocol/sdk": "^1.20.2",
+    "http-proxy-middleware": "^3.0.5",
     "tar": "^7.5.2"
   },
   "build": {
@@ -27,9 +29,18 @@
     "files": [
       "**/*",
       "assets/**/*",
+      "!docs",
+      "!.npmignore",
+      "!assets/**/*.1.png",
       "!node_modules/**/test/**",
       "!node_modules/**/example/**",
-      "!docs"
+      "!node_modules/**/*.md",
+      "!node_modules/**/LICENSE",
+      {
+        "from": "../../packages/web/",
+        "to": "web/",
+        "filter": ["**/*"]
+      }
     ],
     "directories": {
       "output": "../../dist",
@@ -37,34 +48,18 @@
     },
     "extraResources": [
       {
-        "from": "../../",
-        "to": "prompt-manager",
-        "filter": [
-          "package.json",
-          "packages/**/*",
-          "examples/**/*",
-          "node_modules/**/*",
-          "!node_modules/7zip-bin/mac/**/*",
-          "!node_modules/@img/sharp-darwin-x64/**/*",
-          "!node_modules/@img/sharp-darwin-arm64/**/*",
-          "!node_modules/@img/sharp-libvips-darwin-x64/**/*",
-          "!node_modules/@img/sharp-libvips-darwin-arm64/**/*",
-          "!node_modules/app-builder-bin/mac/**/*",
-          "!dist",
-          "!docs",
-          "!app/desktop",
-          "!scripts",
-          "!*.md",
-          "!*.lock",
-          "!*.log",
-          "!*.gitignore",
-          "!*.npmignore"
-        ]
+        "from": "../../packages/resources/tools/",
+        "to": "runtime/toolbox/",
+        "filter": ["**/*"]
+      },
+      {
+        "from": "../../env.example",
+        "to": "runtime/.env"
       }
     ],
     "mac": {
       "category": "public.app-category.productivity",
-      "icon": "assets/icon.icns",
+      "icon": "assets/icons/icon.icns",
       "target": [
         {
           "target": "dmg",
@@ -81,12 +76,11 @@
           "target": "nsis",
           "arch": [
             "x64",
-            "ia32",
             "arm64"
           ]
         }
       ],
-      "icon": "assets/icon.ico"
+      "icon": "assets/icons/icon.ico"
     },
     "linux": {
       "target": [

package/app/desktop/src/services/module-loader.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { pathToFileURL } = require('url');
 const { spawn } = require('child_process');
+const { constants } = require('fs');
 
 class ModuleLoader {
   constructor(logger, errorHandler) {
@@ -50,38 +51,51 @@ class ModuleLoader {
   async _loadModuleInternal(serverRoot) {
     this.logger.info('Loading server module', { serverRoot });
     
-    const serverEntry = path.join(serverRoot, 'packages', 'server', 'server.js');
+    // 简化路径查找逻辑，优先查找 app.asar 包中的核心库
+    const pathsToCheck = [
+      // 1. 优先从 app.asar 包中的 node_modules 加载（打包应用中）
+      path.join(process.resourcesPath, 'app.asar', 'node_modules', '@becrafter', 'prompt-manager-core', 'index.js'),
+      // 2. 尝试从 serverRoot 的 packages/server 加载（开发环境）
+      path.join(serverRoot, 'packages', 'server', 'index.js'),
+      // 3. 尝试从 serverRoot 的 node_modules 加载
+      path.join(serverRoot, 'node_modules', '@becrafter', 'prompt-manager-core', 'index.js'),
+    ];
     
-    // 验证入口文件存在
-    await this._validateServerEntry(serverEntry);
-    
-    // 生成带版本号的URL
-    const entryUrl = pathToFileURL(serverEntry);
-    entryUrl.searchParams.set('v', Date.now().toString());
-    
-    this.logger.debug('Importing server module', { entryUrl: entryUrl.href });
+    for (const libPath of pathsToCheck) {
+      if (await this._pathExists(libPath)) {
+        const entryUrl = pathToFileURL(libPath);
+        // 添加版本参数以防止缓存
+        entryUrl.searchParams.set('v', Date.now().toString());
+        
+        const module = await import(entryUrl.href);
+        this._validateServerModule(module);
+        this.logger.info('Server module loaded successfully');
+        return module;
+      }
+    }
     
+    // 如果所有路径都没有找到，抛出错误
+    throw new Error(`Could not find core library in any of the expected paths: ${pathsToCheck.join(', ')}`);
+  }
+
+  async _pathExists(targetPath) {
     try {
-      const module = await import(entryUrl.href);
-      
-      // 验证模块结构
-      this._validateServerModule(module);
-      
-      this.logger.info('Server module loaded successfully');
-      return module;
+      await fs.promises.access(targetPath, constants.F_OK);
+      return true;
     } catch (error) {
-      this.logger.error('Failed to import server module', error);
-      throw new Error(`Failed to load server module: ${error.message}`);
+      return false;
     }
   }
 
   async _validateServerEntry(serverEntry) {
     try {
-      await fs.promises.access(serverEntry, fs.constants.F_OK);
-      this.logger.debug('Server entry file exists', { serverEntry });
+      // 验证库的 package.json 存在
+      const packageJsonPath = path.join(serverEntry, 'package.json');
+      await fs.promises.access(packageJsonPath, fs.constants.F_OK);
+      this.logger.debug('Server module package.json exists', { serverEntry });
     } catch (error) {
-      this.logger.error('Server entry file does not exist', error);
-      throw new Error(`Server entry file not found: ${serverEntry}`);
+      this.logger.error('Server module not found', error);
+      throw new Error(`Server module not found: ${serverEntry}`);
     }
   }
 
@@ -169,6 +183,13 @@ class ModuleLoader {
       
       pkg.dependencies = pkg.dependencies || {};
       
+      // 确保 @becrafter/prompt-manager-core 依赖存在
+      if (!pkg.dependencies['@becrafter/prompt-manager-core']) {
+        pkg.dependencies['@becrafter/prompt-manager-core'] = '^0.0.19';
+        await fs.promises.writeFile(pkgPath, JSON.stringify(pkg, null, 2), 'utf8');
+        this.logger.info('Added @becrafter/prompt-manager-core to dependencies');
+      }
+      
       // 检查并添加 @modelcontextprotocol/sdk
       if (!pkg.dependencies['@modelcontextprotocol/sdk']) {
         pkg.dependencies['@modelcontextprotocol/sdk'] = '^1.20.2';