Merge pull request #827 from Extra-Chill/fix/issue-821-cleanup-metadata-output

Fix cleanup metadata compact samples

Author: chubes4

inc/Cli/WorkspaceCompactOutput.php

@@ -15,8 +15,10 @@ class WorkspaceCompactOutput {
 
 	public static function cleanup_result( array $result ): array {
 		$summary    = (array) ( $result['summary'] ?? array() );
-		$candidates = (array) ( $result['candidates'] ?? $result['artifact_candidates'] ?? $result['worktree_candidates'] ?? $result['rows'] ?? $result['planned'] ?? array() );
-		$removed    = (array) ( $result['removed'] ?? $result['removed_worktrees'] ?? $result['removed_artifacts'] ?? $result['written'] ?? array() );
+		$candidates = (array) ( $result['candidates'] ?? $result['artifact_candidates'] ?? $result['worktree_candidates'] ?? $result['rows'] ?? array() );
+		$planned    = (array) ( $result['planned'] ?? array() );
+		$written    = (array) ( $result['written'] ?? array() );
+		$removed    = (array) ( $result['removed'] ?? $result['removed_worktrees'] ?? $result['removed_artifacts'] ?? array() );
 		$skipped    = (array) ( $result['skipped'] ?? array() );
 
 		return self::filter_empty(
@@ -33,6 +35,8 @@ public static function cleanup_result( array $result ): array {
 				'bytes'            => self::byte_summary( $summary ),
 				'samples'          => array(
 					'candidates' => self::compact_rows( $candidates ),
+					'planned'    => self::compact_rows( $planned ),
+					'written'    => self::compact_rows( $written ),
 					'removed'    => self::compact_rows( $removed ),
 					'skipped'    => self::compact_rows( $skipped ),
 				),

tests/workspace-compact-output.php

@@ -121,6 +121,9 @@ function compact_output_large_rows( int $count ): array {
 compact_output_assert(! isset($active_apply['written']), 'Compact active/no-signal apply must omit full written array.');
 compact_output_assert(40 === ( $active_apply['row_counts']['planned'] ?? null ), 'Compact active/no-signal apply must preserve planned count.');
 compact_output_assert(40 === ( $active_apply['row_counts']['written'] ?? null ), 'Compact active/no-signal apply must preserve written count.');
+compact_output_assert(count((array) ( $active_apply['samples']['planned'] ?? array() )) <= 5, 'Compact active/no-signal apply must sample planned metadata rows.');
+compact_output_assert(count((array) ( $active_apply['samples']['written'] ?? array() )) <= 5, 'Compact active/no-signal apply must sample written metadata rows.');
+compact_output_assert(empty($active_apply['samples']['removed'] ?? array()), 'Compact active/no-signal apply must not label written metadata rows as removed samples.');
 compact_output_assert(40 === ( $active_apply['blockers']['not_remote_tracking_clean']['count'] ?? null ), 'Compact active/no-signal apply must preserve blocker counts from summary.');
 compact_output_assert(in_array('studio wp datamachine-code workspace worktree active-no-signal-remote-clean-apply --dry-run --limit=40 --offset=40 --format=json', (array) ( $active_apply['next_commands'] ?? array() ), true), 'Compact active/no-signal apply must expose next page command.');