@icoretech/warden-mcp 0.1.19 → 0.1.21

package/bin/patch-bitwarden-cli-lib.js

@@ -0,0 +1,117 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { dirname, isAbsolute, relative, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const defaultPackageDir = resolve(__dirname, '..');
+
+function isModuleNotFoundFor(specifier, error) {
+  if (!(error instanceof Error)) return false;
+  if ('code' in error && error.code !== 'MODULE_NOT_FOUND') return false;
+  return error.message.includes(specifier);
+}
+
+export function findInstallRoot(packageJsonPath) {
+  let currentDir = dirname(packageJsonPath);
+
+  while (true) {
+    const parentDir = dirname(currentDir);
+    if (parentDir === currentDir) break;
+    if (
+      currentDir.endsWith('/node_modules') ||
+      currentDir.endsWith('\\node_modules')
+    ) {
+      return parentDir;
+    }
+    currentDir = parentDir;
+  }
+
+  throw new Error(
+    `[warden-mcp] could not determine install root from ${packageJsonPath}`,
+  );
+}
+
+export function resolvePatchPackagePlan({
+  packageDir = defaultPackageDir,
+  resolveDependency = (specifier) => require.resolve(specifier),
+  exists = existsSync,
+} = {}) {
+  const patchesDir = resolve(packageDir, 'patches');
+  if (!exists(patchesDir)) {
+    throw new Error(
+      `[warden-mcp] patches directory not found at ${patchesDir}`,
+    );
+  }
+
+  let cliPackageJsonPath;
+  try {
+    cliPackageJsonPath = resolveDependency('@bitwarden/cli/package.json');
+  } catch (error) {
+    if (isModuleNotFoundFor('@bitwarden/cli/package.json', error)) {
+      return null;
+    }
+    throw error;
+  }
+
+  const installRoot = findInstallRoot(cliPackageJsonPath);
+  const patchDir = relative(installRoot, patchesDir) || '.';
+  if (isAbsolute(patchDir) || patchDir.startsWith('..')) {
+    throw new Error(
+      `[warden-mcp] patch directory ${patchesDir} is outside install root ${installRoot}`,
+    );
+  }
+
+  return {
+    cwd: installRoot,
+    args: [
+      resolveDependency('patch-package/dist/index.js'),
+      '--patch-dir',
+      patchDir,
+      '--error-on-fail',
+    ],
+  };
+}
+
+export function applyBundledBwPatch({
+  packageDir = defaultPackageDir,
+  resolveDependency,
+  exists,
+  spawn = spawnSync,
+  nodeExecPath = process.execPath,
+  logError = (message) => console.error(message),
+} = {}) {
+  let plan;
+  try {
+    plan = resolvePatchPackagePlan({ packageDir, resolveDependency, exists });
+  } catch (error) {
+    const message =
+      error instanceof Error
+        ? error.message
+        : '[warden-mcp] failed to prepare patch-package';
+    logError(message);
+    return 1;
+  }
+
+  if (!plan) return 0;
+
+  const result = spawn(nodeExecPath, plan.args, {
+    cwd: plan.cwd,
+    stdio: 'inherit',
+  });
+
+  if (result.error) {
+    logError(
+      `[warden-mcp] failed to execute patch-package: ${result.error.message}`,
+    );
+    return 1;
+  }
+
+  return result.status ?? 1;
+}
+
+export function isDirectRun(importMetaUrl, argv = process.argv) {
+  return argv[1] === fileURLToPath(importMetaUrl);
+}

package/bin/patch-bitwarden-cli.js

@@ -1,31 +1,7 @@
 #!/usr/bin/env node
 
-import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { createRequire } from 'node:module';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { applyBundledBwPatch, isDirectRun } from './patch-bitwarden-cli-lib.js';
 
-const require = createRequire(import.meta.url);
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const rootDir = resolve(__dirname, '..');
-const cliPackageDir = resolve(__dirname, '../node_modules/@bitwarden/cli');
-
-if (!existsSync(cliPackageDir)) {
-  process.exit(0);
+if (isDirectRun(import.meta.url)) {
+  process.exit(applyBundledBwPatch());
 }
-
-const patchPackageEntrypoint = require.resolve('patch-package/dist/index.js');
-const result = spawnSync(process.execPath, [patchPackageEntrypoint], {
-  cwd: rootDir,
-  stdio: 'inherit',
-});
-
-if (result.error) {
-  console.error(
-    `[warden-mcp] failed to execute patch-package: ${result.error.message}`,
-  );
-  process.exit(1);
-}
-
-process.exit(result.status ?? 1);

package/dist/bw/bwSession.js

@@ -156,12 +156,19 @@ export class BwSessionManager {
         this.configuredHost = null;
         await runBw(['logout'], { env: this.baseEnv(), timeoutMs: 30_000 }).catch(() => { });
         const home = this.homeDir;
-        await rm(join(home, '.config', 'Bitwarden CLI', 'data.json'), {
-            force: true,
-        }).catch(() => { });
-        await rm(join(home, '.config', 'Bitwarden CLI', 'config.json'), {
-            force: true,
-        }).catch(() => { });
+        const cliStateDirs = [
+            join(home, '.config', 'Bitwarden CLI'),
+            join(home, 'Library', 'Application Support', 'Bitwarden CLI'),
+            join(home, 'AppData', 'Roaming', 'Bitwarden CLI'),
+        ];
+        for (const dir of cliStateDirs) {
+            await rm(join(dir, 'data.json'), {
+                force: true,
+            }).catch(() => { });
+            await rm(join(dir, 'config.json'), {
+                force: true,
+            }).catch(() => { });
+        }
     }
     async ensureUnlockedInternal() {
         // Ensure server config points to BW_HOST.

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@icoretech/warden-mcp",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "module",
   "license": "MIT",
   "description": "Vaultwarden/Bitwarden MCP server backed by Bitwarden CLI (bw).",