pairwit 0.0.2__tar.gz → 0.0.3__tar.gz

{pairwit-0.0.2 → pairwit-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pairwit
-Version: 0.0.2
+Version: 0.0.3
 Summary: Consent-first coding agent for your terminal (Plan/Build, approvals, /schedule)
 Project-URL: Homepage, https://pairwit.dev
 Project-URL: Repository, https://github.com/pairwit/pairwit
@@ -35,6 +35,8 @@ pairwit
 
 Public alpha — APIs and UX may change. Feedback welcome.
 
+On first launch, Pairwit opens a provider setup (API key → saved to `~/.pairwit/.env`). On Windows, if `pairwit` is not on PATH, use `py -m pairwit`.
+
 Editable install from a checkout:
 
 ```bash

{pairwit-0.0.2 → pairwit-0.0.3}/README.md

@@ -9,6 +9,8 @@ pairwit
 
 Public alpha — APIs and UX may change. Feedback welcome.
 
+On first launch, Pairwit opens a provider setup (API key → saved to `~/.pairwit/.env`). On Windows, if `pairwit` is not on PATH, use `py -m pairwit`.
+
 Editable install from a checkout:
 
 ```bash

{pairwit-0.0.2 → pairwit-0.0.3}/pairwit/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-__version__ = "0.0.2"
+__version__ = "0.0.3"
 
 
 def main() -> None:

{pairwit-0.0.2 → pairwit-0.0.3}/pairwit/tui/app.py

@@ -164,6 +164,7 @@ from pairwit.tui.widgets import (
     Prompt,
     PromptModal,
     ProviderPickerScreen,
+    ProviderSetupScreen,
     Response,
     SchedulePane,
     SessionStatsBar,
@@ -523,7 +524,9 @@ class PairwitApp(App):
         self._openai_client: OpenAI | None = None
         self._anthropic_client: Any | None = None
         self._provider_note: str | None = None
-        self.rebuild_llm()
+        self._needs_provider_setup = bool(_provider_missing_key_message(self._provider))
+        if not self._needs_provider_setup:
+            self.rebuild_llm()
         self._refresh_mode_subtitle()
 
     def rebuild_llm(self) -> None:
@@ -710,6 +713,8 @@ class PairwitApp(App):
             self.call_after_refresh(self._show_startup_note, self._provider_note)
         if self._mcp_note:
             self.call_after_refresh(self._show_startup_note, self._mcp_note)
+        if self._needs_provider_setup:
+            self.call_after_refresh(self._launch_provider_setup)
         if self._pending_replay_banner:
             banner = self._pending_replay_banner
             self._pending_replay_banner = None
@@ -722,6 +727,46 @@ class PairwitApp(App):
     def _show_startup_note(self, text: str) -> None:
         self.run_worker(self._show_system_note(text))
 
+    def _launch_provider_setup(self) -> None:
+        self._run_provider_setup()
+
+    @work(exclusive=True)
+    async def _run_provider_setup(self) -> None:
+        """Block first-run until a usable provider is configured."""
+        reason = _provider_missing_key_message(self._provider)
+        while self._needs_provider_setup:
+            result = await self.push_screen_wait(
+                ProviderSetupScreen(
+                    current_provider=self._provider,
+                    reason=(reason or "").replace("❌  ", "").split("\n", 1)[0] or None,
+                )
+            )
+            if result is None:
+                self.exit(return_code=1)
+                return
+            self._provider = result["provider"]
+            self._model = result.get("model") or PROVIDERS[self._provider].default_model
+            try:
+                self.rebuild_llm()
+            except Exception as exc:
+                reason = str(exc)
+                await self._show_system_note(f"Could not start provider: {exc}")
+                continue
+            if _provider_missing_key_message(self._provider):
+                reason = _provider_missing_key_message(self._provider)
+                continue
+            self._needs_provider_setup = False
+            self._refresh_mode_subtitle()
+            env_path = result.get("env_path", "~/.pairwit/.env")
+            note = (
+                f"Provider ready: `{self._provider}` · `{self._model}`.\n"
+                f"Saved to `{env_path}`."
+            )
+            if self._provider_note:
+                note = f"{note}\n{self._provider_note}"
+            await self._show_system_note(note)
+            return
+
     def _startup_replay(self, banner: str) -> None:
         self.run_worker(self._replay_session_ui(banner=banner))
 
@@ -1601,8 +1646,17 @@ class PairwitApp(App):
             return
         fatal = _provider_missing_key_message(picked)
         if fatal:
-            await self._show_system_note(fatal.replace("❌  ", "").replace("\n", " "))
-            return
+            setup = await self.push_screen_wait(
+                ProviderSetupScreen(
+                    current_provider=self._provider,
+                    initial_provider=picked,
+                    reason=f"Configure {picked} before switching.",
+                )
+            )
+            if not setup:
+                return
+            picked = setup["provider"]
+            self._model = setup.get("model") or PROVIDERS[picked].default_model
         prev_provider = self._provider
         prev_model = self._model
         self._provider = picked
@@ -1615,11 +1669,13 @@ class PairwitApp(App):
             self._provider = prev_provider
             self._model = prev_model
             try:
-                self.rebuild_llm()
+                if not self._needs_provider_setup:
+                    self.rebuild_llm()
             except Exception:
                 pass
             await self._show_system_note(f"Could not switch provider: {exc}")
             return
+        self._needs_provider_setup = False
         self._refresh_mode_subtitle()
         note = f"Provider set to `{self._provider}` · model `{self._model}`."
         if self._provider_note:
@@ -1710,6 +1766,13 @@ class PairwitApp(App):
 
     @on(Input.Submitted, "#prompt-input")
     async def on_input(self, event: Input.Submitted) -> None:
+        if self._needs_provider_setup:
+            event.input.clear()
+            await self._show_system_note(
+                "Finish provider setup first (or press Esc in the setup dialog to quit)."
+            )
+            self._launch_provider_setup()
+            return
         raw = event.value.strip()
         if raw.startswith("/"):
             event.input.clear()
@@ -2294,12 +2357,6 @@ class PairwitApp(App):
 
 def agent_loop() -> None:
     resume = "--resume" in sys.argv[1:]
-    provider = (_env_get("PAIRWIT_PROVIDER") or DEFAULT_PROVIDER).strip().lower()
-    if provider not in PROVIDERS:
-        provider = DEFAULT_PROVIDER
-    fatal = _provider_missing_key_message(provider)
-    if fatal:
-        raise SystemExit(fatal)
     PairwitApp(resume=resume).run()
 
 

{pairwit-0.0.2 → pairwit-0.0.3}/pairwit/tui/widgets/__init__.py

@@ -42,6 +42,7 @@ from pairwit.tui.widgets.modals import (
     ModelPickerScreen,
     PromptModal,
     ProviderPickerScreen,
+    ProviderSetupScreen,
     SessionsPickerScreen,
     ToolApprovalScreen,
     TreeContextMenu,
@@ -88,6 +89,7 @@ __all__ = [
     "Prompt",
     "PromptModal",
     "ProviderPickerScreen",
+    "ProviderSetupScreen",
     "Response",
     "SCHEDULE_DEFAULT_WIDTH",
     "SCHEDULE_MIN_WIDTH",

{pairwit-0.0.2 → pairwit-0.0.3}/pairwit/tui/widgets/modals.py

@@ -761,3 +761,255 @@ class TreeContextMenu(ModalScreen[Optional[str]]):
     def on_option_selected(self, event: OptionList.OptionSelected) -> None:
         event.stop()
         self.dismiss(event.option_id)
+
+
+class ProviderSetupScreen(ModalScreen[dict[str, str] | None]):
+    """First-run / missing-key wizard: pick provider, enter key, save ~/.pairwit/.env."""
+
+    BINDINGS = [
+        Binding("escape", "cancel", "Cancel", show=False),
+    ]
+
+    DEFAULT_CSS = f"""
+    ProviderSetupScreen {{
+        align: center middle;
+        background: #091e42 78%;
+    }}
+
+    ProviderSetupScreen #setup-modal-box {{
+        width: 72;
+        height: auto;
+        max-height: 24;
+        border: tall {KIMI_BLUE};
+        background: {KIMI_SURFACE};
+        padding: 1 2;
+    }}
+
+    ProviderSetupScreen #setup-title {{
+        color: {KIMI_TEXT};
+        text-style: bold;
+        padding: 0 0 1 0;
+    }}
+
+    ProviderSetupScreen #setup-hint {{
+        color: {KIMI_MUTED};
+        padding: 0 0 1 0;
+    }}
+
+    ProviderSetupScreen #setup-error {{
+        color: {KIMI_ORANGE};
+        padding: 0 0 1 0;
+    }}
+
+    ProviderSetupScreen OptionList {{
+        height: auto;
+        max-height: 12;
+        border: solid {KIMI_BORDER};
+    }}
+
+    ProviderSetupScreen .option-list--option-highlighted {{
+        background: {KIMI_BLUE} 18%;
+        color: {KIMI_TEXT};
+    }}
+
+    ProviderSetupScreen Input {{
+        border: solid {KIMI_BORDER};
+        background: {KIMI_SURFACE_ALT};
+        color: {KIMI_TEXT};
+        margin: 0 0 1 0;
+    }}
+    """
+
+    def __init__(
+        self,
+        *,
+        current_provider: str = "moonshot",
+        reason: str | None = None,
+        initial_provider: str | None = None,
+    ) -> None:
+        super().__init__()
+        self._current_provider = current_provider
+        self._reason = reason
+        self._providers = [PROVIDERS[pid] for pid in PROVIDER_ORDER if pid in PROVIDERS]
+        self._step = "pick"  # pick | key
+        self._selected_id = initial_provider if initial_provider in PROVIDERS else None
+        self._error = ""
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="setup-modal-box"):
+            yield Static("Set up your AI provider", id="setup-title")
+            hint = (
+                "Pairwit needs a provider before it can chat. "
+                "Keys are saved to ~/.pairwit/.env (kept local)."
+            )
+            if self._reason:
+                hint = f"{self._reason.strip()}\n{hint}"
+            yield Static(hint, id="setup-hint")
+            yield Static("", id="setup-error")
+            yield OptionList(id="setup-provider-list")
+            yield Static("", id="setup-key-label")
+            yield Input(placeholder="API key", password=True, id="setup-api-key")
+            yield Static("", id="setup-base-label")
+            yield Input(placeholder="https://…/v1", id="setup-base-url")
+
+    def on_mount(self) -> None:
+        self._render_pick_step()
+        if self._selected_id:
+            self._enter_key_step(self._selected_id)
+
+    def _set_error(self, message: str) -> None:
+        self._error = message
+        self.query_one("#setup-error", Static).update(message)
+
+    def _render_pick_step(self) -> None:
+        self._step = "pick"
+        self._set_error("")
+        self.query_one("#setup-key-label", Static).display = False
+        self.query_one("#setup-api-key", Input).display = False
+        self.query_one("#setup-base-label", Static).display = False
+        self.query_one("#setup-base-url", Input).display = False
+        options: list[Option] = []
+        for index, spec in enumerate(self._providers):
+            if spec.id == "ollama":
+                extra = " · no API key"
+            elif spec.id == "custom":
+                extra = " · key + base URL"
+            else:
+                extra = f" · needs {spec.api_key_env}"
+            mark = " ← current" if spec.id == self._current_provider else ""
+            options.append(Option(f"{spec.label}{extra}{mark}", id=f"setup-{index}"))
+        option_list = self.query_one("#setup-provider-list", OptionList)
+        option_list.display = True
+        option_list.clear_options()
+        option_list.add_options(options)
+        option_list.focus()
+
+    def _enter_key_step(self, provider_id: str) -> None:
+        self._selected_id = provider_id
+        self._step = "key"
+        self._set_error("")
+        spec = PROVIDERS[provider_id]
+        self.query_one("#setup-provider-list", OptionList).display = False
+
+        if provider_id == "ollama":
+            self._finish_ollama()
+            return
+
+        key_label = self.query_one("#setup-key-label", Static)
+        key_input = self.query_one("#setup-api-key", Input)
+        base_label = self.query_one("#setup-base-label", Static)
+        base_input = self.query_one("#setup-base-url", Input)
+
+        key_label.display = True
+        key_input.display = True
+        key_label.update(f"{spec.label} — paste {spec.api_key_env} and press Enter")
+        key_input.value = ""
+        key_input.placeholder = spec.api_key_env or "API key"
+
+        if provider_id == "custom":
+            base_label.display = True
+            base_input.display = True
+            base_label.update("OpenAI-compatible base URL (PAIRWIT_BASE_URL)")
+            base_input.value = ""
+            base_input.focus()
+        else:
+            base_label.display = False
+            base_input.display = False
+            key_input.focus()
+
+    def _finish_ollama(self) -> None:
+        from pairwit.util.env import upsert_pairwit_env
+
+        path = upsert_pairwit_env(
+            {
+                "PAIRWIT_PROVIDER": "ollama",
+                "PAIRWIT_MODEL": PROVIDERS["ollama"].default_model,
+            }
+        )
+        self.dismiss(
+            {
+                "provider": "ollama",
+                "model": PROVIDERS["ollama"].default_model,
+                "env_path": str(path),
+            }
+        )
+
+    def _save_cloud_provider(self) -> None:
+        from pairwit.util.env import upsert_pairwit_env
+
+        provider_id = self._selected_id
+        if not provider_id or provider_id not in PROVIDERS:
+            self._set_error("Pick a provider first.")
+            return
+        spec = PROVIDERS[provider_id]
+        key = self.query_one("#setup-api-key", Input).value.strip()
+        if not key:
+            self._set_error(f"Enter {spec.api_key_env} to continue.")
+            self.query_one("#setup-api-key", Input).focus()
+            return
+
+        values: dict[str, str] = {
+            "PAIRWIT_PROVIDER": provider_id,
+            "PAIRWIT_MODEL": spec.default_model,
+        }
+        if spec.api_key_env:
+            values[spec.api_key_env] = key
+
+        if provider_id == "custom":
+            base = self.query_one("#setup-base-url", Input).value.strip().rstrip("/")
+            if not base:
+                self._set_error("Enter PAIRWIT_BASE_URL (e.g. https://api.example.com/v1).")
+                self.query_one("#setup-base-url", Input).focus()
+                return
+            values["PAIRWIT_BASE_URL"] = base
+
+        path = upsert_pairwit_env(values)
+        # Re-check after env write.
+        remaining = _provider_missing_key_message(provider_id)
+        if remaining:
+            self._set_error(remaining.split("\n", 1)[0].replace("❌  ", ""))
+            return
+
+        self.dismiss(
+            {
+                "provider": provider_id,
+                "model": spec.default_model,
+                "env_path": str(path),
+            }
+        )
+
+    def action_cancel(self) -> None:
+        if self._step == "key":
+            self._selected_id = None
+            self._render_pick_step()
+            return
+        self.dismiss(None)
+
+    @on(OptionList.OptionSelected, "#setup-provider-list")
+    def on_provider_selected(self, event: OptionList.OptionSelected) -> None:
+        event.stop()
+        option_id = event.option_id or ""
+        if not option_id.startswith("setup-"):
+            return
+        try:
+            index = int(option_id.split("-", 1)[1])
+        except ValueError:
+            return
+        if index < 0 or index >= len(self._providers):
+            return
+        self._enter_key_step(self._providers[index].id)
+
+    @on(Input.Submitted, "#setup-api-key")
+    def on_api_key_submitted(self, event: Input.Submitted) -> None:
+        event.stop()
+        self._save_cloud_provider()
+
+    @on(Input.Submitted, "#setup-base-url")
+    def on_base_url_submitted(self, event: Input.Submitted) -> None:
+        event.stop()
+        # After base URL, move to key field if empty, else save.
+        key = self.query_one("#setup-api-key", Input)
+        if not key.value.strip():
+            key.focus()
+            return
+        self._save_cloud_provider()

{pairwit-0.0.2 → pairwit-0.0.3}/pairwit/util/env.py

@@ -53,3 +53,47 @@ def _env_flag(name: str, *, default: bool = True) -> bool:
     if value is None:
         return default
     return value.strip().lower() not in ("0", "false", "no", "off")
+
+
+def upsert_pairwit_env(values: dict[str, str]) -> Path:
+    """Write/update keys in `~/.pairwit/.env` and apply them to the process env.
+
+    Preserves unrelated lines and comments. Creates the home dir if needed.
+    """
+    path = Path.home() / ".pairwit" / ".env"
+    path.parent.mkdir(parents=True, exist_ok=True)
+
+    cleaned = {key: value.strip() for key, value in values.items() if value and value.strip()}
+    if not cleaned:
+        return path
+
+    existing_lines: list[str] = []
+    if path.is_file():
+        existing_lines = path.read_text(encoding="utf-8").splitlines()
+
+    seen: set[str] = set()
+    out: list[str] = []
+    for line in existing_lines:
+        stripped = line.strip()
+        if not stripped or stripped.startswith("#") or "=" not in line:
+            out.append(line)
+            continue
+        key = stripped.split("=", 1)[0].strip()
+        if key in cleaned:
+            out.append(f"{key}={cleaned[key]}")
+            seen.add(key)
+        else:
+            out.append(line)
+
+    for key, value in cleaned.items():
+        if key not in seen:
+            out.append(f"{key}={value}")
+        os.environ[key] = value
+
+    # Keys already rewritten above still need process env updates.
+    for key, value in cleaned.items():
+        os.environ[key] = value
+
+    text = "\n".join(out).rstrip() + "\n"
+    path.write_text(text, encoding="utf-8")
+    return path

{pairwit-0.0.2 → pairwit-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pairwit"
-version = "0.0.2"
+version = "0.0.3"
 description = "Consent-first coding agent for your terminal (Plan/Build, approvals, /schedule)"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -41,7 +41,7 @@ packages = ["pairwit"]
 "pairwit/assets/pairwit-mascot-8bit.png" = "pairwit/assets/pairwit-mascot-8bit.png"
 
 [tool.hatch.build.targets.sdist]
-include = [
+only-include = [
   "pairwit",
   "README.md",
   "pyproject.toml",

pairwit-0.0.2/site/README.md

@@ -1,106 +0,0 @@
-# pairwit.dev site
-
-Static site for [pairwit.dev](https://pairwit.dev).
-
-| Page | File |
-|---|---|
-| Landing | `index.html` |
-| User guide | `guide.html` |
-| Styles (brand locked) | `styles.css` |
-| Behavior (howto walkthrough) | `script.js` |
-
-## Brand — LOCKED
-
-Do not change fonts, palette, or light theme without an explicit brand decision.
-Matches the kimicode-light TUI.
-
-**Visual references (product UI):**
-
-Marketing page uses crisp HTML/`pw-frame` terminal recreations (same chrome everywhere). Soft JPEG captures are archived until we shoot retina PNGs.
-
-| File | What it documents |
-|---|---|
-| `assets/pairwit-mascot-8bit.png` | 8-bit cat + 2-wheel robot mascot (nav, hero, mocks, OG, favicon source) |
-| `assets/favicon.ico` / `favicon-16.png` / `favicon-32.png` / `favicon-48.png` / `apple-touch-icon.png` | Brand icons from the mascot |
-| `favicon.ico` (site root) | Browser auto-discovery at `/favicon.ico` |
-| `docs/site-captures/ref-desk.png` | Older desk capture (soft JPEG) |
-| `docs/site-captures/ref-chat.png` | Older chat capture (soft JPEG) |
-| `site/assets/shot-desk.png` / `shot-chat.png` | Cropped exports — interim only |
-
-How-to + feature mocks on the landing stay faithful to the live TUI chrome. Site uses the PNG; TUI welcome uses an ASCII sprite of the same cat-robot (`WelcomeMascot`) — half-block PNG downscales look muddy in terminal. PNG also ships in `pairwit/assets/`.
-
-| Token | Value | Role |
-|---|---|---|
-| Canvas | `#FDFCF5` | Page / TUI background |
-| Alt surface | `#F5F4F1` | Section bands, code chips |
-| Surface | `#FFFFFF` | Cards / shells |
-| Text | `#3D3929` | Primary ink |
-| Muted | `#8A8580` | Secondary copy |
-| Accent | `#0079BF` | Links, step numbers, grips |
-| Accent deep | `#026AA7` | Hover |
-| Border | `#E8E4D9` | Rules / chrome |
-| Green | `#6BAA84` | Success / completion tokens |
-| Orange | `#D4A574` | Cost / warm accents |
-| Brand font | **Sora** | Pairwit wordmark, headings |
-| Body font | **IBM Plex Sans** | Prose |
-| Mono font | **IBM Plex Mono** | Commands, shortcuts |
-
-Theme: light only (no dark mode on the marketing site).
-
-## Next (do not skip) — agent reminder
-
-**Status:** not done yet. Finish before calling the marketing site “shipped.”
-
-1. ~~**Mobile-first polish**~~ — done (nav menu, stacked hero/howto desk, safe-area, 44px targets). Re-check on real devices before ship.
-2. **Cross-browser** — verify Chromium, Safari (desktop + iOS), Firefox; check `background-clip: text`, sticky nav, clipboard copy fallback already in `script.js`.
-3. ~~**gtag**~~ — GA4 `G-LJ45HH53S5` on `index.html` + `guide.html`. Consent banner still optional later.
-4. ~~**Deploy → Cloudflare Pages**~~ — project `pairwit` live at https://pairwit.pages.dev. Custom domains `pairwit.dev` / `www` registered but **DNS pending** (CNAME → `pairwit.pages.dev` or move zone to Cloudflare).
-
-## Deploy status
-
-| Target | URL |
-|---|---|
-| Pages production | https://pairwit.pages.dev |
-| Custom domain | `pairwit.dev` + `www` added on Pages (DNS still pending) |
-
-### Redeploy
-
-Requires Node ≥ 22:
-
-```bash
-export NVM_DIR="$HOME/.nvm" && . "$NVM_DIR/nvm.sh" && nvm use 22
-cd site
-npx wrangler@latest pages deploy . --project-name pairwit --branch main --commit-dirty=true
-```
-
-### DNS for pairwit.dev
-
-Zone **pairwit.dev** is on Cloudflare (status pending until nameservers update).
-
-**At Hostinger (registrar)** set nameservers to:
-
-- `kristin.ns.cloudflare.com`
-- `quentin.ns.cloudflare.com`
-
-Then remove Hostinger parking DNS. Apex + `www` CNAMEs to `pairwit.pages.dev` are set in the Cloudflare zone (proxied).
-
-Dashboard: https://dash.cloudflare.com → select **pairwit.dev** → Overview (shows nameserver instructions).
-
-
-```bash
-cd site
-python3 -m http.server 8080
-# open http://127.0.0.1:8080
-# guide: http://127.0.0.1:8080/guide.html
-```
-
-## Temporary Hostinger fallback
-
-Only if Pages is not ready yet:
-
-1. Hostinger → manage **pairwit.dev**
-2. Upload `index.html`, `guide.html`, `styles.css`, `script.js` (+ optional `assets/`) to `public_html/`
-3. Visit https://pairwit.dev
-
-Install one-liner on the page: `pip install pairwit && pairwit`  
-(Agent release on PyPI is still gated — update copy when you green-light the full package.)