@unbrained/pm-cli 2026.9.23 → 2026.9.25

package/packages/pm-vcs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unbrained/pm-vcs-sdk-exemplar",
-  "version": "2026.9.23",
+  "version": "2026.9.25",
   "private": true,
   "type": "module",
   "description": "Beyond-PM exemplar: a VCS-style changeset workflow built entirely on public pm SDK and extension primitives.",

package/plugins/pm-claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pm-claude",
   "description": "Native pm CLI integration for Claude Code — 28 MCP tools, 5 workflow skills, 14 slash commands, 4 subagents (coordinator, delivery-chain, triage, verification), hybrid TUI task tracking (pm as persistent store + Claude Code task panel as live view), session context injection, and full git-based project management without leaving Claude Code.",
-  "version": "2026.9.23",
+  "version": "2026.9.25",
   "author": {
     "name": "unbrained",
     "url": "https://github.com/unbraind/pm-cli"

package/plugins/pm-claude/README.md

@@ -11,7 +11,7 @@ Native pm CLI integration for Claude Code. Use pm project management tools direc
 | **14 slash commands** | Full lifecycle coverage — status, start, close, triage, audit, search, new, list, calendar, developer, planner, release, workflow, init |
 | **4 subagents** | `pm-coordinator` (batch/multi-item), `pm-triage-agent` (duplicate-safe item creation), `pm-verification-agent` (evidence + close readiness), and `pm-delivery-chain` (orchestrated delivery) |
 | **Hybrid TUI tracking** | pm items sync to Claude Code's task panel — pm is the persistent store, the task panel is the live session view |
-| **Session hook** | Injects active pm item summary at session start when pm is initialized (uses native modules, no CLI required) |
+| **Session hook** | Injects active pm item summary at session start using the same pinned pm-cli runtime as the MCP server |
 
 ## Installation
 
@@ -192,8 +192,9 @@ All skills and commands implement this pattern for every claimed item:
 
 ## Session Context Injection
 
-At session start, the hook runs the published `pm` CLI without requiring a global install:
-- Uses `npx --yes --package=@unbrained/pm-cli@latest pm context --limit 5 --json`
+At session start, the hook runs the plugin's exact-version `pm` CLI without requiring a global install:
+- Uses the version pinned in `plugins/pm-claude/package.json` and persisted in the plugin data directory
+- Reuses the installed runtime offline on later sessions
 - Injects a compact summary of in-progress/open/blocked items
 
 Example output:
@@ -215,8 +216,8 @@ Use pm_context tool or /pm-status for full details.
 
 ## Requirements
 
-- Node.js ≥ 20
-- pm CLI resolved automatically via local dist (in repo) or `npx --yes @unbrained/pm-cli@latest` (no global install needed)
+- Node.js ≥ 22.18.0
+- pm CLI resolved automatically from the plugin's pinned package installation (no global install needed)
 - Project initialized with `pm init` (or use `/pm-init`)
 
 ## Links

package/plugins/pm-claude/hooks/hooks.json

@@ -7,7 +7,7 @@
           {
             "type": "command",
             "command": "node \"${CLAUDE_PLUGIN_ROOT}/hooks/session-start.mjs\"",
-            "timeout": 8,
+            "timeout": 130,
             "async": true
           }
         ]

package/plugins/pm-claude/hooks/session-start.mjs

@@ -3,12 +3,13 @@
  * pm-cli Claude Code session-start hook.
  *
  * Injects a brief pm context summary into the session when pm is initialized
- * in the current workspace. Uses the published pm CLI through npx without
+ * in the current workspace. Uses the plugin's exact-version runtime without
  * requiring a global install. Exits silently if pm is not set up.
  */
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import { execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
+import { resolvePluginRuntime } from "../scripts/plugin-runtime.mjs";
 
 const workspace = process.cwd();
 const pmSettingsPath = join(workspace, ".agents", "pm", "settings.json");
@@ -40,10 +41,12 @@ function formatSummary(ctx) {
   );
 }
 
-function tryNpxContext() {
+async function readContext() {
   try {
-    const raw = execSync(
-      "npx -y --package=@unbrained/pm-cli@latest pm context --limit 5 --json",
+    const runtime = await resolvePluginRuntime();
+    const raw = execFileSync(
+      process.execPath,
+      [runtime.cli, "context", "--limit", "5", "--json"],
       {
         cwd: workspace,
         encoding: "utf-8",
@@ -58,7 +61,7 @@ function tryNpxContext() {
 }
 
 try {
-  const ctx = tryNpxContext();
+  const ctx = await readContext();
   if (!ctx) process.exit(0);
 
   const message = formatSummary(ctx);

package/plugins/pm-claude/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "pm-claude-runtime",
+  "private": true,
+  "type": "module",
+  "version": "2026.9.25",
+  "dependencies": {
+    "@unbrained/pm-cli": "2026.9.25"
+  }
+}

package/plugins/pm-claude/scripts/plugin-runtime.mjs

@@ -0,0 +1,84 @@
+/**
+ * Resolve the exact pm-cli runtime declared by a copied agent plugin.
+ * This file is copied into each plugin by gen-plugin-mcp-wrappers.mjs so a
+ * marketplace cache never needs to reach back into the repository checkout.
+ */
+import { spawnSync } from "node:child_process";
+import { access, mkdir, mkdtemp, readFile, rename, rm } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const pluginRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const packageName = "@unbrained/pm-cli";
+const versionPattern = /^[1-9]\d{3}\.[1-9]\d*\.[1-9]\d*(?:-[1-9]\d*)?$/;
+
+/** Require both the declared version and the executable shipped by that package. */
+async function installedRuntime(root, version) {
+  const packageRoot = path.join(root, "node_modules", "@unbrained", "pm-cli");
+  try {
+    const manifest = JSON.parse(await readFile(path.join(packageRoot, "package.json"), "utf8"));
+    if (manifest.version !== version) return null;
+    const server = path.join(packageRoot, "dist", "mcp", "server.js");
+    const cli = path.join(packageRoot, "dist", "cli.js");
+    await access(server);
+    await access(cli);
+    return { server, cli, version };
+  } catch {
+    return null;
+  }
+}
+
+/** Install into a private staging directory and publish only a complete tree. */
+async function installRuntime(dataRoot, version, installer) {
+  await mkdir(dataRoot, { recursive: true });
+  const finalRoot = path.join(dataRoot, `v${version}`);
+  const existing = await installedRuntime(finalRoot, version);
+  if (existing) return existing;
+  const stagingRoot = await mkdtemp(path.join(dataRoot, `.install-${version}-`));
+  try {
+    const args = ["install", "--prefix", stagingRoot, "--no-save", "--ignore-scripts", "--no-audit", "--no-fund", "--package-lock=false", `${packageName}@${version}`];
+    const windows = process.platform === "win32";
+    // The command text contains only fixed tokens and a validated version.
+    // Put the caller-selected path in the child environment so cmd.exe never
+    // parses path metacharacters as command syntax.
+    const command = windows ? process.env.ComSpec || "cmd.exe" : "npm";
+    const commandArgs = windows
+      ? ["/d", "/v:off", "/s", "/c", `"npm.cmd ${args.map((arg) => arg === stagingRoot ? '"%PM_PLUGIN_STAGING_ROOT%"' : arg).join(" ")}"`]
+      : args;
+    const result = installer(command, commandArgs, {
+      encoding: "utf8", timeout: 120000, stdio: ["ignore", "pipe", "pipe"],
+      ...(windows ? { windowsVerbatimArguments: true, env: { ...process.env, PM_PLUGIN_STAGING_ROOT: stagingRoot } } : {}),
+    });
+    if (result.error || result.status !== 0 || !(await installedRuntime(stagingRoot, version))) {
+      throw new Error(`Cannot install ${packageName}@${version}: ${result.error?.message || result.stderr?.trim() || "incomplete package"}`);
+    }
+    try {
+      await rename(stagingRoot, finalRoot);
+    } catch (error) {
+      if (!(await installedRuntime(finalRoot, version))) {
+        throw new Error(`Plugin runtime at ${finalRoot} is incomplete; remove that directory and retry.`, { cause: error });
+      }
+    }
+    const runtime = await installedRuntime(finalRoot, version);
+    if (!runtime) throw new Error(`Plugin runtime at ${finalRoot} is incomplete; remove that directory and retry.`);
+    return runtime;
+  } finally {
+    await rm(stagingRoot, { recursive: true, force: true });
+  }
+}
+
+/** Resolve a copied plugin's runtime without ever consulting npm's latest tag. */
+export async function resolvePluginRuntime(options = {}) {
+  const root = options.pluginRoot ?? pluginRoot;
+  const plugin = JSON.parse(await readFile(path.join(root, "package.json"), "utf8"));
+  const version = plugin.dependencies?.[packageName];
+  if (typeof version !== "string" || !versionPattern.test(version) || plugin.version !== version) {
+    throw new Error(`Plugin ${plugin.name ?? root} needs an exact pm-cli dependency matching its version.`);
+  }
+  const bundled = await installedRuntime(root, version);
+  if (bundled) return bundled;
+  const dataRoot = process.env.PLUGIN_DATA || process.env.CLAUDE_PLUGIN_DATA ||
+    path.join(os.homedir(), ".cache", "pm-cli", "plugins", path.basename(root));
+  return installRuntime(dataRoot, version, options.installer ?? spawnSync);
+}

package/plugins/pm-claude/scripts/pm-mcp-server.mjs

@@ -1,108 +1,51 @@
 #!/usr/bin/env node
 /**
- * This file is auto-generated by scripts/gen-plugin-mcp-wrappers.mjs.
- * Do not edit directly.
+ * Cached-plugin MCP launcher, copied verbatim into Claude and Codex plugins.
+ * The server runs from an exact-version package, never from an npm tag.
  */
 import { spawn } from "node:child_process";
-import { access } from "node:fs/promises";
+import { access, readFile } from "node:fs/promises";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
-const here = path.dirname(fileURLToPath(import.meta.url));
+import { fileURLToPath } from "node:url";
+import { resolvePluginRuntime } from "./plugin-runtime.mjs";
 
-async function exists(target) {
-  try { await access(target); return true; } catch { return false; }
-}
+const here = path.dirname(fileURLToPath(import.meta.url));
 
-function isImportUrl(target) {
-  if (/^[A-Za-z]:[\\/]/.test(target)) {
-    return false;
-  }
+/** Return an explicit local server path or this plugin's matching checkout build. */
+async function localServer() {
+  const override = process.env.PM_CLI_MCP_SERVER;
+  if (override) {
+    const target = override.startsWith("file:") ? fileURLToPath(override) : path.resolve(override);
+    await access(target);
+    return target;
+  }
+  const repoRoot = path.resolve(here, "..", "..", "..");
+  const pluginRoot = path.resolve(here, "..");
+  const candidate = path.join(repoRoot, "dist", "mcp", "server.js");
   try {
-    return new URL(target).protocol.length > 0;
+    const [repo, plugin] = await Promise.all([
+      readFile(path.join(repoRoot, "package.json"), "utf8").then(JSON.parse),
+      readFile(path.join(pluginRoot, "package.json"), "utf8").then(JSON.parse),
+    ]);
+    if (repo.name !== "@unbrained/pm-cli" || repo.version !== plugin.version ||
+        plugin.dependencies?.[repo.name] !== repo.version) return null;
+    await access(candidate);
+    return candidate;
   } catch {
-    return false;
-  }
-}
-
-function isMissingServerModule(error) {
-  return typeof error === "object" && error !== null && error.code === "ERR_MODULE_NOT_FOUND";
-}
-
-async function importServerModule(target) {
-  try {
-    return await import(target);
-  } catch (error) {
-    if (isMissingServerModule(error)) {
-      return null;
-    }
-    throw error;
+    return null;
   }
 }
 
-async function findRepoServer() {
-  let cursor = here;
-  for (let depth = 0; depth < 10; depth += 1) {
-    const candidate = path.join(cursor, "dist", "mcp", "server.js");
-    if (await exists(candidate)) {
-      return candidate;
-    }
-    const parent = path.dirname(cursor);
-    if (parent === cursor) {
-      break;
-    }
-    cursor = parent;
-  }
-  return null;
-}
-
-async function startServer(target) {
-  if (!target) {
-    return false;
-  }
-  if (isImportUrl(target)) {
-    let url;
-    try {
-      url = new URL(target);
-    } catch {
-      return false;
-    }
-    if (url.protocol === "file:") {
-      let filePath;
-      try {
-        filePath = fileURLToPath(url);
-      } catch {
-        return false;
-      }
-      if (!(await exists(filePath))) {
-        return false;
-      }
-    }
-    const server = await importServerModule(target);
-    if (!server) {
-      return false;
-    }
-    server.startMcpServer();
-    return true;
-  }
-  if (!(await exists(target))) {
-    return false;
-  }
-  const server = await importServerModule(pathToFileURL(path.resolve(target)).href);
-  if (!server) {
-    return false;
-  }
-  server.startMcpServer();
-  return true;
-}
-
-if (!(await startServer(process.env.PM_CLI_MCP_SERVER)) && !(await startServer(await findRepoServer()))) {
-  const npxCommand = process.platform === "win32" ? "npx.cmd" : "npx";
-  const child = spawn(npxCommand, ["-y", "--package=@unbrained/pm-cli@latest", "pm-mcp"], { stdio: "inherit", env: process.env });
-  child.on("exit", (code, signal) => {
-    if (signal) {
-      process.kill(process.pid, signal);
-      return;
-    }
-    process.exit(code ?? 1);
-  });
-}
+const server = (await localServer()) ?? (await resolvePluginRuntime()).server;
+const child = spawn(process.execPath, [server], { stdio: "inherit", env: process.env });
+child.on("error", (error) => {
+  console.error(`pm-mcp plugin runtime failed: ${error.message}`);
+  process.exitCode = 1;
+});
+child.on("exit", (code, signal) => {
+  if (signal) {
+    process.kill(process.pid, signal);
+  } else {
+    process.exitCode = code ?? 1;
+  }
+});

package/plugins/pm-codex/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pm-codex",
-  "version": "2026.9.23",
+  "version": "2026.9.25",
   "description": "Native Codex integration for pm-cli with bundled MCP tools, skills, commands, and agent workflows.",
   "author": {
     "name": "unbrained",

package/plugins/pm-codex/.mcp.json

@@ -5,9 +5,6 @@
       "args": [
         "./scripts/pm-mcp-server.mjs"
       ],
-      "env": {
-        "PM_AUTHOR": "codex-agent"
-      },
       "note": "Native pm-cli MCP server. It imports pm command modules directly and does not spawn the pm CLI for tool calls."
     }
   }

package/plugins/pm-codex/README.md

@@ -17,7 +17,7 @@ codex plugin marketplace add .
 
 Restart Codex, then install **pm CLI** from the repo marketplace. The bundled MCP server starts through `plugins/pm-codex/scripts/pm-mcp-server.mjs`.
 
-For a published package install, keep `@unbrained/pm-cli` available through npm. The launcher uses the local repo build when present and falls back to `npx -y --package=@unbrained/pm-cli@latest pm-mcp` when the plugin is cached outside the repository.
+The launcher uses the local repo build when present. In a copied plugin cache it installs the exact `@unbrained/pm-cli` version declared in this plugin's `package.json` into the plugin data directory, then starts that server directly with Node. The runtime is reused offline after the first installation. If the pinned version is unavailable, startup fails with an install error instead of silently running a different release.
 
 ## Native Tools
 

package/plugins/pm-codex/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "pm-codex-runtime",
+  "private": true,
+  "type": "module",
+  "version": "2026.9.25",
+  "dependencies": {
+    "@unbrained/pm-cli": "2026.9.25"
+  }
+}

package/plugins/pm-codex/scripts/plugin-runtime.mjs

@@ -0,0 +1,84 @@
+/**
+ * Resolve the exact pm-cli runtime declared by a copied agent plugin.
+ * This file is copied into each plugin by gen-plugin-mcp-wrappers.mjs so a
+ * marketplace cache never needs to reach back into the repository checkout.
+ */
+import { spawnSync } from "node:child_process";
+import { access, mkdir, mkdtemp, readFile, rename, rm } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const pluginRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const packageName = "@unbrained/pm-cli";
+const versionPattern = /^[1-9]\d{3}\.[1-9]\d*\.[1-9]\d*(?:-[1-9]\d*)?$/;
+
+/** Require both the declared version and the executable shipped by that package. */
+async function installedRuntime(root, version) {
+  const packageRoot = path.join(root, "node_modules", "@unbrained", "pm-cli");
+  try {
+    const manifest = JSON.parse(await readFile(path.join(packageRoot, "package.json"), "utf8"));
+    if (manifest.version !== version) return null;
+    const server = path.join(packageRoot, "dist", "mcp", "server.js");
+    const cli = path.join(packageRoot, "dist", "cli.js");
+    await access(server);
+    await access(cli);
+    return { server, cli, version };
+  } catch {
+    return null;
+  }
+}
+
+/** Install into a private staging directory and publish only a complete tree. */
+async function installRuntime(dataRoot, version, installer) {
+  await mkdir(dataRoot, { recursive: true });
+  const finalRoot = path.join(dataRoot, `v${version}`);
+  const existing = await installedRuntime(finalRoot, version);
+  if (existing) return existing;
+  const stagingRoot = await mkdtemp(path.join(dataRoot, `.install-${version}-`));
+  try {
+    const args = ["install", "--prefix", stagingRoot, "--no-save", "--ignore-scripts", "--no-audit", "--no-fund", "--package-lock=false", `${packageName}@${version}`];
+    const windows = process.platform === "win32";
+    // The command text contains only fixed tokens and a validated version.
+    // Put the caller-selected path in the child environment so cmd.exe never
+    // parses path metacharacters as command syntax.
+    const command = windows ? process.env.ComSpec || "cmd.exe" : "npm";
+    const commandArgs = windows
+      ? ["/d", "/v:off", "/s", "/c", `"npm.cmd ${args.map((arg) => arg === stagingRoot ? '"%PM_PLUGIN_STAGING_ROOT%"' : arg).join(" ")}"`]
+      : args;
+    const result = installer(command, commandArgs, {
+      encoding: "utf8", timeout: 120000, stdio: ["ignore", "pipe", "pipe"],
+      ...(windows ? { windowsVerbatimArguments: true, env: { ...process.env, PM_PLUGIN_STAGING_ROOT: stagingRoot } } : {}),
+    });
+    if (result.error || result.status !== 0 || !(await installedRuntime(stagingRoot, version))) {
+      throw new Error(`Cannot install ${packageName}@${version}: ${result.error?.message || result.stderr?.trim() || "incomplete package"}`);
+    }
+    try {
+      await rename(stagingRoot, finalRoot);
+    } catch (error) {
+      if (!(await installedRuntime(finalRoot, version))) {
+        throw new Error(`Plugin runtime at ${finalRoot} is incomplete; remove that directory and retry.`, { cause: error });
+      }
+    }
+    const runtime = await installedRuntime(finalRoot, version);
+    if (!runtime) throw new Error(`Plugin runtime at ${finalRoot} is incomplete; remove that directory and retry.`);
+    return runtime;
+  } finally {
+    await rm(stagingRoot, { recursive: true, force: true });
+  }
+}
+
+/** Resolve a copied plugin's runtime without ever consulting npm's latest tag. */
+export async function resolvePluginRuntime(options = {}) {
+  const root = options.pluginRoot ?? pluginRoot;
+  const plugin = JSON.parse(await readFile(path.join(root, "package.json"), "utf8"));
+  const version = plugin.dependencies?.[packageName];
+  if (typeof version !== "string" || !versionPattern.test(version) || plugin.version !== version) {
+    throw new Error(`Plugin ${plugin.name ?? root} needs an exact pm-cli dependency matching its version.`);
+  }
+  const bundled = await installedRuntime(root, version);
+  if (bundled) return bundled;
+  const dataRoot = process.env.PLUGIN_DATA || process.env.CLAUDE_PLUGIN_DATA ||
+    path.join(os.homedir(), ".cache", "pm-cli", "plugins", path.basename(root));
+  return installRuntime(dataRoot, version, options.installer ?? spawnSync);
+}

package/plugins/pm-codex/scripts/pm-mcp-server.mjs

@@ -1,112 +1,51 @@
 #!/usr/bin/env node
 /**
- * This file is auto-generated by scripts/gen-plugin-mcp-wrappers.mjs.
- * Do not edit directly.
+ * Cached-plugin MCP launcher, copied verbatim into Claude and Codex plugins.
+ * The server runs from an exact-version package, never from an npm tag.
  */
 import { spawn } from "node:child_process";
-import { access } from "node:fs/promises";
+import { access, readFile } from "node:fs/promises";
 import path from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
+import { fileURLToPath } from "node:url";
+import { resolvePluginRuntime } from "./plugin-runtime.mjs";
 
-async function canRead(target) {
-  try {
-    await access(target);
-    return true;
-  } catch {
-    return false;
-  }
-}
+const here = path.dirname(fileURLToPath(import.meta.url));
 
-function hasImportProtocol(target) {
-  if (/^[A-Za-z]:[\\/]/.test(target)) {
-    return false;
+/** Return an explicit local server path or this plugin's matching checkout build. */
+async function localServer() {
+  const override = process.env.PM_CLI_MCP_SERVER;
+  if (override) {
+    const target = override.startsWith("file:") ? fileURLToPath(override) : path.resolve(override);
+    await access(target);
+    return target;
   }
+  const repoRoot = path.resolve(here, "..", "..", "..");
+  const pluginRoot = path.resolve(here, "..");
+  const candidate = path.join(repoRoot, "dist", "mcp", "server.js");
   try {
-    return new URL(target).protocol.length > 0;
+    const [repo, plugin] = await Promise.all([
+      readFile(path.join(repoRoot, "package.json"), "utf8").then(JSON.parse),
+      readFile(path.join(pluginRoot, "package.json"), "utf8").then(JSON.parse),
+    ]);
+    if (repo.name !== "@unbrained/pm-cli" || repo.version !== plugin.version ||
+        plugin.dependencies?.[repo.name] !== repo.version) return null;
+    await access(candidate);
+    return candidate;
   } catch {
-    return false;
-  }
-}
-
-function isMissingLaunchModule(error) {
-  return typeof error === "object" && error !== null && error.code === "ERR_MODULE_NOT_FOUND";
-}
-
-async function importLaunchModule(target) {
-  try {
-    return await import(target);
-  } catch (error) {
-    if (isMissingLaunchModule(error)) {
-      return null;
-    }
-    throw error;
-  }
-}
-
-async function locateRepoServer() {
-  let cursor = path.dirname(fileURLToPath(import.meta.url));
-  for (let depth = 0; depth < 10; depth += 1) {
-    const candidate = path.join(cursor, "dist", "mcp", "server.js");
-    if (await canRead(candidate)) {
-      return candidate;
-    }
-    const parent = path.dirname(cursor);
-    if (parent === cursor) {
-      return null;
-    }
-    cursor = parent;
+    return null;
   }
-  return null;
 }
 
-async function launchServer(target) {
-  if (!target) {
-    return false;
-  }
-  if (hasImportProtocol(target)) {
-    let url;
-    try {
-      url = new URL(target);
-    } catch {
-      return false;
-    }
-    if (url.protocol === "file:") {
-      let filePath;
-      try {
-        filePath = fileURLToPath(url);
-      } catch {
-        return false;
-      }
-      if (!(await canRead(filePath))) {
-        return false;
-      }
-    }
-    const server = await importLaunchModule(target);
-    if (!server) {
-      return false;
-    }
-    server.startMcpServer();
-    return true;
-  }
-  if (!(await canRead(target))) {
-    return false;
-  }
-  const server = await importLaunchModule(pathToFileURL(path.resolve(target)).href);
-  if (!server) {
-    return false;
-  }
-  server.startMcpServer();
-  return true;
-}
-
-if (!(await launchServer(process.env.PM_CLI_MCP_SERVER)) && !(await launchServer(await locateRepoServer()))) {
-  const npxCommand = process.platform === "win32" ? "npx.cmd" : "npx";
-  const child = spawn(npxCommand, ["-y", "--package=@unbrained/pm-cli@latest", "pm-mcp"], { stdio: "inherit", env: process.env });
-  child.on("exit", (code, signal) => {
-    if (signal) {
-      process.kill(process.pid, signal);
-      return;
-    }
-    process.exit(code ?? 1);
-  });
-}
+const server = (await localServer()) ?? (await resolvePluginRuntime()).server;
+const child = spawn(process.execPath, [server], { stdio: "inherit", env: process.env });
+child.on("error", (error) => {
+  console.error(`pm-mcp plugin runtime failed: ${error.message}`);
+  process.exitCode = 1;
+});
+child.on("exit", (code, signal) => {
+  if (signal) {
+    process.kill(process.pid, signal);
+  } else {
+    process.exitCode = code ?? 1;
+  }
+});