netlify-cli 10.11.2 → 10.13.0

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "netlify-cli",
-  "version": "10.11.2",
+  "version": "10.13.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "10.11.2",
+      "version": "10.13.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@netlify/build": "^27.5.0",
+        "@netlify/build": "^27.7.0",
         "@netlify/config": "^18.1.2",
-        "@netlify/edge-bundler": "^1.7.0",
+        "@netlify/edge-bundler": "^1.8.0",
         "@netlify/framework-info": "^9.1.1",
         "@netlify/local-functions-proxy": "^1.1.1",
         "@netlify/plugins-list": "^6.35.0",
@@ -81,7 +81,7 @@
         "multiparty": "^4.2.1",
         "netlify": "^12.0.0",
         "netlify-headers-parser": "^6.0.2",
-        "netlify-onegraph-internal": "0.3.6",
+        "netlify-onegraph-internal": "0.3.10",
         "netlify-redirect-parser": "^13.0.5",
         "netlify-redirector": "^0.2.1",
         "node-fetch": "^2.6.0",
@@ -1189,14 +1189,14 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/build": {
-      "version": "27.5.0",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.5.0.tgz",
-      "integrity": "sha512-xsoaYmJEmnyWKMPk+W//WbBrBuZm9Oee9lXj+W8oQTtFaYdmPk4X/QN2+YfkmKOf+E303uRERtDuNOrBIkPOPw==",
+      "version": "27.7.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.7.0.tgz",
+      "integrity": "sha512-Vc7g12oNtLxPaU0qfYg0oKwqy5Y55w4cyW9AA45sC+9mTHJ1g1Rpa4KhdV365+oAjBqulfDEPdjgxV8/DBiayw==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
         "@netlify/config": "^18.1.2",
-        "@netlify/edge-bundler": "^1.7.0",
+        "@netlify/edge-bundler": "^1.8.0",
         "@netlify/functions-utils": "^4.2.2",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugins-list": "^6.35.0",
@@ -1204,6 +1204,8 @@
         "@netlify/zip-it-and-ship-it": "5.13.2",
         "@sindresorhus/slugify": "^2.0.0",
         "@types/node": "^16.0.0",
+        "ajv": "^8.11.0",
+        "ajv-errors": "^3.0.0",
         "ansi-escapes": "^5.0.0",
         "chalk": "^5.0.0",
         "clean-stack": "^4.0.0",
@@ -1310,6 +1312,29 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@netlify/build/node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@netlify/build/node_modules/ajv-errors": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz",
+      "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==",
+      "peerDependencies": {
+        "ajv": "^8.0.1"
+      }
+    },
     "node_modules/@netlify/build/node_modules/ansi-regex": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -1553,6 +1578,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@netlify/build/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
     "node_modules/@netlify/build/node_modules/locate-path": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
@@ -2313,9 +2343,9 @@
       }
     },
     "node_modules/@netlify/edge-bundler": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.7.0.tgz",
-      "integrity": "sha512-aNTATeSkaFn+4+Lnyq0NUUq5IV2087TNtRm+jFqCKHBRLJQGogwKmBsqda5qDQxh8qxfGDOnhozEXyLNKXflSw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.8.0.tgz",
+      "integrity": "sha512-A9AqvNCpskKq1ScphTRwEP/iv0CnvUStWVfGVIrLHzzM3qegZeHJyiWUZ81CYScLceaVrj1DtQ68vNEhP+9JSA==",
       "dependencies": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",
@@ -6217,9 +6247,9 @@
       }
     },
     "node_modules/c8": {
-      "version": "7.11.3",
-      "resolved": "https://registry.npmjs.org/c8/-/c8-7.11.3.tgz",
-      "integrity": "sha512-6YBmsaNmqRm9OS3ZbIiL2EZgi1+Xc4O24jL3vMYGE6idixYuGdy76rIfIdltSKDj9DpLNrcXSonUTR1miBD0wA==",
+      "version": "7.12.0",
+      "resolved": "https://registry.npmjs.org/c8/-/c8-7.12.0.tgz",
+      "integrity": "sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
@@ -16038,9 +16068,9 @@
       }
     },
     "node_modules/netlify-onegraph-internal": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.6.tgz",
-      "integrity": "sha512-nNqCWT2jzPmqw/3/sKf1RFicL2JEFjmxXTpnIzJKt5U+bnS633cOy5pImNnfBGTd50NTNvdZ0GXMhQ7AwH16Qg==",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.10.tgz",
+      "integrity": "sha512-8GeKcWbYPV3CCMJEj2LwkhP0eFCDDrt3XDTZuweWHAa5DTkRd6cSEnnH0BjTBBetoFfPKXDjbFmSiD9xobcnPA==",
       "dependencies": {
         "graphql": "16.0.0",
         "node-fetch": "^2.6.0",
@@ -23814,14 +23844,14 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/build": {
-      "version": "27.5.0",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.5.0.tgz",
-      "integrity": "sha512-xsoaYmJEmnyWKMPk+W//WbBrBuZm9Oee9lXj+W8oQTtFaYdmPk4X/QN2+YfkmKOf+E303uRERtDuNOrBIkPOPw==",
+      "version": "27.7.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-27.7.0.tgz",
+      "integrity": "sha512-Vc7g12oNtLxPaU0qfYg0oKwqy5Y55w4cyW9AA45sC+9mTHJ1g1Rpa4KhdV365+oAjBqulfDEPdjgxV8/DBiayw==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/cache-utils": "^4.0.0",
         "@netlify/config": "^18.1.2",
-        "@netlify/edge-bundler": "^1.7.0",
+        "@netlify/edge-bundler": "^1.8.0",
         "@netlify/functions-utils": "^4.2.2",
         "@netlify/git-utils": "^4.0.0",
         "@netlify/plugins-list": "^6.35.0",
@@ -23829,6 +23859,8 @@
         "@netlify/zip-it-and-ship-it": "5.13.2",
         "@sindresorhus/slugify": "^2.0.0",
         "@types/node": "^16.0.0",
+        "ajv": "^8.11.0",
+        "ajv-errors": "^3.0.0",
         "ansi-escapes": "^5.0.0",
         "chalk": "^5.0.0",
         "clean-stack": "^4.0.0",
@@ -23905,6 +23937,23 @@
             "indent-string": "^5.0.0"
           }
         },
+        "ajv": {
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-errors": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz",
+          "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==",
+          "requires": {}
+        },
         "ansi-regex": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -24054,6 +24103,11 @@
           "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz",
           "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ=="
         },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+        },
         "locate-path": {
           "version": "7.1.1",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.1.tgz",
@@ -24491,9 +24545,9 @@
       }
     },
     "@netlify/edge-bundler": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.7.0.tgz",
-      "integrity": "sha512-aNTATeSkaFn+4+Lnyq0NUUq5IV2087TNtRm+jFqCKHBRLJQGogwKmBsqda5qDQxh8qxfGDOnhozEXyLNKXflSw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@netlify/edge-bundler/-/edge-bundler-1.8.0.tgz",
+      "integrity": "sha512-A9AqvNCpskKq1ScphTRwEP/iv0CnvUStWVfGVIrLHzzM3qegZeHJyiWUZ81CYScLceaVrj1DtQ68vNEhP+9JSA==",
       "requires": {
         "common-path-prefix": "^3.0.0",
         "del": "^6.0.0",
@@ -27214,9 +27268,9 @@
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
     "c8": {
-      "version": "7.11.3",
-      "resolved": "https://registry.npmjs.org/c8/-/c8-7.11.3.tgz",
-      "integrity": "sha512-6YBmsaNmqRm9OS3ZbIiL2EZgi1+Xc4O24jL3vMYGE6idixYuGdy76rIfIdltSKDj9DpLNrcXSonUTR1miBD0wA==",
+      "version": "7.12.0",
+      "resolved": "https://registry.npmjs.org/c8/-/c8-7.12.0.tgz",
+      "integrity": "sha512-CtgQrHOkyxr5koX1wEUmN/5cfDa2ckbHRA4Gy5LAL0zaCFtVWJS5++n+w4/sr2GWGerBxgTjpKeDclk/Qk6W/A==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
@@ -34703,9 +34757,9 @@
       }
     },
     "netlify-onegraph-internal": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.6.tgz",
-      "integrity": "sha512-nNqCWT2jzPmqw/3/sKf1RFicL2JEFjmxXTpnIzJKt5U+bnS633cOy5pImNnfBGTd50NTNvdZ0GXMhQ7AwH16Qg==",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.10.tgz",
+      "integrity": "sha512-8GeKcWbYPV3CCMJEj2LwkhP0eFCDDrt3XDTZuweWHAa5DTkRd6cSEnnH0BjTBBetoFfPKXDjbFmSiD9xobcnPA==",
       "requires": {
         "graphql": "16.0.0",
         "node-fetch": "^2.6.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.11.2",
+  "version": "10.13.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -69,7 +69,7 @@
     "Joshua T. (http://localhost:8080)",
     "João Antunes <me@jgantunes.com> (https://twitter.com/jgantunes)",
     "Karagulamos (https://twitter.com/karagulamos)",
-    "Karin Hendrikse (khendrikse.netlify.app)",
+    "Karin Hendrikse <khendrikse.netlify.app>",
     "Kaspar Emanuel <kaspar@monostable.co.uk> (https://twitter.com/kaspar_e)",
     "Keiko Oda (https://keikooda.net/)",
     "Krasimir Nedelchev (https://github.com/kaykayehnn)",
@@ -219,9 +219,9 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^27.5.0",
+    "@netlify/build": "^27.7.0",
     "@netlify/config": "^18.1.2",
-    "@netlify/edge-bundler": "^1.7.0",
+    "@netlify/edge-bundler": "^1.8.0",
     "@netlify/framework-info": "^9.1.1",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/plugins-list": "^6.35.0",
@@ -290,7 +290,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^12.0.0",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-onegraph-internal": "0.3.6",
+    "netlify-onegraph-internal": "0.3.10",
     "netlify-redirect-parser": "^13.0.5",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",

package/src/commands/dev/dev.js

@@ -240,6 +240,7 @@ const FRAMEWORK_PORT_TIMEOUT = 6e5
  * @param {*} params.settings
  * @param {boolean} params.offline
  * @param {*} params.site
+ * @param {*} params.siteInfo
  * @param {import('../../utils/state-config').StateConfig} params.state
  * @returns
  */
@@ -253,6 +254,7 @@ const startProxyServer = async ({
   offline,
   settings,
   site,
+  siteInfo,
   state,
 }) => {
   const url = await startProxy({
@@ -267,8 +269,8 @@ const startProxyServer = async ({
     projectDir: site.root,
     settings,
     state,
+    siteInfo,
   })
-
   if (!url) {
     log(NETLIFYDEVERR, `Unable to start proxy server on port '${settings.port}'`)
     exit(1)
@@ -484,6 +486,7 @@ const dev = async (options, command) => {
     offline: options.offline,
     settings,
     site,
+    siteInfo,
     state,
   })
 
@@ -598,6 +601,7 @@ const createDevCommand = (program) => {
 
   return program
     .command('dev')
+    .alias('develop')
     .description(
       `Local dev server\nThe dev command will run a local dev server with Netlify's proxy and redirect rules`,
     )

package/src/commands/graph/graph-pull.js

@@ -33,9 +33,15 @@ const graphPull = async (options, command) => {
 
   const { jwt } = await OneGraphCliClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
 
-  await refetchAndGenerateFromOneGraph({ logger: log, netlifyGraphConfig, jwt, state, siteId })
-
   const oneGraphSessionId = loadCLISession(state)
+  await refetchAndGenerateFromOneGraph({
+    logger: log,
+    netlifyGraphConfig,
+    jwt,
+    state,
+    siteId,
+    sessionId: oneGraphSessionId,
+  })
 
   if (!oneGraphSessionId) {
     warn(

package/src/lib/edge-functions/editor-helper.js

@@ -7,6 +7,10 @@ const { runRecipe } = require('../../commands/recipes')
 const STATE_PROMPT_PROPERTY = 'promptVSCodeSettings'
 
 const promptEditorHelper = async ({ NETLIFYDEVLOG, chalk, config, log, repositoryRoot, state }) => {
+  // This prevents tests from hanging when running them inside the VS Code
+  // terminal, as otherwise we'll show the prompt and wait for a response.
+  if (env.NODE_ENV === 'test') return
+
   const isVSCode = env.TERM_PROGRAM === 'vscode'
   const hasShownPrompt = Boolean(state.get(STATE_PROMPT_PROPERTY))
   const hasEdgeFunctions = Boolean(config.edge_functions && config.edge_functions.length !== 0)

package/src/lib/edge-functions/headers.js

@@ -6,4 +6,5 @@ module.exports = {
   Passthrough: 'x-deno-pass',
   RequestID: 'X-NF-Request-ID',
   IP: 'x-nf-client-connection-ip',
+  Site: 'X-NF-Site-Info',
 }

package/src/lib/edge-functions/proxy.js

@@ -1,4 +1,5 @@
 // @ts-check
+const { Buffer } = require('buffer')
 const { relative } = require('path')
 const { cwd, env } = require('process')
 
@@ -45,6 +46,13 @@ const handleProxyRequest = (req, proxyReq) => {
   })
 }
 
+const createSiteInfoHeader = (siteInfo = {}) => {
+  const { id, name, url } = siteInfo
+  const site = { id, name, url }
+  const siteString = JSON.stringify(site)
+  return Buffer.from(siteString).toString('base64')
+}
+
 const initializeProxy = async ({
   config,
   configPath,
@@ -55,6 +63,7 @@ const initializeProxy = async ({
   offline,
   projectDir,
   settings,
+  siteInfo,
   state,
 }) => {
   const { functions: internalFunctions, importMap, path: internalFunctionsPath } = await getInternalFunctions()
@@ -91,8 +100,9 @@ const initializeProxy = async ({
 
     if (!registry) return
 
-    // Setting header with geolocation.
+    // Setting header with geolocation and site info.
     req.headers[headers.Geo] = JSON.stringify(geoLocation)
+    req.headers[headers.Site] = createSiteInfoHeader(siteInfo)
 
     await registry.initialize()
 
@@ -182,4 +192,4 @@ const prepareServer = async ({
   }
 }
 
-module.exports = { handleProxyRequest, initializeProxy, isEdgeFunctionsRequest }
+module.exports = { handleProxyRequest, initializeProxy, isEdgeFunctionsRequest, createSiteInfoHeader }

package/src/lib/one-graph/cli-client.js

@@ -61,7 +61,8 @@ InternalConsole.registerConsole(internalConsole)
  * @returns
  */
 const monitorCLISessionEvents = (input) => {
-  const { appId, netlifyGraphConfig, netlifyToken, onClose, onError, onEvents, sessionId, site, state } = input
+  const { appId, netlifyGraphConfig, netlifyToken, onClose, onError, onEvents, site, state } = input
+  const currentSessionId = input.sessionId
 
   const frequency = 5000
   // 30 minutes
@@ -71,11 +72,15 @@ const monitorCLISessionEvents = (input) => {
 
   const markActiveHelper = async () => {
     const graphJwt = await OneGraphClient.getGraphJwtForSite({ siteId: appId, nfToken: netlifyToken })
-    const fullSession = await OneGraphClient.fetchCliSession({ jwt: graphJwt.jwt, appId, sessionId })
+    const fullSession = await OneGraphClient.fetchCliSession({ jwt: graphJwt.jwt, appId, sessionId: currentSessionId })
     // @ts-ignore
     const heartbeatIntervalms = fullSession.session.cliHeartbeatIntervalMs || defaultHeartbeatFrequency
     nextMarkActiveHeartbeat = heartbeatIntervalms
-    const markCLISessionActiveResult = await executeMarkCliSessionActiveHeartbeat(graphJwt.jwt, site.id, sessionId)
+    const markCLISessionActiveResult = await executeMarkCliSessionActiveHeartbeat(
+      graphJwt.jwt,
+      site.id,
+      currentSessionId,
+    )
     if (markCLISessionActiveResult.errors && markCLISessionActiveResult.errors.length !== 0) {
       warn(`Failed to mark CLI session active: ${markCLISessionActiveResult.errors.join(', ')}`)
     }
@@ -84,10 +89,10 @@ const monitorCLISessionEvents = (input) => {
 
   setTimeout(markActiveHelper, nextMarkActiveHeartbeat)
 
-  const enabledServiceWatcher = async (jwt, siteId) => {
+  const enabledServiceWatcher = async (jwt, { appId: siteId, sessionId }) => {
     const enabledServices = state.get('oneGraphEnabledServices') || ['onegraph']
 
-    const enabledServicesInfo = await OneGraphClient.fetchEnabledServices(jwt, siteId)
+    const enabledServicesInfo = await OneGraphClient.fetchEnabledServicesForSession(jwt, siteId, sessionId)
     if (!enabledServicesInfo) {
       warn('Unable to fetch enabled services for site for code generation')
       return
@@ -102,7 +107,7 @@ const monitorCLISessionEvents = (input) => {
           'Reloading',
         )} Netlify Graph schema..., ${enabledServicesCompareKey} => ${newEnabledServicesCompareKey}`,
       )
-      await refetchAndGenerateFromOneGraph({ netlifyGraphConfig, state, jwt, siteId })
+      await refetchAndGenerateFromOneGraph({ netlifyGraphConfig, state, jwt, siteId, sessionId })
       log(`${chalk.green('Reloaded')} Netlify Graph schema and regenerated functions`)
     }
   }
@@ -120,7 +125,7 @@ const monitorCLISessionEvents = (input) => {
     }
 
     const graphJwt = await OneGraphClient.getGraphJwtForSite({ siteId: appId, nfToken: netlifyToken })
-    const next = await OneGraphClient.fetchCliSessionEvents({ appId, jwt: graphJwt.jwt, sessionId })
+    const next = await OneGraphClient.fetchCliSessionEvents({ appId, jwt: graphJwt.jwt, sessionId: currentSessionId })
 
     if (next && next.errors) {
       next.errors.forEach((fetchEventError) => {
@@ -137,11 +142,16 @@ const monitorCLISessionEvents = (input) => {
       } catch (eventHandlerError) {
         warn(`Error handling event: ${eventHandlerError}`)
       } finally {
-        await OneGraphClient.ackCLISessionEvents({ appId, jwt: graphJwt.jwt, sessionId, eventIds: ackIds })
+        await OneGraphClient.ackCLISessionEvents({
+          appId,
+          jwt: graphJwt.jwt,
+          sessionId: currentSessionId,
+          eventIds: ackIds,
+        })
       }
     }
 
-    await enabledServiceWatcher(graphJwt.jwt, appId)
+    await enabledServiceWatcher(graphJwt.jwt, { appId, sessionId: currentSessionId })
 
     handle = setTimeout(helper, frequency)
   }
@@ -178,6 +188,7 @@ const monitorOperationFile = async ({ netlifyGraphConfig, onAdd, onChange, onUnl
  * @param {object} input
  * @param {string} input.siteId The id of the site to query against
  * @param {string} input.jwt The Graph JWT
+ * @param {string} input.sessionId The session ID for the current session
  * @param {NetlifyGraph.NetlifyGraphConfig} input.netlifyGraphConfig A standalone config object that contains all the information necessary for Netlify Graph to process events
  * @param {StateConfig} input.state A function to call to set/get the current state of the local Netlify project
  * @param {(message: string) => void=} input.logger A function that if provided will be used to log messages
@@ -188,7 +199,7 @@ const refetchAndGenerateFromOneGraph = async (input) => {
 
   await OneGraphClient.ensureAppForSite(jwt, siteId)
 
-  const enabledServicesInfo = await OneGraphClient.fetchEnabledServices(jwt, siteId)
+  const enabledServicesInfo = await OneGraphClient.fetchEnabledServicesForSession(jwt, siteId, input.sessionId)
   if (!enabledServicesInfo) {
     warn('Unable to fetch enabled services for site for code generation')
     return

package/src/utils/proxy.js

@@ -472,6 +472,7 @@ const startProxy = async function ({
   offline,
   projectDir,
   settings,
+  siteInfo,
   state,
 }) {
   const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null
@@ -485,6 +486,7 @@ const startProxy = async function ({
     offline,
     projectDir,
     settings,
+    siteInfo,
     state,
   })
   const proxy = await initializeProxy({