npm - @iislee/opencodex - Versions diffs - 2.31.0 → 2.35.0 - Mend

@iislee/opencodex 2.31.0 → 2.35.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (261) hide show

package/README.md +3 -3
package/bin/ocx.mjs +99 -70
package/gui/dist/assets/index-Be1sDpWw.css +1 -0
package/gui/dist/assets/index-D4OKgUV4.js +114 -0
package/gui/dist/index.html +2 -2
package/package.json +3 -1
package/src/adapters/anthropic.ts +104 -15
package/src/adapters/base.ts +29 -1
package/src/adapters/command-code.ts +42 -6
package/src/adapters/cursor/call-id.ts +44 -0
package/src/adapters/cursor/catalog.ts +541 -0
package/src/adapters/cursor/checkpoint-store.ts +15 -10
package/src/adapters/cursor/cursor-errors.ts +15 -0
package/src/adapters/cursor/discovery.ts +69 -18
package/src/adapters/cursor/effort-map.ts +79 -1
package/src/adapters/cursor/envelope-echo.ts +290 -0
package/src/adapters/cursor/live-models.ts +7 -2
package/src/adapters/cursor/live-transport.ts +14 -0
package/src/adapters/cursor/message-mapper.ts +4 -1
package/src/adapters/cursor/native-exec-desktop.ts +23 -0
package/src/adapters/cursor/native-exec-fs.ts +2 -2
package/src/adapters/cursor/native-exec-network.ts +1 -1
package/src/adapters/cursor/native-exec-shell.ts +5 -2
package/src/adapters/cursor/native-exec.ts +20 -0
package/src/adapters/cursor/protobuf-request.ts +68 -14
package/src/adapters/cursor/request-builder.ts +40 -10
package/src/adapters/cursor/tool-definitions.ts +14 -4
package/src/adapters/cursor/tool-result-normalize.ts +28 -5
package/src/adapters/cursor/types.ts +20 -0
package/src/adapters/cursor.ts +209 -38
package/src/adapters/exec-tool-result-normalize.ts +99 -0
package/src/adapters/google-antigravity-replay.ts +173 -25
package/src/adapters/google-antigravity-wire.ts +5 -0
package/src/adapters/google-errors.ts +44 -12
package/src/adapters/google.ts +136 -24
package/src/adapters/image.ts +1 -1
package/src/adapters/kiro-constants.ts +27 -0
package/src/adapters/kiro-tools.ts +55 -16
package/src/adapters/kiro.ts +182 -23
package/src/adapters/openai-chat.ts +300 -242
package/src/adapters/openai-responses.ts +353 -27
package/src/adapters/run-turn-queue.ts +36 -1
package/src/adapters/tool-catalog-nudge.ts +4 -3
package/src/adapters/xai-tool-schema.ts +436 -0
package/src/adapters/xai-web-search.ts +17 -16
package/src/bridge.ts +90 -37
package/src/chat/inbound.ts +14 -1
package/src/chat/outbound.ts +15 -7
package/src/claude/agents-inject.ts +8 -1
package/src/claude/context-windows.ts +16 -9
package/src/claude/outbound.ts +24 -11
package/src/cli/access.ts +46 -3
package/src/cli/account-api.ts +116 -19
package/src/cli/account-extended.ts +262 -29
package/src/cli/account-main.ts +12 -12
package/src/cli/account.ts +69 -15
package/src/cli/agent.ts +8 -1
package/src/cli/alias.ts +66 -0
package/src/cli/capabilities-command.ts +94 -0
package/src/cli/capabilities.ts +496 -0
package/src/cli/claude-desktop.ts +31 -11
package/src/cli/claude.ts +26 -1
package/src/cli/dispatch.ts +256 -28
package/src/cli/doctor.ts +126 -14
package/src/cli/help.ts +17 -6
package/src/cli/index.ts +39 -9
package/src/cli/init.ts +1 -0
package/src/cli/inspect.ts +230 -0
package/src/cli/models-runtime.ts +95 -0
package/src/cli/models.ts +26 -10
package/src/cli/observe.ts +31 -8
package/src/cli/provider-runtime.ts +16 -2
package/src/cli/provider.ts +2 -1
package/src/cli/registry.ts +49 -10
package/src/cli/runtime-api.ts +51 -7
package/src/cli/status.ts +41 -1
package/src/cli/storage.ts +234 -0
package/src/cli/system-command.ts +16 -0
package/src/cli/system-restart-client.ts +1 -1
package/src/cli/usage-report.ts +184 -0
package/src/cli/v2.ts +34 -10
package/src/cli/version-skew.ts +46 -0
package/src/clients/config-export.ts +85 -3
package/src/clients/effective-status.ts +30 -2
package/src/clients/probes/cline.ts +81 -0
package/src/codex/account-label.ts +21 -0
package/src/codex/account-pause.ts +2 -1
package/src/codex/account-priority.ts +3 -2
package/src/codex/app-server-processes.ts +83 -7
package/src/codex/auth-api.ts +50 -10
package/src/codex/auth-context.ts +21 -18
package/src/codex/autostart-health.ts +16 -0
package/src/codex/catalog/aggregation.ts +18 -0
package/src/codex/catalog/effort.ts +18 -3
package/src/codex/catalog/metadata.ts +27 -1
package/src/codex/catalog/native-models.ts +5 -2
package/src/codex/catalog/parsing.ts +72 -27
package/src/codex/catalog/provider-fetch.ts +187 -31
package/src/codex/catalog/sync.ts +131 -5
package/src/codex/catalog.ts +1 -1
package/src/codex/codex-write-lock.ts +3 -1
package/src/codex/convergence-types.ts +1 -1
package/src/codex/convergence.ts +27 -2
package/src/codex/desired-state.ts +2 -2
package/src/codex/desktop-app-restart.ts +355 -0
package/src/codex/history-job.ts +32 -3
package/src/codex/history-manifest.ts +112 -0
package/src/codex/history-migration-guardian.ts +5 -5
package/src/codex/history-provider.ts +825 -247
package/src/codex/history-worker.ts +8 -5
package/src/codex/inject-coordination.ts +83 -0
package/src/codex/inject.ts +63 -22
package/src/codex/injected-marker.ts +1 -1
package/src/codex/internal/history-writer.ts +4 -3
package/src/codex/log-guard/inspect.ts +22 -4
package/src/codex/model-entitlements.ts +9 -2
package/src/codex/native-profile-startup.ts +157 -27
package/src/codex/native-residue.ts +26 -33
package/src/codex/prompt-layers.ts +371 -25
package/src/codex/prompt-text-probe.ts +238 -0
package/src/codex/quota.ts +91 -10
package/src/codex/routing.ts +9 -0
package/src/codex/shim.ts +56 -3
package/src/codex/subagent-model-fallback.ts +104 -25
package/src/codex/transition-state.ts +116 -8
package/src/combos/failover.ts +27 -0
package/src/combos/types.ts +10 -0
package/src/compatibility/index.ts +26 -0
package/src/compatibility/manifest.ts +253 -0
package/src/compatibility/openai-responses.ts +121 -0
package/src/config/atomic-write.ts +219 -0
package/src/config/paths.ts +40 -0
package/src/config/process-state.ts +309 -0
package/src/config/provider-validation.ts +177 -0
package/src/config/rebase-provenance.ts +68 -0
package/src/config.ts +206 -824
package/src/generated/compatibility-version.json +373 -213
package/src/images/loop.ts +5 -4
package/src/images/plan.ts +5 -4
package/src/integrations/ownership-policy.ts +160 -0
package/src/integrations/ownership.ts +46 -2
package/src/integrations/registry.ts +7 -0
package/src/integrations/state.ts +79 -7
package/src/integrations/writer.ts +26 -2
package/src/lab/conformance/fixtures/protocol-v1-cases.json +1 -1
package/src/lab/fabric/producer-child.ts +1 -1
package/src/lib/admin-secrets.ts +24 -0
package/src/lib/bounded-body.ts +14 -2
package/src/lib/config-ownership.ts +20 -0
package/src/lib/errors.ts +36 -3
package/src/lib/package-tree-integrity.ts +101 -0
package/src/lib/process-control.ts +2 -1
package/src/lib/service-secrets.ts +15 -0
package/src/lib/tool-argument-integers.ts +56 -5
package/src/oauth/callback-server.ts +22 -2
package/src/oauth/cline.ts +203 -0
package/src/oauth/generic-account-failover.ts +231 -0
package/src/oauth/health.ts +1 -1
package/src/oauth/index.ts +65 -6
package/src/oauth/key-providers.ts +10 -1
package/src/oauth/kimi.ts +9 -1
package/src/oauth/kiro.ts +45 -0
package/src/oauth/local-token-detect.ts +2 -0
package/src/oauth/open-browser-choice.ts +26 -0
package/src/oauth/store.ts +14 -5
package/src/oauth/types.ts +15 -0
package/src/providers/auto-compact-budget.ts +65 -0
package/src/providers/command-code-efforts.ts +38 -6
package/src/providers/context-cap.ts +4 -3
package/src/providers/default-aliases.ts +65 -0
package/src/providers/derive.ts +28 -0
package/src/providers/fastwire.ts +7 -1
package/src/providers/label.ts +34 -1
package/src/providers/model-presets.ts +119 -0
package/src/providers/new-model-policy.ts +146 -0
package/src/providers/provider-id-rewrite.ts +2 -1
package/src/providers/quota.ts +65 -7
package/src/providers/registry.ts +184 -69
package/src/providers/slug-codec.ts +52 -0
package/src/providers/xai-transport.ts +21 -0
package/src/reasoning-effort.ts +19 -2
package/src/responses/apply-patch-envelope.ts +63 -0
package/src/responses/code-mode-helper-compat.ts +50 -0
package/src/responses/custom-tool-compat.ts +157 -39
package/src/responses/namespace-tool-compat.ts +84 -4
package/src/responses/parser.ts +7 -2
package/src/responses/reasoning-replay-cache.ts +81 -3
package/src/responses/schema.ts +5 -1
package/src/responses/state.ts +94 -4
package/src/responses/thought-signature-replay.ts +17 -0
package/src/responses/turn-termination.ts +107 -0
package/src/router.ts +40 -2
package/src/routing/analytics.ts +1 -0
package/src/routing/quota.ts +10 -0
package/src/server/auth-cors.ts +27 -7
package/src/server/chat-completions.ts +24 -16
package/src/server/chat-native-sse.ts +3 -3
package/src/server/chat-native.ts +30 -11
package/src/server/claude-messages.ts +1 -1
package/src/server/index.ts +179 -32
package/src/server/lifecycle.ts +52 -1
package/src/server/local-management-read-client.ts +1 -1
package/src/server/local-provider-reload-client.ts +1 -1
package/src/server/management/agent-settings-routes.ts +45 -23
package/src/server/management/codex-prompt-routes.ts +570 -0
package/src/server/management/combo-routes.ts +2 -1
package/src/server/management/config-routes.ts +59 -12
package/src/server/management/context.ts +10 -1
package/src/server/management/logs-usage-routes.ts +30 -24
package/src/server/management/model-routes.ts +274 -4
package/src/server/management/model-rows.ts +4 -0
package/src/server/management/native-integration-routes.ts +2 -1
package/src/server/management/oauth-account-routes.ts +10 -4
package/src/server/management/provider-capability-config.ts +1 -1
package/src/server/management/provider-routes.ts +81 -11
package/src/server/management/route-registry.ts +332 -0
package/src/server/management/routing-profile-routes.ts +2 -2
package/src/server/management/system-restart.ts +1 -1
package/src/server/management-api.ts +18 -16
package/src/server/port-reclaim.ts +1 -1
package/src/server/proxy-liveness.ts +29 -5
package/src/server/relay-eager.ts +147 -20
package/src/server/relay.ts +251 -19
package/src/server/request-log-conversation.ts +51 -0
package/src/server/request-log.ts +70 -16
package/src/server/responses/codex-auth-error.ts +55 -0
package/src/server/responses/collaboration.ts +37 -3
package/src/server/responses/combo-stream-preflight.ts +178 -0
package/src/server/responses/compact.ts +6 -21
package/src/server/responses/core.ts +810 -208
package/src/server/responses/empty-completion-guard.ts +63 -6
package/src/server/responses/fetch-helpers.ts +17 -102
package/src/server/responses/input-admission.ts +3 -1
package/src/server/responses/passthrough-error.ts +33 -9
package/src/server/responses/responses-field-backfill.ts +105 -13
package/src/server/responses/ws-upstream.ts +75 -2
package/src/server/responses-custom-tool-repair.ts +87 -6
package/src/server/responses-terminal-repair.ts +25 -4
package/src/server/responses-undeclared-tool-guard.ts +241 -18
package/src/server/sse-frame-buffer.ts +31 -4
package/src/server/ws-bridge.ts +14 -2
package/src/service.ts +42 -4
package/src/storage/policy-job.ts +14 -4
package/src/storage/policy.ts +88 -23
package/src/types/config.ts +66 -0
package/src/types/provider.ts +69 -0
package/src/types/request.ts +17 -4
package/src/types/tools.ts +116 -11
package/src/types.ts +3 -1
package/src/update/index.ts +5 -4
package/src/update/job.ts +3 -1
package/src/update/transactional-install.mjs +8 -1
package/src/usage/expected-prices.ts +43 -24
package/src/usage/log.ts +63 -12
package/src/usage/summary.ts +211 -8
package/src/vision/describe.ts +18 -13
package/src/web-search/exa-executor.ts +40 -9
package/src/web-search/executor.ts +10 -3
package/src/web-search/loop.ts +5 -4
package/gui/dist/assets/index-BF38heuV.js +0 -104
package/gui/dist/assets/index-DMiI18Kv.css +0 -1

package/gui/dist/index.html CHANGED Viewed

@@ -16,8 +16,8 @@
         } catch (e) {}
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-BF38heuV.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DMiI18Kv.css">
+    <script type="module" crossorigin src="/assets/index-D4OKgUV4.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Be1sDpWw.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@iislee/opencodex",
-  "version": "2.31.0",
+  "version": "2.35.0",
   "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code",
   "type": "module",
   "main": "./bin/package-main.mjs",
@@ -42,6 +42,8 @@
     "typecheck": "bun x tsc --noEmit",
     "audit:high": "bun audit --audit-level=high && cd gui && bun audit --audit-level=high",
     "privacy:scan": "bun scripts/privacy-scan.ts",
+    "skill:surface": "bun scripts/generate-ocx-skill-surface.ts",
+    "skill:surface:check": "bun scripts/generate-ocx-skill-surface.ts --check",
     "generate:model-metadata": "bun scripts/generate-model-metadata.ts",
     "build:gui": "cd gui && bun install --frozen-lockfile && bun run build && cd .. && bun run prepare:package",
     "prepare:package": "bun scripts/prepare-package.ts",

package/src/adapters/anthropic.ts CHANGED Viewed

@@ -14,7 +14,7 @@ import type {
   OcxToolResultMessage,
   OcxUsage,
 } from "../types";
-import { isAllowedToolChoice, namespacedToolName, resolveToolChoiceWireName, toolAllowedByChoice } from "../types";
+import { isAllowedToolChoice, namespacedToolName, resolveToolChoiceWireName, toolChoiceToolPredicate } from "../types";
 import { ANTHROPIC_OAUTH_BETA, CLAUDE_CODE_SYSTEM_INSTRUCTION, applyClaudeToolPrefix, stripClaudeToolPrefix } from "../oauth/anthropic";
 import { parseDataUrl } from "./image";
 import { enforceAnthropicImageLimits } from "./anthropic-image-guard";
@@ -27,6 +27,7 @@ import { CLAUDE_CODE_HEADERS, claudeCodeSessionId } from "./client-fingerprint";
 import { buildNonOpenAIToolCatalogNudgeForTools } from "./tool-catalog-nudge";
 import { decodeServerSentEvents } from "../lib/sse-decoder";
 import { isTranslatorBudgetExceededError, retainTranslatedEventBatch, type TranslatorBudget } from "../lib/translator-budget";
+import { isReasoningEffortOmitted, modelRecordValue } from "../reasoning-effort";
 /** Map a user content part to an Anthropic content block (text or image source). */
 function toAnthropicContentPart(p: OcxContentPart): unknown {
@@ -36,6 +37,7 @@ function toAnthropicContentPart(p: OcxContentPart): unknown {
       ? { type: "image", source: { type: "base64", media_type: data.mediaType, data: data.base64 } }
       : { type: "image", source: { type: "url", url: p.imageUrl } };
   }
+  if (p.type === "video") return { type: "text", text: "[video]" };
   return { type: "text", text: p.text };
 }
@@ -264,6 +266,39 @@ export function formatAnthropicErrorBody(status: number, _headers: Headers, payl
   return redactSecretString(detail).slice(0, 400);
 }
+function isAnthropicRecord(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function anthropicStructuralValueType(value: unknown): string {
+  if (value === null) return "null";
+  return Array.isArray(value) ? "array" : typeof value;
+}
+interface InvalidAnthropicShapeDiagnostic {
+  reason: "content_not_array" | "content_block_not_object";
+  blockIndex?: number;
+  valueType: string;
+}
+/**
+ * Structured refusal for a malformed buffered response body, shaped like the google adapter's
+ * `invalidGoogleShapeEvent` so an operator reading a log can tell which rung failed: the content
+ * container, or one block inside an otherwise well-formed container.
+ */
+function invalidAnthropicShapeEvent(
+  diagnostic: InvalidAnthropicShapeDiagnostic,
+): Extract<AdapterEvent, { type: "error" }> {
+  const at = diagnostic.blockIndex !== undefined ? `; blockIndex=${diagnostic.blockIndex}` : "";
+  const subject = diagnostic.reason === "content_not_array" ? "content" : "content block";
+  return {
+    type: "error",
+    message: `anthropic response contained invalid ${subject} (${diagnostic.reason}${at}; valueType=${diagnostic.valueType})`,
+    status: 502,
+    errorType: "upstream_error",
+  };
+}
 function extractAnthropicErrorDetail(parsed: unknown): string | undefined {
   if (typeof parsed === "string") return parsed.trim() || undefined;
   if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return undefined;
@@ -469,10 +504,10 @@ function claudeFamilyVersion(modelId: string): { family: string; major: number;
   // Find the segment that actually starts with `claude-`, rather than assuming it is either
   // the first (breaks `anthropic/claude-sonnet-5`) or the last (breaks `claude-sonnet-5/variant`,
   // where the slash carries a vendor suffix rather than a routing prefix).
-  const match = /(?:^|\/)claude-([a-z]+)-(\d+)(?:-(\d{1,2}))?(?!\d)/.exec(modelId);
+  const match = /(?:^|\/)claude-([a-z]+)-(\d+)(?:[.-](\d{1,2}))?(?!\d)/i.exec(modelId);
   if (!match) return undefined;
   return {
-    family: match[1]!,
+    family: match[1]!.toLowerCase(),
     major: Number(match[2]),
     minor: match[3] === undefined ? 0 : Number(match[3]),
   };
@@ -518,6 +553,18 @@ function adaptiveEffort(effort: string): string {
   return effort === "minimal" ? "low" : effort;
 }
+function defaultReasoningEffort(provider: OcxProviderConfig, modelId: string): string | undefined {
+  const value = modelRecordValue(provider.modelDefaultReasoningEfforts, modelId);
+  if (typeof value !== "string") return undefined;
+  const trimmed = value.trim();
+  // `__omit__` means "send no reasoning field", not "an effort literally named
+  // __omit__". Without this the sentinel reached the wire as
+  // `output_config.effort: "__omit__"` on adaptive models, and enabled budget
+  // thinking on the rest — the opposite of what it asks for (#2432).
+  if (!trimmed || isReasoningEffortOmitted(trimmed)) return undefined;
+  return trimmed;
+}
 function usageFromAnthropic(usage: Record<string, number> | undefined): OcxUsage | undefined {
   if (!usage) return undefined;
   const hasCache = usage.cache_read_input_tokens !== undefined || usage.cache_creation_input_tokens !== undefined;
@@ -796,11 +843,8 @@ function messagesToAnthropicFormat(
 function toolsToAnthropicFormat(parsed: OcxParsedRequest, toolNames: { toWire: (name: string) => string }): unknown[] | undefined {
   if (!parsed.context.tools || parsed.context.tools.length === 0) return undefined;
-  const allowed = isAllowedToolChoice(parsed.options.toolChoice)
-    ? new Set(parsed.options.toolChoice.allowedTools)
-    : undefined;
-  const tools = allowed
-    ? parsed.context.tools.filter(t => toolAllowedByChoice(t, allowed, parsed.context.tools))
+  const tools = isAllowedToolChoice(parsed.options.toolChoice)
+    ? parsed.context.tools.filter(toolChoiceToolPredicate(parsed.options.toolChoice, parsed.context.tools))
     : parsed.context.tools;
   if (tools.length === 0) return undefined;
   const converted = tools.map(t => ({
@@ -929,18 +973,20 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
       // anyway, and thinking shares the caller's `max_tokens` — which truncates a small-budget
       // request before it can emit its stop sequence (#545). Say "disabled" out loud where the
       // model both defaults to thinking and accepts being told not to.
-      if (parsed.options.reasoning === "none" && supportsExplicitThinkingDisable(parsed.modelId)) {
+      const effectiveReasoning = parsed.options.reasoning ?? defaultReasoningEffort(provider, parsed.modelId);
+      if (effectiveReasoning === "none" && supportsExplicitThinkingDisable(parsed.modelId)) {
         body.thinking = { type: "disabled" };
-      } else if (typeof parsed.options.reasoning === "string" && parsed.options.reasoning !== "none") {
+      } else if (typeof effectiveReasoning === "string" && effectiveReasoning !== "none") {
         if (usesAdaptiveThinking(parsed.modelId)) {
           // Adaptive-thinking models replace the token budget with an effort knob and reject
           // `thinking.type: "enabled"` outright. `max_tokens` still caps thinking plus visible
           // output, so high effort needs the same total-token headroom as budget thinking or a
           // default 8192-token request can spend everything on thought and return empty text.
           body.thinking = { type: "adaptive" };
-          body.output_config = { effort: adaptiveEffort(parsed.options.reasoning) };
+          const effort = adaptiveEffort(effectiveReasoning);
+          body.output_config = { effort };
           const explicitMaxOut = parsed.options.maxOutputTokens;
-          const wantBudget = reasoningBudget(parsed.options.reasoning);
+          const wantBudget = reasoningBudget(effort);
           const floor = wantBudget + OUTPUT_HEADROOM;
           // Preserve explicit caller limits as-is; for omitted limits use the adaptive ceiling
           // so effort=max (budget=32k) still leaves OUTPUT_HEADROOM tokens for visible output.
@@ -953,7 +999,7 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
           // 400s ("max_tokens must be greater than thinking.budget_tokens"). Size them so max_tokens
           // always exceeds the budget within a model-safe ceiling, reserving room for visible output.
           const maxOut = parsed.options.maxOutputTokens ?? DEFAULT_MAX_TOKENS;
-          const wantBudget = reasoningBudget(parsed.options.reasoning);
+          const wantBudget = reasoningBudget(effectiveReasoning);
           const maxTokens = Math.min(REASONING_MAX_TOKENS_CEILING, Math.max(maxOut, wantBudget + OUTPUT_HEADROOM));
           const budget = Math.max(MIN_THINKING_BUDGET, Math.min(wantBudget, maxTokens - OUTPUT_FLOOR));
           body.max_tokens = maxTokens;
@@ -1267,12 +1313,55 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti
     },
     async parseResponse(response: Response, budget: TranslatorBudget): Promise<AdapterEvent[]> {
-      const json = await response.json() as Record<string, unknown>;
+      const parsed: unknown = await response.json();
+      // `response.json()` resolves a body of `null` to `null` without throwing, so the cast below
+      // used to reach `json.content` on it — the #1219 defect at the buffered body root. The
+      // streaming parser has skipped a non-record frame since #1240, but a buffered body has no
+      // next frame to recover into, so this fails closed instead.
+      if (!isAnthropicRecord(parsed)) {
+        return [{
+          type: "error",
+          message: `anthropic response was not a JSON object (${anthropicStructuralValueType(parsed)})`,
+          status: 502,
+          errorType: "upstream_error",
+        }];
+      }
+      const json = parsed;
       const responseBytes = new TextEncoder().encode(JSON.stringify(json)).byteLength;
       budget.chargeRetained(responseBytes, { kind: "retained_collectors" });
       try {
       const events: AdapterEvent[] = [];
-      const content = json.content as { type: string; text?: string; id?: string; name?: string; input?: unknown; thinking?: string; reasoning?: string; signature?: string; data?: string }[] | undefined;
+      // Same retain-then-return tail every other terminal branch in this function uses; naming it
+      // keeps the two shape guards below from drifting out of step with the accounting.
+      const finishWithEvents = (batch: AdapterEvent[]): AdapterEvent[] => {
+        retainTranslatedEventBatch(batch, budget);
+        return batch;
+      };
+      const rawContent: unknown = json.content;
+      // `content` is claimed model output inside a well-formed response, so it is governed by the
+      // #1332 nested-shape rule (fail closed) rather than #1240's root-frame padding rule (skip).
+      // Absence stays legal in both encodings. A present non-array was silently accepted and is
+      // the dangerous case: a string is iterable, so `for (const block of "text")` walked it one
+      // CHARACTER at a time, read `undefined` from every `block.type`, and completed the turn as a
+      // successful empty response — the #2231 failure mode on a different adapter.
+      if (rawContent !== undefined && rawContent !== null && !Array.isArray(rawContent)) {
+        return finishWithEvents([invalidAnthropicShapeEvent({
+          reason: "content_not_array",
+          valueType: anthropicStructuralValueType(rawContent),
+        })]);
+      }
+      if (Array.isArray(rawContent)) {
+        for (let blockIndex = 0; blockIndex < rawContent.length; blockIndex++) {
+          if (!isAnthropicRecord(rawContent[blockIndex])) {
+            return finishWithEvents([invalidAnthropicShapeEvent({
+              reason: "content_block_not_object",
+              blockIndex,
+              valueType: anthropicStructuralValueType(rawContent[blockIndex]),
+            })]);
+          }
+        }
+      }
+      const content = rawContent as { type: string; text?: string; id?: string; name?: string; input?: unknown; thinking?: string; reasoning?: string; signature?: string; data?: string }[] | undefined;
       if (content) {
         for (const block of content) {
           if (block.type === "text" && block.text) {

package/src/adapters/base.ts CHANGED Viewed

@@ -37,6 +37,21 @@ export interface ProviderAdapter {
    */
   buildRequest(parsed: OcxParsedRequest, incoming: IncomingMeta): AdapterRequest | Promise<AdapterRequest>;
+  /**
+   * Decide, BEFORE any request is built or sent, that this turn has nothing to ask upstream.
+   *
+   * Returning a reason short-circuits the turn to a locally constructed completed response: no
+   * `buildRequest`, no send, no token estimate, and no empty-completion retry. That last part is
+   * why this cannot be expressed as an outputless `done` from `parseStream`: the empty-completion
+   * guard treats a terminal with no content as a failed turn and re-invokes the identical request,
+   * so an adapter that "successfully returned nothing" would be retried into the very loop it was
+   * trying to end.
+   *
+   * Only for turns whose input already contains the answer — see the Kiro adapter, where replayed
+   * history ending in a delivered final answer has nothing left to complete.
+   */
+  localTerminal?(parsed: OcxParsedRequest): AdapterLocalTerminal | undefined;
   fetchResponse?(request: AdapterRequest, ctx?: AdapterFetchContext): Promise<Response>;
   /**
@@ -70,10 +85,12 @@ export interface AdapterRequest {
     body: string;
     /** Final upstream wire names of custom tools lowered to functions while building this request. */
     convertedRoutedCustomToolNames?: ReadonlySet<string>;
+    /** Native custom-tool wire names authorized for representation-only response repair. */
+    routedCustomToolRepairNames?: ReadonlySet<string>;
     /** Client tool-search names actually lowered to upstream function calls for this request. */
     convertedRoutedToolSearchNames?: ReadonlySet<string>;
     /** Upstream-only aliases for namespace tools flattened in this request. */
-    convertedRoutedNamespaceToolAliases?: ReadonlyMap<string, { namespace: string; name: string }>;
+    convertedRoutedNamespaceToolAliases?: ReadonlyMap<string, { namespace: string; name: string; kind: "function" | "custom" }>;
     /** Releases observation of a serialized request body after its final fetch attempt settles. */
     releaseBodyObservation?: () => void;
     /** Exact reasoning parameter emitted by the adapter, for request-log diagnostics only. */
@@ -117,3 +134,14 @@ export interface AdapterFetchContext {
   /** Custom fetch executor to use for physical upstream network requests (defaults to globalThis.fetch). */
   executor?: typeof globalThis.fetch;
 }
+/**
+ * An adapter's decision that a turn needs no upstream inference at all.
+ *
+ * `reason` is diagnostic only. It is never sent to the client and never logged as request
+ * content: it names the code path for a maintainer reading a request log, so it must stay a
+ * fixed identifier rather than anything derived from the conversation.
+ */
+export interface AdapterLocalTerminal {
+  reason: string;
+}

package/src/adapters/command-code.ts CHANGED Viewed

@@ -3,10 +3,11 @@ import { execFile as execFileCallback } from "node:child_process";
 import { promisify } from "node:util";
 import { opendir } from "node:fs/promises";
 import type { AdapterEvent, OcxContentPart, OcxMessage, OcxParsedRequest, OcxProviderConfig, OcxTool, OcxUsage } from "../types";
-import { isAllowedToolChoice, namespacedToolName, resolveToolChoiceWireName, toolAllowedByChoice } from "../types";
+import { isAllowedToolChoice, namespacedToolName, resolveToolChoiceWireName, toolChoiceToolPredicate } from "../types";
 import type { AdapterFetchContext, AdapterRequest, ProviderAdapter } from "./base";
 import type { TranslatorBudget } from "../lib/translator-budget";
 import { readBoundedResponseBody } from "../lib/bounded-body";
+import { debugDroppedFrame } from "../lib/debug";
 import { configuredReasoningEfforts } from "../reasoning-effort";
 import { commandCodeReasoningEfforts, refreshCommandCodeReasoningEfforts } from "../providers/command-code-efforts";
 import { identifyRoutedModel } from "./identity";
@@ -143,7 +144,8 @@ function wireMessages(messages: OcxMessage[]): Array<Record<string, unknown>> {
     if (typeof message.content === "string") content.push({ type: "text", text: message.content });
     else for (const part of message.content) {
       if (part.type === "text") content.push({ type: "text", text: part.text });
-      else content.push(wireImagePart(part.imageUrl));
+      else if (part.type === "image") content.push(wireImagePart(part.imageUrl));
+      else content.push({ type: "text", text: "[video]" });
     }
     out.push({ role: "user", content });
   }
@@ -156,8 +158,7 @@ function visibleTools(parsed: OcxParsedRequest): OcxTool[] {
   if (choice === "none") return [];
   const tools = parsed.context.tools ?? [];
   if (isAllowedToolChoice(choice)) {
-    const allowed = new Set(choice.allowedTools);
-    return tools.filter(tool => toolAllowedByChoice(tool, allowed, tools));
+    return tools.filter(toolChoiceToolPredicate(choice, tools));
   }
   if (choice && typeof choice !== "string") {
     const selected = resolveToolChoiceWireName(tools, choice.name);
@@ -366,7 +367,7 @@ async function*ndjson(response: Response, budget: TranslatorBudget): AsyncGenera
       let newline = buffer.indexOf("\n");
       while (newline >= 0) {
         const line = buffer.slice(0, newline).trim(); buffer = buffer.slice(newline + 1);
-        if (line) { try { yield JSON.parse(stripEventFrame(line)) as Record<string, unknown>; } catch { /* ignore non-events */ } }
+        if (line) yield* decodeEventLine(line);
         newline = buffer.indexOf("\n");
       }
       const residualBytes = encoder.encode(buffer).byteLength;
@@ -377,7 +378,7 @@ async function*ndjson(response: Response, budget: TranslatorBudget): AsyncGenera
       if (done) break;
     }
     const final = buffer.trim();
-    if (final) { try { yield JSON.parse(stripEventFrame(final)) as Record<string, unknown>; } catch { /* ignore */ } }
+    if (final) yield* decodeEventLine(final);
   } finally {
     budget.releaseRetained(bufferBytes, { kind: "live_transient" });
     try { await reader.cancel(); } catch { /* already closed */ }
@@ -385,6 +386,41 @@ async function*ndjson(response: Response, budget: TranslatorBudget): AsyncGenera
   }
 }
+/**
+ * Yield one NDJSON line as an event record, or nothing.
+ *
+ * `JSON.parse("null")` returns `null` instead of throwing, so the `try/catch` around the parse
+ * cannot see it and the `event.type` read in parseStream crashed the turn — the #1219 defect, on
+ * the one streaming transport the #1240 audit did not cover because it is NDJSON rather than SSE.
+ *
+ * A frame that does not parse to a record is padding, not an event: drop it and continue exactly
+ * as an unparseable line is already dropped, so a stream whose only frames are junk ends in the
+ * same single terminal `done` as an empty body. Skipping is what preserves an answer whose deltas
+ * have already arrived — the observed #1219 case is `null` padding BETWEEN content deltas, where
+ * terminating would discard a complete response (#1240).
+ *
+ * Note this deliberately makes a junk-only stream a quiet `[done]` where it previously threw. That
+ * throw was an unguarded type assumption, not a designed failure signal, and `[done]` is already
+ * what an empty body, a blank-line-only body and an unparseable-only body all produce here. The
+ * broader question — whether this adapter should report *any* no-valid-event stream as a failure
+ * rather than an empty success — is pre-existing, applies to all four of those inputs equally, and
+ * is deliberately not decided by this change.
+ */
+function* decodeEventLine(line: string): Generator<Record<string, unknown>> {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(stripEventFrame(line));
+  } catch {
+    debugDroppedFrame("command-code", line);
+    return;
+  }
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    debugDroppedFrame("command-code", line);
+    return;
+  }
+  yield parsed as Record<string, unknown>;
+}
 /** The endpoint is newline-delimited JSON; defensively strip an SSE `data:` frame if the gateway ever switches shapes. */
 function stripEventFrame(line: string): string {
   return line.startsWith("data:") ? line.slice("data:".length).trim() : line;

package/src/adapters/cursor/call-id.ts ADDED Viewed

@@ -0,0 +1,44 @@
+/**
+ * Reversible single-line codec for Cursor composite tool-call ids.
+ *
+ * Cursor's wire delivers tool-call ids that can be two identifiers glued with a
+ * literal newline ("call-<uuid>-<n>\nfc_<uuid>_<n>"). OpenCodex forwards ids
+ * verbatim, so that newline leaked into Responses-visible `call_id` values,
+ * where line-oriented clients (logging, splitting, validation) break. The codec
+ * encodes only ids containing CR/LF into a versioned single-line form and
+ * decodes both that form and legacy raw multi-line ids back to the exact
+ * upstream bytes before anything is serialized toward Cursor.
+ */
+const CALL_ID_PREFIX = "ocxc1_";
+/** True when the id needs encoding to survive line-oriented consumers. */
+function needsEncoding(id: string): boolean {
+  return id.includes("\n") || id.includes("\r");
+}
+/** Encode a Cursor wire call id into a single-line Responses-safe id. */
+export function encodeCursorCallId(id: string): string {
+  if (!needsEncoding(id)) return id;
+  return CALL_ID_PREFIX + Buffer.from(id, "utf8").toString("base64url");
+}
+/**
+ * Decode a Responses-visible call id back to the exact Cursor wire id.
+ * Non-encoded ids (including legacy raw multi-line ids replayed by older
+ * clients) pass through unchanged; a malformed encoded payload also passes
+ * through rather than corrupting pairing.
+ */
+export function decodeCursorCallId(id: string): string {
+  if (!id.startsWith(CALL_ID_PREFIX)) return id;
+  const payload = id.slice(CALL_ID_PREFIX.length);
+  if (payload.length === 0) return id;
+  try {
+    const decoded = Buffer.from(payload, "base64url").toString("utf8");
+    // Round-trip guard: only trust payloads our encoder could have produced.
+    if (Buffer.from(decoded, "utf8").toString("base64url") !== payload) return id;
+    return decoded;
+  } catch {
+    return id;
+  }
+}