Skip to content

fix(workspace-jj): pin workspaces to parent rev + capture workspace names#40

Merged
muloka merged 1 commit intomainfrom
push-isolation
Mar 19, 2026
Merged

fix(workspace-jj): pin workspaces to parent rev + capture workspace names#40
muloka merged 1 commit intomainfrom
push-isolation

Conversation

@muloka
Copy link
Copy Markdown
Owner

@muloka muloka commented Mar 19, 2026

Summary

Fixes two issues discovered during the first fan-flames test run:

  • Workspace chaining: Without --revision, concurrent jj workspaces see each other's changes and chain instead of branching independently. Now pins each workspace to @- (parent of working copy) at creation time, ensuring the fan-out pattern fan-flames expects.
  • Workspace name mismatch: Claude Code assigns auto-generated agent IDs as workspace names (workspace-agent-a4eeb8f4), not predictable task names. Subagents now report their workspace directory name (basename $PWD) alongside their change ID, enabling accurate cleanup by the orchestrator.

Test plan

  • Run fan-flames with 3 independent tasks — verify changes branch from same parent (not chain)
  • Verify jj log shows 3 independent changes off the same parent after fan-out
  • Verify orchestrator can clean up workspaces using reported names

🤖 Generated with Claude Code

…ames for cleanup

- Pin each workspace to @- at creation time (--revision flag) so concurrent
  subagents create independent changes instead of chaining
- Subagents now report workspace directory name (basename $PWD) alongside
  change ID, enabling accurate cleanup by the orchestrator
- Fixes chaining issue observed in first fan-flames test run
@muloka muloka merged commit 3f7ce35 into main Mar 19, 2026
1 check passed
@muloka muloka deleted the push-isolation branch March 19, 2026 23:40
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.

1 participant