Merge Into stable

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
       SCCACHE_CACHE_SIZE: '2G'
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 

.github/workflows/codeql.yml

@@ -41,12 +41,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3
+        uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v3
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -55,10 +55,10 @@ jobs:
 
       - name: Autobuild
         if: matrix.build-mode == 'autobuild'
-        uses: github/codeql-action/autobuild@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3
+        uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3
+        uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v3
         with:
           category: "/language:${{ matrix.language }}"
 

.github/workflows/nightly.yml

@@ -31,7 +31,7 @@ jobs:
       ahead_count: ${{ steps.diff.outputs.ahead_count }}
     steps:
       - name: Checkout target ref
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ env.TARGET_REF }}
           fetch-depth: 0
@@ -80,7 +80,7 @@ jobs:
       SCCACHE_CACHE_SIZE: '2G'
     steps:
       - name: Checkout target ref
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ env.TARGET_REF }}
           fetch-depth: 0

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
       SCCACHE_CACHE_SIZE: '2G'
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "openvcs-core"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2024"
 description = "Core types and traits for OpenVCS."
 license = "GPL-3.0-or-later"
@@ -31,10 +31,10 @@ default = ["plugin-protocol"]
 plugin-protocol = ["dep:serde_json"]
 
 # The VCS trait and VCS-related error type.
-vcs = ["dep:thiserror", "backend-registry"]
+vcs = ["dep:thiserror"]
 
 # Backend discovery via the `BACKENDS` registry (link-time registration).
-backend-registry = ["dep:linkme"]
+backend-registry = ["dep:linkme", "vcs"]
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }

README.md

@@ -1,6 +1,8 @@
 # OpenVCS Core (`openvcs-core`)
 
-[![Dev CI (fast)](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/ci.yml/badge.svg)](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/ci.yml)
+[![Nightly](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/nightly.yml/badge.svg?branch=Dev)](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/nightly.yml)
+[![Dev](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/ci.yml/badge.svg?branch=Dev)](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/ci.yml)
+[![Stable](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/release.yml/badge.svg?branch=Dev)](https://github.com/Open-VCS/OpenVCS-Core/actions/workflows/release.yml)
 
 Shared Rust crate for:
 - OpenVCS plugins (JSON-RPC over stdio)

src/host.rs

@@ -1,7 +1,7 @@
 use crate::plugin_protocol::RpcRequest;
-use crate::plugin_stdio::{PluginError, RequestIdState, call_host};
+use crate::plugin_protocol::RpcResponse;
+use crate::plugin_stdio::{PluginError, RequestIdState, SharedQueue, call_host};
 use serde_json::Value;
-use std::collections::VecDeque;
 use std::io::{BufReader, LineWriter};
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Duration;
@@ -13,7 +13,8 @@ pub type HostStdin = BufReader<std::io::Stdin>;
 struct HostContext {
     out: Arc<Mutex<HostStdout>>,
     stdin: Arc<Mutex<HostStdin>>,
-    queue: Arc<Mutex<VecDeque<RpcRequest>>>,
+    queue: Arc<SharedQueue<RpcRequest>>,
+    responses: Arc<SharedQueue<RpcResponse>>,
     ids: Arc<Mutex<RequestIdState>>,
     timeout: Duration,
 }
@@ -23,22 +24,30 @@ static HOST: OnceLock<HostContext> = OnceLock::new();
 pub fn init_stdio_default(next_id: u64, timeout: Duration) {
     let out = Arc::new(Mutex::new(LineWriter::new(std::io::stdout())));
     let stdin = Arc::new(Mutex::new(BufReader::new(std::io::stdin())));
-    let queue = Arc::new(Mutex::new(VecDeque::new()));
+    let queue = Arc::new(SharedQueue::new());
+    let responses = Arc::new(SharedQueue::new());
     let ids = Arc::new(Mutex::new(RequestIdState { next_id }));
-    init_default_stdio_host(out, stdin, queue, ids, timeout);
+    crate::plugin_stdio::start_reader_thread(
+        Arc::clone(&stdin),
+        Arc::clone(&queue),
+        Arc::clone(&responses),
+    );
+    init_default_stdio_host(out, stdin, queue, responses, ids, timeout);
 }
 
 pub fn init_default_stdio_host(
     out: Arc<Mutex<HostStdout>>,
     stdin: Arc<Mutex<HostStdin>>,
-    queue: Arc<Mutex<VecDeque<RpcRequest>>>,
+    queue: Arc<SharedQueue<RpcRequest>>,
+    responses: Arc<SharedQueue<RpcResponse>>,
     ids: Arc<Mutex<RequestIdState>>,
     timeout: Duration,
 ) {
     let _ = HOST.set(HostContext {
         out,
         stdin,
         queue,
+        responses,
         ids,
         timeout,
     });
@@ -58,7 +67,7 @@ pub fn stdin() -> Result<&'static Arc<Mutex<HostStdin>>, PluginError> {
         .stdin)
 }
 
-pub fn queue() -> Result<&'static Arc<Mutex<VecDeque<RpcRequest>>>, PluginError> {
+pub fn queue() -> Result<&'static Arc<SharedQueue<RpcRequest>>, PluginError> {
     Ok(&HOST
         .get()
         .ok_or_else(|| PluginError::code("host.uninitialized", "host not initialized"))?
@@ -82,7 +91,7 @@ pub fn call(method: &str, params: Value) -> Result<Value, PluginError> {
     call_host(
         &ctx.out,
         &ctx.stdin,
-        &ctx.queue,
+        &ctx.responses,
         &ctx.ids,
         method,
         params,

src/lib.rs

@@ -8,7 +8,7 @@ pub use crate::backend_id::BackendId;
 #[doc(hidden)]
 pub use log as __log;
 
-#[cfg(feature = "backend-registry")]
+#[cfg(all(feature = "backend-registry", feature = "vcs"))]
 pub mod backend_descriptor;
 
 #[cfg(feature = "plugin-protocol")]
@@ -273,26 +273,6 @@ pub trait Vcs: Send + Sync {
         Err(VcsError::Unsupported(self.id()))
     }
 
-    // lfs
-    fn lfs_fetch(&self) -> Result<()> {
-        Err(VcsError::Unsupported(self.id()))
-    }
-    fn lfs_pull(&self) -> Result<()> {
-        Err(VcsError::Unsupported(self.id()))
-    }
-    fn lfs_prune(&self) -> Result<()> {
-        Err(VcsError::Unsupported(self.id()))
-    }
-    fn lfs_track(&self, _paths: &[PathBuf]) -> Result<()> {
-        Err(VcsError::Unsupported(self.id()))
-    }
-    fn lfs_untrack(&self, _paths: &[PathBuf]) -> Result<()> {
-        Err(VcsError::Unsupported(self.id()))
-    }
-    fn lfs_is_tracked(&self, _path: &Path) -> Result<bool> {
-        Err(VcsError::Unsupported(self.id()))
-    }
-
     // history operations
     fn cherry_pick(&self, _rev: &str) -> Result<()> {
         Err(VcsError::Unsupported(self.id()))

src/plugin_runtime.rs

@@ -1,9 +1,8 @@
 use crate::models::VcsEvent;
 use crate::plugin_protocol::{PluginMessage, RpcRequest};
 use crate::plugin_stdio::ok_null;
-use crate::plugin_stdio::{PluginError, receive_message, respond_shared, send_message_shared};
+use crate::plugin_stdio::{PluginError, SharedQueue, respond_shared, send_message_shared};
 use std::collections::HashMap;
-use std::collections::VecDeque;
 use std::io::{self, BufReader, LineWriter};
 use std::sync::{Arc, Mutex, OnceLock};
 use std::time::Duration;
@@ -37,32 +36,17 @@ impl PluginCtx {
     }
 }
 
-fn next_request(
-    queue: &Arc<Mutex<VecDeque<RpcRequest>>>,
-    stdin: &Arc<Mutex<BufReader<io::Stdin>>>,
-) -> Option<RpcRequest> {
-    if let Ok(mut q) = queue.lock()
-        && let Some(req) = q.pop_front()
-    {
+fn next_request(queue: &Arc<SharedQueue<RpcRequest>>) -> Option<RpcRequest> {
+    if let Some(req) = queue.pop_now() {
         return Some(req);
     }
 
-    loop {
-        let msg = {
-            let mut lock = stdin.lock().ok()?;
-            receive_message(&mut *lock)?
-        };
-        match msg {
-            PluginMessage::Request(req) => return Some(req),
-            PluginMessage::Response(_) | PluginMessage::Event { .. } => continue,
-        }
-    }
+    queue.pop_wait()
 }
 
 pub struct PluginRuntime {
     ctx: PluginCtx,
-    stdin: Arc<Mutex<BufReader<io::Stdin>>>,
-    queue: Arc<Mutex<VecDeque<RpcRequest>>>,
+    queue: Arc<SharedQueue<RpcRequest>>,
 }
 
 impl PluginRuntime {
@@ -77,20 +61,26 @@ impl PluginRuntime {
 
         let stdout = Arc::new(Mutex::new(LineWriter::new(io::stdout())));
         let stdin = Arc::new(Mutex::new(BufReader::new(io::stdin())));
-        let queue: Arc<Mutex<VecDeque<RpcRequest>>> = Arc::new(Mutex::new(VecDeque::new()));
+        let queue: Arc<SharedQueue<RpcRequest>> = Arc::new(SharedQueue::new());
+        let responses = Arc::new(SharedQueue::new());
         let ids = Arc::new(Mutex::new(crate::plugin_stdio::RequestIdState { next_id }));
+        crate::plugin_stdio::start_reader_thread(
+            Arc::clone(&stdin),
+            Arc::clone(&queue),
+            Arc::clone(&responses),
+        );
 
         crate::host::init_default_stdio_host(
             Arc::clone(&stdout),
             Arc::clone(&stdin),
             Arc::clone(&queue),
+            Arc::clone(&responses),
             Arc::clone(&ids),
             timeout,
         );
 
         Self {
             ctx: PluginCtx { stdout },
-            stdin,
             queue,
         }
     }
@@ -103,7 +93,7 @@ impl PluginRuntime {
         &mut self,
         mut handle: impl FnMut(&mut PluginCtx, RpcRequest) -> HandlerResult,
     ) -> io::Result<bool> {
-        let Some(req) = next_request(&self.queue, &self.stdin) else {
+        let Some(req) = next_request(&self.queue) else {
             return Ok(false);
         };
         let id = req.id;