@integrity-labs/agt-cli 0.27.66 → 0.27.68

package/dist/{chunk-CF3SEPE3.js → chunk-DA3KY3D2.js}

@@ -1,7 +1,7 @@
 import {
   claudeModelAlias,
   isClaudeFastMode
-} from "./chunk-PM3CC2SJ.js";
+} from "./chunk-KPD5KJY7.js";
 import {
   reapOrphanChannelMcps
 } from "./chunk-XWVM4KPK.js";
@@ -10,7 +10,7 @@ import {
 import { spawn, execSync, execFileSync as execFileSync2 } from "child_process";
 import { join as join2, dirname } from "path";
 import { homedir as homedir2, platform, userInfo } from "os";
-import { existsSync as existsSync2, readFileSync as readFileSync3, readdirSync, writeFileSync as writeFileSync3, appendFileSync, mkdirSync as mkdirSync2, chmodSync, copyFileSync, rmSync } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync4, readdirSync, writeFileSync as writeFileSync3, appendFileSync, mkdirSync as mkdirSync2, chmodSync, copyFileSync, rmSync } from "fs";
 import { fileURLToPath } from "url";
 
 // src/lib/mcp-sanitize.ts
@@ -62,12 +62,84 @@ function buildAllowedTools(mcpServerNames) {
   return [...mcpPatterns, ...BASE_TOOLS].join(",");
 }
 
+// src/lib/mcp-env-probe.ts
+import { existsSync, readFileSync as readFileSync2 } from "fs";
+var LATE_BOUND_VARS = /* @__PURE__ */ new Set(["AGT_RUN_ID"]);
+var TEMPLATE_VAR_RE = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
+function collectVarsFromValue(value, into) {
+  if (typeof value === "string") {
+    for (const m of value.matchAll(TEMPLATE_VAR_RE)) into.add(m[1]);
+  } else if (Array.isArray(value)) {
+    for (const v of value) collectVarsFromValue(v, into);
+  }
+}
+function findMissingSubstitutionVars(mcpConfig, env) {
+  const findings = [];
+  if (typeof mcpConfig !== "object" || mcpConfig === null) return findings;
+  const servers = mcpConfig.mcpServers;
+  if (typeof servers !== "object" || servers === null) return findings;
+  for (const [server, raw] of Object.entries(servers)) {
+    if (typeof raw !== "object" || raw === null) continue;
+    const entry = raw;
+    const vars = /* @__PURE__ */ new Set();
+    collectVarsFromValue(entry["command"], vars);
+    collectVarsFromValue(entry["args"], vars);
+    collectVarsFromValue(entry["url"], vars);
+    for (const block of [entry["env"], entry["headers"]]) {
+      if (typeof block !== "object" || block === null) continue;
+      for (const v of Object.values(block)) collectVarsFromValue(v, vars);
+    }
+    for (const varName of vars) {
+      if (LATE_BOUND_VARS.has(varName)) continue;
+      const value = env[varName];
+      if (value === void 0) {
+        findings.push({ varName, server, state: "unset" });
+      } else if (value.trim() === "") {
+        findings.push({ varName, server, state: "empty" });
+      }
+    }
+  }
+  return findings;
+}
+function formatMissingVar(f) {
+  return `[mcp-env-substitution] missing var=${f.varName} server=${f.server} state=${f.state}`;
+}
+function parseEnvIntegrations(content) {
+  const out = {};
+  for (const line of content.split("\n")) {
+    if (!line || line.startsWith("#") || !line.includes("=")) continue;
+    const eqIdx = line.indexOf("=");
+    const key = line.slice(0, eqIdx);
+    let value = line.slice(eqIdx + 1);
+    if (value.length >= 2 && value.startsWith("'") && value.endsWith("'")) {
+      value = value.slice(1, -1).replaceAll("'\\''", "'");
+    }
+    out[key] = value;
+  }
+  return out;
+}
+function probeMcpEnvSubstitution(args) {
+  try {
+    const config = JSON.parse(readFileSync2(args.mcpConfigPath, "utf-8"));
+    let env = args.baseEnv;
+    if (args.envIntegrationsPath && existsSync(args.envIntegrationsPath)) {
+      env = {
+        ...args.baseEnv,
+        ...parseEnvIntegrations(readFileSync2(args.envIntegrationsPath, "utf-8"))
+      };
+    }
+    return findMissingSubstitutionVars(config, env);
+  } catch {
+    return [];
+  }
+}
+
 // src/lib/persistent-session.ts
 import { randomUUID as randomUUID2 } from "crypto";
 
 // src/lib/daily-session.ts
 import { randomUUID } from "crypto";
-import { existsSync, mkdirSync, readFileSync as readFileSync2, renameSync, statSync, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync3, renameSync, statSync, writeFileSync as writeFileSync2 } from "fs";
 import { homedir } from "os";
 import { join } from "path";
 var HISTORY_DAYS = 7;
@@ -97,9 +169,9 @@ function todayLocalIso(now = /* @__PURE__ */ new Date(), timezone) {
 }
 function readFile(codeName) {
   const path = dailySessionPath(codeName);
-  if (!existsSync(path)) return { current: null, history: [] };
+  if (!existsSync2(path)) return { current: null, history: [] };
   try {
-    const raw = readFileSync2(path, "utf-8");
+    const raw = readFileSync3(path, "utf-8");
     const parsed = JSON.parse(raw);
     return {
       current: parsed.current ?? null,
@@ -168,7 +240,7 @@ function sessionFilePath(projectDir, sessionId) {
 }
 function isAgentIdle(projectDir, sessionId, idleSeconds = 60, now = /* @__PURE__ */ new Date()) {
   const path = sessionFilePath(projectDir, sessionId);
-  if (!existsSync(path)) return true;
+  if (!existsSync2(path)) return true;
   try {
     const mtimeMs = statSync(path).mtimeMs;
     return now.getTime() - mtimeMs >= idleSeconds * 1e3;
@@ -212,7 +284,7 @@ function syncClaudeCredsToRoot() {
   if (platform() !== "linux") return true;
   if (typeof process.getuid !== "function" || process.getuid() !== 0) return true;
   for (const filename of [".credentials.json", "credentials.json"]) {
-    if (existsSync2(join2("/root/.claude", filename))) return true;
+    if (existsSync3(join2("/root/.claude", filename))) return true;
   }
   let sourcePath = null;
   try {
@@ -221,7 +293,7 @@ function syncClaudeCredsToRoot() {
       if (!entry.isDirectory()) continue;
       for (const filename of [".credentials.json", "credentials.json"]) {
         const candidate = join2("/home", entry.name, ".claude", filename);
-        if (existsSync2(candidate)) {
+        if (existsSync3(candidate)) {
           sourcePath = candidate;
           break outer;
         }
@@ -234,7 +306,7 @@ function syncClaudeCredsToRoot() {
   const sourceFilename = sourcePath.endsWith("credentials.json") && !sourcePath.endsWith(".credentials.json") ? "credentials.json" : ".credentials.json";
   const targetPath = join2(targetDir, sourceFilename);
   try {
-    if (!existsSync2(targetDir)) mkdirSync2(targetDir, { recursive: true, mode: 448 });
+    if (!existsSync3(targetDir)) mkdirSync2(targetDir, { recursive: true, mode: 448 });
     copyFileSync(sourcePath, targetPath);
     chmodSync(targetPath, 384);
     return true;
@@ -246,13 +318,13 @@ var cachedClaudePath = null;
 function resolveClaudeBinary() {
   if (cachedClaudePath) return cachedClaudePath;
   const override = process.env.CLAUDE_PATH;
-  if (override && existsSync2(override)) {
+  if (override && existsSync3(override)) {
     cachedClaudePath = override;
     return override;
   }
   try {
     const out = execSync("which claude 2>/dev/null", { encoding: "utf-8" }).trim();
-    if (out && existsSync2(out)) {
+    if (out && existsSync3(out)) {
       cachedClaudePath = out;
       return out;
     }
@@ -264,7 +336,7 @@ function resolveClaudeBinary() {
     "/usr/local/bin/claude"
   ];
   for (const p of candidates) {
-    if (existsSync2(p)) {
+    if (existsSync3(p)) {
       cachedClaudePath = p;
       return p;
     }
@@ -282,7 +354,7 @@ function writePersistentClaudeWrapper(args) {
     // --dangerously-skip-permissions on dedicated EC2 hosts.
     "export IS_SANDBOX=1"
   ];
-  if (existsSync2(envIntegrationsPath)) {
+  if (existsSync3(envIntegrationsPath)) {
     wrapperLines.push(
       "set -a",
       `source ${JSON.stringify(envIntegrationsPath)}`,
@@ -299,9 +371,9 @@ function writePersistentClaudeWrapper(args) {
   return wrapperPath;
 }
 function collectMcpServerNames(mcpConfigPath) {
-  if (!existsSync2(mcpConfigPath)) return [];
+  if (!existsSync3(mcpConfigPath)) return [];
   try {
-    const data = JSON.parse(readFileSync3(mcpConfigPath, "utf-8"));
+    const data = JSON.parse(readFileSync4(mcpConfigPath, "utf-8"));
     const servers = data.mcpServers;
     return servers ? Object.keys(servers) : [];
   } catch {
@@ -315,7 +387,7 @@ function getAcpxBin() {
   let dir = moduleDir;
   for (let i = 0; i < 6; i++) {
     const candidate = join2(dir, "node_modules", ".bin", "acpx");
-    if (existsSync2(candidate)) {
+    if (existsSync3(candidate)) {
       _acpxBin = candidate;
       return _acpxBin;
     }
@@ -379,9 +451,9 @@ function setupPaneLog(tmuxSession, codeName, log) {
 }
 function readPaneLogTail(codeName, lines = PANE_TAIL_LINES) {
   const logPath = paneLogPath(codeName);
-  if (!existsSync2(logPath)) return null;
+  if (!existsSync3(logPath)) return null;
   try {
-    const raw = readFileSync3(logPath, "utf-8");
+    const raw = readFileSync4(logPath, "utf-8");
     if (!raw) return null;
     const stripped = raw.replace(/\x1b\[[0-9;?]*[A-Za-z]/g, "");
     const all = stripped.split("\n").filter((l) => l.length > 0);
@@ -469,7 +541,7 @@ function spawnSession(config, session) {
       const claudeDir = join2(homedir2(), ".claude");
       for (const filename of [".credentials.json", "credentials.json"]) {
         const p = join2(claudeDir, filename);
-        if (existsSync2(p)) {
+        if (existsSync3(p)) {
           try {
             rmSync(p, { force: true });
             log(`[persistent-session] Removed ${p} (api_key mode active \u2014 preventing OAuth fallback)`);
@@ -495,7 +567,7 @@ function spawnSession(config, session) {
     if (channels.length > 0) args.push("--channels", ...channels);
     if (devChannels.length > 0) args.push("--dangerously-load-development-channels", ...devChannels);
     args.push("--mcp-config", mcpConfigPath);
-    if (existsSync2(claudeMdPath)) args.push("--system-prompt-file", claudeMdPath);
+    if (existsSync3(claudeMdPath)) args.push("--system-prompt-file", claudeMdPath);
     const modelAlias = claudeModelAlias(config.primaryModel);
     if (modelAlias) args.push("--model", modelAlias);
     args.push("--allow-dangerously-skip-permissions");
@@ -529,6 +601,16 @@ function spawnSession(config, session) {
     if (config.runId) {
       tmuxEnv["AGT_RUN_ID"] = config.runId;
     }
+    for (const f of probeMcpEnvSubstitution({
+      mcpConfigPath,
+      envIntegrationsPath: join2(projectDir, ".env.integrations"),
+      baseEnv: {
+        ...tmuxEnv,
+        ...claudeAuthMode === "api_key" && config.anthropicApiKey ? { ANTHROPIC_API_KEY: config.anthropicApiKey } : {}
+      }
+    })) {
+      log(`[persistent-session] ${formatMissingVar(f)} agent=${codeName}`);
+    }
     const child = spawn("tmux", [
       "new-session",
       "-d",
@@ -1061,7 +1143,7 @@ function writeAcpxConfig(config) {
   if (channels.length > 0) claudeArgs.push("--channels", ...channels);
   if (devChannels.length > 0) claudeArgs.push("--dangerously-load-development-channels", ...devChannels);
   claudeArgs.push("--mcp-config", mcpConfigPath);
-  if (existsSync2(claudeMdPath)) claudeArgs.push("--system-prompt-file", claudeMdPath);
+  if (existsSync3(claudeMdPath)) claudeArgs.push("--system-prompt-file", claudeMdPath);
   const acpModelAlias = claudeModelAlias(config.primaryModel);
   if (acpModelAlias) claudeArgs.push("--model", acpModelAlias);
   claudeArgs.push("--allow-dangerously-skip-permissions");
@@ -1073,7 +1155,7 @@ function writeAcpxConfig(config) {
   const envIntegrationsPath = join2(projectDir, ".env.integrations");
   const wrapperPath = join2(projectDir, ".claude", "acpx-agent.sh");
   const wrapperLines = ["#!/usr/bin/env bash"];
-  if (existsSync2(envIntegrationsPath)) {
+  if (existsSync3(envIntegrationsPath)) {
     wrapperLines.push(`set -a`, `source ${JSON.stringify(envIntegrationsPath)}`, `set +a`);
   }
   if (claudeAuthMode === "api_key" && anthropicApiKey) {
@@ -1096,6 +1178,8 @@ function writeAcpxConfig(config) {
 }
 
 export {
+  formatMissingVar,
+  probeMcpEnvSubstitution,
   sanitizeMcpJson,
   buildAllowedTools,
   sessionTranscriptDir,
@@ -1125,4 +1209,4 @@ export {
   stopAllSessionsAndWait,
   getProjectDir
 };
-//# sourceMappingURL=chunk-CF3SEPE3.js.map
+//# sourceMappingURL=chunk-DA3KY3D2.js.map