@clickzetta/cz-cli 0.3.58 → 0.3.60

package/bin/platform.js

@@ -133,10 +133,15 @@ async function installFromNpmRegistry({
 } = {}) {
   const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), "cz-cli-npm-pack-"));
 
+  const cleanEnv = Object.fromEntries(
+    Object.entries(process.env).filter(([k]) => !k.startsWith("npm_")),
+  );
+
   try {
     const packed = execFileSync("npm", ["pack", `${packageName}@${version}`, "--silent"], {
       cwd: tempRoot,
       encoding: "utf-8",
+      env: cleanEnv,
       stdio: ["ignore", "pipe", "pipe"],
     })
       .trim()
@@ -171,16 +176,34 @@ async function ensureInstalledBinary({
 } = {}) {
   if (!spec) throw new Error(`Unsupported platform/arch: ${os.platform()}/${os.arch()}`);
 
+  const resolveFn = resolvePackageDirOverride || resolvePackageDir;
+
   if (!force) {
     const installed = resolveInstalledBinary({
       spec,
       fallbackRoot,
-      resolvePackageDirFn: resolvePackageDirOverride || resolvePackageDir,
+      resolvePackageDirFn: resolveFn,
       existsSync,
     });
     if (installed) return installed;
   }
 
+  // When force is true, still prefer the optionalDependency package if its
+  // version matches — avoids a nested npm pack call that can fail inside
+  // postinstall (inherited npm env/lock conflicts).
+  if (force) {
+    const pkgDir = resolveFn(spec);
+    if (pkgDir) {
+      try {
+        const pkgJson = JSON.parse(fs.readFileSync(path.join(pkgDir, "package.json"), "utf-8"));
+        if (pkgJson.version === version) {
+          const packaged = resolveBinaryFromRoot(path.join(pkgDir, "bin"), spec, existsSync);
+          if (packaged) return { ...packaged, source: "package" };
+        }
+      } catch {}
+    }
+  }
+
   const destinationDir = path.join(fallbackRoot, `${spec.platform}-${spec.arch}`);
   fs.rmSync(destinationDir, { recursive: true, force: true });
   fs.mkdirSync(destinationDir, { recursive: true });

package/bin/postinstall.js

@@ -24,9 +24,9 @@ async function main() {
   const spec = getPlatformSpec();
   if (!spec) return;
 
-  // Always force re-install during postinstall to ensure the platform binary
-  // matches the version being installed. Without this, npm may keep a stale
-  // optionalDependency binary from a previous version.
+  // Force re-install to ensure the platform binary matches the version being
+  // installed. ensureInstalledBinary will prefer the optionalDependency package
+  // when available, falling back to npm pack only when necessary.
   const installed = await ensureInstalledBinary({
     spec,
     version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickzetta/cz-cli",
-  "version": "0.3.58",
+  "version": "0.3.60",
   "description": "AI-Agent-friendly CLI for ClickZetta Lakehouse",
   "bin": {
     "cz-cli": "bin/run.js"
@@ -12,11 +12,11 @@
     "bin/"
   ],
   "optionalDependencies": {
-    "@clickzetta/cz-cli-darwin-arm64": "0.3.58",
-    "@clickzetta/cz-cli-darwin-x64": "0.3.58",
-    "@clickzetta/cz-cli-linux-arm64": "0.3.58",
-    "@clickzetta/cz-cli-linux-x64": "0.3.58",
-    "@clickzetta/cz-cli-win32-x64": "0.3.58"
+    "@clickzetta/cz-cli-darwin-arm64": "0.3.60",
+    "@clickzetta/cz-cli-darwin-x64": "0.3.60",
+    "@clickzetta/cz-cli-linux-arm64": "0.3.60",
+    "@clickzetta/cz-cli-linux-x64": "0.3.60",
+    "@clickzetta/cz-cli-win32-x64": "0.3.60"
   },
   "license": "MIT",
   "repository": {