scrybe-cli 0.6.2__tar.gz → 0.6.3__tar.gz

{scrybe_cli-0.6.2 → scrybe_cli-0.6.3}/Cargo.lock

@@ -3915,7 +3915,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scrybe-app"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "dirs 5.0.1",
@@ -3943,7 +3943,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-cli"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -3961,7 +3961,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-core"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "blake3",
@@ -3978,7 +3978,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-mcp-client"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "dirs 5.0.1",
@@ -3993,7 +3993,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-mcp-server"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -4013,7 +4013,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-mermaid"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -4030,7 +4030,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-mermaid-render"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "hex",
@@ -4040,7 +4040,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-py"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -4054,7 +4054,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-ratatui"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "ratatui",
  "scrybe-core",
@@ -4062,7 +4062,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-render"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "pulldown-cmark",
@@ -4075,7 +4075,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-rpc"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "serde",
  "serde_json",
@@ -4084,7 +4084,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-tools"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "scrybe-core",
@@ -4102,7 +4102,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-tui"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -4114,7 +4114,7 @@ dependencies = [
 
 [[package]]
 name = "scrybe-vcs"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "anyhow",
  "chrono",

{scrybe_cli-0.6.2 → scrybe_cli-0.6.3}/Cargo.toml

@@ -6,7 +6,7 @@ members = ["scrybe-core", "scrybe-render", "scrybe-mcp-server", "scrybe-mermaid"
 # `version.workspace = true`, so a release bumps all crates in lock-step
 # from one place. (See RELEASE.md; issue #128.)
 [workspace.package]
-version = "0.6.2"
+version = "0.6.3"
 
 # Workspace-level dependency pins keep all crates in lock-step.
 [workspace.dependencies]
@@ -60,17 +60,17 @@ 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.6.2" }
-scrybe-render     = { path = "scrybe-render",     version = "=0.6.2" }
-scrybe-mcp-client = { path = "scrybe-mcp-client", version = "=0.6.2" }
-scrybe-mcp-server = { path = "scrybe-mcp-server", version = "=0.6.2" }
-scrybe-mermaid    = { path = "scrybe-mermaid",    version = "=0.6.2" }
-scrybe-vcs        = { path = "scrybe-vcs",        version = "=0.6.2" }
-scrybe-py         = { path = "scrybe-py",         version = "=0.6.2" }
-scrybe-rpc        = { path = "scrybe-rpc",        version = "=0.6.2" }
-scrybe-tools      = { path = "scrybe-tools",      version = "=0.6.2" }
-scrybe-ratatui    = { path = "scrybe-ratatui",    version = "=0.6.2" }
-scrybe-mermaid-render = { path = "scrybe-mermaid-render", version = "=0.6.2" }
+scrybe-core       = { path = "scrybe-core",       version = "=0.6.3" }
+scrybe-render     = { path = "scrybe-render",     version = "=0.6.3" }
+scrybe-mcp-client = { path = "scrybe-mcp-client", version = "=0.6.3" }
+scrybe-mcp-server = { path = "scrybe-mcp-server", version = "=0.6.3" }
+scrybe-mermaid    = { path = "scrybe-mermaid",    version = "=0.6.3" }
+scrybe-vcs        = { path = "scrybe-vcs",        version = "=0.6.3" }
+scrybe-py         = { path = "scrybe-py",         version = "=0.6.3" }
+scrybe-rpc        = { path = "scrybe-rpc",        version = "=0.6.3" }
+scrybe-tools      = { path = "scrybe-tools",      version = "=0.6.3" }
+scrybe-ratatui    = { path = "scrybe-ratatui",    version = "=0.6.3" }
+scrybe-mermaid-render = { path = "scrybe-mermaid-render", version = "=0.6.3" }
 
 # Adopted pure-Rust Mermaid → SVG renderer (#132 spike-Pass, 2026-07-17).
 # SVG-only by default here; the `png` feature (resvg) is opted into per-crate.

{scrybe_cli-0.6.2 → scrybe_cli-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scrybe-cli
-Version: 0.6.2
+Version: 0.6.3
 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.6.2 → scrybe_cli-0.6.3}/pyproject.toml

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

{scrybe_cli-0.6.2 → scrybe_cli-0.6.3}/scrybe-mcp-server/pyproject.toml

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

{scrybe_cli-0.6.2 → scrybe_cli-0.6.3}/scrybe-mermaid/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "scrybe-mermaid"
-version = "0.6.2"
+version = "0.6.3"
 description = "Scrybe Mermaid — standalone PNG iTXt codec (Rust-backed)"
 license = {text = "Apache-2.0"}
 readme = "README.md"

scrybe_cli-0.6.3/scrybe-tools/src/autolaunch.rs

@@ -0,0 +1,228 @@
+// Copyright 2026 Shawn Hartsock and contributors
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
+//! Opt-in auto-launch of the Scrybe desktop app (issue #225).
+//!
+//! A stateful tool (`open`, `state`, `list_tabs`, …) reaches the running editor
+//! over `~/.scrybe/sock`. When nothing is listening, [`crate::LiveApp::call`]
+//! reports `NoApp` and the tool returns a clean `no_live_app` — correct, but it
+//! means "open this file in Scrybe" fails whenever the app happens to be closed.
+//!
+//! This module restores an *opt-in* launch: when `SCRYBE_MCP_AUTOLAUNCH` is set,
+//! a no-app call first tries to start the installed app, waits for its socket,
+//! and retries once. It is **off by default** on purpose — an MCP server
+//! spawning a GUI window is a deliberate choice, not a surprise. It also
+//! deliberately does *not* repeat the old `which scrybe-app` mistake: a cask- or
+//! DMG-installed app lives in a `.app` bundle that is never on `PATH`, so we
+//! resolve it by **install location**, not by `which`.
+
+use std::path::{Path, PathBuf};
+use std::time::Duration;
+
+/// Env var that opts INTO auto-launch. Truthy = `1`/`true`/`yes`/`on`.
+pub const AUTOLAUNCH_ENV: &str = "SCRYBE_MCP_AUTOLAUNCH";
+
+/// Optional explicit `Scrybe.app` bundle path, checked before the standard
+/// install locations (a non-default install, or CI).
+pub const APP_ENV: &str = "SCRYBE_APP";
+
+/// Liveness probes to make after launching before giving up (the app has to
+/// start and bind its socket). 20 × [`POLL_INTERVAL`] ≈ a 5 s budget.
+const DEFAULT_TRIES: u32 = 20;
+/// Delay between liveness probes while waiting for the app to come up.
+const POLL_INTERVAL: Duration = Duration::from_millis(250);
+
+/// Is auto-launch opted in? True only when `SCRYBE_MCP_AUTOLAUNCH` is truthy.
+pub fn enabled() -> bool {
+    is_truthy(std::env::var(AUTOLAUNCH_ENV).ok().as_deref())
+}
+
+fn is_truthy(v: Option<&str>) -> bool {
+    matches!(
+        v.map(|s| s.trim().to_ascii_lowercase()).as_deref(),
+        Some("1" | "true" | "yes" | "on")
+    )
+}
+
+/// Resolve the installed `Scrybe.app`, in priority order:
+/// `$SCRYBE_APP` → `/Applications/Scrybe.app` → `$HOME/Applications/Scrybe.app`.
+///
+/// Pure over the injected `env` lookup and `exists` probe, so the resolution
+/// order is unit-testable without touching the real filesystem.
+pub fn resolve_app(
+    env: impl Fn(&str) -> Option<String>,
+    exists: impl Fn(&Path) -> bool,
+) -> Option<PathBuf> {
+    if let Some(p) = env(APP_ENV) {
+        let p = PathBuf::from(p);
+        if exists(&p) {
+            return Some(p);
+        }
+    }
+    let mut candidates = vec![PathBuf::from("/Applications/Scrybe.app")];
+    if let Some(home) = env("HOME") {
+        candidates.push(PathBuf::from(home).join("Applications/Scrybe.app"));
+    }
+    candidates.into_iter().find(|p| exists(p))
+}
+
+/// Ensure a reachable app, launching it if it is not already up. Pure
+/// orchestration over the injected `is_live` probe, `launch` action, and
+/// `sleep` — no real subprocess, socket, or wall-clock — so the retry/timeout
+/// logic is unit-testable. Returns `true` if the app is (or became) reachable.
+pub fn ensure_running(
+    is_live: impl Fn() -> bool,
+    launch: impl Fn() -> bool,
+    sleep: impl Fn(),
+    tries: u32,
+) -> bool {
+    if is_live() {
+        return true;
+    }
+    if !launch() {
+        return false;
+    }
+    for _ in 0..tries {
+        sleep();
+        if is_live() {
+            return true;
+        }
+    }
+    false
+}
+
+/// Launch the resolved `Scrybe.app` detached and in the background. macOS-only;
+/// returns `false` if no app was found or the spawn failed. On every other OS
+/// auto-launch is a no-op — there is no bundle to `open`.
+pub fn launch_installed_app() -> bool {
+    launch_app(|k| std::env::var(k).ok(), |p| p.exists())
+}
+
+#[cfg(target_os = "macos")]
+fn launch_app(env: impl Fn(&str) -> Option<String>, exists: impl Fn(&Path) -> bool) -> bool {
+    let Some(app) = resolve_app(env, exists) else {
+        return false;
+    };
+    // `open -g` launches the bundle in the background without stealing focus.
+    std::process::Command::new("open")
+        .arg("-g")
+        .arg(&app)
+        .status()
+        .map(|s| s.success())
+        .unwrap_or(false)
+}
+
+#[cfg(not(target_os = "macos"))]
+fn launch_app(_env: impl Fn(&str) -> Option<String>, _exists: impl Fn(&Path) -> bool) -> bool {
+    false
+}
+
+/// The production launch-and-wait the live transport calls on a no-app request:
+/// opt-in gated, launches the installed app, and polls the real socket up to the
+/// budget. Returns `true` if the app became reachable.
+pub fn autolaunch_and_wait() -> bool {
+    if !enabled() {
+        return false;
+    }
+    ensure_running(
+        scrybe_rpc::client::is_live,
+        launch_installed_app,
+        || std::thread::sleep(POLL_INTERVAL),
+        DEFAULT_TRIES,
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::cell::Cell;
+
+    #[test]
+    fn enabled_is_truthy_only_for_yes_values() {
+        for v in ["1", "true", "TRUE", "yes", "on", " on "] {
+            assert!(is_truthy(Some(v)), "{v:?} should be truthy");
+        }
+        for v in ["0", "false", "no", "off", ""] {
+            assert!(!is_truthy(Some(v)), "{v:?} should be falsy");
+        }
+        assert!(!is_truthy(None));
+    }
+
+    #[test]
+    fn resolve_prefers_scrybe_app_env_when_it_exists() {
+        let app = resolve_app(
+            |k| (k == APP_ENV).then(|| "/custom/Scrybe.app".to_string()),
+            |p| p == Path::new("/custom/Scrybe.app"),
+        );
+        assert_eq!(app, Some(PathBuf::from("/custom/Scrybe.app")));
+    }
+
+    #[test]
+    fn resolve_skips_a_missing_env_override_and_falls_through() {
+        let app = resolve_app(
+            |k| (k == APP_ENV).then(|| "/gone/Scrybe.app".to_string()),
+            |p| p == Path::new("/Applications/Scrybe.app"),
+        );
+        assert_eq!(app, Some(PathBuf::from("/Applications/Scrybe.app")));
+    }
+
+    #[test]
+    fn resolve_falls_back_to_system_then_user_applications() {
+        let sys = resolve_app(|_| None, |p| p == Path::new("/Applications/Scrybe.app"));
+        assert_eq!(sys, Some(PathBuf::from("/Applications/Scrybe.app")));
+
+        let user_app = "/Users/me/Applications/Scrybe.app";
+        let user = resolve_app(
+            |k| (k == "HOME").then(|| "/Users/me".to_string()),
+            |p| p == Path::new(user_app),
+        );
+        assert_eq!(user, Some(PathBuf::from(user_app)));
+    }
+
+    #[test]
+    fn resolve_is_none_when_nothing_is_installed() {
+        assert_eq!(resolve_app(|_| None, |_| false), None);
+    }
+
+    #[test]
+    fn ensure_running_short_circuits_without_launching_when_already_live() {
+        let launched = Cell::new(false);
+        let ok = ensure_running(
+            || true,
+            || {
+                launched.set(true);
+                true
+            },
+            || {},
+            20,
+        );
+        assert!(ok);
+        assert!(!launched.get(), "must not launch when already live");
+    }
+
+    #[test]
+    fn ensure_running_is_false_when_launch_fails() {
+        assert!(!ensure_running(|| false, || false, || {}, 20));
+    }
+
+    #[test]
+    fn ensure_running_polls_until_the_app_comes_up() {
+        let ticks = Cell::new(0u32);
+        let ok = ensure_running(
+            || ticks.get() >= 3, // live on the 3rd probe after launch
+            || true,
+            || ticks.set(ticks.get() + 1),
+            20,
+        );
+        assert!(ok);
+        assert_eq!(ticks.get(), 3);
+    }
+
+    #[test]
+    fn ensure_running_gives_up_after_the_budget() {
+        let sleeps = Cell::new(0u32);
+        let ok = ensure_running(|| false, || true, || sleeps.set(sleeps.get() + 1), 5);
+        assert!(!ok);
+        assert_eq!(sleeps.get(), 5, "polls exactly `tries` times then gives up");
+    }
+}

{scrybe_cli-0.6.2 → scrybe_cli-0.6.3}/scrybe-tools/src/lib.rs

@@ -13,6 +13,7 @@
 
 use serde_json::Value;
 
+pub mod autolaunch;
 pub mod figures;
 pub mod lint;
 pub mod schema;
@@ -196,12 +197,33 @@ impl Transport for Headless {
 /// `call` returns `NoApp` and pure tools should fall back to `Headless`.
 pub struct LiveApp;
 
+/// Map a `scrybe-rpc` client result onto the transport error taxonomy: no app
+/// running → [`TransportError::NoApp`], an in-band remote error →
+/// [`TransportError::Remote`], anything else (I/O, timeout, frame) →
+/// [`TransportError::Transport`]. Used for the post-auto-launch retry.
+fn map_send(res: Result<Value, scrybe_rpc::ClientError>) -> Result<Value, TransportError> {
+    match res {
+        Ok(result) => Ok(result),
+        Err(e) if e.is_not_running() => Err(TransportError::NoApp),
+        Err(scrybe_rpc::ClientError::Remote(err)) => Err(TransportError::Remote(err)),
+        Err(e) => Err(TransportError::Transport(e.to_string())),
+    }
+}
+
 impl Transport for LiveApp {
     fn call(&self, method: &str, params: Value) -> Result<Value, TransportError> {
-        match scrybe_rpc::client::send(method, params) {
+        match scrybe_rpc::client::send(method, params.clone()) {
             Ok(result) => Ok(result),
-            // The one blessed no-app check — never message-text matching.
-            Err(e) if e.is_not_running() => Err(TransportError::NoApp),
+            // No app running. If auto-launch is opted in (`SCRYBE_MCP_AUTOLAUNCH`),
+            // start the installed app, wait for its socket, and retry once;
+            // otherwise report NoApp (→ the tool's clean `no_live_app`).
+            Err(e) if e.is_not_running() => {
+                if crate::autolaunch::autolaunch_and_wait() {
+                    map_send(scrybe_rpc::client::send(method, params))
+                } else {
+                    Err(TransportError::NoApp)
+                }
+            }
             // In-band remote error: the app answered. Business, not engine.
             Err(scrybe_rpc::ClientError::Remote(err)) => Err(TransportError::Remote(err)),
             // Everything else (I/O, timeouts, frame/UTF-8/JSON, envelope,