execweave 0.8.9__tar.gz → 0.8.11__tar.gz

{execweave-0.8.9 → execweave-0.8.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: execweave
-Version: 0.8.9
+Version: 0.8.11
 Summary: Turn AI-agent runtime behavior into a local interactive execution graph.
 Project-URL: Homepage, https://github.com/Irish-kw/ExecWeave
 Project-URL: Repository, https://github.com/Irish-kw/ExecWeave
@@ -85,7 +85,7 @@ ExecWeave is a source-available, local-first observability project that turns AI
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-This README documents **v0.8.9**. It includes dagre route-point rendering and post-layout port recomputation, with provider graph/history/raw contracts verified across Ubuntu, macOS, and Windows.
+This README documents **v0.8.11**. This release makes managed local `ollama serve` capture fail-safe for independent loopback clients, so a later `ollama run`, SDK, or `curl` request from another terminal is recorded in the same semantic stream instead of silently falling back without conversation evidence. It also finalizes merged events, `graph.json`, and `viewer.html` when a Live run is stopped with Ctrl+C.
 
 ## Why ExecWeave
 
@@ -126,7 +126,11 @@ execweave live --open -- python my_agent.py
 
 > **Approve the hook when prompted.** On the first provider-integrated run, the Agent/IDE may ask whether ExecWeave may enable its local hook integration. Choose **Allow / Yes**. Without approval, OS-runtime telemetry can still work, but provider-level tool, model, conversation, and supplied-content visibility may be reduced or unavailable.
 
-Google Antigravity currently uses the `agy` CLI command; ExecWeave also accepts `antigravity` as a friendly alias and resolves it to `agy`. For Cursor, `execweave live --open -- cursor` first tries a normal PATH launcher, then falls back to the standard desktop application binary on macOS and Windows.
+Google Antigravity currently uses the `agy` CLI command; ExecWeave also accepts `antigravity` as a friendly alias and resolves it to `agy`.
+
+For Cursor on Windows, bare `cursor` follows the PATH entry the user actually has and, when it is the normal `.../resources/app/bin/cursor.cmd` shim, derives the matching `Cursor.exe` from that same installation root. This works for custom drives and arbitrary install directories; explicit launcher paths are left untouched. macOS/Windows standard desktop paths remain a fallback when the PATH shim cannot identify the desktop binary.
+
+For a managed local Ollama server, `execweave live --open -- ollama serve` owns the public loopback endpoint and relays the real server through an internal loopback port. A later `ollama run`, Ollama SDK request, OpenAI-compatible client, or `curl` started from another terminal can therefore appear in the same ExecWeave semantic stream even though that client is not a child of the `ollama serve` process. ExecWeave prints the active public-to-internal relay mapping; if the public loopback endpoint cannot be safely reserved, the managed run now fails explicitly rather than silently losing conversation capture. Relay mode is deliberately limited to local `localhost` / `127.0.0.1` binds; external, wildcard, and IPv6 exposure is not rewritten. Stopping Live with Ctrl+C still finalizes the run artifacts before returning.
 
 Build finalized run artifacts with:
 
@@ -170,9 +174,9 @@ These are presentation-layer changes. Raw graph evidence is unchanged, and Live,
 | Claude Code | Yes | native hooks + full-fidelity supplied hook content + exact subagent results when exposed |
 | OpenAI Codex | Yes | lifecycle hooks + validated rollout transcripts + agent-local task/message/final-response routing |
 | Google Antigravity / Antigravity CLI | Yes | passive native hooks + validated conversation/subagent routing where exposed |
-| Cursor | Yes | native hooks + exact subagent task/summary routing when exposed |
+| Cursor | Yes | native hooks + exact subagent task/summary routing when exposed; Windows bare-launch resolution follows the actual PATH installation |
 | OpenCode | Yes | project plugin + session/task routing + full-fidelity supplied plugin content |
-| Ollama | Yes | `execweave-model-runtime event/exchange/probe --runtime ollama` |
+| Ollama | Yes | managed local `ollama serve` loopback relay + `execweave-model-runtime event/exchange/probe --runtime ollama` |
 | llama.cpp | Yes | `execweave-model-runtime event/exchange/probe --runtime llamacpp` |
 | vLLM | Yes | `execweave-model-runtime event/exchange/probe --runtime vllm` |
 | LM Studio | Only when the local process is launched under ExecWeave | `execweave-model-runtime event/exchange/probe --runtime lmstudio` |

{execweave-0.8.9 → execweave-0.8.11}/README.de.md

@@ -32,7 +32,7 @@ ExecWeave ist ein source-available, local-first Observability-Projekt, das Aktiv
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-Dieses README dokumentiert **v0.8.9**.
+Dieses README dokumentiert **v0.8.11**.
 
 ## Warum ExecWeave
 

{execweave-0.8.9 → execweave-0.8.11}/README.fr.md

@@ -32,7 +32,7 @@ ExecWeave est un projet d’observabilité source-available et local-first qui t
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-Ce README décrit **v0.8.9**.
+Ce README décrit **v0.8.11**.
 
 ## Pourquoi ExecWeave
 

{execweave-0.8.9 → execweave-0.8.11}/README.ja.md

@@ -32,7 +32,7 @@ ExecWeave は source-available / local-first の observability プロジェク
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-この README は **v0.8.9** を説明します。
+この README は **v0.8.11** を説明します。
 
 ## ExecWeave を使う理由
 

{execweave-0.8.9 → execweave-0.8.11}/README.ko.md

@@ -32,7 +32,7 @@ ExecWeave는 source-available, local-first observability 프로젝트입니다.
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-이 README는 **v0.8.9**을 설명합니다.
+이 README는 **v0.8.11**을 설명합니다.
 
 ## 왜 ExecWeave인가
 

{execweave-0.8.9 → execweave-0.8.11}/README.md

@@ -32,7 +32,7 @@ ExecWeave is a source-available, local-first observability project that turns AI
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-This README documents **v0.8.9**. It includes dagre route-point rendering and post-layout port recomputation, with provider graph/history/raw contracts verified across Ubuntu, macOS, and Windows.
+This README documents **v0.8.11**. This release makes managed local `ollama serve` capture fail-safe for independent loopback clients, so a later `ollama run`, SDK, or `curl` request from another terminal is recorded in the same semantic stream instead of silently falling back without conversation evidence. It also finalizes merged events, `graph.json`, and `viewer.html` when a Live run is stopped with Ctrl+C.
 
 ## Why ExecWeave
 
@@ -73,7 +73,11 @@ execweave live --open -- python my_agent.py
 
 > **Approve the hook when prompted.** On the first provider-integrated run, the Agent/IDE may ask whether ExecWeave may enable its local hook integration. Choose **Allow / Yes**. Without approval, OS-runtime telemetry can still work, but provider-level tool, model, conversation, and supplied-content visibility may be reduced or unavailable.
 
-Google Antigravity currently uses the `agy` CLI command; ExecWeave also accepts `antigravity` as a friendly alias and resolves it to `agy`. For Cursor, `execweave live --open -- cursor` first tries a normal PATH launcher, then falls back to the standard desktop application binary on macOS and Windows.
+Google Antigravity currently uses the `agy` CLI command; ExecWeave also accepts `antigravity` as a friendly alias and resolves it to `agy`.
+
+For Cursor on Windows, bare `cursor` follows the PATH entry the user actually has and, when it is the normal `.../resources/app/bin/cursor.cmd` shim, derives the matching `Cursor.exe` from that same installation root. This works for custom drives and arbitrary install directories; explicit launcher paths are left untouched. macOS/Windows standard desktop paths remain a fallback when the PATH shim cannot identify the desktop binary.
+
+For a managed local Ollama server, `execweave live --open -- ollama serve` owns the public loopback endpoint and relays the real server through an internal loopback port. A later `ollama run`, Ollama SDK request, OpenAI-compatible client, or `curl` started from another terminal can therefore appear in the same ExecWeave semantic stream even though that client is not a child of the `ollama serve` process. ExecWeave prints the active public-to-internal relay mapping; if the public loopback endpoint cannot be safely reserved, the managed run now fails explicitly rather than silently losing conversation capture. Relay mode is deliberately limited to local `localhost` / `127.0.0.1` binds; external, wildcard, and IPv6 exposure is not rewritten. Stopping Live with Ctrl+C still finalizes the run artifacts before returning.
 
 Build finalized run artifacts with:
 
@@ -117,9 +121,9 @@ These are presentation-layer changes. Raw graph evidence is unchanged, and Live,
 | Claude Code | Yes | native hooks + full-fidelity supplied hook content + exact subagent results when exposed |
 | OpenAI Codex | Yes | lifecycle hooks + validated rollout transcripts + agent-local task/message/final-response routing |
 | Google Antigravity / Antigravity CLI | Yes | passive native hooks + validated conversation/subagent routing where exposed |
-| Cursor | Yes | native hooks + exact subagent task/summary routing when exposed |
+| Cursor | Yes | native hooks + exact subagent task/summary routing when exposed; Windows bare-launch resolution follows the actual PATH installation |
 | OpenCode | Yes | project plugin + session/task routing + full-fidelity supplied plugin content |
-| Ollama | Yes | `execweave-model-runtime event/exchange/probe --runtime ollama` |
+| Ollama | Yes | managed local `ollama serve` loopback relay + `execweave-model-runtime event/exchange/probe --runtime ollama` |
 | llama.cpp | Yes | `execweave-model-runtime event/exchange/probe --runtime llamacpp` |
 | vLLM | Yes | `execweave-model-runtime event/exchange/probe --runtime vllm` |
 | LM Studio | Only when the local process is launched under ExecWeave | `execweave-model-runtime event/exchange/probe --runtime lmstudio` |

{execweave-0.8.9 → execweave-0.8.11}/README.ru.md

@@ -32,7 +32,7 @@ ExecWeave — source-available, local-first проект наблюдаемос
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-Этот README описывает **v0.8.9**.
+Этот README описывает **v0.8.11**.
 
 ## Почему ExecWeave
 

{execweave-0.8.9 → execweave-0.8.11}/README.zh-CN.md

@@ -32,7 +32,7 @@ ExecWeave 是一个 source-available、local-first 的可观测性项目，把 A
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-本 README 对应 **v0.8.9**。
+本 README 对应 **v0.8.11**。
 
 ## 为什么是 ExecWeave
 

{execweave-0.8.9 → execweave-0.8.11}/README.zh-TW.md

@@ -32,7 +32,7 @@ ExecWeave 是一個 source-available、local-first 的可觀測性專案，會
   <img src="docs/assets/codex.gif" alt="ExecWeave animated live demo" width="100%">
 </p>
 
-本 README 對應 **v0.8.9**。
+本 README 對應 **v0.8.11**。
 
 ## 為什麼是 ExecWeave
 

{execweave-0.8.9 → execweave-0.8.11}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execweave"
-# ExecWeave v0.8.9 release metadata
-version = "0.8.9"
+# ExecWeave v0.8.11 release metadata
+version = "0.8.11"
 description = "Turn AI-agent runtime behavior into a local interactive execution graph."
 readme = "README.md"
 requires-python = ">=3.10"

{execweave-0.8.9 → execweave-0.8.11}/src/execweave/__init__.py

@@ -1,3 +1,3 @@
 """ExecWeave runtime graph package."""
 
-__version__ = "0.8.9"
+__version__ = "0.8.11"

{execweave-0.8.9 → execweave-0.8.11}/src/execweave/auto_specialized.py

@@ -2,12 +2,14 @@ from __future__ import annotations
 
 import json
 import os
+import socket
+import sys
 import threading
 import time
 from contextlib import contextmanager
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Iterator
+from typing import Any, Iterator
 from urllib.error import HTTPError, URLError
 from urllib.parse import urlsplit, urlunsplit
 from urllib.request import Request, urlopen
@@ -22,6 +24,18 @@ from .model_runtime import (
 
 _SEMANTIC_ENV = "EXECWEAVE_SEMANTIC_SIDECAR"
 _OLLAMA_DEFAULT_ENDPOINT = "http://127.0.0.1:11434"
+_OLLAMA_INFERENCE_PATHS = frozenset(
+    {
+        "/api/chat",
+        "/api/generate",
+        "/api/embed",
+        "/api/embeddings",
+        "/v1/chat/completions",
+        "/v1/completions",
+        "/v1/embeddings",
+        "/v1/responses",
+    }
+)
 _PROBE_INTERVAL_SECONDS = 0.50
 _PROBE_TIMEOUT_SECONDS = 0.35
 _PROBE_STARTUP_GRACE_SECONDS = 0.10
@@ -132,6 +146,45 @@ def _ollama_endpoint_from_environment() -> str | None:
     return _local_endpoint(hostname, port)
 
 
+def _ollama_serve_relay_address() -> tuple[str, int] | None:
+    """Return a loopback endpoint ExecWeave can safely own for ``ollama serve``."""
+    raw = os.environ.get("OLLAMA_HOST", "").strip()
+    if not raw:
+        return ("127.0.0.1", 11434)
+    candidate = raw if "://" in raw else f"http://{raw}"
+    try:
+        parsed = urlsplit(candidate)
+        port = parsed.port or 11434
+    except ValueError:
+        return None
+    if parsed.scheme != "http" or parsed.username is not None or parsed.password is not None:
+        return None
+    if parsed.path not in {"", "/"} or parsed.query or parsed.fragment:
+        return None
+    hostname = parsed.hostname
+    # Do not silently narrow wildcard/external/IPv6 exposure to IPv4 loopback.
+    if hostname not in {"127.0.0.1", "localhost"} or not (1 <= port <= 65535):
+        return None
+    return ("127.0.0.1", port)
+
+
+def _allocate_loopback_port() -> int:
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        sock.bind(("127.0.0.1", 0))
+        return int(sock.getsockname()[1])
+
+
+def _record_ollama_inference_exchange(config: Any, **kwargs: Any) -> None:
+    """Record inference exchanges while still relaying every Ollama API route."""
+    method = str(kwargs.get("method", "")).upper()
+    request_path = str(kwargs.get("request_path", ""))
+    if method != "POST" or urlsplit(request_path).path not in _OLLAMA_INFERENCE_PATHS:
+        return
+    from .http_proxy import record_exchange_fail_open
+
+    record_exchange_fail_open(config, **kwargs)
+
+
 def _lmstudio_post_probe_spec(command: list[str]) -> _ProbeSpec | None:
     if not _is_lmstudio_server_start(command):
         return None
@@ -248,12 +301,7 @@ def _run_ollama_probe(
 
 
 def prepare_post_command_specialized_probe(command: list[str]) -> _ProbeSpec | None:
-    """Prepare an attribution-safe post-command probe for short-lived launch CLIs.
-
-    LM Studio's `lms server start` exits after starting a persistent server. ExecWeave
-    only prepares this probe when the user supplied an explicit local port and no
-    compatible API is already observable at that endpoint before launch.
-    """
+    """Prepare an attribution-safe post-command probe for short-lived launch CLIs."""
     spec = _lmstudio_post_probe_spec(command)
     if spec is None:
         return None
@@ -292,40 +340,119 @@ def run_post_command_specialized_probe(
                 time.sleep(_POST_PROBE_RETRY_SECONDS)
 
 
-
 @contextmanager
-def auto_specialized_launch(command: list[str]) -> Iterator[dict[str, str]]:
-    """Prepare child-only launch wiring for supported transparent local integrations."""
+def auto_specialized_launch(
+    command: list[str],
+    *,
+    server_relay: bool = False,
+) -> Iterator[dict[str, str]]:
+    """Prepare child launch wiring for supported transparent local integrations.
+
+    ``server_relay`` is deliberately opt-in so direct library callers preserve the
+    existing contract. RuntimeCollector enables it for a real managed server run.
+    """
     environment = dict(os.environ)
     configured_sidecar = os.environ.get(_SEMANTIC_ENV)
-    if not configured_sidecar or not _is_ollama_run(command):
-        yield environment
-        return
-    upstream = _ollama_endpoint_from_environment()
-    if upstream is None:
+    wants_run_relay = _is_ollama_run(command)
+    wants_serve_relay = server_relay and _is_ollama_serve(command)
+    if not configured_sidecar or not (wants_run_relay or wants_serve_relay):
         yield environment
         return
 
     from .http_proxy import ExecWeaveHTTPProxyServer, ProxyConfig
 
     sidecar = Path(configured_sidecar).expanduser().resolve()
+
+    if wants_run_relay:
+        upstream = _ollama_endpoint_from_environment()
+        if upstream is None:
+            yield environment
+            return
+        try:
+            server = ExecWeaveHTTPProxyServer(
+                ("127.0.0.1", 0),
+                ProxyConfig(upstream=upstream, sidecar=sidecar, mode="ollama"),
+                recorder=_record_ollama_inference_exchange,
+            )
+        except OSError:
+            yield environment
+            return
+        thread = threading.Thread(
+            target=server.serve_forever,
+            kwargs={"poll_interval": 0.05},
+            name="execweave-ollama-run-relay",
+            daemon=True,
+        )
+        thread.start()
+        host, port = server.server_address[:2]
+        environment["OLLAMA_HOST"] = f"http://{host}:{port}"
+        try:
+            yield environment
+        finally:
+            server.shutdown()
+            server.server_close()
+            thread.join(timeout=2.0)
+        return
+
+    listen_address = _ollama_serve_relay_address()
+    if listen_address is None:
+        yield environment
+        return
+    listen_host, listen_port = listen_address
+    public_endpoint = f"http://{listen_host}:{listen_port}"
     try:
-        server = ExecWeaveHTTPProxyServer(
-            ("127.0.0.1", 0),
-            ProxyConfig(upstream=upstream, sidecar=sidecar, mode="ollama"),
+        existing = _get_json(
+            f"{public_endpoint}/api/ps",
+            timeout=_PROBE_TIMEOUT_SECONDS,
+        )
+    except _PROBE_ERRORS:
+        existing = None
+    if isinstance(existing, dict) and isinstance(existing.get("models"), list):
+        print(
+            "ExecWeave Ollama relay: existing Ollama server detected at "
+            f"{public_endpoint}; leaving that server unclaimed.",
+            file=sys.stderr,
         )
-    except OSError:
         yield environment
         return
+
+    internal_port = _allocate_loopback_port()
+    upstream = f"http://127.0.0.1:{internal_port}"
+    server: ExecWeaveHTTPProxyServer | None = None
+    last_bind_error: OSError | None = None
+    for attempt in range(5):
+        try:
+            server = ExecWeaveHTTPProxyServer(
+                (listen_host, listen_port),
+                ProxyConfig(upstream=upstream, sidecar=sidecar, mode="ollama"),
+                recorder=_record_ollama_inference_exchange,
+            )
+            break
+        except OSError as exc:
+            last_bind_error = exc
+            if attempt < 4:
+                time.sleep(0.05)
+    if server is None:
+        raise RuntimeError(
+            "ExecWeave could not reserve the Ollama endpoint "
+            f"{public_endpoint} for transparent conversation capture. "
+            "Stop any existing Ollama server using that endpoint or set "
+            "OLLAMA_HOST to a free loopback port before starting "
+            "`execweave live -- ollama serve`."
+        ) from last_bind_error
     thread = threading.Thread(
         target=server.serve_forever,
         kwargs={"poll_interval": 0.05},
-        name="execweave-ollama-run-relay",
+        name="execweave-ollama-serve-relay",
         daemon=True,
     )
     thread.start()
-    host, port = server.server_address[:2]
-    environment["OLLAMA_HOST"] = f"http://{host}:{port}"
+    environment["OLLAMA_HOST"] = upstream
+    print(
+        "ExecWeave Ollama relay: "
+        f"http://{listen_host}:{listen_port} -> {upstream}",
+        file=sys.stderr,
+    )
     try:
         yield environment
     finally:
@@ -336,12 +463,7 @@ def auto_specialized_launch(command: list[str]) -> Iterator[dict[str, str]]:
 
 @contextmanager
 def auto_specialized_probe(command: list[str]) -> Iterator[None]:
-    """Run supported local specialized probes without affecting command execution.
-
-    The probe activates only when a caller supplies ExecWeave's per-run semantic
-    sidecar environment variable. Auto-probing is limited to known local server
-    launch commands and loopback endpoints. All failures are fail-open.
-    """
+    """Run supported local specialized probes without affecting command execution."""
     configured_sidecar = os.environ.get(_SEMANTIC_ENV)
     spec = _probe_spec(command)
     if not configured_sidecar or spec is None:

{execweave-0.8.9 → execweave-0.8.11}/src/execweave/collector.py

@@ -9,6 +9,7 @@ from typing import Iterable
 
 import psutil
 
+from . import __version__
 from .auto_specialized import (
     auto_specialized_launch,
     auto_specialized_probe,
@@ -139,6 +140,7 @@ class RuntimeCollector:
                 "command": command,
                 "cwd": str(self.watch_root),
                 "backend": self.backend_name,
+                "execweave_version": __version__,
             },
         )
         self.sink.emit(
@@ -148,7 +150,11 @@ class RuntimeCollector:
                 relation="STARTED_SESSION",
                 source=agent,
                 target=session,
-                attributes={"collector_pid": os.getpid(), "backend": self.backend_name},
+                attributes={
+                    "collector_pid": os.getpid(),
+                    "backend": self.backend_name,
+                    "execweave_version": __version__,
+                },
             )
         )
 
@@ -166,31 +172,42 @@ class RuntimeCollector:
 
         process: subprocess.Popen[bytes] | None = None
         return_code = 1
+        interrupted = False
         post_command_probe = prepare_post_command_specialized_probe(command)
         try:
-            with auto_specialized_launch(command) as launch_environment:
-                process = subprocess.Popen(
-                    launch_command,
-                    cwd=str(self.watch_root),
-                    env=launch_environment,
-                )
-                root = psutil.Process(process.pid)
-                snapshot = _safe_process_snapshot(root)
-                if snapshot is not None:
-                    self._record_process_start(snapshot, parent=session, relation="LAUNCHED")
+            try:
+                with auto_specialized_launch(
+                    command,
+                    server_relay=True,
+                ) as launch_environment:
+                    process = subprocess.Popen(
+                        launch_command,
+                        cwd=str(self.watch_root),
+                        env=launch_environment,
+                    )
+                    root = psutil.Process(process.pid)
+                    snapshot = _safe_process_snapshot(root)
+                    if snapshot is not None:
+                        self._record_process_start(snapshot, parent=session, relation="LAUNCHED")
+
+                    with auto_specialized_probe(command):
+                        while process.poll() is None:
+                            self._sample_process_tree(root)
+                            time.sleep(self.poll_interval)
 
-                with auto_specialized_probe(command):
-                    while process.poll() is None:
                         self._sample_process_tree(root)
-                        time.sleep(self.poll_interval)
-
-                    self._sample_process_tree(root)
-                    self._mark_disappeared_processes(set())
-                return_code = int(process.returncode or 0)
-            run_post_command_specialized_probe(
-                post_command_probe,
-                return_code=return_code,
-            )
+                        self._mark_disappeared_processes(set())
+                    return_code = int(process.returncode or 0)
+            except KeyboardInterrupt:
+                interrupted = True
+                return_code = 130
+                if process is not None:
+                    self._terminate_process_tree(process)
+            if not interrupted:
+                run_post_command_specialized_probe(
+                    post_command_probe,
+                    return_code=return_code,
+                )
             return return_code
         finally:
             if watcher is not None:
@@ -205,10 +222,53 @@ class RuntimeCollector:
                         "return_code": return_code,
                         "root_pid": process.pid if process is not None else None,
                         "backend": self.backend_name,
+                        "interrupted": interrupted,
+                        "execweave_version": __version__,
                     },
                 )
             )
 
+    @staticmethod
+    def _terminate_process_tree(process: subprocess.Popen[bytes]) -> None:
+        descendants: list[psutil.Process] = []
+        try:
+            root = psutil.Process(process.pid)
+            descendants = root.children(recursive=True)
+        except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+            pass
+
+        for child in reversed(descendants):
+            try:
+                child.terminate()
+            except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                pass
+
+        if process.poll() is None:
+            try:
+                process.terminate()
+            except OSError:
+                pass
+
+        if descendants:
+            _, alive = psutil.wait_procs(descendants, timeout=2.0)
+            for child in alive:
+                try:
+                    child.kill()
+                except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                    pass
+
+        try:
+            process.wait(timeout=2.0)
+        except subprocess.TimeoutExpired:
+            try:
+                process.kill()
+            except OSError:
+                return
+            try:
+                process.wait(timeout=2.0)
+            except subprocess.TimeoutExpired:
+                pass
+
     def _sample_process_tree(self, root: psutil.Process) -> None:
         processes: list[psutil.Process] = []
         try:

{execweave-0.8.9 → execweave-0.8.11}/src/execweave/command.py

@@ -37,7 +37,35 @@ def _cursor_desktop_candidates() -> list[Path]:
     return []
 
 
-def _resolve_cursor_desktop() -> str | None:
+def _prefer_cursor_desktop_launcher() -> bool:
+    return os.name == "nt"
+
+
+def _cursor_desktop_from_launcher(launcher: str | None) -> str | None:
+    """Resolve Cursor.exe beside a VS Code-style PATH shim."""
+    if not launcher:
+        return None
+    path = Path(launcher).expanduser()
+    bin_dir = path.parent
+    app_dir = bin_dir.parent
+    resources_dir = app_dir.parent
+    install_root = resources_dir.parent
+    if (
+        bin_dir.name.lower() != "bin"
+        or app_dir.name.lower() != "app"
+        or resources_dir.name.lower() != "resources"
+    ):
+        return None
+    candidate = install_root / "Cursor.exe"
+    if candidate.is_file():
+        return str(candidate.resolve())
+    return None
+
+
+def _resolve_cursor_desktop(*, path_launcher: str | None = None) -> str | None:
+    derived = _cursor_desktop_from_launcher(path_launcher)
+    if derived is not None:
+        return derived
     for candidate in _cursor_desktop_candidates():
         if candidate.is_file():
             return str(candidate.resolve())
@@ -54,16 +82,21 @@ def _resolve_executable(executable: str, *, path: str | None = None) -> str:
             raise FileNotFoundError(f"command executable not found: {executable!r}")
         resolved = str(candidate.resolve())
     else:
-        resolved = shutil.which(executable, path=path)
-        if resolved is None and executable.lower() == "cursor":
-            resolved = _resolve_cursor_desktop()
+        path_launcher = shutil.which(executable, path=path)
+        if executable.lower() == "cursor" and _prefer_cursor_desktop_launcher():
+            resolved = _resolve_cursor_desktop(path_launcher=path_launcher) or path_launcher
+        else:
+            resolved = path_launcher
+            if resolved is None and executable.lower() == "cursor":
+                resolved = _resolve_cursor_desktop()
         if resolved is None and executable.lower() == "antigravity":
             resolved = shutil.which("agy", path=path)
         if resolved is None:
             detail = ""
             if executable.lower() == "cursor":
                 detail = (
-                    "; ExecWeave also checked the standard Cursor desktop-app install paths"
+                    "; ExecWeave also checked the Cursor desktop binary beside the PATH "
+                    "launcher and the standard desktop-app install paths"
                 )
             elif executable.lower() == "antigravity":
                 detail = "; the current Antigravity CLI executable is 'agy'"
@@ -83,9 +116,15 @@ def resolve_launch_command(command: list[str], *, path: str | None = None) -> li
     ExecWeave launches commands without ``shell=True``. Normal executables use PATH
     lookup. On Windows, PATHEXT keeps npm-style ``.cmd``/``.bat`` launchers working.
 
-    ``cursor`` additionally falls back to the standard macOS/Windows desktop app
-    binaries when no CLI launcher exists on PATH. ``antigravity`` is accepted as a
-    friendly alias for Google's current Antigravity CLI executable, ``agy``.
+    Bare ``cursor`` on Windows prefers the desktop application binary. ExecWeave
+    first derives ``Cursor.exe`` from a VS Code-style PATH shim such as
+    ``<install>/resources/app/bin/cursor.cmd`` and then checks standard desktop
+    install paths. This keeps the GUI process and provider hooks in the ExecWeave
+    launch environment instead of treating a short-lived CLI shim as the observed
+    application lifetime. Explicit launcher paths are never rewritten.
+
+    ``antigravity`` is accepted as a friendly alias for Google's current
+    Antigravity CLI executable, ``agy``.
 
     An explicitly supplied PowerShell ``.ps1`` file is launched through pwsh or
     Windows PowerShell because CreateProcess cannot execute a PowerShell script by

{execweave-0.8.9 → execweave-0.8.11}/src/execweave/strace_backend.py

@@ -653,7 +653,10 @@ class StraceRuntimeCollector:
         ]
         return_code = 1
         try:
-            with auto_specialized_launch(command) as launch_environment:
+            with auto_specialized_launch(
+                command,
+                server_relay=True,
+            ) as launch_environment:
                 completed = subprocess.run(
                     strace_command,
                     cwd=str(self.watch_root),