@uxmaltech/collab-cli 0.1.7 → 0.1.8

package/dist/commands/init.js

@@ -15,6 +15,7 @@ const compose_renderer_1 = require("../lib/compose-renderer");
 const errors_1 = require("../lib/errors");
 const github_search_1 = require("../lib/github-search");
 const infra_type_1 = require("../lib/infra-type");
+const mcp_contract_1 = require("../lib/mcp-contract");
 const mode_1 = require("../lib/mode");
 const parsers_1 = require("../lib/parsers");
 const orchestrator_1 = require("../lib/orchestrator");
@@ -55,7 +56,7 @@ function inferComposeMode(config) {
     }
     return 'consolidated';
 }
-async function resolveWizardSelection(options, config, logger) {
+async function resolveWizardSelection(options, config, logger, dryRun) {
     const defaults = {
         mode: (0, mode_1.parseMode)(options.mode, config.mode),
         composeMode: parseComposeMode(options.composeMode, inferComposeMode(config)),
@@ -75,6 +76,7 @@ async function resolveWizardSelection(options, config, logger) {
                 throw new errors_1.CliError('--mcp-url is required with --infra-type remote in non-interactive mode.');
             }
             mcpUrl = (0, infra_type_1.validateMcpUrl)(options.mcpUrl);
+            await validateMcpServerContract(mcpUrl, logger, dryRun);
         }
         return {
             mode,
@@ -104,6 +106,7 @@ async function resolveWizardSelection(options, config, logger) {
             const rawUrl = options.mcpUrl
                 ?? await (0, prompt_1.promptText)('MCP server base URL:', 'http://127.0.0.1:7337');
             mcpUrl = (0, infra_type_1.validateMcpUrl)(rawUrl);
+            await validateMcpServerContract(mcpUrl, logger, dryRun);
         }
     }
     // Skip compose-mode prompt when mode is file-only or infra is remote —
@@ -220,6 +223,45 @@ function buildGitHubAuthStage(effectiveConfig, logger, options) {
         },
     };
 }
+// ────────────────────────────────────────────────────────────────
+// MCP contract validation (single-shot probe at URL-entry time)
+// ────────────────────────────────────────────────────────────────
+async function validateMcpServerContract(mcpUrl, logger, dryRun) {
+    const result = await (0, mcp_contract_1.probeMcpContract)(mcpUrl, {
+        contractRange: (0, ecosystem_1.getMcpContractRange)(),
+        dryRun,
+    });
+    if (result.skipped) {
+        logger.info('[dry-run] Skipped MCP contract validation.');
+        return;
+    }
+    if (!result.ok) {
+        throw new errors_1.CliError(result.error ?? `MCP contract validation failed for ${mcpUrl}`);
+    }
+    const health = result.health;
+    logger.step(true, `MCP server reachable at ${mcpUrl}`);
+    logger.info(`Server version: ${health.version}`);
+    logger.info(`Contract version: ${health.contractVersion}`);
+    const deps = Object.entries(health.dependencies)
+        .map(([name, status]) => `${name} (${status})`)
+        .join(', ');
+    if (deps) {
+        logger.info(`Dependencies: ${deps}`);
+    }
+    if (result.contractCompatible === false) {
+        logger.warn(`MCP contract version ${health.contractVersion} may be incompatible ` +
+            `(CLI expects ${(0, ecosystem_1.getMcpContractRange)()}). Some features may not work correctly.`);
+    }
+    const degraded = Object.entries(health.dependencies)
+        .filter(([, status]) => status !== 'up');
+    if (degraded.length > 0) {
+        const names = degraded.map(([name, status]) => `${name} (${status})`).join(', ');
+        logger.warn(`Some MCP dependencies are not fully ready: ${names}`);
+    }
+}
+// ────────────────────────────────────────────────────────────────
+// Business canon helpers
+// ────────────────────────────────────────────────────────────────
 const LOCAL_PATH_RE = /^[/~.]/;
 /**
  * Expands `~`, resolves to absolute, and validates the path is an existing directory.
@@ -685,6 +727,9 @@ async function runInfraOnly(context, options) {
         mcpUrl = options.mcpUrl ? (0, infra_type_1.validateMcpUrl)(options.mcpUrl) : effectiveConfig.mcpUrl;
         effectiveConfig.infraType = infraType;
         effectiveConfig.mcpUrl = mcpUrl;
+        if (mcpUrl) {
+            await validateMcpServerContract(mcpUrl, context.logger, context.executor.dryRun);
+        }
     }
     const composeMode = parseComposeMode(options.composeMode, inferComposeMode(effectiveConfig));
     const infraLabel = infraType === 'remote' ? 'Remote MCP services' : 'Docker + MCP services';
@@ -909,7 +954,7 @@ Examples:
         }
         // ── Step 1: Configuration wizard ────────────────────────
         context.logger.phaseHeader('collab init', 'Configuration');
-        const selections = await resolveWizardSelection(options, context.config, context.logger);
+        const selections = await resolveWizardSelection(options, context.config, context.logger, context.executor.dryRun);
         const preserveExisting = configExistedBefore && !options.force;
         const effectiveConfig = {
             ...(0, config_1.defaultCollabConfig)(context.config.workspaceDir),
@@ -919,6 +964,7 @@ Examples:
             mcpUrl: preserveExisting ? context.config.mcpUrl : selections.mcpUrl,
         };
         // ── Step 2: Business canon configuration ──────────────────
+        context.logger.phaseHeader('collab init', 'Business Canon');
         const canons = await resolveBusinessCanon(options, effectiveConfig, context.logger);
         if (canons) {
             effectiveConfig.canons = canons;

package/dist/lib/ecosystem.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMcpContractRange = getMcpContractRange;
 exports.checkEcosystemCompatibility = checkEcosystemCompatibility;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -31,6 +32,10 @@ function readManifest() {
     }
     return manifest;
 }
+/** Returns the required MCP contract version range from the ecosystem manifest. */
+function getMcpContractRange() {
+    return readManifest().collabArchitectureMcpContractRange;
+}
 function readCliVersion() {
     const packagePath = node_path_1.default.resolve(__dirname, '../../package.json');
     const pkg = readJsonFile(packagePath);

package/dist/lib/github-auth.js

@@ -19,9 +19,9 @@ const node_path_1 = __importDefault(require("node:path"));
 const AUTH_FILENAME = 'github-auth.json';
 /**
  * Client ID for the collab-cli GitHub OAuth App.
- * Override with COLLAB_GITHUB_CLIENT_ID env var until the app is registered.
+ * Override with COLLAB_GITHUB_CLIENT_ID env var for custom OAuth apps.
  */
-const DEFAULT_CLIENT_ID = process.env.COLLAB_GITHUB_CLIENT_ID ?? '';
+const DEFAULT_CLIENT_ID = process.env.COLLAB_GITHUB_CLIENT_ID ?? 'Ov23liocAEoUmWO39r5B';
 const DEVICE_CODE_URL = 'https://github.com/login/device/code';
 const ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
 const SCOPES = 'repo read:org read:project';

package/dist/lib/mcp-contract.js

@@ -0,0 +1,100 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.probeMcpContract = probeMcpContract;
+const semver_1 = __importDefault(require("semver"));
+const DEFAULT_PROBE_TIMEOUT_MS = 5_000;
+/**
+ * Probes the MCP server's /health endpoint once and validates
+ * the response contract structure and version compatibility.
+ *
+ * This is a quick, single-attempt probe — not a retry loop.
+ * Use it immediately after URL entry to give fast feedback.
+ */
+async function probeMcpContract(baseUrl, options = {}) {
+    const timeoutMs = options.timeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS;
+    const contractRange = options.contractRange;
+    const dryRun = options.dryRun ?? false;
+    if (dryRun) {
+        return { ok: true, skipped: true };
+    }
+    const healthUrl = `${baseUrl}/health`;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    let response;
+    try {
+        response = await fetch(healthUrl, {
+            method: 'GET',
+            signal: controller.signal,
+        });
+    }
+    catch (error) {
+        if (error instanceof Error && error.name === 'AbortError') {
+            return {
+                ok: false,
+                skipped: false,
+                error: `MCP server at ${baseUrl} did not respond within ${timeoutMs / 1000}s.`,
+            };
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        return {
+            ok: false,
+            skipped: false,
+            error: `MCP server unreachable at ${baseUrl}: ${message}`,
+        };
+    }
+    finally {
+        clearTimeout(timer);
+    }
+    if (!response.ok) {
+        return {
+            ok: false,
+            skipped: false,
+            error: `MCP server returned HTTP ${response.status} at ${healthUrl}`,
+        };
+    }
+    let body;
+    try {
+        body = await response.json();
+    }
+    catch {
+        return {
+            ok: false,
+            skipped: false,
+            error: `MCP server returned invalid JSON from ${healthUrl}`,
+        };
+    }
+    if (!isValidHealthResponse(body)) {
+        return {
+            ok: false,
+            skipped: false,
+            error: 'MCP /health response has unexpected structure. Expected: { status, version, contractVersion, dependencies }',
+        };
+    }
+    const health = body;
+    let contractCompatible;
+    if (contractRange) {
+        contractCompatible = semver_1.default.satisfies(health.contractVersion, contractRange, {
+            includePrerelease: true,
+        });
+    }
+    return {
+        ok: true,
+        skipped: false,
+        health,
+        contractCompatible,
+    };
+}
+/** Type guard for the expected /health response shape. */
+function isValidHealthResponse(body) {
+    if (typeof body !== 'object' || body === null)
+        return false;
+    const obj = body;
+    return (typeof obj.status === 'string' &&
+        typeof obj.version === 'string' &&
+        typeof obj.contractVersion === 'string' &&
+        typeof obj.dependencies === 'object' &&
+        obj.dependencies !== null);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxmaltech/collab-cli",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "CLI for collaborative architecture and delivery workflows.",
   "private": false,
   "license": "UNLICENSED",