Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion codex-rs/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion codex-rs/exec/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ use codex_protocol::protocol::SubAgentSource;
use codex_protocol::user_input::UserInput;
use codex_utils_absolute_path::AbsolutePathBuf;
use codex_utils_oss::ensure_oss_provider_ready;
use codex_utils_oss::fetch_oss_model_catalog;
use codex_utils_oss::get_default_model_for_oss_provider;
use event_processor_with_human_output::EventProcessorWithHumanOutput;
use event_processor_with_jsonl_output::EventProcessorWithJsonOutput;
Expand Down Expand Up @@ -289,7 +290,7 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
additional_writable_roots: add_dir,
};

let config = ConfigBuilder::default()
let mut config = ConfigBuilder::default()
.cli_overrides(cli_kv_overrides)
.harness_overrides(overrides)
.cloud_requirements(cloud_requirements)
Expand Down Expand Up @@ -373,6 +374,20 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result
.map_err(|e| anyhow::anyhow!("OSS setup failed: {e}"))?;
}

if config.model_catalog.is_none() {
let provider_id = config.model_provider_id.as_str();
match fetch_oss_model_catalog(provider_id, &config).await {
Ok(Some(catalog)) => {
config.model_catalog = Some(catalog);
}
Ok(None) => {}
Err(err) => {
warn!("Failed to fetch OSS model catalog for {provider_id}: {err}");
}
}
}
let config = config;

let default_cwd = config.cwd.to_path_buf();
let default_approval_policy = config.permissions.approval_policy.value();
let default_sandbox_policy = config.permissions.sandbox_policy.get();
Expand Down
6 changes: 4 additions & 2 deletions codex-rs/lmstudio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ path = "src/lib.rs"

[dependencies]
codex-core = { path = "../core" }
codex-protocol = { path = "../protocol" }
reqwest = { version = "0.12", features = ["json", "stream"] }
serde = { workspace = true, features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = ["rt"] }
tokio = { version = "1", features = ["rt", "time"] }
tracing = { version = "0.1.44", features = ["log"] }
which = "8.0"

[dev-dependencies]
pretty_assertions = { workspace = true }
wiremock = "0.6"
tokio = { version = "1", features = ["full"] }

Expand Down
Loading
Loading