Merge latest upstream/main into host completion fix

Signed-off-by: Duang777 <duangjl007@gmail.com>

Author: Duang777

loopx/extensions/lark/private_conversations.py

@@ -87,6 +87,16 @@ def health(self) -> dict[str, dict[str, int]]:
     def _binding(self, profile: str) -> dict[str, Any]:
         return next(row for row in self.bindings.read()["bindings"] if row["transport_ref"] == profile)
 
+    def _group_source_message(self, profile: str, message_id: str) -> Mapping[str, Any] | None:
+        # The display-oriented mget projection omits reply ancestry. Read the
+        # original provider envelope for group provenance, including root @.
+        result = call(self.runner, lark_args(cli_bin=self.cli_bin, profile=profile,
+            tail=["api", "GET", f"/open-apis/im/v1/messages/{message_id}", "--as", "bot"]))
+        payload = json_payload(result)
+        if result.get("returncode") != 0 or payload.get("code", 0) != 0 or payload.get("ok") is False:
+            return None
+        return _message(payload, message_id)
+
     def _source_message(self, record: dict[str, Any], *, selected: dict[str, Any] | None = None) -> Mapping[str, Any] | None:
         """Read the exact source under this App, then recheck the Core audience.
 
@@ -110,10 +120,22 @@ def _source_message(self, record: dict[str, Any], *, selected: dict[str, Any] |
                     and message.get("chat_id") == event["chat_id"] and isinstance(sender, Mapping)
                     and sender.get("id") == event["sender_id"] and sender.get("sender_type") == "user"):
                 if selected["binding"].get("audience") == "group":
+                    canonical = self._group_source_message(record["profile"], event["message_id"])
+                    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)
+                            or canonical_sender.get("id") != sender.get("id")
+                            or canonical_sender.get("sender_type") != "user"
+                            or canonical.get("msg_type", canonical.get("message_type"))
+                            != message.get("msg_type", message.get("message_type"))):
+                        return None
+                    # Keep the existing text/media rendering, but only the
+                    # lossless envelope supplies identity, ancestry and @.
+                    message = {**canonical, "content": message.get("content")}
                     # Provider readback, never event text, fixes the topic root.
                     root = str(message.get("root_id") or message["message_id"])
                     # The compact event projection emits null for absent
-                    # ancestry. mget can enrich the thread id later; that is
+                    # ancestry. Readback can enrich the thread id later; that is
                     # not a conflict unless the event supplied another id.
                     # Parent/root ancestry must still agree exactly.
                     parent = str(message.get("parent_id") or "")
@@ -127,10 +149,7 @@ def _source_message(self, record: dict[str, Any], *, selected: dict[str, Any] |
                     if root == event["message_id"]:
                         original: Mapping[str, Any] | None = message
                     else:
-                        response = call(self.runner, lark_args(cli_bin=self.cli_bin, profile=record["profile"],
-                            tail=["im", "+messages-mget", "--message-ids", root,
-                                  "--as", "bot", "--no-reactions", "--format", "json"]))
-                        original = _message(json_payload(response), root) if response.get("returncode") == 0 else None
+                        original = self._group_source_message(record["profile"], root)
                     from .event_inbox import lark_event_mentions_bot
                     observation = self.bindings.observe(record["profile"])
                     if (not original or original.get("chat_id") != event["chat_id"]

tests/control_plane/test_agent_preferences.py

@@ -248,8 +248,8 @@ def dispatch():
 @pytest.mark.parametrize("denied_target", ["journal", "namespace"])
 def test_permission_denied_hook_is_not_empty_and_recovers(tmp_path, denied_target):
     import os
-    if os.geteuid() == 0:
-        pytest.skip("root bypasses POSIX read permission")
+    if os.name == "nt" or os.geteuid() == 0:
+        pytest.skip("mode 000 read denial needs a non-root POSIX host")
     _, runtime, registry = _write_fixture(tmp_path, required_capability="network")
     scope = ("--goal-id", GOAL_ID, "--agent-id", AGENT_ID)
     rc, written = _run_cli(registry, runtime, "semantic-preference", "agent", "remember", *scope,

tests/test_contract_scan_unreadable_files.py

@@ -67,7 +67,10 @@ def fail_git_probe(_: Path) -> dict[str, object]:
     assert payload["scanned_files"] == 1
 
 
-@pytest.mark.skipif(os.geteuid() == 0, reason="root reads mode 000 files")
+@pytest.mark.skipif(
+    os.name == "nt" or os.geteuid() == 0,
+    reason="mode 000 read denial needs a non-root POSIX host",
+)
 def test_scan_public_boundary_reports_unreadable_file(tmp_path: Path) -> None:
     (tmp_path / "ok.md").write_text("hello\n", encoding="utf-8")
     locked = tmp_path / "locked.md"

tests/test_lark_private_conversations.py

@@ -67,6 +67,13 @@ def __call__(self, args, cwd=None, timeout=None):
         elif "+chat-list" in args:
             data = {"ok": True, "data": {"chats": [{"chat_id": chat, "name": title}
                 for chat, title in [("oc_community", "Community trial"), ("oc_second", "Second trial")]]}}
+        elif "api" in args and "GET" in args:
+            path = args[args.index("GET") + 1]
+            assert path.startswith("/open-apis/im/v1/messages/")
+            message = dict(self.messages[path.rsplit("/", 1)[-1]])
+            if message.get("msg_type") == "text" and "content" in message:
+                message["body"] = {"content": json.dumps({"text": message.pop("content")})}
+            data = {"code": 0, "data": {"items": [message]}}
         elif "+messages-mget" in args:
             ref = args[args.index("--message-ids") + 1]
             message = self.messages[ref]
@@ -364,6 +371,106 @@ def test_group_readback_rejects_supplied_conflicting_ancestry(ordinary, field, v
         runtime.close()
 
 
+def test_group_reply_uses_raw_ancestry_when_display_readback_omits_it(ordinary):  # noqa: F811
+    _, runtime, provider, transport = connect_group(ordinary)
+    root = provider.topic("display-root", "Explain this project")
+    reply = provider.topic("display-reply", "Compare its configuration", root=root["message_id"])
+
+    def rendered_provider(args, cwd=None, timeout=None):
+        result = provider(args, cwd, timeout)
+        if "+messages-mget" in args:
+            payload = json.loads(result["stdout"])
+            for message in payload["data"]["items"]:
+                message = dict(message)
+                message.pop("root_id", None)
+                message.pop("parent_id", None)
+                payload["data"]["items"] = [message]
+            return {**result, "stdout": json.dumps(payload)}
+        return result
+
+    transport.runner = rendered_provider
+    try:
+        assert transport.admit("notes-app", root)["status"] == "durably_accepted"
+        first = finish_group_turn(runtime, transport, message=root["content"])
+        assert transport.admit("notes-app", reply)["status"] == "durably_accepted"
+        second = finish_group_turn(runtime, transport, message=reply["content"])
+        assert second["session_id"] == first["session_id"]
+        assert all(topic == root["message_id"] for _, topic, _ in provider.topic_writes)
+        assert len([text for _, _, text in provider.topic_writes if text == "Runtime response."]) == 2
+    finally:
+        runtime.close()
+
+
+@pytest.mark.parametrize("failure", ["unavailable", "code_error", "wrong_sender", "wrong_chat", "wrong_type", "wrong_root"])
+def test_group_raw_readback_failure_cannot_fall_back_to_display_authority(ordinary, failure):  # noqa: F811
+    store, runtime, provider, transport = connect_group(ordinary)
+    root = provider.topic("raw-root", "Explain this project")
+    reply = provider.topic("raw-reply", "Compare its configuration", root=root["message_id"])
+
+    def conflicting_provider(args, cwd=None, timeout=None):
+        result = provider(args, cwd, timeout)
+        if "api" in args and "GET" in args:
+            if failure == "unavailable":
+                return {"returncode": 1, "stdout": '{"code":999}', "stderr": ""}
+            if failure == "code_error":
+                return {**result, "stdout": json.dumps({**json.loads(result["stdout"]), "code": 999})}
+            payload = json.loads(result["stdout"])
+            message = dict(payload["data"]["items"][0])
+            message.update({"wrong_sender": {"sender": {"id": "ou_other", "sender_type": "user"}},
+                            "wrong_chat": {"chat_id": "oc_other"}, "wrong_type": {"msg_type": "image"},
+                            "wrong_root": {"root_id": "om_other_root"}}[failure])
+            payload["data"]["items"] = [message]
+            return {**result, "stdout": json.dumps(payload)}
+        return result
+
+    transport.runner = conflicting_provider
+    try:
+        assert transport.admit("notes-app", reply)["status"] == "source_verification_failed"
+        assert not store.list_sessions() and not list(transport.root.glob("*.json"))
+        assert not provider.writes and not provider.reaction_creates
+    finally:
+        runtime.close()
+
+
+@pytest.mark.parametrize("kind", ["image", "post"])
+def test_group_raw_provenance_preserves_rendered_media_and_original_topic(ordinary, kind):  # noqa: F811
+    from test_lark_private_images import image_runner
+    from test_chat_image_attachments import PNG_DATA_URL
+
+    _, runtime, provider, transport = connect_group(ordinary)
+    root = provider.topic("media-root", "Explain this project")
+    media = provider.topic("media-reply", "Inspect this diagram\n![Image](img_example)", root=root["message_id"])
+    media["message_type"] = kind
+    provider.messages[media["message_id"]]["msg_type"] = kind
+    download = image_runner(provider)
+
+    def raw_media_provider(args, cwd=None, timeout=None):
+        result = download(args, cwd, timeout)
+        if "api" in args and "GET" in args:
+            payload = json.loads(result["stdout"])
+            message = payload["data"]["items"][0]
+            if message.get("msg_type") == kind:
+                message.pop("content")
+                body = {"image_key": "img_example"} if kind == "image" else {
+                    "zh_cn": {"title": "", "content": [[{"tag": "text", "text": "Inspect this diagram"},
+                                                       {"tag": "img", "image_key": "img_example"}]]}}
+                message["body"] = {"content": json.dumps(body)}
+            return {**result, "stdout": json.dumps(payload)}
+        return result
+
+    transport.runner = raw_media_provider
+    try:
+        assert transport.admit("notes-app", root)["status"] == "durably_accepted"
+        first = finish_group_turn(runtime, transport, message=root["content"])
+        assert transport.admit("notes-app", media)["status"] == "durably_accepted"
+        second = finish_group_turn(runtime, transport, message="Inspect this diagram\n[图片 1]")
+        assert second["session_id"] == first["session_id"]
+        assert second["attachments"][0]["data_url"] == PNG_DATA_URL
+        assert all(topic == root["message_id"] for _, topic, _ in provider.topic_writes)
+    finally:
+        runtime.close()
+
+
 def test_group_status_and_recipient_commands_cannot_expose_private_sessions(ordinary):  # noqa: F811
     store, runtime, provider, transport = connect_group(ordinary)
     try: