sentinelayer-cli 0.1.2 → 0.4.4

package/src/commands/mcp.js

@@ -1,404 +1,461 @@
-import path from "node:path";
-import process from "node:process";
-
-import pc from "picocolors";
-import { ZodError } from "zod";
-
-import {
-  buildAidenIdProvisioningAdapterTemplate,
-  buildAidenIdRegistryTemplate,
-  buildMcpToolRegistrySchema,
-  buildMcpServerConfigTemplate,
-  buildVsCodeMcpBridgeTemplate,
-  readJsonFile,
-  resolveDefaultAidenIdAdapterContractPath,
-  resolveDefaultMcpOutputPath,
-  resolveDefaultMcpServerConfigPath,
-  resolveDefaultVsCodeBridgePath,
-  validateAidenIdAdapterContract,
-  stringifyJson,
-  validateMcpServerConfig,
-  validateMcpToolRegistry,
-  writeJsonFile,
-} from "../mcp/registry.js";
-
-function shouldEmitJson(options, command) {
-  const local = Boolean(options && options.json);
-  const globalFromCommand =
-    command && command.optsWithGlobals ? Boolean(command.optsWithGlobals().json) : false;
-  return local || globalFromCommand;
-}
-
-function normalizeOutputPath(rawValue, fallbackPath) {
-  const candidate = String(rawValue || "").trim();
-  if (!candidate) {
-    return fallbackPath;
-  }
-  return path.resolve(process.cwd(), candidate);
-}
-
-function zodIssueSummary(error) {
-  if (!(error instanceof ZodError)) {
-    return String(error instanceof Error ? error.message : error);
-  }
-  return error.issues
-    .slice(0, 10)
-    .map((issue) => `${issue.path.join(".") || "<root>"}: ${issue.message}`)
-    .join("; ");
-}
-
-export function registerMcpCommand(program) {
-  const mcp = program.command("mcp").description("Manage Sentinelayer MCP registry schemas and adapters");
-
-  const schema = mcp.command("schema").description("Inspect or materialize MCP tool-registry schema");
-  schema
-    .command("show")
-    .description("Print the canonical MCP tool registry JSON schema")
-    .option("--json", "Emit machine-readable output")
-    .action((options, command) => {
-      const schemaPayload = buildMcpToolRegistrySchema();
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify({ command: "mcp schema show", schema: schemaPayload }, null, 2));
-        return;
-      }
-      console.log(stringifyJson(schemaPayload));
-    });
-
-  schema
-    .command("write")
-    .description("Write the canonical MCP tool registry JSON schema to disk")
-    .option("--path <path>", "Destination file path override")
-    .option("--output-dir <path>", "Optional artifact output root override")
-    .option("--force", "Overwrite destination file if it already exists")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const defaultPath = await resolveDefaultMcpOutputPath({
-        cwd: process.cwd(),
-        outputDir: options.outputDir,
-        env: process.env,
-      });
-      const outputPath = normalizeOutputPath(options.path, defaultPath);
-      const schemaPayload = buildMcpToolRegistrySchema();
-      const writtenPath = await writeJsonFile(outputPath, schemaPayload, { force: Boolean(options.force) });
-
-      const payload = {
-        command: "mcp schema write",
-        outputPath: writtenPath,
-      };
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`Wrote MCP schema: ${writtenPath}`));
-    });
-
-  const registry = mcp.command("registry").description("Manage MCP tool registry payloads");
-
-  registry
-    .command("init-aidenid")
-    .description("Write an AIdenID provisioning adapter template registry")
-    .option("--path <path>", "Destination file path override")
-    .option("--output-dir <path>", "Optional artifact output root override")
-    .option("--force", "Overwrite destination file if it already exists")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const defaultPath = await resolveDefaultMcpOutputPath({
-        cwd: process.cwd(),
-        outputDir: options.outputDir,
-        env: process.env,
-      });
-      const outputPath = normalizeOutputPath(options.path, defaultPath.replace(".schema", ".aidenid-template"));
-      const template = buildAidenIdRegistryTemplate();
-      validateMcpToolRegistry(template);
-      const writtenPath = await writeJsonFile(outputPath, template, { force: Boolean(options.force) });
-      const payload = {
-        command: "mcp registry init-aidenid",
-        outputPath: writtenPath,
-        toolCount: template.tools.length,
-      };
-
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`Wrote AIdenID MCP registry template: ${writtenPath}`));
-      console.log(pc.gray("Next: customize transport.url/auth and validate before runtime use."));
-    });
-
-  registry
-    .command("init-aidenid-adapter")
-    .description("Write an AIdenID provisioning adapter contract bound to the MCP registry template")
-    .option(
-      "--registry-file <path>",
-      "Registry file path referenced by adapter contract",
-      ".sentinelayer/mcp/tool-registry.aidenid-template.json"
-    )
-    .option("--path <path>", "Destination file path override")
-    .option("--output-dir <path>", "Optional artifact output root override")
-    .option("--force", "Overwrite destination file if it already exists")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const defaultPath = await resolveDefaultAidenIdAdapterContractPath({
-        cwd: process.cwd(),
-        outputDir: options.outputDir,
-        env: process.env,
-      });
-      const outputPath = normalizeOutputPath(options.path, defaultPath);
-      const template = buildAidenIdProvisioningAdapterTemplate({
-        registryFile: options.registryFile,
-      });
-      validateAidenIdAdapterContract(template);
-      const writtenPath = await writeJsonFile(outputPath, template, { force: Boolean(options.force) });
-      const payload = {
-        command: "mcp registry init-aidenid-adapter",
-        outputPath: writtenPath,
-        bindingCount: template.tool_bindings.length,
-      };
-
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`Wrote AIdenID adapter contract template: ${writtenPath}`));
-      console.log(pc.gray("Next: validate with registry cross-check before runtime wiring."));
-    });
-
-  registry
-    .command("validate")
-    .description("Validate an MCP tool registry JSON payload against Sentinelayer contract")
-    .requiredOption("--file <path>", "Registry JSON file to validate")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const inputPath = path.resolve(process.cwd(), String(options.file || "").trim());
-      const loaded = await readJsonFile(inputPath);
-      let toolNames = [];
-      try {
-        const parsed = validateMcpToolRegistry(loaded.data);
-        toolNames = parsed.tools.map((tool) => tool.name);
-      } catch (error) {
-        const payload = {
-          command: "mcp registry validate",
-          valid: false,
-          filePath: loaded.path,
-          error: zodIssueSummary(error),
-        };
-        if (shouldEmitJson(options, command)) {
-          console.log(JSON.stringify(payload, null, 2));
-        } else {
-          console.log(pc.red(`Registry invalid: ${payload.error}`));
-          console.log(pc.gray(`File: ${loaded.path}`));
-        }
-        process.exitCode = 2;
-        return;
-      }
-
-      const payload = {
-        command: "mcp registry validate",
-        valid: true,
-        filePath: loaded.path,
-        toolCount: toolNames.length,
-        tools: toolNames,
-      };
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`Registry valid (${toolNames.length} tools)`));
-      console.log(pc.gray(`File: ${loaded.path}`));
-      for (const name of toolNames) {
-        console.log(`- ${name}`);
-      }
-    });
-
-  registry
-    .command("validate-aidenid-adapter")
-    .description(
-      "Validate an AIdenID adapter contract and optionally cross-check tool bindings against an MCP registry file"
-    )
-    .requiredOption("--file <path>", "AIdenID adapter contract JSON file to validate")
-    .option("--registry-file <path>", "Optional MCP registry JSON file for tool binding cross-check")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const inputPath = path.resolve(process.cwd(), String(options.file || "").trim());
-      const loaded = await readJsonFile(inputPath);
-      const registryFile = String(options.registryFile || "").trim();
-      const loadedRegistry = registryFile
-        ? await readJsonFile(path.resolve(process.cwd(), registryFile))
-        : null;
-
-      let parsed;
-      try {
-        parsed = validateAidenIdAdapterContract(loaded.data, {
-          registryPayload: loadedRegistry ? loadedRegistry.data : undefined,
-        });
-      } catch (error) {
-        const payload = {
-          command: "mcp registry validate-aidenid-adapter",
-          valid: false,
-          filePath: loaded.path,
-          registryFilePath: loadedRegistry ? loadedRegistry.path : null,
-          error: zodIssueSummary(error),
-        };
-        if (shouldEmitJson(options, command)) {
-          console.log(JSON.stringify(payload, null, 2));
-        } else {
-          console.log(pc.red(`AIdenID adapter contract invalid: ${payload.error}`));
-          console.log(pc.gray(`File: ${loaded.path}`));
-          if (payload.registryFilePath) {
-            console.log(pc.gray(`Registry: ${payload.registryFilePath}`));
-          }
-        }
-        process.exitCode = 2;
-        return;
-      }
-
-      const payload = {
-        command: "mcp registry validate-aidenid-adapter",
-        valid: true,
-        filePath: loaded.path,
-        registryFilePath: loadedRegistry ? loadedRegistry.path : null,
-        provider: parsed.provider,
-        bindingCount: parsed.tool_bindings.length,
-        tools: parsed.tool_bindings.map((binding) => binding.tool_name),
-      };
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`AIdenID adapter contract valid (${parsed.tool_bindings.length} bindings)`));
-      console.log(pc.gray(`File: ${loaded.path}`));
-      if (payload.registryFilePath) {
-        console.log(pc.gray(`Registry cross-check: ${payload.registryFilePath}`));
-      }
-      for (const toolName of payload.tools) {
-        console.log(`- ${toolName}`);
-      }
-    });
-
-  const server = mcp.command("server").description("Manage MCP server runtime configuration");
-
-  server
-    .command("init")
-    .description("Write a deterministic MCP server configuration scaffold")
-    .requiredOption("--id <server-id>", "Server id (lowercase)")
-    .option(
-      "--registry-file <path>",
-      "Registry file path referenced by server config",
-      ".sentinelayer/mcp/tool-registry.aidenid-template.json"
-    )
-    .option("--path <path>", "Destination file path override")
-    .option("--output-dir <path>", "Optional artifact output root override")
-    .option("--force", "Overwrite destination file if it already exists")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const serverId = String(options.id || "")
-        .trim()
-        .toLowerCase();
-      const defaultPath = await resolveDefaultMcpServerConfigPath({
-        cwd: process.cwd(),
-        outputDir: options.outputDir,
-        env: process.env,
-        serverId,
-      });
-      const outputPath = normalizeOutputPath(options.path, defaultPath);
-      const template = buildMcpServerConfigTemplate({
-        serverId,
-        registryFile: options.registryFile,
-      });
-      const config = validateMcpServerConfig(template);
-      const writtenPath = await writeJsonFile(outputPath, config, { force: Boolean(options.force) });
-
-      const payload = {
-        command: "mcp server init",
-        serverId: config.server_id,
-        outputPath: writtenPath,
-        registryFile: config.registry_file,
-      };
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`Wrote MCP server config: ${writtenPath}`));
-      console.log(pc.gray(`server_id: ${config.server_id}`));
-    });
-
-  server
-    .command("validate")
-    .description("Validate an MCP server config payload")
-    .requiredOption("--file <path>", "Server config JSON to validate")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const inputPath = path.resolve(process.cwd(), String(options.file || "").trim());
-      const loaded = await readJsonFile(inputPath);
-      let parsed;
-      try {
-        parsed = validateMcpServerConfig(loaded.data);
-      } catch (error) {
-        const payload = {
-          command: "mcp server validate",
-          valid: false,
-          filePath: loaded.path,
-          error: zodIssueSummary(error),
-        };
-        if (shouldEmitJson(options, command)) {
-          console.log(JSON.stringify(payload, null, 2));
-        } else {
-          console.log(pc.red(`Server config invalid: ${payload.error}`));
-          console.log(pc.gray(`File: ${loaded.path}`));
-        }
-        process.exitCode = 2;
-        return;
-      }
-
-      const payload = {
-        command: "mcp server validate",
-        valid: true,
-        filePath: loaded.path,
-        serverId: parsed.server_id,
-        transportMode: parsed.transport.mode,
-      };
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`Server config valid (${parsed.server_id})`));
-      console.log(pc.gray(`File: ${loaded.path}`));
-    });
-
-  const bridge = mcp.command("bridge").description("Generate MCP bridge configuration wrappers");
-
-  bridge
-    .command("init-vscode")
-    .description("Write a VS Code MCP bridge config bound to a server config file")
-    .requiredOption("--server-id <server-id>", "Server id to register")
-    .requiredOption("--server-config <path>", "Path to MCP server config file")
-    .option("--path <path>", "Destination VS Code config path override")
-    .option("--force", "Overwrite destination file if it already exists")
-    .option("--json", "Emit machine-readable output")
-    .action(async (options, command) => {
-      const serverId = String(options.serverId || "")
-        .trim()
-        .toLowerCase();
-      const outputPath = normalizeOutputPath(
-        options.path,
-        resolveDefaultVsCodeBridgePath({ cwd: process.cwd() })
-      );
-      const bridgePayload = buildVsCodeMcpBridgeTemplate({
-        serverId,
-        serverConfigFile: String(options.serverConfig || "").trim(),
-      });
-      const writtenPath = await writeJsonFile(outputPath, bridgePayload, { force: Boolean(options.force) });
-
-      const payload = {
-        command: "mcp bridge init-vscode",
-        serverId,
-        serverConfig: String(options.serverConfig || "").trim(),
-        outputPath: writtenPath,
-      };
-      if (shouldEmitJson(options, command)) {
-        console.log(JSON.stringify(payload, null, 2));
-        return;
-      }
-      console.log(pc.green(`Wrote VS Code MCP bridge config: ${writtenPath}`));
-    });
-}
+import path from "node:path";
+import process from "node:process";
+
+import pc from "picocolors";
+import { ZodError } from "zod";
+
+import fs from "node:fs/promises";
+
+import {
+  buildAidenIdProvisioningAdapterTemplate,
+  buildAidenIdRegistryTemplate,
+  buildMcpToolRegistrySchema,
+  buildMcpServerConfigTemplate,
+  buildVsCodeMcpBridgeTemplate,
+  readJsonFile,
+  resolveDefaultAidenIdAdapterContractPath,
+  resolveDefaultMcpOutputPath,
+  resolveDefaultMcpServerConfigPath,
+  resolveDefaultVsCodeBridgePath,
+  validateAidenIdAdapterContract,
+  stringifyJson,
+  validateMcpServerConfig,
+  validateMcpToolRegistry,
+  writeJsonFile,
+} from "../mcp/registry.js";
+import { resolveOutputRoot } from "../config/service.js";
+
+function shouldEmitJson(options, command) {
+  const local = Boolean(options && options.json);
+  const globalFromCommand =
+    command && command.optsWithGlobals ? Boolean(command.optsWithGlobals().json) : false;
+  return local || globalFromCommand;
+}
+
+function normalizeOutputPath(rawValue, fallbackPath) {
+  const candidate = String(rawValue || "").trim();
+  if (!candidate) {
+    return fallbackPath;
+  }
+  return path.resolve(process.cwd(), candidate);
+}
+
+function zodIssueSummary(error) {
+  if (!(error instanceof ZodError)) {
+    return String(error instanceof Error ? error.message : error);
+  }
+  return error.issues
+    .slice(0, 10)
+    .map((issue) => `${issue.path.join(".") || "<root>"}: ${issue.message}`)
+    .join("; ");
+}
+
+export function registerMcpCommand(program) {
+  const mcp = program.command("mcp").description("Manage Sentinelayer MCP registry schemas and adapters");
+
+  mcp
+    .command("list")
+    .description("List all known MCP registries, adapters, and server configs in this workspace")
+    .option("--path <path>", "Workspace path", ".")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const emitJson = shouldEmitJson(options, command);
+      const targetPath = path.resolve(process.cwd(), String(options.path || "."));
+      const outputRoot = await resolveOutputRoot({
+        cwd: targetPath,
+        outputDirOverride: undefined,
+        env: process.env,
+      });
+      const mcpDir = path.join(outputRoot, "mcp");
+
+      const entries = [];
+      try {
+        const files = await fs.readdir(mcpDir);
+        for (const file of files) {
+          if (!file.endsWith(".json")) continue;
+          try {
+            const content = JSON.parse(await fs.readFile(path.join(mcpDir, file), "utf-8"));
+            entries.push({
+              file,
+              path: path.join(mcpDir, file),
+              type: content.schemaVersion ? "registry" : content.transport ? "adapter" : content.command ? "server" : "unknown",
+              toolCount: Array.isArray(content.tools) ? content.tools.length : 0,
+              name: content.name || content.registryName || file,
+            });
+          } catch {
+            entries.push({ file, path: path.join(mcpDir, file), type: "invalid", toolCount: 0, name: file });
+          }
+        }
+      } catch {
+        /* mcp directory does not exist — empty listing */
+      }
+
+      const result = { command: "mcp list", mcpDir, entries };
+      if (emitJson) {
+        console.log(JSON.stringify(result, null, 2));
+        return;
+      }
+
+      console.log(pc.bold("MCP Registries & Adapters"));
+      console.log(pc.gray(`Directory: ${mcpDir}`));
+      if (entries.length === 0) {
+        console.log(pc.gray("No MCP artifacts found. Run 'sl mcp schema write' or 'sl mcp registry init-aidenid' to create one."));
+        return;
+      }
+      for (const entry of entries) {
+        console.log(`- ${entry.name} [${entry.type}] (${entry.toolCount} tools) — ${entry.path}`);
+      }
+    });
+
+  const schema = mcp.command("schema").description("Inspect or materialize MCP tool-registry schema");
+  schema
+    .command("show")
+    .description("Print the canonical MCP tool registry JSON schema")
+    .option("--json", "Emit machine-readable output")
+    .action((options, command) => {
+      const schemaPayload = buildMcpToolRegistrySchema();
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify({ command: "mcp schema show", schema: schemaPayload }, null, 2));
+        return;
+      }
+      console.log(stringifyJson(schemaPayload));
+    });
+
+  schema
+    .command("write")
+    .description("Write the canonical MCP tool registry JSON schema to disk")
+    .option("--path <path>", "Destination file path override")
+    .option("--output-dir <path>", "Optional artifact output root override")
+    .option("--force", "Overwrite destination file if it already exists")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const defaultPath = await resolveDefaultMcpOutputPath({
+        cwd: process.cwd(),
+        outputDir: options.outputDir,
+        env: process.env,
+      });
+      const outputPath = normalizeOutputPath(options.path, defaultPath);
+      const schemaPayload = buildMcpToolRegistrySchema();
+      const writtenPath = await writeJsonFile(outputPath, schemaPayload, { force: Boolean(options.force) });
+
+      const payload = {
+        command: "mcp schema write",
+        outputPath: writtenPath,
+      };
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`Wrote MCP schema: ${writtenPath}`));
+    });
+
+  const registry = mcp.command("registry").description("Manage MCP tool registry payloads");
+
+  registry
+    .command("init-aidenid")
+    .description("Write an AIdenID provisioning adapter template registry")
+    .option("--path <path>", "Destination file path override")
+    .option("--output-dir <path>", "Optional artifact output root override")
+    .option("--force", "Overwrite destination file if it already exists")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const defaultPath = await resolveDefaultMcpOutputPath({
+        cwd: process.cwd(),
+        outputDir: options.outputDir,
+        env: process.env,
+      });
+      const outputPath = normalizeOutputPath(options.path, defaultPath.replace(".schema", ".aidenid-template"));
+      const template = buildAidenIdRegistryTemplate();
+      validateMcpToolRegistry(template);
+      const writtenPath = await writeJsonFile(outputPath, template, { force: Boolean(options.force) });
+      const payload = {
+        command: "mcp registry init-aidenid",
+        outputPath: writtenPath,
+        toolCount: template.tools.length,
+      };
+
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`Wrote AIdenID MCP registry template: ${writtenPath}`));
+      console.log(pc.gray("Next: customize transport.url/auth and validate before runtime use."));
+    });
+
+  registry
+    .command("init-aidenid-adapter")
+    .description("Write an AIdenID provisioning adapter contract bound to the MCP registry template")
+    .option(
+      "--registry-file <path>",
+      "Registry file path referenced by adapter contract",
+      ".sentinelayer/mcp/tool-registry.aidenid-template.json"
+    )
+    .option("--path <path>", "Destination file path override")
+    .option("--output-dir <path>", "Optional artifact output root override")
+    .option("--force", "Overwrite destination file if it already exists")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const defaultPath = await resolveDefaultAidenIdAdapterContractPath({
+        cwd: process.cwd(),
+        outputDir: options.outputDir,
+        env: process.env,
+      });
+      const outputPath = normalizeOutputPath(options.path, defaultPath);
+      const template = buildAidenIdProvisioningAdapterTemplate({
+        registryFile: options.registryFile,
+      });
+      validateAidenIdAdapterContract(template);
+      const writtenPath = await writeJsonFile(outputPath, template, { force: Boolean(options.force) });
+      const payload = {
+        command: "mcp registry init-aidenid-adapter",
+        outputPath: writtenPath,
+        bindingCount: template.tool_bindings.length,
+      };
+
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`Wrote AIdenID adapter contract template: ${writtenPath}`));
+      console.log(pc.gray("Next: validate with registry cross-check before runtime wiring."));
+    });
+
+  registry
+    .command("validate")
+    .description("Validate an MCP tool registry JSON payload against Sentinelayer contract")
+    .requiredOption("--file <path>", "Registry JSON file to validate")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const inputPath = path.resolve(process.cwd(), String(options.file || "").trim());
+      const loaded = await readJsonFile(inputPath);
+      let toolNames = [];
+      try {
+        const parsed = validateMcpToolRegistry(loaded.data);
+        toolNames = parsed.tools.map((tool) => tool.name);
+      } catch (error) {
+        const payload = {
+          command: "mcp registry validate",
+          valid: false,
+          filePath: loaded.path,
+          error: zodIssueSummary(error),
+        };
+        if (shouldEmitJson(options, command)) {
+          console.log(JSON.stringify(payload, null, 2));
+        } else {
+          console.log(pc.red(`Registry invalid: ${payload.error}`));
+          console.log(pc.gray(`File: ${loaded.path}`));
+        }
+        process.exitCode = 2;
+        return;
+      }
+
+      const payload = {
+        command: "mcp registry validate",
+        valid: true,
+        filePath: loaded.path,
+        toolCount: toolNames.length,
+        tools: toolNames,
+      };
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`Registry valid (${toolNames.length} tools)`));
+      console.log(pc.gray(`File: ${loaded.path}`));
+      for (const name of toolNames) {
+        console.log(`- ${name}`);
+      }
+    });
+
+  registry
+    .command("validate-aidenid-adapter")
+    .description(
+      "Validate an AIdenID adapter contract and optionally cross-check tool bindings against an MCP registry file"
+    )
+    .requiredOption("--file <path>", "AIdenID adapter contract JSON file to validate")
+    .option("--registry-file <path>", "Optional MCP registry JSON file for tool binding cross-check")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const inputPath = path.resolve(process.cwd(), String(options.file || "").trim());
+      const loaded = await readJsonFile(inputPath);
+      const registryFile = String(options.registryFile || "").trim();
+      const loadedRegistry = registryFile
+        ? await readJsonFile(path.resolve(process.cwd(), registryFile))
+        : null;
+
+      let parsed;
+      try {
+        parsed = validateAidenIdAdapterContract(loaded.data, {
+          registryPayload: loadedRegistry ? loadedRegistry.data : undefined,
+        });
+      } catch (error) {
+        const payload = {
+          command: "mcp registry validate-aidenid-adapter",
+          valid: false,
+          filePath: loaded.path,
+          registryFilePath: loadedRegistry ? loadedRegistry.path : null,
+          error: zodIssueSummary(error),
+        };
+        if (shouldEmitJson(options, command)) {
+          console.log(JSON.stringify(payload, null, 2));
+        } else {
+          console.log(pc.red(`AIdenID adapter contract invalid: ${payload.error}`));
+          console.log(pc.gray(`File: ${loaded.path}`));
+          if (payload.registryFilePath) {
+            console.log(pc.gray(`Registry: ${payload.registryFilePath}`));
+          }
+        }
+        process.exitCode = 2;
+        return;
+      }
+
+      const payload = {
+        command: "mcp registry validate-aidenid-adapter",
+        valid: true,
+        filePath: loaded.path,
+        registryFilePath: loadedRegistry ? loadedRegistry.path : null,
+        provider: parsed.provider,
+        bindingCount: parsed.tool_bindings.length,
+        tools: parsed.tool_bindings.map((binding) => binding.tool_name),
+      };
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`AIdenID adapter contract valid (${parsed.tool_bindings.length} bindings)`));
+      console.log(pc.gray(`File: ${loaded.path}`));
+      if (payload.registryFilePath) {
+        console.log(pc.gray(`Registry cross-check: ${payload.registryFilePath}`));
+      }
+      for (const toolName of payload.tools) {
+        console.log(`- ${toolName}`);
+      }
+    });
+
+  const server = mcp.command("server").description("Manage MCP server runtime configuration");
+
+  server
+    .command("init")
+    .description("Write a deterministic MCP server configuration scaffold")
+    .requiredOption("--id <server-id>", "Server id (lowercase)")
+    .option(
+      "--registry-file <path>",
+      "Registry file path referenced by server config",
+      ".sentinelayer/mcp/tool-registry.aidenid-template.json"
+    )
+    .option("--path <path>", "Destination file path override")
+    .option("--output-dir <path>", "Optional artifact output root override")
+    .option("--force", "Overwrite destination file if it already exists")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const serverId = String(options.id || "")
+        .trim()
+        .toLowerCase();
+      const defaultPath = await resolveDefaultMcpServerConfigPath({
+        cwd: process.cwd(),
+        outputDir: options.outputDir,
+        env: process.env,
+        serverId,
+      });
+      const outputPath = normalizeOutputPath(options.path, defaultPath);
+      const template = buildMcpServerConfigTemplate({
+        serverId,
+        registryFile: options.registryFile,
+      });
+      const config = validateMcpServerConfig(template);
+      const writtenPath = await writeJsonFile(outputPath, config, { force: Boolean(options.force) });
+
+      const payload = {
+        command: "mcp server init",
+        serverId: config.server_id,
+        outputPath: writtenPath,
+        registryFile: config.registry_file,
+      };
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`Wrote MCP server config: ${writtenPath}`));
+      console.log(pc.gray(`server_id: ${config.server_id}`));
+    });
+
+  server
+    .command("validate")
+    .description("Validate an MCP server config payload")
+    .requiredOption("--file <path>", "Server config JSON to validate")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const inputPath = path.resolve(process.cwd(), String(options.file || "").trim());
+      const loaded = await readJsonFile(inputPath);
+      let parsed;
+      try {
+        parsed = validateMcpServerConfig(loaded.data);
+      } catch (error) {
+        const payload = {
+          command: "mcp server validate",
+          valid: false,
+          filePath: loaded.path,
+          error: zodIssueSummary(error),
+        };
+        if (shouldEmitJson(options, command)) {
+          console.log(JSON.stringify(payload, null, 2));
+        } else {
+          console.log(pc.red(`Server config invalid: ${payload.error}`));
+          console.log(pc.gray(`File: ${loaded.path}`));
+        }
+        process.exitCode = 2;
+        return;
+      }
+
+      const payload = {
+        command: "mcp server validate",
+        valid: true,
+        filePath: loaded.path,
+        serverId: parsed.server_id,
+        transportMode: parsed.transport.mode,
+      };
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`Server config valid (${parsed.server_id})`));
+      console.log(pc.gray(`File: ${loaded.path}`));
+    });
+
+  const bridge = mcp.command("bridge").description("Generate MCP bridge configuration wrappers");
+
+  bridge
+    .command("init-vscode")
+    .description("Write a VS Code MCP bridge config bound to a server config file")
+    .requiredOption("--server-id <server-id>", "Server id to register")
+    .requiredOption("--server-config <path>", "Path to MCP server config file")
+    .option("--path <path>", "Destination VS Code config path override")
+    .option("--force", "Overwrite destination file if it already exists")
+    .option("--json", "Emit machine-readable output")
+    .action(async (options, command) => {
+      const serverId = String(options.serverId || "")
+        .trim()
+        .toLowerCase();
+      const outputPath = normalizeOutputPath(
+        options.path,
+        resolveDefaultVsCodeBridgePath({ cwd: process.cwd() })
+      );
+      const bridgePayload = buildVsCodeMcpBridgeTemplate({
+        serverId,
+        serverConfigFile: String(options.serverConfig || "").trim(),
+      });
+      const writtenPath = await writeJsonFile(outputPath, bridgePayload, { force: Boolean(options.force) });
+
+      const payload = {
+        command: "mcp bridge init-vscode",
+        serverId,
+        serverConfig: String(options.serverConfig || "").trim(),
+        outputPath: writtenPath,
+      };
+      if (shouldEmitJson(options, command)) {
+        console.log(JSON.stringify(payload, null, 2));
+        return;
+      }
+      console.log(pc.green(`Wrote VS Code MCP bridge config: ${writtenPath}`));
+    });
+}