docdex 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.2.4
+## 0.2.6
 - Added glama support
 
 ## 0.1.10

package/lib/postinstall_setup.js

@@ -381,27 +381,53 @@ function hasInteractiveTty(stdin, stdout) {
   return Boolean((stdin && stdin.isTTY) || (stdout && stdout.isTTY));
 }
 
-function resolveOllamaInstallMode({ env = process.env, stdin = process.stdin, stdout = process.stdout } = {}) {
+function canPromptWithTty(stdin, stdout) {
+  if (hasInteractiveTty(stdin, stdout)) return true;
+  const isWindows = process.platform === "win32";
+  const inputPath = isWindows ? "CONIN$" : "/dev/tty";
+  const outputPath = isWindows ? "CONOUT$" : "/dev/tty";
+  try {
+    const readFd = fs.openSync(inputPath, "r");
+    const writeFd = fs.openSync(outputPath, "w");
+    fs.closeSync(readFd);
+    fs.closeSync(writeFd);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function resolveOllamaInstallMode({
+  env = process.env,
+  stdin = process.stdin,
+  stdout = process.stdout,
+  canPrompt = canPromptWithTty
+} = {}) {
   const override = parseEnvBool(env.DOCDEX_OLLAMA_INSTALL);
   if (override === true) return { mode: "install", reason: "env", interactive: false };
   if (override === false) return { mode: "skip", reason: "env", interactive: false };
-  if (!hasInteractiveTty(stdin, stdout)) {
+  if (!canPrompt(stdin, stdout)) {
+    if (env.CI) return { mode: "skip", reason: "ci", interactive: false };
     return { mode: "skip", reason: "non_interactive", interactive: false };
   }
-  if (env.CI) return { mode: "skip", reason: "ci", interactive: false };
   return { mode: "prompt", reason: "interactive", interactive: true };
 }
 
-function resolveOllamaModelPromptMode({ env = process.env, stdin = process.stdin, stdout = process.stdout } = {}) {
+function resolveOllamaModelPromptMode({
+  env = process.env,
+  stdin = process.stdin,
+  stdout = process.stdout,
+  canPrompt = canPromptWithTty
+} = {}) {
   const override = parseEnvBool(env.DOCDEX_OLLAMA_MODEL_PROMPT);
   if (override === true) return { mode: "prompt", reason: "env", interactive: true };
   if (override === false) return { mode: "skip", reason: "env", interactive: false };
   const assumeYes = parseEnvBool(env.DOCDEX_OLLAMA_MODEL_ASSUME_Y);
   if (assumeYes === true) return { mode: "auto", reason: "env", interactive: false };
-  if (!hasInteractiveTty(stdin, stdout)) {
+  if (!canPrompt(stdin, stdout)) {
+    if (env.CI) return { mode: "skip", reason: "ci", interactive: false };
     return { mode: "skip", reason: "non_interactive", interactive: false };
   }
-  if (env.CI) return { mode: "skip", reason: "ci", interactive: false };
   return { mode: "prompt", reason: "interactive", interactive: true };
 }
 
@@ -563,10 +589,19 @@ function resolvePromptStreams(stdin, stdout) {
     return { input: stdin, output: stdout, close: null };
   }
   const isWindows = process.platform === "win32";
-  const ttyPath = isWindows ? "CONIN$" : "/dev/tty";
+  const inputPath = isWindows ? "CONIN$" : "/dev/tty";
+  const outputPath = isWindows ? "CONOUT$" : "/dev/tty";
   try {
-    const input = fs.createReadStream(ttyPath, { autoClose: true });
-    return { input, output: stdout, close: () => input.close() };
+    const input = fs.createReadStream(inputPath, { autoClose: true });
+    const output = fs.createWriteStream(outputPath, { autoClose: true });
+    return {
+      input,
+      output,
+      close: () => {
+        input.close();
+        output.end();
+      }
+    };
   } catch {
     return { input: stdin, output: stdout, close: null };
   }
@@ -1050,5 +1085,6 @@ module.exports = {
   upsertLlmDefaultModel,
   pullOllamaModel,
   listOllamaModels,
-  hasInteractiveTty
+  hasInteractiveTty,
+  canPromptWithTty
 };

package/lib/uninstall.js

@@ -18,6 +18,8 @@ function stateDir() {
 }
 
 function daemonLockPath() {
+  const override = process.env.DOCDEX_DAEMON_LOCK_PATH;
+  if (override && override.trim()) return override.trim();
   return path.join(os.homedir(), ".docdex", "daemon.lock");
 }
 
@@ -28,21 +30,51 @@ function clientConfigPaths() {
   switch (process.platform) {
     case "win32":
       return {
-        claude: path.join(appData, "Claude", "claude_desktop_config.json"),
-        cursor: path.join(userProfile, ".cursor", "mcp.json"),
-        codex: path.join(userProfile, ".codex", "config.toml")
+        json: [
+          path.join(appData, "Claude", "claude_desktop_config.json"),
+          path.join(userProfile, ".cursor", "mcp.json"),
+          path.join(userProfile, ".cursor", "settings.json"),
+          path.join(userProfile, ".codeium", "windsurf", "mcp_config.json"),
+          path.join(appData, "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
+          path.join(appData, "Code", "User", "globalStorage", "rooveterinaryinc.roo-cline", "settings", "mcp_settings.json"),
+          path.join(userProfile, ".continue", "config.json"),
+          path.join(userProfile, ".kiro", "settings", "mcp.json"),
+          path.join(appData, "Zed", "settings.json")
+        ],
+        toml: [path.join(userProfile, ".codex", "config.toml")],
+        yaml: [path.join(appData, "Aider", "config.yml")]
       };
     case "darwin":
       return {
-        claude: path.join(home, "Library", "Application Support", "Claude", "claude_desktop_config.json"),
-        cursor: path.join(home, ".cursor", "mcp.json"),
-        codex: path.join(home, ".codex", "config.toml")
+        json: [
+          path.join(home, "Library", "Application Support", "Claude", "claude_desktop_config.json"),
+          path.join(home, ".cursor", "mcp.json"),
+          path.join(home, ".cursor", "settings.json"),
+          path.join(home, ".codeium", "windsurf", "mcp_config.json"),
+          path.join(home, "Library", "Application Support", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
+          path.join(home, "Library", "Application Support", "Code", "User", "globalStorage", "rooveterinaryinc.roo-cline", "settings", "mcp_settings.json"),
+          path.join(home, ".continue", "config.json"),
+          path.join(home, ".kiro", "settings", "mcp.json"),
+          path.join(home, ".config", "zed", "settings.json")
+        ],
+        toml: [path.join(home, ".codex", "config.toml")],
+        yaml: [path.join(home, ".config", "aider", "config.yml"), path.join(home, ".aider.conf.yml")]
       };
     default:
       return {
-        claude: path.join(home, ".config", "Claude", "claude_desktop_config.json"),
-        cursor: path.join(home, ".cursor", "mcp.json"),
-        codex: path.join(home, ".codex", "config.toml")
+        json: [
+          path.join(home, ".config", "Claude", "claude_desktop_config.json"),
+          path.join(home, ".cursor", "mcp.json"),
+          path.join(home, ".cursor", "settings.json"),
+          path.join(home, ".codeium", "windsurf", "mcp_config.json"),
+          path.join(home, ".config", "Code", "User", "globalStorage", "saoudrizwan.claude-dev", "settings", "cline_mcp_settings.json"),
+          path.join(home, ".config", "Code", "User", "globalStorage", "rooveterinaryinc.roo-cline", "settings", "mcp_settings.json"),
+          path.join(home, ".continue", "config.json"),
+          path.join(home, ".kiro", "settings", "mcp.json"),
+          path.join(home, ".config", "zed", "settings.json")
+        ],
+        toml: [path.join(home, ".codex", "config.toml")],
+        yaml: [path.join(home, ".config", "aider", "config.yml"), path.join(home, ".aider.conf.yml")]
       };
   }
 }
@@ -67,12 +99,17 @@ function removeMcpServerJson(pathname, name = "docdex") {
   const { value, exists } = readJson(pathname);
   if (!exists || typeof value !== "object" || value == null || Array.isArray(value)) return false;
   const root = value;
-  if (!root.mcpServers || typeof root.mcpServers !== "object" || Array.isArray(root.mcpServers)) {
-    return false;
+  const keys = ["mcpServers", "mcp_servers"];
+  let changed = false;
+  for (const key of keys) {
+    const section = root[key];
+    if (!section || typeof section !== "object" || Array.isArray(section)) continue;
+    if (!Object.prototype.hasOwnProperty.call(section, name)) continue;
+    delete section[name];
+    changed = true;
+    if (Object.keys(section).length === 0) delete root[key];
   }
-  if (!Object.prototype.hasOwnProperty.call(root.mcpServers, name)) return false;
-  delete root.mcpServers[name];
-  if (Object.keys(root.mcpServers).length === 0) delete root.mcpServers;
+  if (!changed) return false;
   writeJson(pathname, root);
   return true;
 }
@@ -180,6 +217,71 @@ function removeCodexConfig(pathname, name = "docdex") {
   return false;
 }
 
+function removeMcpServerYaml(pathname, name = "docdex") {
+  if (!fs.existsSync(pathname)) return false;
+  const original = fs.readFileSync(pathname, "utf8");
+  const lines = original.split(/\r?\n/);
+  const output = [];
+  let inSection = false;
+  let sectionIndent = null;
+  let skipIndent = null;
+  let changed = false;
+
+  const indentSize = (line) => (line.match(/^\s*/)?.[0].length ?? 0);
+
+  for (const line of lines) {
+    if (skipIndent != null) {
+      if (line.trim() && indentSize(line) <= skipIndent) {
+        skipIndent = null;
+      } else {
+        changed = true;
+        continue;
+      }
+    }
+
+    if (!inSection) {
+      if (/^\s*mcp_servers\s*:\s*$/.test(line)) {
+        inSection = true;
+        sectionIndent = indentSize(line);
+      }
+      output.push(line);
+      continue;
+    }
+
+    if (line.trim() && indentSize(line) <= sectionIndent) {
+      inSection = false;
+      output.push(line);
+      continue;
+    }
+
+    if (new RegExp(`^\\s*${name}\\s*:`).test(line)) {
+      changed = true;
+      skipIndent = indentSize(line);
+      continue;
+    }
+
+    const listName = line.match(/^\s*-\s*name\s*:\s*(.+)\s*$/);
+    if (listName && listName[1].replace(/["']/g, "").trim() === name) {
+      changed = true;
+      skipIndent = indentSize(line);
+      continue;
+    }
+
+    const listValue = line.match(/^\s*-\s*([^\s#]+)\s*$/);
+    if (listValue && listValue[1].replace(/["']/g, "").trim() === name) {
+      changed = true;
+      continue;
+    }
+
+    output.push(line);
+  }
+
+  if (changed) {
+    fs.writeFileSync(pathname, output.join("\n"));
+  }
+  return changed;
+}
+
 function killPid(pid) {
   if (!pid) return false;
   try {
@@ -209,6 +311,16 @@ function stopDaemonFromLock() {
   }
 }
 
+function stopDaemonByName() {
+  if (process.platform === "win32") {
+    spawnSync("taskkill", ["/IM", "docdexd.exe", "/T", "/F"]);
+    return true;
+  }
+  spawnSync("pkill", ["-TERM", "-x", "docdexd"]);
+  spawnSync("pkill", ["-TERM", "-f", "docdexd daemon"]);
+  return true;
+}
+
 function unregisterStartup() {
   if (process.platform === "darwin") {
     const plistPath = path.join(os.homedir(), "Library", "LaunchAgents", "com.docdex.daemon.plist");
@@ -259,23 +371,34 @@ function clearStartupFailure() {
 
 function removeDaemonRootNotice() {
   const root = daemonRootPath();
-  const readme = path.join(root, "README.txt");
-  if (fs.existsSync(readme)) {
-    try {
-      fs.unlinkSync(readme);
-    } catch {}
+  const readmes = [path.join(root, "README.txt"), path.join(root, "README.md")];
+  for (const readme of readmes) {
+    if (fs.existsSync(readme)) {
+      try {
+        fs.unlinkSync(readme);
+      } catch {}
+    }
   }
 }
 
 function removeClientConfigs() {
   const paths = clientConfigPaths();
-  removeMcpServerJson(paths.claude);
-  removeMcpServerJson(paths.cursor);
-  removeCodexConfig(paths.codex);
+  for (const pathname of paths.json || []) {
+    removeMcpServerJson(pathname);
+  }
+  for (const pathname of paths.toml || []) {
+    removeCodexConfig(pathname);
+  }
+  for (const pathname of paths.yaml || []) {
+    removeMcpServerYaml(pathname);
+  }
 }
 
 async function main() {
-  stopDaemonFromLock();
+  const stopped = stopDaemonFromLock();
+  if (!stopped) {
+    stopDaemonByName();
+  }
   unregisterStartup();
   removeClientConfigs();
   clearStartupFailure();
@@ -289,7 +412,9 @@ if (require.main === module) {
 module.exports = {
   removeMcpServerJson,
   removeCodexConfig,
+  removeMcpServerYaml,
   stopDaemonFromLock,
+  stopDaemonByName,
   unregisterStartup,
   removeClientConfigs
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docdex",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Docdex CLI as an npm-installable binary wrapper.",
   "bin": {
     "docdex": "bin/docdex.js",