From af5f52c9d6a06f14cd8cac8c16ed16ba37e5661b Mon Sep 17 00:00:00 2001 From: vitaliytv Date: Mon, 27 Jul 2026 16:53:19 +0300 Subject: [PATCH] fix(owner): pin mt-core/llm-cascade rev, remove stray nested owner workspace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit release-owner.yml падав на кожному owner-релізі з owner@0.16.0: PR #17 (67e3744) повернув owner/Cargo.toml зі своїм [workspace], видаленим ще в 1efb2bd — Cargo відтоді резолвив owner/src-tauri й owner/owner-llm у незафіксований вкладений воркспейс замість кореневого. Без Cargo.lock там git-залежності mt-core/llm-cascade (без rev) щоразу тягнули живий HEAD nitra/mt і nitra/7n-rules — а структура nitra/mt відтоді розійшлась, тому cargo не міг знайти Cargo.toml за очікуваним шляхом. - видалено owner/Cargo.toml (вкладений workspace) - pin rev на mt-core (app/src-tauri, owner/src-tauri) і llm-cascade (owner/owner-llm) — той самий канон, що вже в tauri-plugin-agent - перевірено cargo check --workspace з чистим CARGO_HOME (як на CI-раннері) Co-Authored-By: Claude Sonnet 5 --- Cargo.lock | 4 ++-- app/.changes/260727-1637.md | 5 +++++ app/src-tauri/Cargo.toml | 2 +- owner/.changes/260727-1637.md | 5 +++++ owner/Cargo.toml | 6 ------ owner/owner-llm/Cargo.toml | 2 +- owner/src-tauri/Cargo.toml | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 app/.changes/260727-1637.md create mode 100644 owner/.changes/260727-1637.md delete mode 100644 owner/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index 00d586c..175714b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2441,7 +2441,7 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "llm-cascade" version = "0.1.0" -source = "git+https://github.com/nitra/7n-rules.git#c47c5248ecb45cd076dbc2558e3c2d04f010ddfe" +source = "git+https://github.com/nitra/7n-rules.git?rev=c47c5248ecb45cd076dbc2558e3c2d04f010ddfe#c47c5248ecb45cd076dbc2558e3c2d04f010ddfe" dependencies = [ "agent-client-protocol", "genai", @@ -2571,7 +2571,7 @@ dependencies = [ [[package]] name = "mt-core" version = "0.1.0" -source = "git+https://github.com/nitra/mt.git#03050b869db4828b351defe639b6d09a1c963b4c" +source = "git+https://github.com/nitra/mt.git?rev=03050b869db4828b351defe639b6d09a1c963b4c#03050b869db4828b351defe639b6d09a1c963b4c" dependencies = [ "chrono", "serde", diff --git a/app/.changes/260727-1637.md b/app/.changes/260727-1637.md new file mode 100644 index 0000000..b32ccfd --- /dev/null +++ b/app/.changes/260727-1637.md @@ -0,0 +1,5 @@ +--- +bump: patch +section: Fixed +--- +Пін rev у git-залежності mt-core (Cargo.toml) — без нього CI резолвив пакет на живий HEAD nitra/mt і падав, щойно там змінювалась структура репо diff --git a/app/src-tauri/Cargo.toml b/app/src-tauri/Cargo.toml index babd28b..de0110c 100644 --- a/app/src-tauri/Cargo.toml +++ b/app/src-tauri/Cargo.toml @@ -39,7 +39,7 @@ tauri-plugin-agent = { git = "https://github.com/nitra/tauri-components", rev = serde = { version = "1", features = ["derive"] } serde_json = "1" uuid = { version = "1", features = ["v4"] } -mt-core = { git = "https://github.com/nitra/mt.git" } +mt-core = { git = "https://github.com/nitra/mt.git", rev = "03050b869db4828b351defe639b6d09a1c963b4c" } notify = "8" tauri-plugin-mcp-bridge = "0.12.0" tauri-plugin-process = "2.3.1" diff --git a/owner/.changes/260727-1637.md b/owner/.changes/260727-1637.md new file mode 100644 index 0000000..34e3eb2 --- /dev/null +++ b/owner/.changes/260727-1637.md @@ -0,0 +1,5 @@ +--- +bump: patch +section: Fixed +--- +Полагоджено release-owner.yml: видалено вкладений owner/Cargo.toml (сторонній `[workspace]`, повернутий комітом #17), який перемикав owner/src-tauri з кореневого воркспейсу на незафіксований — пін rev у git-залежностях mt-core/llm-cascade, щоб CI більше не резолвив їх на живий HEAD nitra/mt і nitra/7n-rules diff --git a/owner/Cargo.toml b/owner/Cargo.toml deleted file mode 100644 index 574eb34..0000000 --- a/owner/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[workspace] -resolver = "2" -members = ["src-tauri", "owner-llm"] - -[profile.dev] -strip = true diff --git a/owner/owner-llm/Cargo.toml b/owner/owner-llm/Cargo.toml index 6ff9303..85b5676 100644 --- a/owner/owner-llm/Cargo.toml +++ b/owner/owner-llm/Cargo.toml @@ -5,7 +5,7 @@ description = "Agent/LLM-логіка owner — тонкі функції пов edition = "2021" [dependencies] -llm-cascade = { git = "https://github.com/nitra/7n-rules.git" } +llm-cascade = { git = "https://github.com/nitra/7n-rules.git", rev = "c47c5248ecb45cd076dbc2558e3c2d04f010ddfe" } [dev-dependencies] tokio = { version = "1", features = ["rt-multi-thread", "macros"] } diff --git a/owner/src-tauri/Cargo.toml b/owner/src-tauri/Cargo.toml index b0a3c2d..726ab11 100644 --- a/owner/src-tauri/Cargo.toml +++ b/owner/src-tauri/Cargo.toml @@ -20,7 +20,7 @@ tauri-plugin-notification = "2" tauri-plugin-opener = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" -mt-core = { git = "https://github.com/nitra/mt.git" } +mt-core = { git = "https://github.com/nitra/mt.git", rev = "03050b869db4828b351defe639b6d09a1c963b4c" } owner-llm = { path = "../owner-llm" } notify = "8" chrono = "0.4"