@gradial/aci 0.1.33 → 0.1.34

package/bin/aci.js

@@ -23,7 +23,7 @@ const platformKey = `${process.platform}-${process.arch}`;
 const packageName = platformPackages[platformKey];
 
 if (!packageName) {
-  console.error(`Unsupported platform for gradial-aci: ${platformKey}`);
+  console.error(`Unsupported platform for aci: ${platformKey}`);
   process.exit(1);
 }
 
@@ -36,57 +36,86 @@ if (argv[0] === 'init') {
   process.exit(0);
 }
 
-function resolveBundledBinary() {
-  const binaryPath = join(shimDir, `aci-${platformKey}${process.platform === 'win32' ? '.exe' : ''}`);
-  if (existsSync(binaryPath)) return binaryPath;
-  // Local development fallback for packages built before platform-suffixed bins.
-  const legacyPath = join(shimDir, binName);
-  return existsSync(legacyPath) ? legacyPath : null;
-}
+// ── Binary resolution ──────────────────────────────────────────────
+//
+// Resolution order (no fallback chain — exactly one path wins):
+//
+// 1. ACI_CLI_BIN env var — explicit override for debugging / CI.
+// 2. Platform npm package — the published distribution channel.
+//    Resolved via require.resolve('$packageName/package.json').
+// 3. Monorepo workspace — for local development inside this repo.
+//    Looks at packages/cli-<platform>/bin/<binary>.
+// 4. `go run` dev fallback — when working on the Go CLI source
+//    inside this monorepo and no binary has been built yet.
+
+function resolveBinary() {
+  // 1. Explicit override
+  const envBin = process.env.ACI_CLI_BIN;
+  if (envBin) {
+    if (!existsSync(envBin)) {
+      console.error(`ACI_CLI_BIN points to ${envBin} but it does not exist.`);
+      process.exit(1);
+    }
+    return { kind: 'binary', path: envBin };
+  }
 
-function resolvePackagedBinary() {
+  // 2. Platform npm package (installed via optionalDependencies)
   try {
     const packageJsonPath = require.resolve(`${packageName}/package.json`);
     const binaryPath = join(dirname(packageJsonPath), 'bin', binName);
-
-    return existsSync(binaryPath) ? binaryPath : null;
+    if (existsSync(binaryPath)) {
+      return { kind: 'binary', path: binaryPath };
+    }
   } catch {
-    return null;
+    // Not installed — continue
   }
-}
 
-function resolveWorkspaceBinary() {
-  const binaryPath = resolve(repoRoot, 'packages', `cli-${platformKey}`, 'bin', binName);
+  // 3. Monorepo workspace (local dev: binary built by ./scripts/build-cli.sh)
+  const workspaceBin = resolve(repoRoot, 'packages', `cli-${platformKey}`, 'bin', binName);
+  if (existsSync(workspaceBin)) {
+    return { kind: 'binary', path: workspaceBin };
+  }
 
-  return existsSync(binaryPath) ? binaryPath : null;
-}
+  // 4. Go run fallback (monorepo dev without a built binary)
+  const goModPath = join(repoRoot, 'go.mod');
+  const commandDir = join(repoRoot, 'cmd', 'aci');
+  if (existsSync(goModPath) && existsSync(commandDir)) {
+    return {
+      kind: 'go-run',
+      command: 'go',
+      args: ['run', './cmd/aci', ...normalizeArgsForGoFallback(argv)],
+      cwd: repoRoot,
+    };
+  }
 
-const binaryPath = resolveBundledBinary() ?? resolvePackagedBinary() ?? resolveWorkspaceBinary();
-if (binaryPath) {
-  try { chmodSync(binaryPath, 0o755); } catch {}
+  return null;
 }
-const fallback = binaryPath ? null : resolveGoFallback();
 
-if (!binaryPath && !fallback) {
+const resolved = resolveBinary();
+
+if (!resolved) {
   console.error(
-    [
-      `Could not find the aci binary for ${platformKey}.`,
-      `Install ${packageName} or build the local CLI package with ./scripts/build-cli.sh.`,
-    ].join(' '),
+    `Platform package ${packageName} is not installed.\n` +
+    `Install it with: npm install ${packageName}\n` +
+    `Or, if using the @gradial/aci SDK, ensure optionalDependencies resolved for your platform.`,
   );
   process.exit(1);
 }
 
-const child = binaryPath
-  ? spawn(binaryPath, argv, {
+if (resolved.kind === 'binary') {
+  try { chmodSync(resolved.path, 0o755); } catch {}
+}
+
+const child = resolved.kind === 'binary'
+  ? spawn(resolved.path, argv, {
       env: {
         ...process.env,
         ACI_PACKAGE_ROOT: resolve(shimDir, '..'),
       },
       stdio: 'inherit',
     })
-  : spawn(fallback.command, fallback.args, {
-      cwd: fallback.cwd,
+  : spawn(resolved.command, resolved.args, {
+      cwd: resolved.cwd,
       env: {
         ...process.env,
         ACI_PACKAGE_ROOT: resolve(shimDir, '..'),
@@ -95,7 +124,7 @@ const child = binaryPath
     });
 
 child.on('error', (error) => {
-  console.error(`Failed to run gradial-aci: ${error.message}`);
+  console.error(`Failed to run aci: ${error.message}`);
   process.exit(1);
 });
 
@@ -108,21 +137,6 @@ child.on('exit', (code, signal) => {
   process.exit(code ?? 1);
 });
 
-function resolveGoFallback() {
-  const goModPath = join(repoRoot, 'go.mod');
-  const commandDir = join(repoRoot, 'cmd', 'aci');
-
-  if (!existsSync(goModPath) || !existsSync(commandDir)) {
-    return null;
-  }
-
-  return {
-    command: 'go',
-    args: ['run', './cmd/aci', ...normalizeArgsForGoFallback(argv)],
-    cwd: repoRoot,
-  };
-}
-
 function normalizeArgsForGoFallback(args) {
   const pathFlags = new Set(['-s', '--site-dir', '--content', '--out']);
   const normalized = [];

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@gradial/aci",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "bin/aci.js",
-    "bin/aci-*",
     "src/cli/*.mjs",
     "src/types/*.ts",
     "templates/common",
@@ -95,7 +94,7 @@
     "build:cli": "cd ../.. && ./scripts/build-cli.sh",
     "generate-starters": "cd ../.. && tsx scripts/generate-starters.ts",
     "compile-registry": "tsx src/cli/compile-registry.mjs",
-    "prepack": "npm run generate-starters && npm run build && npm run build:cli && node scripts/ensure-bin-modes.mjs"
+    "prepack": "npm run generate-starters && npm run build && node scripts/ensure-bin-modes.mjs"
   },
   "dependencies": {
     "markdown-it": "^14.1.0",
@@ -134,5 +133,13 @@
     "tsx": "^4.20.0",
     "typescript": "^5.9.3",
     "zod": "^4.0.0"
+  },
+  "optionalDependencies": {
+    "@gradial/aci-cli-darwin-arm64": "0.1.34",
+    "@gradial/aci-cli-darwin-x64": "0.1.34",
+    "@gradial/aci-cli-linux-arm64": "0.1.34",
+    "@gradial/aci-cli-linux-x64": "0.1.34",
+    "@gradial/aci-cli-win32-arm64": "0.1.34",
+    "@gradial/aci-cli-win32-x64": "0.1.34"
   }
 }