expedait-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/.github/workflows/publish.yml

@@ -9,7 +9,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
       id-token: write
     environment: pypi
     steps:
@@ -35,3 +35,8 @@ jobs:
 
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+
+      - name: Create GitHub Release with PR changelog
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh release create "$GITHUB_REF_NAME" --generate-notes

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/CLAUDE.md

@@ -24,6 +24,12 @@ uv run python -m pytest tests/test_auth.py  # run a single file
 - `expedait_cli/` — source: `main.py` (Click entrypoint), `client.py` (httpx API client), `auth.py`, `config.py`, `formatters.py`, `commands/` (Click subcommands)
 - `tests/` — pytest tests using `pytest-httpx` for mocking HTTP
 
+## Versioning
+
+When creating a PR, bump the patch version in `pyproject.toml` (the `version` field) and include that change in the PR.
+
+To publish a release, push a git tag matching the version (e.g. `git tag v0.2.1 && git push origin v0.2.1`). This triggers CI to publish to PyPI and create a GitHub Release with auto-generated notes listing the PRs since the previous tag.
+
 ## Style
 
 - Python 3.11+, no type-checker configured

expedait_cli-0.2.2/PKG-INFO

@@ -0,0 +1,153 @@
+Metadata-Version: 2.4
+Name: expedait-cli
+Version: 0.2.2
+Summary: CLI for Expedait project management — download specs, post comments
+License-Expression: Apache-2.0
+License-File: LICENSE
+Requires-Python: >=3.11
+Requires-Dist: click>=8.1
+Requires-Dist: httpx>=0.27
+Description-Content-Type: text/markdown
+
+# Expedait CLI
+
+[![PyPI](https://img.shields.io/pypi/v/expedait-cli)](https://pypi.org/project/expedait-cli/)
+[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Python 3.11+](https://img.shields.io/badge/python-3.11+-blue.svg)](https://www.python.org/downloads/)
+
+CLI for [Expedait](https://expedait.org) — lets AI coding agents download project specs and post comments via the Expedait API.
+
+## Usage
+
+### Run with `uvx` (recommended)
+
+No installation needed — run directly:
+
+```bash
+uvx expedait-cli auth login
+uvx expedait-cli projects list
+uvx expedait-cli projects download 1
+```
+
+### Add as a dev dependency
+
+If your AI agent needs it available in the project environment:
+
+```bash
+uv add --group dev expedait-cli
+```
+
+Then reference it in your agent configuration (e.g. `CLAUDE.md`, `.cursor/rules`, etc.).
+
+## Project Setup
+
+After authenticating, run `init` inside your project directory to store your tenant and project settings locally:
+
+```bash
+uvx expedait-cli init
+```
+
+This creates `.expedait/settings.json` with your `tenant_id` and `project_id`. Add `.expedait/` to your `.gitignore`.
+
+Once initialized, commands that need a project ID will resolve it automatically. Downloads default to `.expedait/context/`:
+
+```bash
+expedait projects download              # downloads to .expedait/context/
+expedait pages list                     # no --project-id needed
+expedait pages download 42              # downloads to .expedait/context/
+```
+
+**Resolution order for tenant/project:** CLI flag > env var > `.expedait/settings.json` > `~/.expedait/config.json`.
+
+## Authentication
+
+### Interactive login
+
+```bash
+uvx expedait-cli auth login
+```
+
+Prompts for login method (SSO or email/password). Stores credentials in `~/.expedait/config.json`.
+
+### Environment variables (CI / agents)
+
+```bash
+export EXPEDAIT_TOKEN="your-jwt-token"
+export EXPEDAIT_API_URL="https://your-instance.expedait.org"
+export EXPEDAIT_TENANT_ID=1
+```
+
+**Token resolution order:** `EXPEDAIT_TOKEN` env var > `~/.expedait/config.json` > error.
+
+## Commands
+
+### Auth
+
+```bash
+expedait auth login       # Interactive login
+expedait auth status      # Show current user and tenant
+expedait auth logout      # Clear stored credentials
+```
+
+### Projects
+
+```bash
+expedait projects list                              # List all projects
+expedait projects get PROJECT_ID                    # Get project details
+expedait projects download PROJECT_ID               # Extract markdown to .expedait/context/
+expedait projects download PROJECT_ID --download-format json  # Download as JSON
+expedait projects download PROJECT_ID --output-dir ./specs    # Extract to custom directory
+```
+
+### Pages
+
+```bash
+expedait pages list --project-id PROJECT_ID         # List pages in a project
+expedait pages get PAGE_ID                          # Print page markdown content
+expedait pages full PAGE_ID                         # Full context (content + comments + deps)
+expedait pages download PAGE_ID                     # Extract markdown to .expedait/context/
+expedait pages download PAGE_ID --download-format json  # Download as JSON
+```
+
+### Comments
+
+```bash
+expedait comments list PAGE_ID                      # List comments on a page
+expedait comments create PAGE_ID \                  # Create a comment
+  --text "Comment content" \
+  --selected-text "text from page" \
+  --start-offset 100 \
+  --end-offset 120 \
+  --source-page-id 5                                # Optional: agent's source page
+expedait comments resolve PAGE_ID COMMENT_ID        # Mark as resolved
+expedait comments delete PAGE_ID COMMENT_ID         # Delete a comment
+```
+
+### Global Options
+
+```bash
+expedait --api-url https://host:8000 ...    # Override API URL
+expedait --tenant-id 2 ...                  # Override tenant
+expedait --format json ...                  # Force JSON output
+expedait --format text ...                  # Force human-readable output
+expedait --version                          # Show version
+```
+
+Output format defaults to `text` when connected to a terminal, `json` when piped.
+
+## Agent Skills
+
+For step-by-step guides on using the CLI from AI coding agents, see [expedait-skills](https://github.com/Expedait/expedait-skills).
+
+## Development
+
+```bash
+git clone https://github.com/Expedait/expedait-cli.git
+cd expedait-cli
+uv sync --group dev
+uv run python -m pytest
+```
+
+## License
+
+[Apache License 2.0](LICENSE)

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/README.md

@@ -1,66 +1,68 @@
 # Expedait CLI
 
+[![PyPI](https://img.shields.io/pypi/v/expedait-cli)](https://pypi.org/project/expedait-cli/)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Python 3.11+](https://img.shields.io/badge/python-3.11+-blue.svg)](https://www.python.org/downloads/)
 
-Command-line interface for [Expedait](https://expedait.com) — download project specs and post comments from AI coding agents.
+CLI for [Expedait](https://expedait.org) — lets AI coding agents download project specs and post comments via the Expedait API.
 
-## Quickstart
+## Usage
 
-```bash
-# Install with uv (recommended)
-uv pip install expedait-cli
+### Run with `uvx` (recommended)
 
-# Or install from source
-git clone https://github.com/Expedait/expedait-cli.git
-cd expedait-cli
-uv sync
+No installation needed — run directly:
 
-# Login to your Expedait instance
-expedait auth login
+```bash
+uvx expedait-cli auth login
+uvx expedait-cli projects list
+uvx expedait-cli projects download 1
+```
+
+### Add as a dev dependency
 
-# List your projects
-expedait projects list
+If your AI agent needs it available in the project environment:
 
-# Download all specs for a project
-expedait projects download 1 --output-dir ./specs
+```bash
+uv add --group dev expedait-cli
 ```
 
-## Installation
+Then reference it in your agent configuration (e.g. `CLAUDE.md`, `.cursor/rules`, etc.).
 
-### From PyPI
+## Project Setup
+
+After authenticating, run `init` inside your project directory to store your tenant and project settings locally:
 
 ```bash
-pip install expedait-cli
+uvx expedait-cli init
 ```
 
-### From source
+This creates `.expedait/settings.json` with your `tenant_id` and `project_id`. Add `.expedait/` to your `.gitignore`.
+
+Once initialized, commands that need a project ID will resolve it automatically. Downloads default to `.expedait/context/`:
 
 ```bash
-git clone https://github.com/Expedait/expedait-cli.git
-cd expedait-cli
-uv sync
+expedait projects download              # downloads to .expedait/context/
+expedait pages list                     # no --project-id needed
+expedait pages download 42              # downloads to .expedait/context/
 ```
 
-This creates a virtual environment with the `expedait` command available.
-
-**Requirements:** Python 3.11+
+**Resolution order for tenant/project:** CLI flag > env var > `.expedait/settings.json` > `~/.expedait/config.json`.
 
 ## Authentication
 
 ### Interactive login
 
 ```bash
-expedait auth login
+uvx expedait-cli auth login
 ```
 
-Prompts for API URL, email, and password. Stores credentials in `~/.expedait/config.json`.
+Prompts for login method (SSO or email/password). Stores credentials in `~/.expedait/config.json`.
 
 ### Environment variables (CI / agents)
 
 ```bash
 export EXPEDAIT_TOKEN="your-jwt-token"
-export EXPEDAIT_API_URL="https://your-instance.expedait.com"
+export EXPEDAIT_API_URL="https://your-instance.expedait.org"
 export EXPEDAIT_TENANT_ID=1
 ```
 
@@ -81,8 +83,9 @@ expedait auth logout      # Clear stored credentials
 ```bash
 expedait projects list                              # List all projects
 expedait projects get PROJECT_ID                    # Get project details
-expedait projects download PROJECT_ID               # Download all pages as ZIP
-expedait projects download PROJECT_ID --output-dir ./specs  # Extract to directory
+expedait projects download PROJECT_ID               # Extract markdown to .expedait/context/
+expedait projects download PROJECT_ID --download-format json  # Download as JSON
+expedait projects download PROJECT_ID --output-dir ./specs    # Extract to custom directory
 ```
 
 ### Pages
@@ -91,7 +94,8 @@ expedait projects download PROJECT_ID --output-dir ./specs  # Extract to directo
 expedait pages list --project-id PROJECT_ID         # List pages in a project
 expedait pages get PAGE_ID                          # Print page markdown content
 expedait pages full PAGE_ID                         # Full context (content + comments + deps)
-expedait pages download PAGE_ID --output-dir ./out  # Download page as ZIP
+expedait pages download PAGE_ID                     # Extract markdown to .expedait/context/
+expedait pages download PAGE_ID --download-format json  # Download as JSON
 ```
 
 ### Comments
@@ -108,7 +112,7 @@ expedait comments resolve PAGE_ID COMMENT_ID        # Mark as resolved
 expedait comments delete PAGE_ID COMMENT_ID         # Delete a comment
 ```
 
-## Global Options
+### Global Options
 
 ```bash
 expedait --api-url https://host:8000 ...    # Override API URL
@@ -133,10 +137,6 @@ uv sync --group dev
 uv run python -m pytest
 ```
 
-## Contributing
-
-Contributions are welcome! Please open an issue or submit a pull request.
-
 ## License
 
-This project is licensed under the [Apache License 2.0](LICENSE).
+[Apache License 2.0](LICENSE)

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/expedait_cli/auth.py

@@ -7,6 +7,7 @@ import os
 import click
 
 from .config import load_config
+from .settings import load_settings
 
 
 def resolve_token(config_path=None) -> str:
@@ -41,15 +42,42 @@ def resolve_api_url(explicit: str | None = None, config_path=None) -> str:
     return "https://app.expedait.org"
 
 
-def resolve_tenant_id(explicit: int | None = None, config_path=None) -> int | None:
-    """Return tenant ID from flag > env > config."""
+def resolve_tenant_id(
+    explicit: int | None = None,
+    config_path=None,
+    settings_path=None,
+) -> int | None:
+    """Return tenant ID from flag > env > local settings > config."""
     if explicit is not None:
         return explicit
     env = os.environ.get("EXPEDAIT_TENANT_ID")
     if env:
         return int(env)
+    # Local project settings
+    settings = load_settings(settings_path)
+    tid = settings.get("tenant_id")
+    if tid is not None:
+        return int(tid)
+    # Global config
     cfg = load_config(config_path)
     tid = cfg.get("tenant_id")
     if tid is not None:
         return int(tid)
     return None
+
+
+def resolve_project_id(
+    explicit: int | None = None,
+    settings_path=None,
+) -> int | None:
+    """Return project ID from flag > env > local settings."""
+    if explicit is not None:
+        return explicit
+    env = os.environ.get("EXPEDAIT_PROJECT_ID")
+    if env:
+        return int(env)
+    settings = load_settings(settings_path)
+    pid = settings.get("project_id")
+    if pid is not None:
+        return int(pid)
+    return None

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/expedait_cli/client.py

@@ -96,8 +96,10 @@ class ExpedaitClient:
     def get_workspace(self, project_id: int) -> dict[str, Any]:
         return self._request("GET", f"/api/v1/projects/{project_id}/workspace")
 
-    def download_project(self, project_id: int) -> bytes:
-        resp = self._request_raw("GET", f"/api/v1/projects/{project_id}/download")
+    def download_project(self, project_id: int, fmt: str = "markdown") -> bytes:
+        resp = self._request_raw(
+            "GET", f"/api/v1/projects/{project_id}/download", params={"format": fmt},
+        )
         return resp.content
 
     # -- pages ------------------------------------------------------------
@@ -111,8 +113,10 @@ class ExpedaitClient:
     def get_page_full(self, page_id: int) -> dict[str, Any]:
         return self._request("GET", f"/api/v1/pages/{page_id}/full")
 
-    def download_page(self, page_id: int) -> bytes:
-        resp = self._request_raw("GET", f"/api/v1/pages/{page_id}/download")
+    def download_page(self, page_id: int, fmt: str = "markdown") -> bytes:
+        resp = self._request_raw(
+            "GET", f"/api/v1/pages/{page_id}/download", params={"format": fmt},
+        )
         return resp.content
 
     # -- comments ---------------------------------------------------------

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/expedait_cli/commands/auth_cmd.py

@@ -117,7 +117,6 @@ def _login_sso(api_url: str) -> tuple[str, dict]:
 def login(ctx: click.Context) -> None:
     """Login interactively via browser SSO or email/password."""
     api_url = resolve_api_url(ctx.obj.get("api_url"))
-    api_url = click.prompt("API URL", default=api_url)
 
     method = click.prompt(
         "Login method",

expedait_cli-0.2.2/expedait_cli/commands/init_cmd.py

@@ -0,0 +1,77 @@
+"""Init command: configure project-local settings."""
+
+from __future__ import annotations
+
+import click
+
+from ..auth import resolve_api_url, resolve_tenant_id, resolve_token
+from ..client import ExpedaitClient
+from ..settings import save_settings
+
+
+@click.command()
+@click.pass_context
+def init(ctx: click.Context) -> None:
+    """Initialize Expedait settings for this project directory.
+
+    Requires authentication. Prompts for tenant and project selection,
+    then writes .expedait/settings.json in the current directory.
+    """
+    # Verify auth
+    token = resolve_token()
+    api_url = resolve_api_url(ctx.obj.get("api_url"))
+
+    client = ExpedaitClient(api_url, token)
+    try:
+        me = client.get_me()
+    except click.UsageError:
+        raise click.UsageError(
+            "Authentication failed. Run 'expedait auth login' first."
+        )
+
+    # Select tenant
+    memberships = me.get("tenant_memberships", [])
+    explicit_tenant = ctx.obj.get("tenant_id")
+
+    if explicit_tenant is not None:
+        tenant_id = explicit_tenant
+    elif len(memberships) == 1:
+        tenant_id = memberships[0]["tenant_id"]
+        click.echo(f"Using tenant: {memberships[0].get('tenant_name', tenant_id)}")
+    elif len(memberships) > 1:
+        click.echo("Available tenants:")
+        for m in memberships:
+            click.echo(f"  [{m['tenant_id']}] {m.get('tenant_name', 'Unknown')} ({m['role']})")
+        tenant_id = click.prompt("Select tenant ID", type=int)
+    else:
+        raise click.UsageError("No tenant memberships found for this user.")
+
+    # Fetch projects for selected tenant
+    tenant_client = ExpedaitClient(api_url, token, tenant_id)
+    try:
+        projects = tenant_client.list_projects()
+    finally:
+        tenant_client.close()
+
+    if not projects:
+        raise click.UsageError("No projects found in this tenant.")
+
+    if len(projects) == 1:
+        project = projects[0]
+        click.echo(f"Using project: {project['name']}")
+    else:
+        click.echo("Available projects:")
+        for p in projects:
+            click.echo(f"  [{p['id']}] {p['name']}")
+        project_id = click.prompt("Select project ID", type=int)
+        project = next((p for p in projects if p["id"] == project_id), None)
+        if project is None:
+            raise click.UsageError(f"Project {project_id} not found in list.")
+
+    save_settings({
+        "tenant_id": tenant_id,
+        "project_id": project["id"],
+    })
+
+    click.echo(f"Saved .expedait/settings.json (tenant={tenant_id}, project={project['id']}).")
+    client.close()

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/expedait_cli/commands/pages.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 import click
 
-from ..auth import resolve_api_url, resolve_tenant_id, resolve_token
+from ..auth import resolve_api_url, resolve_project_id, resolve_tenant_id, resolve_token
 from ..client import ExpedaitClient
 from ..formatters import output
 
@@ -26,10 +26,15 @@ def pages() -> None:
 
 
 @pages.command("list")
-@click.option("--project-id", required=True, type=int, help="Project ID to list pages for.")
+@click.option("--project-id", required=False, type=int, default=None, help="Project ID to list pages for.")
 @click.pass_context
-def list_pages(ctx: click.Context, project_id: int) -> None:
+def list_pages(ctx: click.Context, project_id: int | None) -> None:
     """List pages in a project."""
+    project_id = resolve_project_id(project_id)
+    if project_id is None:
+        raise click.UsageError(
+            "No project ID given. Pass --project-id or run 'expedait init'."
+        )
     client = _make_client(ctx)
     try:
         data = client.list_pages(project_id)
@@ -80,13 +85,14 @@ def full_page(ctx: click.Context, page_id: int) -> None:
 
 @pages.command("download")
 @click.argument("page_id", type=int)
-@click.option("--output-dir", type=click.Path(), default=".", help="Extract to directory.")
+@click.option("--output-dir", type=click.Path(), default=".expedait/context", help="Extract to directory.")
+@click.option("--download-format", type=click.Choice(["markdown", "json"]), default="markdown", help="Content format.")
 @click.pass_context
-def download_page(ctx: click.Context, page_id: int, output_dir: str) -> None:
+def download_page(ctx: click.Context, page_id: int, output_dir: str, download_format: str) -> None:
     """Download page as ZIP and extract."""
     client = _make_client(ctx)
     try:
-        data = client.download_page(page_id)
+        data = client.download_page(page_id, fmt=download_format)
     finally:
         client.close()
 

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/expedait_cli/commands/projects.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 import click
 
-from ..auth import resolve_api_url, resolve_tenant_id, resolve_token
+from ..auth import resolve_api_url, resolve_project_id, resolve_tenant_id, resolve_token
 from ..client import ExpedaitClient
 from ..formatters import output
 
@@ -60,14 +60,20 @@ def get_project(ctx: click.Context, project_id: int) -> None:
 
 
 @projects.command("download")
-@click.argument("project_id", type=int)
-@click.option("--output-dir", type=click.Path(), default=".", help="Extract to directory.")
+@click.argument("project_id", type=int, required=False, default=None)
+@click.option("--output-dir", type=click.Path(), default=".expedait/context", help="Extract to directory.")
+@click.option("--download-format", type=click.Choice(["markdown", "json"]), default="markdown", help="Content format.")
 @click.pass_context
-def download_project(ctx: click.Context, project_id: int, output_dir: str) -> None:
+def download_project(ctx: click.Context, project_id: int | None, output_dir: str, download_format: str) -> None:
     """Download all project pages as a ZIP and extract."""
+    project_id = resolve_project_id(project_id)
+    if project_id is None:
+        raise click.UsageError(
+            "No project ID given. Pass PROJECT_ID or run 'expedait init'."
+        )
     client = _make_client(ctx)
     try:
-        data = client.download_project(project_id)
+        data = client.download_project(project_id, fmt=download_format)
     finally:
         client.close()
 

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/expedait_cli/main.py

@@ -6,6 +6,7 @@ import click
 
 from . import __version__
 from .commands.auth_cmd import auth
+from .commands.init_cmd import init
 from .commands.projects import projects
 from .commands.pages import pages
 from .commands.comments import comments
@@ -26,6 +27,7 @@ def cli(ctx: click.Context, api_url: str | None, tenant_id: int | None, fmt: str
 
 
 cli.add_command(auth)
+cli.add_command(init)
 cli.add_command(projects)
 cli.add_command(pages)
 cli.add_command(comments)

expedait_cli-0.2.2/expedait_cli/settings.py

@@ -0,0 +1,31 @@
+"""Project-local settings stored in .expedait/settings.json."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+
+
+SETTINGS_DIR = ".expedait"
+SETTINGS_FILE = "settings.json"
+
+
+def _find_settings_path() -> Path:
+    """Return .expedait/settings.json relative to cwd."""
+    return Path.cwd() / SETTINGS_DIR / SETTINGS_FILE
+
+
+def load_settings(path: Path | None = None) -> dict[str, Any]:
+    """Load project-local settings. Returns empty dict if missing."""
+    p = path or _find_settings_path()
+    if not p.exists():
+        return {}
+    return json.loads(p.read_text())
+
+
+def save_settings(data: dict[str, Any], path: Path | None = None) -> None:
+    """Write project-local settings, creating .expedait/ if needed."""
+    p = path or _find_settings_path()
+    p.parent.mkdir(parents=True, exist_ok=True)
+    p.write_text(json.dumps(data, indent=2) + "\n")

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/pyproject.toml

@@ -4,8 +4,10 @@ build-backend = "hatchling.build"
 
 [project]
 name = "expedait-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "CLI for Expedait project management — download specs, post comments"
+readme = "README.md"
+license = "Apache-2.0"
 requires-python = ">=3.11"
 dependencies = [
     "click>=8.1",

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/tests/test_auth.py

@@ -1,4 +1,4 @@
-"""Tests for token resolution logic."""
+"""Tests for token and ID resolution logic."""
 
 import json
 from pathlib import Path
@@ -6,7 +6,7 @@ from pathlib import Path
 import click
 import pytest
 
-from expedait_cli.auth import resolve_token, resolve_api_url, resolve_tenant_id
+from expedait_cli.auth import resolve_token, resolve_api_url, resolve_tenant_id, resolve_project_id
 
 
 class TestResolveToken:
@@ -48,8 +48,35 @@ class TestResolveTenantId:
         monkeypatch.setenv("EXPEDAIT_TENANT_ID", "7")
         assert resolve_tenant_id(None, tmp_path / "missing.json") == 7
 
-    def test_config_file(self, saved_config: Path):
+    def test_local_settings_before_config(self, tmp_path: Path):
+        """Local .expedait/settings.json takes priority over global config."""
+        settings = tmp_path / "settings.json"
+        settings.write_text(json.dumps({"tenant_id": 99}))
+        config = tmp_path / "config.json"
+        config.write_text(json.dumps({"tenant_id": 1}))
+        assert resolve_tenant_id(None, config, settings) == 99
+
+    def test_config_file_fallback(self, saved_config: Path):
         assert resolve_tenant_id(None, saved_config) == 1
 
     def test_none_when_missing(self, tmp_path: Path):
         assert resolve_tenant_id(None, tmp_path / "missing.json") is None
+
+
+class TestResolveProjectId:
+    def test_explicit_wins(self, tmp_path: Path):
+        settings = tmp_path / "settings.json"
+        settings.write_text(json.dumps({"project_id": 5}))
+        assert resolve_project_id(42, settings) == 42
+
+    def test_env_var(self, monkeypatch, tmp_path: Path):
+        monkeypatch.setenv("EXPEDAIT_PROJECT_ID", "8")
+        assert resolve_project_id(None, tmp_path / "missing.json") == 8
+
+    def test_local_settings(self, tmp_path: Path):
+        settings = tmp_path / "settings.json"
+        settings.write_text(json.dumps({"project_id": 5}))
+        assert resolve_project_id(None, settings) == 5
+
+    def test_none_when_missing(self, tmp_path: Path):
+        assert resolve_project_id(None, tmp_path / "missing.json") is None

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/tests/test_commands/test_auth_cmd.py

@@ -29,7 +29,7 @@ class TestAuthLoginPassword:
             result = runner.invoke(
                 cli,
                 ["auth", "login"],
-                input="https://app.expedait.org\npassword\nuser@test.com\npass123\n",
+                input="password\nuser@test.com\npass123\n",
             )
 
             assert result.exit_code == 0
@@ -46,7 +46,7 @@ class TestAuthLoginPassword:
             result = runner.invoke(
                 cli,
                 ["auth", "login"],
-                input="https://app.expedait.org\npassword\nbad@test.com\nwrong\n",
+                input="password\nbad@test.com\nwrong\n",
             )
 
             assert result.exit_code != 0
@@ -90,7 +90,7 @@ class TestAuthLoginSSO:
             result = runner.invoke(
                 cli,
                 ["auth", "login"],
-                input="https://app.expedait.org\nsso\n",
+                input="sso\n",
             )
 
             assert result.exit_code == 0
@@ -110,7 +110,7 @@ class TestAuthLoginSSO:
             result = runner.invoke(
                 cli,
                 ["auth", "login"],
-                input="https://app.expedait.org\nsso\n",
+                input="sso\n",
             )
 
             assert result.exit_code != 0
@@ -139,7 +139,7 @@ class TestAuthLoginSSO:
             result = runner.invoke(
                 cli,
                 ["auth", "login"],
-                input="https://app.expedait.org\nsso\n",
+                input="sso\n",
             )
 
             assert result.exit_code != 0
@@ -169,7 +169,7 @@ class TestAuthLoginMultipleTenants:
             result = runner.invoke(
                 cli,
                 ["auth", "login"],
-                input="https://app.expedait.org\npassword\nuser@test.com\npass123\n2\n",
+                input="password\nuser@test.com\npass123\n2\n",
             )
 
             assert result.exit_code == 0

expedait_cli-0.2.2/tests/test_commands/test_init_cmd.py

@@ -0,0 +1,161 @@
+"""Tests for the init command."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+from click.testing import CliRunner
+
+from expedait_cli.main import cli
+
+
+def _mock_client(me_response, projects_response):
+    """Return a mock ExpedaitClient class that returns given responses."""
+    instance = MagicMock()
+    instance.get_me.return_value = me_response
+    instance.list_projects.return_value = projects_response
+    instance.close = MagicMock()
+    return MagicMock(return_value=instance)
+
+
+ME_SINGLE_TENANT = {
+    "id": 1,
+    "email": "dev@test.com",
+    "tenant_memberships": [
+        {"tenant_id": 10, "tenant_name": "Acme Corp", "role": "admin"},
+    ],
+}
+
+ME_MULTI_TENANT = {
+    "id": 1,
+    "email": "dev@test.com",
+    "tenant_memberships": [
+        {"tenant_id": 10, "tenant_name": "Acme Corp", "role": "admin"},
+        {"tenant_id": 20, "tenant_name": "Other Inc", "role": "member"},
+    ],
+}
+
+PROJECTS = [
+    {"id": 1, "name": "Project Alpha"},
+    {"id": 2, "name": "Project Beta"},
+]
+
+
+class TestInit:
+    def test_single_tenant_single_project(self, tmp_path: Path):
+        """Auto-selects tenant and project when only one of each."""
+        mock_cls = _mock_client(ME_SINGLE_TENANT, [PROJECTS[0]])
+        settings_file = tmp_path / ".expedait" / "settings.json"
+
+        with patch("expedait_cli.commands.init_cmd.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.init_cmd.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.init_cmd.ExpedaitClient", mock_cls), \
+             patch("expedait_cli.commands.init_cmd.save_settings") as mock_save:
+
+            runner = CliRunner()
+            result = runner.invoke(cli, ["init"])
+
+            assert result.exit_code == 0
+            assert "Project Alpha" in result.output
+            mock_save.assert_called_once_with({
+                "tenant_id": 10,
+                "project_id": 1,
+            })
+
+    def test_multi_tenant_prompts(self, tmp_path: Path):
+        """Prompts for tenant selection when multiple are available."""
+        mock_cls = _mock_client(ME_MULTI_TENANT, [PROJECTS[0]])
+
+        with patch("expedait_cli.commands.init_cmd.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.init_cmd.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.init_cmd.ExpedaitClient", mock_cls), \
+             patch("expedait_cli.commands.init_cmd.save_settings") as mock_save:
+
+            runner = CliRunner()
+            result = runner.invoke(cli, ["init"], input="10\n")
+
+            assert result.exit_code == 0
+            assert "Acme Corp" in result.output
+            assert "Other Inc" in result.output
+            mock_save.assert_called_once()
+            saved = mock_save.call_args[0][0]
+            assert saved["tenant_id"] == 10
+
+    def test_multi_project_prompts(self, tmp_path: Path):
+        """Prompts for project selection when multiple are available."""
+        mock_cls = _mock_client(ME_SINGLE_TENANT, PROJECTS)
+
+        with patch("expedait_cli.commands.init_cmd.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.init_cmd.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.init_cmd.ExpedaitClient", mock_cls), \
+             patch("expedait_cli.commands.init_cmd.save_settings") as mock_save:
+
+            runner = CliRunner()
+            result = runner.invoke(cli, ["init"], input="2\n")
+
+            assert result.exit_code == 0
+            assert "Project Alpha" in result.output
+            assert "Project Beta" in result.output
+            mock_save.assert_called_once()
+            saved = mock_save.call_args[0][0]
+            assert saved["project_id"] == 2
+
+    def test_explicit_tenant_id_skips_prompt(self):
+        """--tenant-id flag bypasses tenant selection."""
+        mock_cls = _mock_client(ME_MULTI_TENANT, [PROJECTS[0]])
+
+        with patch("expedait_cli.commands.init_cmd.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.init_cmd.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.init_cmd.ExpedaitClient", mock_cls), \
+             patch("expedait_cli.commands.init_cmd.save_settings") as mock_save:
+
+            runner = CliRunner()
+            result = runner.invoke(cli, ["--tenant-id", "20", "init"])
+
+            assert result.exit_code == 0
+            # Should not show tenant selection prompt
+            assert "Select tenant" not in result.output
+            saved = mock_save.call_args[0][0]
+            assert saved["tenant_id"] == 20
+
+    def test_not_authenticated_fails(self):
+        """Fails gracefully when not logged in."""
+        import click
+        with patch("expedait_cli.commands.init_cmd.resolve_token",
+                    side_effect=click.UsageError("Not authenticated")):
+
+            runner = CliRunner()
+            result = runner.invoke(cli, ["init"])
+
+            assert result.exit_code != 0
+            assert "Not authenticated" in result.output
+
+    def test_no_projects_fails(self):
+        """Fails when tenant has no projects."""
+        mock_cls = _mock_client(ME_SINGLE_TENANT, [])
+
+        with patch("expedait_cli.commands.init_cmd.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.init_cmd.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.init_cmd.ExpedaitClient", mock_cls):
+
+            runner = CliRunner()
+            result = runner.invoke(cli, ["init"])
+
+            assert result.exit_code != 0
+            assert "No projects found" in result.output
+
+    def test_invalid_project_id_fails(self):
+        """Fails when user enters a project ID not in the list."""
+        mock_cls = _mock_client(ME_SINGLE_TENANT, PROJECTS)
+
+        with patch("expedait_cli.commands.init_cmd.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.init_cmd.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.init_cmd.ExpedaitClient", mock_cls):
+
+            runner = CliRunner()
+            result = runner.invoke(cli, ["init"], input="999\n")
+
+            assert result.exit_code != 0
+            assert "not found" in result.output

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/tests/test_commands/test_pages.py

@@ -119,3 +119,35 @@ class TestPagesDownload:
 
             assert result.exit_code == 0
             assert (Path(dest) / "vision.md").read_text() == "# Vision"
+
+    def test_default_format_is_markdown(self, tmp_path: Path):
+        zip_bytes = _make_zip({"vision.md": "# Vision"})
+        mock_download = MagicMock(return_value=zip_bytes)
+        mock_instance = MagicMock(download_page=mock_download, close=MagicMock())
+        with patch("expedait_cli.commands.pages.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.pages.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.pages.resolve_tenant_id", return_value=1), \
+             patch("expedait_cli.commands.pages.ExpedaitClient", return_value=mock_instance):
+
+            runner = CliRunner()
+            dest = str(tmp_path / "out")
+            result = runner.invoke(cli, ["pages", "download", "1", "--output-dir", dest])
+
+            assert result.exit_code == 0
+            mock_download.assert_called_once_with(1, fmt="markdown")
+
+    def test_json_format(self, tmp_path: Path):
+        zip_bytes = _make_zip({"vision.json": '{"title": "Vision"}'})
+        mock_download = MagicMock(return_value=zip_bytes)
+        mock_instance = MagicMock(download_page=mock_download, close=MagicMock())
+        with patch("expedait_cli.commands.pages.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.pages.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.pages.resolve_tenant_id", return_value=1), \
+             patch("expedait_cli.commands.pages.ExpedaitClient", return_value=mock_instance):
+
+            runner = CliRunner()
+            dest = str(tmp_path / "out")
+            result = runner.invoke(cli, ["pages", "download", "1", "--output-dir", dest, "--download-format", "json"])
+
+            assert result.exit_code == 0
+            mock_download.assert_called_once_with(1, fmt="json")

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/tests/test_commands/test_projects.py

@@ -89,3 +89,35 @@ class TestProjectsDownload:
             assert result.exit_code == 0
             assert (Path(dest) / "page1.md").read_text() == "# Hello"
             assert (Path(dest) / "page2.md").read_text() == "# World"
+
+    def test_default_format_is_markdown(self, tmp_path: Path):
+        zip_bytes = _make_zip({"page.md": "# Hello"})
+        mock_download = MagicMock(return_value=zip_bytes)
+        mock_instance = MagicMock(download_project=mock_download, close=MagicMock())
+        with patch("expedait_cli.commands.projects.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.projects.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.projects.resolve_tenant_id", return_value=1), \
+             patch("expedait_cli.commands.projects.ExpedaitClient", return_value=mock_instance):
+
+            runner = CliRunner()
+            dest = str(tmp_path / "out")
+            result = runner.invoke(cli, ["projects", "download", "1", "--output-dir", dest])
+
+            assert result.exit_code == 0
+            mock_download.assert_called_once_with(1, fmt="markdown")
+
+    def test_json_format(self, tmp_path: Path):
+        zip_bytes = _make_zip({"page.json": '{"title": "Hello"}'})
+        mock_download = MagicMock(return_value=zip_bytes)
+        mock_instance = MagicMock(download_project=mock_download, close=MagicMock())
+        with patch("expedait_cli.commands.projects.resolve_token", return_value="tok"), \
+             patch("expedait_cli.commands.projects.resolve_api_url", return_value="http://x"), \
+             patch("expedait_cli.commands.projects.resolve_tenant_id", return_value=1), \
+             patch("expedait_cli.commands.projects.ExpedaitClient", return_value=mock_instance):
+
+            runner = CliRunner()
+            dest = str(tmp_path / "out")
+            result = runner.invoke(cli, ["projects", "download", "1", "--output-dir", dest, "--download-format", "json"])
+
+            assert result.exit_code == 0
+            mock_download.assert_called_once_with(1, fmt="json")

expedait_cli-0.2.2/tests/test_settings.py

@@ -0,0 +1,33 @@
+"""Tests for project-local settings."""
+
+import json
+from pathlib import Path
+
+from expedait_cli.settings import load_settings, save_settings
+
+
+class TestLoadSettings:
+    def test_missing_file_returns_empty(self, tmp_path: Path):
+        assert load_settings(tmp_path / "nope.json") == {}
+
+    def test_reads_valid_file(self, tmp_path: Path):
+        p = tmp_path / ".expedait" / "settings.json"
+        p.parent.mkdir()
+        p.write_text(json.dumps({"tenant_id": 3, "project_id": 7}))
+        assert load_settings(p) == {"tenant_id": 3, "project_id": 7}
+
+
+class TestSaveSettings:
+    def test_creates_file_and_dir(self, tmp_path: Path):
+        p = tmp_path / ".expedait" / "settings.json"
+        save_settings({"tenant_id": 1, "project_id": 2}, p)
+        assert p.exists()
+        data = json.loads(p.read_text())
+        assert data["tenant_id"] == 1
+        assert data["project_id"] == 2
+
+    def test_overwrites_existing(self, tmp_path: Path):
+        p = tmp_path / ".expedait" / "settings.json"
+        save_settings({"project_id": 1}, p)
+        save_settings({"project_id": 2}, p)
+        assert json.loads(p.read_text())["project_id"] == 2

{expedait_cli-0.2.0 → expedait_cli-0.2.2}/uv.lock

@@ -47,7 +47,7 @@ wheels = [
 
 [[package]]
 name = "expedait-cli"
-version = "0.2.0"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "click" },

expedait_cli-0.2.0/PKG-INFO

@@ -1,8 +0,0 @@
-Metadata-Version: 2.4
-Name: expedait-cli
-Version: 0.2.0
-Summary: CLI for Expedait project management — download specs, post comments
-License-File: LICENSE
-Requires-Python: >=3.11
-Requires-Dist: click>=8.1
-Requires-Dist: httpx>=0.27