Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions loopx/extensions/lark/private_conversations.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from ...capabilities.native_chat.file_discovery import (
REPLY_IMAGE_NAME_PATTERN, FileChatDiscovery, file_change_fingerprint, reply_image_workspace,
)
from ...chat_attachments import CHAT_IMAGE_MAX_COUNT, normalize_chat_image_attachments
from ...chat_attachments import CHAT_IMAGE_MAX_COUNT
from ...chat_store import CHAT_MESSAGE_SCHEMA_VERSION, ChatSessionStore, TERMINAL_TURN_STATES, _atomic_write_json, _read_json
from ...control_plane.collaboration import conversation_reply_context
from ...control_plane.content_digest import BARE_SHA256_PATTERN
Expand Down Expand Up @@ -450,11 +450,13 @@ def _source_message(self, record: dict[str, Any], *, selected: dict[str, Any] |
render_content: bool = True,
sender_identity: dict[str, str] | None = None,
source_pair: tuple[Mapping[str, Any] | None, Mapping[str, Any] | None] | None = None,
report_private_recall: bool = False,
) -> Mapping[str, Any] | None:
"""Read the exact source under this App, then recheck the Core audience.

A p2p source read proves the destination without requiring group-member
scopes. A caller cannot opt into this path with an HTTP boolean.
Queued private cards can request a recall marker after source verification.
"""
event = record["event"]
result: Mapping[str, Any]
Expand Down Expand Up @@ -583,13 +585,16 @@ def sources() -> tuple[Mapping[str, Any] | None, Mapping[str, Any] | None]:
or canonical.get("message_id") != event["message_id"]
or canonical.get("sender", {}).get("id") != sender.get("id")
or canonical.get("sender", {}).get("sender_type") != "user"
or canonical.get("deleted") is True
or canonical.get("msg_type", canonical.get("message_type"))
!= message.get("msg_type", message.get("message_type"))
or any(message.get(key) and canonical.get(key) != message[key]
for key in ("root_id", "parent_id", "thread_id"))):
return None
if message.get("deleted") is True or canonical.get("deleted") is True:
return {"deleted": True} if report_private_recall else None
message = {**canonical, "content": message.get("content")}
elif message.get("deleted") is True:
return None
if render_content:
from .event_inbox import lark_event_mentions_bot
if observation is None:
Expand All @@ -602,8 +607,8 @@ def sources() -> tuple[Mapping[str, Any] | None, Mapping[str, Any] | None]:
allow_text_fallback=False))
if group:
canonical_sender = canonical.get("sender") if isinstance(canonical, Mapping) else None
if (canonical is None or canonical.get("chat_id") != event["chat_id"]
or not isinstance(canonical_sender, Mapping)
if (canonical is None or canonical.get("deleted") is True
or canonical.get("chat_id") != event["chat_id"] or not isinstance(canonical_sender, Mapping)
or canonical_sender.get("id") != sender.get("id")
or canonical_sender.get("sender_type") != "user"
or canonical.get("msg_type", canonical.get("message_type"))
Expand Down Expand Up @@ -633,7 +638,7 @@ def sources() -> tuple[Mapping[str, Any] | None, Mapping[str, Any] | None]:
from .event_inbox import lark_event_mentions_bot
if observation is None:
observation = self.bindings.observe(record["profile"])
if (not original or original.get("chat_id") != event["chat_id"]
if (not original or original.get("deleted") is True or original.get("chat_id") != event["chat_id"]
or original.get("sender", {}).get("sender_type") != "user"
or original.get("parent_id") or original.get("root_id") not in (None, "", root)
or not isinstance(original.get("mentions"), list)
Expand Down
4 changes: 2 additions & 2 deletions loopx/extensions/lark/private_steward_triage.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def retire(reason: str) -> int:
# A transient identity/read failure remains recoverable without
# changing the source or invoking the model.
return 0
source = transport._source_message(record, selected=selected)
source = transport._source_message(record, selected=selected, report_private_recall=True)
if source is None:
return 0
if source.get("deleted") is True or private_source_text(source) != stamp["source_text"]:
Expand Down Expand Up @@ -379,7 +379,7 @@ def retire(reason: str) -> int:
if stamp["scope"] != current["context"]["goal_ids"]:
return retire("scope_changed_after_projection")
if "message_id" not in stamp:
fresh_source = transport._source_message(record, selected=current)
fresh_source = transport._source_message(record, selected=current, report_private_recall=True)
if fresh_source is None:
return 0
if fresh_source.get("deleted") is True or private_source_text(fresh_source) != stamp["source_text"]:
Expand Down
38 changes: 36 additions & 2 deletions tests/test_lark_private_conversations.py
Original file line number Diff line number Diff line change
Expand Up @@ -1857,10 +1857,12 @@ def restart():
runtime.close()


@pytest.mark.parametrize("source_change", ["edited", "recalled", "recalled_before_send", "recalled_after_unavailable"])
def test_private_delivery_keeps_retired_steward_cards_out_of_image_recovery(
ordinary, # noqa: F811
ordinary, monkeypatch, source_change, # noqa: F811
):
from loopx.chat_store import _atomic_write_json
from loopx.extensions.lark import private_steward_triage

store, runtime, provider, transport = connect(ordinary)
bindings = transport.bindings
Expand All @@ -1876,10 +1878,42 @@ def test_private_delivery_keeps_retired_steward_cards_out_of_image_recovery(
assert card in transport.pending_delivery_paths()
assert transport.health()[binding["binding_id"]]["pending_count"] == 1

provider.messages[event["message_id"]]["content"] = "/status"
source = provider.messages[event["message_id"]]
if source_change == "edited":
source["content"] = "/status"
elif source_change == "recalled_before_send":
render = private_steward_triage._render

def render_then_recall(*args, **kwargs):
result = render(*args, **kwargs)
source["deleted"] = True
return result

monkeypatch.setattr(private_steward_triage, "_render", render_then_recall)
else:
source["deleted"] = True

if source_change == "recalled_after_unavailable":
route = f"/open-apis/im/v1/messages/{event['message_id']}"

def unavailable_envelope(args, cwd=None, timeout=None):
if route in args:
return {"returncode": 1, "stdout": "", "stderr": "temporarily unavailable"}
return provider(args, cwd, timeout)

with monkeypatch.context() as fault:
fault.setattr(transport, "runner", unavailable_envelope)
assert transport.reconcile_request(card) == 0
assert "retired" not in json.loads(card.read_text())["triage"]
assert card in transport.pending_delivery_paths()
assert not provider.writes

assert transport.reconcile_request(card) == 0
retired = json.loads(card.read_text())
assert retired["triage"]["retired"] == "original_source_changed"
if source_change == "recalled_before_send":
assert retired["triage"]["card"]
assert "send_started_at" not in retired["triage"]

# Even an orphaned descriptor with this filename cannot turn an
# upstream transport-only record into image or model recovery work.
Expand Down
60 changes: 54 additions & 6 deletions tests/test_lark_source_authority_reply.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,50 @@ def test_ordinary_result_uses_the_same_fresh_app_proof_for_sender_and_source(ord
runtime.close()


@pytest.mark.parametrize("private", [False, True])
def test_recalled_message_with_retained_body_cannot_admit_a_turn(ordinary, private): # noqa: F811
store, runtime, provider, transport = connect(ordinary) if private else connect_group(ordinary)
try:
text = "Explain the project result"
event = provider.event("notes-app", "recalled-source", text) if private else provider.topic("recalled-source", text)
provider.messages[event["message_id"]]["deleted"] = True

assert transport.admit("notes-app", event)["status"] == "source_verification_failed"
assert not store.list_sessions()
assert not list(transport.core.root.glob("*.json"))
assert not provider.writes
finally:
runtime.close()


@pytest.mark.parametrize("private", [False, True])
def test_recall_during_preview_holds_reply_with_no_provider_attempt(ordinary, private, monkeypatch): # noqa: F811
_, runtime, provider, transport = connect(ordinary) if private else connect_group(ordinary)
try:
event = provider.event("notes-app", "late-recall", "/status") if private else provider.topic("late-recall", "/status")
assert transport.admit("notes-app", event)["status"] == "command_recorded"
path, = transport.root.glob("*.json")
reply = transport._reply_runner
source = provider.messages[event["message_id"]]

def preview_then_recall(args):
result = reply(args)
if "--dry-run" in args and ("+messages-reply" in args or "+messages-send" in args):
source["deleted"] = True
return result

monkeypatch.setattr(transport, "_reply_runner", preview_then_recall)
delivered = transport.reconcile_request(path)

assert source["deleted"] is True
assert delivered == 0 and not provider.writes
terminal = json.loads(path.read_text())["deliveries"].get("terminal", {})
assert not terminal.get("started") and not terminal.get("attempt")
assert not transport.core.read_request(path.stem).get("delivery_verified")
finally:
runtime.close()


@pytest.mark.parametrize("change", ["app", "revoke"])
def test_successful_preflight_cannot_authorize_a_send_after_authority_changes(
completed_group_stop, monkeypatch, change, # noqa: F811
Expand All @@ -74,8 +118,8 @@ def test_successful_preflight_cannot_authorize_a_send_after_authority_changes(
original = transport._source_authority
proofs = []

def change_after_proof(*args):
proof = original(*args)
def change_after_proof(*args, **kwargs):
proof = original(*args, **kwargs)
proofs.append(proof)
if len(proofs) == 1:
assert proof[0] and proof[1] is True
Expand All @@ -94,7 +138,8 @@ def change_after_proof(*args):
assert not record["deliveries"]["admission"].get("started")


@pytest.mark.parametrize("change", ["app", "bot", "owner", "revoke", "root", "sender", "chat", "parent", "thread"])
@pytest.mark.parametrize("change", ["app", "bot", "owner", "revoke", "root", "sender", "chat", "parent", "thread",
"recall", "recall-root"])
def test_current_source_denial_never_becomes_a_send_or_receipt_intent(completed_group_stop, change): # noqa: F811
_, provider, transport, root, event, record = completed_group_stop
transport._inbox(record)
Expand All @@ -111,6 +156,9 @@ def test_current_source_denial_never_becomes_a_send_or_receipt_intent(completed_
transport.bindings.disconnect(record["binding_id"], expected_revision=transport.bindings.read()["revision"])
elif change == "root":
provider.messages[root["message_id"]]["mentions"] = []
elif change in {"recall", "recall-root"}:
recalled = root if change == "recall-root" else event
provider.messages[recalled["message_id"]]["deleted"] = True
else:
field, value = {"sender": ("sender", {"id": "ou_other", "sender_type": "user"}),
"chat": ("chat_id", "oc_other"), "parent": ("parent_id", "om_other"),
Expand All @@ -119,7 +167,7 @@ def test_current_source_denial_never_becomes_a_send_or_receipt_intent(completed_
assert not _deliver(transport, record)
assert not provider.writes and not provider.reaction_creates
assert not record["deliveries"]["admission"].get("started")
if change in {"root", "sender", "chat", "parent", "thread"}:
if change in {"root", "sender", "chat", "parent", "thread", "recall", "recall-root"}:
# A verified App with a changed source is not an App-name mismatch.
# Keeping that distinction also avoids an unrelated metadata refresh.
assert record["deliveries"]["admission"]["blocker"] == "lark_inbox_reply_sender_not_in_configured_chat"
Expand Down Expand Up @@ -203,10 +251,10 @@ def test_completed_stop_overlaps_preview_but_joins_fresh_authority(completed_gro
source = transport._source_authority
runner = transport.runner

def verify(*args):
def verify(*args, **kwargs):
source_entered.set()
assert release_source.wait(5)
result = source(*args)
result = source(*args, **kwargs)
source_done.set()
return result

Expand Down
Loading