aws-runtime-bridge 1.2.0 → 1.2.1

package/dist/services/aws-client-agent-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aws-client-agent-mcp.d.ts","sourceRoot":"","sources":["../../src/services/aws-client-agent-mcp.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAuB7C,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,sCAAsC;IACrD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,sCAAsC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAaD,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CAC3C;AAqBD,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AA0FD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,MAAM,GAAG,IAAI,CAgDf;AA2ED,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAEpB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CAwBpB;AAED,wBAAgB,+BAA+B,IAAI,IAAI,CAgBtD"}
+{"version":3,"file":"aws-client-agent-mcp.d.ts","sourceRoot":"","sources":["../../src/services/aws-client-agent-mcp.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAuB7C,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,sCAAsC;IACrD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,sCAAsC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAaD,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CAC3C;AAuBD,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AAgLD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,MAAM,GAAG,IAAI,CAoDf;AA2ED,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAEpB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CAwBpB;AAED,wBAAgB,+BAA+B,IAAI,IAAI,CAgBtD"}

package/dist/services/aws-client-agent-mcp.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync, } from "node:fs";
+import { cpSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, realpathSync, rmSync, statSync, symlinkSync, writeFileSync, } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { getRuntimeHomeDir, port, schedulerBaseUrl } from "../config.js";
@@ -32,7 +32,10 @@ function getPackageRoot() {
     return path.resolve(path.dirname(currentFile), "..", "..");
 }
 function getBundledEntryPath(packageRoot = getPackageRoot()) {
-    return path.join(packageRoot, "package", "aws-client-agent-mcp", "dist", "index.js");
+    return path.join(getBundledMcpRoot(packageRoot), "dist", "index.js");
+}
+function getBundledMcpRoot(packageRoot) {
+    return path.join(packageRoot, "package", "aws-client-agent-mcp");
 }
 function getReleasedMcpRoot() {
     return path.join(getRuntimeHomeDir(), ".aws-bridge", "mcp");
@@ -56,7 +59,66 @@ function getBridgeVersion(packageRoot) {
     return readPackageVersion(path.join(packageRoot, "package.json"));
 }
 function getBundledMcpVersion(packageRoot) {
-    return readPackageVersion(path.join(packageRoot, "package", "aws-client-agent-mcp", "package.json"));
+    return readPackageVersion(path.join(getBundledMcpRoot(packageRoot), "package.json"));
+}
+function copyIfExists(sourcePath, targetPath) {
+    if (!existsSync(sourcePath)) {
+        return;
+    }
+    copyFileOrDirectory(sourcePath, targetPath);
+}
+function copyFileOrDirectory(sourcePath, targetPath) {
+    const stat = statSync(sourcePath);
+    if (stat.isDirectory()) {
+        cpSync(sourcePath, targetPath, {
+            errorOnExist: false,
+            force: true,
+            recursive: true,
+        });
+        return;
+    }
+    cpSync(sourcePath, targetPath, { errorOnExist: false, force: true });
+}
+function syncReleasedPackageMetadata(packageRoot, releasedRoot) {
+    const bundledMcpRoot = getBundledMcpRoot(packageRoot);
+    copyIfExists(path.join(bundledMcpRoot, "package.json"), path.join(releasedRoot, "package.json"));
+    copyIfExists(path.join(bundledMcpRoot, "README.md"), path.join(releasedRoot, "README.md"));
+    copyIfExists(path.join(bundledMcpRoot, "package-lock.json"), path.join(releasedRoot, "package-lock.json"));
+}
+function shouldReplaceNodeModulesLink(targetPath) {
+    if (!existsSync(targetPath)) {
+        return true;
+    }
+    const stat = lstatSync(targetPath);
+    return stat.isSymbolicLink() || stat.isDirectory();
+}
+function isExpectedNodeModulesLink(targetPath, sourcePath) {
+    if (!existsSync(targetPath)) {
+        return false;
+    }
+    try {
+        return realpathSync(targetPath) === realpathSync(sourcePath);
+    }
+    catch {
+        return false;
+    }
+}
+function ensureReleasedNodeModules(packageRoot, releasedRoot) {
+    const sourceNodeModules = path.join(packageRoot, "node_modules");
+    const releasedNodeModules = path.join(releasedRoot, "node_modules");
+    if (!existsSync(sourceNodeModules)) {
+        logger.warn(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 未找到依赖目录，release 产物可能无法解析运行时依赖: ${sourceNodeModules}`);
+        return;
+    }
+    if (isExpectedNodeModulesLink(releasedNodeModules, sourceNodeModules)) {
+        return;
+    }
+    if (!shouldReplaceNodeModulesLink(releasedNodeModules)) {
+        logger.warn(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 依赖路径已存在但不是目录或链接，已保留: ${releasedNodeModules}`);
+        return;
+    }
+    rmSync(releasedNodeModules, { recursive: true, force: true });
+    symlinkSync(sourceNodeModules, releasedNodeModules, process.platform === "win32" ? "junction" : "dir");
 }
 function listDistFiles(dirPath, rootPath = dirPath) {
     return readdirSync(dirPath, { withFileTypes: true }).flatMap((entry) => {
@@ -128,6 +190,8 @@ export function releaseBundledAwsClientAgentMcp(options = {}) {
     if (shouldRefreshReleasedMcp(releasedEntry, currentManifest, nextManifest)) {
         rmSync(releasedDist, { recursive: true, force: true });
         mkdirSync(releasedRoot, { recursive: true });
+        syncReleasedPackageMetadata(packageRoot, releasedRoot);
+        ensureReleasedNodeModules(packageRoot, releasedRoot);
         cpSync(bundledDist, releasedDist, {
             errorOnExist: false,
             force: true,
@@ -140,6 +204,8 @@ export function releaseBundledAwsClientAgentMcp(options = {}) {
         logger.info(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 已更新到: ${releasedDist}`);
     }
     else {
+        syncReleasedPackageMetadata(packageRoot, releasedRoot);
+        ensureReleasedNodeModules(packageRoot, releasedRoot);
         logger.info(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 已是最新: ${releasedDist}`);
     }
     return releasedEntry;

package/dist/services/aws-client-agent-mcp.test.js

@@ -1,4 +1,5 @@
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+import { existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readlinkSync, realpathSync, rmSync, writeFileSync, } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { afterEach, describe, expect, it, vi } from 'vitest';
@@ -13,7 +14,31 @@ function createBundledMcpPackage(version = '1.0.0') {
     const bundledDist = path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'dist');
     mkdirSync(bundledDist, { recursive: true });
     writeFileSync(path.join(packageRoot, 'package.json'), JSON.stringify({ name: 'aws-runtime-bridge', version: '9.9.9' }), 'utf-8');
-    writeFileSync(path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'package.json'), JSON.stringify({ name: 'aws-client-agent-mcp', version }), 'utf-8');
+    writeFileSync(path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'package.json'), JSON.stringify({
+        name: 'aws-client-agent-mcp',
+        version,
+        type: 'module',
+        main: 'dist/index.js',
+        dependencies: {
+            '@modelcontextprotocol/sdk': '^1.27.1',
+            ws: '^8.14.2',
+            yaml: '^2.3.4',
+        },
+    }), 'utf-8');
+    writeFileSync(path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'README.md'), '# aws-client-agent-mcp\n', 'utf-8');
+    mkdirSync(path.join(packageRoot, 'node_modules', '@modelcontextprotocol', 'sdk'), {
+        recursive: true,
+    });
+    writeFileSync(path.join(packageRoot, 'node_modules', '@modelcontextprotocol', 'sdk', 'package.json'), JSON.stringify({
+        name: '@modelcontextprotocol/sdk',
+        version: '1.27.1',
+        type: 'module',
+        main: 'index.js',
+        exports: './index.js',
+    }), 'utf-8');
+    writeFileSync(path.join(packageRoot, 'node_modules', '@modelcontextprotocol', 'sdk', 'index.js'), 'export const sdkMarker = "resolved-sdk";\n', 'utf-8');
+    mkdirSync(path.join(packageRoot, 'node_modules', 'ws'), { recursive: true });
+    mkdirSync(path.join(packageRoot, 'node_modules', 'yaml'), { recursive: true });
     writeFileSync(path.join(bundledDist, 'index.js'), 'console.log("mcp v1");\n', 'utf-8');
     return packageRoot;
 }
@@ -56,8 +81,21 @@ describe('aws-client-agent-mcp service', () => {
             });
             const releasedIndex = path.join(releasedRoot, 'dist', 'index.js');
             const manifestPath = path.join(releasedRoot, '.release.json');
+            const releasedPackageJson = path.join(releasedRoot, 'package.json');
+            const releasedNodeModules = path.join(releasedRoot, 'node_modules');
             expect(firstRelease).toBe(releasedIndex);
             expect(existsSync(releasedIndex)).toBe(true);
+            expect(JSON.parse(readFileSync(releasedPackageJson, 'utf-8'))).toMatchObject({
+                name: 'aws-client-agent-mcp',
+                version: '1.0.0',
+                dependencies: {
+                    '@modelcontextprotocol/sdk': '^1.27.1',
+                },
+            });
+            expect(readFileSync(path.join(releasedRoot, 'README.md'), 'utf-8')).toBe('# aws-client-agent-mcp\n');
+            expect(lstatSync(releasedNodeModules).isSymbolicLink()).toBe(true);
+            expect(realpathSync(releasedNodeModules)).toBe(realpathSync(path.join(packageRoot, 'node_modules')));
+            expect(path.resolve(readlinkSync(releasedNodeModules))).toBe(path.join(packageRoot, 'node_modules'));
             const firstManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'));
             expect(firstManifest).toMatchObject({
                 bridgeVersion: '9.9.9',
@@ -66,12 +104,15 @@ describe('aws-client-agent-mcp service', () => {
             });
             expect(firstManifest.distHash).toMatch(/^sha256:/);
             writeFileSync(releasedIndex, 'console.log("local marker");\n', 'utf-8');
+            rmSync(releasedNodeModules, { recursive: true, force: true });
+            mkdirSync(releasedNodeModules, { recursive: true });
             mod.releaseBundledAwsClientAgentMcp({
                 packageRoot,
                 releasedRoot,
                 now: () => '2026-05-05T00:00:00.000Z',
             });
             expect(readFileSync(releasedIndex, 'utf-8')).toBe('console.log("local marker");\n');
+            expect(realpathSync(releasedNodeModules)).toBe(realpathSync(path.join(packageRoot, 'node_modules')));
             expect(JSON.parse(readFileSync(manifestPath, 'utf-8')).releasedAt).toBe('2026-05-04T00:00:00.000Z');
         }
         finally {
@@ -102,6 +143,32 @@ describe('aws-client-agent-mcp service', () => {
             rmSync(releasedRoot, { recursive: true, force: true });
         }
     });
+    it('releases a runnable package root that resolves bundled mcp runtime dependencies', async () => {
+        process.env.AWS_CLIENT_AGENT_MCP_COMMAND = '';
+        const packageRoot = createBundledMcpPackage('1.0.0');
+        const releasedRoot = mkdtempSync(path.join(os.tmpdir(), 'aws-mcp-release-'));
+        try {
+            const bundledIndex = path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'dist', 'index.js');
+            writeFileSync(bundledIndex, 'import { sdkMarker } from "@modelcontextprotocol/sdk";\nconsole.log(sdkMarker);\n', 'utf-8');
+            const mod = await import('./aws-client-agent-mcp.js');
+            const releasedEntry = mod.releaseBundledAwsClientAgentMcp({ packageRoot, releasedRoot });
+            expect(releasedEntry).toBe(path.join(releasedRoot, 'dist', 'index.js'));
+            if (!releasedEntry) {
+                throw new Error('Expected bundled MCP release entry to exist');
+            }
+            const result = spawnSync(process.execPath, [releasedEntry], {
+                cwd: releasedRoot,
+                encoding: 'utf-8',
+            });
+            expect(result.stderr).toBe('');
+            expect(result.status).toBe(0);
+            expect(result.stdout.trim()).toBe('resolved-sdk');
+        }
+        finally {
+            rmSync(packageRoot, { recursive: true, force: true });
+            rmSync(releasedRoot, { recursive: true, force: true });
+        }
+    });
     it('releases bundled mcp into home directory when runtime dist is missing', async () => {
         process.env.AWS_CLIENT_AGENT_MCP_COMMAND = '';
         const mod = await import('./aws-client-agent-mcp.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-runtime-bridge",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",