Skip to content

feat(auxiliary): store WTK auxiliary config under .wtk#81

Merged
nettee merged 3 commits into
mainfrom
looper/80-store-wtk-auxiliary-config-und-170246791b041537
Jun 15, 2026
Merged

feat(auxiliary): store WTK auxiliary config under .wtk#81
nettee merged 3 commits into
mainfrom
looper/80-store-wtk-auxiliary-config-und-170246791b041537

Conversation

@nettee

@nettee nettee commented Jun 15, 2026

Copy link
Copy Markdown
Owner

Summary

  • store Auxiliary Group config in .wtk/config.toml and coordinated worktree state in .wtk/worktrees.json
  • prefer the primary worktree .wtk files when present, with legacy read fallback to $(git rev-parse --git-common-dir)/wtk/*
  • update e2e coverage and README to match the new persistence model

Testing

  • cargo test
  • pytest -q e2e/test_auxiliary_group.py

Closes #80

🔁 Powered by Looper · runner=worker · agent=codex · An autonomous AI dev team for your GitHub repos.

Generated-By: looper 0.9.9 (runner=worker, agent=codex)

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 605e91ff97

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/auxiliary.rs
Generated-By: looper 0.9.9 (runner=fixer, agent=codex)

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 278ee5e5c4

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/auxiliary.rs
Comment thread src/worktree.rs Outdated
Generated-By: looper 0.9.9 (runner=fixer, agent=codex)

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cc01580eb2

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/auxiliary.rs
if private.exists() {
private
let primary = primary_state_path(primary_root);
if primary.exists() {

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Do not let stale .wtk state shadow git-common state

When a repo has both state files from the prior migration path, this now picks primary/.wtk/worktrees.json even though the previous implementation preferred and updated $GIT_COMMON_DIR/wtk/worktrees.json while leaving any older .wtk file behind. In that upgrade scenario, coordinated worktrees created or updated by the previous release disappear from read_state; wtk remove then treats their Primary worktree as a normal worktree (the Primary has no auxiliary marker) and removes only it, leaving the Auxiliary worktrees/branches orphaned. Please prefer/migrate the git-common state when both files exist, or otherwise detect and merge the newer state instead of blindly taking the .wtk file.

Useful? React with 👍 / 👎.

@nettee nettee merged commit c99bfb7 into main Jun 15, 2026
2 checks passed
nettee added a commit that referenced this pull request Jun 15, 2026
Generated-By: looper 0.9.9 (runner=fixer, agent=codex)
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.

Store WTK auxiliary config under .wtk

1 participant