booking-agent-cli 0.9.0__tar.gz → 0.9.1__tar.gz

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: booking-agent-cli
-Version: 0.9.0
+Version: 0.9.1
 Summary: The Booking Agent CLI: a stateful USP booking flow with hard gates, plus its USP protocol library.
 Project-URL: Homepage, https://github.com/wix/booking-agent
 Project-URL: Documentation, https://github.com/wix/booking-agent/blob/master/booking-agent/README.md
@@ -78,7 +78,7 @@ Each release also publishes that skill at an immutable `skill-v<version>` tag an
 the release workflow, so a harness can pin and verify the exact text it follows:
 
 ```bash
-curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.0/booking-agent/skills/booking-agent/SKILL.md
+curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.1/booking-agent/skills/booking-agent/SKILL.md
 gh attestation verify SKILL.md --repo wix/booking-agent \
   --signer-workflow wix/booking-agent/.github/workflows/release.yml
 ```

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/README.md

@@ -36,7 +36,7 @@ Each release also publishes that skill at an immutable `skill-v<version>` tag an
 the release workflow, so a harness can pin and verify the exact text it follows:
 
 ```bash
-curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.0/booking-agent/skills/booking-agent/SKILL.md
+curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.1/booking-agent/skills/booking-agent/SKILL.md
 gh attestation verify SKILL.md --repo wix/booking-agent \
   --signer-workflow wix/booking-agent/.github/workflows/release.yml
 ```

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "booking-agent-cli"
-version = "0.9.0"
+version = "0.9.1"
 description = "The Booking Agent CLI: a stateful USP booking flow with hard gates, plus its USP protocol library."
 readme = "README.md"
 license = "Apache-2.0"

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent/__init__.py

@@ -3,4 +3,4 @@
 Ships in the booking-agent-cli wheel and never imports ``booking_agent_cli``.
 """
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent/defaults.env

@@ -20,6 +20,9 @@ BOOKING_AGENT_SESSION_DIR=~/.booking-agent
 # Set to `none` by a host that keeps this runtime's files between conversations itself, so
 # `flow init` does not ask the agent how state is kept.
 # BOOKING_AGENT_PERSISTENCE=
+# Set to `0` to let a new conversation change a saved booking without first running
+# `flow status`. By default it must read the saved booking once per runtime.
+# BOOKING_AGENT_RESUME_CHECK=
 BOOKING_AGENT_MAX_SESSIONS=30
 LINK_CLI_BIN=link-cli
 

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent_cli/__init__.py

@@ -1,3 +1,3 @@
 """booking_agent_cli: typer-based stateful CLI for USP booking flows."""
 
-__version__ = "0.9.0"
+__version__ = "0.9.1"

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent_cli/booking_poll.py

@@ -60,6 +60,14 @@ def apply_booking_status(session: Session, booking: Any) -> str:
         session.booking.revision = revision
     status_val = booking_status_value(booking)
     session.booking.status = status_val
+    if getattr(session, "payment_route", None) == "pay_at_service":
+        # Settled offline at the appointment: no booking status means money was collected.
+        session.payment.status = "not_required"
+        if status_val in _SUCCESS_STATUSES:
+            transition(session, to="CONFIRMED")
+        elif status_val in _FAILURE_STATUSES:
+            transition(session, to="FAILED")
+        return status_val
     if status_val in _SUCCESS_STATUSES:
         session.payment.status = "paid"
         transition(session, to="CONFIRMED")

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent_cli/booking_summary.py

@@ -356,6 +356,8 @@ def booked_message(session: Any) -> str:
     link = getattr(session, "calendar_event_html_link", None)
     if link:
         text += f"\nAdded to your Google Calendar: {link}"
+    elif getattr(session, "calendar_skipped_unasked", False):
+        text += "\nNo calendar event was added: Google Calendar was not connected for this booking."
     if getattr(session, "payment_route", None) == "pay_at_service":
         text += "\n" + pay_at_service_line(session)
     booking_url = getattr(getattr(session, "booking", None), "booking_url", None)

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent_cli/bundled_skill.md

@@ -1,5 +1,5 @@
 ---
-version: 0.57.0
+version: 0.57.1
 name: booking-agent
 description: |
   Books time-based services via USP from a Link wallet. Use when the user wants to book, schedule, reserve, or pay for a service from a business (haircut, lesson, repair, class, appointment, consult). The `booking-agent` CLI owns the booking state machine and refuses to proceed when human gates are skipped. Sign the user in to Link on your own, right after install and at the start of every booking (`booking-agent flow link-auth connect`, then start `booking-agent flow link-auth poll` in the background and post the sign-in URL in the same turn, exactly like `pay poll`); never wait for the user to ask to sign in or to say they approved. After `booking-agent flow business use`, follow `next_command` through `use-ucp-checkout-mode`; businesses without native checkout fail closed. Payment uses `booking-agent flow pay request` (default returns immediately with the approval URL), then start `booking-agent flow pay poll` in the background and post the approval URL to the user in the same turn; the poll finishes checkout once they approve. Confirm through `booking-agent flow book poll --wait`; never start an inbound webhook. Surface the approval URL exactly once. Personal identification (name, phone, email, address) must always come from the user's Link account via `link-cli`, never from chat or placeholders. Before any location-based search, the CLI proposes the Link shipping address and the user confirms it or gives another; online services skip this. Talk to the user in plain everyday language only; never expose CLI, UCP, auth, session, or other implementation details unless they explicitly ask.
@@ -19,7 +19,7 @@ metadata:
         - link-cli
     install:
       - kind: uv
-        package: "booking-agent-cli==0.9.0"
+        package: "booking-agent-cli==0.9.1"
         bins: [booking-agent]
 user-invocable: true
 ---
@@ -220,7 +220,7 @@ To take a fixed, published version instead of the latest, fetch it at the releas
 workflow signs it under, and check the signature before you follow it:
 
 ```bash
-curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.0/booking-agent/skills/booking-agent/SKILL.md
+curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.1/booking-agent/skills/booking-agent/SKILL.md
 gh attestation verify SKILL.md \
   --repo wix/booking-agent \
   --signer-workflow wix/booking-agent/.github/workflows/release.yml
@@ -245,17 +245,17 @@ before installing:
 
 ```bash
 dir="$HOME/.booking-agent/verified-wheels"
-uvx pip download "booking-agent-cli==0.9.0" --no-deps --only-binary :all: -d "$dir"
+uvx pip download "booking-agent-cli==0.9.1" --no-deps --only-binary :all: -d "$dir"
 uvx pypi-attestations==0.0.30 verify pypi --repository https://github.com/wix/booking-agent \
-  "$dir/booking_agent_cli-0.9.0-py3-none-any.whl"
-uv tool install --force "$dir/booking_agent_cli-0.9.0-py3-none-any.whl"
+  "$dir/booking_agent_cli-0.9.1-py3-none-any.whl"
+uv tool install --force "$dir/booking_agent_cli-0.9.1-py3-none-any.whl"
 
 booking-agent --help
 ```
 
 Install only the wheel whose verify step passed, never one that failed it. If `uvx` is not
-available, install the same pinned release with `uv tool install booking-agent-cli==0.9.0` or
-`pipx install booking-agent-cli==0.9.0`; the CLI checks its own files against the signed release
+available, install the same pinned release with `uv tool install booking-agent-cli==0.9.1` or
+`pipx install booking-agent-cli==0.9.1`; the CLI checks its own files against the signed release
 on the first `booking-agent flow init` and refuses to book or pay if they do not match.
 
 Harnesses that read the `install` block in this skill's metadata do this for you. Do not go on
@@ -283,9 +283,8 @@ folder holds (booking files by session, the newer copy of anything else) and del
 the runtime keeps its files anyway, or gives no such folder, re-run it with `--no-persistent-root`.
 If it answers `persistence_folder_not_durable` the folder failed a basic check (a temporary or
 memory-backed place, or not writable): name the folder the runtime really keeps, or use
-`--no-persistent-root`. It sends you back at most twice and then uses the folder as given.
-`persistence_setup_failed` and `persistence_flags_conflict` say what to change. Use the same folder
-every time, never guess a path, never ask the user, and never mention it. A host
+`--no-persistent-root`.
+`persistence_setup_failed` and `persistence_flags_conflict` say what to change. Use the same folder every time, never guess a path, never ask the user, and never mention it. A host
 that sets `BOOKING_AGENT_PERSISTENT_ROOT` or `BOOKING_AGENT_PERSISTENCE=none` is never asked. If the
 user is asked to sign in or reconnect right after a restart, run `booking-agent runtime doctor` and
 follow its `next_command`. For extra cache folders the runtime asks you to keep, run `booking-agent
@@ -308,7 +307,7 @@ prints each effective setting and where it came from; `booking-agent config init
 
 The CLI decides whether a newer version is worth mentioning; you never decide from version
 numbers or release pages. Pass this skill's version on every `flow init` (`--skill-version
-0.57.0`, from the frontmatter above), so the CLI can tell when these instructions and the
+0.57.1`, from the frontmatter above), so the CLI can tell when these instructions and the
 installed CLI no longer match.
 
 - When a command returns `awaiting_user: update_consent`, ask the question in `prompt` in plain
@@ -404,6 +403,7 @@ current state at any time: `booking-agent flow status`.
 ## Agent loop (run on every turn)
 
 1. `booking-agent flow status` — read `phase`, `awaiting_user`, `prompt`, `next_command`, `forbidden`.
+   A new conversation starts here; the user's reply answers only the question status shows.
 2. If `awaiting_user` is set:
    - **`link_spend_approval`** or **`link_auth_approval`:** start the matching poll (`pay poll` or
      `link-auth poll`) **in the background** (`run_in_background`) and, in the **same turn**, post
@@ -470,7 +470,7 @@ confirmation email or on the business's page (`booking_url`). Do not invent a lo
 **Step 1b — Create a new session:**
 
 ```bash
-booking-agent flow init --user-request "<user's exact request>" --skill-version 0.57.0 \
+booking-agent flow init --user-request "<user's exact request>" --skill-version 0.57.1 \
   --skill-path "<absolute path of the SKILL.md you loaded>"
 ```
 
@@ -616,8 +616,8 @@ the user anything:
   and never copy it into an env file. Look up the name each conversation; do not assume it.
 - **`--route local-oauth`**: `data.local_oauth_configured` is true and you can relay a sign-in
   link to the user.
-- **Neither**: run `booking-agent flow calendar skip --session-only` without asking the user
-  about the calendar, then continue to availability.
+- **Neither** (a listed but unconnected connector is a route): run
+  `booking-agent flow calendar skip --session-only --no-route` without asking, then continue.
 
 The CLI stores the route and the variable name for later commands and later bookings, and it
 never guesses one: `calendar connect` without `--route` fails with `calendar_route_required`,
@@ -777,8 +777,7 @@ address and the note from `buyer resolve` automatically. Never map or pass an ad
 If it fails with `service_address_unconfirmed`, run its `next_command` and confirm the address
 with the user.
 
-`flow book` returns `data.merchant_quote` and `data.price_display` (always use these for the
-dollar total shown to the user). **Never** quote `amount_minor_units`, `price_minor_units`, or
+`flow book` returns `data.merchant_quote` and `data.price_display`. **Never** quote `amount_minor_units`, `price_minor_units`, or
 raw `amount` as dollars, only `price_display` or `merchant_quote.total_display`. Quote tax only
 when `merchant_quote` includes a tax line from the merchant; never assume zero tax or warn that
 tax might be extra when no tax line was returned. The spend request uses the merchant-advertised
@@ -794,12 +793,14 @@ nothing.
 directly and `next_command` is `booking-agent flow book poll --wait`. Before running it, tell the user
 in one short plain message what `data.booking_narration` says: the request is in, nothing was
 charged (or the price is paid at the appointment), and you are now waiting for the business to
-confirm. Then run `book poll --wait` and report the result. Never create a payment and skip
+confirm. Then run it and report the result. Never create a payment and skip
 Steps 6b to 6d.
 
 **Pay-at-appointment with a checkout (`pay_at_service`).** Nothing is charged; skip `pay request`.
-Show the amount due at the appointment and any policies, then run `next_command` (`pay
-ucp-complete`). If `merchant_quote.total_changed`, get approval and add `--total-confirmed`.
+Show the amount due at the appointment and any policies, then run `next_command`. If
+`merchant_quote.total_changed`, get approval and add `--total-confirmed`. On
+`booking_confirmation_pending` or `booking_not_confirmed`, post `user_message` and run any
+`next_command`.
 
 **Deposit bookings (`deposit_required`).** Before any charge, show `data.due_now_display` (the
 deposit charged now), the amount due at the appointment, and every item in
@@ -1207,8 +1208,7 @@ Use `booking-agent flow sessions list` only to find unfinished flows or upcoming
 
 ## Settings
 
-Nothing needs configuring. `booking-agent config show` lists every setting and where it came from.
-Two matter to a hosting surface: `BOOKING_AGENT_BUYER_DEVICE_IP` (the buyer's device IP when it
+Two settings matter to a host (`booking-agent config show` lists all): `BOOKING_AGENT_BUYER_DEVICE_IP` (the buyer's device IP when it
 observed one) and `BOOKING_AGENT_USP_AUTH_SCOPED_CREDENTIAL` (`required` by default; see [Booking
 authorization](#booking-authorization)). Faults the user never sees are reported automatically,
 with no user data; `BOOKING_AGENT_FAULT_REPORTS=0` turns that off.

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent_cli/calendar_preference.py

@@ -153,10 +153,15 @@ def complete_calendar_gate_with_preference(
     save_calendar_preference(state=state, mode=mode)
 
 
-def skip_calendar_gate_session_only(session: Session) -> None:
-    """Complete the gate as skipped for this session without persisting a store preference."""
+def skip_calendar_gate_session_only(session: Session, *, unasked: bool = False) -> None:
+    """Complete the gate as skipped for this session without persisting a store preference.
+
+    ``unasked``: the user did not choose this (no way to connect the calendar here), so the
+    booked message says no event was added.
+    """
     session.calendar_gate_completed = True
     session.calendar_state = "skipped"
     session.calendar_mode = CALENDAR_MODE_NONE
+    session.calendar_skipped_unasked = unasked
     transition(session, to="CALENDAR_GATE")
     save_session(session)

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent_cli/commands/flow.py

@@ -189,13 +189,52 @@ def _flow_setup(ctx: typer.Context) -> None:
     from .. import config_loader
 
     clear_last_http_failure()
+    config_loader.load()
     sub = ctx.invoked_subcommand
+    _resume_check(sub)
     if sub not in (None, "init", "sessions"):
         session = load_session()
         if session is not None:
             record_command(session)
             save_session(session)
-    config_loader.load()
+
+
+# Commands a new conversation may run before it has read the saved booking.
+_BEFORE_RESUME_CHECK = frozenset({None, "init", "sessions", "status", "support-report"})
+_MARKS_RESUME_CHECK = frozenset({"init", "sessions", "status"})
+
+
+def _resume_check(sub: Optional[str]) -> None:
+    """Make a runtime that did not start this booking read ``flow status`` first.
+
+    A new conversation can hold a saved booking that is waiting for the user's yes. Reading
+    the state is a CLI step so no skill text has to remember it.
+    """
+    from .. import runtime_prepare
+    from ..session import session_path
+
+    if not runtime_prepare.resume_check_enabled():
+        return
+    path = session_path()
+    if sub in _MARKS_RESUME_CHECK:
+        runtime_prepare.mark_runtime_seen(path)
+        return
+    if sub in _BEFORE_RESUME_CHECK or runtime_prepare.runtime_has_seen(path):
+        return
+    session = load_session()
+    if session is None:
+        return
+    emit_error(
+        session.flow_phase,
+        code="resume_check_required",
+        message=(
+            "This conversation did not start this booking. Run `booking-agent flow status`, "
+            "read it, and follow its next_command. The user's reply answers only the question "
+            "status shows; never list times again or start over."
+        ),
+        next_command="booking-agent flow status",
+    )
+    raise typer.Exit(code=1)
 
 
 # ---------------------------------------------------------------------------
@@ -1233,6 +1272,15 @@ def _bulk_cancel_one(session: Session, reason: Optional[str]) -> Dict[str, Any]:
         }
     finally:
         bind_session_observability(None)
+    if status_val == _CHECKOUT_ABANDONED:
+        return {
+            "outcome": "canceled",
+            "status": status_val,
+            "cancellation": None,
+            "refund_follow_up": None,
+            "calendar": None,
+            "user_message": _checkout_abandoned_message(session),
+        }
     row: Dict[str, Any] = {
         "outcome": "canceled" if status_val == "canceled" else "inactive",
         "status": status_val,
@@ -3426,7 +3474,7 @@ def _require_calendar_offer(session: Session) -> None:
 
 def _emit_calendar_unavailable(session: Session, status: dict, mode: str, *, data: Optional[dict]) -> None:
     session.calendar_technical_fallback = True
-    skip_calendar_gate_session_only(session)
+    skip_calendar_gate_session_only(session, unasked=True)
     out = dict(data or {})
     out.update(status)
     out["calendar_state"] = "skipped"
@@ -3641,6 +3689,12 @@ def calendar_skip(
         "--session-only",
         help="Skip calendar checking for this booking only; keep the saved preference",
     ),
+    no_route: bool = typer.Option(
+        False,
+        "--no-route",
+        help="With --session-only: this runtime has no way to connect Google Calendar, so the "
+        "user was not asked. The booked message then says no event was added.",
+    ),
 ) -> None:
     session = must_load()
     try:
@@ -3651,7 +3705,7 @@ def calendar_skip(
     _require_calendar_offer(session)
     _stop_pending_sign_in()
     if session_only:
-        skip_calendar_gate_session_only(session)
+        skip_calendar_gate_session_only(session, unasked=no_route)
         emit(_agent_out(
             session,
             prompt=(
@@ -4578,6 +4632,11 @@ def _adopt_response_timezone(session: Session, response_zones: Dict[str, Any]) -
     return out
 
 
+_PAST_TIME_CHOICE_PHASES = frozenset({
+    "BUYER_RESOLVED", "BOOKED", "PAYMENT_PENDING", "CONFIRMED",
+})
+
+
 @app.command("availability")
 def availability(
     service_id: Optional[str] = typer.Option(None, "--service-id"),
@@ -4589,6 +4648,12 @@ def availability(
         help="Single calendar day to query (YYYY-MM-DD). Sets a full-day window when "
         "--from/--to are not given. Use this to honor a specific requested date.",
     ),
+    change_time: bool = typer.Option(
+        False,
+        "--change-time",
+        help="The user asked for a different time after the summary was shown. Drops the "
+        "chosen slot and the summary, and lists times again.",
+    ),
 ) -> None:
     """Query availability for the selected business + service."""
     session = must_load()
@@ -4597,6 +4662,23 @@ def availability(
         require_calendar_gate(session)
     except GateError as e:
         raise _handle_gate(session, e)
+    if session.flow_phase in _PAST_TIME_CHOICE_PHASES:
+        if not (change_time and session.flow_phase == "BUYER_RESOLVED"):
+            from ..engine import recommend_next
+
+            emit_error(
+                session.flow_phase,
+                code="availability_after_slot_confirmed",
+                message=(
+                    "A time is already chosen for this booking. Do not list times again: run "
+                    "`booking-agent flow status` and follow next_command. Only if the user "
+                    "asks for a different time at the summary, add `--change-time`."
+                ),
+                next_command=recommend_next(session) or "booking-agent flow status",
+            )
+            raise typer.Exit(code=1)
+        session.slot_id = None
+        session.slot_user_confirmed = False
 
     if session.business.timezone and _valid_iana_timezone(session.business.timezone) is None:
         emit_error(
@@ -4616,6 +4698,7 @@ def availability(
             session.flow_phase,
             code="missing_service_id",
             message="--service-id is required (use the value from `flow discover`).",
+            next_command="booking-agent flow discover",
         )
         raise typer.Exit(code=1)
 
@@ -6481,6 +6564,9 @@ def _complete_pay_at_service(
 
     session.payment.order_id = str(result.get("order_id") or "") or None
     session.payment.status = "not_required"
+    save_session(session)
+    if result.get("booking_confirmation_pending"):
+        _await_pay_at_service_confirmation(session)
     from ..flow_timings import apply_pending_timings
 
     apply_pending_timings(session)
@@ -6491,6 +6577,64 @@ def _complete_pay_at_service(
     _finish_post_payment_steps(session)
 
 
+_PAY_AT_SERVICE_CONFIRM_TIMEOUT_S = 120.0
+
+
+def _await_pay_at_service_confirmation(session: Session) -> None:
+    """Wait for the order to confirm a pay-at-service booking (USP 11.3.5 S6).
+
+    The business accepted the order and charged nothing; the booking confirms
+    shortly after. Returns once it is confirmed and raises ``typer.Exit`` otherwise.
+    """
+    business = _business_label(session)
+    try:
+        from booking_agent.step_timing import timed_step_sync
+
+        with timed_step_sync("confirm"):
+            booking = wait_for_booking_terminal(
+                session,
+                deadline_ts=time.time() + _PAY_AT_SERVICE_CONFIRM_TIMEOUT_S,
+                poll_interval=_CAPTURED_POLL_INTERVAL_S,
+            )
+    except Exception as e:  # noqa: BLE001 - the order exists whatever the read failure was
+        save_session(session)
+        emit_error(
+            session.flow_phase,
+            code="booking_confirmation_pending",
+            message=(
+                f"{e} The business accepted the order and nothing was charged; the booking "
+                "is not confirmed yet. Post user_message, then run next_command. Do not "
+                "complete the checkout again and do not describe a payment."
+            ),
+            user_message=(
+                f"{business} accepted your booking request and nothing was charged. They "
+                "haven't confirmed the appointment yet, so I'm still checking with them."
+            ),
+            next_command="booking-agent flow book poll --wait",
+            forbidden=["booking-agent flow pay ucp-complete", "booking-agent flow pay request"],
+            data={"booking_id": session.booking.id, "order_id": session.payment.order_id},
+        )
+        raise typer.Exit(code=1)
+    status_val = apply_booking_status(session, booking)
+    save_session(session)
+    if status_val in ("confirmed", "completed"):
+        return
+    emit_error(
+        session.flow_phase,
+        code="booking_not_confirmed",
+        message=(
+            f"The business marked the booking {status_val} instead of confirming it. Nothing "
+            "was charged. Post user_message, then stop."
+        ),
+        user_message=(
+            f"{business} didn't confirm this appointment, so you're not booked. Nothing was "
+            "charged."
+        ),
+        data={"booking_id": session.booking.id, "status": status_val},
+    )
+    raise typer.Exit(code=1)
+
+
 def _pay_ucp_complete_impl(
     session: Session,
     *,
@@ -7035,12 +7179,17 @@ def book_poll(
         raise typer.Exit(code=1)
 
     was_captured_unconfirmed = session.payment.captured_unconfirmed
+    offline_order_waiting = (
+        session.payment_route == "pay_at_service"
+        and bool(session.payment.order_id)
+        and session.flow_phase != "CONFIRMED"
+    )
     status_val = apply_booking_status(session, b)
     if was_captured_unconfirmed and session.flow_phase == "CONFIRMED":
         session.payment.captured_unconfirmed = False
     save_session(session)
 
-    if was_captured_unconfirmed and session.flow_phase == "CONFIRMED":
+    if (was_captured_unconfirmed or offline_order_waiting) and session.flow_phase == "CONFIRMED":
         _finish_post_payment_steps(session)
         return
     if was_captured_unconfirmed and status_val in ("canceled", "no_show"):
@@ -7130,6 +7279,21 @@ def book_cancel(
         )
         raise typer.Exit(code=1)
 
+    if status_val == _CHECKOUT_ABANDONED:
+        emit(_agent_out(
+            session,
+            user_message=_checkout_abandoned_message(session),
+            prompt="The checkout was canceled before booking. Post user_message to the user as is.",
+            data={
+                "booking_id": bid,
+                "status": _CHECKOUT_ABANDONED,
+                "cancellation": None,
+                "refund_follow_up": None,
+                "calendar": None,
+            },
+        ))
+        return
+
     follow_up = settlement.get("refund_follow_up")
     calendar = _remove_calendar_event_after_cancel(session) if status_val == "canceled" else None
     user_message = (
@@ -7184,6 +7348,20 @@ class _CancelNeedsHuman(Exception):
         self.handoff = handoff or {}
 
 
+class _CheckoutAbandoned(Exception):
+    """The open checkout was canceled; its never-confirmed booking stays pending."""
+
+
+_CHECKOUT_ABANDONED = "checkout_abandoned"
+
+
+def _checkout_abandoned_message(session: Session) -> str:
+    return (
+        f"I canceled your checkout with {_business_label(session)}. Nothing was booked "
+        "and nothing was charged."
+    )
+
+
 class _CancelFailed(Exception):
     """The cancel did not go through; ``data`` still carries the buyer's way out."""
 
@@ -7204,6 +7382,12 @@ def _cancel_and_record(
     http_status: Optional[int] = None
     try:
         booking, fee = asyncio.run(_cancel_booking_async(session, booking_id, reason))
+    except _CheckoutAbandoned:
+        from ..engine import transition
+
+        transition(session, to="FAILED")
+        save_session(session)
+        return _CHECKOUT_ABANDONED, {}
     except _CancelNeedsHuman:
         save_session(session)
         raise
@@ -7343,7 +7527,7 @@ def _captured_amount_minor(session: Session, booking: Any) -> Optional[int]:
     """
     from ..calendar_event import _payment_route
 
-    if _payment_route(session) in ("free", "at_service"):
+    if _payment_route(session) in ("free", "at_service", "pay_at_service"):
         return None
     payment = _record_field(booking, "payment")
     booking_paid = str(_record_field(payment, "status") or "") in _CAPTURED_PAYMENT_STATUSES
@@ -7451,7 +7635,9 @@ def _cancel_needs_human_message(session: Session, booking_id: Optional[str], err
     lines.extend(service_policy_lines(session.live_service))
     for link in extract_policy_links(handoff.get("merchant_links") or session.ucp_checkout_links):
         lines.append(f"{link['label']}: {link['url']}")
-    if _payment_captured(session) or session.payment.order_id:
+    if session.payment_route != "pay_at_service" and (
+        _payment_captured(session) or session.payment.order_id
+    ):
         lines.append(
             f"If you paid, ask {business} for a refund when you cancel, and give them the "
             "references above so they can find your payment."
@@ -7551,6 +7737,8 @@ async def _manage_url_for_cancel(
 
 
 async def _cancel_booking_async(session: Session, booking_id: str, reason: Optional[str]):
+    if session.ucp_checkout_abandoned:
+        raise _CheckoutAbandoned()
     backend = resolve_backend()
     profile = await backend.resolve_profile(session.business.profile_url)
     endpoint = profile.rest_endpoint
@@ -7609,14 +7797,18 @@ async def _cancel_booking_async(session: Session, booking_id: str, reason: Optio
                 checkout,
                 expected_booking_id=booking_id,
             )
-            if booking_context is not None:
-                return (
-                    SimpleNamespace(
-                        id=booking_context["booking_id"],
-                        status=BookingStatus(booking_context["booking_status"]),
-                    ),
-                    None,
-                )
+            if booking_context is None:
+                # USP 7.5 lets the business leave a never-confirmed booking pending:
+                # it holds no slot and cannot be charged, so there is nothing to cancel.
+                session.ucp_checkout_abandoned = True
+                raise _CheckoutAbandoned()
+            return (
+                SimpleNamespace(
+                    id=booking_context["booking_id"],
+                    status=BookingStatus(booking_context["booking_status"]),
+                ),
+                None,
+            )
 
     manage_url = await _manage_url_for_cancel(
         session,

{booking_agent_cli-0.9.0 → booking_agent_cli-0.9.1}/src/booking_agent_cli/payment_helpers.py

@@ -610,6 +610,7 @@ async def complete_ucp_checkout_async(
         extract_order_id_from_checkout,
         immediate_schedule_amount,
         resolve_handler_id_for_ucp_complete,
+        validate_checkout_totals_and_links,
         validate_completed_checkout_selected_term,
         validate_payment_terms,
         validate_ucp_checkout_completed,
@@ -783,8 +784,18 @@ async def complete_ucp_checkout_async(
                 raise _outcome_error(classification, checkout) from exc
             raise
 
+    def _offline_awaiting_confirmation(checkout: Any) -> bool:
+        # Nothing was charged, so a completed offline checkout whose booking is not
+        # confirmed yet is an accepted order waiting for the business, never a capture.
+        if not without_instrument or not isinstance(checkout, dict):
+            return False
+        if checkout.get("status") != "completed":
+            return False
+        booking = checkout.get("booking")
+        return not (isinstance(booking, dict) and booking.get("booking_status") == "confirmed")
+
     def _raise_if_classified(checkout: Any) -> None:
-        if not isinstance(checkout, dict):
+        if not isinstance(checkout, dict) or _offline_awaiting_confirmation(checkout):
             return
         classification = classify_complete_checkout(checkout)
         if classification.outcome in (CompleteOutcome.UNCLASSIFIED, CompleteOutcome.COMPLETED):
@@ -814,11 +825,22 @@ async def complete_ucp_checkout_async(
                 result = await _post()
                 _raise_if_classified(result)
                 break
+    awaiting_confirmation = _offline_awaiting_confirmation(result)
     try:
-        order_id = validate_ucp_checkout_completed(result) if isinstance(result, dict) else ""
+        if awaiting_confirmation:
+            validate_checkout_totals_and_links(result)
+            order_id = extract_order_id_from_checkout(result)
+            if not order_id:
+                raise UcpProfileValidationError(
+                    "UCP complete_checkout response missing order_id (or order.id)"
+                )
+        else:
+            order_id = validate_ucp_checkout_completed(result) if isinstance(result, dict) else ""
         if term is not None and isinstance(result, dict):
             validate_completed_checkout_selected_term(result, term)
     except UcpProfileValidationError:
+        if awaiting_confirmation:
+            raise
         if isinstance(result, dict) and result.get("status") == "completed":
             booking_block = result.get("booking")
             booking_status = (
@@ -852,6 +874,7 @@ async def complete_ucp_checkout_async(
         "checkout_id": cid,
         "order_id": order_id,
         "handler_id_resolved": resolved_handler,
+        "booking_confirmation_pending": awaiting_confirmation,
     }