Skip to content

Codebase intelligence for AI and humans: code health scores, auto-generated docs, git analytics, dead code detection, and architectural decisions via MCP.

refactor(init): split the subscription auth and note checks into small helpers (#4265)

Raghav Chamadiyabb10b120f55b
diff --git a/packages/cli/src/repowise/cli/commands/init_cmd/_provider.py b/packages/cli/src/repowise/cli/commands/init_cmd/_provider.py
index 056a32c74..f1af1926a 100644
--- a/packages/cli/src/repowise/cli/commands/init_cmd/_provider.py
+++ b/packages/cli/src/repowise/cli/commands/init_cmd/_provider.py
@@ -78,19 +78,24 @@ def note_subscription_cli(run: InitRun) -> None:
with --provider. Interactive runs got the picker instead, and a configured
provider is already a choice.
"""
- if run.is_interactive or run.opts.provider_name or run.config.get("provider"):
- return
- if not (run.opts.index_only or run.no_provider):
+ if not _wants_subscription_note(run):
return
from repowise.cli.ui.subscription import logged_in_agent_providers, subscription_note
offered = {n: auth for n, auth in logged_in_agent_providers().items() if auth.offer}
- first = next(iter(offered), None)
- note = subscription_note(tuple(offered), offered[first]) if first else None
+ if not offered:
+ return
+ note = subscription_note(tuple(offered), next(iter(offered.values())))
if note:
console.print(f" [dim]{note}[/dim]")
+def _wants_subscription_note(run: InitRun) -> bool:
+ """A scripted run nobody picked a provider for, and no model writes."""
+ chosen = run.is_interactive or run.opts.provider_name or run.config.get("provider")
+ return not chosen and bool(run.opts.index_only or run.no_provider)
+
+
def _print_provider_summary(run: InitRun) -> None:
provider = run.provider
if not run.is_interactive and not run.no_provider:
diff --git a/packages/cli/src/repowise/cli/ui/subscription.py b/packages/cli/src/repowise/cli/ui/subscription.py
index 2254261df..e44d15553 100644
--- a/packages/cli/src/repowise/cli/ui/subscription.py
+++ b/packages/cli/src/repowise/cli/ui/subscription.py
@@ -74,17 +74,25 @@ def _claude_auth(out: str) -> CliAuth | None:
backend = data.get("apiProvider")
if backend and backend != "firstParty":
return CliAuth(f"runs through {backend}: billed to that cloud account")
+ return _claude_login_auth(data)
+
+
+def _claude_login_auth(data: dict) -> CliAuth:
+ """Billing for a first-party Claude Code login, by its ``authMethod``."""
method = str(data.get("authMethod") or "")
if method == "claude.ai":
- plan = data.get("subscriptionType")
- if plan and plan != "free":
- return CliAuth(f"Claude {plan} plan: uses your plan quota")
- return CliAuth("signed in without a paid Claude plan", offer=False)
+ return _claude_plan_auth(data.get("subscriptionType"))
if "key" in method.lower() or method == "console":
return CliAuth("API key: billed per token")
return _unknown("Claude Code")
+def _claude_plan_auth(plan: object) -> CliAuth:
+ if plan and plan != "free":
+ return CliAuth(f"Claude {plan} plan: uses your plan quota")
+ return CliAuth("signed in without a paid Claude plan", offer=False)
+
+
def _codex_auth(out: str) -> CliAuth | None:
text = out.lower()
if "not logged in" in text:
diff --git a/tests/unit/cli/_provider_picker.py b/tests/unit/cli/_provider_picker.py
new file mode 100644
index 000000000..2d560c4f2
--- /dev/null
+++ b/tests/unit/cli/_provider_picker.py
@@ -0,0 +1,24 @@
+"""Drive the interactive provider picker without a terminal."""
+
+from __future__ import annotations
+
+import io
+from typing import Any
+
+from rich.console import Console
+
+from repowise.cli.ui import provider_selection as ui
+
+
+def pick_default(monkeypatch: Any, **kwargs: Any) -> tuple[str, str]:
+ """The provider the picker offers as its default, and what it printed."""
+ seen: dict[str, str] = {}
+
+ def ask(*_a: object, default: str, **_k: object) -> str:
+ seen["default"] = default
+ return default
+
+ monkeypatch.setattr(ui.Prompt, "ask", ask)
+ buf = io.StringIO()
+ ui._interactive_provider_name(Console(file=buf, width=160), None, **kwargs)
+ return ui._PROVIDER_CHOICES[int(seen["default"]) - 1], buf.getvalue()
diff --git a/tests/unit/cli/test_init_agent_backend.py b/tests/unit/cli/test_init_agent_backend.py
index be79a9a4f..88d451010 100644
--- a/tests/unit/cli/test_init_agent_backend.py
+++ b/tests/unit/cli/test_init_agent_backend.py
@@ -2,12 +2,10 @@
from __future__ import annotations
-import io
from pathlib import Path
from typing import Any
import pytest
-from rich.console import Console
from repowise.cli.agent_targets import registry
from repowise.cli.commands.init_cmd.command import _interactive_gate
@@ -15,6 +13,8 @@ from repowise.cli.ui import provider_selection as ui
from repowise.cli.ui.subscription import SubscriptionContext
from repowise.core.agents.identity import identity_for_target_id
+from ._provider_picker import pick_default
+
class _Target:
def __init__(self, present: bool) -> None:
@@ -36,20 +36,8 @@ def _set_up(monkeypatch: Any, *target_ids: str) -> None:
def _default_pick(
monkeypatch: Any, detected: dict[str, str], prefer: tuple[str, ...]
) -> tuple[str, str]:
- """The provider the picker offers as its default, and what it printed."""
monkeypatch.setattr(ui, "_detect_provider_status", lambda *_a: detected)
- seen: dict[str, str] = {}
-
- def ask(*_a: object, default: str, **_k: object) -> str:
- seen["default"] = default
- return default
-
- monkeypatch.setattr(ui.Prompt, "ask", ask)
- buf = io.StringIO()
- ui._interactive_provider_name(
- Console(file=buf, width=120), None, subscription=SubscriptionContext(prefer=prefer)
- )
- return ui._PROVIDER_CHOICES[int(seen["default"]) - 1], buf.getvalue()
+ return pick_default(monkeypatch, subscription=SubscriptionContext(prefer=prefer))
def test_agent_set_up_here_lists_its_provider(tmp_path: Path, monkeypatch: Any) -> None:
diff --git a/tests/unit/cli/test_subscription_providers.py b/tests/unit/cli/test_subscription_providers.py
index 607facc4c..98af7fa20 100644
--- a/tests/unit/cli/test_subscription_providers.py
+++ b/tests/unit/cli/test_subscription_providers.py
@@ -19,6 +19,8 @@ from repowise.core.cost_estimator import approximate_generation_plan, estimate_c
from repowise.core.providers.llm import resolve
from repowise.core.providers.llm.specs import PROVIDER_SPECS
+from ._provider_picker import pick_default
+
_KEYS = tuple(
var for spec in PROVIDER_SPECS.values() for var in (*spec.api_key_envs, *spec.base_url_envs)
)
@@ -41,16 +43,7 @@ def _logged_in(monkeypatch: Any, *names: str, auth: Any = _PLAN) -> None:
def _default_pick(monkeypatch: Any, repo: Path | None = None, **kwargs: Any) -> tuple[str, str]:
- seen: dict[str, str] = {}
-
- def ask(*_a: object, default: str, **_k: object) -> str:
- seen["default"] = default
- return default
-
- monkeypatch.setattr(ui.Prompt, "ask", ask)
- buf = io.StringIO()
- ui._interactive_provider_name(Console(file=buf, width=160), None, repo_path=repo, **kwargs)
- return ui._PROVIDER_CHOICES[int(seen["default"]) - 1], buf.getvalue()
+ return pick_default(monkeypatch, repo_path=repo, **kwargs)
# -- detection ----------------------------------------------------------------