@polderlabs/bizar 5.6.0-beta.12 → 5.6.0-beta.13

package/cli/provision.mjs

@@ -40,7 +40,16 @@ import chalk from 'chalk';
 import { execSync, spawn, spawnSync } from 'node:child_process';
 import { existsSync, readFileSync, readdirSync, rmSync, writeFileSync, mkdirSync, statSync, copyFileSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { join, dirname, sep } from 'node:path';
+import { join as _origJoin, dirname, sep } from 'node:path';
+// Debug: throw with stack trace if a Dirent sneaks into path.join
+function join(...args) {
+  for (const a of args) {
+    if (a && typeof a === 'object' && a.constructor && a.constructor.name === 'Dirent') {
+      console.error('Dirent passed to join:', a.name, 'stack:', new Error().stack.split('\n').slice(0, 8).join('\n  '));
+    }
+  }
+  return _origJoin(...args);
+}
 import { fileURLToPath } from 'node:url';
 import { bizarConfigDir } from './utils.mjs';
 
@@ -259,11 +268,40 @@ export function writeInstallMarker({ version, repoPath, serviceUnit }) {
  */
 export function detectState({ cwd = process.cwd() } = {}) {
   // ── npm-global package location ─────────────────────────────────────
+  // Try multiple strategies because `npm root -g` doesn't always
+  // respect NPM_CONFIG_PREFIX (notably when npm is installed by the
+  // system package manager on Debian/Ubuntu).
   let globalRoot = null;
+  const npmRootCandidates = [];
+
+  // 1. Honour the user's explicit env override first.
+  if (process.env.NPM_CONFIG_PREFIX) {
+    npmRootCandidates.push(join(process.env.NPM_CONFIG_PREFIX, 'lib', 'node_modules'));
+  }
+  // 2. Honour NPM_CONFIG_GLOBAL_PREFIX (set by `npm -g`).
+  if (process.env.NPM_CONFIG_GLOBAL_PREFIX) {
+    npmRootCandidates.push(join(process.env.NPM_CONFIG_GLOBAL_PREFIX, 'lib', 'node_modules'));
+  }
+  // 3. The classic `npm root -g` query (works on most distros).
   try {
-    globalRoot = execSync('npm root -g', { stdio: ['ignore', 'pipe', 'ignore'] })
+    const r = execSync('npm root -g', { stdio: ['ignore', 'pipe', 'ignore'] })
       .toString().trim();
+    if (r) npmRootCandidates.push(r);
   } catch { /* ignore */ }
+  // 4. Common distro defaults.
+  npmRootCandidates.push('/usr/local/lib/node_modules');
+  npmRootCandidates.push('/usr/lib/node_modules');
+
+  // Pick the first candidate that actually has @polderlabs/bizar.
+  for (const candidate of npmRootCandidates) {
+    if (existsSync(join(candidate, '@polderlabs', 'bizar'))) {
+      globalRoot = candidate;
+      break;
+    }
+  }
+  // Fall back to the first candidate (even if it doesn't have the
+  // package) so downstream code can produce a clean error message.
+  if (!globalRoot) globalRoot = npmRootCandidates[0] ?? null;
 
   const pkgRoot = globalRoot ? join(globalRoot, '@polderlabs', 'bizar') : null;
   const pkgVersion = globalRoot ? currentVersion(PKG_MAIN) : null;
@@ -515,7 +553,11 @@ export async function ensureNpmPackage(pkg, { mode, dryRun, force }) {
   // processes are reading files inside the npm-global install dir. We
   // can't replace those files atomically while they're open. The caller
   // is expected to have already killed them via ensureInstancesKilled().
-  const r = spawnSync('npm', ['install', '-g', `${pkg}@latest`], { stdio: 'inherit', timeout: 600000 });
+  const npmArgs = ['install', '-g', `${pkg}@latest`];
+  if (process.env.NPM_CONFIG_PREFIX) {
+    npmArgs.push('--prefix', process.env.NPM_CONFIG_PREFIX);
+  }
+  const r = spawnSync('npm', npmArgs, { stdio: 'inherit', timeout: 600000 });
   if (r.status === null && r.error?.code === 'ETIMEDOUT') {
     return { ok: false, message: `${pkg} install timed out after 10 minutes`, installed: current };
   }
@@ -543,7 +585,11 @@ export async function updateClineCli({ dryRun, force }) {
     return { ok: true, message: 'cline updated via `cline upgrade`' };
   }
   console.log(chalk.dim('  cline upgrade not available; falling back to npm'));
-  const r2 = spawnSync('npm', ['install', '-g', 'cline@latest'], { stdio: 'inherit', timeout: 600000 });
+  const npm2Args = ['install', '-g', 'cline@latest'];
+  if (process.env.NPM_CONFIG_PREFIX) {
+    npm2Args.push('--prefix', process.env.NPM_CONFIG_PREFIX);
+  }
+  const r2 = spawnSync('npm', npm2Args, { stdio: 'inherit', timeout: 600000 });
   if (r2.status === null && r2.error?.code === 'ETIMEDOUT') {
     return { ok: false, message: 'cline install timed out after 10 minutes' };
   }
@@ -683,9 +729,9 @@ function pluginContentMatches(src, dest) {
     if (!sEntries) return false;
     // src should not have files missing from dest
     for (const e of sEntries) {
-      if (skipDirs.has(e)) continue;
-      const sFull = join(s, e);
-      const dFull = join(d, e);
+      if (skipDirs.has(e.name)) continue;
+      const sFull = join(s, e.name);
+      const dFull = join(d, e.name);
       try {
         const sSt = statSync(sFull);
         if (sSt.isDirectory()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polderlabs/bizar",
-  "version": "5.6.0-beta.12",
+  "version": "5.6.0-beta.13",
   "description": "Norse-pantheon multi-agent system for cline — 13 agents across 4 cost tiers with cost-aware routing, plans, and a configurable agent harness. v4 ships as a single npm package bundling the dashboard server, cline plugin, and typed SDK.",
   "type": "module",
   "bin": {

package/packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polderlabs/bizar-sdk",
-  "version": "0.2.0-beta.12",
+  "version": "0.2.0-beta.13",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",