xcorecli 2.1.0__tar.gz → 2.2.0__tar.gz

{xcorecli-2.1.0 → xcorecli-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: xcorecli
-Version: 2.1.0
+Version: 2.2.0
 Summary: CLI for xcore — configuration, plugins, monitoring
 Requires-Python: >=3.12
 Requires-Dist: alembic>=1.18.0

{xcorecli-2.1.0 → xcorecli-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "xcorecli"
-version = "2.1.0"
+version = "2.2.0"
 description = "CLI for xcore — configuration, plugins, monitoring"
 readme = "README.md"
 requires-python = ">=3.12"

{xcorecli-2.1.0 → xcorecli-2.2.0}/uv.lock

@@ -782,7 +782,7 @@ wheels = [
 
 [[package]]
 name = "xcorecli"
-version = "2.0.0"
+version = "2.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "alembic" },

{xcorecli-2.1.0 → xcorecli-2.2.0}/xcli/plugin/install_commands.py

@@ -10,7 +10,7 @@ from typer import Typer
 
 from xcli._credentials import get_api_key, get_signing_key
 
-from .shared import console, marketplace_install_url, plugins_dir
+from .shared import console, marketplace_install_url, parse_x_repo, plugins_dir, record_install
 
 
 def _verify_signature(zip_bytes: bytes, x_signature: str, signing_key: str) -> bool:
@@ -127,6 +127,20 @@ def _marketplace_install(name: str, version: str) -> None:
 
     console.print(f'[green]✓[/green] [cyan]{x_plugin}[/cyan] installed in [dim]{dest}[/dim]')
 
+    resolved_version = x_plugin.rsplit('@', 1)[-1] if '@' in x_plugin else version
+    repository, ref = parse_x_repo(resp.headers.get('X-Repo'))
+    record_install(
+        name,
+        {
+            'source': 'marketplace',
+            'slug': name,
+            'kind': 'plugin',
+            'version': resolved_version,
+            'repository': repository,
+            'ref': ref,
+        },
+    )
+
 
 def _install_from_url(name: str, url: str, source_type: str) -> None:
     import io
@@ -139,7 +153,9 @@ def _install_from_url(name: str, url: str, source_type: str) -> None:
         shutil.rmtree(dest)
     dest.mkdir(parents=True, exist_ok=True)
 
-    if source_type == 'git' or url.endswith('.git'):
+    resolved_ref: Optional[str] = None
+    used_git = source_type == 'git' or url.endswith('.git')
+    if used_git:
         import subprocess
 
         console.print(f'  Cloning [dim]{url}[/dim]...')
@@ -147,6 +163,14 @@ def _install_from_url(name: str, url: str, source_type: str) -> None:
         if result.returncode != 0:
             console.print(f'[red]git clone failed:[/red] {result.stderr.decode().strip()}')
             raise typer.Exit(1)
+        # --depth=1 leaves HEAD at whatever the clone resolved (default
+        # branch tip, since no ref was requested) — pin the registry entry
+        # to that exact commit rather than a mutable branch name, so a
+        # later `xcore-agent build` re-resolving from it gets the same code.
+        head = subprocess.run(
+            ['git', '-C', str(dest), 'rev-parse', 'HEAD'], capture_output=True, text=True
+        )
+        resolved_ref = head.stdout.strip() if head.returncode == 0 else None
     else:
         import urllib.request
 
@@ -176,6 +200,18 @@ def _install_from_url(name: str, url: str, source_type: str) -> None:
 
     console.print(f'[green]✓[/green] [cyan]{name}[/cyan] installed in [dim]{dest}[/dim]')
 
+    record_install(
+        name,
+        {
+            'source': 'git' if used_git else 'zip',
+            'slug': name,
+            'kind': 'plugin',
+            'version': None,
+            'repository': url if used_git else None,
+            'ref': resolved_ref,
+        },
+    )
+
 
 # Module-level (not a closure inside register()) so the exact same function
 # object can be registered a second time as the top-level `xcli install`

{xcorecli-2.1.0 → xcorecli-2.2.0}/xcli/plugin/marketplace_commands.py

@@ -6,6 +6,8 @@ import httpx
 import typer
 from typer import Typer
 
+from xcli._credentials import get_api_key
+
 from .shared import console, marketplace_api_base
 
 # Contrat réel du backend (app/marketplace/src/routes/plugins.py) — pas le
@@ -90,6 +92,45 @@ def register(app: Typer) -> None:
             return
         _table(items, f'Search results — {query}')
 
+    @app.command('mine')
+    def mine() -> None:
+        """List YOUR plugins on the marketplace — public and private alike.
+
+        `browse`/`search` above only ever see public plugins: they call
+        GET /plugins unauthenticated, and the server only widens that to a
+        caller's own private plugins for a JWT session — which `xcli` never
+        holds (even after `xcli login`, which saves an API key + signing
+        key via a device-code flow, never a browser session token). This
+        command instead calls GET /plugins/mine with X-API-Key — the same
+        auth `xcli plugin install` already uses successfully to fetch a
+        private plugin you own, now also available for listing them.
+        """
+        api_key = get_api_key()
+        if not api_key:
+            console.print('[red]API key missing.[/red] Run: [cyan]xcli login[/cyan] or [cyan]xcli config set api-key xdk_...[/cyan]')
+            raise typer.Exit(1)
+
+        url = f'{marketplace_api_base()}{_LIST_PATH}/mine'
+        with console.status('Fetching your plugins...'):
+            try:
+                resp = httpx.get(url, headers={'X-API-Key': api_key}, timeout=15, follow_redirects=True)
+                resp.raise_for_status()
+            except httpx.HTTPStatusError as exc:
+                if exc.response.status_code == 401:
+                    console.print('[red]Invalid or revoked API key.[/red] Run: [cyan]xcli login[/cyan]')
+                else:
+                    console.print(f'[red]HTTP {exc.response.status_code}:[/red] {exc.response.text[:200]}')
+                raise typer.Exit(1)
+            except httpx.RequestError as exc:
+                console.print(f'[red]Network error:[/red] {exc}')
+                raise typer.Exit(1)
+
+        items = resp.json() or []
+        if not items:
+            console.print('[yellow]No plugins yet.[/yellow] Publish one: [dim]xcli plugin marketplace info <slug>[/dim]')
+            return
+        _table(items, f'Your Plugins ({len(items)})')
+
     @app.command('info')
     def info(slug: str) -> None:
         """Show full details for a marketplace plugin before installing."""

xcorecli-2.2.0/xcli/plugin/shared.py

@@ -0,0 +1,107 @@
+from __future__ import annotations
+
+import json
+import re
+from datetime import datetime, timezone
+from pathlib import Path
+from typing import Any, Optional
+
+from rich.console import Console
+from rich.tree import Tree
+
+from xcli.config.runtime import load_raw_config, plugins_directory
+
+console = Console()
+name_re = re.compile(r'^[a-z][a-z0-9_]*$')
+
+_DEFAULT_MARKETPLACE_API = 'https://marketplace.xcorehub.dev'
+
+
+def marketplace_api_base() -> str:
+    """Return the marketplace API base URL from integration.yaml, with fallback.
+
+    `integration.yaml`'s `marketplace.url` is conventionally a bare domain
+    (`marketplace.xcorehub.dev`, no scheme — see the backend's own
+    integration.yaml) since it's also used to build the CORS allow-list.
+    Used directly as an HTTP base URL that would produce a scheme-less,
+    unusable URL for httpx — always ensure a scheme here rather than assume
+    every caller of this config value remembers to add one.
+    """
+    try:
+        cfg = load_raw_config(required=False)
+        marketplace = cfg.get('marketplace', {})
+        url = str(marketplace.get('api_url') or marketplace.get('url') or _DEFAULT_MARKETPLACE_API).rstrip('/')
+    except Exception:
+        url = _DEFAULT_MARKETPLACE_API
+    if not url.startswith(('http://', 'https://')):
+        url = f'https://{url}'
+    return url
+
+
+def marketplace_install_url(name: str, version: str) -> str:
+    return f'{marketplace_api_base()}/app/marketplace/plugins/{name}/install?version={version}'
+
+
+def plugins_dir() -> Path:
+    return plugins_directory()
+
+
+def registry_path() -> Path:
+    """`.xcore-registry.json` — a sibling of every installed plugin
+    directory, one entry per plugin name, recording how it got there
+    (marketplace/git/zip + repository + pinned ref when known). Read by
+    xcore-agent's packer at build time (see packer.builder._read_registry_
+    source) as a fallback for a plugin with no explicit `source:` of its
+    own in plugin.yaml — this is what lets `xcore-agent build` resolve a
+    plugin from its real origin at deploy time automatically, instead of
+    an operator hand-writing `source:` after every `xcli plugin install`."""
+    return plugins_dir() / ".xcore-registry.json"
+
+
+def record_install(name: str, entry: dict[str, Any]) -> None:
+    """Add/replace this plugin's entry in the registry. Best-effort: a
+    write failure here must never fail the install itself (the plugin is
+    already on disk and usable — the registry only makes a later `xcore-
+    agent build` smarter, it's not required for the plugin to work)."""
+    path = registry_path()
+    try:
+        registry = json.loads(path.read_text()) if path.is_file() else {}
+        if not isinstance(registry, dict):
+            registry = {}
+    except (OSError, ValueError):
+        registry = {}
+    registry[name] = {**entry, "installed_at": datetime.now(timezone.utc).isoformat()}
+    try:
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.write_text(json.dumps(registry, indent=2, sort_keys=True) + "\n")
+    except OSError as exc:
+        console.print(f"[dim yellow]Note: couldn't update {path.name}: {exc}[/dim yellow]")
+
+
+def parse_x_repo(header_value: Optional[str]) -> tuple[Optional[str], Optional[str]]:
+    """Parse the marketplace install endpoint's `X-Repo: owner/repo@ref`
+    response header into (repository_url, ref). Returns (None, None) if the
+    header is absent or malformed — callers must treat that as 'unknown
+    origin', never guess."""
+    if not header_value or "@" not in header_value:
+        return None, None
+    repo_part, _, ref_part = header_value.rpartition("@")
+    if not repo_part or not ref_part:
+        return None, None
+    return f"https://github.com/{repo_part}", ref_part
+
+
+def print_tree(root: Path, created: list[Path]) -> None:
+    tree = Tree(f'[bold green]{root.name}/[/bold green]')
+    dirs: dict[str, Tree] = {}
+    for path in sorted(created):
+        rel = path.relative_to(root)
+        parts = rel.parts
+        current = tree
+        for i, part in enumerate(parts[:-1]):
+            key = '/'.join(parts[: i + 1])
+            if key not in dirs:
+                dirs[key] = current.add(f'[cyan]{part}/[/cyan]')
+            current = dirs[key]
+        current.add(f'[white]{parts[-1]}[/white]')
+    console.print(tree)

xcorecli-2.1.0/xcli/plugin/shared.py

@@ -1,59 +0,0 @@
-from __future__ import annotations
-
-import re
-from pathlib import Path
-
-from rich.console import Console
-from rich.tree import Tree
-
-from xcli.config.runtime import load_raw_config, plugins_directory
-
-console = Console()
-name_re = re.compile(r'^[a-z][a-z0-9_]*$')
-
-_DEFAULT_MARKETPLACE_API = 'https://marketplace.xcorehub.dev'
-
-
-def marketplace_api_base() -> str:
-    """Return the marketplace API base URL from integration.yaml, with fallback.
-
-    `integration.yaml`'s `marketplace.url` is conventionally a bare domain
-    (`marketplace.xcorehub.dev`, no scheme — see the backend's own
-    integration.yaml) since it's also used to build the CORS allow-list.
-    Used directly as an HTTP base URL that would produce a scheme-less,
-    unusable URL for httpx — always ensure a scheme here rather than assume
-    every caller of this config value remembers to add one.
-    """
-    try:
-        cfg = load_raw_config(required=False)
-        marketplace = cfg.get('marketplace', {})
-        url = str(marketplace.get('api_url') or marketplace.get('url') or _DEFAULT_MARKETPLACE_API).rstrip('/')
-    except Exception:
-        url = _DEFAULT_MARKETPLACE_API
-    if not url.startswith(('http://', 'https://')):
-        url = f'https://{url}'
-    return url
-
-
-def marketplace_install_url(name: str, version: str) -> str:
-    return f'{marketplace_api_base()}/app/marketplace/plugins/{name}/install?version={version}'
-
-
-def plugins_dir() -> Path:
-    return plugins_directory()
-
-
-def print_tree(root: Path, created: list[Path]) -> None:
-    tree = Tree(f'[bold green]{root.name}/[/bold green]')
-    dirs: dict[str, Tree] = {}
-    for path in sorted(created):
-        rel = path.relative_to(root)
-        parts = rel.parts
-        current = tree
-        for i, part in enumerate(parts[:-1]):
-            key = '/'.join(parts[: i + 1])
-            if key not in dirs:
-                dirs[key] = current.add(f'[cyan]{part}/[/cyan]')
-            current = dirs[key]
-        current.add(f'[white]{parts[-1]}[/white]')
-    console.print(tree)