@workweave/router 0.1.3 → 0.1.4

package/README.md

@@ -1,26 +1,30 @@
 # @workweave/router
 
-One command, anywhere, to point Claude Code at the Weave Router.
+One command, anywhere, to point Claude Code or Codex at the Weave Router.
 
 ```bash
-npx @workweave/router                       # hosted router, user scope (interactive)
-npx @workweave/router --scope project       # per-repo install, commit settings.json
+npx @workweave/router                       # interactive: pick Claude Code or Codex, then scope
+npx @workweave/router --claude              # skip the picker, target Claude Code
+npx @workweave/router --codex               # skip the picker, target the OpenAI Codex CLI
+npx @workweave/router --scope project       # per-repo install, commit settings.json (or .codex/)
 npx @workweave/router --local               # self-hosted via docker-compose (localhost:8080)
 npx @workweave/router --base-url https://router.acme.internal
-npx @workweave/router --non-interactive     # reads $WEAVE_ROUTER_KEY, no prompts
+npx @workweave/router --non-interactive     # reads $WEAVE_ROUTER_KEY, no prompts (defaults to claude)
 ```
 
 Version-pin for reproducible setups:
 
 ```bash
-npx @workweave/router@0.1.0 --scope project
+npx @workweave/router@0.1.0 --claude --scope project
 ```
 
 Uninstall:
 
 ```bash
-npx @workweave/router --uninstall                 # user scope
-npx @workweave/router --uninstall --scope project # in the repo
+npx @workweave/router --uninstall                       # Claude Code, user scope
+npx @workweave/router --uninstall --codex               # Codex, user scope
+npx @workweave/router --uninstall --scope project       # Claude Code, inside the repo
+npx @workweave/router --uninstall --codex --scope project
 ```
 
 ## What it does
@@ -28,8 +32,21 @@ npx @workweave/router --uninstall --scope project # in the repo
 This package is a thin Node wrapper around [`install.sh`](./install.sh) from
 the Weave Router repo. It exists so you can install from any machine with
 Node ≥ 18 — no `curl | sh`, no Git clone, no PATH fiddling. Everything the
-shell installer documents (scopes, flags, environment variables) works
-identically here.
+shell installer documents (targets, scopes, flags, environment variables)
+works identically here.
+
+Two install targets:
+
+- **Claude Code** (default) — patches `~/.claude/settings.json` (or
+  `<repo>/.claude/settings.json` with `--scope project`) so `claude` routes
+  through Weave automatically. Anthropic plan credentials flow through to
+  api.anthropic.com.
+- **Codex** (`--codex`) — patches `~/.codex/config.toml` (or
+  `<repo>/.codex/config.toml`) with a managed `[model_providers.weave]`
+  block plus `model_provider = "weave"`. OpenAI plan credentials flow
+  through to api.openai.com. The block lives between begin/end markers so
+  re-running the installer rewrites it cleanly and `--uninstall --codex`
+  removes it without touching the rest of your config.
 
 See the [main installer docs](https://github.com/workweave/router/tree/main/install)
 for the full reference.
@@ -38,7 +55,8 @@ for the full reference.
 
 - Node ≥ 18 (ships with `npx`)
 - `bash` on PATH (macOS / Linux native; Windows needs Git Bash or WSL)
-- `jq` on PATH — used by the status line script
+- `jq` on PATH — used by the Claude Code status line script. Not required
+  for the Codex path.
 
 ## Why npx
 

package/cc-statusline.sh

@@ -133,6 +133,7 @@ prices='{
     "claude-opus-4-6":                  0.015,
     "claude-opus-4-7":                  0.015,
     "claude-sonnet-4-5":                0.003,
+    "claude-sonnet-4-6":                0.003,
     "deepseek/deepseek-v4-flash":       0.00014,
     "deepseek/deepseek-v4-pro":         0.00174,
     "gemini-2.0-flash":                 0.0001,
@@ -161,16 +162,23 @@ prices='{
     "gpt-5.5-mini":                     0.0005,
     "gpt-5.5-nano":                     0.00015,
     "gpt-5.5-pro":                      0.03,
+    "minimax/minimax-m2.7":             0.0003,
     "moonshotai/kimi-k2.5":             0.0006,
+    "moonshotai/kimi-k2.6":             0.00095,
     "qwen/qwen3-235b-a22b-2507":        0.000071,
     "qwen/qwen3-coder-next":            0.0005,
-    "qwen/qwen3-next-80b-a3b-instruct": 0.00015
+    "qwen/qwen3-next-80b-a3b-instruct": 0.00015,
+    "qwen/qwen3.6-35b-a3b":             0.00015,
+    "xiaomi/mimo-v2.5":                 0.0004,
+    "xiaomi/mimo-v2.5-pro":             0.001,
+    "z-ai/glm-5":                       0.0006
   },
   "output": {
     "claude-haiku-4-5":                 0.004,
     "claude-opus-4-6":                  0.075,
     "claude-opus-4-7":                  0.075,
     "claude-sonnet-4-5":                0.015,
+    "claude-sonnet-4-6":                0.015,
     "deepseek/deepseek-v4-flash":       0.00028,
     "deepseek/deepseek-v4-pro":         0.00348,
     "gemini-2.0-flash":                 0.0004,
@@ -199,10 +207,16 @@ prices='{
     "gpt-5.5-mini":                     0.0025,
     "gpt-5.5-nano":                     0.0006,
     "gpt-5.5-pro":                      0.12,
+    "minimax/minimax-m2.7":             0.0012,
     "moonshotai/kimi-k2.5":             0.003,
+    "moonshotai/kimi-k2.6":             0.004,
     "qwen/qwen3-235b-a22b-2507":        0.000463,
     "qwen/qwen3-coder-next":            0.0012,
-    "qwen/qwen3-next-80b-a3b-instruct": 0.0012
+    "qwen/qwen3-next-80b-a3b-instruct": 0.0012,
+    "qwen/qwen3.6-35b-a3b":             0.00095,
+    "xiaomi/mimo-v2.5":                 0.002,
+    "xiaomi/mimo-v2.5-pro":             0.003,
+    "z-ai/glm-5":                       0.00208
   }
 }'
 # END_GENERATED_PRICES

package/install.sh

@@ -1,24 +1,33 @@
 #!/usr/bin/env bash
 #
-# Configures Claude Code to permanently route through the Weave Router by
-# writing the router base URL, router auth header, and a status line into
-# Claude Code's settings.json. After running, `claude` Just Works — no shell
-# exports, no manual settings edits.
+# Weave Router installer for Claude Code and Codex.
 #
-# Two scopes:
+# Configures Claude Code (default) or the OpenAI Codex CLI (`--codex`) to
+# permanently route through the Weave Router. For Claude Code this writes
+# the router base URL, router auth header, and a status line into Claude
+# Code's settings.json. For Codex it writes a `model_providers.weave`
+# entry plus `model_provider = "weave"` into ~/.codex/config.toml (managed
+# block delimited by markers so re-install / uninstall is clean).
+#
+# Two scopes (apply to both targets):
 #   - user (default):  ~/.claude/settings.json  + ~/.weave/cc-statusline.sh
+#                      ~/.codex/config.toml                       (with --codex)
 #   - project:         <repo>/.claude/settings.json + <repo>/.claude/cc-statusline.sh
+#                      <repo>/.codex/config.toml                  (with --codex)
 #
 # Or pass --dir to install into any directory:
 #   - dir:              <dir>/.claude/settings.json + <dir>/.claude/cc-statusline.sh
+#                       <dir>/.codex/config.toml                  (with --codex)
 #
 # Usage:
-#   npx @workweave/router                                  # hosted router, user scope
+#   npx @workweave/router                                  # interactive picker (Claude Code or Codex)
+#   npx @workweave/router --claude                         # skip the picker, target Claude Code
+#   npx @workweave/router --codex                          # skip the picker, target the OpenAI Codex CLI
 #   npx @workweave/router --scope project                  # commit-with-team install
 #   npx @workweave/router --dir /tmp/my-sandbox            # isolated throwaway install
 #   npx @workweave/router --local                          # local router on localhost:8080
 #   npx @workweave/router --base-url http://localhost:8080 # self-hosted, custom port
-#   npx @workweave/router --non-interactive                # require WEAVE_ROUTER_KEY env var
+#   npx @workweave/router --non-interactive                # require WEAVE_ROUTER_KEY env var (defaults target to claude)
 #   npx @workweave/router --quiet                          # suppress banner, ping check, and trailing tips
 #   npx @workweave/router --uninstall                      # remove a previous install (delegates to uninstall.sh)
 
@@ -37,6 +46,14 @@ base_url=""
 non_interactive="false"
 quiet="false"
 router_key_header="X-Weave-Router-Key"
+# Target tool whose config we patch. "claude" (default) writes Claude Code
+# settings.json; "codex" writes ~/.codex/config.toml. Each target carries its
+# own credential-passthrough story in the router: Claude Code's logged-in
+# Anthropic key flows through unchanged, and Codex's `OPENAI_API_KEY` flows
+# through via the same header path. target_explicit tracks whether --claude
+# or --codex was passed so an interactive run can prompt for the choice.
+target="claude"
+target_explicit="false"
 
 # ---------- helpers ----------
 
@@ -78,11 +95,16 @@ skip() { printf "%s⊙%s %s%s%s\n" "$C_DIM" "$C_RESET" "$C_DIM" "$*" "$C_RESET";
 print_banner() {
   [ "$quiet" = "true" ] && return 0
   [ "$tty_out" = "true" ] || return 0
+  local target_label
+  case "$target" in
+    codex) target_label="Codex installer" ;;
+    *)     target_label="Claude Code installer" ;;
+  esac
   printf '\n'
   printf '%s  ╦ ╦╔═╗╔═╗╦  ╦╔═╗%s\n' "$C_BRAND" "$C_RESET"
   printf '%s  ║║║║╣ ╠═╣╚╗╔╝║╣ %s\n' "$C_BRAND" "$C_RESET"
   printf '%s  ╚╩╝╚═╝╩ ╩ ╚╝ ╚═╝%s\n' "$C_BRAND" "$C_RESET"
-  printf '  %sWeave Router · Claude Code installer%s\n\n' "$C_DIM" "$C_RESET"
+  printf '  %sWeave Router · %s%s\n\n' "$C_DIM" "$target_label" "$C_RESET"
 }
 
 # ---------- spinner ----------
@@ -207,6 +229,12 @@ refuse_if_symlink() {
   fi
 }
 
+# Markers that delimit the block this installer manages inside Codex's
+# config.toml. Kept on disk verbatim so a re-install (or uninstall.sh
+# --codex) can find and replace the block instead of duplicating it.
+WEAVE_CODEX_BEGIN_MARKER="# >>> weave-router managed (do not edit between markers) >>>"
+WEAVE_CODEX_END_MARKER="# <<< weave-router managed <<<"
+
 # ---------- identity helpers ----------
 #
 # The router parses X-Weave-User-Email and X-Weave-User-Name on every protocol
@@ -269,7 +297,7 @@ normalize_name() {
 
 # resolve_user_email picks the email to plant in router request headers so the
 # router can attribute traffic to a person even on shared API keys. Priority:
-# WEAVE_USER_EMAIL env override -> git config user.email -> interactive prompt
+# WEAVE_USER_EMAIL env override → git config user.email → interactive prompt
 # (pre-filled with whatever we found). In --non-interactive mode we never
 # prompt, so unset/invalid means we ship no header (router treats that as
 # account_uuid-only, same as today). Echoes the validated email on stdout.
@@ -290,6 +318,10 @@ resolve_user_email() {
     printf '%s' "$candidate"
     return
   fi
+  # Interactive: confirm/edit. Empty input keeps the suggested default; a
+  # literal `-` lets the user opt out (ship no header). This stays out of
+  # --quiet runs because --quiet implies the caller doesn't want prompts;
+  # they can still use WEAVE_USER_EMAIL to provide one explicitly.
   if [ "$quiet" = "true" ]; then
     printf '%s' "$candidate"
     return
@@ -318,8 +350,127 @@ resolve_user_email() {
   esac
 }
 
+# write_codex_config writes a managed [model_providers.weave] block to the
+# Codex CLI's config.toml. Sets `model_provider = "weave"` at the top level so
+# Codex picks the routed provider by default. Both lines live inside the
+# managed-block markers so uninstall removes them cleanly. We strip any
+# top-level `model_provider = ...` declaration OUTSIDE the markers before
+# appending so the file doesn't end up with a duplicate key (TOML rejects
+# that). Inline `model_provider` keys inside `[profiles.*]` sections stay
+# untouched.
+#
+# Usage: write_codex_config <config_file_path> <base_url> <api_key> [user_email] [user_name]
+write_codex_config() {
+  local config_file="$1"
+  local block_url="$2"
+  local block_key="$3"
+  local block_email="${4:-}"
+  local block_name="${5:-}"
+
+  # Escape `\` and `"` for TOML basic strings. Order matters: replace
+  # backslashes first so the quotes we add next aren't double-escaped. A
+  # display name like `John "J" Doe` would otherwise produce invalid TOML and
+  # Codex would silently fail to parse config.toml — the installer's success
+  # message wouldn't help diagnose. Router keys are alnum+`_` from the API so
+  # safe as-is, but we escape uniformly for defense-in-depth.
+  toml_escape() {
+    local s="${1//\\/\\\\}"
+    printf '%s' "${s//\"/\\\"}"
+  }
+
+  local esc_key esc_email esc_name esc_url
+  esc_key="$(toml_escape "$block_key")"
+  esc_email="$(toml_escape "$block_email")"
+  esc_name="$(toml_escape "$block_name")"
+  esc_url="$(toml_escape "$block_url")"
+
+  # Plant whichever identity values we have alongside the router key so the
+  # router can attribute Codex traffic to a person on shared keys. Build the
+  # entries piecewise so an empty email/name is omitted entirely — the router
+  # never sees a header with no value (and TOML rejects empty unquoted vals).
+  local headers_parts="\"X-Weave-Router-Key\" = \"${esc_key}\""
+  if [ -n "$block_email" ]; then
+    headers_parts="${headers_parts}, \"X-Weave-User-Email\" = \"${esc_email}\""
+  fi
+  if [ -n "$block_name" ]; then
+    headers_parts="${headers_parts}, \"X-Weave-User-Name\" = \"${esc_name}\""
+  fi
+  local headers_line="http_headers = { ${headers_parts} }"
+
+  local block
+  block="$(cat <<TOML
+${WEAVE_CODEX_BEGIN_MARKER}
+# Managed by the Weave Router installer. Re-running the installer rewrites
+# this block; \`./uninstall.sh --codex\` removes it. To opt out without
+# uninstalling, change the model_provider value below.
+model_provider = "weave"
+
+[model_providers.weave]
+name = "Weave Router"
+base_url = "${esc_url}/v1"
+wire_api = "responses"
+${headers_line}
+${WEAVE_CODEX_END_MARKER}
+TOML
+)"
+
+  if [ -f "$config_file" ]; then
+    local tmp; tmp="$(mktemp -t weave-codex.XXXXXX)"
+    # Strip the managed block (between markers) plus any top-level
+    # `model_provider =` outside it. We define "top-level" as everything
+    # before the first `[section]` header. The awk handles both passes in
+    # one sweep so we never emit a duplicate.
+    awk -v begin="$WEAVE_CODEX_BEGIN_MARKER" -v end="$WEAVE_CODEX_END_MARKER" '
+      $0 == begin { skip = 1; next }
+      $0 == end   { skip = 0; next }
+      skip        { next }
+      /^[[:space:]]*\[/ { in_section = 1 }
+      !in_section && /^[[:space:]]*model_provider[[:space:]]*=/ { next }
+      { print }
+    ' "$config_file" >"$tmp"
+
+    # Insert the managed block at TOML top-level scope, NOT end-of-file. In
+    # TOML, every bare key after a `[section]` header belongs to that
+    # section, so appending `model_provider = "weave"` after a user's
+    # existing `[profiles.foo]` would silently scope it as
+    # `profiles.foo.model_provider` — Codex would never see the top-level
+    # default and routing would silently fail to activate. We splice the
+    # block in just before the first user section header so:
+    #   <user's top-level keys>           ← still top-level
+    #   <our managed block>               ← model_provider stays top-level
+    #     [model_providers.weave]         ← scoped section, OK anywhere
+    #   <user's sections>                 ← re-scope, unaffected
+    local first_section
+    first_section="$(awk '/^[[:space:]]*\[/ { print NR; exit }' "$tmp")"
+    if [ -n "$first_section" ]; then
+      # BSD `head -n 0` (macOS default) errors with "illegal line count"
+      # and trips `set -euo pipefail`, leaving an empty config. Skip the
+      # head call entirely when the file starts with a section header.
+      {
+        if [ "$first_section" -gt 1 ]; then
+          head -n "$((first_section - 1))" "$tmp"
+        fi
+        printf "%s\n" "$block"
+        tail -n "+${first_section}" "$tmp"
+      } >"$config_file"
+    else
+      # No section headers in the existing file — every prior user key was
+      # already at top-level. Our block ends with its own [section], so
+      # appending is safe (no bare keys follow).
+      cp "$tmp" "$config_file"
+      printf "\n%s\n" "$block" >>"$config_file"
+    fi
+    rm -f "$tmp"
+  else
+    printf "%s\n" "$block" >"$config_file"
+  fi
+  # 0600: the file holds a router key. Even at user scope, mode 644 would
+  # leak the key to any local user on a shared box.
+  chmod 600 "$config_file"
+}
+
 # resolve_user_name mirrors resolve_user_email but for display name. Priority:
-# WEAVE_USER_NAME env override -> git config user.name -> empty. We don't
+# WEAVE_USER_NAME env override → git config user.name → empty. We don't
 # prompt for name independently: if email prompting yielded nothing, name
 # almost certainly will too, and a second prompt is noise. Echoes the
 # validated name on stdout.
@@ -417,6 +568,14 @@ while [ $# -gt 0 ]; do
       install_dir="${2:-}"; shift 2
       [ -n "$install_dir" ] || { err "--dir requires a path"; exit 2; }
       ;;
+    --codex)
+      target="codex"; target_explicit="true"; shift
+      ;;
+    --claude)
+      # No-op selector for symmetry with --codex. Useful in pipelines that
+      # want to skip the interactive picker without depending on the default.
+      target="claude"; target_explicit="true"; shift
+      ;;
     -h|--help)
       usage 0
       ;;
@@ -432,9 +591,31 @@ fi
 # trim trailing slash for cleanliness
 base_url="${base_url%/}"
 
+# ---------- interactive target prompt ----------
+
+# If neither --claude nor --codex was passed and we have a controlling
+# terminal, ask which tool to install for. Non-interactive runs (CI,
+# `curl | sh --non-interactive`) silently use the "claude" default — same
+# behavior the script had before --codex existed, so existing pipelines
+# don't change semantics. We prompt BEFORE print_banner so the banner's
+# target label (Claude Code installer / Codex installer) reflects the choice.
+if [ "$target_explicit" = "false" ] && [ "$non_interactive" = "false" ] && [ -r /dev/tty ]; then
+  printf "%sInstall target:%s\n" "$C_BOLD" "$C_RESET"
+  printf "  %s1)%s Claude Code  %s— patches ~/.claude/settings.json (or <repo>/.claude/)%s\n" "$C_BRAND" "$C_RESET" "$C_DIM" "$C_RESET"
+  printf "  %s2)%s Codex        %s— patches ~/.codex/config.toml (or <repo>/.codex/)%s\n" "$C_BRAND" "$C_RESET" "$C_DIM" "$C_RESET"
+  printf "Choose %s[1/2]%s (default %s1%s): " "$C_BOLD" "$C_RESET" "$C_BOLD" "$C_RESET"
+  read -r target_choice </dev/tty || target_choice=""
+  case "${target_choice:-1}" in
+    1|""|claude|c|C)  target="claude" ;;
+    2|codex|x|X)      target="codex" ;;
+    *) err "invalid choice: $target_choice"; exit 2 ;;
+  esac
+fi
+
 # Banner runs before the interactive scope prompt so the very first thing
 # users see when `make full-setup` hands off to install.sh is the wordmark,
-# not a bare "Install scope:" line.
+# not a bare "Install scope:" line. Target prompt above already finalized
+# $target, so the banner's per-target label reflects the user's choice.
 print_banner
 
 # ---------- interactive scope prompt ----------
@@ -443,9 +624,22 @@ print_banner
 # scope to install into. Non-interactive runs (CI, `curl | sh --non-interactive`)
 # silently use the "user" default.
 if [ -z "$install_dir" ] && [ "$scope_explicit" = "false" ] && [ "$non_interactive" = "false" ] && [ -r /dev/tty ]; then
+  # Per-target paths so the prompt text matches what actually gets written.
+  case "$target" in
+    codex)
+      scope_user_path="~/.codex/"
+      scope_project_path="<repo>/.codex/"
+      scope_cli_label="codex"
+      ;;
+    *)
+      scope_user_path="~/.claude/"
+      scope_project_path="<repo>/.claude/"
+      scope_cli_label="claude"
+      ;;
+  esac
   printf "%sInstall scope:%s\n" "$C_BOLD" "$C_RESET"
-  printf "  %s1)%s user     %s— write to ~/.claude/ (applies everywhere you run claude)%s\n" "$C_BRAND" "$C_RESET" "$C_DIM" "$C_RESET"
-  printf "  %s2)%s project  %s— write to <repo>/.claude/ (applies only inside this repo)%s\n" "$C_BRAND" "$C_RESET" "$C_DIM" "$C_RESET"
+  printf "  %s1)%s user     %s— write to %s (applies everywhere you run %s)%s\n" "$C_BRAND" "$C_RESET" "$C_DIM" "$scope_user_path" "$scope_cli_label" "$C_RESET"
+  printf "  %s2)%s project  %s— write to %s (applies only inside this repo)%s\n" "$C_BRAND" "$C_RESET" "$C_DIM" "$scope_project_path" "$C_RESET"
   printf "Choose %s[1/2]%s (default %s1%s): " "$C_BOLD" "$C_RESET" "$C_BOLD" "$C_RESET"
   read -r scope_choice </dev/tty || scope_choice=""
   case "${scope_choice:-1}" in
@@ -477,15 +671,29 @@ fi
 
 # ---------- pre-flight ----------
 
-[ "$quiet" = "true" ] || info "scope=${C_BOLD}${scope}${C_RESET}  base_url=${C_BOLD}${base_url}${C_RESET}"
+[ "$quiet" = "true" ] || info "scope=${C_BOLD}${scope}${C_RESET}  target=${C_BOLD}${target}${C_RESET}  base_url=${C_BOLD}${base_url}${C_RESET}"
 
-require_cmd jq    "macOS: 'brew install jq' · Debian/Ubuntu: 'sudo apt install jq'"
+# Codex install only writes a TOML file (managed via awk) so jq isn't needed.
+# Claude Code's settings.json patching uses jq to deep-merge env keys.
+if [ "$target" = "claude" ]; then
+  require_cmd jq    "macOS: 'brew install jq' · Debian/Ubuntu: 'sudo apt install jq'"
+fi
 require_cmd curl  "macOS/Linux: usually preinstalled — check your package manager"
 
-if ! command -v claude >/dev/null 2>&1; then
-  warn "'claude' not found on PATH. Install Claude Code from https://claude.com/code, then re-run this script."
-  warn "Continuing — settings.json will be written and will take effect once Claude Code is installed."
-fi
+case "$target" in
+  claude)
+    if ! command -v claude >/dev/null 2>&1; then
+      warn "'claude' not found on PATH. Install Claude Code from https://claude.com/code, then re-run this script."
+      warn "Continuing — settings.json will be written and will take effect once Claude Code is installed."
+    fi
+    ;;
+  codex)
+    if ! command -v codex >/dev/null 2>&1; then
+      warn "'codex' not found on PATH. Install via 'npm install -g @openai/codex' (or brew install codex), then re-run this script."
+      warn "Continuing — config.toml will be written and will take effect once Codex is installed."
+    fi
+    ;;
+esac
 
 script_dir="$(cd "$(dirname "$0")" 2>/dev/null && pwd || true)"
 
@@ -518,42 +726,59 @@ else
   esac
 fi
 
-case "$scope" in
-  user)
-    settings_dir="$settings_base/.claude"
-    settings_file="$settings_dir/settings.json"
-    local_settings_file=""
-    statusline_dir="${settings_base}/.weave"
-    statusline_file="$statusline_dir/cc-statusline.sh"
-    statusline_path_for_settings="$statusline_file"
-    ;;
-  project)
-    settings_dir="$settings_base/.claude"
-    settings_file="$settings_dir/settings.json"
-    local_settings_file="$settings_dir/settings.local.json"
-    statusline_dir="$settings_base/.claude"
-    statusline_file="$statusline_dir/cc-statusline.sh"
-    # Portable relative path for real repos (teammates can clone anywhere).
-    # Absolute path when --dir overrides (no meaningful $CLAUDE_PROJECT_DIR).
-    if [ -z "$install_dir" ]; then
-      statusline_path_for_settings="\${CLAUDE_PROJECT_DIR}/.claude/cc-statusline.sh"
-    else
+if [ "$target" = "claude" ]; then
+  case "$scope" in
+    user)
+      settings_dir="$settings_base/.claude"
+      settings_file="$settings_dir/settings.json"
+      local_settings_file=""
+      statusline_dir="${settings_base}/.weave"
+      statusline_file="$statusline_dir/cc-statusline.sh"
       statusline_path_for_settings="$statusline_file"
-    fi
-    ;;
-esac
+      ;;
+    project)
+      settings_dir="$settings_base/.claude"
+      settings_file="$settings_dir/settings.json"
+      local_settings_file="$settings_dir/settings.local.json"
+      statusline_dir="$settings_base/.claude"
+      statusline_file="$statusline_dir/cc-statusline.sh"
+      # Portable relative path for real repos (teammates can clone anywhere).
+      # Absolute path when --dir overrides (no meaningful $CLAUDE_PROJECT_DIR).
+      if [ -z "$install_dir" ]; then
+        statusline_path_for_settings="\${CLAUDE_PROJECT_DIR}/.claude/cc-statusline.sh"
+      else
+        statusline_path_for_settings="$statusline_file"
+      fi
+      ;;
+  esac
 
-# Symlink containment: refuse if any target path is a symlink. User-scope paths
-# under $HOME are trusted; project-scope and --dir paths come from a git repo or
-# user-supplied directory that may be hostile, so we check those.
-if [ "$scope" = "project" ] || [ -n "$install_dir" ]; then
-  refuse_if_symlink "$settings_dir"
-  refuse_if_symlink "$settings_file"
-  refuse_if_symlink "$local_settings_file"
-  refuse_if_symlink "$statusline_file"
-fi
+  # Symlink containment: refuse if any target path is a symlink. User-scope
+  # paths under $HOME are trusted; project-scope and --dir paths come from a
+  # git repo or user-supplied directory that may be hostile, so we check those.
+  if [ "$scope" = "project" ] || [ -n "$install_dir" ]; then
+    refuse_if_symlink "$settings_dir"
+    refuse_if_symlink "$settings_file"
+    refuse_if_symlink "$local_settings_file"
+    refuse_if_symlink "$statusline_file"
+  fi
 
-mkdir -p "$settings_dir" "$statusline_dir"
+  mkdir -p "$settings_dir" "$statusline_dir"
+else
+  # Codex CLI reads config from ~/.codex/config.toml by default. For project
+  # scope we write to <repo>/.codex/config.toml; the user invokes Codex with
+  # `CODEX_HOME=<repo>/.codex codex` (or runs from the repo if Codex auto-
+  # discovers). The router key is embedded in the file so it stays per-
+  # teammate — .codex/config.toml goes in .gitignore in project scope.
+  codex_dir="$settings_base/.codex"
+  codex_config_file="$codex_dir/config.toml"
+
+  if [ "$scope" = "project" ] || [ -n "$install_dir" ]; then
+    refuse_if_symlink "$codex_dir"
+    refuse_if_symlink "$codex_config_file"
+  fi
+
+  mkdir -p "$codex_dir"
+fi
 
 # ---------- token handling ----------
 
@@ -587,17 +812,20 @@ if [ -n "${WEAVE_ROUTER_KEY:-}" ]; then
 
 # ---------- identity (user email + name) ----------
 #
-# Resolved after api_key so the prompt sequence reads naturally: key first,
-# then "who are you?". Both end up as request headers the router parses on
-# every protocol so customers can link router users to Weave accounts on the
-# dashboard. Empty values = no header (router stays in account_uuid-only
-# mode), so existing behavior is preserved when git config is unset.
+# The router parses X-Weave-User-Email and X-Weave-User-Name on every protocol
+# (Anthropic, OpenAI/Codex, Gemini) and persists them onto
+# router.model_router_users so customers can attribute traffic to a person even
+# when many people share one API key. We plant the headers at install time
+# because Claude Code's metadata.user_id payload carries only account_uuid (no
+# email), and Codex carries no identity at all — without this step the router
+# only ever sees anonymous UUIDs for non-OTLP customers.
+#
+# Gate name on email: when the user explicitly opts out of email identity (via
+# '-' at the prompt or by clearing git config), don't auto-plant a name from
+# git config either. Opt-out should be all-or-nothing so the router
+# consistently sees zero identity headers when the user wants to stay
+# anonymous.
 user_email="$(resolve_user_email)"
-# Gate name on email: when the user explicitly opts out of email identity
-# (via '-' at the prompt or by clearing git config), don't auto-plant a
-# name from git config either. Opt-out should be all-or-nothing so the
-# router consistently sees zero identity headers when the user wants to
-# stay anonymous.
 if [ -n "$user_email" ]; then
   user_name="$(resolve_user_name)"
 else
@@ -611,6 +839,60 @@ else
   info "No identity set — router traffic will be attributed by account UUID only."
 fi
 
+# ---------- codex install path (dispatch + exit before the Claude-only writes) ----------
+
+if [ "$target" = "codex" ]; then
+  write_codex_config "$codex_config_file" "$base_url" "$api_key" "$user_email" "$user_name"
+  ok "Codex config written to $codex_config_file"
+
+  # Project scope: ensure the per-teammate config (which holds the router key)
+  # is gitignored. The base URL is the same for every teammate, so a
+  # committed shared file would still leak the per-key portion. Easier to
+  # ignore the whole config and have each teammate run the installer.
+  if [ "$scope" = "project" ] && [ -z "$install_dir" ] && [ -n "${git_root:-}" ]; then
+    gitignore="$git_root/.gitignore"
+    refuse_if_symlink "$gitignore"
+    for entry in \
+      ".codex/config.toml"
+    do
+      if [ ! -f "$gitignore" ] || ! grep -qxF "$entry" "$gitignore"; then
+        printf '%s\n' "$entry" >>"$gitignore"
+      fi
+    done
+    ok "Updated $gitignore (ignored .codex/config.toml)"
+  fi
+
+  # Post-install verification: same probes the Claude path runs so a working
+  # install gives the same green checks regardless of target.
+  if [ "$quiet" != "true" ]; then
+    if ! spin "Pinging $base_url/health" curl -fsS --max-time 5 "$base_url/health"; then
+      warn "Could not reach $base_url/health within 5s. Settings are written; verify the router is running."
+    fi
+  fi
+
+  if [ -n "$api_key" ]; then
+    # Pass the router key via stdin (`@-`) instead of -H so it never lands in
+    # the process arg list. Mirrors the Claude-path validate logic.
+    validate_codex_key() {
+      printf '%s: %s\n' "$router_key_header" "$api_key" \
+        | curl -fsS --max-time 5 --header @- "$base_url/validate"
+    }
+    if ! spin "Validating API key" validate_codex_key; then
+      warn "Router rejected the API key (check it matches the dashboard at $base_url/ui/)."
+    fi
+  fi
+
+  printf "\n"
+  printf "%s✓%s %s%sWeave Router installed for Codex.%s\n" \
+    "$C_GREEN" "$C_RESET" "$C_BOLD" "$C_BRAND" "$C_RESET"
+  if [ "$scope" = "project" ] || [ -n "$install_dir" ]; then
+    # Codex auto-discovers ~/.codex; for non-user installs the caller has to
+    # point CODEX_HOME at the directory we wrote so Codex finds our config.
+    info "Run Codex with CODEX_HOME=$codex_dir codex so it picks up this config."
+  fi
+  exit 0
+fi
+
 # ---------- write the statusline script ----------
 
 cat > "$statusline_file" << 'STATUSLINE_EOF'
@@ -749,6 +1031,7 @@ prices='{
     "claude-opus-4-6":                  0.015,
     "claude-opus-4-7":                  0.015,
     "claude-sonnet-4-5":                0.003,
+    "claude-sonnet-4-6":                0.003,
     "deepseek/deepseek-v4-flash":       0.00014,
     "deepseek/deepseek-v4-pro":         0.00174,
     "gemini-2.0-flash":                 0.0001,
@@ -777,16 +1060,23 @@ prices='{
     "gpt-5.5-mini":                     0.0005,
     "gpt-5.5-nano":                     0.00015,
     "gpt-5.5-pro":                      0.03,
+    "minimax/minimax-m2.7":             0.0003,
     "moonshotai/kimi-k2.5":             0.0006,
+    "moonshotai/kimi-k2.6":             0.00095,
     "qwen/qwen3-235b-a22b-2507":        0.000071,
     "qwen/qwen3-coder-next":            0.0005,
-    "qwen/qwen3-next-80b-a3b-instruct": 0.00015
+    "qwen/qwen3-next-80b-a3b-instruct": 0.00015,
+    "qwen/qwen3.6-35b-a3b":             0.00015,
+    "xiaomi/mimo-v2.5":                 0.0004,
+    "xiaomi/mimo-v2.5-pro":             0.001,
+    "z-ai/glm-5":                       0.0006
   },
   "output": {
     "claude-haiku-4-5":                 0.004,
     "claude-opus-4-6":                  0.075,
     "claude-opus-4-7":                  0.075,
     "claude-sonnet-4-5":                0.015,
+    "claude-sonnet-4-6":                0.015,
     "deepseek/deepseek-v4-flash":       0.00028,
     "deepseek/deepseek-v4-pro":         0.00348,
     "gemini-2.0-flash":                 0.0004,
@@ -815,10 +1105,16 @@ prices='{
     "gpt-5.5-mini":                     0.0025,
     "gpt-5.5-nano":                     0.0006,
     "gpt-5.5-pro":                      0.12,
+    "minimax/minimax-m2.7":             0.0012,
     "moonshotai/kimi-k2.5":             0.003,
+    "moonshotai/kimi-k2.6":             0.004,
     "qwen/qwen3-235b-a22b-2507":        0.000463,
     "qwen/qwen3-coder-next":            0.0012,
-    "qwen/qwen3-next-80b-a3b-instruct": 0.0012
+    "qwen/qwen3-next-80b-a3b-instruct": 0.0012,
+    "qwen/qwen3.6-35b-a3b":             0.00095,
+    "xiaomi/mimo-v2.5":                 0.002,
+    "xiaomi/mimo-v2.5-pro":             0.003,
+    "z-ai/glm-5":                       0.00208
   }
 }'
 # END_GENERATED_PRICES

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workweave/router",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "One-command installer that points Claude Code at the Weave Router.",
   "bin": {
     "weave-router": "bin.js"

package/uninstall.sh

@@ -1,12 +1,16 @@
 #!/usr/bin/env bash
 #
-# Weave Router uninstaller for Claude Code.
+# Weave Router uninstaller for Claude Code and Codex.
 #
-# Removes the env vars, statusLine, and local router auth that install.sh added.
-# Leaves the rest of settings.json untouched.
+# Default target is Claude Code: removes the env vars, statusLine, and local
+# router auth that install.sh added; leaves the rest of settings.json
+# untouched. Pass --codex to strip the managed [model_providers.weave]
+# block (and the matching top-level `model_provider`) from Codex's
+# config.toml — anything outside the markers is preserved.
 #
 # Usage:
-#   npx @workweave/router --uninstall                            # user scope
+#   npx @workweave/router --uninstall                            # Claude Code, user scope
+#   npx @workweave/router --uninstall --codex                    # Codex, user scope
 #   npx @workweave/router --uninstall --scope project            # run inside the repo
 #   npx @workweave/router --uninstall --dir /tmp/test            # --dir alone (user scope, .weave/)
 #   npx @workweave/router --uninstall --scope project --dir /tmp # --dir + project scope (.claude/)
@@ -16,6 +20,7 @@ set -euo pipefail
 scope="user"
 scope_explicit="false"
 install_dir=""
+target="claude"
 
 err()  { printf "\033[31merror:\033[0m %s\n" "$*" >&2; }
 info() { printf "\033[36m==>\033[0m %s\n" "$*"; }
@@ -44,6 +49,15 @@ while [ $# -gt 0 ]; do
       install_dir="${2:-}"; shift 2
       [ -n "$install_dir" ] || { err "--dir requires a path"; exit 2; }
       ;;
+    --codex)
+      target="codex"; shift
+      ;;
+    --claude)
+      # No-op selector for symmetry with --codex and install.sh's --claude.
+      # Lets `./install.sh --uninstall --claude` (which forwards remaining
+      # args here) succeed instead of hitting the unknown-flag catch-all.
+      target="claude"; shift
+      ;;
     -h|--help)
       # awk avoids GNU `head -n -<N>` (rejected by BSD head on macOS).
       awk 'NR<2 { next } /^set -euo/ { exit } { sub(/^# ?/, ""); print }' "$0"
@@ -55,11 +69,103 @@ while [ $# -gt 0 ]; do
   esac
 done
 
-if ! command -v jq >/dev/null 2>&1; then
-  err "jq is required."
+if [ "$target" = "claude" ] && ! command -v jq >/dev/null 2>&1; then
+  err "jq is required for the Claude Code uninstall path."
   exit 1
 fi
 
+# Markers must stay in sync with install.sh. Keep verbatim.
+WEAVE_CODEX_BEGIN_MARKER="# >>> weave-router managed (do not edit between markers) >>>"
+WEAVE_CODEX_END_MARKER="# <<< weave-router managed <<<"
+
+# strip_codex_block rewrites config.toml without the managed block and any
+# top-level `model_provider = "weave"` that lived outside the markers (which
+# can happen if the user copy-pasted our key into their own config). Other
+# top-level model_provider values are preserved so we don't yank a user back
+# into the OpenAI default when they meant to keep their own.
+strip_codex_block() {
+  local config_file="$1"
+  local tmp; tmp="$(mktemp -t weave-codex-uninstall.XXXXXX)"
+  awk -v begin="$WEAVE_CODEX_BEGIN_MARKER" -v end="$WEAVE_CODEX_END_MARKER" '
+    $0 == begin { skip = 1; next }
+    $0 == end   { skip = 0; next }
+    skip        { next }
+    /^[[:space:]]*\[/ { in_section = 1 }
+    !in_section && /^[[:space:]]*model_provider[[:space:]]*=[[:space:]]*"weave"[[:space:]]*$/ { next }
+    { print }
+  ' "$config_file" >"$tmp"
+  mv "$tmp" "$config_file"
+}
+
+# ---------- codex uninstall path ----------
+
+if [ "$target" = "codex" ]; then
+  # Resolve codex_config_file based on scope/dir. Mirrors the install path so
+  # an `install --codex --scope project` is exactly reversed by an
+  # `uninstall --codex --scope project`.
+  if [ -n "$install_dir" ]; then
+    install_dir="$(cd "$install_dir" 2>/dev/null && pwd || echo "$install_dir")"
+    codex_dir="$install_dir/.codex"
+    refuse_if_symlink "$codex_dir"
+  elif [ "$scope" = "user" ]; then
+    codex_dir="$HOME/.codex"
+  else
+    # Project scope: same prompt + git-root fallback as install.sh.
+    project_dir=""
+    if [ "$scope_explicit" = "false" ] && [ -r /dev/tty ]; then
+      default_project_dir="$(pwd)"
+      printf "Project directory to uninstall from [default: %s]: " "$default_project_dir"
+      read -r project_dir_choice </dev/tty || project_dir_choice=""
+      project_dir="${project_dir_choice:-$default_project_dir}"
+      case "$project_dir" in
+        "~")    project_dir="$HOME" ;;
+        "~/"*)  project_dir="$HOME/${project_dir#~/}" ;;
+      esac
+      if [ ! -d "$project_dir" ]; then
+        err "directory does not exist: $project_dir"
+        exit 1
+      fi
+      project_dir="$(cd "$project_dir" && pwd)"
+    fi
+    if [ -n "${project_dir:-}" ]; then
+      codex_dir="$project_dir/.codex"
+    else
+      if ! git_root="$(git rev-parse --show-toplevel 2>/dev/null)"; then
+        err "--scope project must be run inside a git repo, or use --dir <path>."
+        exit 1
+      fi
+      codex_dir="$git_root/.codex"
+    fi
+    refuse_if_symlink "$codex_dir"
+  fi
+  codex_config_file="$codex_dir/config.toml"
+  refuse_if_symlink "$codex_config_file"
+
+  if [ -f "$codex_config_file" ]; then
+    strip_codex_block "$codex_config_file"
+    # If the file now contains only whitespace/comments, leave it: the user
+    # may have other comments worth keeping. Truly empty files we delete so
+    # we don't leave a zero-byte artifact behind.
+    if [ ! -s "$codex_config_file" ]; then
+      rm -f "$codex_config_file"
+      ok "Removed empty $codex_config_file"
+    else
+      ok "Cleaned $codex_config_file"
+    fi
+  else
+    info "No Codex config at $codex_config_file (already uninstalled?)"
+  fi
+
+  if [ -n "$install_dir" ]; then
+    ok "Weave Router uninstalled from $install_dir (Codex)."
+  else
+    ok "Weave Router uninstalled (Codex, scope=$scope)."
+  fi
+  exit 0
+fi
+
+# ---------- claude uninstall path ----------
+
 # Resolve the base directory. When --dir is given, use it directly.
 if [ -n "$install_dir" ]; then
   install_dir="$(cd "$install_dir" 2>/dev/null && pwd || echo "$install_dir")"