booking-agent-cli 0.10.1__tar.gz → 0.10.2__tar.gz

{booking_agent_cli-0.10.1 → booking_agent_cli-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: booking-agent-cli
-Version: 0.10.1
+Version: 0.10.2
 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.3/booking-agent/skills/booking-agent/SKILL.md
+curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.4/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.10.1 → booking_agent_cli-0.10.2}/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.3/booking-agent/skills/booking-agent/SKILL.md
+curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.4/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.10.1 → booking_agent_cli-0.10.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "booking-agent-cli"
-version = "0.10.1"
+version = "0.10.2"
 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.10.1 → booking_agent_cli-0.10.2}/src/booking_agent/__init__.py

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

{booking_agent_cli-0.10.1 → booking_agent_cli-0.10.2}/src/booking_agent_cli/__init__.py

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

{booking_agent_cli-0.10.1 → booking_agent_cli-0.10.2}/src/booking_agent_cli/bundled_skill.md

@@ -1,5 +1,5 @@
 ---
-version: 0.57.3
+version: 0.57.4
 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.10.1"
+        package: "booking-agent-cli==0.10.2"
         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.3/booking-agent/skills/booking-agent/SKILL.md
+curl -fsSLO https://raw.githubusercontent.com/wix/booking-agent/skill-v0.57.4/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,20 +245,20 @@ before installing:
 
 ```bash
 dir="$HOME/.booking-agent/verified-wheels"
-uvx pip download "booking-agent-cli==0.10.1" --no-deps --only-binary :all: -d "$dir"
+uvx pip download "booking-agent-cli==0.10.2" --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.10.1-py3-none-any.whl"
-uv tool install --force "$dir/booking_agent_cli-0.10.1-py3-none-any.whl"
+  "$dir/booking_agent_cli-0.10.2-py3-none-any.whl"
+uv tool install --force "$dir/booking_agent_cli-0.10.2-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.10.1` or
-`pipx install booking-agent-cli==0.10.1`; the CLI checks its own files against the signed release
+Install only a wheel whose verify step passed. If `uvx` is not
+available, install the same pinned release with `uv tool install booking-agent-cli==0.10.2` or
+`pipx install booking-agent-cli==0.10.2`; 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
+Harnesses that read this skill's `install` block do this for you. Do not go on
 until `booking-agent --help` runs. If it still does not, run the commands above yourself; if that
 is not possible in this runtime, ask the user to install the skill, then try again. To develop the
 CLI from a checkout instead, see the [Booking Agent README](https://github.com/wix/booking-agent/blob/master/booking-agent/README.md).
@@ -281,13 +281,13 @@ folder that survives between conversations, re-run the same init with `--persist
 path of that folder>`: the CLI links saved bookings and the Link sign-in into it, merging what each
 folder holds (booking files by session, the newer copy of anything else) and deleting nothing. If
 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`.
-`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
+If it answers `persistence_folder_not_durable` (temporary, memory-backed, or unwritable), name the
+folder the runtime really keeps, or use `--no-persistent-root`.
+`persistence_setup_failed` and `persistence_flags_conflict` say what to change. Use the same folder every time; never guess a path, ask the user, or 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
+follow its `next_command`. If `flow status` or `flow init` answers `saved_state_not_linked`, run its `next_command` once, then
+`flow status`; never answer it with `--no-persistent-root` or a new booking. For extra cache folders the runtime asks you to keep, run `booking-agent
 runtime prepare --persistent-root <folder> --link <runtime folder>=<persistent folder>`.
 
 **Sign the user in to Link**, as described in [Link sign-in](#link-sign-in-automatic). It works
@@ -296,9 +296,8 @@ with no booking in progress. Do not wait for the user to offer to sign in.
 **Pass `--skill-path` and `--skill-version` on every `flow init`**: the path you loaded this file
 from, and the version from the frontmatter above.
 
-Nothing needs configuring for a basic booking: every setting has a shipped default. The user
-never configures anything for the calendar either: you work out at runtime how this runtime can
-reach Google Calendar (see [the calendar gate](#step-3-select-business-and-resolve-calendar-gate)).
+Nothing needs configuring: every setting has a shipped default, and the user never configures the
+calendar: you work out at runtime how this runtime can reach Google Calendar (see [the calendar gate](#step-3-select-business-and-resolve-calendar-gate)).
 **Never** write tokens, keys, or personal details into any env file. `booking-agent config show`
 prints each effective setting and where it came from; `booking-agent config init` creates
 `~/.booking-agent/.env` for an operator to edit.
@@ -306,9 +305,8 @@ prints each effective setting and where it came from; `booking-agent config init
 ### Updates (only with the user's yes)
 
 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.3`, from the frontmatter above), so the CLI can tell when these instructions and the
-installed CLI no longer match.
+numbers or release pages. The `--skill-version` you pass on every `flow init` lets the CLI 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
   words, using `data.user_summary` as the reason, and **STOP**. On yes, run `next_command`
@@ -470,7 +468,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.3 \
+booking-agent flow init --user-request "<user's exact request>" --skill-version 0.57.4 \
   --skill-path "<absolute path of the SKILL.md you loaded>"
 ```
 

{booking_agent_cli-0.10.1 → booking_agent_cli-0.10.2}/src/booking_agent_cli/calendar_preference.py

@@ -85,6 +85,18 @@ def _pref_applicable(
     return False
 
 
+_AT_OR_BEFORE_CALENDAR_GATE = frozenset({"INIT", "PREREQ_OK", "BUSINESS_SELECTED", "CALENDAR_GATE"})
+# Phases where the user has already chosen a time: a calendar reconnect then changes nothing
+# about the booking, and must never send it back to choose a time again.
+CALENDAR_RECONNECTED_LATE_PHASES = frozenset({"SLOT_SELECTED", "BUYER_RESOLVED"})
+
+
+def _reach_calendar_gate(session: Session) -> None:
+    """Move to the calendar gate only from before it; a later phase keeps its place."""
+    if session.flow_phase in _AT_OR_BEFORE_CALENDAR_GATE:
+        transition(session, to="CALENDAR_GATE")
+
+
 def try_apply_remembered_calendar_gate(
     session: Session,
     connection: Dict[str, Any],
@@ -101,7 +113,7 @@ def try_apply_remembered_calendar_gate(
         session.calendar_remembered_applied = True
         session.calendar_state = "skipped"
         session.calendar_mode = CALENDAR_MODE_NONE
-        transition(session, to="CALENDAR_GATE")
+        _reach_calendar_gate(session)
         save_session(session)
         return RememberedCalendarResult(
             applied=True,
@@ -118,7 +130,7 @@ def try_apply_remembered_calendar_gate(
     session.calendar_remembered_applied = True
     session.calendar_state = "connected"
     session.calendar_mode = mode
-    transition(session, to="CALENDAR_GATE")
+    _reach_calendar_gate(session)
     save_session(session)
     if mode == CALENDAR_MODE_EVENTS:
         prompt = (
@@ -148,7 +160,7 @@ def complete_calendar_gate_with_preference(
     session.calendar_gate_completed = True
     session.calendar_state = state
     session.calendar_mode = mode
-    transition(session, to="CALENDAR_GATE")
+    _reach_calendar_gate(session)
     save_session(session)
     save_calendar_preference(state=state, mode=mode)
 
@@ -163,5 +175,5 @@ def skip_calendar_gate_session_only(session: Session, *, unasked: bool = False)
     session.calendar_state = "skipped"
     session.calendar_mode = CALENDAR_MODE_NONE
     session.calendar_skipped_unasked = unasked
-    transition(session, to="CALENDAR_GATE")
+    _reach_calendar_gate(session)
     save_session(session)

{booking_agent_cli-0.10.1 → booking_agent_cli-0.10.2}/src/booking_agent_cli/commands/flow.py

@@ -726,6 +726,19 @@ def _resolve_persistence(persistent_root: Optional[str], no_persistent_root: boo
             )
             raise typer.Exit(code=1)
         return
+    if persistence_resolution() in (None, "acknowledged"):
+        from ..runtime_prepare import find_unlinked_state, saved_state_not_linked_message
+
+        unlinked = find_unlinked_state()
+        if unlinked is not None:
+            emit_error(
+                "INIT",
+                code="saved_state_not_linked",
+                message=saved_state_not_linked_message(unlinked),
+                next_command=f"booking-agent runtime prepare --persistent-root {unlinked}",
+                data={"saved_state_folder": str(unlinked)},
+            )
+            raise typer.Exit(code=1)
     if no_persistent_root:
         acknowledge_no_persistence()
         return
@@ -768,6 +781,18 @@ def _unfinished_similar_sessions(store: Any, user_request: str) -> List[Dict[str
 def status() -> None:
     session = load_session()
     if session is None:
+        from ..runtime_prepare import find_unlinked_state, saved_state_not_linked_message
+
+        unlinked = find_unlinked_state()
+        if unlinked is not None:
+            emit_error(
+                "INIT",
+                code="saved_state_not_linked",
+                message=saved_state_not_linked_message(unlinked),
+                next_command=f"booking-agent runtime prepare --persistent-root {unlinked}",
+                data={"saved_state_folder": str(unlinked)},
+            )
+            raise typer.Exit(code=1)
         emit_error(
             "INIT",
             code="no_session",
@@ -3483,6 +3508,19 @@ def _require_calendar_offer(session: Session) -> None:
     raise typer.Exit(code=1)
 
 
+def _after_calendar(session: Session, prompt: str) -> tuple:
+    """Prompt and next command after a calendar step: a late reconnect resumes the booking."""
+    from ..calendar_preference import CALENDAR_RECONNECTED_LATE_PHASES
+
+    if session.flow_phase in CALENDAR_RECONNECTED_LATE_PHASES:
+        return (
+            f"{prompt} The time is already chosen: do not list times again. Continue the "
+            "booking without asking the user again.",
+            "booking-agent flow buyer resolve",
+        )
+    return f"{prompt} Ready to query availability.", "booking-agent flow availability"
+
+
 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, unasked=True)
@@ -3492,17 +3530,12 @@ def _emit_calendar_unavailable(session: Session, status: dict, mode: str, *, dat
     out["calendar_mode"] = CALENDAR_MODE_NONE
     out["calendar_checking_unavailable"] = True
     out["stale_calendar_mode"] = mode
-    emit(_agent_out(
-        session,
-        prompt=(
-            "The saved Google Calendar access is no longer valid and reconnecting is not "
-            "available on this device, so calendar checking is unavailable for this "
-            "booking. Tell the user that in one plain sentence, then continue. Ready to "
-            "query availability."
-        ),
-        next_command="booking-agent flow availability",
-        data=out,
+    prompt, next_command = _after_calendar(session, (
+        "The saved Google Calendar access is no longer valid and reconnecting is not "
+        "available on this device, so calendar checking is unavailable for this "
+        "booking. Tell the user that in one plain sentence, then continue."
     ))
+    emit(_agent_out(session, prompt=prompt, next_command=next_command, data=out))
 
 
 def _emit_calendar_reconnect_if_stale(
@@ -3717,13 +3750,14 @@ def calendar_skip(
     _stop_pending_sign_in()
     if session_only:
         skip_calendar_gate_session_only(session, unasked=no_route)
+        prompt, next_command = _after_calendar(session, (
+            "Continuing this booking without calendar checking; the saved calendar "
+            "preference is unchanged."
+        ))
         emit(_agent_out(
             session,
-            prompt=(
-                "Continuing this booking without calendar checking; the saved calendar "
-                "preference is unchanged. Ready to query availability."
-            ),
-            next_command="booking-agent flow availability",
+            prompt=prompt,
+            next_command=next_command,
             data={"calendar_state": "skipped", "calendar_mode": CALENDAR_MODE_NONE},
         ))
         return
@@ -3732,11 +3766,8 @@ def calendar_skip(
         state="skipped",
         mode=CALENDAR_MODE_NONE,
     )
-    emit(_agent_out(
-        session,
-        prompt="Calendar gate satisfied (user opted out). Ready to query availability.",
-        next_command="booking-agent flow availability",
-    ))
+    prompt, next_command = _after_calendar(session, "Calendar gate satisfied (user opted out).")
+    emit(_agent_out(session, prompt=prompt, next_command=next_command))
 
 
 @calendar_app.command("connect")
@@ -3810,20 +3841,9 @@ def _emit_calendar_connected(session: Session, *, mode: str, data: dict) -> None
         if mode == CALENDAR_MODE_EVENTS
         else "Calendar connected for conflict checking (free/busy only)."
     )
-    if session.flow_phase == "SLOT_SELECTED":
-        # Reconnected late (after the slot was chosen): pick the booking up where it stopped.
-        emit(_agent_out(
-            session,
-            prompt=f"{prompt} Continue the booking without asking the user again.",
-            next_command="booking-agent flow buyer resolve",
-            data={**data, "mode": mode},
-        ))
-        return
+    prompt, next_command = _after_calendar(session, prompt)
     emit(_agent_out(
-        session,
-        prompt=f"{prompt} Ready to query availability.",
-        next_command="booking-agent flow availability",
-        data={**data, "mode": mode},
+        session, prompt=prompt, next_command=next_command, data={**data, "mode": mode},
     ))
 
 

{booking_agent_cli-0.10.1 → booking_agent_cli-0.10.2}/src/booking_agent_cli/runtime_prepare.py

@@ -17,7 +17,7 @@ import sys
 import tempfile
 import time
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple
+from typing import Callable, Dict, List, Optional, Tuple
 
 from booking_agent import settings
 from booking_agent.secure_file import ensure_private_dir, write_private_text
@@ -353,6 +353,11 @@ def diagnose() -> Dict[str, object]:
                 findings.append({"kind": kind, "path": str(target / sub), "severity": "problem"})
     else:
         findings.append({"kind": "not_persistent", "path": str(state), "severity": "info"})
+        unlinked = find_unlinked_state()
+        if unlinked is not None:
+            problems = True
+            root_hint = str(unlinked)
+            findings.append({"kind": "saved_state_not_linked", "path": root_hint, "severity": "problem"})
     if state_info["linked_to"] and link_info["linked_to"]:
         if Path(str(state_info["linked_to"])).parent != Path(str(link_info["linked_to"])).parent:
             problems = True
@@ -457,6 +462,84 @@ def persistence_resolution() -> Optional[str]:
     return None
 
 
+_TERMINAL_PHASES = frozenset({"CONFIRMED", "FAILED"})
+_SCAN_DEPTH_NAMES = 2
+
+
+def _safe(check: Callable[[], bool]) -> bool:
+    """A filesystem test that treats an unreadable path as absent (``Path.is_file`` raises on EACCES)."""
+    try:
+        return bool(check())
+    except OSError:
+        return False
+
+
+def _holds_unfinished_booking(session_file: Path) -> bool:
+    try:
+        raw = json.loads(session_file.read_text())
+    except (OSError, ValueError):
+        return False
+    sessions = raw.get("sessions") if isinstance(raw, dict) else None
+    return any(
+        isinstance(s, dict) and s.get("flow_phase") not in _TERMINAL_PHASES
+        for s in sessions or []
+    )
+
+
+def find_unlinked_state() -> Optional[Path]:
+    """A persistent root that holds an unfinished booking this runtime has not linked.
+
+    A restart can wipe the runtime's own folders (and the symlinks into the persistent one),
+    leaving the saved booking and Link sign-in intact but invisible: the CLI then sees "no
+    session" and an agent starts over. Looks beside the working folder, its parents, and the
+    home folder, at most two levels down, for a folder this CLI prepared earlier (it holds
+    ``booking-agent/.usp-session.json`` and a boot marker or the sign-in folder).
+    """
+    home = settings.booking_agent_home()
+    if _safe(home.is_symlink) or _safe((home / _SESSION_FILE).is_file):
+        return None
+    try:
+        bases = [Path.cwd(), *Path.cwd().parents, Path.home()]
+    except (OSError, RuntimeError):
+        return None
+    seen = set()
+    for base in bases:
+        if base in seen:
+            continue
+        seen.add(base)
+        level = [base]
+        for _ in range(_SCAN_DEPTH_NAMES + 1):
+            nxt = []
+            for folder in level:
+                state = folder / STATE_SUBDIR
+                session_file = state / _SESSION_FILE
+                if (
+                    _safe(session_file.is_file)
+                    and (_safe((folder / _BOOT_FILE).is_file) or _safe((folder / LINK_SUBDIR).is_dir))
+                    and _holds_unfinished_booking(session_file)
+                ):
+                    return folder
+                try:
+                    nxt.extend(
+                        child for child in sorted(folder.iterdir())
+                        if _safe(child.is_dir) and not _safe(child.is_symlink)
+                        and child.name not in ("node_modules", ".git", ".venv", "proc", "sys")
+                    )
+                except OSError:
+                    continue
+            level = nxt if len(nxt) <= 200 else []
+    return None
+
+
+def saved_state_not_linked_message(root: Path) -> str:
+    return (
+        f"A saved booking and Link sign-in exist in {root}, but this runtime is not linked to "
+        "them (a restart cleared the links). Do not start over and do not use "
+        "--no-persistent-root: run next_command once, then continue with `booking-agent flow "
+        "status`."
+    )
+
+
 def acknowledge_no_persistence() -> None:
     home = ensure_private_dir(settings.booking_agent_home())
     write_private_text(home / _ACK_FILE, time.strftime("%Y-%m-%d\n", time.gmtime()))

{booking_agent_cli-0.10.1 → booking_agent_cli-0.10.2}/tests/integration/test_resume_after_restart.py

@@ -238,3 +238,161 @@ def test_doctor_says_why_a_restart_is_not_shown(isolated_session, monkeypatch, t
     persistence = rp.diagnose()["persistence"]
     assert persistence["survived_restart"] is True
     assert persistence["survived_restart_basis"] == "second_runtime_read_the_saved_booking"
+
+
+# ---------------------------------------------------------------------------
+# A restart cleared the links to the saved state: the booking is still there
+# ---------------------------------------------------------------------------
+
+def _restart_that_clears_the_links(tmp_path, monkeypatch, *, marker=True):
+    """Move the saved booking into a persistent root, then start a runtime with empty folders.
+
+    Hosted replay of 0.10.0 on Base44 Superagent: the sandbox was wiped except the saved
+    folder, the new runtime saw "no session", and the assistant started over.
+    """
+    import shutil
+
+    root = tmp_path / "app" / ".agents" / "state"
+    (root / "booking-agent").mkdir(parents=True)
+    shutil.move(str(tmp_path / ".usp-session.json"), str(root / "booking-agent" / ".usp-session.json"))
+    if marker:
+        (root / ".booking-agent-boot").write_text("{}")
+    conversation = tmp_path / "app" / "conversations" / "c1"
+    conversation.mkdir(parents=True)
+    runtime_home = tmp_path / "rt" / ".booking-agent"
+    monkeypatch.setenv("BOOKING_AGENT_SESSION_DIR", str(runtime_home))
+    monkeypatch.setenv("HOME", str(tmp_path / "rt"))
+    monkeypatch.setattr(
+        "booking_agent_cli.runtime_prepare.link_cli_config_dir", lambda: tmp_path / "rt" / "link",
+    )
+    monkeypatch.chdir(conversation)
+    return root
+
+
+def test_status_points_at_saved_state_this_runtime_is_not_linked_to(
+    runner, isolated_session, monkeypatch, tmp_path,
+):
+    _at_summary(runner, monkeypatch)
+    root = _restart_that_clears_the_links(tmp_path, monkeypatch)
+
+    out = _stdout_json(_invoke(runner, "flow", "status"))
+
+    assert out["data"]["error"]["code"] == "saved_state_not_linked"
+    assert out["next_command"] == f"booking-agent runtime prepare --persistent-root {root}"
+
+
+def test_init_will_not_start_over_beside_saved_state(
+    runner, isolated_session, monkeypatch, tmp_path,
+):
+    _at_summary(runner, monkeypatch)
+    root = _restart_that_clears_the_links(tmp_path, monkeypatch)
+    monkeypatch.delenv("BOOKING_AGENT_PERSISTENCE")  # the test default declares "none"
+
+    for flag in ("--no-persistent-root", None):
+        args = ["flow", "init", "--user-request", "AC repair", "--skill-version", "0.0.0"]
+        if flag:
+            args.append(flag)
+        r = _invoke(runner, *args)
+        assert r.exit_code == 1, r.stdout
+        out = _stdout_json(r)
+        assert out["data"]["error"]["code"] == "saved_state_not_linked"
+        assert out["next_command"].endswith(str(root))
+
+
+def test_linking_the_folder_brings_the_waiting_booking_back(
+    runner, isolated_session, monkeypatch, tmp_path,
+):
+    _at_summary(runner, monkeypatch)
+    root = _restart_that_clears_the_links(tmp_path, monkeypatch)
+    from booking_agent_cli.main import app
+
+    r = runner.invoke(app, ["runtime", "prepare", "--persistent-root", str(root)])
+    assert r.exit_code == 0, r.stdout
+
+    out = _stdout_json(_invoke(runner, "flow", "status"))
+
+    assert out["phase"] == "BUYER_RESOLVED"
+    assert out["awaiting_user"] == "booking_confirmation"
+    assert out["next_command"] == "booking-agent flow buyer resolve"
+
+
+def test_doctor_reports_saved_state_that_is_not_linked(
+    runner, isolated_session, monkeypatch, tmp_path,
+):
+    _at_summary(runner, monkeypatch)
+    root = _restart_that_clears_the_links(tmp_path, monkeypatch)
+    from booking_agent_cli.main import app
+
+    r = runner.invoke(app, ["runtime", "doctor"])
+    out = _stdout_json(r)
+
+    kinds = {f["kind"]: f for f in out["data"]["findings"]}
+    assert kinds["saved_state_not_linked"]["path"] == str(root)
+    assert out["data"]["healthy"] is False
+    assert out["next_command"] == f"booking-agent runtime prepare --persistent-root {root}"
+
+
+def test_a_folder_this_cli_never_prepared_is_not_mistaken_for_saved_state(
+    runner, isolated_session, monkeypatch, tmp_path,
+):
+    _at_summary(runner, monkeypatch)
+    _restart_that_clears_the_links(tmp_path, monkeypatch, marker=False)
+
+    out = _stdout_json(_invoke(runner, "flow", "status"))
+
+    assert out["data"]["error"]["code"] == "no_session"
+
+
+# ---------------------------------------------------------------------------
+# Reconnecting the calendar after a restart must not drop the chosen time
+# ---------------------------------------------------------------------------
+
+def test_a_calendar_step_after_the_summary_keeps_the_chosen_time(
+    runner, isolated_session, monkeypatch,
+):
+    """Hosted replay of 0.10.1: `calendar connect` at the summary sent the booking back to
+    CALENDAR_GATE, so the slot and summary were lost and times were listed again."""
+    slot_id = _at_summary(runner, monkeypatch)
+
+    r = _invoke(runner, "flow", "calendar", "skip", "--session-only")
+
+    assert r.exit_code == 0, r.stdout + r.stderr
+    out = _stdout_json(r)
+    assert out["phase"] == "BUYER_RESOLVED"
+    assert out["next_command"] == "booking-agent flow buyer resolve"
+    assert "do not list times again" in out["prompt"]
+    from booking_agent_cli.session import load_session
+
+    assert load_session().slot_id == slot_id
+    again = _invoke(runner, "flow", "buyer", "resolve")
+    assert again.exit_code == 0, again.stdout + again.stderr
+    assert _stdout_json(again)["awaiting_user"] == "booking_confirmation"
+
+
+def test_the_calendar_gate_still_leads_to_availability_early_in_the_booking(
+    runner, isolated_session,
+):
+    _init(runner)
+    _complete_checkout_mode_setup(runner)
+
+    out = _stdout_json(_skip_calendar(runner, "--session-only"))
+
+    assert out["phase"] == "CALENDAR_GATE"
+    assert out["next_command"] == "booking-agent flow availability"
+
+
+def test_looking_for_saved_state_survives_a_folder_it_cannot_read(
+    runner, isolated_session, monkeypatch, tmp_path,
+):
+    """CI runners have folders the user cannot read; `Path.is_file` raises on those."""
+    from pathlib import Path
+
+    import booking_agent_cli.runtime_prepare as rp
+
+    def _denied(self, *args, **kwargs):
+        raise PermissionError(13, "Permission denied", str(self))
+
+    monkeypatch.setattr(Path, "is_file", _denied)
+    monkeypatch.setattr(Path, "is_dir", _denied)
+
+    assert rp.find_unlinked_state() is None