Refactor ACUL scaffolding and error messages

Author: ramya18101

internal/cli/acul_app_scaffolding.go

@@ -111,8 +111,7 @@ func getLatestReleaseTag() (string, error) {
 		return "", fmt.Errorf("no tags found in repository")
 	}
 
-	// TODO: return tags[0].Name, nil.
-	return "main", nil
+	return tags[0].Name, nil
 }
 
 var (
@@ -343,13 +342,12 @@ func getDestDir(args []string) string {
 }
 
 func downloadAndUnzipSampleRepo() (string, error) {
-	_, err := getLatestReleaseTag()
+	latestTag, err := getLatestReleaseTag()
 	if err != nil {
 		return "", fmt.Errorf("failed to get latest release tag: %w", err)
 	}
 
-	// TODO: repoURL := fmt.Sprintf("https://github.com/auth0-samples/auth0-acul-samples/archive/refs/tags/%s.zip", latestTag).
-	repoURL := "https://github.com/auth0-samples/auth0-acul-samples/archive/refs/heads/main.zip"
+	repoURL := fmt.Sprintf("https://github.com/auth0-samples/auth0-acul-samples/archive/refs/tags/%s.zip", latestTag)
 	tempZipFile, err := downloadFile(repoURL)
 	if err != nil {
 		return "", fmt.Errorf("error downloading sample repo: %w", err)

internal/cli/acul_dev.go

@@ -611,7 +611,8 @@ func applyPromptRenderings(ctx context.Context, cli *cli, screenTagMap map[strin
 				cli.renderer.Errorf("%s batch %d-%d failed: %v", debugPrefix, i+1, end, err)
 				cli.renderer.Infof("%s rollback starting for screens 1-%d...", debugPrefix, i)
 			} else {
-				cli.renderer.Errorf("patch failed; rolling back...")
+				// Removed the redundant log: cli.renderer.Errorf("patch failed; rolling back...").
+				cli.renderer.Warnf("Patch failed. Attempting rollback...")
 			}
 
 			// Rollback all fully-applied previous batches.
@@ -625,7 +626,7 @@ func applyPromptRenderings(ctx context.Context, cli *cli, screenTagMap map[strin
 					if cli.debug {
 						cli.renderer.Warnf("%s rollback failed for screens %d-%d: %v", debugPrefix, r+1, rEnd, rbErr)
 					} else {
-						cli.renderer.Warnf("rollback failed")
+						cli.renderer.Warnf("Partial rollback failed for screens %d-%d.", r+1, rEnd)
 					}
 				} else {
 					if cli.debug {
@@ -634,7 +635,7 @@ func applyPromptRenderings(ctx context.Context, cli *cli, screenTagMap map[strin
 				}
 			}
 
-			cli.renderer.Infof("rolled back for all screens")
+			cli.renderer.Infof("Rollback complete for all applied batches.")
 
 			if cli.debug {
 				return fmt.Errorf("%s update failed at batch %d-%d: %w", debugPrefix, i+1, end, err)
@@ -650,12 +651,12 @@ func applyPromptRenderings(ctx context.Context, cli *cli, screenTagMap map[strin
 func watchAndPatch(ctx context.Context, cli *cli, assetsURL, distPath string, screensToWatch []string, originalHeadTags map[string][]interface{}) error {
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
-		return fmt.Errorf("failed to create watcher: %w", err)
+		return fmt.Errorf("failed to create file system watcher: %w", err)
 	}
 	defer watcher.Close()
 
 	if err := watcher.Add(distPath); err != nil {
-		return fmt.Errorf("failed to watch %s: %w", distPath, err)
+		return fmt.Errorf("failed to watch distribution path %s: %w", distPath, err)
 	}
 
 	fmt.Println("👀  Watching: " + ansi.Yellow(strings.Join(screensToWatch, ", ")))
@@ -677,25 +678,26 @@ func watchAndPatch(ctx context.Context, cli *cli, assetsURL, distPath string, sc
 		time.Sleep(1 * time.Second)
 		fmt.Fprintln(os.Stderr, ansi.Yellow("\nShutting down ACUL connected mode..."))
 		if len(originalHeadTags) > 0 {
-			restore := prompt.Confirm(
-				"Would you like to restore your original rendering settings?",
-			)
+			restore := prompt.Confirm("Would you like to restore your original rendering settings?")
 
 			if restore {
-				fmt.Fprintln(os.Stdout, ansi.Cyan("Restoring original rendering settings..."))
+				fmt.Fprintln(os.Stderr, ansi.Cyan("Restoring original rendering settings..."))
 
 				if err := applyPromptRenderings(ctx, cli, originalHeadTags, "Restoring"); err != nil {
-					fmt.Fprintln(os.Stdout, ansi.Yellow(fmt.Sprintf("Failed to restore previous settings: %v", err)))
+					fmt.Fprintln(os.Stderr, ansi.Yellow(fmt.Sprintf("Restoration failed: %v", err)))
 				} else {
-					fmt.Fprintln(os.Stdout, ansi.Green(fmt.Sprintf("Successfully restored rendering settings for %d screen(s).", len(originalHeadTags))))
+					fmt.Fprintln(os.Stderr, ansi.Green(fmt.Sprintf("Successfully restored rendering settings for %d screen(s).", len(originalHeadTags))))
 				}
 			} else {
-				fmt.Fprintln(os.Stdout, ansi.Yellow("Restoration skipped. The patched assets will continue to remain active in your Auth0 tenant."))
+				fmt.Fprintln(os.Stderr, ansi.Yellow("Restoration skipped. The patched assets will continue to remain active in your Auth0 tenant."))
 			}
 		}
 
 		fmt.Println()
-		fmt.Fprintln(os.Stdout, ansi.Green("👋 ACUL connected mode stopped."))
+		fmt.Fprintln(os.Stderr, ansi.Green("👋 ACUL connected mode stopped."))
+
+		fmt.Fprintf(os.Stderr, "%s  Use %s to see all available commands\n\n",
+			ansi.Yellow("💡 Tip:"), ansi.Cyan("auth0 acul --help"))
 	}
 
 	for {
@@ -725,7 +727,7 @@ func watchAndPatch(ctx context.Context, cli *cli, assetsURL, distPath string, sc
 				headTags, err := buildHeadTagsFromDirs(distPath, assetsURL, screen)
 				if err != nil {
 					if cli.debug {
-						cli.renderer.Warnf(ansi.Yellow(fmt.Sprintf("Skipping '%s': %v", screen, err)))
+						cli.renderer.Warnf(ansi.Yellow(fmt.Sprintf("Skipping '%s': failed to build head tags: %v", screen, err)))
 					}
 					continue
 				}
@@ -742,7 +744,7 @@ func watchAndPatch(ctx context.Context, cli *cli, assetsURL, distPath string, sc
 
 			if len(changedScreens) == 0 {
 				if cli.debug {
-					fmt.Println(ansi.Yellow("No effective asset changes detected and skipping patch."))
+					fmt.Println(ansi.Yellow("No effective asset changes detected, skipping patch."))
 				}
 				continue
 			}
@@ -755,7 +757,7 @@ func watchAndPatch(ctx context.Context, cli *cli, assetsURL, distPath string, sc
 			}
 
 			if err = applyPromptRenderings(ctx, cli, newHeadTags, "Patching"); err != nil {
-				cli.renderer.Errorf("Patch failed: %v", err)
+				cli.renderer.Errorf("Patching assets failed: %v", err)
 			} else {
 				fmt.Println(ansi.Green("✅ Assets patched successfully!"))
 				for screen, headTags := range newHeadTags {
@@ -764,16 +766,14 @@ func watchAndPatch(ctx context.Context, cli *cli, assetsURL, distPath string, sc
 			}
 
 		case err := <-watcher.Errors:
-			cli.renderer.Warnf("Watcher error: %v", err)
+			cli.renderer.Warnf("File watcher internal error: %v", err)
 
 		case <-sigChan:
 			cleanup()
-			printAvailableCommands()
 			return nil
 
 		case <-ctx.Done():
 			cleanup()
-			printAvailableCommands()
 			return ctx.Err()
 		}
 	}

internal/cli/acul_screen_scaffolding.go

@@ -171,8 +171,13 @@ func addScreensToProject(cli *cli, destDir, chosenTemplate string, selectedScree
 	}
 	defer os.RemoveAll(tempUnzipDir) // Clean up the entire temp directory.
 
-	var sourcePrefix = "auth0-acul-samples-main/" + chosenTemplate
-	var sourceRoot = filepath.Join(tempUnzipDir, sourcePrefix)
+	extractedDir, err := findExtractedRepoDir(tempUnzipDir)
+	if err != nil {
+		return fmt.Errorf("failed to find extracted directory: %w", err)
+	}
+
+	sourcePathPrefix := filepath.Join(extractedDir, chosenTemplate)
+	var sourceRoot = filepath.Join(tempUnzipDir, sourcePathPrefix)
 	var destRoot = destDir
 
 	missingFiles, editedFiles, err := processFiles(cli, selectedTemplate.BaseFiles, sourceRoot, destRoot)
@@ -196,7 +201,7 @@ func addScreensToProject(cli *cli, destDir, chosenTemplate string, selectedScree
 		return fmt.Errorf("error during backup/overwrite: %w", err)
 	}
 
-	err = handleMissingFiles(cli, missingFiles, tempUnzipDir, sourcePrefix, destDir)
+	err = handleMissingFiles(cli, missingFiles, tempUnzipDir, sourcePathPrefix, destDir)
 	if err != nil {
 		return fmt.Errorf("error copying missing files: %w", err)
 	}