refactor: 重构工具选择逻辑与多项目路由，优化配置与测试

1. 重构tool_search工具调用的函数名获取逻辑，使用上下文方法获取注册后的名称
2. 完善main.rs的配置覆盖初始化，正确传递启动参数
3. 重构项目鉴权与路由逻辑，优化多项目下的token验证与模型路由匹配
4. 调整代码格式与换行，修复代码冗余空行
5. 新增并完善多项目相关测试用例，优化现有测试的可读性
6. 更新中文使用文档，修正说明描述与操作步骤

Author: HisenWeb

docs/USAGE.zh-CN.md

@@ -1,4 +1,4 @@
-# Codex OpenCode Adapter 使用说明
+# Codex OpenCode Adapter 使用说明
 
 这份说明用于安装、启动和排查薄 Bridge，目标是避免用真实模型反复试错。
 
@@ -13,7 +13,7 @@
 1. 全局安装（仅首次，或更新后重新安装）：
 
 ```powershell
-cargo install codex-opencode-adapter
+cargo install --path .
 ```
 
 2. 初始化配置（安装用户级 Provider + 写入项目配置 + 写入默认 OSS agent 模板）：
@@ -50,7 +50,7 @@ cargo run -- start
 
 `check` 主要用于排障，`auth print-local-token` 主要给 provider auth helper 调用，不是日常手工入口。
 
-> `auth print-local-token` 返回 adapter 级 token，不再负责选择项目。项目选择只来自请求里的 `model = "opencode_adapter/<project_key>/<real_model>"`；裸 `opencode-go/<model-id>` 已不再支持。
+> `auth print-local-token` 输出 adapter 本地 token，用于证明调用方可以访问本机 adapter；项目选择不由 token 决定，而由请求中的 `model = "opencode_adapter/<project_key>/<real_model>"` 决定。无项目上下文时可从 registry 中任一已注册项目读取本地 token，因为 token 是 adapter 级鉴权而不是项目路由。裸 `opencode-go/<model-id>` 已不再支持。
 
 ## 1. 配置分层
 
@@ -148,9 +148,11 @@ Invoke-RestMethod http://127.0.0.1:4010/health
 期望 `status` 为 `ok`。
 
 ```powershell
-cargo test
+Invoke-RestMethod http://127.0.0.1:4010/v1/models -Headers @{Authorization = "Bearer $(codex-opencode-adapter auth print-local-token)"}
 ```
 
+期望返回 `object` 为 `list`，`data` 为可用模型列表。
+
 以上任一步失败，都不要启动子代理。
 
 ## 5. 让 Desktop 加载配置

src/conversion/responses_to_chat.rs

@@ -671,7 +671,8 @@ fn convert_tool_choice(choice: Option<&Value>, context: &ToolContext) -> Option<
         );
     }
     if kind == "tool_search" {
-        return Some(json!({"type":"function","function":{"name":"tool_search"}}));
+        let chat_name = context.chat_name_for_response_function("tool_search", None);
+        return Some(json!({"type":"function","function":{"name":chat_name}}));
     }
     Some(choice.clone())
 }

src/main.rs

@@ -1,4 +1,4 @@
-use clap::Parser;
+use clap::Parser;
 use codex_opencode_adapter::cli::{AuthCommands, Cli, Commands, RunArgs};
 use codex_opencode_adapter::config::{
     Config, ConfigOverrides, DEFAULT_HOST, DEFAULT_MAX_CONCURRENCY, DEFAULT_PORT,
@@ -49,13 +49,13 @@ async fn run_server(args: RunArgs) -> anyhow::Result<()> {
     let config_overrides = ConfigOverrides {
         host: args.host.clone(),
         port: args.port,
-        upstream_base: None,
-        upstream_key: None,
-        local_token: None,
-        state_db: None,
-        state_ttl_seconds: None,
-        timeout_seconds: None,
-        max_request_bytes: None,
+        upstream_base: args.upstream_base.clone(),
+        upstream_key: args.upstream_key.clone(),
+        local_token: args.local_token.clone(),
+        state_db: args.state_db.clone(),
+        state_ttl_seconds: args.state_ttl_seconds,
+        timeout_seconds: args.timeout_seconds,
+        max_request_bytes: args.max_request_bytes,
         max_concurrency: args.max_concurrency,
     };
 

src/project.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context};
+use anyhow::{anyhow, Context};
 use hmac::{Hmac, Mac};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -185,8 +185,6 @@ impl ProjectPaths {
         }
         Self::from_root(start.to_path_buf())
     }
-
-
 }
 
 fn codex_thread_ids() -> Vec<String> {
@@ -317,8 +315,7 @@ pub fn resolve_project() -> anyhow::Result<ProjectPaths> {
     }
 
     // Priority 2: cwd / ancestor walk
-    let cwd = std::env::current_dir()
-        .context("failed to resolve current working directory")?;
+    let cwd = std::env::current_dir().context("failed to resolve current working directory")?;
     let discovered = ProjectPaths::discover_from(&cwd);
     if discovered.env_file.exists() {
         validate_recovered_project(&discovered)
@@ -335,8 +332,9 @@ pub fn resolve_project() -> anyhow::Result<ProjectPaths> {
             {
                 let thread_paths = ProjectPaths::discover_from(&thread_cwd);
                 if thread_paths.env_file.exists() {
-                    validate_recovered_project(&thread_paths)
-                        .context("found project via Codex thread context but registry check failed")?;
+                    validate_recovered_project(&thread_paths).context(
+                        "found project via Codex thread context but registry check failed",
+                    )?;
                     return Ok(thread_paths);
                 }
             }
@@ -345,11 +343,10 @@ pub fn resolve_project() -> anyhow::Result<ProjectPaths> {
 
     // Priority 4: Constrained fallback -- single registered project only
     if registry.projects.is_empty() {
-        return Err(anyhow!(
-            concat!(
-            "No OpenCode adapter projects found.\n", " Run 'codex-opencode-adapter init' from your project root to create one."
-        )
-        ));
+        return Err(anyhow!(concat!(
+            "No OpenCode adapter projects found.\n",
+            " Run 'codex-opencode-adapter init' from your project root to create one."
+        )));
     }
     if registry.projects.len() == 1 {
         let (pid, entry) = registry.projects.iter().next().unwrap();

src/server.rs

@@ -1,4 +1,4 @@
-use axum::extract::State;
+use axum::extract::State;
 use axum::http::{HeaderMap, StatusCode};
 use axum::response::{IntoResponse, Response, Sse};
 use axum::routing::{get, post};
@@ -22,8 +22,8 @@ use crate::media_guard::{
     unsupported_multimodal_error_message,
 };
 use crate::project::{
-    current_environment, project_id_from_key, project_key_from_id, read_project_env,
-    registry_dir_path, validate_adapter_token, ProjectRegistry, PROJECT_ENV_FILENAME,
+    project_id_from_key, project_key_from_id, read_project_env, registry_dir_path,
+    validate_adapter_token, ProjectRegistry, PROJECT_ENV_FILENAME,
 };
 use crate::state::{now_ts, StateStore};
 use crate::upstream::{
@@ -144,7 +144,7 @@ async fn responses(State(state): State<AppState>, headers: HeaderMap, body: Stri
         if let Err(response) = authorize_adapter(&projects, &headers) {
             return *response;
         }
-        match projects.get(&project_id) {
+        match project_runtime(&projects, &project_id) {
             Some(r) => r.clone(),
             None => {
                 return error_response(
@@ -222,7 +222,7 @@ async fn complete_response(
             &message,
         );
     }
-    let permit = match capacity.clone().try_acquire_owned() {
+    let _permit = match capacity.clone().try_acquire_owned() {
         Ok(permit) => permit,
         Err(_) => {
             return error_response(
@@ -233,7 +233,7 @@ async fn complete_response(
         }
     };
     let upstream = runtime.client.chat(payload).await;
-    drop(permit);
+    drop(_permit);
     let upstream = match upstream {
         Ok(value) => value,
         Err(error) => {
@@ -346,10 +346,18 @@ async fn stream_response(
         );
         if let Err(error) = assembler.start() {
             tracing::error!(error = %error, "failed to emit initial stream lifecycle events");
+
+            let response =
+                responses_failed_value(&body, &model_alias, "internal_error", &error.to_string());
+            let event = json!({"type":"response.failed","response":response});
+            let _ = tx.send(Ok(axum::response::sse::Event::default()
+                .event("response.failed")
+                .data(event.to_string())));
             let _ = tx.send(Ok(axum::response::sse::Event::default().data("[DONE]")));
+
             return;
         }
-        let permit = match capacity.clone().try_acquire_owned() {
+        let _permit = match capacity.clone().try_acquire_owned() {
             Ok(permit) => permit,
             Err(_) => {
                 if let Err(error) =
@@ -362,7 +370,7 @@ async fn stream_response(
             }
         };
         let upstream = runtime_for_task.client.chat_stream(payload).await;
-        drop(permit);
+
         match upstream {
             Ok(mut stream) => {
                 let mut buffer = String::new();
@@ -576,10 +584,7 @@ fn previous_response(
     Ok(Some(previous))
 }
 
-fn authorize_adapter(
-    projects: &HashMap<String, ProjectRuntime>,
-    headers: &HeaderMap,
-) -> Result<(), Box<Response>> {
+fn adapter_bearer_token(headers: &HeaderMap) -> Result<&str, Box<Response>> {
     let auth_header = headers
         .get("authorization")
         .and_then(|v| v.to_str().ok())
@@ -590,19 +595,48 @@ fn authorize_adapter(
                 "Missing Authorization header. Provide a valid Bearer token.",
             ))
         })?;
-    let raw_token = auth_header.strip_prefix("Bearer ").ok_or_else(|| {
+    auth_header.strip_prefix("Bearer ").ok_or_else(|| {
         Box::new(error_response(
             StatusCode::UNAUTHORIZED,
             "unauthorized",
             "Invalid Authorization format. Expected 'Bearer <token>'.",
         ))
-    })?;
-    for runtime in projects.values() {
-        if let Some(ref local_token) = runtime.config.local_token {
-            if !local_token.is_empty() && validate_adapter_token(raw_token, local_token) {
-                return Ok(());
-            }
-        }
+    })
+}
+
+fn project_runtime<'a>(
+    projects: &'a HashMap<String, ProjectRuntime>,
+    project_id: &str,
+) -> Option<&'a ProjectRuntime> {
+    projects
+        .get(project_id)
+        .or_else(|| projects.get(project_key_from_id(project_id)))
+        .or_else(|| {
+            let canonical_id = project_id_from_key(project_id);
+            projects.get(&canonical_id)
+        })
+}
+
+fn runtime_accepts_token(runtime: &ProjectRuntime, raw_token: &str) -> bool {
+    runtime
+        .config
+        .local_token
+        .as_ref()
+        .is_some_and(|local_token| {
+            !local_token.is_empty() && validate_adapter_token(raw_token, local_token)
+        })
+}
+
+fn authorize_adapter(
+    projects: &HashMap<String, ProjectRuntime>,
+    headers: &HeaderMap,
+) -> Result<(), Box<Response>> {
+    let raw_token = adapter_bearer_token(headers)?;
+    if projects
+        .values()
+        .any(|runtime| runtime_accepts_token(runtime, raw_token))
+    {
+        return Ok(());
     }
     Err(Box::new(error_response(
         StatusCode::UNAUTHORIZED,
@@ -611,10 +645,7 @@ fn authorize_adapter(
     )))
 }
 
-async fn admin_refresh(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-) -> Response {
+async fn admin_refresh(State(state): State<AppState>, headers: HeaderMap) -> Response {
     // Auth: accept any valid adapter bearer token.
     let auth_ok = {
         let projects = state.projects.read().unwrap();
@@ -657,16 +688,20 @@ async fn admin_refresh(
                 continue;
             }
         };
-        let env = current_environment();
-        let config = match Config::from_sources(&project_env, &env, state.config_overrides.clone()) {
+        let env = HashMap::new();
+        let config = match Config::from_sources(&project_env, &env, state.config_overrides.clone())
+        {
             Ok(c) => c,
             Err(e) => {
                 tracing::warn!("refresh: bad config for {project_id}: {e}");
                 continue;
             }
         };
         let state_db_path = root.join(&config.state_db);
-        let store = match StateStore::new(state_db_path.display().to_string(), config.state_ttl_seconds) {
+        let store = match StateStore::new(
+            state_db_path.display().to_string(),
+            config.state_ttl_seconds,
+        ) {
             Ok(s) => s,
             Err(e) => {
                 tracing::warn!("refresh: cannot create state for {project_id}: {e}");
@@ -684,14 +719,20 @@ async fn admin_refresh(
                 continue;
             }
         };
-        projects.insert(project_id.clone(), ProjectRuntime { config, client, state: store });
+        projects.insert(
+            project_id.clone(),
+            ProjectRuntime {
+                config,
+                client,
+                state: store,
+            },
+        );
         added.push(project_id.clone());
     }
 
     Json(json!({"status":"ok","added":added,"already_loaded":skipped})).into_response()
 }
 
-
 fn parse_routed_model(model: &str) -> Result<(String, String), &'static str> {
     let Some(rest) = model.strip_prefix("opencode_adapter/") else {
         return Err("model must use opencode_adapter/<project_key>/<real_model>. Run 'codex-opencode-adapter init' to refresh agent templates.");
@@ -863,6 +904,3 @@ fn upstream_error(error: UpstreamError) -> Response {
         }
     }
 }
-
-
-