Refactor git probe helpers (#765)

* refactor: centralize git probe helpers

* fix: satisfy git probe lint

---------

Co-authored-by: homeboy-ci[bot] <266378653+homeboy-ci[bot]@users.noreply.github.com>

Author: chubes4

inc/Support/GitRunner.php

@@ -134,4 +134,63 @@ public static function run( string $path, string $args, int $timeout_seconds = 0
 			'output'  => $result['output'],
 		);
 	}
+
+	/**
+	 * Run a read-only git probe and return trimmed output, or null on failure.
+	 */
+	public static function probe_output( string $path, string $args ): ?string {
+		$result = self::run($path, $args);
+		if ( is_wp_error($result) ) {
+			return null;
+		}
+
+		$output = trim( (string) ( $result['output'] ?? '' ));
+		return '' !== $output ? $output : null;
+	}
+
+	/**
+	 * Get the current branch for a repository.
+	 */
+	public static function current_branch( string $path ): ?string {
+		return self::probe_output($path, 'rev-parse --abbrev-ref HEAD');
+	}
+
+	/**
+	 * Get a configured remote URL for a repository.
+	 */
+	public static function remote_url( string $path, string $remote_name = 'origin' ): ?string {
+		$remote_name = preg_replace('/[^A-Za-z0-9._-]/', '', $remote_name);
+		if ( '' === $remote_name ) {
+			return null;
+		}
+
+		return self::probe_output($path, 'config --get ' . escapeshellarg('remote.' . $remote_name . '.url'));
+	}
+
+	/**
+	 * Get the latest commit summary for a repository.
+	 */
+	public static function latest_commit_summary( string $path ): ?string {
+		return self::probe_output($path, 'log -1 --format="%h %s"');
+	}
+
+	/**
+	 * Count dirty status lines for a repository.
+	 */
+	public static function dirty_count( string $path ): int {
+		$output = self::probe_output($path, 'status --porcelain');
+		if ( null === $output ) {
+			return 0;
+		}
+
+		return count(array_filter(array_map('trim', explode("\n", $output))));
+	}
+
+	/**
+	 * Check whether an exact ref exists.
+	 */
+	public static function ref_exists( string $path, string $ref ): bool {
+		$result = self::run($path, 'show-ref --verify --quiet ' . escapeshellarg($ref));
+		return ! is_wp_error($result);
+	}
 }

inc/Workspace/WorkspaceGitOperations.php

@@ -8,6 +8,7 @@
 namespace DataMachineCode\Workspace;
 
 use DataMachineCode\Support\GitHubRemote;
+use DataMachineCode\Support\GitRunner;
 use DataMachineCode\Support\PathSecurity;
 use DataMachineCode\Support\ProcessRunner;
 
@@ -41,10 +42,6 @@ public function git_status( string $handle ): array|\WP_Error {
 			return $policy_attestation;
 		}
 
-		$branch_result = $this->run_git($repo_path, 'rev-parse --abbrev-ref HEAD');
-		$remote_result = $this->run_git($repo_path, 'config --get remote.origin.url');
-		$latest_result = $this->run_git($repo_path, 'log -1 --format="%h %s"');
-
 		$files = array_filter(array_map('trim', explode("\n", $status_result['output'] ?? '')));
 
 		$response = array(
@@ -53,9 +50,9 @@ public function git_status( string $handle ): array|\WP_Error {
 			'repo'        => $parsed['repo'],
 			'is_worktree' => $parsed['is_worktree'],
 			'path'        => $repo_path,
-			'branch'      => ! is_wp_error($branch_result) ? trim( (string) $branch_result['output']) : null,
-			'remote'      => ! is_wp_error($remote_result) ? trim( (string) $remote_result['output']) : null,
-			'commit'      => ! is_wp_error($latest_result) ? trim( (string) $latest_result['output']) : null,
+			'branch'      => GitRunner::current_branch($repo_path),
+			'remote'      => GitRunner::remote_url($repo_path),
+			'commit'      => GitRunner::latest_commit_summary($repo_path),
 			'dirty'       => count($files),
 			'files'       => array_values($files),
 		);
@@ -1709,14 +1706,7 @@ private function get_workspace_git_policies(): array {
 	 * @return string|null Remote URL or null.
 	 */
 	private function git_get_remote( string $repo_path, string $remote_name = 'origin' ): ?string {
-		$escaped     = escapeshellarg($repo_path);
-		$remote_name = preg_replace('/[^A-Za-z0-9._-]/', '', $remote_name);
-		if ( '' === $remote_name ) {
-			return null;
-		}
-     // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
-		$remote = exec(sprintf('git -C %s config --get %s 2>/dev/null', $escaped, escapeshellarg('remote.' . $remote_name . '.url')));
-		return ( '' !== $remote ) ? $remote : null;
+		return GitRunner::remote_url($repo_path, $remote_name);
 	}
 
 	/**
@@ -1726,9 +1716,6 @@ private function git_get_remote( string $repo_path, string $remote_name = 'origi
 	 * @return string|null Branch name or null.
 	 */
 	private function git_get_branch( string $repo_path ): ?string {
-		$escaped = escapeshellarg($repo_path);
-        // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
-		$branch = exec(sprintf('git -C %s rev-parse --abbrev-ref HEAD 2>/dev/null', $escaped));
-		return ( '' !== $branch ) ? $branch : null;
+		return GitRunner::current_branch($repo_path);
 	}
 }

inc/Workspace/WorkspaceRepositoryLifecycle.php

@@ -688,14 +688,10 @@ public function show_repo( string $handle ): array|\WP_Error {
 			return new \WP_Error('repo_not_found', sprintf('Workspace handle "%s" not found.', $parsed['dir_name']), array( 'status' => 404 ));
 		}
 
-		$escaped = escapeshellarg($repo_path);
-
-     // phpcs:disable WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
-		$branch = trim( (string) exec(sprintf('git -C %s rev-parse --abbrev-ref HEAD 2>/dev/null', $escaped)));
-		$remote = trim( (string) exec(sprintf('git -C %s config --get remote.origin.url 2>/dev/null', $escaped)));
-		$commit = trim( (string) exec(sprintf('git -C %s log -1 --format="%%h %%s" 2>/dev/null', $escaped)));
-		$status = trim( (string) exec(sprintf('git -C %s status --porcelain 2>/dev/null | wc -l', $escaped)));
-     // phpcs:enable
+		$branch = GitRunner::current_branch($repo_path);
+		$remote = GitRunner::remote_url($repo_path);
+		$commit = GitRunner::latest_commit_summary($repo_path);
+		$status = GitRunner::dirty_count($repo_path);
 
 		$result = array(
 			'success'           => true,
@@ -704,10 +700,10 @@ public function show_repo( string $handle ): array|\WP_Error {
 			'is_worktree'       => $parsed['is_worktree'],
 			'is_context'        => null !== $context_policy,
 			'path'              => $repo_path,
-			'branch'            => $branch ? $branch : null,
-			'remote'            => $remote ? $remote : null,
-			'commit'            => $commit ? $commit : null,
-			'dirty'             => (int) $status,
+			'branch'            => $branch,
+			'remote'            => $remote,
+			'commit'            => $commit,
+			'dirty'             => $status,
 			'primary_freshness' => ! $parsed['is_worktree'] ? $this->build_primary_freshness_report($repo_path, $parsed['dir_name']) : null,
 		);
 		if ( null !== $context_policy ) {

inc/Workspace/WorkspaceWorktreeLifecycle.php

@@ -7,6 +7,8 @@
 
 namespace DataMachineCode\Workspace;
 
+use DataMachineCode\Support\GitRunner;
+
 defined('ABSPATH') || exit;
 
 trait WorkspaceWorktreeLifecycle {
@@ -256,12 +258,11 @@ private function worktree_add_locked(
 		}
 
 		// Does the branch already exist locally?
-     // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
-		exec(sprintf('git -C %s show-ref --verify --quiet %s 2>&1', escapeshellarg($primary_path), escapeshellarg('refs/heads/' . $branch)), $_unused, $exists_local);
+		$exists_local   = GitRunner::ref_exists($primary_path, 'refs/heads/' . $branch);
 		$created_branch = false;
 		$resolved_base  = null;
 
-		if ( 0 === $exists_local ) {
+		if ( $exists_local ) {
 			if ( ! $allow_stale && ! $rebase_base && ! $fetch_failed ) {
 				$default_guard = $this->assert_ref_current_with_default_branch($primary_path, $branch, $repo, $branch, 'branch');
 				if ( is_wp_error($default_guard) ) {