rename: /model_provider → /provider_model, /search_provider → /provider_search

Avoid tab-completion prefix conflicts with /model and /search commands.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: lzwjava

CLAUDE.md

@@ -62,7 +62,7 @@ GITHUB_TOKEN_INTEGRATION=<token> python3 -m unittest discover integration_tests
 - `iclaw/completer.py` — `IclawCompleter`: `@`-mention file completion (via `git ls-files`) and `/`-command completion
 - `iclaw/at_mention.py` — `resolve_at_mentions()`: expands `@path` tokens into file content XML
 - `iclaw/github_api.py` — `get_copilot_token()`, `get_models()`, `chat()`
-- `iclaw/commands/` — handlers for `/model_provider`, `/model`, `/search_provider`, `/copy`
+- `iclaw/commands/` — handlers for `/provider_model`, `/model`, `/provider_search`, `/copy`
 - `iclaw/config.py` — `CONFIG_PATH`, `TOKEN_REFRESH_INTERVAL`, `load_github_token()`
 
 **API endpoints:**

README.md

@@ -40,14 +40,14 @@ pip install -e .
 
 2. **Authenticate with GitHub** (on first run):
    ```
-   /model_provider
+   /provider_model
    ```
    Select `copilot`, then follow the GitHub device authorization flow. Your token is saved to `~/.config/iclaw/config.json`.
 
 ### CLI Commands
-- `/model_provider`: Select and authenticate with the model provider.
+- `/provider_model`: Select and authenticate with the model provider.
 - `/model`: View and switch between available models.
-- `/search_provider`: View and switch web search providers (default: DuckDuckGo).
+- `/provider_search`: View and switch web search providers (default: DuckDuckGo).
 - `/copy`: Copy the last response to your clipboard.
 - `/help`: Show available commands.
 - `.exit`: Quit the REPL.
@@ -62,7 +62,7 @@ The model has access to three tools it can invoke autonomously:
 
 ## Search Providers
 
-Switch providers during a session with `/search_provider`:
+Switch providers during a session with `/provider_search`:
 
 | Provider | API Key Required | Notes |
 |----------|-----------------|-------|

README_CN.md

@@ -32,14 +32,14 @@ pip install -e .
 
 2. **GitHub 认证（首次运行时）**：
    ```
-   /model_provider
+   /provider_model
    ```
    选择 `copilot`，然后按照 GitHub 设备授权流程操作。令牌将保存到 `~/.config/iclaw/config.json`。
 
 ### 终端命令
-- `/model_provider`: 选择并认证模型提供商。
+- `/provider_model`: 选择并认证模型提供商。
 - `/model`: 查看并切换可用模型。
-- `/search_provider`: 查看并切换网页搜索提供商（默认：DuckDuckGo）。
+- `/provider_search`: 查看并切换网页搜索提供商（默认：DuckDuckGo）。
 - `/copy`: 将最后一条回复复制到剪贴板。
 - `/help`: 显示可用命令。
 - `.exit`: 退出 REPL。
@@ -54,7 +54,7 @@ pip install -e .
 
 ## 搜索引擎
 
-在会话中使用 `/search_provider` 切换搜索引擎：
+在会话中使用 `/provider_search` 切换搜索引擎：
 
 | 搜索引擎 | 需要 API Key | 说明 |
 |----------|-------------|------|

iclaw/completer.py

@@ -4,9 +4,9 @@
 from prompt_toolkit.completion import Completer, Completion
 
 COMMANDS = [
-    "/model_provider",
+    "/provider_model",
     "/model",
-    "/search_provider",
+    "/provider_search",
     "/proxy",
     "/ca_bundle",
     "/copy",

iclaw/main.py

@@ -27,9 +27,9 @@
 from iclaw.web_search import web_search
 
 COMMANDS_HELP = [
-    ("/model_provider", "Select and authenticate with the model provider"),
+    ("/provider_model", "Select and authenticate with the model provider"),
     ("/model", "Select specific model from your provider"),
-    ("/search_provider", "Select the web search provider"),
+    ("/provider_search", "Select the web search provider"),
     ("/proxy", "Set HTTP/HTTPS proxy (usage: /proxy [url|off])"),
     ("/ca_bundle", "Set CA bundle for HTTPS (usage: /ca_bundle [path|off])"),
     ("/copy", "Copy last Copilot response to clipboard"),
@@ -60,7 +60,7 @@ def main():
         except Exception as e:
             print(f"Warning: {e}", file=sys.stderr)
     else:
-        print("No token found. Type /model_provider to authenticate.\n")
+        print("No token found. Type /provider_model to authenticate.\n")
 
     messages = []
     print("iclaw CLI ready. Available commands:")
@@ -91,7 +91,7 @@ def main():
         if user_input == "/copy":
             handle_copy_command(last_reply)
             continue
-        if user_input == "/model_provider":
+        if user_input == "/provider_model":
             p, t = handle_model_provider_command(CONFIG_PATH, model_provider)
             if t:
                 model_provider = p
@@ -116,7 +116,7 @@ def main():
                 ca_bundle=ca_bundle,
             )
             continue
-        if user_input == "/search_provider":
+        if user_input == "/provider_search":
             search_provider = handle_search_provider_command(search_provider)
             save_session_settings(
                 model_provider=model_provider,
@@ -163,7 +163,7 @@ def main():
             continue
 
         if not copilot_token:
-            print("Not authenticated. Type /model_provider first.", file=sys.stderr)
+            print("Not authenticated. Type /provider_model first.", file=sys.stderr)
             continue
 
         try:

integration_tests/test_repl.py

@@ -248,7 +248,7 @@ def test_copy_with_no_reply_yet(self):
 
     def test_search_provider_change(self):
         _read_until(self.q, "> ")
-        _send(self.process, "/search_provider")
+        _send(self.process, "/provider_search")
         out, found = _read_until(self.q, "Select search provider", timeout=8)
         self.assertTrue(found, f"Search provider prompt not found. Got: {out!r}")
         _send(self.process, "2")  # select startpage
@@ -258,7 +258,7 @@ def test_search_provider_change(self):
 
     def test_search_provider_keep_current(self):
         _read_until(self.q, "> ")
-        _send(self.process, "/search_provider")
+        _send(self.process, "/provider_search")
         _read_until(self.q, "Select search provider", timeout=8)
         _send(self.process, "")  # press Enter to keep current
         out, found = _read_until(self.q, "> ", timeout=8)
@@ -267,7 +267,7 @@ def test_search_provider_keep_current(self):
 
     def test_search_provider_invalid_selection(self):
         _read_until(self.q, "> ")
-        _send(self.process, "/search_provider")
+        _send(self.process, "/provider_search")
         _read_until(self.q, "Select search provider", timeout=8)
         _send(self.process, "99")  # out of range
         out, found = _read_until(self.q, "> ", timeout=8)
@@ -276,7 +276,7 @@ def test_search_provider_invalid_selection(self):
 
     def test_search_provider_non_digit(self):
         _read_until(self.q, "> ")
-        _send(self.process, "/search_provider")
+        _send(self.process, "/provider_search")
         _read_until(self.q, "Select search provider", timeout=8)
         _send(self.process, "bad")
         out, found = _read_until(self.q, "> ", timeout=8)

tests/test_at_mention.py

@@ -153,15 +153,15 @@ def test_slash_alone_returns_all_commands(self):
         completions = self._completions("/")
         texts = [c.text for c in completions]
         # "/" prefix only matches slash-prefixed commands, not ".exit"
-        for cmd in ["/model_provider", "/model", "/search_provider", "/copy", "/help"]:
+        for cmd in ["/provider_model", "/model", "/provider_search", "/copy", "/help"]:
             self.assertIn(cmd, texts)
         self.assertNotIn(".exit", texts)
 
     def test_slash_partial_filters_commands(self):
         completions = self._completions("/mod")
         texts = [c.text for c in completions]
         self.assertIn("/model", texts)
-        self.assertIn("/model_provider", texts)
+        self.assertNotIn("/provider_model", texts)
         self.assertNotIn("/copy", texts)
         self.assertNotIn("/help", texts)
 

tests/test_main.py

@@ -111,7 +111,7 @@ def test_main_copy(self, mock_ps, mock_copy, mock_cp, mock_load, mock_http):
     @patch("iclaw.main.handle_model_provider_command", return_value=("copilot", None))
     @patch("iclaw.main.PromptSession")
     def test_main_model_provider(self, mock_ps, mock_mp, mock_cp, mock_load, mock_http):
-        mock_ps.return_value = _mock_session("/model_provider", ".exit")
+        mock_ps.return_value = _mock_session("/provider_model", ".exit")
         with patch("sys.stdout"), patch("iclaw.main.time.monotonic", return_value=0):
             main.main()
 
@@ -133,7 +133,7 @@ def test_main_model(self, mock_ps, mock_mc, mock_cp, mock_load, mock_http):
     def test_main_search_provider(
         self, mock_ps, mock_sp, mock_cp, mock_load, mock_http
     ):
-        mock_ps.return_value = _mock_session("/search_provider", ".exit")
+        mock_ps.return_value = _mock_session("/provider_search", ".exit")
         with patch("sys.stdout"), patch("iclaw.main.time.monotonic", return_value=0):
             main.main()
 
@@ -283,7 +283,7 @@ def test_main_token_refresh(
     def test_main_model_provider_with_token(
         self, mock_ps, mock_mp, mock_cp, mock_load, mock_http
     ):
-        mock_ps.return_value = _mock_session("/model_provider", ".exit")
+        mock_ps.return_value = _mock_session("/provider_model", ".exit")
         with patch("sys.stdout"), patch("iclaw.main.time.monotonic", return_value=0):
             main.main()