Skip to content

fix(workspace-jj): fan-flames recovery path for missing change IDs #39

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
muloka merged 1 commit into from
Mar 19, 2026
+10 −0
Merged

fix(workspace-jj): fan-flames recovery path for missing change IDs #39

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
10 changes: 10 additions & 0 deletions plugins/workspace-jj/skills/fan-flames.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,16 @@ As subagents return, classify each result:

Track which tasks succeeded and which failed. **Capture the change ID from each subagent's report** — these are needed for fan-in.

### Recovery: Missing Change IDs

If a subagent crashes or times out before reporting its change ID, the change still exists in jj's DAG — it's just not referenced. Recover it by searching for the task description:

```bash
jj log -r 'description("Task N: <short description>")' --no-graph -T 'change_id'
```

If multiple matches, use the most recent. If no matches, the subagent likely never created any changes — treat as BLOCKED.

## Phase 4: FAN IN 🔥 — Reunify Changes

**Why change IDs, not workspace revsets:** Each subagent reports its change ID before returning. We use these IDs for squash instead of `workspace-<name>@` revsets because Claude Code may fire the WorktreeRemove hook (which calls `jj workspace forget`) when a subagent finishes, before the orchestrator runs fan-in. Change IDs are stable regardless of workspace lifecycle.
Expand Down
Loading