@haystackeditor/cli 0.15.12 → 0.15.13

package/dist/index.js

@@ -42,7 +42,12 @@ import { schemaCommand, listSchemas } from './commands/schema-cmd.js';
 import { registerWebhook, listWebhooks, rotateWebhookSecret, setWebhookEnabled, listDeliveries, replayDelivery, } from './commands/webhooks.js';
 import { editRulesCommand, validateRulesCommand } from './commands/rules.js';
 import { headlessLoginCommand, headlessLogoutCommand, listTokensCommand, revokeTokenCommand, } from './commands/tokens.js';
-import { runMcpServer } from './commands/mcp.js';
+// `mcp` is imported lazily inside its command action (below), NOT at the top level.
+// It is the only module that pulls in `@modelcontextprotocol/sdk`; keeping it out of
+// the startup import graph means a missing/broken SDK can never crash core commands
+// like `triage`/`submit`. (0.15.12 shipped `mcp.js` but published its package.json
+// WITHOUT `@modelcontextprotocol/sdk`, so the eager import here hard-crashed every
+// command at startup with ERR_MODULE_NOT_FOUND.)
 // pr-state read helpers (parsePrRef, prReadCommand) are imported by the MCP
 // server directly from ./commands/pr.js; no top-level CLI command is wired
 // here. The previous `pr <ref> [show|merge|snooze|dismiss]` and `fix <ref>`
@@ -818,10 +823,19 @@ program
     .description('Run a stdio MCP server exposing Haystack tools to Claude Code, Cursor, etc.')
     .action(async () => {
     try {
+        // Lazy import: only this command needs @modelcontextprotocol/sdk, so we keep it
+        // out of the startup graph (see the note where the eager import used to be).
+        const { runMcpServer } = await import('./commands/mcp.js');
         await runMcpServer();
     }
     catch (err) {
-        console.error(chalk.red('mcp server failed:'), err instanceof Error ? err.message : err);
+        const code = err?.code;
+        if (code === 'ERR_MODULE_NOT_FOUND') {
+            console.error(chalk.red('mcp server failed:'), 'the @modelcontextprotocol/sdk package is missing. Reinstall the CLI to pull it in (e.g. `npm i -g @haystackeditor/cli@latest`).');
+        }
+        else {
+            console.error(chalk.red('mcp server failed:'), err instanceof Error ? err.message : err);
+        }
         process.exit(1);
     }
 });

package/dist/utils/git.js

@@ -3,7 +3,7 @@
  *
  * Provides functions for git operations: branch management, push, remote parsing.
  */
-import { execSync } from 'child_process';
+import { execFileSync, execSync } from 'child_process';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
@@ -369,7 +369,7 @@ export function getCommitMessagesSinceBase(baseBranch) {
 /** True if `ref` resolves to a commit in the current repo. */
 function gitRefResolves(ref) {
     try {
-        execSync(`git rev-parse --verify --quiet ${ref}^{commit}`, {
+        execFileSync('git', ['rev-parse', '--verify', '--quiet', '--', `${ref}^{commit}`], {
             stdio: ['pipe', 'pipe', 'pipe'],
         });
         return true;
@@ -382,7 +382,7 @@ function gitRefResolves(ref) {
 function gitIsAncestor(ancestor, descendant) {
     try {
         // exit 0 => ancestor; exit 1 => not; both non-throwing for us via stdio pipe
-        execSync(`git merge-base --is-ancestor ${ancestor} ${descendant}`, {
+        execFileSync('git', ['merge-base', '--is-ancestor', '--', ancestor, descendant], {
             stdio: ['pipe', 'pipe', 'pipe'],
         });
         return true;
@@ -440,7 +440,7 @@ export function resolveDiffBaseRef(baseBranch) {
     // if <base> was rewound on the remote).
     let fetched = false;
     try {
-        execSync(`git fetch origin +refs/heads/${baseBranch}:${remoteRef}`, {
+        execFileSync('git', ['fetch', 'origin', `+refs/heads/${baseBranch}:${remoteRef}`], {
             stdio: ['pipe', 'pipe', 'pipe'],
         });
         fetched = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haystackeditor/cli",
-  "version": "0.15.12",
+  "version": "0.15.13",
   "description": "Set up Haystack for your project — automated PR review, triage, and merge queue",
   "type": "module",
   "bin": {
@@ -34,6 +34,7 @@
     "url": "https://github.com/haystackeditor/haystack-review/issues"
   },
   "dependencies": {
+    "@modelcontextprotocol/sdk": "1.26.0",
     "chalk": "5.6.2",
     "commander": "12.1.0",
     "fast-glob": "3.3.3",