@muhaven/mcp 0.1.6 → 0.2.0

package/CHANGELOG.md

@@ -7,6 +7,201 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] — 2026-05-18
+
+**Minor bump signals a breaking change to `position.buy`'s input
+shape.** This release consolidates the pre-Codex review of the 0.1.7
+Path C bundle: 4 parallel agents (Code Reviewer, Frontend Developer,
+Security Engineer, Reality Checker) surfaced ≥5 cross-confirmed HIGH
+findings and several MEDIUM/LOW items. 0.2.0 lands all of them.
+
+### Breaking
+
+- **`muhaven.position.buy.amountUsdc6` → `amountUsdc` (human decimal).**
+  Pre-0.2.0, the field was base-6 integer string ("5000000" = $5).
+  An LLM hearing "buy 5 dollars" would naively emit `"5"` and silently
+  produce a URL with `amount=0.000005` — user buys $5e-6 instead of $5.
+  0.2.0 unifies the unit convention across the whole Path C surface
+  (matches `cash.wrap.amountUsdc` shape): `"5"` means 5 mhUSDC. Max
+  6 fractional digits, 48-char length cap. Server-side schema rejects
+  scientific notation, leading +, thousands separators, leading zeros,
+  bare leading/trailing dots.
+
+- **`muhaven.position.sell.amountShares` rejects fractional input.**
+  fhERC-20 shares are integer base units (memory:
+  `project_decimals_lie_wave4_p0`). Pre-0.2.0 accepted "2.5" which
+  silently floored to 2 on the on-chain submit. 0.2.0 schema regex
+  `^[1-9]\d*$` rejects any fractional or leading-zero input at the
+  MCP-server boundary.
+
+- **Position tool response shape** stays the `{ dashboardUrl, action,
+  instructions, echo }` format from 0.1.7 — no change here, but the
+  schema breaking changes above are what trigger the minor bump per
+  semver.
+
+### Removed (cleanup of 0.1.7 deprecation candidates)
+
+- `__resetSessionKeyProbeCacheForTests` — was retained as a no-op in
+  0.1.7 for "back-compat with downstream test consumers." Verified
+  empirically (Security Engineer review) that no consumer outside our
+  own tests imported it. Deleted entirely.
+- `formatUsdc6ToDecimal` + `computeIntentHash` +
+  `PLACEHOLDER_INTENT_DOMAIN` — orphaned helpers tied to the
+  pre-0.1.7 attestation path. No external consumers; deleted.
+
+### Fixed
+
+- **`MUHAVEN_DASHBOARD_URL` env-poisoning** (Security M-2): the URL
+  is used to build every position deep-link. Pre-0.2.0, a malicious
+  npm dep or attacker with write access to `~/.claude.json` could
+  set `MUHAVEN_DASHBOARD_URL=https://muhaven-app.com` and have the
+  MCP server route every user click to a typosquat phishing clone.
+  Validation now happens at boot in `loadMcpConfig` + `loadBrokerConfig`
+  using the same `https-or-loopback` rule as the existing
+  `--dashboard-base-url` CLI flag. Hard-fails at server start with a
+  clear error message if invalid.
+
+- **`buildRegisterEnv` shell-metachar sanitization** (Security M-1):
+  the JSON config blob passed via argv to `claude mcp add-json` could
+  carry a crafted `MUHAVEN_KEYRING='file" & calc.exe &"'` past
+  Windows's `shell: true` invocation, reaching `cmd.exe`'s parser as
+  a command-injection vector. 0.2.0 rejects (not escapes) any value
+  containing shell metacharacters (`"` `\` newline `&` `|` `;`
+  `` ` `` `<` `>` `(` `)` `%` `$`) and restricts `MUHAVEN_KEYRING` to
+  the recognized values (`file` / `os`). Rejected values surface as
+  warnings on stderr; setup continues with the cleaned env.
+
+- **`claude mcp remove` exit-code capture** (Code Reviewer H2 +
+  Security M-3): pre-0.2.0 swallowed every exit code from the
+  idempotent remove step. A perm-locked scope or stale lockfile that
+  failed remove + then failed add showed an opaque error attributing
+  the failure only to add. 0.2.0 captures remove's exit + stderr,
+  swallows only the expected "no such server" pattern, and surfaces
+  any anomaly as a warning on the success path or folds it into the
+  failure reason on the error path. Closes the split-brain
+  `~/.claude.json` operator-confusion class.
+
+- **`decimalUsdcAmountSchema.max(48)` length cap** (Security L-5):
+  defense-in-depth against URL bloat (LLM emits a 10MB digit string).
+
+### Sibling commits (same hotfix bundle, deployed in lockstep)
+
+- Backend `pg-portfolio.repository.findByUserId` now orders by
+  `last_synced_at DESC NULLS LAST` so the frontend's first-seen Map
+  dedup picks the freshest row — aligns the tiebreak across backend +
+  frontend + dedup script (Code Reviewer N2).
+- `backend/scripts/dedup-portfolios.ts` moved the discovery SELECT
+  inside the dedup transaction + added `SELECT FOR UPDATE` row locks
+  + `pg_advisory_xact_lock`. Closes the TOCTOU window where a
+  concurrent backend write could lose data (Security H-1).
+- Frontend TradePage / YieldsPage now render an inline AlertTriangle
+  banner when `?token=` doesn't resolve instead of silently falling
+  back to `marketplace.filtered[0]`. Closes the LLM-token-swap footgun
+  (Frontend H-1).
+- TradePage marketplace.load() failure surfaces a Retry CTA instead
+  of half-rendering (Frontend H-2).
+- TradePage / CashPage `?amount=` pre-fill uses a shared
+  `sanitizePrefillAmount` helper that bounds precision to 6 dp and
+  rejects fractional shares (Frontend H-4 / Code Reviewer L1).
+- YieldsPage scroll-into-view moved into a watch keyed on
+  `epochsStore.items.length` so deep-link landings on disconnected
+  wallets still scroll once the items render (Frontend H-3).
+- YieldsPage `selectedToken` declaration hoisted above onMounted so
+  the deep-link path sets the ref synchronously before the
+  `selectableTokens` watcher (`immediate: true`) snaps it to `list[0]`
+  (Frontend H-5).
+
+### Internal
+
+- `__tests__/position-deeplink.test.ts`: rewrote amount tests for the
+  decimal-string schema; added schema-level corpus tests pinning the
+  reject list (negative, scientific notation, leading +, thousands
+  separator, leading zeros, etc.); added a regression test for the
+  base-6 footgun (`position.buy({amountUsdc: '5'})` must produce
+  `amount=5`, NOT `0.000005`).
+- `__tests__/mcp-redteam.test.ts`: updated field name from `amountUsdc6`
+  to `amountUsdc` in 4 call sites.
+- Total tool count unchanged at 23.
+
+## [0.1.7] — 2026-05-18
+
+`position.*` tools can now drive real on-chain action via @muhaven/mcp
+— Path C of MCP Option A (dashboard URL elicitation → existing passkey
+ceremony). Pre-0.1.7, position tools returned a placeholder UserOp
+envelope + broker signature that no host could submit; the path was
+attestation-only despite implying buy/sell/claim. 0.1.7 swaps the
+envelope for a pre-filled dashboard deep-link URL the user opens to
+review + tap their passkey through the existing dashboard flow.
+
+### Added
+
+- **`muhaven.cash.wrap`** — new tool. Returns a `/cash?amount=` deep-
+  link for USDC → mhUSDC conversion. Common LLM chain: `read.portfolio`
+  → notice 0 mhUSDC → `cash.wrap` → then `position.buy` (each is its
+  own user-confirmed deep-link). Input is human-readable USDC ("100" =
+  $100). 23 tools total now (was 22).
+
+- **Token identifier accepts symbols OR addresses.** Every `position.*`
+  tool's `token` field used to require a 0x-address. Now accepts either
+  a symbol ("TBILL1") or a 0x-address. The dashboard pages resolve the
+  symbol via the marketplace store; unknown identifiers leave the form
+  blank for the user to fill in. Saves the LLM a round-trip through
+  `read.tokens` for the common "buy 5 of TBILL1" flow.
+
+- **Exported pure helpers** (`buildPositionDeeplink`,
+  `formatUsdc6ToDecimal`) so third-party MCP servers + tests can reason
+  about the URL shape without spawning anything.
+
+### Changed
+
+- **`position.buy/sell/claim` return shape** is now `{ dashboardUrl,
+  action, instructions, echo }` instead of `{ intentHash,
+  unsignedUserOp, brokerSignature, signerAddress }`. The `instructions`
+  field is a pre-formatted two-line string the LLM can show the user
+  verbatim ("Open this link to review and authorize..."). The `echo`
+  field mirrors input for LLM self-verification. **Breaking** for any
+  consumer that pinned the 0.1.6 response shape — the prior shape was
+  itself never end-to-end usable (placeholder envelope), so the
+  practical impact is "MCP buy now actually works" rather than
+  regression.
+
+- **`position.rebalance`** returns `not_implemented` with a clear
+  next-step hint pointing at single-leg `position.buy` / `position.sell`
+  or the dashboard. Multi-leg `execute_plan` (one URL, one passkey,
+  one batched UserOp) lands in Wave 5 with composite preview UI.
+
+- **Broker dep no longer required for position tools.** Previously, a
+  `position.buy` call without a running `muhaven-broker` daemon
+  returned `broker.unavailable`. Now position tools talk only to the
+  dashboard URL — the broker is still needed for `read.*` / governance
+  / issuer / policy tools (those use the JWT-authed path).
+
+### Removed
+
+- `signEnvelope` + `PositionEnvelopeData` + the per-process
+  `hasSessionKey` probe cache + `__resetSessionKeyProbeCacheForTests`'s
+  cache (the function is retained as a no-op for back-compat with any
+  test harness importing it). The whole broker-attestation path for
+  position tools is gone — they don't need a signing key at all.
+
+### Internal
+
+- 21 new vitest cases in `__tests__/position-deeplink.test.ts`,
+  replacing `session-key-required.test.ts` (deleted — covered a
+  removed code path). Total `@muhaven/mcp` suite: **262/262 passing**
+  (was 241). Tool-hash count: **23** (was 22).
+
+### Operator notes
+
+- Once installed, the fresh-install ritual is unchanged: `muhaven-broker
+  setup --register claude-code` still wires the MCP server into Claude
+  Code via `claude mcp add-json`.
+- Existing 0.1.6 installs: `npm install -g @muhaven/mcp@latest` picks up
+  the new bin; no setup re-run needed.
+- `MUHAVEN_DASHBOARD_URL` env var (defaults to `https://muhaven.app`)
+  now drives the deep-link URL prefix; staging operators set it to
+  `https://muhaven-staging.example` and the URLs flow through.
+
 ## [0.1.6] — 2026-05-17
 
 Adds `muhaven-broker setup --register HOST` so a fresh install no longer

package/dist/broker.cjs

@@ -51,9 +51,38 @@ function deriveAllowedHosts(baseUrl) {
 function trimTrailingSlash(s) {
   return s.endsWith("/") ? s.slice(0, -1) : s;
 }
+function validatePublicUrlEnv(name, value) {
+  let parsed;
+  try {
+    parsed = new URL(value);
+  } catch {
+    return `${name} is not a valid URL: ${value}`;
+  }
+  if (parsed.protocol === "https:") return null;
+  if (parsed.protocol === "http:") {
+    const host = parsed.hostname;
+    if (host === "localhost" || host === "127.0.0.1" || host === "[::1]") return null;
+    return `${name} must use https:// (got http:// to ${host} \u2014 refusing to route MCP deep-links over cleartext to a non-loopback host)`;
+  }
+  return `${name} must use https:// (got ${parsed.protocol})`;
+}
+function resolvePublicUrlEnv(name, rawValue, defaultValue) {
+  const value = rawValue ?? defaultValue;
+  const err = validatePublicUrlEnv(name, value);
+  if (err) throw new Error(err);
+  return trimTrailingSlash(value);
+}
 function loadMcpConfig(env = process.env) {
-  const backendBaseUrl = trimTrailingSlash(env.MUHAVEN_BACKEND_URL ?? DEFAULT_BACKEND_URL);
-  const dashboardBaseUrl = trimTrailingSlash(env.MUHAVEN_DASHBOARD_URL ?? DEFAULT_DASHBOARD_URL);
+  const backendBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_BACKEND_URL",
+    env.MUHAVEN_BACKEND_URL,
+    DEFAULT_BACKEND_URL
+  );
+  const dashboardBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_DASHBOARD_URL",
+    env.MUHAVEN_DASHBOARD_URL,
+    DEFAULT_DASHBOARD_URL
+  );
   const brokerEndpoint = env.MUHAVEN_BROKER_ENDPOINT ?? defaultBrokerEndpoint();
   const readOnly = readEnvBool("MUHAVEN_READ_ONLY", false, env);
   const requestTimeoutMs = readEnvInt("MUHAVEN_REQUEST_TIMEOUT_MS", DEFAULT_REQUEST_TIMEOUT_MS, env);
@@ -83,8 +112,16 @@ function loadBrokerConfig(env = process.env) {
   const endpoint = env.MUHAVEN_BROKER_ENDPOINT ?? defaultBrokerEndpoint();
   const maxRequestBytes = readEnvInt("MUHAVEN_BROKER_MAX_BYTES", DEFAULT_BROKER_MAX_BYTES, env);
   const requestTimeoutMs = readEnvInt("MUHAVEN_BROKER_TIMEOUT_MS", DEFAULT_BROKER_TIMEOUT_MS, env);
-  const backendBaseUrl = trimTrailingSlash(env.MUHAVEN_BACKEND_URL ?? DEFAULT_BACKEND_URL);
-  const dashboardBaseUrl = trimTrailingSlash(env.MUHAVEN_DASHBOARD_URL ?? DEFAULT_DASHBOARD_URL);
+  const backendBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_BACKEND_URL",
+    env.MUHAVEN_BACKEND_URL,
+    DEFAULT_BACKEND_URL
+  );
+  const dashboardBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_DASHBOARD_URL",
+    env.MUHAVEN_DASHBOARD_URL,
+    DEFAULT_DASHBOARD_URL
+  );
   return {
     endpoint,
     sessionKeyHex,
@@ -1105,12 +1142,34 @@ function parseSetupFlags(argv) {
     registerScope
   };
 }
+var SHELL_METACHAR_RE = /["\\\n\r&|;`<>()%$]/;
+var SAFE_KEYRING_VALUES = /* @__PURE__ */ new Set(["file", "os"]);
 function buildRegisterEnv(effectiveEnv) {
   const env = {};
-  if (effectiveEnv.MUHAVEN_BACKEND_URL) env.MUHAVEN_BACKEND_URL = effectiveEnv.MUHAVEN_BACKEND_URL;
-  if (effectiveEnv.MUHAVEN_DASHBOARD_URL) env.MUHAVEN_DASHBOARD_URL = effectiveEnv.MUHAVEN_DASHBOARD_URL;
-  if (effectiveEnv.MUHAVEN_KEYRING) env.MUHAVEN_KEYRING = effectiveEnv.MUHAVEN_KEYRING;
-  return env;
+  const warnings = [];
+  function acceptOrWarn(name, value) {
+    if (!value) return;
+    if (SHELL_METACHAR_RE.test(value)) {
+      warnings.push(
+        `${name} contains shell metacharacters and was dropped from the host config \u2014 set a clean value in your env if you need a non-default.`
+      );
+      return;
+    }
+    env[name] = value;
+  }
+  acceptOrWarn("MUHAVEN_BACKEND_URL", effectiveEnv.MUHAVEN_BACKEND_URL);
+  acceptOrWarn("MUHAVEN_DASHBOARD_URL", effectiveEnv.MUHAVEN_DASHBOARD_URL);
+  const keyring = effectiveEnv.MUHAVEN_KEYRING;
+  if (keyring) {
+    if (!SAFE_KEYRING_VALUES.has(keyring)) {
+      warnings.push(
+        `MUHAVEN_KEYRING="${keyring}" is not one of the recognized values (file, os) \u2014 dropped from the host config.`
+      );
+    } else {
+      env.MUHAVEN_KEYRING = keyring;
+    }
+  }
+  return { env, warnings };
 }
 function buildClaudeMcpRegisterJson(registerEnv) {
   const payload = {
@@ -1128,6 +1187,7 @@ function buildClaudeMcpAddJsonArgv(serverName, json, scope) {
 function buildClaudeMcpRemoveArgv(serverName, scope) {
   return ["mcp", "remove", serverName, "--scope", scope];
 }
+var CLAUDE_REMOVE_NOT_FOUND_RE = /(no.*server|not found|does not exist|no MCP server)/i;
 async function registerWithHost(deps, options) {
   if (options.host === "claude-code") {
     return registerWithClaudeCode(deps, options);
@@ -1152,7 +1212,28 @@ async function registerWithClaudeCode(deps, options) {
       cmd: "claude --version"
     };
   }
-  await deps.shellOut("claude", buildClaudeMcpRemoveArgv(options.serverName, options.scope));
+  const warnings = [];
+  let removeResult = null;
+  try {
+    removeResult = await deps.shellOut(
+      "claude",
+      buildClaudeMcpRemoveArgv(options.serverName, options.scope)
+    );
+  } catch (err) {
+    warnings.push(
+      `claude mcp remove threw before exit: ${err.message}. If the add below succeeds but you see duplicates in ~/.claude.json, inspect file permissions.`
+    );
+  }
+  if (removeResult && removeResult.exitCode !== 0) {
+    const stderr = removeResult.stderr.trim();
+    const stdout = removeResult.stdout.trim();
+    const combined = [stderr, stdout].filter((s) => s.length > 0).join(" | ");
+    if (!CLAUDE_REMOVE_NOT_FOUND_RE.test(combined)) {
+      warnings.push(
+        `claude mcp remove returned exit ${removeResult.exitCode}: ${combined || "(no stderr)"}. Continuing with add. If you see duplicate muhaven entries afterwards, inspect ~/.claude.json or the project's .mcp.json manually.`
+      );
+    }
+  }
   const json = buildClaudeMcpRegisterJson(options.registerEnv);
   const addArgv = buildClaudeMcpAddJsonArgv(options.serverName, json, options.scope);
   let add;
@@ -1166,10 +1247,11 @@ async function registerWithClaudeCode(deps, options) {
     };
   }
   if (add.exitCode !== 0) {
-    const reason = [add.stderr, add.stdout].map((s) => s.trim()).filter((s) => s.length > 0).join(" | ") || `exit ${add.exitCode}`;
+    const addReason = [add.stderr, add.stdout].map((s) => s.trim()).filter((s) => s.length > 0).join(" | ") || `exit ${add.exitCode}`;
+    const reason = warnings.length > 0 ? `${addReason} (preceding remove also surfaced: ${warnings.join("; ")})` : addReason;
     return { status: "failed", host: options.host, reason };
   }
-  return { status: "registered", host: options.host, scope: options.scope };
+  return warnings.length > 0 ? { status: "registered", host: options.host, scope: options.scope, warnings } : { status: "registered", host: options.host, scope: options.scope };
 }
 async function runSetup(argv, deps) {
   let flags;
@@ -1342,7 +1424,10 @@ async function runSetup(argv, deps) {
     }
   }
   if (flags.register.length > 0) {
-    const registerEnv = buildRegisterEnv(effectiveEnv);
+    const { env: registerEnv, warnings: envWarnings } = buildRegisterEnv(effectiveEnv);
+    for (const w of envWarnings) {
+      deps.printErr(`Host register env: ${w}`);
+    }
     for (const host of flags.register) {
       const outcome = await registerWithHost(deps, {
         host,
@@ -1355,6 +1440,11 @@ async function runSetup(argv, deps) {
           deps.print(
             `Host register: ${outcome.host} wired (scope: ${outcome.scope}). Restart the host to pick up the new MCP server.`
           );
+          if (outcome.warnings) {
+            for (const w of outcome.warnings) {
+              deps.printErr(`Host register warning: ${w}`);
+            }
+          }
           break;
         case "cli_missing":
           deps.printErr(
@@ -1750,7 +1840,7 @@ function printUsage() {
 }
 function getBrokerPackageVersion() {
   {
-    return "0.1.6";
+    return "0.2.0";
   }
 }
 function printVersion() {

package/dist/broker.js

@@ -53,9 +53,38 @@ function deriveAllowedHosts(baseUrl) {
 function trimTrailingSlash(s) {
   return s.endsWith("/") ? s.slice(0, -1) : s;
 }
+function validatePublicUrlEnv(name, value) {
+  let parsed;
+  try {
+    parsed = new URL(value);
+  } catch {
+    return `${name} is not a valid URL: ${value}`;
+  }
+  if (parsed.protocol === "https:") return null;
+  if (parsed.protocol === "http:") {
+    const host = parsed.hostname;
+    if (host === "localhost" || host === "127.0.0.1" || host === "[::1]") return null;
+    return `${name} must use https:// (got http:// to ${host} \u2014 refusing to route MCP deep-links over cleartext to a non-loopback host)`;
+  }
+  return `${name} must use https:// (got ${parsed.protocol})`;
+}
+function resolvePublicUrlEnv(name, rawValue, defaultValue) {
+  const value = rawValue ?? defaultValue;
+  const err = validatePublicUrlEnv(name, value);
+  if (err) throw new Error(err);
+  return trimTrailingSlash(value);
+}
 function loadMcpConfig(env = process.env) {
-  const backendBaseUrl = trimTrailingSlash(env.MUHAVEN_BACKEND_URL ?? DEFAULT_BACKEND_URL);
-  const dashboardBaseUrl = trimTrailingSlash(env.MUHAVEN_DASHBOARD_URL ?? DEFAULT_DASHBOARD_URL);
+  const backendBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_BACKEND_URL",
+    env.MUHAVEN_BACKEND_URL,
+    DEFAULT_BACKEND_URL
+  );
+  const dashboardBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_DASHBOARD_URL",
+    env.MUHAVEN_DASHBOARD_URL,
+    DEFAULT_DASHBOARD_URL
+  );
   const brokerEndpoint = env.MUHAVEN_BROKER_ENDPOINT ?? defaultBrokerEndpoint();
   const readOnly = readEnvBool("MUHAVEN_READ_ONLY", false, env);
   const requestTimeoutMs = readEnvInt("MUHAVEN_REQUEST_TIMEOUT_MS", DEFAULT_REQUEST_TIMEOUT_MS, env);
@@ -85,8 +114,16 @@ function loadBrokerConfig(env = process.env) {
   const endpoint = env.MUHAVEN_BROKER_ENDPOINT ?? defaultBrokerEndpoint();
   const maxRequestBytes = readEnvInt("MUHAVEN_BROKER_MAX_BYTES", DEFAULT_BROKER_MAX_BYTES, env);
   const requestTimeoutMs = readEnvInt("MUHAVEN_BROKER_TIMEOUT_MS", DEFAULT_BROKER_TIMEOUT_MS, env);
-  const backendBaseUrl = trimTrailingSlash(env.MUHAVEN_BACKEND_URL ?? DEFAULT_BACKEND_URL);
-  const dashboardBaseUrl = trimTrailingSlash(env.MUHAVEN_DASHBOARD_URL ?? DEFAULT_DASHBOARD_URL);
+  const backendBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_BACKEND_URL",
+    env.MUHAVEN_BACKEND_URL,
+    DEFAULT_BACKEND_URL
+  );
+  const dashboardBaseUrl = resolvePublicUrlEnv(
+    "MUHAVEN_DASHBOARD_URL",
+    env.MUHAVEN_DASHBOARD_URL,
+    DEFAULT_DASHBOARD_URL
+  );
   return {
     endpoint,
     sessionKeyHex,
@@ -1107,12 +1144,34 @@ function parseSetupFlags(argv) {
     registerScope
   };
 }
+var SHELL_METACHAR_RE = /["\\\n\r&|;`<>()%$]/;
+var SAFE_KEYRING_VALUES = /* @__PURE__ */ new Set(["file", "os"]);
 function buildRegisterEnv(effectiveEnv) {
   const env = {};
-  if (effectiveEnv.MUHAVEN_BACKEND_URL) env.MUHAVEN_BACKEND_URL = effectiveEnv.MUHAVEN_BACKEND_URL;
-  if (effectiveEnv.MUHAVEN_DASHBOARD_URL) env.MUHAVEN_DASHBOARD_URL = effectiveEnv.MUHAVEN_DASHBOARD_URL;
-  if (effectiveEnv.MUHAVEN_KEYRING) env.MUHAVEN_KEYRING = effectiveEnv.MUHAVEN_KEYRING;
-  return env;
+  const warnings = [];
+  function acceptOrWarn(name, value) {
+    if (!value) return;
+    if (SHELL_METACHAR_RE.test(value)) {
+      warnings.push(
+        `${name} contains shell metacharacters and was dropped from the host config \u2014 set a clean value in your env if you need a non-default.`
+      );
+      return;
+    }
+    env[name] = value;
+  }
+  acceptOrWarn("MUHAVEN_BACKEND_URL", effectiveEnv.MUHAVEN_BACKEND_URL);
+  acceptOrWarn("MUHAVEN_DASHBOARD_URL", effectiveEnv.MUHAVEN_DASHBOARD_URL);
+  const keyring = effectiveEnv.MUHAVEN_KEYRING;
+  if (keyring) {
+    if (!SAFE_KEYRING_VALUES.has(keyring)) {
+      warnings.push(
+        `MUHAVEN_KEYRING="${keyring}" is not one of the recognized values (file, os) \u2014 dropped from the host config.`
+      );
+    } else {
+      env.MUHAVEN_KEYRING = keyring;
+    }
+  }
+  return { env, warnings };
 }
 function buildClaudeMcpRegisterJson(registerEnv) {
   const payload = {
@@ -1130,6 +1189,7 @@ function buildClaudeMcpAddJsonArgv(serverName, json, scope) {
 function buildClaudeMcpRemoveArgv(serverName, scope) {
   return ["mcp", "remove", serverName, "--scope", scope];
 }
+var CLAUDE_REMOVE_NOT_FOUND_RE = /(no.*server|not found|does not exist|no MCP server)/i;
 async function registerWithHost(deps, options) {
   if (options.host === "claude-code") {
     return registerWithClaudeCode(deps, options);
@@ -1154,7 +1214,28 @@ async function registerWithClaudeCode(deps, options) {
       cmd: "claude --version"
     };
   }
-  await deps.shellOut("claude", buildClaudeMcpRemoveArgv(options.serverName, options.scope));
+  const warnings = [];
+  let removeResult = null;
+  try {
+    removeResult = await deps.shellOut(
+      "claude",
+      buildClaudeMcpRemoveArgv(options.serverName, options.scope)
+    );
+  } catch (err) {
+    warnings.push(
+      `claude mcp remove threw before exit: ${err.message}. If the add below succeeds but you see duplicates in ~/.claude.json, inspect file permissions.`
+    );
+  }
+  if (removeResult && removeResult.exitCode !== 0) {
+    const stderr = removeResult.stderr.trim();
+    const stdout = removeResult.stdout.trim();
+    const combined = [stderr, stdout].filter((s) => s.length > 0).join(" | ");
+    if (!CLAUDE_REMOVE_NOT_FOUND_RE.test(combined)) {
+      warnings.push(
+        `claude mcp remove returned exit ${removeResult.exitCode}: ${combined || "(no stderr)"}. Continuing with add. If you see duplicate muhaven entries afterwards, inspect ~/.claude.json or the project's .mcp.json manually.`
+      );
+    }
+  }
   const json = buildClaudeMcpRegisterJson(options.registerEnv);
   const addArgv = buildClaudeMcpAddJsonArgv(options.serverName, json, options.scope);
   let add;
@@ -1168,10 +1249,11 @@ async function registerWithClaudeCode(deps, options) {
     };
   }
   if (add.exitCode !== 0) {
-    const reason = [add.stderr, add.stdout].map((s) => s.trim()).filter((s) => s.length > 0).join(" | ") || `exit ${add.exitCode}`;
+    const addReason = [add.stderr, add.stdout].map((s) => s.trim()).filter((s) => s.length > 0).join(" | ") || `exit ${add.exitCode}`;
+    const reason = warnings.length > 0 ? `${addReason} (preceding remove also surfaced: ${warnings.join("; ")})` : addReason;
     return { status: "failed", host: options.host, reason };
   }
-  return { status: "registered", host: options.host, scope: options.scope };
+  return warnings.length > 0 ? { status: "registered", host: options.host, scope: options.scope, warnings } : { status: "registered", host: options.host, scope: options.scope };
 }
 async function runSetup(argv, deps) {
   let flags;
@@ -1344,7 +1426,10 @@ async function runSetup(argv, deps) {
     }
   }
   if (flags.register.length > 0) {
-    const registerEnv = buildRegisterEnv(effectiveEnv);
+    const { env: registerEnv, warnings: envWarnings } = buildRegisterEnv(effectiveEnv);
+    for (const w of envWarnings) {
+      deps.printErr(`Host register env: ${w}`);
+    }
     for (const host of flags.register) {
       const outcome = await registerWithHost(deps, {
         host,
@@ -1357,6 +1442,11 @@ async function runSetup(argv, deps) {
           deps.print(
             `Host register: ${outcome.host} wired (scope: ${outcome.scope}). Restart the host to pick up the new MCP server.`
           );
+          if (outcome.warnings) {
+            for (const w of outcome.warnings) {
+              deps.printErr(`Host register warning: ${w}`);
+            }
+          }
           break;
         case "cli_missing":
           deps.printErr(
@@ -1752,7 +1842,7 @@ function printUsage() {
 }
 function getBrokerPackageVersion() {
   {
-    return "0.1.6";
+    return "0.2.0";
   }
 }
 function printVersion() {