@integrity-labs/agt-cli 0.28.21 → 0.28.22

package/dist/{claude-pair-runtime-LQJ5E4IF.js → claude-pair-runtime-UKOL6GWJ.js}

@@ -100,7 +100,7 @@ async function spawnPairSession(session) {
     return { ok: true };
   } catch {
   }
-  const { resolveClaudeBinary } = await import("./persistent-session-5BEMWOTM.js");
+  const { resolveClaudeBinary } = await import("./persistent-session-34CY65FC.js");
   const claudeBin = resolveClaudeBinary();
   const pairEnv = {
     ...process.env,
@@ -373,4 +373,4 @@ export {
   startClaudePair,
   submitClaudePairCode
 };
-//# sourceMappingURL=claude-pair-runtime-LQJ5E4IF.js.map
+//# sourceMappingURL=claude-pair-runtime-UKOL6GWJ.js.map

package/dist/lib/manager-worker.js

@@ -22,7 +22,7 @@ import {
   provisionStopHook,
   requireHost,
   safeWriteJsonAtomic
-} from "../chunk-NGZVHSI3.js";
+} from "../chunk-O2QKTUOE.js";
 import {
   getProjectDir as getProjectDir2,
   getReadyTasks,
@@ -64,7 +64,7 @@ import {
   takeWatchdogGiveUpCount,
   takeZombieDetection,
   transcriptActivityAgeSeconds
-} from "../chunk-BKO5PJZ7.js";
+} from "../chunk-IHPN6AX7.js";
 import {
   FLAGS_SCHEMA_VERSION,
   KANBAN_CHECK_COMMAND,
@@ -89,6 +89,7 @@ import {
   probeComposioAccount,
   probeComposioMcpToolCall,
   probeHttpProvider,
+  probeMcpHttp,
   resolveAvatarEnvUrl,
   resolveChannels,
   resolveConnectivityProbe,
@@ -96,7 +97,7 @@ import {
   sumTranscriptUsageInWindow,
   worseConnectivityOutcome,
   wrapScheduledTaskPrompt
-} from "../chunk-3HZSMDEW.js";
+} from "../chunk-SN2G4B2Z.js";
 import {
   parsePsRows,
   reapOrphanChannelMcps
@@ -1303,111 +1304,11 @@ async function runConnectivityProbes(integrations, options = {}) {
   return { reports, due: due.length, probed: batch.length, skipped };
 }
 
-// src/lib/mcp-probe-client.ts
-var MCP_ACCEPT = "application/json, text/event-stream";
-var DEFAULT_TIMEOUT_MS = 1e4;
-async function parseRpc(res, expectedId) {
-  const ct = res.headers.get("content-type") ?? "";
-  if (ct.includes("text/event-stream")) {
-    const text = await res.text();
-    let dataLines = [];
-    for (const rawLine of text.split(/\r?\n/)) {
-      if (rawLine.startsWith("data:")) {
-        dataLines.push(rawLine.slice(5).trimStart());
-        continue;
-      }
-      if (rawLine === "" && dataLines.length > 0) {
-        try {
-          const msg2 = JSON.parse(dataLines.join("\n"));
-          if (("result" in msg2 || "error" in msg2) && msg2["id"] === expectedId) return msg2;
-        } catch {
-        }
-        dataLines = [];
-      }
-    }
-    return null;
-  }
-  const msg = await res.json().catch(() => null);
-  if (msg && ("result" in msg || "error" in msg) && msg["id"] === expectedId) return msg;
-  return msg;
-}
-function httpStatusOutcome(status, step) {
-  if (status === 401 || status === 403) {
-    return { status: "down", message: `MCP ${step} unauthorized (${status}) \u2014 reconnect required` };
-  }
-  if (status >= 500) {
-    return { status: "transient_error", message: `MCP ${step} returned ${status}` };
-  }
-  return { status: "down", message: `MCP ${step} returned ${status}` };
-}
-async function probeMcpHttp(config2, fetchImpl = fetch) {
-  const timeoutMs = config2.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  const baseHeaders = {
-    ...config2.headers ?? {},
-    "Content-Type": "application/json",
-    Accept: MCP_ACCEPT
-  };
-  try {
-    const initRes = await fetchImpl(config2.url, {
-      method: "POST",
-      headers: baseHeaders,
-      body: JSON.stringify({
-        jsonrpc: "2.0",
-        id: 1,
-        method: "initialize",
-        params: {
-          protocolVersion: "2025-03-26",
-          capabilities: {},
-          clientInfo: { name: "augmented-connectivity-probe", version: "1.0.0" }
-        }
-      }),
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-    if (!initRes.ok) return httpStatusOutcome(initRes.status, "initialize");
-    const sessionId = initRes.headers.get("mcp-session-id");
-    await parseRpc(initRes, 1);
-    const sessionHeaders = { ...baseHeaders, ...sessionId ? { "Mcp-Session-Id": sessionId } : {} };
-    const initializedRes = await fetchImpl(config2.url, {
-      method: "POST",
-      headers: sessionHeaders,
-      body: JSON.stringify({ jsonrpc: "2.0", method: "notifications/initialized" }),
-      signal: AbortSignal.timeout(5e3)
-    });
-    if (!initializedRes.ok) return httpStatusOutcome(initializedRes.status, "initialized");
-    await initializedRes.text().catch(() => "");
-    const listRes = await fetchImpl(config2.url, {
-      method: "POST",
-      headers: sessionHeaders,
-      body: JSON.stringify({ jsonrpc: "2.0", id: 2, method: "tools/list" }),
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-    if (!listRes.ok) return httpStatusOutcome(listRes.status, "tools/list");
-    const rpc = await parseRpc(listRes, 2);
-    if (rpc && "error" in rpc) {
-      const err = rpc["error"];
-      return { status: "down", message: `MCP tools/list error: ${err?.message ?? "unknown"}` };
-    }
-    const result = rpc?.["result"];
-    const toolCount = Array.isArray(result?.tools) ? result.tools.length : void 0;
-    return {
-      status: "ok",
-      message: toolCount !== void 0 ? `${toolCount} tools` : "reachable",
-      ...toolCount !== void 0 ? { details: { toolCount } } : {}
-    };
-  } catch (err) {
-    const isAbort = err?.name === "TimeoutError" || err?.name === "AbortError";
-    return {
-      status: "transient_error",
-      message: isAbort ? `MCP handshake timed out after ${timeoutMs / 1e3}s` : `MCP handshake failed: ${err.message}`
-    };
-  }
-}
-
 // src/lib/cli-probe.ts
 import { execFile } from "child_process";
-var DEFAULT_TIMEOUT_MS2 = 8e3;
+var DEFAULT_TIMEOUT_MS = 8e3;
 function runCliProbe(binary, args, opts = {}) {
-  const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
+  const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   return new Promise((resolve) => {
     execFile(
       binary,
@@ -5143,6 +5044,16 @@ function readMcpHttpServerConfig(projectDir, serverKey, env) {
     return null;
   }
 }
+function deriveMcpServerKey(input) {
+  const kind = resolveConnectivityProbe({
+    definitionId: input.definitionId,
+    sourceType: input.sourceType,
+    authType: input.authType,
+    connectivityTest: input.connectivityTest ?? null
+  }).kind;
+  if (kind !== "mcp_tools_list" && kind !== "managed_composite") return void 0;
+  return input.definitionId.replace(/[^a-z0-9]/gi, "_").toLowerCase();
+}
 async function runAgentConnectivityProbes(agent, integrations, projectDir) {
   if (integrations.length === 0) return;
   const probeEnv = { ...process.env };
@@ -5219,24 +5130,31 @@ async function runAgentConnectivityProbes(agent, integrations, projectDir) {
   };
   const intervalSec = Number(process.env.AGT_CONNECTIVITY_PROBE_INTERVAL_SECONDS) || 3600;
   const result = await runConnectivityProbes(
-    integrations.map((i) => ({
-      id: i.id,
-      definition_id: i.definition_id,
-      scope: i.scope,
-      auth_type: i.auth_type,
-      source_type: i.source_type ?? null,
-      credentials: i.credentials,
-      last_connectivity_check_at: i.last_connectivity_check_at ?? null,
-      // ENG-5665: for managed (Composio) + mcp_server toolkits the connectivity
-      // probe is an MCP `tools/list` against the agent's wired server. Derive the
-      // .mcp.json server key the same way the managed-toolkit writer does
-      // (definition_id === toolkit_id, sanitised: non-alnum → '_', lowercased —
-      // e.g. 'composio_outlook'). The executor looks this up in .mcp.json; an
-      // unresolvable key degrades to transient_error, never a false 'down'.
-      mcp_server_key: i.source_type === "managed" || i.source_type === "mcp_server" ? i.definition_id.replace(/[^a-z0-9]/gi, "_").toLowerCase() : void 0,
-      // ENG-6242: forward the prescribed connectivity-test tool to the executor.
-      connectivity_test: i.connectivity_test ?? null
-    })),
+    integrations.map((i) => {
+      const sourceType = i.source_type ?? null;
+      return {
+        id: i.id,
+        definition_id: i.definition_id,
+        scope: i.scope,
+        auth_type: i.auth_type,
+        source_type: sourceType,
+        credentials: i.credentials,
+        last_connectivity_check_at: i.last_connectivity_check_at ?? null,
+        // ENG-5665 / ENG-6396: for any integration whose probe is an MCP
+        // `tools/list` against the agent's wired server (managed/Composio,
+        // mcp_server, or a remote-MCP OAuth provider like granola), derive the
+        // .mcp.json server key. The executor looks this up in .mcp.json; an
+        // unresolvable key degrades to transient_error, never a false 'down'.
+        mcp_server_key: deriveMcpServerKey({
+          definitionId: i.definition_id,
+          sourceType,
+          authType: i.auth_type,
+          connectivityTest: i.connectivity_test ?? null
+        }),
+        // ENG-6242: forward the prescribed connectivity-test tool to the executor.
+        connectivity_test: i.connectivity_test ?? null
+      };
+    }),
     { probeDeps, intervalMs: intervalSec * 1e3 }
   );
   if (result.reports.length > 0) {
@@ -5429,7 +5347,7 @@ var cachedMaintenanceWindow = null;
 var lastVersionCheckAt = 0;
 var VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
 var lastResponsivenessProbeAt = 0;
-var agtCliVersion = true ? "0.28.21" : "dev";
+var agtCliVersion = true ? "0.28.22" : "dev";
 function resolveBrewPath(execFileSync4) {
   try {
     const out = execFileSync4("which", ["brew"], { timeout: 5e3 }).toString().trim();
@@ -6538,7 +6456,7 @@ async function pollCycle() {
     }
     try {
       const { detectHostSecurity } = await import("../host-security-6PDFG7F5.js");
-      const { collectDiagnostics } = await import("../persistent-session-5BEMWOTM.js");
+      const { collectDiagnostics } = await import("../persistent-session-34CY65FC.js");
       const diagCodeNames = [...agentState.persistentSessionAgents];
       const agentDiagnostics = diagCodeNames.length > 0 ? collectDiagnostics(diagCodeNames) : void 0;
       let tailscaleHostname;
@@ -6632,7 +6550,7 @@ async function pollCycle() {
       const {
         collectResponsivenessProbes,
         getResponsivenessIntervalMs
-      } = await import("../responsiveness-probe-JP4HLFYU.js");
+      } = await import("../responsiveness-probe-KKWPOZSX.js");
       const probeIntervalMs = getResponsivenessIntervalMs();
       if (now - lastResponsivenessProbeAt > probeIntervalMs) {
         const probeCodeNames = [...agentState.persistentSessionAgents];
@@ -6664,7 +6582,7 @@ async function pollCycle() {
           collectResponsivenessProbes,
           livePendingInboundOldestAgeSeconds,
           parkPendingInbound
-        } = await import("../responsiveness-probe-JP4HLFYU.js");
+        } = await import("../responsiveness-probe-KKWPOZSX.js");
         const { getProjectDir: wedgeProjectDir } = await import("../claude-scheduler-FATCLHDM.js");
         const wedgeNow = /* @__PURE__ */ new Date();
         const liveAgents = agentState.persistentSessionAgents;
@@ -11255,7 +11173,7 @@ async function processClaudePairSessions(agents) {
     killPairSession,
     pairTmuxSession,
     finalizeClaudePairOnboarding
-  } = await import("../claude-pair-runtime-LQJ5E4IF.js");
+  } = await import("../claude-pair-runtime-UKOL6GWJ.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));
@@ -12199,6 +12117,7 @@ export {
   claudeManagedSettingsPath,
   deliverScheduledCardResult,
   deliverScheduledTaskOutput,
+  deriveMcpServerKey,
   deriveScheduledTaskNotify,
   ensureClaudeManagedSettings,
   extractCharterSlackPeers,