Skip to content

Route managed Codex model discovery - #716

Merged
andy-xu-db merged 2 commits into
mainfrom
andy-xu-db/stack/andy/managed-config-codex-discovery
Sep 18, 2026
Merged

Route managed Codex model discovery#716
andy-xu-db merged 2 commits into
mainfrom
andy-xu-db/stack/andy/managed-config-codex-discovery

Conversation

@andy-xu-db

@andy-xu-db andy-xu-db commented Sep 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

🥞 Stacked PR

Use this link to review incremental changes.

Summary

  • Extend the same managed MPS/Unity Catalog source precedence to Codex.
  • Pass the effective source into Codex configuration and reuse its existing automatic, source-scoped model catalog discovery at launch.
  • Make a launch-scoped managed Unity Catalog parent suppress a developer-saved provider without rewriting developer state.
  • Support both generic configure and configure --agent codex without requiring globally discovered models.
  • Keep Claude discovery environment behavior out of the Codex path.
  • Add one focused managed-MPS integration journey: bare fresh-home launch and a nonempty scoped discovery catalog.

Stack

Stacked on #715, #714, and #710. Merge from the bottom.

Testing

  • uv run pytest -q --ignore=tests/test_e2e_user_agent.py: 2,406 passed, 41 skipped at the stack tip before the integration-test-only update
  • Focused Claude/Codex/CLI and integration-contract suites after the update: 717 passed
  • Managed Claude/Codex CI lane collection verified locally
  • Ruff check and format check pass for tests/ and scripts/run_integration.py
  • python3.12 scripts/run_integration.py --help
  • git diff --check
  • Live managed integration is left to the managed CI lane because local managed-workspace credentials were not used

Tested with MPS in Managed Config:
Screenshot 2026-09-18 at 9 31 22 AM

Screen.Recording.2026-09-18.at.9.28.53.AM.mov

Tested with Unity Catalog Location in Managed Config:
Screenshot 2026-09-18 at 9 34 27 AM

Screen.Recording.2026-09-18.at.9.34.53.AM.mov

This was referenced Sep 17, 2026
Merged
Closed
@andy-xu-db
andy-xu-db force-pushed the andy-xu-db/stack/andy/managed-config-codex-discovery branch 2 times, most recently from 7a0fb27 to 1da2ad3 Compare September 17, 2026 22:50
@andy-xu-db andy-xu-db mentioned this pull request Sep 17, 2026
Merged
@andy-xu-db
andy-xu-db force-pushed the andy-xu-db/stack/andy/managed-config-codex-discovery branch 13 times, most recently from 6bb0414 to 80104dd Compare September 18, 2026 05:20
lilly-luo added a commit that referenced this pull request Sep 18, 2026
@andy-xu-db @lilly-luo
Automatically enable Claude model discovery for providers (#710)
7e3a4b3 
## 🥞 Stacked PR
Use this
[link](https://github.com/databricks/unity-gateway/pull/710/files) to
review incremental changes.
-
[**auto-claude-model-discovery**](#710)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/710/files)] ←
_this PR_
-
[stack/andy/managed-config-cli-guard](#714)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/714/files/96a954c75e38f92aa68115ca0de579dac010d781..32b156bf7e7b5cb98e4ed40c986553c2697e600c)]
-
[stack/andy/managed-config-claude-discovery](#715)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/715/files/32b156bf7e7b5cb98e4ed40c986553c2697e600c..003d5da301b465fe304ed9a28b9690e46e55ecf5)]
-
[stack/andy/managed-config-codex-discovery](#716)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/716/files/003d5da301b465fe304ed9a28b9690e46e55ecf5..1da2ad3989f3c857016d9a2226847f2aa233a194)]

---------
## Summary

- Automatically enable Claude Code gateway model discovery when a user
launches with --provider.
- Preserve the existing automatic behavior for --model-location and the
explicit hidden opt-in.
- Add CLI regression coverage for provider launches.

## Testing

- uv run pytest tests/test_cli.py tests/test_agent_claude.py — 530
passed
- uv run --frozen ruff check src/ucode/cli.py tests/test_cli.py — passed
- uv run --frozen ruff format --check src/ucode/cli.py tests/test_cli.py
— passed
- uv run --frozen pytest -q — 2,386 passed, 41 skipped, 2
environment-dependent failures in tests/test_e2e_user_agent.py: the
installed Claude binary rejected the fixture model before sending a
request, and the installed Codex binary used ambient machine-wide
configuration instead of the capture server
<img width="638" height="501" alt="Screenshot 2026-09-17 at 5 07 31 PM"
src="https://github.com/user-attachments/assets/ac58ac34-6f37-4203-ad2e-b06df8041627"
/>


https://github.com/user-attachments/assets/c6753b85-c9e7-42e0-babf-b8a03bb84e22

Co-authored-by: andy-xu-db <310751426+andy-xu-db@users.noreply.github.com>
Co-authored-by: lilly-luo <lilly.luo@databricks.com>
@andy-xu-db
andy-xu-db force-pushed the andy-xu-db/stack/andy/managed-config-codex-discovery branch from 80104dd to d323731 Compare September 18, 2026 13:53
@andy-xu-db
andy-xu-db enabled auto-merge (squash) September 18, 2026 15:13
andy-xu-db added a commit that referenced this pull request Sep 18, 2026
@andy-xu-db @lilly-luo
Reject launch source flags under managed config (#714)
b6a3fba 
## 🥞 Stacked PR
Use this
[link](https://github.com/databricks/unity-gateway/pull/714/files/91df94411cb76842cfd1f957a165c023eafdd1ae..6b3d9ec7ef7957be48186bda1534c10fdecefcc9)
to review incremental changes.
-
[auto-claude-model-discovery](#710)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/710/files)]
-
[**stack/andy/managed-config-cli-guard**](#714)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/714/files/91df94411cb76842cfd1f957a165c023eafdd1ae..6b3d9ec7ef7957be48186bda1534c10fdecefcc9)]
← _this PR_
-
[stack/andy/managed-config-claude-discovery](#715)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/715/files/6b3d9ec7ef7957be48186bda1534c10fdecefcc9..85b1f7eae704dacf19d56fb4808b928f96013fbb)]
-
[stack/andy/managed-config-codex-discovery](#716)
[[Files
changed](https://github.com/databricks/unity-gateway/pull/716/files/85b1f7eae704dacf19d56fb4808b928f96013fbb..80104ddb42eb1cc8b8d2274f97fa42e16719bb9d)]

---------
## Summary

- Reject explicit `--provider` and `--model-location` launch options
whenever the workspace returns a managed config, including an empty
config.
- Keep the existing first-launch/bootstrap path unchanged.
- Keep saved provider choices valid; only explicit command-line source
flags are rejected.

## Stack

Built directly on #710. Claude behavior is isolated in #715 and Codex
behavior in #716.

## Testing

- `uv run pytest -q --ignore=tests/test_e2e_user_agent.py`: 2,406
passed, 41 skipped at the stack tip
- `uv run pytest tests/test_cli.py -q`: 369 passed on this branch
- Ruff check and format check pass for all changed Python files
- `git diff --check`

---------

Co-authored-by: andy-xu-db <310751426+andy-xu-db@users.noreply.github.com>
Co-authored-by: lilly-luo <lilly.luo@databricks.com>
@andy-xu-db
andy-xu-db force-pushed the andy-xu-db/stack/andy/managed-config-codex-discovery branch from ea1778c to 2722c76 Compare September 18, 2026 15:20
@andy-xu-db
andy-xu-db merged commit 35012a6 into main Sep 18, 2026
20 checks passed
@andy-xu-db
andy-xu-db deleted the andy-xu-db/stack/andy/managed-config-codex-discovery branch September 18, 2026 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lilly-luo lilly-luo lilly-luo approved these changes
@david-siqi-liu david-siqi-liu david-siqi-liu approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@andy-xu-db @lilly-luo @david-siqi-liu