@nightlybuildgroup/vault 1.0.1 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlybuildgroup/vault",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Store Vaultwarden/Bitwarden credentials in the macOS Keychain and read secrets back for local agents.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -7,7 +7,7 @@ Commands:
   get       Fetch a secret value (e.g. nbg-pw get "GitHub" --field password)
   serve     Start a local bw API daemon (unlocked) for fast repeated reads
   status    Show config + auth state (no secret values)
-  doctor    Diagnose bw / Keychain / server connectivity
+  doctor    Diagnose bw / Keychain / server connectivity (--fix resets a wedged bw session)
   logout    Lock the session (bw logout)
   reset     Log out and delete the stored Keychain item
 `;

package/src/commands/doctor.js

@@ -13,13 +13,14 @@ async function defaultFetchUrl(url) {
 export async function runDoctor(args, deps) {
   const { keychain, bw, out } = deps;
   const fetchUrl = deps.fetchUrl ?? defaultFetchUrl;
+  const fix = (args ?? []).includes('--fix');
   let failed = false;
   const line = (label, ok, hint) => {
     out(`  ${label} [${ok ? 'OK' : 'FAIL'}]${ok ? '' : `  -> ${hint}`}\n`);
     if (!ok) failed = true;
   };
 
-  out('nbg-pw doctor\n');
+  out(`nbg-pw doctor${fix ? ' --fix' : ''}\n`);
 
   const version = await bw.bwVersion();
   line('bw installed', !!version, 'brew install bitwarden-cli');
@@ -34,6 +35,24 @@ export async function runDoctor(args, deps) {
     line('server reachable', false, 'no stored server URL — run "nbg-pw setup"');
   }
 
+  // bw session state. A leftover logged-in ("locked"/"unlocked") account can
+  // wedge later commands (e.g. "Logout required before server config update").
+  // `--fix` resets bw to a clean baseline by logging out; without it we only
+  // report, since a logged-in state is harmless on its own.
+  if (version) {
+    let state = 'unknown';
+    try { state = (await bw.status()).status; } catch { /* leave as unknown */ }
+    const loggedIn = state === 'locked' || state === 'unlocked';
+    if (loggedIn && fix) {
+      await bw.logout();
+      out(`  bw session [FIXED]  -> was "${state}"; ran bw logout, now a clean baseline\n`);
+    } else if (loggedIn) {
+      out(`  bw session [info]  -> logged in ("${state}"); run "nbg-pw doctor --fix" to reset\n`);
+    } else {
+      out(`  bw session [OK]  (${state})\n`);
+    }
+  }
+
   out(failed ? '\nSome checks failed.\n' : '\nAll checks passed.\n');
   return failed ? 1 : 0;
 }