docdex 0.2.7 → 0.2.9

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.2.7
+## 0.2.9
 - Added glama support
 
 ## 0.1.10

package/lib/install.js

@@ -427,6 +427,15 @@ async function installFromLocalBinary({
   if (!isWin32) {
     await fsModule.promises.chmod(destPath, 0o755).catch(() => {});
   }
+  const mcpName = isWin32 ? "docdex-mcp-server.exe" : "docdex-mcp-server";
+  const mcpSource = pathModule.join(pathModule.dirname(binaryPath), mcpName);
+  if (fsModule.existsSync(mcpSource)) {
+    const mcpDest = pathModule.join(distDir, mcpName);
+    await fsModule.promises.copyFile(mcpSource, mcpDest);
+    if (!isWin32) {
+      await fsModule.promises.chmod(mcpDest, 0o755).catch(() => {});
+    }
+  }
   const binarySha256 = await sha256FileFn(destPath);
   const metadata = {
     schemaVersion: INSTALL_METADATA_SCHEMA_VERSION,

package/lib/postinstall_setup.js

@@ -1063,6 +1063,49 @@ function shouldSkipSetup(env = process.env) {
   return parseEnvBool(env.DOCDEX_SETUP_SKIP) === true;
 }
 
+function commandExists(cmd, spawnSyncFn) {
+  const result = spawnSyncFn(cmd, ["--version"], { stdio: "ignore" });
+  if (result?.error?.code === "ENOENT") return false;
+  return true;
+}
+
+function launchMacTerminal({ binaryPath, args, spawnSyncFn, logger }) {
+  const command = [binaryPath, ...args].join(" ");
+  const script = [
+    'tell application "Terminal" to activate',
+    `tell application "Terminal" to do script ${JSON.stringify(command)}`
+  ].join("\n");
+  const result = spawnSyncFn("osascript", ["-e", script]);
+  if (result.status === 0) return true;
+  logger?.warn?.(`[docdex] osascript launch failed: ${result.stderr || "unknown error"}`);
+  return false;
+}
+
+function launchLinuxTerminal({ binaryPath, args, spawnFn, spawnSyncFn }) {
+  const candidates = [
+    { cmd: "x-terminal-emulator", args: ["-e", binaryPath, ...args] },
+    { cmd: "gnome-terminal", args: ["--", binaryPath, ...args] },
+    { cmd: "konsole", args: ["-e", binaryPath, ...args] },
+    { cmd: "xfce4-terminal", args: ["-e", binaryPath, ...args] },
+    { cmd: "xterm", args: ["-e", binaryPath, ...args] },
+    { cmd: "kitty", args: ["-e", binaryPath, ...args] },
+    { cmd: "alacritty", args: ["-e", binaryPath, ...args] },
+    { cmd: "wezterm", args: ["start", "--", binaryPath, ...args] }
+  ];
+  for (const candidate of candidates) {
+    if (!commandExists(candidate.cmd, spawnSyncFn)) continue;
+    const child = spawnFn(candidate.cmd, candidate.args, {
+      stdio: "ignore",
+      detached: true
+    });
+    if (child?.pid) {
+      child.unref?.();
+      return true;
+    }
+  }
+  return false;
+}
+
 function launchSetupWizard({
   binaryPath,
   logger,
@@ -1078,26 +1121,18 @@ function launchSetupWizard({
   if (shouldSkipSetup(env)) return { ok: false, reason: "skipped" };
 
   const args = ["setup"];
-  if (platform === "linux") {
+  if (platform === "linux" || platform === "darwin") {
     if (!canPrompt(stdin, stdout)) {
       return { ok: false, reason: "non_interactive" };
     }
-    const child = spawnFn(binaryPath, args, { stdio: "inherit" });
-    if (child.pid) return { ok: true };
-    return { ok: false, reason: "spawn_failed" };
-  }
-
-  if (platform === "darwin") {
-    const command = `${binaryPath} ${args.join(" ")}`;
-    const osa = [
-      "osascript",
-      "-e",
-      `tell application \"Terminal\" to do script \"${command.replace(/"/g, '\\"')}\"`
-    ];
-    const result = spawnSyncFn(osa[0], osa.slice(1));
-    if (result.status === 0) return { ok: true };
-    logger?.warn?.(`[docdex] osascript failed: ${result.stderr || "unknown error"}`);
-    return { ok: false, reason: "terminal_launch_failed" };
+    if (platform === "darwin") {
+      return launchMacTerminal({ binaryPath, args, spawnSyncFn, logger })
+        ? { ok: true }
+        : { ok: false, reason: "terminal_launch_failed" };
+    }
+    return launchLinuxTerminal({ binaryPath, args, spawnFn, spawnSyncFn })
+      ? { ok: true }
+      : { ok: false, reason: "terminal_launch_failed" };
   }
 
   if (platform === "win32") {

package/lib/uninstall.js

@@ -206,9 +206,68 @@ function removeCodexConfig(pathname, name = "docdex") {
     return output.join("\n");
   };
 
+  const removeLooseEntry = (text) => {
+    const lines = text.split(/\r?\n/);
+    const output = [];
+    let changed = false;
+    for (const line of lines) {
+      if (/^\s*docdex\s*=/.test(line)) {
+        changed = true;
+        continue;
+      }
+      output.push(line);
+    }
+    return { text: output.join("\n"), changed };
+  };
+
+  const removeEmptyMcpServersTable = (text) => {
+    const lines = text.split(/\r?\n/);
+    const output = [];
+    let inTable = false;
+    let tableHasEntries = false;
+    let buffer = [];
+
+    const flushTable = () => {
+      if (!inTable) return;
+      if (tableHasEntries) output.push(...buffer);
+      inTable = false;
+      tableHasEntries = false;
+      buffer = [];
+    };
+
+    for (const line of lines) {
+      const section = line.match(/^\s*\[([^\]]+)\]\s*$/);
+      if (section) {
+        flushTable();
+        if (section[1].trim() === "mcp_servers") {
+          inTable = true;
+          buffer = [line];
+          continue;
+        }
+        output.push(line);
+        continue;
+      }
+
+      if (inTable) {
+        if (line.trim() && !line.trim().startsWith("#")) {
+          if (/=/.test(line)) tableHasEntries = true;
+        }
+        buffer.push(line);
+        continue;
+      }
+
+      output.push(line);
+    }
+    flushTable();
+    return output.join("\n");
+  };
+
   contents = removeArrayBlocks(contents);
   contents = removeNestedSection(contents);
   contents = removeTableEntry(contents);
+  const loose = removeLooseEntry(contents);
+  contents = loose.text;
+  contents = removeEmptyMcpServersTable(contents);
 
   if (contents !== original) {
     fs.writeFileSync(pathname, contents.endsWith("\n") ? contents : `${contents}\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docdex",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "mcpName": "io.github.bekirdag/docdex",
   "description": "Docdex CLI as an npm-installable binary wrapper.",
   "bin": {