walla-cli 0.1.4__tar.gz → 0.1.6__tar.gz

{walla_cli-0.1.4 → walla_cli-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: walla-cli
-Version: 0.1.4
+Version: 0.1.6
 Summary: Wallapop.es CLI - look · offer · talk for humans and agents
 Project-URL: Homepage, https://github.com/berendgort/wallapop-cli
 Project-URL: Repository, https://github.com/berendgort/wallapop-cli
@@ -149,7 +149,7 @@ Optional MCP:
 | Step | Agent alone | Ask human |
 |------|-------------|-----------|
 | Search inside mandate | yes | if query vague or budget unset |
-| Shortlist | show GRABs | if more than one GRAB, pick the id |
+| Shortlist | show ranked Wallapop rows with markdown item links | if more than one GRAB, pick the id |
 | Negotiate draft | yes | approve Spanish text |
 | `say --yes` | never | yes to that exact text |
 | `offer --yes` | never; refuse if EUR > budget | yes to that exact EUR |
@@ -161,6 +161,8 @@ Rules:
 - `--yes` means send chat or price offer only. It never completes a purchase.
 - If they only asked to look, do not send.
 - Ambiguous match or multiple GRABs: ask once with candidates.
+- Always present Wallapop shortlists ranked best-first with a markdown link on every item URL.
+- Default search is all of Spain. Shipping counts anywhere. Use `walla search --local` only when the human asked for nearby or pickup.
 - In-person offers outside pickup radius: refuse.
 - Envelope: `ok`, `api_version`, `data` or `error` / `error_type` / `retryable`.
 

{walla_cli-0.1.4 → walla_cli-0.1.6}/README.md

@@ -105,7 +105,7 @@ Optional MCP:
 | Step | Agent alone | Ask human |
 |------|-------------|-----------|
 | Search inside mandate | yes | if query vague or budget unset |
-| Shortlist | show GRABs | if more than one GRAB, pick the id |
+| Shortlist | show ranked Wallapop rows with markdown item links | if more than one GRAB, pick the id |
 | Negotiate draft | yes | approve Spanish text |
 | `say --yes` | never | yes to that exact text |
 | `offer --yes` | never; refuse if EUR > budget | yes to that exact EUR |
@@ -117,6 +117,8 @@ Rules:
 - `--yes` means send chat or price offer only. It never completes a purchase.
 - If they only asked to look, do not send.
 - Ambiguous match or multiple GRABs: ask once with candidates.
+- Always present Wallapop shortlists ranked best-first with a markdown link on every item URL.
+- Default search is all of Spain. Shipping counts anywhere. Use `walla search --local` only when the human asked for nearby or pickup.
 - In-person offers outside pickup radius: refuse.
 - Envelope: `ok`, `api_version`, `data` or `error` / `error_type` / `retryable`.
 

{walla_cli-0.1.4 → walla_cli-0.1.6}/docs/WIRE.md

@@ -48,7 +48,9 @@ Reported shapes (confirm with a live token before trusting writes):
 
 - Inbox: `GET /api/v3/conversations`
 - Messages: `GET|POST /api/v3/conversations/{id}/messages`
-- Offers: `POST /api/v3/delivery/buyer/offers`
+- Offers: `POST /api/v3/delivery/buyer/offers` with
+  `{offer_id, offer_price_amount, offer_price_currency, item_ids}`.
+  `offer_id` is a client UUID. `item_ids` is a one-element list of the listing id.
 - Favorites: `/api/v3/users/me/favorites`, `/api/v3/items/{id}/favorite`
 
 Writes that fail closed as `error_type: unsupported` until fixtures exist.

{walla_cli-0.1.4 → walla_cli-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "walla-cli"
-version = "0.1.4"
+version = "0.1.6"
 description = "Wallapop.es CLI - look · offer · talk for humans and agents"
 authors = [{ name = "Dr. Berend Gort", email = "berend.gort@gmail.com" }]
 readme = "README.md"

{walla_cli-0.1.4 → walla_cli-0.1.6}/skills/walla/SKILL.md

@@ -16,7 +16,7 @@ license: MIT
 pipx install 'walla-cli[mcp]'   # PyPI: https://pypi.org/project/walla-cli/
 walla doctor --json
 # If auth.session is false: ask human to run `walla login` and paste cookie
-walla instruct --json           # read mandate + hitl.ladder
+walla instruct --json           # read mandate + hitl.ladder + present
 ```
 
 If `mandate.budget` is null, ask once:
@@ -28,12 +28,15 @@ walla setup --lat 41.39 --lon 2.17 --km 30 --budget 400 \
 
 ## Loop (efficient HITL)
 
-1. Search inside mandate: `walla search "…" --json`
+1. Search Spain-wide inside budget: `walla search "…" --json`
+   Distance only if the human asked nearby or pickup: add `--local`.
    Optional shortlist share: `--export md,csv,html,pdf --out ./shortlist`
-   or later `walla export --format md,csv,html,pdf --out ./shortlist --json`.
-2. One GRAB → `walla negotiate <id> --json`. Several GRABs → ask human to pick an id.
-3. Show opening + offer_eur + walk_away. Human approves text and EUR.
-4. Only then: `walla say … --yes` or `walla offer … --eur N --yes`
-5. **Stop.** Human pays or meets in the Wallapop app. `--yes` never means buy.
-
-Reads and negotiate drafts are safe. Sends need confirm. Narrate GRAB/LOOK/PASS + URLs.
+2. **Present Wallapop results** from `data.shortlist` (already ranked best-first):
+   say they are on wallapop.es, number them 1…N, and put a markdown link on
+   every `https://es.wallapop.com/item/…` URL. Never summarize without links.
+3. One GRAB → `walla negotiate <id> --json`. Several GRABs → ask human to pick an id.
+4. Show opening + offer_eur + walk_away. Human approves text and EUR.
+5. Only then: `walla say … --yes` or `walla offer … --eur N --yes`
+6. **Stop.** Human pays or meets in the Wallapop app. `--yes` never means buy.
+
+Reads and negotiate drafts are safe. Sends need confirm.

{walla_cli-0.1.4 → walla_cli-0.1.6}/tests/test_account.py

@@ -126,3 +126,8 @@ def test_make_offer_confirm_and_wire(
             out = make_offer("1", 40, confirm=True)
             assert out["sent"] is True
             assert out["quote"]["offer_eur"] == 40
+            body = client.post.call_args.kwargs["json_body"]
+            assert body["item_ids"] == ["1"]
+            assert body["offer_price_amount"] == 40
+            assert body["offer_price_currency"] == "EUR"
+            assert body["offer_id"] == out["offer_id"]

{walla_cli-0.1.4 → walla_cli-0.1.6}/tests/test_edges.py

@@ -68,7 +68,8 @@ def test_verdict_distance_pass(tmp_path: Path, monkeypatch: pytest.MonkeyPatch)
         user_allows_shipping=False,
         location=ListingLocation(latitude=40.4, longitude=-3.7),
     )
-    assert score_listing(far, p) == "PASS"
+    assert score_listing(far, p) == "GRAB"
+    assert score_listing(far, p, local=True) == "PASS"
 
 
 def test_cookie_bare_token(tmp_path: Path) -> None:

{walla_cli-0.1.4 → walla_cli-0.1.6}/tests/test_negotiate.py

@@ -51,10 +51,20 @@ def test_draft_opening_is_specific_and_polite() -> None:
 def test_offer_band_never_lowballs() -> None:
     profile = Profile(lat=41.39, lon=2.17, km=30, pickup_km=30, budget=400)
     brief = draft_negotiation(_listing(price=200), profile)
+    assert brief.offer_eur == 164  # fair is 82% of ask
     assert brief.offer_eur >= 200 * 0.80
     assert brief.offer_eur <= brief.walk_away_eur
 
 
+def test_fair_on_800_opens_near_650() -> None:
+    profile = Profile(lat=41.39, lon=2.17, km=30, pickup_km=30, budget=850)
+    brief = draft_negotiation(
+        _listing(price=800, ship=True, title="North Reach 13m"),
+        profile,
+    )
+    assert brief.offer_eur == 656
+
+
 def test_firm_offer_at_floor_within_budget() -> None:
     profile = Profile(
         lat=41.39, lon=2.17, km=30, pickup_km=30, budget=400, aggressiveness="firm"
@@ -91,9 +101,28 @@ def test_refuse_outside_pickup() -> None:
         draft_negotiation(far, profile)
 
 
-def test_instruct_has_never_pay(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+def test_shipping_draft_asks_envio_not_pickup() -> None:
+    profile = Profile(lat=41.39, lon=2.17, km=30, pickup_km=30, budget=800)
+    brief = draft_negotiation(
+        _listing(price=800, lat=39.53, lon=2.72, ship=True, title="North Reach 13m 2023"),
+        profile,
+    )
+    blob = f"{brief.opening}\n{brief.offer_line}".lower()
+    assert "envío" in blob
+    assert "pasar hoy" not in blob
+    assert "recojo" not in blob
+
+
+def test_instruct_spain_default(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("WALLA_CONFIG_DIR", str(tmp_path))
     data = instruct_recipe()
     assert data["hitl"]["never_pay"] is True
     assert data["hitl"]["yes_means"]
     assert any(s["step"] == "pay_or_buy" for s in data["hitl"]["ladder"])
+    blob = " ".join(data["rules"]) + data["hitl"]["ladder"][0]["agent"]
+    assert "Spain" in blob
+    assert "--local" in blob
+    assert "present" in data
+    assert "wallapop.es" in data["present"]["channel"]
+    assert "es.wallapop.com/item" in data["present"]["format"]
+    assert "link" in data["hitl"]["ladder"][1]["agent"].lower()

walla_cli-0.1.6/tests/test_shortlist.py

@@ -0,0 +1,50 @@
+"""Ranked shortlist helpers."""
+
+from __future__ import annotations
+
+from walla.hunter.shortlist import PRESENT_RULE, rank_shortlist
+
+
+def test_rank_grab_before_look_and_cheaper_first() -> None:
+    rows = [
+        {
+            "id": "look-cheap",
+            "title": "Look cheap",
+            "verdict": "LOOK",
+            "price": {"amount": 200},
+            "url": "https://es.wallapop.com/item/look-cheap",
+            "location": {"city": "A"},
+            "shippable": True,
+        },
+        {
+            "id": "grab-dear",
+            "title": "Grab dear",
+            "verdict": "GRAB",
+            "price": {"amount": 700},
+            "url": "https://es.wallapop.com/item/grab-dear",
+            "location": {"city": "B"},
+            "user_allows_shipping": True,
+        },
+        {
+            "id": "grab-cheap",
+            "title": "Grab cheap",
+            "verdict": "GRAB",
+            "price": {"amount": 430},
+            "url": "https://es.wallapop.com/item/grab-cheap",
+            "location": {"city": "C"},
+            "shippable": True,
+        },
+        {
+            "id": "pass",
+            "title": "Pass",
+            "verdict": "PASS",
+            "price": {"amount": 10},
+            "url": "https://es.wallapop.com/item/pass",
+        },
+    ]
+    ranked = rank_shortlist(rows)
+    assert [r["id"] for r in ranked] == ["grab-cheap", "grab-dear", "look-cheap"]
+    assert ranked[0]["rank"] == 1
+    assert ranked[0]["url"].startswith("https://es.wallapop.com/item/")
+    assert "Wallapop" in PRESENT_RULE
+    assert "markdown" in PRESENT_RULE.lower()

{walla_cli-0.1.4 → walla_cli-0.1.6}/tests/test_verdict.py

@@ -42,6 +42,29 @@ def test_verdict_grab() -> None:
     assert score_listing(_listing(price=Money(amount=100, currency="EUR")), p) == "GRAB"
 
 
+def test_far_shipping_is_grab_unless_local() -> None:
+    p = Profile(lat=41.39, lon=2.17, km=30, budget=800)
+    far = _listing(
+        price=Money(amount=700, currency="EUR"),
+        user_allows_shipping=True,
+        shippable=True,
+        location=ListingLocation(latitude=39.53, longitude=2.72, city="Mallorca"),
+    )
+    assert score_listing(far, p) == "GRAB"
+    assert score_listing(far, p, local=True) == "PASS"
+
+
+def test_far_pickup_stays_visible() -> None:
+    p = Profile(lat=41.39, lon=2.17, km=5, budget=500)
+    far = _listing(
+        price=Money(amount=400, currency="EUR"),
+        user_allows_shipping=False,
+        location=ListingLocation(latitude=40.4, longitude=-3.7, city="Madrid"),
+    )
+    assert score_listing(far, p) == "GRAB"
+    assert score_listing(far, p, local=True) == "PASS"
+
+
 def test_watch_diff_and_merge() -> None:
     assert diff_new_ids(["a"], ["a", "b"]) == ["b"]
     w = Watch(id="1", keywords="bici", seen_ids=["a"])

{walla_cli-0.1.4 → walla_cli-0.1.6}/walla/__init__.py

@@ -4,4 +4,4 @@ from __future__ import annotations
 
 __all__ = ("__version__",)
 
-__version__ = "0.1.4"
+__version__ = "0.1.6"

{walla_cli-0.1.4 → walla_cli-0.1.6}/walla/account/actions.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import uuid
 from typing import Any
 
 from walla.account.login import ensure_access_token
@@ -116,18 +117,21 @@ def make_offer(
             f"In-person listing outside pickup radius ({item.title}). Refuse offer."
         )
     http = client or _auth_client()
+    offer_id = str(uuid.uuid4())
     try:
         raw = http.post(
             "/api/v3/delivery/buyer/offers",
             json_body={
-                "item_id": item_id,
-                "amount": offer_eur,
-                "currency": "EUR",
+                "offer_id": offer_id,
+                "offer_price_amount": offer_eur,
+                "offer_price_currency": "EUR",
+                "item_ids": [item_id],
             },
             auth=True,
         )
         return {
             "sent": True,
+            "offer_id": offer_id,
             "quote": quote.model_dump(mode="json"),
             "title": item.title,
             "response": raw,

{walla_cli-0.1.4 → walla_cli-0.1.6}/walla/cli/cmd_look.py

@@ -11,7 +11,8 @@ import typer
 from walla.cli.catch import run_cmd
 from walla.hunter.export import load_last_search, save_last_search, write_exports
 from walla.hunter.profile_store import load_profile
-from walla.hunter.verdict import score_listing
+from walla.hunter.shortlist import PRESENT_RULE, rank_shortlist
+from walla.hunter.verdict import geo_scope, score_listing
 from walla.hunter.watches import (
     Watch,
     diff_new_ids,
@@ -33,6 +34,9 @@ def register(app: typer.Typer) -> None:
         max_price: float | None = typer.Option(None, "--max-price"),
         category_id: int | None = typer.Option(None, "--category"),
         order_by: str = typer.Option("most_relevance", "--order"),
+        local: bool = typer.Option(
+            False, "--local", help="PASS listings outside profile.km"
+        ),
         export: str | None = typer.Option(
             None, "--export", help="Formats: md,csv,html,pdf"
         ),
@@ -58,7 +62,7 @@ def register(app: typer.Typer) -> None:
             )
             rows = []
             for listing in result.listings:
-                listing.verdict = score_listing(listing, profile)
+                listing.verdict = score_listing(listing, profile, local=local)
                 rows.append(listing.model_dump(mode="json"))
             mandate = {
                 "budget": profile.spend_cap,
@@ -66,15 +70,21 @@ def register(app: typer.Typer) -> None:
                 "must_match": profile.must_match,
             }
             save_last_search(keywords=keywords, listings=rows, mandate=mandate)
+            shortlist = rank_shortlist(rows)
             payload: dict[str, Any] = {
                 "count": len(rows),
                 "next_page": result.next_page,
                 "listings": rows,
+                "shortlist": shortlist,
+                "geo": geo_scope(local=local),
                 "mandate": mandate,
+                "source": "wallapop.es",
                 "hitl": {
                     "grabs": sum(1 for r in rows if r.get("verdict") == "GRAB"),
                     "ask_if_multiple_grabs": True,
+                    "present": PRESENT_RULE,
                     "next": (
+                        "Show shortlist with markdown links (data.shortlist). "
                         "If one GRAB: walla negotiate <id> --json. "
                         "If several: ask human to pick an id. Never pay."
                     ),

{walla_cli-0.1.4 → walla_cli-0.1.6}/walla/core/instruct.py

@@ -36,12 +36,20 @@ def instruct_recipe() -> dict[str, Any]:
             "ladder": [
                 {
                     "step": "search",
-                    "agent": "alone inside budget + radius + must_match",
+                    "agent": (
+                        "alone, Spain-wide, inside budget + must_match. "
+                        "Keep model and size in the keywords. "
+                        "--local only if the human asked nearby or pickup."
+                    ),
                     "ask_human": "only if query vague or budget unset",
                 },
                 {
                     "step": "shortlist",
-                    "agent": "show GRAB title, EUR, URL, verdict",
+                    "agent": (
+                        "Say these are Wallapop.es results. Show numbered "
+                        "data.shortlist best-first with markdown links on every "
+                        "https://es.wallapop.com/item/… URL. Never omit links."
+                    ),
                     "ask_human": "if more than one GRAB, human picks the id",
                 },
                 {
@@ -75,11 +83,28 @@ def instruct_recipe() -> dict[str, Any]:
             "If no session: ask the human to run `walla login` and paste "
             "__Secure-next-auth.session-token (or pass --cookie for non-interactive).",
             "If mandate.budget is null: ask once for budget + aggression + must words.",
-            "Do the ask with walla … --json and narrate in prose.",
+            "Do the ask with walla … --json. Always narrate as Wallapop.es "
+            "and paste data.shortlist with full item URLs (markdown links).",
             "Draft with walla negotiate; never say/offer without human --yes; never pay.",
         ],
+        "present": {
+            "channel": "wallapop.es",
+            "format": (
+                "1. GRAB · Title · €N · City\n"
+                "   [open on Wallapop](https://es.wallapop.com/item/<web_slug>)"
+            ),
+            "order": "best-first: GRAB then LOOK; lower EUR within band",
+            "rule": (
+                "Every shortlist row must include the full item URL. "
+                "Never table-only without links."
+            ),
+        },
         "verbs": {
-            "look": ["walla search <q> --json", "walla item <id> --json"],
+            "look": [
+                "walla search <q> --json",
+                "walla search <q> --local --json",
+                "walla item <id> --json",
+            ],
             "talk": [
                 "walla negotiate <id> --json",
                 "walla inbox --json",
@@ -92,10 +117,14 @@ def instruct_recipe() -> dict[str, Any]:
             ],
         },
         "rules": [
+            "Always present Wallapop shortlists ranked best-first with markdown item links.",
             "search / item / inbox / negotiate are safe reads or drafts.",
             "say and offer require --yes / confirm=true; name listing + euros.",
             "If only asked to look, do not send.",
             "Ambiguous match or multiple GRABs: ask once with candidates.",
+            "Default search is all of Spain. Shipping is enough; do not fence on profile.km.",
+            "walla search --local only when the human asked nearby, pickup, or no shipping.",
+            "Keep model and size tokens in the query. Do not drop them to widen geography.",
             "Refuse in-person offers outside pickup radius.",
             "Refuse offer_eur above mandate.budget.",
             "Negotiate drafts are win-win: respectful Spanish, no lowballs, no pressure.",

{walla_cli-0.1.4 → walla_cli-0.1.6}/walla/hunter/negotiate.py

@@ -31,8 +31,8 @@ BANNED_PHRASES = (
 )
 
 _AGGRESSION_PCT: dict[Aggression, float] = {
-    "soft": 0.95,
-    "fair": 0.90,
+    "soft": 0.90,
+    "fair": 0.82,
     "firm": 0.80,
 }
 
@@ -82,17 +82,10 @@ def draft_negotiation(
             f"Listing is PASS under mandate (must_match / budget / radius): {listing.title}"
         )
     walk = _walk_away(ask, profile)
-    offer = _first_offer(ask, walk, verdict, profile.aggressiveness)
+    offer = _first_offer(ask, walk, profile.aggressiveness)
     specific = _specific_thing(listing)
     greeting = f"Hola {seller_name}," if seller_name else "Hola,"
-    opening = (
-        f"{greeting} me interesa tu {specific}. "
-        "¿Sigue disponible? Puedo pasar hoy si te va bien."
-    )
-    offer_line = (
-        f"Gracias. Por el estado y lo que hay ahora mismo, te propongo "
-        f"{_fmt_eur(offer)} € y lo recojo cuando te venga bien."
-    )
+    opening, offer_line, you_give = _copy(greeting, specific, offer, _ships(listing))
     return NegotiationBrief(
         item_id=listing.id,
         title=listing.title,
@@ -105,11 +98,37 @@ def draft_negotiation(
         offer_line=offer_line,
         why=_why(ask, offer, verdict, profile.aggressiveness),
         seller_gives="Un precio justo y una venta rapida sin pelea.",
-        you_give="Recogida flexible, pago claro, trato respetuoso.",
+        you_give=you_give,
         tone_checks=_tone_checks(opening, offer_line, offer, ask),
     )
 
 
+def _ships(listing: Listing) -> bool:
+    return bool(listing.user_allows_shipping or listing.shippable)
+
+
+def _copy(greeting: str, specific: str, offer: float, ships: bool) -> tuple[str, str, str]:
+    if ships:
+        opening = (
+            f"{greeting} me interesa tu {specific}. "
+            "¿Sigue disponible? Me iría bien envío Wallapop."
+        )
+        offer_line = (
+            f"Gracias. Por el estado y lo que hay ahora mismo, te propongo "
+            f"{_fmt_eur(offer)} € con envío Wallapop."
+        )
+        return opening, offer_line, "Envío Wallapop, pago claro, trato respetuoso."
+    opening = (
+        f"{greeting} me interesa tu {specific}. "
+        "¿Sigue disponible? Puedo pasar hoy si te va bien."
+    )
+    offer_line = (
+        f"Gracias. Por el estado y lo que hay ahora mismo, te propongo "
+        f"{_fmt_eur(offer)} € y lo recojo cuando te venga bien."
+    )
+    return opening, offer_line, "Recogida flexible, pago claro, trato respetuoso."
+
+
 def _assert_reachable(listing: Listing, profile: Profile) -> None:
     if listing.user_allows_shipping or listing.shippable:
         return
@@ -140,17 +159,11 @@ def _walk_away(ask: float, profile: Profile) -> float:
     return round(min(cap, ask), 2)
 
 
-def _first_offer(
-    ask: float, walk: float, verdict: str, aggressiveness: Aggression
-) -> float:
+def _first_offer(ask: float, walk: float, aggressiveness: Aggression) -> float:
     """Aggression sets the ask percent; never below 80% on first message."""
     if ask <= 0:
         return 0.0
-    pct = _AGGRESSION_PCT.get(aggressiveness, 0.90)
-    if ask <= walk and verdict == "GRAB" and aggressiveness == "fair":
-        pct = max(pct, 0.95)
-    elif ask <= walk and verdict == "GRAB" and aggressiveness == "soft":
-        pct = 0.98
+    pct = _AGGRESSION_PCT.get(aggressiveness, 0.82)
     raw = ask * pct
     floor = ask * 0.80
     offer = max(floor, min(raw, walk, ask))

walla_cli-0.1.6/walla/hunter/shortlist.py

@@ -0,0 +1,50 @@
+"""Ranked shortlist for agents (pure; no HTTP)."""
+
+from __future__ import annotations
+
+from typing import Any
+
+__all__ = ("PRESENT_RULE", "rank_shortlist")
+
+_VERDICT_RANK = {"GRAB": 0, "LOOK": 1, "PASS": 2}
+
+PRESENT_RULE = (
+    "Always say these are Wallapop.es listings. Present a numbered shortlist "
+    "ranked best-first (GRAB before LOOK; lower EUR first). Each row must "
+    "include the full https://es.wallapop.com/item/… URL as a markdown link. "
+    "Never summarize without links."
+)
+
+
+def rank_shortlist(
+    listings: list[dict[str, Any]], *, limit: int = 12
+) -> list[dict[str, Any]]:
+    """Return ranked rows: GRAB then LOOK then PASS; cheaper first within band."""
+    scored: list[tuple[int, float, dict[str, Any]]] = []
+    for row in listings:
+        verdict = str(row.get("verdict") or "LOOK")
+        if verdict == "PASS":
+            continue
+        price = row.get("price") or {}
+        amount = float(price.get("amount") or 0) if isinstance(price, dict) else 0.0
+        scored.append((_VERDICT_RANK.get(verdict, 9), amount, row))
+    scored.sort(key=lambda t: (t[0], t[1]))
+    out: list[dict[str, Any]] = []
+    for i, (_, amount, row) in enumerate(scored[:limit], start=1):
+        loc = row.get("location") or {}
+        city = loc.get("city") if isinstance(loc, dict) else None
+        out.append(
+            {
+                "rank": i,
+                "id": row.get("id"),
+                "title": row.get("title"),
+                "price_eur": amount,
+                "verdict": row.get("verdict"),
+                "url": row.get("url"),
+                "city": city,
+                "shippable": bool(
+                    row.get("user_allows_shipping") or row.get("shippable")
+                ),
+            }
+        )
+    return out

{walla_cli-0.1.4 → walla_cli-0.1.6}/walla/hunter/verdict.py

@@ -8,6 +8,7 @@ from walla.models.listing import Listing
 from walla.models.profile import Profile
 
 __all__ = (
+    "geo_scope",
     "haversine_km",
     "matches_must",
     "score_listing",
@@ -32,8 +33,26 @@ def matches_must(listing: Listing, profile: Profile) -> bool:
     return all(tok in blob for tok in tokens)
 
 
-def score_listing(listing: Listing, profile: Profile) -> str:
-    """Return GRAB / LOOK / PASS."""
+def geo_scope(*, local: bool) -> dict[str, object]:
+    """Search contract for agents. lat/lon on the wire is a ranking bias."""
+    if local:
+        return {
+            "scope": "local",
+            "distance_filter": True,
+            "note": "Human asked nearby or pickup. PASS outside profile.km.",
+        }
+    return {
+        "scope": "spain",
+        "distance_filter": False,
+        "note": (
+            "Spain-wide. Shipping counts anywhere. "
+            "Use --local only if the human asked nearby, pickup, or no shipping."
+        ),
+    }
+
+
+def score_listing(listing: Listing, profile: Profile, *, local: bool = False) -> str:
+    """Return GRAB / LOOK / PASS. Distance fences only when local=True."""
     if listing.reserved:
         return "PASS"
     if not matches_must(listing, profile):
@@ -41,14 +60,17 @@ def score_listing(listing: Listing, profile: Profile) -> str:
     budget = profile.spend_cap
     if budget is not None and listing.price.amount > budget:
         return "PASS"
-    if profile.lat is not None and profile.lon is not None and listing.location:
-        la, lo = listing.location.latitude, listing.location.longitude
-        if la is not None and lo is not None:
-            dist = haversine_km(profile.lat, profile.lon, la, lo)
-            if dist > profile.km and not listing.user_allows_shipping:
-                return "PASS"
-            if budget is not None and listing.price.amount <= budget * 0.85 and dist <= profile.km:
-                return "GRAB"
+    if local and _outside_km(listing, profile):
+        return "PASS"
     if budget is not None and listing.price.amount <= budget * 0.9:
         return "GRAB"
     return "LOOK"
+
+
+def _outside_km(listing: Listing, profile: Profile) -> bool:
+    if profile.lat is None or profile.lon is None or not listing.location:
+        return False
+    la, lo = listing.location.latitude, listing.location.longitude
+    if la is None or lo is None:
+        return False
+    return haversine_km(profile.lat, profile.lon, la, lo) > profile.km

{walla_cli-0.1.4 → walla_cli-0.1.6}/walla/mcp/server.py

@@ -10,7 +10,8 @@ from walla.account.login import login_cookie_text, whoami
 from walla.core.envelope import error_payload, success_payload
 from walla.core.instruct import instruct_recipe
 from walla.hunter.profile_store import load_profile
-from walla.hunter.verdict import score_listing
+from walla.hunter.shortlist import PRESENT_RULE, rank_shortlist
+from walla.hunter.verdict import geo_scope, score_listing
 from walla.search.api import get_categories, get_item, search_listings
 
 __all__ = ("build_server",)
@@ -38,6 +39,7 @@ def build_server() -> Any:
         max_results: int = 40,
         min_price: float | None = None,
         max_price: float | None = None,
+        local: bool = False,
     ) -> dict[str, Any]:
         def _run() -> dict[str, Any]:
             profile = load_profile()
@@ -56,9 +58,17 @@ def build_server() -> Any:
             )
             rows = []
             for listing in result.listings:
-                listing.verdict = score_listing(listing, profile)
+                listing.verdict = score_listing(listing, profile, local=local)
                 rows.append(listing.model_dump(mode="json"))
-            return {"count": len(rows), "listings": rows}
+            shortlist = rank_shortlist(rows)
+            return {
+                "count": len(rows),
+                "source": "wallapop.es",
+                "geo": geo_scope(local=local),
+                "shortlist": shortlist,
+                "listings": rows,
+                "hitl": {"present": PRESENT_RULE},
+            }
 
         return _wrap(_run)