diff --git a/pkgs/clan-app/clan_app/deps/webview/webview.py b/pkgs/clan-app/clan_app/deps/webview/webview.py
index 70c66035c..81a2ee7b5 100644
--- a/pkgs/clan-app/clan_app/deps/webview/webview.py
+++ b/pkgs/clan-app/clan_app/deps/webview/webview.py
@@ -8,7 +8,6 @@ from dataclasses import dataclass
 from enum import IntEnum
 from typing import Any
 
-from clan_cli.async_run import set_should_cancel
 from clan_lib.api import (
     ApiError,
     ErrorDataClass,
@@ -16,6 +15,7 @@ from clan_lib.api import (
     dataclass_to_dict,
     from_dict,
 )
+from clan_lib.async_run import set_should_cancel
 
 from ._webview_ffi import _encode_c_string, _webview_lib
 
diff --git a/pkgs/clan-cli/clan_cli/machines/update.py b/pkgs/clan-cli/clan_cli/machines/update.py
index 6efcebf92..ecc3af02d 100644
--- a/pkgs/clan-cli/clan_cli/machines/update.py
+++ b/pkgs/clan-cli/clan_cli/machines/update.py
@@ -8,12 +8,12 @@ import sys
 from contextlib import ExitStack
 
 from clan_lib.api import API
+from clan_lib.async_run import AsyncContext, AsyncOpts, AsyncRuntime, is_async_cancelled
 from clan_lib.cmd import Log, MsgColor, RunOpts, run
 from clan_lib.colors import AnsiColor
 from clan_lib.errors import ClanError
 from clan_lib.nix import nix_command, nix_config, nix_metadata
 
-from clan_cli.async_run import AsyncContext, AsyncOpts, AsyncRuntime, is_async_cancelled
 from clan_cli.completions import (
     add_dynamic_completer,
     complete_machines,
diff --git a/pkgs/clan-cli/clan_cli/ssh/deploy_info.py b/pkgs/clan-cli/clan_cli/ssh/deploy_info.py
index 88e1ad053..4528b568b 100644
--- a/pkgs/clan-cli/clan_cli/ssh/deploy_info.py
+++ b/pkgs/clan-cli/clan_cli/ssh/deploy_info.py
@@ -6,11 +6,11 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
 
+from clan_lib.async_run import AsyncRuntime
 from clan_lib.cmd import run
 from clan_lib.errors import ClanError
 from clan_lib.nix import nix_shell
 
-from clan_cli.async_run import AsyncRuntime
 from clan_cli.completions import (
     add_dynamic_completer,
     complete_machines,
diff --git a/pkgs/clan-cli/clan_cli/ssh/tor.py b/pkgs/clan-cli/clan_cli/ssh/tor.py
index 6b5cb57f4..3a87f1d11 100755
--- a/pkgs/clan-cli/clan_cli/ssh/tor.py
+++ b/pkgs/clan-cli/clan_cli/ssh/tor.py
@@ -7,12 +7,11 @@ import struct
 import time
 from dataclasses import dataclass
 
+from clan_lib.async_run import AsyncRuntime
 from clan_lib.cmd import Log, RunOpts, run
 from clan_lib.errors import TorConnectionError, TorSocksError
 from clan_lib.nix import nix_shell
 
-from clan_cli.async_run import AsyncRuntime
-
 log = logging.getLogger(__name__)
 
 
diff --git a/pkgs/clan-cli/clan_cli/tests/runtime.py b/pkgs/clan-cli/clan_cli/tests/runtime.py
index a13a992ff..e305ac527 100644
--- a/pkgs/clan-cli/clan_cli/tests/runtime.py
+++ b/pkgs/clan-cli/clan_cli/tests/runtime.py
@@ -1,5 +1,5 @@
 import pytest
-from clan_cli.async_run import AsyncRuntime
+from clan_lib.async_run import AsyncRuntime
 
 
 @pytest.fixture
diff --git a/pkgs/clan-cli/clan_cli/tests/test_ssh_local.py b/pkgs/clan-cli/clan_cli/tests/test_ssh_local.py
index 91f2c0dbf..ba2183945 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_ssh_local.py
+++ b/pkgs/clan-cli/clan_cli/tests/test_ssh_local.py
@@ -1,5 +1,5 @@
-from clan_cli.async_run import AsyncRuntime
 from clan_cli.ssh.host import Host
+from clan_lib.async_run import AsyncRuntime
 from clan_lib.cmd import ClanCmdTimeoutError, Log, RunOpts
 
 host = Host("some_host")
diff --git a/pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py b/pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py
index 6f42ef6f3..289a8ecab 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py
+++ b/pkgs/clan-cli/clan_cli/tests/test_ssh_remote.py
@@ -4,10 +4,10 @@ from collections.abc import Generator
 from typing import Any, NamedTuple
 
 import pytest
-from clan_cli.async_run import AsyncRuntime
 from clan_cli.ssh.host import Host
 from clan_cli.ssh.host_key import HostKeyCheck
 from clan_cli.ssh.parse import parse_deployment_address
+from clan_lib.async_run import AsyncRuntime
 from clan_lib.cmd import ClanCmdTimeoutError, Log, RunOpts
 from clan_lib.errors import ClanError, CmdOut
 
diff --git a/pkgs/clan-cli/clan_cli/async_run.py b/pkgs/clan-cli/clan_lib/async_run/__init__.py
similarity index 100%
rename from pkgs/clan-cli/clan_cli/async_run.py
rename to pkgs/clan-cli/clan_lib/async_run/__init__.py
diff --git a/pkgs/clan-cli/clan_lib/cmd/__init__.py b/pkgs/clan-cli/clan_lib/cmd/__init__.py
index cfdb57226..edf493b72 100644
--- a/pkgs/clan-cli/clan_lib/cmd/__init__.py
+++ b/pkgs/clan-cli/clan_lib/cmd/__init__.py
@@ -18,9 +18,9 @@ from enum import Enum
 from pathlib import Path
 from typing import IO, Any
 
-from clan_cli.async_run import get_async_ctx, is_async_cancelled
 from clan_cli.custom_logger import print_trace
 
+from clan_lib.async_run import get_async_ctx, is_async_cancelled
 from clan_lib.colors import Color
 from clan_lib.errors import ClanCmdError, ClanError, CmdOut, indent_command