docdex 0.2.21 → 0.2.23

package/lib/install.js

@@ -8,7 +8,7 @@ const os = require("node:os");
 const path = require("node:path");
 const { pipeline } = require("node:stream/promises");
 const crypto = require("node:crypto");
-const { spawn, spawnSync } = require("node:child_process");
+const { spawn } = require("node:child_process");
 
 const pkg = require("../package.json");
 const {
@@ -41,8 +41,6 @@ const DEFAULT_INTEGRITY_CONFIG = Object.freeze({
 const LOCAL_FALLBACK_ENV = "DOCDEX_LOCAL_FALLBACK";
 const LOCAL_BINARY_ENV = "DOCDEX_LOCAL_BINARY";
 const AGENTS_DOC_FILENAME = "agents.md";
-const PLAYWRIGHT_INSTALL_GUARD = "DOCDEX_INTERNAL_PLAYWRIGHT_INSTALL";
-const PLAYWRIGHT_SKIP_ENV = "DOCDEX_SKIP_PLAYWRIGHT_DEP_INSTALL";
 
 const EXIT_CODE_BY_ERROR_CODE = Object.freeze({
   DOCDEX_INSTALLER_CONFIG: 2,
@@ -232,60 +230,6 @@ function writeAgentInstructions() {
   }
 }
 
-function resolvePlaywrightPackage() {
-  const baseDir = path.join(__dirname, "..");
-  try {
-    return require.resolve("playwright/package.json", { paths: [baseDir] });
-  } catch {}
-  try {
-    return require.resolve("playwright/package.json");
-  } catch {}
-  return null;
-}
-
-function resolveNpmCommand() {
-  const npmExec = process.env.npm_execpath;
-  if (npmExec) {
-    return { cmd: process.execPath, args: [npmExec] };
-  }
-  const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
-  return { cmd: npmCmd, args: [] };
-}
-
-function ensurePlaywrightDependency({ logger = console } = {}) {
-  if (process.env[PLAYWRIGHT_SKIP_ENV]) return;
-  if (process.env[PLAYWRIGHT_INSTALL_GUARD]) return;
-  if (resolvePlaywrightPackage()) return;
-
-  const rootDir = path.join(__dirname, "..");
-  const { cmd, args } = resolveNpmCommand();
-  const installArgs = args.concat([
-    "install",
-    "--no-save",
-    "--ignore-scripts",
-    "--no-package-lock",
-    "--no-audit",
-    "--no-fund",
-    "playwright"
-  ]);
-  const result = spawnSync(cmd, installArgs, {
-    cwd: rootDir,
-    stdio: "inherit",
-    env: {
-      ...process.env,
-      [PLAYWRIGHT_INSTALL_GUARD]: "1"
-    }
-  });
-  if (result.error || (typeof result.status === "number" && result.status !== 0)) {
-    const message = result.error?.message || `npm exit status ${result.status}`;
-    logger.warn?.(`[docdex] Playwright dependency install failed: ${message}`);
-    return;
-  }
-  if (!resolvePlaywrightPackage()) {
-    logger.warn?.("[docdex] Playwright dependency still missing after install attempt");
-  }
-}
-
 function selectHttpClient(url) {
   try {
     const protocol = new URL(url).protocol;
@@ -577,13 +521,16 @@ function isLocalInstallRequest({ env, pathModule }) {
   return argv.some((arg) => isLikelyLocalInstallArg(arg, pathModule));
 }
 
-function shouldPreferLocalInstall({ env, localBinaryPath, pathModule }) {
+function shouldPreferLocalInstall({ env, localBinaryPath, pathModule, localRepoRoot }) {
   if (!localBinaryPath) return false;
   if (parseEnvBool(env?.[LOCAL_FALLBACK_ENV]) === false) return false;
   if (env?.[LOCAL_BINARY_ENV]) return true;
-  if (!env?.INIT_CWD) return false;
   if (env?.npm_lifecycle_event !== "postinstall") return false;
-  return isLocalInstallRequest({ env, pathModule });
+  if (isLocalInstallRequest({ env, pathModule })) return true;
+  if (!env?.INIT_CWD || !localRepoRoot) return false;
+  const initCwd = pathModule.resolve(env.INIT_CWD);
+  const repoRoot = pathModule.resolve(localRepoRoot);
+  return initCwd === repoRoot || initCwd.startsWith(`${repoRoot}${pathModule.sep}`);
 }
 
 function resolveLocalBinaryCandidate({
@@ -599,35 +546,16 @@ function resolveLocalBinaryCandidate({
     if (fsModule.existsSync(resolved)) return resolved;
   }
   const isWin32 = platform === "win32";
-  const mcpName = isWin32 ? "docdex-mcp-server.exe" : "docdex-mcp-server";
   const root = repoRoot || detectLocalRepoRoot({ pathModule, fsModule });
   if (!root) return null;
   const binaryName = platform === "win32" ? "docdexd.exe" : "docdexd";
   const releasePath = pathModule.join(root, "target", "release", binaryName);
-  if (fsModule.existsSync(releasePath)) {
-    if (localMcpPresent({ fsModule, pathModule, binaryPath: releasePath, mcpName })) {
-      return releasePath;
-    }
-  }
+  if (fsModule.existsSync(releasePath)) return releasePath;
   const debugPath = pathModule.join(root, "target", "debug", binaryName);
-  if (fsModule.existsSync(debugPath)) {
-    if (localMcpPresent({ fsModule, pathModule, binaryPath: debugPath, mcpName })) {
-      return debugPath;
-    }
-  }
+  if (fsModule.existsSync(debugPath)) return debugPath;
   return null;
 }
 
-function localMcpPresent({ fsModule, pathModule, binaryPath, mcpName }) {
-  const dir = pathModule.dirname(binaryPath);
-  const candidates = [
-    pathModule.join(dir, mcpName),
-    pathModule.join(pathModule.dirname(dir), "release", mcpName),
-    pathModule.join(pathModule.dirname(dir), "debug", mcpName)
-  ];
-  return candidates.some((candidate) => fsModule.existsSync(candidate));
-}
-
 async function installFromLocalBinary({
   fsModule,
   pathModule,
@@ -650,22 +578,6 @@ async function installFromLocalBinary({
   if (!isWin32) {
     await fsModule.promises.chmod(destPath, 0o755).catch(() => {});
   }
-  const mcpName = isWin32 ? "docdex-mcp-server.exe" : "docdex-mcp-server";
-  const mcpCandidates = [
-    pathModule.join(pathModule.dirname(binaryPath), mcpName),
-    pathModule.join(pathModule.dirname(pathModule.dirname(binaryPath)), "release", mcpName),
-    pathModule.join(pathModule.dirname(pathModule.dirname(binaryPath)), "debug", mcpName)
-  ];
-  const mcpSource = mcpCandidates.find((candidate) => fsModule.existsSync(candidate));
-  if (mcpSource) {
-    const mcpDest = pathModule.join(distDir, mcpName);
-    await fsModule.promises.copyFile(mcpSource, mcpDest);
-    if (!isWin32) {
-      await fsModule.promises.chmod(mcpDest, 0o755).catch(() => {});
-    }
-  } else {
-    logger?.warn?.(`[docdex] local MCP binary not found; expected near ${binaryPath}`);
-  }
   const binarySha256 = await sha256FileFn(destPath);
   const metadata = {
     schemaVersion: INSTALL_METADATA_SCHEMA_VERSION,
@@ -718,7 +630,13 @@ async function maybeInstallLocalFallback({
 
   const candidate =
     localBinaryPath ||
-    resolveLocalBinaryCandidate({ env, platform: process.platform, pathModule, fsModule, repoRoot: localRepoRoot });
+    resolveLocalBinaryCandidate({
+      env,
+      platform: process.platform,
+      pathModule,
+      fsModule,
+      repoRoot: localRepoRoot
+    });
   if (!candidate) return null;
 
   return installFromLocalBinary({
@@ -1074,9 +992,6 @@ function decideInstallAction({
   integrityResult
 }) {
   if (!discoveredInstalledState?.binaryPresent) return { outcome: "update", reason: "binary_missing" };
-  if (discoveredInstalledState.mcpBinaryPresent === false) {
-    return { outcome: "update", reason: "mcp_binary_missing" };
-  }
 
   if (discoveredInstalledState.metadataStatus !== "valid") {
     return {
@@ -1111,10 +1026,6 @@ function decideInstallAction({
 
 async function discoverInstalledState({ fsModule, pathModule, distDir, platformKey, isWin32 }) {
   const binaryPath = pathModule.join(distDir, isWin32 ? "docdexd.exe" : "docdexd");
-  const mcpBinaryPath = pathModule.join(
-    distDir,
-    isWin32 ? "docdex-mcp-server.exe" : "docdex-mcp-server"
-  );
   const metadataPath = installMetadataPath(distDir, pathModule);
 
   const existsSync = typeof fsModule?.existsSync === "function" ? fsModule.existsSync.bind(fsModule) : null;
@@ -1123,7 +1034,6 @@ async function discoverInstalledState({ fsModule, pathModule, distDir, platformK
       binaryPath,
       metadataPath,
       binaryPresent: false,
-      mcpBinaryPresent: false,
       installedVersion: null,
       metadata: null,
       metadataStatus: "unavailable",
@@ -1137,7 +1047,6 @@ async function discoverInstalledState({ fsModule, pathModule, distDir, platformK
       binaryPath,
       metadataPath,
       binaryPresent: false,
-      mcpBinaryPresent: false,
       installedVersion: null,
       metadata: null,
       metadataStatus: "missing",
@@ -1146,13 +1055,11 @@ async function discoverInstalledState({ fsModule, pathModule, distDir, platformK
     };
   }
 
-  const mcpBinaryPresent = existsSync(mcpBinaryPath);
   const metaResult = await readJsonFileIfPossible({ fsModule, filePath: metadataPath });
   const meta = metaResult.value;
   if (!isValidInstallMetadata(meta)) {
     return {
       binaryPath,
-      mcpBinaryPresent,
       metadataPath,
       binaryPresent: true,
       installedVersion: typeof meta?.version === "string" ? meta.version : null,
@@ -1175,7 +1082,6 @@ async function discoverInstalledState({ fsModule, pathModule, distDir, platformK
 
   return {
     binaryPath,
-    mcpBinaryPresent,
     metadataPath,
     binaryPresent: true,
     installedVersion: meta.version,
@@ -1249,7 +1155,6 @@ async function determineLocalInstallerOutcome({
 
   const shouldVerifyIntegrity =
     discoveredInstalledState.binaryPresent &&
-    discoveredInstalledState.mcpBinaryPresent !== false &&
     !discoveredInstalledState.platformMismatch &&
     discoveredInstalledState.installedVersion === expectedVersion &&
     (normalizeSha256Hex(expectedBinarySha256) || discoveredInstalledState.metadataStatus === "valid");
@@ -1805,6 +1710,7 @@ async function runInstaller(options) {
   });
 
   const priorRunnable = existsSync ? existsSync(local.binaryPath) : false;
+  const preferLocal = shouldPreferLocalInstall({ env, localBinaryPath, pathModule, localRepoRoot });
 
   const forceLocalBinary = Boolean(env?.[LOCAL_BINARY_ENV]);
   if (forceLocalBinary && localBinaryPath) {
@@ -1825,6 +1731,24 @@ async function runInstaller(options) {
     return localInstall;
   }
 
+  if (preferLocal) {
+    const localInstall = await installFromLocalBinary({
+      fsModule,
+      pathModule,
+      distDir,
+      binaryPath: localBinaryPath,
+      isWin32,
+      version,
+      platformKey,
+      targetTriple,
+      repoSlug: null,
+      sha256FileFn,
+      writeJsonFileAtomicFn,
+      logger
+    });
+    return localInstall;
+  }
+
   if (local.outcome === "no-op") {
     logger.log("[docdex] Install outcome: no-op");
     await cleanupInstallArtifacts({
@@ -1853,24 +1777,6 @@ async function runInstaller(options) {
     };
   }
 
-  if (shouldPreferLocalInstall({ env, localBinaryPath, pathModule })) {
-    const localInstall = await installFromLocalBinary({
-      fsModule,
-      pathModule,
-      distDir,
-      binaryPath: localBinaryPath,
-      isWin32,
-      version,
-      platformKey,
-      targetTriple,
-      repoSlug: null,
-      sha256FileFn,
-      writeJsonFileAtomicFn,
-      logger
-    });
-    return localInstall;
-  }
-
   let repoSlug = null;
   let archive;
   let expectedSha256;
@@ -2189,18 +2095,14 @@ async function main() {
   try {
     await runPostInstallSetup({ binaryPath: result?.binaryPath });
   } catch (err) {
-    console.warn(`[docdex] postinstall setup skipped: ${err?.message || err}`);
+    console.warn(`[docdex] postinstall setup failed: ${err?.message || err}`);
+    throw err;
   }
   try {
     writeAgentInstructions();
   } catch (err) {
     console.warn(`[docdex] agent instructions skipped: ${err?.message || err}`);
   }
-  try {
-    ensurePlaywrightDependency();
-  } catch (err) {
-    console.warn(`[docdex] playwright dependency check skipped: ${err?.message || err}`);
-  }
   printPostInstallBanner();
 }
 
@@ -2230,7 +2132,7 @@ function printPostInstallBanner() {
     "\x1b[32mDocdex installed successfully!\x1b[0m",
     "\x1b[41m\x1b[97m IMPORTANT \x1b[0m \x1b[33mNext step:\x1b[0m run \x1b[32m`docdex setup`\x1b[0m to complete the installation.",
     "\x1b[33mSetup:\x1b[0m configures Ollama/models + browser.",
-    "\x1b[34mTip:\x1b[0m after setup, start the daemon with \x1b[36m`docdexd serve --repo <path>`\x1b[0m"
+    "\x1b[34mTip:\x1b[0m after setup, the daemon should auto-start; if not, run \x1b[36m`docdexd daemon`\x1b[0m"
   ];
   width = Math.max(72, content.reduce((max, line) => Math.max(max, stripAnsi(line).length), 0));
   const padLine = (text) => {