@carrierllc/mcp 0.9.0 → 0.9.2

package/dist/index.js

@@ -37,7 +37,7 @@ import {
   subscriberIdParams,
   usageOverPeriodParams,
   verifyStorefront
-} from "./chunk-VACB3Z5V.js";
+} from "./chunk-4XHSOF62.js";
 import "./chunk-SHKKVIIA.js";
 
 // src/index.ts
@@ -98,17 +98,213 @@ var OcsClient = class {
   }
 };
 
+// ../../packages/carrier-ai/dist/index.js
+import { AwsClient } from "aws4fetch";
+var AI_TIER_POLICY = {
+  free: { limit: 5, window: "day" },
+  pro: { limit: 1e3, window: "month" },
+  enterprise: { limit: 1e4, window: "month" },
+  // Finite, deliberately. This was `Infinity` when the tier was introduced in
+  // #762, and Infinity breaks in two ways that both hide themselves:
+  //
+  //   1. JSON.stringify(Infinity) is "null". The quota endpoint returned
+  //      {"limit":null,"remaining":null} and the console badge rendered
+  //      "1 of null used". That is the whole reason this was investigated.
+  //   2. An infinite allowance is unmetered Bedrock. A staff account could
+  //      spend without bound and nothing would refuse it or show a number.
+  //
+  // 100,000 is roughly $580 of Haiku at the measured $0.0058/call. Nobody on
+  // staff will reach it by using the product, and a runaway loop stops.
+  superadmin: { limit: 1e5, window: "month" }
+};
+for (const [tier, policy] of Object.entries(AI_TIER_POLICY)) {
+  if (!Number.isFinite(policy.limit) || policy.limit <= 0) {
+    throw new Error(
+      `AI_TIER_POLICY.${tier}.limit must be a positive finite number, got ${policy.limit}. A non-finite limit serialises to null in JSON and leaves spend unmetered.`
+    );
+  }
+}
+var PRELUDE_BYTES = 12;
+var MESSAGE_CRC_BYTES = 4;
+var MIN_FRAME_BYTES = PRELUDE_BYTES + MESSAGE_CRC_BYTES;
+var MAX_FRAME_BYTES = 16 * 1024 * 1024;
+var MAX_ENTRIES = 16;
+var MAX_KEY_LEN = 256;
+var MAX_VALUE_LEN = 256;
+var ALLOWED = /[^a-zA-Z0-9\s:_@$#=/+,\-.]/g;
+function clean(value, max) {
+  return value.replace(ALLOWED, "").slice(0, max);
+}
+var REQUEST_METADATA_HEADER = "X-Amzn-Bedrock-Request-Metadata";
+function requestMetadata(attr2) {
+  const out = {};
+  const pairs = [
+    ["product", "carrier"],
+    ["org", attr2.orgId],
+    ["subaccount", attr2.subAccountId],
+    ["surface", attr2.surface],
+    ["tier", attr2.tier]
+  ];
+  for (const [k, v] of pairs) {
+    if (v === void 0 || v === "") continue;
+    const key = clean(k, MAX_KEY_LEN);
+    const value = clean(v, MAX_VALUE_LEN);
+    if (key && value && Object.keys(out).length < MAX_ENTRIES) out[key] = value;
+  }
+  return Object.keys(out).length > 0 ? out : null;
+}
+var ZERO_USAGE = {
+  inputTokens: 0,
+  outputTokens: 0,
+  cacheReadTokens: 0,
+  cacheWriteTokens: 0
+};
+function extractUsage(payload) {
+  if (!payload || typeof payload !== "object") return ZERO_USAGE;
+  const root = payload;
+  const holder = root.usage ?? root.message?.usage;
+  if (!holder) return ZERO_USAGE;
+  const num = (v) => {
+    const n = Number(v);
+    return Number.isFinite(n) && n > 0 ? n : 0;
+  };
+  return {
+    inputTokens: num(holder.input_tokens),
+    outputTokens: num(holder.output_tokens),
+    cacheReadTokens: num(holder.cache_read_input_tokens),
+    cacheWriteTokens: num(holder.cache_creation_input_tokens)
+  };
+}
+var HAIKU_RATES = {
+  inputPerMTok: 1,
+  outputPerMTok: 5,
+  cacheReadPerMTok: 0.1,
+  cacheWritePerMTok: 1.25,
+  asOf: "2026-08-22"
+};
+function estimateCostUsd(u, rates = HAIKU_RATES) {
+  const perTok = (mtok) => mtok / 1e6;
+  return u.inputTokens * perTok(rates.inputPerMTok) + u.outputTokens * perTok(rates.outputPerMTok) + u.cacheReadTokens * perTok(rates.cacheReadPerMTok) + u.cacheWriteTokens * perTok(rates.cacheWritePerMTok);
+}
+var DEFAULT_BEDROCK_REGION = "us-east-1";
+var DEFAULT_MODEL_ID = "us.anthropic.claude-haiku-4-5-20251001-v1:0";
+var BEDROCK_TIMEOUT_MS = 3e4;
+var BedrockRateLimitError = class extends Error {
+  isRateLimit = true;
+  /**
+   * The raw `retry-after` header, when Bedrock sent one. Callers surface it as
+   * the delay they tell the user to wait; without it they have to guess.
+   */
+  retryAfter;
+  constructor(message, retryAfter = null) {
+    super(message);
+    this.name = "BedrockRateLimitError";
+    this.retryAfter = retryAfter;
+  }
+};
+var BedrockError = class extends Error {
+  constructor(message, status) {
+    super(message);
+    this.status = status;
+    this.name = "BedrockError";
+  }
+  status;
+};
+function client(creds) {
+  const region = creds.region ?? DEFAULT_BEDROCK_REGION;
+  return {
+    aws: new AwsClient({
+      accessKeyId: creds.accessKeyId,
+      secretAccessKey: creds.secretAccessKey,
+      ...creds.sessionToken ? { sessionToken: creds.sessionToken } : {},
+      region,
+      service: "bedrock"
+    }),
+    region,
+    modelId: creds.modelId ?? DEFAULT_MODEL_ID
+  };
+}
+function body(req) {
+  return {
+    anthropic_version: "bedrock-2023-05-31",
+    max_tokens: req.maxTokens,
+    ...req.temperature !== void 0 ? { temperature: req.temperature } : {},
+    system: [{ type: "text", text: req.system, cache_control: { type: "ephemeral" } }],
+    messages: req.messages.map((m) => ({ role: m.role, content: m.content })),
+    ...req.tools ? { tools: req.tools, tool_choice: { type: "any" } } : {}
+  };
+}
+function headersFor(attribution, accept) {
+  const headers = {
+    "Content-Type": "application/json",
+    Accept: accept
+  };
+  const meta = attribution ? requestMetadata(attribution) : null;
+  if (meta) headers[REQUEST_METADATA_HEADER] = JSON.stringify(meta);
+  return headers;
+}
+function reportUsage(req, usage) {
+  if (!req.onUsage) return;
+  try {
+    req.onUsage(usage);
+  } catch {
+  }
+}
+async function fail(resp) {
+  const text = await resp.text().catch(() => "");
+  if (resp.status === 429 || /throttl/i.test(text)) {
+    throw new BedrockRateLimitError(
+      text || "Bedrock throttled the request",
+      resp.headers.get("retry-after")
+    );
+  }
+  throw new BedrockError(text || `Bedrock returned HTTP ${resp.status}`, resp.status);
+}
+async function invokeTool(creds, req, signal) {
+  const json = await invokeModelRaw(
+    creds,
+    body(req),
+    { attribution: req.attribution, timeoutMs: req.timeoutMs },
+    signal
+  );
+  reportUsage(req, extractUsage(json));
+  const block = json.content?.find((b) => b.type === "tool_use");
+  return block?.name ? { name: block.name, input: block.input ?? {} } : null;
+}
+async function invokeModelRaw(creds, payload, opts = {}, signal) {
+  const { aws, region, modelId } = client(creds);
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? BEDROCK_TIMEOUT_MS);
+  const onAbort = () => controller.abort();
+  signal?.addEventListener("abort", onAbort, { once: true });
+  try {
+    const resp = await aws.fetch(
+      `https://bedrock-runtime.${region}.amazonaws.com/model/${encodeURIComponent(modelId)}/invoke`,
+      {
+        method: "POST",
+        headers: headersFor(opts.attribution, "application/json"),
+        body: JSON.stringify(payload),
+        signal: controller.signal
+      }
+    );
+    if (!resp.ok) await fail(resp);
+    return await resp.json();
+  } finally {
+    clearTimeout(timer);
+    signal?.removeEventListener("abort", onAbort);
+  }
+}
+
 // src/billing.ts
 var TIER_CALL_LIMITS = {
-  free: 5e3,
-  pro: 5e4,
-  enterprise: Infinity
+  free: 1e3,
+  pro: Infinity,
+  enterprise: Infinity,
+  superadmin: Infinity
 };
+var CARRIER_ASK_PRO_MONTHLY_LIMIT = AI_TIER_POLICY.pro.limit;
+var CARRIER_ASK_FREE_DAILY_LIMIT = AI_TIER_POLICY.free.limit;
 var UPGRADE_URL = "https://mcp.carrier.llc/upgrade";
-function getBillingPrimary(env) {
-  const raw = env.BILLING_PRIMARY;
-  return raw === "clerk" ? "clerk" : "stripe";
-}
 function platformOrgId(env) {
   const raw = env.CARRIER_PLATFORM_ORG_ID;
   if (typeof raw !== "string") return null;
@@ -123,7 +319,7 @@ function isPlatformOperator(env, orgId) {
 async function checkCallQuota(env, sub, tier) {
   const limit = TIER_CALL_LIMITS[tier];
   const resetAt = firstDayNextMonth();
-  if (tier === "enterprise") {
+  if (tier === "pro" || tier === "enterprise" || tier === "superadmin") {
     return { allowed: true, remaining: Infinity, resetAt, tier };
   }
   if (!env.CARRIER_USERS) {
@@ -144,6 +340,7 @@ async function checkCallQuota(env, sub, tier) {
 function recordUsage(env, sub, tier) {
   if (!env.CARRIER_USERS) return;
   (async () => {
+    if (tier === "pro" || tier === "enterprise" || tier === "superadmin") return;
     const month = currentMonth();
     const usageKey = `usage:${sub}:${month}`;
     const raw = await env.CARRIER_USERS.get(usageKey, "json").catch(() => null);
@@ -154,35 +351,8 @@ function recordUsage(env, sub, tier) {
       JSON.stringify({ calls: next, updated_at: (/* @__PURE__ */ new Date()).toISOString() }),
       { expirationTtl: 35 * 24 * 60 * 60 }
     );
-    if (tier === "pro" && next % 100 === 0 && getBillingPrimary(env) === "stripe") {
-      await pushStripeUsageRecord(env, sub, 100).catch(() => {
-      });
-    }
   })();
 }
-async function pushStripeUsageRecord(env, sub, quantity) {
-  const stripeKey = env.STRIPE_SECRET_KEY;
-  if (!stripeKey) return;
-  if (!env.CARRIER_USERS) return;
-  const subItemId = await env.CARRIER_USERS.get(`stripe_sub_item_id:${sub}`);
-  if (!subItemId) return;
-  const body2 = new URLSearchParams({
-    quantity: String(quantity),
-    timestamp: String(Math.floor(Date.now() / 1e3)),
-    action: "increment"
-  });
-  await fetch(
-    `https://api.stripe.com/v1/subscription_items/${subItemId}/usage_records`,
-    {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${stripeKey}`,
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      body: body2.toString()
-    }
-  );
-}
 function currentMonth() {
   const now = /* @__PURE__ */ new Date();
   return `${now.getUTCFullYear()}${String(now.getUTCMonth() + 1).padStart(2, "0")}`;
@@ -531,8 +701,8 @@ function wrapHandler(toolName, ocsMethod, requiredScope, ctx, handler) {
           {
             type: "text",
             text: [
-              `Quota exceeded: your ${quota.tier} plan has reached the safety limit of 100,000 regular tool calls/month.`,
-              `This limit exists to prevent runaway automation. Resets ${quota.resetAt}.`,
+              `Quota exceeded: your ${quota.tier} plan has reached the monthly limit of ${TIER_CALL_LIMITS.free.toLocaleString()} regular tool calls.`,
+              `Resets ${quota.resetAt}.`,
               `Upgrade to Pro for unlimited calls at ${UPGRADE_URL}`
             ].join(" ")
           }
@@ -4675,196 +4845,6 @@ function registerAllBacklogTools(server2, ctx) {
   );
 }
 
-// ../../packages/carrier-ai/dist/index.js
-import { AwsClient } from "aws4fetch";
-var AI_TIER_POLICY = {
-  free: { limit: 5, window: "day" },
-  pro: { limit: 1e3, window: "month" },
-  enterprise: { limit: 1e4, window: "month" },
-  // Finite, deliberately. This was `Infinity` when the tier was introduced in
-  // #762, and Infinity breaks in two ways that both hide themselves:
-  //
-  //   1. JSON.stringify(Infinity) is "null". The quota endpoint returned
-  //      {"limit":null,"remaining":null} and the console badge rendered
-  //      "1 of null used". That is the whole reason this was investigated.
-  //   2. An infinite allowance is unmetered Bedrock. A staff account could
-  //      spend without bound and nothing would refuse it or show a number.
-  //
-  // 100,000 is roughly $580 of Haiku at the measured $0.0058/call. Nobody on
-  // staff will reach it by using the product, and a runaway loop stops.
-  superadmin: { limit: 1e5, window: "month" }
-};
-for (const [tier, policy] of Object.entries(AI_TIER_POLICY)) {
-  if (!Number.isFinite(policy.limit) || policy.limit <= 0) {
-    throw new Error(
-      `AI_TIER_POLICY.${tier}.limit must be a positive finite number, got ${policy.limit}. A non-finite limit serialises to null in JSON and leaves spend unmetered.`
-    );
-  }
-}
-var PRELUDE_BYTES = 12;
-var MESSAGE_CRC_BYTES = 4;
-var MIN_FRAME_BYTES = PRELUDE_BYTES + MESSAGE_CRC_BYTES;
-var MAX_FRAME_BYTES = 16 * 1024 * 1024;
-var MAX_ENTRIES = 16;
-var MAX_KEY_LEN = 256;
-var MAX_VALUE_LEN = 256;
-var ALLOWED = /[^a-zA-Z0-9\s:_@$#=/+,\-.]/g;
-function clean(value, max) {
-  return value.replace(ALLOWED, "").slice(0, max);
-}
-var REQUEST_METADATA_HEADER = "X-Amzn-Bedrock-Request-Metadata";
-function requestMetadata(attr2) {
-  const out = {};
-  const pairs = [
-    ["product", "carrier"],
-    ["org", attr2.orgId],
-    ["subaccount", attr2.subAccountId],
-    ["surface", attr2.surface],
-    ["tier", attr2.tier]
-  ];
-  for (const [k, v] of pairs) {
-    if (v === void 0 || v === "") continue;
-    const key = clean(k, MAX_KEY_LEN);
-    const value = clean(v, MAX_VALUE_LEN);
-    if (key && value && Object.keys(out).length < MAX_ENTRIES) out[key] = value;
-  }
-  return Object.keys(out).length > 0 ? out : null;
-}
-var ZERO_USAGE = {
-  inputTokens: 0,
-  outputTokens: 0,
-  cacheReadTokens: 0,
-  cacheWriteTokens: 0
-};
-function extractUsage(payload) {
-  if (!payload || typeof payload !== "object") return ZERO_USAGE;
-  const root = payload;
-  const holder = root.usage ?? root.message?.usage;
-  if (!holder) return ZERO_USAGE;
-  const num = (v) => {
-    const n = Number(v);
-    return Number.isFinite(n) && n > 0 ? n : 0;
-  };
-  return {
-    inputTokens: num(holder.input_tokens),
-    outputTokens: num(holder.output_tokens),
-    cacheReadTokens: num(holder.cache_read_input_tokens),
-    cacheWriteTokens: num(holder.cache_creation_input_tokens)
-  };
-}
-var HAIKU_RATES = {
-  inputPerMTok: 1,
-  outputPerMTok: 5,
-  cacheReadPerMTok: 0.1,
-  cacheWritePerMTok: 1.25,
-  asOf: "2026-08-22"
-};
-function estimateCostUsd(u, rates = HAIKU_RATES) {
-  const perTok = (mtok) => mtok / 1e6;
-  return u.inputTokens * perTok(rates.inputPerMTok) + u.outputTokens * perTok(rates.outputPerMTok) + u.cacheReadTokens * perTok(rates.cacheReadPerMTok) + u.cacheWriteTokens * perTok(rates.cacheWritePerMTok);
-}
-var DEFAULT_BEDROCK_REGION = "us-east-1";
-var DEFAULT_MODEL_ID = "us.anthropic.claude-haiku-4-5-20251001-v1:0";
-var BEDROCK_TIMEOUT_MS = 3e4;
-var BedrockRateLimitError = class extends Error {
-  isRateLimit = true;
-  /**
-   * The raw `retry-after` header, when Bedrock sent one. Callers surface it as
-   * the delay they tell the user to wait; without it they have to guess.
-   */
-  retryAfter;
-  constructor(message, retryAfter = null) {
-    super(message);
-    this.name = "BedrockRateLimitError";
-    this.retryAfter = retryAfter;
-  }
-};
-var BedrockError = class extends Error {
-  constructor(message, status) {
-    super(message);
-    this.status = status;
-    this.name = "BedrockError";
-  }
-  status;
-};
-function client(creds) {
-  const region = creds.region ?? DEFAULT_BEDROCK_REGION;
-  return {
-    aws: new AwsClient({
-      accessKeyId: creds.accessKeyId,
-      secretAccessKey: creds.secretAccessKey,
-      ...creds.sessionToken ? { sessionToken: creds.sessionToken } : {},
-      region,
-      service: "bedrock"
-    }),
-    region,
-    modelId: creds.modelId ?? DEFAULT_MODEL_ID
-  };
-}
-function body(req) {
-  return {
-    anthropic_version: "bedrock-2023-05-31",
-    max_tokens: req.maxTokens,
-    ...req.temperature !== void 0 ? { temperature: req.temperature } : {},
-    system: [{ type: "text", text: req.system, cache_control: { type: "ephemeral" } }],
-    messages: req.messages.map((m) => ({ role: m.role, content: m.content })),
-    ...req.tools ? { tools: req.tools, tool_choice: { type: "any" } } : {}
-  };
-}
-function headersFor(req, accept) {
-  const headers = {
-    "Content-Type": "application/json",
-    Accept: accept
-  };
-  const meta = req.attribution ? requestMetadata(req.attribution) : null;
-  if (meta) headers[REQUEST_METADATA_HEADER] = JSON.stringify(meta);
-  return headers;
-}
-function reportUsage(req, usage) {
-  if (!req.onUsage) return;
-  try {
-    req.onUsage(usage);
-  } catch {
-  }
-}
-async function fail(resp) {
-  const text = await resp.text().catch(() => "");
-  if (resp.status === 429 || /throttl/i.test(text)) {
-    throw new BedrockRateLimitError(
-      text || "Bedrock throttled the request",
-      resp.headers.get("retry-after")
-    );
-  }
-  throw new BedrockError(text || `Bedrock returned HTTP ${resp.status}`, resp.status);
-}
-async function invokeTool(creds, req, signal) {
-  const { aws, region, modelId } = client(creds);
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), req.timeoutMs ?? BEDROCK_TIMEOUT_MS);
-  const onAbort = () => controller.abort();
-  signal?.addEventListener("abort", onAbort, { once: true });
-  try {
-    const headers = headersFor(req, "application/json");
-    const resp = await aws.fetch(
-      `https://bedrock-runtime.${region}.amazonaws.com/model/${encodeURIComponent(modelId)}/invoke`,
-      {
-        method: "POST",
-        headers,
-        body: JSON.stringify(body(req)),
-        signal: controller.signal
-      }
-    );
-    if (!resp.ok) await fail(resp);
-    const json = await resp.json();
-    reportUsage(req, extractUsage(json));
-    const block = json.content?.find((b) => b.type === "tool_use");
-    return block?.name ? { name: block.name, input: block.input ?? {} } : null;
-  } finally {
-    clearTimeout(timer);
-    signal?.removeEventListener("abort", onAbort);
-  }
-}
-
 // src/tools-carrier-ask.ts
 import { z as z11 } from "zod";
 
@@ -5132,6 +5112,7 @@ var UI_AGENT_TOOL_SCOPES = {
   ui_create_steering_list: "write",
   ui_build_steering_list: "write",
   ui_set_account_steering_list: "write",
+  ui_request_reseller_relay_change: "write",
   ui_create_account: "admin",
   ui_create_destination_list: "write",
   ui_edit_destination_list: "write",
@@ -5217,6 +5198,66 @@ Open account ID ${args.account_id}.
 `
     )
   );
+  server2.registerTool(
+    "ui_request_reseller_relay_change",
+    {
+      title: "Request Reseller Relay Change",
+      description: "Drafts a parent-reseller/support request for Relay Gy, calls/SMS relay, or VoIP relay when those portal controls are read-only at the current reseller tier. Does not send the request or mutate the portal.",
+      inputSchema: {
+        reseller_id: z4.number().optional().describe("Reseller id; defaults to the authenticated reseller"),
+        relay_gy: z4.boolean().optional().describe("Desired Relay Gy state"),
+        relay_calls_sms: z4.boolean().optional().describe("Desired calls/SMS relay state"),
+        relay_voip: z4.boolean().optional().describe("Desired VoIP relay state"),
+        reason: z4.string().optional().describe("Operational reason for the requested change")
+      }
+    },
+    async (args) => {
+      if (!ctx.props.scope.includes("write")) {
+        return {
+          isError: true,
+          content: [{ type: "text", text: "Scope denied: tool 'ui_request_reseller_relay_change' requires 'write' scope." }]
+        };
+      }
+      const resellerId = args.reseller_id ?? ctx.props.reseller_id;
+      const requested = [
+        args.relay_gy === void 0 ? null : `Relay Gy: ${args.relay_gy ? "enable" : "disable"}`,
+        args.relay_calls_sms === void 0 ? null : `Calls/SMS relay: ${args.relay_calls_sms ? "enable" : "disable"}`,
+        args.relay_voip === void 0 ? null : `VoIP relay: ${args.relay_voip ? "enable" : "disable"}`
+      ].filter((value) => value !== null);
+      if (requested.length === 0) {
+        return {
+          isError: true,
+          content: [{ type: "text", text: JSON.stringify({ error: "relay_state_required", message: "Choose at least one relay flag and desired state." }) }]
+        };
+      }
+      const draft = [
+        `Please update the parent-controlled OCS relay settings for reseller ${resellerId}.`,
+        "",
+        ...requested.map((line) => `- ${line}`),
+        ...args.reason ? ["", `Reason: ${args.reason}`] : [],
+        "",
+        "Please confirm once the change is active so we can verify the dependent OCS operation."
+      ].join("\n");
+      ctx.audit({
+        tool_name: "ui_request_reseller_relay_change",
+        ocs_method: "[ui-agent:G-20]",
+        status: "parent_request_drafted",
+        dry_run: true,
+        duration_ms: 0,
+        event_type: "ui_agent_dispatch"
+      });
+      return {
+        content: [{ type: "text", text: JSON.stringify({
+          status: "parent_request_drafted",
+          capability: "parent_controlled",
+          reseller_id: resellerId,
+          parent_reseller: resellerId === 1170 ? "Bridge4IP" : "parent reseller/support",
+          draft,
+          sent: false
+        }, null, 2) }]
+      };
+    }
+  );
   server2.registerTool(
     "ui_create_account",
     {
@@ -5494,6 +5535,21 @@ function computeExpiresAt(askedAt) {
   if (isNaN(asked)) return "";
   return new Date(asked + PENDING_ASK_TTL_SECONDS * 1e3).toISOString();
 }
+async function callerOwnsTask(ctx, taskId) {
+  let raw;
+  try {
+    raw = await ctx.env.CARRIER_USERS.get(`steel_task:${taskId}`);
+  } catch {
+    return false;
+  }
+  if (!raw) return false;
+  try {
+    const task = JSON.parse(raw);
+    return task.owner_sub !== void 0 && task.owner_sub === ctx.props.sub;
+  } catch {
+    return false;
+  }
+}
 function registerUiAgentAskTools(server2, ctx) {
   server2.registerTool(
     "ui_agent_reply",
@@ -5543,7 +5599,7 @@ function registerUiAgentAskTools(server2, ctx) {
       }
       const pendingKey = `${PENDING_ASK_PREFIX}${task_id}`;
       const pendingRaw = await ctx.env.CARRIER_USERS.get(pendingKey);
-      if (pendingRaw === null) {
+      if (pendingRaw === null || !await callerOwnsTask(ctx, task_id)) {
         return {
           isError: true,
           content: [
@@ -5685,6 +5741,8 @@ function registerUiAgentAskTools(server2, ctx) {
           if (!raw) return null;
           try {
             const parsed = JSON.parse(raw);
+            const taskId = parsed.task_id ?? name.slice(PENDING_ASK_PREFIX.length);
+            if (!await callerOwnsTask(ctx, taskId)) return null;
             return {
               ...parsed,
               expires_at: computeExpiresAt(parsed.asked_at)
@@ -6662,6 +6720,33 @@ async function resolveBillingSub(env, orgId) {
   return pointer ?? orgId;
 }
 
+// src/scope-guard.ts
+function denyUnlessScoped(props2, toolName, scopes) {
+  const required = scopes[toolName];
+  if (required === void 0) {
+    return {
+      isError: true,
+      content: [
+        {
+          type: "text",
+          text: `Scope denied: tool '${toolName}' declares no scope, so it cannot be authorised. This is a server-side omission \u2014 add it to the tool's scope table.`
+        }
+      ]
+    };
+  }
+  const held = props2.scope ?? [];
+  if (held.includes(required)) return null;
+  return {
+    isError: true,
+    content: [
+      {
+        type: "text",
+        text: `Scope denied: tool '${toolName}' requires '${required}' scope. Your token has: [${held.join(", ")}].`
+      }
+    ]
+  };
+}
+
 // src/wallet-tools.ts
 var PACKS = [
   { id: "pack_500", eurCents: 5e4, bonusPct: 0 },
@@ -6858,6 +6943,8 @@ function registerWalletTools(server2, ctx) {
       annotations: annotationsFor("wallet_balance", "read")
     },
     async () => {
+      const denied = denyUnlessScoped(props2, "wallet_balance", WALLET_TOOL_SCOPES);
+      if (denied) return denied;
       const orgId = defaultOrgId;
       const start = Date.now();
       try {
@@ -6900,6 +6987,8 @@ function registerWalletTools(server2, ctx) {
       annotations: annotationsFor("wallet_topup_checkout", "write")
     },
     async ({ pack }) => {
+      const denied = denyUnlessScoped(props2, "wallet_topup_checkout", WALLET_TOOL_SCOPES);
+      if (denied) return denied;
       const orgId = defaultOrgId;
       const start = Date.now();
       if (!pack) {
@@ -6959,6 +7048,8 @@ function registerWalletTools(server2, ctx) {
       annotations: annotationsFor("wallet_auto_topup", "write")
     },
     async ({ pack_cents }) => {
+      const denied = denyUnlessScoped(props2, "wallet_auto_topup", WALLET_TOOL_SCOPES);
+      if (denied) return denied;
       const orgId = defaultOrgId;
       const start = Date.now();
       try {
@@ -7069,6 +7160,8 @@ function registerStripeConnectTools(server2, ctx) {
       annotations: annotationsFor("stripe_connect_status", "read")
     },
     async ({ operator_id }) => {
+      const denied = denyUnlessScoped(props2, "stripe_connect_status", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
       if (operator_id !== void 0 && operator_id !== operatorId) {
         if (!isPlatformOperator(env, props2.org_id)) {
           return err2(
@@ -7129,6 +7222,8 @@ function registerStripeConnectTools(server2, ctx) {
       annotations: annotationsFor("stripe_connect_payouts", "read")
     },
     async ({ limit, status }) => {
+      const denied = denyUnlessScoped(props2, "stripe_connect_payouts", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
       const start = Date.now();
       try {
         const stripeKey = env.STRIPE_SECRET_KEY;
@@ -7164,6 +7259,8 @@ function registerStripeConnectTools(server2, ctx) {
       annotations: annotationsFor("stripe_connect_balance", "read")
     },
     async () => {
+      const denied = denyUnlessScoped(props2, "stripe_connect_balance", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
       const start = Date.now();
       try {
         const stripeKey = env.STRIPE_SECRET_KEY;
@@ -7206,6 +7303,8 @@ function registerStripeConnectTools(server2, ctx) {
       annotations: annotationsFor("stripe_connect_refund", "write")
     },
     async ({ charge_id, amount_cents, reason, confirm_token }) => {
+      const denied = denyUnlessScoped(props2, "stripe_connect_refund", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
       const start = Date.now();
       const toolName = "stripe_connect_refund";
       if (!confirm_token) {
@@ -7258,6 +7357,8 @@ Call again with confirm_token="${token2}" to execute. Token expires in 5 minutes
       annotations: annotationsFor("stripe_connect_dispute_list", "read")
     },
     async ({ limit, status }) => {
+      const denied = denyUnlessScoped(props2, "stripe_connect_dispute_list", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
       const start = Date.now();
       try {
         const stripeKey = env.STRIPE_SECRET_KEY;
@@ -7296,6 +7397,13 @@ Call again with confirm_token="${token2}" to execute. Token expires in 5 minutes
       annotations: annotationsFor("radar_review_list", "read")
     },
     async ({ open_only, limit }) => {
+      const denied = denyUnlessScoped(props2, "radar_review_list", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
+      if (!isPlatformOperator(env, props2.org_id)) {
+        return err2(
+          "This tool acts on Carrier's platform Stripe account and is restricted to Carrier's own organization."
+        );
+      }
       const start = Date.now();
       try {
         const stripeKey = env.STRIPE_SECRET_KEY;
@@ -7332,6 +7440,13 @@ Call again with confirm_token="${token2}" to execute. Token expires in 5 minutes
       annotations: annotationsFor("radar_review_approve", "admin")
     },
     async ({ review_id, confirm_token }) => {
+      const denied = denyUnlessScoped(props2, "radar_review_approve", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
+      if (!isPlatformOperator(env, props2.org_id)) {
+        return err2(
+          "This tool acts on Carrier's platform Stripe account and is restricted to Carrier's own organization."
+        );
+      }
       const toolName = "radar_review_approve";
       const start = Date.now();
       if (!confirm_token) {
@@ -7381,6 +7496,13 @@ Call again with confirm_token="${token2}" to execute. Expires in 5 minutes.`
       annotations: annotationsFor("radar_review_decline", "admin")
     },
     async ({ review_id, confirm_token }) => {
+      const denied = denyUnlessScoped(props2, "radar_review_decline", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
+      if (!isPlatformOperator(env, props2.org_id)) {
+        return err2(
+          "This tool acts on Carrier's platform Stripe account and is restricted to Carrier's own organization."
+        );
+      }
       const toolName = "radar_review_decline";
       const start = Date.now();
       if (!confirm_token) {
@@ -7431,6 +7553,13 @@ Expires in 5 minutes.`
       annotations: annotationsFor("radar_value_list_add", "admin")
     },
     async ({ value_list_id, value, confirm_token }) => {
+      const denied = denyUnlessScoped(props2, "radar_value_list_add", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
+      if (!isPlatformOperator(env, props2.org_id)) {
+        return err2(
+          "This tool acts on Carrier's platform Stripe account and is restricted to Carrier's own organization."
+        );
+      }
       const toolName = "radar_value_list_add";
       const start = Date.now();
       if (!confirm_token) {
@@ -7480,6 +7609,13 @@ Expires in 5 minutes.`
       annotations: annotationsFor("radar_rule_toggle", "admin")
     },
     async ({ rule_id, enabled }) => {
+      const denied = denyUnlessScoped(props2, "radar_rule_toggle", STRIPE_CONNECT_TOOL_SCOPES);
+      if (denied) return denied;
+      if (!isPlatformOperator(env, props2.org_id)) {
+        return err2(
+          "This tool acts on Carrier's platform Stripe account and is restricted to Carrier's own organization."
+        );
+      }
       return ok2(
         `Stripe Radar does not expose rule enable/disable via the public API.
 To ${enabled ? "enable" : "disable"} rule ${rule_id}:
@@ -7692,7 +7828,8 @@ function registerStorefrontDeployTools(server2) {
 var TIER_CREDIT_ALLOTMENTS = {
   free: 5e3,
   pro: 1e5,
-  enterprise: Infinity
+  enterprise: Infinity,
+  superadmin: Infinity
 };
 var DAILY_FREE_CREDITS = 50;
 var SCOPE_CREDIT_COSTS = {
@@ -7715,7 +7852,7 @@ async function checkCredits(env, sub, tier, scope) {
   const month = currentMonth2();
   const today = currentDay();
   const resetAt = firstDayNextMonth2();
-  if (tier === "enterprise") {
+  if (tier === "enterprise" || tier === "superadmin") {
     return {
       allowed: true,
       credits_remaining: Infinity,
@@ -7755,7 +7892,7 @@ function deductCredits(env, sub, tier, scope) {
     const cost = SCOPE_CREDIT_COSTS[scope];
     const month = currentMonth2();
     const today = currentDay();
-    if (tier === "enterprise") return;
+    if (tier === "enterprise" || tier === "superadmin") return;
     const dailyFree = await getDailyFreeCredits(env, sub, today);
     const dailyRemaining = dailyFree.granted - dailyFree.consumed;
     if (dailyRemaining >= cost) {
@@ -7961,7 +8098,7 @@ async function resolveUserTier(env, sub) {
   const raw = await env.CARRIER_USERS.get(`user:${sub}`, "json").catch(() => null);
   if (raw && typeof raw === "object" && "tier" in raw) {
     const t = raw.tier;
-    if (t === "pro" || t === "enterprise") return t;
+    if (t === "pro" || t === "enterprise" || t === "superadmin") return t;
   }
   return "free";
 }
@@ -8011,6 +8148,14 @@ var DEFAULT_THRESHOLD_CONFIGS = {
     auto_pause_on_cap: false,
     notification_email: null,
     webhook_url: null
+  },
+  superadmin: {
+    notification_thresholds: [],
+    hard_cap_cents: 0,
+    invoice_threshold_cents: 0,
+    auto_pause_on_cap: false,
+    notification_email: null,
+    webhook_url: null
   }
 };
 async function getThresholdConfig(env, sub, tier) {
@@ -8033,7 +8178,7 @@ async function resolveUserTier2(env, sub) {
   const raw = await env.CARRIER_USERS.get(`user:${sub}`, "json").catch(() => null);
   if (raw && typeof raw === "object" && "tier" in raw) {
     const t = raw.tier;
-    if (t === "pro" || t === "enterprise") return t;
+    if (t === "pro" || t === "enterprise" || t === "superadmin") return t;
   }
   return "free";
 }
@@ -9971,7 +10116,82 @@ function buildExamples(toolName) {
 // src/list-recent-ocs-events.ts
 import { z as z12 } from "zod";
 
+// src/ocs-scoping.ts
+function managedOwnAccountId(auth) {
+  if (!auth.managed || auth.accountId === void 0) return void 0;
+  const n = Number(auth.accountId);
+  return Number.isFinite(n) ? n : void 0;
+}
+function subscriberAccountId(data) {
+  if (!data || typeof data !== "object") return void 0;
+  const root = data;
+  const sub = root.subscriber && typeof root.subscriber === "object" ? root.subscriber : root;
+  const raw = sub.accountId ?? sub.account_id ?? sub.account;
+  if (raw === void 0 || raw === null) return void 0;
+  const n = Number(raw);
+  return Number.isFinite(n) ? n : void 0;
+}
+function isManagedSubscriberDenied(auth, subscriberData) {
+  const ownId = managedOwnAccountId(auth);
+  if (ownId === void 0) return false;
+  const subAccountId = subscriberAccountId(subscriberData);
+  if (subAccountId === void 0) return true;
+  return subAccountId !== ownId;
+}
+async function assertManagedIccidAccess(baseUrl2, auth, iccid) {
+  if (managedOwnAccountId(auth) === void 0) return { ok: true };
+  try {
+    const client2 = new OcsClient(baseUrl2, auth.token);
+    const data = await client2.call("getSingleSubscriber", { iccid });
+    if (isManagedSubscriberDenied(auth, data)) {
+      return { ok: false, error: "Subscriber not found" };
+    }
+    return { ok: true };
+  } catch (err7) {
+    return {
+      ok: false,
+      error: err7 instanceof Error ? err7.message : String(err7)
+    };
+  }
+}
+
 // ../../packages/ocs-spec/src/ocs-event-buffer-read.ts
+function ocsEventRingBufferIccidFromDigitsReference(raw) {
+  const digits = raw.replace(/\D/g, "");
+  if (digits.length === 0) {
+    throw new Error("reference must contain at least one digit");
+  }
+  if (digits.length > 20) {
+    return digits.slice(-20);
+  }
+  if (digits.length >= 19) {
+    return digits;
+  }
+  return digits.padStart(19, "0");
+}
+function msisdnFieldFromSubscriberPayload(data) {
+  if (!data || typeof data !== "object") return null;
+  const r = data;
+  const v = r["msisdn"] ?? r["MSISDN"];
+  if (v === void 0 || v === null) return null;
+  if (typeof v === "string") return /\d/.test(v) ? v : null;
+  if (typeof v === "number") return String(v);
+  return null;
+}
+function mergeOcsEventOutputsNewestFirst(parts, limit) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  const combined = [...parts].flat().sort(
+    (x, y) => x.timestamp < y.timestamp ? 1 : x.timestamp > y.timestamp ? -1 : x.event_id.localeCompare(y.event_id)
+  );
+  for (const e of combined) {
+    if (seen.has(e.event_id)) continue;
+    seen.add(e.event_id);
+    out.push(e);
+    if (out.length >= limit) break;
+  }
+  return out;
+}
 async function listRecentOcsEvents(iccid, limit, eventTypes, since, kv) {
   const routingRaw = await kv.get(`iccid:${iccid}`, "json");
   const resellerId = routingRaw?.reseller_id ?? 0;
@@ -10054,7 +10274,8 @@ var listRecentOcsEventsSchema = {
 async function listRecentOcsEvents2(iccid, limit, eventTypes, since, kv) {
   return listRecentOcsEvents(iccid, limit, eventTypes, since, kv);
 }
-function registerListRecentOcsEventsTool(server2, env) {
+function registerListRecentOcsEventsTool(server2, ctx) {
+  const env = ctx.env;
   server2.registerTool(
     "list_recent_ocs_events",
     {
@@ -10070,6 +10291,19 @@ function registerListRecentOcsEventsTool(server2, env) {
     async (args) => {
       const { iccid, limit, event_types, since } = args;
       try {
+        if (managedOwnAccountId(ctx.managedAuth) !== void 0) {
+          const access = await assertManagedIccidAccess(
+            env.CARRIER_OCS_BASE_URL,
+            { token: await ctx.getUserToken(ctx.props.sub), ...ctx.managedAuth },
+            iccid
+          );
+          if (!access.ok) {
+            return {
+              isError: true,
+              content: [{ type: "text", text: access.error }]
+            };
+          }
+        }
         const result2 = await listRecentOcsEvents2(
           iccid,
           limit,
@@ -10187,6 +10421,20 @@ function ok5(payload) {
 function err5(message) {
   return { isError: true, content: [{ type: "text", text: message }] };
 }
+async function ownershipToken(ctx) {
+  if (managedOwnAccountId(ctx.managedAuth) === void 0) return null;
+  return ctx.getUserToken(ctx.props.sub);
+}
+async function ownsEvent(ctx, token2, iccid) {
+  if (token2 === null) return true;
+  if (!iccid) return false;
+  const access = await assertManagedIccidAccess(
+    ctx.env.CARRIER_OCS_BASE_URL,
+    { token: token2, ...ctx.managedAuth },
+    iccid
+  );
+  return access.ok;
+}
 function registerDepletionEventsTool(server2, ctx) {
   server2.registerTool(
     "subscriber_depletion_events",
@@ -10216,6 +10464,14 @@ function registerDepletionEventsTool(server2, ctx) {
         );
       }
       const { subscriberId, since } = args;
+      let scopeToken;
+      try {
+        scopeToken = await ownershipToken(ctx);
+      } catch (e) {
+        return err5(
+          `Could not resolve the OCS credential needed to scope this read: ${e instanceof Error ? e.message : String(e)}`
+        );
+      }
       if (subscriberId) {
         const raw = await kv.get(`bundle-depleted:${subscriberId}`, "text");
         if (!raw) {
@@ -10237,6 +10493,14 @@ function registerDepletionEventsTool(server2, ctx) {
             note: "Stored depletion entry was invalid JSON and was ignored."
           });
         }
+        if (!await ownsEvent(ctx, scopeToken, event.iccid)) {
+          return ok5({
+            subscriber_id: subscriberId,
+            depleted: false,
+            event: null,
+            note: "No bundle depletion event found in the last 7 days."
+          });
+        }
         if (since && event.depletedAt < since) {
           return ok5({
             subscriber_id: subscriberId,
@@ -10273,6 +10537,7 @@ function registerDepletionEventsTool(server2, ctx) {
           try {
             const ev = JSON.parse(raw);
             if (since && ev.depletedAt < since) return;
+            if (!await ownsEvent(ctx, scopeToken, ev.iccid)) return;
             events.push({
               subscriber_id: ev.subscriberId,
               iccid: ev.iccid,
@@ -10310,19 +10575,46 @@ function registerCountryHistoryTool(server2, ctx) {
     },
     wrapHandler(
       "subscriber_country_history",
-      "[country-history:kv]",
+      "getSingleSubscriber",
       "read",
       ctx,
-      async ({ subscriberId, limit }) => {
+      async ({ subscriberId, limit }, token2) => {
         const effectiveLimit = limit ?? 20;
-        const result2 = await listRecentOcsEvents2(
+        const client2 = new OcsClient(ctx.env.CARRIER_OCS_BASE_URL, token2);
+        const subscriberPayload = await client2.call("getSingleSubscriber", {
+          iccid: subscriberId
+        });
+        let syntheticRingIccid = null;
+        const msisdnRaw = msisdnFieldFromSubscriberPayload(subscriberPayload);
+        if (msisdnRaw) {
+          try {
+            const k = ocsEventRingBufferIccidFromDigitsReference(msisdnRaw);
+            if (k !== subscriberId) syntheticRingIccid = k;
+          } catch {
+            syntheticRingIccid = null;
+          }
+        }
+        const primary = await listRecentOcsEvents(
           subscriberId,
           effectiveLimit,
           ["country.entered"],
           void 0,
           ctx.env.OCS_EVENT_ROUTING
         );
-        const countryEvents = result2.events;
+        let countryEvents = primary.events;
+        if (syntheticRingIccid) {
+          const secondary = await listRecentOcsEvents(
+            syntheticRingIccid,
+            effectiveLimit,
+            ["country.entered"],
+            void 0,
+            ctx.env.OCS_EVENT_ROUTING
+          );
+          countryEvents = mergeOcsEventOutputsNewestFirst(
+            [primary.events, secondary.events],
+            effectiveLimit
+          );
+        }
         return {
           content: [
             {
@@ -10340,7 +10632,7 @@ function registerCountryHistoryTool(server2, ctx) {
                     source: e.data["source"] ?? "relay-lu"
                   })),
                   total_country_events: countryEvents.length,
-                  total_in_buffer: result2.total_in_buffer,
+                  total_in_buffer: primary.total_in_buffer,
                   note: countryEvents.length === 0 ? "No cross-border events recorded in the 24h ring-buffer for this subscriber." : void 0
                 },
                 null,
@@ -11906,7 +12198,13 @@ var props = {
 var audit = (_row) => {
 };
 var getUserToken = async (_sub) => token;
-var toolCtx = { env: stdioEnv, props, audit, getUserToken };
+var toolCtx = {
+  env: stdioEnv,
+  props,
+  managedAuth: {},
+  audit,
+  getUserToken
+};
 var server = new McpServer(
   { name: "carrier-mcp", version: CARRIER_VERSION },
   {
@@ -11918,7 +12216,7 @@ registerAllTools(server, toolCtx);
 registerIntelligenceTools(server, toolCtx);
 registerAllBacklogTools(server, toolCtx);
 registerAllCarrierAskTools(server, toolCtx);
-registerListRecentOcsEventsTool(server, stdioEnv);
+registerListRecentOcsEventsTool(server, toolCtx);
 registerRateLimitStatusTool(server, toolCtx);
 registerCountryHistoryTool(server, toolCtx);
 registerDepletionEventsTool(server, toolCtx);