diff --git a/Cargo.lock b/Cargo.lock index 897a78f..4fc3f93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -643,7 +643,7 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "opencode-wrap" -version = "0.4.1" +version = "0.4.2" dependencies = [ "axum", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index aeb5d06..ebae069 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opencode-wrap" -version = "0.4.1" +version = "0.4.2" edition = "2021" description = "OpenAI-compatible API in front of `opencode serve`" license = "MIT" diff --git a/README.md b/README.md index be7d6fd..0e56074 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # opencode-wrap OpenAI-compatible HTTP API in front of `opencode serve`, using the free model -`opencode/muse-spark-1.3-contributor-free`. No `OPENCODE_API_KEY` needed — +`opencode/deepseek-v4.1-flash-free`. No `OPENCODE_API_KEY` needed — reuses whatever auth the `opencode` CLI already has. Targets the **OpenCode 2** server API (`/api/*`, basic auth, session-scoped @@ -112,7 +112,7 @@ before starting the wrapper. | `OPENCODE_PORT` | `4100` | Port for auto-spawned serve | | `OPENCODE_SERVER_PASSWORD` | random per start | Basic-auth password for `opencode serve`. Required when `OPENCODE_BASE` points at a server you started yourself | | `OPENCODE_SERVER_USERNAME` | `opencode` | Basic-auth username for `opencode serve` | -| `WRAP_MODEL` | `muse-spark-1.3-contributor-free` | Backend model | +| `WRAP_MODEL` | `deepseek-v4.1-flash-free` | Backend model | | `WRAP_PROVIDER` | `opencode` | Backend provider | | `WRAP_AGENT` | `build` | OpenCode agent each per-request session runs under | | `WRAP_CWD` | `/tmp` (Unix) / `%TEMP%` (Windows) | Existing directory for spawned serve. Native bash tools run here — use an empty sandbox, not your home directory | @@ -185,7 +185,7 @@ curl http://127.0.0.1:8000/health curl http://127.0.0.1:8000/v1/chat/completions \ -H 'Content-Type: application/json' \ -d '{ - "model": "opencode/muse-spark-1.3-contributor-free", + "model": "opencode/deepseek-v4.1-flash-free", "messages": [ { "role": "user", @@ -201,7 +201,7 @@ Streaming: curl -N http://127.0.0.1:8000/v1/chat/completions \ -H 'Content-Type: application/json' \ -d '{ - "model": "opencode/muse-spark-1.3-contributor-free", + "model": "opencode/deepseek-v4.1-flash-free", "stream": true, "messages": [ { @@ -217,12 +217,12 @@ curl -N http://127.0.0.1:8000/v1/chat/completions \ ```bash curl http://127.0.0.1:8000/v1/chat/completions \ -H 'Content-Type: application/json' \ - -d '{"model":"opencode/muse-spark-1.3-contributor-free", + -d '{"model":"opencode/deepseek-v4.1-flash-free", "messages":[{"role":"user","content":"Explain closures in one paragraph."}]}' curl http://127.0.0.1:8000/v1/chat/completions \ -H 'Content-Type: application/json' \ - -d '{"model":"opencode/muse-spark-1.3-contributor-free", + -d '{"model":"opencode/deepseek-v4.1-flash-free", "messages":[{"role":"user","content":"Weather in Paris?"}], "tools":[{"type":"function","function":{"name":"get_weather", "description":"Get weather for a city", @@ -251,7 +251,10 @@ curl http://127.0.0.1:8000/v1/chat/completions \ type comes from the data URI or the `Content-Type` header, falling back to the file extension. - Opencode-native tools (bash/read/edit) execute server-side automatically. -- Bare `muse-spark-*-contributor` aliased to `...-contributor-free`. +- Bare `muse-spark-*-contributor` aliased to `...-contributor-free` (legacy; that + family is no longer on Zen). +- `WRAP_MODEL` naming a model Zen has dropped falls back to another free model + instead of failing every request; the substitution is logged at `WARN`. - Explicit `opencode/` typos → HTTP 400 with suggestions when Zen list loads. - Empty contentless turns retried (fresh session), not served as `stop`. - Caller tools use instruction + `tool_call` fence parsing; returned as OpenAI diff --git a/src/config.rs b/src/config.rs index 568dc4c..5bb41e3 100644 --- a/src/config.rs +++ b/src/config.rs @@ -65,7 +65,7 @@ impl Config { opencode_password, opencode_password_generated, default_model: env::var("WRAP_MODEL") - .unwrap_or_else(|_| "muse-spark-1.3-contributor-free".into()), + .unwrap_or_else(|_| "deepseek-v4.1-flash-free".into()), default_provider: env::var("WRAP_PROVIDER").unwrap_or_else(|_| "opencode".into()), agent: non_empty_env("WRAP_AGENT").unwrap_or_else(|| "build".into()), wrap_cwd, @@ -94,7 +94,7 @@ impl Config { opencode_username: "opencode".into(), opencode_password: "test-password".into(), opencode_password_generated: true, - default_model: "muse-spark-1.3-contributor-free".into(), + default_model: "deepseek-v4.1-flash-free".into(), default_provider: "opencode".into(), agent: "build".into(), wrap_cwd: "/tmp".into(), diff --git a/src/turn.rs b/src/turn.rs index 1a2d94f..7f84b53 100644 --- a/src/turn.rs +++ b/src/turn.rs @@ -79,6 +79,26 @@ fn split_variant(id: &str) -> (String, Option) { } } +/// Preferred stand-in when the configured default is gone from Zen. +const FALLBACK_DEFAULT_MODEL: &str = "deepseek-v4.1-flash-free"; + +/// The configured default when Zen still lists it, otherwise the best free +/// model Zen currently offers. Zen rotates its catalogue, so a pinned default +/// eventually disappears and every caller without an explicit model breaks. +pub fn pick_default_model(configured: &str, ids: &HashSet) -> String { + let configured = resolve_model_id(configured); + if ids.is_empty() || ids.contains(&configured) { + return configured; + } + let mut free: Vec<&String> = ids.iter().filter(|id| id.ends_with("-free")).collect(); + free.sort(); + free.iter() + .find(|id| id.as_str() == FALLBACK_DEFAULT_MODEL) + .or_else(|| free.first()) + .map(|id| (*id).clone()) + .unwrap_or(configured) +} + pub async fn prepare_turn(client: &OcoClient, body: &Value) -> Result { let messages = body .get("messages") @@ -86,17 +106,21 @@ pub async fn prepare_turn(client: &OcoClient, body: &Value) -> Result Result Result backend {}/{}", raw_req, client.config.default_provider, - client.config.default_model + default_model ); - model_ref( - &client.config.default_provider, - &resolve_model_id(&client.config.default_model), - None, - ) + model_ref(&client.config.default_provider, &default_model, None) }; let system = messages @@ -333,12 +352,12 @@ pub async fn list_models(client: &OcoClient) -> Value { .duration_since(std::time::UNIX_EPOCH) .unwrap() .as_secs(); + let ids = client.zen_model_ids().await; let def_id = format!( "{}/{}", client.config.default_provider, - resolve_model_id(&client.config.default_model) + pick_default_model(&client.config.default_model, &ids) ); - let ids = client.zen_model_ids().await; if !ids.is_empty() { let mut sorted: Vec<_> = ids.iter().cloned().collect(); sorted.sort(); @@ -1053,6 +1072,37 @@ mod tests { OcoClient::new(Config::for_tests()) } + fn ids(list: &[&str]) -> HashSet { + list.iter().map(|s| s.to_string()).collect() + } + + #[test] + fn default_model_kept_when_zen_still_offers_it() { + let zen = ids(&["deepseek-v4.1-flash-free", "big-pickle"]); + assert_eq!( + pick_default_model("deepseek-v4.1-flash-free", &zen), + "deepseek-v4.1-flash-free" + ); + } + + #[test] + fn default_model_falls_back_when_zen_drops_it() { + let zen = ids(&["big-pickle", "glm-5.3-flash-free"]); + assert_eq!( + pick_default_model("muse-spark-1.3-contributor-free", &zen), + "glm-5.3-flash-free" + ); + } + + #[test] + fn default_model_unchanged_without_zen_catalogue() { + let zen = HashSet::new(); + assert_eq!( + pick_default_model("muse-spark-1.3-contributor-free", &zen), + "muse-spark-1.3-contributor-free" + ); + } + #[tokio::test] async fn prepare_turn_merges_developer_and_files() { let client = test_client(); @@ -1086,7 +1136,7 @@ mod tests { assert_eq!(prepared.session_body["model"]["providerID"], "opencode"); assert_eq!( prepared.session_body["model"]["id"], - "muse-spark-1.3-contributor-free" + "deepseek-v4.1-flash-free" ); assert_eq!(prepared.session_body["agent"], "build"); assert_eq!(prepared.model_name, "wrap/test-model");