feat: expose worktree safety fields for orchestrators (#893)

Author: chubes4

inc/Cli/Commands/WorkspaceCommand.php

@@ -4529,8 +4529,9 @@ private function renderWorktreeResult( string $operation, array $result, array $
 				function ( $wt ) {
 					$skipped = (array) ( $wt['fields_skipped'] ?? array() );
 					$dirty   = $wt['dirty'] ?? null;
+					$unpushed = $wt['unpushed'] ?? null;
 					$size    = $wt['size_bytes'] ?? null;
-					return array(
+					$item = array(
 						'handle'              => $wt['handle'] ?? '',
 						'repo'                => $wt['repo'] ?? '',
 						'kind'                => ! empty($wt['is_primary']) ? 'primary' : 'worktree',
@@ -4562,12 +4563,21 @@ function ( $wt ) {
 						'task_full'           => $wt['task'] ?? null,
 						'path'                => $wt['path'] ?? '',
 					);
+					if ( null !== $dirty && null !== $unpushed ) {
+						$item['safety'] = array(
+							'dirty'    => 0 !== (int) $dirty,
+							'unpushed' => 0 !== (int) $unpushed,
+							'primary'  => ! empty($wt['is_primary']),
+						);
+					}
+
+					return $item;
 				},
 				$worktrees
 				);
 				$fields = array( 'handle', 'repo', 'kind', 'branch', 'head', 'dirty', 'state', 'liveness', 'last_seen_at', 'owner', 'agent', 'session', 'task', 'pr', 'age_days', 'size', 'artifacts', 'stale', 'path' );
 				if ( in_array( (string) ( $assoc_args['format'] ?? '' ), array( 'json', 'yaml' ), true) ) {
-					$fields = array( 'handle', 'repo', 'kind', 'branch', 'head', 'dirty', 'state', 'created_at', 'liveness', 'liveness_reason', 'last_seen_at', 'owner_full', 'session_full', 'task_full', 'pr', 'age_days', 'size_bytes', 'artifact_size_bytes', 'artifact_paths', 'stale', 'fields_skipped', 'metadata', 'path' );
+					$fields = array( 'handle', 'repo', 'kind', 'branch', 'head', 'dirty', 'safety', 'state', 'created_at', 'liveness', 'liveness_reason', 'last_seen_at', 'owner_full', 'session_full', 'task_full', 'pr', 'age_days', 'size_bytes', 'artifact_size_bytes', 'artifact_paths', 'stale', 'fields_skipped', 'metadata', 'path' );
 				}
 				$skipped_global = (array) ( $result['fields_skipped'] ?? array() );
 				if ( ! empty($skipped_global) && ! in_array( (string) ( $assoc_args['format'] ?? '' ), array( 'json', 'yaml', 'csv' ), true) ) {

inc/Workspace/WorkspaceWorktreeLifecycle.php

@@ -847,8 +847,13 @@ public function worktree_list( ?string $repo = null, ?string $state = null, arra
 					$dirty_files  = is_wp_error($dirty_result)
 					? 0
 					: count(array_filter(array_map('trim', explode("\n", $dirty_result['output'] ?? ''))));
+					$unpushed_commits = $this->count_unpushed_commits($wt['path']);
+					if ( is_wp_error($unpushed_commits) ) {
+						return $unpushed_commits;
+					}
 				} else {
-					$dirty_files = null;
+					$dirty_files      = null;
+					$unpushed_commits = null;
 				}
 
 				$metadata_key = null;
@@ -911,6 +916,7 @@ public function worktree_list( ?string $repo = null, ?string $state = null, arra
 						'head'                  => $wt['head'],
 						'path'                  => $wt['path'],
 						'dirty'                 => $dirty_files,
+						'unpushed'              => $unpushed_commits,
 						'created_at'            => $created_at,
 						'lifecycle_state'       => $lifecycle_state,
 						'pr_url'                => is_array($metadata) ? ( $metadata['pr_url'] ?? null ) : null,

tests/worktree-list-orchestrator-safety.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+$root      = dirname(__DIR__);
+$cli_source = file_get_contents($root . '/inc/Cli/Commands/WorkspaceCommand.php');
+$list_source = file_get_contents($root . '/inc/Workspace/WorkspaceWorktreeLifecycle.php');
+
+if ( false === $cli_source || false === $list_source ) {
+	throw new RuntimeException('Unable to read worktree list sources.');
+}
+
+foreach ( array( "'dirty'    => 0 !== (int) \$dirty", "'unpushed' => 0 !== (int) \$unpushed", "'primary'  => ! empty(\$wt['is_primary'])" ) as $expected ) {
+	if ( ! str_contains($cli_source, $expected) ) {
+		throw new RuntimeException(sprintf('Worktree list safety mapping is missing %s.', $expected));
+	}
+}
+
+if ( ! str_contains($list_source, '$unpushed_commits = $this->count_unpushed_commits($wt[\'path\']);') ) {
+	throw new RuntimeException('Status-enabled worktree listings must reuse the unpushed commit probe.');
+}
+
+echo "worktree-list-orchestrator-safety: ok\n";