msdevflow 0.7.6 → 0.7.7

package/lib/bootstrap.js

@@ -764,11 +764,13 @@ function outputLines(output) {
   return output.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
 }
 
-export function resolveExecutable(name, run, platform) {
-  const invocation = platform === "win32"
+function executableLookup(name, platform) {
+  return platform === "win32"
     ? { command: "where.exe", args: [name] }
     : { command: "sh", args: ["-c", "command -v -- \"$1\"", "sh", name] };
-  const result = runOptional(run, invocation);
+}
+
+function executableFromLookup(result, platform) {
   if (result.status !== 0) {
     return "";
   }
@@ -779,6 +781,20 @@ export function resolveExecutable(name, run, platform) {
   return candidates[0] || "";
 }
 
+export function resolveExecutable(name, run, platform) {
+  return executableFromLookup(
+    runOptional(run, executableLookup(name, platform)),
+    platform,
+  );
+}
+
+async function resolveExecutableAsync(name, run, platform) {
+  return executableFromLookup(
+    await runOptionalAsync(run, executableLookup(name, platform)),
+    platform,
+  );
+}
+
 export function detectClients(run, platform) {
   return SUPPORTED_CLIENTS.filter((client) => Boolean(resolveExecutable(client, run, platform)));
 }
@@ -849,60 +865,95 @@ function hasPythonShebang(file) {
   }
 }
 
-function pythonScriptDirectories(run, platform) {
-  const candidates = platform === "win32"
+function pythonCandidates(platform) {
+  return platform === "win32"
     ? [{ command: "py", prefix: ["-3"] }, { command: "python", prefix: [] }, { command: "python3", prefix: [] }]
     : [{ command: "python3", prefix: [] }, { command: "python", prefix: [] }];
+}
+
+function parsePythonScriptDirectory(result) {
+  if (result.status !== 0) {
+    return "";
+  }
+  try {
+    const directory = JSON.parse(result.stdout.trim());
+    return typeof directory === "string" ? directory : "";
+  } catch {
+    return "";
+  }
+}
+
+function pythonScriptDirectories(run, platform) {
+  const probe = "import json,sysconfig; print(json.dumps(sysconfig.get_path('scripts')))";
+  return pythonCandidates(platform)
+    .map((candidate) => parsePythonScriptDirectory(runOptional(run, {
+      command: candidate.command,
+      args: [...candidate.prefix, "-c", probe],
+    })))
+    .filter(Boolean);
+}
+
+async function pythonScriptDirectoriesAsync(run, platform) {
   const probe = "import json,sysconfig; print(json.dumps(sysconfig.get_path('scripts')))";
   const directories = [];
-  for (const candidate of candidates) {
-    const result = runOptional(run, {
+  for (const candidate of pythonCandidates(platform)) {
+    const directory = parsePythonScriptDirectory(await runOptionalAsync(run, {
       command: candidate.command,
       args: [...candidate.prefix, "-c", probe],
-    });
-    if (result.status !== 0) {
-      continue;
-    }
-    try {
-      const directory = JSON.parse(result.stdout.trim());
-      if (typeof directory === "string" && directory) {
-        directories.push(directory);
-      }
-    } catch {
-      continue;
+    }));
+    if (directory) {
+      directories.push(directory);
     }
   }
   return directories;
 }
 
-function isPythonGitcode(executable, run, platform) {
-  if (/[\\/]Python[^\\/]*[\\/]Scripts[\\/]gitcode(?:\.exe)?$/i.test(executable)
-      || /[\\/]pipx[\\/]/i.test(executable)
-      || hasPythonShebang(executable)) {
-    return true;
-  }
+function isKnownPythonGitcodePath(executable) {
+  return /[\\/]Python[^\\/]*[\\/]Scripts[\\/]gitcode(?:\.exe)?$/i.test(executable)
+    || /[\\/]pipx[\\/]/i.test(executable)
+    || hasPythonShebang(executable);
+}
+
+function executableMatchesPythonScripts(executable, directories, platform) {
   const directory = normalizedPath(executableDirectory(executable, platform), platform);
-  return pythonScriptDirectories(run, platform)
-    .some((candidate) => normalizedPath(candidate, platform) === directory);
+  return directories.some((candidate) => normalizedPath(candidate, platform) === directory);
 }
 
-export function diagnoseGitcode(run, platform) {
-  const executable = resolveExecutable("gitcode", run, platform);
-  if (!executable) {
-    return {
-      classification: "absent",
-      existingExecutable: null,
-      workflowCommand: "gitcode",
-    };
-  }
-  if (isPythonGitcode(executable, run, platform)) {
-    return {
-      classification: "python",
-      existingExecutable: executable,
-      workflowCommand: "gitcode-npm",
-    };
-  }
-  const doctor = runOptional(run, executableCommand(executable, ["doctor", "install", "--json"], platform));
+function isPythonGitcode(executable, run, platform) {
+  return isKnownPythonGitcodePath(executable)
+    || executableMatchesPythonScripts(
+      executable,
+      pythonScriptDirectories(run, platform),
+      platform,
+    );
+}
+
+async function isPythonGitcodeAsync(executable, run, platform) {
+  return isKnownPythonGitcodePath(executable)
+    || executableMatchesPythonScripts(
+      executable,
+      await pythonScriptDirectoriesAsync(run, platform),
+      platform,
+    );
+}
+
+function absentGitcodeDiagnosis() {
+  return {
+    classification: "absent",
+    existingExecutable: null,
+    workflowCommand: "gitcode",
+  };
+}
+
+function pythonGitcodeDiagnosis(executable) {
+  return {
+    classification: "python",
+    existingExecutable: executable,
+    workflowCommand: "gitcode-npm",
+  };
+}
+
+function npmGitcodeDiagnosis(executable, doctor) {
   if (doctor.status === 0) {
     try {
       const metadata = JSON.parse(doctor.stdout);
@@ -920,23 +971,74 @@ export function diagnoseGitcode(run, platform) {
   throw new BootstrapError(`Existing gitcode has unknown ownership: ${executable}. Refusing to overwrite it.`, 3);
 }
 
-function detectPython(run, platform) {
-  const candidates = platform === "win32"
-    ? [{ command: "py", prefix: ["-3"] }, { command: "python", prefix: [] }, { command: "python3", prefix: [] }]
-    : [{ command: "python3", prefix: [] }, { command: "python", prefix: [] }];
+export function diagnoseGitcode(run, platform) {
+  const executable = resolveExecutable("gitcode", run, platform);
+  if (!executable) {
+    return absentGitcodeDiagnosis();
+  }
+  if (isPythonGitcode(executable, run, platform)) {
+    return pythonGitcodeDiagnosis(executable);
+  }
+  return npmGitcodeDiagnosis(
+    executable,
+    runOptional(run, executableCommand(executable, ["doctor", "install", "--json"], platform)),
+  );
+}
+
+async function diagnoseGitcodeAsync(run, platform) {
+  const executable = await resolveExecutableAsync("gitcode", run, platform);
+  if (!executable) {
+    return absentGitcodeDiagnosis();
+  }
+  if (await isPythonGitcodeAsync(executable, run, platform)) {
+    return pythonGitcodeDiagnosis(executable);
+  }
+  return npmGitcodeDiagnosis(
+    executable,
+    await runOptionalAsync(
+      run,
+      executableCommand(executable, ["doctor", "install", "--json"], platform),
+    ),
+  );
+}
+
+function parsePythonProbe(result) {
+  if (result.status !== 0) {
+    return null;
+  }
+  try {
+    const data = JSON.parse(result.stdout.trim());
+    if (data.version[0] > 3 || (data.version[0] === 3 && data.version[1] >= 10)) {
+      return data;
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+
+function pythonProbe(candidate) {
   const probe = "import json,sys; print(json.dumps({'executable':sys.executable,'version':list(sys.version_info[:3])}))";
-  for (const candidate of candidates) {
-    const result = runOptional(run, { command: candidate.command, args: [...candidate.prefix, "-c", probe] });
-    if (result.status !== 0) {
-      continue;
+  return { command: candidate.command, args: [...candidate.prefix, "-c", probe] };
+}
+
+function detectPython(run, platform) {
+  for (const candidate of pythonCandidates(platform)) {
+    const data = parsePythonProbe(runOptional(run, pythonProbe(candidate)));
+    if (data) {
+      return data;
     }
-    try {
-      const data = JSON.parse(result.stdout.trim());
-      if (data.version[0] > 3 || (data.version[0] === 3 && data.version[1] >= 10)) {
-        return data;
-      }
-    } catch {
-      continue;
+  }
+  throw new BootstrapError("Python >=3.10 is required for workflow scripts.", 2);
+}
+
+async function detectPythonAsync(run, platform) {
+  for (const candidate of pythonCandidates(platform)) {
+    const python = parsePythonProbe(
+      await runOptionalAsync(run, pythonProbe(candidate)),
+    );
+    if (python) {
+      return python;
     }
   }
   throw new BootstrapError("Python >=3.10 is required for workflow scripts.", 2);
@@ -1004,7 +1106,7 @@ export function pythonRuntimeDetails(
   return pythonRuntimeAt(directory, python, platform);
 }
 
-function validatePythonRuntime(runtime, run) {
+async function validatePythonRuntime(runtime, run) {
   let marker;
   try {
     const metadata = lstatSync(runtime.directory);
@@ -1043,10 +1145,10 @@ function validatePythonRuntime(runtime, run) {
       closeSync(descriptor);
     }
   }
-  if (runOptional(run, {
+  if ((await runOptionalAsync(run, {
     command: runtime.executable,
     args: ["-m", "pip", "--version"],
-  }).status !== 0) {
+  })).status !== 0) {
     return "repair";
   }
   return "current";
@@ -1069,8 +1171,8 @@ function writePythonRuntimeMarker(runtime) {
   writeFileSync(runtime.marker, PYTHON_RUNTIME_MARKER_CONTENT, { encoding: "utf8", flag: "wx" });
 }
 
-async function ensurePythonRuntime(runtime, status, runLong, run) {
-  if (validatePythonRuntime(runtime, run) !== status) {
+async function ensurePythonRuntime(runtime, status, runLong) {
+  if ((await validatePythonRuntime(runtime, runLong)) !== status) {
     throw new BootstrapError(
       `Managed Python runtime changed after confirmation: ${runtime.directory}`,
       3,
@@ -1499,7 +1601,42 @@ export async function runSetup(options, dependencies = {}) {
       platform,
     )),
   );
-  const diagnosis = diagnoseGitcode(run, platform);
+  const { diagnosis, python, pythonRuntime } = await progress.run(
+    "Inspecting local GitCode and Python environment",
+    async () => {
+      const [diagnosisResult, pythonResult] = await Promise.all([
+        diagnoseGitcodeAsync(runLong, platform),
+        detectPythonAsync(runLong, platform),
+      ]);
+      const configuredPythonRuntime = pythonRuntimeDetails(
+        pythonResult,
+        environment,
+        platform,
+      );
+      const runtime = dependencies.pythonRuntimeDir
+        ? pythonRuntimeAt(dependencies.pythonRuntimeDir, pythonResult, platform)
+        : configuredPythonRuntime;
+      const [venvCapability, runtimeStatus] = await Promise.all([
+        runOptionalAsync(runLong, {
+          command: pythonResult.executable,
+          args: ["-m", "venv", "--help"],
+        }),
+        validatePythonRuntime(runtime, runLong),
+      ]);
+      if (venvCapability.status !== 0) {
+        throw new BootstrapError(
+          `Python venv is unavailable for ${pythonResult.executable}. Install the venv component for this Python (for example python3-venv on Debian/Ubuntu) and rerun setup.`,
+          2,
+        );
+      }
+      runtime.status = runtimeStatus;
+      return {
+        diagnosis: diagnosisResult,
+        python: pythonResult,
+        pythonRuntime: runtime,
+      };
+    },
+  );
   diagnosis.officialLatest = latestResult.status === 0 ? latestResult.stdout.trim() || null : null;
   const gitcodeInstall = gitcodeInstallDetails(diagnosis.classification, environment, platform, npmPrefix);
   if (gitcodeInstall.wrapper) {
@@ -1511,22 +1648,6 @@ export async function runSetup(options, dependencies = {}) {
     platform,
   );
 
-  const python = detectPython(run, platform);
-  const venvCapability = runOptional(run, {
-    command: python.executable,
-    args: ["-m", "venv", "--help"],
-  });
-  if (venvCapability.status !== 0) {
-    throw new BootstrapError(
-      `Python venv is unavailable for ${python.executable}. Install the venv component for this Python (for example python3-venv on Debian/Ubuntu) and rerun setup.`,
-      2,
-    );
-  }
-  const configuredPythonRuntime = pythonRuntimeDetails(python, environment, platform);
-  const pythonRuntime = dependencies.pythonRuntimeDir
-    ? pythonRuntimeAt(dependencies.pythonRuntimeDir, python, platform)
-    : configuredPythonRuntime;
-  pythonRuntime.status = validatePythonRuntime(pythonRuntime, run);
   const venvInvocation = {
     command: python.executable,
     args: ["-m", "venv", pythonRuntime.directory],
@@ -1554,14 +1675,16 @@ export async function runSetup(options, dependencies = {}) {
   if (!options.yes && !(await (dependencies.confirm || confirmPlan)(process.stdin, process.stdout))) {
     throw new BootstrapError("Setup cancelled; no changes were applied.", 2);
   }
-  const currentDiagnosis = diagnoseGitcode(run, platform);
-  if (currentDiagnosis.classification !== diagnosis.classification
-      || currentDiagnosis.existingExecutable !== diagnosis.existingExecutable) {
-    throw new BootstrapError("GitCode command ownership changed after confirmation; refusing to install.", 3);
-  }
-  if (gitcodeInstall.wrapper) {
-    validateWrapper(gitcodeInstall, platform);
-  }
+  await progress.run("Revalidating command ownership", async () => {
+    const currentDiagnosis = await diagnoseGitcodeAsync(runLong, platform);
+    if (currentDiagnosis.classification !== diagnosis.classification
+        || currentDiagnosis.existingExecutable !== diagnosis.existingExecutable) {
+      throw new BootstrapError("GitCode command ownership changed after confirmation; refusing to install.", 3);
+    }
+    if (gitcodeInstall.wrapper) {
+      validateWrapper(gitcodeInstall, platform);
+    }
+  });
 
   await progress.run(
     pythonRuntime.status === "absent"
@@ -1569,7 +1692,7 @@ export async function runSetup(options, dependencies = {}) {
       : pythonRuntime.status === "repair"
         ? "Repairing the managed Python runtime"
         : "Validating the managed Python runtime",
-    () => ensurePythonRuntime(pythonRuntime, pythonRuntime.status, runLong, run),
+    () => ensurePythonRuntime(pythonRuntime, pythonRuntime.status, runLong),
   );
   await progress.run("Installing reviewed Python dependencies", () => runLong(pipInvocation));
   await progress.run(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msdevflow",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "Install the msdevflow GitCode skill and its runtime dependencies",
   "type": "module",
   "bin": {