npm - @bitkyc08/opencodex - Versions diffs - 2.56.0 → 2.58.0 - Mend

@bitkyc08/opencodex 2.56.0 → 2.58.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 (206) hide show

package/bin/ocx.mjs +10 -0
package/gui/dist/assets/{index-D4zuyIxQ.js → index-BbrHOIY0.js} +21 -21
package/gui/dist/assets/{index-BBOZWGB6.css → index-C5-RdDmD.css} +1 -1
package/gui/dist/index.html +2 -2
package/package.json +4 -4
package/src/adapters/codebuddy/adapter.ts +2 -1
package/src/adapters/codebuddy/scaffold-guard.ts +249 -0
package/src/adapters/command-code.ts +12 -3
package/src/adapters/cursor/cursor-errors.ts +15 -0
package/src/adapters/cursor/discovery.ts +65 -1
package/src/adapters/cursor/envelope-echo.ts +8 -2
package/src/adapters/cursor/live-transport.ts +5 -1
package/src/adapters/cursor/protobuf-events.ts +110 -11
package/src/adapters/cursor/protobuf-request.ts +19 -1
package/src/adapters/cursor/text-toolcall.ts +230 -0
package/src/adapters/cursor/thread-continuity.ts +67 -0
package/src/adapters/cursor/types.ts +5 -0
package/src/adapters/cursor.ts +55 -5
package/src/adapters/google-http.ts +38 -13
package/src/adapters/google.ts +7 -7
package/src/adapters/kiro/payload.ts +17 -3
package/src/adapters/kiro/reasoning.ts +70 -7
package/src/adapters/kiro/stream.ts +8 -2
package/src/adapters/kiro/wire.ts +2 -1
package/src/adapters/kiro-events.ts +21 -13
package/src/adapters/mimo-free.ts +32 -17
package/src/adapters/ollama-native.ts +42 -8
package/src/adapters/openai-chat/tool-name-registry.ts +166 -0
package/src/adapters/openai-chat/tool-schema.ts +25 -7
package/src/adapters/openai-chat.ts +8 -8
package/src/adapters/openai-responses/passthrough.ts +62 -5
package/src/adapters/openai-responses/request-strips.ts +43 -0
package/src/adapters/physical-send.ts +50 -0
package/src/bridge/errors.ts +26 -2
package/src/bridge/response-json.ts +8 -2
package/src/bridge/sse.ts +20 -2
package/src/claude/desktop-profile.ts +66 -9
package/src/claude/outbound.ts +32 -4
package/src/cli/account-main.ts +1 -1
package/src/cli/capabilities.ts +2 -2
package/src/cli/combo.ts +10 -1
package/src/cli/config-command.ts +35 -18
package/src/cli/dispatch.ts +17 -4
package/src/cli/index.ts +92 -7
package/src/cli/registry.ts +2 -1
package/src/cli/system-command.ts +74 -5
package/src/cli/uninstall-client-state.ts +12 -0
package/src/clients/config-export.ts +7 -3
package/src/codex/account-label.ts +14 -3
package/src/codex/account-store.ts +113 -26
package/src/codex/account-usability.ts +21 -0
package/src/codex/auth-api/login-flow.ts +14 -2
package/src/codex/auth-api/reset-credit-service.ts +11 -2
package/src/codex/auth-context.ts +199 -15
package/src/codex/catalog/aggregation.ts +80 -1
package/src/codex/catalog/model-visibility.ts +1 -0
package/src/codex/catalog/remote.ts +30 -0
package/src/codex/catalog/retained-sync.ts +9 -1
package/src/codex/catalog/routed-gather.ts +38 -1
package/src/codex/cli-install-provenance.ts +7 -1
package/src/codex/convergence.ts +7 -2
package/src/codex/desktop-app/types.ts +11 -2
package/src/codex/desktop-app/windows.ts +5 -5
package/src/codex/desktop-switches.ts +145 -0
package/src/codex/history-job.ts +5 -1
package/src/codex/history-provider.ts +33 -4
package/src/codex/history-worker.ts +14 -1
package/src/codex/inject/remove.ts +145 -7
package/src/codex/inject/restore.ts +231 -32
package/src/codex/inject.ts +12 -16
package/src/codex/loopback-target.ts +9 -0
package/src/codex/model-entitlements.ts +152 -15
package/src/codex/native-profile-startup.ts +64 -20
package/src/codex/pool-refresh-backoff.ts +12 -3
package/src/codex/quota-rejection.ts +104 -15
package/src/codex/routing/cache-affinity.ts +70 -0
package/src/codex/routing/cooldown-math.ts +10 -0
package/src/codex/routing/selection.ts +79 -2
package/src/codex/routing/thread-affinity.ts +50 -2
package/src/codex/routing/transient-hold-dispatch.ts +141 -0
package/src/codex/routing.ts +29 -49
package/src/codex/warmup.ts +1 -1
package/src/combos/failover.ts +85 -0
package/src/combos/request.ts +17 -10
package/src/combos/types.ts +23 -2
package/src/config/atomic-write.ts +83 -8
package/src/config/pending-teardown.ts +31 -0
package/src/config/schema/config-schema.ts +2 -0
package/src/config/schema/leaf-validators.ts +1 -0
package/src/generated/compatibility-version.json +272 -180
package/src/images/loop.ts +1 -1
package/src/lib/bounded-subprocess.ts +62 -10
package/src/lib/errors.ts +17 -0
package/src/lib/request-execution-budget.ts +147 -21
package/src/lib/spend-reservation-ledger.ts +18 -0
package/src/lib/state-store-registrations.ts +6 -2
package/src/lib/test-home-guard.ts +85 -1
package/src/lib/upstream-retry.ts +77 -10
package/src/lib/windows-elevation.ts +76 -14
package/src/lib/windows-secret-acl.ts +151 -15
package/src/lib/windows-user-principal.ts +5 -1
package/src/oauth/index.ts +2 -2
package/src/oauth/key-providers.ts +2 -2
package/src/providers/derive.ts +6 -0
package/src/providers/kiro-models.ts +4 -3
package/src/providers/label.ts +19 -1
package/src/providers/model-discovery.ts +35 -7
package/src/providers/registry/entries-core.ts +18 -0
package/src/providers/registry/entries-extended.ts +59 -28
package/src/providers/registry/model-seeds.ts +71 -17
package/src/providers/registry/types.ts +9 -0
package/src/responses/reasoning-envelope.ts +6 -3
package/src/responses/spill-store.ts +17 -0
package/src/responses/state/body-policy.ts +25 -0
package/src/responses/state/spill-queue.ts +8 -6
package/src/responses/state.ts +3 -22
package/src/router.ts +4 -0
package/src/routing/identity-domains.ts +21 -14
package/src/routing/probe-lease.ts +103 -1
package/src/server/auth-cors.ts +1 -0
package/src/server/chat-completions.ts +3 -1
package/src/server/chat-native.ts +37 -9
package/src/server/index/live-sideband.ts +37 -1
package/src/server/index/websocket-handler.ts +54 -3
package/src/server/index.ts +5 -5
package/src/server/inspection-tee.ts +107 -0
package/src/server/live.ts +46 -1
package/src/server/management/combo-routes.ts +10 -1
package/src/server/management/config-routes.ts +27 -5
package/src/server/models-capabilities.ts +24 -3
package/src/server/relay-eager.ts +2 -0
package/src/server/relay.ts +14 -19
package/src/server/request-log.ts +127 -3
package/src/server/response-log-body.ts +153 -0
package/src/server/responses/account-change-state.ts +74 -0
package/src/server/responses/adapter-continuation.ts +33 -7
package/src/server/responses/adapter-delivery.ts +5 -11
package/src/server/responses/adapter-dispatch.ts +84 -13
package/src/server/responses/codex-ws-exchange.ts +65 -4
package/src/server/responses/codex-ws-wire.ts +5 -0
package/src/server/responses/collaboration.ts +74 -4
package/src/server/responses/combo-session-recall.ts +68 -8
package/src/server/responses/combo-stream-preflight.ts +68 -5
package/src/server/responses/compact.ts +54 -13
package/src/server/responses/core-auth.ts +2 -0
package/src/server/responses/core-codex-account.ts +51 -3
package/src/server/responses/core-combo.ts +129 -23
package/src/server/responses/core-errors.ts +18 -0
package/src/server/responses/core-options.ts +3 -0
package/src/server/responses/core-replay.ts +105 -32
package/src/server/responses/core.ts +3 -3
package/src/server/responses/encrypted-payload.ts +0 -1
package/src/server/responses/fetch-helpers.ts +4 -1
package/src/server/responses/input-admission.ts +126 -6
package/src/server/responses/native-injection-protocol.ts +42 -0
package/src/server/responses/native-injection-replay.ts +105 -0
package/src/server/responses/native-injection.ts +242 -0
package/src/server/responses/native-response-control.ts +56 -0
package/src/server/responses/native-response-json.ts +14 -0
package/src/server/responses/native-response-output.ts +37 -0
package/src/server/responses/native-steering-log.ts +44 -0
package/src/server/responses/native-steering-policy.ts +49 -0
package/src/server/responses/native-steering-replay.ts +126 -0
package/src/server/responses/native-steering-settings.ts +76 -0
package/src/server/responses/native-steering.ts +400 -0
package/src/server/responses/native-tool-results.ts +130 -0
package/src/server/responses/passthrough-delivery.ts +30 -6
package/src/server/responses/passthrough-dispatch.ts +61 -11
package/src/server/responses/passthrough-error.ts +38 -2
package/src/server/responses/request-prepare.ts +173 -22
package/src/server/responses/request-send-budget.ts +97 -2
package/src/server/responses/request-spend.ts +147 -0
package/src/server/responses/request-transport.ts +62 -3
package/src/server/responses/run-turn-execution.ts +59 -31
package/src/server/responses/sidecar-execution.ts +7 -13
package/src/server/responses/terminal-guard.ts +65 -4
package/src/server/responses/ws-upstream.ts +21 -1
package/src/server/responses-undeclared-tool-guard.ts +9 -5
package/src/server/stop-teardown.ts +8 -1
package/src/server/ws-bridge.ts +16 -1
package/src/service/cli.ts +13 -1
package/src/service/windows-ops.ts +210 -16
package/src/service/windows-scheduler.ts +28 -21
package/src/service.ts +1 -1
package/src/types/config.ts +8 -1
package/src/types/provider.ts +13 -0
package/src/types/request.ts +8 -5
package/src/types/tools.ts +24 -0
package/src/types.ts +2 -0
package/src/update/index.ts +10 -0
package/src/update/stop-contract.d.mts +1 -0
package/src/update/stop-contract.mjs +19 -0
package/src/update/stop-decision.d.mts +1 -1
package/src/update/stop-decision.mjs +12 -3
package/src/usage/log.ts +1 -1
package/src/vision/anthropic-describe.ts +1 -1
package/src/vision/describe.ts +5 -5
package/src/web-search/anthropic-executor.ts +1 -1
package/src/web-search/exa-executor.ts +1 -1
package/src/web-search/executor.ts +1 -1
package/src/web-search/gemini-executor.ts +1 -1
package/src/web-search/loop.ts +1 -1
package/src/web-search/ollama-executor.ts +1 -1
package/src/web-search/parse.ts +67 -14
package/src/web-search/passthrough-bridge.ts +64 -31
package/src/web-search/xai-executor.ts +1 -1

package/gui/dist/index.html CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "2.56.0",
+  "version": "2.58.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",
@@ -76,17 +76,17 @@
     "@bufbuild/protobuf": "^2.14.0",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "@napi-rs/keyring": "1.3.0",
-    "bun": "1.4.2",
+    "bun": "1.4.0",
     "zod": "4.4.3"
   },
   "devDependencies": {
-    "@types/bun": "1.4.2",
+    "@types/bun": "1.4.0",
     "typescript": "7.0.2"
   },
   "overrides": {
     "@hono/node-server": "2.1.0",
     "fast-uri": "^3.1.7",
-    "hono": "4.13.1",
+    "hono": "4.13.8",
     "ip-address": "^10.4.0",
     "qs": "^6.16.0"
   },

package/src/adapters/codebuddy/adapter.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import { mapReasoningEffort } from "../../reasoning-effort";
 import { buildSystemPrompt } from "../coding-agent/protocol";
 import { baseScopedEnv, runCodingAgentTurn, type CodingAgentDeps, type SpawnFn } from "../coding-agent/turn";
 import { CODEBUDDY_PROFILES, type CodeBuddyProfile } from "./profiles";
+import { guardCodeBuddyScaffolding } from "./scaffold-guard";
 export type { SpawnFn } from "../coding-agent/turn";
 export type CodeBuddyAdapterDeps = CodingAgentDeps;
@@ -75,7 +76,7 @@ export function createCodeBuddyAdapter(provider: OcxProviderConfig, deps: CodeBu
         provider,
         parsed,
         incoming,
-        emit,
+        emit: guardCodeBuddyScaffolding(emit),
         buildArgs: (resolved, req, prov) => buildArgs(resolved as CodeBuddyProfile, req, prov),
         buildEnv: (resolved, apiKey) => buildChildEnv(resolved as CodeBuddyProfile, apiKey),
         deps,

package/src/adapters/codebuddy/scaffold-guard.ts ADDED Viewed

@@ -0,0 +1,249 @@
+import type { AdapterEvent } from "../../types";
+/** Error code for a CodeBuddy turn whose output contains vendor agent scaffolding. */
+export const CODEBUDDY_SCAFFOLD_ERROR_CODE = "vendor_scaffold_detected";
+// The observed control protocol uses FULLWIDTH VERTICAL LINE (U+FF5C). Detection stays
+// deliberately narrower than the marker spelling: a calls control line must be followed by an
+// invoke line with a non-empty tool name. That distinguishes an agent scaffold from prose quoting or
+// discussing one tag.
+const DSML_CALLS_LINE = "<｜｜dsml｜｜ calls>";
+const DSML_INVOKE_PREFIX = "<｜｜dsml｜｜ invoke name=\"";
+export interface CodeBuddyScaffoldFilterResult {
+  /** Bytes released from a suffix withheld by an earlier event on this channel. */
+  releasedPending: string;
+  /** Safe bytes belonging to the event currently being processed. */
+  text: string;
+  /** The earlier pending event still owns the extended candidate. */
+  pendingContinues: boolean;
+  fail: boolean;
+}
+interface ScanResult {
+  safe: string;
+  held: string;
+  fail: boolean;
+  fence: "`" | "~" | null;
+  lineStart: boolean;
+}
+function prefixAtEnd(text: string, at: number, expected: string): boolean {
+  const rest = text.slice(at).toLowerCase();
+  return rest.length < expected.length && expected.startsWith(rest);
+}
+/**
+ * Scan complete bytes and retain only a bounded suffix that can still become a control sequence.
+ *
+ * Control tags are recognized only at column zero and outside fenced Markdown. Inline code,
+ * quoted strings, blockquotes, indented source, and prose all add syntax before the tag and are
+ * therefore forwarded unchanged. A calls line alone is harmless; refusal requires the observed
+ * two-line calls-plus-named-invoke grammar.
+ */
+function scan(
+  text: string,
+  initialFence: "`" | "~" | null,
+  initialLineStart: boolean,
+): ScanResult {
+  let fence = initialFence;
+  let lineStart = initialLineStart;
+  let index = 0;
+  while (index < text.length) {
+    if (lineStart) {
+      const fenceMarkers = fence ? [fence.repeat(3)] : ["```", "~~~"];
+      const completeFence = fenceMarkers.find(marker => text.startsWith(marker, index));
+      if (completeFence) {
+        fence = fence ? null : (completeFence[0] as "`" | "~");
+        index += completeFence.length;
+        lineStart = false;
+        continue;
+      }
+      if (fenceMarkers.some(marker => prefixAtEnd(text, index, marker))) {
+        return { safe: text.slice(0, index), held: text.slice(index), fail: false, fence, lineStart };
+      }
+      if (!fence) {
+        const lowered = text.slice(index).toLowerCase();
+        if (lowered.startsWith(DSML_CALLS_LINE)) {
+          const afterCalls = index + DSML_CALLS_LINE.length;
+          let invokeAt = -1;
+          if (text[afterCalls] === "\n") invokeAt = afterCalls + 1;
+          else if (text[afterCalls] === "\r" && text[afterCalls + 1] === "\n") invokeAt = afterCalls + 2;
+          else if (afterCalls === text.length || (text[afterCalls] === "\r" && afterCalls + 1 === text.length)) {
+            return { safe: text.slice(0, index), held: text.slice(index), fail: false, fence, lineStart };
+          }
+          if (invokeAt >= 0) {
+            const invokeRest = text.slice(invokeAt).toLowerCase();
+            const invokeNameStart = invokeRest[DSML_INVOKE_PREFIX.length];
+            if (invokeRest.startsWith(DSML_INVOKE_PREFIX) && invokeNameStart && !/[\s"]/.test(invokeNameStart)) {
+              return { safe: text.slice(0, index), held: "", fail: true, fence, lineStart };
+            }
+            if (invokeRest.length === 0 || DSML_INVOKE_PREFIX.startsWith(invokeRest)) {
+              return { safe: text.slice(0, index), held: text.slice(index), fail: false, fence, lineStart };
+            }
+          }
+        } else if (prefixAtEnd(text, index, DSML_CALLS_LINE)) {
+          return { safe: text.slice(0, index), held: text.slice(index), fail: false, fence, lineStart };
+        }
+      }
+    }
+    const char = text[index]!;
+    index += 1;
+    lineStart = char === "\n";
+  }
+  return { safe: text, held: "", fail: false, fence, lineStart };
+}
+/** Streaming DSML control-sequence filter for one text or reasoning channel. */
+export class CodeBuddyScaffoldFilter {
+  private pending = "";
+  private failed = false;
+  private fence: "`" | "~" | null = null;
+  private lineStart = true;
+  /** True while an earlier event owns an unresolved marker or fence prefix. */
+  hasPending(): boolean {
+    return this.pending.length > 0;
+  }
+  push(chunk: string): CodeBuddyScaffoldFilterResult {
+    if (this.failed) {
+      return { releasedPending: "", text: "", pendingContinues: false, fail: false };
+    }
+    if (!chunk) {
+      return {
+        releasedPending: "",
+        text: "",
+        pendingContinues: this.hasPending(),
+        fail: false,
+      };
+    }
+    const priorPending = this.pending;
+    const result = scan(priorPending + chunk, this.fence, this.lineStart);
+    this.pending = result.held;
+    this.fence = result.fence;
+    this.lineStart = result.lineStart;
+    this.failed = result.fail;
+    const releasedLength = Math.min(priorPending.length, result.safe.length);
+    return {
+      releasedPending: result.safe.slice(0, releasedLength),
+      text: result.safe.slice(releasedLength),
+      pendingContinues: priorPending.length > 0 && result.safe.length === 0 && result.held.length > 0,
+      fail: result.fail,
+    };
+  }
+  /** Release a suffix that never completed the two-line control grammar. */
+  flush(): CodeBuddyScaffoldFilterResult {
+    if (this.failed) {
+      return { releasedPending: "", text: "", pendingContinues: false, fail: false };
+    }
+    const text = this.pending;
+    this.pending = "";
+    return { releasedPending: text, text: "", pendingContinues: false, fail: false };
+  }
+}
+function codeBuddyScaffoldErrorMessage(): string {
+  return "CodeBuddy CLI emitted vendor tool-call markup in an assistant output channel. This route"
+    + " runs the CLI with its own tools and MCP servers disabled and Codex owns tool control, so"
+    + " the turn was refused rather than forwarding or executing vendor agent scaffolding.";
+}
+/** Guard both streamed channels while preserving event order around withheld marker prefixes. */
+export function guardCodeBuddyScaffolding(emit: (event: AdapterEvent) => void): (event: AdapterEvent) => void {
+  const textFilter = new CodeBuddyScaffoldFilter();
+  const thinkingFilter = new CodeBuddyScaffoldFilter();
+  type PendingChannel = "text" | "thinking";
+  type EventSlot = { resolved: boolean; event?: AdapterEvent };
+  const eventQueue: EventSlot[] = [];
+  const pendingSlots = new Map<PendingChannel, EventSlot>();
+  let closed = false;
+  const channelEvent = (channel: PendingChannel, text: string): AdapterEvent => channel === "text"
+    ? { type: "text_delta", text }
+    : { type: "thinking_delta", thinking: text };
+  const drainResolved = (): void => {
+    while (eventQueue[0]?.resolved) {
+      const slot = eventQueue.shift()!;
+      if (slot.event) emit(slot.event);
+    }
+  };
+  const enqueueResolved = (event: AdapterEvent): void => {
+    eventQueue.push({ resolved: true, event });
+    drainResolved();
+  };
+  const resolvePendingSlot = (channel: PendingChannel, text: string): void => {
+    const slot = pendingSlots.get(channel);
+    if (!slot) return;
+    slot.resolved = true;
+    if (text) slot.event = channelEvent(channel, text);
+    pendingSlots.delete(channel);
+    drainResolved();
+  };
+  const enqueuePendingSlot = (channel: PendingChannel): void => {
+    const slot: EventSlot = { resolved: false };
+    eventQueue.push(slot);
+    pendingSlots.set(channel, slot);
+  };
+  const flushAllPending = (): void => {
+    for (const channel of ["text", "thinking"] as const) {
+      if (!pendingSlots.has(channel)) continue;
+      const filter = channel === "text" ? textFilter : thinkingFilter;
+      resolvePendingSlot(channel, filter.flush().releasedPending);
+    }
+    drainResolved();
+  };
+  const refuse = (): void => {
+    if (closed) return;
+    flushAllPending();
+    closed = true;
+    emit({
+      type: "error",
+      message: codeBuddyScaffoldErrorMessage(),
+      status: 502,
+      errorType: "upstream_error",
+      code: CODEBUDDY_SCAFFOLD_ERROR_CODE,
+      retryable: false,
+    });
+  };
+  return (event: AdapterEvent): void => {
+    if (closed) return;
+    if (event.type === "text_delta" || event.type === "thinking_delta") {
+      const channel: PendingChannel = event.type === "text_delta" ? "text" : "thinking";
+      const filter = channel === "text" ? textFilter : thinkingFilter;
+      const hadPending = filter.hasPending();
+      const cleaned = filter.push(event.type === "text_delta" ? event.text : event.thinking);
+      if (hadPending && !cleaned.pendingContinues) resolvePendingSlot(channel, cleaned.releasedPending);
+      if (cleaned.text) {
+        enqueueResolved(event.type === "text_delta"
+          ? { ...event, text: cleaned.text }
+          : { ...event, thinking: cleaned.text });
+      }
+      if (filter.hasPending() && !cleaned.pendingContinues) enqueuePendingSlot(channel);
+      if (cleaned.fail) refuse();
+      return;
+    }
+    if (event.type === "done" || event.type === "error" || event.type === "incomplete") {
+      flushAllPending();
+      closed = true;
+      emit(event);
+      return;
+    }
+    enqueueResolved(event);
+  };
+}

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

@@ -13,6 +13,8 @@ import { commandCodeReasoningEfforts, refreshCommandCodeReasoningEfforts } from
 import { identifyRoutedModel } from "./identity";
 import { buildNonOpenAIToolCatalogNudgeForTools } from "./tool-catalog-nudge";
 import { parseDataUrl } from "./image";
+import { createAdapterPhysicalSend } from "./physical-send";
+import { SendBudgetExhaustedError } from "../lib/upstream-retry";
 // Retain the short ids emitted by the first local integration. New requests use the live catalog's
 // provider-native IDs directly; this map is compatibility-only and is not a model fallback list.
@@ -556,7 +558,8 @@ export function createCommandCodeAdapter(provider: OcxProviderConfig): ProviderA
       };
     },
     async fetchResponse(request: AdapterRequest, ctx?: AdapterFetchContext): Promise<Response> {
-      const response = await fetchCommandCode(request, ctx, executor);
+      const send = createAdapterPhysicalSend(ctx, executor);
+      const response = await send({ url: request.url, dispatch: physical => fetchCommandCode(request, ctx, physical) });
       if (response.ok) return response;
       const currentEffort = (() => {
         try { return (JSON.parse(request.body) as { params?: { reasoning_effort?: unknown } }).params?.reasoning_effort; } catch { return undefined; }
@@ -577,8 +580,14 @@ export function createCommandCodeAdapter(provider: OcxProviderConfig): ProviderA
       if (!refreshed || refreshed.includes(currentEffort)) return response;
       const retry = requestWithoutReasoningEffort(request);
       if (!retry) return response;
-      try { void response.body?.cancel(); } catch { /* already closed */ }
-      return fetchCommandCode(retry, ctx, executor);
+      try {
+        return await send({ url: retry.url, sendClass: "repair", recovery: "reasoning-effort-downgrade",
+          beforeDispatch: () => { try { void response.body?.cancel().catch(() => {}); } catch { /* already closed */ } },
+          dispatch: physical => fetchCommandCode(retry, ctx, physical) });
+      } catch (error) {
+        if (error instanceof SendBudgetExhaustedError) return response;
+        throw error;
+      }
     },
     async *parseStream(response: Response, budget: TranslatorBudget): AsyncGenerator<AdapterEvent> {
       let sawFinish = false;

package/src/adapters/cursor/cursor-errors.ts CHANGED Viewed

@@ -46,6 +46,21 @@ export class CursorStreamTruncatedError extends Error {
   }
 }
+export const CURSOR_INCOMPLETE_TOOL_CALL_MESSAGE_PREFIX =
+  "Cursor stream ended with incomplete tool call(s):";
+/**
+ * True when Cursor ended the stream with a client tool still open. The adapter fail-closes
+ * the current turn (no partial `tool_call_start`) and remints the conversation afterwards
+ * so the next turn does not resume a session left waiting for `mcpResult`.
+ */
+export function isCursorIncompleteToolCallMessage(value: unknown): boolean {
+  const message = typeof value === "string" ? value : errorMessage(value);
+  const lower = message.toLowerCase();
+  return lower.includes(CURSOR_INCOMPLETE_TOOL_CALL_MESSAGE_PREFIX.toLowerCase())
+    || lower.includes("tool call(s) left incomplete");
+}
 /**
  * A cancel-shaped stream failure that WE did not request. `cancelCursorRun` is the only place
  * that cancels our own stream, and it sets `expectedClose` first, so a cancel arriving without it

package/src/adapters/cursor/discovery.ts CHANGED Viewed

@@ -24,8 +24,54 @@ const CONTEXT_272K = 272_000;
 const CONTEXT_262K = 262_144;
 const CONTEXT_256K = 256_000;
 const CONTEXT_200K = 200_000;
+export const CURSOR_OBSERVED_CONTEXT_WINDOW_MAX_ENTRIES = 2_048;
-export function inferCursorContextWindow(modelId: string): number {
+/**
+ * Process-local ceilings from `ConversationTokenDetails.maxTokens` on live
+ * checkpoints. Each observation belongs to the Cursor identity scope that
+ * produced it; plan-gated accounts sharing one proxy must not overwrite each
+ * other's overflow prior (senpi `cursor-context-limit`).
+ */
+const observedCursorContextWindows = new Map<string, number>();
+interface CursorContextWindowOptions {
+  identityScope?: string;
+  observed?: number;
+}
+function normalizeObservedWindowKey(modelId: string, identityScope?: string): string {
+  return `${identityScope?.trim() || "local"}\0${modelId.trim().toLowerCase()}`;
+}
+export function recordObservedCursorContextWindow(
+  modelId: string,
+  maxTokens: number | undefined,
+  options: Pick<CursorContextWindowOptions, "identityScope"> = {},
+): void {
+  if (!modelId.trim()) return;
+  if (typeof maxTokens !== "number" || !Number.isFinite(maxTokens) || maxTokens <= 0) return;
+  const key = normalizeObservedWindowKey(modelId, options.identityScope);
+  observedCursorContextWindows.delete(key);
+  observedCursorContextWindows.set(key, Math.floor(maxTokens));
+  while (observedCursorContextWindows.size > CURSOR_OBSERVED_CONTEXT_WINDOW_MAX_ENTRIES) {
+    const oldest = observedCursorContextWindows.keys().next().value;
+    if (oldest === undefined) break;
+    observedCursorContextWindows.delete(oldest);
+  }
+}
+export function observedCursorContextWindow(
+  modelId: string,
+  options: Pick<CursorContextWindowOptions, "identityScope"> = {},
+): number | undefined {
+  return observedCursorContextWindows.get(normalizeObservedWindowKey(modelId, options.identityScope));
+}
+export function resetObservedCursorContextWindowsForTests(): void {
+  observedCursorContextWindows.clear();
+}
+function inferCursorContextWindowHeuristic(modelId: string): number {
   const id = modelId.trim().toLowerCase();
   if (id.includes("1m")) return CONTEXT_1M;
   if (id.startsWith("gemini-")) return CONTEXT_1M;
@@ -40,6 +86,24 @@ export function inferCursorContextWindow(modelId: string): number {
   return CURSOR_DEFAULT_CONTEXT_WINDOW;
 }
+/**
+ * Infer a conservative context window for a Cursor model id.
+ *
+ * A positive explicit observation wins, then an identity-scoped process-local
+ * checkpoint `maxTokens`, then the id heuristic. Cursor's `AvailableModelsResponse`
+ * does not currently include per-model context window metadata.
+ */
+export function inferCursorContextWindow(
+  modelId: string,
+  options: CursorContextWindowOptions = {},
+): number {
+  const { observed } = options;
+  if (typeof observed === "number" && Number.isFinite(observed) && observed > 0) {
+    return Math.floor(observed);
+  }
+  return observedCursorContextWindow(modelId, options) ?? inferCursorContextWindowHeuristic(modelId);
+}
 function normalizeInputModalities(input: string[] | undefined): string[] {
   const values = (input ?? [...CURSOR_DEFAULT_INPUT_MODALITIES])
     .map(item => item.trim())

package/src/adapters/cursor/envelope-echo.ts CHANGED Viewed

@@ -217,7 +217,13 @@ export type RoutingCommentaryDecision =
   | { kind: "flush" }
   | { kind: "hallucination" };
-const ROUTING_NATIVE_TOOL_NAME = /\b(shell|read|grep|list|bash)\b/giu;
+// The Korean alternative is deliberately asymmetric: it has a left boundary and no right one.
+// Korean attaches particles directly to the noun, so the real sentences this detector exists to
+// catch read "네이티브 셸이 차단되어..." and "네이티브 셸과 Read가...". A mirrored
+// (?![\p{L}\p{M}\p{N}_]) lookahead would see the 이/과 particle as a letter and stop matching
+// every one of them, which is why the negative cases below only probe the left side. Adding the
+// right boundary looks like an obvious fix and disables the check; do not.
+const ROUTING_NATIVE_TOOL_NAME = /\b(shell|read|grep|list|bash)\b|(?<![\p{L}\p{M}\p{N}_])네이티브\s*(?:셸|쉘)/giu;
 const ROUTING_TOOL_HINT =
   /(?:\b(?:shell|read|grep|list|bash)\b|exec_command|shell_command|브리지|네이티브\s*(?:셸|쉘))/iu;
 const ROUTING_FAILURE_CLAIM =
@@ -276,7 +282,7 @@ export class CursorRoutingCommentarySniffer {
   private matchesHallucination(): boolean {
     if (!ROUTING_FAILURE_CLAIM.test(this.buffered)) return false;
     const nativeTools = new Set(
-      [...this.buffered.matchAll(ROUTING_NATIVE_TOOL_NAME)].map(match => match[1]?.toLowerCase()),
+      [...this.buffered.matchAll(ROUTING_NATIVE_TOOL_NAME)].map(match => match[1]?.toLowerCase() ?? "shell"),
     );
     if (nativeTools.size === 0) return false;
     return ROUTING_REDIRECT_CLAIM.test(this.buffered) || nativeTools.size >= 2;

package/src/adapters/cursor/live-transport.ts CHANGED Viewed

@@ -20,6 +20,7 @@ import {
   createCursorContextUsageTracker,
   createCursorProtobufEventState,
   finalizeTurnEvents,
+  hasBufferedTextToolCalls,
   mapCursorProtobufServerMessage,
   mapSyntheticMcpExecToToolEvents,
   reportableContextTokens,
@@ -732,6 +733,8 @@ class LiveCursorTransport implements CursorTransport {
         syntheticStructuredEditToolNames,
         translatorBudget: this.translatorBudget,
         contextUsage,
+        wireModelId: request.modelId,
+        identityScope: request._cursorIdentityScope,
         ...(prepared.estimatedInputTokens !== undefined
           ? { estimatedInputTokens: prepared.estimatedInputTokens }
           : {}),
@@ -1265,6 +1268,7 @@ class LiveCursorTransport implements CursorTransport {
             state.openToolCalls.size > 0
             || this.sawAssistantText
             || hasPendingClientToolFinalization
+            || hasBufferedTextToolCalls(state)
           )
         ) {
           const terminal = hasPendingClientToolFinalization && state.openToolCalls.size === 0
@@ -1431,7 +1435,7 @@ class LiveCursorTransport implements CursorTransport {
           settler.settleFinish();
           return;
         }
-        if (this.framesReceived > 0 && this.sawAssistantText) {
+        if (this.framesReceived > 0 && (this.sawAssistantText || hasBufferedTextToolCalls(state))) {
           for (const event of finalizeTurnEvents(state)) push(event);
           releaseBacklogLease();
           settler.settleFinish();