Skip to content

Classify metadata identity reconciliation buckets#656

Merged
chubes4 merged 1 commit into
mainfrom
fix/issue-648-reconcile-identity
Jun 12, 2026
Merged

Classify metadata identity reconciliation buckets#656
chubes4 merged 1 commit into
mainfrom
fix/issue-648-reconcile-identity

Conversation

@chubes4

@chubes4 chubes4 commented Jun 12, 2026

Copy link
Copy Markdown
Member

Summary

  • Split inconsistent metadata identity rows into actionable buckets for stale metadata, branch-renamed worktrees, default-branch checkouts in feature worktrees, and manual-review cases.
  • Add proposed source-of-truth and next-command guidance for each class.
  • Keep automatic writes metadata-only and limited to stale identity repairs after dirty/unpushed safety checks pass.

Fixes #648.

Verification

  • php tests/smoke-worktree-metadata-reconcile.php
  • php -l inc/Workspace/WorkspaceMetadataReconciliation.php
  • php -l tests/smoke-worktree-metadata-reconcile.php
  • git diff --check -- inc/Workspace/WorkspaceMetadataReconciliation.php tests/smoke-worktree-metadata-reconcile.php

AI assistance

  • AI assistance: Yes
  • Tool(s): OpenCode (openai/gpt-5.5)
  • Used for: Drafted the reconciliation classification implementation and focused smoke coverage; Chris remains responsible for review and testing.

@chubes4 chubes4 merged commit 1f0041a into main Jun 12, 2026
4 of 5 checks passed
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.

metadata reconciliation should classify inconsistent branch identity into repairable buckets

1 participant