From 6ecc709fd2992313e956589b9fd83ebd31e67eb0 Mon Sep 17 00:00:00 2001
From: infosave2007 <urevich55@gmail.com>
Date: Tue, 21 Jul 2026 23:39:47 +0300
Subject: [PATCH] =?UTF-8?q?chore(release):=20v0.2.29=20=E2=80=94=20fix=20d?=
 =?UTF-8?q?uplicate=20managed=20model=20registration=20conflict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md     |  6 ++++-
 Cargo.lock       |  2 +-
 Cargo.toml       |  2 +-
 src/admin/mod.rs | 62 +++++++++++++++++++++++++++++-------------------
 4 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2d71c2..11e7123 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
-## [0.2.28] - 2026-07-21
+## [0.2.29] - 2026-07-21
+
+### Fixed
+- **Duplicate Local Model Registration**: Fixed `duplicate managed model id` conflict in `register_import` by cleanly routing managed CMF models directly into `[[cmf.servers]]` with automatic free port allocation without pushing duplicate entries to `[[models]]`.
+
 
 ### Fixed
 - **Quantization Badge & Title for Pre-Converted Models**: Automatically detect quantization (`Q1`, `Q1T`) for ready-to-run `.cmf` models (e.g. `infosave/Bonsai-27Bcmf`) from repo name and downloaded filename, resolving default `Q8_2F` badge fallback. Updated section title to "Загрузки / Конвертации" ("Downloads & Conversions").
diff --git a/Cargo.lock b/Cargo.lock
index bd1d0a6..88ed782 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -285,7 +285,7 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "cortiq-gateway"
-version = "0.2.28"
+version = "0.2.29"
 dependencies = [
  "anyhow",
  "arc-swap",
diff --git a/Cargo.toml b/Cargo.toml
index 215e105..f4d91fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cortiq-gateway"
-version = "0.2.28"
+version = "0.2.29"
 edition = "2021"
 rust-version = "1.75"
 license = "Apache-2.0"
diff --git a/src/admin/mod.rs b/src/admin/mod.rs
index 7ba9863..38fa425 100644
--- a/src/admin/mod.rs
+++ b/src/admin/mod.rs
@@ -1304,32 +1304,46 @@ async fn register_import(State(state): State<SharedState>, Path(job): Path<Strin
         .unwrap_or_else(|| "cmf-local".into());
     let id = format!("cmf-{base}");
     let mut cfg = current_cfg(&state);
-    if cfg.models.iter().any(|m| m.id == id) {
-        return Err(ApiError::bad(format!("model '{id}' already registered")));
+
+    let is_in_models = cfg.models.iter().any(|m| m.id == id);
+    let is_in_servers = cfg
+        .cmf
+        .servers
+        .iter()
+        .any(|s| s.id == id || s.model == j.output);
+
+    if is_in_models || is_in_servers {
+        return Err(ApiError::bad(format!("model '{id}' is already registered")));
     }
-    cfg.models.push(crate::config::ModelCfg {
-        id: id.clone(),
-        provider: "openai".into(),
-        base_url: cfg.cmf.cortiq_server_url.clone(),
-        model: base,
-        cost_tier: "local".into(),
-        price_in: 0.0,
-        price_out: 0.0,
-        kind: "chat".into(),
-        api_key_env: None,
-        caps: Vec::new(),
-    });
+
     if cfg.cmf.manage_server {
-        let port = cfg.cmf.local_port;
-        if !cfg.cmf.servers.iter().any(|s| s.model == j.output) {
-            cfg.cmf.servers.push(crate::config::CmfServer {
-                id: id.clone(),
-                model: j.output.clone(),
-                port,
-                threads: cfg.cmf.threads,
-                gpu: cfg.cmf.gpu,
-            });
-        }
+        let host = if cfg.cmf.local_host.trim().is_empty() {
+            "127.0.0.1"
+        } else {
+            &cfg.cmf.local_host
+        };
+        let base_port = cfg.cmf.servers.iter().map(|s| s.port).max().unwrap_or(8089);
+        let port = next_free_port(host, base_port).unwrap_or_else(|| base_port + 1);
+        cfg.cmf.servers.push(crate::config::CmfServer {
+            id: id.clone(),
+            model: j.output.clone(),
+            port,
+            threads: cfg.cmf.threads,
+            gpu: cfg.cmf.gpu,
+        });
+    } else {
+        cfg.models.push(crate::config::ModelCfg {
+            id: id.clone(),
+            provider: "openai".into(),
+            base_url: cfg.cmf.cortiq_server_url.clone(),
+            model: base,
+            cost_tier: "local".into(),
+            price_in: 0.0,
+            price_out: 0.0,
+            kind: "chat".into(),
+            api_key_env: None,
+            caps: Vec::new(),
+        });
     }
     state.reload(cfg)?;
     ok(json!({ "ok": true, "model_id": id }))