@yawlabs/aws-mcp 1.4.1 → 1.5.2

package/dist/index.js

@@ -7,7 +7,11 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -30055,6 +30059,7 @@ var require_turndown_cjs = __commonJS({
 });
 
 // src/index.ts
+import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
 
 // node_modules/zod/v3/helpers/util.js
@@ -53507,7 +53512,7 @@ function setProfile(name) {
   const trimmed = name.trim();
   if (!isValidProfileName(trimmed)) {
     throw new Error(
-      `Invalid profile name '${trimmed}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-], must not start with '-' or '=', no whitespace or shell metacharacters.`
+      `Invalid profile name '${trimmed}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-]; the first char must be a letter, digit, or one of _+,.@: (not '-' or '='); no whitespace or shell metacharacters.`
     );
   }
   sessionProfile = trimmed;
@@ -53546,9 +53551,10 @@ var MAX_ERROR_MSG_BYTES = 8 * 1024;
 var SAFE_NAME_RE = /^[a-z0-9][a-z0-9-]*$/;
 function redactDisplayArgs(args) {
   const out = [...args];
-  const idx = out.indexOf("--cli-input-json");
-  if (idx >= 0 && idx < out.length - 1) {
-    out[idx + 1] = `<redacted len=${out[idx + 1].length}>`;
+  for (let i = 0; i < out.length - 1; i++) {
+    if (out[i] === "--cli-input-json") {
+      out[i + 1] = `<redacted len=${out[i + 1].length}>`;
+    }
   }
   return out;
 }
@@ -53612,7 +53618,7 @@ function runAwsCall(opts) {
     return Promise.resolve({
       ok: false,
       kind: "bad_input",
-      error: `Invalid profile name '${profile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-], must not start with '-' or '='. Check the 'profile' arg or AWS_PROFILE env var.`
+      error: `Invalid profile name '${profile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-]; the first char must be a letter, digit, or one of _+,.@: (not '-' or '='). Check the 'profile' arg or AWS_PROFILE env var.`
     });
   }
   if (!isValidRegionName(region)) {
@@ -53642,6 +53648,13 @@ function runAwsCall(opts) {
     region
   ];
   if (opts.query !== void 0 && opts.query.trim().length > 0) {
+    if (opts.query.length > 2048) {
+      return Promise.resolve({
+        ok: false,
+        kind: "bad_input",
+        error: `query expression too long (${opts.query.length} chars; max 2048). Simplify the JMESPath expression.`
+      });
+    }
     args.push("--query", opts.query);
   }
   if (opts.params !== void 0 && Object.keys(opts.params).length > 0) {
@@ -53838,7 +53851,7 @@ function mergeProfileBody(existingBody, creds) {
       updated.push(line);
       continue;
     }
-    const key = line.slice(0, eqIdx).trim();
+    const key = line.slice(0, eqIdx).trim().toLowerCase();
     if (managedKeys.has(key)) {
       seen.add(key);
       updated.push(`${key} = ${creds[key]}`);
@@ -53973,7 +53986,7 @@ function resolveTargetProfile(input) {
   if (input.targetProfile) {
     return input.targetProfile.startsWith("mcp-") ? input.targetProfile : `mcp-${input.targetProfile}`;
   }
-  return `mcp-${input.sessionName}`;
+  return input.sessionName.startsWith("mcp-") ? input.sessionName : `mcp-${input.sessionName}`;
 }
 var assumeTools = [
   {
@@ -53987,7 +54000,10 @@ var assumeTools = [
       openWorldHint: true
     },
     inputSchema: external_exports3.object({
-      roleArn: external_exports3.string().describe("Target role ARN, e.g. 'arn:aws:iam::123456789012:role/CrossAccountAdmin'."),
+      roleArn: external_exports3.string().regex(
+        /^arn:aws[a-z-]*:iam::[0-9]{12}:role\/.+$/,
+        "roleArn must match arn:aws[partition]:iam::<12-digit-account>:role/<name>"
+      ).describe("Target role ARN, e.g. 'arn:aws:iam::123456789012:role/CrossAccountAdmin'."),
       sessionName: external_exports3.string().min(2).max(64).regex(/^[\w+=,.@-]+$/, "sessionName must match [\\w+=,.@-]").describe("Role session name (shows up in CloudTrail). Alphanumeric + +=,.@- only."),
       durationSeconds: external_exports3.number().int().min(900).max(43200).optional().describe("Session duration in seconds (900-43200). Default 3600."),
       externalId: external_exports3.string().optional().describe("External ID (only required if the role's trust policy demands it)."),
@@ -54008,13 +54024,19 @@ var assumeTools = [
       if (!isValidProfileName(sourceProfile)) {
         return {
           ok: false,
-          error: `Invalid sourceProfile name '${sourceProfile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-], must not start with '-' or '='. Check the 'sourceProfile' arg or AWS_PROFILE env var.`
+          error: `Invalid sourceProfile name '${sourceProfile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-]; the first char must be a letter, digit, or one of _+,.@: (not '-' or '='). Check the 'sourceProfile' arg or AWS_PROFILE env var.`
         };
       }
       if (!isValidProfileName(targetProfile)) {
         return {
           ok: false,
-          error: `Invalid targetProfile name '${targetProfile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-], must not start with '-' or '='. Pick a different targetProfile or sessionName.`
+          error: `Invalid targetProfile name '${targetProfile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-]; the first char must be a letter, digit, or one of _+,.@: (not '-' or '='). Pick a different targetProfile or sessionName.`
+        };
+      }
+      if (!/^arn:aws[a-z-]*:iam::[0-9]{12}:role\/.+$/.test(i.roleArn)) {
+        return {
+          ok: false,
+          error: `Invalid roleArn '${i.roleArn}'. Must match arn:aws[partition]:iam::<12-digit-account>:role/<name>, e.g. 'arn:aws:iam::123456789012:role/CrossAccountAdmin'.`
         };
       }
       const params = {
@@ -54044,7 +54066,7 @@ var assumeTools = [
             error: `SSO session expired for source profile '${sourceProfile}'. Call aws_login_start with profile='${sourceProfile}' before assuming.`
           };
         }
-        return { ok: false, error: result.error, rawBody: result.rawStderr ?? result.rawStdout };
+        return { ok: false, error: result.error, rawBody: result.rawStderr };
       }
       const data = result.data ?? {};
       const creds = data.Credentials;
@@ -54052,11 +54074,22 @@ var assumeTools = [
         return { ok: false, error: "STS AssumeRole succeeded but returned incomplete credentials." };
       }
       const credentialsPath = join(homedir(), ".aws", "credentials");
-      await upsertProfile(credentialsPath, targetProfile, {
-        aws_access_key_id: creds.AccessKeyId,
-        aws_secret_access_key: creds.SecretAccessKey,
-        aws_session_token: creds.SessionToken
-      });
+      try {
+        await upsertProfile(credentialsPath, targetProfile, {
+          aws_access_key_id: creds.AccessKeyId,
+          aws_secret_access_key: creds.SecretAccessKey,
+          aws_session_token: creds.SessionToken
+        });
+      } catch (err) {
+        const code = err.code;
+        if (code === "EACCES" || code === "EROFS" || code === "EPERM") {
+          return {
+            ok: false,
+            error: `Cannot write ${credentialsPath} (permission denied). Check directory permissions or set AWS_SHARED_CREDENTIALS_FILE to a writable path.`
+          };
+        }
+        throw err;
+      }
       const expiration = creds.Expiration;
       return {
         ok: true,
@@ -54111,7 +54144,7 @@ function startSsoLogin(profile, opts = {}) {
   if (!isValidProfileName(profile)) {
     return Promise.resolve({
       ok: false,
-      error: `Invalid profile name '${profile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-], must not start with '-' or '='.`
+      error: `Invalid profile name '${profile}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-]; the first char must be a letter, digit, or one of _+,.@: (not '-' or '=').`
     });
   }
   const key = dedupeKey(profile, opts);
@@ -54157,6 +54190,7 @@ function doStartSsoLogin(profile, opts) {
     let codeSeen = null;
     let settled = false;
     let registeredSession = null;
+    let exitResult = null;
     let completionResolve;
     const completion = new Promise((res) => {
       completionResolve = res;
@@ -54254,14 +54288,17 @@ ${stderrBuf}` : "");
           rawOutput
         };
       }
+      exitResult = result;
       completionResolve(result);
+    });
+    proc.on("close", () => {
       if (!settled) {
         settled = true;
         clearTimeout(urlTimeout);
         resolve({
           ok: false,
-          error: result.error ?? "aws sso login exited before printing a verification URL",
-          rawOutput: result.rawOutput
+          error: exitResult?.error ?? "aws sso login exited before printing a verification URL",
+          rawOutput: exitResult?.rawOutput
         });
       }
     });
@@ -54820,6 +54857,7 @@ function parseSearchResults(json2, limit) {
     const t = tes;
     const url2 = typeof t.link === "string" ? t.link : void 0;
     if (!url2) continue;
+    if (!isValidDocsUrl(url2)) continue;
     const title = typeof t.title === "string" ? t.title : url2;
     const result = { title, url: url2 };
     if (typeof t.summary === "string" && t.summary.length > 0) result.summary = t.summary;
@@ -54965,7 +55003,7 @@ function buildDocsTools(fetchImpl = fetch) {
       }),
       handler: async (input) => {
         const i = input;
-        const limit = i.limit ?? DEFAULT_SEARCH_LIMIT;
+        const limit = Math.min(Math.max(1, i.limit ?? DEFAULT_SEARCH_LIMIT), MAX_SEARCH_LIMIT);
         let response;
         try {
           response = await fetchWithTimeout(
@@ -55035,7 +55073,7 @@ function buildDocsTools(fetchImpl = fetch) {
         openWorldHint: true
       },
       inputSchema: external_exports3.object({
-        url: external_exports3.string().min(1).describe(
+        url: external_exports3.string().min(1).max(2048).describe(
           "AWS docs page URL: https://docs.aws.amazon.com/<...>.html. Usually from an aws_docs_search result."
         ),
         startIndex: external_exports3.number().int().min(0).optional().describe("Character offset to start from (for paginated reads). Default 0."),
@@ -55049,8 +55087,8 @@ function buildDocsTools(fetchImpl = fetch) {
             error: `Invalid url '${i.url}'. Must be an 'https://docs.aws.amazon.com/...html' page. Use aws_docs_search to find one.`
           };
         }
-        const startIndex = i.startIndex ?? 0;
-        const maxLength = i.maxLength ?? DEFAULT_MAX_LENGTH;
+        const startIndex = Math.max(0, i.startIndex ?? 0);
+        const maxLength = Math.min(Math.max(1, i.maxLength ?? DEFAULT_MAX_LENGTH), MAX_MAX_LENGTH);
         let markdown = docCache.get(i.url);
         let cached2 = true;
         if (markdown === void 0) {
@@ -55135,9 +55173,25 @@ function parseSimulationResults(raw) {
     const matched = Array.isArray(er.MatchedStatements) ? er.MatchedStatements : [];
     const ids = [];
     for (const m of matched) {
-      if (m && typeof m === "object" && typeof m.SourcePolicyId === "string") {
-        ids.push(m.SourcePolicyId);
+      if (!m || typeof m !== "object") continue;
+      const ms = m;
+      const sourceId = ms.SourcePolicyId;
+      if (typeof sourceId === "string" && sourceId.length > 0) {
+        ids.push(sourceId);
+        continue;
       }
+      if (sourceId !== void 0 && sourceId !== "") continue;
+      const sourceType = ms.SourcePolicyType;
+      if (typeof sourceType !== "string") continue;
+      const startPos = ms.StartPosition;
+      if (startPos && typeof startPos === "object") {
+        const line = startPos.Line;
+        if (typeof line === "number") {
+          ids.push(`inline#L${line}`);
+          continue;
+        }
+      }
+      ids.push("inline");
     }
     if (ids.length > 0) result.matchedStatementIds = ids;
     const missing = Array.isArray(er.MissingContextValues) ? er.MissingContextValues : [];
@@ -55165,7 +55219,7 @@ function parseSimulationResults(raw) {
 var iamSimulateTools = [
   {
     name: "aws_iam_simulate",
-    description: "Simulate IAM permissions for a principal: can principal X do actions Y on resources Z? Wraps `iam simulate-principal-policy`. Returns one entry per (action, resource) pair with `decision` (allowed / explicitDeny / implicitDeny), `matchedStatementIds` (which IAM statements decided), and `missingContextValues` (context keys the policy needed but you didn't provide -- common for tag-based policies). Use this BEFORE a risky operation to avoid a 403; pairs with the post-failure Suggestion you get from aws_call. Requires iam:SimulatePrincipalPolicy on the caller.",
+    description: "Simulate IAM permissions for a principal: can principal X do actions Y on resources Z? Wraps `iam simulate-principal-policy`. Returns one entry per (action, resource) pair with `decision` (allowed / explicitDeny / implicitDeny / unknown -- unknown is the malformed-response fallback when EvalDecision is missing or unrecognised), `matchedStatementIds` (which IAM statements decided), and `missingContextValues` (context keys the policy needed but you didn't provide -- common for tag-based policies). Use this BEFORE a risky operation to avoid a 403; pairs with the post-failure Suggestion you get from aws_call. Requires iam:SimulatePrincipalPolicy on the caller.",
     annotations: {
       title: "Simulate IAM permissions for a principal",
       readOnlyHint: true,
@@ -55175,13 +55229,13 @@ var iamSimulateTools = [
     },
     inputSchema: external_exports3.object({
       principalArn: external_exports3.string().min(1).describe(
-        "ARN of the principal whose policies you want to evaluate, e.g. 'arn:aws:iam::123456789012:user/jeff' or 'arn:aws:iam::123:role/my-role'."
+        "ARN of the principal whose policies you want to evaluate, e.g. 'arn:aws:iam::123456789012:user/jeff' or 'arn:aws:iam::123456789012:role/my-role'."
       ),
       actions: external_exports3.array(external_exports3.string().min(1)).min(1).max(50).describe(
         "IAM action names to test, e.g. ['lambda:CreateFunction', 's3:GetObject']. 1-50 entries. Wildcards (e.g. 's3:*') are accepted."
       ),
       resources: external_exports3.array(external_exports3.string().min(1)).optional().describe(
-        "Resource ARNs to test against, e.g. ['arn:aws:s3:::my-bucket/*']. Omit to default to ['*'] (best-case 'is this action ever allowed?')."
+        "Resource ARNs to test against, e.g. ['arn:aws:s3:::my-bucket/*']. When omitted, AWS applies its own default of ['*'] server-side (best-case 'is this action ever allowed?') -- this tool does not inject a ['*'] itself."
       ),
       contextEntries: external_exports3.array(
         external_exports3.object({
@@ -55251,13 +55305,14 @@ var iamSimulateTools = [
       const raw = result.data;
       const results = parseSimulationResults(raw?.EvaluationResults);
       const allowed = results.filter((r) => r.decision === "allowed").length;
-      const denied = results.length - allowed;
+      const unknown2 = results.filter((r) => r.decision === "unknown").length;
+      const denied = results.length - allowed - unknown2;
       return {
         ok: true,
         data: {
           command: result.command,
           principalArn: i.principalArn,
-          summary: { allowed, denied, total: results.length },
+          summary: { allowed, denied, unknown: unknown2, total: results.length },
           results,
           evaluationResults: raw?.EvaluationResults ?? []
         }
@@ -55347,6 +55402,12 @@ var logsTools = [
           error: `Invalid logStreamNamePrefix '${i.logStreamNamePrefix}'. Must be 1-512 chars, not start with '-', and contain no ':', '*', or control characters.`
         };
       }
+      if (i.filterPattern?.startsWith("-")) {
+        return {
+          ok: false,
+          error: "Invalid filterPattern: must not start with '-'."
+        };
+      }
       const extraFlags = [i.logGroupName, "--format", "json", "--since", i.since ?? "10m"];
       if (i.filterPattern) extraFlags.push("--filter-pattern", i.filterPattern);
       if (i.logStreamNames && i.logStreamNames.length > 0) {
@@ -55384,454 +55445,6 @@ var logsTools = [
   }
 ];
 
-// src/tools/paginate.ts
-function extractNextToken(data) {
-  if (data && typeof data === "object" && "NextToken" in data) {
-    const token = data.NextToken;
-    if (typeof token === "string" && token.length > 0) return token;
-  }
-  return null;
-}
-function wrapQueryForPagination(userQuery) {
-  return `{NextToken: NextToken, items: ${userQuery}}`;
-}
-var paginateTools = [
-  {
-    name: "aws_paginate",
-    description: "Fetch one page of a paginated AWS list/describe operation. Identical to aws_call plus `maxItems` (page size) and `startingToken` (resume cursor). Returns the parsed response, a `nextToken` (null when the list is exhausted), and `hasMore`. Call again with the returned nextToken as startingToken until hasMore is false. Use this instead of aws_call for operations that might exceed the 5 MB stdout cap: list-objects-v2, describe-instances, describe-log-streams, list-roles, etc.",
-    annotations: {
-      title: "Fetch one page of a paginated AWS operation",
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: true
-    },
-    inputSchema: external_exports3.object({
-      service: external_exports3.string().describe("AWS service in kebab-case: 's3api', 'ec2', 'iam', 'logs', etc."),
-      operation: external_exports3.string().describe("Paginated operation: 'list-objects-v2', 'describe-instances', 'list-roles', etc."),
-      params: external_exports3.record(external_exports3.string(), external_exports3.unknown()).optional().describe("Operation parameters (PascalCase keys) passed via --cli-input-json."),
-      query: external_exports3.string().optional().describe(
-        "JMESPath expression to extract fields from each page (--query). The query is wrapped server-side as {NextToken, items: <query>} so pagination still works even when the projection drops NextToken; the handler unwraps `items` before returning."
-      ),
-      maxItems: external_exports3.number().int().positive().optional().describe("Items per page. Default 100. Lower this if hitting the 5 MB output cap."),
-      startingToken: external_exports3.string().optional().describe("Resume cursor from the previous call's `nextToken`. Omit for the first page."),
-      profile: external_exports3.string().optional().describe("Override session profile for this call."),
-      region: external_exports3.string().optional().describe("Override session region for this call."),
-      timeoutMs: external_exports3.number().int().positive().optional().describe("Timeout in milliseconds. Default 60000.")
-    }),
-    handler: async (input) => {
-      const i = input;
-      const maxItems = i.maxItems ?? 100;
-      const extraFlags = ["--max-items", String(maxItems)];
-      if (i.startingToken) {
-        extraFlags.push("--starting-token", i.startingToken);
-      }
-      const userQuery = i.query?.trim();
-      const queryWrapped = userQuery ? wrapQueryForPagination(userQuery) : void 0;
-      const result = await runAwsCall({
-        service: i.service,
-        operation: i.operation,
-        params: i.params,
-        query: queryWrapped,
-        profile: i.profile,
-        region: i.region,
-        outputFormat: "json",
-        timeoutMs: i.timeoutMs,
-        extraFlags
-      });
-      if (!result.ok) {
-        return { ok: false, error: result.error, rawBody: result.rawStderr ?? result.rawStdout };
-      }
-      let resultBody;
-      let nextToken;
-      if (queryWrapped) {
-        const wrapped = result.data ?? {};
-        nextToken = extractNextToken(wrapped);
-        resultBody = wrapped.items ?? null;
-      } else {
-        nextToken = extractNextToken(result.data);
-        resultBody = result.data;
-      }
-      return {
-        ok: true,
-        data: {
-          command: result.command,
-          result: resultBody,
-          nextToken,
-          hasMore: nextToken !== null
-        }
-      };
-    }
-  }
-];
-
-// src/tools/metrics.ts
-var SIMPLE_STATS = ["Average", "Sum", "Maximum", "Minimum", "SampleCount"];
-var EXTENDED_STAT_RE = /^(p|tm|tc|wm|pr|ts|iqm)(\d{1,3}(\.\d{1,3})?)?$/i;
-function isValidStatistic(s) {
-  const lower = s.toLowerCase();
-  if (SIMPLE_STATS.some((stat) => stat.toLowerCase() === lower)) return true;
-  return EXTENDED_STAT_RE.test(s);
-}
-function canonicalizeStatistic(s) {
-  const lower = s.toLowerCase();
-  for (const stat of SIMPLE_STATS) {
-    if (stat.toLowerCase() === lower) return stat;
-  }
-  if (EXTENDED_STAT_RE.test(s)) return lower;
-  return s;
-}
-var QUERY_ID_RE = /^[a-z][A-Za-z0-9_]*$/;
-var MAX_QUERIES = 100;
-var CLOUDWATCH_MAX_DATAPOINTS = 100800;
-var PERIOD_3H_MS = 3 * 60 * 60 * 1e3;
-var PERIOD_24H_MS = 24 * 60 * 60 * 1e3;
-var PERIOD_15D_MS = 15 * 24 * 60 * 60 * 1e3;
-function pickAutoPeriodSeconds(startMs, endMs) {
-  const rangeMs = Math.max(0, endMs - startMs);
-  if (rangeMs <= PERIOD_3H_MS) return 60;
-  if (rangeMs <= PERIOD_24H_MS) return 300;
-  if (rangeMs <= PERIOD_15D_MS) return 900;
-  return 3600;
-}
-var RELATIVE_TIME_RE = /^\d+[smhdw]$/;
-var UNIT_MS = {
-  s: 1e3,
-  m: 60 * 1e3,
-  h: 60 * 60 * 1e3,
-  d: 24 * 60 * 60 * 1e3,
-  w: 7 * 24 * 60 * 60 * 1e3
-};
-function resolveTime(input, now) {
-  if (input === "now") return new Date(now);
-  const rel = input.match(RELATIVE_TIME_RE);
-  if (rel) {
-    const num = Number(input.slice(0, -1));
-    const unit = input.slice(-1);
-    const ms = UNIT_MS[unit];
-    if (!ms || !Number.isFinite(num)) return null;
-    return new Date(now - num * ms);
-  }
-  const t = new Date(input);
-  if (Number.isNaN(t.getTime())) return null;
-  return t;
-}
-function buildMetricDataQueries(inputs, autoPeriod) {
-  return inputs.map((q) => {
-    const base = { Id: q.id };
-    if (q.label !== void 0) base.Label = q.label;
-    if (q.returnData !== void 0) base.ReturnData = q.returnData;
-    if (q.expression !== void 0) {
-      base.Expression = q.expression;
-      if (q.period !== void 0) base.Period = q.period;
-      return base;
-    }
-    const dimensions = q.dimensions ? Object.entries(q.dimensions).map(([Name, Value]) => ({ Name, Value })) : void 0;
-    const stat = {
-      Metric: {
-        Namespace: q.namespace,
-        MetricName: q.metricName,
-        ...dimensions ? { Dimensions: dimensions } : {}
-      },
-      Period: q.period ?? autoPeriod,
-      Stat: q.statistic !== void 0 ? canonicalizeStatistic(q.statistic) : "Average"
-    };
-    if (q.unit !== void 0) stat.Unit = q.unit;
-    base.MetricStat = stat;
-    return base;
-  });
-}
-var metricsTools = [
-  {
-    name: "aws_metrics_query",
-    description: "Query CloudWatch metrics via GetMetricData (the modern multi-metric / expression-capable API, not the legacy get-metric-statistics). Pass `queries` as a flat array of {id, namespace, metricName, dimensions?, statistic?, period?, expression?, label?}; the tool shapes them into MetricDataQueries for you. `startTime`/`endTime` accept ISO 8601 or relative shorthand ('15m', '1h', '1d', '1w'); endTime defaults to 'now'. Period is auto-picked from the time range when omitted (60s for <=3h, 300s for <=24h, 900s for <=15d, 3600s otherwise) to stay under CloudWatch's ~100,800-datapoint response cap. Returns {series: [{id, label?, timestamps, values, period?, statusCode?}], messages?, periodSeconds, profile, region, nextToken, hasMore}. Each series' `period` is the effective granularity for that query (its explicit period, or the auto-pick it inherited); it is omitted for an expression query that didn't set one. The top-level `periodSeconds` is always the auto-pick. When CloudWatch truncates a large response, `hasMore` is true and `nextToken` carries the resume cursor -- call again with `nextToken` set to fetch the next page (rare for typical agent queries that stay within the per-request cap). Use for 'show me the CPU on this instance for the last hour', 'sum lambda invocations across these 3 functions', or expression-based 'p99 latency divided by average latency' lookups.",
-    annotations: {
-      title: "Query CloudWatch metrics (GetMetricData)",
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: true
-    },
-    inputSchema: external_exports3.object({
-      queries: external_exports3.array(
-        external_exports3.object({
-          id: external_exports3.string().regex(QUERY_ID_RE, "id must match /^[a-z][A-Za-z0-9_]*$/ (CloudWatch's MetricDataQuery.Id contract)"),
-          namespace: external_exports3.string().min(1).optional().describe("AWS metric namespace, e.g. 'AWS/Lambda', 'AWS/EC2'. Required unless `expression` is set."),
-          metricName: external_exports3.string().min(1).optional().describe("Metric name, e.g. 'Invocations', 'CPUUtilization'. Required unless `expression` is set."),
-          dimensions: external_exports3.record(external_exports3.string(), external_exports3.string()).optional().describe("Dimension Name -> Value map, e.g. {FunctionName: 'my-fn'}."),
-          statistic: external_exports3.string().optional().describe(
-            "Statistic: Average | Sum | Maximum | Minimum | SampleCount, or an extended stat like 'p99', 'p99.9', 'tm95'. Default 'Average'."
-          ),
-          period: external_exports3.number().int().positive().optional().describe("Period in seconds. Defaults to an auto-pick from the time range (60s/300s/900s/3600s)."),
-          expression: external_exports3.string().min(1).optional().describe(
-            `CloudWatch metric math expression, e.g. 'SUM([m1, m2])' or 'AVG(METRICS("AWS/Lambda"))'. Mutually exclusive with namespace/metricName/dimensions.`
-          ),
-          label: external_exports3.string().optional().describe("Human-readable label for the series in the response."),
-          returnData: external_exports3.boolean().optional().describe(
-            "Set false to compute this query but not return its data (useful for intermediate values in expressions). Default true."
-          ),
-          unit: external_exports3.string().optional().describe(
-            "Restrict to a specific Unit (e.g. 'Seconds', 'Bytes'). Default: no filter. Only meaningful on metric-stat queries."
-          )
-        })
-      ).min(1).max(MAX_QUERIES).describe(`1-${MAX_QUERIES} queries. Each is either a metric-stat (namespace + metricName) or an expression.`),
-      startTime: external_exports3.string().optional().describe("ISO 8601 timestamp or relative shorthand ('15m', '1h', '1d', '1w'). Default '1h' (one hour ago)."),
-      endTime: external_exports3.string().optional().describe("ISO 8601 timestamp or relative shorthand. Default 'now'."),
-      scanBy: external_exports3.enum(["TimestampAscending", "TimestampDescending"]).optional().describe("Sort order for returned datapoints. Default 'TimestampDescending' (matches CloudWatch's default)."),
-      maxDataPoints: external_exports3.number().int().positive().optional().describe(
-        "Target datapoint count. CloudWatch does not truncate to the first N points -- it widens (coarsens) the period server-side so the series aggregates down to fit this many points. CloudWatch's own ceiling is ~100,800; lower this to make CloudWatch return a coarser, smaller series. Forwarded as CloudWatch's MaxDatapoints (single 'p') field; the camelCase schema name follows this server's convention."
-      ),
-      nextToken: external_exports3.string().optional().describe(
-        "Resume cursor from a previous call's `nextToken`. Omit for the first page. Forwarded as CloudWatch's NextToken; only meaningful when a prior call returned `hasMore: true`."
-      ),
-      profile: external_exports3.string().optional().describe("Override session profile for this call."),
-      region: external_exports3.string().optional().describe("Override session region for this call."),
-      timeoutMs: external_exports3.number().int().positive().optional().describe("Timeout in milliseconds. Default 60000 (60s).")
-    }),
-    handler: async (input) => {
-      const i = input;
-      const seenIds = /* @__PURE__ */ new Map();
-      for (let qi = 0; qi < i.queries.length; qi++) {
-        const q = i.queries[qi];
-        const firstIdx = seenIds.get(q.id);
-        if (firstIdx !== void 0) {
-          return {
-            ok: false,
-            error: `Duplicate query id '${q.id}' at queries[${qi}]; first seen at queries[${firstIdx}]. Each MetricDataQuery.Id must be unique in a batch.`
-          };
-        }
-        seenIds.set(q.id, qi);
-        const hasMetricStat = q.namespace !== void 0 || q.metricName !== void 0 || q.dimensions !== void 0;
-        const hasExpression = q.expression !== void 0;
-        if (hasMetricStat && hasExpression) {
-          return {
-            ok: false,
-            error: `Query '${q.id}' mixes metric-stat fields (namespace/metricName/dimensions) with 'expression'. Pick one shape per query.`
-          };
-        }
-        if (!hasMetricStat && !hasExpression) {
-          return {
-            ok: false,
-            error: `Query '${q.id}' has neither metric-stat (namespace+metricName) nor 'expression'. One is required.`
-          };
-        }
-        if (hasMetricStat && (q.namespace === void 0 || q.metricName === void 0)) {
-          return {
-            ok: false,
-            error: `Query '${q.id}' must include BOTH 'namespace' and 'metricName' (or use 'expression' instead).`
-          };
-        }
-        if (q.statistic !== void 0 && !isValidStatistic(q.statistic)) {
-          return {
-            ok: false,
-            error: `Query '${q.id}' has invalid statistic '${q.statistic}'. Use Average | Sum | Maximum | Minimum | SampleCount, or an extended stat like p99 / p99.9 / tm95.`
-          };
-        }
-      }
-      const now = Date.now();
-      const startStr = i.startTime ?? "1h";
-      const endStr = i.endTime ?? "now";
-      const startDate = resolveTime(startStr, now);
-      const endDate = resolveTime(endStr, now);
-      if (!startDate) {
-        return {
-          ok: false,
-          error: `Invalid startTime '${startStr}'. Use ISO 8601 (e.g. '2026-05-16T10:00:00Z') or relative shorthand (e.g. '1h', '15m', '1d').`
-        };
-      }
-      if (!endDate) {
-        return {
-          ok: false,
-          error: `Invalid endTime '${endStr}'. Use ISO 8601 or relative shorthand, or 'now' for the current moment.`
-        };
-      }
-      if (endDate.getTime() <= startDate.getTime()) {
-        return {
-          ok: false,
-          error: `endTime (${endDate.toISOString()}) must be after startTime (${startDate.toISOString()}).`
-        };
-      }
-      const rangeSeconds = (endDate.getTime() - startDate.getTime()) / 1e3;
-      for (const q of i.queries) {
-        if (q.period === void 0) continue;
-        if (q.period <= 0 || q.period % 60 !== 0) {
-          return {
-            ok: false,
-            error: `Query '${q.id}' has invalid period ${q.period}. CloudWatch requires period to be a positive multiple of 60 (seconds).`
-          };
-        }
-        const datapoints = Math.ceil(rangeSeconds / q.period);
-        if (datapoints > CLOUDWATCH_MAX_DATAPOINTS) {
-          return {
-            ok: false,
-            error: `Query '${q.id}' with period ${q.period}s over the requested range (${startDate.toISOString()} to ${endDate.toISOString()}) would request ${datapoints} datapoints, exceeding CloudWatch's per-request cap of ${CLOUDWATCH_MAX_DATAPOINTS}. Widen the period or narrow the time range.`
-          };
-        }
-      }
-      const periodSeconds = pickAutoPeriodSeconds(startDate.getTime(), endDate.getTime());
-      const metricDataQueries = buildMetricDataQueries(i.queries, periodSeconds);
-      const params = {
-        MetricDataQueries: metricDataQueries,
-        StartTime: startDate.toISOString(),
-        EndTime: endDate.toISOString(),
-        ScanBy: i.scanBy ?? "TimestampDescending"
-      };
-      if (i.maxDataPoints !== void 0) params.MaxDatapoints = i.maxDataPoints;
-      if (i.nextToken !== void 0) params.NextToken = i.nextToken;
-      const effectiveProfile = i.profile ?? getProfile();
-      const effectiveRegion = i.region ?? getRegion();
-      const result = await runAwsCall({
-        service: "cloudwatch",
-        operation: "get-metric-data",
-        profile: i.profile,
-        region: i.region,
-        timeoutMs: i.timeoutMs,
-        outputFormat: "json",
-        params
-      });
-      if (!result.ok) {
-        return { ok: false, error: result.error, rawBody: result.rawStderr ?? result.rawStdout };
-      }
-      const raw = result.data ?? {};
-      const queryById = new Map(i.queries.map((q) => [q.id, q]));
-      const series = (raw.MetricDataResults ?? []).map((r) => {
-        const q = queryById.get(r.Id ?? "");
-        const effectivePeriod = q?.period ?? (q && q.expression === void 0 ? periodSeconds : void 0);
-        return {
-          id: r.Id ?? "",
-          ...r.Label !== void 0 ? { label: r.Label } : {},
-          timestamps: r.Timestamps ?? [],
-          values: r.Values ?? [],
-          ...effectivePeriod !== void 0 ? { period: effectivePeriod } : {},
-          ...r.StatusCode !== void 0 ? { statusCode: r.StatusCode } : {}
-        };
-      });
-      const messages = raw.Messages?.filter((m) => m.Code || m.Value).map((m) => ({
-        code: m.Code,
-        value: m.Value
-      }));
-      const nextToken = extractNextToken(raw);
-      return {
-        ok: true,
-        data: {
-          command: result.command,
-          profile: effectiveProfile,
-          region: effectiveRegion,
-          startTime: startDate.toISOString(),
-          endTime: endDate.toISOString(),
-          periodSeconds,
-          series,
-          nextToken,
-          hasMore: nextToken !== null,
-          ...messages && messages.length > 0 ? { messages } : {}
-        }
-      };
-    }
-  }
-];
-
-// src/tools/multi-region.ts
-var DEFAULT_CONCURRENCY = 8;
-var MAX_CONCURRENCY = 32;
-var MAX_REGIONS = 32;
-async function runWithConcurrency(inputs, concurrency, fn) {
-  const results = new Array(inputs.length);
-  let next = 0;
-  const worker = async () => {
-    while (true) {
-      const i = next++;
-      if (i >= inputs.length) return;
-      results[i] = await fn(inputs[i], i);
-    }
-  };
-  const workerCount = Math.min(concurrency, inputs.length);
-  await Promise.all(Array.from({ length: workerCount }, () => worker()));
-  return results;
-}
-var multiRegionTools = [
-  {
-    name: "aws_multi_region",
-    description: "Run the same AWS API operation across multiple regions in parallel. Same shape as aws_call (service, operation, params?, query?, outputFormat?, timeoutMs?) but takes `regions: string[]` instead of `region`. Returns an array of `{region, ok, data?, command?, error?, errorKind?}` -- partial failure is expected (services aren't everywhere, perms may be region-scoped). Duplicate regions in the input are collapsed (first occurrence wins), so `results.length` may be less than `regions.length`; use the returned `regionCount` for the actual count run. Use for fleet-wide reads: 'describe-instances across all our regions', 'list buckets in every region', 'check IAM password policy everywhere'.",
-    annotations: {
-      title: "Run an AWS operation across multiple regions in parallel",
-      // The operation can be anything -- we conservatively annotate as not
-      // read-only / not destructive. The caller chooses what to invoke.
-      readOnlyHint: false,
-      destructiveHint: false,
-      idempotentHint: false,
-      openWorldHint: true
-    },
-    inputSchema: external_exports3.object({
-      service: external_exports3.string().describe("AWS service in kebab-case: 's3api', 'ec2', 'iam', etc."),
-      operation: external_exports3.string().describe("Operation in kebab-case: 'describe-instances', 'list-buckets', etc."),
-      regions: external_exports3.array(external_exports3.string().min(1)).min(1).max(MAX_REGIONS).describe(
-        `Region IDs (e.g. ['us-east-1','us-west-2','eu-west-1']). 1-${MAX_REGIONS}. Validated for argv-safety; a bad region name yields a clear per-region error and skips its CLI spawn (per-region isolation comes from each region being a separate call, not from this pre-check).`
-      ),
-      params: external_exports3.record(external_exports3.string(), external_exports3.unknown()).optional().describe("Operation parameters (PascalCase keys) -- same shape as aws_call."),
-      query: external_exports3.string().optional().describe("JMESPath expression for --query (server-side trimming per region)."),
-      outputFormat: external_exports3.enum(["json", "text", "table", "yaml"]).optional().describe("Output format. Default 'json'."),
-      profile: external_exports3.string().optional().describe("Override session profile for the batch."),
-      timeoutMs: external_exports3.number().int().positive().optional().describe("Timeout in ms applied PER region. Default 60000."),
-      concurrency: external_exports3.number().int().positive().max(MAX_CONCURRENCY).optional().describe(`Max regions in flight at once (1-${MAX_CONCURRENCY}). Default ${DEFAULT_CONCURRENCY}.`)
-    }),
-    handler: async (input) => {
-      const i = input;
-      const seen = /* @__PURE__ */ new Set();
-      const regions = [];
-      for (const r of i.regions) {
-        if (!seen.has(r)) {
-          seen.add(r);
-          regions.push(r);
-        }
-      }
-      const concurrency = i.concurrency ?? DEFAULT_CONCURRENCY;
-      const results = await runWithConcurrency(regions, concurrency, async (region) => {
-        if (!isValidRegionName(region)) {
-          return {
-            region,
-            ok: false,
-            error: `Invalid region '${region}'. Must match ${REGION_NAME_RE} (e.g. 'us-east-1').`,
-            errorKind: "bad_input"
-          };
-        }
-        const r = await runAwsCall({
-          service: i.service,
-          operation: i.operation,
-          params: i.params,
-          query: i.query,
-          profile: i.profile,
-          region,
-          outputFormat: i.outputFormat,
-          timeoutMs: i.timeoutMs
-        });
-        if (!r.ok) {
-          return {
-            region,
-            ok: false,
-            command: r.command,
-            error: r.error,
-            errorKind: r.kind
-          };
-        }
-        return { region, ok: true, command: r.command, data: r.data };
-      });
-      const okCount = results.filter((r) => r.ok).length;
-      const errCount = results.length - okCount;
-      return {
-        ok: true,
-        data: {
-          service: i.service,
-          operation: i.operation,
-          regionCount: regions.length,
-          okCount,
-          errorCount: errCount,
-          results
-        }
-      };
-    }
-  }
-];
-
 // src/tools/resource.ts
 var TYPE_NAME_RE = /^[A-Z][A-Za-z0-9]*::[A-Z][A-Za-z0-9]*::[A-Z][A-Za-z0-9]*$/;
 function isValidIdentifier(id) {
@@ -56415,6 +56028,11 @@ function _applyJsonPatchInPlace(doc, ops) {
       throw new Error(`op '${op.op}' at index ${i} is not implemented in aws_resource_diff (use add/remove/replace).`);
     }
     const tokens = parseJsonPointer(op.path);
+    for (const seg of tokens) {
+      if (seg === "__proto__" || seg === "constructor" || seg === "prototype") {
+        throw new Error(`Path '${op.path}' contains reserved segment '${seg}' at op index ${i}.`);
+      }
+    }
     if (tokens.length === 0) {
       if (op.op === "remove") {
         throw new Error(`Cannot remove the document root at index ${i}.`);
@@ -56439,7 +56057,7 @@ function _applyJsonPatchInPlace(doc, ops) {
         }
         parent = parent[idx];
       } else if (isObj(parent)) {
-        if (!(segment in parent)) {
+        if (!Object.hasOwn(parent, segment)) {
           if (op.op === "add") {
             parent[segment] = {};
             parent = parent[segment];
@@ -56482,12 +56100,12 @@ function _applyJsonPatchInPlace(doc, ops) {
       }
     } else if (isObj(parent)) {
       if (op.op === "remove") {
-        if (!(lastToken in parent)) {
+        if (!Object.hasOwn(parent, lastToken)) {
           throw new Error(`Cannot remove missing key '${lastToken}' at index ${i}.`);
         }
         delete parent[lastToken];
       } else if (op.op === "replace") {
-        if (!(lastToken in parent)) {
+        if (!Object.hasOwn(parent, lastToken)) {
           throw new Error(`Cannot replace missing key '${lastToken}' at index ${i} (use 'add' to create it).`);
         }
         parent[lastToken] = clone2(op.value);
@@ -56511,10 +56129,6 @@ function summarizePatch(ops, before, after) {
   }
   const out = [];
   for (const op of ops) {
-    if (op.op === "move" || op.op === "copy" || op.op === "test") {
-      out.push({ op: "replace", path: op.path });
-      continue;
-    }
     const beforeAt = resolvePointer(before, op.path);
     let afterAt;
     if (replayOk) {
@@ -56559,12 +56173,473 @@ function resolvePointer(doc, pointer) {
   return cur;
 }
 
+// src/tools/paginate.ts
+function extractNextToken(data) {
+  if (data && typeof data === "object" && "NextToken" in data) {
+    const token = data.NextToken;
+    if (typeof token === "string" && token.length > 0) return token;
+  }
+  return null;
+}
+function wrapQueryForPagination(userQuery) {
+  return `{NextToken: NextToken, items: ${userQuery}}`;
+}
+var paginateTools = [
+  {
+    name: "aws_paginate",
+    description: "Fetch one page of a paginated AWS list/describe operation. Identical to aws_call plus `maxItems` (page size) and `startingToken` (resume cursor). When `query` is supplied it is wrapped server-side as {NextToken, items: <query>} so pagination survives a projection that would otherwise drop NextToken; the handler unwraps `items` before returning. Returns the parsed response, a `nextToken` (null when the list is exhausted), and `hasMore`. Call again with the returned nextToken as startingToken until hasMore is false. Use this instead of aws_call for operations that might exceed the 5 MB stdout cap: list-objects-v2, describe-instances, describe-log-streams, list-roles, etc.",
+    annotations: {
+      title: "Fetch one page of a paginated AWS operation",
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: true
+    },
+    inputSchema: external_exports3.object({
+      service: external_exports3.string().describe("AWS service in kebab-case: 's3api', 'ec2', 'iam', 'logs', etc."),
+      operation: external_exports3.string().describe("Paginated operation: 'list-objects-v2', 'describe-instances', 'list-roles', etc."),
+      params: external_exports3.record(external_exports3.string(), external_exports3.unknown()).optional().describe("Operation parameters (PascalCase keys) passed via --cli-input-json."),
+      query: external_exports3.string().optional().describe(
+        "JMESPath expression to extract fields from each page (--query). The query is wrapped server-side as {NextToken, items: <query>} so pagination still works even when the projection drops NextToken; the handler unwraps `items` before returning."
+      ),
+      maxItems: external_exports3.number().int().positive().max(1e4).optional().describe("Items per page (1-10000). Default 100. Lower this if hitting the 5 MB output cap."),
+      startingToken: external_exports3.string().optional().describe("Resume cursor from the previous call's `nextToken`. Omit for the first page."),
+      profile: external_exports3.string().optional().describe("Override session profile for this call."),
+      region: external_exports3.string().optional().describe("Override session region for this call."),
+      timeoutMs: external_exports3.number().int().positive().optional().describe("Timeout in milliseconds. Default 60000.")
+    }),
+    handler: async (input) => {
+      const i = input;
+      if (i.startingToken !== void 0) {
+        const stErr = validateOpaqueToken(i.startingToken, "startingToken");
+        if (stErr) return { ok: false, error: stErr };
+      }
+      const maxItems = Math.min(Math.max(1, i.maxItems ?? 100), 1e4);
+      const extraFlags = ["--max-items", String(maxItems)];
+      if (i.startingToken) {
+        extraFlags.push("--starting-token", i.startingToken);
+      }
+      const userQuery = i.query?.trim();
+      const queryWrapped = userQuery ? wrapQueryForPagination(userQuery) : void 0;
+      const result = await runAwsCall({
+        service: i.service,
+        operation: i.operation,
+        params: i.params,
+        query: queryWrapped,
+        profile: i.profile,
+        region: i.region,
+        outputFormat: "json",
+        timeoutMs: i.timeoutMs,
+        extraFlags
+      });
+      if (!result.ok) {
+        return { ok: false, error: result.error, rawBody: result.rawStderr ?? result.rawStdout };
+      }
+      let resultBody;
+      let nextToken;
+      if (queryWrapped) {
+        const wrapped = result.data ?? {};
+        nextToken = extractNextToken(wrapped);
+        resultBody = wrapped.items ?? null;
+      } else {
+        nextToken = extractNextToken(result.data);
+        resultBody = result.data;
+      }
+      return {
+        ok: true,
+        data: {
+          command: result.command,
+          result: resultBody,
+          nextToken,
+          hasMore: nextToken !== null
+        }
+      };
+    }
+  }
+];
+
+// src/tools/metrics.ts
+var SIMPLE_STATS = ["Average", "Sum", "Maximum", "Minimum", "SampleCount"];
+var EXTENDED_STAT_RE = /^((p|tm|tc|wm|pr|ts)(\d{1,3}(\.\d{1,3})?)?|iqm)$/i;
+function isValidStatistic(s) {
+  const lower = s.toLowerCase();
+  if (SIMPLE_STATS.some((stat) => stat.toLowerCase() === lower)) return true;
+  return EXTENDED_STAT_RE.test(s);
+}
+function canonicalizeStatistic(s) {
+  const lower = s.toLowerCase();
+  for (const stat of SIMPLE_STATS) {
+    if (stat.toLowerCase() === lower) return stat;
+  }
+  if (EXTENDED_STAT_RE.test(s)) return lower;
+  return s;
+}
+var QUERY_ID_RE = /^[a-z][A-Za-z0-9_]*$/;
+var MAX_QUERIES = 100;
+var CLOUDWATCH_MAX_DATAPOINTS = 100800;
+var PERIOD_3H_MS = 3 * 60 * 60 * 1e3;
+var PERIOD_24H_MS = 24 * 60 * 60 * 1e3;
+var PERIOD_15D_MS = 15 * 24 * 60 * 60 * 1e3;
+function pickAutoPeriodSeconds(startMs, endMs) {
+  const rangeMs = Math.max(0, endMs - startMs);
+  if (rangeMs <= PERIOD_3H_MS) return 60;
+  if (rangeMs <= PERIOD_24H_MS) return 300;
+  if (rangeMs <= PERIOD_15D_MS) return 900;
+  return 3600;
+}
+var RELATIVE_TIME_RE = /^\d+[smhdw]$/;
+var UNIT_MS = {
+  s: 1e3,
+  m: 60 * 1e3,
+  h: 60 * 60 * 1e3,
+  d: 24 * 60 * 60 * 1e3,
+  w: 7 * 24 * 60 * 60 * 1e3
+};
+function resolveTime(input, now) {
+  if (input === "now") return new Date(now);
+  const rel = input.match(RELATIVE_TIME_RE);
+  if (rel) {
+    const num = Number(input.slice(0, -1));
+    const unit = input.slice(-1);
+    const ms = UNIT_MS[unit];
+    if (!ms || !Number.isFinite(num)) return null;
+    return new Date(now - num * ms);
+  }
+  const t = new Date(input);
+  if (Number.isNaN(t.getTime())) return null;
+  return t;
+}
+function buildMetricDataQueries(inputs, autoPeriod) {
+  return inputs.map((q) => {
+    const base = { Id: q.id };
+    if (q.label !== void 0) base.Label = q.label;
+    if (q.returnData !== void 0) base.ReturnData = q.returnData;
+    if (q.expression !== void 0) {
+      base.Expression = q.expression;
+      if (q.period !== void 0) base.Period = q.period;
+      return base;
+    }
+    const dimEntries = q.dimensions ? Object.entries(q.dimensions) : [];
+    const stat = {
+      Metric: {
+        Namespace: q.namespace,
+        MetricName: q.metricName,
+        ...dimEntries.length > 0 ? { Dimensions: dimEntries.map(([Name, Value]) => ({ Name, Value })) } : {}
+      },
+      Period: q.period ?? autoPeriod,
+      Stat: q.statistic !== void 0 ? canonicalizeStatistic(q.statistic) : "Average"
+    };
+    if (q.unit !== void 0) stat.Unit = q.unit;
+    base.MetricStat = stat;
+    return base;
+  });
+}
+var metricsTools = [
+  {
+    name: "aws_metrics_query",
+    description: "Query CloudWatch metrics via GetMetricData (the modern multi-metric / expression-capable API, not the legacy get-metric-statistics). Pass `queries` as a flat array of {id, namespace, metricName, dimensions?, statistic?, period?, expression?, label?}; the tool shapes them into MetricDataQueries for you. `startTime`/`endTime` accept ISO 8601 or relative shorthand ('15m', '1h', '1d', '1w'); endTime defaults to 'now'. Period is auto-picked from the time range when omitted (60s for <=3h, 300s for <=24h, 900s for <=15d, 3600s otherwise) to stay under CloudWatch's ~100,800-datapoint response cap. Returns {series: [{id, label?, timestamps, values, period?, statusCode?}], messages?, periodSeconds, profile, region, nextToken, hasMore}. Each series' `period` is the effective granularity for that query (its explicit period, or the auto-pick it inherited); it is omitted for an expression query that didn't set one. The top-level `periodSeconds` is always the auto-pick. When CloudWatch truncates a large response, `hasMore` is true and `nextToken` carries the resume cursor -- call again with `nextToken` set to fetch the next page (rare for typical agent queries that stay within the per-request cap). Use for 'show me the CPU on this instance for the last hour', 'sum lambda invocations across these 3 functions', or expression-based 'p99 latency divided by average latency' lookups.",
+    annotations: {
+      title: "Query CloudWatch metrics (GetMetricData)",
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: true
+    },
+    inputSchema: external_exports3.object({
+      queries: external_exports3.array(
+        external_exports3.object({
+          id: external_exports3.string().regex(QUERY_ID_RE, "id must match /^[a-z][A-Za-z0-9_]*$/ (CloudWatch's MetricDataQuery.Id contract)"),
+          namespace: external_exports3.string().min(1).optional().describe("AWS metric namespace, e.g. 'AWS/Lambda', 'AWS/EC2'. Required unless `expression` is set."),
+          metricName: external_exports3.string().min(1).optional().describe("Metric name, e.g. 'Invocations', 'CPUUtilization'. Required unless `expression` is set."),
+          dimensions: external_exports3.record(external_exports3.string(), external_exports3.string()).optional().describe("Dimension Name -> Value map, e.g. {FunctionName: 'my-fn'}."),
+          statistic: external_exports3.string().optional().describe(
+            "Statistic: Average | Sum | Maximum | Minimum | SampleCount, or an extended stat like 'p99', 'p99.9', 'tm95'. Default 'Average'."
+          ),
+          period: external_exports3.number().int().positive().optional().describe("Period in seconds. Defaults to an auto-pick from the time range (60s/300s/900s/3600s)."),
+          expression: external_exports3.string().min(1).optional().describe(
+            `CloudWatch metric math expression, e.g. 'SUM([m1, m2])' or 'AVG(METRICS("AWS/Lambda"))'. Mutually exclusive with namespace/metricName/dimensions. Validated server-side by CloudWatch; malformed values surface as a downstream ValidationError rather than a local rejection.`
+          ),
+          label: external_exports3.string().optional().describe("Human-readable label for the series in the response."),
+          returnData: external_exports3.boolean().optional().describe(
+            "Set false to compute this query but not return its data (useful for intermediate values in expressions). Default true."
+          ),
+          unit: external_exports3.string().optional().describe(
+            "Restrict to a specific Unit (e.g. 'Seconds', 'Bytes'). Default: no filter. Only meaningful on metric-stat queries. Validated server-side by CloudWatch; malformed values surface as a downstream ValidationError rather than a local rejection."
+          )
+        })
+      ).min(1).max(MAX_QUERIES).describe(`1-${MAX_QUERIES} queries. Each is either a metric-stat (namespace + metricName) or an expression.`),
+      startTime: external_exports3.string().optional().describe("ISO 8601 timestamp or relative shorthand ('15m', '1h', '1d', '1w'). Default '1h' (one hour ago)."),
+      endTime: external_exports3.string().optional().describe("ISO 8601 timestamp or relative shorthand. Default 'now'."),
+      scanBy: external_exports3.enum(["TimestampAscending", "TimestampDescending"]).optional().describe("Sort order for returned datapoints. Default 'TimestampDescending' (matches CloudWatch's default)."),
+      maxDataPoints: external_exports3.number().int().positive().optional().describe(
+        "Target datapoint count. CloudWatch does not truncate to the first N points -- it widens (coarsens) the period server-side so the series aggregates down to fit this many points. CloudWatch's own ceiling is ~100,800; lower this to make CloudWatch return a coarser, smaller series. Forwarded as CloudWatch's MaxDatapoints (single 'p') field; the camelCase schema name follows this server's convention."
+      ),
+      nextToken: external_exports3.string().optional().describe(
+        "Resume cursor from a previous call's `nextToken`. Omit for the first page. Forwarded as CloudWatch's NextToken; only meaningful when a prior call returned `hasMore: true`."
+      ),
+      profile: external_exports3.string().optional().describe("Override session profile for this call."),
+      region: external_exports3.string().optional().describe("Override session region for this call."),
+      timeoutMs: external_exports3.number().int().positive().optional().describe("Timeout in milliseconds. Default 60000 (60s).")
+    }),
+    handler: async (input) => {
+      const i = input;
+      const seenIds = /* @__PURE__ */ new Map();
+      for (let qi = 0; qi < i.queries.length; qi++) {
+        const q = i.queries[qi];
+        const firstIdx = seenIds.get(q.id);
+        if (firstIdx !== void 0) {
+          return {
+            ok: false,
+            error: `Duplicate query id '${q.id}' at queries[${qi}]; first seen at queries[${firstIdx}]. Each MetricDataQuery.Id must be unique in a batch.`
+          };
+        }
+        seenIds.set(q.id, qi);
+        const hasMetricStat = q.namespace !== void 0 || q.metricName !== void 0 || q.dimensions !== void 0;
+        const hasExpression = q.expression !== void 0;
+        if (hasMetricStat && hasExpression) {
+          return {
+            ok: false,
+            error: `Query '${q.id}' mixes metric-stat fields (namespace/metricName/dimensions) with 'expression'. Pick one shape per query.`
+          };
+        }
+        if (!hasMetricStat && !hasExpression) {
+          return {
+            ok: false,
+            error: `Query '${q.id}' has neither metric-stat (namespace+metricName) nor 'expression'. One is required.`
+          };
+        }
+        if (hasMetricStat && (q.namespace === void 0 || q.metricName === void 0)) {
+          return {
+            ok: false,
+            error: `Query '${q.id}' must include BOTH 'namespace' and 'metricName' (or use 'expression' instead).`
+          };
+        }
+        if (q.statistic !== void 0 && !isValidStatistic(q.statistic)) {
+          return {
+            ok: false,
+            error: `Query '${q.id}' has invalid statistic '${q.statistic}'. Use Average | Sum | Maximum | Minimum | SampleCount, or an extended stat like p99 / p99.9 / tm95.`
+          };
+        }
+      }
+      const now = Date.now();
+      const startStr = i.startTime ?? "1h";
+      const endStr = i.endTime ?? "now";
+      const startDate = resolveTime(startStr, now);
+      const endDate = resolveTime(endStr, now);
+      if (!startDate) {
+        return {
+          ok: false,
+          error: `Invalid startTime '${startStr}'. Use ISO 8601 (e.g. '2026-05-16T10:00:00Z') or relative shorthand (e.g. '1h', '15m', '1d').`
+        };
+      }
+      if (!endDate) {
+        return {
+          ok: false,
+          error: `Invalid endTime '${endStr}'. Use ISO 8601 or relative shorthand, or 'now' for the current moment.`
+        };
+      }
+      if (endDate.getTime() <= startDate.getTime()) {
+        return {
+          ok: false,
+          error: `endTime (${endDate.toISOString()}) must be after startTime (${startDate.toISOString()}).`
+        };
+      }
+      const rangeSeconds = (endDate.getTime() - startDate.getTime()) / 1e3;
+      for (const q of i.queries) {
+        if (q.period === void 0) continue;
+        if (q.period <= 0 || q.period % 60 !== 0) {
+          return {
+            ok: false,
+            error: `Query '${q.id}' has invalid period ${q.period}. CloudWatch requires period to be a positive multiple of 60 (seconds).`
+          };
+        }
+        const datapoints = Math.ceil(rangeSeconds / q.period);
+        if (datapoints > CLOUDWATCH_MAX_DATAPOINTS) {
+          return {
+            ok: false,
+            error: `Query '${q.id}' with period ${q.period}s over the requested range (${startDate.toISOString()} to ${endDate.toISOString()}) would request ${datapoints} datapoints, exceeding CloudWatch's per-request cap of ${CLOUDWATCH_MAX_DATAPOINTS}. Widen the period or narrow the time range.`
+          };
+        }
+      }
+      const periodSeconds = pickAutoPeriodSeconds(startDate.getTime(), endDate.getTime());
+      const metricDataQueries = buildMetricDataQueries(i.queries, periodSeconds);
+      const params = {
+        MetricDataQueries: metricDataQueries,
+        StartTime: startDate.toISOString(),
+        EndTime: endDate.toISOString(),
+        ScanBy: i.scanBy ?? "TimestampDescending"
+      };
+      if (i.maxDataPoints !== void 0) params.MaxDatapoints = i.maxDataPoints;
+      if (i.nextToken !== void 0) params.NextToken = i.nextToken;
+      const effectiveProfile = i.profile ?? getProfile();
+      const effectiveRegion = i.region ?? getRegion();
+      const result = await runAwsCall({
+        service: "cloudwatch",
+        operation: "get-metric-data",
+        profile: i.profile,
+        region: i.region,
+        timeoutMs: i.timeoutMs,
+        outputFormat: "json",
+        params
+      });
+      if (!result.ok) {
+        return { ok: false, error: result.error, rawBody: result.rawStderr ?? result.rawStdout };
+      }
+      const raw = result.data ?? {};
+      const queryById = new Map(i.queries.map((q) => [q.id, q]));
+      const series = (raw.MetricDataResults ?? []).map((r) => {
+        const q = queryById.get(r.Id ?? "");
+        const effectivePeriod = q?.period ?? (q && q.expression === void 0 ? periodSeconds : void 0);
+        return {
+          id: r.Id ?? "",
+          ...r.Label !== void 0 ? { label: r.Label } : {},
+          timestamps: r.Timestamps ?? [],
+          values: r.Values ?? [],
+          ...effectivePeriod !== void 0 ? { period: effectivePeriod } : {},
+          ...r.StatusCode !== void 0 ? { statusCode: r.StatusCode } : {}
+        };
+      });
+      const messages = raw.Messages?.filter((m) => m.Code || m.Value).map((m) => ({
+        code: m.Code,
+        value: m.Value
+      }));
+      const nextToken = extractNextToken(raw);
+      return {
+        ok: true,
+        data: {
+          command: result.command,
+          profile: effectiveProfile,
+          region: effectiveRegion,
+          startTime: startDate.toISOString(),
+          endTime: endDate.toISOString(),
+          periodSeconds,
+          series,
+          nextToken,
+          hasMore: nextToken !== null,
+          ...messages && messages.length > 0 ? { messages } : {}
+        }
+      };
+    }
+  }
+];
+
+// src/tools/multi-region.ts
+var DEFAULT_CONCURRENCY = 8;
+var MAX_CONCURRENCY = 32;
+var MAX_REGIONS = 32;
+async function runWithConcurrency(inputs, concurrency, fn) {
+  const results = new Array(inputs.length);
+  let next = 0;
+  const worker = async () => {
+    while (true) {
+      const i = next++;
+      if (i >= inputs.length) return;
+      results[i] = await fn(inputs[i], i);
+    }
+  };
+  const workerCount = Math.min(concurrency, inputs.length);
+  await Promise.all(Array.from({ length: workerCount }, () => worker()));
+  return results;
+}
+var multiRegionTools = [
+  {
+    name: "aws_multi_region",
+    description: "Run the same AWS API operation across multiple regions in parallel. Same shape as aws_call (service, operation, params?, query?, outputFormat?, timeoutMs?) but takes `regions: string[]` instead of `region`. Returns an array of `{region, ok, data?, command?, error?, errorKind?}` -- partial failure is expected (services aren't everywhere, perms may be region-scoped). Duplicate regions in the input are collapsed (first occurrence wins), so `results.length` may be less than `regions.length`; use the returned `regionCount` for the actual count run. Use for fleet-wide reads: 'describe-instances across all our regions', 'list buckets in every region', 'check IAM password policy everywhere'.",
+    annotations: {
+      title: "Run an AWS operation across multiple regions in parallel",
+      // The operation can be anything -- we conservatively annotate as not
+      // read-only / not destructive. The caller chooses what to invoke.
+      readOnlyHint: false,
+      destructiveHint: false,
+      idempotentHint: false,
+      openWorldHint: true
+    },
+    inputSchema: external_exports3.object({
+      service: external_exports3.string().describe("AWS service in kebab-case: 's3api', 'ec2', 'iam', etc."),
+      operation: external_exports3.string().describe("Operation in kebab-case: 'describe-instances', 'list-buckets', etc."),
+      regions: external_exports3.array(external_exports3.string().min(1)).min(1).max(MAX_REGIONS).describe(
+        `Region IDs (e.g. ['us-east-1','us-west-2','eu-west-1']). 1-${MAX_REGIONS}. Validated for argv-safety; a bad region name yields a clear per-region error and skips its CLI spawn (per-region isolation comes from each region being a separate call, not from this pre-check).`
+      ),
+      params: external_exports3.record(external_exports3.string(), external_exports3.unknown()).optional().describe("Operation parameters (PascalCase keys) -- same shape as aws_call."),
+      query: external_exports3.string().optional().describe("JMESPath expression for --query (server-side trimming per region)."),
+      outputFormat: external_exports3.enum(["json", "text", "table", "yaml"]).optional().describe("Output format. Default 'json'."),
+      profile: external_exports3.string().optional().describe("Override session profile for the batch."),
+      timeoutMs: external_exports3.number().int().positive().optional().describe("Timeout in ms applied PER region. Default 60000."),
+      concurrency: external_exports3.number().int().positive().max(MAX_CONCURRENCY).optional().describe(`Max regions in flight at once (1-${MAX_CONCURRENCY}). Default ${DEFAULT_CONCURRENCY}.`)
+    }),
+    handler: async (input) => {
+      const i = input;
+      const seen = /* @__PURE__ */ new Set();
+      const regions = [];
+      for (const r of i.regions) {
+        if (!seen.has(r)) {
+          seen.add(r);
+          regions.push(r);
+        }
+      }
+      const concurrency = i.concurrency ?? DEFAULT_CONCURRENCY;
+      const results = await runWithConcurrency(regions, concurrency, async (region) => {
+        try {
+          if (!isValidRegionName(region)) {
+            return {
+              region,
+              ok: false,
+              error: `Invalid region '${region}'. Must match ${REGION_NAME_RE} (e.g. 'us-east-1').`,
+              errorKind: "bad_input"
+            };
+          }
+          const r = await runAwsCall({
+            service: i.service,
+            operation: i.operation,
+            params: i.params,
+            query: i.query,
+            profile: i.profile,
+            region,
+            outputFormat: i.outputFormat,
+            timeoutMs: i.timeoutMs
+          });
+          if (!r.ok) {
+            return {
+              region,
+              ok: false,
+              command: r.command,
+              error: r.error,
+              errorKind: r.kind
+            };
+          }
+          return { region, ok: true, command: r.command, data: r.data };
+        } catch (err) {
+          return {
+            region,
+            ok: false,
+            error: err instanceof Error ? err.message : String(err),
+            errorKind: "unexpected"
+          };
+        }
+      });
+      const okCount = results.filter((r) => r.ok).length;
+      const errCount = results.length - okCount;
+      return {
+        ok: true,
+        data: {
+          service: i.service,
+          operation: i.operation,
+          regionCount: regions.length,
+          okCount,
+          errorCount: errCount,
+          results
+        }
+      };
+    }
+  }
+];
+
 // src/tools/script.ts
 import { createContext, runInContext } from "node:vm";
 var DEFAULT_TIMEOUT_MS2 = 6e4;
 var MAX_TIMEOUT_MS = 5 * 6e4;
 var MAX_LOG_LINES = 500;
-var MAX_LOG_LINE_BYTES = 4 * 1024;
+var MAX_LOG_LINE_CHARS = 4 * 1024;
 var DEFAULT_MAX_PAGES = 50;
 var MAX_PAGES_HARD_CAP = 1e3;
 function findTool(name, source) {
@@ -56664,7 +56739,7 @@ async function runScript(opts, handlers = defaultScriptHandlers()) {
         }
       }
     }).join(" ");
-    const capped = text.length > MAX_LOG_LINE_BYTES ? `${text.slice(0, MAX_LOG_LINE_BYTES)}... [line truncated]` : text;
+    const capped = text.length > MAX_LOG_LINE_CHARS ? `${text.slice(0, MAX_LOG_LINE_CHARS)}... [line truncated]` : text;
     logs.push(`[${level}] ${capped}`);
   };
   const ctx = createContext(
@@ -56797,9 +56872,11 @@ var scriptTools = [
     annotations: {
       title: "Run a JS snippet that orchestrates AWS tool calls",
       // The script may invoke destructive tools (resource.create/update/delete)
-      // so we conservatively annotate as non-read-only.
+      // so annotate the worst case honestly: non-read-only AND destructive.
+      // Cautious clients may confirm read-only scripts too -- acceptable cost;
+      // an unflagged delete is not.
       readOnlyHint: false,
-      destructiveHint: false,
+      destructiveHint: true,
       idempotentHint: false,
       openWorldHint: true
     },
@@ -56865,7 +56942,7 @@ var sessionTools = [
         if (!isValidProfileName(trimmed)) {
           return {
             ok: false,
-            error: `Invalid profile name '${trimmed}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-], must not start with '-' or '=', no whitespace or shell metacharacters.`
+            error: `Invalid profile name '${trimmed}'. Must be 1-128 chars from [A-Za-z0-9_+=,.@:-]; the first char must be a letter, digit, or one of _+,.@: (not '-' or '='); no whitespace or shell metacharacters.`
           };
         }
       }
@@ -56952,8 +57029,18 @@ function errorToMcpResult(err, toolName) {
     isError: true
   };
 }
-var version2 = true ? "1.4.1" : (await null).createRequire(import.meta.url)("../package.json").version;
-var isEntryPoint = (() => {
+var version2 = true ? "1.5.2" : (await null).createRequire(import.meta.url)("../package.json").version;
+var isSeaBinary = (() => {
+  try {
+    const base = import.meta.url || pathToFileURL(process.execPath).href;
+    const require2 = createRequire(base);
+    const sea = require2("node:sea");
+    return typeof sea.isSea === "function" && sea.isSea() === true;
+  } catch {
+    return false;
+  }
+})();
+var isEntryPoint = isSeaBinary || (() => {
   const entry = process.argv[1];
   if (!entry) return false;
   return import.meta.url === pathToFileURL(entry).href;
@@ -56993,8 +57080,13 @@ if (isEntryPoint) {
     });
   }
   const transport = new StdioServerTransport();
-  await server.connect(transport);
-  console.error(`@yawlabs/aws-mcp v${version2} ready (${allTools.length} tools)`);
+  server.connect(transport).then(() => {
+    console.error(`@yawlabs/aws-mcp v${version2} ready (${allTools.length} tools)`);
+  }).catch((err) => {
+    process.stderr.write(`aws-mcp: ${err instanceof Error ? err.message : String(err)}
+`);
+    process.exit(1);
+  });
 }
 export {
   allTools,