@zenithbuild/cli 0.6.7 → 0.6.9

package/dist/toolchain-paths.js

@@ -8,6 +8,24 @@ const CLI_ROOT = resolve(__dirname, '..');
 const localRequire = createRequire(import.meta.url);
 const IS_WINDOWS = process.platform === 'win32';
 const COMPILER_BRIDGE_RUNNER = resolve(__dirname, 'compiler-bridge-runner.js');
+const BUNDLER_PLATFORM_PACKAGES = {
+    'darwin-arm64': {
+        packageName: '@zenithbuild/bundler-darwin-arm64',
+        binaryName: 'zenith-bundler'
+    },
+    'darwin-x64': {
+        packageName: '@zenithbuild/bundler-darwin-x64',
+        binaryName: 'zenith-bundler'
+    },
+    'linux-x64': {
+        packageName: '@zenithbuild/bundler-linux-x64',
+        binaryName: 'zenith-bundler'
+    },
+    'win32-x64': {
+        packageName: '@zenithbuild/bundler-win32-x64',
+        binaryName: 'zenith-bundler.exe'
+    }
+};
 function safeCreateRequire(projectRoot) {
     if (!projectRoot) {
         return localRequire;
@@ -68,6 +86,9 @@ function createCompilerBridgeCandidate(modulePath) {
         argsPrefix: [COMPILER_BRIDGE_RUNNER, '--bridge-module', modulePath]
     };
 }
+function currentBundlerPlatformPackage() {
+    return BUNDLER_PLATFORM_PACKAGES[`${process.platform}-${process.arch}`] || null;
+}
 export function resolveBinary(candidates) {
     for (const candidate of candidates) {
         const path = typeof candidate === 'string' ? candidate : candidate.path;
@@ -163,6 +184,13 @@ export function bundlerCommandCandidates(projectRoot = null, env = process.env)
             explicit: true
         });
     }
+    const platformPackage = currentBundlerPlatformPackage();
+    if (platformPackage) {
+        const platformPackageRoot = resolvePackageRoot(platformPackage.packageName, projectRoot);
+        if (platformPackageRoot) {
+            candidates.push(createBinaryCandidate('bundler', 'installed platform package binary', resolve(platformPackageRoot, 'bin', platformPackage.binaryName)));
+        }
+    }
     const installedRoot = resolvePackageRoot('@zenithbuild/bundler', projectRoot);
     if (installedRoot) {
         candidates.push(createBinaryCandidate('bundler', 'installed package binary', resolve(installedRoot, 'target/release/zenith-bundler')));

package/dist/toolchain-runner.js

@@ -53,6 +53,14 @@ function emitFallbackWarning(toolchain, nextCandidate) {
     FALLBACK_LOG_KEYS.add(onceKey);
     console.warn(message);
 }
+function missingToolchainError(toolchain) {
+    if (toolchain.tool === 'bundler') {
+        return new Error(`[zenith] Bundler binary not installed for ${process.platform}/${process.arch}. ` +
+            'Reinstall @zenithbuild/bundler or ensure optional dependency installed.');
+    }
+    return new Error(`[zenith] ${toolchain.tool} binary not installed for ${currentPlatformLabel()}; ` +
+        `reinstall or set ${toolEnvVar(toolchain.tool)}=...`);
+}
 function incompatibleBinaryError(toolchain) {
     return new Error(`[zenith] ${toolchain.tool} binary is incompatible for ${currentPlatformLabel()}; ` +
         `reinstall or set ${toolEnvVar(toolchain.tool)}=...`);
@@ -115,6 +123,14 @@ export function ensureToolchainCompatibility(toolchain, probeArgs = ['--version'
         if (!candidate) {
             break;
         }
+        if (!candidateExists(candidate)) {
+            const nextIndex = findNextFallbackIndex(toolchain, probeArgs);
+            if (nextIndex === -1) {
+                throw missingToolchainError(toolchain);
+            }
+            toolchain.activeIndex = nextIndex;
+            continue;
+        }
         if (!candidateSupportsArgs(candidate, probeArgs)) {
             const nextIndex = findNextFallbackIndex(toolchain, probeArgs);
             if (nextIndex === -1) {
@@ -138,7 +154,7 @@ export function ensureToolchainCompatibility(toolchain, probeArgs = ['--version'
         toolchain.activeIndex = nextIndex;
         emitFallbackWarning(toolchain, toolchain.candidates[nextIndex]);
     }
-    throw incompatibleBinaryError(toolchain);
+    throw missingToolchainError(toolchain);
 }
 export function runToolchainSync(toolchain, args, spawnOptions = { encoding: 'utf8' }) {
     while (toolchain.activeIndex < toolchain.candidates.length) {
@@ -146,6 +162,14 @@ export function runToolchainSync(toolchain, args, spawnOptions = { encoding: 'ut
         if (!candidate) {
             break;
         }
+        if (!candidateExists(candidate)) {
+            const nextIndex = findNextFallbackIndex(toolchain, args);
+            if (nextIndex === -1) {
+                throw missingToolchainError(toolchain);
+            }
+            toolchain.activeIndex = nextIndex;
+            continue;
+        }
         if (!candidateSupportsArgs(candidate, args)) {
             const nextIndex = findNextFallbackIndex(toolchain, args);
             if (nextIndex === -1) {
@@ -166,5 +190,5 @@ export function runToolchainSync(toolchain, args, spawnOptions = { encoding: 'ut
         toolchain.activeIndex = nextIndex;
         emitFallbackWarning(toolchain, toolchain.candidates[nextIndex]);
     }
-    throw incompatibleBinaryError(toolchain);
+    throw missingToolchainError(toolchain);
 }

package/dist/ui/format.js

@@ -2,7 +2,7 @@ import pc from 'picocolors';
 import { relative, sep } from 'node:path';
 const DEFAULT_PHASE = 'cli';
 const DEFAULT_FILE = '.';
-const DEFAULT_HINT_BASE = 'https://github.com/zenithbuild/zenith/blob/main/zenith-cli/CLI_CONTRACT.md';
+const DEFAULT_HINT_BASE = 'https://github.com/zenithbuild/framework/blob/master/packages/cli/CLI_CONTRACT.md';
 const PREFIX = '[zenith]';
 const TAG_WIDTH = 6;
 const TAG_COLORS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/cli",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Deterministic project orchestrator for Zenith framework",
   "license": "MIT",
   "type": "module",
@@ -34,7 +34,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@zenithbuild/compiler": "0.6.7",
+    "@zenithbuild/compiler": "0.6.9",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {