@unbrained/pm-cli 2026.7.2 → 2026.7.4

package/packages/pm-todos/extensions/todos/runtime.ts

@@ -11,11 +11,10 @@ import type {
   ItemMetadata,
   ItemStatus,
   ItemType,
-  LinkedDoc,
-  LinkedFile,
-  LinkedTest,
-  LogNote,
   PmSettings,
+  ToImportLinkedArtifactsOptions,
+  ToImportLinkedTestsOptions,
+  ToImportLogEntriesOptions,
 } from "@unbrained/pm-cli/sdk";
 
 const PM_PACKAGE_ROOT_ENV = "PM_CLI_PACKAGE_ROOT";
@@ -132,6 +131,14 @@ interface TodosSdkModule {
   selectImportAuthor: (explicitAuthor: string | undefined, settingsAuthor: string) => string;
   splitFrontMatter: (content: string) => { frontMatter: string; body: string };
   toEstimatedMinutesValue: (value: unknown) => number | undefined;
+  toImportBoolean: (value: unknown) => boolean | undefined;
+  toImportConfidence: (value: unknown, allowedTextValues: readonly string[]) => ItemMetadata["confidence"];
+  toImportInteger: (value: unknown) => number | undefined;
+  toImportLinkedDocs: (value: unknown, options?: ToImportLinkedArtifactsOptions) => ItemMetadata["docs"];
+  toImportLinkedFiles: (value: unknown, options?: ToImportLinkedArtifactsOptions) => ItemMetadata["files"];
+  toImportLinkedTests: (value: unknown, options?: ToImportLinkedTestsOptions) => ItemMetadata["tests"];
+  toImportLogEntries: (value: unknown, options: ToImportLogEntriesOptions) => ItemMetadata["comments"];
+  toImportNormalizedEnum: <T extends readonly string[]>(value: unknown, allowed: T) => T[number] | undefined;
   toImportPriority: (value: unknown) => 0 | 1 | 2 | 3 | 4;
   toImportStatus: (value: unknown) => ItemStatus;
   toImportTags: (value: unknown) => string[];
@@ -168,6 +175,14 @@ const TODOS_SDK_FUNCTION_EXPORTS = [
   "selectImportAuthor",
   "splitFrontMatter",
   "toEstimatedMinutesValue",
+  "toImportBoolean",
+  "toImportConfidence",
+  "toImportInteger",
+  "toImportLinkedDocs",
+  "toImportLinkedFiles",
+  "toImportLinkedTests",
+  "toImportLogEntries",
+  "toImportNormalizedEnum",
   "toImportPriority",
   "toImportStatus",
   "toImportTags",
@@ -244,6 +259,14 @@ const {
   selectImportAuthor,
   splitFrontMatter,
   toEstimatedMinutesValue,
+  toImportBoolean,
+  toImportConfidence,
+  toImportInteger,
+  toImportLinkedDocs,
+  toImportLinkedFiles,
+  toImportLinkedTests,
+  toImportLogEntries,
+  toImportNormalizedEnum,
   toImportPriority,
   toImportStatus,
   toImportTags,
@@ -256,6 +279,7 @@ const {
 // confidence/enum coercion) stay local below.
 const toNonEmptyString = toNonEmptyImportString;
 const toEstimatedMinutes = toEstimatedMinutesValue;
+const toInteger = toImportInteger;
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -273,122 +297,22 @@ function toIsoString(value: unknown): string | undefined {
   return new Date(timestamp).toISOString();
 }
 
-function toInteger(value: unknown): number | undefined {
-  if (typeof value === "number" && Number.isInteger(value)) {
-    return value;
-  }
-  if (typeof value === "string" && value.trim().length > 0) {
-    const parsed = Number(value);
-    if (Number.isInteger(parsed)) {
-      return parsed;
-    }
-  }
-  return undefined;
-}
-
 const toPriority: (value: unknown) => PriorityValue = toImportPriority;
 
-function toConfidence(value: unknown): ItemMetadata["confidence"] | undefined {
-  if (typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 100) {
-    return value;
-  }
-  if (typeof value !== "string") {
-    return undefined;
-  }
-  const normalized = value.trim().toLowerCase();
-  if (normalized.length === 0) {
-    return undefined;
-  }
-  if (normalized === "med") {
-    return "medium";
-  }
-  if (CONFIDENCE_TEXT_VALUES.includes(normalized as (typeof CONFIDENCE_TEXT_VALUES)[number])) {
-    return normalized as (typeof CONFIDENCE_TEXT_VALUES)[number];
-  }
-  const parsed = Number(normalized);
-  if (Number.isInteger(parsed) && parsed >= 0 && parsed <= 100) {
-    return parsed;
-  }
-  return undefined;
-}
-
-function toNormalizedEnum<T extends readonly string[]>(
-  value: unknown,
-  allowed: T,
-): T[number] | undefined {
-  if (typeof value !== "string") {
-    return undefined;
-  }
-  const normalized = value.trim().toLowerCase();
-  if (normalized.length === 0) {
-    return undefined;
-  }
-  const candidate = normalized === "med" ? "medium" : normalized;
-  if (allowed.includes(candidate as T[number])) {
-    return candidate as T[number];
-  }
-  return undefined;
-}
-
-function toBoolean(value: unknown): boolean | undefined {
-  if (typeof value === "boolean") {
-    return value;
-  }
-  if (typeof value === "string") {
-    const normalized = value.trim().toLowerCase();
-    if (normalized === "true" || normalized === "1") {
-      return true;
-    }
-    if (normalized === "false" || normalized === "0") {
-      return false;
-    }
-  }
-  if (typeof value === "number") {
-    if (value === 1) {
-      return true;
-    }
-    if (value === 0) {
-      return false;
-    }
-  }
-  return undefined;
-}
-
 const toTags = toImportTags;
 
-function toLinkScope(value: unknown): "project" | "global" {
-  return toNonEmptyString(value)?.toLowerCase() === "global" ? "global" : "project";
-}
-
-function toStringList(value: unknown): string[] | undefined {
-  if (!Array.isArray(value)) {
-    return undefined;
-  }
-  const entries = value
-    .map((entry) => toNonEmptyString(entry))
-    .filter((entry): entry is string => entry !== undefined);
-  return entries.length > 0 ? entries : undefined;
-}
-
-function toStringMap(value: unknown): Record<string, string> | undefined {
-  if (!isRecord(value)) {
-    return undefined;
-  }
-  const entries = Object.entries(value)
-    .map(([key, entryValue]) => [key.trim(), toNonEmptyString(entryValue)] as const)
-    .filter((entry): entry is readonly [string, string] => entry[0].length > 0 && entry[1] !== undefined);
-  return entries.length > 0 ? Object.fromEntries(entries) : undefined;
-}
+const TODOS_LOG_ENTRY_OPTIONS = {
+  allowScalar: true,
+  textKeys: ["text"],
+  toIsoString,
+} satisfies Partial<ToImportLogEntriesOptions>;
 
-function toNumberMap(value: unknown): Record<string, number> | undefined {
-  if (!isRecord(value)) {
-    return undefined;
-  }
-  const entries = Object.entries(value)
-    .map(([key, entryValue]) => [key.trim(), toInteger(entryValue)] as const)
-    .filter((entry): entry is readonly [string, number] => entry[0].length > 0 && entry[1] !== undefined);
-  return entries.length > 0 ? Object.fromEntries(entries) : undefined;
-}
+const TODOS_TEST_OPTIONS = {
+  includeExtendedAssertions: true,
+  integerTimeout: true,
+  timeoutMinimum: 0,
+  timeoutExclusiveMinimum: true,
+} satisfies ToImportLinkedTestsOptions;
 
 function toDependencyEntries(value: unknown, fallbackCreatedAt: string): ItemMetadata["dependencies"] {
   if (!Array.isArray(value)) {
@@ -419,138 +343,6 @@ function toDependencyEntries(value: unknown, fallbackCreatedAt: string): ItemMet
   return dependencies.length > 0 ? dependencies : undefined;
 }
 
-function toLogEntries(value: unknown, fallbackCreatedAt: string, fallbackAuthor: string): LogNote[] | undefined {
-  if (!Array.isArray(value)) {
-    return undefined;
-  }
-  const entries = value
-    .map((entry) => {
-      if (typeof entry === "string") {
-        const text = toNonEmptyString(entry);
-        return text
-          ? {
-              created_at: fallbackCreatedAt,
-              author: fallbackAuthor,
-              text,
-            }
-          : undefined;
-      }
-      if (!isRecord(entry)) {
-        return undefined;
-      }
-      const text = toNonEmptyString(entry.text);
-      if (!text) {
-        return undefined;
-      }
-      return {
-        created_at: toIsoString(entry.created_at) ?? fallbackCreatedAt,
-        author: toNonEmptyString(entry.author) ?? fallbackAuthor,
-        text,
-      };
-    })
-    .filter((entry): entry is LogNote => entry !== undefined);
-  return entries.length > 0 ? entries : undefined;
-}
-
-function toLinkedFiles(value: unknown): LinkedFile[] | undefined {
-  if (!Array.isArray(value)) {
-    return undefined;
-  }
-  const entries = value
-    .map((entry) => {
-      if (typeof entry === "string") {
-        const filePath = toNonEmptyString(entry);
-        return filePath ? { path: filePath, scope: "project" } : undefined;
-      }
-      if (!isRecord(entry)) {
-        return undefined;
-      }
-      const filePath = toNonEmptyString(entry.path);
-      if (!filePath) {
-        return undefined;
-      }
-      return {
-        path: filePath,
-        scope: toLinkScope(entry.scope),
-        note: toNonEmptyString(entry.note),
-      };
-    })
-    .filter((entry): entry is LinkedFile => entry !== undefined);
-  return entries.length > 0 ? entries : undefined;
-}
-
-function toLinkedDocs(value: unknown): LinkedDoc[] | undefined {
-  if (!Array.isArray(value)) {
-    return undefined;
-  }
-  const entries = value
-    .map((entry) => {
-      if (typeof entry === "string") {
-        const docPath = toNonEmptyString(entry);
-        return docPath ? { path: docPath, scope: "project" } : undefined;
-      }
-      if (!isRecord(entry)) {
-        return undefined;
-      }
-      const docPath = toNonEmptyString(entry.path);
-      if (!docPath) {
-        return undefined;
-      }
-      return {
-        path: docPath,
-        scope: toLinkScope(entry.scope),
-        note: toNonEmptyString(entry.note),
-      };
-    })
-    .filter((entry): entry is LinkedDoc => entry !== undefined);
-  return entries.length > 0 ? entries : undefined;
-}
-
-function toLinkedTests(value: unknown): LinkedTest[] | undefined {
-  if (!Array.isArray(value)) {
-    return undefined;
-  }
-  const entries: LinkedTest[] = [];
-  for (const entry of value) {
-    if (typeof entry === "string") {
-      const command = toNonEmptyString(entry);
-      if (command) {
-        entries.push({ command, scope: "project" });
-      }
-      continue;
-    }
-    if (!isRecord(entry)) {
-      continue;
-    }
-    const command = toNonEmptyString(entry.command);
-    const testPath = toNonEmptyString(entry.path);
-    if (!command && !testPath) {
-      continue;
-    }
-    const timeoutSeconds = toInteger(entry.timeout_seconds);
-    const pmContextMode = toNormalizedEnum(entry.pm_context_mode, ["schema", "tracker", "auto"] as const);
-    entries.push({
-      command,
-      path: testPath,
-      scope: toLinkScope(entry.scope),
-      timeout_seconds: timeoutSeconds !== undefined && timeoutSeconds > 0 ? timeoutSeconds : undefined,
-      pm_context_mode: pmContextMode,
-      env_set: toStringMap(entry.env_set),
-      env_clear: toStringList(entry.env_clear),
-      shared_host_safe: toBoolean(entry.shared_host_safe),
-      assert_stdout_contains: toStringList(entry.assert_stdout_contains),
-      assert_stdout_regex: toStringList(entry.assert_stdout_regex),
-      assert_stderr_contains: toStringList(entry.assert_stderr_contains),
-      assert_stderr_regex: toStringList(entry.assert_stderr_regex),
-      assert_stdout_min_lines: toInteger(entry.assert_stdout_min_lines),
-      assert_json_field_equals: toStringMap(entry.assert_json_field_equals),
-      assert_json_field_gte: toNumberMap(entry.assert_json_field_gte),
-      note: toNonEmptyString(entry.note),
-    });
-  }
-  return entries.length > 0 ? entries : undefined;
-}
-
 function toItemType(value: unknown, typeNames: string[]): ItemType {
   const normalized = toNonEmptyString(value)?.toLowerCase();
   const fallbackType = typeNames.find((entry) => entry.toLowerCase() === "task") ?? typeNames[0] ?? "Task";
@@ -661,7 +453,7 @@ async function importTodoCandidate(candidate: ParsedTodoCandidate, runtime: Todo
       type,
       status: toStatus(candidate.frontMatter.status),
       priority: toPriority(candidate.frontMatter.priority),
-      confidence: toConfidence(candidate.frontMatter.confidence),
+      confidence: toImportConfidence(candidate.frontMatter.confidence, CONFIDENCE_TEXT_VALUES),
       tags: toTags(candidate.frontMatter.tags),
       created_at: createdAt,
       updated_at: updatedAt,
@@ -680,14 +472,14 @@ async function importTodoCandidate(candidate: ParsedTodoCandidate, runtime: Todo
       why_now: toNonEmptyString(candidate.frontMatter.why_now),
       parent: toNonEmptyString(candidate.frontMatter.parent),
       reviewer: toNonEmptyString(candidate.frontMatter.reviewer),
-      risk: toNormalizedEnum(candidate.frontMatter.risk, RISK_VALUES),
+      risk: toImportNormalizedEnum(candidate.frontMatter.risk, RISK_VALUES),
       sprint: toNonEmptyString(candidate.frontMatter.sprint),
       release: toNonEmptyString(candidate.frontMatter.release),
       blocked_by: toNonEmptyString(candidate.frontMatter.blocked_by),
       blocked_reason: toNonEmptyString(candidate.frontMatter.blocked_reason),
       unblock_note: toNonEmptyString(candidate.frontMatter.unblock_note),
       reporter: toNonEmptyString(candidate.frontMatter.reporter),
-      severity: toNormalizedEnum(candidate.frontMatter.severity, ISSUE_SEVERITY_VALUES),
+      severity: toImportNormalizedEnum(candidate.frontMatter.severity, ISSUE_SEVERITY_VALUES),
       environment: toNonEmptyString(candidate.frontMatter.environment),
       repro_steps: toNonEmptyString(candidate.frontMatter.repro_steps),
       resolution: toNonEmptyString(candidate.frontMatter.resolution),
@@ -696,16 +488,28 @@ async function importTodoCandidate(candidate: ParsedTodoCandidate, runtime: Todo
       affected_version: toNonEmptyString(candidate.frontMatter.affected_version),
       fixed_version: toNonEmptyString(candidate.frontMatter.fixed_version),
       component: toNonEmptyString(candidate.frontMatter.component),
-      regression: toBoolean(candidate.frontMatter.regression),
+      regression: toImportBoolean(candidate.frontMatter.regression),
       customer_impact: toNonEmptyString(candidate.frontMatter.customer_impact),
       close_reason: toNonEmptyString(candidate.frontMatter.close_reason),
       dependencies: toDependencyEntries(candidate.frontMatter.dependencies, createdAt),
-      comments: toLogEntries(candidate.frontMatter.comments, createdAt, runtime.author),
-      notes: toLogEntries(candidate.frontMatter.notes, createdAt, runtime.author),
-      learnings: toLogEntries(candidate.frontMatter.learnings, createdAt, runtime.author),
-      files: toLinkedFiles(candidate.frontMatter.files),
-      docs: toLinkedDocs(candidate.frontMatter.docs),
-      tests: toLinkedTests(candidate.frontMatter.tests),
+      comments: toImportLogEntries(candidate.frontMatter.comments, {
+        ...TODOS_LOG_ENTRY_OPTIONS,
+        fallbackCreatedAt: createdAt,
+        fallbackAuthor: runtime.author,
+      }),
+      notes: toImportLogEntries(candidate.frontMatter.notes, {
+        ...TODOS_LOG_ENTRY_OPTIONS,
+        fallbackCreatedAt: createdAt,
+        fallbackAuthor: runtime.author,
+      }),
+      learnings: toImportLogEntries(candidate.frontMatter.learnings, {
+        ...TODOS_LOG_ENTRY_OPTIONS,
+        fallbackCreatedAt: createdAt,
+        fallbackAuthor: runtime.author,
+      }),
+      files: toImportLinkedFiles(candidate.frontMatter.files),
+      docs: toImportLinkedDocs(candidate.frontMatter.docs),
+      tests: toImportLinkedTests(candidate.frontMatter.tests, TODOS_TEST_OPTIONS),
     } as ItemMetadata),
     body: candidate.body,
   });

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

@@ -1,7 +1,7 @@
 {
   "name": "pm-claude",
-  "description": "Native pm CLI integration for Claude Code — 26 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": "1.4.0",
+  "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": "1.4.1",
   "author": {
     "name": "unbrained",
     "url": "https://github.com/unbraind/pm-cli"

package/plugins/pm-claude/README.md

@@ -6,7 +6,7 @@ Native pm CLI integration for Claude Code. Use pm project management tools direc
 
 | Component | What it provides |
 |-----------|----------------|
-| **26 MCP tools** | Full pm surface: context, search, list, get, create, copy, focus, update, claim, release, close, comments, files, docs, notes, learnings, deps, test, validate, health, contracts, plan, append, schema, config + `pm_run` for everything else |
+| **28 MCP tools** | Full pm surface: next, context, search, list, get, create, copy, focus, update, claim, release, close, comments, files, docs, notes, learnings, deps, test, validate, health, contracts, plan, append, schema, config, profile + `pm_run` for everything else |
 | **5 skills** | `pm-workflow`, `pm-developer`, `pm-release`, `pm-audit`, `pm-planner` — auto-loaded as Claude Code skills |
 | **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) |
@@ -29,7 +29,7 @@ claude plugin marketplace add /path/to/pm-cli
 # claude plugin marketplace add unbraind/pm-cli
 ```
 
-This installs all 26 MCP tools, 5 skills, 14 slash commands, 4 subagents, hybrid TUI tracking, and the session hook in one step. (`pm-claude` is the plugin name; `pm` is the marketplace name from `marketplace.json`.)
+This installs all 28 MCP tools, 5 skills, 14 slash commands, 4 subagents, hybrid TUI tracking, and the session hook in one step. (`pm-claude` is the plugin name; `pm` is the marketplace name from `marketplace.json`.)
 
 ### Option B: Global MCP server via Claude Code CLI (MCP tools only)
 
@@ -37,7 +37,7 @@ This installs all 26 MCP tools, 5 skills, 14 slash commands, 4 subagents, hybrid
 claude mcp add --transport stdio pm-mcp -- npx -y --package=@unbrained/pm-cli@latest pm-mcp
 ```
 
-This gives you the 26 MCP tools but not the skills, slash commands, or session hook.
+This gives you the 28 MCP tools but not the skills, slash commands, or session hook.
 
 ### Option C: Direct `.mcp.json` (project-scoped MCP only)
 
@@ -139,12 +139,14 @@ Spawn pm-triage-agent to set up the pm item for: add OAuth2 login support
 
 | Tool | Purpose |
 |------|---------|
+| `pm_next` | Pick the next actionable item |
 | `pm_context` | Active work snapshot |
 | `pm_search` | Keyword/semantic/hybrid search |
 | `pm_list` | Filtered item list |
 | `pm_get` | Single item detail |
 | `pm_create` | Create new item |
 | `pm_copy` | Copy item into a new id |
+| `pm_focus` | Set or clear the focused item |
 | `pm_update` | Update metadata |
 | `pm_append` | Append text to item body |
 | `pm_claim` | Claim for active work |
@@ -162,6 +164,7 @@ Spawn pm-triage-agent to set up the pm item for: add OAuth2 login support
 | `pm_contracts` | Inspect command contracts |
 | `pm_schema` | Manage custom item types/statuses |
 | `pm_config` | Read or write settings keys |
+| `pm_profile` | List/show/apply project profiles |
 | `pm_plan` | Manage durable Plan workflows |
 
 ### General tool

package/plugins/pm-claude/commands/pm-init.md

@@ -47,7 +47,7 @@ Initialize pm project tracking using native MCP tools. Argument: `$ARGUMENTS` (o
    - pm initialized at `.agents/pm/`
    - guidance mode defaults to `ask` (TTY prompt only); use `agentGuidance=add|skip|status` in `pm_run` options for deterministic behavior
    - Available slash commands: `/pm-status`, `/pm-new`, `/pm-start-task`, `/pm-close-task`, `/pm-list`, `/pm-search`, `/pm-triage`, `/pm-calendar`, `/pm-developer`, `/pm-planner`, `/pm-release`, `/pm-audit`, `/pm-workflow`
-   - All 26 MCP tools available: `pm_context`, `pm_search`, `pm_list`, `pm_get`, `pm_create`, `pm_copy`, `pm_focus`, `pm_update`, `pm_append`, `pm_claim`, `pm_release`, `pm_close`, `pm_comments`, `pm_files`, `pm_docs`, `pm_notes`, `pm_learnings`, `pm_deps`, `pm_test`, `pm_validate`, `pm_health`, `pm_contracts`, `pm_schema`, `pm_config`, `pm_plan`, `pm_run`
+   - All 28 MCP tools available: `pm_next`, `pm_context`, `pm_search`, `pm_list`, `pm_get`, `pm_create`, `pm_copy`, `pm_focus`, `pm_update`, `pm_append`, `pm_claim`, `pm_release`, `pm_close`, `pm_comments`, `pm_files`, `pm_docs`, `pm_notes`, `pm_learnings`, `pm_deps`, `pm_test`, `pm_validate`, `pm_health`, `pm_contracts`, `pm_schema`, `pm_config`, `pm_profile`, `pm_plan`, `pm_run`
    - Next: use `/pm-new <title>` to create your first item, or `/pm-status` to see the tracker state
 
 If initialization fails, report the error and suggest running `pm init` manually in the terminal.

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

@@ -1,31 +1,44 @@
 #!/usr/bin/env node
 /**
- * pm-cli native MCP server launcher (Claude Code / Codex plugin).
- *
  * This file is auto-generated by scripts/gen-plugin-mcp-wrappers.mjs.
  * Do not edit directly.
- *
- * Resolution order:
- * 1. PM_CLI_MCP_SERVER env var (explicit path)
- * 2. dist/mcp/server.js walking up from this file (repo checkout)
- * 3. npx -y --package=@unbrained/pm-cli@latest pm-mcp (installed via npm)
  */
 import { spawn } from "node:child_process";
 import { access } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-
 const here = path.dirname(fileURLToPath(import.meta.url));
 
 async function exists(target) {
+  try { await access(target); return true; } catch { return false; }
+}
+
+function isImportUrl(target) {
+  if (/^[A-Za-z]:[\\/]/.test(target)) {
+    return false;
+  }
   try {
-    await access(target);
-    return true;
+    return new URL(target).protocol.length > 0;
   } 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;
+  }
+}
+
 async function findRepoServer() {
   let cursor = here;
   for (let depth = 0; depth < 10; depth += 1) {
@@ -34,32 +47,61 @@ async function findRepoServer() {
       return candidate;
     }
     const parent = path.dirname(cursor);
-    if (parent === cursor) break;
+    if (parent === cursor) {
+      break;
+    }
     cursor = parent;
   }
   return null;
 }
 
-const explicitServer = process.env.PM_CLI_MCP_SERVER;
-if (explicitServer && (await exists(explicitServer))) {
-  const server = await import(pathToFileURL(explicitServer).href);
-  server.startMcpServer();
-} else {
-  const repoServer = await findRepoServer();
-  if (repoServer) {
-    const server = await import(pathToFileURL(repoServer).href);
-    server.startMcpServer();
-  } else {
-    const child = spawn("npx", ["-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;
+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;
       }
-      process.exit(code ?? 1);
-    });
+    }
+    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 child = spawn("npx", ["-y", "--package=@unbrained/pm-cli@latest", "pm-mcp"], { stdio: "inherit", env: process.env, shell: process.platform === "win32" });
+  child.on("exit", (code, signal) => {
+    if (signal) {
+      process.kill(process.pid, signal);
+      return;
+    }
+    process.exit(code ?? 1);
+  });
 }