@integrity-labs/agt-cli 0.28.207 → 0.28.209

package/dist/lib/manager-worker.js

@@ -9,15 +9,21 @@ import {
   atomicWriteFileSync,
   buildConnectivityProbeDeps,
   buildProbeEnv,
+  clearPresenceReaperState,
+  clearPresenceReaperStateForKeys,
   defaultFlagsCachePath,
   deriveMcpServerKey,
+  diffEnvIntegrations,
   estimateActiveTasksTokens,
   exchangeApiKey,
   executeConnectivityProbe,
   extractCommandNotFound,
+  findMcpServersUsingVars,
+  gatherSessionToolBindProbe,
   getApiKey,
   getCachedClaudeAuthMode,
   getHostId,
+  givenUpMcpServerKeys,
   provision,
   provisionAutoKanbanProgressHook,
   provisionChannelProgressHook,
@@ -25,10 +31,12 @@ import {
   provisionOrientHook,
   provisionSessionStateHook,
   provisionStopHook,
+  reapMissingMcpSessions,
+  reapStaleMcpChildren,
   requireHost,
   safeWriteJsonAtomic,
   setConfigHash
-} from "../chunk-TPFTAFG3.js";
+} from "../chunk-Z62QHIR3.js";
 import {
   getProjectDir as getProjectDir2,
   getReadyTasks,
@@ -36,41 +44,6 @@ import {
   markTaskFired,
   syncTasksToScheduler
 } from "../chunk-I3YS5WFV.js";
-import {
-  buildEgressAllowlist,
-  checkChannelInputs,
-  creditWatchdogGiveUpCount,
-  egressMode,
-  getLastFailureContext,
-  getProjectDir,
-  getSessionState,
-  injectMessage,
-  injectMessageWithStatus,
-  isAgentIdle,
-  isAgentPromptReady,
-  isSessionHealthy,
-  isStaleForToday,
-  isolationMode,
-  paneLogPath,
-  peekCurrentSession,
-  prepareForRespawn,
-  readPaneLogTail,
-  reloadEgressSidecar,
-  resetRestartCount,
-  resolveClaudeBinary,
-  restartEgressSidecar,
-  rotateSessionForWedge,
-  sendToAgent,
-  sessionTranscriptDir,
-  startPersistentSession,
-  stopAllSessionsAndWait,
-  stopPersistentSession,
-  subagentActivityAgeSeconds,
-  takeWatchdogGiveUpCount,
-  takeZombieDetection,
-  transcriptActivityAgeSeconds,
-  writeEgressAllowlist
-} from "../chunk-GWBOA7ZY.js";
 import {
   CONVERSATION_FAILURE_CATEGORIES,
   DEFAULT_FRAMEWORK,
@@ -82,17 +55,28 @@ import {
   StreamEncoder,
   appendDmFooter,
   attributeTranscriptUsageByRun,
+  buildEgressAllowlist,
   buildFailureCategoryPromptLines,
   buildScheduledTaskContextBlocks,
+  checkChannelInputs,
   classifyActor,
   classifyOutput,
   coerceOnboardingState,
+  creditWatchdogGiveUpCount,
   describeOnboardingChannel,
+  egressMode,
   extractFrontmatter,
   formatActorId,
   formatRunMarker,
   getFramework,
   getIntegration,
+  getLastFailureContext,
+  getProjectDir,
+  getSessionState,
+  injectMessage,
+  injectMessageWithStatus,
+  isAgentIdle,
+  isAgentPromptReady,
   isBareAck,
   isConversationFailureCategory,
   isEmptyTotals,
@@ -100,23 +84,44 @@ import {
   isParseError,
   isResolveError,
   isSelfCompletion,
+  isSessionHealthy,
+  isStaleForToday,
   isSystemInjectedContent,
   isUnsetTimezone,
   isVacuousDeliverReason,
+  isolationMode,
   laneTagFragment,
+  paneLogPath,
   parseDeliverAssertion,
   parseDeliveryTarget,
   parseEnvIntegrations,
   parseTranscriptUsage,
   parseUsageBanner,
+  peekCurrentSession,
+  prepareForRespawn,
+  readPaneLogTail,
+  reloadEgressSidecar,
+  resetRestartCount,
   resolveAgentTimezone,
   resolveAvatarEnvUrl,
   resolveChannels,
+  resolveClaudeBinary,
   resolveDmTarget,
-  sumTranscriptUsageInWindow
-} from "../chunk-ELBYWACS.js";
+  restartEgressSidecar,
+  rotateSessionForWedge,
+  sendToAgent,
+  sessionTranscriptDir,
+  startPersistentSession,
+  stopAllSessionsAndWait,
+  stopPersistentSession,
+  subagentActivityAgeSeconds,
+  sumTranscriptUsageInWindow,
+  takeWatchdogGiveUpCount,
+  takeZombieDetection,
+  transcriptActivityAgeSeconds,
+  writeEgressAllowlist
+} from "../chunk-WFCCBTA6.js";
 import {
-  parsePsRows,
   reapOrphanChannelMcps
 } from "../chunk-XWVM4KPK.js";
 
@@ -223,559 +228,9 @@ function computeIntegrationsHash(integrations) {
   return createHash2("sha256").update(JSON.stringify(payload)).digest("hex").slice(0, 16);
 }
 
-// src/lib/stale-mcp-reaper.ts
-import { execFileSync } from "child_process";
-var rotationTimestamps = /* @__PURE__ */ new Map();
-var DEFAULT_ROTATION_GRACE_MS = 15e3;
-function rotationKey(codeName, serverKey) {
-  return `${codeName}\0${serverKey}`;
-}
-function recordStaleRotation(codeName, serverKeys, now = Date.now) {
-  const ts = now();
-  for (const key of serverKeys) {
-    rotationTimestamps.set(rotationKey(codeName, key), ts);
-  }
-}
-function wasRecentlyRotated(codeName, serverKey, withinMs, now = Date.now) {
-  const k = rotationKey(codeName, serverKey);
-  const ts = rotationTimestamps.get(k);
-  if (ts === void 0) return false;
-  if (now() - ts < withinMs) return true;
-  rotationTimestamps.delete(k);
-  return false;
-}
-function parseEnvIntegrationsEntries(content) {
-  const entries = /* @__PURE__ */ new Map();
-  for (const raw of content.split(/\r?\n/)) {
-    const line = raw.trim();
-    if (!line || line.startsWith("#")) continue;
-    const eq = line.indexOf("=");
-    if (eq <= 0) continue;
-    const name = line.slice(0, eq).trim();
-    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) continue;
-    const value = line.slice(eq + 1);
-    entries.set(name, value);
-  }
-  return entries;
-}
-function diffEnvIntegrations(oldContent, newContent) {
-  const oldEntries = oldContent === void 0 ? /* @__PURE__ */ new Map() : parseEnvIntegrationsEntries(oldContent);
-  const newEntries = parseEnvIntegrationsEntries(newContent);
-  const changed = /* @__PURE__ */ new Set();
-  for (const [name, value] of newEntries) {
-    if (oldEntries.get(name) !== value) changed.add(name);
-  }
-  for (const name of oldEntries.keys()) {
-    if (!newEntries.has(name)) changed.add(name);
-  }
-  return [...changed];
-}
-function findMcpServersUsingVars(mcp, changedVars) {
-  const changedSet = new Set(changedVars);
-  if (!mcp?.mcpServers || changedSet.size === 0) return [];
-  const result = [];
-  for (const [serverKey, entry] of Object.entries(mcp.mcpServers)) {
-    if (!entry || typeof entry !== "object") continue;
-    const env = entry.env;
-    if (!env || typeof env !== "object") continue;
-    let matches = false;
-    for (const value of Object.values(env)) {
-      if (typeof value !== "string") continue;
-      const placeholderMatches = value.match(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g);
-      if (placeholderMatches) {
-        for (const ph of placeholderMatches) {
-          const name = ph.slice(2, -1);
-          if (changedSet.has(name)) {
-            matches = true;
-            break;
-          }
-        }
-      }
-      if (matches) break;
-    }
-    if (matches) result.push(serverKey);
-  }
-  return result;
-}
-function buildArgvMatchersForEntry(key, entry) {
-  const escapeRe = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const patterns = [];
-  const args = entry?.args ?? [];
-  for (let i = args.length - 1; i >= 0; i--) {
-    const arg = args[i];
-    if (typeof arg !== "string" || !arg) continue;
-    if (arg.startsWith("-")) continue;
-    const stripped = arg.replace(
-      /@[^/@]*$/,
-      (m) => (
-        // @latest, @1.2.3, etc. — drop. But @scope at the START of a
-        // package spec must NOT be stripped, so we only strip a tail
-        // `@...` if it doesn't itself start with a slash inside.
-        // The regex above only matches a single trailing `@...`
-        // segment after the last `/`, so this is safe for `@scope/pkg`.
-        m.includes("/") ? m : ""
-      )
-    );
-    const tail = "(?![A-Za-z0-9_-])";
-    if (/^@?[a-z0-9]([a-z0-9._-]*\/)?[a-z0-9._-]+$/i.test(stripped)) {
-      patterns.push(new RegExp(`${escapeRe(stripped)}${tail}`));
-      const basename = stripped.split("/").pop();
-      if (basename && basename !== stripped) {
-        patterns.push(new RegExp(`${escapeRe(basename)}${tail}`));
-      }
-      break;
-    }
-    if (stripped.includes("/")) {
-      const basename = stripped.split("/").pop();
-      if (basename) {
-        patterns.push(new RegExp(`${escapeRe(basename)}${tail}`));
-        break;
-      }
-    }
-  }
-  if (patterns.length === 0) {
-    const safe = escapeRe(key);
-    patterns.push(new RegExp(`(?<![A-Za-z0-9_])${safe}(?![A-Za-z0-9_])`));
-    if (safe.includes("_")) {
-      const dashed = safe.replace(/_/g, "-");
-      patterns.push(new RegExp(`(?<![A-Za-z0-9_])${dashed}(?![A-Za-z0-9_])`));
-    }
-  }
-  return patterns;
-}
-function buildClaudeAgentMatcher(codeName) {
-  const safe = codeName.replace(/[^A-Za-z0-9_-]/g, "");
-  return new RegExp(`\\bclaude\\b.*--name\\s+agt-${safe}(?=\\s|$)`);
-}
-function findMcpChildrenForAgent(args) {
-  const { rows, codeName, serverKeys, mcpJson } = args;
-  const maxDepth = args.maxDepth ?? 8;
-  const inContainer = args.inContainer ?? false;
-  if (serverKeys.length === 0 || rows.length === 0) return [];
-  const claudeMatcher = inContainer ? /\bclaude\b/ : buildClaudeAgentMatcher(codeName);
-  const argvMatchers = [];
-  for (const key of serverKeys) {
-    const entry = mcpJson?.mcpServers?.[key];
-    argvMatchers.push(...buildArgvMatchersForEntry(key, entry));
-  }
-  const byPid = new Map(rows.map((r) => [r.pid, r]));
-  const matched = [];
-  for (const row of rows) {
-    if (!argvMatchers.some((re) => re.test(row.args))) continue;
-    if (/\bclaude\b/.test(row.args) && row.args.includes(`--name agt-${codeName}`)) continue;
-    let cur = byPid.get(row.ppid);
-    let belongs = false;
-    for (let depth = 0; depth < maxDepth && cur; depth++) {
-      if (claudeMatcher.test(cur.args)) {
-        belongs = true;
-        break;
-      }
-      if (cur.pid === 1) break;
-      cur = byPid.get(cur.ppid);
-    }
-    if (belongs) matched.push(row.pid);
-  }
-  return matched;
-}
-function reapStaleMcpChildren(args) {
-  const { log: log2, codeName, serverKeys, mcpJson, graceMs = 5e3, isolated = false } = args;
-  if (serverKeys.length === 0) return [];
-  const runPs = args.runPs ?? (isolated ? () => execFileSync("docker", ["exec", `agt-${codeName}`, "ps", "-eo", "pid,ppid,args"], {
-    encoding: "utf-8",
-    timeout: 8e3
-  }) : () => execFileSync("ps", ["-eo", "pid,ppid,args"], { encoding: "utf-8", timeout: 5e3 }));
-  const killProcess = args.killProcess ?? (isolated ? (pid, signal) => {
-    try {
-      execFileSync(
-        "docker",
-        ["exec", `agt-${codeName}`, "kill", signal === "SIGKILL" ? "-KILL" : "-TERM", String(pid)],
-        { timeout: 8e3, stdio: "ignore" }
-      );
-    } catch {
-    }
-  } : (pid, signal) => {
-    try {
-      process.kill(pid, signal);
-    } catch {
-    }
-  });
-  const isAlive = args.isAlive ?? (isolated ? (pid) => {
-    try {
-      execFileSync("docker", ["exec", `agt-${codeName}`, "kill", "-0", String(pid)], {
-        timeout: 8e3,
-        stdio: "ignore"
-      });
-      return true;
-    } catch {
-      return false;
-    }
-  } : (pid) => {
-    try {
-      process.kill(pid, 0);
-      return true;
-    } catch {
-      return false;
-    }
-  });
-  let psOutput;
-  try {
-    psOutput = runPs();
-  } catch (err) {
-    log2(`[stale-mcp-reaper] ps invocation failed for '${codeName}': ${err.message} \u2014 skipping reap`);
-    return [];
-  }
-  const rows = parsePsRows(psOutput);
-  const targets = findMcpChildrenForAgent({ rows, codeName, serverKeys, mcpJson, inContainer: isolated });
-  if (targets.length === 0) return [];
-  const byPid = new Map(rows.map((r) => [r.pid, r]));
-  const describe = (pid) => {
-    const argv = byPid.get(pid)?.args ?? "";
-    const pkgMatch = argv.match(/(@[a-z0-9_-]+\/[a-z0-9_-]+|[a-z0-9_-]+-mcp-server|[a-z0-9_-]+-mcp\b)/i);
-    return pkgMatch ? `${pkgMatch[1]} (pid ${pid})` : `pid ${pid}`;
-  };
-  log2(
-    `[stale-mcp-reaper] '${codeName}': rotating ${targets.length} stale MCP child(ren) for [${serverKeys.join(", ")}]: ${targets.map(describe).join(", ")}`
-  );
-  for (const pid of targets) {
-    killProcess(pid, "SIGTERM");
-  }
-  const killedKeys = /* @__PURE__ */ new Set();
-  for (const pid of targets) {
-    const argv = byPid.get(pid)?.args ?? "";
-    for (const key of serverKeys) {
-      const entry = mcpJson?.mcpServers?.[key];
-      const matchers = buildArgvMatchersForEntry(key, entry);
-      if (matchers.some((re) => re.test(argv))) killedKeys.add(key);
-    }
-  }
-  if (killedKeys.size > 0) recordStaleRotation(codeName, killedKeys);
-  setTimeout(() => {
-    try {
-      let freshPsOutput;
-      try {
-        freshPsOutput = runPs();
-      } catch (err) {
-        log2(`[stale-mcp-reaper] '${codeName}': fresh ps for SIGKILL re-verify failed: ${err.message} \u2014 skipping SIGKILL pass`);
-        return;
-      }
-      const stillOwned = new Set(
-        findMcpChildrenForAgent({
-          rows: parsePsRows(freshPsOutput),
-          codeName,
-          serverKeys,
-          mcpJson,
-          inContainer: isolated
-        })
-      );
-      const stragglers = targets.filter((pid) => isAlive(pid) && stillOwned.has(pid));
-      if (stragglers.length === 0) return;
-      log2(
-        `[stale-mcp-reaper] '${codeName}': ${stragglers.length} child(ren) survived SIGTERM; sending SIGKILL: ${stragglers.map(describe).join(", ")}`
-      );
-      for (const pid of stragglers) {
-        killProcess(pid, "SIGKILL");
-      }
-    } catch (err) {
-      log2(`[stale-mcp-reaper] '${codeName}': error in SIGKILL pass: ${err.message}`);
-    }
-  }, graceMs).unref();
-  return targets;
-}
-
-// src/lib/mcp-presence-reaper.ts
-import { execFileSync as execFileSync2 } from "child_process";
-var DEFAULT_COLD_START_GRACE_MS = 9e4;
-var MAX_PRESENCE_RESTART_ATTEMPTS = 3;
-var BACKOFF_AFTER_RESTARTS = MAX_PRESENCE_RESTART_ATTEMPTS;
-var BACKOFF_BASE_MS = 6e4;
-var BACKOFF_MAX_MS = 30 * 6e4;
-var BACKOFF_WINDOW_MS = 60 * 6e4;
-var BACKOFF_GIVE_UP_RESTARTS = 2 * MAX_PRESENCE_RESTART_ATTEMPTS;
-var BACKOFF_STABLE_RESET_MS = 5 * 6e4;
-var presenceReaperState = /* @__PURE__ */ new Map();
-function stateKey(codeName, serverKey) {
-  return `${codeName}\0${serverKey}`;
-}
-function clearPresenceReaperState(codeName) {
-  const prefix = `${codeName}\0`;
-  for (const key of presenceReaperState.keys()) {
-    if (key.startsWith(prefix)) presenceReaperState.delete(key);
-  }
-}
-function clearPresenceReaperStateForKeys(codeName, keys) {
-  for (const key of keys) {
-    presenceReaperState.delete(stateKey(codeName, key));
-  }
-}
-function givenUpMcpServerKeys(codeName) {
-  const prefix = `${codeName}\0`;
-  const out = /* @__PURE__ */ new Set();
-  for (const [key, st] of presenceReaperState) {
-    if (key.startsWith(prefix) && (st.gaveUp || st.attempts >= MAX_PRESENCE_RESTART_ATTEMPTS)) {
-      out.add(key.slice(prefix.length));
-    }
-  }
-  return out;
-}
-function findMissingMcpServers(args) {
-  const { rows, codeName, mcpJson, inContainer } = args;
-  const servers = mcpJson?.mcpServers ?? {};
-  const declared = Object.keys(servers);
-  if (declared.length === 0) return [];
-  const missing = [];
-  for (const key of declared) {
-    const entry = servers[key];
-    const isStdio = typeof entry?.command === "string";
-    if (!isStdio) continue;
-    const live = findMcpChildrenForAgent({
-      rows,
-      codeName,
-      serverKeys: [key],
-      mcpJson,
-      inContainer
-    });
-    if (live.length === 0) missing.push(key);
-  }
-  return missing;
-}
-function reapMissingMcpSessions(args) {
-  const {
-    log: log2,
-    codeName,
-    mcpJson,
-    sessionStartedAt,
-    restartPending = false,
-    stopSession,
-    graceMs = DEFAULT_COLD_START_GRACE_MS,
-    rotationGraceMs = DEFAULT_ROTATION_GRACE_MS,
-    onGiveUp,
-    onRestart,
-    // ENG-5932: defaults make quarantine a strict no-op (classify everything
-    // essential, mode off) so legacy callers/tests are unaffected.
-    classifyKey = () => "essential",
-    quarantineDwellMs = 0,
-    quarantineMode = "off",
-    onQuarantine,
-    isolated = false
-  } = args;
-  const now = args.now ?? Date.now;
-  const runPs = args.runPs ?? (isolated ? () => execFileSync2("docker", ["exec", `agt-${codeName}`, "ps", "-eo", "pid,ppid,args"], {
-    encoding: "utf-8",
-    timeout: 8e3
-  }) : () => execFileSync2("ps", ["-eo", "pid,ppid,args"], { encoding: "utf-8", timeout: 5e3 }));
-  if (!mcpJson?.mcpServers) {
-    return { missing: [], restarted: false, reason: "no-mcp-json" };
-  }
-  const declaredCount = Object.keys(mcpJson.mcpServers).length;
-  if (declaredCount === 0) {
-    return { missing: [], restarted: false, reason: "no-declared-servers" };
-  }
-  if (restartPending) {
-    return { missing: [], restarted: false, reason: "restart-pending" };
-  }
-  if (sessionStartedAt === null) {
-    return { missing: [], restarted: false, reason: "session-start-unknown" };
-  }
-  if (now() - sessionStartedAt < graceMs) {
-    return { missing: [], restarted: false, reason: "cold-start" };
-  }
-  let psOutput;
-  try {
-    psOutput = runPs();
-  } catch (err) {
-    log2(`[mcp-presence-reaper] ps invocation failed for '${codeName}': ${err.message} \u2014 skipping`);
-    return { missing: [], restarted: false, reason: "healthy" };
-  }
-  const rows = parsePsRows(psOutput);
-  const missingRaw = findMissingMcpServers({ rows, codeName, mcpJson, inContainer: isolated });
-  const rotationGraced = [];
-  const missing = [];
-  for (const key of missingRaw) {
-    if (wasRecentlyRotated(codeName, key, rotationGraceMs, now)) {
-      rotationGraced.push(key);
-    } else {
-      missing.push(key);
-    }
-  }
-  if (rotationGraced.length > 0) {
-    log2(
-      `[mcp-presence-reaper] '${codeName}': skipping [${rotationGraced.join(", ")}] within rotation grace window (${rotationGraceMs}ms) \u2014 child(ren) just SIGTERM'd by stale-mcp-reaper, awaiting respawn on next tool call (ENG-5344)`
-    );
-  }
-  const declared = mcpJson.mcpServers ?? {};
-  const liveKeys = /* @__PURE__ */ new Set();
-  for (const key of Object.keys(declared)) {
-    const entry = declared[key];
-    if (typeof entry?.command !== "string") continue;
-    if (!missingRaw.includes(key)) liveKeys.add(key);
-  }
-  for (const key of liveKeys) {
-    const state7 = presenceReaperState.get(stateKey(codeName, key));
-    if (state7) {
-      state7.attempts = 0;
-      state7.lastSeenLiveAt = now();
-      state7.lastAttemptedSessionStartedAt = null;
-      state7.gaveUpLogged = false;
-      state7.firstMissingAt = null;
-      state7.quarantineLogged = false;
-      state7.gaveUp = false;
-      if (state7.stableLiveSince === null) state7.stableLiveSince = now();
-      if (now() - state7.stableLiveSince >= BACKOFF_STABLE_RESET_MS) {
-        state7.restartHistory = [];
-      }
-    }
-  }
-  if (missing.length === 0) {
-    return {
-      missing,
-      restarted: false,
-      reason: "healthy",
-      rotationGraced: rotationGraced.length > 0 ? rotationGraced : void 0
-    };
-  }
-  const nowMs = now();
-  const givenUp = [];
-  const active = [];
-  const backingOff = [];
-  const newGenerationKeys = /* @__PURE__ */ new Set();
-  const quarantined = [];
-  const wouldQuarantine = [];
-  for (const key of missing) {
-    const sk = stateKey(codeName, key);
-    const state7 = presenceReaperState.get(sk) ?? {
-      attempts: 0,
-      lastSeenLiveAt: null,
-      lastAttemptedSessionStartedAt: null,
-      gaveUpLogged: false,
-      firstMissingAt: null,
-      quarantineLogged: false,
-      restartHistory: [],
-      stableLiveSince: null,
-      gaveUp: false
-    };
-    if (state7.firstMissingAt === null) state7.firstMissingAt = nowMs;
-    state7.stableLiveSince = null;
-    if (state7.lastAttemptedSessionStartedAt !== sessionStartedAt) {
-      state7.attempts += 1;
-      state7.lastAttemptedSessionStartedAt = sessionStartedAt;
-      newGenerationKeys.add(key);
-    }
-    state7.restartHistory = state7.restartHistory.filter((t) => nowMs - t < BACKOFF_WINDOW_MS);
-    const restartsInWindow = state7.restartHistory.length;
-    presenceReaperState.set(sk, state7);
-    const overAttemptsCap = state7.attempts > MAX_PRESENCE_RESTART_ATTEMPTS;
-    const overRateCap = restartsInWindow >= BACKOFF_GIVE_UP_RESTARTS;
-    if (overAttemptsCap || overRateCap) {
-      givenUp.push(key);
-      state7.gaveUp = true;
-      if (!state7.gaveUpLogged) {
-        const cause = overAttemptsCap ? `${MAX_PRESENCE_RESTART_ATTEMPTS} consecutive failed restarts \u2014 declared but never recovers (likely orphaned config; see ENG-5279)` : `${restartsInWindow} restarts within ${Math.round(BACKOFF_WINDOW_MS / 6e4)}m \u2014 persistently flapping (crash-loop; ENG-6480)`;
-        log2(
-          `[mcp-presence-reaper] giving up on '${codeName}:${key}' after ${cause}`
-        );
-        state7.gaveUpLogged = true;
-        if (onGiveUp) {
-          try {
-            onGiveUp(codeName, key);
-          } catch (err) {
-            log2(
-              `[mcp-presence-reaper] onGiveUp callback threw for '${codeName}:${key}' (suppressed; reaper continues): ${err.message}`
-            );
-          }
-        }
-      }
-      if (quarantineMode !== "off" && !state7.quarantineLogged && classifyKey(key) === "optional") {
-        const dwellElapsed = quarantineDwellMs <= 0 || state7.firstMissingAt !== null && nowMs - state7.firstMissingAt >= quarantineDwellMs;
-        if (dwellElapsed) {
-          state7.quarantineLogged = true;
-          if (quarantineMode === "enforce") {
-            quarantined.push(key);
-            log2(
-              `[mcp-presence-reaper] QUARANTINE '${codeName}:${key}' \u2014 optional channel dead past restart budget + ${quarantineDwellMs}ms dwell; dropping from provisioned set so the dead channel stops restarting the whole session (ENG-5932)`
-            );
-            if (onQuarantine) {
-              try {
-                onQuarantine(codeName, key);
-              } catch (err) {
-                log2(
-                  `[mcp-presence-reaper] onQuarantine callback threw for '${codeName}:${key}' (suppressed; reaper continues): ${err.message}`
-                );
-              }
-            }
-          } else {
-            wouldQuarantine.push(key);
-            log2(
-              `[mcp-presence-reaper] SHADOW would-quarantine '${codeName}:${key}' \u2014 optional channel dead past restart budget + ${quarantineDwellMs}ms dwell; no action taken (ENG-5932 shadow mode)`
-            );
-          }
-        }
-      }
-    } else {
-      const backoffMs = restartsInWindow < BACKOFF_AFTER_RESTARTS ? 0 : Math.min(
-        BACKOFF_BASE_MS * 2 ** (restartsInWindow - BACKOFF_AFTER_RESTARTS),
-        BACKOFF_MAX_MS
-      );
-      const lastRestartAt = state7.restartHistory[state7.restartHistory.length - 1] ?? null;
-      if (lastRestartAt !== null && nowMs - lastRestartAt < backoffMs) {
-        backingOff.push(key);
-      } else {
-        active.push(key);
-      }
-    }
-  }
-  if (active.length === 0) {
-    const reason = backingOff.length > 0 ? "backoff" : "all-keys-over-cap";
-    if (backingOff.length > 0) {
-      log2(
-        `[mcp-presence-reaper] '${codeName}': holding off restart for [${backingOff.join(", ")}] \u2014 escalating backoff interval not yet elapsed (ENG-6480)${givenUp.length > 0 ? ` (given up: [${givenUp.join(", ")}])` : ""}`
-      );
-    }
-    return {
-      missing,
-      restarted: false,
-      reason,
-      givenUp,
-      backingOff: backingOff.length > 0 ? backingOff : void 0,
-      rotationGraced: rotationGraced.length > 0 ? rotationGraced : void 0,
-      quarantined: quarantined.length > 0 ? quarantined : void 0,
-      wouldQuarantine: wouldQuarantine.length > 0 ? wouldQuarantine : void 0
-    };
-  }
-  const givenUpSuffix = givenUp.length > 0 ? ` (skipping over-cap: [${givenUp.join(", ")}])` : "";
-  log2(
-    `[mcp-presence-reaper] '${codeName}': declared MCP(s) [${active.join(", ")}] have no live children \u2014 restarting session${givenUpSuffix}`
-  );
-  if (onRestart) {
-    try {
-      const maybePromise = onRestart(codeName, { activeKeys: active, givenUpKeys: givenUp });
-      if (maybePromise && typeof maybePromise.then === "function") {
-        void maybePromise.then(void 0, (err) => {
-          log2(
-            `[mcp-presence-reaper] onRestart callback rejected for '${codeName}' (suppressed; restart proceeds): ${err.message}`
-          );
-        });
-      }
-    } catch (err) {
-      log2(
-        `[mcp-presence-reaper] onRestart callback threw for '${codeName}' (suppressed; restart proceeds): ${err.message}`
-      );
-    }
-  }
-  stopSession(codeName, { activeKeys: active });
-  for (const key of active) {
-    if (!newGenerationKeys.has(key)) continue;
-    const st = presenceReaperState.get(stateKey(codeName, key));
-    if (st) st.restartHistory.push(nowMs);
-  }
-  return {
-    missing,
-    restarted: true,
-    givenUp: givenUp.length > 0 ? givenUp : void 0,
-    backingOff: backingOff.length > 0 ? backingOff : void 0,
-    rotationGraced: rotationGraced.length > 0 ? rotationGraced : void 0,
-    quarantined: quarantined.length > 0 ? quarantined : void 0,
-    wouldQuarantine: wouldQuarantine.length > 0 ? wouldQuarantine : void 0
-  };
+// src/lib/host-integration-mapping.ts
+function withResolvedRemoteMcp(integration) {
+  return { ...integration, remoteMcp: integration.remote_mcp ?? void 0 };
 }
 
 // src/lib/channel-restart-decision.ts
@@ -1804,116 +1259,6 @@ function isDirectChatMessageExpired(createdAt, nowMs, maxAgeMs) {
   return nowMs - created > maxAgeMs;
 }
 
-// src/lib/session-tool-probe.ts
-function classifyMcpServer(entry) {
-  if (!entry || typeof entry !== "object") return "unknown";
-  const e = entry;
-  if (typeof e.command === "string") return "stdio";
-  if (typeof e.url === "string") return "http";
-  return "unknown";
-}
-function splitServerKeysByKind(mcpJson, serverKeys) {
-  const servers = mcpJson?.mcpServers ?? {};
-  const stdio = [];
-  const http = [];
-  for (const key of serverKeys) {
-    const kind = classifyMcpServer(servers[key]);
-    if (kind === "stdio") stdio.push(key);
-    else if (kind === "http") http.push(key);
-  }
-  return { stdio, http };
-}
-function computeSessionToolBindStatus(input) {
-  const { stdioServerKeys, httpServerKeys, missingStdioKeys, httpReachable, httpSessionLoaded } = input;
-  if (stdioServerKeys.length === 0 && httpServerKeys.length === 0) return "unknown";
-  if (stdioServerKeys.some((k) => missingStdioKeys.has(k))) return "missing";
-  let anyHttpUnconfirmed = false;
-  for (const k of httpServerKeys) {
-    const reachable = httpReachable.get(k);
-    if (reachable === false) return "unreachable";
-    if (reachable === void 0) {
-      anyHttpUnconfirmed = true;
-    } else if (!httpSessionLoaded) {
-      anyHttpUnconfirmed = true;
-    }
-  }
-  if (anyHttpUnconfirmed && stdioServerKeys.length === 0) return "unknown";
-  return "bound";
-}
-
-// src/lib/session-tool-bind-runner.ts
-var DEFAULT_INTERVAL_MS2 = 60 * 60 * 1e3;
-var DEFAULT_MAX_PER_RUN2 = 25;
-function sanitizeServerKey(definitionId) {
-  return definitionId.replace(/[^a-z0-9]/gi, "_").toLowerCase();
-}
-function resolveIntegrationServerKeys(definitionId, declaredKeys, hint) {
-  const declared = new Set(declaredKeys);
-  const candidates = [hint, definitionId, sanitizeServerKey(definitionId)].filter(
-    (k) => typeof k === "string" && k.length > 0
-  );
-  const out = /* @__PURE__ */ new Set();
-  for (const c of candidates) if (declared.has(c)) out.add(c);
-  return [...out];
-}
-function isDue2(last, now, intervalMs) {
-  if (!last) return true;
-  const t = Date.parse(last);
-  if (Number.isNaN(t)) return true;
-  return now - t >= intervalMs;
-}
-async function runSessionToolBindProbes(integrations, options) {
-  const now = (options.now?.() ?? /* @__PURE__ */ new Date()).getTime();
-  const intervalMs = options.intervalMs ?? DEFAULT_INTERVAL_MS2;
-  const maxPerRun = options.maxPerRun ?? DEFAULT_MAX_PER_RUN2;
-  const due = integrations.filter((i) => isDue2(i.last_session_tool_bind_at, now, intervalMs)).sort((a, b) => {
-    const ta = a.last_session_tool_bind_at ? Date.parse(a.last_session_tool_bind_at) : 0;
-    const tb = b.last_session_tool_bind_at ? Date.parse(b.last_session_tool_bind_at) : 0;
-    return ta - tb;
-  });
-  const batch = due.slice(0, maxPerRun);
-  const declaredKeys = Object.keys(options.mcpJson?.mcpServers ?? {});
-  const reports = [];
-  let skipped = 0;
-  let probed = 0;
-  for (const integ of batch) {
-    const keys = resolveIntegrationServerKeys(
-      integ.definition_id,
-      declaredKeys,
-      integ.mcp_server_key
-    );
-    if (keys.length === 0) {
-      skipped += 1;
-      continue;
-    }
-    probed += 1;
-    const { stdio, http } = splitServerKeysByKind(options.mcpJson, keys);
-    const httpReachable = /* @__PURE__ */ new Map();
-    for (const key of http) {
-      let reachable;
-      try {
-        reachable = await options.probeHttp(key);
-      } catch {
-        reachable = void 0;
-      }
-      if (reachable !== void 0) httpReachable.set(key, reachable);
-    }
-    const status = computeSessionToolBindStatus({
-      stdioServerKeys: stdio,
-      httpServerKeys: http,
-      missingStdioKeys: options.missingStdioKeys,
-      httpReachable,
-      httpSessionLoaded: options.httpSessionLoaded ?? false
-    });
-    if (status === "unknown") {
-      skipped += 1;
-      continue;
-    }
-    reports.push({ integration_id: integ.id, scope: integ.scope, status });
-  }
-  return { reports, due: due.length, probed, skipped };
-}
-
 // ../../packages/core/dist/host-config/capture.js
 import { createHash as createHash3 } from "crypto";
 var NON_SECRET_ENV_GATES = [
@@ -3430,7 +2775,7 @@ function saveChannelHashCache(source, configDir) {
 }
 
 // src/lib/channel-sweep.ts
-import { execFileSync as execFileSync3 } from "child_process";
+import { execFileSync } from "child_process";
 var CHANNEL_BASENAMES = [
   "slack-channel",
   "direct-chat-channel",
@@ -3593,7 +2938,7 @@ function resolveLiveAnchorPids(agentCodeNames) {
   for (const codeName of agentCodeNames) {
     const pids = /* @__PURE__ */ new Set();
     try {
-      const out = execFileSync3("tmux", ["list-panes", "-t", `agt-${codeName}`, "-F", "#{pane_pid}"], {
+      const out = execFileSync("tmux", ["list-panes", "-t", `agt-${codeName}`, "-F", "#{pane_pid}"], {
         encoding: "utf-8",
         timeout: 2e3,
         stdio: ["ignore", "pipe", "ignore"]
@@ -3613,7 +2958,7 @@ async function sweepChannelProcesses(opts) {
   const kill = opts.killFn ?? defaultKill;
   let psOutput = "";
   try {
-    psOutput = execFileSync3("ps", ["eww", "-o", "pid=,ppid=,etime=,command="], {
+    psOutput = execFileSync("ps", ["eww", "-o", "pid=,ppid=,etime=,command="], {
       encoding: "utf-8",
       timeout: 5e3,
       maxBuffer: 10 * 1024 * 1024
@@ -3650,7 +2995,7 @@ function defaultKillSignal(pid, signal) {
   }
 }
 function defaultPs() {
-  return execFileSync3("ps", ["eww", "-o", "pid=,ppid=,etime=,command="], {
+  return execFileSync("ps", ["eww", "-o", "pid=,ppid=,etime=,command="], {
     encoding: "utf-8",
     timeout: 5e3,
     maxBuffer: 10 * 1024 * 1024
@@ -6616,65 +5961,13 @@ async function runAgentConnectivityProbes(agent, integrations, projectDir) {
 }
 async function runAgentSessionToolBindProbes(agent, integrations, projectDir) {
   if (integrations.length === 0) return;
-  let mcpJson = null;
-  try {
-    mcpJson = JSON.parse(readFileSync14(join16(projectDir, ".mcp.json"), "utf-8"));
-  } catch {
-    return;
-  }
-  if (!mcpJson?.mcpServers || Object.keys(mcpJson.mcpServers).length === 0) return;
-  const isolated = isolationMode(agent.code_name) === "docker";
-  let missingStdioKeys = /* @__PURE__ */ new Set();
-  try {
-    const psOutput = isolated ? syncExecFile("docker", ["exec", `agt-${agent.code_name}`, "ps", "-eo", "pid,ppid,args"], {
-      encoding: "utf-8",
-      timeout: 8e3
-    }) : syncExecFile("ps", ["-eo", "pid,ppid,args"], { encoding: "utf-8", timeout: 5e3 });
-    missingStdioKeys = new Set(
-      findMissingMcpServers({
-        rows: parsePsRows(psOutput),
-        codeName: agent.code_name,
-        mcpJson,
-        inContainer: isolated
-      })
-    );
-  } catch {
-  }
-  const probeEnv = buildProbeEnv(projectDir);
-  const probeDeps = buildConnectivityProbeDeps(projectDir, probeEnv);
-  const probeHttp = async (serverKey) => {
-    if (!probeDeps.mcpProbe) return void 0;
-    const outcome = await probeDeps.mcpProbe({ serverKey, definitionId: serverKey });
-    if (outcome.status === "ok") return true;
-    if (outcome.status === "down") return false;
-    return void 0;
-  };
-  let httpSessionLoaded = false;
-  try {
-    const sessionStartedMs = getSessionState(agent.code_name)?.startedAt ?? null;
-    const mcpMtimeMs = statSync4(join16(projectDir, ".mcp.json")).mtimeMs;
-    httpSessionLoaded = sessionStartedMs != null && sessionStartedMs >= mcpMtimeMs;
-  } catch {
-  }
   const intervalSec = Number(process.env.AGT_CONNECTIVITY_PROBE_INTERVAL_SECONDS) || 3600;
-  const result = await runSessionToolBindProbes(
-    integrations.map((i) => ({
-      id: i.id,
-      definition_id: i.definition_id,
-      scope: i.scope,
-      last_session_tool_bind_at: i.last_session_tool_bind_at ?? null,
-      // Server-key hint for managed/remote-MCP kinds; the runner also tries the
-      // raw + sanitised definition_id against the real `.mcp.json` keys.
-      mcp_server_key: deriveMcpServerKey({
-        definitionId: i.definition_id,
-        sourceType: i.source_type ?? null,
-        authType: i.auth_type,
-        connectivityTest: i.connectivity_test ?? null
-      })
-    })),
-    { mcpJson, missingStdioKeys, probeHttp, httpSessionLoaded, intervalMs: intervalSec * 1e3 }
-  );
-  if (result.reports.length > 0) {
+  const sessionStartedMs = getSessionState(agent.code_name)?.startedAt ?? null;
+  const result = await gatherSessionToolBindProbe(agent, integrations, projectDir, {
+    sessionStartedMs,
+    intervalMs: intervalSec * 1e3
+  });
+  if (result && result.reports.length > 0) {
     await api.post("/host/session-tool-bind", {
       agent_id: agent.agent_id,
       results: result.reports
@@ -6866,10 +6159,10 @@ var agentRestartTimezoneInputs = /* @__PURE__ */ new Map();
 var lastVersionCheckAt = 0;
 var VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
 var lastResponsivenessProbeAt = 0;
-var agtCliVersion = true ? "0.28.207" : "dev";
-function resolveBrewPath(execFileSync4) {
+var agtCliVersion = true ? "0.28.209" : "dev";
+function resolveBrewPath(execFileSync2) {
   try {
-    const out = execFileSync4("which", ["brew"], { timeout: 5e3 }).toString().trim();
+    const out = execFileSync2("which", ["brew"], { timeout: 5e3 }).toString().trim();
     if (out) return out;
   } catch {
   }
@@ -6883,7 +6176,7 @@ function resolveBrewPath(execFileSync4) {
   }
   return null;
 }
-function claudeBinaryInstalled(execFileSync4) {
+function claudeBinaryInstalled(execFileSync2) {
   const canonical = [
     "/home/linuxbrew/.linuxbrew/bin/claude",
     "/opt/homebrew/bin/claude",
@@ -6891,7 +6184,7 @@ function claudeBinaryInstalled(execFileSync4) {
   ];
   if (canonical.some((path) => existsSync8(path))) return true;
   try {
-    execFileSync4("which", ["claude"], { timeout: 5e3 });
+    execFileSync2("which", ["claude"], { timeout: 5e3 });
     return true;
   } catch {
     return false;
@@ -6925,9 +6218,9 @@ async function ensureToolkitCli(toolkitSlug) {
   }
   const { binary, installer, package: pkg, script } = integration.cli_tool;
   const resolvedInstaller = installer ?? "manual";
-  const { execFileSync: execFileSync4, execSync } = await import("child_process");
+  const { execFileSync: execFileSync2, execSync } = await import("child_process");
   try {
-    execFileSync4("which", [binary], { timeout: 5e3, stdio: "pipe" });
+    execFileSync2("which", [binary], { timeout: 5e3, stdio: "pipe" });
     toolkitCliEnsured.add(toolkitSlug);
     toolkitCliRetryAfter.delete(toolkitSlug);
     toolkitCliFailureCount.delete(toolkitSlug);
@@ -6948,14 +6241,14 @@ async function ensureToolkitCli(toolkitSlug) {
         return;
       }
       log(`[toolkit-install] ${toolkitSlug}: installing via npm (${pkg})\u2026`);
-      execFileSync4("npm", ["install", "-g", pkg], { timeout: 18e4, stdio: "pipe" });
+      execFileSync2("npm", ["install", "-g", pkg], { timeout: 18e4, stdio: "pipe" });
     } else if (resolvedInstaller === "brew") {
       if (!pkg) {
         log(`[toolkit-install] ${toolkitSlug}: installer=brew but no package declared`);
         toolkitCliEnsured.add(toolkitSlug);
         return;
       }
-      const brewPath = resolveBrewPath(execFileSync4);
+      const brewPath = resolveBrewPath(execFileSync2);
       if (!brewPath) {
         log(`[toolkit-install] ${toolkitSlug}: installer=brew but Homebrew not available \u2014 install manually: brew install ${pkg}`);
         toolkitCliEnsured.add(toolkitSlug);
@@ -6965,9 +6258,9 @@ async function ensureToolkitCli(toolkitSlug) {
       const isRoot = typeof process.getuid === "function" && process.getuid() === 0;
       log(`[toolkit-install] ${toolkitSlug}: installing via brew (${pkg})\u2026`);
       if (isRoot) {
-        execFileSync4("sudo", ["-u", "ec2-user", "-H", brewPath, "install", pkg], { timeout: 18e4, stdio: "pipe", cwd: "/tmp" });
+        execFileSync2("sudo", ["-u", "ec2-user", "-H", brewPath, "install", pkg], { timeout: 18e4, stdio: "pipe", cwd: "/tmp" });
       } else {
-        execFileSync4(brewPath, ["install", pkg], { timeout: 18e4, stdio: "pipe" });
+        execFileSync2(brewPath, ["install", pkg], { timeout: 18e4, stdio: "pipe" });
       }
     } else if (resolvedInstaller === "script") {
       if (!script) {
@@ -6987,7 +6280,7 @@ async function ensureToolkitCli(toolkitSlug) {
     process.env.PATH = `${brewBinDir}:${process.env.PATH ?? ""}`;
   }
   try {
-    execFileSync4("which", [binary], { timeout: 5e3, stdio: "pipe" });
+    execFileSync2("which", [binary], { timeout: 5e3, stdio: "pipe" });
     log(`[toolkit-install] ${toolkitSlug}: installed \u2014 ${binary} now on PATH`);
     toolkitCliEnsured.add(toolkitSlug);
     toolkitCliRetryAfter.delete(toolkitSlug);
@@ -7074,8 +6367,8 @@ async function ensureFrameworkBinary(frameworkId) {
   if (frameworkBinaryChecked.has(frameworkId)) return;
   frameworkBinaryChecked.add(frameworkId);
   lastManagedSettingsStatus = ensureClaudeManagedSettings();
-  const { execFileSync: execFileSync4 } = await import("child_process");
-  const brewPath = resolveBrewPath(execFileSync4);
+  const { execFileSync: execFileSync2 } = await import("child_process");
+  const brewPath = resolveBrewPath(execFileSync2);
   if (!brewPath) {
     log("Homebrew not found (no `brew` on PATH, no /home/linuxbrew/.linuxbrew/bin/brew). Cannot auto-install Claude Code. Install manually: https://claude.ai/download");
     return;
@@ -7088,7 +6381,7 @@ async function ensureFrameworkBinary(frameworkId) {
     }
     return runAsync(brewPath, args, opts);
   };
-  const claudeExists = claudeBinaryInstalled(execFileSync4);
+  const claudeExists = claudeBinaryInstalled(execFileSync2);
   if (!claudeExists) {
     log(`Claude Code binary not found \u2014 installing via Homebrew${isRoot ? " (as ec2-user via sudo)" : ""}...`);
     try {
@@ -7123,13 +6416,13 @@ async function maybeUpgradeClaudeCode() {
   }
   claudeCodeUpgradeInFlight = true;
   stampClaudeCodeUpgradeMarker();
-  const { execFileSync: execFileSync4 } = await import("child_process");
-  const brewPath = resolveBrewPath(execFileSync4);
+  const { execFileSync: execFileSync2 } = await import("child_process");
+  const brewPath = resolveBrewPath(execFileSync2);
   if (!brewPath) {
     claudeCodeUpgradeInFlight = false;
     return;
   }
-  if (!claudeBinaryInstalled(execFileSync4)) {
+  if (!claudeBinaryInstalled(execFileSync2)) {
     claudeCodeUpgradeInFlight = false;
     return;
   }
@@ -7208,18 +6501,18 @@ async function checkAndUpdateCli(opts) {
   }
 }
 async function checkAndUpdateCliViaBrew(force = false) {
-  const { execFileSync: execFileSync4 } = await import("child_process");
-  const brewPath = resolveBrewPath(execFileSync4);
+  const { execFileSync: execFileSync2 } = await import("child_process");
+  const brewPath = resolveBrewPath(execFileSync2);
   if (!brewPath) return "noop";
   let metadataFresh = true;
   try {
-    execFileSync4(brewPath, ["update", "--quiet"], { timeout: 6e4, stdio: "pipe" });
+    execFileSync2(brewPath, ["update", "--quiet"], { timeout: 6e4, stdio: "pipe" });
   } catch (err) {
     metadataFresh = false;
     log(`[self-update] brew update failed (continuing with stale cache): ${err.message}`);
   }
   try {
-    const outdated = execFileSync4(brewPath, ["outdated", "--json=v2"], {
+    const outdated = execFileSync2(brewPath, ["outdated", "--json=v2"], {
       timeout: 3e4,
       encoding: "utf-8"
     });
@@ -7252,7 +6545,7 @@ async function checkAndUpdateCliViaBrew(force = false) {
       }
       log(`[self-update] agt CLI update available: ${installed} \u2192 ${latest}. Upgrading via brew${force ? " (forced \u2014 Update CLI now)" : ""}...`);
       try {
-        execFileSync4(brewPath, ["upgrade", "integrity-labs/tap/agt"], {
+        execFileSync2(brewPath, ["upgrade", "integrity-labs/tap/agt"], {
           timeout: 12e4,
           stdio: "pipe"
         });
@@ -7371,7 +6664,7 @@ async function fetchUrgentDistTagVersion() {
   }
 }
 async function installAgtCliViaNpm(version, reasonLabel) {
-  const { execFileSync: execFileSync4 } = await import("child_process");
+  const { execFileSync: execFileSync2 } = await import("child_process");
   const isRoot = typeof process.getuid === "function" && process.getuid() === 0;
   const cmd = isRoot ? "npm" : "sudo";
   const installArgs = [
@@ -7382,14 +6675,14 @@ async function installAgtCliViaNpm(version, reasonLabel) {
   ];
   const args = isRoot ? installArgs : ["-n", "npm", ...installArgs];
   try {
-    execFileSync4(cmd, args, { timeout: 18e4, stdio: "pipe" });
+    execFileSync2(cmd, args, { timeout: 18e4, stdio: "pipe" });
   } catch (err) {
     log(`[self-update] npm upgrade failed: ${err.message}`);
     return "failed";
   }
   let smokeOk = false;
   try {
-    const out = execFileSync4("agt", ["--version"], { timeout: 15e3, stdio: "pipe" }).toString();
+    const out = execFileSync2("agt", ["--version"], { timeout: 15e3, stdio: "pipe" }).toString();
     smokeOk = isAgtVersionSmokeOk(out, version);
     if (!smokeOk) {
       log(
@@ -7775,7 +7068,7 @@ async function pollCycle() {
     }
     try {
       const { detectHostSecurity } = await import("../host-security-6PDFG7F5.js");
-      const { collectDiagnostics } = await import("../persistent-session-6662WBSH.js");
+      const { collectDiagnostics } = await import("../persistent-session-Z46SCCQM.js");
       const diagCodeNames = [...agentState.persistentSessionAgents];
       const agentDiagnostics = diagCodeNames.length > 0 ? collectDiagnostics(diagCodeNames) : void 0;
       let tailscaleHostname;
@@ -7923,7 +7216,7 @@ async function pollCycle() {
       const {
         collectResponsivenessProbes,
         getResponsivenessIntervalMs
-      } = await import("../responsiveness-probe-TOLTTG6I.js");
+      } = await import("../responsiveness-probe-4MUX7FBH.js");
       const probeIntervalMs = getResponsivenessIntervalMs();
       if (now - lastResponsivenessProbeAt > probeIntervalMs) {
         const probeCodeNames = [...agentState.persistentSessionAgents];
@@ -7955,7 +7248,7 @@ async function pollCycle() {
           collectResponsivenessProbes,
           livePendingInboundOldestAgeSeconds,
           parkPendingInbound
-        } = await import("../responsiveness-probe-TOLTTG6I.js");
+        } = await import("../responsiveness-probe-4MUX7FBH.js");
         const { getProjectDir: wedgeProjectDir } = await import("../claude-scheduler-FATCLHDM.js");
         const wedgeNow = /* @__PURE__ */ new Date();
         const liveAgents = agentState.persistentSessionAgents;
@@ -9283,7 +8576,7 @@ async function processAgent(agent, agentStates) {
   }
   try {
     const integrationsData = await api.post("/host/agent-integrations", { agent_id: agent.agent_id });
-    const integrations = integrationsData.integrations ?? [];
+    const integrations = (integrationsData.integrations ?? []).map(withResolvedRemoteMcp);
     for (const integration of integrations) {
       if (integration.auth_type !== "oauth2") continue;
       const expiresAt = integration.credentials?.token_expires_at;
@@ -10982,7 +10275,7 @@ async function processClaudePairSessions(agents) {
     killPairSession,
     pairTmuxSession,
     finalizeClaudePairOnboarding
-  } = await import("../claude-pair-runtime-Q4Q2OTTV.js");
+  } = await import("../claude-pair-runtime-UUTPSE2V.js");
   for (const pairId of pendingResp.cancelled_pair_ids ?? []) {
     log(`[claude-pair] sweeping orphan tmux session for pair ${pairId.slice(0, 8)}`);
     const killed = await killPairSession(pairTmuxSession(pairId));