@qingflow-tech/qingflow-cli 1.1.34 → 1.1.35

package/README.md

@@ -3,13 +3,13 @@
 Install:
 
 ```bash
-npm install @qingflow-tech/qingflow-cli@1.1.34
+npm install @qingflow-tech/qingflow-cli@1.1.35
 ```
 
 Run:
 
 ```bash
-npx -y -p @qingflow-tech/qingflow-cli@1.1.34 qingflow
+npx -y -p @qingflow-tech/qingflow-cli@1.1.35 qingflow
 ```
 
 Environment:

package/npm/lib/runtime.mjs

@@ -4,6 +4,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 
 const WINDOWS = process.platform === "win32";
+const MIN_PYTHON_VERSION = [3, 11, 0];
 
 const PKG_BY_BIN = {
   qingflow: "qingflow-cli",
@@ -26,11 +27,41 @@ function runChecked(command, args, options = {}) {
   }
 }
 
-function commandWorks(command, args) {
+function commandResult(command, args) {
   const result = spawnSync(command, args, {
-    stdio: "ignore",
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
   });
-  return result.status === 0;
+  return {
+    status: result.status ?? 1,
+    error: result.error,
+    stdout: result.stdout ?? "",
+    stderr: result.stderr ?? "",
+  };
+}
+
+function parseVersion(text) {
+  const match = /(\d+)\.(\d+)\.(\d+)/.exec(text);
+  if (!match) {
+    return null;
+  }
+  return [Number(match[1]), Number(match[2]), Number(match[3])];
+}
+
+function versionAtLeast(current, minimum) {
+  for (let index = 0; index < minimum.length; index += 1) {
+    if ((current[index] ?? 0) > minimum[index]) {
+      return true;
+    }
+    if ((current[index] ?? 0) < minimum[index]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function formatVersion(version) {
+  return version.join(".");
 }
 
 export function getPackageRoot(metaUrl) {
@@ -449,6 +480,40 @@ export function inspectPythonEnv(packageRoot, commandName = "qingflow-mcp") {
   };
 }
 
+function getRuntimeProbeModule(commandName) {
+  if (commandName === "qingflow") {
+    return "qingflow_mcp.cli.main";
+  }
+  if (commandName === "qingflow-app-user-mcp") {
+    return "qingflow_mcp.server_app_user";
+  }
+  if (commandName === "qingflow-app-builder-mcp") {
+    return "qingflow_mcp.server_app_builder";
+  }
+  return "qingflow_mcp";
+}
+
+function probePythonRuntime(packageRoot, commandName) {
+  const python = getVenvPython(packageRoot);
+  if (!fs.existsSync(python)) {
+    return { ok: false, details: `missing Python executable: ${python}` };
+  }
+  const moduleName = getRuntimeProbeModule(commandName);
+  const result = spawnSync(python, ["-c", `import ${moduleName}`], {
+    cwd: packageRoot,
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+  if (result.error) {
+    return { ok: false, details: result.error.message };
+  }
+  if (result.status !== 0) {
+    const details = [result.stderr, result.stdout].filter((value) => typeof value === "string" && value.trim()).join("\n");
+    return { ok: false, details: details || `import ${moduleName} failed` };
+  }
+  return { ok: true, details: "" };
+}
+
 function formatRuntimeProblem(runtime, commandName, { allowRuntimeBootstrap = false } = {}) {
   const problemLines = [];
   for (const problem of runtime.problems) {
@@ -511,30 +576,38 @@ function findOfflineProjectWheel(findLinksDir) {
 export function findPython() {
   const preferred = process.env.QINGFLOW_MCP_PYTHON?.trim();
   const candidates = preferred
-    ? [{ command: preferred, args: [], label: preferred }]
+    ? [{ command: preferred, checkArgs: ["-V"], runArgs: [], label: preferred }]
     : WINDOWS
       ? [
-          { command: "py", args: ["-3", "-V"], label: "py -3" },
-          { command: "python", args: ["-V"], label: "python" },
-          { command: "python3", args: ["-V"], label: "python3" },
+          { command: "py", checkArgs: ["-3", "-V"], runArgs: ["-3"], label: "py -3" },
+          { command: "python", checkArgs: ["-V"], runArgs: [], label: "python" },
+          { command: "python3", checkArgs: ["-V"], runArgs: [], label: "python3" },
         ]
       : [
-          { command: "python3", args: ["-V"], label: "python3" },
-          { command: "python", args: ["-V"], label: "python" },
+          { command: "python3", checkArgs: ["-V"], runArgs: [], label: "python3" },
+          { command: "python", checkArgs: ["-V"], runArgs: [], label: "python" },
         ];
 
+  const rejected = [];
   for (const candidate of candidates) {
-    if (commandWorks(candidate.command, candidate.args)) {
-      if (candidate.command === "py") {
-        return { command: "py", args: ["-3"], label: candidate.label };
-      }
-      return { command: candidate.command, args: [], label: candidate.label };
+    const result = commandResult(candidate.command, candidate.checkArgs);
+    if (result.status !== 0) {
+      continue;
+    }
+    const version = parseVersion(`${result.stdout}\n${result.stderr}`);
+    if (!version) {
+      rejected.push(`${candidate.label}: version could not be parsed`);
+      continue;
     }
+    if (!versionAtLeast(version, MIN_PYTHON_VERSION)) {
+      rejected.push(`${candidate.label}: ${formatVersion(version)}`);
+      continue;
+    }
+    return { command: candidate.command, args: candidate.runArgs, label: `${candidate.label} (${formatVersion(version)})` };
   }
 
-  throw new Error(
-    "Python 3.11+ was not found. Set QINGFLOW_MCP_PYTHON to a Python 3 executable before running npm install."
-  );
+  const rejectedText = rejected.length ? ` Detected but rejected: ${rejected.join(", ")}.` : "";
+  throw new Error(`Python ${formatVersion(MIN_PYTHON_VERSION)}+ was not found.${rejectedText} Set QINGFLOW_MCP_PYTHON to a Python 3.11+ executable before running npm install.`);
 }
 
 export function ensurePythonEnv(packageRoot, { force = false, commandName = "qingflow-mcp" } = {}) {
@@ -544,7 +617,11 @@ export function ensurePythonEnv(packageRoot, { force = false, commandName = "qin
   const { packageVersion, serverCommand, stampPath, venvDir, stampVersion } = runtime;
 
   if (!force && fs.existsSync(serverCommand) && fs.existsSync(stampPath) && stampVersion && stampVersion === packageVersion) {
-    return serverCommand;
+    const probe = probePythonRuntime(packageRoot, commandName);
+    if (probe.ok) {
+      return serverCommand;
+    }
+    fs.rmSync(venvDir, { recursive: true, force: true });
   }
 
   if (force && fs.existsSync(venvDir)) {
@@ -571,6 +648,11 @@ export function ensurePythonEnv(packageRoot, { force = false, commandName = "qin
   }
   runChecked(pip, pipArgs, { cwd: packageRoot });
 
+  const probe = probePythonRuntime(packageRoot, commandName);
+  if (!probe.ok) {
+    throw new Error(`Bootstrap finished but Python runtime import probe failed:\n${probe.details}`);
+  }
+
   fs.writeFileSync(
     stampPath,
     JSON.stringify(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qingflow-tech/qingflow-cli",
-  "version": "1.1.34",
+  "version": "1.1.35",
   "description": "Human-friendly Qingflow command line interface for auth, record operations, import, tasks, and stable builder flows.",
   "license": "MIT",
   "type": "module",

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qingflow-mcp"
-version = "1.1.34"
+version = "1.1.35"
 description = "User-authenticated MCP server for Qingflow"
 readme = "README.md"
 license = "MIT"