@integrity-labs/agt-cli 0.28.536 → 0.28.538

package/dist/{chunk-NOOKTWZP.js → chunk-XREQUTXK.js}

@@ -42,7 +42,7 @@ import {
   resolveConnectivityProbe,
   worseConnectivityOutcome,
   wrapScheduledTaskPrompt
-} from "./chunk-TPJ57PWU.js";
+} from "./chunk-N6HD5UG4.js";
 import {
   parsePsRows
 } from "./chunk-XWVM4KPK.js";
@@ -685,18 +685,81 @@ var TOKEN_RESOLVER_PRELUDE = `
 const AGT_HOST = (process.env.AGT_HOST || '').replace(/\\/+$/, '');
 const AGT_API_KEY = process.env.AGT_API_KEY || '';
 const AGT_AGENT_ID = process.env.AGT_AGENT_ID || '';
+const SELF_FILE = __filename;
+
+/**
+ * The agent ids the manager wrote into THIS agent's own .mcp.json.
+ *
+ * This program lives at <projectDir>/.claude/agt-bin/<name>, so the project dir
+ * is three dirnames up. Best-effort and never fatal: an agent with no .mcp.json,
+ * an unreadable file or a relocated bin dir yields [] and the caller stays quiet.
+ * Scraped with a regex rather than JSON.parse because the file is a rendered
+ * config that may carry unsubstituted variable placeholders in other fields, and
+ * a parse failure there must not swallow the identity we came for.
+ */
+function mcpConfigAgentIds() {
+  try {
+    const { readFileSync } = require('node:fs');
+    const { dirname, join } = require('node:path');
+    const projectDir = dirname(dirname(dirname(SELF_FILE)));
+    const raw = readFileSync(join(projectDir, '.mcp.json'), 'utf8');
+    const ids = [];
+    const re = /"AGT_AGENT_ID"\\s*:\\s*"([0-9a-fA-F-]{8,})"/g;
+    let m;
+    while ((m = re.exec(raw)) !== null) {
+      if (ids.indexOf(m[1]) === -1) ids.push(m[1]);
+    }
+    return ids;
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Extra sentence for the "Integration not found" case, which is the single most
+ * misleading response this program can get: it reads as "GitHub is disconnected"
+ * when the real cause can be that the PROCESS env carries a different agent's
+ * uuid than the one this agent actually is. That happened in the field - the
+ * .mcp.json blocks held the right id (they are rendered per agent) while the
+ * process env held a stale one inherited from elsewhere, so the broker was asked
+ * for an integration belonging to somebody else and answered, correctly, 404.
+ *
+ * DIAGNOSTIC ONLY. It deliberately does NOT fall back to the .mcp.json value.
+ * The broker authorises with the HOST key, which covers every agent on the host,
+ * so honouring an agent-writable file as the identity would let any agent mint
+ * another agent's GitHub token. The process env stays the only accepted source;
+ * a mismatch is something an operator fixes at the provisioner.
+ */
+function identityMismatchHint() {
+  const ids = mcpConfigAgentIds();
+  if (ids.length === 0 || ids.indexOf(AGT_AGENT_ID) !== -1) return '';
+  return (
+    '\\naugmented: IDENTITY MISMATCH - process.env.AGT_AGENT_ID is ' + AGT_AGENT_ID +
+    ', but this agent\\'s own .mcp.json says ' + ids.join(', ') + '. The broker was ' +
+    'asked for an integration belonging to a DIFFERENT agent, which is why it ' +
+    'answered "not found". Your GitHub integration is probably fine. Fix the ' +
+    'agent id the session was spawned with; this program will not use the ' +
+    '.mcp.json value, because that file is agent-writable and the broker ' +
+    'authorises with the host key.'
+  );
+}
 
 /**
  * Every failure exits through here, so an operator always gets a sentence that
  * names the credential fetch as the failing step. A bare 401 from GitHub sends
  * people auditing App permissions; "broker credential fetch failed: 503" sends
  * them at the API. Constraint D of ENG-8344.
+ *
+ * The agent id is echoed on every failure. It is not a secret, and a 404 whose
+ * message does not say WHICH agent was looked up is unfalsifiable from the
+ * operator's side.
  */
 function fail(reason) {
   process.stderr.write(
     'augmented: GitHub credential fetch failed: ' + reason + '\\n' +
     'augmented: the token is fetched per use from ' + (AGT_HOST || '<AGT_HOST unset>') +
-    '${GITHUB_CREDENTIAL_PATH}' + ' (ENG-8344). This is NOT a GitHub permissions problem.\\n',
+    '${GITHUB_CREDENTIAL_PATH}' + ' for agent_id=' + (AGT_AGENT_ID || '<unset>') +
+    ' (ENG-8344). This is NOT a GitHub permissions problem.\\n',
   );
   process.exit(1);
 }
@@ -751,7 +814,7 @@ async function resolveToken() {
       { Authorization: 'Bearer ' + jwt },
     );
   } catch (err) {
-    fail('broker credential fetch failed - ' + err.message);
+    fail('broker credential fetch failed - ' + err.message + identityMismatchHint());
   }
   const token = credential && credential.access_token;
   if (typeof token !== 'string' || token === '') {
@@ -5486,7 +5549,7 @@ function exchangeFailureKind(err) {
 }
 
 // src/lib/api-client.ts
-var agtCliVersion = true ? "0.28.536" : "dev";
+var agtCliVersion = true ? "0.28.538" : "dev";
 var lastConfigHash = null;
 function setConfigHash(hash) {
   lastConfigHash = hash && hash.length > 0 ? hash : null;
@@ -8798,4 +8861,4 @@ export {
   managerInstallSystemUnitCommand,
   managerUninstallSystemUnitCommand
 };
-//# sourceMappingURL=chunk-NOOKTWZP.js.map
+//# sourceMappingURL=chunk-XREQUTXK.js.map