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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wechatbridge-cli
-Version: 1.4.1
+Version: 1.4.3
 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
@@ -250,8 +250,8 @@ See [`deploy/wechatbridge-windows.md`](deploy/wechatbridge-windows.md).
 | `/help` | list supported commands for the active backend |
 | `/backend <agy\|grok\|codex>` | switch CLI backend for this WeChat user (on real change: clears that backend's continuation state — agy/grok flag and codex `thread_id`/resume — so the next turn starts a fresh session; history files may remain until retention cleanup) |
 | `/clear` or `/new` | drop continue flag so the next CLI turn is a new conversation (does not instantly delete history files) |
-| `/model <name>` | set model (validation differs by backend: agy/grok check against the live model list; codex stores the name without verifying, so a typo only surfaces on the next run; see `/models`) |
-| `/models` | list models — agy/grok query the live CLI; codex returns a built-in reference list, not your actual account's models |
+| `/model <name>` | set model (all backends validate against a live list: agy/grok via CLI `models`; codex via `codex debug models` [then `--bundled`]; unknown name or list-fetch failure refuse and do not write prefs; see `/models`) |
+| `/models` | list models — agy/grok/codex all query the live CLI (codex: `debug models`; falls back to a built-in reference note only if the live list cannot be fetched) |
 | `/fast` | set low reasoning effort (**on only** — not a toggle; no “off” command) |
 | `/planning` | set planning mode (**on only** — not a toggle) |
 | `/add-dir <path>` | **agy:** pass `--add-dir` on later runs if path is allowed. **grok:** recorded only; not passed to the CLI yet |

{wechatbridge_cli-1.4.1 → wechatbridge_cli-1.4.3}/README.md

@@ -219,8 +219,8 @@ See [`deploy/wechatbridge-windows.md`](deploy/wechatbridge-windows.md).
 | `/help` | list supported commands for the active backend |
 | `/backend <agy\|grok\|codex>` | switch CLI backend for this WeChat user (on real change: clears that backend's continuation state — agy/grok flag and codex `thread_id`/resume — so the next turn starts a fresh session; history files may remain until retention cleanup) |
 | `/clear` or `/new` | drop continue flag so the next CLI turn is a new conversation (does not instantly delete history files) |
-| `/model <name>` | set model (validation differs by backend: agy/grok check against the live model list; codex stores the name without verifying, so a typo only surfaces on the next run; see `/models`) |
-| `/models` | list models — agy/grok query the live CLI; codex returns a built-in reference list, not your actual account's models |
+| `/model <name>` | set model (all backends validate against a live list: agy/grok via CLI `models`; codex via `codex debug models` [then `--bundled`]; unknown name or list-fetch failure refuse and do not write prefs; see `/models`) |
+| `/models` | list models — agy/grok/codex all query the live CLI (codex: `debug models`; falls back to a built-in reference note only if the live list cannot be fetched) |
 | `/fast` | set low reasoning effort (**on only** — not a toggle; no “off” command) |
 | `/planning` | set planning mode (**on only** — not a toggle) |
 | `/add-dir <path>` | **agy:** pass `--add-dir` on later runs if path is allowed. **grok:** recorded only; not passed to the CLI yet |

{wechatbridge_cli-1.4.1 → wechatbridge_cli-1.4.3}/tests/test_codex.py

@@ -3,12 +3,14 @@
 from __future__ import annotations
 
 import asyncio
+import json
 import os
 import sys
 import tempfile
 import time
 import unittest
 from unittest import mock
+from unittest.mock import AsyncMock
 
 _HERE = os.path.dirname(os.path.abspath(__file__))
 _FIXTURES = os.path.join(_HERE, "fixtures")
@@ -519,24 +521,149 @@ class TestCodexSlash(unittest.IsolatedAsyncioTestCase):
         self.assertEqual(_read_codex_thread_id(sd), "")
         self.assertFalse(os.path.exists(os.path.join(sd, ".initialized.codex")))
 
-    async def test_model_unvalidated_stores(self):
+    async def test_model_validated_stores(self):
+        """Known model in live list → switch succeeds and prefs are written."""
         from wechatbridge.codex import handle_codex_slash_command
         from wechatbridge.runner_common import load_prefs
-        reply = await handle_codex_slash_command("/model gpt-5.1-codex", "u-model")
+        from wechatbridge import codex as codex_mod
+
+        with mock.patch.object(
+            codex_mod,
+            "_fetch_codex_model_list",
+            new=AsyncMock(return_value=["gpt-5.1-codex", "gpt-5.1", "gpt-5"]),
+        ):
+            reply = await handle_codex_slash_command("/model gpt-5.1-codex", "u-model")
         self.assertIn("模型已切换", reply)
-        self.assertIn("未校验", reply)
+        self.assertNotIn("未校验", reply)
         self.assertEqual(load_prefs("u-model")["model"], "gpt-5.1-codex")
 
+    async def test_model_unknown_rejects(self):
+        """Unknown model → refuse and prefs unchanged."""
+        from wechatbridge.codex import handle_codex_slash_command
+        from wechatbridge.runner_common import load_prefs, save_prefs
+        from wechatbridge import codex as codex_mod
+
+        uid = "u-model-unknown"
+        save_prefs(uid, {"model": "gpt-5.1", "effort": "", "mode": ""})
+        with mock.patch.object(
+            codex_mod,
+            "_fetch_codex_model_list",
+            new=AsyncMock(return_value=["gpt-5.1-codex", "gpt-5.1"]),
+        ):
+            reply = await handle_codex_slash_command("/model not-a-real-model", uid)
+        self.assertIn("模型不存在", reply)
+        self.assertNotIn("模型已切换", reply)
+        self.assertEqual(load_prefs(uid)["model"], "gpt-5.1")
+
+    async def test_model_list_fail_rejects(self):
+        """List fetch failure → refuse and do not write prefs (strict)."""
+        from wechatbridge.codex import handle_codex_slash_command
+        from wechatbridge.runner_common import load_prefs, save_prefs
+        from wechatbridge import codex as codex_mod
+
+        uid = "u-model-listfail"
+        save_prefs(uid, {"model": "gpt-5", "effort": "", "mode": ""})
+        with mock.patch.object(
+            codex_mod,
+            "_fetch_codex_model_list",
+            new=AsyncMock(return_value=None),
+        ):
+            reply = await handle_codex_slash_command("/model gpt-5.1-codex", uid)
+        self.assertIn("无法获取模型列表", reply)
+        self.assertNotIn("模型已切换", reply)
+        self.assertEqual(load_prefs(uid)["model"], "gpt-5")
+
+    async def test_model_prefix_match(self):
+        """Prefix match takes the first hit (same as agy)."""
+        from wechatbridge.codex import handle_codex_slash_command
+        from wechatbridge.runner_common import load_prefs
+        from wechatbridge import codex as codex_mod
+
+        with mock.patch.object(
+            codex_mod,
+            "_fetch_codex_model_list",
+            new=AsyncMock(return_value=["gpt-5.1-codex", "gpt-5.1", "gpt-5"]),
+        ):
+            reply = await handle_codex_slash_command("/model gpt-5.1", "u-model-prefix")
+        # exact "gpt-5.1" is in list → exact match wins over longer prefixes
+        self.assertIn("模型已切换", reply)
+        self.assertEqual(load_prefs("u-model-prefix")["model"], "gpt-5.1")
+
+        with mock.patch.object(
+            codex_mod,
+            "_fetch_codex_model_list",
+            new=AsyncMock(return_value=["gpt-5.1-codex", "gpt-5-codex"]),
+        ):
+            reply2 = await handle_codex_slash_command("/model gpt-5.1", "u-model-prefix2")
+        self.assertIn("模型已切换", reply2)
+        self.assertEqual(load_prefs("u-model-prefix2")["model"], "gpt-5.1-codex")
+
     async def test_model_empty_shows_current(self):
         from wechatbridge.codex import handle_codex_slash_command
+        from wechatbridge.runner_common import save_prefs
+
+        save_prefs("u-model-empty", {"model": "gpt-5.1-codex", "effort": "", "mode": ""})
         reply = await handle_codex_slash_command("/model", "u-model-empty")
         self.assertIn("当前模型", reply)
+        self.assertIn("gpt-5.1-codex", reply)
+        self.assertNotIn("不会校验", reply)
+        self.assertNotIn("未校验", reply)
+
+    async def test_models_live_list(self):
+        """/models under mock returns the live list."""
+        from wechatbridge.codex import handle_codex_slash_command
+        from wechatbridge import codex as codex_mod
+
+        with mock.patch.object(
+            codex_mod,
+            "_fetch_codex_model_list",
+            new=AsyncMock(return_value=["gpt-5.1-codex", "gpt-5.1"]),
+        ):
+            reply = await handle_codex_slash_command("/models", "u-models")
+        self.assertIn("gpt-5.1-codex", reply)
+        self.assertIn("gpt-5.1", reply)
+        self.assertIn("debug models", reply)
 
-    async def test_models_builtin(self):
+    async def test_models_fallback_builtin(self):
+        """/models falls back to built-in note when live list fails."""
         from wechatbridge.codex import handle_codex_slash_command
-        reply = await handle_codex_slash_command("/models", "u-models")
+        from wechatbridge import codex as codex_mod
+
+        with mock.patch.object(
+            codex_mod,
+            "_fetch_codex_model_list",
+            new=AsyncMock(return_value=None),
+        ):
+            reply = await handle_codex_slash_command("/models", "u-models-fb")
+        self.assertIn("参考", reply)
         self.assertIn("gpt-5.1-codex", reply)
 
+    async def test_parse_codex_models_json_and_lines(self):
+        from wechatbridge.codex import _parse_codex_models
+
+        j = json.dumps({
+            "models": [
+                {"slug": "gpt-5.1-codex"},
+                {"slug": "gpt-5"},
+            ]
+        })
+        self.assertEqual(_parse_codex_models(j), ["gpt-5.1-codex", "gpt-5"])
+
+        nested = json.dumps({
+            "models": [{"slug": "a"}, {"id": "b", "name": "ignored-without-slug-only"}]
+        })
+        # models[] item with slug + item with id (no slug) both accepted
+        self.assertEqual(_parse_codex_models(nested), ["a", "b"])
+
+        # bare string list
+        self.assertEqual(_parse_codex_models(json.dumps(["m1", "m2"])), ["m1", "m2"])
+
+        lines = "* gpt-5.1-codex (default)\n- gpt-5\n"
+        self.assertEqual(_parse_codex_models(lines), ["gpt-5.1-codex", "gpt-5"])
+
+        self.assertEqual(_parse_codex_models(""), [])
+        self.assertEqual(_parse_codex_models("{}"), [])
+
     async def test_fast_and_planning(self):
         from wechatbridge.codex import handle_codex_slash_command
         from wechatbridge.runner_common import load_prefs
@@ -684,9 +811,11 @@ class TestCodexRunFakeCli(unittest.IsolatedAsyncioTestCase):
         # 续轮：thread.started 正常输出，但随后 turn.failed("rate limit exceeded")，
         # returncode=1。这是普通限流错误，不是 resume/session 错误，不得 fallback，
         # 旧 thread_id 必须保留，且只运行一次（无重试）。
+        # 限流最终用户文案用 🔔（不是 ❌）。
         log = os.path.join(self.td, "inv-turn-fail.log")
         display, _ = self._run("again", "u-turn-fail", mode="resume_turn_fail", log_path=log)
-        self.assertTrue(display.startswith("❌"))
+        self.assertTrue(display.startswith("🔔"), msg=display[:80])
+        self.assertIn("**请求较多**", display)
         # 旧 thread_id 保留
         self.assertEqual(_read_tid(sd), old_tid)
         # 只运行一次（无降级重试）