aws-runtime-bridge 1.9.175 → 1.9.179

package/dist/services/lsp/provider-registry.d.ts

@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+export type LspProviderKind = "builtin" | "npm" | "system";
+export interface LspProviderLanguage {
+    
+    languageId: string;
+    
+    extensions: string[];
+}
+export interface LspProviderSpec {
+    id: string;
+    
+    label: string;
+    kind: LspProviderKind;
+    languages: LspProviderLanguage[];
+    
+    npmPackage?: string;
+    npmVersion?: string;
+    
+    binPath?: string;
+    
+    args: string[];
+    
+    env?: Record<string, string>;
+    
+    initializationOptions?: Record<string, unknown>;
+    
+    rootMarkers: string[];
+    
+    systemBinaries?: string[];
+    
+    systemArgs?: string[];
+    
+    priority: number;
+    
+    description: string;
+}
+
+export interface LspLaunchSpec {
+    providerId: string;
+    label: string;
+    command: string;
+    args: string[];
+    env: Record<string, string>;
+    cwd: string;
+    initializationOptions?: Record<string, unknown>;
+}
+
+export interface LspProviderSummary {
+    id: string;
+    label: string;
+    kind: LspProviderKind;
+    languages: string[];
+    extensions: string[];
+    npmPackage?: string;
+    npmVersion?: string;
+    systemBinaries?: string[];
+    rootMarkers: string[];
+    description: string;
+    
+    available: boolean;
+    
+    unavailableReason?: string;
+}
+
+export declare function getLspServersRoot(): string;
+
+export declare function getLspServerDir(providerId: string): string;
+export declare function listAllProviders(): LspProviderSpec[];
+export declare function getProvider(providerId: string): LspProviderSpec | null;
+
+
+
+
+export declare function resolveProviderForFile(filePath: string): LspProviderSpec | null;
+
+export declare function resolveLanguageId(provider: LspProviderSpec, filePath: string): string;
+
+
+
+
+export declare function resolveProviderRoot(provider: LspProviderSpec, workspacePath: string, filePath: string): Promise<string>;
+
+
+
+
+export declare function checkProviderAvailability(provider: LspProviderSpec): {
+    available: boolean;
+    reason?: string;
+    command?: string;
+};
+
+export declare function buildLaunchSpec(provider: LspProviderSpec, ctx: {
+    workspacePath: string;
+    filePath: string;
+}): Promise<LspLaunchSpec | null>;
+
+export declare function listProviderSummaries(): Promise<LspProviderSummary[]>;

package/dist/services/lsp/provider-registry.js

@@ -0,0 +1,2 @@
+import{existsSync as u,readFileSync as j,promises as y}from"node:fs";import{createRequire as v}from"node:module";import t from"node:path";import{getBridgeDataHome as I}from"../../config.js";import{canonicalizePath as k}from"./uri-rewrite.js";const h=v(import.meta.url),_="typescript-language-server",M={id:"typescript",label:"TypeScript / JavaScript",kind:"builtin",languages:[{languageId:"typescript",extensions:[".ts",".tsx",".mts",".cts"]},{languageId:"javascript",extensions:[".js",".jsx",".mjs",".cjs"]}],npmPackage:_,args:["--stdio"],initializationOptions:{tsserver:{useSyntaxServer:"never"}},rootMarkers:["tsconfig.json","jsconfig.json","package.json"],priority:100,description:"\u968F bridge \u5185\u7F6E\uFF0C\u65E0\u9700\u5B89\u88C5\u3002"},A=[{id:"vue",label:"Vue",kind:"npm",languages:[{languageId:"vue",extensions:[".vue"]}],npmPackage:"@vue/language-server",npmVersion:"3.3.13",binPath:"bin/vue-language-server.js",args:["--stdio"],initializationOptions:{vue:{hybridMode:!1}},rootMarkers:["package.json","tsconfig.json","vite.config.ts","vite.config.js"],priority:90,description:"Vue \u5355\u6587\u4EF6\u7EC4\u4EF6\u8BED\u4E49\u8DF3\u8F6C\uFF08\u542B template \u5F15\u7528\uFF09\u3002"},{id:"python",label:"Python (Pyright)",kind:"npm",languages:[{languageId:"python",extensions:[".py",".pyi"]}],npmPackage:"pyright",npmVersion:"1.1.414",binPath:"langserver.index.js",args:["--stdio"],rootMarkers:["pyproject.toml","setup.py","setup.cfg","requirements.txt","pyrightconfig.json"],priority:90,description:"Pyright \u8BED\u8A00\u670D\u52A1\uFF0C\u7EAF JS \u5B9E\u73B0\uFF0C\u65E0\u9700\u672C\u673A Python\u3002"},{id:"json",label:"JSON",kind:"npm",languages:[{languageId:"json",extensions:[".json",".jsonc"]}],npmPackage:"vscode-langservers-extracted",npmVersion:"4.10.0",binPath:"bin/vscode-json-language-server",args:["--stdio"],rootMarkers:[".git"],priority:40,description:"JSON Schema \u6821\u9A8C\u4E0E\u8DF3\u8F6C\u3002"},{id:"css",label:"CSS / SCSS / Less",kind:"npm",languages:[{languageId:"css",extensions:[".css",".scss",".less",".sass",".pcss"]}],npmPackage:"vscode-langservers-extracted",npmVersion:"4.10.0",binPath:"bin/vscode-css-language-server",args:["--stdio"],rootMarkers:[".git"],priority:30,description:"CSS \u53D8\u91CF\u4E0E @import \u8DF3\u8F6C\u3002"},{id:"html",label:"HTML",kind:"npm",languages:[{languageId:"html",extensions:[".html",".htm"]}],npmPackage:"vscode-langservers-extracted",npmVersion:"4.10.0",binPath:"bin/vscode-html-language-server",args:["--stdio"],rootMarkers:[".git"],priority:30,description:"HTML \u7ED3\u6784\u4E0E\u8D44\u6E90\u5F15\u7528\u3002"},{id:"yaml",label:"YAML",kind:"npm",languages:[{languageId:"yaml",extensions:[".yaml",".yml"]}],npmPackage:"yaml-language-server",npmVersion:"2.0.0",binPath:"bin/yaml-language-server",args:["--stdio"],rootMarkers:[".git"],priority:30,description:"YAML Schema \u6821\u9A8C\u4E0E\u951A\u70B9\u8DF3\u8F6C\u3002"},{id:"bash",label:"Shell",kind:"npm",languages:[{languageId:"shellscript",extensions:[".sh",".bash",".zsh"]}],npmPackage:"bash-language-server",npmVersion:"5.8.1",binPath:"out/cli.js",args:["start"],rootMarkers:[".git"],priority:20,description:"Shell \u51FD\u6570\u4E0E\u53D8\u91CF\u8DF3\u8F6C\uFF08\u4F9D\u8D56\u672C\u673A shellcheck \u63D0\u4F9B\u8BCA\u65AD\uFF09\u3002"},{id:"dockerfile",label:"Dockerfile",kind:"npm",languages:[{languageId:"dockerfile",extensions:[".dockerfile"]}],npmPackage:"dockerfile-language-server-nodejs",npmVersion:"0.15.0",binPath:"bin/docker-langserver",args:["--stdio"],rootMarkers:[".git"],priority:20,description:"Dockerfile \u6307\u4EE4\u6821\u9A8C\uFF08\u6309\u6587\u4EF6\u540D\u8BC6\u522B\uFF0C\u89C1 resolveLanguageId\uFF09\u3002"},{id:"php",label:"PHP (Intelephense)",kind:"npm",languages:[{languageId:"php",extensions:[".php"]}],npmPackage:"intelephense",npmVersion:"1.18.5",binPath:"lib/intelephense.js",args:["--stdio"],rootMarkers:["composer.json"],priority:80,description:"Intelephense \u514D\u8D39\u7248\uFF1B\u5355\u6587\u4EF6\u4F53\u79EF\u8F83\u5927\uFF08\u7EA6 26MB\uFF09\u3002"}],L=[{id:"java",label:"Java (Eclipse JDT)",kind:"system",languages:[{languageId:"java",extensions:[".java"]}],args:[],systemBinaries:["jdtls","jdt-language-server"],systemArgs:["-data","{dataDir}"],rootMarkers:["pom.xml","build.gradle","build.gradle.kts","settings.gradle",".project"],priority:95,description:"\u9700\u8981\u672C\u673A\u5B89\u88C5 eclipse.jdt.ls\uFF08jdtls \u547D\u4EE4\uFF09\u3002"},{id:"go",label:"Go (gopls)",kind:"system",languages:[{languageId:"go",extensions:[".go"]}],args:[],systemBinaries:["gopls"],rootMarkers:["go.mod","go.work"],priority:95,description:"\u9700\u8981\u672C\u673A\u5B89\u88C5 gopls\uFF08go install golang.org/x/tools/gopls@latest\uFF09\u3002"},{id:"rust",label:"Rust (rust-analyzer)",kind:"system",languages:[{languageId:"rust",extensions:[".rs"]}],args:[],systemBinaries:["rust-analyzer"],rootMarkers:["Cargo.toml","rust-toolchain.toml"],priority:95,description:"\u9700\u8981\u672C\u673A\u5B89\u88C5 rust-analyzer\uFF08rustup component add rust-analyzer\uFF09\u3002"},{id:"clangd",label:"C / C++ (clangd)",kind:"system",languages:[{languageId:"c",extensions:[".c",".h"]},{languageId:"cpp",extensions:[".cpp",".cc",".cxx",".hpp",".hxx"]}],args:[],systemBinaries:["clangd"],rootMarkers:["compile_commands.json","CMakeLists.txt",".clangd"],priority:95,description:"\u9700\u8981\u672C\u673A\u5B89\u88C5 clangd\uFF08LLVM \u53D1\u884C\u7248\u81EA\u5E26\uFF09\u3002"},{id:"csharp",label:"C# (csharp-ls)",kind:"system",languages:[{languageId:"csharp",extensions:[".cs"]}],args:[],systemBinaries:["csharp-ls","omnisharp","OmniSharp"],rootMarkers:["*.sln","*.csproj","*.fsproj"],priority:95,description:"\u9700\u8981\u672C\u673A\u5B89\u88C5 csharp-ls \u6216 OmniSharp\u3002"},{id:"ruby",label:"Ruby (solargraph)",kind:"system",languages:[{languageId:"ruby",extensions:[".rb",".rake",".gemspec"]}],args:[],systemBinaries:["solargraph"],systemArgs:["stdio"],rootMarkers:["Gemfile",".solargraph.yml"],priority:70,description:"\u9700\u8981\u672C\u673A\u5B89\u88C5 solargraph\uFF08gem install solargraph\uFF09\u3002"}],p=[M,...A,...L].sort((e,n)=>n.priority-e.priority),E=new Map(p.map(e=>[e.id,e]));function R(){return String(process.env.AWS_LSP_SERVER_ROOT||"").trim()||t.join(I(),"lsp-servers")}function b(e){return t.join(R(),e)}const B={dockerfile:"dockerfile","dockerfile.dev":"dockerfile","dockerfile.prod":"dockerfile",makefile:"makefile"},d=new Map;for(const e of p)for(const n of e.languages)for(const s of n.extensions)d.has(s)||d.set(s,e);function U(){return p}function V(e){return E.get(String(e||"").trim().toLowerCase())??null}function q(e){const n=String(e||"").trim().toLowerCase();if(!n)return null;const s=n.split(/[\\/]/).pop()??"",a=B[s];if(a&&a==="dockerfile")return V("dockerfile");const i=s.lastIndexOf(".");if(i<0)return null;const r=s.slice(i);return d.get(r)??null}function X(e,n){const a=String(n||"").trim().toLowerCase().split(/[\\/]/).pop()??"";if(a==="dockerfile"||a.startsWith("dockerfile."))return"dockerfile";const i=a.lastIndexOf("."),r=i<0?"":a.slice(i);for(const o of e.languages)if(o.extensions.includes(r))return o.languageId;return e.languages[0]?.languageId??"plaintext"}function m(e,n){return e.replace(/\{(\w+)\}/g,(s,a)=>n[a]??"")}async function O(e){try{return await y.access(e),!0}catch{return!1}}async function N(e,n,s){const a=t.resolve(String(n||"").trim()||process.cwd()),i=t.isAbsolute(s)?t.resolve(s):t.resolve(a,s);let r=t.dirname(i);for(let o=0;o<12;o+=1){for(const l of e.rootMarkers){if(l.includes("*")){const P=t.basename(l).replace(/^\*/,"");try{if((await y.readdir(r)).some(x=>x.endsWith(P)))return r}catch{}continue}if(await O(t.join(r,l)))return r}const c=t.dirname(r);if(c===r)break;const g=t.relative(a,c);if(g.startsWith("..")||t.isAbsolute(g))break;r=c}return a}function C(e){if(!e.npmPackage)return null;try{const n=h.resolve(`${e.npmPackage}/package.json`),a=JSON.parse(j(n,"utf8")).bin;if(!a)return null;if(typeof a=="string")return t.join(t.dirname(n),a);const i=Object.values(a)[0];return i?t.join(t.dirname(n),i):null}catch{return null}}function T(e){if(!e.npmPackage||!e.binPath)return null;const n=t.join(b(e.id),"node_modules",...e.npmPackage.split("/")),s=t.join(n,e.binPath);return u(s)?s:null}const w={java:"AWS_LSP_JAVA_BIN",go:"AWS_LSP_GO_BIN",rust:"AWS_LSP_RUST_BIN",clangd:"AWS_LSP_CLANGD_BIN",csharp:"AWS_LSP_CSHARP_BIN",ruby:"AWS_LSP_RUBY_BIN"};function D(e){const n=String(process.env.PATH||"").split(t.delimiter).map(a=>a.trim()).filter(Boolean),s=process.platform==="win32"?String(process.env.PATHEXT||".EXE;.CMD;.BAT").split(";").map(a=>a.toLowerCase()):[""];for(const a of n)for(const i of e)for(const r of s){const o=t.join(a,`${i}${r}`);if(u(o))return o}return null}function z(e){const n=w[e.id];if(n){const s=String(process.env[n]||"").trim();if(s&&u(s))return s}return D(e.systemBinaries??[])}function S(e){if(e.kind==="builtin"){const s=C(e);return s?{available:!0,command:s}:{available:!1,reason:"\u5185\u7F6E\u8BED\u8A00\u670D\u52A1\u5165\u53E3\u89E3\u6790\u5931\u8D25"}}if(e.kind==="npm"){const s=T(e);return s?{available:!0,command:s}:{available:!1,reason:`\u5C1A\u672A\u5B89\u88C5\uFF08${e.npmPackage}@${e.npmVersion}\uFF09`}}const n=z(e);return n?{available:!0,command:n}:{available:!1,reason:`\u672A\u627E\u5230\u53EF\u6267\u884C\u6587\u4EF6\uFF1A${(e.systemBinaries??[]).join(" / ")}`}}async function K(e,n){const s=S(e);if(!s.available||!s.command)return null;const a=k(await N(e,n.workspacePath,n.filePath)),i=t.join(b(e.id),"data",W(a)),r={workspace:k(n.workspacePath),root:a,dataDir:i};let o,c;e.kind==="system"?(o=s.command,c=[...e.args,...e.systemArgs??[]].map(l=>m(l,r))):(o=process.execPath,c=[s.command,...e.args.map(l=>m(l,r))]);const g={};for(const[l,f]of Object.entries(e.env??{}))g[l]=m(f,r);if(e.id==="typescript")try{g.TSSERVER_PATH=h.resolve("typescript/lib/tsserver.js")}catch{}return{providerId:e.id,label:e.label,command:o,args:c,env:g,cwd:a,initializationOptions:e.initializationOptions}}function W(e){let n=0;for(let s=0;s<e.length;s+=1)n=n*31+e.charCodeAt(s)|0;return Math.abs(n).toString(36)}async function Q(){return p.map(e=>{const n=S(e);return{id:e.id,label:e.label,kind:e.kind,languages:e.languages.map(s=>s.languageId),extensions:e.languages.flatMap(s=>s.extensions),npmPackage:e.npmPackage,npmVersion:e.npmVersion,systemBinaries:e.systemBinaries,rootMarkers:e.rootMarkers,description:e.description,available:n.available,unavailableReason:n.reason}})}export{K as buildLaunchSpec,S as checkProviderAvailability,b as getLspServerDir,R as getLspServersRoot,V as getProvider,U as listAllProviders,Q as listProviderSummaries,X as resolveLanguageId,q as resolveProviderForFile,N as resolveProviderRoot};
+

package/dist/services/lsp/uri-rewrite.d.ts

@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+export interface UriRewriteRule {
+    from: string;
+    to: string;
+}
+
+export declare function normalizeUriPath(value: string): string;
+
+export declare function pathToFileUri(absolutePath: string): string;
+
+
+
+
+
+
+
+
+export declare function buildUriRewriteRules(workspacePath: string, canonicalWorkspace: string, filePath?: string, canonicalFile?: string): UriRewriteRule[];
+
+
+
+
+export declare function rewriteMessageUris<T>(message: T, rules: UriRewriteRule[]): T;
+
+export declare function invertRules(rules: UriRewriteRule[]): UriRewriteRule[];
+
+
+
+
+export declare function canonicalizePath(target: string): string;

package/dist/services/lsp/uri-rewrite.js

@@ -0,0 +1,2 @@
+import{realpathSync as m}from"node:fs";import l from"node:path";function c(r){let t=String(r||"").replace(/\\/g,"/");try{t=decodeURIComponent(t)}catch{}return t.startsWith("file://")&&(t=t.slice(7),/^\/[a-zA-Z]:\//.test(t)&&(t=t.slice(1))),t}function u(r){const e=String(r||"").replace(/\\/g,"/").replace(/[^A-Za-z0-9\-._~:/@!$&'()*+,;=]/g,o=>encodeURIComponent(o));return e.startsWith("/")?`file://${e}`:`file:///${e}`}function h(r,t){return t?r.toLowerCase().startsWith(t.toLowerCase()):!1}function C(r,t,e,o){const n=[],i=c(r).replace(/\/+$/,""),a=c(t).replace(/\/+$/,"");if(i&&a&&i.toLowerCase()!==a.toLowerCase()&&n.push({from:i,to:a}),e&&o){const s=c(e),f=c(o);s&&f&&s.toLowerCase()!==f.toLowerCase()&&n.push({from:s,to:f})}return n.sort((s,f)=>f.from.length-s.from.length),n}function g(r,t){if(!r.startsWith("file://"))return r;const e=c(r);for(const o of t)if(h(e,o.from)){const n=e.slice(o.from.length);if(n===""||n.startsWith("/"))return u(o.to+n)}return r}function p(r,t,e){if(e>12)return r;if(typeof r=="string")return g(r,t);if(Array.isArray(r))return r.map(o=>p(o,t,e+1));if(r!==null&&typeof r=="object"){const o={};for(const[n,i]of Object.entries(r))o[n]=p(i,t,e+1);return o}return r}function W(r,t){return t.length===0?r:p(r,t,0)}function d(r){return r.map(t=>({from:t.to,to:t.from})).sort((t,e)=>e.from.length-t.from.length)}function U(r){const t=l.resolve(String(r||"").trim());if(process.platform!=="win32")return t;try{return m.native(t)}catch{return t}}export{C as buildUriRewriteRules,U as canonicalizePath,d as invertRules,c as normalizeUriPath,u as pathToFileUri,W as rewriteMessageUris};
+

package/dist/services/lsp-stdio-bridge.d.ts

@@ -1,6 +1,9 @@
 
 export declare function encodeLspStdioFrame(jsonText: string): Buffer;
 
+
+
+
 export declare class LspStdioFrameReader {
     private buffer;
     
@@ -13,6 +16,9 @@ export declare class LspStdioFrameReader {
     reset(): void;
 }
 
+
+
+
 export declare function resolveTypeScriptLanguageServerEntry(): string;
 
 export declare function resolveTsserverPath(): string;
@@ -27,20 +33,51 @@ export interface LspProcessBridgeCallbacks {
     onError?: (error: Error) => void;
 }
 
+export interface LspLaunchCommand {
+    command: string;
+    args: string[];
+    env?: Record<string, string>;
+    cwd?: string;
+}
+export interface LspProcessBridgeOptions {
+    
+    workspacePath: string;
+    
+    language: string;
+    
+
+
+
+    launch?: LspLaunchCommand;
+    
+    providerId?: string;
+}
+
+
+
+
+
+
+
 export declare class LspProcessBridge {
     readonly callbacks: LspProcessBridgeCallbacks;
     readonly workspacePath: string;
     readonly language: string;
+    readonly providerId: string;
+    private readonly launch?;
     private child;
     private readonly reader;
     private disposed;
-    constructor(options: {
-        workspacePath: string;
-        language: string;
-    }, callbacks: LspProcessBridgeCallbacks);
+    private readonly stderrTail;
+    constructor(options: LspProcessBridgeOptions, callbacks: LspProcessBridgeCallbacks);
     get running(): boolean;
     
+    getStderrTail(): string[];
+    
+    private resolveLaunchCommand;
+    
     start(): void;
+    private appendStderrTail;
     
     send(message: unknown): void;
     

package/dist/services/lsp-stdio-bridge.js

@@ -1,6 +1,6 @@
-import{spawn as f}from"node:child_process";import d from"node:fs";import{createRequire as p}from"node:module";import c from"node:path";import{createLogger as u}from"../utils/logger.js";const i=u("lsp-stdio-bridge"),l=p(import.meta.url);function g(n){const e=Buffer.from(n,"utf8"),t=`Content-Length: ${e.length}\r
+import{spawn as d}from"node:child_process";import f from"node:fs";import{createRequire as p}from"node:module";import c from"node:path";import{createLogger as u}from"../utils/logger.js";const i=u("lsp-stdio-bridge"),l=p(import.meta.url);function g(n){const t=Buffer.from(n,"utf8"),e=`Content-Length: ${t.length}\r
 \r
-`;return Buffer.concat([Buffer.from(t,"ascii"),e])}class a{constructor(){this.buffer=Buffer.alloc(0),this.headerDone=!1,this.contentLength=0}push(e){this.buffer=this.buffer.length===0?e:Buffer.concat([this.buffer,e]);const t=[];for(;;){if(!this.headerDone){const s=this.buffer.indexOf(`\r
+`;return Buffer.concat([Buffer.from(e,"ascii"),t])}class h{constructor(){this.buffer=Buffer.alloc(0),this.headerDone=!1,this.contentLength=0}push(t){this.buffer=this.buffer.length===0?t:Buffer.concat([this.buffer,t]);const e=[];for(;;){if(!this.headerDone){const r=this.buffer.indexOf(`\r
 \r
-`);if(s===-1){if(this.buffer.length>a.MAX_HEADER_BYTES)throw new Error(`lsp stdio: header too large (${this.buffer.length} bytes), stream is malformed`);break}const o=this.buffer.subarray(0,s).toString("ascii"),h=/^Content-Length:\s*(\d+)/i.exec(o);if(!h)throw new Error(`lsp stdio: invalid header: ${o.slice(0,120)}`);if(this.contentLength=parseInt(h[1],10),this.contentLength<0||this.contentLength>512*1024*1024)throw new Error(`lsp stdio: implausible content length ${this.contentLength}`);this.buffer=this.buffer.subarray(s+4),this.headerDone=!0}if(this.buffer.length<this.contentLength)break;const r=this.buffer.subarray(0,this.contentLength).toString("utf8");this.buffer=this.buffer.subarray(this.contentLength),this.headerDone=!1,this.contentLength=0,t.push(r)}return t}reset(){this.buffer=Buffer.alloc(0),this.headerDone=!1,this.contentLength=0}}a.MAX_HEADER_BYTES=64*1024;function b(){const n=l.resolve("typescript-language-server/package.json"),e=JSON.parse(d.readFileSync(n,"utf8"));if(!e.bin)throw new Error("typescript-language-server package.json has no bin entry");const t=typeof e.bin=="string"?e.bin:Object.values(e.bin)[0];return c.join(c.dirname(n),t)}function m(){return l.resolve("typescript/lib/tsserver.js")}class L{constructor(e,t){this.callbacks=t,this.child=null,this.reader=new a,this.disposed=!1,this.workspacePath=e.workspacePath,this.language=e.language}get running(){return this.child!==null&&this.child.exitCode===null&&this.child.signalCode===null}start(){if(this.disposed)return;let e;try{e=b()}catch(t){i.warn(`[lsp-stdio] \u89E3\u6790 typescript-language-server \u5165\u53E3\u5931\u8D25: ${t.message}`),this.callbacks.onError?.(t);return}try{const t=f(process.execPath,[e,"--stdio"],{cwd:this.workspacePath,env:{...process.env,TSSERVER_PATH:m()},stdio:["pipe","pipe","pipe"]});this.child=t,t.on("error",r=>{i.warn(`[lsp-stdio] \u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B error: ${r.message}`),this.callbacks.onError?.(r)}),t.on("exit",(r,s)=>{this.child===t&&(this.child=null),i.info(`[lsp-stdio] \u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B\u9000\u51FA: code=${r}, signal=${String(s)}`),this.callbacks.onExit?.(r,s)}),t.stdout?.on("data",r=>{if(!this.disposed)try{for(const s of this.reader.push(r))try{this.callbacks.onMessage(JSON.parse(s))}catch(o){i.warn(`[lsp-stdio] \u65E0\u6CD5\u89E3\u6790 server \u6D88\u606F: ${s.slice(0,200)} err=${o.message}`)}}catch(s){i.warn(`[lsp-stdio] \u89E3\u6790 server \u8F93\u51FA\u5931\u8D25: ${s.message}`),this.callbacks.onError?.(s)}}),t.stderr?.on("data",r=>{this.disposed||this.callbacks.onStderr?.(r.toString("utf8"))}),i.info(`[lsp-stdio] \u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B\u5DF2\u542F\u52A8 workspace=${this.workspacePath} pid=${t.pid}`)}catch(t){i.warn(`[lsp-stdio] \u542F\u52A8\u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B\u5931\u8D25: ${t.message}`),this.callbacks.onError?.(t)}}send(e){const t=this.child;if(!t||!t.stdin?.writable){i.warn("[lsp-stdio] \u8FDB\u7A0B\u672A\u5C31\u7EEA\uFF0C\u4E22\u5F03\u6D88\u606F");return}t.stdin.write(g(JSON.stringify(e)))}dispose(){if(this.disposed)return;this.disposed=!0;const e=this.child;this.child=null,this.reader.reset(),e&&e.exitCode===null&&e.signalCode===null&&(i.info(`[lsp-stdio] \u7EC8\u6B62\u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B pid=${e.pid}`),e.kill())}}export{L as LspProcessBridge,a as LspStdioFrameReader,g as encodeLspStdioFrame,m as resolveTsserverPath,b as resolveTypeScriptLanguageServerEntry};
+`);if(r===-1){if(this.buffer.length>h.MAX_HEADER_BYTES)throw new Error(`lsp stdio: header too large (${this.buffer.length} bytes), stream is malformed`);break}const o=this.buffer.subarray(0,r).toString("ascii"),a=/^Content-Length:\s*(\d+)/i.exec(o);if(!a)throw new Error(`lsp stdio: invalid header: ${o.slice(0,120)}`);if(this.contentLength=parseInt(a[1],10),this.contentLength<0||this.contentLength>512*1024*1024)throw new Error(`lsp stdio: implausible content length ${this.contentLength}`);this.buffer=this.buffer.subarray(r+4),this.headerDone=!0}if(this.buffer.length<this.contentLength)break;const s=this.buffer.subarray(0,this.contentLength).toString("utf8");this.buffer=this.buffer.subarray(this.contentLength),this.headerDone=!1,this.contentLength=0,e.push(s)}return e}reset(){this.buffer=Buffer.alloc(0),this.headerDone=!1,this.contentLength=0}}h.MAX_HEADER_BYTES=64*1024;function b(){const n=l.resolve("typescript-language-server/package.json"),t=JSON.parse(f.readFileSync(n,"utf8"));if(!t.bin)throw new Error("typescript-language-server package.json has no bin entry");const e=typeof t.bin=="string"?t.bin:Object.values(t.bin)[0];return c.join(c.dirname(n),e)}function m(){return l.resolve("typescript/lib/tsserver.js")}const v=40;class E{constructor(t,e){this.callbacks=e,this.child=null,this.reader=new h,this.disposed=!1,this.stderrTail=[],this.workspacePath=t.workspacePath,this.language=t.language,this.providerId=t.providerId??"typescript",this.launch=t.launch}get running(){return this.child!==null&&this.child.exitCode===null&&this.child.signalCode===null}getStderrTail(){return[...this.stderrTail]}resolveLaunchCommand(){if(this.launch)return this.launch;const t=b();return{command:process.execPath,args:[t,"--stdio"],env:{TSSERVER_PATH:m()},cwd:this.workspacePath}}start(){if(this.disposed)return;let t;try{t=this.resolveLaunchCommand()}catch(e){i.warn(`[lsp-stdio] \u89E3\u6790\u8BED\u8A00\u670D\u52A1\u5165\u53E3\u5931\u8D25 provider=${this.providerId}: ${e.message}`),this.callbacks.onError?.(e);return}try{const e=d(t.command,t.args,{cwd:t.cwd||this.workspacePath,env:{...process.env,...t.env??{}},stdio:["pipe","pipe","pipe"]});this.child=e,e.on("error",s=>{i.warn(`[lsp-stdio] \u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B error provider=${this.providerId}: ${s.message}`),this.callbacks.onError?.(s)}),e.on("exit",(s,r)=>{this.child===e&&(this.child=null),i.info(`[lsp-stdio] \u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B\u9000\u51FA provider=${this.providerId}: code=${s}, signal=${String(r)}`),this.callbacks.onExit?.(s,r)}),e.stdout?.on("data",s=>{if(!this.disposed)try{for(const r of this.reader.push(s))try{this.callbacks.onMessage(JSON.parse(r))}catch(o){i.warn(`[lsp-stdio] \u65E0\u6CD5\u89E3\u6790 server \u6D88\u606F: ${r.slice(0,200)} err=${o.message}`)}}catch(r){i.warn(`[lsp-stdio] \u89E3\u6790 server \u8F93\u51FA\u5931\u8D25: ${r.message}`),this.callbacks.onError?.(r)}}),e.stderr?.on("data",s=>{if(this.disposed)return;const r=s.toString("utf8");this.appendStderrTail(r),this.callbacks.onStderr?.(r)}),i.info(`[lsp-stdio] \u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B\u5DF2\u542F\u52A8 provider=${this.providerId} workspace=${this.workspacePath} pid=${e.pid} cmd=${t.command}`)}catch(e){i.warn(`[lsp-stdio] \u542F\u52A8\u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B\u5931\u8D25 provider=${this.providerId}: ${e.message}`),this.callbacks.onError?.(e)}}appendStderrTail(t){for(const e of t.split(/\r?\n/)){const s=e.trim();s&&this.stderrTail.push(s)}for(;this.stderrTail.length>v;)this.stderrTail.shift()}send(t){const e=this.child;if(!e||!e.stdin?.writable){i.warn("[lsp-stdio] \u8FDB\u7A0B\u672A\u5C31\u7EEA\uFF0C\u4E22\u5F03\u6D88\u606F");return}e.stdin.write(g(JSON.stringify(t)))}dispose(){if(this.disposed)return;this.disposed=!0;const t=this.child;this.child=null,this.reader.reset(),t&&t.exitCode===null&&t.signalCode===null&&(i.info(`[lsp-stdio] \u7EC8\u6B62\u8BED\u8A00\u670D\u52A1\u8FDB\u7A0B pid=${t.pid}`),t.kill())}}export{E as LspProcessBridge,h as LspStdioFrameReader,g as encodeLspStdioFrame,m as resolveTsserverPath,b as resolveTypeScriptLanguageServerEntry};
 

package/dist/services/mcp-deploy.d.ts

@@ -1,4 +1,17 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
+import { type UserScope } from "./user-scope.js";
 export interface DeployedMcpEntry {
     name: string;
     fileName: string;
@@ -34,16 +47,30 @@ export interface McpDeploySpec {
     env?: Record<string, string>;
     headers?: Record<string, string>;
     
+
+
+
+
     collapsed?: boolean;
     
     description?: string;
 }
 export declare class McpDeployManager {
+    private readonly scope;
     private readonly rootDir;
-    private static _instance;
-    static getInstance(): McpDeployManager;
+    private readonly packagesRootDir;
+    private static instances;
+    
+
+
+
+    static forScope(scope: UserScope): McpDeployManager;
     private constructor();
     
+
+
+
+
     private static isValidName;
     private manifestFile;
     private specFile;
@@ -60,6 +87,9 @@ export declare class McpDeployManager {
     private packagesDir;
     private packagesManifestFile;
     
+
+
+
     packageDir(name: string): string;
     
     isPackageHealthy(name: string): boolean;
@@ -68,6 +98,12 @@ export declare class McpDeployManager {
     
     private packageUpToDate;
     
+
+
+
+
+
+
     ensureMcpPackage(name: string, ref: McpPackageRef): Promise<McpDeployResult>;
     
     private removeMcpPackage;
@@ -76,9 +112,14 @@ export declare class McpDeployManager {
     
     getSpec(name: string): McpDeploySpec | null;
     
+
+
+
+
     resolveEnabledMcp(agentId: string, globalMcpServers: Record<string, unknown>): Record<string, unknown>;
     
     deployedDefaultEnabled(): Record<string, boolean>;
 }
-export declare const mcpDeployManager: McpDeployManager;
-export declare const reconcileMcpDefaultsFromDeployed: () => number;
+
+export declare function getMcpDeployManager(scope: UserScope): McpDeployManager;
+export declare const reconcileMcpDefaultsFromDeployed: (scope: UserScope) => number;

package/dist/services/mcp-deploy.js

@@ -1,5 +1,5 @@
-import{existsSync as f,mkdirSync as p,readFileSync as d,renameSync as y,rmSync as h,writeFileSync as M}from"node:fs";import s from"node:path";import{getBridgeTemplateMcpDir as v,getBridgeTemplateMcpPackagesDir as $}from"../config.js";import{downloadPluginZip as N}from"../utils/file-utils.js";import{createLogger as j}from"../utils/logger.js";import{setDeployedDefaultsProvider as C,reconcileDefaultsFromDeployed as F}from"./capability-config.js";import{isCapabilityEnabled as P}from"./instance-features.js";import{extractMcpPackageZip as E,runMcpPackageInstall as b}from"./mcp-package.js";const g=j("mcp-deploy"),O=1;class c{static getInstance(){return this._instance||(this._instance=new c(s.join(v(),"deployed"))),this._instance}constructor(e){this.rootDir=e}static isValidName(e){return!e||e==="."||e===".."||e!==s.basename(e)?!1:/^[a-zA-Z0-9_.-]+$/.test(e)}manifestFile(){return s.join(this.rootDir,"manifest.json")}specFile(e){const r=s.join(this.rootDir,`${e}.json`),t=s.resolve(this.rootDir);if(s.resolve(r)!==s.join(t,`${e}.json`))throw new Error(`MCP \u6A21\u677F\u6587\u4EF6\u8D8A\u51FA\u90E8\u7F72\u533A: ${e}`);return r}isHealthy(e){return f(this.specFile(e))}readManifest(){try{const e=JSON.parse(d(this.manifestFile(),"utf8"));return Array.isArray(e.servers)?e.servers.filter(r=>r&&r.name):[]}catch{return[]}}writeManifest(e){p(this.rootDir,{recursive:!0}),M(this.manifestFile(),`${JSON.stringify({version:O,servers:e},null,2)}
-`,"utf8")}saveMcp(e,r,t=!0,i){if(!c.isValidName(e))return{ok:!1,error:`MCP \u540D\u975E\u6CD5: ${JSON.stringify(e)}`};p(this.rootDir,{recursive:!0});try{M(this.specFile(e),`${JSON.stringify(r,null,2)}
-`,"utf8")}catch(n){return{ok:!1,error:`MCP \u6A21\u677F\u5199\u5165\u5931\u8D25: ${n instanceof Error?n.message:String(n)}`}}const a=this.readManifest().filter(n=>n.name!==e);return a.push({name:e,fileName:`${e}.json`,defaultEnabled:t,sha256:i}),this.writeManifest(a),g.info("[mcp] MCP \u6A21\u677F\u5DF2\u90E8\u7F72\u5230 bridge: %s",e),{ok:!0,name:e}}removeMcp(e){if(!c.isValidName(e))return{ok:!1,error:"name \u975E\u6CD5"};const r=this.readManifest().filter(t=>t.name!==e);this.writeManifest(r);try{h(this.specFile(e),{force:!0})}catch(t){return{ok:!1,error:`\u6A21\u677F\u6587\u4EF6\u6E05\u7406\u5931\u8D25: ${t instanceof Error?t.message:String(t)}`}}return this.removeMcpPackage(e),g.info("[mcp] MCP \u6A21\u677F\u5DF2\u4ECE bridge \u79FB\u9664\u90E8\u7F72: %s",e),{ok:!0}}packagesDir(){return $()}packagesManifestFile(){return s.join(this.packagesDir(),"manifest.json")}packageDir(e){if(!c.isValidName(e))throw new Error(`\u975E\u6CD5 MCP \u540D: ${JSON.stringify(e)}`);const r=s.join(this.packagesDir(),e),t=s.resolve(this.packagesDir());if(s.resolve(r)!==s.join(t,e))throw new Error(`MCP \u5305\u76EE\u5F55\u8D8A\u51FA\u90E8\u7F72\u533A: ${e}`);return r}isPackageHealthy(e){try{return f(s.join(this.packageDir(e),"mcp.json"))}catch{return!1}}readPackagesManifest(){try{const e=JSON.parse(d(this.packagesManifestFile(),"utf8"));return Array.isArray(e.packages)?e.packages.filter(r=>r&&r.name):[]}catch{return[]}}writePackagesManifest(e){p(this.packagesDir(),{recursive:!0}),M(this.packagesManifestFile(),`${JSON.stringify({version:1,packages:e},null,2)}
-`,"utf8")}packageUpToDate(e,r){return this.isPackageHealthy(e)?r?this.readPackagesManifest().find(i=>i.name===e)?.packageSha256===r:!0:!1}async ensureMcpPackage(e,r){if(!c.isValidName(e))return{ok:!1,error:`MCP \u540D\u975E\u6CD5: ${JSON.stringify(e)}`};const t=String(r?.packageUrl??"").trim();if(!t)return{ok:!1,error:"packageUrl \u4E3A\u7A7A"};if(this.packageUpToDate(e,r.packageSha256))return{ok:!0,name:e};const i=s.join(this.packagesDir(),"tmp",`pull-${e}-${Date.now()}-${Math.random().toString(36).slice(2,8)}`);try{p(i,{recursive:!0});const a=r.fileName?.trim()||`${e}.zip`,n=await N({downloadUrl:t,fileName:a,sha256:r.packageSha256},i);if(!n)return{ok:!1,error:`\u4E0B\u8F7D MCP \u5305\u65E0\u54CD\u5E94: ${t}`};const S=d(n.outputPath),w=s.join(i,"extract"),o=await E(S,w);await b(o.packageDir,o.manifest),p(this.packagesDir(),{recursive:!0});const l=this.packageDir(e),u=s.join(this.packagesDir(),`.old-${e}-${Date.now()}-${Math.random().toString(36).slice(2,8)}`);let k=!1;f(l)&&(y(l,u),k=!0);try{y(o.packageDir,l)}catch(m){throw k&&f(u)&&(h(l,{recursive:!0,force:!0}),y(u,l)),m}k&&f(u)&&h(u,{recursive:!0,force:!0});const D=this.readPackagesManifest().filter(m=>m.name!==e);return D.push({name:e,fileName:n.fileName,packageSha256:r.packageSha256,dependencies:o.manifest.dependencies}),this.writePackagesManifest(D),g.info("[mcp] \u5305\u578B MCP \u5DF2\u90E8\u7F72\u5230 bridge: %s\uFF08%d \u4E2A\u6587\u4EF6, dependencies=%s\uFF09",e,o.fileCount,o.manifest.dependencies),{ok:!0,name:e}}catch(a){const n=a instanceof Error?a.message:String(a);return g.warn("[mcp] \u5305\u578B MCP \u90E8\u7F72\u5931\u8D25\uFF08%s\uFF09: %s",e,n),{ok:!1,error:`MCP \u5305\u90E8\u7F72\u5931\u8D25: ${n}`}}finally{try{h(i,{recursive:!0,force:!0})}catch{}}}removeMcpPackage(e){try{const t=this.packageDir(e);f(t)&&h(t,{recursive:!0,force:!0})}catch(t){g.warn("[mcp] MCP \u5305\u76EE\u5F55\u6E05\u7406\u5931\u8D25\uFF08%s\uFF09: %s",e,t instanceof Error?t.message:String(t))}const r=this.readPackagesManifest().filter(t=>t.name!==e);try{this.writePackagesManifest(r)}catch{}}listDeployed(){return this.readManifest().map(e=>({...e,deployed:this.isHealthy(e.name)}))}getSpec(e){if(!this.isHealthy(e))return null;try{return JSON.parse(d(this.specFile(e),"utf8"))}catch{return null}}resolveEnabledMcp(e,r){const t={};for(const i of this.readManifest()){if(!P(e,"mcp",i.name)||!this.isHealthy(i.name))continue;const a=this.getSpec(i.name);a&&(t[i.name]={...a,type:a.type||"stdio"})}for(const[i,a]of Object.entries(r))P(e,"mcp",i)&&(t[i]||(t[i]=a));return t}deployedDefaultEnabled(){const e={};for(const r of this.readManifest())e[r.name]=r.defaultEnabled;return e}}c._instance=null;const J=c.getInstance();C("mcp",()=>J.deployedDefaultEnabled());const z=()=>F("mcp");export{c as McpDeployManager,J as mcpDeployManager,z as reconcileMcpDefaultsFromDeployed};
+import{existsSync as l,mkdirSync as h,readFileSync as d,renameSync as M,rmSync as g,writeFileSync as D}from"node:fs";import s from"node:path";import{downloadPluginZip as $}from"../utils/file-utils.js";import{createLogger as N}from"../utils/logger.js";import{setDeployedDefaultsProvider as j,reconcileDefaultsFromDeployed as C}from"./capability-config.js";import{isCapabilityEnabled as P}from"./instance-features.js";import{extractMcpPackageZip as F,runMcpPackageInstall as E}from"./mcp-package.js";import{getUserMcpDeployedDir as b,getUserMcpPackagesDir as O}from"./user-scope.js";const k=N("mcp-deploy"),J=1;class o{static forScope(e){const r=b(e),t=s.resolve(r);let i=this.instances.get(t);return i||(i=new o(e,r,O(e)),this.instances.set(t,i)),i}constructor(e,r,t){this.scope=e,this.rootDir=r,this.packagesRootDir=t}static isValidName(e){return!e||e==="."||e===".."||e!==s.basename(e)?!1:/^[a-zA-Z0-9_.-]+$/.test(e)}manifestFile(){return s.join(this.rootDir,"manifest.json")}specFile(e){const r=s.join(this.rootDir,`${e}.json`),t=s.resolve(this.rootDir);if(s.resolve(r)!==s.join(t,`${e}.json`))throw new Error(`MCP \u6A21\u677F\u6587\u4EF6\u8D8A\u51FA\u90E8\u7F72\u533A: ${e}`);return r}isHealthy(e){return l(this.specFile(e))}readManifest(){try{const e=JSON.parse(d(this.manifestFile(),"utf8"));return Array.isArray(e.servers)?e.servers.filter(r=>r&&r.name):[]}catch{return[]}}writeManifest(e){h(this.rootDir,{recursive:!0}),D(this.manifestFile(),`${JSON.stringify({version:J,servers:e},null,2)}
+`,"utf8")}saveMcp(e,r,t=!0,i){if(!o.isValidName(e))return{ok:!1,error:`MCP \u540D\u975E\u6CD5: ${JSON.stringify(e)}`};h(this.rootDir,{recursive:!0});try{D(this.specFile(e),`${JSON.stringify(r,null,2)}
+`,"utf8")}catch(n){return{ok:!1,error:`MCP \u6A21\u677F\u5199\u5165\u5931\u8D25: ${n instanceof Error?n.message:String(n)}`}}const a=this.readManifest().filter(n=>n.name!==e);return a.push({name:e,fileName:`${e}.json`,defaultEnabled:t,sha256:i}),this.writeManifest(a),k.info("[mcp] MCP \u6A21\u677F\u5DF2\u90E8\u7F72\u5230 bridge: %s",e),{ok:!0,name:e}}removeMcp(e){if(!o.isValidName(e))return{ok:!1,error:"name \u975E\u6CD5"};const r=this.readManifest().filter(t=>t.name!==e);this.writeManifest(r);try{g(this.specFile(e),{force:!0})}catch(t){return{ok:!1,error:`\u6A21\u677F\u6587\u4EF6\u6E05\u7406\u5931\u8D25: ${t instanceof Error?t.message:String(t)}`}}return this.removeMcpPackage(e),k.info("[mcp] MCP \u6A21\u677F\u5DF2\u4ECE bridge \u79FB\u9664\u90E8\u7F72: %s",e),{ok:!0}}packagesDir(){return this.packagesRootDir}packagesManifestFile(){return s.join(this.packagesDir(),"manifest.json")}packageDir(e){if(!o.isValidName(e))throw new Error(`\u975E\u6CD5 MCP \u540D: ${JSON.stringify(e)}`);const r=s.join(this.packagesDir(),e),t=s.resolve(this.packagesDir());if(s.resolve(r)!==s.join(t,e))throw new Error(`MCP \u5305\u76EE\u5F55\u8D8A\u51FA\u90E8\u7F72\u533A: ${e}`);return r}isPackageHealthy(e){try{return l(s.join(this.packageDir(e),"mcp.json"))}catch{return!1}}readPackagesManifest(){try{const e=JSON.parse(d(this.packagesManifestFile(),"utf8"));return Array.isArray(e.packages)?e.packages.filter(r=>r&&r.name):[]}catch{return[]}}writePackagesManifest(e){h(this.packagesDir(),{recursive:!0}),D(this.packagesManifestFile(),`${JSON.stringify({version:1,packages:e},null,2)}
+`,"utf8")}packageUpToDate(e,r){return this.isPackageHealthy(e)?r?this.readPackagesManifest().find(i=>i.name===e)?.packageSha256===r:!0:!1}async ensureMcpPackage(e,r){if(!o.isValidName(e))return{ok:!1,error:`MCP \u540D\u975E\u6CD5: ${JSON.stringify(e)}`};const t=String(r?.packageUrl??"").trim();if(!t)return{ok:!1,error:"packageUrl \u4E3A\u7A7A"};if(this.packageUpToDate(e,r.packageSha256))return{ok:!0,name:e};const i=s.join(this.packagesDir(),"tmp",`pull-${e}-${Date.now()}-${Math.random().toString(36).slice(2,8)}`);try{h(i,{recursive:!0});const a=r.fileName?.trim()||`${e}.zip`,n=await $({downloadUrl:t,fileName:a,sha256:r.packageSha256},i);if(!n)return{ok:!1,error:`\u4E0B\u8F7D MCP \u5305\u65E0\u54CD\u5E94: ${t}`};const w=d(n.outputPath),v=s.join(i,"extract"),f=await F(w,v);await E(f.packageDir,f.manifest),h(this.packagesDir(),{recursive:!0});const u=this.packageDir(e),p=s.join(this.packagesDir(),`.old-${e}-${Date.now()}-${Math.random().toString(36).slice(2,8)}`);let y=!1;l(u)&&(M(u,p),y=!0);try{M(f.packageDir,u)}catch(m){throw y&&l(p)&&(g(u,{recursive:!0,force:!0}),M(p,u)),m}y&&l(p)&&g(p,{recursive:!0,force:!0});const S=this.readPackagesManifest().filter(m=>m.name!==e);return S.push({name:e,fileName:n.fileName,packageSha256:r.packageSha256,dependencies:f.manifest.dependencies}),this.writePackagesManifest(S),k.info("[mcp] \u5305\u578B MCP \u5DF2\u90E8\u7F72\u5230 bridge: %s\uFF08%d \u4E2A\u6587\u4EF6, dependencies=%s\uFF09",e,f.fileCount,f.manifest.dependencies),{ok:!0,name:e}}catch(a){const n=a instanceof Error?a.message:String(a);return k.warn("[mcp] \u5305\u578B MCP \u90E8\u7F72\u5931\u8D25\uFF08%s\uFF09: %s",e,n),{ok:!1,error:`MCP \u5305\u90E8\u7F72\u5931\u8D25: ${n}`}}finally{try{g(i,{recursive:!0,force:!0})}catch{}}}removeMcpPackage(e){try{const t=this.packageDir(e);l(t)&&g(t,{recursive:!0,force:!0})}catch(t){k.warn("[mcp] MCP \u5305\u76EE\u5F55\u6E05\u7406\u5931\u8D25\uFF08%s\uFF09: %s",e,t instanceof Error?t.message:String(t))}const r=this.readPackagesManifest().filter(t=>t.name!==e);try{this.writePackagesManifest(r)}catch{}}listDeployed(){return this.readManifest().map(e=>({...e,deployed:this.isHealthy(e.name)}))}getSpec(e){if(!this.isHealthy(e))return null;try{return JSON.parse(d(this.specFile(e),"utf8"))}catch{return null}}resolveEnabledMcp(e,r){const t={};for(const i of this.readManifest()){if(!P(e,"mcp",i.name)||!this.isHealthy(i.name))continue;const a=this.getSpec(i.name);a&&(t[i.name]={...a,type:a.type||"stdio"})}for(const[i,a]of Object.entries(r))P(e,"mcp",i)&&(t[i]||(t[i]=a));return t}deployedDefaultEnabled(){const e={};for(const r of this.readManifest())e[r.name]=r.defaultEnabled;return e}}o.instances=new Map;function Z(c){return o.forScope(c)}j("mcp",c=>c?o.forScope(c).deployedDefaultEnabled():{});const B=c=>C(c,"mcp");export{o as McpDeployManager,Z as getMcpDeployManager,B as reconcileMcpDefaultsFromDeployed};
 

package/dist/services/mcp-env-injector.d.ts

@@ -4,10 +4,30 @@ export declare function isStdioMcpSpec(spec: unknown): boolean;
 export declare const MCP_PACKAGE_DIR_PLACEHOLDER = "${MCP_PACKAGE_DIR}";
 export declare const MCP_NODE_PLACEHOLDER = "${MCP_NODE}";
 
+
+
+
+
+
+
+
+
+
+
 export declare function expandMcpPackagePlaceholders(record: Record<string, unknown>, packageDir?: string, nodePath?: string): boolean;
 
 export declare function isBuiltinMcpName(name: string): boolean;
 
+
+
+
+
+
+
+
+
+
+
 export declare const AGENT_META_ENV_KEYS: {
     readonly agentId: "AWS_AGENT_ID";
     readonly roleId: "AWS_AGENT_ROLE_ID";
@@ -21,16 +41,48 @@ export interface AgentMetaEnvInput {
     projectId?: string;
 }
 
+
+
+
 export declare function buildAgentMetaEnv(meta: AgentMetaEnvInput | undefined): Record<string, string>;
 
+
+
+
+
+
+
 export declare function expandEnvPlaceholders(text: string, env: Record<string, string>): string;
 export interface InjectEnvOptions {
     
+
+
+
     overwriteExisting?: boolean;
     
+
+
+
+
     resolvePackageDir?: (name: string) => string | undefined;
     
+
+
+
+
     agentMeta?: AgentMetaEnvInput;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 export declare function injectEffectiveEnvIntoMcpServers(servers: Record<string, unknown>, effectiveEnv: Record<string, string>, options?: InjectEnvOptions): string[];

package/dist/services/mcp-launch-binding-queue.d.ts

@@ -32,17 +32,29 @@ export declare function enqueueMcpLaunchBinding(input: McpLaunchBindingInput): M
 export declare function claimMcpLaunchBinding(request: McpLaunchBindingClaimRequest): ClaimedMcpLaunchBinding | null;
 export declare function getMcpLaunchQueueSize(workspacePath: unknown): number;
 
+
+
+
 export declare function removeMcpLaunchBinding(bindingId: string): boolean;
 export declare function clearMcpLaunchBindingQueues(): void;
 
+
+
+
 export declare function getLatestAgentToken(agentId: string): {
     runtimeAccessToken: string;
 } | null;
 
+
+
+
 export declare function getLatestAgentTokenEntry(agentId: string): {
     runtimeAccessToken: string;
     schedulerBaseUrl?: string;
     updatedAt: number;
 } | null;
 
+
+
+
 export declare function updateLatestAgentToken(agentId: string, runtimeAccessToken: string, schedulerBaseUrl?: string): void;

package/dist/services/mcp-package.d.ts

@@ -1,4 +1,15 @@
 
+
+
+
+
+
+
+
+
+
+
+
 export interface McpPackageManifestEnvField {
     key: string;
     required?: boolean;
@@ -17,9 +28,14 @@ export interface McpPackageManifest {
     install?: string;
     description?: string;
     
+
+
+
     env?: McpPackageManifestEnvField[];
 }
 
+
+
 export declare function validateMcpPackageManifest(raw: unknown): McpPackageManifest;
 
 export declare function readMcpPackageManifest(packageDir: string): McpPackageManifest;
@@ -30,6 +46,12 @@ export interface McpPackageExtractResult {
     manifest: McpPackageManifest;
 }
 
+
+
+
 export declare function extractMcpPackageZip(zipBuffer: Buffer, stagingRoot: string): Promise<McpPackageExtractResult>;
 
+
+
+
 export declare function runMcpPackageInstall(packageDir: string, manifest: McpPackageManifest): Promise<void>;

package/dist/services/mcp-package.js

@@ -1,2 +1,2 @@
-import{spawn as l}from"node:child_process";import{existsSync as E,readFileSync as g}from"node:fs";import h from"node:path";import{createLogger as S}from"../utils/logger.js";import{BLOCKED_ENV_KEYS as w,ENV_KEY_PATTERN as y}from"../utils/env-safety.js";import{extractPluginZip as T}from"./plugin-package.js";const A=S("mcp-package"),$=new Set(["node","python","binary"]),M=new Set(["bundled","npm"]),d="mcp.json",N=/^[A-Za-z0-9_./@+-]+$/,a=/^(npm|pnpm|yarn)\s+(ci|install)(\s+[A-Za-z0-9@._/:=+-]+)*$/,u=5*60*1e3,P=64*1024;function f(n){return typeof n=="object"&&n!==null&&!Array.isArray(n)}function _(n){if(n==null)return;if(!Array.isArray(n))throw new Error("mcp.json \u7684 env \u975E\u6CD5\uFF08\u987B\u4E3A\u6570\u7EC4\uFF09");if(n.length===0)return;if(n.length>64)throw new Error("mcp.json \u7684 env \u6700\u591A\u58F0\u660E 64 \u9879");const i=new Set,e=[];for(const r of n){if(!f(r))throw new Error("mcp.json \u7684 env \u5143\u7D20\u975E\u6CD5\uFF08\u987B\u4E3A\u5BF9\u8C61\uFF09");const t=String(r.key??"").trim();if(!t)throw new Error("mcp.json \u7684 env \u5143\u7D20\u7F3A\u5C11 key");if(!y.test(t))throw new Error(`mcp.json \u7684 env \u53D8\u91CF\u540D\u975E\u6CD5: ${t}`);if(w.has(t.toUpperCase()))throw new Error(`mcp.json \u58F0\u660E\u4E86\u7981\u6B62\u7684\u5371\u9669\u73AF\u5883\u53D8\u91CF: ${t}`);if(i.has(t))throw new Error(`mcp.json \u7684 env \u91CD\u590D\u58F0\u660E: ${t}`);i.add(t),e.push({key:t,required:r.required===!0,sensitive:r.sensitive===!0,description:r.description!==void 0?String(r.description):void 0,example:r.example!==void 0?String(r.example):void 0})}return e}function v(n){if(!f(n))throw new Error("mcp.json \u5FC5\u987B\u662F JSON \u5BF9\u8C61");const i=String(n.runtime??"").trim().toLowerCase();if(!$.has(i))throw new Error(`mcp.json \u7684 runtime \u975E\u6CD5\uFF08\u4EC5 node/python/binary\uFF09: ${String(n.runtime)}`);const e=String(n.entry??"").trim();if(!e||!N.test(e)||e.startsWith("/")||/^[A-Za-z]:/.test(e)||e.split(/[\\/]/).includes(".."))throw new Error(`mcp.json \u7684 entry \u975E\u6CD5\uFF08\u987B\u4E3A\u5305\u5185\u76F8\u5BF9\u8DEF\u5F84\uFF09: ${e}`);const r=String(n.dependencies??"bundled").trim().toLowerCase()||"bundled";if(!M.has(r))throw new Error(`mcp.json \u7684 dependencies \u975E\u6CD5\uFF08\u4EC5 bundled/npm\uFF09: ${r}`);let t;if(r==="npm"&&(t=String(n.install??"").trim(),!t||!a.test(t)))throw new Error(`dependencies=npm \u65F6\u5FC5\u987B\u58F0\u660E\u5408\u6CD5\u7684 install \u547D\u4EE4\uFF08\u4EC5 npm/pnpm/yarn \u7684 install/ci\uFF09: ${t}`);const o=Array.isArray(n.args)?n.args.filter(s=>s!=null).map(String):void 0;return{name:n.name!==void 0?String(n.name):void 0,version:n.version!==void 0?String(n.version):void 0,runtime:i,entry:e,args:o,dependencies:r,install:t,description:n.description!==void 0?String(n.description):void 0,env:_(n.env)}}function j(n){const i=h.join(n,d);if(!E(i))throw new Error(`MCP \u5305\u5185\u7F3A\u5C11 ${d}\uFF08\u5305\u578B MCP \u5FC5\u987B\u81EA\u63CF\u8FF0 runtime/entry\uFF09`);let e;try{e=JSON.parse(g(i,"utf8"))}catch(r){throw new Error(`MCP \u5305\u5185 ${d} \u89E3\u6790\u5931\u8D25: ${r instanceof Error?r.message:String(r)}`)}return v(e)}async function O(n,i){const{pluginDir:e,fileCount:r}=await T(n,i),t=j(e);return{packageDir:e,fileCount:r,manifest:t}}async function R(n,i){if(i.dependencies!=="npm")return;const e=String(i.install??"").trim();if(!a.test(e))throw new Error(`\u62D2\u7EDD\u6267\u884C\u975E\u767D\u540D\u5355\u5B89\u88C5\u547D\u4EE4: ${e}`);await new Promise((r,t)=>{A.info("[mcp-package] \u6267\u884C\u4F9D\u8D56\u5B89\u88C5: %s (cwd=%s)",e,n);const o=l(e,{cwd:n,shell:!0,windowsHide:!0});let s="";const p=c=>{s.length<P&&(s+=c.toString("utf8"))};o.stdout?.on("data",p),o.stderr?.on("data",p);const m=setTimeout(()=>{o.kill(),t(new Error(`\u4F9D\u8D56\u5B89\u88C5\u8D85\u65F6\uFF08${u}ms\uFF09: ${e}`))},u);o.on("error",c=>{clearTimeout(m),t(new Error(`\u4F9D\u8D56\u5B89\u88C5\u8FDB\u7A0B\u542F\u52A8\u5931\u8D25: ${c.message}`))}),o.on("close",c=>{if(clearTimeout(m),c!==0){t(new Error(`\u4F9D\u8D56\u5B89\u88C5\u5931\u8D25\uFF08\u9000\u51FA\u7801 ${c}\uFF09: ${s.trim().slice(0,600)||"(\u65E0\u8F93\u51FA)"}`));return}r()})})}export{O as extractMcpPackageZip,j as readMcpPackageManifest,R as runMcpPackageInstall,v as validateMcpPackageManifest};
+import{spawn as l}from"node:child_process";import{existsSync as E,readFileSync as g}from"node:fs";import h from"node:path";import{BLOCKED_ENV_KEYS as S,ENV_KEY_PATTERN as w}from"../utils/env-safety.js";import{createLogger as y}from"../utils/logger.js";import{extractPluginZip as T}from"./plugin-package.js";const A=y("mcp-package"),$=new Set(["node","python","binary"]),M=new Set(["bundled","npm"]),d="mcp.json",N=/^[A-Za-z0-9_./@+-]+$/,a=/^(npm|pnpm|yarn)\s+(ci|install)(\s+[A-Za-z0-9@._/:=+-]+)*$/,u=5*60*1e3,P=64*1024;function f(n){return typeof n=="object"&&n!==null&&!Array.isArray(n)}function _(n){if(n==null)return;if(!Array.isArray(n))throw new Error("mcp.json \u7684 env \u975E\u6CD5\uFF08\u987B\u4E3A\u6570\u7EC4\uFF09");if(n.length===0)return;if(n.length>64)throw new Error("mcp.json \u7684 env \u6700\u591A\u58F0\u660E 64 \u9879");const i=new Set,e=[];for(const r of n){if(!f(r))throw new Error("mcp.json \u7684 env \u5143\u7D20\u975E\u6CD5\uFF08\u987B\u4E3A\u5BF9\u8C61\uFF09");const t=String(r.key??"").trim();if(!t)throw new Error("mcp.json \u7684 env \u5143\u7D20\u7F3A\u5C11 key");if(!w.test(t))throw new Error(`mcp.json \u7684 env \u53D8\u91CF\u540D\u975E\u6CD5: ${t}`);if(S.has(t.toUpperCase()))throw new Error(`mcp.json \u58F0\u660E\u4E86\u7981\u6B62\u7684\u5371\u9669\u73AF\u5883\u53D8\u91CF: ${t}`);if(i.has(t))throw new Error(`mcp.json \u7684 env \u91CD\u590D\u58F0\u660E: ${t}`);i.add(t),e.push({key:t,required:r.required===!0,sensitive:r.sensitive===!0,description:r.description!==void 0?String(r.description):void 0,example:r.example!==void 0?String(r.example):void 0})}return e}function v(n){if(!f(n))throw new Error("mcp.json \u5FC5\u987B\u662F JSON \u5BF9\u8C61");const i=String(n.runtime??"").trim().toLowerCase();if(!$.has(i))throw new Error(`mcp.json \u7684 runtime \u975E\u6CD5\uFF08\u4EC5 node/python/binary\uFF09: ${String(n.runtime)}`);const e=String(n.entry??"").trim();if(!e||!N.test(e)||e.startsWith("/")||/^[A-Za-z]:/.test(e)||e.split(/[\\/]/).includes(".."))throw new Error(`mcp.json \u7684 entry \u975E\u6CD5\uFF08\u987B\u4E3A\u5305\u5185\u76F8\u5BF9\u8DEF\u5F84\uFF09: ${e}`);const r=String(n.dependencies??"bundled").trim().toLowerCase()||"bundled";if(!M.has(r))throw new Error(`mcp.json \u7684 dependencies \u975E\u6CD5\uFF08\u4EC5 bundled/npm\uFF09: ${r}`);let t;if(r==="npm"&&(t=String(n.install??"").trim(),!t||!a.test(t)))throw new Error(`dependencies=npm \u65F6\u5FC5\u987B\u58F0\u660E\u5408\u6CD5\u7684 install \u547D\u4EE4\uFF08\u4EC5 npm/pnpm/yarn \u7684 install/ci\uFF09: ${t}`);const o=Array.isArray(n.args)?n.args.filter(s=>s!=null).map(String):void 0;return{name:n.name!==void 0?String(n.name):void 0,version:n.version!==void 0?String(n.version):void 0,runtime:i,entry:e,args:o,dependencies:r,install:t,description:n.description!==void 0?String(n.description):void 0,env:_(n.env)}}function j(n){const i=h.join(n,d);if(!E(i))throw new Error(`MCP \u5305\u5185\u7F3A\u5C11 ${d}\uFF08\u5305\u578B MCP \u5FC5\u987B\u81EA\u63CF\u8FF0 runtime/entry\uFF09`);let e;try{e=JSON.parse(g(i,"utf8"))}catch(r){throw new Error(`MCP \u5305\u5185 ${d} \u89E3\u6790\u5931\u8D25: ${r instanceof Error?r.message:String(r)}`)}return v(e)}async function O(n,i){const{pluginDir:e,fileCount:r}=await T(n,i),t=j(e);return{packageDir:e,fileCount:r,manifest:t}}async function R(n,i){if(i.dependencies!=="npm")return;const e=String(i.install??"").trim();if(!a.test(e))throw new Error(`\u62D2\u7EDD\u6267\u884C\u975E\u767D\u540D\u5355\u5B89\u88C5\u547D\u4EE4: ${e}`);await new Promise((r,t)=>{A.info("[mcp-package] \u6267\u884C\u4F9D\u8D56\u5B89\u88C5: %s (cwd=%s)",e,n);const o=l(e,{cwd:n,shell:!0,windowsHide:!0});let s="";const p=c=>{s.length<P&&(s+=c.toString("utf8"))};o.stdout?.on("data",p),o.stderr?.on("data",p);const m=setTimeout(()=>{o.kill(),t(new Error(`\u4F9D\u8D56\u5B89\u88C5\u8D85\u65F6\uFF08${u}ms\uFF09: ${e}`))},u);o.on("error",c=>{clearTimeout(m),t(new Error(`\u4F9D\u8D56\u5B89\u88C5\u8FDB\u7A0B\u542F\u52A8\u5931\u8D25: ${c.message}`))}),o.on("close",c=>{if(clearTimeout(m),c!==0){t(new Error(`\u4F9D\u8D56\u5B89\u88C5\u5931\u8D25\uFF08\u9000\u51FA\u7801 ${c}\uFF09: ${s.trim().slice(0,600)||"(\u65E0\u8F93\u51FA)"}`));return}r()})})}export{O as extractMcpPackageZip,j as readMcpPackageManifest,R as runMcpPackageInstall,v as validateMcpPackageManifest};
 

package/dist/services/mcp-probe-client.d.ts

@@ -1,4 +1,16 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
 import { type AgentMetaEnvInput } from "./mcp-env-injector.js";
 export interface McpProbeTool {
     name: string;
@@ -15,6 +27,8 @@ export interface McpProbeResult {
 }
 export interface McpProbeOptions {
     
+    scope?: import("./user-scope.js").UserScope;
+    
     effectiveEnv?: Record<string, string>;
     
     agentMeta?: AgentMetaEnvInput;
@@ -22,4 +36,9 @@ export interface McpProbeOptions {
     listToolsTimeoutMs?: number;
 }
 
+
+
+
+
+
 export declare function probeDeployedMcp(name: string, options?: McpProbeOptions): Promise<McpProbeResult>;