fix(skills): gate orchestration to Orca terminals#9411
Open
tmchow wants to merge 1 commit into
Open
Conversation
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (4)
🚧 Files skipped from review as they are similar to previous changes (1)
📝 WalkthroughWalkthroughUpdated orchestration guidance to require 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
tmchow
force-pushed
the
tmchow/gate-orchestration-skill-to
branch
from
July 19, 2026 03:34
d6c466d to
22f37bf
Compare
AmethystLiang
self-requested a review
July 19, 2026 03:35
tmchow
force-pushed
the
tmchow/gate-orchestration-skill-to
branch
from
July 19, 2026 03:43
22f37bf to
e8b658d
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Codex sessions outside Orca were activating the globally installed orchestration skill. The skill now treats Orca-managed terminal identity as a prerequisite at both discovery and execution time: it declines use before any
orcacommand when neither Orca identity variable is present, briefly explains why, and continues with the current harness's native coordination tools.The gate accepts either
ORCA_WORKTREE_IDorORCA_TERMINAL_HANDLEso local, WSL, and SSH agent terminals remain supported. Repository location, anorcabinary onPATH, and a reachable runtime no longer count as proof. The skill remains globally discoverable; this is a fail-closed instruction boundary rather than an authentication mechanism or catalog filter.Screenshots
No visual change.
Testing
pnpm lint— blocked by existing switch-exhaustiveness failures innative-chat-session-option-labels.tsandskill-freshness-group.tsx; neither file is changed by this PR.pnpm run typecheckpnpm test— 31,224 passed; three unrelated failures remain inagent-exec-handler.test.ts(inherited Git config environment) andssh-system-transport.integration.test.ts(timeout).pnpm buildpnpm exec vitest run config/scripts/orchestration-skill-guidance.test.mjs(12/12)pnpm run verify:bundled-skill-guidesAI Review Report
The review traced the skill from its canonical guide through generated projections and checked Orca identity propagation across local, WSL, and SSH agent terminals. It flagged that an
ORCA_WORKTREE_ID-only gate would reject valid SSH sessions when remote hooks omit worktree identity, so the final gate retainsORCA_TERMINAL_HANDLEas the fallback.The review also challenged the boundary against non-Orca harnesses, stale or spoofed environment values, and cross-platform behavior. The result is intentionally defense in depth: the selection description and early execution gate prevent accidental use, while existing runtime and lifecycle validation remains authoritative. No shortcuts, paths, platform-specific code, UI, or Electron behavior changed.
Security Audit
This PR changes runtime agent instructions and generated skill metadata only. It adds no command execution, path handling, authentication, secret, dependency, IPC, or network code.
The environment values are availability markers, not authentication credentials. Setting them manually can influence skill selection but does not bypass Orca runtime reachability or orchestration ownership checks. No follow-up security work is required for this instruction-layer fix.
Notes