@yawlabs/aws-mcp 1.1.0 → 1.2.1

package/dist/index.js

@@ -54043,11 +54043,8 @@ async function upsertProfile(path, profile, creds) {
     }
     renameSync(tmpPath, path);
     if (platform() !== "win32") {
-      let existingMode = 384;
-      if (existsSync(path)) {
-        const st = statSync(path);
-        existingMode = st.mode & 511;
-      }
+      const st = statSync(path);
+      const existingMode = st.mode & 511;
       if ((existingMode & 63) !== 0) chmodSync(path, 384);
     }
   } finally {
@@ -55452,7 +55449,8 @@ var logsTools = [
 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) {
-  if (SIMPLE_STATS.includes(s)) return true;
+  const lower = s.toLowerCase();
+  if (SIMPLE_STATS.some((stat) => stat.toLowerCase() === lower)) return true;
   return EXTENDED_STAT_RE.test(s);
 }
 var QUERY_ID_RE = /^[a-z][A-Za-z0-9_]*$/;
@@ -55517,7 +55515,7 @@ function buildMetricDataQueries(inputs, autoPeriod) {
 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, statusCode?}], messages?, periodSeconds}. 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.",
+    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, statusCode?}], messages?, periodSeconds, profile, region, nextToken, hasMore}. 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,
@@ -55552,7 +55550,10 @@ var metricsTools = [
       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(
-        "Soft cap on returned datapoints across all queries. CloudWatch's hard cap is ~100,800; lower this to keep response sizes manageable."
+        "Soft cap on returned datapoints across all queries. CloudWatch's hard cap is ~100,800; lower this to keep response sizes manageable. 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."),
@@ -55560,15 +55561,17 @@ var metricsTools = [
     }),
     handler: async (input) => {
       const i = input;
-      const seenIds = /* @__PURE__ */ new Set();
-      for (const q of i.queries) {
-        if (seenIds.has(q.id)) {
+      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}'. Each MetricDataQuery.Id must be unique in a batch.`
+            error: `Duplicate query id '${q.id}' at queries[${qi}]; first seen at queries[${firstIdx}]. Each MetricDataQuery.Id must be unique in a batch.`
           };
         }
-        seenIds.add(q.id);
+        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) {
@@ -55628,6 +55631,9 @@ var metricsTools = [
         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",
@@ -55652,14 +55658,19 @@ var metricsTools = [
         code: m.Code,
         value: m.Value
       }));
+      const nextToken = typeof raw.NextToken === "string" && raw.NextToken.length > 0 ? raw.NextToken : null;
       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 } : {}
         }
       };
@@ -55689,7 +55700,7 @@ async function runWithConcurrency(inputs, concurrency, fn) {
 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). Use for fleet-wide reads: 'describe-instances across all our regions', 'list buckets in every region', 'check IAM password policy everywhere'.",
+    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
@@ -56753,7 +56764,13 @@ async function runScript(opts, handlers = defaultScriptHandlers()) {
     Response: void 0,
     Headers: void 0,
     AbortController: void 0,
-    AbortSignal: void 0
+    AbortSignal: void 0,
+    // BroadcastChannel can post messages to listeners in OTHER vm contexts
+    // or the parent process when a channel with the same name is open
+    // there. The aws-mcp parent doesn't subscribe to any channel, so the
+    // realistic reach is nil -- but a future plugin in the parent could,
+    // and the cost of shadowing is zero. Defense-in-depth.
+    BroadcastChannel: void 0
   });
   const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2, MAX_TIMEOUT_MS);
   const wrappedSource = `(async () => {
@@ -56796,10 +56813,10 @@ var scriptTools = [
     },
     inputSchema: external_exports3.object({
       code: external_exports3.string().min(1).describe(
-        "JavaScript snippet evaluated inside `(async () => { ... })()`. Use `return <value>` to surface a result. Globals: aws.call, aws.paginate, aws.paginateAll, aws.resource.{get,list,create,update,delete,status}, aws.logsTail, JSON, Math, Date, Promise, Array, Object, String, Number, Boolean, Error, console. No require/import/process/fs/fetch/setTimeout/globalThis. Tool helpers throw on failure -- wrap in try/catch when you want to handle errors per-call."
+        "JavaScript snippet evaluated inside `(async () => { ... })()`. Use `return <value>` to surface a result. Bound globals: aws.call, aws.paginate, aws.paginateAll, aws.resource.{get,list,create,update,delete,status}, aws.logsTail, console (capture), JSON, Math, Date, Promise, Array, Object, String, Number, Boolean, Error, Intl, Atomics, SharedArrayBuffer, WebAssembly (compile blocked). Shadowed (undefined): require, import, process, fs, fetch + family, BroadcastChannel, setTimeout/Interval, queueMicrotask, Buffer, global, globalThis. NOT available (ReferenceError if used): URL, URLSearchParams, TextEncoder, TextDecoder, crypto, structuredClone, EventTarget, MessageChannel, performance. eval/Function are disabled (codeGeneration off). Tool helpers throw on failure -- wrap in try/catch when you want to handle errors per-call."
       ),
       timeoutMs: external_exports3.number().int().positive().max(MAX_TIMEOUT_MS).optional().describe(
-        `Wall-clock timeout in milliseconds. Default ${DEFAULT_TIMEOUT_MS2}; max ${MAX_TIMEOUT_MS}. Covers evaluation plus every awaited aws.* call.`
+        `Wall-clock timeout in milliseconds. Default ${DEFAULT_TIMEOUT_MS2}; max ${MAX_TIMEOUT_MS}. Covers evaluation plus every awaited aws.* call. On timeout the script stops being awaited and the tool returns an error, but any aws.* call already in flight is NOT cancelled -- it continues until its own per-call timeout (default 60s). Plan retries accordingly: a script that timed out mid 'resource.delete' may have completed the delete; re-issuing the same script can double-mutate.`
       )
     }),
     handler: async (input) => {
@@ -56897,7 +56914,7 @@ var sessionTools = [
 ];
 
 // src/index.ts
-var version2 = true ? "1.1.0" : (await null).createRequire(import.meta.url)("../package.json").version;
+var version2 = true ? "1.2.1" : (await null).createRequire(import.meta.url)("../package.json").version;
 var subcommand = process.argv[2];
 if (subcommand === "version" || subcommand === "--version") {
   console.log(version2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/aws-mcp",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "mcpName": "io.github.YawLabs/aws-mcp",
   "description": "AWS MCP server — call any AWS API from AI assistants, with first-class SSO re-login (no more 'browser won't open' dead ends)",
   "license": "MIT",