fix(cli): fixed --non-interactive flag (#3666)

Author: pavelgj

genkit-tools/cli/src/cli.ts

@@ -69,9 +69,11 @@ export async function startCLI(): Promise<void> {
     .description('Genkit CLI')
     .version(version)
     .option('--no-update-notification', 'Do not show update notification')
-    .hook('preAction', async (_, actionCommand) => {
-      await notifyAnalyticsIfFirstRun();
-
+    .option(
+      '--non-interactive',
+      'Run in non-interactive mode. All interactions will use the default choice.'
+    )
+    .hook('preAction', async (command, actionCommand) => {
       // For now only record known command names, to avoid tools plugins causing
       // arbitrary text to get recorded. Once we launch tools plugins, we'll have
       // to give this more thought
@@ -87,6 +89,14 @@ export async function startCLI(): Promise<void> {
       } else {
         commandName = 'unknown';
       }
+
+      if (
+        !process.argv.includes('--non-interactive') &&
+        commandName !== 'config'
+      ) {
+        await notifyAnalyticsIfFirstRun();
+      }
+
       const { isCompiledBinary } = detectCLIRuntime();
       await record(
         new RunCommandEvent(commandName, isCompiledBinary ? 'binary' : 'node')

genkit-tools/common/src/utils/analytics.ts

@@ -120,7 +120,7 @@ export async function record(event: GAEvent): Promise<void> {
 
 /** Displays a notification that analytics are in use. */
 export async function notifyAnalyticsIfFirstRun(): Promise<void> {
-  if (!isAnalyticsEnabled()) return;
+  if (isAnalyticsOptedOut()) return;
 
   if (configstore.get(NOTIFICATION_ACKED)) {
     return;
@@ -132,7 +132,7 @@ export async function notifyAnalyticsIfFirstRun(): Promise<void> {
     input: process.stdin,
     output: process.stdout,
   });
-  await readline.question('Press "Enter" to continue');
+  await readline.question('Press "Enter" to acknowledge and continue');
   readline.close();
 
   configstore.set(NOTIFICATION_ACKED, true);
@@ -169,7 +169,12 @@ const ANALYTICS_NOTIFICATION =
   'Genkit CLI and Developer UI use cookies and ' +
   'similar technologies from Google\nto deliver and enhance the quality of its ' +
   'services and to analyze usage.\n' +
-  'Learn more at https://policies.google.com/technologies/cookies';
+  'Learn more at https://policies.google.com/technologies/cookies\n' +
+  '\n' +
+  'If running in non-interactive environments set --non-interactive flag. Ex:\n' +
+  '  genkit start --non-interactive -- <cmd>\n' +
+  'To opt out of analytics run:\n' +
+  '  genkit config set analyticsOptOut true\n';
 const NOTIFICATION_ACKED = 'analytics_notification';
 const CONFIGSTORE_CLIENT_KEY = 'genkit-tools-ga-id';
 
@@ -217,14 +222,16 @@ function isValidateOnly(): boolean {
   return !!process.env['GENKIT_GA_VALIDATE'];
 }
 
-// For now, this is default false unless GENKIT_GA_DEBUG or GENKIT_GA_VALIDATE
-// are set. Once we have opt-out and we're ready for public preview this will
-// get updated.
+function isAnalyticsAcknowledged(): boolean {
+  return configstore.get(NOTIFICATION_ACKED) === true;
+}
+
+function isAnalyticsOptedOut(): boolean {
+  return getUserSettings()[ANALYTICS_OPT_OUT_CONFIG_TAG] === true;
+}
+
 function isAnalyticsEnabled(): boolean {
-  return (
-    !process.argv.includes('--non-interactive') &&
-    !getUserSettings()[ANALYTICS_OPT_OUT_CONFIG_TAG]
-  );
+  return isAnalyticsAcknowledged() && !isAnalyticsOptedOut();
 }
 
 async function recordInternal(