supipowers 1.2.4 → 1.2.5

package/bin/install.mjs

@@ -5,7 +5,11 @@ import { dirname, join } from "node:path";
 
 const isWindows = process.platform === "win32";
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const result = spawnSync("bun", [join(__dirname, "install.ts"), ...process.argv.slice(2)], {
+// When invoked via bunx/npx, always force a full install to guarantee
+// node_modules/ and a consistent extension directory. The --force flag
+// bypasses the "already up to date" version check.
+const args = [join(__dirname, "install.ts"), "--force", ...process.argv.slice(2)];
+const result = spawnSync("bun", args, {
   stdio: "inherit",
   env: process.env,
   shell: isWindows,

package/bin/install.ts

@@ -14,6 +14,7 @@ import { spawnSync } from "node:child_process";
 import {
   readFileSync,
   writeFileSync,
+  appendFileSync,
   existsSync,
   mkdirSync,
   cpSync,
@@ -123,10 +124,37 @@ async function exec(cmd: string, args: string[]): Promise<ExecResult> {
   return { stdout: r.stdout ?? "", stderr: r.stderr ?? "", code: r.status ?? 1 };
 }
 
-// ── CLI Flags ────────────────────────────────────────────────
+// ── CLI Flags ────────────────────────────────────────────────────
 
 const cliArgs = process.argv.slice(2);
 const skipDeps = cliArgs.includes("--skip-deps");
+const FORCE = cliArgs.includes("--force");
+const DEBUG = cliArgs.includes("--debug");
+
+// ── Debug logging ────────────────────────────────────────────────
+
+const LOG_FILE = resolve(process.cwd(), "supipowers-install.log");
+
+function log(msg: string): void {
+  if (!DEBUG) return;
+  const line = `[${new Date().toISOString()}] ${msg}\n`;
+  appendFileSync(LOG_FILE, line);
+}
+
+if (DEBUG) {
+  // Start fresh log
+  writeFileSync(LOG_FILE, `supipowers installer debug log\n`);
+  log(`platform: ${process.platform}`);
+  log(`arch: ${process.arch}`);
+  log(`bun: ${process.versions?.bun ?? "N/A"}`);
+  log(`node: ${process.version}`);
+  log(`cwd: ${process.cwd()}`);
+  log(`homedir: ${homedir()}`);
+  log(`argv: ${JSON.stringify(process.argv)}`);
+  log(`__dirname: ${__dirname}`);
+  log(`packageRoot will be: ${resolve(__dirname, "..")}`);
+  log(`isWindows: ${isWindows}`);
+}
 
 // ── Install to platform ──────────────────────────────────────
 
@@ -143,18 +171,29 @@ function installToPlatform(platformDir: string, packageRoot: string): string {
   const extDir = join(agentDir, "extensions", "supipowers");
   const installedPkgPath = join(extDir, "package.json");
 
+  log(`installToPlatform(platformDir=${platformDir}, packageRoot=${packageRoot})`);
+  log(`  agentDir: ${agentDir}`);
+  log(`  extDir:   ${extDir}`);
+
   // Check for existing installation
   let installedVersion: string | null = null;
   if (existsSync(installedPkgPath)) {
     try {
       const installed = JSON.parse(readFileSync(installedPkgPath, "utf8"));
       installedVersion = installed.version;
+      log(`  existing version: ${installedVersion}`);
     } catch {
-      // corrupted package.json — treat as not installed
+      log(`  existing package.json corrupted, treating as fresh install`);
     }
+  } else {
+    log(`  no existing installation found`);
   }
 
-  if (installedVersion === VERSION) {
+  const hasNodeModules = existsSync(join(extDir, "node_modules"));
+  log(`  node_modules present: ${hasNodeModules}`);
+
+  if (installedVersion === VERSION && hasNodeModules && !FORCE) {
+    log(`  already up to date with deps, skipping`);
     note(
       `supipowers v${VERSION} is already installed and up to date.`,
       `Up to date (${platformDir})`,
@@ -162,9 +201,16 @@ function installToPlatform(platformDir: string, packageRoot: string): string {
     return extDir;
   }
 
+  if (installedVersion === VERSION && !hasNodeModules) {
+    log(`  same version but node_modules missing — reinstalling deps`);
+  }
+  if (FORCE) {
+    log(`  --force flag set, reinstalling`);
+  }
+
   const action = installedVersion ? "Updating" : "Installing";
   if (installedVersion) {
-    note(`v${installedVersion} → v${VERSION}`, `Updating supipowers (${platformDir})`);
+    note(`v${installedVersion} \u2192 v${VERSION}`, `Updating supipowers (${platformDir})`);
   }
 
   const s = spinner();
@@ -173,14 +219,40 @@ function installToPlatform(platformDir: string, packageRoot: string): string {
   try {
     // Clean previous installation to remove stale files
     if (existsSync(extDir)) {
+      log(`  removing old extDir`);
       rmSync(extDir, { recursive: true });
     }
 
-    // Copy extension (src/ + bin/ + package.json) → ~/<platform>/agent/extensions/supipowers/
+    // Copy extension (src/ + bin/ + package.json) \u2192 ~/<platform>/agent/extensions/supipowers/
+    log(`  creating extDir and copying files`);
     mkdirSync(extDir, { recursive: true });
     cpSync(join(packageRoot, "src"), join(extDir, "src"), { recursive: true });
     cpSync(join(packageRoot, "bin"), join(extDir, "bin"), { recursive: true });
     cpSync(join(packageRoot, "package.json"), join(extDir, "package.json"));
+    log(`  files copied to ${extDir}`);
+
+    // Rewrite package.json for the installed extension.
+    // The npm-published package.json has bin, scripts, prepare, devDeps —
+    // all of which cause problems during `bun install` in the extension dir.
+    // We keep only what OMP needs (omp.extensions) and the runtime dependencies.
+    const sourcePkg = JSON.parse(readFileSync(join(extDir, "package.json"), "utf8"));
+    const runtimePkg = {
+      name: sourcePkg.name,
+      version: sourcePkg.version,
+      type: sourcePkg.type,
+      omp: sourcePkg.omp,
+      dependencies: {
+        // Only packages imported at runtime by src/ code:
+        // - config/schema.ts → @sinclair/typebox
+        // - commands/model.ts, model-picker.ts → @oh-my-pi/pi-ai
+        // - commands/model-picker.ts → @oh-my-pi/pi-tui
+        "@sinclair/typebox": "*",
+        "@oh-my-pi/pi-ai": "*",
+        "@oh-my-pi/pi-tui": "*",
+      },
+    };
+    writeFileSync(join(extDir, "package.json"), JSON.stringify(runtimePkg, null, 2));
+    log(`  rewrote package.json: ${JSON.stringify(runtimePkg, null, 2)}`);
 
     // Copy skills → ~/<platform>/agent/skills/<skillname>/SKILL.md
     const skillsSource = join(packageRoot, "skills");
@@ -196,17 +268,19 @@ function installToPlatform(platformDir: string, packageRoot: string): string {
       }
     }
 
-    // Install dependencies so the extension's runtime imports resolve.
-    // Bun installs peer deps by default, which provides @sinclair/typebox
-    // and @oh-my-pi/* packages that the extension needs at import time.
-    // Without this, the extension fails to load on systems where these
-    // packages aren't in Bun's global install (e.g. OMP installed via npm).
+    // Install runtime dependencies so the extension's imports resolve.
+    // Without node_modules/, external imports (@sinclair/typebox, @oh-my-pi/*)
+    // fail on systems where these packages aren't in Bun's global install.
+    log(`  running: bun install (cwd=${extDir})`);
     s.message("Installing extension dependencies...");
-    const install = run("bun", ["install", "--frozen-lockfile=false"], { cwd: extDir });
+    const install = run("bun", ["install"], { cwd: extDir });
+    log(`  bun install exit code: ${install.status}`);
+    log(`  bun install stdout: ${install.stdout ?? "(null)"}`);
+    log(`  bun install stderr: ${install.stderr ?? "(null)"}`);
+    if (install.error) log(`  bun install error: ${install.error.message}`);
     if (install.status !== 0) {
-      // Non-fatal: the extension may still work if OMP provides the deps.
-      // Log a warning but don't bail — the user might be offline or the
-      // registry might be temporarily unreachable.
+      // Non-fatal: the extension may still work if OMP provides the deps
+      // via its own module resolution (e.g. Bun global install on macOS).
       note(
         "Could not install extension dependencies.\n" +
           "If /supi commands don't appear in OMP, run:\n" +
@@ -215,12 +289,23 @@ function installToPlatform(platformDir: string, packageRoot: string): string {
       );
     }
 
+    // Verify node_modules was created
+    const nmExists = existsSync(join(extDir, "node_modules"));
+    log(`  node_modules exists after install: ${nmExists}`);
+    if (nmExists) {
+      try {
+        const nmContents = readdirSync(join(extDir, "node_modules"));
+        log(`  node_modules top-level: ${nmContents.join(", ")}`);
+      } catch { /* ignore */ }
+    }
+
     s.stop(
       installedVersion
         ? `supipowers updated to v${VERSION} (${platformDir})`
         : `supipowers v${VERSION} installed (${platformDir})`,
     );
   } catch (err: unknown) {
+    log(`  installToPlatform FAILED: ${err instanceof Error ? err.stack : String(err)}`);
     s.stop(`${action} failed (${platformDir})`);
     const message = err instanceof Error ? err.message : `Failed to copy files to ~/${platformDir}/agent/`;
     bail(message);
@@ -377,9 +462,14 @@ async function main(): Promise<void> {
   const piBin = findPiBinary();
   const ompBin = findOmpBinary();
 
+  log(`findPiBinary() => ${piBin ?? "null"}`);
+  log(`findOmpBinary() => ${ompBin ?? "null"}`);
+
   const piVer = piBin ? run(piBin, ["--version"]).stdout?.trim() || "unknown" : null;
   const ompVer = ompBin ? run(ompBin, ["--version"]).stdout?.trim() || "unknown" : null;
 
+  log(`piVer: ${piVer ?? "N/A"}, ompVer: ${ompVer ?? "N/A"}`);
+
   const detected: string[] = [];
   if (piBin) detected.push(`Pi ${piVer}`);
   if (ompBin) detected.push(`OMP ${ompVer}`);
@@ -448,6 +538,8 @@ async function main(): Promise<void> {
   // ── Step 3: Install supipowers to each chosen target ──────
 
   const packageRoot = resolve(__dirname, "..");
+  log(`packageRoot: ${packageRoot}`);
+  log(`targets: ${JSON.stringify(targets)}`);
 
   for (const target of targets) {
     installToPlatform(target.dir, packageRoot);
@@ -456,6 +548,10 @@ async function main(): Promise<void> {
     await installContextMode(target.dir);
   }
 
+  if (DEBUG) {
+    note(`Debug log written to:\n${LOG_FILE}`, "Debug");
+  }
+
   // ── Step 4: Unified dependency check (--skip-deps to skip) ──
 
   if (skipDeps) {

package/bin/local-install.sh

@@ -2,38 +2,42 @@
 # Install supipowers locally from the current working tree.
 # Usage:  ./bin/local-install.sh
 #
-# This creates a global symlink so both the `supipowers` CLI and
-# the Pi/OMP extension resolve to your local source — no publish needed.
-# Re-run after pulling new changes; the symlink stays valid.
+# Creates a global symlink so `supipowers` CLI works, then runs the
+# installer with --debug to deploy the extension and write a log file.
+# Re-run after pulling new changes.
 
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
 
-echo "→ Installing supipowers locally from $PROJECT_DIR"
+echo "-> Installing supipowers locally from $PROJECT_DIR"
 
 # 1. Install dependencies (fast no-op when lock is current)
-echo "→ Installing dependencies…"
+echo "-> Installing dependencies..."
 cd "$PROJECT_DIR"
 bun install --frozen-lockfile 2>/dev/null || bun install
 
 # 2. Create a global symlink via bun link
-#    This registers the package globally so `supipowers` CLI works
-#    and Pi/OMP can resolve it by name.
-echo "→ Linking supipowers globally…"
+echo "-> Linking supipowers globally..."
 bun link
 
 # 3. Verify the link
 if command -v supipowers &>/dev/null; then
-  echo "✓ 'supipowers' CLI is available at $(which supipowers)"
+  echo "[OK] 'supipowers' CLI is available at $(which supipowers)"
 else
-  echo "⚠ CLI not on PATH — you may need to add bun's global bin to \$PATH:"
+  echo "[WARN] CLI not on PATH -- you may need to add bun's global bin to \$PATH:"
   echo "  export PATH=\"\$HOME/.bun/bin:\$PATH\""
 fi
 
-# 4. Show version
+# 4. Run the installer with --debug to deploy extension + write log
+echo "-> Running installer (--debug mode)..."
+bun run "$PROJECT_DIR/bin/install.ts" --debug --force
+
+# 5. Show version and log location
 VERSION=$(node -e "console.log(require('$PROJECT_DIR/package.json').version)")
 echo ""
-echo "✓ supipowers v${VERSION} installed locally (linked to $PROJECT_DIR)"
-echo "  Any edits to src/ or skills/ take effect immediately — no rebuild needed."
+echo "[OK] supipowers v${VERSION} installed locally"
+if [ -f "$PROJECT_DIR/supipowers-install.log" ]; then
+  echo "  Debug log: $PROJECT_DIR/supipowers-install.log"
+fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supipowers",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Workflow extension for OMP coding agents.",
   "type": "module",
   "scripts": {

package/src/deps/registry.ts

@@ -34,10 +34,10 @@ export async function checkBinary(
   exec: ExecFn,
   binary: string,
 ): Promise<{ installed: boolean; version?: string }> {
-  // `which` is Unix-only; Windows uses `where` to locate executables
-  const whichCmd = process.platform === "win32" ? "where" : "which";
-  const which = await exec(whichCmd, [binary]);
-  if (which.code !== 0) return { installed: false };
+  // Bun.which() is cross-platform (handles .cmd/.exe/.bat on Windows)
+  // and doesn't require shelling out to `which` (Unix) or `where` (Windows).
+  const found = Bun.which(binary);
+  if (!found) return { installed: false };
 
   const ver = await exec(binary, ["--version"]);
   const version = ver.code === 0 ? ver.stdout.trim().split("\n")[0] : undefined;