@integrity-labs/cloud-broker 0.2.2 → 0.4.3

package/dist/index.js

@@ -20994,7 +20994,8 @@ function makeBrokerError(status, message, detail) {
 }
 var BrokerClient = class {
   host;
-  teamSlug;
+  agentId;
+  runId;
   apiKey;
   fetchImpl;
   token;
@@ -21002,7 +21003,8 @@ var BrokerClient = class {
   exchangeInFlight = null;
   constructor(config2) {
     this.host = config2.host.replace(/\/+$/, "");
-    this.teamSlug = config2.teamSlug;
+    this.agentId = config2.agentId;
+    this.runId = config2.runId;
     this.apiKey = config2.apiKey;
     this.fetchImpl = config2.fetchImpl ?? fetch;
     this.token = config2.initialToken ?? "";
@@ -21019,8 +21021,7 @@ var BrokerClient = class {
   buildHeaders(token, contentType = "application/json") {
     return {
       "Content-Type": contentType,
-      Authorization: `Bearer ${token}`,
-      "X-Team-Slug": this.teamSlug
+      Authorization: `Bearer ${token}`
     };
   }
   async refreshToken() {
@@ -21089,21 +21090,38 @@ var BrokerClient = class {
   }
   // ────────────────────────── tool-shaped wrappers ──────────────────────────
   describeScope(args) {
+    if (!this.agentId) {
+      throw makeBrokerError(400, "BrokerClient.describeScope requires agentId \u2014 pass it in BrokerClientConfig");
+    }
     return this.request(
       "GET",
       "/aws/scope",
-      { query: { account_id: args.account_id } }
+      { query: { account_id: args.account_id, agent_id: this.agentId } }
     );
   }
   previewRequest(args) {
+    if (!this.agentId) {
+      throw makeBrokerError(400, "BrokerClient.previewRequest requires agentId \u2014 pass it in BrokerClientConfig");
+    }
+    const body = { ...args };
+    if (body.agent_id === void 0) body.agent_id = this.agentId;
     return this.request(
       "POST",
       "/aws/scope/preview",
-      { body: args }
+      { body }
     );
   }
-  requestAccess(args) {
-    return this.request("POST", "/aws/grants", { body: args });
+  async requestAccess(args) {
+    const agentId = args.agent_id ?? this.agentId;
+    const runId = args.run_id ?? this.runId;
+    if (!agentId) {
+      throw makeBrokerError(400, "BrokerClient.requestAccess requires agent_id (pass it in args, or set agentId on BrokerClientConfig)");
+    }
+    if (!runId) {
+      throw makeBrokerError(400, "BrokerClient.requestAccess requires run_id (pass it in args, or set runId on BrokerClientConfig)");
+    }
+    const body = { ...args, agent_id: agentId, run_id: runId };
+    return this.request("POST", "/aws/grants", { body });
   }
   pollGrant(args) {
     return this.request("GET", `/aws/grants/${encodeURIComponent(args.grant_id)}`);
@@ -21133,8 +21151,16 @@ var previewRequestSchema = external_exports.object({
   ttl_seconds: ttlSecondsSchema
 });
 var requestAccessSchema = external_exports.object({
-  agent_id: external_exports.string().uuid("agent_id must be a UUID"),
-  run_id: external_exports.string().uuid("run_id must be a UUID"),
+  // ENG-4746: agent_id and run_id are optional. The MCP server fills them
+  // from AGT_AGENT_ID / AGT_RUN_ID env at provision time, so the agent
+  // doesn't need to know its own UUID. Pass them explicitly only to
+  // attribute the grant to a different agent or run (e.g. delegated work).
+  agent_id: external_exports.string().uuid("agent_id must be a UUID").optional().describe(
+    "Optional. Defaults to the host MCP env (AGT_AGENT_ID). Pass explicitly only to attribute the grant to a different agent."
+  ),
+  run_id: external_exports.string().uuid("run_id must be a UUID").optional().describe(
+    "Optional. Defaults to the host MCP env (AGT_RUN_ID). Pass explicitly only to attribute the grant to a different run."
+  ),
   account_id: accountIdSchema,
   actions: actionListSchema,
   resources: resourceListSchema,
@@ -21159,18 +21185,28 @@ var releaseAccessShape = releaseAccessSchema.shape;
 
 // src/index.ts
 var AGT_HOST = process.env.AGT_HOST;
-var AGT_TEAM_SLUG = process.env.AGT_TEAM_SLUG;
+var AGT_AGENT_ID = process.env.AGT_AGENT_ID;
+var AGT_RUN_ID = process.env.AGT_RUN_ID ?? "";
 var AGT_TOKEN = process.env.AGT_TOKEN ?? "";
 var AGT_API_KEY = process.env.AGT_API_KEY ?? "";
-if (!AGT_HOST || !AGT_TEAM_SLUG || !AGT_TOKEN && !AGT_API_KEY) {
+if (!AGT_HOST || !AGT_AGENT_ID || !AGT_TOKEN && !AGT_API_KEY) {
   console.error(
-    "cloud-broker: missing env vars. Need AGT_HOST, AGT_TEAM_SLUG, and one of AGT_TOKEN or AGT_API_KEY."
+    "cloud-broker: missing env vars. Need AGT_HOST, AGT_AGENT_ID, and one of AGT_TOKEN or AGT_API_KEY."
   );
   process.exit(1);
 }
+if (process.env.AGT_TEAM_SLUG) {
+  console.error(
+    "cloud-broker: AGT_TEAM_SLUG is set but no longer required (the API derives team from agent_id). Safe to remove from .mcp.json env block."
+  );
+}
 var broker = new BrokerClient({
   host: AGT_HOST,
-  teamSlug: AGT_TEAM_SLUG,
+  agentId: AGT_AGENT_ID,
+  // ENG-4746: thread AGT_RUN_ID through so request_access can default it.
+  // Empty string is treated as absent — the broker client only fills runId
+  // on requestAccess if a non-empty value is provided.
+  runId: AGT_RUN_ID || void 0,
   initialToken: AGT_TOKEN || void 0,
   apiKey: AGT_API_KEY || void 0
 });
@@ -21213,7 +21249,7 @@ server.tool(
 );
 server.tool(
   "request_access",
-  'Request scoped, TTL-bounded AWS credentials for the current task. Returns { grant_id, status, secret_ref?, expires_at?, denial_reason? }. status="active" means credentials are ready; status="pending" means a human approver was paged and you should poll_grant; status="denied" means the request was rejected (denial_reason explains).',
+  'Request scoped, TTL-bounded AWS credentials for the current task. agent_id and run_id are optional \u2014 the broker fills them from the host MCP env (AGT_AGENT_ID / AGT_RUN_ID). Only pass them explicitly to attribute the grant to a different agent or run. Returns { grant_id, status, secret_ref?, expires_at?, denial_reason?, notification_status?, notification_failure_reason? }. status="active" means credentials are ready; status="denied" means the request was rejected (denial_reason explains). status="pending" means approval is still outstanding \u2014 always check notification_status before deciding what to do next: "sent" means the Slack approval message reached the configured channel and poll_grant is appropriate; "failed" means the notification did NOT reach a human (typically channel_not_found because the bot is not a member of the approval channel) \u2014 quote grant_id + notification_failure_reason and recommend manual escalation instead of silently polling.',
   requestAccessShape,
   async (args) => {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@integrity-labs/cloud-broker",
-  "version": "0.2.2",
+  "version": "0.4.3",
   "description": "Cloud Access Broker — MCP server that mints scoped, TTL-bounded cloud credentials per agent task. v1 ships AWS support (request_access, poll_grant, release_access, describe_scope, preview_request — STS AssumeRole under the hood); GCP, Azure, and Cloudflare land alongside in the same package as the broker grows.",
   "type": "module",
   "bin": {