@carrierllc/mcp 0.9.1 → 0.9.2

package/dist/cli.js

@@ -39,7 +39,7 @@ import {
   verifyStorefront,
   walletScreen,
   which
-} from "./chunk-V4CYEMLJ.js";
+} from "./chunk-4XHSOF62.js";
 import {
   copyTree,
   exists,

package/dist/index.js

@@ -37,7 +37,7 @@ import {
   subscriberIdParams,
   usageOverPeriodParams,
   verifyStorefront
-} from "./chunk-V4CYEMLJ.js";
+} from "./chunk-4XHSOF62.js";
 import "./chunk-SHKKVIIA.js";
 
 // src/index.ts
@@ -234,12 +234,12 @@ function body(req) {
     ...req.tools ? { tools: req.tools, tool_choice: { type: "any" } } : {}
   };
 }
-function headersFor(req, accept) {
+function headersFor(attribution, accept) {
   const headers = {
     "Content-Type": "application/json",
     Accept: accept
   };
-  const meta = req.attribution ? requestMetadata(req.attribution) : null;
+  const meta = attribution ? requestMetadata(attribution) : null;
   if (meta) headers[REQUEST_METADATA_HEADER] = JSON.stringify(meta);
   return headers;
 }
@@ -261,27 +261,34 @@ async function fail(resp) {
   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(), req.timeoutMs ?? BEDROCK_TIMEOUT_MS);
+  const timer = setTimeout(() => controller.abort(), opts.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)),
+        headers: headersFor(opts.attribution, "application/json"),
+        body: JSON.stringify(payload),
         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;
+    return await resp.json();
   } finally {
     clearTimeout(timer);
     signal?.removeEventListener("abort", onAbort);
@@ -5528,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",
@@ -5577,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: [
@@ -5719,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)
@@ -6696,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 },
@@ -6892,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 {
@@ -6934,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) {
@@ -6993,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 {
@@ -7103,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(
@@ -7163,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;
@@ -7198,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;
@@ -7240,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) {
@@ -7292,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;
@@ -7330,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;
@@ -7366,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) {
@@ -7415,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) {
@@ -7465,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) {
@@ -7514,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}:
@@ -10014,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;
@@ -10097,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",
     {
@@ -10113,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,
@@ -10230,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",
@@ -10259,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) {
@@ -10280,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,
@@ -10316,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,
@@ -10353,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: [
             {
@@ -10383,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,
@@ -11949,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 },
   {
@@ -11961,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);