@kya-os/create-mcpi-app 1.7.35 → 1.7.36

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 (8) 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 +60 -89
  4. package/dist/helpers/fetch-cloudflare-mcpi-template.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/helpers/fetch-cloudflare-mcpi-template.ts +72 -121
  7. package/test-cloudflare/src/index.ts +1 -0
  8. package/test-cloudflare/tsconfig.json +4 -10
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,CAo3Ef"}
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,CAk0Ef"}
package/dist/helpers/fetch-cloudflare-mcpi-template.js CHANGED
@@ -1749,23 +1749,22 @@ XMCP_I_SESSION_TTL = "1800"
1749
1749
 
1750
1750
  # AgentShield Integration (https://kya.vouched.id)
1751
1751
  AGENTSHIELD_API_URL = "https://kya.vouched.id"
1752
- # AGENTSHIELD_API_KEY - MUST be declared here for .dev.vars to work
1753
- # Development: Values in .dev.vars will override this empty string
1754
- # Production: Use wrangler secret put AGENTSHIELD_API_KEY
1755
- AGENTSHIELD_API_KEY = ""
1756
1752
  # AGENTSHIELD_PROJECT_ID - Your project ID from AgentShield dashboard (e.g., "batman-txh0ae")
1757
1753
  # Required for project-scoped tool protection configuration (recommended)
1758
1754
  # Find it in your dashboard URL: https://kya.vouched.id/dashboard/projects/{PROJECT_ID}
1759
1755
  # Or in your project settings
1760
- # This is not sensitive, so it's safe to keep a value here if provided
1756
+ # This is not sensitive, so it's safe to keep a value here
1761
1757
  AGENTSHIELD_PROJECT_ID = "${projectId || ""}"
1762
- # ADMIN_API_KEY - Used for protected admin endpoints (e.g., /admin/clear-cache)
1763
- # Set to same value as AGENTSHIELD_API_KEY by default
1764
- # Development: Values in .dev.vars will override this empty string
1765
- # Production: Use wrangler secret put ADMIN_API_KEY
1766
- ADMIN_API_KEY = ""
1767
1758
  MCPI_ENV = "development"
1768
1759
 
1760
+ # Secrets (NOT declared here - see instructions below)
1761
+ # For local development: Add secrets to .dev.vars file
1762
+ # For production: Use wrangler secret put COMMAND_NAME
1763
+ # $ wrangler secret put MCP_IDENTITY_PRIVATE_KEY
1764
+ # $ wrangler secret put AGENTSHIELD_API_KEY
1765
+ # $ wrangler secret put ADMIN_API_KEY
1766
+ # Note: .dev.vars is git-ignored and contains actual secret values for local dev
1767
+
1769
1768
  # Optional: MCP Server URL for tool discovery
1770
1769
  # Uncomment to explicitly set your MCP server URL (auto-detected if not set)
1771
1770
  # MCP_SERVER_URL = "https://your-worker.workers.dev/mcp"
@@ -1788,11 +1787,12 @@ MCPI_ENV = "development"
1788
1787
  # Agent DID (public identifier - safe to commit)
1789
1788
  MCP_IDENTITY_AGENT_DID = "${identity.did}"
1790
1789
 
1791
- # Identity keys - MUST be declared here for .dev.vars to work!
1792
- # Development: Values in .dev.vars will override these empty strings
1793
- # Production: Use wrangler secret put to set these
1794
- MCP_IDENTITY_PRIVATE_KEY = ""
1795
- MCP_IDENTITY_PUBLIC_KEY = ""
1790
+ # Public identity key (safe to commit - not sensitive)
1791
+ MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"
1792
+
1793
+ # Private identity key (SECRET - NOT declared here)
1794
+ # For local development: Add to .dev.vars file
1795
+ # For production: Use wrangler secret put MCP_IDENTITY_PRIVATE_KEY
1796
1796
 
1797
1797
  # ALLOWED_ORIGINS for CORS (update for production)
1798
1798
  ALLOWED_ORIGINS = "https://claude.ai,https://app.anthropic.com"
@@ -1802,23 +1802,14 @@ DO_ROUTING_STRATEGY = "session"
1802
1802
  DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1803
1803
 
1804
1804
  `;
1805
- // Update existing values in wrangler.toml if they already exist
1806
- // This handles the case where variables were added by the initial template
1807
- // IMPORTANT: Secrets are always kept as empty strings in wrangler.toml
1808
- // Actual values go in .dev.vars for local dev, wrangler secret put for production
1809
- // Ensure identity keys are empty strings (not actual values)
1810
- if (/MCP_IDENTITY_PRIVATE_KEY\s*=/.test(wranglerTomlContent)) {
1811
- wranglerTomlContent = wranglerTomlContent.replace(/MCP_IDENTITY_PRIVATE_KEY\s*=\s*"[^"]*"/, `MCP_IDENTITY_PRIVATE_KEY = ""`);
1812
- }
1805
+ // Remove any secret declarations from [vars] (they should not be here)
1806
+ // Secrets go in .dev.vars for local dev, wrangler secret put for production
1807
+ wranglerTomlContent = wranglerTomlContent.replace(/^\s*MCP_IDENTITY_PRIVATE_KEY\s*=.*$/gm, `# MCP_IDENTITY_PRIVATE_KEY - SECRET (not declared here, see .dev.vars or wrangler secret put)`);
1808
+ wranglerTomlContent = wranglerTomlContent.replace(/^\s*AGENTSHIELD_API_KEY\s*=.*$/gm, `# AGENTSHIELD_API_KEY - SECRET (not declared here, see .dev.vars or wrangler secret put)`);
1809
+ wranglerTomlContent = wranglerTomlContent.replace(/^\s*ADMIN_API_KEY\s*=.*$/gm, `# ADMIN_API_KEY - SECRET (not declared here, see .dev.vars or wrangler secret put)`);
1810
+ // Update public key if it exists (safe to keep in [vars])
1813
1811
  if (/MCP_IDENTITY_PUBLIC_KEY\s*=/.test(wranglerTomlContent)) {
1814
- wranglerTomlContent = wranglerTomlContent.replace(/MCP_IDENTITY_PUBLIC_KEY\s*=\s*"[^"]*"/, `MCP_IDENTITY_PUBLIC_KEY = ""`);
1815
- }
1816
- // Ensure API keys are empty strings (not actual values)
1817
- if (/AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent)) {
1818
- wranglerTomlContent = wranglerTomlContent.replace(/AGENTSHIELD_API_KEY\s*=\s*"[^"]*"/, `AGENTSHIELD_API_KEY = ""`);
1819
- }
1820
- if (/ADMIN_API_KEY\s*=/.test(wranglerTomlContent)) {
1821
- wranglerTomlContent = wranglerTomlContent.replace(/ADMIN_API_KEY\s*=\s*"[^"]*"/, `ADMIN_API_KEY = ""`);
1812
+ wranglerTomlContent = wranglerTomlContent.replace(/MCP_IDENTITY_PUBLIC_KEY\s*=\s*"[^"]*"/, `MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"`);
1822
1813
  }
1823
1814
  // Update AGENTSHIELD_PROJECT_ID if it exists and projectId is provided
1824
1815
  // This is safe to keep a value since it's not sensitive
@@ -1826,78 +1817,38 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1826
1817
  /AGENTSHIELD_PROJECT_ID\s*=/.test(wranglerTomlContent)) {
1827
1818
  wranglerTomlContent = wranglerTomlContent.replace(/AGENTSHIELD_PROJECT_ID\s*=\s*"[^"]*"/, `AGENTSHIELD_PROJECT_ID = "${projectId}"`);
1828
1819
  }
1829
- // Check if API key variables already exist in wrangler.toml
1830
- // (They may have been added by the initial template)
1831
- const hasAgentshieldApiKey = /AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent);
1832
- const hasAgentshieldProjectId = /AGENTSHIELD_PROJECT_ID\s*=/.test(wranglerTomlContent);
1833
- const hasAdminApiKey = /ADMIN_API_KEY\s*=/.test(wranglerTomlContent);
1820
+ // Check if non-secret variables already exist in wrangler.toml
1834
1821
  const hasIdentityDid = /MCP_IDENTITY_AGENT_DID\s*=/.test(wranglerTomlContent);
1835
- const hasIdentityPrivateKey = /MCP_IDENTITY_PRIVATE_KEY\s*=/.test(wranglerTomlContent);
1836
1822
  const hasIdentityPublicKey = /MCP_IDENTITY_PUBLIC_KEY\s*=/.test(wranglerTomlContent);
1837
- // Build API key declarations only for variables that don't already exist
1838
- // Cloudflare Workers REQUIRE variables to be declared in [vars] for .dev.vars to work
1839
- const apiKeyVarsParts = [];
1840
- if (!hasAgentshieldApiKey ||
1841
- !hasAgentshieldProjectId ||
1842
- !hasAdminApiKey) {
1843
- apiKeyVarsParts.push(`# API keys - MUST be declared here for .dev.vars to work!`);
1844
- apiKeyVarsParts.push(`# Development: Values in .dev.vars will override these empty strings`);
1845
- apiKeyVarsParts.push(`# Production: Use wrangler secret put to set these`);
1846
- }
1847
- if (!hasAgentshieldApiKey) {
1848
- apiKeyVarsParts.push(`AGENTSHIELD_API_KEY = ""`);
1849
- }
1850
- if (!hasAdminApiKey) {
1851
- apiKeyVarsParts.push(`ADMIN_API_KEY = ""`);
1852
- }
1853
- // Only add AGENTSHIELD_PROJECT_ID if it doesn't exist
1854
- // If projectId is provided, it will be set above (lines 1897-1907)
1855
- // If not provided, we still need to declare it for .dev.vars to work
1856
- if (!hasAgentshieldProjectId) {
1857
- apiKeyVarsParts.push(`AGENTSHIELD_PROJECT_ID = "${projectId || ""}"`);
1858
- }
1859
- const apiKeyVars = apiKeyVarsParts.length > 0
1860
- ? `\n${apiKeyVarsParts.join("\n")}\n`
1861
- : "";
1862
- // Only insert identity vars and API key vars if they don't already exist in [vars]
1863
- // If they already exist, we've already updated them above to ensure they're empty strings
1864
- // Note: API keys are already in initial template, so we mainly check for identity vars
1865
- // But we also check for API keys in case they were removed from template
1866
- const needsInsertion = !hasIdentityDid ||
1867
- !hasIdentityPrivateKey ||
1868
- !hasIdentityPublicKey ||
1869
- (!hasAgentshieldApiKey && apiKeyVarsParts.length > 0) ||
1870
- (!hasAdminApiKey && apiKeyVarsParts.length > 0) ||
1871
- (!hasAgentshieldProjectId && apiKeyVarsParts.length > 0);
1823
+ // Only insert identity vars if they don't already exist
1824
+ const needsInsertion = !hasIdentityDid || !hasIdentityPublicKey;
1872
1825
  if (needsInsertion) {
1873
1826
  wranglerTomlContent =
1874
1827
  wranglerTomlContent.slice(0, insertPosition) +
1875
1828
  identityVars +
1876
- apiKeyVars +
1877
1829
  wranglerTomlContent.slice(insertPosition);
1878
1830
  }
1879
1831
  // Write updated wrangler.toml (without secrets)
1880
1832
  fs.writeFileSync(wranglerPath, wranglerTomlContent);
1881
1833
  // Create .dev.vars file for local development (git-ignored)
1834
+ // Only contains SECRETS (not public keys or project IDs)
1882
1835
  const devVarsPath = path.join(projectPath, ".dev.vars");
1883
1836
  const devVarsContent = `# Local development secrets (DO NOT COMMIT)
1884
1837
  # This file is git-ignored and contains sensitive data
1885
1838
  #
1886
1839
  # HOW IT WORKS:
1887
- # 1. Variables are declared in wrangler.toml [vars] as empty strings
1888
- # 2. This file (.dev.vars) overrides them for local development
1840
+ # 1. Secrets are NOT declared in wrangler.toml [vars] (avoids conflicts)
1841
+ # 2. This file (.dev.vars) provides secrets for local development
1889
1842
  # 3. Production uses: wrangler secret put VARIABLE_NAME
1843
+ #
1844
+ # Non-secrets (MCP_IDENTITY_PUBLIC_KEY, AGENTSHIELD_PROJECT_ID) are in wrangler.toml
1890
1845
 
1891
- # Identity keys (generated by create-mcpi-app)
1846
+ # Private identity key (generated by create-mcpi-app)
1892
1847
  MCP_IDENTITY_PRIVATE_KEY="${identity.privateKey}"
1893
- MCP_IDENTITY_PUBLIC_KEY="${identity.publicKey}"
1894
1848
 
1895
1849
  # AgentShield API key (get from https://kya.vouched.id/dashboard)
1896
1850
  AGENTSHIELD_API_KEY="${apikey || ""}"${apikey ? " # Provided via --apikey flag" : ""}
1897
1851
 
1898
- # AgentShield Project ID (from dashboard URL: /dashboard/projects/{PROJECT_ID})
1899
- AGENTSHIELD_PROJECT_ID="${projectId || ""}"${projectId ? " # Provided via --project flag" : ""}
1900
-
1901
1852
  # Admin API key for protected endpoints (set to same value as AGENTSHIELD_API_KEY)
1902
1853
  ADMIN_API_KEY="${apikey || ""}"${apikey ? " # Set to same value as AGENTSHIELD_API_KEY" : ""}
1903
1854
  `;
@@ -1906,15 +1857,17 @@ ADMIN_API_KEY="${apikey || ""}"${apikey ? " # Set to same value as AGENTSHIELD_
1906
1857
  const devVarsExamplePath = path.join(projectPath, ".dev.vars.example");
1907
1858
  const devVarsExampleContent = `# Copy this file to .dev.vars and fill in your values
1908
1859
  # DO NOT commit .dev.vars to version control
1860
+ #
1861
+ # NOTE: Only secrets go here. Non-secrets (MCP_IDENTITY_PUBLIC_KEY, AGENTSHIELD_PROJECT_ID)
1862
+ # are in wrangler.toml [vars] and can be committed safely.
1909
1863
 
1910
- # Identity keys (generate with: npx @kya-os/create-mcpi-app regenerate-identity)
1864
+ # Private identity key (generate with: npx @kya-os/create-mcpi-app regenerate-identity)
1911
1865
  MCP_IDENTITY_PRIVATE_KEY="your-private-key-here"
1912
- MCP_IDENTITY_PUBLIC_KEY="your-public-key-here"
1913
1866
 
1914
- # AgentShield API key (get from https://agentshield.ai)
1867
+ # AgentShield API key (get from https://kya.vouched.id/dashboard)
1915
1868
  AGENTSHIELD_API_KEY="your-api-key-here"
1916
1869
 
1917
- # Admin API key for protected endpoints
1870
+ # Admin API key for protected endpoints (set to same value as AGENTSHIELD_API_KEY)
1918
1871
  ADMIN_API_KEY="your-admin-key-here"
1919
1872
  `;
1920
1873
  fs.writeFileSync(devVarsExamplePath, devVarsExampleContent);
@@ -1926,11 +1879,13 @@ ADMIN_API_KEY="your-admin-key-here"
1926
1879
  console.log(chalk.dim(" • Example template in .dev.vars.example"));
1927
1880
  console.log();
1928
1881
  console.log(chalk.yellow("🔒 Production Security:"));
1929
- console.log(chalk.dim(" Set secrets using wrangler (never commit them):"));
1930
- console.log(chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PRIVATE_KEY"));
1931
- console.log(chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PUBLIC_KEY"));
1932
- console.log(chalk.cyan(" $ wrangler secret put AGENTSHIELD_API_KEY"));
1933
- console.log(chalk.cyan(" $ wrangler secret put ADMIN_API_KEY"));
1882
+ console.log(chalk.dim(" Secrets are NOT in wrangler.toml (cleaner approach)"));
1883
+ console.log(chalk.dim(" For production, set secrets using wrangler:"));
1884
+ console.log(chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PRIVATE_KEY"));
1885
+ console.log(chalk.cyan(" $ wrangler secret put AGENTSHIELD_API_KEY"));
1886
+ console.log(chalk.cyan(" $ wrangler secret put ADMIN_API_KEY"));
1887
+ console.log();
1888
+ console.log(chalk.dim(" Tip: Copy values from .dev.vars when prompted"));
1934
1889
  console.log();
1935
1890
  }
1936
1891
  }
@@ -2047,6 +2002,22 @@ ${packageManager === "npm" ? "npm run" : packageManager} dev
2047
2002
 
2048
2003
  ### 4. Deploy
2049
2004
 
2005
+ #### Production Deployment
2006
+
2007
+ Secrets are **not** declared in \`wrangler.toml\` to avoid conflicts. Set them using:
2008
+
2009
+ \`\`\`bash
2010
+ wrangler secret put MCP_IDENTITY_PRIVATE_KEY
2011
+ wrangler secret put AGENTSHIELD_API_KEY
2012
+ wrangler secret put ADMIN_API_KEY
2013
+ \`\`\`
2014
+
2015
+ **Tip:** Copy values from your \`.dev.vars\` file when prompted.
2016
+
2017
+ **Note:** \`MCP_IDENTITY_PUBLIC_KEY\` and \`AGENTSHIELD_PROJECT_ID\` are not secrets and are already in \`wrangler.toml\` with values.
2018
+
2019
+ Now deploy:
2020
+
2050
2021
  \`\`\`bash
2051
2022
  ${packageManager === "npm" ? "npm run" : packageManager} deploy
2052
2023
  \`\`\`
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":"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"}
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.35",
3
+ "version": "1.7.36",
4
4
  "description": "Bootstrap MCP applications with identity features",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/helpers/fetch-cloudflare-mcpi-template.ts CHANGED
@@ -1804,23 +1804,22 @@ XMCP_I_SESSION_TTL = "1800"
1804
1804
 
1805
1805
  # AgentShield Integration (https://kya.vouched.id)
1806
1806
  AGENTSHIELD_API_URL = "https://kya.vouched.id"
1807
- # AGENTSHIELD_API_KEY - MUST be declared here for .dev.vars to work
1808
- # Development: Values in .dev.vars will override this empty string
1809
- # Production: Use wrangler secret put AGENTSHIELD_API_KEY
1810
- AGENTSHIELD_API_KEY = ""
1811
1807
  # AGENTSHIELD_PROJECT_ID - Your project ID from AgentShield dashboard (e.g., "batman-txh0ae")
1812
1808
  # Required for project-scoped tool protection configuration (recommended)
1813
1809
  # Find it in your dashboard URL: https://kya.vouched.id/dashboard/projects/{PROJECT_ID}
1814
1810
  # Or in your project settings
1815
- # This is not sensitive, so it's safe to keep a value here if provided
1811
+ # This is not sensitive, so it's safe to keep a value here
1816
1812
  AGENTSHIELD_PROJECT_ID = "${projectId || ""}"
1817
- # ADMIN_API_KEY - Used for protected admin endpoints (e.g., /admin/clear-cache)
1818
- # Set to same value as AGENTSHIELD_API_KEY by default
1819
- # Development: Values in .dev.vars will override this empty string
1820
- # Production: Use wrangler secret put ADMIN_API_KEY
1821
- ADMIN_API_KEY = ""
1822
1813
  MCPI_ENV = "development"
1823
1814
 
1815
+ # Secrets (NOT declared here - see instructions below)
1816
+ # For local development: Add secrets to .dev.vars file
1817
+ # For production: Use wrangler secret put COMMAND_NAME
1818
+ # $ wrangler secret put MCP_IDENTITY_PRIVATE_KEY
1819
+ # $ wrangler secret put AGENTSHIELD_API_KEY
1820
+ # $ wrangler secret put ADMIN_API_KEY
1821
+ # Note: .dev.vars is git-ignored and contains actual secret values for local dev
1822
+
1824
1823
  # Optional: MCP Server URL for tool discovery
1825
1824
  # Uncomment to explicitly set your MCP server URL (auto-detected if not set)
1826
1825
  # MCP_SERVER_URL = "https://your-worker.workers.dev/mcp"
@@ -1847,11 +1846,12 @@ MCPI_ENV = "development"
1847
1846
  # Agent DID (public identifier - safe to commit)
1848
1847
  MCP_IDENTITY_AGENT_DID = "${identity.did}"
1849
1848
 
1850
- # Identity keys - MUST be declared here for .dev.vars to work!
1851
- # Development: Values in .dev.vars will override these empty strings
1852
- # Production: Use wrangler secret put to set these
1853
- MCP_IDENTITY_PRIVATE_KEY = ""
1854
- MCP_IDENTITY_PUBLIC_KEY = ""
1849
+ # Public identity key (safe to commit - not sensitive)
1850
+ MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"
1851
+
1852
+ # Private identity key (SECRET - NOT declared here)
1853
+ # For local development: Add to .dev.vars file
1854
+ # For production: Use wrangler secret put MCP_IDENTITY_PRIVATE_KEY
1855
1855
 
1856
1856
  # ALLOWED_ORIGINS for CORS (update for production)
1857
1857
  ALLOWED_ORIGINS = "https://claude.ai,https://app.anthropic.com"
@@ -1862,36 +1862,26 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1862
1862
 
1863
1863
  `;
1864
1864
 
1865
- // Update existing values in wrangler.toml if they already exist
1866
- // This handles the case where variables were added by the initial template
1867
- // IMPORTANT: Secrets are always kept as empty strings in wrangler.toml
1868
- // Actual values go in .dev.vars for local dev, wrangler secret put for production
1865
+ // Remove any secret declarations from [vars] (they should not be here)
1866
+ // Secrets go in .dev.vars for local dev, wrangler secret put for production
1867
+ wranglerTomlContent = wranglerTomlContent.replace(
1868
+ /^\s*MCP_IDENTITY_PRIVATE_KEY\s*=.*$/gm,
1869
+ `# MCP_IDENTITY_PRIVATE_KEY - SECRET (not declared here, see .dev.vars or wrangler secret put)`
1870
+ );
1871
+ wranglerTomlContent = wranglerTomlContent.replace(
1872
+ /^\s*AGENTSHIELD_API_KEY\s*=.*$/gm,
1873
+ `# AGENTSHIELD_API_KEY - SECRET (not declared here, see .dev.vars or wrangler secret put)`
1874
+ );
1875
+ wranglerTomlContent = wranglerTomlContent.replace(
1876
+ /^\s*ADMIN_API_KEY\s*=.*$/gm,
1877
+ `# ADMIN_API_KEY - SECRET (not declared here, see .dev.vars or wrangler secret put)`
1878
+ );
1869
1879
 
1870
- // Ensure identity keys are empty strings (not actual values)
1871
- if (/MCP_IDENTITY_PRIVATE_KEY\s*=/.test(wranglerTomlContent)) {
1872
- wranglerTomlContent = wranglerTomlContent.replace(
1873
- /MCP_IDENTITY_PRIVATE_KEY\s*=\s*"[^"]*"/,
1874
- `MCP_IDENTITY_PRIVATE_KEY = ""`
1875
- );
1876
- }
1880
+ // Update public key if it exists (safe to keep in [vars])
1877
1881
  if (/MCP_IDENTITY_PUBLIC_KEY\s*=/.test(wranglerTomlContent)) {
1878
1882
  wranglerTomlContent = wranglerTomlContent.replace(
1879
1883
  /MCP_IDENTITY_PUBLIC_KEY\s*=\s*"[^"]*"/,
1880
- `MCP_IDENTITY_PUBLIC_KEY = ""`
1881
- );
1882
- }
1883
-
1884
- // Ensure API keys are empty strings (not actual values)
1885
- if (/AGENTSHIELD_API_KEY\s*=/.test(wranglerTomlContent)) {
1886
- wranglerTomlContent = wranglerTomlContent.replace(
1887
- /AGENTSHIELD_API_KEY\s*=\s*"[^"]*"/,
1888
- `AGENTSHIELD_API_KEY = ""`
1889
- );
1890
- }
1891
- if (/ADMIN_API_KEY\s*=/.test(wranglerTomlContent)) {
1892
- wranglerTomlContent = wranglerTomlContent.replace(
1893
- /ADMIN_API_KEY\s*=\s*"[^"]*"/,
1894
- `ADMIN_API_KEY = ""`
1884
+ `MCP_IDENTITY_PUBLIC_KEY = "${identity.publicKey}"`
1895
1885
  );
1896
1886
  }
1897
1887
 
@@ -1907,82 +1897,21 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1907
1897
  );
1908
1898
  }
1909
1899
 
1910
- // Check if API key variables already exist in wrangler.toml
1911
- // (They may have been added by the initial template)
1912
- const hasAgentshieldApiKey = /AGENTSHIELD_API_KEY\s*=/.test(
1913
- wranglerTomlContent
1914
- );
1915
- const hasAgentshieldProjectId = /AGENTSHIELD_PROJECT_ID\s*=/.test(
1916
- wranglerTomlContent
1917
- );
1918
- const hasAdminApiKey = /ADMIN_API_KEY\s*=/.test(wranglerTomlContent);
1900
+ // Check if non-secret variables already exist in wrangler.toml
1919
1901
  const hasIdentityDid = /MCP_IDENTITY_AGENT_DID\s*=/.test(
1920
1902
  wranglerTomlContent
1921
1903
  );
1922
- const hasIdentityPrivateKey = /MCP_IDENTITY_PRIVATE_KEY\s*=/.test(
1923
- wranglerTomlContent
1924
- );
1925
1904
  const hasIdentityPublicKey = /MCP_IDENTITY_PUBLIC_KEY\s*=/.test(
1926
1905
  wranglerTomlContent
1927
1906
  );
1928
1907
 
1929
- // Build API key declarations only for variables that don't already exist
1930
- // Cloudflare Workers REQUIRE variables to be declared in [vars] for .dev.vars to work
1931
- const apiKeyVarsParts: string[] = [];
1932
-
1933
- if (
1934
- !hasAgentshieldApiKey ||
1935
- !hasAgentshieldProjectId ||
1936
- !hasAdminApiKey
1937
- ) {
1938
- apiKeyVarsParts.push(
1939
- `# API keys - MUST be declared here for .dev.vars to work!`
1940
- );
1941
- apiKeyVarsParts.push(
1942
- `# Development: Values in .dev.vars will override these empty strings`
1943
- );
1944
- apiKeyVarsParts.push(
1945
- `# Production: Use wrangler secret put to set these`
1946
- );
1947
- }
1948
-
1949
- if (!hasAgentshieldApiKey) {
1950
- apiKeyVarsParts.push(`AGENTSHIELD_API_KEY = ""`);
1951
- }
1952
- if (!hasAdminApiKey) {
1953
- apiKeyVarsParts.push(`ADMIN_API_KEY = ""`);
1954
- }
1955
- // Only add AGENTSHIELD_PROJECT_ID if it doesn't exist
1956
- // If projectId is provided, it will be set above (lines 1897-1907)
1957
- // If not provided, we still need to declare it for .dev.vars to work
1958
- if (!hasAgentshieldProjectId) {
1959
- apiKeyVarsParts.push(
1960
- `AGENTSHIELD_PROJECT_ID = "${projectId || ""}"`
1961
- );
1962
- }
1963
-
1964
- const apiKeyVars =
1965
- apiKeyVarsParts.length > 0
1966
- ? `\n${apiKeyVarsParts.join("\n")}\n`
1967
- : "";
1968
-
1969
- // Only insert identity vars and API key vars if they don't already exist in [vars]
1970
- // If they already exist, we've already updated them above to ensure they're empty strings
1971
- // Note: API keys are already in initial template, so we mainly check for identity vars
1972
- // But we also check for API keys in case they were removed from template
1973
- const needsInsertion =
1974
- !hasIdentityDid ||
1975
- !hasIdentityPrivateKey ||
1976
- !hasIdentityPublicKey ||
1977
- (!hasAgentshieldApiKey && apiKeyVarsParts.length > 0) ||
1978
- (!hasAdminApiKey && apiKeyVarsParts.length > 0) ||
1979
- (!hasAgentshieldProjectId && apiKeyVarsParts.length > 0);
1908
+ // Only insert identity vars if they don't already exist
1909
+ const needsInsertion = !hasIdentityDid || !hasIdentityPublicKey;
1980
1910
 
1981
1911
  if (needsInsertion) {
1982
1912
  wranglerTomlContent =
1983
1913
  wranglerTomlContent.slice(0, insertPosition) +
1984
1914
  identityVars +
1985
- apiKeyVars +
1986
1915
  wranglerTomlContent.slice(insertPosition);
1987
1916
  }
1988
1917
 
@@ -1990,25 +1919,24 @@ DO_SHARD_COUNT = "10" # Number of shards if using shard strategy
1990
1919
  fs.writeFileSync(wranglerPath, wranglerTomlContent);
1991
1920
 
1992
1921
  // Create .dev.vars file for local development (git-ignored)
1922
+ // Only contains SECRETS (not public keys or project IDs)
1993
1923
  const devVarsPath = path.join(projectPath, ".dev.vars");
1994
1924
  const devVarsContent = `# Local development secrets (DO NOT COMMIT)
1995
1925
  # This file is git-ignored and contains sensitive data
1996
1926
  #
1997
1927
  # HOW IT WORKS:
1998
- # 1. Variables are declared in wrangler.toml [vars] as empty strings
1999
- # 2. This file (.dev.vars) overrides them for local development
1928
+ # 1. Secrets are NOT declared in wrangler.toml [vars] (avoids conflicts)
1929
+ # 2. This file (.dev.vars) provides secrets for local development
2000
1930
  # 3. Production uses: wrangler secret put VARIABLE_NAME
1931
+ #
1932
+ # Non-secrets (MCP_IDENTITY_PUBLIC_KEY, AGENTSHIELD_PROJECT_ID) are in wrangler.toml
2001
1933
 
2002
- # Identity keys (generated by create-mcpi-app)
1934
+ # Private identity key (generated by create-mcpi-app)
2003
1935
  MCP_IDENTITY_PRIVATE_KEY="${identity.privateKey}"
2004
- MCP_IDENTITY_PUBLIC_KEY="${identity.publicKey}"
2005
1936
 
2006
1937
  # AgentShield API key (get from https://kya.vouched.id/dashboard)
2007
1938
  AGENTSHIELD_API_KEY="${apikey || ""}"${apikey ? " # Provided via --apikey flag" : ""}
2008
1939
 
2009
- # AgentShield Project ID (from dashboard URL: /dashboard/projects/{PROJECT_ID})
2010
- AGENTSHIELD_PROJECT_ID="${projectId || ""}"${projectId ? " # Provided via --project flag" : ""}
2011
-
2012
1940
  # Admin API key for protected endpoints (set to same value as AGENTSHIELD_API_KEY)
2013
1941
  ADMIN_API_KEY="${apikey || ""}"${apikey ? " # Set to same value as AGENTSHIELD_API_KEY" : ""}
2014
1942
  `;
@@ -2021,15 +1949,17 @@ ADMIN_API_KEY="${apikey || ""}"${apikey ? " # Set to same value as AGENTSHIELD_
2021
1949
  );
2022
1950
  const devVarsExampleContent = `# Copy this file to .dev.vars and fill in your values
2023
1951
  # DO NOT commit .dev.vars to version control
1952
+ #
1953
+ # NOTE: Only secrets go here. Non-secrets (MCP_IDENTITY_PUBLIC_KEY, AGENTSHIELD_PROJECT_ID)
1954
+ # are in wrangler.toml [vars] and can be committed safely.
2024
1955
 
2025
- # Identity keys (generate with: npx @kya-os/create-mcpi-app regenerate-identity)
1956
+ # Private identity key (generate with: npx @kya-os/create-mcpi-app regenerate-identity)
2026
1957
  MCP_IDENTITY_PRIVATE_KEY="your-private-key-here"
2027
- MCP_IDENTITY_PUBLIC_KEY="your-public-key-here"
2028
1958
 
2029
- # AgentShield API key (get from https://agentshield.ai)
1959
+ # AgentShield API key (get from https://kya.vouched.id/dashboard)
2030
1960
  AGENTSHIELD_API_KEY="your-api-key-here"
2031
1961
 
2032
- # Admin API key for protected endpoints
1962
+ # Admin API key for protected endpoints (set to same value as AGENTSHIELD_API_KEY)
2033
1963
  ADMIN_API_KEY="your-admin-key-here"
2034
1964
  `;
2035
1965
  fs.writeFileSync(devVarsExamplePath, devVarsExampleContent);
@@ -2047,18 +1977,22 @@ ADMIN_API_KEY="your-admin-key-here"
2047
1977
  console.log();
2048
1978
  console.log(chalk.yellow("🔒 Production Security:"));
2049
1979
  console.log(
2050
- chalk.dim(" Set secrets using wrangler (never commit them):")
1980
+ chalk.dim(" Secrets are NOT in wrangler.toml (cleaner approach)")
2051
1981
  );
2052
1982
  console.log(
2053
- chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PRIVATE_KEY")
1983
+ chalk.dim(" For production, set secrets using wrangler:")
2054
1984
  );
2055
1985
  console.log(
2056
- chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PUBLIC_KEY")
1986
+ chalk.cyan(" $ wrangler secret put MCP_IDENTITY_PRIVATE_KEY")
2057
1987
  );
2058
1988
  console.log(
2059
- chalk.cyan(" $ wrangler secret put AGENTSHIELD_API_KEY")
1989
+ chalk.cyan(" $ wrangler secret put AGENTSHIELD_API_KEY")
1990
+ );
1991
+ console.log(chalk.cyan(" $ wrangler secret put ADMIN_API_KEY"));
1992
+ console.log();
1993
+ console.log(
1994
+ chalk.dim(" Tip: Copy values from .dev.vars when prompted")
2060
1995
  );
2061
- console.log(chalk.cyan(" $ wrangler secret put ADMIN_API_KEY"));
2062
1996
  console.log();
2063
1997
  }
2064
1998
  } catch (error: any) {
@@ -2182,6 +2116,22 @@ ${packageManager === "npm" ? "npm run" : packageManager} dev
2182
2116
 
2183
2117
  ### 4. Deploy
2184
2118
 
2119
+ #### Production Deployment
2120
+
2121
+ Secrets are **not** declared in \`wrangler.toml\` to avoid conflicts. Set them using:
2122
+
2123
+ \`\`\`bash
2124
+ wrangler secret put MCP_IDENTITY_PRIVATE_KEY
2125
+ wrangler secret put AGENTSHIELD_API_KEY
2126
+ wrangler secret put ADMIN_API_KEY
2127
+ \`\`\`
2128
+
2129
+ **Tip:** Copy values from your \`.dev.vars\` file when prompted.
2130
+
2131
+ **Note:** \`MCP_IDENTITY_PUBLIC_KEY\` and \`AGENTSHIELD_PROJECT_ID\` are not secrets and are already in \`wrangler.toml\` with values.
2132
+
2133
+ Now deploy:
2134
+
2185
2135
  \`\`\`bash
2186
2136
  ${packageManager === "npm" ? "npm run" : packageManager} deploy
2187
2137
  \`\`\`
@@ -2439,3 +2389,4 @@ Or simply don't configure the \`AGENTSHIELD_API_KEY\` environment variable.
2439
2389
  throw error;
2440
2390
  }
2441
2391
  }
2392
+
package/test-cloudflare/src/index.ts CHANGED
@@ -1,3 +1,4 @@
1
+ /// <reference types="@cloudflare/workers-types" />
1
2
  import { McpAgent } from "agents/mcp";
2
3
  import { Hono } from "hono";
3
4
  import { cors } from "hono/cors";