From 366671d2401e38889cd0c25f4513304ed30e2742 Mon Sep 17 00:00:00 2001 From: Petr Nyc Date: Tue, 23 Jun 2026 10:54:11 +0200 Subject: [PATCH] renamed codex-gemma to more generic codex-ollama --- {.codex-gemma => .codex-ollama}/config.toml | 3 +- bin/codex-gemma | 47 --------------- bin/codex-ollama | 67 +++++++++++++++++++++ 3 files changed, 68 insertions(+), 49 deletions(-) rename {.codex-gemma => .codex-ollama}/config.toml (96%) delete mode 100755 bin/codex-gemma create mode 100755 bin/codex-ollama diff --git a/.codex-gemma/config.toml b/.codex-ollama/config.toml similarity index 96% rename from .codex-gemma/config.toml rename to .codex-ollama/config.toml index 0cbafa7..ea86783 100644 --- a/.codex-gemma/config.toml +++ b/.codex-ollama/config.toml @@ -10,7 +10,7 @@ goals = true [sandbox_workspace_write] network_access = true -writable_roots = ["/Users/jetpac/.codex-gemma/skills"] +writable_roots = ["/Users/jetpac/.codex-ollama/skills"] [mcp_servers.headroom] command = "/Users/jetpac/.conda/envs/headroom/bin/headroom" @@ -59,4 +59,3 @@ browser_run_code = { approval_mode = "approve" } browser_select_option = { approval_mode = "approve" } browser_evaluate = { approval_mode = "approve" } - diff --git a/bin/codex-gemma b/bin/codex-gemma deleted file mode 100755 index a52dcdf..0000000 --- a/bin/codex-gemma +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env zsh -set -euo pipefail - -CODEX_BIN="${CODEX_BIN:-/opt/homebrew/bin/codex}" -CODEX_GEMMA_HOME="${CODEX_GEMMA_HOME:-${HOME}/.codex-gemma}" -CODEX_GEMMA_MODEL="${CODEX_GEMMA_MODEL:-gemma4:26b-a4b-it-q4_K_M}" - -export CODEX_HOME="${CODEX_GEMMA_HOME}" -export PATH="${HOME}/bin:${PATH}" - -if [[ ! -x "${CODEX_BIN}" ]]; then - print -u2 -- "Codex binary not found or not executable: ${CODEX_BIN}" - exit 1 -fi - -if ! command -v ollama >/dev/null 2>&1; then - print -u2 -- "ollama is not available on PATH" - exit 1 -fi - -if ! ollama list | awk 'NR > 1 { print $1 }' | grep -Fxq -- "${CODEX_GEMMA_MODEL}"; then - print -u2 -- "Ollama model is not installed: ${CODEX_GEMMA_MODEL}" - print -u2 -- "Install it with: ollama pull ${CODEX_GEMMA_MODEL}" - exit 1 -fi - -args_include_cd() { - local arg - for arg in "$@"; do - case "${arg}" in - -C|--cd|-C=*|--cd=*) - return 0 - ;; - esac - done - return 1 -} - -codex_args=(--oss --local-provider ollama -m "${CODEX_GEMMA_MODEL}") - -if [[ "${PWD}" == "${HOME}" ]] && ! args_include_cd "$@"; then - original_pwd="${PWD}" - builtin cd "${TMPDIR:-/private/tmp}" - codex_args+=(--cd "${original_pwd}") -fi - -exec "${CODEX_BIN}" "${codex_args[@]}" "$@" diff --git a/bin/codex-ollama b/bin/codex-ollama new file mode 100755 index 0000000..d6dc664 --- /dev/null +++ b/bin/codex-ollama @@ -0,0 +1,67 @@ +#!/usr/bin/env zsh +set -euo pipefail + +CODEX_BIN="${CODEX_BIN:-/opt/homebrew/bin/codex}" +CODEX_OLLAMA_HOME="${CODEX_OLLAMA_HOME:-${HOME}/.codex-ollama}" +CODEX_OLLAMA_MODEL="${CODEX_OLLAMA_MODEL:-gemma4:26b-a4b-it-q4_K_M}" + +export CODEX_HOME="${CODEX_OLLAMA_HOME}" +export PATH="${HOME}/bin:${PATH}" + +if [[ ! -x "${CODEX_BIN}" ]]; then + print -u2 -- "Codex binary not found or not executable: ${CODEX_BIN}" + exit 1 +fi + +if ! command -v ollama >/dev/null 2>&1; then + print -u2 -- "ollama not available on PATH" + exit 1 +fi + +args_include_cd() { + local arg + + for arg in "$@"; do + case "${arg}" in + -C|--cd|-C=*|--cd=*) + return 0 + ;; + esac + done + + return 1 +} + +args_include_model() { + local arg + + for arg in "$@"; do + case "${arg}" in + -m|--model|-m=*|--model=*) + return 0 + ;; + esac + done + + return 1 +} + +codex_args=(--oss --local-provider ollama) + +if ! args_include_model "$@"; then + if ! ollama list | awk 'NR > 1 { print $1 }' | grep -Fxq -- "${CODEX_OLLAMA_MODEL}"; then + print -u2 -- "Ollama model not installed: ${CODEX_OLLAMA_MODEL}" + print -u2 -- "Install it with: ollama pull ${CODEX_OLLAMA_MODEL}" + exit 1 + fi + + codex_args+=(-m "${CODEX_OLLAMA_MODEL}") +fi + +if [[ "${PWD}" == "${HOME}" ]] && ! args_include_cd "$@"; then + original_pwd="${PWD}" + builtin cd "${TMPDIR:-/private/tmp}" + codex_args+=(--cd "${original_pwd}") +fi + +exec "${CODEX_BIN}" "${codex_args[@]}" "$@"