@sonarsource/marketing-cli 1.0.0 → 1.1.0

package/README.md

@@ -171,6 +171,10 @@ Clone a Kontent.ai environment for the current branch.
 
 Migrate the source environment, delete the clone, and clean up Netlify vars and status.
 
+### `marketing environment verify`
+
+Check whether the current branch's Kontent environment has been properly finished before merging. Local-only — no credentials required. In CI, use `npx marketing environment verify --ci`.
+
 ### `marketing migration create <name>`
 
 Scaffold a new timestamp-ordered TypeScript migration in `Migrations/`.

package/dist/cli.js

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
 import { readFileSync } from 'node:fs';
-import { environmentCreate, environmentFinish } from './commands/environment.js';
+import { environmentCreate, environmentFinish, environmentVerify } from './commands/environment.js';
 import { init } from './commands/init.js';
 import { migrationCreate, migrationRun } from './commands/migration.js';
 import { setup } from './commands/setup.js';
@@ -98,5 +98,13 @@ export function buildProgram() {
         const globalOpts = program.opts();
         await environmentFinish(globalOpts);
     }));
+    environment
+        .command('verify')
+        .description('Check that the current branch is safe to merge (no unfinished environments).')
+        .option('--ci', 'Force CI mode (accepted for symmetry; verify never prompts)')
+        .action(wrapAction(async () => {
+        const globalOpts = program.opts();
+        await environmentVerify(globalOpts);
+    }));
     return program;
 }

package/dist/commands/environment.d.ts

@@ -11,6 +11,9 @@ export interface EnvironmentFinishOptions {
     ci?: boolean;
     yes?: boolean;
 }
+export interface EnvironmentVerifyOptions {
+    branch?: string;
+}
 interface ResolvedSource {
     environmentId: string;
     isProduction: boolean;
@@ -33,4 +36,5 @@ export declare function slugifyBranch(branch: string): string;
 export declare function resolveSourceEnvironment(branch: string, config: MarketingConfig): ResolvedSource;
 export declare function environmentCreate(opts: EnvironmentCreateOptions): Promise<void>;
 export declare function environmentFinish(opts: EnvironmentFinishOptions): Promise<void>;
+export declare function environmentVerify(opts: EnvironmentVerifyOptions): Promise<void>;
 export {};

package/dist/commands/environment.js

@@ -395,6 +395,40 @@ export async function environmentFinish(opts) {
     console.log(`\nEnvironment finished for branch "${branch}".`);
 }
 // ---------------------------------------------------------------------------
+// environment verify
+// ---------------------------------------------------------------------------
+export async function environmentVerify(opts) {
+    const cwd = process.cwd();
+    const config = loadConfig(cwd);
+    const branch = requireBranch(opts);
+    const llb = config.kontent.longLivedBranches;
+    // --- Active-children check ---
+    const llbEntry = llb[branch];
+    if (llbEntry && llbEntry.children.length > 0) {
+        throw new CliError(`Long-lived branch "${branch}" still has children registered in config:\n` +
+            llbEntry.children.map((c) => `  \u2022 ${c}`).join('\n') +
+            `\nFinish and merge those branches (or remove them from config) before merging "${branch}".`);
+    }
+    // --- Build expected environment set ---
+    const status = loadStatusJson(cwd);
+    const statusKeys = Object.keys(status);
+    const expectedSet = new Set();
+    expectedSet.add(config.kontent.productionEnvironmentId);
+    for (const [llbBranch, entry] of Object.entries(llb)) {
+        if (llbBranch !== branch && entry.environmentId) {
+            expectedSet.add(entry.environmentId);
+        }
+    }
+    // --- Check for unexpected environments ---
+    const unexpected = statusKeys.filter((key) => !expectedSet.has(key));
+    if (unexpected.length > 0) {
+        throw new CliError(`Branch "${branch}" has an unfinished environment.\n` +
+            `Unexpected environments in Migrations/status.json:\n` +
+            unexpected.map((id) => `  \u2022 ${id}`).join('\n') +
+            `\nRun \`marketing environment finish\` before merging.`);
+    }
+}
+// ---------------------------------------------------------------------------
 // Utilities
 // ---------------------------------------------------------------------------
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarsource/marketing-cli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "license": "MIT",
   "type": "module",
   "bin": {