docdex 0.2.8 → 0.2.10

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.2.8
+## 0.2.10
 - 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

@@ -40,6 +40,10 @@ function configUrlForPort(port) {
   return `http://localhost:${port}/sse`;
 }
 
+function configStreamableUrlForPort(port) {
+  return `http://localhost:${port}/v1/mcp`;
+}
+
 function isPortAvailable(port, host) {
   return new Promise((resolve) => {
     const server = net.createServer();
@@ -837,11 +841,21 @@ async function maybePromptOllamaModel({
   }
 
   const normalizedInstalled = installed.map(normalizeModelName);
+  const displayModels = normalizedInstalled.map((model) => {
+    const selectable = model.toLowerCase() !== DEFAULT_OLLAMA_MODEL.toLowerCase();
+    return {
+      model,
+      label: selectable ? model : `${model} (embedding only)`,
+      selectable
+    };
+  });
+  const selectableModels = displayModels.filter((item) => item.selectable).map((item) => item.model);
   const installedLower = normalizedInstalled.map((model) => model.toLowerCase());
   const hasPhi = installedLower.includes(phiModel.toLowerCase());
-  const selectionDefault = defaultChoice && installedLower.includes(defaultChoice.toLowerCase())
+  const defaultLower = defaultChoice ? defaultChoice.toLowerCase() : null;
+  const selectionDefault = defaultLower && selectableModels.some((model) => model.toLowerCase() === defaultLower)
     ? defaultChoice
-    : normalizedInstalled[0];
+    : selectableModels[0];
 
   if (decision.mode === "auto") {
     if (selectionDefault) {
@@ -852,24 +866,28 @@ async function maybePromptOllamaModel({
   }
 
   stdout.write("[docdex] Ollama models detected:\n");
-  normalizedInstalled.forEach((model, idx) => {
-    const marker = model === selectionDefault ? " (default)" : "";
-    stdout.write(`  ${idx + 1}) ${model}${marker}\n`);
+  displayModels.forEach((item, idx) => {
+    const marker = item.model === selectionDefault ? " (default)" : "";
+    stdout.write(`  ${idx + 1}) ${item.label}${marker}\n`);
   });
   if (!hasPhi) {
     stdout.write(`  I) Install ${phiModel} (~${sizeText}, free ${freeText})\n`);
   }
   stdout.write("  S) Skip\n");
 
+  const defaultHint = selectionDefault ? ` [${selectionDefault}]` : "";
   const answer = await promptInput(
-    `[docdex] Select default model [${selectionDefault}]: `,
+    `[docdex] Select default model${defaultHint}: `,
     { stdin, stdout }
   );
   const normalizedAnswer = normalizeModelName(answer);
   const answerLower = normalizedAnswer.toLowerCase();
   if (!answer) {
-    updateDefaultModelConfig(configPath, selectionDefault, logger);
-    return { status: "selected", model: selectionDefault };
+    if (selectionDefault) {
+      updateDefaultModelConfig(configPath, selectionDefault, logger);
+      return { status: "selected", model: selectionDefault };
+    }
+    return { status: "skipped", reason: "no_models" };
   }
   if (answerLower === "s" || answerLower === "skip") {
     return { status: "skipped", reason: "user_skip" };
@@ -881,16 +899,24 @@ async function maybePromptOllamaModel({
     return { status: "installed", model: phiModel };
   }
   const numeric = Number.parseInt(answerLower, 10);
-  if (Number.isFinite(numeric) && numeric >= 1 && numeric <= normalizedInstalled.length) {
-    const selected = normalizedInstalled[numeric - 1];
-    updateDefaultModelConfig(configPath, selected, logger);
-    return { status: "selected", model: selected };
+  if (Number.isFinite(numeric) && numeric >= 1 && numeric <= displayModels.length) {
+    const selected = displayModels[numeric - 1];
+    if (!selected.selectable) {
+      logger?.warn?.(`[docdex] ${selected.model} is an embedding-only model; choose a chat model.`);
+      return { status: "skipped", reason: "embedding_only" };
+    }
+    updateDefaultModelConfig(configPath, selected.model, logger);
+    return { status: "selected", model: selected.model };
   }
   const matchedIndex = installedLower.indexOf(answerLower);
   if (matchedIndex !== -1) {
-    const selected = normalizedInstalled[matchedIndex];
-    updateDefaultModelConfig(configPath, selected, logger);
-    return { status: "selected", model: selected };
+    const selected = displayModels[matchedIndex];
+    if (!selected.selectable) {
+      logger?.warn?.(`[docdex] ${selected.model} is an embedding-only model; choose a chat model.`);
+      return { status: "skipped", reason: "embedding_only" };
+    }
+    updateDefaultModelConfig(configPath, selected.model, logger);
+    return { status: "selected", model: selected.model };
   }
   logger?.warn?.("[docdex] Unrecognized selection; skipping model update.");
   return { status: "skipped", reason: "invalid_selection" };
@@ -1063,6 +1089,55 @@ 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"',
+    'if not (exists window 1) then',
+    `do script ${JSON.stringify(command)}`,
+    "else",
+    `do script ${JSON.stringify(command)} in window 1`,
+    "end if",
+    "activate",
+    "end tell"
+  ].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,
@@ -1082,9 +1157,14 @@ function launchSetupWizard({
     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") {
+      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") {
@@ -1125,10 +1205,11 @@ async function runPostInstallSetup({ binaryPath, logger } = {}) {
   }
 
   const url = configUrlForPort(port);
+  const codexUrl = configStreamableUrlForPort(port);
   const paths = clientConfigPaths();
   upsertMcpServerJson(paths.claude, url);
   upsertMcpServerJson(paths.cursor, url);
-  upsertCodexConfig(paths.codex, url);
+  upsertCodexConfig(paths.codex, codexUrl);
 
   const daemonRoot = ensureDaemonRoot();
   const resolvedBinary = resolveBinaryPath({ binaryPath });
@@ -1160,6 +1241,7 @@ module.exports = {
   upsertCodexConfig,
   pickAvailablePort,
   configUrlForPort,
+  configStreamableUrlForPort,
   parseEnvBool,
   resolveOllamaInstallMode,
   resolveOllamaModelPromptMode,

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`);
@@ -321,6 +380,16 @@ function stopDaemonByName() {
   return true;
 }
 
+function stopMcpByName() {
+  if (process.platform === "win32") {
+    spawnSync("taskkill", ["/IM", "docdex-mcp-server.exe", "/T", "/F"]);
+    return true;
+  }
+  spawnSync("pkill", ["-TERM", "-x", "docdex-mcp-server"]);
+  spawnSync("pkill", ["-TERM", "-f", "docdex-mcp-server"]);
+  return true;
+}
+
 function unregisterStartup() {
   if (process.platform === "darwin") {
     const plistPath = path.join(os.homedir(), "Library", "LaunchAgents", "com.docdex.daemon.plist");
@@ -399,6 +468,7 @@ async function main() {
   if (!stopped) {
     stopDaemonByName();
   }
+  stopMcpByName();
   unregisterStartup();
   removeClientConfigs();
   clearStartupFailure();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docdex",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "mcpName": "io.github.bekirdag/docdex",
   "description": "Docdex CLI as an npm-installable binary wrapper.",
   "bin": {
@@ -16,6 +16,7 @@
   ],
   "scripts": {
     "postinstall": "node ./lib/install.js",
+    "preuninstall": "node ./lib/uninstall.js",
     "postuninstall": "node ./lib/uninstall.js",
     "test": "node --test",
     "pack:verify": "node --test test/packaging_guardrails.test.js"