@yugabytedb/meko-mcp 1.1.0 → 1.2.0

package/lib/clients/cursor.mjs

@@ -17,6 +17,7 @@ import {
 } from "../config.mjs";
 import {
   getInstallerVersion,
+  isDanglingSymlink,
   markerIsStale,
   readInstallerMarker,
   resolveHooksRoot,
@@ -29,7 +30,8 @@ import {
 const SKILLS = [{ name: "meko-mcp-tools" }];
 
 const HOOKS = [
-  { event: "sessionStart", script: "session-start.sh", timeout: 15000 },
+  { event: "sessionStart", script: "cursor-session-start.sh", timeout: 15000 },
+  { event: "beforeSubmitPrompt", script: "before-submit-prompt.sh", matcher: "UserPromptSubmit", timeout: 2000 },
   { event: "preCompact", script: "pre-compact.sh" },
   { event: "sessionEnd", script: "session-end.sh", timeout: 30000 },
 ];
@@ -101,21 +103,21 @@ export function createCursorAdapter(customPaths = {}) {
       writeJsonFile(mcpPath, cfg);
     },
     setHookEnvironment({ url, apiKey, dryRun, log, scope, projectRoot, cursorHookMode }) {
-      const mode = cursorHookMode || "hybrid";
+      const mode = cursorHookMode || "native";
       if (dryRun) {
-        if (mode === "native" || mode === "hybrid") {
+        if (mode === "native") {
           log.dim(`  Would configure Cursor hooks at ${paths.getHooksPath(scope, projectRoot)}`);
         }
-        if (mode === "claude-compat" || mode === "hybrid") {
+        if (mode === "claude-compat") {
           log.dim(`  Would configure Claude-compatible hooks at ${paths.getClaudeCompatSettingsPath(scope, projectRoot)}`);
         }
         return;
       }
 
-      if (mode === "native" || mode === "hybrid") {
+      if (mode === "native") {
         installNativeCursorHooks({ scope, projectRoot, url, apiKey, paths });
       }
-      if (mode === "claude-compat" || mode === "hybrid") {
+      if (mode === "claude-compat") {
         installClaudeCompatHooks({ scope, projectRoot, url, apiKey, paths });
       }
     },
@@ -159,6 +161,15 @@ export function createCursorAdapter(customPaths = {}) {
             // Same version already deployed — nothing to do.
             continue;
           }
+        } else if (isDanglingSymlink(destination)) {
+          // Stale symlink left behind by an earlier install whose target
+          // (e.g. a deleted worktree) no longer exists. existsSync is false
+          // for these, so the branch above misses them. Clear it so the
+          // fresh-install path below can replace it cleanly.
+          log.dim?.(
+            `  Replacing dangling symlink at ${destination} (target missing).`,
+          );
+          removePath(destination);
         }
 
         const strategy = symlinkOrCopy(source, destination);
@@ -186,7 +197,7 @@ export function createCursorAdapter(customPaths = {}) {
         uninstallCursorHooks({
           scope,
           projectRoot,
-          mode: cursorHookMode || "hybrid",
+          mode: cursorHookMode || "native",
           paths,
         });
         results.push({ key: "hooks", ok: true, message: "Cursor hook configuration cleaned up." });
@@ -243,10 +254,12 @@ function installNativeCursorHooks({ scope, projectRoot, url, apiKey, paths }) {
   }
 
   const handlersRoot = resolveHooksRoot();
+  pruneNativeCursorMekoHooks(cfg.hooks);
   for (const hook of HOOKS) {
     const scriptPath = join(handlersRoot, hook.script);
     const entry = { command: buildScriptCommand({ scriptPath }) };
     if (hook.timeout) entry.timeout = hook.timeout;
+    if (hook.matcher) entry.matcher = hook.matcher;
     upsertHookEntry(cfg.hooks, hook.event, entry);
   }
 
@@ -305,6 +318,30 @@ function upsertHookEntry(hooksObj, event, entry) {
   if (!exists) hooksObj[event].push(entry);
 }
 
+function pruneNativeCursorMekoHooks(hooksObj) {
+  if (!hooksObj || typeof hooksObj !== "object") return;
+  for (const event of Object.keys(hooksObj)) {
+    if (!Array.isArray(hooksObj[event])) continue;
+    hooksObj[event] = hooksObj[event].filter((item) => {
+      if (!item?.command) return true;
+      return !isMekoHookCommand(item.command);
+    });
+  }
+}
+
+function isMekoHookCommand(command) {
+  if (typeof command !== "string") return false;
+  if (!command.includes("hooks-handlers/")) return false;
+  return [
+    "session-start.sh",
+    "cursor-session-start.sh",
+    "before-submit-prompt.sh",
+    "pre-compact.sh",
+    "session-end.sh",
+    "post-tool-context.sh",
+  ].some((script) => command.includes(script));
+}
+
 function upsertClaudeCompatHook(hooksObj, event, entry) {
   if (!Array.isArray(hooksObj[event])) hooksObj[event] = [];
   let bucket = hooksObj[event].find((item) => Array.isArray(item.hooks));
@@ -318,10 +355,10 @@ function upsertClaudeCompatHook(hooksObj, event, entry) {
 
 function uninstallCursorHooks({ scope, projectRoot, mode, paths }) {
   const handlersRoot = resolveHooksRoot();
-  const scripts = ["session-start.sh", "pre-compact.sh", "session-end.sh"]
+  const scripts = ["session-start.sh", "cursor-session-start.sh", "before-submit-prompt.sh", "pre-compact.sh", "session-end.sh"]
     .map((name) => join(handlersRoot, name));
 
-  if (mode === "native" || mode === "hybrid") {
+  if (mode === "native") {
     const hooksPath = paths.getHooksPath(scope, projectRoot);
     const cfg = readJsonFile(hooksPath);
     if (cfg?.hooks && typeof cfg.hooks === "object") {
@@ -336,7 +373,7 @@ function uninstallCursorHooks({ scope, projectRoot, mode, paths }) {
     }
   }
 
-  if (mode === "claude-compat" || mode === "hybrid") {
+  if (mode === "claude-compat") {
     // NOTE: we deliberately do NOT strip env.MEKO_MCP_URL / env.MEKO_API_KEY here.
     // On scope=user, this file is the same ~/.claude/settings.json the Claude Code
     // adapter owns; the Claude Code uninstall (claude-code.mjs removeKeys call) is

package/lib/config.mjs

@@ -117,6 +117,32 @@ export function getCodexAgentsMdPath() {
   return join(codexHome, "AGENTS.md");
 }
 
+/**
+ * Return path to Codex's user-level hooks config.
+ * @returns {string}
+ */
+export function getCodexHooksPath() {
+  const codexHome = process.env.CODEX_HOME || join(homedir(), ".codex");
+  return join(codexHome, "hooks.json");
+}
+
+/**
+ * Return path to the Meko env file the Codex hooks source on launch.
+ * Lives next to hooks.json under $CODEX_HOME (default ~/.codex/) and is
+ * written at mode 0600. Used because Codex's hooks.json schema has no
+ * `env` block, and inlining the API key into each hook's `command`
+ * field would expose it via `ps -ef` while the hook runs.
+ *
+ * The hook command becomes `. ~/.codex/meko-env.sh && bash /path/to/hook.sh`,
+ * so the secret never appears in process arguments.
+ *
+ * @returns {string}
+ */
+export function getCodexMekoEnvFilePath() {
+  const codexHome = process.env.CODEX_HOME || join(homedir(), ".codex");
+  return join(codexHome, "meko-env.sh");
+}
+
 /**
  * Return path to the shared agent-skills directory used by Codex
  * (and other agent runtimes that follow the convention).

package/lib/installer.mjs

@@ -37,7 +37,7 @@ export async function install(options) {
     verbose = false,
     yes = false,
     projectRoot = process.cwd(),
-    cursorHookMode = "hybrid",
+    cursorHookMode = "native",
   } = options;
 
   const adapters = getClientAdapters();
@@ -225,7 +225,7 @@ export async function uninstall(options = {}) {
     scope = "user",
     verbose = false,
     projectRoot = process.cwd(),
-    cursorHookMode = "hybrid",
+    cursorHookMode = "native",
   } = options;
 
   const adapters = getClientAdapters();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yugabytedb/meko-mcp",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Single-line installer for Meko MCP Server across Claude and Cursor clients",
   "type": "module",
   "bin": {

package/scripts/bundle-assets.mjs

@@ -18,10 +18,18 @@ const PAYLOAD = [
     from: join(repoRoot, "skills", "skills", "meko-mcp-tools"),
     to: join(assetsDir, "skills", "meko-mcp-tools"),
   },
+  {
+    from: join(repoRoot, "skills", "skills", "meko-mcp-tools-desktop"),
+    to: join(assetsDir, "skills", "meko-mcp-tools-desktop"),
+  },
   {
     from: join(repoRoot, "skills", "hooks-handlers"),
     to: join(assetsDir, "hooks-handlers"),
   },
+  {
+    from: join(repoRoot, "skills", "scripts", "package-desktop-skill.sh"),
+    to: join(assetsDir, "scripts", "package-desktop-skill.sh"),
+  },
 ];
 
 const cleaning = process.argv.includes("--clean");