@adhd/apigen-python-env 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.2.6 (2026-09-26)
+
+### 🚀 Features
+
+- **vite-plugins:** absorb perf/test-resolve-fix — test-time @adhd/* source resolution ([3e344506](https://github.com/PseudoSky/adhd/commit/3e344506))
+
+### 🩹 Fixes
+
+- **nx:** reconcile main's e2e lane with the flat ESLint config + fix missing-deps ([cf72a2ab](https://github.com/PseudoSky/adhd/commit/cf72a2ab))
+- **vite:** restore import.meta.url in CJS output under vite 8 ([7916e639](https://github.com/PseudoSky/adhd/commit/7916e639))
+- **nx:** finish the ESLint v9 flat-config migration and unblock the gate ([53f4ff3e](https://github.com/PseudoSky/adhd/commit/53f4ff3e))
+
+### ❤️ Thank You
+
+- pseudosky
+
+## 0.2.5 (2026-09-24)
+
+This was a version bump only for apigen-python-env to align it with other projects, there were no code changes.
+
 ## 0.2.4 (2026-08-08)
 
 

package/index.js

@@ -1,10 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("node:fs"),I=require("node:os"),q=require("node:path"),F=require("node:crypto"),h=require("node:child_process");function P(t){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const n in t)if(n!=="default"){const i=Object.getOwnPropertyDescriptor(t,n);Object.defineProperty(e,n,i.get?i:{enumerable:!0,get:()=>t[n]})}}return e.default=t,Object.freeze(e)}const r=P(D),b=P(I),o=P(q);function k(t){const e=t??__dirname,n=o.resolve(e,"..","..","..","python");if(r.existsSync(o.join(n,"apigen_python")))return n;const i=o.join(e,"python");if(r.existsSync(o.join(i,"apigen_python")))return i;let a=e;for(let c=0;c<20;c++){const p=o.join(a,"packages","apigen","python");if(r.existsSync(o.join(p,"apigen_python")))return p;const u=o.dirname(a);if(u===a)break;a=u}return n}const H=["python3.13","python3.12","python3.11","python3"],m=[3,11];function J(t){const e=h.spawnSync(t,["-c",'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")'],{encoding:"utf8",timeout:15e3});if(e.status!==0||!e.stdout)return;const[n,i]=e.stdout.trim().split(".").map(Number);if(!(!Number.isFinite(n)||!Number.isFinite(i)))return[n,i]}function M(){for(const t of H){const e=J(t);if(e&&(e[0]>m[0]||e[0]===m[0]&&e[1]>=m[1]))return t}throw new Error(`apigen-python-env: no Python >= ${m.join(".")} found on PATH (tried: ${H.join(", ")}). Install Python ${m.join(".")}+ or set APIGEN_PYTHON to a provisioned interpreter.`)}function Y(t){return process.platform==="win32"?o.join(t,"Scripts","python.exe"):o.join(t,"bin","python3")}function G(t){const e=r.readFileSync(o.join(t,"pyproject.toml"));return F.createHash("sha256").update(e).digest("hex")}function O(t){try{const e=JSON.parse(r.readFileSync(t,"utf8"));if(typeof e.pyprojectHash=="string"&&Array.isArray(e.extras))return e}catch{}}function B(t,e,n){const i=Date.now()+e;for(;;)try{r.mkdirSync(t,{recursive:!1});break}catch{if(Date.now()>i){try{r.rmdirSync(t)}catch{}continue}h.spawnSync(process.execPath,["-e","setTimeout(()=>{}, 250)"],{timeout:5e3})}try{return n()}finally{try{r.rmdirSync(t)}catch{}}}function V(t={}){const e=k(),n=process.env.APIGEN_PYTHON;if(n){if(!r.existsSync(n))throw new Error(`apigen-python-env: APIGEN_PYTHON points to a missing file: ${n}`);return{python:n,venvDir:"",pythonPkgDir:e}}const i=[...new Set(t.extras??[])].sort(),a=t.envHome??process.env.APIGEN_PYENV_HOME??o.join(b.homedir(),".adhd","apigen"),c=o.join(a,"pyvenv"),p=o.join(c,".apigen-stamp"),u=G(e),y=Y(c),l=()=>{if(!r.existsSync(y))return!1;const s=O(p);return!s||s.pyprojectHash!==u?!1:i.every(d=>s.extras.includes(d))};if(l())return{python:y,venvDir:c,pythonPkgDir:e};r.mkdirSync(a,{recursive:!0});const v=o.join(a,"pyvenv.lock"),w=t.lockTimeoutMs??3e5;return B(v,w,()=>{if(l())return{python:y,venvDir:c,pythonPkgDir:e};const s=O(p),d=[...new Set([...(s==null?void 0:s.extras)??[],...i])].sort();r.rmSync(c,{recursive:!0,force:!0});const _=M(),j=h.spawnSync(_,["-m","venv",c],{encoding:"utf8",timeout:12e4});if(j.status!==0)throw new Error(`apigen-python-env: "${_} -m venv" failed (exit ${j.status}):
-${j.stderr}`);const x=o.join(e,"build");r.existsSync(x)&&r.rmSync(x,{recursive:!0,force:!0});for(const f of r.readdirSync(e))f.endsWith(".egg-info")&&r.rmSync(o.join(e,f),{recursive:!0,force:!0});const S=r.mkdtempSync(o.join(b.tmpdir(),"apigen-python-wheel-"));try{const f=h.spawnSync(y,["-m","pip","wheel","--no-deps","--wheel-dir",S,e],{encoding:"utf8",timeout:6e5});if(f.status!==0)throw new Error(`apigen-python-env: pip wheel failed (exit ${f.status}):
-${f.stderr}
-stdout:
-${f.stdout}`);const E=r.readdirSync(S).filter(A=>A.endsWith(".whl"));if(E.length===0)throw new Error("apigen-python-env: pip wheel produced no .whl file");const $=o.join(S,E[0]),N=d.length?`${$}[${d.join(",")}]`:$,g=h.spawnSync(y,["-m","pip","install","--quiet","--disable-pip-version-check",N],{encoding:"utf8",timeout:6e5});if(g.status!==0)throw new Error(`apigen-python-env: pip install "${N}" failed (exit ${g.status}):
-${g.stderr}
-stdout:
-${g.stdout}`)}finally{r.rmSync(S,{recursive:!0,force:!0})}const T={pyprojectHash:u,extras:d};return r.writeFileSync(p,JSON.stringify(T)),{python:y,venvDir:c,pythonPkgDir:e}})}function L(t,e,n,i,a){return new Promise((c,p)=>{var v,w;const u=h.spawn(t,["-m","apigen_python.extractor",n,"--namespace",i,"--emit-json"],{cwd:e,env:{...process.env,PYTHONPATH:e},stdio:["ignore","pipe","pipe"]});let y="",l="";(v=u.stdout)==null||v.on("data",s=>{y+=s.toString("utf8")}),(w=u.stderr)==null||w.on("data",s=>{l+=s.toString("utf8")}),u.on("error",p),u.on("exit",s=>{if(s!==0){p(new Error(`${a}: extractor --emit-json exited with code ${s}:
-${l}`));return}try{c(JSON.parse(y))}catch(d){p(new Error(`${a}: extractor --emit-json produced invalid JSON (${d.message}):
-${y}`))}})})}exports.ensurePythonEnv=V;exports.resolvePythonPkgDir=k;exports.runExtractorEmitJson=L;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});var e=Object.create,t=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty,o=(e,i,o,s)=>{if(i&&typeof i==`object`||typeof i==`function`)for(var c=r(i),l=0,u=c.length,d;l<u;l++)d=c[l],!a.call(e,d)&&d!==o&&t(e,d,{get:(e=>i[e]).bind(null,d),enumerable:!(s=n(i,d))||s.enumerable});return e},s=(n,r,s)=>(s=n==null?{}:e(i(n)),o(r||!n||!n.__esModule||!a.call(n,`default`)?t(s,`default`,{value:n,enumerable:!0}):s,n));let c=require("node:fs");c=s(c);let l=require("node:os");l=s(l);let u=require("node:path");u=s(u);let d=require("node:crypto"),f=require("node:child_process");function p(e){let t=e??__dirname,n=u.resolve(t,`..`,`..`,`..`,`python`);if(c.existsSync(u.join(n,`apigen_python`)))return n;let r=u.join(t,`python`);if(c.existsSync(u.join(r,`apigen_python`)))return r;let i=t;for(let e=0;e<20;e++){let e=u.join(i,`packages`,`apigen`,`python`);if(c.existsSync(u.join(e,`apigen_python`)))return e;let t=u.dirname(i);if(t===i)break;i=t}return n}var m=[`python3.13`,`python3.12`,`python3.11`,`python3`],h=[3,11];function g(e){let t=(0,f.spawnSync)(e,[`-c`,`import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")`],{encoding:`utf8`,timeout:15e3});if(t.status!==0||!t.stdout)return;let[n,r]=t.stdout.trim().split(`.`).map(Number);if(Number.isFinite(n)&&Number.isFinite(r))return[n,r]}function _(){for(let e of m){let t=g(e);if(t&&(t[0]>h[0]||t[0]===h[0]&&t[1]>=h[1]))return e}throw Error(`apigen-python-env: no Python >= ${h.join(`.`)} found on PATH (tried: ${m.join(`, `)}). Install Python ${h.join(`.`)}+ or set APIGEN_PYTHON to a provisioned interpreter.`)}function v(e){return process.platform===`win32`?u.join(e,`Scripts`,`python.exe`):u.join(e,`bin`,`python3`)}function y(e){let t=c.readFileSync(u.join(e,`pyproject.toml`));return(0,d.createHash)(`sha256`).update(t).digest(`hex`)}function b(e){try{let t=JSON.parse(c.readFileSync(e,`utf8`));if(typeof t.pyprojectHash==`string`&&Array.isArray(t.extras))return t}catch{}}function x(e,t,n){let r=Date.now()+t;for(;;)try{c.mkdirSync(e,{recursive:!1});break}catch{if(Date.now()>r){try{c.rmdirSync(e)}catch{}continue}(0,f.spawnSync)(process.execPath,[`-e`,`setTimeout(()=>{}, 250)`],{timeout:5e3})}try{return n()}finally{try{c.rmdirSync(e)}catch{}}}function S(e={}){let t=p(),n=process.env.APIGEN_PYTHON;if(n){if(!c.existsSync(n))throw Error(`apigen-python-env: APIGEN_PYTHON points to a missing file: ${n}`);return{python:n,venvDir:``,pythonPkgDir:t}}let r=[...new Set(e.extras??[])].sort(),i=e.envHome??process.env.APIGEN_PYENV_HOME??u.join(l.homedir(),`.adhd`,`apigen`),a=u.join(i,`pyvenv`),o=u.join(a,`.apigen-stamp`),s=y(t),d=v(a),m=()=>{if(!c.existsSync(d))return!1;let e=b(o);return e?.pyprojectHash===s&&r.every(t=>e.extras.includes(t))};return m()?{python:d,venvDir:a,pythonPkgDir:t}:(c.mkdirSync(i,{recursive:!0}),x(u.join(i,`pyvenv.lock`),e.lockTimeoutMs??3e5,()=>{if(m())return{python:d,venvDir:a,pythonPkgDir:t};let e=b(o),n=[...new Set([...e?.extras??[],...r])].sort();c.rmSync(a,{recursive:!0,force:!0});let i=_(),p=(0,f.spawnSync)(i,[`-m`,`venv`,a],{encoding:`utf8`,timeout:12e4});if(p.status!==0)throw Error(`apigen-python-env: "${i} -m venv" failed (exit ${p.status}):\n${p.stderr}`);let h=u.join(t,`build`);c.existsSync(h)&&c.rmSync(h,{recursive:!0,force:!0});for(let e of c.readdirSync(t))e.endsWith(`.egg-info`)&&c.rmSync(u.join(t,e),{recursive:!0,force:!0});let g=c.mkdtempSync(u.join(l.tmpdir(),`apigen-python-wheel-`));try{let e=(0,f.spawnSync)(d,[`-m`,`pip`,`wheel`,`--no-deps`,`--wheel-dir`,g,t],{encoding:`utf8`,timeout:6e5});if(e.status!==0)throw Error(`apigen-python-env: pip wheel failed (exit ${e.status}):\n${e.stderr}\nstdout:\n${e.stdout}`);let r=c.readdirSync(g).filter(e=>e.endsWith(`.whl`));if(r.length===0)throw Error(`apigen-python-env: pip wheel produced no .whl file`);let i=u.join(g,r[0]),a=n.length?`${i}[${n.join(`,`)}]`:i,o=(0,f.spawnSync)(d,[`-m`,`pip`,`install`,`--quiet`,`--disable-pip-version-check`,a],{encoding:`utf8`,timeout:6e5});if(o.status!==0)throw Error(`apigen-python-env: pip install "${a}" failed (exit ${o.status}):\n${o.stderr}\nstdout:\n${o.stdout}`)}finally{c.rmSync(g,{recursive:!0,force:!0})}let v={pyprojectHash:s,extras:n};return c.writeFileSync(o,JSON.stringify(v)),{python:d,venvDir:a,pythonPkgDir:t}}))}function C(e,t,n,r,i){return new Promise((a,o)=>{let s=(0,f.spawn)(e,[`-m`,`apigen_python.extractor`,n,`--namespace`,r,`--emit-json`],{cwd:t,env:{...process.env,PYTHONPATH:t},stdio:[`ignore`,`pipe`,`pipe`]}),c=``,l=``;s.stdout?.on(`data`,e=>{c+=e.toString(`utf8`)}),s.stderr?.on(`data`,e=>{l+=e.toString(`utf8`)}),s.on(`error`,o),s.on(`exit`,e=>{if(e!==0){o(Error(`${i}: extractor --emit-json exited with code ${e}:\n${l}`));return}try{a(JSON.parse(c))}catch(e){o(Error(`${i}: extractor --emit-json produced invalid JSON (${e.message}):\n${c}`))}})})}exports.ensurePythonEnv=S,exports.resolvePythonPkgDir=p,exports.runExtractorEmitJson=C;

package/index.mjs

@@ -1,195 +1,214 @@
-import * as n from "node:fs";
-import * as H from "node:os";
-import * as r from "node:path";
-import { createHash as T } from "node:crypto";
-import { spawnSync as l, spawn as I } from "node:child_process";
-function O(e) {
-  const t = e ?? __dirname, o = r.resolve(t, "..", "..", "..", "python");
-  if (n.existsSync(r.join(o, "apigen_python")))
-    return o;
-  const s = r.join(t, "python");
-  if (n.existsSync(r.join(s, "apigen_python")))
-    return s;
-  let a = t;
-  for (let c = 0; c < 20; c++) {
-    const p = r.join(a, "packages", "apigen", "python");
-    if (n.existsSync(r.join(p, "apigen_python")))
-      return p;
-    const u = r.dirname(a);
-    if (u === a)
-      break;
-    a = u;
-  }
-  return o;
+import * as e from "node:fs";
+import * as t from "node:os";
+import * as n from "node:path";
+import { createHash as r } from "node:crypto";
+import { spawn as i, spawnSync as a } from "node:child_process";
+//#region src/lib/python-env.ts
+function o(t) {
+	let r = t ?? __dirname, i = n.resolve(r, "..", "..", "..", "python");
+	if (e.existsSync(n.join(i, "apigen_python"))) return i;
+	let a = n.join(r, "python");
+	if (e.existsSync(n.join(a, "apigen_python"))) return a;
+	let o = r;
+	for (let t = 0; t < 20; t++) {
+		let t = n.join(o, "packages", "apigen", "python");
+		if (e.existsSync(n.join(t, "apigen_python"))) return t;
+		let r = n.dirname(o);
+		if (r === o) break;
+		o = r;
+	}
+	return i;
 }
-const _ = ["python3.13", "python3.12", "python3.11", "python3"], m = [3, 11];
-function D(e) {
-  const t = l(e, ["-c", 'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")'], {
-    encoding: "utf8",
-    timeout: 15e3
-  });
-  if (t.status !== 0 || !t.stdout)
-    return;
-  const [o, s] = t.stdout.trim().split(".").map(Number);
-  if (!(!Number.isFinite(o) || !Number.isFinite(s)))
-    return [o, s];
+var s = [
+	"python3.13",
+	"python3.12",
+	"python3.11",
+	"python3"
+], c = [3, 11];
+function l(e) {
+	let t = a(e, ["-c", "import sys; print(f\"{sys.version_info[0]}.{sys.version_info[1]}\")"], {
+		encoding: "utf8",
+		timeout: 15e3
+	});
+	if (t.status !== 0 || !t.stdout) return;
+	let [n, r] = t.stdout.trim().split(".").map(Number);
+	if (Number.isFinite(n) && Number.isFinite(r)) return [n, r];
 }
-function F() {
-  for (const e of _) {
-    const t = D(e);
-    if (t && (t[0] > m[0] || t[0] === m[0] && t[1] >= m[1]))
-      return e;
-  }
-  throw new Error(
-    `apigen-python-env: no Python >= ${m.join(".")} found on PATH (tried: ${_.join(", ")}). Install Python ${m.join(".")}+ or set APIGEN_PYTHON to a provisioned interpreter.`
-  );
+function u() {
+	for (let e of s) {
+		let t = l(e);
+		if (t && (t[0] > c[0] || t[0] === c[0] && t[1] >= c[1])) return e;
+	}
+	throw Error(`apigen-python-env: no Python >= ${c.join(".")} found on PATH (tried: ${s.join(", ")}). Install Python ${c.join(".")}+ or set APIGEN_PYTHON to a provisioned interpreter.`);
 }
-function Y(e) {
-  return process.platform === "win32" ? r.join(e, "Scripts", "python.exe") : r.join(e, "bin", "python3");
+function d(e) {
+	return process.platform === "win32" ? n.join(e, "Scripts", "python.exe") : n.join(e, "bin", "python3");
 }
-function J(e) {
-  const t = n.readFileSync(r.join(e, "pyproject.toml"));
-  return T("sha256").update(t).digest("hex");
+function f(t) {
+	let i = e.readFileSync(n.join(t, "pyproject.toml"));
+	return r("sha256").update(i).digest("hex");
 }
-function k(e) {
-  try {
-    const t = JSON.parse(n.readFileSync(e, "utf8"));
-    if (typeof t.pyprojectHash == "string" && Array.isArray(t.extras))
-      return t;
-  } catch {
-  }
+function p(t) {
+	try {
+		let n = JSON.parse(e.readFileSync(t, "utf8"));
+		if (typeof n.pyprojectHash == "string" && Array.isArray(n.extras)) return n;
+	} catch {}
 }
-function G(e, t, o) {
-  const s = Date.now() + t;
-  for (; ; )
-    try {
-      n.mkdirSync(e, { recursive: !1 });
-      break;
-    } catch {
-      if (Date.now() > s) {
-        try {
-          n.rmdirSync(e);
-        } catch {
-        }
-        continue;
-      }
-      l(process.execPath, ["-e", "setTimeout(()=>{}, 250)"], { timeout: 5e3 });
-    }
-  try {
-    return o();
-  } finally {
-    try {
-      n.rmdirSync(e);
-    } catch {
-    }
-  }
+function m(t, n, r) {
+	let i = Date.now() + n;
+	for (;;) try {
+		e.mkdirSync(t, { recursive: !1 });
+		break;
+	} catch {
+		if (Date.now() > i) {
+			try {
+				e.rmdirSync(t);
+			} catch {}
+			continue;
+		}
+		a(process.execPath, ["-e", "setTimeout(()=>{}, 250)"], { timeout: 5e3 });
+	}
+	try {
+		return r();
+	} finally {
+		try {
+			e.rmdirSync(t);
+		} catch {}
+	}
 }
-function V(e = {}) {
-  const t = O(), o = process.env.APIGEN_PYTHON;
-  if (o) {
-    if (!n.existsSync(o))
-      throw new Error(`apigen-python-env: APIGEN_PYTHON points to a missing file: ${o}`);
-    return { python: o, venvDir: "", pythonPkgDir: t };
-  }
-  const s = [...new Set(e.extras ?? [])].sort(), a = e.envHome ?? process.env.APIGEN_PYENV_HOME ?? r.join(H.homedir(), ".adhd", "apigen"), c = r.join(a, "pyvenv"), p = r.join(c, ".apigen-stamp"), u = J(t), d = Y(c), h = () => {
-    if (!n.existsSync(d))
-      return !1;
-    const i = k(p);
-    return !i || i.pyprojectHash !== u ? !1 : s.every((y) => i.extras.includes(y));
-  };
-  if (h())
-    return { python: d, venvDir: c, pythonPkgDir: t };
-  n.mkdirSync(a, { recursive: !0 });
-  const v = r.join(a, "pyvenv.lock"), w = e.lockTimeoutMs ?? 3e5;
-  return G(v, w, () => {
-    if (h())
-      return { python: d, venvDir: c, pythonPkgDir: t };
-    const i = k(p), y = [.../* @__PURE__ */ new Set([...(i == null ? void 0 : i.extras) ?? [], ...s])].sort();
-    n.rmSync(c, { recursive: !0, force: !0 });
-    const x = F(), j = l(x, ["-m", "venv", c], { encoding: "utf8", timeout: 12e4 });
-    if (j.status !== 0)
-      throw new Error(
-        `apigen-python-env: "${x} -m venv" failed (exit ${j.status}):
-${j.stderr}`
-      );
-    const $ = r.join(t, "build");
-    n.existsSync($) && n.rmSync($, { recursive: !0, force: !0 });
-    for (const f of n.readdirSync(t))
-      f.endsWith(".egg-info") && n.rmSync(r.join(t, f), { recursive: !0, force: !0 });
-    const S = n.mkdtempSync(r.join(H.tmpdir(), "apigen-python-wheel-"));
-    try {
-      const f = l(
-        d,
-        ["-m", "pip", "wheel", "--no-deps", "--wheel-dir", S, t],
-        { encoding: "utf8", timeout: 6e5 }
-      );
-      if (f.status !== 0)
-        throw new Error(
-          `apigen-python-env: pip wheel failed (exit ${f.status}):
-${f.stderr}
-stdout:
-${f.stdout}`
-        );
-      const P = n.readdirSync(S).filter((b) => b.endsWith(".whl"));
-      if (P.length === 0)
-        throw new Error("apigen-python-env: pip wheel produced no .whl file");
-      const E = r.join(S, P[0]), N = y.length ? `${E}[${y.join(",")}]` : E, g = l(
-        d,
-        ["-m", "pip", "install", "--quiet", "--disable-pip-version-check", N],
-        { encoding: "utf8", timeout: 6e5 }
-      );
-      if (g.status !== 0)
-        throw new Error(
-          `apigen-python-env: pip install "${N}" failed (exit ${g.status}):
-${g.stderr}
-stdout:
-${g.stdout}`
-        );
-    } finally {
-      n.rmSync(S, { recursive: !0, force: !0 });
-    }
-    const A = { pyprojectHash: u, extras: y };
-    return n.writeFileSync(p, JSON.stringify(A)), { python: d, venvDir: c, pythonPkgDir: t };
-  });
+function h(r = {}) {
+	let i = o(), s = process.env.APIGEN_PYTHON;
+	if (s) {
+		if (!e.existsSync(s)) throw Error(`apigen-python-env: APIGEN_PYTHON points to a missing file: ${s}`);
+		return {
+			python: s,
+			venvDir: "",
+			pythonPkgDir: i
+		};
+	}
+	let c = [...new Set(r.extras ?? [])].sort(), l = r.envHome ?? process.env.APIGEN_PYENV_HOME ?? n.join(t.homedir(), ".adhd", "apigen"), h = n.join(l, "pyvenv"), g = n.join(h, ".apigen-stamp"), _ = f(i), v = d(h), y = () => {
+		if (!e.existsSync(v)) return !1;
+		let t = p(g);
+		return t?.pyprojectHash === _ && c.every((e) => t.extras.includes(e));
+	};
+	return y() ? {
+		python: v,
+		venvDir: h,
+		pythonPkgDir: i
+	} : (e.mkdirSync(l, { recursive: !0 }), m(n.join(l, "pyvenv.lock"), r.lockTimeoutMs ?? 3e5, () => {
+		if (y()) return {
+			python: v,
+			venvDir: h,
+			pythonPkgDir: i
+		};
+		let r = p(g), o = [.../* @__PURE__ */ new Set([...r?.extras ?? [], ...c])].sort();
+		e.rmSync(h, {
+			recursive: !0,
+			force: !0
+		});
+		let s = u(), l = a(s, [
+			"-m",
+			"venv",
+			h
+		], {
+			encoding: "utf8",
+			timeout: 12e4
+		});
+		if (l.status !== 0) throw Error(`apigen-python-env: "${s} -m venv" failed (exit ${l.status}):\n${l.stderr}`);
+		let d = n.join(i, "build");
+		e.existsSync(d) && e.rmSync(d, {
+			recursive: !0,
+			force: !0
+		});
+		for (let t of e.readdirSync(i)) t.endsWith(".egg-info") && e.rmSync(n.join(i, t), {
+			recursive: !0,
+			force: !0
+		});
+		let f = e.mkdtempSync(n.join(t.tmpdir(), "apigen-python-wheel-"));
+		try {
+			let t = a(v, [
+				"-m",
+				"pip",
+				"wheel",
+				"--no-deps",
+				"--wheel-dir",
+				f,
+				i
+			], {
+				encoding: "utf8",
+				timeout: 6e5
+			});
+			if (t.status !== 0) throw Error(`apigen-python-env: pip wheel failed (exit ${t.status}):\n${t.stderr}\nstdout:\n${t.stdout}`);
+			let r = e.readdirSync(f).filter((e) => e.endsWith(".whl"));
+			if (r.length === 0) throw Error("apigen-python-env: pip wheel produced no .whl file");
+			let s = n.join(f, r[0]), c = o.length ? `${s}[${o.join(",")}]` : s, l = a(v, [
+				"-m",
+				"pip",
+				"install",
+				"--quiet",
+				"--disable-pip-version-check",
+				c
+			], {
+				encoding: "utf8",
+				timeout: 6e5
+			});
+			if (l.status !== 0) throw Error(`apigen-python-env: pip install "${c}" failed (exit ${l.status}):\n${l.stderr}\nstdout:\n${l.stdout}`);
+		} finally {
+			e.rmSync(f, {
+				recursive: !0,
+				force: !0
+			});
+		}
+		let m = {
+			pyprojectHash: _,
+			extras: o
+		};
+		return e.writeFileSync(g, JSON.stringify(m)), {
+			python: v,
+			venvDir: h,
+			pythonPkgDir: i
+		};
+	}));
 }
-function q(e, t, o, s, a) {
-  return new Promise((c, p) => {
-    var v, w;
-    const u = I(
-      e,
-      ["-m", "apigen_python.extractor", o, "--namespace", s, "--emit-json"],
-      {
-        cwd: t,
-        env: { ...process.env, PYTHONPATH: t },
-        stdio: ["ignore", "pipe", "pipe"]
-      }
-    );
-    let d = "", h = "";
-    (v = u.stdout) == null || v.on("data", (i) => {
-      d += i.toString("utf8");
-    }), (w = u.stderr) == null || w.on("data", (i) => {
-      h += i.toString("utf8");
-    }), u.on("error", p), u.on("exit", (i) => {
-      if (i !== 0) {
-        p(new Error(`${a}: extractor --emit-json exited with code ${i}:
-${h}`));
-        return;
-      }
-      try {
-        c(JSON.parse(d));
-      } catch (y) {
-        p(
-          new Error(
-            `${a}: extractor --emit-json produced invalid JSON (${y.message}):
-${d}`
-          )
-        );
-      }
-    });
-  });
+//#endregion
+//#region src/lib/run-extractor.ts
+function g(e, t, n, r, a) {
+	return new Promise((o, s) => {
+		let c = i(e, [
+			"-m",
+			"apigen_python.extractor",
+			n,
+			"--namespace",
+			r,
+			"--emit-json"
+		], {
+			cwd: t,
+			env: {
+				...process.env,
+				PYTHONPATH: t
+			},
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		}), l = "", u = "";
+		c.stdout?.on("data", (e) => {
+			l += e.toString("utf8");
+		}), c.stderr?.on("data", (e) => {
+			u += e.toString("utf8");
+		}), c.on("error", s), c.on("exit", (e) => {
+			if (e !== 0) {
+				s(/* @__PURE__ */ Error(`${a}: extractor --emit-json exited with code ${e}:\n${u}`));
+				return;
+			}
+			try {
+				o(JSON.parse(l));
+			} catch (e) {
+				s(/* @__PURE__ */ Error(`${a}: extractor --emit-json produced invalid JSON (${e.message}):\n${l}`));
+			}
+		});
+	});
 }
-export {
-  V as ensurePythonEnv,
-  O as resolvePythonPkgDir,
-  q as runExtractorEmitJson
-};
+//#endregion
+export { h as ensurePythonEnv, o as resolvePythonPkgDir, g as runExtractorEmitJson };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhd/apigen-python-env",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "main": "./index.js",
   "module": "./index.mjs",
   "types": "./index.d.ts",
@@ -12,9 +12,19 @@
     "provisioning"
   ],
   "dependencies": {
-    "@adhd/apigen-core-client": "^0.3.0"
+    "@adhd/apigen-core-client": "^0.3.2"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/PseudoSky/adhd.git",
+    "directory": "packages/apigen/python-env"
+  },
+  "homepage": "https://github.com/PseudoSky/adhd/tree/main/packages/apigen/python-env#readme",
+  "bugs": {
+    "url": "https://github.com/PseudoSky/adhd/issues"
   }
 }

package/python/apigen_python/flask_server.py

@@ -434,11 +434,12 @@ def _resolve_batch_concurrency(mode: str, requested: Any, item_count: int) -> in
 def _dispatch_batch(
     state: _ServerState, body: dict[str, Any], envelope: dict[str, Any]
 ) -> list[dict[str, Any]]:
-    """Fan out `body['items']` to the real operation `body['operation']` —
-    the Python host's OWN executor against BATCH_0.0.1.md §5's wire contract
-    (LEFT column only; this function is never a call into the TS
-    `invokeBatch`). Implements the architect-reviewed design's binding fixes
-    (`tmp/apigen-batch-python-design.md` §3.5):
+    """Fan out `body['input']['items']` to the real operation
+    `body['input']['operation']` — the Python host's OWN executor against
+    BATCH_0.0.1.md §5's wire contract (LEFT column only; this function is
+    never a call into the TS `invokeBatch`). Implements the
+    architect-reviewed design's binding fixes (`tmp/apigen-batch-python-design.md`
+    §3.5):
 
     - F2: `mode` branching — `parallel` uses a bounded `ThreadPoolExecutor`;
       `serial`/`chained` use a plain sequential loop; `chained` additionally
@@ -455,13 +456,32 @@ def _dispatch_batch(
     - F5: every rejected result's `reason` is a real `ApiError(...).to_json()`
       using an existing `errors.py` taxonomy code.
 
+    BUG-APIGEN-CLI-002: every batch control-plane field (`operation`,
+    `items`, `concurrency`, `mode`, `onItemError`, `itemTimeoutMs`) now nests
+    under one top-level `input` object on the wire — `batch.ts`'s
+    `branchInputSchema` matches every other apigen-mounted operation's
+    single-JSON-blob convention. `@adhd/apigen-plugin-batch`'s
+    `parseBatchRequest` already unwraps this one extra level (its own doc
+    comment: "Unwrap that one extra level here — the only call site that
+    reads this shape."); this Python host is a SECOND call site reading the
+    same wire shape and must unwrap identically, never operate on the raw
+    top-level `body`.
+
     Raises:
-        ApiError: for whole-request-level rejections (bad `operation`,
-            unsupported `itemTimeoutMs`, malformed `items`/`mode`/
-            `onItemError`/`concurrency`) — the caller maps this to a real
-            HTTP 4xx via `_send_error`, the SAME mechanism every other route
-            on this server already uses.
+        ApiError: for whole-request-level rejections (missing/malformed
+            `input`, bad `operation`, unsupported `itemTimeoutMs`, malformed
+            `items`/`mode`/`onItemError`/`concurrency`) — the caller maps
+            this to a real HTTP 4xx via `_send_error`, the SAME mechanism
+            every other route on this server already uses.
     """
+    input_raw = body.get("input")
+    if not isinstance(input_raw, dict):
+        raise ApiError(
+            "invalid_argument",
+            '"input" must be an object containing {operation, items, ...}',
+        )
+    body = input_raw
+
     # F3 — reject the WHOLE batch upfront; never a silently-weaker
     # wait-only guarantee under the same field name TS uses for real
     # cancellation.