Merge branch 'release/0.8.73'

Author: ljonesfl

.version.json

@@ -2,6 +2,6 @@
   "strategy": "semver",
   "major": 0,
   "minor": 8,
-  "patch": 72,
+  "patch": 73,
   "build": 0
 }

src/Cms/Cli/Commands/Install/UpgradeCommand.php

@@ -52,6 +52,7 @@ public function configure(): void
 		$this->addOption( 'migrations-only', 'm', false, 'Only copy new migrations' );
 		$this->addOption( 'skip-views', null, false, 'Skip updating view files' );
 		$this->addOption( 'force-views', null, false, 'Overwrite existing view files with package versions (destroys local view customizations)' );
+		$this->addOption( 'prompt-views', null, false, 'Prompt before overwriting each view that is newer in the package and differs from the local copy' );
 		$this->addOption( 'skip-migrations', null, false, 'Skip copying migrations' );
 		$this->addOption( 'run-migrations', 'r', false, 'Run migrations automatically after copying' );
 	}
@@ -84,10 +85,12 @@ public function execute( array $parameters = [] ): int
 		// Check for updates
 		$hasUpdates = $this->checkForUpdates();
 
-		// --force-views always has work to do (it re-publishes package views).
-		$forceViews = (bool) $this->input->getOption( 'force-views' );
+		// --force-views / --prompt-views always have potential work to do: they
+		// re-examine published views even when the manifest version is unchanged.
+		$forceViews  = (bool) $this->input->getOption( 'force-views' );
+		$promptViews = (bool) $this->input->getOption( 'prompt-views' );
 
-		if( !$hasUpdates && !$forceViews )
+		if( !$hasUpdates && !$forceViews && !$promptViews )
 		{
 			$this->output->success( "✓ CMS is already up to date!" );
 			return 0;
@@ -97,6 +100,10 @@ public function execute( array $parameters = [] ): int
 		{
 			$this->output->writeln( "  ⚠️  --force-views: existing view files will be overwritten with package versions" );
 		}
+		elseif( $promptViews )
+		{
+			$this->output->writeln( "  ℹ️  --prompt-views: you will be asked before overwriting each changed view" );
+		}
 
 		// If --check flag, exit after displaying what would be updated
 		if( $this->input->getOption( 'check' ) )
@@ -486,6 +493,29 @@ private function updateViews(): bool
 		}
 
 		$force  = (bool) $this->input->getOption( 'force-views' );
+		$prompt = (bool) $this->input->getOption( 'prompt-views' );
+
+		// Interactive merge: add new views, and ask per file for views that are
+		// newer in the package and differ from the local copy.
+		if( $prompt && !$force )
+		{
+			$copied = $this->copyViewsInteractive( $viewSource, $viewDest );
+
+			if( $copied > 0 )
+			{
+				$this->output->writeln( "\n  Copied $copied view file" . ( $copied !== 1 ? 's' : '' ) );
+			}
+			else
+			{
+				$this->output->writeln( "  No view files copied" );
+			}
+
+			$this->output->writeln( "  ℹ️  Unchanged and declined views were left as-is" );
+			$this->output->writeln( "  Package views location: " . $viewSource . "/" );
+
+			return true;
+		}
+
 		$copied = $this->copyNewViews( $viewSource, $viewDest, $force );
 
 		if( $copied > 0 )
@@ -583,6 +613,120 @@ private function copyNewViews( string $source, string $dest, bool $force = false
 		return $copied;
 	}
 
+	/**
+	 * Recursively copy views, prompting before overwriting changed files.
+	 *
+	 * Missing views are added automatically. An existing view is only offered
+	 * for overwrite when the package copy is newer (by modification time) AND
+	 * its contents differ from the local copy, so identical or locally-newer
+	 * files are skipped without noise.
+	 *
+	 * @param string $source Source directory
+	 * @param string $dest Destination directory
+	 * @return int Number of files copied
+	 */
+	private function copyViewsInteractive( string $source, string $dest ): int
+	{
+		$items = scandir( $source );
+
+		if( $items === false )
+		{
+			return 0;
+		}
+
+		$copied = 0;
+
+		foreach( $items as $item )
+		{
+			if( $item === '.' || $item === '..' )
+			{
+				continue;
+			}
+
+			$sourcePath = $source . '/' . $item;
+			$destPath   = $dest . '/' . $item;
+
+			if( is_dir( $sourcePath ) )
+			{
+				$copied += $this->copyViewsInteractive( $sourcePath, $destPath );
+				continue;
+			}
+
+			$relative = ltrim( str_replace( $this->_projectPath, '', $destPath ), '/' );
+
+			// New view: add without prompting.
+			if( !file_exists( $destPath ) )
+			{
+				if( $this->copyViewFile( $sourcePath, $destPath ) )
+				{
+					$this->output->writeln( "  ✓ Added: $relative" );
+					$this->_messages[] = "Added view: $relative";
+					$copied++;
+				}
+
+				continue;
+			}
+
+			// Only consider views the package updated more recently.
+			if( filemtime( $sourcePath ) <= filemtime( $destPath ) )
+			{
+				continue;
+			}
+
+			// Skip when contents are identical despite the newer timestamp.
+			if( md5_file( $sourcePath ) === md5_file( $destPath ) )
+			{
+				continue;
+			}
+
+			$packageDate = date( 'Y-m-d H:i', (int) filemtime( $sourcePath ) );
+			$localDate   = date( 'Y-m-d H:i', (int) filemtime( $destPath ) );
+
+			$this->output->writeln( "  • $relative (package $packageDate is newer than local $localDate)" );
+
+			if( !$this->confirm( "    Overwrite this view?", false ) )
+			{
+				$this->output->writeln( "  – Skipped: $relative" );
+				continue;
+			}
+
+			if( $this->copyViewFile( $sourcePath, $destPath ) )
+			{
+				$this->output->writeln( "  ✓ Updated: $relative" );
+				$this->_messages[] = "Updated view: $relative";
+				$copied++;
+			}
+		}
+
+		return $copied;
+	}
+
+	/**
+	 * Copy a single view file, creating the destination directory as needed.
+	 *
+	 * @param string $source Source file
+	 * @param string $dest Destination file
+	 * @return bool
+	 */
+	private function copyViewFile( string $source, string $dest ): bool
+	{
+		$destDir = dirname( $dest );
+
+		if( !is_dir( $destDir ) && !mkdir( $destDir, 0755, true ) && !is_dir( $destDir ) )
+		{
+			$this->output->error( "  ✗ Failed to create directory: $destDir" );
+			return false;
+		}
+
+		if( !copy( $source, $dest ) )
+		{
+			$this->output->error( "  ✗ Failed to copy: $dest" );
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * Scaffold the scheduled jobs configuration.
 	 *

tests/Unit/Cms/Cli/Commands/Install/UpgradeCommandTest.php

@@ -161,6 +161,77 @@ public function testCopyNewViewsForceOverwritesExistingFiles(): void
 		}
 	}
 
+	public function testCopyViewsInteractiveOnlyPromptsForNewerChangedViews(): void
+	{
+		$base   = sys_get_temp_dir() . '/neuron_cms_views_prompt_' . uniqid();
+		$source = $base . '/source';
+		$dest   = $base . '/dest';
+
+		$old = time() - 1000;
+		$mid = time() - 500;
+		$new = time();
+
+		// a_new: only in the package -> added automatically (no prompt).
+		$this->writeFile( $source . '/admin/a_new.php', 'PKG_A' );
+
+		// b_changed: differs and package is newer -> prompt (answered yes).
+		$this->writeFile( $dest . '/admin/b_changed.php', 'LOCAL_B' );
+		$this->writeFile( $source . '/admin/b_changed.php', 'PKG_B' );
+
+		// c_changed: differs and package is newer -> prompt (answered no).
+		$this->writeFile( $dest . '/admin/c_changed.php', 'LOCAL_C' );
+		$this->writeFile( $source . '/admin/c_changed.php', 'PKG_C' );
+
+		// d_same: identical contents though package is newer -> no prompt.
+		$this->writeFile( $dest . '/admin/d_same.php', 'SAME' );
+		$this->writeFile( $source . '/admin/d_same.php', 'SAME' );
+
+		// e_older: differs but package is older -> no prompt.
+		$this->writeFile( $dest . '/admin/e_older.php', 'LOCAL_E' );
+		$this->writeFile( $source . '/admin/e_older.php', 'PKG_E' );
+
+		// Local copies share a baseline mtime; package copies are newer except e.
+		touch( $dest . '/admin/b_changed.php', $old );
+		touch( $dest . '/admin/c_changed.php', $old );
+		touch( $dest . '/admin/d_same.php', $old );
+		touch( $dest . '/admin/e_older.php', $mid );
+
+		touch( $source . '/admin/b_changed.php', $new );
+		touch( $source . '/admin/c_changed.php', $new );
+		touch( $source . '/admin/d_same.php', $new );
+		touch( $source . '/admin/e_older.php', $old );
+
+		// Prompts occur in scandir (alphabetical) order: b then c.
+		$this->inputReader->addResponse( 'y' );
+		$this->inputReader->addResponse( 'n' );
+
+		try {
+			$reflection = new \ReflectionClass( $this->command );
+			$method = $reflection->getMethod( 'copyViewsInteractive' );
+
+			$copied = $method->invoke( $this->command, $source, $dest );
+
+			// Only the added view and the accepted overwrite were copied.
+			$this->assertEquals( 2, $copied );
+
+			// New view added.
+			$this->assertEquals( 'PKG_A', file_get_contents( $dest . '/admin/a_new.php' ) );
+
+			// Accepted overwrite applied; declined one preserved.
+			$this->assertEquals( 'PKG_B', file_get_contents( $dest . '/admin/b_changed.php' ) );
+			$this->assertEquals( 'LOCAL_C', file_get_contents( $dest . '/admin/c_changed.php' ) );
+
+			// Identical and older-package views untouched and never prompted.
+			$this->assertEquals( 'SAME', file_get_contents( $dest . '/admin/d_same.php' ) );
+			$this->assertEquals( 'LOCAL_E', file_get_contents( $dest . '/admin/e_older.php' ) );
+
+			// Exactly two prompts were shown (b and c).
+			$this->assertCount( 2, $this->inputReader->getPromptHistory() );
+		} finally {
+			$this->removeDirectory( $base );
+		}
+	}
+
 	public function testScaffoldScheduleConfigCreatesWhenMissingAndPreservesExisting(): void
 	{
 		$base    = sys_get_temp_dir() . '/neuron_cms_schedule_' . uniqid();

versionlog.md

@@ -1,3 +1,5 @@
+## 0.8.73 2026-06-19
+
 ## 0.8.72 2026-06-19
 
 * Added repeating events.