lithe-cli 0.2.0__tar.gz → 0.2.3__tar.gz

{lithe_cli-0.2.0 → lithe_cli-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lithe-cli
-Version: 0.2.0
+Version: 0.2.3
 Summary: Command-line interface for the lithe agent kernel: chat, one-shot runs, undo, and run inspection.
 License: MIT License
         
@@ -65,7 +65,14 @@ pip install lithe-cli
 ## Configure
 
 There is no default endpoint — the CLI refuses to run rather than silently
-hitting some third-party URL. Point it at any OpenAI-compatible endpoint:
+hitting some third-party URL. The easiest way in is the wizard: on the
+first `lithe chat` / `lithe run` (or any time, via `lithe config`) an
+interactive terminal prompts for the three essentials and saves them to
+`$LITHE_HOME/config.json` (mode 0600 — it holds the key). An optional
+connectivity probe catches typos before your first turn.
+
+To configure by hand instead, point the CLI at any OpenAI-compatible
+endpoint:
 
 ```bash
 export LITHE_API_KEY=sk-...
@@ -73,13 +80,18 @@ export LITHE_BASE_URL=https://your-endpoint/api/v1
 export LITHE_MODEL=your-model
 ```
 
-Flags (`--api-key`, `--base-url`, `--model`) override the environment.
+Resolution order is flag (`--api-key`, `--base-url`, `--model`) >
+environment > saved config file, per key. The wizard never runs without
+a TTY on both ends, so pipes and CI keep the hard refusal; `--no-setup`
+restores that fail-fast behavior on terminals too. `lithe config --show`
+peeks at the saved values with a masked key.
+
 `LITHE_HOME` (default `~/.lithe`) locates the run store; the agent's
 workspace defaults to the current directory (`--workspace` to change).
 
 `lithe doctor` prints the effective configuration — endpoint (with a
-masked key), store, workspace, sandbox backend, skills, MCP servers — so
-you can see what a run would use before starting one.
+masked key), config file, store, workspace, sandbox backend, skills, MCP
+servers — so you can see what a run would use before starting one.
 
 ## Use
 

{lithe_cli-0.2.0 → lithe_cli-0.2.3}/README.md

@@ -18,7 +18,14 @@ pip install lithe-cli
 ## Configure
 
 There is no default endpoint — the CLI refuses to run rather than silently
-hitting some third-party URL. Point it at any OpenAI-compatible endpoint:
+hitting some third-party URL. The easiest way in is the wizard: on the
+first `lithe chat` / `lithe run` (or any time, via `lithe config`) an
+interactive terminal prompts for the three essentials and saves them to
+`$LITHE_HOME/config.json` (mode 0600 — it holds the key). An optional
+connectivity probe catches typos before your first turn.
+
+To configure by hand instead, point the CLI at any OpenAI-compatible
+endpoint:
 
 ```bash
 export LITHE_API_KEY=sk-...
@@ -26,13 +33,18 @@ export LITHE_BASE_URL=https://your-endpoint/api/v1
 export LITHE_MODEL=your-model
 ```
 
-Flags (`--api-key`, `--base-url`, `--model`) override the environment.
+Resolution order is flag (`--api-key`, `--base-url`, `--model`) >
+environment > saved config file, per key. The wizard never runs without
+a TTY on both ends, so pipes and CI keep the hard refusal; `--no-setup`
+restores that fail-fast behavior on terminals too. `lithe config --show`
+peeks at the saved values with a masked key.
+
 `LITHE_HOME` (default `~/.lithe`) locates the run store; the agent's
 workspace defaults to the current directory (`--workspace` to change).
 
 `lithe doctor` prints the effective configuration — endpoint (with a
-masked key), store, workspace, sandbox backend, skills, MCP servers — so
-you can see what a run would use before starting one.
+masked key), config file, store, workspace, sandbox backend, skills, MCP
+servers — so you can see what a run would use before starting one.
 
 ## Use
 

{lithe_cli-0.2.0 → lithe_cli-0.2.3}/lithe_cli/__init__.py

@@ -1,3 +1,3 @@
 """lithe-cli: the command-line interface for the lithe agent kernel."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.3"

{lithe_cli-0.2.0 → lithe_cli-0.2.3}/lithe_cli/__main__.py

@@ -1,4 +1,5 @@
 """Support ``python -m lithe_cli`` alongside the console script."""
+
 import sys
 
 from .main import main

{lithe_cli-0.2.0 → lithe_cli-0.2.3}/lithe_cli/agent.py

@@ -14,6 +14,7 @@ Everything here maps lithe's host contract onto CLI defaults:
 - undo — the bundled tools register reverters, so ``lithe undo`` works with
   zero configuration.
 """
+
 from __future__ import annotations
 
 import json
@@ -25,7 +26,11 @@ from typing import Any
 
 from lithe import AgentContext, LLMConfig, ToolRegistry
 from lithe.bundles import (
-    AgentHost, JsonlRunStore, JsonTodoStore, Workspace, undo_run,
+    AgentHost,
+    JsonlRunStore,
+    JsonTodoStore,
+    Workspace,
+    undo_run,
 )
 from lithe.bundles.download import register_download_tools
 from lithe.bundles.patch import register_apply_patch_tool
@@ -91,8 +96,7 @@ def build_registry(cfg: Config) -> ToolRegistry:
         from lithe.bundles.sandbox import CodeRunner, register_code_tools
 
         runner = CodeRunner(sys.executable, backend=sandbox_backend())
-        register_code_tools(
-            reg, lambda ctx: str(cfg.workspace_dir.resolve()), runner)
+        register_code_tools(reg, lambda ctx: str(cfg.workspace_dir.resolve()), runner)
     if cfg.skills_dir is not None:
         from lithe.bundles.skills import SkillLibrary, register_skill_tool
 
@@ -109,13 +113,18 @@ def build_host(cfg: Config, reg: ToolRegistry) -> AgentHost:
     store = JsonlRunStore(cfg.store_dir)
     prompt = build_system_prompt(cfg)
     return AgentHost(
-        reg, build_llm(cfg), store, max_steps=cfg.max_steps,
+        reg,
+        build_llm(cfg),
+        store,
+        max_steps=cfg.max_steps,
         build_system_prompt=lambda ctx, mode, anchor: prompt,
     )
 
 
 def render_event(
-    ev: dict, verbose: bool = False, stream: bool = False,
+    ev: dict,
+    verbose: bool = False,
+    stream: bool = False,
     pending: dict | None = None,
 ) -> None:
     """Render one runtime event onto the terminal.
@@ -150,8 +159,14 @@ def render_event(
     elif t == "cancelled":
         ui.warn("已取消")
     elif verbose and t == "usage":
-        print(ui.usage(ev.get("prompt_tokens"), ev.get("completion_tokens"),
-                       ev.get("context_tokens"), ev.get("context_percent")))
+        print(
+            ui.usage(
+                ev.get("prompt_tokens"),
+                ev.get("completion_tokens"),
+                ev.get("context_tokens"),
+                ev.get("context_percent"),
+            )
+        )
     elif verbose and t == "reasoning":
         digest = (ev.get("summary") or "").replace("\n", " ")
         if digest:
@@ -159,7 +174,9 @@ def render_event(
 
 
 async def execute(
-    cfg: Config, task: str, history: list[dict] | None = None,
+    cfg: Config,
+    task: str,
+    history: list[dict] | None = None,
     run_id: str | None = None,
 ) -> tuple[str, dict, Any]:
     """Run one task end-to-end; returns (run_id, done_event, host)."""

{lithe_cli-0.2.0 → lithe_cli-0.2.3}/lithe_cli/config.py

@@ -1,9 +1,13 @@
-"""Configuration resolved from CLI flags and the environment.
+"""Configuration resolved from CLI flags, the environment, and a saved file.
 
 Endpoint credentials follow the same convention as lithe's ``live_host``
-example: ``LITHE_API_KEY`` / ``LITHE_BASE_URL`` / ``LITHE_MODEL`` — flags
-override env vars. There is no default endpoint on purpose: the CLI refuses
-to run rather than silently hitting some third-party URL.
+example: ``LITHE_API_KEY`` / ``LITHE_BASE_URL`` / ``LITHE_MODEL``. There
+is no default endpoint on purpose: the CLI refuses to run rather than
+silently hitting some third-party URL. Resolution order is flag > env >
+``$LITHE_HOME/config.json`` (written by the first-run wizard or
+``lithe-cli config``; mode 0600 since it holds the key). On an
+interactive terminal a missing endpoint triggers the wizard instead of
+the refusal — see :mod:`lithe_cli.setup`.
 
 Capability flags (all off unless asked for):
 
@@ -17,6 +21,7 @@ Capability flags (all off unless asked for):
 - ``--vision``     ``image_info`` + ``analyze_image`` (one vision call on
                    the main endpoint, memoized per file hash).
 """
+
 from __future__ import annotations
 
 import json
@@ -101,20 +106,74 @@ def load_mcp_spec(raw: str) -> list:
         raise SystemExit(
             f"MCP 配置解析失败：{exc}\n"
             "spec 应为 JSON 数组（stdio: command/env，http: url/headers），"
-            "例如：--mcp '[{\"name\":\"fs\",\"command\":[\"npx\",\"-y\","
-            "\"@modelcontextprotocol/server-filesystem\",\".\"]}]'"
+            '例如：--mcp \'[{"name":"fs","command":["npx","-y",'
+            '"@modelcontextprotocol/server-filesystem","."]}]\''
         ) from exc
 
 
+_ENDPOINT_KEYS = ("api_key", "base_url", "model")
+
+
+def config_file() -> Path:
+    """Where the wizard-saved endpoint lives."""
+    return lithe_home() / "config.json"
+
+
+def load_saved_endpoint() -> dict:
+    """Read {api_key, base_url, model} from the config file; {} if none.
+
+    A corrupt file is treated as absent — a bad edit should cost the user
+    one re-prompt, not a broken CLI.
+    """
+    try:
+        data = json.loads(config_file().read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return {}
+    if not isinstance(data, dict):
+        return {}
+    return {
+        k: data[k].strip()
+        for k in _ENDPOINT_KEYS
+        if isinstance(data.get(k), str) and data[k].strip()
+    }
+
+
+def save_endpoint(api_key: str, base_url: str, model: str) -> Path:
+    """Write the config file; 0600 because it holds the API key."""
+    path = config_file()
+    fresh_dir = not path.parent.exists()
+    path.parent.mkdir(parents=True, exist_ok=True)
+    if fresh_dir:
+        try:
+            path.parent.chmod(0o700)
+        except OSError:
+            pass
+    payload = {
+        k: v
+        for k, v in (("api_key", api_key), ("base_url", base_url), ("model", model))
+    }
+    path.write_text(
+        json.dumps(payload, ensure_ascii=False, indent=2) + "\n", encoding="utf-8"
+    )
+    try:
+        path.chmod(0o600)
+    except OSError:
+        pass
+    return path
+
+
 def load_config(args: Any) -> Config:
     """Merge parsed argparse flags over environment defaults."""
+
     def g(name: str, default):
         return getattr(args, name, default)
 
-    store_dir = (Path(g("store", None)).expanduser()
-                 if g("store", None) else default_store_dir())
-    workspace_dir = (Path(g("workspace", None)).expanduser()
-                     if g("workspace", None) else Path.cwd())
+    store_dir = (
+        Path(g("store", None)).expanduser() if g("store", None) else default_store_dir()
+    )
+    workspace_dir = (
+        Path(g("workspace", None)).expanduser() if g("workspace", None) else Path.cwd()
+    )
     skills = g("skills", None)
     if skills is not None and skills.strip():
         skills_dir: Path | None = Path(skills).expanduser()
@@ -125,10 +184,15 @@ def load_config(args: Any) -> Config:
         skills_dir = cand if cand.is_dir() else None
 
     mcp_raw = g("mcp", None) or os.environ.get(ENV_MCP)
+    saved = load_saved_endpoint()  # flag > env > config file, per key
     return Config(
-        api_key=g("api_key", None) or os.environ.get(ENV_API_KEY),
-        base_url=g("base_url", None) or os.environ.get(ENV_BASE_URL),
-        model=g("model", None) or os.environ.get(ENV_MODEL),
+        api_key=(
+            g("api_key", None) or os.environ.get(ENV_API_KEY) or saved.get("api_key")
+        ),
+        base_url=(
+            g("base_url", None) or os.environ.get(ENV_BASE_URL) or saved.get("base_url")
+        ),
+        model=(g("model", None) or os.environ.get(ENV_MODEL) or saved.get("model")),
         store_dir=store_dir,
         workspace_dir=workspace_dir,
         user_id=g("user", None) or DEFAULT_USER,
@@ -144,19 +208,35 @@ def load_config(args: Any) -> Config:
         mcp_spec=mcp_raw,
         mcp_servers=load_mcp_spec(mcp_raw) if mcp_raw else [],
         vision=g("vision", False),
-        color=(True if g("color", False) else
-               False if g("no_color", False) else None),
+        color=(True if g("color", False) else False if g("no_color", False) else None),
     )
 
 
-def require_endpoint(cfg: Config) -> None:
-    """Exit with a how-to message when no endpoint is configured."""
+def require_endpoint(cfg: Config, interactive: bool = False) -> None:
+    """Ensure an endpoint, launching the first-run wizard when it helps.
+
+    ``interactive`` asks for the wizard; it still only runs on a TTY (both
+    ends), so pipes, captures and CI keep the plain SystemExit.
+    """
     if cfg.has_endpoint:
         return
+    if interactive:
+        from .setup import run_setup_wizard, stdin_is_interactive
+
+        if stdin_is_interactive():
+            saved = run_setup_wizard() or {}
+            cfg.api_key = cfg.api_key or saved.get("api_key")
+            cfg.base_url = cfg.base_url or saved.get("base_url")
+            cfg.model = cfg.model or saved.get("model")
+            if cfg.has_endpoint:
+                return
     raise SystemExit(
-        "缺少模型端点配置。请设置环境变量（或使用对应flag）：\n"
-        f"  export {ENV_API_KEY}=sk-...\n"
-        f"  export {ENV_BASE_URL}=https://your-endpoint/api/v1\n"
-        f"  export {ENV_MODEL}=your-model\n"
+        "缺少模型端点配置。两种方式任选：\n"
+        "  1) 交互式（推荐）：运行 lithe-cli config，按提示输入后保存到\n"
+        f"     {config_file()}\n"
+        "  2) 环境变量（或对应flag）：\n"
+        f"     export {ENV_API_KEY}=sk-...\n"
+        f"     export {ENV_BASE_URL}=https://your-endpoint/api/v1\n"
+        f"     export {ENV_MODEL}=your-model\n"
         "本 CLI 不内置任何默认端点。"
     )