chore: reduce lint and type-check noise #187

Merged
didericis merged 32 commits from feat/linting-and-type-fixes into main 2026-06-04 12:24:39 -04:00
7 changed files with 20 additions and 13 deletions
Showing only changes of commit 0bf1532557 - Show all commits
+2 -2
View File
@@ -23,7 +23,7 @@ class DockerBottle(Bottle):
): ):
self.name = container self.name = container
self._teardown = teardown self._teardown = teardown
self._prompt_path = prompt_path_in_container self.prompt_path = prompt_path_in_container
self._agent_prompt_mode = agent_prompt_mode self._agent_prompt_mode = agent_prompt_mode
self.agent_command = agent_command self.agent_command = agent_command
self.agent_provider_template = ( self.agent_provider_template = (
@@ -36,7 +36,7 @@ class DockerBottle(Bottle):
) -> list[str]: ) -> list[str]:
full_argv = list(argv) full_argv = list(argv)
full_argv.extend( full_argv.extend(
prompt_args(self._agent_prompt_mode, self._prompt_path, argv=full_argv) prompt_args(self._agent_prompt_mode, self.prompt_path, argv=full_argv)
) )
cmd = ["docker", "exec"] cmd = ["docker", "exec"]
if tty: if tty:
+2 -2
View File
@@ -80,7 +80,7 @@ _REPO_DIR = str(Path(__file__).resolve().parent.parent.parent.parent)
def launch( def launch(
plan: DockerBottlePlan, plan: DockerBottlePlan,
*, *,
provision: Callable[[DockerBottlePlan, str], str | None], provision: Callable[[DockerBottlePlan, "DockerBottle"], str | None],
) -> Generator[DockerBottle, None, None]: ) -> Generator[DockerBottle, None, None]:
"""Build, launch, and provision a Docker bottle via compose. """Build, launch, and provision a Docker bottle via compose.
Teardown on exit.""" Teardown on exit."""
@@ -218,7 +218,7 @@ def launch(
agent_command=plan.agent_command, agent_command=plan.agent_command,
agent_prompt_mode=plan.agent_prompt_mode, agent_prompt_mode=plan.agent_prompt_mode,
) )
bottle._prompt_path = provision(plan, bottle) bottle.prompt_path = provision(plan, bottle)
# Step 9: yield. exec_agent continues to use `docker exec -it` # Step 9: yield. exec_agent continues to use `docker exec -it`
# — the agent runs `sleep infinity` per the renderer's # — the agent runs `sleep infinity` per the renderer's
+2 -2
View File
@@ -72,7 +72,7 @@ class SmolmachinesBottle(Bottle):
# In-VM path to the agent's prompt file. None when the # In-VM path to the agent's prompt file. None when the
# agent declared no prompt (file still exists; we just # agent declared no prompt (file still exists; we just
# don't pass --append-system-prompt-file). # don't pass --append-system-prompt-file).
self._prompt_path = prompt_path self.prompt_path = prompt_path
# Env vars the agent process needs (HTTPS_PROXY, # Env vars the agent process needs (HTTPS_PROXY,
# CLAUDE_CODE_OAUTH_TOKEN, manifest-declared bottle env, …). # CLAUDE_CODE_OAUTH_TOKEN, manifest-declared bottle env, …).
# Forwarded on every `smolvm machine exec` via `-e K=V` # Forwarded on every `smolvm machine exec` via `-e K=V`
@@ -93,7 +93,7 @@ class SmolmachinesBottle(Bottle):
agent_tail = ["env", *_env_assignments_for("node", self._guest_env), agent_tail = ["env", *_env_assignments_for("node", self._guest_env),
self.agent_command] self.agent_command]
provider_prompt_args = prompt_args( provider_prompt_args = prompt_args(
self._agent_prompt_mode, self._prompt_path, argv=argv, self._agent_prompt_mode, self.prompt_path, argv=argv,
) )
if self._agent_prompt_mode == "read_prompt_file": if self._agent_prompt_mode == "read_prompt_file":
agent_tail += argv agent_tail += argv
+2 -2
View File
@@ -89,7 +89,7 @@ _SUPERVISE_PORT = SUPERVISE_PORT
def launch( def launch(
plan: SmolmachinesBottlePlan, plan: SmolmachinesBottlePlan,
*, *,
provision: Callable[[SmolmachinesBottlePlan, str], str | None], provision: Callable[[SmolmachinesBottlePlan, "SmolmachinesBottle"], str | None],
) -> Generator[SmolmachinesBottle, None, None]: ) -> Generator[SmolmachinesBottle, None, None]:
"""Build + run the bottle and yield a handle; tear everything """Build + run the bottle and yield a handle; tear everything
down on exit. Errors during bringup unwind any partial state down on exit. Errors during bringup unwind any partial state
@@ -120,7 +120,7 @@ def launch(
agent_command=plan.agent_command, agent_command=plan.agent_command,
agent_prompt_mode=plan.agent_prompt_mode, agent_prompt_mode=plan.agent_prompt_mode,
) )
bottle._prompt_path = provision(plan, bottle) bottle.prompt_path = provision(plan, bottle)
yield bottle yield bottle
finally: finally:
@@ -42,7 +42,7 @@ import time
import uuid import uuid
from contextlib import contextmanager from contextlib import contextmanager
from dataclasses import dataclass from dataclasses import dataclass
from typing import Iterator from typing import Generator, Iterator
from ...log import die from ...log import die
@@ -98,7 +98,7 @@ class RegistryHandle:
@contextmanager @contextmanager
def ephemeral_registry() -> Iterator[RegistryHandle]: def ephemeral_registry() -> Generator[RegistryHandle, None, None]:
"""Bring up a per-session docker network + a `registry:2.8.3` """Bring up a per-session docker network + a `registry:2.8.3`
container on it (published on a random host port), yield a container on it (published on a random host port), yield a
`RegistryHandle`, force-remove both on exit. `RegistryHandle`, force-remove both on exit.
@@ -123,7 +123,7 @@ def main(argv: list[str]) -> int:
machine = argv[0] machine = argv[0]
inner = argv[2:] inner = argv[2:]
def sync(*_args) -> None: def sync(*_args: int) -> None:
size = _read_winsize() size = _read_winsize()
if size is None: if size is None:
return return
+9 -2
View File
@@ -13,8 +13,15 @@ DEFAULT_WORKSPACE_MODE = "755"
class WorkspaceSpec(Protocol): class WorkspaceSpec(Protocol):
copy_cwd: bool @property
user_cwd: str def copy_cwd(self) -> bool:
"""Whether to copy the current working directory."""
...
@property
def user_cwd(self) -> str:
"""The user's current working directory."""
...
@dataclass(frozen=True) @dataclass(frozen=True)