@skaleagents/swarm 0.6.19 → 0.6.20

package/README.md

@@ -113,9 +113,10 @@ in every result. An empty finding list is not proof that a system is secure.
 The web app hosts `https://skaleagents.com/mcp` using `handleMcpRequest` from
 `@skaleagents/swarm/http`. Audit workers import `scanIac` from
 `@skaleagents/swarm/scan`. It validates each bearer credential with the API's
-`/api/oauth/mcp-token` endpoint before running a tool. Tokens are bound to the
-MCP resource and cannot access unrelated API routes. Credentials are not
-forwarded to the public bot directory.
+`/api/oauth/mcp-token` endpoint before running a tool. A successful check is
+reused for up to 60 seconds, so a revoked token can run tools for up to a
+minute. Tokens are bound to the MCP resource and cannot access unrelated API
+routes. Credentials are not forwarded to the public bot directory.
 
 `protectedResourceMetadata` exports the discovery response for
 `/.well-known/oauth-protected-resource/mcp`.

package/dist/application/tools.js

@@ -60,7 +60,8 @@ export function registerConsultation(server, remote) {
     server.registerTool("review_application_architecture", {
         title: "Review whole-application architecture",
         description: "Review related source files as an application. Builds a JS/TS import graph, checks Next.js server/client and runtime boundaries, maps routes and mutations, and returns evidence-backed findings plus questions covering data, auth, reliability, tests, deployment and product fit. Pass answers in context on subsequent calls. No repository fetch or execution; the connected assistant reasons about system-level tradeoffs using the returned evidence.",
-        annotations,
+        // Saves a review to the account when authorized, so it is not read-only.
+        annotations: { ...annotations, readOnlyHint: false },
         _meta: security,
         inputSchema: {
             files: z

package/dist/http.js

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
 import { createServer } from "./server.js";
 import { getApiUrl } from "./config.js";
@@ -37,6 +38,16 @@ export function protectedResourceMetadata() {
         resource_documentation: "https://skaleagents.com/mcp-config",
     });
 }
+// Revocation can take up to one TTL to take effect for an already-validated token.
+const validationTtlMs = 60_000;
+const validationCacheLimit = 10_000;
+const validatedUntil = new Map();
+function rememberValidation(key, until) {
+    // Map keeps insertion order, so the first key is the oldest entry to evict.
+    if (!validatedUntil.has(key) && validatedUntil.size >= validationCacheLimit)
+        validatedUntil.delete(validatedUntil.keys().next().value);
+    validatedUntil.set(key, until);
+}
 export async function handleMcpRequest(request) {
     const origin = request.headers.get("origin");
     if (origin && !allowedOrigins.has(origin))
@@ -46,30 +57,35 @@ export async function handleMcpRequest(request) {
     const authorization = request.headers.get("authorization");
     if (!authorization || !/^Bearer [^\s]+$/i.test(authorization))
         return challenge();
-    try {
-        // Validate the opaque token with its issuer, including the MCP audience.
-        const validation = await fetch(`${getApiUrl()}/api/oauth/mcp-token`, {
-            headers: { Authorization: authorization, Accept: "application/json" },
-            signal: AbortSignal.timeout(10_000),
-            redirect: "error",
-            cache: "no-store",
-        });
-        if (validation.status === 401 || validation.status === 403)
-            return challenge();
-        if (!validation.ok)
+    // Cache only successful validations, keyed by a digest so raw tokens are not kept.
+    const tokenKey = createHash("sha256").update(authorization.slice(7)).digest("hex");
+    if ((validatedUntil.get(tokenKey) ?? 0) <= Date.now()) {
+        try {
+            // Validate the opaque token with its issuer, including the MCP audience.
+            const validation = await fetch(`${getApiUrl()}/api/oauth/mcp-token`, {
+                headers: { Authorization: authorization, Accept: "application/json" },
+                signal: AbortSignal.timeout(10_000),
+                redirect: "error",
+                cache: "no-store",
+            });
+            if (validation.status === 401 || validation.status === 403)
+                return challenge();
+            if (!validation.ok)
+                return json(503, { error: "authorization_unavailable" });
+            const token = (await validation.json());
+            if (!token.active ||
+                token.resource !== resource ||
+                token.scope !== "mcp" ||
+                !token.expiresAt ||
+                token.expiresAt * 1000 <= Date.now()) {
+                return challenge();
+            }
+            rememberValidation(tokenKey, Math.min(Date.now() + validationTtlMs, token.expiresAt * 1000));
+        }
+        catch {
             return json(503, { error: "authorization_unavailable" });
-        const token = (await validation.json());
-        if (!token.active ||
-            token.resource !== resource ||
-            token.scope !== "mcp" ||
-            !token.expiresAt ||
-            token.expiresAt * 1000 <= Date.now()) {
-            return challenge();
         }
     }
-    catch {
-        return json(503, { error: "authorization_unavailable" });
-    }
     if (request.method !== "POST")
         return json(405, { error: "method_not_allowed" }, { Allow: "POST, OPTIONS" });
     if (!request.headers.get("content-type")?.startsWith("application/json"))

package/dist/iac/parse.js

@@ -39,8 +39,8 @@ export function looksLikeIac(content) {
             /* Other format detection still applies to incomplete input. */
         }
     }
-    return (/^\s*(?:resource|module|terraform|variable|provider)\s+["{]/m.test(content) ||
-        /^\s*(?:["']?Resources["']?\s*:|apiVersion\s*:)/m.test(content) ||
+    return (/^[^\S\n]*(?:resource|module|terraform|variable|provider)\s+["{]/m.test(content) ||
+        /^[^\S\n]*(?:["']?Resources["']?\s*:|apiVersion\s*:)/m.test(content) ||
         /^\s*\{\s*"(?:resource|Resources|apiVersion|AWSTemplateFormatVersion)"\s*:/.test(content) ||
         looksLikePulumiYaml(content) ||
         looksLikePulumiProgram(content) ||
@@ -57,13 +57,13 @@ export function looksLikeIac(content) {
         looksLikeIamPolicy(content));
 }
 export function looksLikePulumiProgram(content) {
-    return /(?:^|\n)\s*(?:import\s+\*\s+as\s+pulumi\b|import\s+pulumi\b|from\s+["']@pulumi\/)/.test(content);
+    return /(?:^|\n)[^\S\n]*(?:import\s+\*\s+as\s+pulumi\b|import\s+pulumi\b|from\s+["']@pulumi\/)/.test(content);
 }
 export function looksLikeCompose(content) {
-    return /^\s*services\s*:/m.test(content) && /^\s+image\s*:/m.test(content);
+    return /^[^\S\n]*services\s*:/m.test(content) && /^[^\S\n]+image\s*:/m.test(content);
 }
 export function looksLikeDockerfile(content) {
-    return /^\s*FROM\s+\S+/m.test(content);
+    return /^[^\S\n]*FROM\s+\S+/m.test(content);
 }
 function topLevelKey(content, name) {
     return new RegExp(`^(?:"${name}"|'${name}'|${name})\\s*:`, "m").test(content);
@@ -71,7 +71,7 @@ function topLevelKey(content, name) {
 function playbookShape(content) {
     if (topLevelKey(content, "hosts") && topLevelKey(content, "tasks"))
         return true;
-    return /^\s*-\s+hosts\s*:/m.test(content) && /^\s*tasks\s*:/m.test(content);
+    return /^[^\S\n]*-\s+hosts\s*:/m.test(content) && /^[^\S\n]*tasks\s*:/m.test(content);
 }
 export function looksLikeAnsible(content) {
     if (looksLikeGithubWorkflow(content))
@@ -86,27 +86,27 @@ export function looksLikeHelm(content) {
     const visible = maskNonCode(content);
     if (!visible.includes("{{"))
         return false;
-    return /^\s*(?:apiVersion|kind)\s*:/m.test(visible);
+    return /^[^\S\n]*(?:apiVersion|kind)\s*:/m.test(visible);
 }
 export function looksLikeGithubWorkflow(content) {
     if (topLevelKey(content, "apiVersion") || topLevelKey(content, "kind"))
         return false;
     const topOn = topLevelKey(content, "on");
     const composeOnly = topLevelKey(content, "services") &&
-        /^\s+image\s*:/m.test(content) &&
+        /^[^\S\n]+image\s*:/m.test(content) &&
         !topOn;
     if (composeOnly)
         return false;
     return topOn && topLevelKey(content, "jobs");
 }
 export function looksLikeTerraformHcl(content) {
-    return /^\s*(?:(?:resource|module|variable|provider|data|output)\s+"|(?:terraform|locals)\s*\{)/m.test(content);
+    return /^[^\S\n]*(?:(?:resource|module|variable|provider|data|output)\s+"|(?:terraform|locals)\s*\{)/m.test(content);
 }
 export function looksLikeBicep(content) {
     const visible = maskIaCComments(content);
     if (looksLikeTerraformHcl(visible))
         return false;
-    return /^\s*resource\s+[A-Za-z_][A-Za-z0-9_]*\s+['"]Microsoft\./m.test(visible);
+    return /^[^\S\n]*resource\s+[A-Za-z_][A-Za-z0-9_]*\s+['"]Microsoft\./m.test(visible);
 }
 export function looksLikeArm(content) {
     const visible = maskIaCComments(content).trim();
@@ -138,8 +138,8 @@ export function looksLikeArm(content) {
     return root.resources.some((item) => String(object(item).type ?? "").startsWith("Microsoft."));
 }
 export function looksLikePulumiYaml(content) {
-    return (/^\s*resources\s*:/m.test(content) &&
-        /^\s+type\s*:\s*[A-Za-z0-9_.-]+:\S+/m.test(content));
+    return (/^[^\S\n]*resources\s*:/m.test(content) &&
+        /^[^\S\n]+type\s*:\s*[A-Za-z0-9_.-]+:\S+/m.test(content));
 }
 const terraformExpressionWarning = "Variable and local literals from the submitted files are resolved. A string of those references, format of known literals, and join of known literals are resolved. Other functions and expressions are not evaluated.";
 export function parseIac(content, requested = "auto", shared) {
@@ -221,7 +221,7 @@ export function parseIac(content, requested = "auto", shared) {
         checkShape(data);
         // The HCL parser preserves expressions but does not expose source ranges.
         // Report the resource declaration line and the exact parsed property path.
-        const searchable = content.replace(/\/\*[\s\S]*?\*\/|(?:#|\/\/)[^\n]*/g, (match) => match.replace(/[^\n]/g, " "));
+        const searchable = blankComments(content, /(?:#|\/\/)[^\n]*/.source);
         for (const [type, instances] of Object.entries(object(object(data).resource))) {
             for (const [name, blocks] of Object.entries(object(instances))) {
                 const declaration = new RegExp(`\\bresource\\s+"${escapeRegex(type)}"\\s+"${escapeRegex(name)}"`).exec(searchable);
@@ -503,11 +503,35 @@ function programLocation(content, offset, path) {
         path,
     };
 }
+// One left-to-right pass that blanks block comments and, when given, line comments
+// (newlines kept). A lazy /\*[\s\S]*?\*\// rescans to the end for every unclosed opener,
+// which is quadratic on hostile input. An unclosed "/*" stays code, as before.
+function blankComments(text, lineSource) {
+    const pattern = new RegExp(lineSource ? `\\/\\*|${lineSource}` : "\\/\\*", "g");
+    let out = "";
+    let last = 0;
+    let closable = true;
+    for (let match = pattern.exec(text); match; match = pattern.exec(text)) {
+        let end = pattern.lastIndex;
+        if (match[0] === "/*") {
+            // No "*/" after one opener means none after any later opener either.
+            const close = closable ? text.indexOf("*/", end) : -1;
+            if (close < 0) {
+                closable = false;
+                continue;
+            }
+            end = close + 2;
+            pattern.lastIndex = end;
+        }
+        out += text.slice(last, match.index) + text.slice(match.index, end).replace(/[^\n]/g, " ");
+        last = end;
+    }
+    return out + text.slice(last);
+}
 function stripProgramComments(content) {
-    return content
-        .replace(/\/\*[\s\S]*?\*\//g, (match) => match.replace(/[^\n]/g, " "))
+    return blankComments(content)
         .replace(/(^|[^:])\/\/[^\n]*/g, (match) => match.replace(/[^\n]/g, " "))
-        .replace(/(^|\n)\s*#[^\n]*/g, (match) => match.replace(/[^\n]/g, " "));
+        .replace(/(^|\n)[^\S\n]*#[^\n]*/g, (match) => match.replace(/[^\n]/g, " "));
 }
 function parsePulumiProgram(content) {
     const searchable = stripProgramComments(content);
@@ -741,14 +765,14 @@ function gitlabShape(content) {
         return false;
     if (topLevelKey(content, "stages"))
         return true;
-    return /^\s*script\s*:/m.test(content);
+    return /^[^\S\n]*script\s*:/m.test(content);
 }
 function cloudBuildShape(content) {
     if (!topLevelKey(content, "steps"))
         return false;
     if (topLevelKey(content, "on") && topLevelKey(content, "jobs"))
         return false;
-    return /^\s*-\s*name\s*:/m.test(content);
+    return /^[^\S\n]*-\s*name\s*:/m.test(content);
 }
 function looksLikePipeline(content) {
     if (stolenPipelineInput(content) || looksLikeServerless(content))
@@ -918,11 +942,11 @@ function parsePipeline(content, format) {
 }
 function looksLikeTfvars(content) {
     const visible = maskIaCComments(content);
-    if (/^\s*(?:resource|module|provider)\s+["']/m.test(visible))
+    if (/^[^\S\n]*(?:resource|module|provider)\s+["']/m.test(visible))
         return false;
-    if (/^\s*(?:terraform|provider|module)\s*\{/m.test(visible))
+    if (/^[^\S\n]*(?:terraform|provider|module)\s*\{/m.test(visible))
         return false;
-    return /^\s*[A-Za-z_][A-Za-z0-9_]*\s*=\s*\S/m.test(visible);
+    return /^[^\S\n]*[A-Za-z_][A-Za-z0-9_]*\s*=\s*\S/m.test(visible);
 }
 function parseTfvars(content) {
     let data;
@@ -1235,8 +1259,8 @@ function escapeRegex(value) {
 }
 function maskNonCode(content) {
     const withoutBlockComments = content
-        .replace(/\{\{-?\s*\/\*[\s\S]*?\*\/\s*-?\}\}/g, (match) => match.replace(/[^\n]/g, " "))
-        .replace(/\{#[\s\S]*?#\}/g, (match) => match.replace(/[^\n]/g, " "));
+        .replace(/\{\{-?\s*\/\*[\s\S]{0,4096}?\*\/\s*-?\}\}/g, (match) => match.replace(/[^\n]/g, " "))
+        .replace(/\{#[\s\S]{0,4096}?#\}/g, (match) => match.replace(/[^\n]/g, " "));
     return withoutBlockComments
         .split("\n")
         .map((line) => {
@@ -1314,7 +1338,7 @@ function parseHelm(content) {
 }
 function parseAnsible(content) {
     const visible = maskNonCode(content);
-    const become = firstLiteral(visible, /(?:^|\n)\s*(?:-\s+)?become\s*:\s*["']?(?:true|yes)["']?(?=\s|$)/);
+    const become = firstLiteral(visible, /(?:^|\n)[^\S\n]*(?:-\s+)?become\s*:\s*["']?(?:true|yes)["']?(?=\s|$)/);
     const cidr = firstLiteral(visible, /(?:cidr|source)\s*:\s*(?:\|\s*)?(?:\n\s*-\s*)?["']?0\.0\.0\.0\/0\b/);
     return {
         format: "ansible",
@@ -1532,7 +1556,7 @@ function substituteKnownParameters(template, parameters) {
     let unresolved = false;
     let secret = false;
     const names = [];
-    const text = template.replace(/\$\{(!?)([^}]*)\}/g, (full, literalMark, rawName) => {
+    const text = template.replace(/\$\{(!?)([^}]{0,200})\}/g, (full, literalMark, rawName) => {
         if (literalMark === "!")
             return `\${${rawName}}`;
         const name = rawName.trim();
@@ -1726,7 +1750,9 @@ export function looksLikePackage(content) {
         plainObject(root.scripts));
 }
 function scriptPipesDownload(command) {
-    return /\b(?:curl|wget)\b[\s\S]*\|\s*(?:ba)?sh\b/.test(command);
+    // Search only after the first download word. A [\s\S]* prefix rescans per download word.
+    const start = command.search(/\b(?:curl|wget)\b/);
+    return start >= 0 && /\|\s*(?:ba)?sh\b/.test(command.slice(start));
 }
 function jsonKeyLine(content, key) {
     const match = new RegExp(`"${escapeRegex(key)}"\\s*:`).exec(content);

package/dist/review.js

@@ -148,7 +148,7 @@ export function architectureFindings(content, focus) {
         });
     }
     if (shouldInclude(focusValue, "security") &&
-        /^\s*USER\s+root\s*$/im.test(content)) {
+        /^[^\S\n]*USER\s+root\s*$/im.test(content)) {
         findings.push({
             severity: "medium",
             title: "Container runs as root",
@@ -175,7 +175,7 @@ export function architectureFindings(content, focus) {
             "Retry limit is unbounded": /(?:max_?retries|retry_?count|retries)\s*[:=]\s*(?:-1|Infinity)\b/i,
             "Database connection limit is unlimited": /(?:max_?open_?conns|maxOpenConns|SetMaxOpenConns)\s*(?:[:=]|\()\s*0\b/,
             "Memory limit is disabled": /(?:mem_limit|memory_limit)\s*[:=]\s*["']?0\b/i,
-            "Container runs as root": /^\s*USER\s+root\s*$/im,
+            "Container runs as root": /^[^\S\n]*USER\s+root\s*$/im,
         };
         const pattern = matchers[finding.title];
         const matches = pattern

package/dist/server.js

@@ -60,7 +60,7 @@ export function createServer(remote = false) {
         title: "Review architecture",
         description: "Review individual source snippets or parsed infrastructure for security, reliability, and cost risks. Application checks include infrastructure bottlenecks: a disabled timeout, a one-connection pool, and an unbounded retry limit. For a whole application or Next.js architecture consultation, use plan_architecture_review and review_application_architecture instead.",
         annotations: {
-            readOnlyHint: true,
+            readOnlyHint: false,
             destructiveHint: false,
             openWorldHint: false,
         },
@@ -148,7 +148,7 @@ export function createServer(remote = false) {
                 : "") +
                 "Parse Terraform HCL/JSON, CloudFormation YAML/JSON, Kubernetes manifests, Pulumi YAML, Pulumi programs, or Docker Compose. Includes Dockerfile, GitHub Actions, Helm templates, Ansible playbooks, Bicep files, ARM templates, GitLab CI, Azure Pipelines, Cloud Build, tfvars, Serverless Framework, a standalone IAM policy, and package.json. Helm templates, Ansible facts, Bicep modules, ARM expressions, pipelines, Serverless Framework config, and IAM policies are not executed. Conditions are not evaluated. Terraform module sources are not fetched. Check security, reliability and cost rules with resource locations and remediation. Pulumi programs are scanned as text.",
             annotations: {
-                readOnlyHint: true,
+                readOnlyHint: false,
                 destructiveHint: false,
                 openWorldHint: false,
             },

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.6.19";
+export declare const VERSION = "0.6.20";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = "0.6.19";
+export const VERSION = "0.6.20";

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@skaleagents/swarm",
-  "version": "0.6.19",
+  "version": "0.6.20",
   "private": false,
   "publishConfig": {
     "access": "public"
   },
   "type": "module",
   "description": "SkaleAgents review tools with OAuth for local and hosted MCP clients",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/SkaleAgents/mcp-server.git"
+  },
   "exports": {
     "./http": {
       "types": "./dist/http.d.ts",