@contentrail/cli 0.2.1 → 0.2.3

package/README.md

@@ -1,25 +1,31 @@
 # `@contentrail/cli`
 
-Node.js CLI for ContentRail local development (ADR 020).
+Node.js CLI for ContentRail local development (ADR 020 / ADR 029).
 
 Requires **Node.js ≥ 22**. Init works on any static site (`framework: "static"`).
 Astro and Vite have extra helpers (Astro **7.3.8**, Vite **8.3.5**;
 `@contentrail/astro` needs Node ≥ **22.12**).
 
-## Install
-
-### Monorepo
+## Install (one package)
 
 ```sh
-pnpm install
-pnpm --filter @contentrail/cli build
-pnpm exec contentrail --help
+npm i -D @contentrail/cli
+npx contentrail
 ```
 
-### From npm (`0.2.1`)
+On a TTY, `contentrail` opens an interactive menu: Setup, Connect, Doctor,
+Status, Deploy. Setup scaffolds files and can install the other `@contentrail/*`
+packages for your framework. You still configure Git + Cloudflare (tokens stay
+in env / the dashboard — never in `contentrail.config.json`).
+
+Non-interactive / CI: pass commands and `-y` / `--yes`. Use `init --install` to
+add packages without prompts.
+
+### Monorepo
 
 ```sh
-pnpm add -D @contentrail/cli@0.2.1
+pnpm install
+pnpm --filter @contentrail/cli build
 pnpm exec contentrail --help
 ```
 
@@ -28,18 +34,21 @@ schemas use Zod **`^4.6.7`** via `@contentrail/core`.
 
 ## Commands
 
-| Command                     | Purpose                                                                           |
-| --------------------------- | --------------------------------------------------------------------------------- |
-| `contentrail init`          | Scaffold config, sample collection, sample JSON (`--with-functions`, `--dry-run`) |
-| `contentrail validate`      | Validate config + local JSON content                                              |
-| `contentrail build`         | Validate, then run `package.json` build script                                    |
-| `contentrail doctor`        | Diagnose setup (no secret values printed)                                         |
-| `contentrail status`        | Summarize local readiness                                                         |
-| `contentrail dev`           | Run `package.json` `dev`                                                          |
-| `contentrail import`        | CSV → validated JSON for a registered collection                                  |
-| `contentrail publish`       | POST local JSON to `publishApiUrl` (env token)                                    |
-| `contentrail deploy status` | Pages deployment status (`CF_API_TOKEN`)                                          |
-| `contentrail pages setup`   | Print Cloudflare automation capabilities                                          |
+| Command                     | Purpose                                                                     |
+| --------------------------- | --------------------------------------------------------------------------- |
+| `contentrail`               | Interactive control panel (TTY)                                             |
+| `contentrail init`          | Scaffold config + optional `--install` of ContentRail packages              |
+| `contentrail validate`      | Validate config + local JSON content                                        |
+| `contentrail build`         | Validate, then run `package.json` build script                              |
+| `contentrail doctor`        | Diagnose setup (no secret values printed)                                   |
+| `contentrail status`        | Summarize local readiness                                                   |
+| `contentrail dev`           | Run `package.json` `dev`                                                    |
+| `contentrail import`        | CSV → validated JSON for a registered collection                            |
+| `contentrail publish`       | POST local JSON to `publishApiUrl` (env token)                              |
+| `contentrail connect`       | GitHub origin + Cloudflare Pages project (interactive or `--confirm --yes`) |
+| `contentrail deploy`        | Build and deploy to Pages                                                   |
+| `contentrail deploy status` | Pages deployment status (`CF_API_TOKEN`)                                    |
+| `contentrail pages setup`   | Alias for connect                                                           |
 
 `rollback` is API-only. `publish` never sends GitHub tokens (ADR 020). See `docs/CONFIGURATION.md`.
 
@@ -71,14 +80,13 @@ schemas use Zod **`^4.6.7`** via `@contentrail/core`.
 
 ## Typical workflow
 
-1. Create an Astro or Vite app (or use a monorepo `examples/*` app).
-2. Add `@contentrail/core` + `zod`, plus `@contentrail/astro` or `@contentrail/vite`
-   (workspace links today; `pnpm add` from npm only after public release).
-3. `pnpm exec contentrail init --framework vite` (or `astro`)
-4. Edit collections / JSON under `content/`
-5. `pnpm exec contentrail validate`
-6. Framework `dev` / `contentrail build`
-7. For `/admin`, add `@contentrail/editor` + `preact` and the admin plugin (`docs/ADMIN.md`)
+1. Create an Astro, Vite, Next.js, or static site.
+2. `npm i -D @contentrail/cli` then `npx contentrail` → **Setup** (installs the rest).
+3. Export `CF_API_TOKEN` (never commit it) → **Connect** for Pages.
+4. Edit collections / JSON under `content/` (or use `/admin`).
+5. `npx contentrail validate` / `doctor`
+6. Framework `dev` / `contentrail build` / **Deploy**
+7. For `/admin`, add `@contentrail/editor` + `preact@^10.26.0` (`docs/ADMIN.md`)
 8. `contentrail doctor` when something fails
 
 ## Limitations

package/dist/cli.d.ts

@@ -1,4 +1,5 @@
 import { ExitCode } from "./exit-codes.js";
+import type { InstallDepsFn, PromptHost } from "./interactive/types.js";
 export interface RunCliOptions {
     readonly cwd?: string;
     readonly stdout?: NodeJS.WritableStream;
@@ -6,6 +7,10 @@ export interface RunCliOptions {
     readonly env?: NodeJS.ProcessEnv;
     readonly fetchImpl?: typeof fetch;
     readonly gitRemoteUrl?: string;
+    /** Force interactive UI on/off (tests). Default: TTY + non-CI detection. */
+    readonly interactive?: boolean;
+    readonly prompts?: PromptHost;
+    readonly installDeps?: InstallDepsFn;
 }
 export declare function runCli(argv: readonly string[], options?: RunCliOptions): Promise<ExitCode>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAoI3C,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IACxC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IACxC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,wBAAsB,MAAM,CAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,QAAQ,CAAC,CA+MnB"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA8IxE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IACxC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IACxC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,4EAA4E;IAC5E,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC;CACtC;AAED,wBAAsB,MAAM,CAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,QAAQ,CAAC,CAyFnB"}

package/dist/cli.js

@@ -12,16 +12,25 @@ import { runStatus } from "./commands/status.js";
 import { runValidate } from "./commands/validate.js";
 import { loadProject } from "./config/load.js";
 import { ExitCode } from "./exit-codes.js";
+import { createClackPromptHost } from "./interactive/clack-host.js";
+import { canUseInteractiveUi } from "./interactive/is-interactive.js";
+import { runMainMenu } from "./interactive/menu.js";
+import { createPackageInstallRunner } from "./install/run.js";
 import { createLogger } from "./util/print.js";
 import { findProjectRoot } from "./util/paths.js";
 const VERSION = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
-const HELP = `ContentRail CLI — local developer tooling
+const HELP = `ContentRail CLI — developer control panel for your static site
 
 Usage:
+  contentrail                 Interactive menu (TTY)
   contentrail <command> [options]
 
+Install once:
+  npm i -D @contentrail/cli
+  npx contentrail
+
 Commands:
-  init            Add ContentRail to an existing static site (any framework)
+  init            Add ContentRail + optionally install packages for this site
   validate        Validate configuration and local JSON content
   build           Validate then run the project build script
   doctor          Diagnose common setup problems
@@ -43,12 +52,13 @@ Global options:
 init options:
   --framework <astro|vite|next|static>  Force framework (default: auto-detect)
   --force                   Overwrite existing generated files
+  --install                 Install ContentRail packages with the project package manager
   --no-editor               Skip contentrail.editor.json
   --no-functions            Skip Pages Functions templates
-  -y, --yes                 Non-interactive; accept defaults
+  -y, --yes                 Non-interactive; accept defaults (skips prompts)
 
 connect / deploy:
-  --confirm --yes           Required to create or change Pages projects
+  --confirm --yes           Required to create or change Pages projects (non-interactive)
   --account-id --project    Cloudflare account and Pages project name
   --skip-build              Deploy without running the site build
 
@@ -66,7 +76,7 @@ deploy status options:
   --project <pages-project-name>
 
 pages setup options:
-  --confirm   Required before any Cloudflare mutation (still blocked in CLI)
+  --confirm   Required before any Cloudflare mutation
   -y, --yes   Non-interactive confirmation
 
 Exit codes:
@@ -78,13 +88,16 @@ Exit codes:
 Notes:
   rollback is not a CLI command. Use the authenticated Worker/Pages API.
   CLI publish never sends GitHub tokens; it uses CONTENTRAIL_PUBLISH_TOKEN.
+  Secrets never go in contentrail.config.json.
 `;
 function printCommandHelp(command) {
     switch (command) {
         case "init":
-            return `Usage: contentrail init [--framework astro|vite|static] [--force] [--with-editor] [--with-functions] [--dry-run] [-y]
+            return `Usage: contentrail init [--framework astro|vite|next|static] [--force] [--install] [--no-editor] [--no-functions] [--dry-run] [-y]
 
 Creates contentrail.config.json, a sample collection module, and sample JSON.
+With --install (or interactive Setup), installs the ContentRail packages this
+site needs so you only add @contentrail/cli yourself.
 Works on Next.js, React, vanilla, Astro, and Vite sites. Does not generate the public site.
 Never overwrites existing files unless --force is set.`;
         case "validate":
@@ -138,141 +151,192 @@ Prints the Cloudflare automation capability map. Does not mutate production.`;
 export async function runCli(argv, options) {
     const log = createLogger(options?.stdout, options?.stderr);
     const baseCwd = options?.cwd ?? process.cwd();
+    const env = options?.env ?? process.env;
+    const prompts = options?.prompts ?? createClackPromptHost();
+    const installDeps = options?.installDeps ?? createPackageInstallRunner({ env });
     try {
         const { command, subcommand, flags, cwd } = parseArgv(argv, baseCwd);
+        const interactive = options?.interactive ??
+            (canUseInteractiveUi(env) && !flags.yes && !flags.help && !flags.version);
         if (flags.version) {
             log.info(VERSION);
             return ExitCode.Success;
         }
-        if (command === undefined || command === "help" || flags.help) {
-            log.info(command !== undefined && command !== "help"
-                ? printCommandHelp(command)
-                : HELP);
+        if (flags.help) {
+            log.info(command !== undefined ? printCommandHelp(command) : HELP);
             return ExitCode.Success;
         }
-        const projectRoot = findProjectRoot(cwd);
-        const env = options?.env ?? process.env;
-        switch (command) {
-            case "init": {
-                const framework = flags.framework;
-                if (framework !== undefined &&
-                    framework !== "astro" &&
-                    framework !== "vite" &&
-                    framework !== "static" &&
-                    framework !== "next") {
-                    log.error('--framework must be "astro", "vite", "next", or "static".');
-                    return ExitCode.Usage;
-                }
-                return runInit({
-                    projectRoot,
-                    ...(framework !== undefined ? { framework } : {}),
-                    force: flags.force,
-                    withEditor: flags.withEditor,
-                    withFunctions: flags.withFunctions,
-                    dryRun: flags.dryRun,
-                    yes: flags.yes,
-                }, log);
+        if (command === "help") {
+            log.info(HELP);
+            return ExitCode.Success;
+        }
+        if (command === undefined) {
+            if (!interactive) {
+                log.info(HELP);
+                return ExitCode.Success;
             }
-            case "validate": {
-                const project = await loadProject(projectRoot);
-                return (await runValidate(project, log)).code;
+            const action = await runMainMenu(prompts, log);
+            if (action === "cancelled" || action === "exit") {
+                return ExitCode.Success;
             }
-            case "build": {
-                const project = await loadProject(projectRoot);
-                return runBuild(project, log);
+            if (action === "help") {
+                log.info(HELP);
+                return ExitCode.Success;
             }
-            case "doctor":
-                return runDoctor(projectRoot, log);
-            case "status":
-                return runStatus(projectRoot, log);
-            case "dev":
-                return runDev(projectRoot, log);
-            case "import": {
-                if (flags.collection === undefined || flags.file === undefined) {
-                    log.error("import requires --collection and --file.");
-                    return ExitCode.Usage;
-                }
-                return runImport({
-                    projectRoot,
-                    collection: flags.collection,
-                    file: flags.file,
-                    dryRun: flags.dryRun,
-                    force: flags.force,
-                }, log);
+            return await dispatchCommand(action, {
+                projectRoot: findProjectRoot(cwd),
+                flags: {
+                    ...flags,
+                    yes: false,
+                },
+                env,
+                log,
+                interactive: true,
+                prompts,
+                installDeps,
+                ...(options !== undefined ? { options } : {}),
+            });
+        }
+        const projectRoot = findProjectRoot(cwd);
+        return await dispatchCommand(command, {
+            projectRoot,
+            ...(subcommand !== undefined ? { subcommand } : {}),
+            flags,
+            env,
+            log,
+            interactive: interactive && !flags.yes,
+            prompts,
+            installDeps,
+            ...(options !== undefined ? { options } : {}),
+        });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        log.error(message);
+        if (/Unknown option|Unexpected argument|requires a directory|--framework requires/i.test(message)) {
+            return ExitCode.Usage;
+        }
+        if (/contentrail\.config\.json|Invalid contentrail|collections module|escapes the project/i.test(message)) {
+            return ExitCode.Config;
+        }
+        return ExitCode.Failure;
+    }
+}
+async function dispatchCommand(command, ctx) {
+    const { projectRoot, subcommand, flags, env, log, interactive, prompts, installDeps, options, } = ctx;
+    switch (command) {
+        case "setup":
+        case "init": {
+            const framework = flags.framework;
+            if (framework !== undefined &&
+                framework !== "astro" &&
+                framework !== "vite" &&
+                framework !== "static" &&
+                framework !== "next") {
+                log.error('--framework must be "astro", "vite", "next", or "static".');
+                return ExitCode.Usage;
             }
-            case "publish": {
-                if (flags.collection === undefined) {
-                    log.error("publish requires --collection.");
-                    return ExitCode.Usage;
-                }
-                return runPublish({
-                    projectRoot,
-                    collection: flags.collection,
-                    dryRun: flags.dryRun,
-                    env,
-                    ...(flags.expectedVersion !== undefined
-                        ? {
-                            expectedVersion: flags.expectedVersion === "null"
-                                ? null
-                                : flags.expectedVersion,
-                        }
-                        : {}),
-                    ...(options?.fetchImpl !== undefined
-                        ? { fetchImpl: options.fetchImpl }
-                        : {}),
-                }, log);
+            const useWizard = interactive && (command === "setup" || !flags.yes);
+            return runInit({
+                projectRoot,
+                ...(framework !== undefined ? { framework } : {}),
+                force: flags.force,
+                ...(useWizard && !flags.editorFlagSet
+                    ? {}
+                    : { withEditor: flags.withEditor }),
+                ...(useWizard && !flags.functionsFlagSet
+                    ? {}
+                    : { withFunctions: flags.withFunctions }),
+                dryRun: flags.dryRun,
+                yes: flags.yes,
+                install: flags.install,
+                interactive: useWizard,
+                prompts,
+                installDeps,
+            }, log);
+        }
+        case "validate": {
+            const project = await loadProject(projectRoot);
+            return (await runValidate(project, log)).code;
+        }
+        case "build": {
+            const project = await loadProject(projectRoot);
+            return runBuild(project, log);
+        }
+        case "doctor":
+            return runDoctor(projectRoot, log);
+        case "status":
+            return runStatus(projectRoot, log);
+        case "dev":
+            return runDev(projectRoot, log);
+        case "import": {
+            if (flags.collection === undefined || flags.file === undefined) {
+                log.error("import requires --collection and --file.");
+                return ExitCode.Usage;
             }
-            case "connect":
-            case "pages": {
-                if (command === "pages" && subcommand !== "setup") {
-                    log.error("Use `contentrail pages setup` or `contentrail connect`.");
-                    return ExitCode.Usage;
-                }
-                return runConnect({
-                    projectRoot,
-                    dryRun: flags.dryRun,
-                    confirm: flags.confirm,
-                    yes: flags.yes,
-                    env,
-                    ...(flags.accountId !== undefined
-                        ? { accountId: flags.accountId }
-                        : {}),
-                    ...(flags.project !== undefined
-                        ? { projectName: flags.project }
-                        : {}),
-                    ...(options?.fetchImpl !== undefined
-                        ? { fetchImpl: options.fetchImpl }
-                        : {}),
-                    ...(options?.gitRemoteUrl !== undefined
-                        ? { gitRemoteUrl: options.gitRemoteUrl }
-                        : {}),
-                }, log);
+            return runImport({
+                projectRoot,
+                collection: flags.collection,
+                file: flags.file,
+                dryRun: flags.dryRun,
+                force: flags.force,
+            }, log);
+        }
+        case "publish": {
+            if (flags.collection === undefined) {
+                log.error("publish requires --collection.");
+                return ExitCode.Usage;
+            }
+            return runPublish({
+                projectRoot,
+                collection: flags.collection,
+                dryRun: flags.dryRun,
+                env,
+                ...(flags.expectedVersion !== undefined
+                    ? {
+                        expectedVersion: flags.expectedVersion === "null"
+                            ? null
+                            : flags.expectedVersion,
+                    }
+                    : {}),
+                ...(options?.fetchImpl !== undefined
+                    ? { fetchImpl: options.fetchImpl }
+                    : {}),
+            }, log);
+        }
+        case "connect":
+        case "pages": {
+            if (command === "pages" && subcommand !== "setup") {
+                log.error("Use `contentrail pages setup` or `contentrail connect`.");
+                return ExitCode.Usage;
             }
-            case "deploy": {
-                if (subcommand === "status") {
-                    return runDeployStatus({
-                        projectRoot,
-                        env,
-                        ...(flags.accountId !== undefined
-                            ? { accountId: flags.accountId }
-                            : {}),
-                        ...(flags.project !== undefined
-                            ? { projectName: flags.project }
-                            : {}),
-                        ...(options?.fetchImpl !== undefined
-                            ? { fetchImpl: options.fetchImpl }
-                            : {}),
-                    }, log);
-                }
-                if (subcommand !== undefined) {
-                    log.error("Use `contentrail deploy` or `contentrail deploy status`.");
-                    return ExitCode.Usage;
-                }
-                return runDeploy({
+            return runConnect({
+                projectRoot,
+                dryRun: flags.dryRun,
+                confirm: flags.confirm,
+                yes: flags.yes,
+                env,
+                interactive,
+                prompts,
+                ...(flags.accountId !== undefined
+                    ? { accountId: flags.accountId }
+                    : {}),
+                ...(flags.project !== undefined
+                    ? { projectName: flags.project }
+                    : {}),
+                ...(options?.fetchImpl !== undefined
+                    ? { fetchImpl: options.fetchImpl }
+                    : {}),
+                ...(options?.gitRemoteUrl !== undefined
+                    ? { gitRemoteUrl: options.gitRemoteUrl }
+                    : {}),
+            }, log);
+        }
+        case "deploy": {
+            if (subcommand === "status") {
+                return runDeployStatus({
                     projectRoot,
                     env,
-                    skipBuild: flags.skipBuild,
-                    dryRun: flags.dryRun,
                     ...(flags.accountId !== undefined
                         ? { accountId: flags.accountId }
                         : {}),
@@ -284,24 +348,32 @@ export async function runCli(argv, options) {
                         : {}),
                 }, log);
             }
-            case "rollback":
-                log.error('Command "rollback" is not implemented in the CLI. Use the authenticated Worker or Pages API.');
-                return ExitCode.Usage;
-            default:
-                log.error(`Unknown command "${command}". Run contentrail --help.`);
+            if (subcommand !== undefined) {
+                log.error("Use `contentrail deploy` or `contentrail deploy status`.");
                 return ExitCode.Usage;
+            }
+            return runDeploy({
+                projectRoot,
+                env,
+                skipBuild: flags.skipBuild,
+                dryRun: flags.dryRun,
+                ...(flags.accountId !== undefined
+                    ? { accountId: flags.accountId }
+                    : {}),
+                ...(flags.project !== undefined
+                    ? { projectName: flags.project }
+                    : {}),
+                ...(options?.fetchImpl !== undefined
+                    ? { fetchImpl: options.fetchImpl }
+                    : {}),
+            }, log);
         }
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        log.error(message);
-        if (/Unknown option|Unexpected argument|requires a directory|--framework requires/i.test(message)) {
+        case "rollback":
+            log.error('Command "rollback" is not implemented in the CLI. Use the authenticated Worker or Pages API.');
+            return ExitCode.Usage;
+        default:
+            log.error(`Unknown command "${command}". Run contentrail --help.`);
             return ExitCode.Usage;
-        }
-        if (/contentrail\.config\.json|Invalid contentrail|collections module|escapes the project/i.test(message)) {
-            return ExitCode.Config;
-        }
-        return ExitCode.Failure;
     }
 }
 function parseArgv(argv, baseCwd) {
@@ -314,10 +386,13 @@ function parseArgv(argv, baseCwd) {
         force: false,
         withEditor: true,
         withFunctions: true,
+        editorFlagSet: false,
+        functionsFlagSet: false,
         yes: false,
         dryRun: false,
         confirm: false,
         skipBuild: false,
+        install: false,
     };
     const take = (index, flag) => {
         const value = argv[index];
@@ -340,20 +415,28 @@ function parseArgv(argv, baseCwd) {
             flags.force = true;
             continue;
         }
+        if (arg === "--install") {
+            flags.install = true;
+            continue;
+        }
         if (arg === "--with-editor") {
             flags.withEditor = true;
+            flags.editorFlagSet = true;
             continue;
         }
         if (arg === "--with-functions") {
             flags.withFunctions = true;
+            flags.functionsFlagSet = true;
             continue;
         }
         if (arg === "--no-editor") {
             flags.withEditor = false;
+            flags.editorFlagSet = true;
             continue;
         }
         if (arg === "--no-functions") {
             flags.withFunctions = false;
+            flags.functionsFlagSet = true;
             continue;
         }
         if (arg === "--skip-build") {