@integrity-labs/agt-cli 0.28.496 → 0.28.498

package/dist/bin/agt.js

@@ -40,7 +40,7 @@ import {
   success,
   table,
   warn
-} from "../chunk-DZSS6TA3.js";
+} from "../chunk-F6SYBDTF.js";
 import {
   AnchorSessionClient,
   CHANNEL_REGISTRY,
@@ -71,7 +71,7 @@ import {
   requiredMcpWildcard,
   resolveChannels,
   serializeManifestForSlackCli
-} from "../chunk-JWR5FP7S.js";
+} from "../chunk-WRII2Q5W.js";
 import "../chunk-XWVM4KPK.js";
 
 // src/bin/agt.ts
@@ -4830,7 +4830,7 @@ import { execFileSync, execSync } from "child_process";
 import { existsSync as existsSync10, realpathSync as realpathSync2 } from "fs";
 import chalk18 from "chalk";
 import ora16 from "ora";
-var cliVersion = true ? "0.28.496" : "dev";
+var cliVersion = true ? "0.28.498" : "dev";
 async function fetchLatestVersion() {
   const host2 = getHost();
   if (!host2) return null;
@@ -6002,7 +6002,7 @@ function handleError(err) {
 }
 
 // src/bin/agt.ts
-var cliVersion2 = true ? "0.28.496" : "dev";
+var cliVersion2 = true ? "0.28.498" : "dev";
 var program = new Command();
 program.name("agt").description("Augmented CLI \u2014 agent provisioning and management").version(cliVersion2).option("--json", "Emit machine-readable JSON output (suppress spinners and colors)").option("--skip-update-check", "Skip the automatic update check on startup");
 program.hook("preAction", async (thisCommand, actionCommand) => {

package/dist/{chunk-DZSS6TA3.js → chunk-F6SYBDTF.js}

@@ -19,6 +19,7 @@ import {
   getFlagDefinition,
   getFramework,
   handshakeToolsListOutcome,
+  isDefaultRemoteMcpConnection,
   isolationMode,
   listFlagDefinitions,
   mcpWildcardsForServers,
@@ -30,11 +31,14 @@ import {
   probeMcpHttp,
   readRemoteMcpAuthConfig,
   registerFramework,
+  remoteMcpConnectionScopedEnvVar,
+  remoteMcpEnvPrefix,
+  remoteMcpServerKey,
   resolveAvatarEnvUrl,
   resolveConnectivityProbe,
   worseConnectivityOutcome,
   wrapScheduledTaskPrompt
-} from "./chunk-JWR5FP7S.js";
+} from "./chunk-WRII2Q5W.js";
 import {
   parsePsRows
 } from "./chunk-XWVM4KPK.js";
@@ -3205,19 +3209,21 @@ function buildMcpJson(input) {
     tokenFile: join2(getProjectDir(input.agent.code_name), ".env.integrations")
   };
   for (const integration of input.integrations ?? []) {
-    const liveEntry = buildLiveHeaderRemoteMcpProxyEntry(integration.definition_id, integration.remoteMcp, remoteOAuthProxyPaths);
+    const connectionKey = integration.connection_key;
+    const serverKey = remoteMcpServerKey(integration.definition_id, connectionKey);
+    const liveEntry = buildLiveHeaderRemoteMcpProxyEntry(integration.definition_id, integration.remoteMcp, remoteOAuthProxyPaths, connectionKey);
     if (liveEntry) {
-      mcpServers[integration.definition_id] = liveEntry;
+      mcpServers[serverKey] = liveEntry;
       continue;
     }
-    const proxyEntry = buildOAuthRemoteMcpProxyEntry(integration.definition_id, remoteOAuthProxyPaths);
+    const proxyEntry = buildOAuthRemoteMcpProxyEntry(integration.definition_id, remoteOAuthProxyPaths, connectionKey);
     if (proxyEntry) {
-      mcpServers[integration.definition_id] = proxyEntry;
+      mcpServers[serverKey] = proxyEntry;
       continue;
     }
-    const entry = buildRemoteMcpEntry(integration.definition_id, integration.remoteMcp);
+    const entry = buildRemoteMcpEntry(integration.definition_id, integration.remoteMcp, connectionKey);
     if (entry) {
-      mcpServers[integration.definition_id] = entry;
+      mcpServers[serverKey] = entry;
     }
   }
   const hasCloudBroker = input.integrations?.some((i) => i.definition_id === "cloud-broker");
@@ -4295,7 +4301,8 @@ ${sections}`
     }));
     const envUpdates = {};
     for (const integration of decryptedIntegrations) {
-      const prefix = integration.definition_id.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+      const prefix = remoteMcpEnvPrefix(integration.definition_id, integration.connection_key);
+      const unscopedPrefix = remoteMcpEnvPrefix(integration.definition_id, null);
       const creds = integration.credentials;
       const def = INTEGRATION_REGISTRY.find((d) => d.id === integration.definition_id);
       let token;
@@ -4328,8 +4335,8 @@ ${sections}`
         for (const [key, value] of Object.entries(config)) {
           if (typeof value === "string" && value) {
             const upperKey = key.toUpperCase();
-            const envKey = upperKey.startsWith(`${prefix}_`) ? upperKey : `${prefix}_${upperKey}`;
-            envUpdates[envKey] = value;
+            const stripped = upperKey.startsWith(`${unscopedPrefix}_`) ? upperKey.slice(unscopedPrefix.length + 1) : upperKey;
+            envUpdates[`${prefix}_${stripped}`] = value;
           }
         }
       }
@@ -4339,9 +4346,10 @@ ${sections}`
       if (!defaults)
         continue;
       for (const [key, value] of Object.entries(defaults)) {
-        if (key in envUpdates)
+        const scoped = remoteMcpConnectionScopedEnvVar(integration.definition_id, key, integration.connection_key);
+        if (scoped in envUpdates)
           continue;
-        envUpdates[key] = value;
+        envUpdates[scoped] = value;
       }
     }
     writeEnvIntegrationsForAgent(codeName, {
@@ -4402,19 +4410,21 @@ ${sections}`
       tokenFile: join2(getProjectDir(codeName), ".env.integrations")
     };
     for (const integration of integrations) {
-      const liveEntry = buildLiveHeaderRemoteMcpProxyEntry(integration.definition_id, integration.remoteMcp, remoteOAuthProxyPaths);
+      const connectionKey = integration.connection_key;
+      const serverKey = remoteMcpServerKey(integration.definition_id, connectionKey);
+      const liveEntry = buildLiveHeaderRemoteMcpProxyEntry(integration.definition_id, integration.remoteMcp, remoteOAuthProxyPaths, connectionKey);
       if (liveEntry) {
-        this.writeMcpServer(codeName, integration.definition_id, liveEntry);
+        this.writeMcpServer(codeName, serverKey, liveEntry);
         continue;
       }
-      const proxyEntry = buildOAuthRemoteMcpProxyEntry(integration.definition_id, remoteOAuthProxyPaths);
+      const proxyEntry = buildOAuthRemoteMcpProxyEntry(integration.definition_id, remoteOAuthProxyPaths, connectionKey);
       if (proxyEntry) {
-        this.writeMcpServer(codeName, integration.definition_id, proxyEntry);
+        this.writeMcpServer(codeName, serverKey, proxyEntry);
         continue;
       }
-      const entry = buildRemoteMcpEntry(integration.definition_id, integration.remoteMcp);
+      const entry = buildRemoteMcpEntry(integration.definition_id, integration.remoteMcp, connectionKey);
       if (entry) {
-        this.writeMcpServer(codeName, integration.definition_id, entry);
+        this.writeMcpServer(codeName, serverKey, entry);
       }
     }
     const hasCloudBroker = integrations.some((i) => i.definition_id === "cloud-broker");
@@ -4539,6 +4549,21 @@ ${sections}`
         ...registryRemoteMcpKeys,
         ...Object.entries(OAUTH_PROVIDERS).filter(([, provider]) => Boolean(provider.mcpUrl)).map(([id]) => id)
       ]);
+      const remoteCapableBases = new Set([
+        ...registryRemoteMcpKeys,
+        ...Object.entries(OAUTH_PROVIDERS).filter(([, provider]) => Boolean(provider.mcpUrl)).map(([id]) => id)
+      ].map((id) => id.replace(/[^a-z0-9]/gi, "_").toLowerCase()));
+      try {
+        for (const declared of Object.keys(this.readMcpServers?.(codeName) ?? {})) {
+          const hyphen = declared.indexOf("-");
+          if (hyphen <= 0)
+            continue;
+          if (remoteCapableBases.has(declared.slice(0, hyphen))) {
+            integrationDerivedKeys.add(declared);
+          }
+        }
+      } catch {
+      }
       const expectedKeys = /* @__PURE__ */ new Set();
       if (xeroIntegration)
         expectedKeys.add("xero");
@@ -4559,8 +4584,14 @@ ${sections}`
         if (def?.nativeMcp) {
           expectedKeys.add(def.nativeMcp.key ?? integration.definition_id);
         }
-        if (buildRemoteMcpEntry(integration.definition_id, integration.remoteMcp)) {
-          expectedKeys.add(integration.definition_id);
+        let remoteEntry = null;
+        try {
+          remoteEntry = buildRemoteMcpEntry(integration.definition_id, integration.remoteMcp, integration.connection_key);
+        } catch {
+          remoteEntry = null;
+        }
+        if (remoteEntry) {
+          expectedKeys.add(remoteMcpServerKey(integration.definition_id, integration.connection_key));
         }
       }
       for (const key of integrationDerivedKeys) {
@@ -5026,7 +5057,7 @@ function exchangeFailureKind(err) {
 }
 
 // src/lib/api-client.ts
-var agtCliVersion = true ? "0.28.496" : "dev";
+var agtCliVersion = true ? "0.28.498" : "dev";
 var lastConfigHash = null;
 function setConfigHash(hash) {
   lastConfigHash = hash && hash.length > 0 ? hash : null;
@@ -6793,8 +6824,8 @@ function deriveMcpServerKey(input) {
   }).kind;
   if (kind !== "mcp_tools_list" && kind !== "managed_composite") return void 0;
   const base = input.definitionId.replace(/[^a-z0-9]/gi, "_").toLowerCase();
-  const key = input.connectionKey;
-  return !key || key === "default" ? base : `${base}-${key}`;
+  if (isDefaultRemoteMcpConnection(input.connectionKey)) return base;
+  return remoteMcpServerKey(input.definitionId, input.connectionKey);
 }
 function buildProbeEnv(projectDir) {
   const probeEnv = { ...process.env };
@@ -7840,4 +7871,4 @@ export {
   managerInstallSystemUnitCommand,
   managerUninstallSystemUnitCommand
 };
-//# sourceMappingURL=chunk-DZSS6TA3.js.map
+//# sourceMappingURL=chunk-F6SYBDTF.js.map