Skip to content

Automate browser based workflows with AI

fix: block Zillow first-party PX bootstrap (SKY-18052) (#8980)

LawyZheng5ba0c704d3ad
diff --git a/alembic/versions/2026_10_21_0412-35f6e2470dd5_add_per_number_stripe_subscription_billing_lifecycle_fields.py b/alembic/versions/2026_10_21_0412-35f6e2470dd5_add_per_number_stripe_subscription_billing_lifecycle_fields.py
new file mode 100644
index 000000000..88f08ec84
--- /dev/null
+++ b/alembic/versions/2026_10_21_0412-35f6e2470dd5_add_per_number_stripe_subscription_billing_lifecycle_fields.py
@@ -0,0 +1,124 @@
+"""add per-number Stripe subscription billing lifecycle fields
+
+Revision ID: 35f6e2470dd5
+Revises: 1db436c126a8
+Create Date: 2026-10-21T04:12:05.169595+00:00
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "35f6e2470dd5"
+down_revision: Union[str, None] = "1db436c126a8"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("stripe_subscription_id", sa.String(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("stripe_subscription_item_id", sa.String(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("stripe_payment_intent_id", sa.String(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("stripe_invoice_id", sa.String(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("stripe_refund_id", sa.String(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("stripe_credit_note_id", sa.String(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("current_period_start", sa.DateTime(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("current_period_end", sa.DateTime(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("cancel_at", sa.DateTime(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("maintenance_checked_at", sa.DateTime(), nullable=True),
+ )
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("purchase_generation", sa.String(), nullable=True),
+ )
+ # Exempt means not billed through Stripe: enterprise and pre-billing rows; new self-serve rows default false.
+ op.add_column(
+ "organization_phone_numbers",
+ sa.Column("billing_exempt", sa.Boolean(), nullable=False, server_default=sa.true()),
+ )
+ op.alter_column(
+ "organization_phone_numbers",
+ "billing_exempt",
+ server_default=sa.false(),
+ )
+ op.create_index(
+ "uq_org_phone_numbers_stripe_subscription",
+ "organization_phone_numbers",
+ ["stripe_subscription_id"],
+ unique=True,
+ postgresql_where=sa.text("stripe_subscription_id IS NOT NULL AND deleted_at IS NULL"),
+ sqlite_where=sa.text("stripe_subscription_id IS NOT NULL AND deleted_at IS NULL"),
+ )
+ op.drop_index("uq_org_phone_numbers_org_number", table_name="organization_phone_numbers")
+ op.create_index(
+ "uq_org_phone_numbers_org_number",
+ "organization_phone_numbers",
+ ["organization_id", "phone_number"],
+ unique=True,
+ postgresql_where=sa.text(
+ "status IN ('active', 'provisioning', 'quarantined', 'quarantining', "
+ "'releasing', 'surrendering', 'reversal_pending') AND deleted_at IS NULL"
+ ),
+ sqlite_where=sa.text(
+ "status IN ('active', 'provisioning', 'quarantined', 'quarantining', "
+ "'releasing', 'surrendering', 'reversal_pending') AND deleted_at IS NULL"
+ ),
+ )
+
+
+def downgrade() -> None:
+ op.drop_index("uq_org_phone_numbers_org_number", table_name="organization_phone_numbers")
+ op.create_index(
+ "uq_org_phone_numbers_org_number",
+ "organization_phone_numbers",
+ ["organization_id", "phone_number"],
+ unique=True,
+ postgresql_where=sa.text("status IN ('active', 'provisioning', 'quarantined') AND deleted_at IS NULL"),
+ sqlite_where=sa.text("status IN ('active', 'provisioning', 'quarantined') AND deleted_at IS NULL"),
+ )
+ op.drop_index("uq_org_phone_numbers_stripe_subscription", table_name="organization_phone_numbers")
+ op.drop_column("organization_phone_numbers", "purchase_generation")
+ op.drop_column("organization_phone_numbers", "billing_exempt")
+ op.drop_column("organization_phone_numbers", "maintenance_checked_at")
+ op.drop_column("organization_phone_numbers", "cancel_at")
+ op.drop_column("organization_phone_numbers", "current_period_end")
+ op.drop_column("organization_phone_numbers", "current_period_start")
+ op.drop_column("organization_phone_numbers", "stripe_credit_note_id")
+ op.drop_column("organization_phone_numbers", "stripe_refund_id")
+ op.drop_column("organization_phone_numbers", "stripe_invoice_id")
+ op.drop_column("organization_phone_numbers", "stripe_payment_intent_id")
+ op.drop_column("organization_phone_numbers", "stripe_subscription_item_id")
+ op.drop_column("organization_phone_numbers", "stripe_subscription_id")
diff --git a/skyvern/forge/sdk/db/models.py b/skyvern/forge/sdk/db/models.py
index c47ed6b9e..77e976f72 100644
--- a/skyvern/forge/sdk/db/models.py
+++ b/skyvern/forge/sdk/db/models.py
@@ -341,8 +341,19 @@ class OrganizationPhoneNumberModel(Base):
"organization_id",
"phone_number",
unique=True,
- postgresql_where=text("status IN ('active', 'provisioning', 'quarantined') AND deleted_at IS NULL"),
- sqlite_where=text("status IN ('active', 'provisioning', 'quarantined') AND deleted_at IS NULL"),
+ postgresql_where=text(
+ "status IN ('active', 'provisioning', 'quarantined', 'quarantining', 'releasing', 'surrendering', 'reversal_pending') AND deleted_at IS NULL"
+ ),
+ sqlite_where=text(
+ "status IN ('active', 'provisioning', 'quarantined', 'quarantining', 'releasing', 'surrendering', 'reversal_pending') AND deleted_at IS NULL"
+ ),
+ ),
+ Index(
+ "uq_org_phone_numbers_stripe_subscription",
+ "stripe_subscription_id",
+ unique=True,
+ postgresql_where=text("stripe_subscription_id IS NOT NULL AND deleted_at IS NULL"),
+ sqlite_where=text("stripe_subscription_id IS NOT NULL AND deleted_at IS NULL"),
),
)
@@ -360,7 +371,19 @@ class OrganizationPhoneNumberModel(Base):
price_cents = Column(Integer, nullable=True)
status = Column(String, nullable=False, default="active", server_default="active")
quarantined_until = Column(DateTime, nullable=True)
+ stripe_subscription_id = Column(String, nullable=True)
+ stripe_subscription_item_id = Column(String, nullable=True)
+ stripe_payment_intent_id = Column(String, nullable=True)
+ stripe_invoice_id = Column(String, nullable=True)
+ stripe_refund_id = Column(String, nullable=True)
+ stripe_credit_note_id = Column(String, nullable=True)
+ purchase_generation = Column(String, nullable=True)
+ current_period_start = Column(DateTime, nullable=True)
+ current_period_end = Column(DateTime, nullable=True)
provisioning_claimed_at = Column(DateTime, nullable=True)
+ cancel_at = Column(DateTime, nullable=True)
+ maintenance_checked_at = Column(DateTime, nullable=True)
+ billing_exempt = Column(Boolean, nullable=False, default=False, server_default=sqlalchemy.false())
created_at = Column(DateTime, default=datetime.datetime.utcnow, nullable=False)
modified_at = Column(
DateTime,
diff --git a/skyvern/forge/sdk/db/repositories/sms.py b/skyvern/forge/sdk/db/repositories/sms.py
index 273a10469..23c38af85 100644
--- a/skyvern/forge/sdk/db/repositories/sms.py
+++ b/skyvern/forge/sdk/db/repositories/sms.py
@@ -30,6 +30,14 @@ _PHONE_NUMBER_UNIQUE_INDEX = "uq_org_phone_numbers_org_number"
_PHONE_NUMBER_SQLITE_UNIQUE_ERROR = (
"UNIQUE constraint failed: organization_phone_numbers.organization_id, organization_phone_numbers.phone_number"
)
+_MAINTENANCE_ORDER = (
+ OrganizationPhoneNumberModel.maintenance_checked_at.is_(None).desc(),
+ OrganizationPhoneNumberModel.maintenance_checked_at,
+)
+
+
+def _normalize_lifecycle_updates(updates: dict[str, Any]) -> dict[str, Any]:
+ return {key: to_naive_utc(value) if isinstance(value, datetime) else value for key, value in updates.items()}
class PhoneNumberAlreadyExists(ValueError):
@@ -594,6 +602,20 @@ class SMSRepository(BaseRepository):
)
return OrganizationPhoneNumber.model_validate(row) if row is not None else None
+ @db_operation("get_phone_number_by_stripe_subscription_id")
+ async def get_phone_number_by_stripe_subscription_id(
+ self,
+ stripe_subscription_id: str,
+ ) -> OrganizationPhoneNumber | None:
+ async with self.Session() as session:
+ row = await session.scalar(
+ select(OrganizationPhoneNumberModel).where(
+ OrganizationPhoneNumberModel.stripe_subscription_id == stripe_subscription_id,
+ OrganizationPhoneNumberModel.deleted_at.is_(None),
+ )
+ )
+ return OrganizationPhoneNumber.model_validate(row) if row is not None else None
+
@db_operation("list_phone_numbers")
async def list_phone_numbers(
self,
@@ -612,6 +634,97 @@ class SMSRepository(BaseRepository):
rows = (await session.scalars(query.order_by(OrganizationPhoneNumberModel.created_at))).all()
return [OrganizationPhoneNumber.model_validate(row) for row in rows]
+ async def _list_managed_phone_numbers(
+ self,
+ *conditions: Any,
+ order_by: tuple[Any, ...],
+ limit: int,
+ ) -> list[OrganizationPhoneNumber]:
+ async with self.Session() as session:
+ rows = (
+ await session.scalars(
+ select(OrganizationPhoneNumberModel).where(*conditions).order_by(*order_by).limit(limit)
+ )
+ ).all()
+ return [OrganizationPhoneNumber.model_validate(row) for row in rows]
+
+ @db_operation("list_due_quarantined_phone_numbers")
+ async def list_due_quarantined_phone_numbers(self, limit: int = 100) -> list[OrganizationPhoneNumber]:
+ return await self._list_managed_phone_numbers(
+ OrganizationPhoneNumberModel.status.in_(["quarantined", "surrendering"]),
+ OrganizationPhoneNumberModel.quarantined_until <= naive_utc_now(),
+ OrganizationPhoneNumberModel.deleted_at.is_(None),
+ OrganizationPhoneNumberModel.provider == "skyvern",
+ order_by=(
+ *_MAINTENANCE_ORDER,
+ OrganizationPhoneNumberModel.quarantined_until,
+ OrganizationPhoneNumberModel.phone_number_id,
+ ),
+ limit=limit,
+ )
+
+ @db_operation("list_reversal_pending_phone_numbers")
+ async def list_reversal_pending_phone_numbers(self, limit: int = 100) -> list[OrganizationPhoneNumber]:
+ return await self._list_managed_phone_numbers(
+ OrganizationPhoneNumberModel.status == "reversal_pending",
+ OrganizationPhoneNumberModel.deleted_at.is_(None),
+ OrganizationPhoneNumberModel.provider == "skyvern",
+ order_by=(
+ *_MAINTENANCE_ORDER,
+ OrganizationPhoneNumberModel.modified_at,
+ OrganizationPhoneNumberModel.phone_number_id,
+ ),
+ limit=limit,
+ )
+
+ @db_operation("list_incomplete_quarantined_phone_numbers")
+ async def list_incomplete_quarantined_phone_numbers(self, limit: int = 100) -> list[OrganizationPhoneNumber]:
+ return await self._list_managed_phone_numbers(
+ OrganizationPhoneNumberModel.status == "quarantined",
+ OrganizationPhoneNumberModel.quarantined_until.is_(None),
+ OrganizationPhoneNumberModel.deleted_at.is_(None),
+ OrganizationPhoneNumberModel.provider == "skyvern",
+ order_by=(
+ *_MAINTENANCE_ORDER,
+ OrganizationPhoneNumberModel.modified_at,
+ OrganizationPhoneNumberModel.phone_number_id,
+ ),
+ limit=limit,
+ )
+
+ @db_operation("list_active_managed_phone_numbers")
+ async def list_active_managed_phone_numbers(self, limit: int = 100) -> list[OrganizationPhoneNumber]:
+ return await self._list_managed_phone_numbers(
+ OrganizationPhoneNumberModel.status == "active",
+ OrganizationPhoneNumberModel.provider == "skyvern",
+ OrganizationPhoneNumberModel.deleted_at.is_(None),
+ order_by=(*_MAINTENANCE_ORDER, OrganizationPhoneNumberModel.phone_number_id),
+ limit=limit,
+ )
+
+ @db_operation("list_stale_provisioning_phone_numbers")
+ async def list_stale_provisioning_phone_numbers(
+ self,
+ limit: int = 100,
+ stale_after: timedelta = timedelta(minutes=5),
+ ) -> list[OrganizationPhoneNumber]:
+ stale_before = naive_utc_now() - stale_after
+ return await self._list_managed_phone_numbers(
+ OrganizationPhoneNumberModel.status == "provisioning",
+ OrganizationPhoneNumberModel.deleted_at.is_(None),
+ OrganizationPhoneNumberModel.provider == "skyvern",
+ or_(
+ OrganizationPhoneNumberModel.provisioning_claimed_at.is_(None),
+ OrganizationPhoneNumberModel.provisioning_claimed_at < stale_before,
+ ),
+ order_by=(
+ *_MAINTENANCE_ORDER,
+ OrganizationPhoneNumberModel.modified_at,
+ OrganizationPhoneNumberModel.phone_number_id,
+ ),
+ limit=limit,
+ )
+
@db_operation("update_phone_number")
async def update_phone_number(
self,
@@ -628,7 +741,19 @@ class SMSRepository(BaseRepository):
quarantined_until: datetime | None | object = _UNSET,
price_cents: int | None | object = _UNSET,
provider_cost_cents: int | None | object = _UNSET,
+ stripe_subscription_id: str | None | object = _UNSET,
+ stripe_subscription_item_id: str | None | object = _UNSET,
+ stripe_payment_intent_id: str | None | object = _UNSET,
+ stripe_invoice_id: str | None | object = _UNSET,
+ stripe_refund_id: str | None | object = _UNSET,
+ stripe_credit_note_id: str | None | object = _UNSET,
+ purchase_generation: str | None | object = _UNSET,
+ current_period_start: datetime | None | object = _UNSET,
+ current_period_end: datetime | None | object = _UNSET,
provisioning_claimed_at: datetime | None | object = _UNSET,
+ cancel_at: datetime | None | object = _UNSET,
+ maintenance_checked_at: datetime | None | object = _UNSET,
+ billing_exempt: bool | object = _UNSET,
) -> OrganizationPhoneNumber | None:
if status is not None and status not in PHONE_NUMBER_STATUSES:
raise InvalidPhoneNumberStatus("Invalid phone number status")
@@ -682,6 +807,22 @@ class SMSRepository(BaseRepository):
row.price_cents = cast(int | None, price_cents)
if provider_cost_cents is not _UNSET:
row.provider_cost_cents = cast(int | None, provider_cost_cents)
+ for key, value in (
+ ("stripe_subscription_id", stripe_subscription_id),
+ ("stripe_subscription_item_id", stripe_subscription_item_id),
+ ("stripe_payment_intent_id", stripe_payment_intent_id),
+ ("stripe_invoice_id", stripe_invoice_id),
+ ("stripe_refund_id", stripe_refund_id),
+ ("stripe_credit_note_id", stripe_credit_note_id),
+ ("purchase_generation", purchase_generation),
+ ("current_period_start", current_period_start),
+ ("current_period_end", current_period_end),
+ ("cancel_at", cancel_at),
+ ("maintenance_checked_at", maintenance_checked_at),
+ ("billing_exempt", bool(billing_exempt) if billing_exempt is not _UNSET else _UNSET),
+ ):
+ if value is not _UNSET:
+ setattr(row, key, _normalize_lifecycle_updates({key: value})[key])
if provisioning_claimed_at is not _UNSET:
row.provisioning_claimed_at = to_naive_utc(cast(datetime | None, provisioning_claimed_at))
row.modified_at = naive_utc_now()
@@ -709,7 +850,19 @@ class SMSRepository(BaseRepository):
price_cents: int | None | object = _UNSET,
provider_cost_cents: int | None | object = _UNSET,
quarantined_until: datetime | None | object = _UNSET,
+ stripe_subscription_id: str | None | object = _UNSET,
+ stripe_subscription_item_id: str | None | object = _UNSET,
+ stripe_payment_intent_id: str | None | object = _UNSET,
+ stripe_invoice_id: str | None | object = _UNSET,
+ stripe_refund_id: str | None | object = _UNSET,
+ stripe_credit_note_id: str | None | object = _UNSET,
+ purchase_generation: str | None | object = _UNSET,
+ current_period_start: datetime | None | object = _UNSET,
+ current_period_end: datetime | None | object = _UNSET,
provisioning_claimed_at: datetime | None | object = _UNSET,
+ cancel_at: datetime | None | object = _UNSET,
+ maintenance_checked_at: datetime | None | object = _UNSET,
+ billing_exempt: bool | object = _UNSET,
) -> OrganizationPhoneNumber | None:
"""Apply a phone update only while the caller owns its claim token."""
if status is not None and status not in PHONE_NUMBER_STATUSES:
@@ -722,10 +875,23 @@ class SMSRepository(BaseRepository):
("price_cents", price_cents),
("provider_cost_cents", provider_cost_cents),
("quarantined_until", quarantined_until),
+ ("stripe_subscription_id", stripe_subscription_id),
+ ("stripe_subscription_item_id", stripe_subscription_item_id),
+ ("stripe_payment_intent_id", stripe_payment_intent_id),
+ ("stripe_invoice_id", stripe_invoice_id),
+ ("stripe_refund_id", stripe_refund_id),
+ ("stripe_credit_note_id", stripe_credit_note_id),
+ ("purchase_generation", purchase_generation),
+ ("current_period_start", current_period_start),
+ ("current_period_end", current_period_end),
("provisioning_claimed_at", provisioning_claimed_at),
+ ("cancel_at", cancel_at),
+ ("maintenance_checked_at", maintenance_checked_at),
+ ("billing_exempt", billing_exempt),
):
if value is not _UNSET:
- values[key] = to_naive_utc(value) if isinstance(value, datetime) else value
+ values[key] = value
+ values = _normalize_lifecycle_updates(values)
async with self.Session() as session:
row = await session.scalar(
update(OrganizationPhoneNumberModel)
@@ -744,6 +910,52 @@ class SMSRepository(BaseRepository):
await session.refresh(row)
return OrganizationPhoneNumber.model_validate(row)
+ @db_operation("update_phone_number_if_expected")
+ async def update_phone_number_if_expected(
+ self,
+ phone_number_id: str,
+ organization_id: str,
+ *,
+ expected_status: str | tuple[str, ...],
+ expected_stripe_subscription_id: str | None | object = _UNSET,
+ expected_purchase_generation: str | None | object = _UNSET,
+ expected_provider_number_sid: str | None | object = _UNSET,
+ **updates: Any,
+ ) -> OrganizationPhoneNumber | None:
+ if "status" in updates and updates["status"] not in PHONE_NUMBER_STATUSES:
+ raise InvalidPhoneNumberStatus("Invalid phone number status")
+ conditions = [
+ OrganizationPhoneNumberModel.phone_number_id == phone_number_id,
+ OrganizationPhoneNumberModel.organization_id == organization_id,
+ OrganizationPhoneNumberModel.deleted_at.is_(None),
+ ]
+ conditions.append(
+ OrganizationPhoneNumberModel.status.in_(expected_status)
+ if isinstance(expected_status, tuple)
+ else OrganizationPhoneNumberModel.status == expected_status
+ )
+ for field, expected in (
+ ("stripe_subscription_id", expected_stripe_subscription_id),
+ ("purchase_generation", expected_purchase_generation),
+ ("provider_number_sid", expected_provider_number_sid),
+ ):
+ if expected is not _UNSET:
+ column = getattr(OrganizationPhoneNumberModel, field)
+ conditions.append(column.is_(None) if expected is None else column == expected)
+ values = {"modified_at": naive_utc_now(), **_normalize_lifecycle_updates(updates)}
+ async with self.Session() as session:
+ row = await session.scalar(
+ update(OrganizationPhoneNumberModel)
+ .where(*conditions)
+ .values(**values)
+ .returning(OrganizationPhoneNumberModel)
+ )
+ await session.commit()
+ if row is None:
+ return None
+ await session.refresh(row)
+ return OrganizationPhoneNumber.model_validate(row)
+
@db_operation("claim_phone_number_provisioning")
async def claim_phone_number_provisioning(
self,
diff --git a/skyvern/forge/sdk/schemas/sms.py b/skyvern/forge/sdk/schemas/sms.py
index 385955922..c9535ddf2 100644
--- a/skyvern/forge/sdk/schemas/sms.py
+++ b/skyvern/forge/sdk/schemas/sms.py
@@ -12,7 +12,17 @@ from skyvern.utils.phone_validation import (
normalize_phone_identifier,
)
-PhoneNumberStatus = Literal["active", "disabled", "released", "quarantined", "provisioning"]
+PhoneNumberStatus = Literal[
+ "active",
+ "disabled",
+ "released",
+ "quarantined",
+ "provisioning",
+ "quarantining",
+ "releasing",
+ "surrendering",
+ "reversal_pending",
+]
PHONE_NUMBER_STATUSES: frozenset[str] = frozenset(get_args(PhoneNumberStatus))
SMSConfigMode = Literal["connected", "manual", "managed"]
SMS_CONFIG_MODES: frozenset[str] = frozenset(get_args(SMSConfigMode))
@@ -49,12 +59,33 @@ class OrganizationPhoneNumber(BaseModel):
price_cents: int | None = None
status: PhoneNumberStatus
quarantined_until: datetime | None = None
+ stripe_subscription_id: str | None = None
+ stripe_subscription_item_id: str | None = None
+ stripe_payment_intent_id: str | None = None
+ stripe_invoice_id: str | None = None
+ stripe_refund_id: str | None = None
+ stripe_credit_note_id: str | None = None
+ purchase_generation: str | None = None
+ current_period_start: datetime | None = None
+ current_period_end: datetime | None = None
provisioning_claimed_at: datetime | None = None
+ cancel_at: datetime | None = None
+ maintenance_checked_at: datetime | None = None
+ billing_exempt: bool = False
created_at: datetime
modified_at: datetime
deleted_at: datetime | None = None
+class AvailableManagedPhoneNumber(BaseModel):
+ phone_number: str
+ friendly_name: str | None = None
+ locality: str | None = None
+ region: str | None = None
+ iso_country: str | None = None
+ monthly_price_cents: int
+
+
class TwilioPhoneNumberInfo(BaseModel):
sid: str
phone_number: str
diff --git a/tests/unit/forge/sdk/db/test_sms_repository.py b/tests/unit/forge/sdk/db/test_sms_repository.py
index 4dfab4c55..2e503869d 100644
--- a/tests/unit/forge/sdk/db/test_sms_repository.py
+++ b/tests/unit/forge/sdk/db/test_sms_repository.py
@@ -184,7 +184,7 @@ async def test_invalid_sms_config_mode_leaves_no_poisoned_row(agent_db: AgentDB)
@pytest.mark.asyncio
[email protected]("operation", ["create", "update", "disable", "delete"])
[email protected]("operation", ["create", "update", "disable", "delete", "claimed", "expected"])
async def test_sms_timestamp_writes_are_naive_utc(agent_db: AgentDB, db_engine: Any, operation: str) -> None:
writes: list[dict[str, datetime]] = []
@@ -200,6 +200,35 @@ async def test_sms_timestamp_writes_are_naive_utc(agent_db: AgentDB, db_engine:
expected = datetime(2026, 9, 10, 9, 30)
if operation == "update":
await agent_db.sms.update_phone_number(phone.phone_number_id, "o_test", quarantined_until=timestamp)
+ elif operation in {"claimed", "expected"}:
+ await agent_db.sms.update_phone_number(phone.phone_number_id, "o_test", status="provisioning")
+ claimed = await agent_db.sms.claim_phone_number_provisioning(phone.phone_number_id, "o_test")
+ writer = getattr(agent_db.sms, f"update_phone_number_if_{operation}")
+ conditions = (
+ {"claim_token": claimed.provisioning_claimed_at}
+ if operation == "claimed"
+ else {"expected_status": "provisioning"}
+ )
+ with pytest.raises(sms_repository_module.InvalidPhoneNumberStatus):
+ await writer(phone.phone_number_id, "o_test", status="bogus", **conditions)
+ updated = await writer(
+ phone.phone_number_id,
+ "o_test",
+ status="reversal_pending",
+ current_period_start=timestamp,
+ current_period_end=timestamp,
+ cancel_at=timestamp,
+ maintenance_checked_at=timestamp,
+ **conditions,
+ )
+ assert updated.status == "reversal_pending"
+ assert (
+ updated.current_period_start
+ == updated.current_period_end
+ == updated.cancel_at
+ == updated.maintenance_checked_at
+ == expected
+ )
elif operation == "disable":
await agent_db.sms.update_phone_number(phone.phone_number_id, "o_test", status="disabled")
elif operation == "delete":
@@ -457,6 +486,40 @@ async def test_phone_number_create_normalizes_and_validates_e164(agent_db: Agent
)
+async def test_list_active_managed_phone_numbers_orders_null_and_oldest_maintenance_first(
+ agent_db: AgentDB,
+) -> None:
+ config, _ = await agent_db.sms.create_sms_config(
+ organization_id="o_reconcile",
+ mode="managed",
+ webhook_secret="secret-token",
+ )
+ first = await agent_db.sms.create_phone_number(
+ organization_id="o_reconcile",
+ sms_config_id=config.sms_config_id,
+ phone_number="+14155550121",
+ provider="skyvern",
+ provider_number_sid="PN_first",
+ )
+ second = await agent_db.sms.create_phone_number(
+ organization_id="o_reconcile",
+ sms_config_id=config.sms_config_id,
+ phone_number="+14155550122",
+ provider="skyvern",
+ provider_number_sid="PN_second",
+ )
+ await agent_db.sms.update_phone_number(
+ first.phone_number_id,
+ "o_reconcile",
+ maintenance_checked_at=datetime.now(timezone.utc),
+ )
+
+ rows = await agent_db.sms.list_active_managed_phone_numbers(limit=2)
+
+ assert [row.phone_number_id for row in rows] == [second.phone_number_id, first.phone_number_id]
+
+
@pytest.mark.parametrize(
("stored_identifier", "lookup_identifier"),
[
diff --git a/uv.lock b/uv.lock
index 2a334653c..991148cdf 100644
--- a/uv.lock
+++ b/uv.lock
@@ -866,11 +866,11 @@ wheels = [
[[package]]
name = "certifi"
-version = "2026.4.22"
+version = "2026.10.19"
source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/25/ee/6caf7a40c36a1220410afe15a1cc64993a1f864871f698c0f93acb72842a/certifi-2026.4.22.tar.gz", hash = "sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580", size = 137077, upload-time = "2026-04-22T11:26:11.191Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a6/bd/1436c50cc46699de0230fbaacc1d1de7bfec413176099949e9d5112e88f2/certifi-2026.10.19.tar.gz", hash = "sha256:035c1e85572b141bf1c3a3eff0e33a8eb74917522f2559075ff8d2fea780a1ae", size = 137598, upload-time = "2026-10-20T02:24:16.604Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/22/30/7cd8fdcdfbc5b869528b079bfb76dcdf6056b1a2097a662e5e8c04f42965/certifi-2026.4.22-py3-none-any.whl", hash = "sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a", size = 135707, upload-time = "2026-04-22T11:26:09.372Z" },
+ { url = "https://files.pythonhosted.org/packages/c4/51/29046e48f693c54e5b7412216d447a1d8362c9653148d98c02cdf65fa733/certifi-2026.10.19-py3-none-any.whl", hash = "sha256:42d35340cc5b9ba78e818ddbff0c5b1c2b779de448a340fd1b989f5fa8670e1b", size = 136464, upload-time = "2026-10-20T02:24:15.072Z" },
]
[[package]]