hypercli-cli 2026.4.5__tar.gz → 2026.4.7__tar.gz

{hypercli_cli-2026.4.5 → hypercli_cli-2026.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hypercli-cli
-Version: 2026.4.5
+Version: 2026.4.7
 Summary: CLI for HyperCLI - GPU orchestration and LLM API
 Project-URL: Homepage, https://hypercli.com
 Project-URL: Documentation, https://docs.hypercli.com
@@ -9,8 +9,9 @@ Author-email: HyperCLI <support@hypercli.com>
 License: MIT
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: hypercli-sdk>=2026.4.5
+Requires-Dist: hypercli-sdk>=2026.4.7
 Requires-Dist: mutagen>=1.47.0
+Requires-Dist: openai>=2.8.1
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=14.2.0
 Requires-Dist: typer>=0.20.0
@@ -19,11 +20,11 @@ Provides-Extra: all
 Requires-Dist: argon2-cffi>=25.0.0; extra == 'all'
 Requires-Dist: eth-account>=0.13.0; extra == 'all'
 Requires-Dist: faster-whisper>=1.1.0; extra == 'all'
-Requires-Dist: hypercli-sdk[comfyui]>=2026.4.5; extra == 'all'
+Requires-Dist: hypercli-sdk[comfyui]>=2026.4.7; extra == 'all'
 Requires-Dist: web3>=7.0.0; extra == 'all'
 Requires-Dist: x402[evm,httpx]>=2.0.0; extra == 'all'
 Provides-Extra: comfyui
-Requires-Dist: hypercli-sdk[comfyui]>=2026.4.5; extra == 'comfyui'
+Requires-Dist: hypercli-sdk[comfyui]>=2026.4.7; extra == 'comfyui'
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0.0; extra == 'dev'
 Requires-Dist: ruff>=0.3.0; extra == 'dev'

hypercli_cli-2026.4.7/hypercli_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "2026.4.7"

{hypercli_cli-2026.4.5 → hypercli_cli-2026.4.7}/hypercli_cli/agent.py

@@ -2,15 +2,18 @@
 import asyncio
 import json
 import os
+import shutil
+import subprocess
 from pathlib import Path
 from datetime import datetime, timedelta
 import typer
 from rich.console import Console
 from rich.table import Table
 
+from hypercli import HyperCLI
+
 from .onboard import onboard as _onboard_fn
 from .voice import app as voice_app
-from .stt import transcribe as _stt_transcribe
 from .embed import app as embed_app
 
 app = typer.Typer(help="HyperAgent inference commands")
@@ -21,26 +24,6 @@ app.command("onboard")(_onboard_fn)
 app.add_typer(voice_app, name="voice")
 app.add_typer(embed_app, name="embed")
 
-
-@app.command("transcribe")
-def transcribe(
-    audio_file: Path = typer.Argument(..., help="Audio file to transcribe (wav, mp3, ogg, m4a, etc.)"),
-    model: str = typer.Option("turbo", "--model", "-m", help="Whisper model: tiny, base, small, medium, large-v3, turbo"),
-    language: str = typer.Option(None, "--language", "-l", help="Language code (e.g. en, de, fr). Auto-detect if omitted."),
-    device: str = typer.Option("auto", "--device", "-d", help="Device: auto, cpu, cuda"),
-    compute_type: str = typer.Option("auto", "--compute", help="Compute type: auto, int8, float16, float32"),
-    json_output: bool = typer.Option(False, "--json", help="Output as JSON with timestamps"),
-    output: Path = typer.Option(None, "--output", "-o", help="Write transcript to file"),
-):
-    """Transcribe audio to text using faster-whisper (runs locally).
-
-    Examples:
-      hyper agent transcribe voice.ogg
-      hyper agent transcribe meeting.mp3 --model large-v3 --language en
-      hyper agent transcribe audio.wav --json -o transcript.json
-    """
-    _stt_transcribe(audio_file, model, language, device, compute_type, json_output, output)
-
 # Check if wallet dependencies are available
 try:
     from x402 import x402Client
@@ -68,6 +51,30 @@ def require_x402_deps():
         raise typer.Exit(1)
 
 
+def _resolve_agent_query_key() -> str:
+    key = os.getenv("HYPER_AGENTS_API_KEY", "").strip() or os.getenv("HYPER_API_KEY", "").strip()
+    if key:
+        return key
+    if AGENT_KEY_PATH.exists():
+        try:
+            with open(AGENT_KEY_PATH) as f:
+                data = json.load(f)
+            key = str(data.get("key") or "").strip()
+            if key:
+                return key
+        except Exception:
+            pass
+    console.print("[red]❌ No HyperClaw API key found.[/red]")
+    console.print("Set HYPER_AGENTS_API_KEY or HYPER_API_KEY, or subscribe first with [bold]hyper agent subscribe[/bold].")
+    raise typer.Exit(1)
+
+
+def _get_agent_query_client(dev: bool) -> HyperCLI:
+    key = _resolve_agent_query_key()
+    api_base = DEV_API_BASE if dev else PROD_API_BASE
+    return HyperCLI(api_key=key, agent_api_key=key, api_url=api_base, agent_dev=dev)
+
+
 @app.command("subscribe")
 def subscribe(
     plan_id: str = typer.Argument("1aiu", help="Plan ID: 1aiu, 2aiu, 5aiu, 10aiu (default: 1aiu)"),
@@ -151,7 +158,7 @@ def subscribe(
         console.print(f"Limits: {result['tpm_limit']:,} TPM / {result['rpm_limit']:,} RPM")
         console.print(f"\n[green]✓[/green] Key saved to [bold]{AGENT_KEY_PATH}[/bold]")
         console.print(f"[green]✓[/green] Key history: [bold]{keys_history_path}[/bold]")
-        console.print("\nConfigure OpenClaw with: [bold]hyper agent openclaw-setup[/bold]")
+        console.print("\nConfigure OpenClaw with: [bold]hyper config openclaw --apply[/bold]")
 
 
 async def _subscribe_async(account, plan_id: str, api_base: str, amount: str = None):
@@ -344,6 +351,104 @@ def plans(
     console.print("Subscribe with: [bold]hyper agent subscribe <plan_id> <amount>[/bold]")
 
 
+@app.command("current-plan")
+def current_plan(
+    dev: bool = typer.Option(False, "--dev", help="Use dev API"),
+    json_output: bool = typer.Option(False, "--json", help="Print raw JSON response"),
+):
+    """Show the effective current HyperClaw plan."""
+    client = _get_agent_query_client(dev)
+    current = client.agent.current_plan()
+
+    if json_output:
+        console.print_json(json.dumps(current.__dict__, indent=2, default=str))
+        return
+
+    console.print("\n[bold]Current HyperClaw Plan[/bold]\n")
+    console.print(f"Plan: [bold]{current.name}[/bold] ({current.id})")
+    console.print(f"TPM/RPM: {current.tpm_limit:,} / {current.rpm_limit:,}")
+    if current.pooled_tpd:
+        console.print(f"Pooled TPD: {current.pooled_tpd:,}")
+    if current.expires_at:
+        console.print(f"Expires: {current.expires_at.strftime('%Y-%m-%d %H:%M:%S %Z')}")
+    if current.provider:
+        console.print(f"Provider: {current.provider}")
+    console.print(f"Cancel at period end: {'yes' if current.cancel_at_period_end else 'no'}")
+    if current.slot_inventory:
+        console.print("\n[bold]Slots[/bold]")
+        for tier, inventory in current.slot_inventory.items():
+            console.print(
+                f"  {tier}: {inventory.get('used', 0)}/{inventory.get('granted', 0)} "
+                f"({inventory.get('available', 0)} available)"
+            )
+
+
+@app.command("subscriptions")
+def subscriptions(
+    dev: bool = typer.Option(False, "--dev", help="Use dev API"),
+    json_output: bool = typer.Option(False, "--json", help="Print raw JSON response"),
+):
+    """List your HyperClaw subscriptions/entitlements."""
+    client = _get_agent_query_client(dev)
+    items = client.agent.subscriptions()
+
+    if json_output:
+        console.print_json(json.dumps([item.__dict__ for item in items], indent=2, default=str))
+        return
+
+    table = Table(title="HyperClaw Subscriptions")
+    table.add_column("ID", style="cyan")
+    table.add_column("Plan", style="green")
+    table.add_column("Qty", justify="right")
+    table.add_column("Provider")
+    table.add_column("Status")
+    table.add_column("Expires")
+    for item in items:
+        expires = item.expires_at.strftime("%Y-%m-%d %H:%M:%S %Z") if item.expires_at else ""
+        table.add_row(item.id[:12], item.plan_name or item.plan_id, str(item.quantity), item.provider, item.status, expires)
+    console.print()
+    console.print(table)
+
+
+@app.command("subscription-summary")
+def subscription_summary(
+    dev: bool = typer.Option(False, "--dev", help="Use dev API"),
+    json_output: bool = typer.Option(False, "--json", help="Print raw JSON response"),
+):
+    """Show your effective HyperClaw entitlement summary."""
+    client = _get_agent_query_client(dev)
+    summary = client.agent.subscription_summary()
+
+    if json_output:
+        console.print_json(json.dumps({
+            "effective_plan_id": summary.effective_plan_id,
+            "current_subscription_id": summary.current_subscription_id,
+            "pooled_tpm_limit": summary.pooled_tpm_limit,
+            "pooled_rpm_limit": summary.pooled_rpm_limit,
+            "pooled_tpd": summary.pooled_tpd,
+            "slot_inventory": summary.slot_inventory,
+            "active_subscription_count": summary.active_subscription_count,
+            "active_subscriptions": [item.__dict__ for item in summary.active_subscriptions],
+            "subscriptions": [item.__dict__ for item in summary.subscriptions],
+            "user": summary.user,
+        }, indent=2, default=str))
+        return
+
+    console.print("\n[bold]HyperClaw Entitlement Summary[/bold]\n")
+    console.print(f"Effective plan: [bold]{summary.effective_plan_id}[/bold]")
+    console.print(f"Current subscription: {summary.current_subscription_id or ''}")
+    console.print(
+        f"Pooled limits: {summary.pooled_tpm_limit:,} TPM / "
+        f"{summary.pooled_rpm_limit:,} RPM / {summary.pooled_tpd:,} TPD"
+    )
+    console.print("\n[bold]Slots[/bold]")
+    for tier, inventory in summary.slot_inventory.items():
+        console.print(
+            f"  {tier}: {inventory.get('used', 0)}/{inventory.get('granted', 0)} "
+            f"({inventory.get('available', 0)} available)"
+        )
+
+
 @app.command("models")
 def models(
     dev: bool = typer.Option(False, "--dev", help="Use dev API"),
@@ -538,7 +643,7 @@ def login(
     console.print(f"  Wallet:  {wallet_addr}")
     console.print(f"\n[green]You're all set![/green]")
     console.print(f"  Launch agent:   [bold]hyper agents create[/bold]")
-    console.print(f"  Configure:      [bold]hyper agent config openclaw --apply[/bold]")
+    console.print(f"  Configure:      [bold]hyper config openclaw --apply[/bold]")
 
 
 OPENCLAW_CONFIG_PATH = Path.home() / ".openclaw" / "openclaw.json"
@@ -734,15 +839,16 @@ def _config_openclaw(
     embedding_models = [m for m in supported_models if m.get("mode") == "embedding"]
     kimi_models = [m for m in chat_models if "kimi" in _model_suffix(m.get("id", ""))]
     glm_models = [m for m in chat_models if _model_suffix(m.get("id", "")) == "glm-5"]
-    openai_chat_models = [
+    other_chat_models = [
         m for m in chat_models
         if m not in kimi_models and m not in glm_models
     ]
+    provider_models = kimi_models + glm_models + other_chat_models
     embedding_model_id = embedding_models[0]["id"] if embedding_models else None
     primary_model = (
-        f"kimi-coding/{kimi_models[0]['id']}" if kimi_models else (
+        f"hyperclaw/{kimi_models[0]['id']}" if kimi_models else (
             f"hyperclaw/{glm_models[0]['id']}" if glm_models else (
-                f"hyperclaw-openai/{openai_chat_models[0]['id']}" if openai_chat_models else None
+                f"hyperclaw/{other_chat_models[0]['id']}" if other_chat_models else None
             )
         )
     )
@@ -756,46 +862,18 @@ def _config_openclaw(
                     "baseUrl": api_base,
                     "apiKey": config_api_key,
                     "api": "anthropic-messages",
-                    "models": glm_models,
-                },
-                **(
-                    {
-                        "kimi-coding": {
-                            # Use the upstream Kimi provider semantics while still
-                            # routing requests through the HyperClaw Anthropic proxy.
-                            "baseUrl": api_base,
-                            "apiKey": config_api_key,
-                            "api": "anthropic-messages",
-                            "headers": {
-                                "User-Agent": "claude-code/0.1.0",
-                            },
-                            "models": kimi_models,
-                        },
-                    }
-                    if kimi_models
-                    else {}
-                ),
-                **(
-                    {
-                        "hyperclaw-openai": {
-                            "baseUrl": f"{api_base}/v1",
-                            "apiKey": config_api_key,
-                            "api": "openai-completions",
-                            "models": openai_chat_models,
-                        },
-                    }
-                    if openai_chat_models
-                    else {}
-                ),
+                    "authHeader": True,
+                    "models": provider_models,
+                }
             }
         },
         "agents": {
             "defaults": {
                 **({"model": {"primary": primary_model}} if primary_model else {}),
                 "models": {
+                    **{f"hyperclaw/{m['id']}": {"alias": "kimi"} for m in kimi_models},
                     **{f"hyperclaw/{m['id']}": {"alias": "glm"} for m in glm_models},
-                    **{f"kimi-coding/{m['id']}": {"alias": "kimi"} for m in kimi_models},
-                    **{f"hyperclaw-openai/{m['id']}": {"alias": m['id'].split('-')[0]} for m in openai_chat_models},
+                    **{f"hyperclaw/{m['id']}": {"alias": m['id'].split('-')[0]} for m in other_chat_models},
                 },
                 **(
                     {
@@ -890,10 +968,10 @@ def config_cmd(
 
     Examples:
       hyper agent config                          # Show all configs
-      hyper agent config openclaw                 # OpenClaw snippet
+      hyper config openclaw                       # OpenClaw snippet
       hyper agent config opencode --key sk-...    # OpenCode with explicit key
-      hyper agent config openclaw --base-url https://api.dev.hypercli.com
-      hyper agent config openclaw --apply         # Write directly to openclaw.json
+      hyper config openclaw --base-url https://api.dev.hypercli.com
+      hyper config openclaw --apply               # Write directly to openclaw.json
       hyper agent config env                      # Shell export lines
     """
     api_key = _resolve_api_key(key)
@@ -937,8 +1015,11 @@ def _show_snippet(name: str, path_hint: str, data: dict, apply: bool, target_pat
         if target_path.exists():
             with open(target_path) as f:
                 existing = json.load(f)
-            _deep_merge(existing, data)
-            merged = existing
+            if name == "OpenClaw":
+                merged = _merge_openclaw_config(existing, data)
+            else:
+                _deep_merge(existing, data)
+                merged = existing
         else:
             merged = data
 
@@ -947,6 +1028,31 @@ def _show_snippet(name: str, path_hint: str, data: dict, apply: bool, target_pat
             json.dump(merged, f, indent=2)
             f.write("\n")
         console.print(f"[green]✅ Written to {target_path}[/green]\n")
+        if name == "OpenClaw":
+            _refresh_openclaw_runtime()
+
+
+def _refresh_openclaw_runtime():
+    """Best-effort refresh of OpenClaw generated runtime state after config changes."""
+    if shutil.which("openclaw") is None:
+        console.print("[yellow]⚠[/yellow] OpenClaw CLI not found in PATH.")
+        console.print("Run after install: [bold]openclaw models list[/bold]")
+        console.print("Then restart when ready: [bold]openclaw gateway restart[/bold]\n")
+        return
+
+    try:
+        subprocess.run(
+            ["openclaw", "models", "list"],
+            capture_output=True,
+            text=True,
+            timeout=30,
+            check=True,
+        )
+        console.print("[green]✓[/green] Regenerated OpenClaw model cache.")
+    except Exception:
+        console.print("[yellow]⚠[/yellow] Could not regenerate OpenClaw model cache automatically.")
+        console.print("Run manually: [bold]openclaw models list[/bold]")
+    console.print("Restart when ready: [bold]openclaw gateway restart[/bold]\n")
 
 
 def _deep_merge(base: dict, overlay: dict):
@@ -956,3 +1062,28 @@ def _deep_merge(base: dict, overlay: dict):
             _deep_merge(base[k], v)
         else:
             base[k] = v
+
+
+def _merge_openclaw_config(existing: dict, snippet: dict) -> dict:
+    """Merge OpenClaw config while replacing generated provider/model sections exactly."""
+    merged = dict(existing)
+    _deep_merge(merged, snippet)
+
+    snippet_models = ((snippet.get("models") or {}).get("providers") or {})
+    if snippet_models:
+        merged.setdefault("models", {})
+        merged["models"]["providers"] = snippet_models
+
+    snippet_defaults = (((snippet.get("agents") or {}).get("defaults") or {}).get("models") or {})
+    if snippet_defaults:
+        merged.setdefault("agents", {})
+        merged["agents"].setdefault("defaults", {})
+        merged["agents"]["defaults"]["models"] = snippet_defaults
+
+    snippet_model_config = (((snippet.get("agents") or {}).get("defaults") or {}).get("model") or {})
+    if snippet_model_config:
+        merged.setdefault("agents", {})
+        merged["agents"].setdefault("defaults", {})
+        merged["agents"]["defaults"]["model"] = snippet_model_config
+
+    return merged

{hypercli_cli-2026.4.5 → hypercli_cli-2026.4.7}/hypercli_cli/cli.py

@@ -4,11 +4,12 @@ import json
 import typer
 from rich.console import Console
 from rich.prompt import Prompt
+from rich.table import Table
 
 from hypercli import HyperCLI, APIError, configure
 from hypercli.config import CONFIG_FILE
 
-from . import agent, agents, billing, comfyui, files, flow, instances, jobs, keys, user, wallet
+from . import agent, agents, billing, comfyui, files, flow, instances, jobs, keys, llm, user, voice, wallet
 from .output import output, spinner
 
 console = Console()
@@ -56,10 +57,16 @@ app = typer.Typer(
     no_args_is_help=True,
     rich_markup_mode="rich",
 )
+config_app = typer.Typer(
+    help="Generate config for OpenClaw and other tools",
+    no_args_is_help=True,
+    rich_markup_mode="rich",
+)
 
 # Register subcommands
 app.add_typer(agents.app, name="agents")
 app.add_typer(agent.app, name="agent")
+app.add_typer(config_app, name="config")
 app.add_typer(billing.app, name="billing")
 app.add_typer(comfyui.app, name="comfyui")
 app.add_typer(files.app, name="files")
@@ -67,10 +74,31 @@ app.add_typer(flow.app, name="flow")
 app.add_typer(instances.app, name="instances")
 app.add_typer(keys.app, name="keys")
 app.add_typer(jobs.app, name="jobs")
+app.add_typer(llm.app, name="llm")
 app.add_typer(user.app, name="user")
+app.add_typer(voice.app, name="voice")
 app.add_typer(wallet.app, name="wallet")
 
 
+@config_app.command("openclaw")
+def config_openclaw_cmd(
+    key: str = typer.Option(None, "--key", "-k", help="API key. Falls back to ~/.hypercli/agent-key.json"),
+    base_url: str = typer.Option(None, "--base-url", help="HyperClaw API base URL. Falls back to HYPER_API_BASE, then --dev/prod defaults"),
+    placeholder_env: str = typer.Option(None, "--placeholder-env", help="Write ${ENV_VAR} placeholders into generated config instead of literal API keys"),
+    apply: bool = typer.Option(False, "--apply", help="Write directly to ~/.openclaw/openclaw.json"),
+    dev: bool = typer.Option(False, "--dev", help="Use dev API"),
+):
+    """Generate or apply OpenClaw config."""
+    agent.config_cmd(
+        format="openclaw",
+        key=key,
+        base_url=base_url,
+        placeholder_env=placeholder_env,
+        apply=apply,
+        dev=dev,
+    )
+
+
 @app.command("me")
 def me_cmd(
     fmt: str = typer.Option("table", "--output", "-o", help="Output format: table|json"),
@@ -79,7 +107,27 @@ def me_cmd(
     client = HyperCLI()
     with spinner("Resolving auth context..."):
         auth_me = client.user.auth_me()
-    output(auth_me, fmt)
+    if fmt == "json":
+        output(auth_me, fmt)
+        return
+
+    table = Table(show_header=False, box=None)
+    table.add_column("Key", style="bold cyan")
+    table.add_column("Value")
+    table.add_row("user_id", auth_me.user_id)
+    table.add_row("orchestra_user_id", str(auth_me.orchestra_user_id or ""))
+    table.add_row("team_id", auth_me.team_id)
+    table.add_row("plan_id", auth_me.plan_id)
+    table.add_row("email", str(auth_me.email or ""))
+    table.add_row("auth_type", auth_me.auth_type)
+    has_active_subscription = bool(getattr(auth_me, "has_active_subscription", False))
+    table.add_row("has_active_subscription", "yes" if has_active_subscription else "no")
+    table.add_row("key_id", str(getattr(auth_me, "key_id", None) or ""))
+    table.add_row("key_name", str(getattr(auth_me, "key_name", None) or ""))
+    raw_capabilities = list(getattr(auth_me, "capabilities", []) or [])
+    capabilities = "\n".join(raw_capabilities) if raw_capabilities else ""
+    table.add_row("capabilities", capabilities)
+    console.print(table)
 
 
 @app.command("configure")