netlify-cli 27.12.1 → 27.13.0

package/dist/commands/agents/agents-stop.js

@@ -38,8 +38,8 @@ export const agentsStop = async (id, options, command) => {
         }
         // Stop the agent task
         const stopSpinnerInstance = startSpinner({ text: 'Stopping agent task...' });
-        const response = await fetch(`${apiOpts.scheme ?? 'https'}://${apiOpts.host ?? api.host}/api/v1/agent_runners/${id}`, {
-            method: 'DELETE',
+        const response = await fetch(`${apiOpts.scheme ?? 'https'}://${apiOpts.host ?? api.host}/api/v1/agent_runners/${id}/stop`, {
+            method: 'POST',
             headers: {
                 Authorization: `Bearer ${api.accessToken ?? ''}`,
                 'User-Agent': apiOpts.userAgent,

package/dist/commands/base-command.js

@@ -234,6 +234,8 @@ export default class BaseCommand extends Command {
         const getCommands = (command) => {
             const parentCommand = this.name() === 'netlify' ? command : command.parent;
             return (parentCommand?.commands
+                // subcommands nested with `.command()` rather than named `parent:child`, e.g. `database connect`
+                .concat(this.name() === 'netlify' ? [] : command.commands)
                 .filter((cmd) => {
                 if (cmd._hidden)
                     return false;
@@ -242,11 +244,13 @@ export default class BaseCommand extends Command {
                     // don't include subcommands on the main page
                     return !cmd.name().includes(':');
                 }
-                return cmd.name().startsWith(`${command.name()}:`);
+                return cmd.name().startsWith(`${command.name()}:`) || cmd.parent === command;
             })
                 .sort((a, b) => a.name().localeCompare(b.name())) || []);
         };
-        help.longestSubcommandTermLength = (command) => getCommands(command).reduce((max, cmd) => Math.max(max, cmd.name().length), 0);
+        /** nested subcommands are shown by their full path, e.g. `database migrations apply` */
+        const getCommandTerm = (cmd) => cmd.parent && cmd.parent.name() !== 'netlify' ? `${getCommandTerm(cmd.parent)} ${cmd.name()}` : cmd.name();
+        help.longestSubcommandTermLength = (command) => getCommands(command).reduce((max, cmd) => Math.max(max, getCommandTerm(cmd).length), 0);
         /** override the longestOptionTermLength to react on hide options flag */
         help.longestOptionTermLength = (command, helper) => (!command.noBaseOptions &&
             helper.visibleOptions(command).reduce((max, option) => Math.max(max, helper.optionTerm(option).length), 0)) ||
@@ -313,7 +317,7 @@ export default class BaseCommand extends Command {
                     '',
                 ];
             }
-            const commandList = getCommands(command).map((cmd) => formatItem(cmd.name(), helper.subcommandDescription(cmd).split('\n')[0], true));
+            const commandList = getCommands(command).map((cmd) => formatItem(getCommandTerm(cmd), helper.subcommandDescription(cmd).split('\n')[0], true));
             if (commandList.length !== 0) {
                 output = [...output, chalk.bold('COMMANDS'), formatHelpList(commandList), ''];
             }

package/dist/commands/deploy/deploy.js

@@ -72,7 +72,7 @@ const getDeployFolder = async ({ command, config, options, site, siteData, }) =>
             ? resolve(command.jsWorkspaceRoot || site.root, options.dir)
             : resolve(command.workingDir, options.dir);
     }
-    else if (config?.build?.publish) {
+    else if (config.build.publish) {
         deployFolder = resolve(site.root, config.build.publish);
     }
     else if (siteData?.build_settings?.dir) {
@@ -252,10 +252,7 @@ const generateDeployCommand = (options, availableTeams, command) => {
     return parts.join(' ');
 };
 const prepareProductionDeploy = async ({ api, siteData, options, command, }) => {
-    if (typeof siteData.published_deploy === 'object' &&
-        // eslint-disable-next-line @typescript-eslint/prefer-optional-chain -- FIXME: a non-object `published_deploy` must not count as locked
-        siteData.published_deploy !== null &&
-        siteData.published_deploy.locked) {
+    if (siteData.published_deploy?.locked) {
         log(`\n${NETLIFYDEVERR} Deployments are "locked" for production context of this project\n`);
         const overrideCommand = generateDeployCommand({ ...options, prodIfUnlocked: true, prod: false }, [], command);
         if (!isInteractive()) {
@@ -275,6 +272,19 @@ const prepareProductionDeploy = async ({ api, siteData, options, command, }) =>
         log(`\n${NETLIFYDEVLOG} "Auto publishing" has been enabled for production context\n`);
     }
 };
+const createDeploy = async ({ alias, api, command, deployToProduction, options, siteData, siteId, }) => {
+    if (deployToProduction) {
+        await prepareProductionDeploy({ siteData, api, options, command });
+    }
+    const draft = options.draft || (!deployToProduction && !alias);
+    const createDeployBody = {
+        draft,
+        branch: alias,
+        include_upload_url: options.uploadSourceZip,
+        ...getDeploySourceFields(),
+    };
+    return (await api.createSiteDeploy({ siteId, title: options.message, body: createDeployBody }));
+};
 const hasErrorMessage = (actual, expected) => {
     if (typeof actual === 'string') {
         return actual.includes(expected);
@@ -372,7 +382,7 @@ const uploadDeployBlobs = async ({ cachedConfig, deployId, options, packagePath,
         phase: 'stop',
     });
 };
-const runDeploy = async ({ alias, api, command, config, deployFolder, deployTimeout, deployToProduction, functionsConfig, functionsFolder, options, packagePath, silent, site, siteData, siteId, skipFunctionsCache, title, deployId: existingDeployId, }) => {
+const runDeploy = async ({ alias, api, command, config, deployFolder, deployTimeout, deployToProduction, functionsConfig, functionsFolder, options, packagePath, silent, site, siteData, siteId, skipFunctionsCache, deployId: existingDeployId, }) => {
     let results;
     let deployId = existingDeployId;
     let uploadSourceZipResult;
@@ -380,21 +390,15 @@ const runDeploy = async ({ alias, api, command, config, deployFolder, deployTime
         // We won't have a deploy ID if we run the command with `--no-build`.
         // In this case, we must create the deploy.
         if (!deployId) {
-            if (deployToProduction) {
-                await prepareProductionDeploy({ siteData, api, options, command });
-            }
-            const draft = options.draft || (!deployToProduction && !alias);
-            const createDeployBody = {
-                draft,
-                branch: alias,
-                include_upload_url: options.uploadSourceZip,
-                ...getDeploySourceFields(),
-            };
-            const createDeployResponse = (await api.createSiteDeploy({
+            const createDeployResponse = await createDeploy({
+                alias,
+                api,
+                command,
+                deployToProduction,
+                options,
+                siteData,
                 siteId,
-                title,
-                body: createDeployBody,
-            }));
+            });
             deployId = createDeployResponse.id;
             if (options.uploadSourceZip &&
                 createDeployResponse.source_zip_upload_url &&
@@ -458,7 +462,7 @@ const runDeploy = async ({ alias, api, command, config, deployFolder, deployTime
             workingDir: command.workingDir,
             manifestPath: manifestPath ?? undefined,
             packagePath,
-            serverEnabled: Boolean(siteData?.feature_flags?.netlify_build_server_standalone),
+            serverEnabled: Boolean(siteData.feature_flags?.netlify_build_server_standalone),
             serverManifestPath: serverManifestPath ?? undefined,
             skipFunctionsCache,
             siteRoot: site.root,
@@ -708,7 +712,6 @@ const prepAndRunDeploy = async ({ api, command, config, deployToProduction, opti
         siteData,
         siteId,
         skipFunctionsCache: options.skipFunctionsCache,
-        title: options.message,
         deployId,
     });
     return results;
@@ -831,7 +834,7 @@ const anonymousDeploy = async (options, command) => {
         }
     };
     const checkForFunctions = async () => {
-        const functionsFolder = getFunctionsFolder({ config, options, site, siteData: {}, workingDir });
+        const functionsFolder = getFunctionsFolder({ config, options, site, workingDir });
         const internalFunctionsDir = await getInternalFunctionsDir({ base: site.root });
         const frameworksFunctionsDir = command.netlify.frameworksAPIPaths.functions.path;
         const hasFunctions = (await dirHasFiles(functionsFolder)) ||
@@ -861,10 +864,9 @@ const anonymousDeploy = async (options, command) => {
     }
     const deployFolder = await getDeployFolder({
         command,
-        config: command.netlify.config,
+        config,
         options,
         site,
-        siteData: {},
     });
     await validateDeployFolder(deployFolder);
     const edgeFunctionsDistPath = await getEdgeFunctionsDistPathIfExists(workingDir);
@@ -983,22 +985,8 @@ export const deploy = async (options, command) => {
     const deployToProduction = !options.draft && (options.prod || (options.prodIfUnlocked && !(siteData.published_deploy?.locked ?? false)));
     let results = {};
     if (options.build) {
-        if (deployToProduction) {
-            await prepareProductionDeploy({ siteData, api, options, command });
-        }
-        const draft = options.draft || (!deployToProduction && !alias);
-        const createDeployBody = {
-            draft,
-            branch: alias,
-            include_upload_url: options.uploadSourceZip,
-            ...getDeploySourceFields(),
-        };
-        const deployMetadata = (await api.createSiteDeploy({
-            siteId,
-            title: options.message,
-            body: createDeployBody,
-        }));
-        const deployId = deployMetadata.id || '';
+        const deployMetadata = await createDeploy({ alias, api, command, deployToProduction, options, siteData, siteId });
+        const deployId = deployMetadata.id;
         const skewProtectionToken = deployMetadata.skew_protection_token;
         let sourceZipFileName;
         if (options.uploadSourceZip &&

package/dist/commands/sites/sites-create.js

@@ -5,7 +5,7 @@ import { chalk, logAndThrowError, log, logJson, warn } from '../../utils/command
 import getRepoData from '../../utils/get-repo-data.js';
 import { configureRepo } from '../../utils/init/config.js';
 import { isInteractive } from '../../utils/scripted-commands.js';
-import { resolveTeamForNonInteractive } from '../../utils/team.js';
+import { requireTeams, resolveTeamForNonInteractive } from '../../utils/team.js';
 import { track } from '../../utils/telemetry/index.js';
 import { MAX_SITE_NAME_LENGTH } from '../../utils/validation.js';
 import { link } from '../link/link.js';
@@ -29,9 +29,10 @@ export const sitesCreate = async (options, command) => {
             log(`Using team: ${team.name}`);
         }
         else {
+            const teams = requireTeams(accounts);
             accountSlug = await select({
                 message: 'Team:',
-                choices: accounts.map((account) => ({
+                choices: teams.map((account) => ({
                     value: account.slug,
                     name: account.name,
                 })),

package/dist/utils/team.d.ts

@@ -1,4 +1,5 @@
 import type { MinimalAccount } from './types.js';
+export declare const requireTeams: (accounts: MinimalAccount[] | undefined) => MinimalAccount[];
 export declare const resolveTeam: (accounts: MinimalAccount[]) => MinimalAccount | undefined;
 export declare const resolveTeamForNonInteractive: (accounts: MinimalAccount[], commandExample: string) => MinimalAccount;
 //# sourceMappingURL=team.d.ts.map

package/dist/utils/team.js

@@ -1,4 +1,11 @@
 import { logAndThrowError } from './command-helpers.js';
+export const requireTeams = (accounts) => {
+    const teams = accounts ?? [];
+    if (teams.length === 0) {
+        return logAndThrowError('No teams available. Please ensure you have access to at least one team.');
+    }
+    return teams;
+};
 export const resolveTeam = (accounts) => {
     if (accounts.length === 1) {
         return accounts[0];
@@ -6,14 +13,12 @@ export const resolveTeam = (accounts) => {
     return accounts.find((acc) => acc.default);
 };
 export const resolveTeamForNonInteractive = (accounts, commandExample) => {
-    if (accounts.length === 0) {
-        return logAndThrowError('No teams available. Please ensure you have access to at least one team.');
-    }
-    const team = resolveTeam(accounts);
+    const teams = requireTeams(accounts);
+    const team = resolveTeam(teams);
     if (team) {
         return team;
     }
-    const availableTeams = accounts.map((t) => t.slug).join(', ');
+    const availableTeams = teams.map((t) => t.slug).join(', ');
     return logAndThrowError(`Multiple teams available. Please specify which team to use.\n` +
         `Available teams: ${availableTeams}\n\n` +
         `Example: ${commandExample}\n\n` +

package/dist/utils/telemetry/report-error.js

@@ -3,9 +3,8 @@ import { dirname, join } from 'path';
 import process, { version as nodejsVersion } from 'process';
 import { fileURLToPath } from 'url';
 import { getGlobalConfigStore } from '@netlify/dev-utils';
-import { isCI } from 'ci-info';
 import execa from '../execa.js';
-import { cliVersion } from './utils.js';
+import { cliVersion, isTelemetryDisabledByEnv } from './utils.js';
 const dirPath = dirname(fileURLToPath(import.meta.url));
 let currentCommand;
 export const setCommandForErrorReporting = (command) => {
@@ -21,7 +20,7 @@ export const setCommandForErrorReporting = (command) => {
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'error' implicitly has an 'any' type.
 export const reportError = async function (error, config = {}) {
-    if (isCI) {
+    if (isTelemetryDisabledByEnv()) {
         return;
     }
     // convert a NotifiableError to an error class

package/dist/utils/telemetry/telemetry.js

@@ -2,10 +2,10 @@ import { dirname, join } from 'path';
 import process, { version as nodejsVersion } from 'process';
 import { fileURLToPath } from 'url';
 import { getGlobalConfigStore } from '@netlify/dev-utils';
-import { isCI } from 'ci-info';
+import { id as ciVendor, isPR } from 'ci-info';
 import { getDrivingAgent } from '../agent-detection.js';
 import execa from '../execa.js';
-import { isTelemetryDisabled, cliVersion } from './utils.js';
+import { isTelemetryDisabled, isTelemetryDisabledByEnv, cliVersion } from './utils.js';
 import isValidEventName from './validation.js';
 const dirPath = dirname(fileURLToPath(import.meta.url));
 function send(type, payload) {
@@ -49,11 +49,15 @@ const getAgentProperties = () => {
         agent_other_value: agent?.otherValue,
     };
 };
+const getCIProperties = () => ({
+    ci_vendor: ciVendor ?? undefined,
+    ci_is_pr: isPR ?? undefined,
+});
 /**
  * Tracks a custom event with the provided payload
  */
 export async function track(eventName, payload = {}) {
-    if (isCI) {
+    if (isTelemetryDisabledByEnv()) {
         return;
     }
     const globalConfig = await getGlobalConfigStore();
@@ -78,12 +82,12 @@ export async function track(eventName, payload = {}) {
         anonymousId: cliId,
         duration,
         status,
-        properties: { ...properties, nodejsVersion, cliVersion, ...getAgentProperties() },
+        properties: { ...properties, nodejsVersion, cliVersion, ...getAgentProperties(), ...getCIProperties() },
     };
     return send('track', defaultData);
 }
 export async function identify(payload) {
-    if (isCI) {
+    if (isTelemetryDisabledByEnv()) {
         return;
     }
     const globalConfig = await getGlobalConfigStore();

package/dist/utils/telemetry/utils.d.ts

@@ -1,3 +1,4 @@
 export declare const cliVersion: string;
 export declare const isTelemetryDisabled: (config: any) => any;
+export declare const isTelemetryDisabledByEnv: () => boolean;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils/telemetry/utils.js

@@ -1,7 +1,11 @@
+import process from 'process';
 import getCLIPackageJson from '../get-cli-package-json.js';
 export const { version: cliVersion } = await getCLIPackageJson();
 // @ts-expect-error TS(7006) FIXME: Parameter 'config' implicitly has an 'any' type.
 export const isTelemetryDisabled = function (config) {
     return config.get('telemetryDisabled');
 };
+const isEnabledFlag = (value) => value !== undefined && !['', '0', 'false'].includes(value);
+// An env var opt-out matters in CI, where the global config written by `--telemetry-disable` rarely persists.
+export const isTelemetryDisabledByEnv = () => isEnabledFlag(process.env.NETLIFY_TELEMETRY_DISABLED) || isEnabledFlag(process.env.DO_NOT_TRACK);
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netlify-cli",
-  "version": "27.12.1",
+  "version": "27.13.0",
   "description": "Netlify command line tool",
   "keywords": [
     "api",
@@ -182,7 +182,7 @@
     "@types/write-file-atomic": "^4.0.3",
     "@types/ws": "^8.18.1",
     "@types/yauzl": "^2.10.3",
-    "@vitest/coverage-v8": "^4.1.11",
+    "@vitest/coverage-v8": "^5.0.0",
     "@vitest/eslint-plugin": "1.3.13",
     "c8": "^10.1.3",
     "cheerio": "^1.1.2",
@@ -210,7 +210,7 @@
     "typescript-eslint": "~8.65.0",
     "typescript-native": "npm:typescript@~7.0.2",
     "verdaccio": "^6.3.2",
-    "vitest": "^4.1.11"
+    "vitest": "^5.0.0"
   },
   "engines": {
     "node": ">=22.13.0"