Skip to content

fix(lint): quote provenance/freshness to resolve SC2100#629

Open
e-jung wants to merge 5 commits into
kunchenguid:mainfrom
e-jung:fm/orca-subagent-hierarchy-j4
Open

fix(lint): quote provenance/freshness to resolve SC2100#629
e-jung wants to merge 5 commits into
kunchenguid:mainfrom
e-jung:fm/orca-subagent-hierarchy-j4

Conversation

@e-jung

@e-jung e-jung commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Intent

Make Orca delegate worktrees children of the captain's Orca session (parent linkage via ORCA_WORKTREE_ID) and prevent doubled fm-fm- task name prefixes in Orca worktree names, terminal titles, and window= metadata

What Changed

90ae327 fix(lint): quote provenance/freshness to resolve SC2100
65d09e4 no-mistakes(review): fix(orca): thread captain parent and complete alias migration
e7d9ea9 no-mistakes(review): Route fm-teardown kill labels through fm_alias_for_id to de-double
98fdaa7 fix(orca): link delegates to captain session and de-double fm- prefix
fcb9e8a feat: establish instruction ownership foundation (#619)

Testing

Completed 1 recorded test check.

  • Outcome: ⚠️ 1 error across 1 run (14m48s)

Pipeline

Updates from git push no-mistakes

✅ **intent** - passed

✅ No issues found.

✅ **Rebase** - passed

✅ No issues found.

⏭️ **Review** - skipped

Step was skipped.

⚠️ **Test** - 1 error
  • 🚨 tests failed with exit code 1
  • command -v tmux >/dev/null || { echo "tmux is required for e2e tests" >&2; exit 1; }; tmux -V; rc=0; for t in tests/*.test.sh; do echo "== $t =="; bash "$t" || rc=1; done; exit "$rc"
⏭️ **Document** - skipped

Step was skipped.

⏭️ **Lint** - skipped

Step was skipped.

✅ **Push** - passed

✅ No issues found.

e-jung added 5 commits July 15, 2026 23:53
Orca delegates were created with --no-parent, making them peers of the
captain's session instead of children. When firstmate itself runs under
Orca (ORCA_WORKTREE_ID set and repo-qualified), pass --parent-worktree
so the sidebar nests delegates under the captain's session. Fall back to
--no-parent when no trustworthy parent is discoverable or parent linkage
fails (best-effort).

Task ids already beginning with fm- (e.g. fm-orca-fix-k2) were doubled to
fm-fm-orca-fix-k2 in worktree names, terminal titles, and window= metadata.
Add fm_alias_for_id() as the single source of truth for the idempotent
fm- prefix, and route all label derivation through it: spawn, expected-label
resolution, crew-state, and teardown child cleanup. Legacy doubled selectors
keep resolving through the existing single-prefix strip fallback.
ShellCheck SC2100 fires on unquoted hyphenated assignments where the
prefix/suffix tokens happen to be existing variable names in the sourced
scope (parent-event-fallback). Quote the values so the assignment is
unambiguous.
@kunchenguid

kunchenguid commented Jul 16, 2026

Copy link
Copy Markdown
Owner

Automated reminder: thanks for the PR! This branch currently has a merge conflict with the base branch.

When you get a chance, please rebase onto (or merge) the latest base branch, resolve the conflict, and push. After that, checks will re-run and the PR will get looked at again.

Noted for firstmate#629 at 450cd445.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants