ai-consultants 3.3.0 → 3.4.0

package/.env.example

@@ -122,11 +122,19 @@ GEMINI_TIMEOUT=180
 GEMINI_CMD=agy
 # API-mode model ID (only used when GEMINI_USE_API=true)
 GEMINI_API_MODEL=gemini-3.1-pro-preview
+# Reasoning effort for the agy CLI. Passed as --effort <value>. Accepts only
+# low|medium|high; anything else is rejected by the provider and surfaces as a
+# diagnosed error (provider owns the enum — same stance as QWEN3_REASONING_EFFORT).
+# GEMINI_REASONING_EFFORT=
 
 # Codex - The Pragmatist
-CODEX_MODEL=gpt-5.5
+CODEX_MODEL=gpt-5.6-sol
 CODEX_TIMEOUT=180
 CODEX_CMD=codex
+# Reasoning effort for the codex CLI (and API mode). Passed as
+# -c model_reasoning_effort=<value>. The provider owns the accepted enum;
+# an unsupported value is rejected rather than silently ignored.
+# CODEX_REASONING_EFFORT=
 
 # Mistral Vibe - The Devil's Advocate
 MISTRAL_MODEL=mistral-large-3
@@ -148,6 +156,10 @@ CLAUDE_MODEL=claude-opus-5 # ai-consultants:default
 CLAUDE_TIMEOUT=240
 CLAUDE_CMD=claude
 CLAUDE_API_MAX_TOKENS=16384
+# Reasoning effort for the claude CLI (and API mode). Passed as --effort <value>.
+# The provider owns the accepted enum; an unsupported value is rejected rather
+# than silently ignored.
+# CLAUDE_REASONING_EFFORT=
 
 # Qwen3 - The Analyst (CLI/API switchable v2.7)
 QWEN3_MODEL=qwen3.7-max
@@ -157,7 +169,7 @@ QWEN3_CMD=qwen
 # mode this is ignored (with a warning); set model.reasoningEffort in
 # ~/.qwen/settings.json instead. Accepted: none|minimal|low|medium|high|xhigh|max
 # (the provider's own enum). The valid subset depends on the model:
-# qwen3.8-max-preview takes all of them EXCEPT 'none' - thinking cannot be
+# qwen3.8-max takes all of them EXCEPT 'none' - thinking cannot be
 # disabled on it - and defaults to xhigh. An unsupported combination is
 # rejected by the provider with a 400, not silently ignored.
 # QWEN3_REASONING_EFFORT=

package/CLAUDE.md

@@ -6,7 +6,7 @@ AI Consultants is a multi-model coverage system that queries up to 11 AI consult
 
 **Self-Exclusion**: The invoking agent is automatically excluded from the panel to prevent self-consultation. Claude Code won't query Claude, Codex CLI won't query Codex, etc.
 
-**Version**: 3.3.0
+**Version**: 3.4.0
 
 ## Distribution
 
@@ -368,9 +368,9 @@ Three tiers of models are available for each consultant, configurable via `apply
 
 | Tier | Description | Example Models |
 |------|-------------|----------------|
-| **premium** | Latest flagship models | claude-opus-5, Gemini 3.1 Pro (High), gpt-5.5 |
-| **standard** | Good quality at reasonable cost | claude-sonnet-4-6, Gemini 3.5 Flash (High), gpt-5.4 |
-| **economy** | Optimized for speed and low cost | claude-haiku-4-5, Gemini 3.5 Flash (Low), gpt-5.4-nano |
+| **premium** | Latest flagship models | claude-opus-5, Gemini 3.1 Pro (High), gpt-5.6-sol |
+| **standard** | Good quality at reasonable cost | claude-sonnet-5, Gemini 3.6 Flash (High), gpt-5.6-terra |
+| **economy** | Optimized for speed and low cost | claude-haiku-4-5, Gemini 3.6 Flash (Low), gpt-5.6-luna |
 
 **Default models are now premium tier** for maximum quality.
 
@@ -407,7 +407,7 @@ All consultants now use premium models by default:
 |------------|---------------|
 | Claude | claude-opus-5 |
 | Gemini | Gemini 3.1 Pro (High) (via agy CLI) |
-| Codex | gpt-5.5 |
+| Codex | gpt-5.6-sol |
 | Mistral | mistral-large-3 |
 | Cursor | composer-2.5 |
 | DeepSeek | deepseek-v4-pro |
@@ -617,7 +617,7 @@ for f in scripts/*.sh scripts/lib/*.sh; do bash -n "$f" && echo "OK: $f"; done
 | `CLAUDE_API_MAX_TOKENS` | 16384 | Claude API thinking + visible-output budget |
 | `GEMINI_MODEL` | Gemini 3.1 Pro (High) | Gemini agy CLI model (v2.15) |
 | `GEMINI_API_MODEL` | gemini-3.1-pro-preview | Gemini API-mode model ID (v2.15) |
-| `CODEX_MODEL` | gpt-5.5 | Codex model (v2.5) |
+| `CODEX_MODEL` | gpt-5.6-sol | Codex model (v2.5) |
 | `MISTRAL_MODEL` | mistral-large-3 | Mistral model (v2.5) |
 | `SYNTHESIS_STRATEGY` | coverage | Synthesis strategy (coverage=union of distinct points) |
 | `ENABLE_SEMANTIC_CACHE` | true | Semantic response caching (v2.3) |
@@ -787,6 +787,23 @@ curl -fsSL https://raw.githubusercontent.com/matteoscurati/ai-consultants/main/s
 
 ## Changelog
 
+### v3.4.0
+- **Gemini was unreachable from an SSH session, and no amount of re-authenticating helped.** `agy` picks its credential store from the environment: seeing `SSH_CLIENT`, `SSH_CONNECTION`, or `SSH_TTY` it switches to a file-based token store and never consults the macOS Keychain. A user who signed in locally therefore lost Gemini entirely over SSH, and signing in again landed the new credential in the Keychain the CLI had already decided to ignore. Reproduced live before fixing (`agy models` → "Please sign in"; the same command under `env -u SSH_CLIENT -u SSH_CONNECTION -u SSH_TTY` → full inventory), and confirmed again end to end after. Found by reading delegation-kit's 0.13.1 fix and checking whether the same failure applied here — it did, in the very session doing the work.
+- **The fix ships in two shapes on purpose** (`lib/common.sh:163-164`). `AGY_ENV_PREFIX` is an array of `env -u …` for anything that reaches `agy` through `run_with_timeout`, because GNU `timeout` execs a binary and **cannot invoke a shell function**; `agy_env` is the same-shell wrapper, defined *from* that array so the two cannot drift. Applied at every executing call site — `query_gemini.sh`, `doctor.sh`, `update_clis.sh`, and `build_synthesis_args` (which is executed directly by `synthesize.sh:304`, not through timeout, so either shape would work there — it uses the array for consistency). The remaining `${GEMINI_CMD:-agy}` hits are `command -v` probes and config-dump strings, which execute nothing.
+- **The Codex adapter was the least isolated in the panel, contradicting our own v3.1.0 policy.** That release isolated Grok specifically so "local plugins, hooks, skills, memories, and project instructions stay outside the consultation", then left Codex running `codex exec --skip-git-repo-check -m … "$FULL_QUERY"` in the ambient environment: the user's `~/.codex/config.toml`, the repo's `AGENTS.md`, their hooks, MCP servers, and execpolicy rules all reached an advisory consultation, the sandbox was unpinned, and the prompt rode in argv — the same `ARG_MAX` and process-list exposure v3.1.0 had already fixed once. CLI mode now uses an ephemeral mode-700 HOME/CWD with `--ephemeral --ignore-user-config --ignore-rules -s read-only`, prompt on stdin, answer from a private `-o` payload (`query_codex.sh:86-160`).
+- **`CODEX_HOME` is resolved before HOME is overridden** (`query_codex.sh:89`) and passed through unchanged: `--ignore-user-config` skips `config.toml` but auth still resolves through `CODEX_HOME`, so repointing it at the isolated home would break authentication outright. Note the coupling recorded at `query_codex.sh:123`: `--ignore-user-config` is safe **only** because `-m` pins the model — it also makes Codex ignore any `-p <profile>`, so a profile must never be added here.
+- **Review caught the `-o` payload rewriting real failures into successes.** The first implementation adopted the payload whenever it was non-empty, *regardless of how `run_query` finished* — so a timeout (124), an auth error, or exhausted retries that left a partial answer on disk all became `exit_code=0` and entered synthesis as a healthy consultation. That is strictly worse than the bug it replaced and defeats the v2.18/v2.19 diagnosed-failure machinery. Adoption is now gated on success; exit 0 with an empty payload remains a failure. Both directions are regression-tested, and both tests were confirmed non-vacuous by reintroducing the defect and watching them fail.
+- **Correction, on the record: the justification for that override was measured and found false.** It was defended as avoiding "false empty-stdout failures", since `run_query` treats an empty stdout as a failure *and retries* — which would have meant every Codex consultation making `MAX_RETRIES` billable calls. Measured against the real CLI, stdout carries the answer (11 bytes), the `-o` file mirrors it, and only token telemetry goes to stderr. There was never a retry storm. `-o` is kept as defence in depth — and the isolation is what makes stdout clean in the first place, since `--ignore-user-config` plus an ephemeral HOME leaves no hooks to emit chatter.
+- **`*_REASONING_EFFORT` had been a documented no-op on the default path.** `warn_effort_ignored_in_cli` announced the setting as API-mode only, but CLI-first transport has been mandatory since v2.21 — so in the shipped configuration the knob did nothing at all, while three CLIs did expose the control. Now wired: Codex `-c model_reasoning_effort=` (`query_codex.sh:148`), Claude `--effort` (`query_claude.sh:78-86`), Gemini `--effort` (`query_gemini.sh:97-105`). This is not cosmetic — cheap models do not degrade gracefully, so a consultant silently inheriting an unknown effort is not a controlled panel member.
+- **Deliberately no per-CLI effort allowlist.** `agy` accepts only `low|medium|high`, but the accepted enum is a provider fact, not ours; an unsupported value comes back as a diagnosed 400 rather than being pre-empted by a table in shell. Same stance v2.25.0 took for Qwen, and for the same reason: hardcoding per-model facts is what produced the stale `MODEL_USED` bugs.
+- **The parameter-contract test did its job on code it knew nothing about.** `test_configure.sh:91-121` scans every non-test `*.sh` for `${VAR:-}` and requires each name to be accepted by `configure --set`; the three new effort reads and then `CODEX_HOME` each failed it in turn. The effort variables are now declared in `.env.example` (commented out, matching the `QWEN3_REASONING_EFFORT` convention). `CODEX_HOME` went to the **exclusion list** instead (`test_configure.sh:105-107`), because it is owned by the Codex CLI: we read it to locate the user's auth store and must never persist it — declaring it would advertise `configure --set CODEX_HOME=…`, writing another tool's private auth path into our config. It joins `HOME`, `TMPDIR`, `XDG_CONFIG_HOME`, and `XAI_API_KEY`, and the distinction is now stated inline so nobody "fixes" it by moving it into `.env.example`.
+- **The model catalog refresh would have been invisible to every existing installation — and only a live smoke test caught it.** The full gate was green (19/19, shellcheck clean, both new regression tests proven non-vacuous) and a real consultation still reported `model=gpt-5.5`. `init` copies `.env.example` verbatim, so the then-current Codex default was persisted as an ordinary unmarked value, and `configure` reads any unmarked value as a deliberate user pin. The proof sits side by side in an installed config: `CODEX_MODEL=gpt-5.5` beside `CLAUDE_MODEL=claude-opus-5 # ai-consultants:default`, where only the marked line can migrate. Fixed with the direct analogue of v3.2.0's Claude migration (`configure.sh:288-295`) — one exact historical value, one target, skipped on the pin marker, rewritten with the default marker. Verified against real config files: unmarked `gpt-5.5` migrates, a pin recorded via `--set` survives, an unrelated `gpt-5.4` is untouched.
+- **Deliberately not generalised.** A table-driven "upgrade anything that looks old" rule would silently rewrite genuine user pins. Two adjacent narrow blocks is the intended shape; a third model needs a third block.
+- **Model ids were verified by querying the installed binaries, never from documentation.** `agy models` (with the SSH markers cleared) returns slugs — `gemini-3.6-flash-high`, `gemini-3.1-pro-high` — but the display names we ship still resolve, checked by round-tripping both forms. Gemini premium stays `Gemini 3.1 Pro (High)` because the inventory has **no 3.6 Pro**; only standard/economy move to 3.6 Flash. Codex `gpt-5.6-sol|terra|luna` and `claude-sonnet-5` each answered a live probe.
+- **Cost rates ship with the ids, not after them.** `calculate_session_cost` never calls `resolve_model_for_cost`, so a model absent from the catalog falls to the `*)` arm of `get_input_cost_per_1k` at 0.005/0.015 and is reported as a confident, wrong number — the trap documented at v2.25.0. Sonnet 5 is entered at its standard $3/$15 rate rather than the introductory $2/$10, which expires 2026-08-31; that slightly overstates for a few weeks and is exactly right afterwards.
+- **Qwen: two ids, two deployments, not a rename.** delegation-kit's snapshot said `GET /models` lists both `qwen3.8-max` and `qwen3.8-max-preview`. Verified live against a real Token Plan account: both are served **and each completion reports its own requested id back in `.model`**, so `-preview` is not an alias and is not silently served by `qwen3.8-max`. Both stay catalogued and both stay in `unpriced_models` — removing the preview entry is precisely what would drop an existing pin onto `default_rate`. Recorded in `docs/RECIPES.md`; the shipped premium Qwen model remains `qwen3.7-max` and the negative assertion in `test_suite.sh` keeps that contract self-documenting.
+- **Process note for the next stacked release.** `ci.yml` triggers on `pull_request: branches: [main]` with the default activity types, and a base-branch change fires `edited`, which is not among them — so a PR stacked on another branch never gets a server-side check until it is retargeted *and* reopened. Separately, `gh pr merge --delete-branch` on a stack base **closes** the child PR rather than retargeting it, and GitHub will neither retarget a closed PR nor reopen one whose base is gone; recovery meant pushing the base ref back from a commit still reachable in `main`. Adding `edited` to the workflow's activity types would close the first hole.
+
 ### v3.3.0
 - **Grok and Kimi compatibility is now established from capabilities, not inferred from an installed binary or its version string.** `grok_cli_supports_required_interface` validates the complete headless parser surface inside the same isolated HOME/CWD boundary used for dispatch, while `grok_cli_exposes_requested_model` verifies both usable authentication and the exact `GROK_MODEL` in the CLI inventory (`scripts/query_grok.sh:85-154`). Kimi similarly checks prompt mode, `stream-json`, the provider inventory, and `KIMI_MODEL` before any request (`scripts/query_kimi.sh:45-79`). Compatible future and vendor-custom versions therefore continue to work without a release-specific allowlist; an interface that cannot enforce the adapter's contract fails before a model call.
 - **The observed CLI version is provenance only.** Successful Grok and Kimi responses add `metadata.cli_version` and `metadata.cli_compatibility="capability-probed"`; the shared schema documents both fields without making either required for other transports (`scripts/query_grok.sh:319-336`, `scripts/query_kimi.sh:126-138`, `scripts/lib/schema.json:169-180`). This deliberately does not introduce a blessed-version range: the version is useful for diagnosis, while compatibility is decided by the exercised command, output, and model surfaces.

package/README.md

@@ -1,8 +1,8 @@
-# AI Consultants v3.3.0
+# AI Consultants v3.4.0
 
 > **Coverage, not a single guess.** A panel of up to 11 frontier models from different vendors fans out on your question in parallel and hands you the *union* of what they collectively see — the risks, edge cases, and approaches a single model misses.
 
-[![Version](https://img.shields.io/badge/version-3.3.0-blue.svg)](https://github.com/matteoscurati/ai-consultants)
+[![Version](https://img.shields.io/badge/version-3.4.0-blue.svg)](https://github.com/matteoscurati/ai-consultants)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](LICENSE)
 [![Claude Code Skill](https://img.shields.io/badge/Claude%20Code-Skill-orange.svg)](https://docs.anthropic.com/en/docs/claude-code/skills)
 [![GitHub stars](https://img.shields.io/github/stars/matteoscurati/ai-consultants?style=social)](https://github.com/matteoscurati/ai-consultants)
@@ -447,9 +447,9 @@ parallel and returns the coverage union.
 
 | Consultant | Premium | Standard | Economy |
 |------------|---------|----------|---------|
-| Claude | claude-opus-5 | claude-sonnet-4-6 | claude-haiku-4-5 |
-| Gemini | Gemini 3.1 Pro (High) | Gemini 3.5 Flash (High) | Gemini 3.5 Flash (Low) |
-| Codex | gpt-5.5 | gpt-5.4 | gpt-5.4-nano |
+| Claude | claude-opus-5 | claude-sonnet-5 | claude-haiku-4-5 |
+| Gemini | Gemini 3.1 Pro (High) | Gemini 3.6 Flash (High) | Gemini 3.6 Flash (Low) |
+| Codex | gpt-5.6-sol | gpt-5.6-terra | gpt-5.6-luna |
 | Mistral | mistral-large-3 | mistral-medium-latest | devstral-small-2 |
 | Cursor | composer-2.5 | composer-2 | gemini-3-flash |
 | DeepSeek | deepseek-v4-pro | deepseek-v4-flash | deepseek-v4-flash |

package/SKILL.md

@@ -5,10 +5,10 @@ license: MIT
 compatibility: Requires bash, jq, and at least 2 AI CLI tools (agy, codex, vibe, etc.). macOS and Linux.
 metadata:
   author: matteoscurati
-  version: 3.3.0
+  version: 3.4.0
 ---
 
-# AI Consultants v3.3.0 - AI Expert Panel
+# AI Consultants v3.4.0 - AI Expert Panel
 
 **Coverage, not a single guess.** Convene a panel of AI "consultants" from different vendors for coding questions: they fan out in parallel and you get the *union* of what they collectively see — the risks, edge cases, and approaches a single model misses. Each consultant has a **configurable persona** that decorrelates its analysis.
 

package/docs/COST_RATES.md

@@ -1,4 +1,4 @@
-# Cost Rates - AI Consultants v3.3.0
+# Cost Rates - AI Consultants v3.4.0
 
 This page documents the per-token rates used by the cost tracking system.
 
@@ -21,13 +21,13 @@ Since v2.5, models are organized into three tiers. Use `apply_model_tier()` or `
 | Model | Tier | Cost/1K | Consultant |
 |-------|------|---------|------------|
 | Gemini 3.1 Pro (High) | Premium | $0.002 | Gemini (agy CLI) |
-| Gemini 3.5 Flash (High) | Standard | $0.0015 | Gemini (agy CLI) |
-| Gemini 3.5 Flash (Low) | Economy | $0.0015 | Gemini (agy CLI) |
-| gpt-5.5 | Premium | $0.005 | Codex |
-| gpt-5.4 | Standard | $0.0025 | Codex |
-| gpt-5.4-nano | Economy | $0.0002 | Codex |
+| Gemini 3.6 Flash (High) | Standard | $0.0015 | Gemini (agy CLI) |
+| Gemini 3.6 Flash (Low) | Economy | $0.0015 | Gemini (agy CLI) |
+| gpt-5.6-sol | Premium | $0.005 | Codex |
+| gpt-5.6-terra | Standard | $0.002 | Codex |
+| gpt-5.6-luna | Economy | $0.0002 | Codex |
 | claude-opus-5 | Premium | $0.005 | Claude |
-| claude-sonnet-4-6 | Standard | $0.003 | Claude |
+| claude-sonnet-5 | Standard | $0.003 | Claude |
 | claude-haiku-4-5 | Economy | $0.001 | Claude |
 | mistral-large-3 | Premium | $0.002 | Mistral |
 | mistral-medium-latest | Standard | $0.001 | Mistral |
@@ -54,13 +54,13 @@ Since v2.5, models are organized into three tiers. Use `apply_model_tier()` or `
 | Model | Tier | Cost/1K | Consultant |
 |-------|------|---------|------------|
 | Gemini 3.1 Pro (High) | Premium | $0.012 | Gemini (agy CLI) |
-| Gemini 3.5 Flash (High) | Standard | $0.009 | Gemini (agy CLI) |
-| Gemini 3.5 Flash (Low) | Economy | $0.009 | Gemini (agy CLI) |
-| gpt-5.5 | Premium | $0.030 | Codex |
-| gpt-5.4 | Standard | $0.015 | Codex |
-| gpt-5.4-nano | Economy | $0.00125 | Codex |
+| Gemini 3.6 Flash (High) | Standard | $0.0075 | Gemini (agy CLI) |
+| Gemini 3.6 Flash (Low) | Economy | $0.0075 | Gemini (agy CLI) |
+| gpt-5.6-sol | Premium | $0.030 | Codex |
+| gpt-5.6-terra | Standard | $0.012 | Codex |
+| gpt-5.6-luna | Economy | $0.0012 | Codex |
 | claude-opus-5 | Premium | $0.025 | Claude |
-| claude-sonnet-4-6 | Standard | $0.015 | Claude |
+| claude-sonnet-5 | Standard | $0.015 | Claude |
 | claude-haiku-4-5 | Economy | $0.005 | Claude |
 | mistral-large-3 | Premium | $0.006 | Mistral |
 | mistral-medium-latest | Standard | $0.003 | Mistral |

package/docs/RECIPES.md

@@ -190,28 +190,38 @@ For every available variable and its default, see
 [`references/configuration.md`](../references/configuration.md). The executable
 source of truth is [`scripts/config.sh`](../scripts/config.sh).
 
-## Qwen via Qwen Cloud Token Plan (opt-in, preview)
+## Qwen via Qwen Cloud Token Plan (opt-in)
 
-`qwen3.8-max-preview` is **not** served by DashScope/ModelStudio. It is reachable
+`qwen3.8-max` is **not** served by DashScope/ModelStudio. It is reachable
 only through a Qwen Cloud **Token Plan** subscription, which has its own base URL
 and its own API key. This is opt-in: nothing below is a default, and the panel's
 premium Qwen model remains `qwen3.7-max`.
 
 Understand the tradeoffs before enabling it:
 
-- **Preview, not GA.** Alibaba describes it as continuously evolving. No open
-  weights, no published benchmarks, no stable per-token price.
+- **Token Plan only.** No open weights, no published benchmarks, no stable
+  per-token price.
 - **Billed in prepaid credits**, not per token — and credit consumption varies
   with reasoning depth. Cost reports therefore exclude it and say so explicitly
   rather than estimating a figure.
 
+Both `qwen3.8-max` and `qwen3.8-max-preview` are served by Token Plan and are
+**separate deployments**, not an alias or rename: each completion reports its
+own requested id back in `.model`. Verified against the live endpoint on
+2026-08-05. Prefer `qwen3.8-max`; `qwen3.8-max-preview` is the older
+deployment and the natural candidate for eventual retirement. An existing
+`qwen3.8-max-preview` pin keeps working and stays correctly catalogued — both
+ids are listed in `unpriced_models`, so the session report continues to
+disclose them as credit-billed and excluded from the total rather than falling
+through to `default_rate`.
+
 ### API mode (the effort knob works here)
 
 ```bash
 QWEN3_USE_API=true
 QWEN3_FORMAT=openai      # Token Plan is OpenAI-compatible; DashScope is not
 QWEN3_API_URL=https://token-plan.ap-southeast-1.maas.aliyuncs.com/compatible-mode/v1/chat/completions
-QWEN3_MODEL=qwen3.8-max-preview
+QWEN3_MODEL=qwen3.8-max
 QWEN3_API_KEY=<your Token Plan key>
 QWEN3_REASONING_EFFORT=high    # none|minimal|low|medium|high|xhigh|max; default xhigh
 ```
@@ -240,8 +250,8 @@ ai-consultants cannot deliver it per call and warns if you set
   "modelProviders": {
     "openai": [
       {
-        "id": "qwen3.8-max-preview",
-        "name": "[Token Plan] qwen3.8-max-preview",
+        "id": "qwen3.8-max",
+        "name": "[Token Plan] qwen3.8-max",
         "baseUrl": "https://token-plan.ap-southeast-1.maas.aliyuncs.com/compatible-mode/v1",
         "envKey": "BAILIAN_TOKEN_PLAN_API_KEY",
         "generationConfig": { "reasoning": { "effort": "high" } }

package/docs/cost_rates.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.4.0",
   "updated": "2026-07-25",
   "models": {
     "_comment_units": "All rates are USD per 1,000 tokens (per-1K). lib/costs.sh computes cost as (token_count / 1000) * rate, so every value here MUST be a per-1K rate = (provider $/1M price) / 1000. Do NOT paste $/MTok figures directly.",
@@ -17,18 +17,26 @@
       "input": 0.002,
       "output": 0.012
     },
-    "Gemini 3.5 Flash (High)": {
+    "Gemini 3.6 Flash (High)": {
       "input": 0.0015,
-      "output": 0.009
+      "output": 0.0075
     },
-    "Gemini 3.5 Flash (Low)": {
+    "Gemini 3.6 Flash (Low)": {
       "input": 0.0015,
-      "output": 0.009
+      "output": 0.0075
     },
-    "gpt-5.5": {
+    "gpt-5.6-sol": {
       "input": 0.005,
       "output": 0.030
     },
+    "gpt-5.6-terra": {
+      "input": 0.002,
+      "output": 0.012
+    },
+    "gpt-5.6-luna": {
+      "input": 0.0002,
+      "output": 0.0012
+    },
     "mistral-large-3": {
       "input": 0.002,
       "output": 0.006
@@ -75,7 +83,7 @@
       "output": 0.00
     },
     "_comment_standard": "Standard tier models",
-    "claude-sonnet-4-6": {
+    "claude-sonnet-5": {
       "input": 0.003,
       "output": 0.015
     },
@@ -137,6 +145,30 @@
       "output": 0.001
     },
     "_comment_legacy": "Legacy models for backwards compatibility",
+    "Gemini 3.5 Flash (High)": {
+      "input": 0.0015,
+      "output": 0.009
+    },
+    "Gemini 3.5 Flash (Low)": {
+      "input": 0.0015,
+      "output": 0.009
+    },
+    "gpt-5.5": {
+      "input": 0.005,
+      "output": 0.030
+    },
+    "gpt-5.4": {
+      "input": 0.0025,
+      "output": 0.015
+    },
+    "gpt-5.4-nano": {
+      "input": 0.0002,
+      "output": 0.00125
+    },
+    "claude-sonnet-4-6": {
+      "input": 0.003,
+      "output": 0.015
+    },
     "claude-opus-4-8": {
       "input": 0.005,
       "output": 0.025
@@ -289,14 +321,6 @@
       "input": 0.0003,
       "output": 0.0015
     },
-    "gpt-5.4": {
-      "input": 0.0025,
-      "output": 0.015
-    },
-    "gpt-5.4-nano": {
-      "input": 0.0002,
-      "output": 0.00125
-    },
     "composer-2.5": {
       "input": 0.0005,
       "output": 0.0025
@@ -326,19 +350,24 @@
       "output": 0.0025
     },
     "_comment_unpriced": "Credit-billed models: drawn from a prepaid subscription pool, with no published per-token price. Rated 0 so the estimator does not fabricate a figure - an absent model would otherwise fall through to default_rate (0.005/0.015) and be reported as a confident, wrong number. Every entry here must also be listed in unpriced_models, which is what makes the session report disclose the exclusion instead of implying the model was free.",
+    "qwen3.8-max": {
+      "input": 0,
+      "output": 0
+    },
     "qwen3.8-max-preview": {
       "input": 0,
       "output": 0
     }
   },
   "unpriced_models": [
+    "qwen3.8-max",
     "qwen3.8-max-preview"
   ],
   "consultant_fallbacks": {
-    "_comment": "Premium defaults - Updated Jul 2026",
+    "_comment": "Premium defaults - Updated Aug 2026",
     "claude": "claude-opus-5",
     "gemini": "Gemini 3.1 Pro (High)",
-    "codex": "gpt-5.5",
+    "codex": "gpt-5.6-sol",
     "mistral": "mistral-large-3",
     "deepseek": "deepseek-v4-pro",
     "glm": "glm-5.2",
@@ -353,7 +382,7 @@
     "premium": {
       "claude": "claude-opus-5",
       "gemini": "Gemini 3.1 Pro (High)",
-      "codex": "gpt-5.5",
+      "codex": "gpt-5.6-sol",
       "mistral": "mistral-large-3",
       "deepseek": "deepseek-v4-pro",
       "glm": "glm-5.2",
@@ -364,9 +393,9 @@
       "minimax": "minimax-m2.7"
     },
     "standard": {
-      "claude": "claude-sonnet-4-6",
-      "gemini": "Gemini 3.5 Flash (High)",
-      "codex": "gpt-5.4",
+      "claude": "claude-sonnet-5",
+      "gemini": "Gemini 3.6 Flash (High)",
+      "codex": "gpt-5.6-terra",
       "mistral": "mistral-medium-latest",
       "deepseek": "deepseek-v4-flash",
       "glm": "glm-5.2",
@@ -378,8 +407,8 @@
     },
     "economy": {
       "claude": "claude-haiku-4-5",
-      "gemini": "Gemini 3.5 Flash (Low)",
-      "codex": "gpt-5.4-nano",
+      "gemini": "Gemini 3.6 Flash (Low)",
+      "codex": "gpt-5.6-luna",
       "mistral": "devstral-small-2",
       "deepseek": "deepseek-v4-flash",
       "glm": "glm-4-flash",

package/docs/releases/v3.4.0.md

@@ -0,0 +1,102 @@
+# Release v3.4.0
+
+**Date:** 2026-08-05
+**Type:** Minor — Gemini works over SSH again, the Codex consultant is isolated, and the model catalog moves to the current generation
+**Previous:** v3.3.0
+
+## Highlights
+
+- **Gemini consultations from an SSH session were failing authentication, and re-signing-in could not fix it.** Now fixed at every `agy` call site.
+- **The Codex consultant no longer inherits your local Codex environment** — no `config.toml`, no `AGENTS.md`, no hooks, no MCP servers, and a read-only sandbox.
+- **Model catalog refreshed** to `gpt-5.6-sol/terra/luna`, `claude-sonnet-5`, and Gemini 3.6 Flash, every id verified against the installed CLIs rather than documentation.
+- **`*_REASONING_EFFORT` actually works now.** It was honored in API mode only, which meant it did nothing in the default CLI-first configuration.
+- **Existing installations receive the new Codex model.** Without the migration added here, they would have kept querying `gpt-5.5` indefinitely while every doc claimed otherwise.
+
+## What's New
+
+### Gemini authentication over SSH
+
+The Antigravity CLI picks its credential store from the environment. When it sees any of `SSH_CLIENT`, `SSH_CONNECTION`, or `SSH_TTY`, it switches to a file-based token store and never consults the macOS Keychain. If you signed in locally — as almost everyone does — the credential lives in the Keychain, so every Gemini consultation over SSH failed to authenticate. Signing in again did not help: the new login also landed in the store the CLI had already decided to ignore.
+
+Those three markers are now stripped for every `agy` invocation: consultations, `doctor`, `update-clis`, and synthesis. On a local session they are already unset, so this changes nothing there. It grants no additional tools and no filesystem access — only which credential store the CLI consults.
+
+If you drive ai-consultants over SSH, this is the release that makes Gemini work.
+
+### The Codex consultant runs isolated
+
+Previously the Codex adapter ran `codex exec` in your ambient environment. That meant your `~/.codex/config.toml`, the repository's `AGENTS.md`, your hooks, your MCP servers, and your execpolicy rules all shaped what is supposed to be an independent second opinion — and the sandbox was unpinned.
+
+CLI mode now runs under an ephemeral HOME and working directory with `--ephemeral`, `--ignore-user-config`, `--ignore-rules`, and `-s read-only`. **Authentication is unaffected**: `CODEX_HOME` still resolves to your real Codex auth store.
+
+Two side effects worth knowing:
+
+- **Large contexts no longer break it.** The prompt is delivered on stdin rather than argv, which removes both the `ARG_MAX` ceiling and the exposure of your prompt in the process list.
+- **Failures are reported as failures.** A timeout, authentication error, or exhausted retry is never rewritten into a success, even when a partial answer reached disk.
+
+### Reasoning effort works in CLI mode
+
+`*_REASONING_EFFORT` was documented as API-mode only. Since CLI-first transport became mandatory in v2.21, that meant the setting did nothing at all in the default configuration — while three consultant CLIs did expose the control.
+
+| Consultant | Variable | Passed as |
+|---|---|---|
+| Codex | `CODEX_REASONING_EFFORT` | `-c model_reasoning_effort=<value>` |
+| Claude | `CLAUDE_REASONING_EFFORT` | `--effort <value>` |
+| Gemini | `GEMINI_REASONING_EFFORT` | `--effort <value>` |
+
+There is deliberately no local allowlist of accepted values. The enum belongs to the provider — `agy`, for instance, accepts only `low|medium|high` — and an unsupported value comes back as a diagnosed error rather than being silently pre-empted. Consultants whose CLI has no such flag still warn, as before.
+
+All three are optional. Leave them unset and each CLI keeps its own default.
+
+### Model catalog
+
+Every replacement id was verified live against the installed CLIs:
+
+| Consultant | Premium | Standard | Economy |
+|---|---|---|---|
+| Codex | `gpt-5.6-sol` | `gpt-5.6-terra` | `gpt-5.6-luna` |
+| Claude | `claude-opus-5` *(unchanged)* | `claude-sonnet-5` | `claude-haiku-4-5` *(unchanged)* |
+| Gemini | `Gemini 3.1 Pro (High)` *(unchanged)* | `Gemini 3.6 Flash (High)` | `Gemini 3.6 Flash (Low)` |
+
+Gemini's premium tier stays on 3.1 Pro because the live model inventory has no 3.6 Pro. Cost rates ship alongside the new ids — a model missing from the catalog would otherwise be billed at the fallback rate and reported as a confident, wrong figure. Superseded ids remain catalogued so pinned configurations and historical responses still resolve.
+
+The opt-in Qwen Token Plan model is referenced as `qwen3.8-max`. Both it and `qwen3.8-max-preview` are still served by Token Plan, and they are separate deployments rather than aliases — each reports its own id back. Both stay catalogued, so an existing `-preview` pin keeps working and keeps its credit-billed cost disclosure. The shipped premium Qwen model remains `qwen3.7-max`.
+
+### Existing installations get the new Codex model
+
+`init` copies `.env.example` verbatim, so the then-current Codex default was written into your config as an ordinary value — and `configure` reads any unmarked value as a deliberate pin. A catalog refresh alone would therefore never have reached you: your panel would have kept querying `gpt-5.5` while the docs, tier tables, and cost catalog all said `gpt-5.6-sol`.
+
+`configure` now migrates that one exact historical value and marks it as managed, so future refreshes can reach it too. **An explicit pin is preserved** — if you deliberately want `gpt-5.5`, record it with `--set CODEX_MODEL=gpt-5.5` and it will survive.
+
+## Breaking Changes
+
+None. All new parameters are additive, existing configurations migrate, and no consultant is added or removed.
+
+Two behavior changes are worth noting even though nothing breaks:
+
+- **Codex answers may differ**, because it no longer sees your local Codex configuration. That is the intent — an advisory consultation shaped by your own hooks and project instructions is not an independent opinion.
+- **Codex and Gemini tier models changed.** Pin `CODEX_MODEL` / `GEMINI_MODEL` explicitly if you need the previous ones.
+
+## Upgrade Guide
+
+```bash
+# If installed via npx, nothing to do — npx resolves the published version
+npx ai-consultants "your question"
+
+# If installed via git clone
+cd ~/.claude/skills/ai-consultants && git pull
+
+# If installed via curl | bash
+curl -fsSL https://raw.githubusercontent.com/matteoscurati/ai-consultants/main/scripts/install.sh | bash
+```
+
+Then, to pick up the new Codex default in an existing configuration:
+
+```bash
+ai-consultants configure
+```
+
+No other configuration changes are required. Run `ai-consultants doctor --live` afterwards to confirm each consultant actually answers — the static check only verifies that CLIs are installed and keys are present.
+
+## Contributors
+
+- @matteoscurati

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-consultants",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "A harness for every question - a panel of up to 11 AI models that picks its own deliberation strategy per question (convergence, adversarial verification, tournament) and checks its work before answering",
   "bin": {
     "ai-consultants": "bin/ai-consultants"

package/references/configuration.md

@@ -239,7 +239,7 @@ ENABLE_DEEPSEEK=false
 
 ```bash
 GEMINI_MODEL=Gemini 3.1 Pro (High)   # agy CLI display name; API mode uses GEMINI_API_MODEL
-CODEX_MODEL=gpt-5.5
+CODEX_MODEL=gpt-5.6-sol
 CLAUDE_MODEL=claude-opus-5
 CLAUDE_API_MAX_TOKENS=16384  # API only: adaptive thinking + visible output
 MISTRAL_MODEL=mistral-large-3

package/scripts/config.sh

@@ -144,8 +144,8 @@ export GEMINI_USE_API
 # CODEX CONFIGURATION - The Pragmatist
 # =============================================================================
 
-# Model: "gpt-5.5" (default), "gpt-5.4", "gpt-5.4-nano", "gpt-5.3-codex", etc.
-CODEX_MODEL="${CODEX_MODEL:-gpt-5.5}"
+# Model: "gpt-5.6-sol" (default), "gpt-5.6-terra", "gpt-5.6-luna", etc.
+CODEX_MODEL="${CODEX_MODEL:-gpt-5.6-sol}"
 CODEX_TIMEOUT_SECONDS="${CODEX_TIMEOUT:-180}"
 CODEX_CMD="${CODEX_CMD:-codex}"
 
@@ -584,7 +584,7 @@ get_model_for_tier() {
             case "$consultant" in
                 claude)   echo "claude-opus-5" ;;
                 gemini)   echo "Gemini 3.1 Pro (High)" ;;
-                codex)    echo "gpt-5.5" ;;
+                codex)    echo "gpt-5.6-sol" ;;
                 mistral)  echo "mistral-large-3" ;;
                 cursor)   echo "composer-2.5" ;;
                 deepseek) echo "deepseek-v4-pro" ;;
@@ -598,9 +598,9 @@ get_model_for_tier() {
             ;;
         standard|medium|balanced)
             case "$consultant" in
-                claude)   echo "claude-sonnet-4-6" ;;
-                gemini)   echo "Gemini 3.5 Flash (High)" ;;
-                codex)    echo "gpt-5.4" ;;
+                claude)   echo "claude-sonnet-5" ;;
+                gemini)   echo "Gemini 3.6 Flash (High)" ;;
+                codex)    echo "gpt-5.6-terra" ;;
                 mistral)  echo "mistral-medium-latest" ;;
                 cursor)   echo "composer-2" ;;
                 deepseek) echo "deepseek-v4-flash" ;;
@@ -615,8 +615,8 @@ get_model_for_tier() {
         economy|fast|quick)
             case "$consultant" in
                 claude)   echo "claude-haiku-4-5" ;;
-                gemini)   echo "Gemini 3.5 Flash (Low)" ;;
-                codex)    echo "gpt-5.4-nano" ;;
+                gemini)   echo "Gemini 3.6 Flash (Low)" ;;
+                codex)    echo "gpt-5.6-luna" ;;
                 mistral)  echo "devstral-small-2" ;;
                 cursor)   echo "gemini-3-flash" ;;
                 deepseek) echo "deepseek-v4-flash" ;;
@@ -779,4 +779,4 @@ EOF
 # VERSION
 # =============================================================================
 
-AI_CONSULTANTS_VERSION="3.3.0"
+AI_CONSULTANTS_VERSION="3.4.0"

package/scripts/configure.sh

@@ -285,6 +285,15 @@ if [[ "$(read_value "$WORK_FILE" CLAUDE_MODEL 2>/dev/null || true)" == "claude-o
     echo "Migrated managed Claude default: claude-opus-4-8 -> claude-opus-5" >&2
 fi
 
+# Same shape for Codex: `init` once wrote gpt-5.5 as an unmarked value, so
+# configure treated it as a deliberate pin and never reached gpt-5.6-sol. A
+# real pin is preserved by `--set CODEX_MODEL=gpt-5.5`.
+if [[ "$(read_value "$WORK_FILE" CODEX_MODEL 2>/dev/null || true)" == "gpt-5.5" ]] \
+    && ! has_value_marker "$WORK_FILE" CODEX_MODEL "$PIN_MARKER"; then
+    set_value CODEX_MODEL "gpt-5.6-sol $DEFAULT_MARKER"
+    echo "Migrated managed Codex default: gpt-5.5 -> gpt-5.6-sol" >&2
+fi
+
 configure_cli_only() {
     local enable_key="$1" cmd_key="$2" cmd enabled=false
     cmd=$(effective_input_value "$cmd_key")

package/scripts/doctor.sh

@@ -242,9 +242,15 @@ check_cli_consultant() {
         return 0
     fi
 
-    # Get version (--version is standard and fast, no timeout needed)
+    # Get version (--version is standard and fast, no timeout needed).
+    # Gemini/agy must run under agy_env so an SSH session still reaches the
+    # Keychain credential store (see agy_env in lib/common.sh).
     local version
-    version=$("$cmd" --version 2>/dev/null | head -1 || echo "")
+    if [[ "$name" == "Gemini" ]]; then
+        version=$(agy_env "$cmd" --version 2>/dev/null | head -1 || echo "")
+    else
+        version=$("$cmd" --version 2>/dev/null | head -1 || echo "")
+    fi
 
     if [[ -n "$version" ]]; then
         _print "  ✓ $name: $version"

package/scripts/lib/api.sh

@@ -188,7 +188,7 @@ build_qwen_request() {
 #   'reasoning_effort' must be one of: 'none', 'minimal', 'low', 'medium',
 #   'high', 'xhigh', 'max'
 # Note this is WIDER than the low|high|xhigh that the public write-ups for
-# qwen3.8-max-preview all reported — 'minimal', 'medium' and 'max' are accepted
+# qwen3.8-max all reported — 'minimal', 'medium' and 'max' are accepted
 # by the model too. Taken from the API rather than from documentation for
 # exactly that reason.
 #
@@ -196,7 +196,7 @@ build_qwen_request() {
 # facts in shell is what produced the stale-model bugs this release also fixes,
 # and the same builder serves GLM/Grok/DeepSeek/MiniMax. An unsupported
 # combination is rejected by the provider with a 400 that run_api_query
-# surfaces without retrying — e.g. 'none' on qwen3.8-max-preview returns "The
+# surfaces without retrying — e.g. 'none' on qwen3.8-max returns "The
 # value of the enable_thinking parameter is restricted to True", which is a
 # model fact, not a syntax error.
 validate_reasoning_effort() {
@@ -248,7 +248,7 @@ build_openai_request() {
 # Usage: build_anthropic_request <prompt> <model> [max_tokens]
 build_anthropic_request() {
     local prompt="$1"
-    local model="${2:-claude-sonnet-4-6}"
+    local model="${2:-claude-sonnet-5}"
     local max_tokens="${3:-16384}"
 
     jq -n \

package/scripts/lib/common.sh

@@ -140,6 +140,29 @@ check_command() {
     return 0
 }
 
+# Run a command with SSH session markers stripped from the environment.
+#
+# WHY (do not "simplify" this away): the Antigravity CLI (`agy`, our Gemini
+# transport) picks its credential store from the environment. When it sees any
+# of SSH_CLIENT, SSH_CONNECTION, or SSH_TTY it switches to a file-based token
+# store and never consults the macOS Keychain. A user who signed in locally has
+# credentials only in the Keychain, so every `agy` call from an SSH session
+# fails auth — and re-signing-in does not help, because the new login also lands
+# in the Keychain the CLI has already decided to ignore. Clearing the three
+# markers for the `agy` process restores Keychain lookup. On a local (non-SSH)
+# session they are already unset, so this is a pure no-op there. It grants no
+# extra tools or filesystem access; it only changes which credential store the
+# CLI consults.
+#
+# AGY_ENV_PREFIX is the exec-safe form (external `env` binary) for use under
+# run_with_timeout / GNU timeout, which cannot invoke shell functions. agy_env
+# is the same-shell convenience wrapper. Keep both in lockstep via this array.
+#
+# Usage (same shell):  agy_env <command> [args...]
+# Usage (under timeout / command arrays):  "${AGY_ENV_PREFIX[@]}" <command> [args...]
+AGY_ENV_PREFIX=(env -u SSH_CLIENT -u SSH_CONNECTION -u SSH_TTY)
+agy_env() { "${AGY_ENV_PREFIX[@]}" "$@"; }
+
 # =============================================================================
 # MAIN QUERY EXECUTION FUNCTION
 # =============================================================================
@@ -149,8 +172,9 @@ check_command() {
 # Usage: run_query <consultant_name> <output_file> <timeout_sec> <command...>
 #
 # The query is passed via stdin to the command.
+# Use the exec-safe array form under run_query (agy_env is same-shell only).
 # Example:
-#   echo "$QUERY" | run_query "Gemini" "/tmp/out.json" 120 agy -p - --model "Gemini 3.1 Pro (High)"
+#   echo "$QUERY" | run_query "Gemini" "/tmp/out.json" 120 "${AGY_ENV_PREFIX[@]}" agy -p "..." --model "Gemini 3.1 Pro (High)"
 #
 run_query() {
     local consultant_name="$1"
@@ -485,7 +509,7 @@ warn_effort_ignored_in_cli() {
     if is_api_mode "$agent"; then
         return 0
     fi
-    log_warn "[$agent] $var is ignored in CLI mode - no consultant CLI exposes a reasoning-effort flag. Set it in the CLI's own configuration, or switch this consultant to API mode."
+    log_warn "[$agent] $var is ignored in CLI mode - this consultant's CLI does not expose a reasoning-effort flag. Set it in the CLI's own configuration, or switch this consultant to API mode."
 }
 
 # Log API mode status for debugging
@@ -1311,7 +1335,8 @@ build_synthesis_args() {
             # stdin and "-" is not a stdin sentinel. A prior `-p -` made agy answer
             # a literal "-" with a generic greeting -> unparseable synthesis ->
             # manual_review. Pass the prompt directly, mirroring query_gemini.sh.
-            SYNTHESIS_ARGS=("${GEMINI_CMD:-agy}" "-p" "$prompt")
+            # AGY_ENV_PREFIX is exec-safe under timeout (see agy_env above).
+            SYNTHESIS_ARGS=("${AGY_ENV_PREFIX[@]}" "${GEMINI_CMD:-agy}" "-p" "$prompt")
             local model="${SYNTHESIS_MODEL:-${GEMINI_MODEL:-}}"
             [[ -n "$model" ]] && SYNTHESIS_ARGS+=("--model" "$model")
             ;;

package/scripts/query_claude.sh

@@ -9,6 +9,7 @@
 #   CLAUDE_USE_API - Use API mode instead of CLI (default: false)
 #   CLAUDE_API_MAX_TOKENS - API thinking + visible-output budget (default: 16384)
 #   ANTHROPIC_API_KEY - API key for API mode
+#   CLAUDE_REASONING_EFFORT - Optional CLI/API reasoning effort
 #   ENABLE_PERSONA - Enable "The Synthesizer" persona (default: true)
 
 set -euo pipefail
@@ -64,21 +65,41 @@ if is_api_mode "claude"; then
     else
         exit_code=$?
     fi
-warn_effort_ignored_in_cli "Claude"
 else
     # --- CLI Mode ---
     log_api_mode_status "claude"
     check_command "$CLAUDE_CMD" "Claude CLI" "Visit https://docs.anthropic.com/en/docs/claude-code" || exit 1
 
-    # JSON output exposes provider-measured usage and cost. In particular,
-    # output_tokens includes adaptive thinking that is absent from .result.
-    echo "$FULL_QUERY" | run_query \
-        "Claude" \
-        "$TEMP_OUTPUT" \
-        "$CLAUDE_TIMEOUT_SECONDS" \
-        "$CLAUDE_CMD" --print --model "$MODEL_USED" --output-format json
+    # Optional CLI effort control. Unset leaves the CLI's own default alone;
+    # when set, pass --effort through after the shared validation gate. Do not
+    # invent a local allowlist — the provider rejects what it does not accept.
+    CLAUDE_ARGS=("$CLAUDE_CMD" --print --model "$MODEL_USED" --output-format json)
+    effort_ok=true
+    if [[ -n "${CLAUDE_REASONING_EFFORT:-}" ]]; then
+        source "$SCRIPT_DIR/lib/api.sh"
+        if ! cli_effort=$(validate_reasoning_effort "$CLAUDE_REASONING_EFFORT" "$CONSULTANT_NAME"); then
+            effort_ok=false
+            exit_code=1
+        else
+            CLAUDE_ARGS+=(--effort "$cli_effort")
+        fi
+    fi
 
-    exit_code=$?
+    if [[ "$effort_ok" == "true" ]]; then
+        # JSON output exposes provider-measured usage and cost. In particular,
+        # output_tokens includes adaptive thinking that is absent from .result.
+        # Keep failures inside an explicit conditional so `set -e` cannot skip
+        # exit_code assignment (same guard as the API branch).
+        if echo "$FULL_QUERY" | run_query \
+                "Claude" \
+                "$TEMP_OUTPUT" \
+                "$CLAUDE_TIMEOUT_SECONDS" \
+                "${CLAUDE_ARGS[@]}"; then
+            exit_code=0
+        else
+            exit_code=$?
+        fi
+    fi
 fi
 
 # --- Calculate latency ---

package/scripts/query_codex.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
-# query_codex.sh - Query OpenAI Codex CLI or API (v2.6 with API mode support)
+# query_codex.sh - Query OpenAI Codex CLI or API (isolated CLI runtime)
 #
 # Usage: ./query_codex.sh "question" [context_file] [output_file]
 #
 # Environment variables:
-#   CODEX_MODEL - Model to use (default: gpt-5.3-codex)
+#   CODEX_MODEL - Model to use (default: gpt-5.6-sol)
 #   CODEX_TIMEOUT - Timeout in seconds (default: 180)
 #   CODEX_USE_API - Use API mode instead of CLI (default: false)
 #   OPENAI_API_KEY - API key for API mode
+#   CODEX_REASONING_EFFORT - Optional CLI/API reasoning effort
 #   ENABLE_PERSONA - Enable "The Pragmatist" persona (default: true)
 
 set -euo pipefail
@@ -39,6 +40,22 @@ START_TIME=$(get_timestamp_ms)
 
 # --- Execution (CLI or API mode) ---
 TEMP_OUTPUT=$(mktemp)
+CODEX_RUNTIME_DIR=""
+exit_code=1
+
+cleanup() {
+    rm -f "$TEMP_OUTPUT" "${TEMP_OUTPUT}.err"
+
+    # CODEX_RUNTIME_DIR is always created by this script under the system temp
+    # directory. Validate the prefix before recursive cleanup so an unexpected
+    # empty or overridden value can never widen the deletion target.
+    local temp_prefix="${TMPDIR:-/tmp}"
+    temp_prefix="${temp_prefix%/}/ai-consultants-codex."
+    if [[ -n "$CODEX_RUNTIME_DIR" && "$CODEX_RUNTIME_DIR" == "$temp_prefix"* ]]; then
+        rm -rf -- "$CODEX_RUNTIME_DIR"
+    fi
+}
+trap cleanup EXIT
 
 if is_api_mode "codex"; then
     # --- API Mode ---
@@ -61,26 +78,104 @@ if is_api_mode "codex"; then
     else
         exit_code=$?
     fi
-warn_effort_ignored_in_cli "Codex"
 else
-    # --- CLI Mode ---
+    # --- CLI Mode (isolated HOME/CWD; auth via real CODEX_HOME) ---
     log_api_mode_status "codex"
     check_command "$CODEX_CMD" "Codex CLI" "npm install -g @openai/codex" || exit 1
 
-    # Build command
-    CMD_ARGS=("$CODEX_CMD" "exec" "--skip-git-repo-check")
-    if [[ -n "$CODEX_MODEL" ]]; then
-        CMD_ARGS+=("-m" "$CODEX_MODEL")
+    # Resolve the real Codex home BEFORE overriding HOME. --ignore-user-config
+    # skips config.toml but auth still resolves through CODEX_HOME; repointing
+    # it at the isolated home would break authentication.
+    real_codex_home="${CODEX_HOME:-${HOME}/.codex}"
+
+    runtime_base="${TMPDIR:-/tmp}"
+    runtime_base="${runtime_base%/}"
+    CODEX_RUNTIME_DIR=$(mktemp -d "$runtime_base/ai-consultants-codex.XXXXXX")
+    chmod 700 "$CODEX_RUNTIME_DIR"
+
+    isolated_home="$CODEX_RUNTIME_DIR/home"
+    isolated_cwd="$CODEX_RUNTIME_DIR/workspace"
+    prompt_file="$CODEX_RUNTIME_DIR/prompt.txt"
+    payload_file="$CODEX_RUNTIME_DIR/payload.txt"
+    mkdir -p "$isolated_home" "$isolated_cwd"
+    chmod 700 "$isolated_home" "$isolated_cwd"
+    printf '%s' "$FULL_QUERY" > "$prompt_file"
+    : > "$payload_file"
+    chmod 600 "$prompt_file" "$payload_file"
+
+    cli_effort=""
+    effort_ok=true
+    if [[ -n "${CODEX_REASONING_EFFORT:-}" ]]; then
+        # Keep the existing validate_reasoning_effort gate; pass the value
+        # through and let the CLI reject what it does not accept.
+        source "$SCRIPT_DIR/lib/api.sh"
+        if ! cli_effort=$(validate_reasoning_effort "$CODEX_REASONING_EFFORT" "$CONSULTANT_NAME"); then
+            effort_ok=false
+            exit_code=1
+        fi
     fi
 
-    # Codex uses query as the last argument, not from stdin
-    run_query \
-        "Codex" \
-        "$TEMP_OUTPUT" \
-        "$CODEX_TIMEOUT_SECONDS" \
-        "${CMD_ARGS[@]}" "$FULL_QUERY" < /dev/null
-
-    exit_code=$?
+    if [[ "$effort_ok" == "true" ]]; then
+        # Isolated Codex headless contract (verified against codex-cli 0.146.0):
+        #   HOME is ephemeral so ambient ~/.codex config, hooks, MCP, and
+        #   project instructions stay outside the consultation.
+        #   CODEX_HOME stays on the real auth store.
+        #   --ignore-user-config is safe here only because we pin the model with
+        #   -m. It also makes Codex ignore any -p <profile>, which is why we
+        #   must not add -p.
+        #   -s read-only: the consultant answers; it never edits.
+        #   -C points at an empty temp dir so the host repo's AGENTS.md stays out
+        #   (build_context.sh already inlined the relevant files into FULL_QUERY).
+        #   trailing - reads the prompt from stdin (no ARG_MAX / process-list).
+        #   -o writes the final agent message to a private payload file.
+        CMD_ARGS=(
+            env
+            HOME="$isolated_home"
+            CODEX_HOME="$real_codex_home"
+            "$CODEX_CMD"
+            exec
+            --ephemeral
+            --ignore-user-config
+            --ignore-rules
+            --skip-git-repo-check
+            -m "$CODEX_MODEL"
+            -s read-only
+            -C "$isolated_cwd"
+            -o "$payload_file"
+        )
+
+        if [[ -n "$cli_effort" ]]; then
+            CMD_ARGS+=("-c" "model_reasoning_effort=${cli_effort}")
+        fi
+
+        CMD_ARGS+=("-")
+
+        # run_query buffers stdin once and replays it on each retry.
+        if run_query \
+                "Codex" \
+                "$TEMP_OUTPUT" \
+                "$CODEX_TIMEOUT_SECONDS" \
+                "${CMD_ARGS[@]}" < "$prompt_file"; then
+            exit_code=0
+        else
+            exit_code=$?
+        fi
+
+        # Prefer the -o payload over stdout only when the run succeeded.
+        # A non-empty payload must never rewrite a timeout, auth error, or
+        # exhausted-retry into success — a partial answer would enter synthesis
+        # as a healthy consultation. Exit 0 with an empty payload remains a
+        # diagnosed failure.
+        if [[ $exit_code -eq 0 ]]; then
+            if [[ -s "$payload_file" ]]; then
+                cp "$payload_file" "$TEMP_OUTPUT"
+            else
+                exit_code=1
+                log_warn "[$CONSULTANT_NAME] Codex wrote an empty last-message payload"
+                printf 'Codex wrote an empty last-message payload\n' > "${TEMP_OUTPUT}.err"
+            fi
+        fi
+    fi
 fi
 
 # --- Calculate latency ---
@@ -88,12 +183,15 @@ END_TIME=$(get_timestamp_ms)
 LATENCY_MS=$((END_TIME - START_TIME))
 
 # --- Configuration for response building ---
-MODEL_USED="${CODEX_MODEL:-gpt-5.5}"
+MODEL_USED="${CODEX_MODEL:-gpt-5.6-sol}"
 PERSONA_NAME=$(get_persona_name "$CONSULTANT_NAME")
 
 # --- Post-processing: use shared helper ---
+# process_consultant_response returns the consultant exit code. Guard the call
+# so a non-zero return does not abort under set -e before we cat the output
+# file and exit with that code.
 process_consultant_response "$CONSULTANT_NAME" "$MODEL_USED" "$PERSONA_NAME" \
-    "$TEMP_OUTPUT" "$OUTPUT_FILE" "$exit_code" "$LATENCY_MS" "" "$FULL_QUERY"
+    "$TEMP_OUTPUT" "$OUTPUT_FILE" "$exit_code" "$LATENCY_MS" "" "$FULL_QUERY" || true
 
 cat "$OUTPUT_FILE"
 exit $exit_code

package/scripts/query_gemini.sh

@@ -13,6 +13,7 @@
 #   GEMINI_USE_API - Use Google AI API mode instead of the agy CLI (default: false)
 #   GEMINI_API_MODEL - API model ID for API mode (default: gemini-3.1-pro-preview)
 #   GEMINI_API_KEY - API key for API mode
+#   GEMINI_REASONING_EFFORT - Optional CLI reasoning effort
 #   ENABLE_PERSONA - Enable "The Architect" persona (default: true)
 
 set -euo pipefail
@@ -68,7 +69,6 @@ if is_api_mode "gemini"; then
     else
         exit_code=$?
     fi
-warn_effort_ignored_in_cli "Gemini"
 else
     # --- CLI Mode (Antigravity CLI: agy) ---
     log_api_mode_status "gemini"
@@ -85,13 +85,38 @@ else
     # -p argument. agy has --model (no -m alias) and no read-from-file flag, so a
     # very large FULL_QUERY goes through argv (ARG_MAX-bounded; fine for normal
     # contexts). stdin is /dev/null (agy ignores it; run_query's cat needs an EOF).
-    run_query \
-        "Gemini" \
-        "$TEMP_OUTPUT" \
-        "$GEMINI_TIMEOUT_SECONDS" \
-        "$GEMINI_CMD" -p "$FULL_QUERY" --model "$GEMINI_MODEL" </dev/null
+    # Strip SSH_* markers so agy consults the macOS Keychain (see agy_env /
+    # AGY_ENV_PREFIX in lib/common.sh). Use the exec-safe prefix array — not the
+    # agy_env function — because run_query dispatches through GNU timeout.
+    #
+    # Optional CLI effort: when GEMINI_REASONING_EFFORT is set, pass --effort.
+    # agy accepts only a subset (e.g. low|medium|high); unsupported values fail
+    # at the provider and surface as diagnosed errors — no local allowlist.
+    GEMINI_ARGS=("${AGY_ENV_PREFIX[@]}" "$GEMINI_CMD" -p "$FULL_QUERY" --model "$GEMINI_MODEL")
+    effort_ok=true
+    if [[ -n "${GEMINI_REASONING_EFFORT:-}" ]]; then
+        source "$SCRIPT_DIR/lib/api.sh"
+        if ! cli_effort=$(validate_reasoning_effort "$GEMINI_REASONING_EFFORT" "$CONSULTANT_NAME"); then
+            effort_ok=false
+            exit_code=1
+        else
+            GEMINI_ARGS+=(--effort "$cli_effort")
+        fi
+    fi
 
-    exit_code=$?
+    if [[ "$effort_ok" == "true" ]]; then
+        # Keep failures inside an explicit conditional so `set -e` cannot skip
+        # exit_code assignment (same guard as the API branch).
+        if run_query \
+                "Gemini" \
+                "$TEMP_OUTPUT" \
+                "$GEMINI_TIMEOUT_SECONDS" \
+                "${GEMINI_ARGS[@]}" </dev/null; then
+            exit_code=0
+        else
+            exit_code=$?
+        fi
+    fi
 fi
 
 # --- Calculate latency ---

package/scripts/update_clis.sh

@@ -200,7 +200,13 @@ main() {
             continue
         fi
 
-        ver="$(run_with_timeout 8 "$cmd" --version </dev/null 2>/dev/null | head -1 || true)"
+        # agy under SSH must not see SSH_* markers (Keychain credential store).
+        # AGY_ENV_PREFIX is exec-safe under GNU timeout (see lib/common.sh).
+        if [[ "$default_bin" == "agy" ]]; then
+            ver="$(run_with_timeout 8 "${AGY_ENV_PREFIX[@]}" "$cmd" --version </dev/null 2>/dev/null | head -1 || true)"
+        else
+            ver="$(run_with_timeout 8 "$cmd" --version </dev/null 2>/dev/null | head -1 || true)"
+        fi
         detect_method "$default_bin" "$cmd"
         log_info "$display ($cmd): installed [${ver:-version n/a}] -- install method: $DETECT_METHOD"