@polderlabs/bizar 4.4.6 → 4.4.7

package/cli/bin.mjs

@@ -153,59 +153,68 @@ function showExportHelp() {
 
 function showInstallHelp() {
   console.log(`
-  bizar install — Run the canonical BizarHarness installer
+  bizar install — Run the unified BizarHarness installer
 
   Usage:
-    bizar install
+    bizar install                 Install (or refresh) every component
+    bizar install --dry-run       Print what would happen, change nothing
+    bizar install --force         Overwrite existing files
+    bizar install --help          Show this help
 
   Description:
-    v3.20.11+ — thin wrapper around ./install.sh. The bash script
-    auto-installs every system dep (uv, python3.12, chrome-headless-shell
-    + runtime libs, jq), installs browser-harness via uv, syncs agents /
-    commands / hooks / skills into ~/.config/opencode/, configures
-    opencode.json + the Bizar plugin, and prints a single status banner.
-
-    No API key collection, no interactive prompts, no opencode restart —
-    the installer is safe to re-run anytime.
-
-    Run from a fresh git clone instead: \`cd BizarHarness && ./install.sh\`
+    v4.4.7+ — unified installer. Same code path as 'bizar update'; the
+    difference is just mode=install vs mode=update. Every step is
+    idempotent — running this twice is safe.
+
+    1. Installs @polderlabs/bizar via npm (skipped if already current).
+    2. Shells to ./install.sh for platform-specific system deps (uv,
+       python3.12, jq, gh on Linux; brew on macOS) + service registration
+       (systemd / launchd / Task Scheduler).
+    3. Syncs agent files, slash commands, and bundled skills into
+       ~/.config/opencode/.
+    4. Copies plugins/bizar/ from the npm install into
+       ~/.config/opencode/plugins/bizar/ (preserves dev symlinks).
+    5. Patches ~/.config/opencode/opencode.json with the Bizar plugin
+       entry (skipped if already present).
+    6. Runs 'bizar doctor' as a post-install health check.
+
+    No API key collection, no interactive prompts.
   `);
 }
 
 function showUpdateHelp() {
   console.log(`
-  bizar update — Update opencode, bizar, bizar-dash, and/or bizar-plugin
+  bizar update — Update opencode + @polderlabs/bizar (which bundles the
+  plugin and dashboard). Detects what's installed and only touches what's
+  missing or out of date.
 
   Usage:
     bizar update                       Update EVERYTHING (default; auto-kills + restarts)
-    bizar update --pick                Interactive picker (legacy per-component UI)
-    bizar update opencode bizar dash    Update specific components
     bizar update --no-restart          Don't auto-restart the dashboard after update
     bizar update --dry-run             Print what would happen, change nothing
+    bizar update --force               Override .bizar/PRE_PUSH_NOTES.md blockers
+    bizar update --yes                 Same as --force, but named for one-line scripts
     bizar update --help                Show this help
 
-  Components:
-    opencode   the opencode CLI itself
-    bizar      @polderlabs/bizar (this CLI + installer + agents + rules)
-    dash       @polderlabs/bizar-dash (web dashboard + TUI)
-    plugin     @polderlabs/bizar-plugin (opencode plugin)
+  Components updated:
+    opencode-ai   the opencode CLI itself
+    @polderlabs/bizar    this CLI + dashboard + plugin (one package)
 
-  Behavior (v3.15.0+):
-    • Default = automatic. Updates all 4 components without prompting.
-      Any missing package is auto-installed so a broken install gets
-      repaired in one shot.
+  Behavior (v4.4.7+):
+    • Single unified provisioner. 'bizar install' and 'bizar update' are
+      the same code path with different mode flags. Every step is
+      idempotent — re-running is safe.
     • Detects running Bizar instances (background service daemon, web
       dashboard) by reading ~/.config/bizar/{service,dashboard}.pid and
       cleans up any stale or empty PID files.
-    • Auto-kills running instances with a brief notice (use --pick to
-      be prompted first instead).
+    • Auto-kills running instances with a brief notice.
     • Sends SIGTERM, waits up to 5s, escalates to SIGKILL if needed.
     • Re-runs the install script so the deployed plugin source matches
       the just-upgraded npm version (avoids the version-skew trap).
-    • If the dashboard was running and bizar or dash was updated,
-      spawns a fresh detached dashboard process with the new code
-      (skipped with --no-restart).
-    • Runs \`bizar doctor\` after a successful update to catch config
+    • If the dashboard was running and bizar was updated, spawns a
+      fresh detached dashboard process with the new code (skipped with
+      --no-restart).
+    • Runs 'bizar doctor' after a successful update to catch config
       regressions before opencode tries to start.
 
   Examples:

package/cli/install.mjs

@@ -203,60 +203,22 @@ export async function installPluginFromGlobal(opts = {}) {
 }
 
 /**
- * runInstaller — v3.20.11 thin wrapper.
+ * runInstaller — v4.4.7 thin wrapper around the unified provisioner.
  *
- * As of v3.20.11, `bizar install` is a thin wrapper around the canonical
- * `install.sh` script at the repo root. The bash script handles all the
- * heavy lifting: system-dep installation (uv, python3.12, chrome-headless-shell
- * + runtime libs, jq), browser-harness via uv, Chrome lifecycle, agent /
- * command / hook / skill sync, opencode.json merging, install-state.
+ * `bizar install` and `bizar update` are now the SAME code path with
+ * different `mode` flags. Everything (deps, plugin copy, opencode.json
+ * patching, service registration, agent files, skills, doctor) is
+ * owned by `cli/provision.mjs:runProvision`. This file just parses the
+ * flags and forwards.
  *
- * Why a thin wrapper instead of the old TUI:
- *   - One source of truth. The bash script is also what `git clone` users
- *     run (`./install.sh`), what `bizar update` re-runs, and what the npm
- *     postinstall hook invokes. Keeping a parallel Node implementation
- *     guarantees the two will diverge.
- *   - No interactive prompts. The TUI asked for API keys, restart
- *     confirmation, and component selection — none of which belong in a
- *     `npm i -g @polderlabs/bizar` install (no TTY, secrets stay local).
- *   - Cross-platform. The bash script already detects Windows and falls
- *     back to the npm-based path; re-implementing that in Node is busywork.
- *
- * Returns the install.sh exit code (0 = success, 1 = partial failure).
- * On platforms where bash isn't available (rare — Windows without WSL),
- * falls back to running the npm-based path directly.
+ * Backward-compatible — the public exports (`runInstaller`,
+ * `runPostInstall`, `installPluginFromGlobal`) still exist so that any
+ * external callers (including the postinstall npm hook) keep working.
+ * New code should call `runProvision({ mode: 'install' })` directly.
  */
-export async function runInstaller() {
-  const { existsSync } = await import('node:fs');
-  const { join } = await import('node:path');
-  const { spawnSync } = await import('node:child_process');
-
-  // __dirname is defined at module scope (see top of file)
-  // cli/install.mjs → ../install.sh
-  const installSh = join(__dirname, '..', 'install.sh');
-
-  if (!existsSync(installSh)) {
-    console.error(chalk.red('  ✗ install.sh not found at ' + installSh));
-    console.error(chalk.dim('    Run `git clone https://github.com/DrB0rk/BizarHarness` first, then `cd BizarHarness && ./install.sh`.'));
-    process.exit(1);
-  }
-
-  console.log(chalk.bold.hex('#6366f1')('\n  BizarHarness installer (delegating to install.sh)\n'));
-
-  const useBash = process.platform !== 'win32' || process.env.WSL_DISTRO_NAME;
-  if (useBash) {
-    const r = spawnSync('bash', [installSh], { stdio: 'inherit' });
-    process.exit(r.status ?? 1);
-  }
-
-  // Windows without WSL — bash isn't available. The bash script has a
-  // Windows fallback that uses npm-based install paths. Run the npm path
-  // directly: install the BizarHarness npm packages + copy plugin from
-  // global to ~/.config/opencode/plugins/bizar/. This is the same code
-  // path install.sh uses for `platform == win32`.
-  console.log(chalk.dim('  bash not available — running npm-based installer (Windows path)'));
-  console.log('');
-  await runPostInstall();
+export async function runInstaller(opts = {}) {
+  const { runProvision } = await import('./provision.mjs');
+  return runProvision({ ...opts, mode: 'install' });
 }
 
 // ── Interactive prompts for optional packages ─────────────────────────────────