From a278ece348e1fce93212bdfde2caa0ed773a4f1c Mon Sep 17 00:00:00 2001
From: "Yuyao Huang (Sam)" <huangyuyao@outlook.com>
Date: Mon, 30 Mar 2026 00:11:41 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E5=91=BD=E4=BB=A4=E5=89=8D=E7=BC=80=E4=BB=A5?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=8EClaude=20Code=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

引入可配置的COMMAND_PREFIX参数，默认设置为"//"以避免与Claude Code的"/"命令冲突
修改相关文件以支持新的命令前缀，包括配置解析、路由逻辑和命令处理
更新帮助文档和提示信息以反映新的命令前缀
---
 bot/commands.py          | 78 +++++++++++++++++++++-------------------
 config.py                |  4 +++
 host_config.example.yaml |  4 +++
 orchestrator/agent.py    | 49 +++++++++++++++----------
 router/routing_agent.py  |  6 ++--
 5 files changed, 85 insertions(+), 56 deletions(-)

diff --git a/bot/commands.py b/bot/commands.py
index e48e2d9..dd406e4 100644
--- a/bot/commands.py
+++ b/bot/commands.py
@@ -44,14 +44,18 @@ def _perm_label(mode: str) -> str:
 
 def parse_command(text: str) -> Optional[Tuple[str, str]]:
     """
-    Parse a slash command from text.
+    Parse a bot command from text.
     Returns (command, args) or None if not a command.
+    Commands must start with COMMAND_PREFIX (default "//").
     """
+    from config import COMMAND_PREFIX
     text = text.strip()
-    if not text.startswith("/"):
+    if not text.startswith(COMMAND_PREFIX):
         return None
-    parts = text.split(None, 1)
-    cmd = parts[0].lower()
+    # Strip the prefix, then split into command word and args
+    body = text[len(COMMAND_PREFIX):]
+    parts = body.split(None, 1)
+    cmd = COMMAND_PREFIX + parts[0].lower()
     args = parts[1] if len(parts) > 1 else ""
     return (cmd, args)
 
@@ -68,38 +72,39 @@ async def handle_command(user_id: str, text: str) -> Optional[str]:
     logger.info("Command: %s args=%r user=...%s", cmd, args[:50], user_id[-8:])
 
     # In ROUTER_MODE, only handle router-specific commands locally.
-    # Session commands (/status, /new, /close, etc.) fall through to node forwarding.
-    from config import ROUTER_MODE
-    if ROUTER_MODE and cmd not in ("/nodes", "/node", "/help", "/h", "/?"):
+    # Session commands (//status, //new, //close, etc.) fall through to node forwarding.
+    from config import ROUTER_MODE, COMMAND_PREFIX
+    P = COMMAND_PREFIX
+    if ROUTER_MODE and cmd not in (P+"nodes", P+"node", P+"help", P+"h", P+"?"):
         return None
 
     set_current_user(user_id)
 
-    if cmd in ("/new", "/n"):
+    if cmd in (P+"new", P+"n"):
         return await _cmd_new(user_id, args)
-    elif cmd in ("/status", "/list", "/ls", "/l"):
+    elif cmd in (P+"status", P+"list", P+"ls", P+"l"):
         return await _cmd_status(user_id)
-    elif cmd in ("/close", "/c"):
+    elif cmd in (P+"close", P+"c"):
         return await _cmd_close(user_id, args)
-    elif cmd in ("/switch", "/s"):
+    elif cmd in (P+"switch", P+"s"):
         return await _cmd_switch(user_id, args)
-    elif cmd == "/retry":
+    elif cmd == P+"retry":
         return await _cmd_retry(user_id)
-    elif cmd in ("/help", "/h", "/?"):
+    elif cmd in (P+"help", P+"h", P+"?"):
         return _cmd_help()
-    elif cmd == "/direct":
+    elif cmd == P+"direct":
         return _cmd_direct(user_id)
-    elif cmd == "/smart":
+    elif cmd == P+"smart":
         return _cmd_smart(user_id)
-    elif cmd == "/tasks":
+    elif cmd == P+"tasks":
         return _cmd_tasks()
-    elif cmd == "/shell":
+    elif cmd == P+"shell":
         return await _cmd_shell(args)
-    elif cmd == "/remind":
+    elif cmd == P+"remind":
         return await _cmd_remind(args)
-    elif cmd == "/perm":
+    elif cmd == P+"perm":
         return await _cmd_perm(user_id, args)
-    elif cmd in ("/nodes", "/node"):
+    elif cmd in (P+"nodes", P+"node"):
         return await _cmd_nodes(user_id, args)
     else:
         return None
@@ -431,23 +436,24 @@ async def _cmd_nodes(user_id: str, args: str) -> str:
 
 def _cmd_help() -> str:
     """Show help."""
-    return """**Commands:**
-/new <dir> [msg] [--timeout N] [--idle N] [--perm MODE] - Create session
-/status - Show sessions and current mode
-/close [n] - Close session (active or by number)
-/switch <n> - Switch to session by number
-/perm <mode> [conv_id] - Set permission mode (bypass/accept/plan)
-/direct - Direct mode: messages → Claude Code (no LLM overhead)
-/smart - Smart mode: messages → LLM routing (default)
-/shell <cmd> - Run shell command (bypasses LLM)
-/remind <time> <msg> - Set reminder (e.g. /remind 10m check build)
-/tasks - List background tasks
-/nodes - List connected host nodes
-/node <name> - Switch active node
-/retry - Retry last message
-/help - Show this help
+    from config import COMMAND_PREFIX as P
+    return f"""**Commands:** (prefix: `{P}`)
+{P}new <dir> [msg] [--timeout N] [--idle N] [--perm MODE] - Create session
+{P}status - Show sessions and current mode
+{P}close [n] - Close session (active or by number)
+{P}switch <n> - Switch to session by number
+{P}perm <mode> [conv_id] - Set permission mode (bypass/accept/plan)
+{P}direct - Direct mode: messages → Claude Code (no LLM overhead)
+{P}smart - Smart mode: messages → LLM routing (default)
+{P}shell <cmd> - Run shell command (bypasses LLM)
+{P}remind <time> <msg> - Set reminder (e.g. {P}remind 10m check build)
+{P}tasks - List background tasks
+{P}nodes - List connected host nodes
+{P}node <name> - Switch active node
+{P}retry - Retry last message
+{P}help - Show this help
 
-**Permission modes** (used by /perm and /new --perm):
+**Permission modes** (used by {P}perm and {P}new --perm):
   bypass — 跳过所有权限确认，CC 自动执行一切操作（默认）
             适合：受信任的沙盒环境、自动化任务
   accept — 自动接受文件编辑，但 shell 命令仍需手动确认
diff --git a/config.py b/config.py
index b354738..8bbfa18 100644
--- a/config.py
+++ b/config.py
@@ -25,6 +25,10 @@ METASO_API_KEY: str = _cfg.get("METASO_API_KEY", "")
 ROUTER_MODE: bool = _cfg.get("ROUTER_MODE", False)
 ROUTER_SECRET: str = _cfg.get("ROUTER_SECRET", "")
 
+# Command prefix — the leader string that identifies bot commands.
+# Default is "//" to avoid conflicts with Claude Code's own "/" commands.
+COMMAND_PREFIX: str = _cfg.get("COMMAND_PREFIX", "//")
+
 # Server configuration
 PORT: int = _cfg.get("PORT", 8000)
 
diff --git a/host_config.example.yaml b/host_config.example.yaml
index 444dd5d..b08a9a8 100644
--- a/host_config.example.yaml
+++ b/host_config.example.yaml
@@ -20,6 +20,10 @@ WORKING_DIR: C:/Users/yourname/projects
 # Optional: 秘塔AI Search API key for web search
 METASO_API_KEY: your_metaso_api_key
 
+# Bot command prefix (default: "//")
+# "//" avoids conflicts with Claude Code's own "/" commands.
+# COMMAND_PREFIX: "//"
+
 # Which Feishu users this node serves
 # List of open_ids from Feishu
 SERVES_USERS:
diff --git a/orchestrator/agent.py b/orchestrator/agent.py
index b865d1a..7eae79e 100644
--- a/orchestrator/agent.py
+++ b/orchestrator/agent.py
@@ -21,7 +21,7 @@ from langchain_core.messages import (
 from langchain_openai import ChatOpenAI
 
 from agent.manager import manager
-from config import OPENAI_API_KEY, OPENAI_BASE_URL, OPENAI_MODEL, WORKING_DIR
+from config import OPENAI_API_KEY, OPENAI_BASE_URL, OPENAI_MODEL, WORKING_DIR, COMMAND_PREFIX as _P
 from orchestrator.tools import TOOLS, set_current_user
 
 logger = logging.getLogger(__name__)
@@ -39,27 +39,29 @@ Pass these names directly to `create_conversation` — the tool resolves them au
 
 {active_session_line}
 
+Bot command prefix: {prefix}
+
 ## Tools — two distinct categories
 
 ### Bot control commands (use `run_command`)
-`run_command` executes PhoneWork slash commands. Use it when the user asks to:
-- Change permission mode: "切换到只读模式" → run_command("/perm plan")
-- Close/switch sessions: "关掉第一个" → run_command("/close 1")
-- Change routing mode: "切换到直连模式" → run_command("/direct")
-- Set a reminder: "10分钟后提醒我" → run_command("/remind 10m 提醒我")
-- Check status: "看看现在有哪些 session" → run_command("/status")
-- Any other /command the user would type manually
+`run_command` executes PhoneWork commands. Use it when the user asks to:
+- Change permission mode: "切换到只读模式" → run_command("{prefix}perm plan")
+- Close/switch sessions: "关掉第一个" → run_command("{prefix}close 1")
+- Change routing mode: "切换到直连模式" → run_command("{prefix}direct")
+- Set a reminder: "10分钟后提醒我" → run_command("{prefix}remind 10m 提醒我")
+- Check status: "看看现在有哪些 session" → run_command("{prefix}status")
+- Any other command the user would type manually
 
 Available bot commands (pass verbatim to run_command):
-  /new <dir> [msg] [--perm bypass|accept|plan]  — create session
-  /close [n|conv_id]   — close session
-  /switch <n>          — switch active session
-  /perm <mode> [conv_id] — permission mode: bypass (default), accept, plan
-  /direct              — direct mode (bypass LLM for CC messages)
-  /smart               — smart mode (LLM routing, default)
-  /status              — list sessions
-  /remind <Ns|Nm|Nh> <msg> — one-shot reminder
-  /tasks               — list background tasks
+  {prefix}new <dir> [msg] [--perm bypass|accept|plan]  — create session
+  {prefix}close [n|conv_id]   — close session
+  {prefix}switch <n>          — switch active session
+  {prefix}perm <mode> [conv_id] — permission mode: bypass (default), accept, plan
+  {prefix}direct              — direct mode (bypass LLM for CC messages)
+  {prefix}smart               — smart mode (LLM routing, default)
+  {prefix}status              — list sessions
+  {prefix}remind <Ns|Nm|Nh> <msg> — one-shot reminder
+  {prefix}tasks               — list background tasks
 
 ### Host shell commands (use `run_shell`)
 `run_shell` executes shell commands on the host machine (git, ls, cat, pip, etc.).
@@ -69,7 +71,7 @@ NEVER use `run_shell` for bot control. NEVER use `run_command` for shell command
 1. NEW session: call `create_conversation` with the project name/path. \
    If the user's message also contains a task, pass it as `initial_message` too.
 2. Follow-up to ACTIVE session: call `send_to_conversation` with the active conv_id shown above.
-3. BOT CONTROL: call `run_command` with the appropriate slash command.
+3. BOT CONTROL: call `run_command` with the appropriate command.
 4. GENERAL QUESTIONS: answer directly — do NOT create a session for simple Q&A.
 5. WEB / SEARCH: use `web` at most twice, then synthesize and reply.
 6. BACKGROUND TASKS: when a task starts, reply immediately — do NOT poll `task_status`.
@@ -119,6 +121,7 @@ class OrchestrationAgent:
             working_dir=WORKING_DIR,
             active_session_line=active_line,
             today=today,
+            prefix=_P,
         )
 
     def get_active_conv(self, user_id: str) -> Optional[str]:
@@ -143,6 +146,16 @@ class OrchestrationAgent:
         logger.info(">>> user=...%s  conv=%s  msg=%r", short_uid, active_conv, text[:80])
         logger.debug("    history_len=%d", len(self._history[user_id]))
 
+        # Always handle bot commands first — even in passthrough mode.
+        # Bot commands must never reach Claude Code.
+        from config import COMMAND_PREFIX
+        if text.strip().startswith(COMMAND_PREFIX):
+            from bot.commands import handle_command
+            result = await handle_command(user_id, text)
+            if result is not None:
+                return result
+            logger.debug("    unknown command, falling through to LLM")
+
         # Passthrough mode: if enabled and active session, bypass LLM
         if self._passthrough[user_id] and active_conv:
             try:
diff --git a/router/routing_agent.py b/router/routing_agent.py
index 6ea8241..12c4372 100644
--- a/router/routing_agent.py
+++ b/router/routing_agent.py
@@ -76,9 +76,11 @@ async def route(user_id: str, chat_id: str, text: str) -> tuple[Optional[str], s
     if len(online_nodes) == 1:
         return online_nodes[0].node_id, "Only one node available"
 
-    if text.strip().startswith("/"):
+    from config import COMMAND_PREFIX
+    if text.strip().startswith(COMMAND_PREFIX):
         cmd = text.strip().split()[0].lower()
-        if cmd in ("/nodes", "/node", "/help", "/h", "/?"):
+        meta_cmds = {COMMAND_PREFIX + s for s in ("nodes", "node", "help", "h", "?")}
+        if cmd in meta_cmds:
             return "meta", "Meta command"
         # Session commands: forward to active node directly (no LLM call needed)
         active = registry.get_active_node(user_id)