fa-mcp-sdk 0.2.146 → 0.2.182

package/README.md

@@ -174,7 +174,7 @@ npm start
 
 Provides endpoints:
 
-- `GET /` - About page with server info
+- `GET /` - Home page with server info
 - `GET /health` - Health check
 - `GET /sse` - Server-Sent Events for MCP communication
 - `POST /mcp` - Direct MCP JSON-RPC endpoint

package/bin/fa-mcp.js

@@ -46,6 +46,7 @@ const ALLOWED_FILES = [
   '__misc',
   '_tmp',
   '~last-cli-config.json',
+  'yarn.lock',
 ];
 
 const getAsk = () => {
@@ -227,6 +228,11 @@ class MCPGenerator {
         defaultValue: '***',
         title: 'Token for registering service with Consul agent',
       },
+      {
+        name: 'consul.agent.reg.host',
+        defaultValue: '',
+        title: 'The host of the consul agent where the service will be registered',
+      },
       {
         name: 'consul.envCode.dev',
         defaultValue: '<envCode.dev>',
@@ -730,6 +736,9 @@ certificate's public and private keys`,
 
   async copyDirectory (source, target) {
     const entries = await fs.readdir(source, { withFileTypes: true });
+    if (!fss.existsSync(target)) {
+      await fs.mkdir(target, { recursive: true });
+    }
 
     for (const entry of entries) {
       if (entry.name === 'node_modules' || entry.name === 'dist') {
@@ -845,6 +854,10 @@ certificate's public and private keys`,
         content = content.replace(/http:\/\/localhost:9876/g, `http://localhost:${config.port}`);
         modified = true;
       }
+      if (filePath.endsWith('test-stdio.js')) {
+        content = content.replace('../dist/template/start.js', 'dist/src/start.js');
+        modified = true;
+      }
 
       if (modified) {
         await fs.writeFile(filePath, content, 'utf8');
@@ -854,40 +867,14 @@ certificate's public and private keys`,
       await this.transformTargetFile(config, '.env', (c) => c.replace(/^(NODE_CONSUL_ENV)=([^\r\n]*)/m, '#$1=$2'));
     }
     if (config['claude.isBypassPermissions'] === 'true') {
+      const c1 = ['sudo cp', 'sudo', 'bash', 'chmod', 'curl', 'dir', 'echo', 'git', 'find', 'grep', 'jest',
+        'mkdir', 'node', 'npm install', 'npm run', 'npm test', 'npm', 'npx', 'pkill', 'set', 'playwright', 'powershell',
+        'rm', 'taskkill', 'tasklist', 'timeout', 'turbo run', 'wc'];
+      const c2 = ['jobs', 'npm start', 'unset http_proxy'];
+      const i = ' '.repeat(8);
+      const allowBashLines = [...c1.map((c) => `${i}"Bash(${c}:*)",`), ...c2.map((c) => `${i}"Bash(${c})",`)].join('\n');
       const transformFn = (c) => c.replace('"acceptEdits"', '"bypassPermissions"')
-        .replace(/"allow": \[\s+"Edit",/, `"allow": [
-      "Bash(sudo cp:*)",
-      "Bash(sudo:*)",
-      "Bash(bash:*)",
-      "Bash(chmod:*)",
-      "Bash(curl:*)",
-      "Bash(dir:*)",
-      "Bash(echo:*)",
-      "Bash(git:*)",
-      "Bash(find:*)",
-      "Bash(grep:*)",
-      "Bash(jest:*)",
-      "Bash(jobs)",
-      "Bash(mkdir:*)",
-      "Bash(node:*)",
-      "Bash(npm install:*)",
-      "Bash(npm run:*)",
-      "Bash(npm start)",
-      "Bash(npm test:*)",
-      "Bash(npm:*)",
-      "Bash(npx:*)",
-      "Bash(pkill:*)",
-      "Bash(set:*)",
-      "Bash(playwright:*)",
-      "Bash(powershell:*)",
-      "Bash(rm:*)",
-      "Bash(taskkill:*)",
-      "Bash(tasklist:*)",
-      "Bash(timeout:*)",
-      "Bash(turbo run:*)",
-      "Bash(unset http_proxy)",
-      "Bash(wc:*)",
-      "Edit",`);
+        .replace(/"allow": \[\s+"Edit",/, `"allow": [\n${allowBashLines}\n${i}"Edit",`);
       await this.transformTargetFile(config, '.claude/settings.json', transformFn);
     }
   }
@@ -897,12 +884,32 @@ certificate's public and private keys`,
     // Copy template files
     await this.copyDirectory(path.join(PROJ_ROOT, 'cli-template'), targetPath);
     await this.copyDirectory(path.join(PROJ_ROOT, 'src/template'), path.join(targetPath, 'src'));
-    let testsTargetPath = path.join(targetPath, 'tests');
-    await fs.mkdir(testsTargetPath, { recursive: true });
+
+    const testsTargetPath = path.join(targetPath, 'tests');
+
     await this.copyDirectory(path.join(PROJ_ROOT, 'src/tests'), testsTargetPath);
     await fs.copyFile(path.join(targetPath, '.env.example'), path.join(targetPath, '.env'));
     await fs.rename(path.join(targetPath, 'gitignore'), path.join(targetPath, '.gitignore'));
-    await fs.rename(path.join(targetPath, 'run'), path.join(targetPath, '.run'));
+    await fs.rename(path.join(targetPath, 'r'), path.join(targetPath, '.run'));
+
+    await this.copyDirectory(path.join(PROJ_ROOT, 'config'), path.join(targetPath, 'config'));
+
+    const scriptsTargetPath = path.join(targetPath, 'scripts');
+    await this.copyDirectory(path.join(PROJ_ROOT, 'scripts'), scriptsTargetPath);
+    await fs.rm(path.join(targetPath, 'scripts/copy-static.js'), { force: true });
+
+    // Rename all .xml files in .run directory to .run.xml
+    const runDirPath = path.join(targetPath, '.run');
+    const files = await fs.readdir(runDirPath);
+
+    for (const file of files) {
+      if (file.endsWith('.xml')) {
+        const oldFilePath = path.join(runDirPath, file);
+        const newFileName = file.slice(0, -4) + '.run.xml';
+        const newFilePath = path.join(runDirPath, newFileName);
+        await fs.rename(oldFilePath, newFilePath);
+      }
+    }
 
     // Rename mcp-template.com.conf if mcp.domain is provided
     const mcpDomain = config['mcp.domain'];
@@ -920,15 +927,13 @@ certificate's public and private keys`,
     }
 
     // Read _local.yaml into memory and rename it to local.yaml
-    let localYamlContent = '';
+    let localYamlExampleContent = '';
+    const localYamlExamplePath = path.join(targetPath, 'config', '_local.yaml');
+    const localYamlPath = path.join(targetPath, 'config', 'local.yaml');
     try {
-      const localYamlPath = path.join(targetPath, 'config', '_local.yaml');
-      const localYamlNewPath = path.join(targetPath, 'config', 'local.yaml');
 
-      localYamlContent = await fs.readFile(localYamlPath, 'utf8');
-      await fs.rename(localYamlPath, localYamlNewPath);
+      localYamlExampleContent = await fs.readFile(localYamlExamplePath, 'utf8');
     } catch (error) {
-      // _local.yaml doesn't exist, which might be fine
       console.log('⚠️  Warning: Could not process config/_local.yaml file:', error.message);
     }
 
@@ -936,35 +941,40 @@ certificate's public and private keys`,
     await this.replaceTemplateParameters(config);
 
     // Replace template placeholders with defaultValue from optionalParams and save as _local.yaml
-    if (localYamlContent) {
+    if (localYamlExampleContent) {
       try {
-        let modifiedContent = localYamlContent;
-
+        let localYamlExampleModifiedContent = localYamlExampleContent;
+        let localYamlModifiedContent = localYamlExampleContent;
         // Replace with defaultValue from optionalParams
         for (const param of this.optionalParams) {
           const template = `{{${param.name}}}`;
-          if (modifiedContent.includes(template)) {
+          if (localYamlExampleModifiedContent.includes(template)) {
             const defaultValue = param.defaultValue || '';
-            modifiedContent = modifiedContent.replace(new RegExp(escapeRegExp(template), 'g'), defaultValue);
+            localYamlExampleModifiedContent = localYamlExampleModifiedContent.replace(new RegExp(escapeRegExp(template), 'g'), defaultValue);
           }
         }
+
         // Replacement of the remaining substitution places with what is in the config
         for (const [paramName, value] of Object.entries(config)) {
           const template = `{{${paramName}}}`;
-          if (modifiedContent.includes(template)) {
-            modifiedContent = modifiedContent.replace(new RegExp(escapeRegExp(template), 'g'), value);
+          if (localYamlExampleModifiedContent.includes(template)) {
+            localYamlExampleModifiedContent = localYamlExampleModifiedContent.replace(new RegExp(escapeRegExp(template), 'g'), value);
+          }
+          if (localYamlModifiedContent.includes(template)) {
+            localYamlModifiedContent = localYamlModifiedContent.replace(new RegExp(escapeRegExp(template), 'g'), value);
           }
         }
+        if (!config['consul.agent.reg.host']) {
+          localYamlModifiedContent = localYamlModifiedContent.replace(/(\n +)host: '[^']*'( # The host of the consul agent)/, '$1# host: \'\'$2');
+        }
 
-        const newLocalYamlPath = path.join(targetPath, 'config', '_local.yaml');
-        await fs.writeFile(newLocalYamlPath, modifiedContent, 'utf8');
+        await fs.writeFile(localYamlPath, localYamlModifiedContent, 'utf8');
+        await fs.writeFile(localYamlExamplePath, localYamlExampleModifiedContent, 'utf8');
       } catch (error) {
         console.log('⚠️  Warning: Could not create config/_local.yaml file:', error.message);
       }
     }
     const pathsToRemove = [
-      { rel: 'node_modules' },
-      { rel: 'yarn.lock' },
       { rel: 'package-lock.json' },
     ];
 
@@ -994,7 +1004,9 @@ certificate's public and private keys`,
       process.exit(0);
 
     } catch (error) {
-      console.error('\n❌  Error:', error.message);
+      if (error.message && !(error.stack || '').includes(String(error.message))) {
+        console.error('\n❌  Error:', error.message);
+      }
       console.error(error.stack);
       process.exit(1);
     }

package/cli-template/.env.example

@@ -16,8 +16,8 @@ DEBUG=config-info
 
 ## DEBUG patterns ##
 # AP-UPDATER - consul/access-points-updater
-# af-consul:reg | af-consul:* - consul/cyclic-register
-# af-consul:curl - consul/prepare-consul-api
+# fa-consul:reg | fa-consul:* - consul/cyclic-register
+# fa-consul:curl - consul/prepare-consul-api
 # token:auth
 
 # The address of the mcp server for testing. Default: http://localhost:<config.webServer.port>