@kya-os/create-mcpi-app 1.7.32 → 1.7.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/helpers/fetch-cloudflare-mcpi-template.d.ts.map +1 -1
  3. package/dist/helpers/fetch-cloudflare-mcpi-template.js +40 -25
  4. package/dist/helpers/fetch-cloudflare-mcpi-template.js.map +1 -1
  5. package/package.json +2 -2
  6. package/src/helpers/fetch-cloudflare-mcpi-template.ts +45 -29
package/dist/helpers/fetch-cloudflare-mcpi-template.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-cloudflare-mcpi-template.d.ts","sourceRoot":"","sources":["../../src/helpers/fetch-cloudflare-mcpi-template.ts"],"names":[],"mappings":"AAKA,UAAU,6BAA6B;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,6BAAkC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAm2Ef"}
1
+ {"version":3,"file":"fetch-cloudflare-mcpi-template.d.ts","sourceRoot":"","sources":["../../src/helpers/fetch-cloudflare-mcpi-template.ts"],"names":[],"mappings":"AAKA,UAAU,6BAA6B;IACrC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,6BAAkC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAm3Ef"}
package/dist/helpers/fetch-cloudflare-mcpi-template.js CHANGED
@@ -916,7 +916,10 @@ export class ${pascalClassName}MCP extends McpAgent {
916
916
  // Ensure URL includes /mcp path if not already present
917
917
  if (!this.mcpServerUrl.endsWith('/mcp')) {
918
918
  // Remove trailing slash if present, then append /mcp
919
- this.mcpServerUrl = this.mcpServerUrl.replace(/\\/$/, '') + '/mcp';
919
+ const urlWithoutTrailingSlash = this.mcpServerUrl.endsWith('/')
920
+ ? this.mcpServerUrl.slice(0, -1)
921
+ : this.mcpServerUrl;
922
+ this.mcpServerUrl = urlWithoutTrailingSlash + '/mcp';
920
923
  }
921
924
  console.log('[MCP-I] MCP Server URL configured:', this.mcpServerUrl);
922
925
  } else {
@@ -1746,21 +1749,20 @@ XMCP_I_SESSION_TTL = "1800"
1746
1749
  # AgentShield Integration (https://kya.vouched.id)
1747
1750
  AGENTSHIELD_API_URL = "https://kya.vouched.id"
1748
1751
  # AGENTSHIELD_API_KEY - MUST be declared here for .dev.vars to work
1749
- # Development: Add to .dev.vars file${apikey ? ` (already configured via --apikey flag)` : ""}
1750
- # Production: wrangler secret put AGENTSHIELD_API_KEY
1751
- AGENTSHIELD_API_KEY = "${apikey || ""}"
1752
+ # Development: Values in .dev.vars will override this empty string
1753
+ # Production: Use wrangler secret put AGENTSHIELD_API_KEY
1754
+ AGENTSHIELD_API_KEY = ""
1752
1755
  # AGENTSHIELD_PROJECT_ID - Your project ID from AgentShield dashboard (e.g., "batman-txh0ae")
1753
1756
  # Required for project-scoped tool protection configuration (recommended)
1754
1757
  # Find it in your dashboard URL: https://kya.vouched.id/dashboard/projects/{PROJECT_ID}
1755
1758
  # Or in your project settings
1756
- # Development: Add to .dev.vars file${projectId ? ` (already configured: ${projectId})` : ""}
1757
- # Production: wrangler secret put AGENTSHIELD_PROJECT_ID
1759
+ # This is not sensitive, so it's safe to keep a value here if provided
1758
1760
  AGENTSHIELD_PROJECT_ID = "${projectId || ""}"
1759
1761
  # ADMIN_API_KEY - Used for protected admin endpoints (e.g., /admin/clear-cache)
1760
1762
  # Set to same value as AGENTSHIELD_API_KEY by default
1761
- # Development: Add to .dev.vars file${apikey ? ` (already configured via --apikey flag)` : ""}
1762
- # Production: wrangler secret put ADMIN_API_KEY
1763
- ADMIN_API_KEY = "${apikey || ""}"
1763
+ # Development: Values in .dev.vars will override this empty string
1764
+ # Production: Use wrangler secret put ADMIN_API_KEY
1765
+ ADMIN_API_KEY = ""
1764
1766
  MCPI_ENV = "development"
1765
1767
 
1766
1768
  # Optional: MCP Server URL for tool discovery
@@ -1786,10 +1788,10 @@ MCPI_ENV = "development"
1786
1788
  MCP_IDENTITY_AGENT_DID = "${identity.did}"
1787
1789
 
1788
1790
  # Identity keys - MUST be declared here for .dev.vars to work!
1789
- # Development: Values in .dev.vars will override these
1791
+ # Development: Values in .dev.vars will override these empty strings
1790
1792
  # Production: Use wrangler secret put to set these
1791
- MCP_IDENTITY_PRIVATE_KEY = "${identity.privateKey}"
1792
- MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"
1793
+ MCP_IDENTITY_PRIVATE_KEY = ""
1794
+ MCP_IDENTITY_PUBLIC_KEY = ""
1793
1795
 
1794
1796
  # ALLOWED_ORIGINS for CORS (update for production)
1795
1797
  ALLOWED_ORIGINS = "https://claude.ai,https://app.anthropic.com"
@@ -1801,26 +1803,28 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1801
1803
  `;
1802
1804
  // Update existing values in wrangler.toml if they already exist
1803
1805
  // This handles the case where variables were added by the initial template
1804
- // Update identity keys if they already exist in the template
1806
+ // IMPORTANT: Secrets are always kept as empty strings in wrangler.toml
1807
+ // Actual values go in .dev.vars for local dev, wrangler secret put for production
1808
+ // Ensure identity keys are empty strings (not actual values)
1805
1809
  if (/MCP_IDENTITY_PRIVATE_KEY\s*=/.test(wranglerTomlContent)) {
1806
- wranglerTomlContent = wranglerTomlContent.replace(/MCP_IDENTITY_PRIVATE_KEY\s*=\s*"[^"]*"/, `MCP_IDENTITY_PRIVATE_KEY = "${identity.privateKey}"`);
1810
+ wranglerTomlContent = wranglerTomlContent.replace(/MCP_IDENTITY_PRIVATE_KEY\s*=\s*"[^"]*"/, `MCP_IDENTITY_PRIVATE_KEY = ""`);
1807
1811
  }
1808
1812
  if (/MCP_IDENTITY_PUBLIC_KEY\s*=/.test(wranglerTomlContent)) {
1809
- wranglerTomlContent = wranglerTomlContent.replace(/MCP_IDENTITY_PUBLIC_KEY\s*=\s*"[^"]*"/, `MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"`);
1813
+ wranglerTomlContent = wranglerTomlContent.replace(/MCP_IDENTITY_PUBLIC_KEY\s*=\s*"[^"]*"/, `MCP_IDENTITY_PUBLIC_KEY = ""`);
1810
1814
  }
1811
- // Update AGENTSHIELD_API_KEY if it exists and apikey is provided
1812
- if (apikey && /AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent)) {
1813
- wranglerTomlContent = wranglerTomlContent.replace(/AGENTSHIELD_API_KEY\s*=\s*"[^"]*"/, `AGENTSHIELD_API_KEY = "${apikey}"`);
1815
+ // Ensure API keys are empty strings (not actual values)
1816
+ if (/AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent)) {
1817
+ wranglerTomlContent = wranglerTomlContent.replace(/AGENTSHIELD_API_KEY\s*=\s*"[^"]*"/, `AGENTSHIELD_API_KEY = ""`);
1818
+ }
1819
+ if (/ADMIN_API_KEY\s*=/.test(wranglerTomlContent)) {
1820
+ wranglerTomlContent = wranglerTomlContent.replace(/ADMIN_API_KEY\s*=\s*"[^"]*"/, `ADMIN_API_KEY = ""`);
1814
1821
  }
1815
1822
  // Update AGENTSHIELD_PROJECT_ID if it exists and projectId is provided
1823
+ // This is safe to keep a value since it's not sensitive
1816
1824
  if (projectId &&
1817
1825
  /AGENTSHIELD_PROJECT_ID\s*=/.test(wranglerTomlContent)) {
1818
1826
  wranglerTomlContent = wranglerTomlContent.replace(/AGENTSHIELD_PROJECT_ID\s*=\s*"[^"]*"/, `AGENTSHIELD_PROJECT_ID = "${projectId}"`);
1819
1827
  }
1820
- // Update ADMIN_API_KEY if it exists and apikey is provided (set to same value as AGENTSHIELD_API_KEY)
1821
- if (apikey && /ADMIN_API_KEY\s*=/.test(wranglerTomlContent)) {
1822
- wranglerTomlContent = wranglerTomlContent.replace(/ADMIN_API_KEY\s*=\s*"[^"]*"/, `ADMIN_API_KEY = "${apikey}"`);
1823
- }
1824
1828
  // Check if API key variables already exist in wrangler.toml
1825
1829
  // (They may have been added by the initial template)
1826
1830
  const hasAgentshieldApiKey = /AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent);
@@ -1845,15 +1849,25 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1845
1849
  if (!hasAdminApiKey) {
1846
1850
  apiKeyVarsParts.push(`ADMIN_API_KEY = ""`);
1847
1851
  }
1852
+ // Only add AGENTSHIELD_PROJECT_ID if it doesn't exist
1853
+ // If projectId is provided, it will be set above (lines 1897-1907)
1854
+ // If not provided, we still need to declare it for .dev.vars to work
1848
1855
  if (!hasAgentshieldProjectId) {
1849
- apiKeyVarsParts.push(`AGENTSHIELD_PROJECT_ID = ""`);
1856
+ apiKeyVarsParts.push(`AGENTSHIELD_PROJECT_ID = "${projectId || ""}"`);
1850
1857
  }
1851
1858
  const apiKeyVars = apiKeyVarsParts.length > 0
1852
1859
  ? `\n${apiKeyVarsParts.join("\n")}\n`
1853
1860
  : "";
1854
1861
  // Only insert identity vars and API key vars if they don't already exist in [vars]
1855
- // If they already exist, we've already updated them above
1856
- const needsInsertion = !hasIdentityDid || !hasIdentityPrivateKey || !hasIdentityPublicKey;
1862
+ // If they already exist, we've already updated them above to ensure they're empty strings
1863
+ // Note: API keys are already in initial template, so we mainly check for identity vars
1864
+ // But we also check for API keys in case they were removed from template
1865
+ const needsInsertion = !hasIdentityDid ||
1866
+ !hasIdentityPrivateKey ||
1867
+ !hasIdentityPublicKey ||
1868
+ (!hasAgentshieldApiKey && apiKeyVarsParts.length > 0) ||
1869
+ (!hasAdminApiKey && apiKeyVarsParts.length > 0) ||
1870
+ (!hasAgentshieldProjectId && apiKeyVarsParts.length > 0);
1857
1871
  if (needsInsertion) {
1858
1872
  wranglerTomlContent =
1859
1873
  wranglerTomlContent.slice(0, insertPosition) +
@@ -1915,6 +1929,7 @@ ADMIN_API_KEY="your-admin-key-here"
1915
1929
  console.log(chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PRIVATE_KEY"));
1916
1930
  console.log(chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PUBLIC_KEY"));
1917
1931
  console.log(chalk.cyan(" $ wrangler secret put AGENTSHIELD_API_KEY"));
1932
+ console.log(chalk.cyan(" $ wrangler secret put ADMIN_API_KEY"));
1918
1933
  console.log();
1919
1934
  }
1920
1935
  }
package/dist/helpers/fetch-cloudflare-mcpi-template.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-cloudflare-mcpi-template.js","sourceRoot":"","sources":["../../src/helpers/fetch-cloudflare-mcpi-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAU1D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,WAAmB,EACnB,UAAyC,EAAE;IAE3C,MAAM,EACJ,cAAc,GAAG,KAAK,EACtB,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EACxC,MAAM,EACN,SAAS,EACT,YAAY,GAAG,KAAK,GACrB,GAAG,OAAO,CAAC;IAEZ,wCAAwC;IACxC,MAAM,SAAS,GAAG,WAAW;SAC1B,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;SAC5B,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC5B,MAAM,eAAe,GACnB,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEzD,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC,CAAC;QAEzE,sBAAsB;QACtB,MAAM,WAAW,GAAG;YAClB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE;gBACP,KAAK,EAAE,uBAAuB;gBAC9B,WAAW,EAAE,eAAe;gBAC5B,MAAM,EAAE,iBAAiB;gBACzB,GAAG,EAAE,cAAc;gBACnB,KAAK,EAAE,cAAc;gBACrB,WAAW,EACT,uJAAuJ;gBACzJ,iBAAiB,EAAE,gCAAgC,SAAS,CAAC,WAAW,EAAE,cAAc;gBACxF,iBAAiB,EAAE,gCAAgC,SAAS,CAAC,WAAW,EAAE,gBAAgB;gBAC1F,oBAAoB,EAAE,gCAAgC,SAAS,CAAC,WAAW,EAAE,mBAAmB;gBAChG,sBAAsB,EAAE,gCAAgC,SAAS,CAAC,WAAW,EAAE,qBAAqB;gBACpG,2BAA2B,EAAE,gCAAgC,SAAS,CAAC,WAAW,EAAE,qBAAqB;gBACzG,SAAS,EACP,6HAA6H;gBAC/H,eAAe,EAAE,kCAAkC,SAAS,CAAC,WAAW,EAAE,cAAc;gBACxF,eAAe,EAAE,kCAAkC,SAAS,CAAC,WAAW,EAAE,gBAAgB;gBAC1F,kBAAkB,EAAE,kCAAkC,SAAS,CAAC,WAAW,EAAE,mBAAmB;gBAChG,oBAAoB,EAAE,kCAAkC,SAAS,CAAC,WAAW,EAAE,qBAAqB;gBACpG,yBAAyB,EAAE,kCAAkC,SAAS,CAAC,WAAW,EAAE,qBAAqB;gBACzG,iBAAiB,EAAE,0CAA0C,SAAS,CAAC,WAAW,EAAE,cAAc;gBAClG,iBAAiB,EAAE,0CAA0C,SAAS,CAAC,WAAW,EAAE,gBAAgB;gBACpG,oBAAoB,EAAE,0CAA0C,SAAS,CAAC,WAAW,EAAE,mBAAmB;gBAC1G,sBAAsB,EAAE,0CAA0C,SAAS,CAAC,WAAW,EAAE,qBAAqB;gBAC9G,2BAA2B,EAAE,0CAA0C,SAAS,CAAC,WAAW,EAAE,qBAAqB;gBACnH,WAAW,EACT,uJAAuJ;gBACzJ,UAAU,EAAE,wCAAwC;gBACpD,UAAU,EACR,2IAA2I;gBAC7I,YAAY,EAAE,gBAAgB;gBAC9B,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE,QAAQ;gBACd,YAAY,EAAE,gBAAgB;gBAC9B,eAAe,EAAE,uBAAuB;aACzC;YACD,YAAY,EAAE;gBACZ,0BAA0B,EAAE,QAAQ;gBACpC,2BAA2B,EAAE,SAAS;gBACtC,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,SAAS;gBACf,GAAG,EAAE,UAAU;aAChB;YACD,eAAe,EAAE;gBACf,2BAA2B,EAAE,eAAe;gBAC5C,yBAAyB,EAAE,SAAS;gBACpC,qBAAqB,EAAE,QAAQ;gBAC/B,SAAS,EAAE,QAAQ;gBACnB,UAAU,EAAE,QAAQ;gBACpB,MAAM,EAAE,QAAQ;gBAChB,QAAQ,EAAE,SAAS;aACpB;SACF,CAAC;QAEF,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC9B,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,WAAW,EAAE;YACpE,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5C,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE3B,2BAA2B;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACrD,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAE7B,oCAAoC;QACpC,MAAM,kBAAkB,GAAG;;;gCAGC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4CAgFC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA6CrC,SAAS,CAAC,WAAW,EAAE;kBACvB,SAAS,CAAC,WAAW,EAAE;kBACvB,SAAS,CAAC,WAAW,EAAE;kBACvB,SAAS,CAAC,WAAW,EAAE;kBACvB,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0MxC,CAAC;QACE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAExE,+BAA+B;QAC/B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;QAED,yBAAyB;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACjD,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE3B,8BAA8B;QAC9B,MAAM,qBAAqB,GAAG;;;;;;;;;;;;;;;;;;;;MAoB5B,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+D5B,CAAC;QACE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EACzC,qBAAqB,CACtB,CAAC;QAEF,8BAA8B;QAC9B,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiFhC,CAAC;QACE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAAC,EACzC,oBAAoB,CACrB,CAAC;QAEF,4BAA4B;QAC5B,MAAM,mBAAmB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6D/B,CAAC;QACE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,kBAAkB,CAAC,EACvC,mBAAmB,CACpB,CAAC;QAEF,4BAA4B;QAC5B,MAAM,mBAAmB,GAAG;;;;;;;WAOrB,SAAS,CAAC,WAAW,EAAE;WACvB,SAAS,CAAC,WAAW,EAAE;WACvB,SAAS,CAAC,WAAW,EAAE;WACvB,SAAS,CAAC,WAAW,EAAE;WACvB,SAAS,CAAC,WAAW,EAAE;;;UAGxB,SAAS,CAAC,WAAW,EAAE,aAAa,eAAe;;;;;;;;;;;;;;;;CAgB5D,CAAC;QACE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAC1C,mBAAmB,CACpB,CAAC;QAEF,oBAAoB;QACpB,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4C5B,CAAC;QACE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAEpE,4DAA4D;QAC5D,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgGhC,CAAC;QACE,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAC3C,oBAAoB,CACrB,CAAC;QAEF,yDAAyD;QACzD,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;IAsBrB,SAAS,CAAC,WAAW,EAAE;IACvB,SAAS,CAAC,WAAW,EAAE;IACvB,SAAS,CAAC,WAAW,EAAE;IACvB,SAAS,CAAC,WAAW,EAAE;IACvB,SAAS,CAAC,WAAW,EAAE;;;eAGZ,eAAe;;aAEjB,WAAW;;;;;;;;;;;;;;;;;;;yBAmBC,SAAS,CAAC,WAAW,EAAE;2BACrB,SAAS,CAAC,WAAW,EAAE;8BACpB,SAAS,CAAC,WAAW,EAAE;gCACrB,SAAS,CAAC,WAAW,EAAE;gCACvB,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yCA4Ld,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yCAwIvB,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAgXpC,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAuDtB,SAAS,CAAC,WAAW,EAAE;;;;;;;;SAQ3C,eAAe;;;;;;;;;oBASJ,eAAe;oBACf,eAAe;;;CAGlC,CAAC;QACE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,YAAY,CAAC,CAAC;QAE9D,6CAA6C;QAC7C,MAAM,eAAe,GAAG;UAClB,WAAW;;;;;;;gBAOL,eAAe;;;;yBAIN,eAAe;;;;;;;;aAQ3B,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;aAYvB,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;aAUvB,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;aAUvB,SAAS,CAAC,WAAW,EAAE;;;6CAGS,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;;;;;;;;;;;;;;;;;;aAkB/D,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;wCAUI,MAAM,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC,CAAC,EAAE;;yBAEtE,MAAM,IAAI,EAAE;;;;;wCAKG,SAAS,CAAC,CAAC,CAAC,yBAAyB,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE;;4BAElE,SAAS,IAAI,EAAE;;;wCAGH,MAAM,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC,CAAC,EAAE;;mBAE5E,MAAM,IAAI,EAAE;;;;;;CAM9B,CAAC;QACE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,eAAe,CAAC,CAAC;QAE3E,qDAAqD;QACrD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC,CAAC;YAEhE,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,EAAE,CAAC;gBAE1C,8BAA8B;gBAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;gBAC7D,IAAI,mBAAmB,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBAEhE,6DAA6D;gBAC7D,4EAA4E;gBAC5E,MAAM,SAAS,GAAG,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACxD,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,cAAc,GAAG,SAAS,CAAC,KAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;oBAC9D,MAAM,YAAY,GAAG;;4BAEH,QAAQ,CAAC,GAAG;;;;;8BAKV,QAAQ,CAAC,UAAU;6BACpB,QAAQ,CAAC,SAAS;;;;;;;;;CAS9C,CAAC;oBAEQ,gEAAgE;oBAChE,2EAA2E;oBAE3E,6DAA6D;oBAC7D,IAAI,8BAA8B,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;wBAC7D,mBAAmB,GAAG,mBAAmB,CAAC,OAAO,CAC/C,wCAAwC,EACxC,+BAA+B,QAAQ,CAAC,UAAU,GAAG,CACtD,CAAC;oBACJ,CAAC;oBACD,IAAI,6BAA6B,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;wBAC5D,mBAAmB,GAAG,mBAAmB,CAAC,OAAO,CAC/C,uCAAuC,EACvC,8BAA8B,QAAQ,CAAC,SAAS,GAAG,CACpD,CAAC;oBACJ,CAAC;oBAED,iEAAiE;oBACjE,IAAI,MAAM,IAAI,yBAAyB,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;wBAClE,mBAAmB,GAAG,mBAAmB,CAAC,OAAO,CAC/C,mCAAmC,EACnC,0BAA0B,MAAM,GAAG,CACpC,CAAC;oBACJ,CAAC;oBAED,uEAAuE;oBACvE,IACE,SAAS;wBACT,4BAA4B,CAAC,IAAI,CAAC,mBAAmB,CAAC,EACtD,CAAC;wBACD,mBAAmB,GAAG,mBAAmB,CAAC,OAAO,CAC/C,sCAAsC,EACtC,6BAA6B,SAAS,GAAG,CAC1C,CAAC;oBACJ,CAAC;oBAED,sGAAsG;oBACtG,IAAI,MAAM,IAAI,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;wBAC5D,mBAAmB,GAAG,mBAAmB,CAAC,OAAO,CAC/C,6BAA6B,EAC7B,oBAAoB,MAAM,GAAG,CAC9B,CAAC;oBACJ,CAAC;oBAED,4DAA4D;oBAC5D,qDAAqD;oBACrD,MAAM,oBAAoB,GAAG,yBAAyB,CAAC,IAAI,CACzD,mBAAmB,CACpB,CAAC;oBACF,MAAM,uBAAuB,GAAG,4BAA4B,CAAC,IAAI,CAC/D,mBAAmB,CACpB,CAAC;oBACF,MAAM,cAAc,GAAG,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;oBACrE,MAAM,cAAc,GAAG,4BAA4B,CAAC,IAAI,CACtD,mBAAmB,CACpB,CAAC;oBACF,MAAM,qBAAqB,GAAG,8BAA8B,CAAC,IAAI,CAC/D,mBAAmB,CACpB,CAAC;oBACF,MAAM,oBAAoB,GAAG,6BAA6B,CAAC,IAAI,CAC7D,mBAAmB,CACpB,CAAC;oBAEF,yEAAyE;oBACzE,sFAAsF;oBACtF,MAAM,eAAe,GAAa,EAAE,CAAC;oBAErC,IACE,CAAC,oBAAoB;wBACrB,CAAC,uBAAuB;wBACxB,CAAC,cAAc,EACf,CAAC;wBACD,eAAe,CAAC,IAAI,CAClB,2DAA2D,CAC5D,CAAC;wBACF,eAAe,CAAC,IAAI,CAClB,sEAAsE,CACvE,CAAC;wBACF,eAAe,CAAC,IAAI,CAClB,oDAAoD,CACrD,CAAC;oBACJ,CAAC;oBAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;wBAC1B,eAAe,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;oBACnD,CAAC;oBACD,IAAI,CAAC,cAAc,EAAE,CAAC;wBACpB,eAAe,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;oBAC7C,CAAC;oBACD,IAAI,CAAC,uBAAuB,EAAE,CAAC;wBAC7B,eAAe,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;oBACtD,CAAC;oBAED,MAAM,UAAU,GACd,eAAe,CAAC,MAAM,GAAG,CAAC;wBACxB,CAAC,CAAC,KAAK,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;wBACrC,CAAC,CAAC,EAAE,CAAC;oBAET,mFAAmF;oBACnF,0DAA0D;oBAC1D,MAAM,cAAc,GAClB,CAAC,cAAc,IAAI,CAAC,qBAAqB,IAAI,CAAC,oBAAoB,CAAC;oBAErE,IAAI,cAAc,EAAE,CAAC;wBACnB,mBAAmB;4BACjB,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC;gCAC5C,YAAY;gCACZ,UAAU;gCACV,mBAAmB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;oBAC9C,CAAC;oBAED,gDAAgD;oBAChD,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;oBAEpD,4DAA4D;oBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;oBACxD,MAAM,cAAc,GAAG;;;;;;;;;4BASL,QAAQ,CAAC,UAAU;2BACpB,QAAQ,CAAC,SAAS;;;uBAGtB,MAAM,IAAI,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,EAAE;;;0BAG3D,SAAS,IAAI,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,EAAE;;;iBAG9E,MAAM,IAAI,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,8CAA8C,CAAC,CAAC,CAAC,EAAE;CAC5F,CAAC;oBACQ,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;oBAE9C,yCAAyC;oBACzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAClC,WAAW,EACX,mBAAmB,CACpB,CAAC;oBACF,MAAM,qBAAqB,GAAG;;;;;;;;;;;;CAYvC,CAAC;oBACQ,EAAE,CAAC,aAAa,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;oBAE5D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC,CAAC;oBAC5D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC,CAAC;oBAC5D,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAC/D,CAAC;oBACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAC1D,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC,CAAC;oBACrE,OAAO,CAAC,GAAG,EAAE,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC;oBACrD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAChE,CAAC;oBACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAChE,CAAC;oBACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAC/D,CAAC;oBACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAC3D,CAAC;oBACF,OAAO,CAAC,GAAG,EAAE,CAAC;gBAChB,CAAC;YACH,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CAAC,kCAAkC,CAAC,EAChD,KAAK,CAAC,OAAO,CACd,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC,CAAC;gBAC9D,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,sDAAsD,CAAC,CACnE,CAAC;gBACF,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;QAED,uBAAuB;QACvB,MAAM,eAAe,GAAG;YACtB,eAAe,EAAE;gBACf,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,QAAQ;gBAChB,GAAG,EAAE,CAAC,QAAQ,CAAC;gBACf,KAAK,EAAE,CAAC,2BAA2B,CAAC;gBACpC,gBAAgB,EAAE,SAAS;gBAC3B,iBAAiB,EAAE,IAAI;gBACvB,4BAA4B,EAAE,IAAI;gBAClC,eAAe,EAAE,IAAI;gBACrB,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,IAAI;gBAClB,gCAAgC,EAAE,IAAI;aACvC;YACD,OAAO,EAAE,CAAC,UAAU,CAAC;SACtB,CAAC;QACF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,eAAe,EAAE;YACzE,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,gBAAgB,GAAG;;;;;;;CAO5B,CAAC;QACE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAEzE,mBAAmB;QACnB,MAAM,aAAa,GAAG,KAAK,WAAW;;;;;;;;;;;;;;;;;;EAkBxC,cAAc;;;;;;;;EAQd,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAmCjD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;MACrD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;MACrD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;MACrD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;MACrD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;EAKzD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;;EAMrD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;;;;;;OAUhD,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuDhB,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA4DlD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+BrD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;;;;;;;;;;;;KAgBrD,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCzD,CAAC;QACE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,aAAa,CAAC,CAAC;QAErE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;QACnE,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAClE,CAAC;YACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAClE,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC,CAAC;YAC1E,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,qCAAqC,CAAC,CAAC,CAAC;YACjE,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CACP,uEAAuE,CACxE,CACF,CAAC;YACF,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAClE,CAAC;YACF,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC,CAAC;QAC1E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC,CAAC;QAC5E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC,CAAC;QAC5E,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,2DAA2D,CAAC,CACvE,CAAC;QACF,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAClE,CAAC;QACF,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACX,KAAK,CAAC,GAAG,CAAC,gDAAgD,CAAC,EAC3D,KAAK,CACN,CAAC;QACF,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"fetch-cloudflare-mcpi-template.js","sourceRoot":"","sources":["../../src/helpers/fetch-cloudflare-mcpi-template.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kya-os/create-mcpi-app",
3
- "version": "1.7.32",
3
+ "version": "1.7.34",
4
4
  "description": "Bootstrap MCP applications with identity features",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -32,7 +32,7 @@
32
32
  "@kya-os/cli-effects": "^1.0.9",
33
33
  "@kya-os/contracts": "^1.4.0",
34
34
  "@kya-os/mcp-i": "^1.5.5",
35
- "@kya-os/mcp-i-core": "^1.1.11",
35
+ "@kya-os/mcp-i-core": "^1.1.12",
36
36
  "@noble/ed25519": "^2.1.0",
37
37
  "axios": "^1.12.0",
38
38
  "base-x": "^5.0.0",
package/src/helpers/fetch-cloudflare-mcpi-template.ts CHANGED
@@ -970,7 +970,10 @@ export class ${pascalClassName}MCP extends McpAgent {
970
970
  // Ensure URL includes /mcp path if not already present
971
971
  if (!this.mcpServerUrl.endsWith('/mcp')) {
972
972
  // Remove trailing slash if present, then append /mcp
973
- this.mcpServerUrl = this.mcpServerUrl.replace(/\\/$/, '') + '/mcp';
973
+ const urlWithoutTrailingSlash = this.mcpServerUrl.endsWith('/')
974
+ ? this.mcpServerUrl.slice(0, -1)
975
+ : this.mcpServerUrl;
976
+ this.mcpServerUrl = urlWithoutTrailingSlash + '/mcp';
974
977
  }
975
978
  console.log('[MCP-I] MCP Server URL configured:', this.mcpServerUrl);
976
979
  } else {
@@ -1801,21 +1804,20 @@ XMCP_I_SESSION_TTL = "1800"
1801
1804
  # AgentShield Integration (https://kya.vouched.id)
1802
1805
  AGENTSHIELD_API_URL = "https://kya.vouched.id"
1803
1806
  # AGENTSHIELD_API_KEY - MUST be declared here for .dev.vars to work
1804
- # Development: Add to .dev.vars file${apikey ? ` (already configured via --apikey flag)` : ""}
1805
- # Production: wrangler secret put AGENTSHIELD_API_KEY
1806
- AGENTSHIELD_API_KEY = "${apikey || ""}"
1807
+ # Development: Values in .dev.vars will override this empty string
1808
+ # Production: Use wrangler secret put AGENTSHIELD_API_KEY
1809
+ AGENTSHIELD_API_KEY = ""
1807
1810
  # AGENTSHIELD_PROJECT_ID - Your project ID from AgentShield dashboard (e.g., "batman-txh0ae")
1808
1811
  # Required for project-scoped tool protection configuration (recommended)
1809
1812
  # Find it in your dashboard URL: https://kya.vouched.id/dashboard/projects/{PROJECT_ID}
1810
1813
  # Or in your project settings
1811
- # Development: Add to .dev.vars file${projectId ? ` (already configured: ${projectId})` : ""}
1812
- # Production: wrangler secret put AGENTSHIELD_PROJECT_ID
1814
+ # This is not sensitive, so it's safe to keep a value here if provided
1813
1815
  AGENTSHIELD_PROJECT_ID = "${projectId || ""}"
1814
1816
  # ADMIN_API_KEY - Used for protected admin endpoints (e.g., /admin/clear-cache)
1815
1817
  # Set to same value as AGENTSHIELD_API_KEY by default
1816
- # Development: Add to .dev.vars file${apikey ? ` (already configured via --apikey flag)` : ""}
1817
- # Production: wrangler secret put ADMIN_API_KEY
1818
- ADMIN_API_KEY = "${apikey || ""}"
1818
+ # Development: Values in .dev.vars will override this empty string
1819
+ # Production: Use wrangler secret put ADMIN_API_KEY
1820
+ ADMIN_API_KEY = ""
1819
1821
  MCPI_ENV = "development"
1820
1822
 
1821
1823
  # Optional: MCP Server URL for tool discovery
@@ -1845,10 +1847,10 @@ MCPI_ENV = "development"
1845
1847
  MCP_IDENTITY_AGENT_DID = "${identity.did}"
1846
1848
 
1847
1849
  # Identity keys - MUST be declared here for .dev.vars to work!
1848
- # Development: Values in .dev.vars will override these
1850
+ # Development: Values in .dev.vars will override these empty strings
1849
1851
  # Production: Use wrangler secret put to set these
1850
- MCP_IDENTITY_PRIVATE_KEY = "${identity.privateKey}"
1851
- MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"
1852
+ MCP_IDENTITY_PRIVATE_KEY = ""
1853
+ MCP_IDENTITY_PUBLIC_KEY = ""
1852
1854
 
1853
1855
  # ALLOWED_ORIGINS for CORS (update for production)
1854
1856
  ALLOWED_ORIGINS = "https://claude.ai,https://app.anthropic.com"
@@ -1861,30 +1863,39 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1861
1863
 
1862
1864
  // Update existing values in wrangler.toml if they already exist
1863
1865
  // This handles the case where variables were added by the initial template
1866
+ // IMPORTANT: Secrets are always kept as empty strings in wrangler.toml
1867
+ // Actual values go in .dev.vars for local dev, wrangler secret put for production
1864
1868
 
1865
- // Update identity keys if they already exist in the template
1869
+ // Ensure identity keys are empty strings (not actual values)
1866
1870
  if (/MCP_IDENTITY_PRIVATE_KEY\s*=/.test(wranglerTomlContent)) {
1867
1871
  wranglerTomlContent = wranglerTomlContent.replace(
1868
1872
  /MCP_IDENTITY_PRIVATE_KEY\s*=\s*"[^"]*"/,
1869
- `MCP_IDENTITY_PRIVATE_KEY = "${identity.privateKey}"`
1873
+ `MCP_IDENTITY_PRIVATE_KEY = ""`
1870
1874
  );
1871
1875
  }
1872
1876
  if (/MCP_IDENTITY_PUBLIC_KEY\s*=/.test(wranglerTomlContent)) {
1873
1877
  wranglerTomlContent = wranglerTomlContent.replace(
1874
1878
  /MCP_IDENTITY_PUBLIC_KEY\s*=\s*"[^"]*"/,
1875
- `MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"`
1879
+ `MCP_IDENTITY_PUBLIC_KEY = ""`
1876
1880
  );
1877
1881
  }
1878
1882
 
1879
- // Update AGENTSHIELD_API_KEY if it exists and apikey is provided
1880
- if (apikey && /AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent)) {
1883
+ // Ensure API keys are empty strings (not actual values)
1884
+ if (/AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent)) {
1881
1885
  wranglerTomlContent = wranglerTomlContent.replace(
1882
1886
  /AGENTSHIELD_API_KEY\s*=\s*"[^"]*"/,
1883
- `AGENTSHIELD_API_KEY = "${apikey}"`
1887
+ `AGENTSHIELD_API_KEY = ""`
1888
+ );
1889
+ }
1890
+ if (/ADMIN_API_KEY\s*=/.test(wranglerTomlContent)) {
1891
+ wranglerTomlContent = wranglerTomlContent.replace(
1892
+ /ADMIN_API_KEY\s*=\s*"[^"]*"/,
1893
+ `ADMIN_API_KEY = ""`
1884
1894
  );
1885
1895
  }
1886
1896
 
1887
1897
  // Update AGENTSHIELD_PROJECT_ID if it exists and projectId is provided
1898
+ // This is safe to keep a value since it's not sensitive
1888
1899
  if (
1889
1900
  projectId &&
1890
1901
  /AGENTSHIELD_PROJECT_ID\s*=/.test(wranglerTomlContent)
@@ -1895,14 +1906,6 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1895
1906
  );
1896
1907
  }
1897
1908
 
1898
- // Update ADMIN_API_KEY if it exists and apikey is provided (set to same value as AGENTSHIELD_API_KEY)
1899
- if (apikey && /ADMIN_API_KEY\s*=/.test(wranglerTomlContent)) {
1900
- wranglerTomlContent = wranglerTomlContent.replace(
1901
- /ADMIN_API_KEY\s*=\s*"[^"]*"/,
1902
- `ADMIN_API_KEY = "${apikey}"`
1903
- );
1904
- }
1905
-
1906
1909
  // Check if API key variables already exist in wrangler.toml
1907
1910
  // (They may have been added by the initial template)
1908
1911
  const hasAgentshieldApiKey = /AGENTSHIELD_API_KEY\s*=/.test(
@@ -1948,8 +1951,13 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1948
1951
  if (!hasAdminApiKey) {
1949
1952
  apiKeyVarsParts.push(`ADMIN_API_KEY = ""`);
1950
1953
  }
1954
+ // Only add AGENTSHIELD_PROJECT_ID if it doesn't exist
1955
+ // If projectId is provided, it will be set above (lines 1897-1907)
1956
+ // If not provided, we still need to declare it for .dev.vars to work
1951
1957
  if (!hasAgentshieldProjectId) {
1952
- apiKeyVarsParts.push(`AGENTSHIELD_PROJECT_ID = ""`);
1958
+ apiKeyVarsParts.push(
1959
+ `AGENTSHIELD_PROJECT_ID = "${projectId || ""}"`
1960
+ );
1953
1961
  }
1954
1962
 
1955
1963
  const apiKeyVars =
@@ -1958,9 +1966,16 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1958
1966
  : "";
1959
1967
 
1960
1968
  // Only insert identity vars and API key vars if they don't already exist in [vars]
1961
- // If they already exist, we've already updated them above
1969
+ // If they already exist, we've already updated them above to ensure they're empty strings
1970
+ // Note: API keys are already in initial template, so we mainly check for identity vars
1971
+ // But we also check for API keys in case they were removed from template
1962
1972
  const needsInsertion =
1963
- !hasIdentityDid || !hasIdentityPrivateKey || !hasIdentityPublicKey;
1973
+ !hasIdentityDid ||
1974
+ !hasIdentityPrivateKey ||
1975
+ !hasIdentityPublicKey ||
1976
+ (!hasAgentshieldApiKey && apiKeyVarsParts.length > 0) ||
1977
+ (!hasAdminApiKey && apiKeyVarsParts.length > 0) ||
1978
+ (!hasAgentshieldProjectId && apiKeyVarsParts.length > 0);
1964
1979
 
1965
1980
  if (needsInsertion) {
1966
1981
  wranglerTomlContent =
@@ -2042,6 +2057,7 @@ ADMIN_API_KEY="your-admin-key-here"
2042
2057
  console.log(
2043
2058
  chalk.cyan(" $ wrangler secret put AGENTSHIELD_API_KEY")
2044
2059
  );
2060
+ console.log(chalk.cyan(" $ wrangler secret put ADMIN_API_KEY"));
2045
2061
  console.log();
2046
2062
  }
2047
2063
  } catch (error: any) {