Skip to content

feat(bin): scaffold jj bookmark branch step for jj-managed projects - #1945

Open
swissgrammie wants to merge 4 commits into
kunchenguid:mainfrom
swissgrammie:fm/brief-jj-support
Open

feat(bin): scaffold jj bookmark branch step for jj-managed projects#1945
swissgrammie wants to merge 4 commits into
kunchenguid:mainfrom
swissgrammie:fm/brief-jj-support

Conversation

@swissgrammie

@swissgrammie swissgrammie commented Aug 8, 2026

Copy link
Copy Markdown

Enables Jujutsu (jj) support in firstmate: ship briefs scaffold the jj bookmark branch step when a project is jj-marked.

Takes effect only when jj has been selected for a project and jjhouse is installed. All other projects (treehouse/git) keep the existing workflow, byte-identical.

Updates from git push no-mistakes

fm-brief.sh now reads the home registry's `jj` token (after the mode
bracket) and, when present, emits `jj bookmark create fm/<id>` as the
ship brief's branch step instead of `git checkout -b`. Projects without
the token keep the existing git step byte-identically; the scout and
secondmate variants are untouched.
@greptile-apps

greptile-apps Bot commented Aug 22, 2026

Copy link
Copy Markdown

Confidence Score: 4/5

The PR is not yet safe to merge because a generated jj brief can still mandate a command unavailable in the worker environment.

The new check validates firstmate's scaffold-time PATH, while the worker runs in a pane owned by a daemon that does not inherit that environment, leaving the previously reported execution-time availability failure reachable.

Files Needing Attention: bin/fm-brief.sh

Reviews (3): Last reviewed commit: "no-mistakes: apply CI fixes" | Re-trigger Greptile

Comment thread bin/fm-brief.sh Outdated
Comment thread bin/fm-brief.sh Outdated
Comment thread bin/fm-brief.sh Outdated
Comment thread bin/fm-brief.sh
[ "$JJ_TOKEN" = jj ] && JJ_MANAGED=1
fi
if [ "$JJ_MANAGED" = 1 ]; then
if command -v jj >/dev/null 2>&1 && command -v jjhouse >/dev/null 2>&1; then

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Gate checks the wrong environment

If firstmate's PATH contains jj and jjhouse but the long-lived worker daemon's PATH lacks jj, this check emits jj bookmark create even though the worker pane cannot execute it, causing the mandatory first action to fail before task work begins.

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