Skip to content

fix: repair cleanup-eligible stale worktree markers#740

Merged
chubes4 merged 2 commits into
mainfrom
issue-738-stale-marker-cleanup
Jun 16, 2026
Merged

fix: repair cleanup-eligible stale worktree markers#740
chubes4 merged 2 commits into
mainfrom
issue-738-stale-marker-cleanup

Conversation

@chubes4

@chubes4 chubes4 commented Jun 15, 2026

Copy link
Copy Markdown
Member

Summary

  • Fixes Cleanup should repair or remove stale worktree marker candidates #738 by letting workspace worktree prune repair exact cleanup-eligible stale marker candidates instead of leaving them behind when Git has nothing to prune.
  • Keeps ambiguous path-present stale marker rows blocked, but now returns a concrete DMC-owned workspace remove <handle> --yes next command instead of a Git-only prune hint.
  • Adds smoke coverage for both the auto-repair path and the blocked/manual-removal path when host Git is unavailable.

Safety

  • Auto-removal requires a non-primary worktree handle, cleanup signal, stored path exactly matching the expected workspace worktree directory, realpath containment under the configured workspace, and a .git marker pointing at a missing primary .git/worktrees target.
  • After removal DMC forgets worktree metadata, deletes the inventory row, and attempts primary git worktree prune when possible.

Verification

  • php tests/smoke-worktree-prune-no-git.php
  • php tests/smoke-worktree-cleanup.php
  • php tests/smoke-worktree-cleanup-cli.php
  • php tests/smoke-worktree-bounded-cleanup-eligible-apply.php
  • php -l inc/Workspace/WorkspaceWorktreeLifecycle.php && php -l tests/smoke-worktree-prune-no-git.php

@homeboy-ci

homeboy-ci Bot commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Homeboy Results — data-machine-code

Lint

lint — passed

ℹ️ Full options: homeboy docs commands/lint
Deep dive: homeboy lint data-machine-code --changed-since 2519ac3

Artifacts and drill-down
  • CI results artifact: homeboy-ci-results-data-machine-code-lint-quality-Linux-node24 contains immediate command JSON for this action invocation.
  • Observation artifact: homeboy-observations-data-machine-code-lint-quality-Linux-node24 contains exported Homeboy run history for deeper queries.
  • Drill-down: download the observation artifact, then run homeboy runs import <dir>, homeboy runs list, and homeboy runs findings <run-id>.
  • Artifacts are attached to the workflow run: https://github.com/Extra-Chill/data-machine-code/actions/runs/27584534131

Test

test — passed

ℹ️ Auto-fix lint issues: homeboy refactor data-machine-code --from lint --write
ℹ️ Collect coverage: homeboy test data-machine-code --coverage
ℹ️ Save test baseline: homeboy test data-machine-code --baseline
ℹ️ Pass args to test runner: homeboy test -- [args]
ℹ️ Full options: homeboy docs commands/test
Deep dive: homeboy test data-machine-code --changed-since 2519ac3

Artifacts and drill-down
  • CI results artifact: homeboy-ci-results-data-machine-code-test-quality-Linux-node24 contains immediate command JSON for this action invocation.
  • Observation artifact: homeboy-observations-data-machine-code-test-quality-Linux-node24 contains exported Homeboy run history for deeper queries.
  • Drill-down: download the observation artifact, then run homeboy runs import <dir>, homeboy runs list, and homeboy runs findings <run-id>.
  • Artifacts are attached to the workflow run: https://github.com/Extra-Chill/data-machine-code/actions/runs/27584534131

Audit

audit — passed

  • audit — 12 finding(s)
  • Total: 12 finding(s)

Deep dive: homeboy audit data-machine-code --changed-since 2519ac3

Artifacts and drill-down
  • CI results artifact: homeboy-ci-results-data-machine-code-audit-quality-Linux-node24 contains immediate command JSON for this action invocation.
  • Observation artifact: homeboy-observations-data-machine-code-audit-quality-Linux-node24 contains exported Homeboy run history for deeper queries.
  • Drill-down: download the observation artifact, then run homeboy runs import <dir>, homeboy runs list, and homeboy runs findings <run-id>.
  • Artifacts are attached to the workflow run: https://github.com/Extra-Chill/data-machine-code/actions/runs/27584534131
Tooling versions
  • Homeboy CLI: homeboy 0.232.0+8fd2b92d870e+d1fb198
  • Extension: wordpress from https://github.com/Extra-Chill/homeboy-extensions
  • Extension revision: 97d0a4d2
  • Action: unknown@unknown

@chubes4 chubes4 merged commit 4d8bf60 into main Jun 16, 2026
5 checks passed
@chubes4 chubes4 deleted the issue-738-stale-marker-cleanup branch June 16, 2026 00:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cleanup should repair or remove stale worktree marker candidates

1 participant