Merge pull request #702 from Extra-Chill/fix/issue-699-worktree-remove-timeout

Make cleanup worktree removal timeout resumable

Author: chubes4

inc/Abilities/WorkspaceAbilities.php

@@ -2288,6 +2288,10 @@ private function registerAbilities(): void {
 								'type'        => 'boolean',
 								'description' => 'Schedule each candidate as a single-row worktree_cleanup_chunk job for resumable async apply.',
 							),
+							'remove_timeout'            => array(
+								'type'        => 'integer',
+								'description' => 'Timeout in seconds for destructive git worktree remove calls during apply. Defaults to the cleanup removal timeout.',
+							),
 							'include_repaired_metadata' => array(
 								'type'        => 'boolean',
 								'description' => 'Also include repaired metadata rows. Requires explicit opt-in and still runs fresh safety probes before removal.',
@@ -4031,7 +4035,7 @@ public static function worktreeCleanupArtifacts( array $input ): array|\WP_Error
 	/**
 	 * Apply only worktrees with explicit lifecycle cleanup_eligible metadata in a bounded batch.
 	 *
-	 * @param  array $input Input parameters (dry_run, limit, older_than, sort, force, via_jobs, source).
+	 * @param  array $input Input parameters (dry_run, limit, older_than, sort, force, via_jobs, remove_timeout, source).
 	 * @return array<string,mixed>|\WP_Error
 	 */
 	public static function worktreeBoundedCleanupEligibleApply( array $input ): array|\WP_Error {
@@ -4051,6 +4055,9 @@ public static function worktreeBoundedCleanupEligibleApply( array $input ): arra
 		if ( isset($input['sort']) && '' !== trim( (string) $input['sort']) ) {
 			$opts['sort'] = trim( (string) $input['sort']);
 		}
+		if ( isset($input['remove_timeout']) ) {
+			$opts['remove_timeout'] = (int) $input['remove_timeout'];
+		}
 		if ( isset($input['source']) && '' !== trim( (string) $input['source']) ) {
 			$opts['source'] = trim( (string) $input['source']);
 		}

inc/Cli/Commands/WorkspaceCommand.php

@@ -2960,10 +2960,14 @@ private function renderGitOperationResult( string $operation, array $result, arr
 	 *   metadata older than the compact duration (cleanup only, e.g. 7d, 24h).
 	 *   Candidate worktrees without valid `created_at` metadata are skipped.
 	 *
-		 * [--sort=<field>]
-		 * : Sort cleanup candidates by reporting field. For artifact cleanup,
-		 *   `--sort=size` scans the cheap inventory once and returns the largest
-		 *   artifact opportunities without manual pagination.
+	 * [--remove-timeout=<seconds>]
+	 * : Timeout for destructive `git worktree remove` during cleanup apply.
+	 *   Defaults to a larger removal-specific budget than cheap git probes.
+		 *
+	 * [--sort=<field>]
+	 * : Sort cleanup candidates by reporting field. For artifact cleanup,
+	 *   `--sort=size` scans the cheap inventory once and returns the largest
+	 *   artifact opportunities without manual pagination.
 	 * ---
 	 * options:
 	 *   - size
@@ -3492,6 +3496,9 @@ public function worktree( array $args, array $assoc_args ): void {
 				if ( isset($assoc_args['sort']) && '' !== trim( (string) $assoc_args['sort']) ) {
 					$input['sort'] = trim( (string) $assoc_args['sort']);
 				}
+				if ( isset($assoc_args['remove-timeout']) && '' !== trim( (string) $assoc_args['remove-timeout']) ) {
+					$input['remove_timeout'] = (int) $assoc_args['remove-timeout'];
+				}
 				break;
 		}
 

inc/Tasks/WorktreeCleanupChunkTask.php

@@ -111,6 +111,7 @@ public function executeTask( int $jobId, array $params ): void {
 					'skip_github'               => array_key_exists('skip_github', $params) ? (bool) $params['skip_github'] : true,
 					'include_repaired_metadata' => ! empty($params['include_repaired_metadata']),
 					'stale_liveness_only'       => ! empty($params['stale_liveness_only']),
+					'remove_timeout'            => isset($params['remove_timeout']) ? (int) $params['remove_timeout'] : null,
 				)
 			),
 			default     => new \WP_Error('invalid_cleanup_chunk_type', sprintf('Unknown cleanup chunk type: %s', $chunk_type), array( 'status' => 400 )),

inc/Workspace/Workspace.php

@@ -59,6 +59,11 @@ class Workspace {
 	 */
 	protected const CLEANUP_GIT_PROBE_TIMEOUT = 5;
 
+	/**
+	 * Bound destructive git worktree removal separately from cheap probes.
+	 */
+	protected const CLEANUP_GIT_REMOVE_TIMEOUT = 60;
+
 	/**
 	 * Closed PR pages to inspect per repo during cleanup.
 	 */