[pull] main from xintaofei:main

package.json

@@ -1,7 +1,7 @@
 {
   "name": "codeg",
   "private": true,
-  "version": "0.20.2",
+  "version": "0.20.3",
   "packageManager": "pnpm@11.9.0",
   "scripts": {
     "dev": "next dev --turbopack",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "codeg"
-version = "0.20.2"
+version = "0.20.3"
 description = "Agent Code Generation App"
 authors = ["feitao"]
 edition = "2021"

src-tauri/src/acp/codex_catalog_source.rs

@@ -0,0 +1,198 @@
+//! Runtime source for codex's official model catalog.
+//!
+//! Because `model_catalog_json` is a whole-table replace, codeg must reproduce
+//! codex's own catalog inside the generated file — so it has to match the codex
+//! codeg **actually launches**. That codex is the one **nested** under the
+//! pinned `codex-acp` npm package (`.../codex-acp/node_modules/@openai/codex`),
+//! NOT the `codex` on PATH (often an unrelated standalone install of a different
+//! version, and the version that gets hoisted to the top-level `node_modules`).
+//!
+//! We resolve it with node's own nearest-`node_modules`-first resolution
+//! (`require.resolve('@openai/codex/bin/codex.js', {paths:[<codex-acp dir>]})`),
+//! run `codex debug models --bundled`, and cache the JSON on disk with a
+//! live → cache → bundled-snapshot fallback chain, mirroring
+//! [`crate::acp::opencode_catalog`]. Infallible by construction: the compiled-in
+//! snapshot ([`crate::acp::codex_model_catalog::bundled_snapshot_models`])
+//! guarantees a result offline.
+//!
+//! The cache lives under [`crate::paths::codeg_home_dir`] (not the app data dir)
+//! so both the async editor path and the **synchronous** config-write paths can
+//! reach it with zero `data_dir` threading.
+
+use std::path::{Path, PathBuf};
+use std::time::{Duration, SystemTime};
+
+use serde_json::Value;
+
+/// On-disk cache freshness window — matches the OpenCode catalog cache.
+const CACHE_TTL: Duration = Duration::from_secs(24 * 60 * 60);
+/// Upper bound on each codex subprocess (node resolve + `debug models`).
+const CODEX_TIMEOUT: Duration = Duration::from_secs(15);
+
+fn cache_path() -> PathBuf {
+    crate::paths::codeg_home_dir()
+        .join("cache")
+        .join("codex")
+        .join("bundled-catalog.json")
+}
+
+/// Extract the `models` array from a `{"models":[...]}` document.
+fn parse_models(text: &str) -> Option<Vec<Value>> {
+    serde_json::from_str::<Value>(text)
+        .ok()?
+        .get("models")?
+        .as_array()
+        .cloned()
+}
+
+fn read_cache(require_fresh: bool) -> Option<Vec<Value>> {
+    let path = cache_path();
+    let metadata = std::fs::metadata(&path).ok()?;
+    if require_fresh {
+        let age = metadata
+            .modified()
+            .ok()
+            .and_then(|m| SystemTime::now().duration_since(m).ok())?;
+        if age > CACHE_TTL {
+            return None;
+        }
+    }
+    let text = std::fs::read_to_string(&path).ok()?;
+    parse_models(&text).filter(|m| !m.is_empty())
+}
+
+fn write_cache(models: &[Value]) {
+    let path = cache_path();
+    if let Some(parent) = path.parent() {
+        if std::fs::create_dir_all(parent).is_err() {
+            return;
+        }
+    }
+    if let Ok(text) = serde_json::to_string(&serde_json::json!({ "models": models })) {
+        let _ = std::fs::write(&path, text);
+    }
+}
+
+/// The codex-acp package directory under an npm prefix, where the nested
+/// `@openai/codex` codex-acp actually drives lives.
+fn codex_acp_dir(prefix: &Path) -> PathBuf {
+    let base = if cfg!(windows) {
+        prefix.join("node_modules")
+    } else {
+        prefix.join("lib").join("node_modules")
+    };
+    base.join("@agentclientprotocol").join("codex-acp")
+}
+
+/// Candidate codex-acp package dirs: the global npm prefix and codeg's user
+/// prefix (`~/.codeg/npm-global`, used when a global install hit EACCES).
+async fn codex_acp_dirs() -> Vec<PathBuf> {
+    let mut dirs = Vec::new();
+    if let Some(prefix) = crate::commands::acp::cached_npm_global_prefix().await {
+        dirs.push(codex_acp_dir(&prefix));
+    }
+    if let Some(prefix) = crate::process::user_npm_prefix() {
+        dirs.push(codex_acp_dir(&prefix));
+    }
+    dirs
+}
+
+/// Resolve the nested `@openai/codex/bin/codex.js` from a codex-acp package dir
+/// using node's own resolver (nearest `node_modules` first) so we get the
+/// version codex-acp uses, not a hoisted/PATH one.
+async fn resolve_codex_js(acp_dir: &Path, node: &Path) -> Option<PathBuf> {
+    let mut cmd = crate::process::tokio_command(node);
+    cmd.arg("-e")
+        .arg("process.stdout.write(require.resolve('@openai/codex/bin/codex.js',{paths:[process.argv[1]]}))")
+        .arg(acp_dir)
+        .kill_on_drop(true);
+    let output = tokio::time::timeout(CODEX_TIMEOUT, cmd.output())
+        .await
+        .ok()?
+        .ok()?;
+    if !output.status.success() {
+        return None;
+    }
+    let resolved = String::from_utf8_lossy(&output.stdout).trim().to_string();
+    if resolved.is_empty() {
+        return None;
+    }
+    let path = PathBuf::from(resolved);
+    path.exists().then_some(path)
+}
+
+/// Run the nested codex's `debug models --bundled` and return its `models`.
+async fn fetch_live() -> Option<Vec<Value>> {
+    let node = which::which("node").ok()?;
+    for acp_dir in codex_acp_dirs().await {
+        if !acp_dir.exists() {
+            continue;
+        }
+        let Some(codex_js) = resolve_codex_js(&acp_dir, &node).await else {
+            continue;
+        };
+        let mut cmd = crate::process::tokio_command(&node);
+        cmd.arg(&codex_js)
+            .arg("debug")
+            .arg("models")
+            .arg("--bundled")
+            .kill_on_drop(true);
+        let Ok(Ok(output)) = tokio::time::timeout(CODEX_TIMEOUT, cmd.output()).await else {
+            continue;
+        };
+        if !output.status.success() {
+            continue;
+        }
+        if let Some(models) = parse_models(&String::from_utf8_lossy(&output.stdout)) {
+            if !models.is_empty() {
+                return Some(models);
+            }
+        }
+    }
+    None
+}
+
+/// Resolve the official codex catalog with the live → cache → bundled-snapshot
+/// fallback chain. Infallible. Used by the editor (may spawn codex + refresh the
+/// cache); the write paths use the sync [`cached_or_bundled_snapshot`] instead.
+pub async fn runtime_catalog(force_refresh: bool) -> Vec<Value> {
+    if !force_refresh {
+        if let Some(fresh) = read_cache(true) {
+            return fresh;
+        }
+    }
+    if let Some(models) = fetch_live().await {
+        write_cache(&models);
+        return models;
+    }
+    read_cache(false).unwrap_or_else(crate::acp::codex_model_catalog::bundled_snapshot_models)
+}
+
+/// Synchronous catalog for the config-write paths: the on-disk cache (kept warm
+/// by the editor's [`runtime_catalog`] fetch), else the bundled snapshot. Never
+/// spawns a subprocess, so saving stays fast and works from sync contexts.
+pub fn cached_or_bundled_snapshot() -> Vec<Value> {
+    read_cache(false).unwrap_or_else(crate::acp::codex_model_catalog::bundled_snapshot_models)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_models_extracts_array() {
+        assert_eq!(
+            parse_models(r#"{"models":[{"slug":"a"}]}"#).unwrap().len(),
+            1
+        );
+        assert!(parse_models("not json").is_none());
+        assert!(parse_models(r#"{"nope":1}"#).is_none());
+    }
+
+    #[test]
+    fn cached_or_bundled_falls_back_to_snapshot() {
+        // Whatever the cache state, the fallback guarantees a non-empty catalog
+        // (the compiled-in snapshot), so callers never get an empty list.
+        assert!(!cached_or_bundled_snapshot().is_empty());
+    }
+}