@danielblomma/cortex-mcp 1.3.0 → 1.3.2

package/bin/cortex.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import fs from "node:fs";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { spawn } from "node:child_process";
 import { normalizeProjectRoot } from "./wsl.mjs";
 
@@ -490,6 +490,78 @@ function canAutoInitialize(targetDir) {
   return scaffoldPaths.every((entryPath) => !fs.existsSync(entryPath));
 }
 
+function isScaffoldOutOfDate(targetDir) {
+  const contextScript = path.join(targetDir, "scripts", "context.sh");
+  if (!fs.existsSync(contextScript)) {
+    return false;
+  }
+  const doctorScript = path.join(targetDir, "scripts", "doctor.sh");
+  if (!fs.existsSync(doctorScript)) {
+    return true;
+  }
+  const mcpPackage = path.join(targetDir, "mcp", "package.json");
+  if (!fs.existsSync(mcpPackage)) {
+    return true;
+  }
+  try {
+    const contents = fs.readFileSync(contextScript, "utf8");
+    if (!/\bdoctor\)\s*\n/.test(contents)) {
+      return true;
+    }
+  } catch {
+    return true;
+  }
+  return false;
+}
+
+async function confirmPrompt(message) {
+  const { createInterface } = await import("node:readline/promises");
+  const rl = createInterface({ input: process.stdin, output: process.stderr });
+  try {
+    const answer = (await rl.question(message)).trim().toLowerCase();
+    return answer === "y" || answer === "yes";
+  } finally {
+    rl.close();
+  }
+}
+
+async function maybeMigrateScaffold(targetDir, command) {
+  if (!isScaffoldOutOfDate(targetDir)) {
+    return;
+  }
+
+  const autoYes = isTruthyEnv(process.env.CORTEX_AUTO_MIGRATE);
+  const interactive = Boolean(process.stdin.isTTY && process.stderr.isTTY);
+
+  console.error(
+    `[cortex] scaffold in ${targetDir} is out of date ` +
+      `(missing scripts/doctor.sh, mcp/package.json, or doctor subcommand in context.sh).`
+  );
+
+  let proceed = autoYes;
+  if (!autoYes) {
+    if (!interactive) {
+      throw new Error(
+        `Cortex CLI ${process.env.CORTEX_CLI_VERSION ?? ""} needs an updated scaffold to run '${command}'. ` +
+          `Run 'cortex init --bootstrap' to upgrade, or re-run with CORTEX_AUTO_MIGRATE=true.`
+      );
+    }
+    proceed = await confirmPrompt("[cortex] Upgrade scaffold now (runs 'cortex init --bootstrap')? [y/N] ");
+  }
+
+  if (!proceed) {
+    throw new Error("Scaffold upgrade declined. Run 'cortex init --bootstrap' manually to continue.");
+  }
+
+  console.error(`[cortex] migrating scaffold in ${targetDir}`);
+  ensureScaffoldExists();
+  installScaffold(targetDir, true);
+  installAssistantHelpers(targetDir);
+  await maybeInstallGitHooks(targetDir);
+  await runContextCommand(targetDir, ["bootstrap"]);
+  console.error(`[cortex] scaffold upgraded; continuing with '${command}'`);
+}
+
 async function ensureProjectInitializedForMcp(targetDir) {
   const mcpPackageJson = path.join(targetDir, "mcp", "package.json");
   const serverEntry = path.join(targetDir, "mcp", "dist", "server.js");
@@ -498,6 +570,13 @@ async function ensureProjectInitializedForMcp(targetDir) {
     return;
   }
 
+  if (isScaffoldOutOfDate(targetDir)) {
+    await maybeMigrateScaffold(targetDir, "mcp");
+    if (fs.existsSync(mcpPackageJson) && fs.existsSync(serverEntry)) {
+      return;
+    }
+  }
+
   if (!isTruthyEnv(process.env.CORTEX_AUTO_BOOTSTRAP_ON_MCP)) {
     ensureProjectInitialized(targetDir);
     return;
@@ -651,10 +730,18 @@ async function run() {
     throw new Error(`Unknown command: ${command}`);
   }
 
+  await maybeMigrateScaffold(process.cwd(), command);
   await runContextCommand(process.cwd(), [command, ...rest]);
 }
 
-run().catch((error) => {
-  process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
-  process.exit(1);
-});
+const invokedAsScript =
+  process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href;
+
+if (invokedAsScript) {
+  run().catch((error) => {
+    process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+    process.exit(1);
+  });
+}
+
+export { isScaffoldOutOfDate };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielblomma/cortex-mcp",
   "mcpName": "io.github.DanielBlomma/cortex",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Local, repo-scoped context platform for coding assistants. Semantic search, graph relationships, and architectural rule context.",
   "type": "module",
   "author": "Daniel Blomma",

package/scaffold/scripts/doctor.sh

@@ -221,19 +221,59 @@ if [[ -n "$ENTERPRISE_CONFIG" ]]; then
     console.log(fields["policy.endpoint"] || "");
   ' "$ENTERPRISE_CONFIG" 2>/dev/null || echo "")
 
+  TELEMETRY_API_KEY=$(node -e '
+    const fs = require("node:fs");
+    const raw = fs.readFileSync(process.argv[1], "utf8");
+    let section = "", fields = {};
+    for (const line of raw.split("\n")) {
+      const t = line.trimEnd();
+      if (!t || t.startsWith("#")) continue;
+      const sm = t.match(/^(\w+):\s*$/);
+      if (sm) { section = sm[1]; continue; }
+      const kv = t.match(/^\s+(\w+):\s*(.+?)\s*$/);
+      if (kv && section) fields[section + "." + kv[1]] = kv[2].replace(/^["\x27]|["\x27]$/g, "");
+    }
+    console.log(fields["telemetry.api_key"] || "");
+  ' "$ENTERPRISE_CONFIG" 2>/dev/null || echo "")
+
+  POLICY_API_KEY=$(node -e '
+    const fs = require("node:fs");
+    const raw = fs.readFileSync(process.argv[1], "utf8");
+    let section = "", fields = {};
+    for (const line of raw.split("\n")) {
+      const t = line.trimEnd();
+      if (!t || t.startsWith("#")) continue;
+      const sm = t.match(/^(\w+):\s*$/);
+      if (sm) { section = sm[1]; continue; }
+      const kv = t.match(/^\s+(\w+):\s*(.+?)\s*$/);
+      if (kv && section) fields[section + "." + kv[1]] = kv[2].replace(/^["\x27]|["\x27]$/g, "");
+    }
+    console.log(fields["policy.api_key"] || "");
+  ' "$ENTERPRISE_CONFIG" 2>/dev/null || echo "")
+
   # Telemetry
   if [[ -n "$TELEMETRY_ENDPOINT" ]]; then
     pass "Telemetry: endpoint configured"
-    HTTP_CODE=$(curl -so /dev/null -w '%{http_code}' --max-time 5 -X POST \
-      -H "Content-Type: application/json" \
-      -d '{}' \
-      "$TELEMETRY_ENDPOINT" 2>/dev/null | tail -c 3 || echo "000")
+    TELEMETRY_CURL_ARGS=(-so /dev/null -w '%{http_code}' --max-time 5 -X POST \
+      -H "Content-Type: application/json" -d '{}')
+    if [[ -n "$TELEMETRY_API_KEY" ]]; then
+      TELEMETRY_CURL_ARGS+=(-H "Authorization: Bearer ${TELEMETRY_API_KEY}")
+    fi
+    HTTP_CODE=$(curl "${TELEMETRY_CURL_ARGS[@]}" "$TELEMETRY_ENDPOINT" 2>/dev/null | tail -c 3 || echo "000")
     if [[ "$HTTP_CODE" == "000" ]]; then
       fail "Telemetry: endpoint not reachable (timeout/DNS)"
     elif [[ "$HTTP_CODE" =~ ^[23] ]]; then
-      pass "Telemetry: endpoint reachable (HTTP ${HTTP_CODE})"
-    elif [[ "$HTTP_CODE" == "401" ]]; then
-      pass "Telemetry: endpoint reachable (auth required — expected)"
+      if [[ -n "$TELEMETRY_API_KEY" ]]; then
+        pass "Telemetry: endpoint authenticated (HTTP ${HTTP_CODE})"
+      else
+        pass "Telemetry: endpoint reachable (HTTP ${HTTP_CODE})"
+      fi
+    elif [[ "$HTTP_CODE" == "401" || "$HTTP_CODE" == "403" ]]; then
+      if [[ -n "$TELEMETRY_API_KEY" ]]; then
+        fail "Telemetry: auth rejected (HTTP ${HTTP_CODE}) — check telemetry.api_key in enterprise.yaml"
+      else
+        pass "Telemetry: endpoint reachable (auth required — expected)"
+      fi
     else
       warn "Telemetry: endpoint returned HTTP ${HTTP_CODE}"
     fi
@@ -258,11 +298,25 @@ if [[ -n "$ENTERPRISE_CONFIG" ]]; then
   fi
 
   if [[ -n "$POLICY_ENDPOINT" ]]; then
-    POLICY_HTTP=$(curl -so /dev/null -w '%{http_code}' --max-time 5 "$POLICY_ENDPOINT" 2>/dev/null | tail -c 3 || echo "000")
+    POLICY_CURL_ARGS=(-so /dev/null -w '%{http_code}' --max-time 5)
+    if [[ -n "$POLICY_API_KEY" ]]; then
+      POLICY_CURL_ARGS+=(-H "Authorization: Bearer ${POLICY_API_KEY}")
+    fi
+    POLICY_HTTP=$(curl "${POLICY_CURL_ARGS[@]}" "$POLICY_ENDPOINT" 2>/dev/null | tail -c 3 || echo "000")
     if [[ "$POLICY_HTTP" == "000" ]]; then
       fail "Policy: endpoint not reachable (timeout/DNS)"
-    elif [[ "$POLICY_HTTP" =~ ^[23] ]] || [[ "$POLICY_HTTP" == "401" ]]; then
-      pass "Policy: endpoint reachable (HTTP ${POLICY_HTTP})"
+    elif [[ "$POLICY_HTTP" =~ ^[23] ]]; then
+      if [[ -n "$POLICY_API_KEY" ]]; then
+        pass "Policy: endpoint authenticated (HTTP ${POLICY_HTTP})"
+      else
+        pass "Policy: endpoint reachable (HTTP ${POLICY_HTTP})"
+      fi
+    elif [[ "$POLICY_HTTP" == "401" || "$POLICY_HTTP" == "403" ]]; then
+      if [[ -n "$POLICY_API_KEY" ]]; then
+        fail "Policy: auth rejected (HTTP ${POLICY_HTTP}) — check policy.api_key in enterprise.yaml"
+      else
+        pass "Policy: endpoint reachable (auth required — expected)"
+      fi
     else
       warn "Policy: endpoint returned HTTP ${POLICY_HTTP}"
     fi