wechatbridge-cli 1.4.3__tar.gz → 1.4.4__tar.gz

{wechatbridge_cli-1.4.3/wechatbridge_cli.egg-info → wechatbridge_cli-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wechatbridge-cli
-Version: 1.4.3
+Version: 1.4.4
 Summary: Bridge WeChat messages to agy, Grok Build, or Codex CLIs — text/image/file/voice in, CLI replies and generated files back.
 Author: WeChatBridge contributors
 License: MIT

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4}/tests/test_hardening.py

@@ -399,7 +399,255 @@ class TestSendArtifactsBackCodexAddDirs(unittest.IsolatedAsyncioTestCase):
             # Exactly the two legitimate artifacts are uploaded; the send API is
             # never called for any deleted/file/oob/symlink-escape target.
             self.assertEqual(len(client.send_media.await_args_list), 2)
-            client.send_message.assert_not_awaited()
+
+            # Skipped (whitelist) artifacts get a short Chinese notice — no abs path.
+            self.assertEqual(client.send_message.await_count, 4)
+            for call in client.send_message.await_args_list:
+                text = call.kwargs["text"]
+                self.assertIn("未能发送", text)
+                self.assertNotIn(base, text)
+                self.assertNotIn(session_dir, text)
+                self.assertNotIn(oob, text)
+
+
+class TestAgyExtractArtifactsUnquote(unittest.TestCase):
+    """agy extract_artifacts must URL-decode percent-encoded paths/names."""
+
+    def test_space_and_cjk_percent_encoded(self):
+        from wechatbridge.agy import extract_artifacts
+
+        text = (
+            "here is [my report.pdf](file:///tmp/scratch/my%20report.pdf) "
+            "and [报告.pdf](file:///tmp/scratch/%E6%8A%A5%E5%91%8A.pdf)"
+        )
+        arts = extract_artifacts(text)
+        paths = {p for _, p in arts}
+        names = {n for n, _ in arts}
+        self.assertIn("/tmp/scratch/my report.pdf", paths)
+        self.assertIn("/tmp/scratch/报告.pdf", paths)
+        self.assertIn("my report.pdf", names)
+        self.assertIn("报告.pdf", names)
+        # Encoded forms must not leak into resolved paths
+        for p in paths:
+            self.assertNotIn("%20", p)
+            self.assertNotIn("%E6", p)
+
+
+class TestSendArtifactsBackAgyAddDirs(unittest.IsolatedAsyncioTestCase):
+    """agy must honour validated --add-dir roots at send time (like codex)."""
+
+    async def test_agy_add_dir_artifact_sent(self):
+        from wechatbridge.main import send_artifacts_back
+        from wechatbridge.config import config
+
+        with tempfile.TemporaryDirectory() as base:
+            session_dir = os.path.join(base, "session")
+            os.makedirs(session_dir)
+            scratch = os.path.join(
+                session_dir, ".gemini", "antigravity-cli", "scratch"
+            )
+            os.makedirs(scratch)
+
+            allowed_extra = os.path.join(base, "allowed_extra")
+            os.makedirs(allowed_extra)
+            good_dir = os.path.join(allowed_extra, "proj")
+            os.makedirs(good_dir)
+            good_art = os.path.join(good_dir, "doc.pdf")
+            with open(good_art, "w", encoding="utf-8") as f:
+                f.write("%PDF-1.4 ok")
+
+            scratch_art = os.path.join(scratch, "local.txt")
+            with open(scratch_art, "w", encoding="utf-8") as f:
+                f.write("scratch")
+
+            # out-of-bounds must still be blocked
+            oob = os.path.join(base, "oob")
+            os.makedirs(oob)
+            oob_art = os.path.join(oob, "secret.txt")
+            with open(oob_art, "w", encoding="utf-8") as f:
+                f.write("secret")
+
+            prefs = {"backend": "agy", "add_dirs": [good_dir]}
+            with open(
+                os.path.join(session_dir, "prefs.json"), "w", encoding="utf-8"
+            ) as f:
+                json.dump(prefs, f)
+
+            client = MagicMock()
+            client.state.baseurl = "https://example.test"
+            client.state.bot_token = "tok"
+            client.send_message = AsyncMock(return_value=True)
+            client.send_media = AsyncMock(return_value=True)
+
+            artifacts = [
+                ("doc.pdf", good_art),
+                ("local.txt", scratch_art),
+                ("secret.txt", oob_art),
+            ]
+
+            with mock.patch(
+                "wechatbridge.main.get_session_dir", return_value=session_dir
+            ), mock.patch(
+                "wechatbridge.runner_common.get_session_dir", return_value=session_dir
+            ), mock.patch(
+                "wechatbridge.main._get_backend", return_value="agy"
+            ), mock.patch.object(
+                config, "add_dir_roots", [allowed_extra]
+            ):
+                await send_artifacts_back(
+                    client, "user-1", "ctx-token", artifacts
+                )
+
+            sent = {c.kwargs["path"] for c in client.send_media.await_args_list}
+            self.assertIn(good_art, sent)
+            self.assertIn(scratch_art, sent)
+            self.assertNotIn(oob_art, sent)
+            self.assertEqual(len(client.send_media.await_args_list), 2)
+
+
+class TestMediaTypeForPath(unittest.TestCase):
+    def test_pdf_png_svg(self):
+        from wechatbridge.ilink import media_type_for_path, MEDIA_IMAGE, MEDIA_FILE
+
+        self.assertEqual(media_type_for_path("/tmp/a.pdf"), MEDIA_FILE)
+        self.assertEqual(media_type_for_path("/tmp/a.docx"), MEDIA_FILE)
+        self.assertEqual(media_type_for_path("/tmp/a.xlsx"), MEDIA_FILE)
+        self.assertEqual(media_type_for_path("/tmp/a.txt"), MEDIA_FILE)
+        self.assertEqual(media_type_for_path("/tmp/a.zip"), MEDIA_FILE)
+        self.assertEqual(media_type_for_path("/tmp/a.png"), MEDIA_IMAGE)
+        self.assertEqual(media_type_for_path("/tmp/a.jpg"), MEDIA_IMAGE)
+        self.assertEqual(media_type_for_path("/tmp/a.jpeg"), MEDIA_IMAGE)
+        self.assertEqual(media_type_for_path("/tmp/a.gif"), MEDIA_IMAGE)
+        self.assertEqual(media_type_for_path("/tmp/a.webp"), MEDIA_IMAGE)
+        self.assertEqual(media_type_for_path("/tmp/a.svg"), MEDIA_FILE)
+        self.assertEqual(media_type_for_path("/tmp/a.heic"), MEDIA_FILE)
+        self.assertEqual(media_type_for_path("/tmp/a.bin"), MEDIA_FILE)
+
+
+class TestArtifactSendFailureNotice(unittest.TestCase):
+    def test_helper_no_absolute_path(self):
+        from wechatbridge.runner_common import format_artifact_send_failure_notice
+
+        art_path = "/root/.local/share/wechatbridge/default/sessions/u1/x.pdf"
+        for reason in ("skipped", "not_found", "send_failed", "error"):
+            text = format_artifact_send_failure_notice("x.pdf", reason)
+            self.assertNotIn(art_path, text)
+            self.assertNotIn("/root/", text)
+            self.assertIn("x.pdf", text)
+            self.assertIn("未能发送", text)
+
+    def test_send_failed_notifies_user(self):
+        from wechatbridge.main import send_artifacts_back
+
+        async def _run():
+            with tempfile.TemporaryDirectory() as td:
+                scratch = os.path.join(td, ".gemini", "antigravity-cli", "scratch")
+                os.makedirs(scratch)
+                art = os.path.join(scratch, "report.pdf")
+                with open(art, "w", encoding="utf-8") as f:
+                    f.write("pdf")
+
+                client = MagicMock()
+                client.state.baseurl = "https://example.test"
+                client.state.bot_token = "tok"
+                client.send_message = AsyncMock(return_value=True)
+                client.send_media = AsyncMock(return_value=False)  # send fails
+
+                with mock.patch(
+                    "wechatbridge.main.get_session_dir", return_value=td
+                ), mock.patch(
+                    "wechatbridge.main._get_backend", return_value="agy"
+                ):
+                    await send_artifacts_back(
+                        client, "user-1", "ctx-token", [("report.pdf", art)]
+                    )
+
+                client.send_media.assert_awaited()
+                client.send_message.assert_awaited()
+                text = client.send_message.await_args.kwargs["text"]
+                self.assertIn("report.pdf", text)
+                self.assertIn("未能发送", text)
+                self.assertNotIn(art, text)
+                self.assertNotIn(td, text)
+
+        asyncio.run(_run())
+
+    def test_not_found_notifies_user(self):
+        from wechatbridge.main import send_artifacts_back
+
+        async def _run():
+            with tempfile.TemporaryDirectory() as td:
+                scratch = os.path.join(td, ".gemini", "antigravity-cli", "scratch")
+                os.makedirs(scratch)
+                missing = os.path.join(scratch, "gone.pdf")
+
+                client = MagicMock()
+                client.state.baseurl = "https://example.test"
+                client.state.bot_token = "tok"
+                client.send_message = AsyncMock(return_value=True)
+                client.send_media = AsyncMock(return_value=True)
+
+                with mock.patch(
+                    "wechatbridge.main.get_session_dir", return_value=td
+                ), mock.patch(
+                    "wechatbridge.main._get_backend", return_value="agy"
+                ):
+                    await send_artifacts_back(
+                        client, "user-1", "ctx-token", [("gone.pdf", missing)]
+                    )
+
+                client.send_media.assert_not_awaited()
+                client.send_message.assert_awaited()
+                text = client.send_message.await_args.kwargs["text"]
+                self.assertIn("gone.pdf", text)
+                self.assertIn("未能发送", text)
+                self.assertNotIn(missing, text)
+                self.assertNotIn(td, text)
+
+        asyncio.run(_run())
+
+
+class TestGrokRelativePathArtifacts(unittest.TestCase):
+    """grok relative file_path must join session_dir then abspath (like codex)."""
+
+    def test_relative_path_resolved(self):
+        from wechatbridge.grok import _extract_grok_artifacts
+        import urllib.parse
+
+        with tempfile.TemporaryDirectory() as session_dir:
+            # Create the relative file under session_dir
+            rel_name = "notes/out.txt"
+            abs_file = os.path.join(session_dir, "notes", "out.txt")
+            os.makedirs(os.path.dirname(abs_file))
+            with open(abs_file, "w", encoding="utf-8") as f:
+                f.write("hello")
+
+            # Fake grok chat_history.jsonl layout
+            cwd_encoded = urllib.parse.quote(session_dir, safe="")
+            session_id = "sess-rel-1"
+            hist_dir = os.path.join(
+                session_dir, ".grok", "sessions", cwd_encoded, session_id
+            )
+            os.makedirs(hist_dir)
+            hist = os.path.join(hist_dir, "chat_history.jsonl")
+            line = {
+                "type": "assistant",
+                "tool_calls": [
+                    {
+                        "name": "write",
+                        "arguments": json.dumps({"file_path": rel_name}),
+                    }
+                ],
+            }
+            with open(hist, "w", encoding="utf-8") as f:
+                f.write(json.dumps(line) + "\n")
+
+            arts = _extract_grok_artifacts(session_dir, session_id, since=0.0)
+            self.assertEqual(len(arts), 1)
+            name, path = arts[0]
+            self.assertEqual(name, "out.txt")
+            self.assertEqual(path, os.path.abspath(abs_file))
+            self.assertTrue(os.path.isabs(path))
 
 
 class TestILinkDeliveryAccepted(unittest.TestCase):

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4}/wechatbridge/__init__.py

@@ -1,2 +1,2 @@
 """WeChatBridge — bridge WeChat messages to agy, Grok Build, or Codex CLIs."""
-__version__ = "1.4.3"
+__version__ = "1.4.4"

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4}/wechatbridge/agy.py

@@ -11,6 +11,7 @@ import shutil
 import signal
 import sys
 import time
+from urllib.parse import unquote
 
 from .config import config
 from .runner_common import (
@@ -32,14 +33,19 @@ def extract_artifacts(text: str) -> list[tuple[str, str]]:
 
     Uses regex ``\\[([^\\]]+)\\](file:///([^)]+))`` to find agy-generated
     artifact references in stdout. Returns deduplicated, order-preserved list.
+
+    Paths and display names are URL-decoded (``urllib.parse.unquote``) so
+    percent-encoded spaces / CJK (e.g. ``my%20report.pdf``, ``%E6%8A%A5%E5%91%8A.pdf``)
+    resolve to real filesystem paths.
     """
     if not text:
         return []
     seen = set()
     result = []
     for match in re.finditer(r"\[([^\]]+)\]\(file:///([^)]+)\)", text):
-        name = match.group(1).split("#")[0]
-        abs_path = "/" + match.group(2).split("#")[0]
+        name = unquote(match.group(1).split("#")[0])
+        path_part = unquote(match.group(2).split("#")[0])
+        abs_path = path_part if path_part.startswith("/") else "/" + path_part
         key = (name, abs_path)
         if key not in seen:
             seen.add(key)

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4}/wechatbridge/grok.py

@@ -324,18 +324,26 @@ def _extract_grok_artifacts(session_dir: str, session_id: str, since: float = 0.
                                 continue
                         if name in ("write", "edit", "str_replace") and isinstance(args, dict):
                             fp = args.get("file_path", "")
-                            if fp and os.path.isabs(fp):
-                                # 只收录本轮运行期间新写/修改的文件
-                                try:
-                                    if since and os.path.getmtime(fp) < since - 2.0:
-                                        continue
-                                except OSError:
-                                    continue  # 文件已不存在，无需回传
-                                art_name = os.path.basename(fp)
-                                key = (art_name, fp)
-                                if key not in seen:
-                                    seen.add(key)
-                                    artifacts.append(key)
+                            if not fp:
+                                continue
+                            # Relative paths resolve against session_dir (cwd)
+                            if not os.path.isabs(fp):
+                                fp = os.path.join(session_dir, fp)
+                            try:
+                                fp = os.path.abspath(fp)
+                            except (OSError, ValueError):
+                                continue
+                            # 只收录本轮运行期间新写/修改的文件
+                            try:
+                                if since and os.path.getmtime(fp) < since - 2.0:
+                                    continue
+                            except OSError:
+                                continue  # 文件已不存在，无需回传
+                            art_name = os.path.basename(fp)
+                            key = (art_name, fp)
+                            if key not in seen:
+                                seen.add(key)
+                                artifacts.append(key)
     except OSError as e:
         logger.warning("Failed to read chat_history.jsonl: %s", e)
 

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4}/wechatbridge/ilink.py

@@ -25,6 +25,30 @@ logger = logging.getLogger("ilink")
 
 ILINK_BASE = config.ilink_base_url.rstrip("/")
 
+# WeChat image_item handles these well; other image/* (svg/heic/…) go as FILE.
+_DISPLAYABLE_IMAGE_MIMES = frozenset({
+    "image/jpeg",
+    "image/png",
+    "image/gif",
+    "image/webp",
+    "image/bmp",
+})
+
+MEDIA_IMAGE = 1
+MEDIA_FILE = 3
+
+
+def media_type_for_path(path: str) -> int:
+    """Return MEDIA_IMAGE or MEDIA_FILE for a local path based on guessed MIME.
+
+    Only common displayable raster images use IMAGE; everything else
+    (pdf/doc/xlsx/txt/zip, svg/heic, unknown) uses FILE so file_name is kept.
+    """
+    mime = mimetypes.guess_type(path)[0] or "application/octet-stream"
+    if mime in _DISPLAYABLE_IMAGE_MIMES:
+        return MEDIA_IMAGE
+    return MEDIA_FILE
+
 
 def ilink_delivery_accepted(ret, message_id) -> bool:
     """Whether an iLink sendmessage JSON body means the message was accepted.
@@ -530,12 +554,8 @@ class ILinkClient:
         ciphertext = _encrypt_aes_ecb(plaintext, aes_key)
         filesize = len(ciphertext)
 
-        # Determine media_type from mime
-        mime = mimetypes.guess_type(path)[0] or "application/octet-stream"
-        if mime.startswith("image/"):
-            media_type = 1  # MEDIA_IMAGE
-        else:
-            media_type = 3  # MEDIA_FILE
+        # Determine media_type from mime (only common rasters → IMAGE)
+        media_type = media_type_for_path(path)
 
         # Get CDN upload URL
         upload_param, upload_full_url = await self.get_upload_url(

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4}/wechatbridge/main.py

@@ -23,6 +23,7 @@ from .runner_common import (
     clean_session_media,
     clear_initialized,
     classify_upstream_failure,
+    format_artifact_send_failure_notice,
     format_error,
     format_model_label,
     format_oversized_artifact_notice,
@@ -646,8 +647,9 @@ async def gate_and_run(
 async def send_artifacts_back(client, from_user, context_token, artifacts) -> None:
     """Filter artifacts: only send back those under per-user session dir.
 
-    For agy: artifacts under .gemini/antigravity-cli/scratch
-    For grok: artifacts under session_dir (cwd where grok ran)
+    For agy: artifacts under .gemini/antigravity-cli/scratch (plus validated --add-dir)
+    For codex: artifacts under session_dir (plus validated --add-dir)
+    For grok: artifacts under session_dir (cwd where grok ran; no add-dir gate)
     """
     session_dir = get_session_dir(from_user)
     backend = _get_backend(from_user)
@@ -659,22 +661,34 @@ async def send_artifacts_back(client, from_user, context_token, artifacts) -> No
         # codex runs with cwd=session_dir; file_change paths may also land in
         # user-approved --add-dir roots, so allow those too.
         allowed_root = session_dir
+    else:
+        # agy writes to .gemini/antigravity-cli/scratch under session_dir
+        allowed_root = os.path.join(session_dir, ".gemini", "antigravity-cli", "scratch")
+
+    # codex and agy both support --add-dir; re-verify stored roots at send time.
+    # Only keep roots that currently exist, are real directories, and still
+    # resolve inside the configured allowed roots (session dir + config
+    # add_dir_roots). Deleted dirs, plain files, out-of-bounds paths and
+    # symlink escapes must not become artifact allow roots. Legitimate
+    # directories are kept (and still re-checked against each artifact path
+    # below). session_dir itself is never relaxed. grok does not use add-dir.
+    if backend in ("codex", "agy"):
         prefs = load_prefs(from_user)
-        # Second-factor verification of stored --add-dir roots at send time.
-        # Only keep roots that currently exist, are real directories, and still
-        # resolve inside the configured allowed roots (session dir + config
-        # add_dir_roots). Deleted dirs, plain files, out-of-bounds paths and
-        # symlink escapes must not become artifact allow roots. Legitimate
-        # directories are kept (and still re-checked against each artifact path
-        # below). session_dir itself is never relaxed.
-        add_dirs = []
         for d in prefs.get("add_dirs", []) or []:
             ok, resolved = validate_add_dir(d, from_user)
             if ok:
                 add_dirs.append(resolved)
-    else:
-        # agy writes to .gemini/antigravity-cli/scratch under session_dir
-        allowed_root = os.path.join(session_dir, ".gemini", "antigravity-cli", "scratch")
+
+    async def _notify_failure(name: str, reason: str) -> None:
+        # Never echo server absolute paths to WeChat users
+        await client.send_message(
+            to_user_id=from_user,
+            text=format_artifact_send_failure_notice(name, reason),
+            context_token=context_token,
+            baseurl=client.state.baseurl,
+            bot_token=client.state.bot_token,
+        )
+
     for art_name, art_path in artifacts:
         try:
             # realpath check blocks symlink escape outside allowed root
@@ -686,9 +700,11 @@ async def send_artifacts_back(client, from_user, context_token, artifacts) -> No
                         break
                 if not ok_root:
                     logger.debug("skip non-scratch artifact: %s", art_path)
+                    await _notify_failure(art_name, "skipped")
                     continue
             if not os.path.isfile(os.path.realpath(art_path)):
                 logger.warning("Artifact not found: %s", art_path)
+                await _notify_failure(art_name, "not_found")
                 continue
             art_path = os.path.realpath(art_path)
             file_size = os.path.getsize(art_path)
@@ -719,8 +735,13 @@ async def send_artifacts_back(client, from_user, context_token, artifacts) -> No
                 logger.info("Artifact sent: %s -> %s", art_name, from_user)
             else:
                 logger.warning("Failed to send artifact: %s", art_name)
+                await _notify_failure(art_name, "send_failed")
         except Exception as e:
             logger.exception("Error sending artifact %s: %s", art_name, e)
+            try:
+                await _notify_failure(art_name, "error")
+            except Exception:
+                logger.exception("Failed to notify user about artifact error: %s", art_name)
 
 
 # ---------------------------------------------------------------------------

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4}/wechatbridge/runner_common.py

@@ -259,6 +259,30 @@ def format_oversized_artifact_notice(art_name: str, size_mb: float) -> str:
     )
 
 
+# Internal reason codes for format_artifact_send_failure_notice
+_ARTIFACT_FAIL_REASONS = {
+    "skipped": "不在允许回传的目录内，已跳过",
+    "not_found": "文件不存在或不是普通文件",
+    "send_failed": "发送失败，请稍后重试",
+    "error": "发送出错，请稍后重试",
+}
+
+
+def format_artifact_send_failure_notice(art_name: str, reason: str) -> str:
+    """User-facing text when an artifact cannot be sent back to WeChat.
+
+    ``reason`` is an internal code: skipped / not_found / send_failed / error.
+    Must never include server absolute paths — only the display name and reason.
+    """
+    name = (art_name or "file").replace("`", "'").strip() or "file"
+    detail = _ARTIFACT_FAIL_REASONS.get(reason) or _ARTIFACT_FAIL_REASONS["error"]
+    return (
+        f"⚠️ **文件未能发送** ⚠️\n\n"
+        f"`{name}`\n"
+        f"{detail}"
+    )
+
+
 def format_cli_error(raw_message: str, *, backend: str = "") -> str:
     """Map backend stderr/JSON error text into a short Chinese user reply.
 

{wechatbridge_cli-1.4.3 → wechatbridge_cli-1.4.4/wechatbridge_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wechatbridge-cli
-Version: 1.4.3
+Version: 1.4.4
 Summary: Bridge WeChat messages to agy, Grok Build, or Codex CLIs — text/image/file/voice in, CLI replies and generated files back.
 Author: WeChatBridge contributors
 License: MIT