@mrrlin-dev/mcp 0.4.54 → 0.4.55

package/dist/bin.cjs

@@ -20659,6 +20659,7 @@ var toml = __toESM(require_toml(), 1);
 // src/api-base-url.ts
 var DEFAULT_API_BASE_URL = "http://127.0.0.1:8787";
 var STAGING_API_BASE_URL = "https://api-staging.mrrlin.com";
+var PRODUCTION_API_BASE_URL = "https://api.mrrlin.com";
 function normalizeUrl(value) {
   return value.replace(/\/$/, "");
 }
@@ -20668,7 +20669,9 @@ var RETIRED_API_BASE_URLS = {
   "mrrlin-api-fnnzzz-fnnzzzs-projects.vercel.app": STAGING_API_BASE_URL,
   // Retired 2026-08-14 when staging decoupled onto the stable custom domain api-staging.mrrlin.com.
   // A persisted operator configuration may still pin the mrrlin3 Vercel alias; retarget it in one hop.
-  "mrrlin-api-mrrlin3.vercel.app": STAGING_API_BASE_URL
+  "mrrlin-api-mrrlin3.vercel.app": STAGING_API_BASE_URL,
+  // Retired 2026-09-07 when production moved from the transitional api-prod host to api.mrrlin.com.
+  "api-prod.mrrlin.com": PRODUCTION_API_BASE_URL
 };
 function isSameApiHost(a, b) {
   const origin = (value) => {
@@ -20685,6 +20688,9 @@ function isSameApiHost(a, b) {
 function isStagingApiBaseUrl(input) {
   return isSameApiHost(input, STAGING_API_BASE_URL);
 }
+function isProductionApiBaseUrl(input) {
+  return isSameApiHost(input, PRODUCTION_API_BASE_URL);
+}
 function retargetRetiredApiBaseUrl(input) {
   const normalized = normalizeUrl(input.trim());
   let hostname3;
@@ -20703,7 +20709,6 @@ function retiredApiHostnames() {
 function bridgeUrlImpliesStaging(input) {
   const raw = input?.trim();
   if (!raw) return false;
-  if (isLoopbackUrl(raw)) return true;
   let hostname3;
   try {
     hostname3 = new URL(raw).hostname.toLowerCase();
@@ -20728,8 +20733,14 @@ function readConfiguredApiBaseUrl(explicit) {
   if (process.env.MRRLIN_STAGING === "1") return STAGING_API_BASE_URL;
   return DEFAULT_API_BASE_URL;
 }
+function readDirectorBridgeApiBaseUrl(explicit) {
+  const direct = explicit ?? process.env.MRRLIN_API_BASE_URL;
+  if (direct?.trim()) return retargetRetiredApiBaseUrl(direct.trim()).baseUrl;
+  if (process.env.MRRLIN_STAGING === "1") return STAGING_API_BASE_URL;
+  return PRODUCTION_API_BASE_URL;
+}
 function isRemoteApiAllowed(apiBaseUrl) {
-  return isLoopbackUrl(apiBaseUrl) || isStagingApiBaseUrl(apiBaseUrl) || process.env.MRRLIN_API_ALLOW_REMOTE === "1" || process.env.MRRLIN_STAGING === "1";
+  return isLoopbackUrl(apiBaseUrl) || isStagingApiBaseUrl(apiBaseUrl) || isProductionApiBaseUrl(apiBaseUrl) || process.env.MRRLIN_API_ALLOW_REMOTE === "1";
 }
 function readProbeTimeoutMs(env) {
   const raw = Number((env.MRRLIN_API_PROBE_TIMEOUT_MS ?? "").trim());
@@ -20770,7 +20781,7 @@ async function resolveApiBaseUrlDynamic(opts = {}) {
     return { baseUrl: STAGING_API_BASE_URL, source: "staging-autodetect" };
   }
   throw new Error(
-    `Local Mrrlin API not reachable at ${DEFAULT_API_BASE_URL}. Start it, or set MRRLIN_STAGING=1 to target staging (or MRRLIN_API_AUTODETECT=1 to auto-fall back to staging when local is down).`
+    `Local Mrrlin API not reachable at ${DEFAULT_API_BASE_URL}. Start it, or set MRRLIN_API_BASE_URL=${STAGING_API_BASE_URL} to target staging (or MRRLIN_API_AUTODETECT=1 to auto-fall back to staging when local is down).`
   );
 }
 
@@ -20994,6 +21005,24 @@ function blockEnvHasRetiredApiUrl(actual) {
   }
   return retiredApiHostnames().includes(hostname3);
 }
+function isFirstPartyOrLoopbackApiUrl(value) {
+  return isStagingApiBaseUrl(value) || isProductionApiBaseUrl(value) || isLoopbackUrl(value);
+}
+function normalizedApiUrlFromEnv(env) {
+  const pinned = env.MRRLIN_API_BASE_URL;
+  if (typeof pinned === "string" && pinned.trim()) return retargetRetiredApiBaseUrl(pinned.trim()).baseUrl;
+  return env.MRRLIN_STAGING === "1" ? STAGING_API_BASE_URL : void 0;
+}
+function blockEnvNeedsApiRoutingMigration(actual) {
+  if (typeof actual !== "object" || actual === null) return false;
+  const env = actual.env;
+  if (typeof env !== "object" || env === null) return false;
+  const vars = env;
+  if (vars.MRRLIN_STAGING === "1") return true;
+  if (blockEnvHasRetiredApiUrl(actual)) return true;
+  const apiUrl = normalizedApiUrlFromEnv(vars);
+  return apiUrl !== void 0 && (isProductionApiBaseUrl(apiUrl) || vars.MRRLIN_API_ALLOW_REMOTE === "1" && isFirstPartyOrLoopbackApiUrl(apiUrl));
+}
 function renderEnvPreservedNotice(blockId, envKeys) {
   const keys = [...envKeys].sort().join(", ");
   return `[mrrlin-mcp configure bridge] kept your existing [mcp_servers.${blockId}] env keys (${keys}) so your API target is preserved. Re-run with --force to replace or remove it.`;
@@ -21001,16 +21030,30 @@ function renderEnvPreservedNotice(blockId, envKeys) {
 function reconcileMcpServerBlock(existing, desired) {
   if (existing === void 0) return { block: desired, preservedEnvKeys: [] };
   if (tablesEqual(existing, desired)) return { block: existing, preservedEnvKeys: [] };
-  if (blockEnvHasRetiredApiUrl(existing)) {
+  if (blockEnvNeedsApiRoutingMigration(existing)) {
     const existingEnv = existing.env ?? {};
+    const apiUrl = normalizedApiUrlFromEnv(existingEnv);
     const healedEnv = {};
     for (const [key, value] of Object.entries(existingEnv)) {
-      if (key === "MRRLIN_API_BASE_URL") continue;
+      if (key === "MRRLIN_API_BASE_URL" || key === "MRRLIN_STAGING" || key === "MRRLIN_API_ALLOW_REMOTE") {
+        continue;
+      }
       if (typeof value === "string") healedEnv[key] = value;
     }
-    healedEnv.MRRLIN_STAGING = "1";
-    delete healedEnv.MRRLIN_API_ALLOW_REMOTE;
-    return { block: { ...desired, env: healedEnv }, preservedEnvKeys: [] };
+    if (apiUrl && !isProductionApiBaseUrl(apiUrl)) {
+      healedEnv.MRRLIN_API_BASE_URL = apiUrl;
+      if (existingEnv.MRRLIN_API_ALLOW_REMOTE === "1" && !isFirstPartyOrLoopbackApiUrl(apiUrl)) {
+        healedEnv.MRRLIN_API_ALLOW_REMOTE = "1";
+      }
+    }
+    const finalEnv = { ...desired.env, ...healedEnv };
+    const block = { ...desired };
+    if (Object.keys(finalEnv).length > 0) {
+      block.env = finalEnv;
+    } else {
+      delete block.env;
+    }
+    return { block, preservedEnvKeys: [] };
   }
   if (classifyExistingBlock(existing, desired) === "preserve-env-noop") {
     const env = existing.env ?? {};
@@ -21057,11 +21100,15 @@ function deriveServeEnvFromProcessEnv(env) {
   const rawApiUrl = env.MRRLIN_API_BASE_URL?.trim();
   const bridgeWantsStaging = bridgeUrlImpliesStaging(env.MRRLIN_BRIDGE_URL);
   const apiUrl = rawApiUrl ? retargetRetiredApiBaseUrl(rawApiUrl).baseUrl : void 0;
-  if (apiUrl && !isStagingApiBaseUrl(apiUrl)) {
-    out.MRRLIN_API_BASE_URL = apiUrl;
-    if (env.MRRLIN_API_ALLOW_REMOTE === "1") out.MRRLIN_API_ALLOW_REMOTE = "1";
-  } else if (apiUrl || env.MRRLIN_STAGING === "1" || bridgeWantsStaging) {
-    out.MRRLIN_STAGING = "1";
+  if (apiUrl) {
+    if (!isProductionApiBaseUrl(apiUrl)) {
+      out.MRRLIN_API_BASE_URL = apiUrl;
+      if (env.MRRLIN_API_ALLOW_REMOTE === "1" && !isStagingApiBaseUrl(apiUrl) && !isLoopbackUrl(apiUrl)) {
+        out.MRRLIN_API_ALLOW_REMOTE = "1";
+      }
+    }
+  } else if (env.MRRLIN_STAGING === "1" || bridgeWantsStaging) {
+    out.MRRLIN_API_BASE_URL = STAGING_API_BASE_URL;
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
@@ -21204,7 +21251,7 @@ async function installCodex(options) {
     }
     const classification = classifyExistingBlock(existingTable, block.expected);
     if (classification === "equal") continue;
-    if (blockEnvHasRetiredApiUrl(existingTable)) {
+    if (blockEnvNeedsApiRoutingMigration(existingTable)) {
       const { block: healedBlock } = reconcileMcpServerBlock(existingTable, block.expected);
       content = replaceBlock(content, block.blockRe, renderBlock(block.id, healedBlock));
       action = "replaced";
@@ -21377,7 +21424,7 @@ async function installClaude(options) {
     }
     const classification = classifyExistingBlock(existingEntry, entry.expected);
     if (classification === "equal") continue;
-    if (blockEnvHasRetiredApiUrl(existingEntry)) {
+    if (blockEnvNeedsApiRoutingMigration(existingEntry)) {
       const { block: healedBlock } = reconcileMcpServerBlock(existingEntry, entry.expected);
       mcpServers[entry.id] = healedBlock;
       action = "replaced";
@@ -42441,7 +42488,7 @@ Do NOT derail the current task - if the operator has an in-flight question, answ
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.4.54";
+var PKG_VERSION = "0.4.55";
 
 // src/api-base-url-migrate.ts
 var import_node_fs4 = __toESM(require("node:fs"), 1);
@@ -42475,9 +42522,13 @@ function renderEcosystemConfig(opts) {
   if (telemetryProject) env.MRRLIN_TELEMETRY_DEFAULT_PROJECT = telemetryProject;
   if (opts.user) env.USER = opts.user;
   if (opts.codexHome) env.CODEX_HOME = opts.codexHome;
-  const retargeted = opts.apiBaseUrl ? retargetRetiredApiBaseUrl(opts.apiBaseUrl).baseUrl : void 0;
-  if (opts.staging || retargeted && isStagingApiBaseUrl(retargeted)) env.MRRLIN_STAGING = "1";
-  else if (retargeted) env.MRRLIN_API_BASE_URL = retargeted;
+  const apiBaseUrl = opts.apiBaseUrl ? retargetRetiredApiBaseUrl(opts.apiBaseUrl).baseUrl : void 0;
+  if (apiBaseUrl && !isProductionApiBaseUrl(apiBaseUrl)) {
+    env.MRRLIN_API_BASE_URL = apiBaseUrl;
+    if (opts.apiAllowRemote && !isStagingApiBaseUrl(apiBaseUrl) && !isLoopbackUrl(apiBaseUrl)) {
+      env.MRRLIN_API_ALLOW_REMOTE = "1";
+    }
+  }
   const envLines = Object.entries(env).map(([k, v]) => `      ${k}: ${JSON.stringify(v)},`).join("\n");
   return `module.exports = {
   apps: [{
@@ -42521,6 +42572,10 @@ function defaultDeps(deps) {
 function findRetiredHost(text) {
   return retiredApiHostnames().find((host) => text.toLowerCase().includes(host));
 }
+function hasLiveLegacyStagingFlag(text, syntax) {
+  const lineRe = syntax === "js" ? /^[ \t]*MRRLIN_STAGING:\s*"1",?[ \t]*\r?$/gm : /^[ \t]*(?!#).*MRRLIN_STAGING\s*=\s*"1"/gm;
+  return lineRe.test(text);
+}
 function isRetiredApiUrl(value) {
   if (!value?.trim()) return false;
   try {
@@ -42529,6 +42584,19 @@ function isRetiredApiUrl(value) {
     return false;
   }
 }
+function migratedApiUrl(value) {
+  const { baseUrl, retargeted } = retargetRetiredApiBaseUrl(value);
+  return retargeted ? baseUrl : void 0;
+}
+function isFirstPartyOrLoopbackUrl(value) {
+  return isStagingApiBaseUrl(value) || isProductionApiBaseUrl(value) || isLoopbackUrl(value);
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function removeStandaloneAllowRemoteLine(text) {
+  return text.replace(/^[ \t]*MRRLIN_API_ALLOW_REMOTE:\s*"1",?[ \t]*\r?\n/gm, "");
+}
 function backupOnce(file2, text, deps) {
   const bak = `${file2}.bak-retired-api-url`;
   if (!deps.exists(bak)) deps.writeFile(bak, text);
@@ -42538,7 +42606,8 @@ function migrateEcosystemConfig(deps = {}) {
   const file2 = import_node_path8.default.join(d.home, ".mrrlin", "ecosystem.config.cjs");
   if (!d.exists(file2)) return { file: file2, status: "absent" };
   const text = d.readFile(file2);
-  if (!findRetiredHost(text)) return { file: file2, status: "clean" };
+  if (!findRetiredHost(text) && !hasLiveLegacyStagingFlag(text, "js"))
+    return { file: file2, status: "clean" };
   const fields = {
     cwd: /cwd:\s*"((?:[^"\\]|\\.)*)"/.exec(text)?.[1],
     home: /HOME:\s*"((?:[^"\\]|\\.)*)"/.exec(text)?.[1],
@@ -42547,14 +42616,48 @@ function migrateEcosystemConfig(deps = {}) {
   };
   if (fields.cwd && fields.home && fields.pathEnv) {
     const retiredUrl = /MRRLIN_API_BASE_URL:\s*"((?:[^"\\]|\\.)*)"/.exec(text)?.[1];
-    const legacyShape = retiredUrl && isRetiredApiUrl(retiredUrl) ? renderEcosystemConfigLegacy({
+    const legacyUrlShape = retiredUrl && isRetiredApiUrl(retiredUrl) ? renderEcosystemConfigLegacy({
       cwd: fields.cwd,
       home: fields.home,
       pathEnv: fields.pathEnv,
       codexHome: fields.codexHome,
       apiBaseUrl: retiredUrl
     }) : void 0;
-    if (legacyShape && legacyShape === text) {
+    const legacyStagingShape = renderEcosystemConfigWithEnv(
+      { cwd: fields.cwd, home: fields.home, pathEnv: fields.pathEnv, codexHome: fields.codexHome },
+      { MRRLIN_STAGING: "1" }
+    );
+    if (legacyUrlShape && legacyUrlShape === text) {
+      const nextUrl = migratedApiUrl(retiredUrl ?? "");
+      if (!nextUrl) {
+        return {
+          file: file2,
+          status: "skipped-drifted",
+          detail: "the pinned API URL did not resolve to a known successor"
+        };
+      }
+      backupOnce(file2, text, d);
+      d.writeFile(
+        file2,
+        isProductionApiBaseUrl(nextUrl) ? renderEcosystemConfigWithEnv(
+          {
+            cwd: fields.cwd,
+            home: fields.home,
+            pathEnv: fields.pathEnv,
+            codexHome: fields.codexHome
+          },
+          { MRRLIN_API_BASE_URL: nextUrl }
+        ) : renderEcosystemConfig({
+          cwd: fields.cwd,
+          home: fields.home,
+          pathEnv: fields.pathEnv,
+          codexHome: fields.codexHome,
+          apiBaseUrl: STAGING_API_BASE_URL
+        })
+      );
+      return { file: file2, status: "migrated", detail: "regenerated from the canonical template" };
+    }
+    if (legacyStagingShape === text) {
       backupOnce(file2, text, d);
       d.writeFile(
         file2,
@@ -42563,8 +42666,7 @@ function migrateEcosystemConfig(deps = {}) {
           home: fields.home,
           pathEnv: fields.pathEnv,
           codexHome: fields.codexHome,
-          staging: true,
-          apiBaseUrl: void 0
+          apiBaseUrl: STAGING_API_BASE_URL
         })
       );
       return { file: file2, status: "migrated", detail: "regenerated from the canonical template" };
@@ -42574,16 +42676,49 @@ function migrateEcosystemConfig(deps = {}) {
   const matches = (text.match(lineRe) ?? []).filter((line) => !line.trimStart().startsWith("//"));
   const target = matches.length === 1 ? matches[0] : void 0;
   if (target !== void 0 && isRetiredApiUrl(/"((?:[^"\\]|\\.)*)"/.exec(target)?.[1])) {
+    const nextUrl = migratedApiUrl(/"((?:[^"\\]|\\.)*)"/.exec(target)?.[1] ?? "");
+    if (!nextUrl) {
+      return {
+        file: file2,
+        status: "skipped-drifted",
+        detail: "the pinned API URL did not resolve to a known successor"
+      };
+    }
     backupOnce(file2, text, d);
     const indent = /^[ \t]*/.exec(target)?.[0] ?? "      ";
-    d.writeFile(file2, text.replace(target, () => `${indent}MRRLIN_STAGING: "1",
-`));
-    return { file: file2, status: "migrated", detail: "replaced the pinned URL line with MRRLIN_STAGING" };
+    let out = text.replace(
+      target,
+      () => `${indent}MRRLIN_API_BASE_URL: ${JSON.stringify(nextUrl)},
+`
+    );
+    if (isFirstPartyOrLoopbackUrl(nextUrl)) out = removeStandaloneAllowRemoteLine(out);
+    return d.writeFile(file2, out), { file: file2, status: "migrated", detail: "replaced the pinned URL line" };
+  }
+  const stagingLineRe = /^[ \t]*MRRLIN_STAGING:\s*"1",?[ \t]*\r?\n/gm;
+  const stagingMatches = (text.match(stagingLineRe) ?? []).filter(
+    (line) => !line.trimStart().startsWith("//")
+  );
+  const stagingTarget = stagingMatches.length === 1 ? stagingMatches[0] : void 0;
+  if (stagingTarget !== void 0) {
+    backupOnce(file2, text, d);
+    const indent = /^[ \t]*/.exec(stagingTarget)?.[0] ?? "      ";
+    let out = text.replace(
+      stagingTarget,
+      () => `${indent}MRRLIN_API_BASE_URL: ${JSON.stringify(STAGING_API_BASE_URL)},
+`
+    );
+    out = removeStandaloneAllowRemoteLine(out);
+    d.writeFile(file2, out);
+    return {
+      file: file2,
+      status: "migrated",
+      detail: "replaced the legacy staging flag with the explicit API URL"
+    };
   }
   return {
     file: file2,
     status: "skipped-drifted",
-    detail: matches.length === 0 ? "a retired host appears in the file but no MRRLIN_API_BASE_URL line was found \u2014 fix it by hand or re-run install-service" : `found ${matches.length} MRRLIN_API_BASE_URL lines; refusing to guess \u2014 fix by hand or re-run install-service`
+    detail: matches.length === 0 ? "a retired host or legacy staging flag appears in the file but no live routing env line was found \u2014 fix it by hand or re-run install-service" : `found ${matches.length} MRRLIN_API_BASE_URL lines; refusing to guess \u2014 fix by hand or re-run install-service`
   };
 }
 function renderEcosystemConfigLegacy(opts) {
@@ -42622,7 +42757,7 @@ function migrateCodexConfig(deps = {}) {
   if (!d.exists(file2)) return { file: file2, status: "absent" };
   const text = d.readFile(file2);
   const host = findRetiredHost(text);
-  if (!host) return { file: file2, status: "clean" };
+  if (!host && !hasLiveLegacyStagingFlag(text, "toml")) return { file: file2, status: "clean" };
   const managedBlockRe = /^\[mcp_servers\.mrrlin\][^\n]*\n(?:(?!\[)[^\n]*\n?)*/gm;
   const blocks = text.match(managedBlockRe) ?? [];
   if (blocks.length === 0) {
@@ -42633,21 +42768,39 @@ function migrateCodexConfig(deps = {}) {
     };
   }
   const assignRe = /MRRLIN_API_BASE_URL\s*=\s*"([^"]*)"/g;
+  const stagingAssignRe = /MRRLIN_STAGING\s*=\s*"1"/g;
+  const allowRemoteAssignRe = /,?\s*MRRLIN_API_ALLOW_REMOTE\s*=\s*"1"\s*,?/g;
   let out = text;
   let changed = 0;
   for (const block of blocks) {
     let blockChanged = false;
     const healedBlock = block.split("\n").map((line) => {
       if (line.trimStart().startsWith("#")) return line;
-      const healedLine = line.replace(
-        assignRe,
-        (match, url2) => isRetiredApiUrl(url2) ? `MRRLIN_STAGING = "1"` : match
-      );
+      let nextApiUrl;
+      let healedLine = line.replace(assignRe, (match, url2) => {
+        const successor = migratedApiUrl(url2);
+        if (!successor) return match;
+        nextApiUrl = successor;
+        return `MRRLIN_API_BASE_URL = ${JSON.stringify(successor)}`;
+      });
+      healedLine = healedLine.replace(stagingAssignRe, () => {
+        nextApiUrl = STAGING_API_BASE_URL;
+        return `MRRLIN_API_BASE_URL = ${JSON.stringify(STAGING_API_BASE_URL)}`;
+      });
+      if (nextApiUrl && isFirstPartyOrLoopbackUrl(nextApiUrl)) {
+        healedLine = healedLine.replace(
+          allowRemoteAssignRe,
+          (match) => match.startsWith(",") && match.endsWith(",") ? "," : ""
+        ).replace(/\{\s*,\s*/, "{ ").replace(/,\s*\}/, " }").replace(/,\s*,/g, ",");
+      }
       if (healedLine !== line) blockChanged = true;
       return healedLine;
     }).join("\n");
     if (!blockChanged) continue;
-    const deduped = healedBlock.replace(/MRRLIN_STAGING = "1"\s*,\s*MRRLIN_STAGING = "1"/g, `MRRLIN_STAGING = "1"`);
+    const deduped = healedBlock.replace(
+      /MRRLIN_API_BASE_URL = "https:\/\/api-staging\.mrrlin\.com"\s*,\s*MRRLIN_API_BASE_URL = "https:\/\/api-staging\.mrrlin\.com"/g,
+      `MRRLIN_API_BASE_URL = "https://api-staging.mrrlin.com"`
+    );
     out = out.replace(block, () => deduped);
     changed += 1;
   }
@@ -42660,14 +42813,67 @@ function migrateCodexConfig(deps = {}) {
   }
   backupOnce(file2, text, d);
   d.writeFile(file2, out);
-  return { file: file2, status: "migrated", detail: "swapped the pinned URL for MRRLIN_STAGING" };
+  return {
+    file: file2,
+    status: "migrated",
+    detail: "rewrote legacy API routing env to explicit URL form"
+  };
+}
+function migrateClaudeConfig(deps = {}) {
+  const d = defaultDeps(deps);
+  const file2 = import_node_path8.default.join(d.home, ".claude.json");
+  if (!d.exists(file2)) return { file: file2, status: "absent" };
+  const text = d.readFile(file2);
+  let parsed;
+  try {
+    parsed = text.trim() === "" ? {} : JSON.parse(text);
+  } catch (error51) {
+    const detail2 = error51 instanceof Error ? error51.message : String(error51);
+    return { file: file2, status: "failed", detail: `malformed JSON: ${detail2}` };
+  }
+  if (!isRecord(parsed) || !isRecord(parsed.mcpServers)) {
+    return { file: file2, status: "clean" };
+  }
+  const entry = parsed.mcpServers.mrrlin;
+  if (!isRecord(entry) || entry.command !== "mrrlin-mcp" || !Array.isArray(entry.args) || entry.args.length !== 1 || entry.args[0] !== "serve") {
+    return { file: file2, status: "clean" };
+  }
+  const env = entry.env;
+  if (!isRecord(env)) return { file: file2, status: "clean" };
+  const envKeys = Object.keys(env);
+  const routingKeys = /* @__PURE__ */ new Set(["MRRLIN_STAGING", "MRRLIN_API_BASE_URL", "MRRLIN_API_ALLOW_REMOTE"]);
+  if (envKeys.length === 0 || !envKeys.every((key) => routingKeys.has(key)) || !envKeys.every((key) => typeof env[key] === "string")) {
+    return { file: file2, status: "clean" };
+  }
+  let nextEnv;
+  let detail;
+  if (env.MRRLIN_STAGING === "1" && envKeys.length === 1) {
+    nextEnv = { MRRLIN_API_BASE_URL: STAGING_API_BASE_URL };
+    detail = "replaced the legacy staging flag with the explicit API URL";
+  } else if (typeof env.MRRLIN_API_BASE_URL === "string" && (envKeys.length === 1 || envKeys.length === 2 && env.MRRLIN_API_ALLOW_REMOTE === "1")) {
+    const nextUrl = migratedApiUrl(env.MRRLIN_API_BASE_URL);
+    if (!nextUrl) return { file: file2, status: "clean" };
+    nextEnv = isProductionApiBaseUrl(nextUrl) ? {} : { MRRLIN_API_BASE_URL: nextUrl };
+    detail = isProductionApiBaseUrl(nextUrl) ? "removed the retired production routing override" : "retargeted the retired API URL";
+  }
+  if (!nextEnv) return { file: file2, status: "clean" };
+  backupOnce(file2, text, d);
+  const next = JSON.parse(JSON.stringify(parsed));
+  const nextServers = next.mcpServers;
+  const nextEntry = nextServers.mrrlin;
+  if (Object.keys(nextEnv).length === 0) delete nextEntry.env;
+  else nextEntry.env = nextEnv;
+  d.writeFile(file2, `${JSON.stringify(next, null, 2)}
+`);
+  return { file: file2, status: "migrated", detail };
 }
 function migrateRetiredApiBaseUrls(deps = {}) {
   const d = defaultDeps(deps);
   const results = [];
   const steps = [
     { run: migrateEcosystemConfig, file: import_node_path8.default.join(d.home, ".mrrlin", "ecosystem.config.cjs") },
-    { run: migrateCodexConfig, file: import_node_path8.default.join(d.codexHome, "config.toml") }
+    { run: migrateCodexConfig, file: import_node_path8.default.join(d.codexHome, "config.toml") },
+    { run: migrateClaudeConfig, file: import_node_path8.default.join(d.home, ".claude.json") }
   ];
   for (const step of steps) {
     try {
@@ -45062,7 +45268,7 @@ You revise a deliverable to address the accepted issues so it satisfies the acce
 }
 
 // src/telemetry/pii-gate.ts
-function isRecord(v) {
+function isRecord2(v) {
   return v !== null && typeof v === "object";
 }
 function resolvePath(root, path24) {
@@ -45074,7 +45280,7 @@ function resolvePath(root, path24) {
     if (Array.isArray(cur) && Number.isInteger(idx)) {
       if (idx < 0 || idx >= cur.length) return null;
       cur = cur[idx];
-    } else if (isRecord(cur) && part in cur) {
+    } else if (isRecord2(cur) && part in cur) {
       cur = cur[part];
     } else {
       return null;
@@ -45086,7 +45292,7 @@ function resolvePath(root, path24) {
     if (lastIdx < 0 || lastIdx >= cur.length) return null;
     return { parent: cur, key: lastIdx };
   }
-  if (isRecord(cur) && last in cur) {
+  if (isRecord2(cur) && last in cur) {
     return { parent: cur, key: last };
   }
   return null;
@@ -45095,7 +45301,7 @@ function withheldExcerptClone(artifact) {
   const clone2 = { ...artifact };
   if (Array.isArray(clone2.steps)) {
     clone2.steps = clone2.steps.map((step) => {
-      if (!isRecord(step)) return step;
+      if (!isRecord2(step)) return step;
       const copy = { ...step };
       delete copy.excerpt;
       return copy;
@@ -45126,9 +45332,9 @@ async function gate(artifact, prose, ctx) {
   } catch {
     return { ok: true, gated: true, artifact: withheldExcerptClone(artifact) };
   }
-  const fields = isRecord(parsed) && Array.isArray(parsed.fields) ? parsed.fields : null;
+  const fields = isRecord2(parsed) && Array.isArray(parsed.fields) ? parsed.fields : null;
   const isValidShape = fields !== null && fields.length === prose.length && fields.every(
-    (entry, i) => isRecord(entry) && typeof entry.path === "string" && typeof entry.masked === "string" && entry.path === prose[i]?.path && resolvePath(artifact, entry.path) !== null
+    (entry, i) => isRecord2(entry) && typeof entry.path === "string" && typeof entry.masked === "string" && entry.path === prose[i]?.path && resolvePath(artifact, entry.path) !== null
   );
   if (!isValidShape || fields === null) {
     return { ok: true, gated: true, artifact: withheldExcerptClone(artifact) };
@@ -49350,27 +49556,27 @@ function redact(input) {
 
 // src/telemetry/projector.ts
 var import_node_crypto8 = require("node:crypto");
-function isRecord2(x) {
+function isRecord3(x) {
   return typeof x === "object" && x !== null;
 }
 function buildProjection(payload, type, ms, telemetry) {
-  if (!isRecord2(payload)) return null;
+  if (!isRecord3(payload)) return null;
   const seqRaw = payload.seq;
   const turnIdRaw = payload.turnId;
   const maybeSeq = typeof seqRaw === "number" ? seqRaw : void 0;
   const maybeTurnId = typeof turnIdRaw === "string" ? turnIdRaw : void 0;
   if (type === "event") {
     const rawEvent = payload.event;
-    if (!isRecord2(rawEvent) || typeof rawEvent.type !== "string") return null;
+    if (!isRecord3(rawEvent) || typeof rawEvent.type !== "string") return null;
     if (rawEvent.type === "tool_use") {
       const tool = rawEvent.tool;
-      if (!isRecord2(tool)) return null;
+      if (!isRecord3(tool)) return null;
       const toolId = tool.id;
       const toolName = tool.name;
       if (typeof toolId !== "string" || typeof toolName !== "string") return null;
       const input = tool.input;
-      const argKeys = isRecord2(input) ? Object.keys(input) : [];
-      const projectSlug = isRecord2(input) && typeof input.projectSlug === "string" ? input.projectSlug : void 0;
+      const argKeys = isRecord3(input) ? Object.keys(input) : [];
+      const projectSlug = isRecord3(input) && typeof input.projectSlug === "string" ? input.projectSlug : void 0;
       const proj = { kind: "tool_use", toolId, toolName, argKeys, seq: maybeSeq ?? 0 };
       if (maybeTurnId !== void 0) proj.turnId = maybeTurnId;
       if (ms !== void 0) proj.ms = ms;
@@ -49379,7 +49585,7 @@ function buildProjection(payload, type, ms, telemetry) {
     }
     if (rawEvent.type === "tool_result") {
       const tool = rawEvent.tool;
-      if (!isRecord2(tool)) return null;
+      if (!isRecord3(tool)) return null;
       const toolId = tool.id;
       if (typeof toolId !== "string") return null;
       const exitCode = tool.exitCode;
@@ -49427,7 +49633,7 @@ function buildProjection(payload, type, ms, telemetry) {
     const proj = { kind: "plumbing", plumbingKind: "rate_limit_status", seq: maybeSeq ?? 0 };
     if (maybeTurnId !== void 0) proj.turnId = maybeTurnId;
     if (ms !== void 0) proj.ms = ms;
-    if (isRecord2(rateLimits)) proj.rateLimitReached = rateLimits.rateLimitReachedType != null;
+    if (isRecord3(rateLimits)) proj.rateLimitReached = rateLimits.rateLimitReachedType != null;
     return proj;
   }
   const bracketMatch = /^<([a-z-]+)>$/.exec(type);
@@ -54680,7 +54886,7 @@ function dayFilesInWindow(now, windowMs) {
   }
   return files;
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null;
 }
 function extractItems(lines2, sessionIds) {
@@ -54698,7 +54904,7 @@ function extractItems(lines2, sessionIds) {
       skipped2++;
       continue;
     }
-    if (!isRecord3(parsed)) {
+    if (!isRecord4(parsed)) {
       skipped2++;
       continue;
     }
@@ -54707,11 +54913,11 @@ function extractItems(lines2, sessionIds) {
     const ts = obj.ts;
     const type = obj.type;
     const payload = obj.payload;
-    if (type === "turn" && isRecord3(payload) && typeof payload.message === "string") {
+    if (type === "turn" && isRecord4(payload) && typeof payload.message === "string") {
       items.push({ ts, kind: "user", text: payload.message });
-    } else if (type === "event" && isRecord3(payload) && isRecord3(payload.event) && payload.event.type === "assistant" && typeof payload.event.content === "string") {
+    } else if (type === "event" && isRecord4(payload) && isRecord4(payload.event) && payload.event.type === "assistant" && typeof payload.event.content === "string") {
       items.push({ ts, kind: "assistant", text: payload.event.content });
-    } else if (type === "event" && isRecord3(payload) && isRecord3(payload.event) && payload.event.type === "tool_use" && isRecord3(payload.event.tool) && typeof payload.event.tool.name === "string") {
+    } else if (type === "event" && isRecord4(payload) && isRecord4(payload.event) && payload.event.type === "tool_use" && isRecord4(payload.event.tool) && typeof payload.event.tool.name === "string") {
       items.push({ ts, kind: "tool", text: payload.event.tool.name });
     }
   }
@@ -54804,7 +55010,7 @@ async function readSessionRows(logsDir, files, sessionIds) {
         stream.destroy();
       }
     } catch (e) {
-      if (isRecord3(e) && e.code === "ENOENT") {
+      if (isRecord4(e) && e.code === "ENOENT") {
         missingFiles++;
         continue;
       }
@@ -57402,10 +57608,10 @@ async function startDirectorBridge() {
     migrateRetiredApiBaseUrls();
   } catch {
   }
-  const apiBaseUrl = readConfiguredApiBaseUrl();
+  const apiBaseUrl = readDirectorBridgeApiBaseUrl();
   if (!isRemoteApiAllowed(apiBaseUrl)) {
     throw new Error(
-      `Refusing to run the director-bridge execution consumer against non-loopback API URL ${apiBaseUrl}. Set MRRLIN_API_ALLOW_REMOTE=1 or MRRLIN_STAGING=1 if this is intentional.`
+      `Refusing to run the director-bridge execution consumer against untrusted remote API URL ${apiBaseUrl}. Set MRRLIN_API_ALLOW_REMOTE=1 for a custom remote, or set MRRLIN_API_BASE_URL=https://api-staging.mrrlin.com for the official staging API.`
     );
   }
   const envToken = process.env.MRRLIN_TOKEN?.trim() || void 0;
@@ -64607,7 +64813,7 @@ async function invokeCapability(server, toolName, payload) {
       await client.connect(transport);
       result = await client.callTool({
         name: toolName,
-        arguments: isRecord4(payload) ? payload : void 0
+        arguments: isRecord5(payload) ? payload : void 0
       });
     } catch (error51) {
       throw classifyInvokeError(error51, server.url, toolName);
@@ -64659,7 +64865,7 @@ function classifyInvokeError(error51, url2, toolName) {
   if (error51 instanceof TypeError) return new InvokeUnreachableError(url2, error51);
   return new InvokeMalformedResultError(error51 instanceof Error ? error51.message : String(error51), error51);
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function extractFirstUrl(content) {
@@ -64668,7 +64874,7 @@ function extractFirstUrl(content) {
 function extractFirstText(content) {
   if (Array.isArray(content)) {
     for (const block of content) {
-      if (isRecord4(block) && typeof block.text === "string") return block.text;
+      if (isRecord5(block) && typeof block.text === "string") return block.text;
     }
   }
   return JSON.stringify(content);
@@ -64685,7 +64891,7 @@ function findFirstMatch(value, pattern) {
     }
     return null;
   }
-  if (isRecord4(value)) {
+  if (isRecord5(value)) {
     for (const nested of Object.values(value)) {
       const found = findFirstMatch(nested, pattern);
       if (found) return found;
@@ -64906,7 +65112,7 @@ async function recordUse(client, route, input, outcome) {
   }
 }
 async function callDestination(client, projectSlug, route, payload, mcpConfigPath) {
-  const operation = isRecord5(payload) ? payload.operation : void 0;
+  const operation = isRecord6(payload) ? payload.operation : void 0;
   if (route.capability === "wiki") {
     if (operation !== "create" && operation !== "update") {
       throw new Error(`callDestination: payload.operation "${String(operation)}" is not valid for wiki`);
@@ -64923,7 +65129,7 @@ async function callDestination(client, projectSlug, route, payload, mcpConfigPat
   }
   throw new Error(`callDestination: no destination wired for capability "${route.capability}"`);
 }
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null;
 }
 
@@ -65973,7 +66179,7 @@ var import_node_path31 = require("node:path");
 function evidenceDedupKey(sessionId, reportId) {
   return `${sessionId}:${reportId}`;
 }
-function isRecord6(v) {
+function isRecord7(v) {
   return v !== null && typeof v === "object";
 }
 async function readDayLines(stateDir, day, sessionId) {
@@ -65992,7 +66198,7 @@ async function readDayLines(stateDir, day, sessionId) {
     } catch {
       continue;
     }
-    if (!isRecord6(rec) || !isRecord6(rec.payload)) continue;
+    if (!isRecord7(rec) || !isRecord7(rec.payload)) continue;
     if (rec.payload.directorSessionId !== sessionId) continue;
     kept.push(rec);
   }
@@ -66062,7 +66268,7 @@ async function assembleEvidence(stateDir, sessionId, reportId, gateCtx) {
       } catch {
         continue;
       }
-      if (!isRecord6(rec) || !Array.isArray(rec.daysRemoved)) continue;
+      if (!isRecord7(rec) || !Array.isArray(rec.daysRemoved)) continue;
       for (const removedDay of rec.daysRemoved) {
         if (daysRead.includes(removedDay)) {
           windowPruned = true;
@@ -68115,7 +68321,7 @@ function resolveServerOptions(input = {}) {
   const remoteAllowed = isRemoteApiAllowed(apiBaseUrl) || input.allowRemoteApi === true;
   if (!remoteAllowed) {
     throw new Error(
-      `Refusing to start MCP server against non-loopback URL ${apiBaseUrl}. Set MRRLIN_API_ALLOW_REMOTE=1 or MRRLIN_STAGING=1 if this is intentional.`
+      `Refusing to start MCP server against non-loopback URL ${apiBaseUrl}. Set MRRLIN_API_ALLOW_REMOTE=1 for a custom remote, or set MRRLIN_API_BASE_URL=https://api-staging.mrrlin.com for the official staging API.`
     );
   }
   return {
@@ -68297,6 +68503,50 @@ function readExistingTelemetryDefaultProject(deps, ecoPath) {
     return void 0;
   }
 }
+function isOwnedEcosystemConfig(text) {
+  return /name:\s*"mrrlin-bridge"/.test(text) && /script:\s*"mrrlin-mcp"/.test(text) && /args:\s*"director-bridge"/.test(text);
+}
+function readEnvString(text, key) {
+  const match = new RegExp(`\\b${key}:\\s*("(?:[^"\\\\]|\\\\.)*")`).exec(text);
+  if (!match?.[1]) return void 0;
+  try {
+    const value = JSON.parse(match[1]);
+    return typeof value === "string" && value.trim() ? value.trim() : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function normalizeServiceApiTarget(apiBaseUrl, allowRemote) {
+  const normalized = retargetRetiredApiBaseUrl(apiBaseUrl).baseUrl;
+  if (isProductionApiBaseUrl(normalized)) return {};
+  const target = { apiBaseUrl: normalized };
+  if (allowRemote && !isStagingApiBaseUrl(normalized) && !isLoopbackUrl(normalized)) target.apiAllowRemote = true;
+  return target;
+}
+function readExistingServiceApiTarget(deps, ecoPath) {
+  try {
+    const existing = deps.readFile?.(ecoPath);
+    if (!existing || !isOwnedEcosystemConfig(existing)) return void 0;
+    const apiBaseUrl = readEnvString(existing, "MRRLIN_API_BASE_URL");
+    if (apiBaseUrl) {
+      return normalizeServiceApiTarget(apiBaseUrl, readEnvString(existing, "MRRLIN_API_ALLOW_REMOTE") === "1");
+    }
+    if (readEnvString(existing, "MRRLIN_STAGING") === "1") {
+      return { apiBaseUrl: STAGING_API_BASE_URL };
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  }
+}
+function deriveServiceApiTarget(deps, ecoPath) {
+  const apiBaseUrl = deps.env.MRRLIN_API_BASE_URL?.trim();
+  if (apiBaseUrl) return normalizeServiceApiTarget(apiBaseUrl, deps.env.MRRLIN_API_ALLOW_REMOTE === "1");
+  if (deps.env.MRRLIN_STAGING === "1" || bridgeUrlImpliesStaging(deps.env.MRRLIN_BRIDGE_URL)) {
+    return { apiBaseUrl: STAGING_API_BASE_URL };
+  }
+  return readExistingServiceApiTarget(deps, ecoPath) ?? {};
+}
 var SYSTEM_PATH_DIRS = ["/usr/bin", "/bin", "/usr/sbin", "/sbin"];
 function defaultHomeOwnerUid(home) {
   try {
@@ -68363,9 +68613,8 @@ function installService(deps) {
   const pathEnv = Array.from(
     /* @__PURE__ */ new Set([...resolvedBins.map((b) => import_node_path33.default.dirname(b)), ...SYSTEM_PATH_DIRS])
   ).join(":");
-  const apiBaseUrl = deps.env.MRRLIN_API_BASE_URL?.trim() || void 0;
-  const staging = deps.env.MRRLIN_STAGING === "1" || !apiBaseUrl && bridgeUrlImpliesStaging(deps.env.MRRLIN_BRIDGE_URL);
   const ecoPath = import_node_path33.default.join(home, ".mrrlin", "ecosystem.config.cjs");
+  const apiTarget = deriveServiceApiTarget(deps, ecoPath);
   const telemetryDefaultProject = "MRRLIN_TELEMETRY_DEFAULT_PROJECT" in deps.env ? deps.env.MRRLIN_TELEMETRY_DEFAULT_PROJECT?.trim() || void 0 : readExistingTelemetryDefaultProject(deps, ecoPath);
   const text = renderEcosystemConfig({
     cwd: resolved.cwd,
@@ -68373,8 +68622,8 @@ function installService(deps) {
     user,
     codexHome: deps.env.CODEX_HOME?.trim() || void 0,
     pathEnv,
-    staging,
-    apiBaseUrl,
+    apiBaseUrl: apiTarget.apiBaseUrl,
+    apiAllowRemote: apiTarget.apiAllowRemote,
     telemetryDefaultProject
   });
   deps.writeFile(ecoPath, text);
@@ -68512,7 +68761,7 @@ function parseArgs(args) {
   }
   return map2;
 }
-function isRecord7(v) {
+function isRecord8(v) {
   return v !== null && typeof v === "object";
 }
 async function runExtract(args, deps) {
@@ -68549,8 +68798,8 @@ Missing required flag(s): ${missing.join(
       } catch {
         continue;
       }
-      const payload = isRecord7(parsed) ? parsed.payload : void 0;
-      if (isRecord7(payload) && payload.directorSessionId === sessionId) {
+      const payload = isRecord8(parsed) ? parsed.payload : void 0;
+      if (isRecord8(payload) && payload.directorSessionId === sessionId) {
         matchingLines.push(line);
       }
     }
@@ -68658,8 +68907,9 @@ Usage:
   mrrlin-mcp serve              Run the stdio MCP server. Honors
                                 MRRLIN_API_BASE_URL (default http://127.0.0.1:8787)
                                 and MRRLIN_TOKEN. Non-loopback API URLs require
-                                MRRLIN_API_ALLOW_REMOTE=1, or use MRRLIN_STAGING=1
-                                to target the known staging API alias.
+                                MRRLIN_API_ALLOW_REMOTE=1 for a custom remote. Use
+                                MRRLIN_API_BASE_URL=https://api-staging.mrrlin.com
+                                to target the known staging API.
 
   mrrlin-mcp install-browser    Idempotently install the dedicated, pinned
                                 Chromium into ~/.mrrlin/browser/browsers (its own
@@ -68695,16 +68945,16 @@ Usage:
                                 Bakes API-target env vars into the block as an
                                 inline env table so \`serve\` boots even when the
                                 local 127.0.0.1:8787 is not running. Setup guide:
-                                  MRRLIN_STAGING=1 mrrlin-mcp configure bridge
-                                is the canonical path (staging alias + remote-
-                                allow gate in one flag). For a non-staging remote,
+                                  MRRLIN_API_BASE_URL=https://api-staging.mrrlin.com                                     mrrlin-mcp configure bridge
+                                is the canonical staging path. For a custom remote,
                                 pass BOTH the URL AND the allow gate:
                                   MRRLIN_API_BASE_URL=https://... \\
                                     MRRLIN_API_ALLOW_REMOTE=1 mrrlin-mcp configure bridge
                                 Without an allow gate, \`serve\` still refuses any
                                 non-loopback URL (see \`mrrlin-mcp serve\` above).
-                                URL and MRRLIN_STAGING are mutually exclusive at
-                                bake time \u2014 URL wins, mirrors serve's resolver.
+                                An explicit URL is the only routing selector at bake
+                                time. Production needs no routing env; a custom
+                                remote also needs MRRLIN_API_ALLOW_REMOTE=1.
                                 Re-running BARE (no env vars) over a block you
                                 already pinned to staging/a remote target is safe:
                                 it keeps your env verbatim (reported as
@@ -68738,8 +68988,9 @@ Usage:
                                 pending runs, read-only). Consumer env:
                                 - MRRLIN_API_BASE_URL (default http://127.0.0.1:8787;
                                   non-loopback requires MRRLIN_API_ALLOW_REMOTE=1,
-                                  or MRRLIN_STAGING=1 for the known staging API alias)
-                                - MRRLIN_STAGING=1 (shortcut for the public staging API)
+                                  or an explicit staging API URL)
+                                - MRRLIN_API_BASE_URL=https://api-staging.mrrlin.com
+                                  (known staging API)
                                 - MRRLIN_TOKEN (service-principal auth to the API;
                                   if unset, chat still works but claim-sweep /
                                   autonomous execution stays disabled)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.4.54",
+  "version": "0.4.55",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"
@@ -21,11 +21,11 @@
     "@types/ws": "^8.18.1",
     "esbuild": "^0.24.0",
     "tsx": "^4.22.3",
+    "@mrrlin/client": "0.0.0",
     "@mrrlin/agent-client": "0.0.0",
     "@mrrlin/director-e2e": "0.0.0",
-    "@mrrlin/client": "0.0.0",
-    "@mrrlin/schemas": "0.0.0",
     "@mrrlin/tsconfig": "0.0.0",
+    "@mrrlin/schemas": "0.0.0",
     "@mrrlin/wiki": "0.0.0"
   },
   "dependencies": {