scrybe-cli 0.2.0__tar.gz → 0.4.0__tar.gz

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/Cargo.lock

@@ -3169,9 +3169,9 @@ checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
 
 [[package]]
 name = "pyo3"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12"
+checksum = "cd274650b21d4bfc26a0a47587962c1edb425f69287324355cd040c3ea66071c"
 dependencies = [
  "libc",
  "once_cell",
@@ -3183,18 +3183,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e"
+checksum = "c5e2a7d2f0d013342f295c048ad19237add5154a55b1c5a254c0ec93d4109078"
 dependencies = [
  "target-lexicon 0.13.5",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e"
+checksum = "ca85c467da1bbc8d866eea5deff9cf29ea5f7785054a17da36e65bda9c05845b"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -3202,9 +3202,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813"
+checksum = "9ac53762fd065daa3194dd09337a38bd793a188100fd1a9304c4ab312d901771"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -3214,13 +3214,12 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.28.3"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb"
+checksum = "4ca3a1557399783172dc5bf39cfca835157732532cba56b71d2292161e53b362"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
  "syn 2.0.117",
 ]
@@ -3525,7 +3524,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scrybe-app"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "dirs 5.0.1",
@@ -3543,6 +3542,7 @@ dependencies = [
  "tauri-plugin-dialog",
  "tauri-plugin-shell",
  "tauri-plugin-single-instance",
+ "tempfile",
  "thiserror 2.0.18",
  "tokio",
  "tracing",
@@ -3551,7 +3551,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-cli"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -3570,7 +3570,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-core"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "blake3",
@@ -3587,7 +3587,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-mcp-client"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "dirs 5.0.1",
@@ -3602,24 +3602,27 @@ dependencies = [
 
 [[package]]
 name = "scrybe-mcp-server"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "clap",
  "scrybe-core",
  "scrybe-mermaid",
  "scrybe-render",
+ "scrybe-rpc",
  "serde",
  "serde_json",
+ "tempfile",
  "thiserror 2.0.18",
  "tokio",
  "tracing",
  "tracing-subscriber",
+ "which",
 ]
 
 [[package]]
 name = "scrybe-mermaid"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3635,7 +3638,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-py"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -3649,7 +3652,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-render"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "pulldown-cmark",
@@ -3662,7 +3665,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-rpc"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -3671,7 +3674,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-vcs"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "chrono",

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/Cargo.toml

@@ -2,6 +2,12 @@
 resolver = "2"
 members = ["scrybe-core", "scrybe-render", "scrybe-mcp-server", "scrybe-mermaid", "scrybe-cli", "scrybe-rpc"]
 
+# Shared package metadata. Every member inherits the version via
+# `version.workspace = true`, so a release bumps all crates in lock-step
+# from one place. (See RELEASE.md; issue #128.)
+[workspace.package]
+version = "0.4.0"
+
 # Workspace-level dependency pins keep all crates in lock-step.
 [workspace.dependencies]
 # Core utilities
@@ -43,7 +49,7 @@ png = "0.17"
 base64 = "0.22"
 
 # PyO3
-pyo3 = { version = "0.28", features = ["auto-initialize"] }
+pyo3 = { version = "0.29", features = ["auto-initialize"] }
 
 # Tauri 2
 tauri = { version = "2", features = ["protocol-asset"] }
@@ -52,14 +58,14 @@ tauri-build = { version = "2", features = [] }
 # Internal crates — version pinned (=) so cargo publish accepts the
 # tarballs (path-deps without versions are rejected at publish time).
 # Workspace lock-step: every release bumps all members together.
-scrybe-core       = { path = "scrybe-core",       version = "=0.2.0" }
-scrybe-render     = { path = "scrybe-render",     version = "=0.2.0" }
-scrybe-mcp-client = { path = "scrybe-mcp-client", version = "=0.2.0" }
-scrybe-mcp-server = { path = "scrybe-mcp-server", version = "=0.2.0" }
-scrybe-mermaid    = { path = "scrybe-mermaid",    version = "=0.2.0" }
-scrybe-vcs        = { path = "scrybe-vcs",        version = "=0.2.0" }
-scrybe-py         = { path = "scrybe-py",         version = "=0.2.0" }
-scrybe-rpc        = { path = "scrybe-rpc",        version = "=0.2.0" }
+scrybe-core       = { path = "scrybe-core",       version = "=0.4.0" }
+scrybe-render     = { path = "scrybe-render",     version = "=0.4.0" }
+scrybe-mcp-client = { path = "scrybe-mcp-client", version = "=0.4.0" }
+scrybe-mcp-server = { path = "scrybe-mcp-server", version = "=0.4.0" }
+scrybe-mermaid    = { path = "scrybe-mermaid",    version = "=0.4.0" }
+scrybe-vcs        = { path = "scrybe-vcs",        version = "=0.4.0" }
+scrybe-py         = { path = "scrybe-py",         version = "=0.4.0" }
+scrybe-rpc        = { path = "scrybe-rpc",        version = "=0.4.0" }
 
 [workspace.lints.clippy]
 explicit_iter_loop     = "warn"

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrybe-cli
-Version: 0.2.0
+Version: 0.4.0
 Summary: Scrybe CLI — headless Markdown render/lint/mermaid tool (binary wheel)
 Home-Page: https://github.com/hartsock/scrybe
 License: Apache-2.0

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "scrybe-cli"
-version = "0.2.0"
+version = "0.4.0"
 description = "Scrybe CLI — headless Markdown render/lint/mermaid tool (binary wheel)"
 license = {text = "Apache-2.0"}
 readme = "README.md"

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/scrybe-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scrybe-cli"
-version = "0.2.0"
+version.workspace = true
 edition = "2021"
 description = "Scrybe CLI — headless render/lint/mermaid/panel command-line tool"
 license = "Apache-2.0"

scrybe_cli-0.4.0/scrybe-cli/src/rpc_client.rs

@@ -0,0 +1,27 @@
+//! Thin JSON-RPC client to talk to the running Scrybe GUI.
+//!
+//! The implementation now lives in [`scrybe_rpc::client`] so the CLI and the
+//! MCP server dial the live app through **one** shared dialer (two divergent
+//! clients is exactly the split `scrybe-rpc` exists to prevent). This module
+//! re-exports it to keep the existing `rpc_client::*` call sites unchanged.
+
+pub use scrybe_rpc::client::{is_live, send, send_to, socket_path, try_connect, try_connect_at};
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn socket_path_reexported() {
+        // The re-export links and resolves to the shared implementation.
+        assert!(!socket_path().as_os_str().is_empty());
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn send_to_errors_when_no_server() {
+        let path = std::path::PathBuf::from("/tmp/scrybe-nonexistent-sock-cli-reexport-test");
+        let err = send_to(&path, "open", serde_json::json!({"path": "/tmp/foo.md"})).unwrap_err();
+        assert!(err.contains("no Scrybe running"));
+    }
+}

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/scrybe-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scrybe-core"
-version = "0.2.0"
+version.workspace = true
 edition = "2021"
 description = "Scrybe core — AST, Document, ContentAddressable, Plugin trait, Workspace"
 license = "Apache-2.0"

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/scrybe-mcp-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scrybe-mcp-server"
-version = "0.2.0"
+version.workspace = true
 edition = "2021"
 description = "Scrybe MCP server — inbound MCP tools: open/read/section/edit/diff/find/embed/lint"
 license = "Apache-2.0"
@@ -18,6 +18,7 @@ path = "src/main.rs"
 scrybe-core.workspace = true
 scrybe-render.workspace = true
 scrybe-mermaid.workspace = true
+scrybe-rpc.workspace = true
 anyhow.workspace = true
 thiserror.workspace = true
 serde.workspace = true
@@ -26,6 +27,11 @@ tracing.workspace = true
 tracing-subscriber.workspace = true
 tokio.workspace = true
 clap.workspace = true
+which.workspace = true
+
+[dev-dependencies]
+tempfile = "3"
+serde_json.workspace = true
 
 [lints]
 workspace = true

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/scrybe-mcp-server/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "scrybe-mcp-server"
-version = "0.2.0"
+version = "0.4.0"
 description = "Scrybe MCP server — standalone inbound MCP server (binary wheel)"
 license = {text = "Apache-2.0"}
 readme = "README.md"

{scrybe_cli-0.2.0 → scrybe_cli-0.4.0}/scrybe-mcp-server/src/server.rs

@@ -89,16 +89,29 @@ impl McpServer {
                 let name = params["name"].as_str()?;
                 let args = params.get("arguments").unwrap_or(&Value::Null);
                 let content = self.registry.call_tool(name, args);
+                // A tool result carrying an `error` field is a failed call; set
+                // `isError` so agents can tell success from failure structurally
+                // instead of parsing the text payload.
+                let is_error = content.get("error").is_some();
                 serde_json::json!({
-                    "content": [{"type": "text", "text": content.to_string()}]
+                    "content": [{"type": "text", "text": content.to_string()}],
+                    "isError": is_error,
                 })
             }
-            other => serde_json::json!({
-                "error": {
-                    "code": -32601,
-                    "message": format!("method not found: {other}")
-                }
-            }),
+            other => {
+                // Unknown method → a real top-level JSON-RPC error object,
+                // sibling to `id` (never nested under `result`).
+                return id.map(|i| {
+                    serde_json::json!({
+                        "jsonrpc": "2.0",
+                        "id": i,
+                        "error": {
+                            "code": -32601,
+                            "message": format!("method not found: {other}")
+                        }
+                    })
+                });
+            }
         };
 
         id.map(|i| {
@@ -207,16 +220,42 @@ mod tests {
     }
 
     #[test]
-    fn test_unknown_method_with_id_returns_error_result() {
+    fn test_unknown_method_returns_top_level_error() {
         let mut s = server();
         let req = json!({"jsonrpc": "2.0", "id": 7, "method": "nonexistent"});
         let resp = s.handle(&req).unwrap();
+        // JSON-RPC error MUST be top-level, not nested under `result`.
+        assert_eq!(resp["error"]["code"], -32601);
         assert!(
-            resp["result"]["error"].is_object() || resp.get("error").is_some(),
-            "expected error in response: {resp}"
+            resp.get("result").is_none(),
+            "error response must not carry a result: {resp}"
         );
     }
 
+    #[test]
+    fn test_tools_call_failure_sets_is_error() {
+        // `read` with an unknown id returns an error payload → isError: true.
+        let mut s = server();
+        let req = json!({
+            "jsonrpc": "2.0", "id": 9, "method": "tools/call",
+            "params": {"name": "read", "arguments": {"id": "bogus-id"}}
+        });
+        let resp = s.handle(&req).unwrap();
+        assert_eq!(resp["result"]["isError"], true);
+    }
+
+    #[test]
+    fn test_tools_call_success_is_not_error() {
+        // A successful render carries no error field → isError: false.
+        let mut s = server();
+        let req = json!({
+            "jsonrpc": "2.0", "id": 10, "method": "tools/call",
+            "params": {"name": "render", "arguments": {"source": "# Hi"}}
+        });
+        let resp = s.handle(&req).unwrap();
+        assert_eq!(resp["result"]["isError"], false);
+    }
+
     #[test]
     fn test_jsonrpc_version_in_response() {
         let mut s = server();