@devdogsuga/devtools 0.1.18 → 0.1.19

package/dist/bws/bw.d.ts

@@ -1,3 +1,12 @@
+/**
+ * The `[command, args]` pair that runs the bundled Bitwarden CLI.
+ *
+ * Runs `build/bw.js` under this Node rather than through a shim, so it works
+ * the same wherever devtools is installed. Falls back to `bw` on PATH when the
+ * package cannot be resolved, which keeps a missing install surfacing as the
+ * ENOENT every caller already handles.
+ */
+export declare function bwCommand(args: string[]): [string, string[]];
 /**
  * Runs the Bitwarden CLI with `args`, then exits with its status.
  *

package/dist/bws/bw.js

@@ -12,12 +12,33 @@
  * `pnpm --filter @devdogsuga/devtools exec bw`, the last script at the
  * workspace root whose whole job was to reach into this package.
  *
- * ⚠️ `cwd` is deliberately NOT overridden, unlike the pnpm spawn in
- * `run/pick.ts`. pnpm puts this package's `node_modules/.bin` on PATH as a
- * relative entry, so moving the working directory would make `bw` unresolvable
- * from the very place it is installed. Bitwarden does not care where it runs.
+ * ⚠️ The binary is resolved from `@bitwarden/cli` itself, never looked up on
+ * PATH. A dependency's bin is only linked into the `node_modules/.bin` of the
+ * package that depends on it, so under `pnpm dlx`, or with devtools installed
+ * in a clone, nothing puts `bw` on PATH and a bare `spawn("bw")` is ENOENT.
  */
 import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+/**
+ * The `[command, args]` pair that runs the bundled Bitwarden CLI.
+ *
+ * Runs `build/bw.js` under this Node rather than through a shim, so it works
+ * the same wherever devtools is installed. Falls back to `bw` on PATH when the
+ * package cannot be resolved, which keeps a missing install surfacing as the
+ * ENOENT every caller already handles.
+ */
+export function bwCommand(args) {
+    try {
+        const require_ = createRequire(import.meta.url);
+        const pkgPath = require_.resolve("@bitwarden/cli/package.json");
+        const pkg = require_(pkgPath);
+        return [process.execPath, [join(dirname(pkgPath), pkg.bin.bw), ...args]];
+    }
+    catch {
+        return ["bw", args];
+    }
+}
 /**
  * Runs the Bitwarden CLI with `args`, then exits with its status.
  *
@@ -28,7 +49,7 @@ import { spawn } from "node:child_process";
  */
 export function runBw(args) {
     return new Promise(() => {
-        const child = spawn("bw", args, { stdio: "inherit" });
+        const child = spawn(...bwCommand(args), { stdio: "inherit" });
         child.on("error", (err) => {
             // ENOENT here means the dependency is not installed rather than that the
             // user mistyped, so say the thing that fixes it.

package/dist/bws/vault.js

@@ -21,6 +21,7 @@ import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import { confirm, log, spinner } from "@clack/prompts";
 import { unwrap } from "../ui.js";
+import { bwCommand } from "./bw.js";
 const run = promisify(execFile);
 /**
  * The item this looks for, and creates.
@@ -33,7 +34,7 @@ export const VAULT_ITEM_NAME = "DevDogs Secrets Manager access token (admin)";
 /** `bw status`, or `unavailable` when the CLI is not installed. */
 export async function vaultStatus() {
     try {
-        const { stdout } = await run("bw", bwArgs(["status", "--response"]), {
+        const { stdout } = await run(...bwCommand(bwArgs(["status", "--response"])), {
             shell: false,
         });
         // `--response` wraps the payload; the bare form is also accepted, so read
@@ -80,7 +81,7 @@ async function session(status) {
     return new Promise((resolve) => {
         // stdin inherited so the master password goes to `bw` and not through here;
         // stdout piped so the session key can be captured rather than printed.
-        const child = spawn("bw", ["unlock", "--raw"], {
+        const child = spawn(...bwCommand(["unlock", "--raw"]), {
             stdio: ["inherit", "pipe", "inherit"],
             shell: false,
         });
@@ -127,7 +128,7 @@ export async function readTokenFromVault() {
     const s = spinner();
     s.start("Looking in your Bitwarden vault");
     try {
-        const { stdout } = await run("bw", bwArgs(["get", "password", VAULT_ITEM_NAME, "--raw"], key), { shell: false });
+        const { stdout } = await run(...bwCommand(bwArgs(["get", "password", VAULT_ITEM_NAME, "--raw"], key)), { shell: false });
         const token = stdout.trim();
         if (token === "") {
             s.stop("Nothing stored in the vault yet");
@@ -172,7 +173,7 @@ export async function saveTokenToVault(token) {
         login: { username: null, password: token, totp: null },
     };
     return new Promise((resolve) => {
-        const child = spawn("bw", bwArgs(["create", "item"], key), {
+        const child = spawn(...bwCommand(bwArgs(["create", "item"], key)), {
             stdio: ["pipe", "ignore", "pipe"],
             shell: false,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devdogsuga/devtools",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "private": false,
   "type": "module",
   "description": "Contributor CLI for a DevDogsUGA checkout: database, env, images, emails, cron, deploy. Ships built JS; run via `pnpm dlx @devdogsuga/devtools` (or the `devtools`/`devtools-ci` bins once installed) from inside a DevDogsUGA clone.",
@@ -66,11 +66,11 @@
     "@vitest/coverage-v8": "^4.1.11",
     "react": "^19.2.8",
     "vitest": "^4.1.11",
-    "@devdogsuga/db": "0.1.1",
-    "@devdogsuga/brand": "0.1.2",
     "@devdogsuga/config": "0.1.1",
+    "@devdogsuga/db": "0.1.1",
     "@devdogsuga/env": "0.1.2",
-    "@devdogsuga/events": "0.1.3"
+    "@devdogsuga/events": "0.1.3",
+    "@devdogsuga/brand": "0.1.2"
   },
   "scripts": {
     "build": "tsc && node scripts/write-build-info.mjs",