@sfdxy/anypoint-connect 0.13.0 → 0.15.0

package/dist/mcp/tools/identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/mcp/tools/identity.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,UAAU,qBAAqB,CAAC,MAAiB,EAAE,MAAsB;IAC3E,MAAM,CAAC,YAAY,CACf,QAAQ,EACR;QACI,KAAK,EAAE,UAAU;QACjB,WAAW,EACP,4NAA4N;QAChO,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;KACtC,EACD,KAAK,IAAI,EAAE;QACP,IAAI,CAAC;YACD,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;YACjC,OAAO;gBACH,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAChB;4BACI,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,QAAQ,EAAE;4BACtC,QAAQ,EAAE,EAAE,CAAC,QAAQ;4BACrB,KAAK,EAAE,EAAE,CAAC,KAAK;4BACf,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI;4BAClC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE;yBAC5B,EACD,IAAI,EACJ,CAAC,CACJ;qBACJ;iBACJ;aACJ,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO;gBACH,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,eAAe,YAAY,CAAC,KAAK,CAAC,+BAA+B;qBAC1E;iBACJ;gBACD,OAAO,EAAE,IAAI;aAChB,CAAC;QACN,CAAC;IACL,CAAC,CACJ,CAAC;IAEF,MAAM,CAAC,YAAY,CACf,mBAAmB,EACnB;QACI,KAAK,EAAE,mBAAmB;QAC1B,WAAW,EACP,qQAAqQ;QACzQ,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;KACtC,EACD,KAAK,IAAI,EAAE;QACP,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAClE,OAAO;gBACH,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAChB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4BACb,EAAE,EAAE,CAAC,CAAC,EAAE;4BACR,IAAI,EAAE,CAAC,CAAC,IAAI;4BACZ,IAAI,EAAE,CAAC,CAAC,IAAI;4BACZ,YAAY,EAAE,CAAC,CAAC,YAAY;yBAC/B,CAAC,CAAC,EACH,IAAI,EACJ,CAAC,CACJ;qBACJ;iBACJ;aACJ,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC,CACJ,CAAC;IAEF,MAAM,CAAC,YAAY,CACf,kBAAkB,EAClB;QACI,KAAK,EAAE,+BAA+B;QACtC,WAAW,EACP,saAAsa;QAC1a,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;KACtC,EACD,KAAK,IAAI,EAAE;QACP,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC/D,MAAM,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC;YAE3B,MAAM,OAAO,GAAG;gBACZ,YAAY,EAAE,GAAG,CAAC,IAAI;gBACtB,YAAY,EAAE,GAAG,CAAC,YAAY;gBAC9B,OAAO,EAAE;oBACL,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;oBACpC,aAAa,EAAE,CAAC,CAAC,aAAa;oBAC9B,YAAY,EAAE,CAAC,CAAC,YAAY;oBAC5B,WAAW,EAAE,CAAC,CAAC,WAAW;oBAC1B,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;iBACvC;gBACD,SAAS,EAAE;oBACP,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,kBAAkB,EAAE,CAAC,CAAC,kBAAkB;iBAC3C;gBACD,WAAW,EAAE;oBACT,YAAY,EAAE,CAAC,CAAC,uBAAuB;oBACvC,IAAI,EAAE,CAAC,CAAC,eAAe;iBAC1B;gBACD,UAAU,EAAE;oBACR,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,YAAY,EAAE,CAAC,CAAC,YAAY;iBAC/B;gBACD,aAAa,EAAE;oBACX,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,aAAa,EAAE,CAAC,CAAC,aAAa;oBAC9B,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;oBACpC,MAAM,EAAE,CAAC,CAAC,SAAS;iBACtB;gBACD,YAAY,EAAE,CAAC,CAAC,YAAY;gBAC5B,aAAa,EAAE,CAAC,CAAC,aAAa;gBAC9B,kBAAkB,EAAE,CAAC,CAAC,kBAAkB;gBACxC,aAAa,EAAE,CAAC,CAAC,MAAM;aAC1B,CAAC;YAEF,OAAO;gBACH,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;qBACzC;iBACJ;aACJ,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC,CACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../../src/mcp/tools/identity.ts"],"names":[],"mappings":"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"}

package/dist/mcp/tools/index.d.ts

@@ -2,13 +2,16 @@
  * MCP Tool Registrars — barrel export
  */
 export { registerIdentityTools } from './identity.js';
-export { registerApplicationTools } from './applications.js';
+export { registerAppReadTools } from './apps-read.js';
+export { registerAppLifecycleTools } from './apps-lifecycle.js';
+export { registerAppDeployTools } from './apps-deploy.js';
 export { registerLogTools } from './logs.js';
 export { registerAnalysisTools } from './analysis.js';
 export { registerMonitoringTools } from './monitoring.js';
 export { registerExchangeTools } from './exchange.js';
 export { registerApiManagerTools } from './api-manager.js';
 export { registerDesignCenterTools } from './design-center.js';
+export { registerGovernanceTools } from './governance.js';
 export { registerProfileTools } from './profile.js';
 export { registerAuditTools } from './audit.js';
 export { registerAnypointMQTools } from './anypoint-mq.js';

package/dist/mcp/tools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/mcp/tools/index.js

@@ -2,13 +2,16 @@
  * MCP Tool Registrars — barrel export
  */
 export { registerIdentityTools } from './identity.js';
-export { registerApplicationTools } from './applications.js';
+export { registerAppReadTools } from './apps-read.js';
+export { registerAppLifecycleTools } from './apps-lifecycle.js';
+export { registerAppDeployTools } from './apps-deploy.js';
 export { registerLogTools } from './logs.js';
 export { registerAnalysisTools } from './analysis.js';
 export { registerMonitoringTools } from './monitoring.js';
 export { registerExchangeTools } from './exchange.js';
 export { registerApiManagerTools } from './api-manager.js';
 export { registerDesignCenterTools } from './design-center.js';
+export { registerGovernanceTools } from './governance.js';
 export { registerProfileTools } from './profile.js';
 export { registerAuditTools } from './audit.js';
 export { registerAnypointMQTools } from './anypoint-mq.js';

package/dist/mcp/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/mcp/tools/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/mcp/tools/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/mcp/tools/logs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/logs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIrE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,QA4GzE"}
+{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/logs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAIrE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,QA2FzE"}

package/dist/mcp/tools/logs.js

@@ -3,7 +3,7 @@
  * get_logs, download_logs
  */
 import { z } from 'zod';
-import { mcpError } from './shared.js';
+import { mcpError, mcpText, resolveEnvironment, timeWindow } from './shared.js';
 export function registerLogTools(server, client) {
     server.registerTool('get_logs', {
         title: 'Get Application Logs',
@@ -27,8 +27,7 @@ export function registerLogTools(server, client) {
         annotations: { readOnlyHint: true },
     }, async ({ appName, environment, lines, level, search }) => {
         try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
+            const { orgId, env } = await resolveEnvironment(client, environment);
             const entries = await client.logs.getLogs(orgId, env.id, appName, {
                 limit: lines || 100,
                 level,
@@ -39,14 +38,7 @@ export function registerLogTools(server, client) {
                 level: e.priority,
                 message: e.message,
             }));
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({ total: entries.length, entries: formatted }, null, 2),
-                    },
-                ],
-            };
+            return mcpText({ total: entries.length, entries: formatted });
         }
         catch (error) {
             return mcpError(error);
@@ -66,10 +58,8 @@ export function registerLogTools(server, client) {
         annotations: { readOnlyHint: true },
     }, async ({ appName, environment, hoursBack, level }) => {
         try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
-            const to = Date.now();
-            const from = to - hoursBack * 60 * 60 * 1000;
+            const { orgId, env } = await resolveEnvironment(client, environment);
+            const { from, to } = timeWindow(hoursBack);
             const entries = await client.logs.getLogsForPeriod(orgId, env.id, appName, from, to, level);
             const text = entries
                 .map((e) => {
@@ -77,14 +67,7 @@ export function registerLogTools(server, client) {
                 return `${ts} [${e.priority}] ${e.message}`;
             })
                 .join('\n');
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: text || 'No log entries found for the specified period.',
-                    },
-                ],
-            };
+            return mcpText(text || 'No log entries found for the specified period.');
         }
         catch (error) {
             return mcpError(error);

package/dist/mcp/tools/logs.js.map

@@ -1 +1 @@
-{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/mcp/tools/logs.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,UAAU,gBAAgB,CAAC,MAAiB,EAAE,MAAsB;IACtE,MAAM,CAAC,YAAY,CACf,UAAU,EACV;QACI,KAAK,EAAE,sBAAsB;QAC7B,WAAW,EACP,2TAA2T;QAC/T,WAAW,EAAE;YACT,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sCAAsC,CAAC;YACpE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;YAC1D,KAAK,EAAE,CAAC;iBACH,MAAM,EAAE;iBACR,QAAQ,EAAE;iBACV,QAAQ,CAAC,uEAAuE,CAAC;YACtF,KAAK,EAAE,CAAC;iBACH,MAAM,EAAE;iBACR,QAAQ,EAAE;iBACV,QAAQ,CACL,0GAA0G,CAC7G;YACL,MAAM,EAAE,CAAC;iBACJ,MAAM,EAAE;iBACR,QAAQ,EAAE;iBACV,QAAQ,CACL,+IAA+I,CAClJ;SACR;QACD,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;KACtC,EACD,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE;QACrD,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAEjF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE;gBAC9D,KAAK,EAAE,KAAK,IAAI,GAAG;gBACnB,KAAK;gBACL,MAAM;aACT,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC;gBAC5C,SAAS,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE;gBAC9C,KAAK,EAAE,CAAC,CAAC,QAAQ;gBACjB,OAAO,EAAE,CAAC,CAAC,OAAO;aACrB,CAAC,CAAC,CAAC;YAEJ,OAAO;gBACH,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC/E;iBACJ;aACJ,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC,CACJ,CAAC;IAEF,MAAM,CAAC,YAAY,CACf,eAAe,EACf;QACI,KAAK,EAAE,8BAA8B;QACrC,WAAW,EACP,qSAAqS;QACzS,WAAW,EAAE;YACT,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sCAAsC,CAAC;YACpE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;YAC1D,SAAS,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,QAAQ,CACL,+FAA+F,CAClG;YACL,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,uDAAuD,CAAC;SACjG;QACD,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;KACtC,EACD,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;QACjD,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;YAEjF,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,EAAE,GAAG,SAAS,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YAE7C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YAE5F,MAAM,IAAI,GAAG,OAAO;iBACf,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACP,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC/C,OAAO,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;YAChD,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,CAAC;YAEhB,OAAO;gBACH,OAAO,EAAE;oBACL;wBACI,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,IAAI,IAAI,gDAAgD;qBACjE;iBACJ;aACJ,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC,CACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/mcp/tools/logs.ts"],"names":[],"mappings":"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"}

package/dist/mcp/tools/monitoring.d.ts

@@ -1,7 +1,6 @@
 /**
  * MCP Tool Registrar — Monitoring tools
- * get_metrics, get_performance_metrics, get_metrics_timeseries,
- * get_worker_metrics, compare_environments
+ * get_metrics, get_runtime_metrics, get_metrics_timeseries, raw_amql_query
  */
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { AnypointClient } from '../../client/AnypointClient.js';

package/dist/mcp/tools/monitoring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monitoring.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/monitoring.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAGrE,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,QAwahF"}
+{"version":3,"file":"monitoring.d.ts","sourceRoot":"","sources":["../../../src/mcp/tools/monitoring.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAEzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAYrE,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,QA8IhF"}

package/dist/mcp/tools/monitoring.js

@@ -1,86 +1,72 @@
 /**
  * MCP Tool Registrar — Monitoring tools
- * get_metrics, get_performance_metrics, get_metrics_timeseries,
- * get_worker_metrics, compare_environments
+ * get_metrics, get_runtime_metrics, get_metrics_timeseries, raw_amql_query
  */
 import { z } from 'zod';
-import { mcpError } from './shared.js';
+import { AMQL_MAX_LIMIT, GRANULARITIES, TIME_SERIES_SIGNALS } from '../../api/MonitoringApi.js';
+import { mcpError, mcpText, resolveEnvironment, timeWindow } from './shared.js';
+const hoursBackSchema = z
+    .number()
+    .positive()
+    .optional()
+    .describe('Time window in hours ending now (default: 24). Use 1 for recent activity, 168 for weekly trends.');
+const appNameSchema = z.string().optional().describe('Limit to one application name. Omit for every app.');
 export function registerMonitoringTools(server, client) {
     server.registerTool('get_metrics', {
-        title: 'Get Application Metrics',
-        description: 'Fetches runtime performance metrics for applications in an environment using Anypoint Monitoring AMQL queries. Returns inbound request count, average response time (ms), outbound request count, and outbound average response time. Use this to identify performance bottlenecks or traffic patterns.',
+        title: 'Get Traffic Metrics',
+        description: 'Traffic, latency and failures from Anypoint Monitoring. Per app (default), per worker/replica, or per HTTP route: inbound request count, failed count and failure rate, average/min/max and p50/p75/p90/p95/p99 response time (ms), outbound call count/failures/average, and Mule message count/errors. Omit `environment` to compare every environment side by side. Use groupBy "worker" to spot an unhealthy or overloaded replica, and "route" to find which inbound or outbound route is failing.',
         inputSchema: {
-            environment: z.string().describe('Environment name or ID'),
-            hoursBack: z
-                .number()
-                .optional()
-                .describe('Time window in hours (default: 24). Use 1 for recent, 168 for weekly trends.'),
-            appName: z
+            environment: z
                 .string()
                 .optional()
-                .describe('Filter to a specific application name. Omit to get metrics for all apps.'),
+                .describe('Environment name or ID. Omit to compare every environment.'),
+            hoursBack: hoursBackSchema,
+            appName: appNameSchema,
+            groupBy: z.enum(['app', 'worker', 'route']).optional().describe('Row grouping (default: "app").'),
         },
         annotations: { readOnlyHint: true },
-    }, async ({ environment, hoursBack, appName }) => {
+    }, async ({ environment, hoursBack, appName, groupBy = 'app' }) => {
         try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
-            const to = Date.now();
-            const from = to - (hoursBack || 24) * 60 * 60 * 1000;
-            const metrics = await client.monitoring.getAppMetrics(orgId, env.id, from, to, appName);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            environment: env.name,
-                            period: { from: new Date(from).toISOString(), to: new Date(to).toISOString() },
-                            apps: metrics,
-                        }, null, 2),
-                    },
-                ],
-            };
+            const { from, to, period } = timeWindow(hoursBack);
+            const resolved = environment ? await resolveEnvironment(client, environment) : undefined;
+            const orgId = resolved?.orgId ?? (await client.getDefaultOrgId());
+            const scope = { orgId, envId: resolved?.env.id, from, to, appName };
+            if (groupBy === 'route') {
+                return mcpText({
+                    environment: resolved?.env.name ?? 'all',
+                    period,
+                    routes: await client.monitoring.getRouteMetrics(scope),
+                });
+            }
+            return mcpText({
+                environment: resolved?.env.name ?? 'all',
+                period,
+                groupBy,
+                rows: await client.monitoring.getMetrics(scope, groupBy),
+            });
         }
         catch (error) {
             return mcpError(error);
         }
     });
-    server.registerTool('get_performance_metrics', {
-        title: 'Get Performance Metrics (Percentiles)',
-        description: 'Fetches detailed percentile-based performance metrics per application: p50, p95, p99 response times, min/max latency, and request count. Use this for SLA validation, identifying tail latency issues, and performance baselining. For basic request counts and averages, use get_metrics instead.',
+    server.registerTool('get_runtime_metrics', {
+        title: 'Get Runtime (JVM and Host) Metrics',
+        description: 'JVM and host health per worker/replica: total heap used (avg/peak) and committed; the old-generation pool with its limit and peak-to-limit ratio (the memory-pressure and leak signal); metaspace; old-generation GC collections and GC time inside the window; CPU count and physical RAM; system and process CPU load (avg/max); and average free physical memory. Memory sizes are bytes, CPU loads are 0–1 fractions, GC time is milliseconds.',
         inputSchema: {
-            environment: z
-                .string()
-                .describe('Environment name (e.g. "Development", "Production") or environment ID'),
-            hoursBack: z
-                .number()
-                .optional()
-                .describe('Time window in hours (default: 24). Use 1 for recent, 168 for weekly trends'),
-            appName: z
-                .string()
-                .optional()
-                .describe('Filter to a specific application name. Omit to get metrics for all apps'),
+            environment: z.string().describe('Environment name or ID'),
+            hoursBack: hoursBackSchema,
+            appName: appNameSchema,
         },
         annotations: { readOnlyHint: true },
     }, async ({ environment, hoursBack, appName }) => {
         try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
-            const to = Date.now();
-            const from = to - (hoursBack || 24) * 60 * 60 * 1000;
-            const metrics = await client.monitoring.getPerformanceMetrics(orgId, env.id, from, to, appName);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            environment: env.name,
-                            period: { from: new Date(from).toISOString(), to: new Date(to).toISOString() },
-                            apps: metrics,
-                        }, null, 2),
-                    },
-                ],
-            };
+            const { orgId, env } = await resolveEnvironment(client, environment);
+            const { from, to, period } = timeWindow(hoursBack);
+            return mcpText({
+                environment: env.name,
+                period,
+                workers: await client.monitoring.getRuntimeMetrics({ orgId, envId: env.id, from, to, appName }),
+            });
         }
         catch (error) {
             return mcpError(error);
@@ -88,167 +74,24 @@ export function registerMonitoringTools(server, client) {
     });
     server.registerTool('get_metrics_timeseries', {
         title: 'Get Metrics Time Series',
-        description: 'Fetches time-series metrics for trending analysis. Returns timestamped buckets with request count, average response time, and p95 latency per app. Use this to spot degradation trends, traffic spikes, or correlate performance changes with deployments.',
+        description: 'Bucketed metrics for trend and incident analysis. Signals: "traffic" (requests, failed, avg and p95 latency per app), "latency" (p50/p75/p90/p95/p99 per app), "memory" (heap, old-generation and metaspace bytes per worker), "cpu" (system/process CPU load and free physical memory per worker), "gc" (collections and GC milliseconds per bucket per worker, old-generation split out). Use "1m" or "5m" buckets for incident windows of a few hours and "1h"/"1d" for multi-day trends such as a rising old-generation baseline.',
         inputSchema: {
-            environment: z
-                .string()
-                .describe('Environment name (e.g. "Development", "Production") or environment ID'),
-            hoursBack: z
-                .number()
-                .optional()
-                .describe('Time window in hours (default: 24). Use 1 for recent, 168 for weekly trends'),
+            environment: z.string().describe('Environment name or ID'),
+            signal: z.enum(TIME_SERIES_SIGNALS).describe('Which signal to chart'),
+            hoursBack: hoursBackSchema,
             granularity: z
-                .enum(['5m', '15m', '30m', '1h', '1d'])
-                .optional()
-                .describe('Time bucket size (default: "1h"). Use "5m" for short windows, "1d" for weekly'),
-            appName: z
-                .string()
-                .optional()
-                .describe('Filter to a specific application name. Omit to get time series for all apps'),
-        },
-        annotations: { readOnlyHint: true },
-    }, async ({ environment, hoursBack, granularity, appName }) => {
-        try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
-            const to = Date.now();
-            const from = to - (hoursBack || 24) * 60 * 60 * 1000;
-            const granularityMap = {
-                '5m': 'PT5M',
-                '15m': 'PT15M',
-                '30m': 'PT30M',
-                '1h': 'PT1H',
-                '1d': 'P1D',
-            };
-            const g = granularityMap[granularity || '1h'];
-            const data = await client.monitoring.getTimeSeries(orgId, env.id, from, to, g, appName);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            environment: env.name,
-                            period: { from: new Date(from).toISOString(), to: new Date(to).toISOString() },
-                            granularity: granularity || '1h',
-                            dataPoints: data,
-                        }, null, 2),
-                    },
-                ],
-            };
-        }
-        catch (error) {
-            return mcpError(error);
-        }
-    });
-    server.registerTool('get_worker_metrics', {
-        title: 'Get Worker/Replica Metrics',
-        description: 'Fetches per-worker (per-replica) performance metrics: request count, average response time, max latency, and p95 for each worker ID. Use this to detect unhealthy replicas, identify load imbalance between workers, or pinpoint specific instances with elevated latency.',
-        inputSchema: {
-            environment: z
-                .string()
-                .describe('Environment name (e.g. "Development", "Production") or environment ID'),
-            hoursBack: z
-                .number()
-                .optional()
-                .describe('Time window in hours (default: 24). Use 1 for recent, 168 for weekly trends'),
-            appName: z
-                .string()
-                .optional()
-                .describe('Filter to a specific application name. Omit to get worker metrics for all apps'),
-        },
-        annotations: { readOnlyHint: true },
-    }, async ({ environment, hoursBack, appName }) => {
-        try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
-            const to = Date.now();
-            const from = to - (hoursBack || 24) * 60 * 60 * 1000;
-            const metrics = await client.monitoring.getWorkerMetrics(orgId, env.id, from, to, appName);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            environment: env.name,
-                            period: { from: new Date(from).toISOString(), to: new Date(to).toISOString() },
-                            workers: metrics,
-                        }, null, 2),
-                    },
-                ],
-            };
-        }
-        catch (error) {
-            return mcpError(error);
-        }
-    });
-    server.registerTool('compare_env_performance', {
-        title: 'Compare Environment Performance',
-        description: 'Compares application response-time performance across all environments (Development, Sandbox, Production) without requiring an environment filter. Returns per-app, per-environment metrics including request count, average response time, p95, and p99 latency. Use this to validate that staging matches production behavior, spot environment-specific degradation, or baseline performance across the org.',
-        inputSchema: {
-            hoursBack: z
-                .number()
-                .optional()
-                .describe('Time window in hours (default: 24). Use 1 for recent, 168 for weekly trends'),
-        },
-        annotations: { readOnlyHint: true },
-    }, async ({ hoursBack }) => {
-        try {
-            const orgId = await client.getDefaultOrgId();
-            const to = Date.now();
-            const from = to - (hoursBack || 24) * 60 * 60 * 1000;
-            const metrics = await client.monitoring.getCrossEnvMetrics(orgId, from, to);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            period: { from: new Date(from).toISOString(), to: new Date(to).toISOString() },
-                            environments: metrics,
-                        }, null, 2),
-                    },
-                ],
-            };
-        }
-        catch (error) {
-            return mcpError(error);
-        }
-    });
-    server.registerTool('get_memory_metrics', {
-        title: 'Get JVM Memory Metrics',
-        description: 'Fetches JVM memory and infrastructure metrics per application: average heap used/committed, max heap, GC count and time, and thread count. Use this to identify memory pressure, potential leaks, or apps approaching heap limits. Queries the mulesoft.jvm datasource via AMQL.',
-        inputSchema: {
-            environment: z
-                .string()
-                .describe('Environment name (e.g. "Development", "Production") or environment ID'),
-            hoursBack: z
-                .number()
-                .optional()
-                .describe('Time window in hours (default: 24). Use 1 for recent, 168 for weekly trends'),
-            appName: z
-                .string()
+                .enum(GRANULARITIES)
                 .optional()
-                .describe('Filter to a specific application name. Omit to get memory metrics for all apps'),
+                .describe('Bucket size (default: "1h").'),
+            appName: appNameSchema,
         },
         annotations: { readOnlyHint: true },
-    }, async ({ environment, hoursBack, appName }) => {
+    }, async ({ environment, signal, hoursBack, granularity = '1h', appName }) => {
         try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
-            const to = Date.now();
-            const from = to - (hoursBack || 24) * 60 * 60 * 1000;
-            const metrics = await client.monitoring.getMemoryMetrics(orgId, env.id, from, to, appName);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            environment: env.name,
-                            period: { from: new Date(from).toISOString(), to: new Date(to).toISOString() },
-                            apps: metrics,
-                        }, null, 2),
-                    },
-                ],
-            };
+            const { orgId, env } = await resolveEnvironment(client, environment);
+            const { from, to, period } = timeWindow(hoursBack);
+            const points = await client.monitoring.getTimeSeries({ orgId, envId: env.id, from, to, appName }, signal, granularity);
+            return mcpText({ environment: env.name, period, signal, granularity, points });
         }
         catch (error) {
             return mcpError(error);
@@ -256,82 +99,32 @@ export function registerMonitoringTools(server, client) {
     });
     server.registerTool('raw_amql_query', {
         title: 'Execute Raw AMQL Query',
-        description: 'Executes a freeform AMQL (Anypoint Monitoring Query Language) query against the monitoring API. Use this for ad-hoc analysis when the pre-built metric tools don\'t answer a specific question. Datasources: "mulesoft.app.inbound" (inbound requests), "mulesoft.app.outbound" (outbound calls), "mulesoft.jvm" (memory/GC/threads). Supports SELECT, COUNT, AVG, SUM, MAX, MIN, PERCENTILE, GROUP BY, TIMESERIES, WHERE with timestamp BETWEEN.',
+        description: `Runs a freeform AMQL query against Anypoint Monitoring when the other metric tools do not answer the question. Platform errors are returned as-is (they name the bad token or attribute). Always filter on "sub_org.id" and a "timestamp BETWEEN <fromMs> AND <toMs>" range; add "env.id" and "app.name" as needed.
+Datasources:
+- "mulesoft.app.inbound" / "mulesoft.app.outbound": requests, response_time, "response.status" ('FAILED'), "http.route" (outbound), "worker.id", "app.name", "env.name"
+- "mulesoft.message": total_count, error_count
+- "mulesoft.app.jvm.memory": usage, committed, init, "limit" (quote it; -1 = unbounded), "type" (heap|off-heap), "pool" (total-heap, tenured_gen, eden_space, survivor_space, metaspace, …)
+- "mulesoft.app.jvm.gc": count and duration (ms) are CUMULATIVE per worker — use MAX − MIN, never SUM; filter or group by name (collector)
+- "mulesoft.app.jvm.cpu": available_processors, total_physical_memory_size
+- "mulesoft.app.memory": system_cpu_load, process_cpu_load, free_physical_memory_size (AVG only — MIN/MAX on memory sizes fail server-side)
+- "mulesoft.entity": entity-level view keyed by "entity.id"/"entity.name" (no "app.name")
+Syntax: COUNT, SUM, AVG, MIN, MAX, PERCENTILE(field, 0.95), LATEST(field), GROUP BY, ORDER BY, TIMESERIES PT1M|PT5M|PT15M|PT30M|PT1H|P1D. SELECT * is not supported; single-letter aliases such as h, d, t are reserved; escape quotes in string literals by doubling them. An in-query LIMIT is ignored — use the limit argument.`,
         inputSchema: {
-            query: z
-                .string()
-                .describe('AMQL query string. Example: SELECT COUNT(requests) AS "count", AVG(response_time) AS "avg_rt", "app.name" FROM "mulesoft.app.inbound" WHERE "sub_org.id" = \'<orgId>\' AND timestamp BETWEEN <from> AND <to> GROUP BY "app.name"'),
+            query: z.string().describe('AMQL query string'),
             limit: z
                 .number()
+                .int()
+                .positive()
+                .max(AMQL_MAX_LIMIT)
                 .optional()
-                .describe('Maximum number of data points to return (default: 200, max: 1000)'),
-        },
-        annotations: { readOnlyHint: true },
-    }, async ({ query, limit }) => {
-        try {
-            const data = await client.monitoring.search(query, limit || 200);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({ rowCount: data.length, data }, null, 2),
-                    },
-                ],
-            };
-        }
-        catch (error) {
-            return mcpError(error);
-        }
-    });
-    server.registerTool('get_memory_timeseries', {
-        title: 'Get Memory Usage Time Series',
-        description: 'Fetches time-series JVM memory metrics for trending analysis. Returns timestamped buckets with average heap used, heap committed, and GC count per app. Use this to spot memory growth trends, correlate GC spikes with latency, or detect slow memory leaks over time.',
-        inputSchema: {
-            environment: z
-                .string()
-                .describe('Environment name (e.g. "Development", "Production") or environment ID'),
-            hoursBack: z
-                .number()
-                .optional()
-                .describe('Time window in hours (default: 24). Use 1 for recent, 168 for weekly trends'),
-            granularity: z
-                .enum(['5m', '15m', '30m', '1h', '1d'])
-                .optional()
-                .describe('Time bucket size (default: "1h"). Use "5m" for short windows, "1d" for weekly'),
-            appName: z
-                .string()
-                .optional()
-                .describe('Filter to a specific application name. Omit to get time series for all apps'),
+                .describe(`Rows per page (default: 200, max: ${AMQL_MAX_LIMIT})`),
+            offset: z.number().int().min(0).optional().describe('Row offset for paging (default: 0)'),
         },
         annotations: { readOnlyHint: true },
-    }, async ({ environment, hoursBack, granularity, appName }) => {
+    }, async ({ query, limit, offset }) => {
         try {
-            const orgId = await client.getDefaultOrgId();
-            const env = await client.accessManagement.resolveEnvironment(orgId, environment);
-            const to = Date.now();
-            const from = to - (hoursBack || 24) * 60 * 60 * 1000;
-            const granularityMap = {
-                '5m': 'PT5M',
-                '15m': 'PT15M',
-                '30m': 'PT30M',
-                '1h': 'PT1H',
-                '1d': 'P1D',
-            };
-            const g = granularityMap[granularity || '1h'];
-            const data = await client.monitoring.getMemoryTimeSeries(orgId, env.id, from, to, g, appName);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({
-                            environment: env.name,
-                            period: { from: new Date(from).toISOString(), to: new Date(to).toISOString() },
-                            granularity: granularity || '1h',
-                            dataPoints: data,
-                        }, null, 2),
-                    },
-                ],
-            };
+            const data = await client.monitoring.search(query, { limit: limit ?? 200, offset });
+            return mcpText({ rowCount: data.length, data });
         }
         catch (error) {
             return mcpError(error);