converse-mcp-server 4.1.1 → 4.2.0

package/.env.example

@@ -91,7 +91,7 @@ TYPESAFE_API_KEY=your_typesafe_api_key_here
 # The model a bare provider name ("codex", "openai", ...) and "auto" use.
 # Each must be a model ID or alias from that provider's catalog; startup fails
 # with "did you mean" suggestions otherwise. Per request, use "provider:model".
-# CODEX_DEFAULT_MODEL=gpt-6-sol       # gpt-6-sol, gpt-6-luna, gpt-6-astra, gpt-5.6-sol, gpt-5.6-terra, gpt-5.6-luna, gpt-5.5, gpt-5.3-codex-spark (CODEX_MODEL is the legacy name)
+# CODEX_DEFAULT_MODEL=gpt-6-astra     # gpt-6-sol, gpt-6-luna, gpt-6-astra, gpt-5.6-sol, gpt-5.6-terra, gpt-5.6-luna, gpt-5.5, gpt-5.3-codex-spark (CODEX_MODEL is the legacy name)
 # CLAUDE_DEFAULT_MODEL=claude-opus-5-5
 # AGY_DEFAULT_MODEL=gemini-3.8-flash  # Antigravity CLI: gemini-3.8-flash, gemini-3.1-pro-preview
 # COPILOT_DEFAULT_MODEL=gpt-6-sol     # COPILOT_MODEL is the legacy name

package/README.md

@@ -304,7 +304,7 @@ Any other model works via its full `provider/model` slug or the `openrouter:` na
 
 ### Codex Models
 
-OpenAI Codex agentic coding assistant. `codex` uses its default model (GPT-6 Sol, or `CODEX_DEFAULT_MODEL`); `codex:<model>` picks one (e.g. `codex:luna`, `codex:astra`, `codex:gpt-5.6-terra`):
+OpenAI Codex agentic coding assistant. `codex` uses its default model (GPT-6 Astra, or `CODEX_DEFAULT_MODEL`); `codex:<model>` picks one (e.g. `codex:luna`, `codex:astra`, `codex:gpt-5.6-terra`):
 
 - **gpt-6-sol** (default; aliases: `sol`, `gpt-6`), **gpt-6-luna** (`luna`), **gpt-6-astra** (`astra`)
 - **gpt-5.6-sol** (`gpt-5.6`), **gpt-5.6-terra** (`terra`), **gpt-5.6-luna**, **gpt-5.5**, **gpt-5.3-codex-spark** (`spark`)
@@ -388,7 +388,7 @@ CODEX_APPROVAL_POLICY=never                  # never (default), untrusted, on-fa
 # Optional: per-provider default model, used for a bare provider name (`codex`,
 # `openai`, ...) and for "auto". Must be a model or alias from that provider's
 # list; startup fails with suggestions otherwise.
-CODEX_DEFAULT_MODEL=gpt-6-sol                # CODEX_MODEL still works as a fallback
+CODEX_DEFAULT_MODEL=gpt-6-astra              # CODEX_MODEL still works as a fallback
 CLAUDE_DEFAULT_MODEL=claude-opus-5-5
 AGY_DEFAULT_MODEL=gemini-3.8-flash           # Antigravity CLI (gemini)
 COPILOT_DEFAULT_MODEL=gpt-6-sol              # COPILOT_MODEL still works as a fallback
@@ -459,7 +459,7 @@ Every entry in `models` takes one of four forms:
 "auto";
 
 // A provider: its default model (hardcoded, or <PROVIDER>_DEFAULT_MODEL)
-"codex"; // -> Codex (GPT-6 Sol)
+"codex"; // -> Codex (GPT-6 Astra)
 "claude"; // -> Claude Agent SDK (Claude Opus 5.5)
 "gemini"; // -> Antigravity CLI (Gemini 3.8 Flash); `agy` works too
 "openai"; // -> OpenAI API (GPT-6 Sol)
@@ -492,7 +492,7 @@ Every entry in `models` takes one of four forms:
 
 Provider priority order (subscription-based local providers first, then API-key providers), used by both `auto` and bare model names:
 
-1. Codex (`codex` → GPT-6 Sol)
+1. Codex (`codex` → GPT-6 Astra)
 2. Gemini via Antigravity CLI (`gemini` / `agy` → Gemini 3.8 Flash)
 3. Claude Agent SDK (`claude` → Claude Opus 5.5)
 4. Copilot (`copilot` → GPT-6 Sol; `auto` only, never bare names)

package/docs/API.md

@@ -422,6 +422,8 @@ Only jobs in a `queued` or `running` state can be cancelled; already-completed,
 
 Each provider call retries timeouts, 408, 429 and 5xx with backoff, honoring `Retry-After`. Auth failures, exhausted retries and malformed responses fall back to the next provider. A 400/422 request fault stops immediately, because every host would reject it the same way.
 
+TypeSafe's API sits behind a Cloudflare firewall that rejects some request bodies containing SQL-injection or shell-command patterns (for example `-- ; DROP TABLE`, or a quoted `'...; DROP TABLE ...;'`) with a 403 before the model sees them. This applies through OpenRouter too, since it forwards to the same edge. `decide` reports it as `Blocked by typesafe.ai's Cloudflare firewall before reaching the model (Ray ID …)` and stops without retrying or falling back. Treat a block as an unanswered question, not as a decision, and report the Ray ID to TypeSafe.
+
 ### Example Usage
 
 ```json
@@ -564,7 +566,7 @@ Any other model works via its full `provider/model` slug (e.g. `anthropic/claude
 
 **Codex** is an agentic coding assistant with direct filesystem access:
 
-- **Model**: `codex` (underlying model: GPT-6 Sol by default, or `CODEX_DEFAULT_MODEL`)
+- **Model**: `codex` (underlying model: GPT-6 Astra by default, or `CODEX_DEFAULT_MODEL`)
 - **Backend selection**: `codex:<model>` per request (e.g. `codex:luna`, `codex:astra`, `codex:gpt-5.6-terra`) from the Codex catalog: `gpt-6-sol` (`sol`, `gpt-6`), `gpt-6-luna` (`luna`), `gpt-6-astra` (`astra`), `gpt-5.6-sol` (`gpt-5.6`), `gpt-5.6-terra` (`terra`), `gpt-5.6-luna`, `gpt-5.5`, `gpt-5.3-codex-spark` (`spark`). Other names are rejected with suggestions. Bare IDs from this list (e.g. `gpt-6-astra`) go to Codex first, then the OpenAI API.
 - **Availability**: the Codex SDK is installed and `~/.codex/auth.json` exists (`$CODEX_HOME/auth.json` when set) or `CODEX_API_KEY` is set
 - **Thread-based sessions**: persistent conversation history via `continuation_id` in `chat` mode
@@ -682,7 +684,7 @@ Control Codex behavior through environment variables:
 - **`CODEX_SANDBOX_MODE`** — filesystem access: `read-only` (default), `workspace-write`, `danger-full-access` (containers only)
 - **`CODEX_SKIP_GIT_CHECK`** — `true` (default) works in any directory; `false` requires a Git repository
 - **`CODEX_APPROVAL_POLICY`** — `never` (default, recommended for servers), `untrusted`, `on-failure`, `on-request`
-- **`CODEX_DEFAULT_MODEL`** — model used for `codex` and `auto` (default: `gpt-6-sol`); the legacy name `CODEX_MODEL` is honored when it is unset
+- **`CODEX_DEFAULT_MODEL`** — model used for `codex` and `auto` (default: `gpt-6-astra`); the legacy name `CODEX_MODEL` is honored when it is unset
 - **`CODEX_API_KEY`** — optional API key for headless deployments (alternative to ChatGPT login)
 
 **Example (.env):**
@@ -691,7 +693,7 @@ CODEX_API_KEY=your_codex_api_key_here
 CODEX_SANDBOX_MODE=read-only
 CODEX_SKIP_GIT_CHECK=true
 CODEX_APPROVAL_POLICY=never
-CODEX_DEFAULT_MODEL=gpt-6-sol
+CODEX_DEFAULT_MODEL=gpt-6-astra
 ```
 
 ### Default Models
@@ -699,7 +701,7 @@ CODEX_DEFAULT_MODEL=gpt-6-sol
 Each provider's default model (used for its bare provider name and for `auto`) can be set with `<PROVIDER>_DEFAULT_MODEL`. The value must be a model ID or alias from that provider's list; startup fails with "Did you mean" suggestions otherwise (OpenRouter also accepts any `vendor/model` slug).
 
 ```bash
-CODEX_DEFAULT_MODEL=gpt-6-sol                # CODEX_MODEL is honored as a legacy fallback
+CODEX_DEFAULT_MODEL=gpt-6-astra              # CODEX_MODEL is honored as a legacy fallback
 CLAUDE_DEFAULT_MODEL=claude-opus-5-5
 AGY_DEFAULT_MODEL=gemini-3.8-flash           # Antigravity CLI (gemini)
 COPILOT_DEFAULT_MODEL=gpt-6-sol              # COPILOT_MODEL is honored as a legacy fallback

package/docs/EXAMPLES.md

@@ -446,7 +446,7 @@ Codex maintains conversation history through threads in `chat` mode:
 
 ### Choosing the Codex Model
 
-`codex` uses GPT-6 Sol (or `CODEX_DEFAULT_MODEL`); `codex:<model>` picks another model from the Codex list:
+`codex` uses GPT-6 Astra (or `CODEX_DEFAULT_MODEL`); `codex:<model>` picks another model from the Codex list:
 
 ```json
 {

package/docs/PROVIDERS.md

@@ -106,9 +106,9 @@ This guide documents all supported AI providers in the Converse MCP Server and t
   - `CODEX_SANDBOX_MODE` - Filesystem access control (default: read-only)
   - `CODEX_SKIP_GIT_CHECK` - Skip Git repository validation (default: true)
   - `CODEX_APPROVAL_POLICY` - Command approval behavior (default: never)
-  - `CODEX_DEFAULT_MODEL` - Model used for bare `codex` and `auto` (default: `gpt-6-sol`; any Codex model ID or alias below). The legacy name `CODEX_MODEL` is honored when `CODEX_DEFAULT_MODEL` is unset.
+  - `CODEX_DEFAULT_MODEL` - Model used for bare `codex` and `auto` (default: `gpt-6-astra`; any Codex model ID or alias below). The legacy name `CODEX_MODEL` is honored when `CODEX_DEFAULT_MODEL` is unset.
 - **Supported Models**:
-  - `codex` - OpenAI Codex agentic coding assistant (GPT-6 Sol by default)
+  - `codex` - OpenAI Codex agentic coding assistant (GPT-6 Astra by default)
   - `codex:<model>` - Same, with an explicit backend from the Codex catalog:
     - `gpt-6-sol` (aliases: `sol`, `gpt-6`), `gpt-6-luna` (`luna`), `gpt-6-astra` (`astra`)
     - `gpt-5.6-sol` (`gpt-5.6`), `gpt-5.6-terra` (`terra`), `gpt-5.6-luna`, `gpt-5.5`, `gpt-5.3-codex-spark` (`spark`)
@@ -278,7 +278,7 @@ CODEX_APPROVAL_POLICY=never                  # never (default), untrusted, on-fa
 Each provider has a `<PROVIDER>_DEFAULT_MODEL` variable that sets the model used for its bare provider name (`codex`, `openai`, ...) and for `auto`. The value must be a model ID or alias from that provider's list; startup fails with "Did you mean" suggestions otherwise. OpenRouter also accepts any `vendor/model` slug.
 
 ```bash
-CODEX_DEFAULT_MODEL=gpt-6-sol                # CODEX_MODEL is honored as a legacy fallback
+CODEX_DEFAULT_MODEL=gpt-6-astra              # CODEX_MODEL is honored as a legacy fallback
 CLAUDE_DEFAULT_MODEL=claude-opus-5-5
 AGY_DEFAULT_MODEL=gemini-3.8-flash           # Antigravity CLI (gemini)
 COPILOT_DEFAULT_MODEL=gpt-6-sol              # COPILOT_MODEL is honored as a legacy fallback

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse-mcp-server",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "Converse MCP Server - Converse with other LLMs with chat and consensus tools",
   "type": "module",
   "main": "src/index.js",

package/src/decisionProviders/systemOne.js

@@ -84,6 +84,43 @@ export function extractErrorMessage(body, rawText) {
   return rawText?.trim() || 'No error details returned';
 }
 
+const MAX_ERROR_MESSAGE_LENGTH = 500;
+
+/**
+ * Summarize an HTML error page, which arrives raw from TypeSafe's edge and
+ * embedded in OpenRouter's JSON error message when it forwards one.
+ * Cloudflare's block page means the firewall rejected the request content
+ * before any model saw it: typically SQL-injection or shell-command patterns
+ * inside state or questions.
+ * @returns {{ message: string, firewall: boolean, rayId: string|null }|null}
+ *   null when the text is not an HTML page
+ */
+export function describeHtmlError(text) {
+  if (!/<!doctype html|<html[\s>]/i.test(text || '')) return null;
+  const rayId = text.match(/Cloudflare Ray ID:\s*<strong[^>]*>([0-9a-f]+)</i)?.[1] ?? null;
+  if (/cloudflare/i.test(text) && /you have been blocked|Attention Required/i.test(text)) {
+    const host = text.match(/unable to access<\/span>\s*([^<\s]+)/i)?.[1] ?? 'the upstream';
+    return {
+      firewall: true,
+      rayId,
+      message:
+        `Blocked by ${host}'s Cloudflare firewall before reaching the model${rayId ? ` (Ray ID ${rayId})` : ''}: ` +
+        'the request content matched an attack signature, typically SQL-injection or shell-command patterns in state or questions. ' +
+        'Retrying the same content will not help; report the Ray ID to the provider.',
+    };
+  }
+  const title = text.match(/<title>([^<]*)<\/title>/i)?.[1]?.trim();
+  return {
+    firewall: false,
+    rayId,
+    message: `Upstream returned an HTML error page${title ? `: ${title}` : ''}${rayId ? ` (Ray ID ${rayId})` : ''}`,
+  };
+}
+
+function truncate(text) {
+  return text.length > MAX_ERROR_MESSAGE_LENGTH ? `${text.slice(0, MAX_ERROR_MESSAGE_LENGTH)}…` : text;
+}
+
 function parseRetryAfter(headers) {
   const ms = Number(headers.get('retry-after-ms'));
   if (Number.isFinite(ms) && ms > 0) return ms;
@@ -145,11 +182,20 @@ async function sendOnce({ url, headers, body, signal, timeoutMs }) {
 
   if (!response.ok) {
     const status = response.status;
-    throw new DecisionError(`HTTP ${status}: ${extractErrorMessage(parsed, rawText)}`, {
+    const detail = extractErrorMessage(parsed, rawText);
+    const html = describeHtmlError(detail);
+    // Every host forwards to TypeSafe's edge, so a firewall block repeats on
+    // retry and on failover alike.
+    const firewall = html?.firewall === true;
+    throw new DecisionError(`HTTP ${status}: ${html ? html.message : truncate(detail)}`, {
       status,
-      retryable: status === 408 || status === 429 || status >= 500 || status === 401 || status === 403,
-      terminal: status === 400 || status === 422,
-      requestId: response.headers.get('x-typesafe-request-id') || response.headers.get('x-generation-id'),
+      retryable: !firewall && (status === 408 || status === 429 || status >= 500 || status === 401 || status === 403),
+      terminal: firewall || status === 400 || status === 422,
+      requestId:
+        response.headers.get('x-typesafe-request-id') ||
+        response.headers.get('x-generation-id') ||
+        html?.rayId ||
+        response.headers.get('cf-ray'),
       retryAfterMs: parseRetryAfter(response.headers),
     });
   }

package/src/providers/codex.js

@@ -92,7 +92,7 @@ const SUPPORTED_MODELS = {
   }),
 };
 
-const DEFAULT_MODEL = 'gpt-6-sol';
+const DEFAULT_MODEL = 'gpt-6-astra';
 
 /**
  * Custom error class for Codex provider errors