Skip to content

Refactor active cleanup metadata envelope #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chubes4 merged 1 commit into from
Jun 7, 2026
Merged

Refactor active cleanup metadata envelope #595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 64 additions & 46 deletions inc/Workspace/Workspace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2144,18 +2144,14 @@ private function build_active_no_signal_finalized_metadata( array $row ): array|
return new \WP_Error('missing_pr_url', 'merged PR evidence is missing html_url');
}

$base_metadata = is_array($row['metadata'] ?? null) ? $row['metadata'] : array();
$metadata = array_merge(
$base_metadata,
array(
'handle' => $handle,
'repo' => $repo,
'branch' => $branch,
'path' => $path,
'observed_at' => gmdate('c'),
'last_seen_at' => gmdate('c'),
),
WorktreeContextInjector::build_finalizer_metadata(WorktreeContextInjector::STATE_MERGED, $pr_url)
$metadata = $this->build_active_no_signal_cleanup_metadata(
$row,
$handle,
$repo,
$branch,
$path,
WorktreeContextInjector::STATE_MERGED,
$pr_url
);
$metadata['auto_finalized_by'] = 'active_no_signal_finalized_apply';
$metadata['auto_finalized_signal'] = 'pr-merged';
Expand Down Expand Up @@ -2210,18 +2206,13 @@ private function build_active_no_signal_equivalent_clean_metadata( array $row ):
return $equivalence;
}

$base_metadata = is_array($row['metadata'] ?? null) ? $row['metadata'] : array();
$metadata = array_merge(
$base_metadata,
array(
'handle' => $handle,
'repo' => $repo,
'branch' => $branch,
'path' => $path,
'observed_at' => gmdate('c'),
'last_seen_at' => gmdate('c'),
),
WorktreeContextInjector::build_finalizer_metadata(WorktreeContextInjector::STATE_CLEANUP_ELIGIBLE)
$metadata = $this->build_active_no_signal_cleanup_metadata(
$row,
$handle,
$repo,
$branch,
$path,
WorktreeContextInjector::STATE_CLEANUP_ELIGIBLE
);
$effective_status = (string) ( $equivalence['upstream_equivalence']['effective_status'] ?? '' );
$signal = 'contained_non_default_remote' === $effective_status ? 'contained-non-default-remote' : 'upstream-equivalent-clean';
Expand Down Expand Up @@ -2261,18 +2252,13 @@ private function build_active_no_signal_merged_to_default_metadata( array $row )
return $evidence;
}

$base_metadata = is_array($row['metadata'] ?? null) ? $row['metadata'] : array();
$metadata = array_merge(
$base_metadata,
array(
'handle' => $handle,
'repo' => $repo,
'branch' => $branch,
'path' => (string) ( $evidence['path'] ?? $path ),
'observed_at' => gmdate('c'),
'last_seen_at' => gmdate('c'),
),
WorktreeContextInjector::build_finalizer_metadata(WorktreeContextInjector::STATE_MERGED)
$metadata = $this->build_active_no_signal_cleanup_metadata(
$row,
$handle,
$repo,
$branch,
(string) ( $evidence['path'] ?? $path ),
WorktreeContextInjector::STATE_MERGED
);
$metadata['auto_finalized_by'] = 'active_no_signal_merged_apply';
$metadata['auto_finalized_signal'] = 'merged-to-default';
Expand All @@ -2299,25 +2285,57 @@ private function build_active_no_signal_remote_clean_metadata( array $row ): arr
return $evidence;
}

$base_metadata = is_array($row['metadata'] ?? null) ? $row['metadata'] : array();
$metadata = array_merge(
$metadata = $this->build_active_no_signal_cleanup_metadata(
$row,
$handle,
$repo,
$branch,
(string) ( $evidence['path'] ?? $path ),
WorktreeContextInjector::STATE_CLEANUP_ELIGIBLE
);
$metadata['auto_finalized_by'] = 'active_no_signal_remote_clean_apply';
$metadata['auto_finalized_signal'] = 'remote-tracking-clean';
$metadata['auto_finalized_reason'] = 'active/no-signal report found a clean local worktree whose work is preserved by its remote branch';
$metadata['cleanup_eligibility_evidence'] = $evidence;

return $metadata;
}

/**
* Build the common cleanup metadata envelope for active/no-signal apply paths.
*
* @param array<string,mixed> $row Evidence row.
* @param string $handle Worktree handle.
* @param string $repo Repository name.
* @param string $branch Branch name.
* @param string $path Canonical worktree path to store.
* @param string $finalizer_state Lifecycle finalizer state.
* @param string|null $finalizer_url Optional finalizer URL.
* @return array<string,mixed>
*/
private function build_active_no_signal_cleanup_metadata(
array $row,
string $handle,
string $repo,
string $branch,
string $path,
string $finalizer_state,
?string $finalizer_url = null
): array {
$base_metadata = is_array($row['metadata'] ?? null) ? $row['metadata'] : array();

return array_merge(
$base_metadata,
array(
'handle' => $handle,
'repo' => $repo,
'branch' => $branch,
'path' => (string) ( $evidence['path'] ?? $path ),
'path' => $path,
'observed_at' => gmdate('c'),
'last_seen_at' => gmdate('c'),
),
WorktreeContextInjector::build_finalizer_metadata(WorktreeContextInjector::STATE_CLEANUP_ELIGIBLE)
WorktreeContextInjector::build_finalizer_metadata($finalizer_state, $finalizer_url)
);
$metadata['auto_finalized_by'] = 'active_no_signal_remote_clean_apply';
$metadata['auto_finalized_signal'] = 'remote-tracking-clean';
$metadata['auto_finalized_reason'] = 'active/no-signal report found a clean local worktree whose work is preserved by its remote branch';
$metadata['cleanup_eligibility_evidence'] = $evidence;

return $metadata;
}

/**
Expand Down
Loading