bytecii
3293cb5ff4
Two cleanup-plan items, both Python-side.
Item 29 -- `mirage mcp`. TypeScript shipped a six-tool stdio MCP server;
Python had none, so a pip-install user could not point Cursor or Claude
Desktop at a workspace and `mirage --help` differed by distribution.
Adding the entry point alone would have duplicated the tools, because
this side kept them private inside the Claude Agent SDK integration, so
the shared layer comes first:
- agents/tool_descriptions.py -- the six strings, one copy.
- agents/tool_operations.py -- MirageToolOperations, lifted out of the
SDK server's private _MirageTools.
- agents/file_version.py -- stale-write protection, which this side
lacked entirely. TS stamps stored bytes; here the stamp covers the
rendered bytes, because this read tool has always rendered and an
edit must search what the agent was actually shown.
- agents/mcp/server.py + cli/mcp.py -- the server and `mirage mcp`.
- server/workspace_config.py -- config discovery (candidates, env
names, walk up from cwd), which Python had nowhere, so every entry
point had to be handed an explicit path.
The server is the low-level MCP Server rather than FastMCP: FastMCP does
not forward a version, and TS advertises one. Handlers are bound methods,
not decorated closures, so nothing nests.
Item 28 -- the mypy allowlist. 54 modules opted *in* to annotation
checking against 1826, so the default was unchecked and every new file
joined the unchecked side. The default is now strict, with a list of
what is not yet annotated that only shrinks. 166 annotations cleared
along the way; the remainder is named module by module.
Two real defects surfaced by the annotations, neither of them typing:
- Workspace._original_open / _original_os were invented by assignment
in lifecycle.patch_process, so unpatch without a patch raised
AttributeError. Declared, and the restore is guarded.
- sed_generic declared a non-optional writer while its own docstring
and its `write_bytes is None` branch said otherwise; the builder
passes None whenever the backend cannot write.
Tests keep the PathSpec rule instead of full strict: measured, full
strict on python/tests is 2374 errors, of which 634 are `str` where a
pydantic field declares SecretStr -- which pydantic coerces at runtime --
and most of the rest is the monkeypatched-fake pattern CLAUDE.md
sanctions. The rule that is violated for real is PathSpec, 19 times, and
scripts/check_test_pathspec.py now holds that line. One of the 19 was a
latent AttributeError: tests/e2e passes a str to s3 write_bytes, which
reads .mount_path, and the test skips without a live versioned bucket.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
86 lines
2.7 KiB
Python
86 lines
2.7 KiB
Python
import dataclasses
|
|
from typing import Any
|
|
|
|
from pydantic import BaseModel, ConfigDict
|
|
|
|
from mirage.accessor.nextcloud import NextcloudAccessor
|
|
from mirage.commands.builtin.nextcloud import COMMANDS as NEXTCLOUD_COMMANDS
|
|
from mirage.core.nextcloud.constants import SCOPE_ERROR
|
|
from mirage.core.nextcloud.readdir import readdir
|
|
from mirage.core.nextcloud.watch import build_delta_hook
|
|
from mirage.ops.nextcloud import OPS as NEXTCLOUD_OPS
|
|
from mirage.resource.base import BaseResource
|
|
from mirage.resource.nextcloud.prompt import PROMPT
|
|
from mirage.types import PathSpec, ResourceName
|
|
from mirage.utils.glob_walk import make_resolve_glob
|
|
from mirage.utils.key_prefix import mount_key
|
|
from mirage.watch.base import DeltaHook
|
|
|
|
_resolve_glob = make_resolve_glob(readdir, SCOPE_ERROR)
|
|
|
|
_NEXTCLOUD_OPS: dict[str, Any] = {}
|
|
|
|
|
|
class NextcloudConfig(BaseModel):
|
|
model_config = ConfigDict(frozen=True)
|
|
|
|
url: str
|
|
username: str | None = None
|
|
password: str | None = None
|
|
verify_ssl: bool = True
|
|
timeout: int = 30
|
|
|
|
|
|
class NextcloudResource(BaseResource):
|
|
|
|
accessor: NextcloudAccessor
|
|
name: str = ResourceName.NEXTCLOUD
|
|
caches_reads: bool = True
|
|
# WebDAV PROPFIND carries getcontentlength for every file; readdir
|
|
# backfills any lister-omitted size with one stat per affected file.
|
|
SIZES_ALWAYS_KNOWN: bool = True
|
|
_ops: dict[str, Any] = _NEXTCLOUD_OPS
|
|
PROMPT: str = PROMPT
|
|
SUPPORTS_SNAPSHOT: bool = True
|
|
|
|
def __init__(self, config: NextcloudConfig) -> None:
|
|
super().__init__()
|
|
self.config = config
|
|
self.accessor = NextcloudAccessor(self.config)
|
|
for fn in NEXTCLOUD_COMMANDS:
|
|
self.register(fn)
|
|
for op in NEXTCLOUD_OPS:
|
|
self.register_op(op)
|
|
|
|
def delta_hook(self) -> DeltaHook:
|
|
return build_delta_hook(self.accessor)
|
|
|
|
async def resolve_glob(
|
|
self,
|
|
paths: list[str | PathSpec],
|
|
prefix: str = '',
|
|
) -> list[PathSpec]:
|
|
if prefix:
|
|
paths = [
|
|
dataclasses.replace(p,
|
|
resource_path=mount_key(p.virtual, prefix))
|
|
if isinstance(p, PathSpec) else p for p in paths
|
|
]
|
|
return await _resolve_glob(self.accessor, paths, self._index)
|
|
|
|
def get_state(self) -> dict[str, Any]:
|
|
redacted = ["password"]
|
|
cfg = self.config.model_dump()
|
|
for f in redacted:
|
|
if cfg.get(f) is not None:
|
|
cfg[f] = "<REDACTED>"
|
|
return {
|
|
"type": self.name,
|
|
"needs_override": True,
|
|
"redacted_fields": redacted,
|
|
"config": cfg,
|
|
}
|
|
|
|
def load_state(self, state: dict[str, Any]) -> None:
|
|
pass
|