Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
982e586
Integrate orchestrator skill with smart routing
JJ27 Oct 7, 2026
2e08582
Let smart routing choose orchestrator models
JJ27 Oct 7, 2026
d6131c3
Preserve bundled orchestrator role defaults
JJ27 Oct 7, 2026
c153167
Let Codex merge native hook sources
JJ27 Oct 7, 2026
4ee23bb
Handle orchestrator check confirmation in routing journey
JJ27 Oct 7, 2026
59a4fd1
Wait for the orchestrator command transcript before confirming
JJ27 Oct 7, 2026
a7a511c
Handle Claude check permissions before transcript persistence
JJ27 Oct 7, 2026
f950333
Remove monkeypatched orchestrator test additions
JJ27 Oct 7, 2026
480c4b5
Remove standalone orchestrator plugin compatibility
JJ27 Oct 7, 2026
dd27761
Keep smart-routing toggle output concise
JJ27 Oct 7, 2026
b836dbe
Explain the bundled orchestrator skill
JJ27 Oct 7, 2026
05b2ed5
Gate orchestration behind an opt-in feature flag
JJ27 Oct 7, 2026
f41bec0
Simplify orchestrator activation to automatic hooks
JJ27 Oct 7, 2026
dafbac2
Name the bundled workflow Smart Router Orchestrator
JJ27 Oct 7, 2026
5ab64e8
Align CUJ2 fixture with published managed skill
JJ27 Oct 7, 2026
94feca7
Remove unrelated CUJ fixture changes
JJ27 Oct 7, 2026
9284679
Drop nested-launch session reset from orchestrator integration
JJ27 Oct 7, 2026
d834a4e
Use Codex's default environment inheritance
JJ27 Oct 7, 2026
b0af05a
Test automatic orchestration and post-compaction recovery
JJ27 Oct 7, 2026
78176dc
Fix Codex compaction test timing
JJ27 Oct 7, 2026
684aed2
Move temporary orchestration verification out of integration PR
JJ27 Oct 7, 2026
a098d13
Rename Smart Router Orchestrator identifiers
JJ27 Oct 7, 2026
0785e40
Merge main and preserve orchestration routing tests
JJ27 Oct 7, 2026
dd40db0
Show orchestration mode beside Claude subagents
JJ27 Oct 8, 2026
d2540a9
Show orchestration mode beside Codex subagents
JJ27 Oct 8, 2026
56dbb51
Hide the orchestration label when disabled
JJ27 Oct 8, 2026
cabbafa
Merge branch 'main' into JJ27/ug-model-orchestrator
lilly-luo Oct 8, 2026
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
2 changes: 2 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Fields live in `~/.claude/ucode-settings.json` and the OS-managed settings file
| Tracing | Ignore | Create/replace | The seven `CLAUDE_CODE_*`/`OTEL_*` trace keys and `otelHeadersHelper`; only when the config enables tracing |
| `managedMcpServers` | Ignore | Merge | Add/update the config's MCP server entries; other entries left alone |
| Smart-routing hooks | Merge | Merge | `PreToolUse`, `SessionStart`, `SubagentStart`; only `ug`'s own marked handlers, other hooks left alone |
| Smart Router Orchestrator hooks | Merge | Merge | Launch-only `UserPromptSubmit` and compact `SessionStart` handlers for smart-routed sessions with `ENABLE_SMART_ROUTER_ORCHESTRATOR=1`; read the same session controls as routing |

</details>

Expand All @@ -86,5 +87,6 @@ Fields live in `~/.codex/ucode.config.toml` and `/etc/codex/managed_config.toml`
| `http_headers` | Merge | Merge | In `[model_providers.Databricks]`; merge `ug`'s routing headers by name, admin headers added under managed config |
| `model_catalog_json` | Create/replace | Create/replace | In `~/.codex/config.toml`; `ug`'s own catalog reference, for a static model list |
| `mcp_servers` | Ignore | Merge | Managed file; add/update the config's MCP server entries, other entries left alone |
| Smart Router and Smart Router Orchestrator hooks | Merge | Merge | Launch-only `PreToolUse`, plus `UserPromptSubmit` and compact `SessionStart` with `ENABLE_SMART_ROUTER_ORCHESTRATOR=1`; Codex combines them with its native hook sources and applies project trust; `features.hooks` is enabled for a smart-routed launch |

</details>
38 changes: 38 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,44 @@ is enabled, ug warns and falls back to subagent routing because the first-prompt
wrapper requires a Unix terminal.
The generated shell hooks expect Git Bash; PowerShell-only setups are not covered.

### Smart Router Orchestrator

Smart-routed Claude and Codex sessions install `smart-router`. Set
`ENABLE_SMART_ROUTER_ORCHESTRATOR=1` at launch to also install and activate Smart Router
Orchestrator through the bundled `smart-router-orchestrator` skill; orchestration is off by
default. For example:

```bash
ENABLE_SMART_ROUTER_ORCHESTRATOR=1 ENABLE_SMART_ROUTING_SUBAGENT_ONLY=1 ug claude
```

Use `ug codex` in the same command for Codex. Smart Router Orchestrator assigns bounded work
to explorer, researcher, worker, tester, and reviewer roles while the root plans,
integrates, and verifies results. Easy tasks and explicit requests not to delegate
stay in the root.

Claude and Codex routing panels add `[orchestrator on]` to the `Subagent` line
only when orchestration is active. When it is off, they show the normal subagent
name. The label reports the session mode; it does not identify whether a particular
delegation came from the workflow or an explicit user request.

Once opted in, orchestration follows the existing smart-routing launch eligibility
and session controls. Turning Smart Router off through its skill stops new automatic delegation;
turning it on restores orchestration only in opted-in sessions. Explicit user
requests for subagents still use normal harness behavior while routing is off.
Stored skill files do not activate orchestration when the feature flag is unset or
`ENABLE_SMART_ROUTER_ORCHESTRATOR=0`, or in non-routed sessions. Existing Isaac pilot gating
and UG launch exclusions still apply.

Hooks refresh orchestration state before each prompt and after compaction. A
state change made outside the conversation is observed at the next hook; model
routing still checks the controls for each subagent.

UG supplies its own hooks; Codex combines them with existing hooks and applies
project trust. Smart routing selects subagent models; separate role-model
preferences are ignored and their files are left untouched. See the bundled
[Smart Router Orchestrator documentation](skills/smart-router-orchestrator/README.md) for details.

## Managed Files

`ug` backs up files before overwriting them. `ug revert` restores backups.
Expand Down
56 changes: 0 additions & 56 deletions skills/orchestrate/README.md

This file was deleted.

201 changes: 0 additions & 201 deletions skills/orchestrate/SKILL.md

This file was deleted.

Loading
Loading