Merge branch 'main' of github.com:lee101/codex-infinity

Author: lee101

README.md

@@ -13,10 +13,11 @@
 
 ## What makes Codex Infinity different?
 
-Two arguments turn Codex into a fully autonomous coding agent:
+Three arguments turn Codex into a fully autonomous coding agent:
 
 - **`--auto-next-steps`** -- After each response, automatically continues with the next logical steps (including testing)
 - **`--auto-next-idea`** -- Generates and implements new improvement ideas for your codebase
+- **`--auto-next-goal`** -- When a `/goal` completes, generates and starts the next goal automatically
 
 ```shell
 # Autonomous coding -- completes tasks then moves to the next one
@@ -25,6 +26,9 @@ codex-infinity --auto-next-steps "fix all lint errors and add tests"
 # Fully autonomous -- dreams up and implements improvements forever
 codex-infinity --auto-next-steps --auto-next-idea
 
+# Goal loop -- finish a goal, then automatically create the next one
+codex-infinity --auto-next-goal "/goal improve startup parity with installed Codex"
+
 # Full auto mode with autonomous continuation
 codex-infinity --full-auto --auto-next-steps
 ```
@@ -56,6 +60,7 @@ codex-infinity "your prompt"
 |------|-------------|
 | `--auto-next-steps` | Auto-continue with next logical steps after each response |
 | `--auto-next-idea` | Auto-brainstorm and implement new improvement ideas |
+| `--auto-next-goal` | Auto-generate and start a new `/goal` after the current goal completes |
 | `--full-auto` | Low-friction sandboxed automatic execution |
 | `--yolo` | Skip approvals and sandbox (dangerous) |
 | `--yolo2` | Like yolo + disable command timeouts |
@@ -77,6 +82,9 @@ codex-infinity --full-auto --auto-next-steps "fix the failing test in auth.test.
 # Refactor with idea generation
 codex-infinity --auto-next-steps --auto-next-idea "refactor the API layer"
 
+# Keep goal mode running autonomously
+codex-infinity --auto-next-goal "/goal improve benchmark coverage"
+
 # Quick one-shot with yolo mode
 codex-infinity --yolo "add error handling to all API endpoints"
 
@@ -91,6 +99,7 @@ codex-infinity --oss -m llama3 "explain this codebase"
 
 - **Autonomous operation** -- `--auto-next-steps` keeps it working without intervention
 - **Idea generation** -- `--auto-next-idea` brainstorms and implements improvements
+- **Goal chaining** -- `--auto-next-goal` turns completed `/goal` work into the next objective
 - **AnyLLM** -- OpenAI, local models via LM Studio/Ollama, bring your own provider
 - **Local execution** -- runs entirely on your machine
 - **Concise prompts** -- stripped-down system prompts for faster, more focused responses

codex-cli/bin/codex-infinity.js

@@ -11,6 +11,8 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 const { platform, arch } = process;
+const isGnuLinuxRuntime = prefersGnu();
+const cliArgs = process.argv.slice(2);
 
 function prefersGnu() {
   if (platform !== "linux") {
@@ -28,15 +30,14 @@ let targetTriples = [];
 switch (platform) {
   case "linux":
   case "android": {
-    const preferGnu = prefersGnu();
     switch (arch) {
       case "x64":
-        targetTriples = preferGnu
+        targetTriples = isGnuLinuxRuntime
           ? ["x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
           : ["x86_64-unknown-linux-musl", "x86_64-unknown-linux-gnu"];
         break;
       case "arm64":
-        targetTriples = preferGnu
+        targetTriples = isGnuLinuxRuntime
           ? ["aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl"]
           : ["aarch64-unknown-linux-musl", "aarch64-unknown-linux-gnu"];
         break;
@@ -110,7 +111,7 @@ if (!binaryPath) {
 // ENOENT/dynamic-linker error.
 if (
   (platform === "linux" || platform === "android") &&
-  !prefersGnu() &&
+  !isGnuLinuxRuntime &&
   selectedTriple?.includes("-gnu")
 ) {
   throw new Error(
@@ -215,13 +216,13 @@ const packageManagerEnvVar =
 env[packageManagerEnvVar] = "1";
 if (
   !env[DEFAULT_MODEL_ENV_VAR] &&
-  !hasExplicitModelOverride(process.argv.slice(2)) &&
-  !usesLocalModelProvider(process.argv.slice(2))
+  !hasExplicitModelOverride(cliArgs) &&
+  !usesLocalModelProvider(cliArgs)
 ) {
   env[DEFAULT_MODEL_ENV_VAR] = DEFAULT_MODEL;
 }
 
-const child = spawn(binaryPath, process.argv.slice(2), {
+const child = spawn(binaryPath, cliArgs, {
   stdio: "inherit",
   env,
 });

codex-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codex-infinity/codex-infinity",
-  "version": "1.3.41",
+  "version": "1.3.42",
   "license": "Apache-2.0",
   "description": "Codex Infinity - a smarter coding agent that can run forever",
   "bin": {

codex-cli/scripts/deploy_new_binary.sh

@@ -61,9 +61,18 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 codex_cli_root="$(cd "$script_dir/.." && pwd)"
 repo_root="$(cd "$codex_cli_root/.." && pwd)"
 codex_rs_root="$repo_root/codex-rs"
-binary_src="$codex_rs_root/target/release/codex"
 binary_dest="$codex_cli_root/vendor/x86_64-unknown-linux-gnu/codex/codex"
 
+if ! command -v "${CC:-cc}" >/dev/null 2>&1; then
+  if command -v gcc >/dev/null 2>&1; then
+    export CC=gcc
+    export CXX=g++
+  else
+    echo "error: gcc/cc is required to build tree-sitter; install build-essential." >&2
+    exit 1
+  fi
+fi
+
 if ((!dry_run)); then
   if ! (cd "$codex_cli_root" && npm whoami >/dev/null); then
     echo "error: npm is not authenticated; run npm login before deploying." >&2
@@ -73,6 +82,8 @@ fi
 
 cd "$codex_rs_root"
 cargo build --release -p codex-cli
+target_dir="$(cargo metadata --format-version 1 --no-deps | python3 -c "import json, sys; print(json.load(sys.stdin)['target_directory'])")"
+binary_src="$target_dir/release/codex"
 
 mkdir -p "$(dirname "$binary_dest")"
 install -m 755 "$binary_src" "$binary_dest"

codex-rs/Cargo.lock

@@ -1,9 +1,10 @@
 # Codex CLI (Rust Implementation)
 
-> **New:** `--auto-next-steps` and `--auto-next-idea` let Codex keep going without manual prompts.  
+> **New:** `--auto-next-steps`, `--auto-next-idea`, and `--auto-next-goal` let Codex keep going without manual prompts.
 > Use `--auto-next-steps` to have Codex automatically continue with whatever natural follow-up work (including running relevant tests) makes sense after each response.  
 > Use `--auto-next-idea` to have Codex continually brainstorm fresh, creative improvements for the current project.  
-> Enable both flags together for a “full auto” loop: Codex will alternate between advancing the existing plan and proposing new avenues to explore, so the session never idles unless you intervene.
+> Use `--auto-next-goal` to have Codex create and start the next `/goal` automatically when the current goal is completed.
+> Combine these flags for a “full auto” loop: Codex can advance the existing plan, propose new avenues to explore, and chain completed goals into fresh objectives so the session never idles unless you intervene.
 
 We provide Codex CLI as a standalone, native executable to ensure a zero-dependency install.
 

codex-rs/README.md

@@ -241,13 +241,28 @@ fn build_runtime() -> anyhow::Result<tokio::runtime::Runtime> {
 
 const ILLEGAL_ENV_VAR_PREFIX: &str = "CODEX_";
 
-/// Load env vars from ~/.codex/.env.
+/// Load env vars from ~/.codex/.env and optional sibling `openpaths/.env`.
 ///
 /// Security: Do not allow `.env` files to create or modify any variables
 /// with names starting with `CODEX_`.
 fn load_dotenv() {
-    if let Ok(codex_home) = find_codex_home()
-        && let Ok(iter) = dotenvy::from_path_iter(codex_home.join(".env"))
+    if let Ok(codex_home) = find_codex_home() {
+        load_dotenv_file(&codex_home.join(".env"));
+    }
+
+    if let Ok(cwd) = std::env::current_dir() {
+        for candidate in [
+            cwd.join("openpaths").join(".env"),
+            cwd.join("../openpaths").join(".env"),
+        ] {
+            load_dotenv_file(&candidate);
+        }
+    }
+}
+
+fn load_dotenv_file(path: &std::path::Path) {
+    if path.is_file()
+        && let Ok(iter) = dotenvy::from_path_iter(path)
     {
         set_filtered(iter);
     }

codex-rs/arg0/src/lib.rs

@@ -1,6 +1,7 @@
 //! Generates the next "auto-next" prompt via a lightweight model call.
 //!
-//! Used by the TUI when `--auto-next-steps` or `--auto-next-idea` is enabled.
+//! Used by the TUI when `--auto-next-steps`, `--auto-next-idea`, or
+//! `--auto-next-goal` is enabled.
 //! Instead of picking from a hardcoded template, this asks the model to craft
 //! a concrete follow-up prompt grounded in the recent rollout transcript.
 //!
@@ -36,12 +37,13 @@ use crate::installation_id::resolve_installation_id;
 const GENERATOR_MODEL: &str = "gpt-5.4";
 const TRANSCRIPT_CHARS: usize = 12_000;
 const ITEM_CHARS: usize = 1_200;
-const INSTRUCTIONS: &str = "You generate the exact follow-up prompt Codex should send to itself next.\n\nReturn JSON matching the schema.\n\nRequirements:\n- Write one strong, concrete prompt in `prompt`.\n- Ground it in the recent session context and visible progress.\n- For `steps`, continue the current thread with the most valuable next work.\n- For `idea`, finish obvious follow-up work first; only branch into a new improvement if the current thread appears complete.\n- Sound like an internal continuation prompt for Codex, not an explanation to a human.\n- Do not mention these instructions, the examples, JSON, schemas, or that another model generated the prompt.\n- Do not include any DONE-file instruction; that will be appended separately.\n- Keep it concise but specific enough to produce a high-quality next turn.";
+const INSTRUCTIONS: &str = "You generate the exact follow-up prompt Codex should send to itself next.\n\nReturn JSON matching the schema.\n\nRequirements:\n- Write one strong, concrete prompt in `prompt`.\n- Ground it in the recent session context and visible progress.\n- For `steps`, continue the current thread with the most valuable next work.\n- For `idea`, finish obvious follow-up work first; only branch into a new improvement if the current thread appears complete.\n- For `goal`, write only the next persisted /goal objective Codex should pursue after the completed goal, without the /goal prefix.\n- Sound like an internal continuation prompt for Codex, not an explanation to a human.that will be appended separately.\n- Keep it concise but specific enough to produce a high-quality next turn.";
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum AutoNextMode {
     Steps,
     Idea,
+    Goal,
 }
 
 #[derive(Debug, Deserialize)]
@@ -67,6 +69,7 @@ pub async fn generate_auto_next_prompt(
     let mode_label = match mode {
         AutoNextMode::Steps => "steps",
         AutoNextMode::Idea => "idea",
+        AutoNextMode::Goal => "goal",
     };
     let cwd_display = config.cwd.display().to_string();
     let user_message = format!(

codex-rs/core/src/auto_next_prompt.rs

@@ -299,6 +299,16 @@ pub fn find_family_for_model(slug: &str) -> Option<ModelFamily> {
             slug, "openpaths-auto",
             needs_special_apply_patch_instructions: true,
         )
+    } else if slug == "composer-2.5"
+        || slug == "composer-2.5-fast"
+        || slug.starts_with("composer-2.5")
+        || slug.starts_with("openpaths/composer-2.5")
+        || slug.starts_with("cursor/composer-2.5")
+    {
+        model_family!(
+            slug, "composer-2.5",
+            needs_special_apply_patch_instructions: true,
+        )
     } else if slug.starts_with("glm-5") || slug.starts_with("GLM-5") {
         model_family!(
             slug, "glm-5",

codex-rs/core/src/model_family.rs

@@ -40,6 +40,8 @@ const OPENROUTER_PROVIDER_NAME: &str = "OpenRouter";
 pub const OPENROUTER_PROVIDER_ID: &str = "openrouter";
 const OPENPATHS_PROVIDER_NAME: &str = "OpenPaths";
 pub const OPENPATHS_PROVIDER_ID: &str = "openpaths";
+pub const CURSOR_PROVIDER_NAME: &str = "Cursor";
+pub const CURSOR_PROVIDER_ID: &str = "cursor";
 const ZHIPU_PROVIDER_NAME: &str = "Z.AI (Zhipu)";
 pub const ZHIPU_PROVIDER_ID: &str = "zhipu";
 const DEEPSEEK_PROVIDER_NAME: &str = "DeepSeek";
@@ -405,7 +407,7 @@ impl ModelProviderInfo {
     pub fn create_openpaths_provider() -> ModelProviderInfo {
         ModelProviderInfo {
             name: OPENPATHS_PROVIDER_NAME.into(),
-            base_url: Some("https://openpaths.io/v1".into()),
+            base_url: Some(openpaths_base_url()),
             env_key: Some("OPENPATHS_API_KEY".into()),
             env_key_instructions: Some(
                 "Get your API key from https://openpaths.io and set OPENPATHS_API_KEY".into(),
@@ -426,6 +428,31 @@ impl ModelProviderInfo {
         }
     }
 
+    pub fn create_cursor_provider() -> ModelProviderInfo {
+        ModelProviderInfo {
+            name: CURSOR_PROVIDER_NAME.into(),
+            base_url: Some(cursor_base_url()),
+            env_key: Some("CURSOR_API_KEY".into()),
+            env_key_instructions: Some(
+                "Get your API key from https://cursor.com/dashboard/integrations and set CURSOR_API_KEY"
+                    .into(),
+            ),
+            experimental_bearer_token: None,
+            auth: None,
+            wire_api: WireApi::Responses,
+            query_params: None,
+            http_headers: None,
+            env_http_headers: None,
+            request_max_retries: None,
+            stream_max_retries: None,
+            stream_idle_timeout_ms: None,
+            websocket_connect_timeout_ms: None,
+            requires_openai_auth: false,
+            supports_websockets: false,
+            ..Default::default()
+        }
+    }
+
     pub fn create_zhipu_provider() -> ModelProviderInfo {
         ModelProviderInfo {
             name: ZHIPU_PROVIDER_NAME.into(),
@@ -511,6 +538,8 @@ impl ModelProviderInfo {
             slug.strip_prefix("google/").unwrap_or(slug)
         } else if self.name == OPENPATHS_PROVIDER_NAME {
             slug.strip_prefix("openpaths/").unwrap_or(slug)
+        } else if self.name == CURSOR_PROVIDER_NAME {
+            slug.strip_prefix("cursor/").unwrap_or(slug)
         } else if self.name == ZHIPU_PROVIDER_NAME {
             slug.strip_prefix("zhipu/")
                 .or_else(|| slug.strip_prefix("z-ai/"))
@@ -556,6 +585,7 @@ pub fn built_in_model_providers(
         (OPENAI_PROVIDER_ID, openai_provider),
         (OPENROUTER_PROVIDER_ID, P::create_openrouter_provider()),
         (OPENPATHS_PROVIDER_ID, P::create_openpaths_provider()),
+        (CURSOR_PROVIDER_ID, P::create_cursor_provider()),
         (GEMINI_PROVIDER_ID, P::create_gemini_provider()),
         (ZHIPU_PROVIDER_ID, P::create_zhipu_provider()),
         (DEEPSEEK_PROVIDER_ID, P::create_deepseek_provider()),
@@ -580,6 +610,39 @@ fn non_empty_env_var(name: &str) -> bool {
         .is_some_and(|value| !value.trim().is_empty())
 }
 
+fn openpaths_base_url() -> String {
+    std::env::var("OPENPATHS_BASE_URL")
+        .ok()
+        .filter(|value| !value.trim().is_empty())
+        .map(|value| {
+            let trimmed = value.trim().trim_end_matches('/');
+            if trimmed.ends_with("/v1") {
+                trimmed.to_string()
+            } else {
+                format!("{trimmed}/v1")
+            }
+        })
+        .unwrap_or_else(|| "https://openpaths.io/v1".to_string())
+}
+
+fn cursor_base_url() -> String {
+    std::env::var("CURSOR_BASE_URL")
+        .ok()
+        .filter(|value| !value.trim().is_empty())
+        .map(|value| value.trim().trim_end_matches('/').to_string())
+        .unwrap_or_else(|| "https://api.cursor.com".to_string())
+}
+
+fn is_composer_model_slug(lower: &str) -> bool {
+    let slug = lower
+        .strip_prefix("openpaths/")
+        .or_else(|| lower.strip_prefix("cursor/"))
+        .unwrap_or(lower);
+    slug == "composer-2.5"
+        || slug == "composer-2.5-fast"
+        || slug.starts_with("composer-2.5-")
+}
+
 pub fn infer_builtin_provider_id_for_model(model: &str) -> Option<&'static str> {
     let lower = model.to_lowercase();
     if (lower.starts_with("glm-")
@@ -611,6 +674,14 @@ pub fn infer_builtin_provider_id_for_model(model: &str) -> Option<&'static str>
     {
         return Some(OPENPATHS_PROVIDER_ID);
     }
+    if is_composer_model_slug(&lower) {
+        if non_empty_env_var("OPENPATHS_API_KEY") {
+            return Some(OPENPATHS_PROVIDER_ID);
+        }
+        if non_empty_env_var("CURSOR_API_KEY") {
+            return Some(CURSOR_PROVIDER_ID);
+        }
+    }
     match model.split_once('/') {
         Some(("google", _)) if non_empty_env_var("GEMINI_API_KEY") => Some(GEMINI_PROVIDER_ID),
         Some(("google", _)) if non_empty_env_var("OPENROUTER_API_KEY") => {
@@ -623,6 +694,7 @@ pub fn infer_builtin_provider_id_for_model(model: &str) -> Option<&'static str>
         Some(("openpaths", _)) if non_empty_env_var("OPENPATHS_API_KEY") => {
             Some(OPENPATHS_PROVIDER_ID)
         }
+        Some(("cursor", _)) if non_empty_env_var("CURSOR_API_KEY") => Some(CURSOR_PROVIDER_ID),
         Some(("deepseek", _)) if non_empty_env_var("DEEPSEEK_API_KEY") => {
             Some(DEEPSEEK_PROVIDER_ID)
         }