arcane-cli 1.9.0 → 1.9.2

package/dist/assets/.mcp.json

@@ -1,9 +1,9 @@
 {
-  "$comment": "Example MCP server config. Replace or remove the example server below with your own. Set a per-server \"timeout\" (milliseconds) so a hung server aborts on a predictable schedule instead of running to the client's own default idle limit (as long as 30 minutes) -- see .arcane/governance/git-conventions.md's MCP fail-fast / fallback rule.",
+  "$comment": "Example MCP server config. Replace or remove the example server below with your own: the package argument is a placeholder that npm rejects, so the example does not run until you name a real server package. Set a per-server \"timeout\" (milliseconds) so a hung server aborts on a predictable schedule instead of running to the client's own default idle limit (as long as 30 minutes) -- see .arcane/governance/git-conventions.md's MCP fail-fast / fallback rule.",
   "mcpServers": {
     "example-server": {
       "command": "npx",
-      "args": ["-y", "@example/mcp-server"],
+      "args": ["-y", "<your-mcp-server-package>"],
       "timeout": 30000
     }
   }

package/dist/index.js

@@ -5896,8 +5896,10 @@ async function scanRepository(repoRoot, rules, extensions, excludePrefixes = [])
 
 // src/modules/exec.ts
 import { execFile as execFile2 } from "child_process";
+import { existsSync, readFileSync } from "fs";
+import { win32 } from "path";
 var EXTERNAL_CLI_TIMEOUT_MS = 1e4;
-function execFileWithTimeout(file, args, timeoutMs) {
+function execFileWithTimeout(file, args, timeoutMs, options = {}) {
   return new Promise((resolve5, reject) => {
     const child = execFile2(
       file,
@@ -5906,7 +5908,8 @@ function execFileWithTimeout(file, args, timeoutMs) {
         timeout: timeoutMs,
         killSignal: "SIGTERM",
         windowsHide: true,
-        encoding: "utf8"
+        encoding: "utf8",
+        ...options.env ? { env: { ...process.env, ...options.env } } : {}
       },
       (error, stdout, stderr) => {
         if (error) {
@@ -5919,6 +5922,36 @@ function execFileWithTimeout(file, args, timeoutMs) {
     child.stdin?.end();
   });
 }
+function defaultProbes() {
+  return {
+    platform: process.platform,
+    pathEnv: process.env["PATH"] ?? process.env["Path"],
+    readText: (path4) => {
+      try {
+        return readFileSync(path4, "utf8");
+      } catch {
+        return void 0;
+      }
+    },
+    exists: (path4) => existsSync(path4)
+  };
+}
+var MSI_LAUNCHER_LINE = /^\s*"%~dp0\\\.\.\\python\.exe"\s+-IBm\s+azure\.cli\s+%\*\s*$/im;
+function resolveAzureCli(probes = defaultProbes()) {
+  const plain = { file: "az", prefixArgs: [] };
+  if (probes.platform !== "win32") return plain;
+  for (const raw of (probes.pathEnv ?? "").split(";")) {
+    const dir = raw.trim().replace(/^"(.*)"$/, "$1");
+    if (!dir || !win32.isAbsolute(dir)) continue;
+    const launcher = probes.readText(win32.join(dir, "az.cmd"));
+    if (launcher === void 0) continue;
+    if (!MSI_LAUNCHER_LINE.test(launcher)) return plain;
+    const interpreter = win32.resolve(dir, "..", "python.exe");
+    if (!probes.exists(interpreter)) return plain;
+    return { file: interpreter, prefixArgs: ["-IBm", "azure.cli"], env: { AZ_INSTALLER: "MSI" } };
+  }
+  return plain;
+}
 
 // src/modules/platform-policy.ts
 var SANCTIONED_MERGE_METHODS = ["merge", "rebase"];
@@ -6028,10 +6061,13 @@ function evaluateAdoMergePolicy(policies) {
   }
   return compareToLadder([...effective], []);
 }
-async function fetchAdoMergeTypePolicies(org, project, repoName, branch) {
+async function fetchAdoMergeTypePolicies(org, project, repoName, branch, launch = resolveAzureCli()) {
+  const az = (args) => execFileWithTimeout(launch.file, [...launch.prefixArgs, ...args], EXTERNAL_CLI_TIMEOUT_MS, {
+    ...launch.env ? { env: launch.env } : {}
+  });
   try {
     const orgUrl = `https://dev.azure.com/${org}`;
-    const { stdout: repoOut } = await execFileWithTimeout("az", [
+    const { stdout: repoOut } = await az([
       "repos",
       "show",
       "--repository",
@@ -6044,10 +6080,10 @@ async function fetchAdoMergeTypePolicies(org, project, repoName, branch) {
       "id",
       "--output",
       "tsv"
-    ], EXTERNAL_CLI_TIMEOUT_MS);
+    ]);
     const repositoryId = repoOut.trim();
     if (!repositoryId) return null;
-    const { stdout } = await execFileWithTimeout("az", [
+    const { stdout } = await az([
       "repos",
       "policy",
       "list",
@@ -6061,7 +6097,7 @@ async function fetchAdoMergeTypePolicies(org, project, repoName, branch) {
       project,
       "--output",
       "json"
-    ], EXTERNAL_CLI_TIMEOUT_MS);
+    ]);
     return JSON.parse(stdout);
   } catch {
     return null;
@@ -6074,18 +6110,26 @@ function parseGitHubRemote(url) {
   if (!owner || !repo) return null;
   return { owner, repo };
 }
-function parseAdoRemote(url) {
-  const modern = /dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/([^/?]+)/.exec(url);
-  if (modern) {
-    const [, org, project, repo] = modern;
-    if (org && project && repo) return { org, project, repo };
-  }
-  const legacy = /([^./]+)\.visualstudio\.com\/([^/]+)\/_git\/([^/?]+)/.exec(url);
-  if (legacy) {
-    const [, org, project, repo] = legacy;
-    if (org && project && repo) return { org, project, repo };
+function decodeAdoSegment(raw) {
+  let decoded;
+  try {
+    decoded = decodeURIComponent(raw);
+  } catch {
+    return null;
   }
-  return null;
+  if (!decoded || decoded.startsWith("-")) return null;
+  return decoded;
+}
+function parseAdoRemote(url) {
+  const match = /dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/([^/?]+)/.exec(url) ?? /([^./]+)\.visualstudio\.com\/([^/]+)\/_git\/([^/?]+)/.exec(url);
+  if (!match) return null;
+  const [, rawOrg, rawProject, rawRepo] = match;
+  if (!rawOrg || !rawProject || !rawRepo) return null;
+  const org = decodeAdoSegment(rawOrg);
+  const project = decodeAdoSegment(rawProject);
+  const repo = decodeAdoSegment(rawRepo);
+  if (org === null || project === null || repo === null) return null;
+  return { org, project, repo };
 }
 
 // src/modules/placeholders.ts
@@ -6552,6 +6596,7 @@ async function checkGovernancePlaceholders(targetDir) {
     message: `unknown placeholder(s) in status: active doc(s) \u2014 ${listed.join("; ")}. Fill each one in; or, if an agent resolves it at use time, add it to the runtime-placeholders list in .arcane/governance/${PLACEHOLDER_STANDARD_FILE}; or, if the document is meant to be filled in by hand, mark it \`status: template\`.`
   };
 }
+var UNOWNED_EXAMPLE_SCOPE = "@example/";
 async function checkComponentRequires(targetDir) {
   const name = "Component prerequisites";
   let manifest;
@@ -6611,6 +6656,22 @@ async function checkMcpConfig(targetDir) {
   if (serverNames.length === 0) {
     return { name, passed: true, blocking: false, message: "no MCP servers configured" };
   }
+  const exampleHits = [];
+  for (const n of serverNames) {
+    const args = servers[n]?.args;
+    if (!Array.isArray(args)) continue;
+    for (const a of args) {
+      if (typeof a === "string" && a.startsWith(UNOWNED_EXAMPLE_SCOPE)) exampleHits.push(`${n} (${a})`);
+    }
+  }
+  if (exampleHits.length > 0) {
+    return {
+      name,
+      passed: false,
+      blocking: false,
+      message: `.mcp.json runs a package under the ${UNOWNED_EXAMPLE_SCOPE} scope nobody here owns: ${exampleHits.join(", ")}. The old \`spell init\` scaffold shipped it as a placeholder, and \`npx -y\` would run whoever publishes it. Replace the entry with your own MCP server package, or remove it; the file is yours, so doctor does not edit it`
+    };
+  }
   const missingTimeout = serverNames.filter((n) => typeof servers[n]?.timeout !== "number");
   if (missingTimeout.length > 0) {
     return {
@@ -7441,13 +7502,16 @@ async function getVersionAtRef(cwd, ref) {
     return null;
   }
 }
+function excludeOutputs(generatedOutputs) {
+  return generatedOutputs.length === 0 ? [] : ["--", ".", ...generatedOutputs.map((p) => `:(exclude)${p}`)];
+}
 async function getCloseCommit(cwd, completedDate, generatedOutputs = []) {
   if (!completedDate) {
-    const args = generatedOutputs.length === 0 ? ["rev-parse", "HEAD"] : ["log", "-1", "--format=%H", "HEAD", "--", ".", ...generatedOutputs.map((p) => `:(exclude)${p}`)];
+    const args = generatedOutputs.length === 0 ? ["rev-parse", "HEAD"] : ["log", "-1", "--format=%H", "HEAD", ...excludeOutputs(generatedOutputs)];
     const head = await runGitTextOrNull(cwd, args);
     return head === null || head === "" ? null : head;
   }
-  const log = await runGitTextOrNull(cwd, ["log", "--format=%H%x09%cs", "HEAD"]);
+  const log = await runGitTextOrNull(cwd, ["log", "--format=%H%x09%cs", "HEAD", ...excludeOutputs(generatedOutputs)]);
   if (log === null || log === "") return null;
   for (const line of log.split("\n")) {
     const [sha, landed] = line.split("	");