@bitkyc08/opencodex 2.95.0 → 2.97.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.
- package/bin/ocx.mjs +214 -19
- package/gui/dist/assets/{App-8yedBkhm.js → App-DuNhggE1.js} +18 -18
- package/gui/dist/assets/{Tray-erSMzxPG.js → Tray-CEw0y0jR.js} +1 -1
- package/gui/dist/assets/index-CynE_Rue.js +94 -0
- package/gui/dist/assets/{quota-summary-BK4VuQNc.js → quota-summary-VHFSlUuM.js} +1 -1
- package/gui/dist/index.html +1 -1
- package/package.json +1 -1
- package/src/adapters/command-code.ts +15 -16
- package/src/adapters/cursor/transport-retry.ts +2 -2
- package/src/adapters/devin/cloud-direct/chat.ts +15 -6
- package/src/adapters/kiro/stream.ts +63 -4
- package/src/adapters/kiro-constants.ts +15 -1
- package/src/adapters/kiro-events.ts +31 -1
- package/src/adapters/kiro-retry.ts +3 -3
- package/src/adapters/ollama-native.ts +21 -7
- package/src/adapters/openai-responses/canonical-forward.ts +50 -13
- package/src/adapters/openai-responses/empty-assistant.ts +15 -3
- package/src/adapters/openai-responses/passthrough.ts +8 -8
- package/src/adapters/openai-responses/reasoning.ts +9 -4
- package/src/adapters/openai-responses/request-strips.ts +1 -1
- package/src/adapters/openai-responses/transport.ts +17 -26
- package/src/adapters/physical-send.ts +3 -3
- package/src/adapters/qoder/adapter.ts +1 -1
- package/src/adapters/qoder/image-input.ts +5 -2
- package/src/adapters/zed-openai-stream.ts +2 -1
- package/src/bridge/errors.ts +11 -2
- package/src/bridge/response-json.ts +2 -1
- package/src/bridge/sse.ts +14 -6
- package/src/chat/failure-verdict.ts +21 -0
- package/src/chat/outbound.ts +139 -21
- package/src/claude/outbound.ts +49 -2
- package/src/cli/agent.ts +44 -15
- package/src/cli/capabilities-agents-routing.ts +9 -0
- package/src/cli/capabilities-base.ts +25 -3
- package/src/cli/capabilities-command.ts +12 -3
- package/src/cli/capability-contracts.ts +2 -0
- package/src/cli/codex-launch-auth.ts +30 -1
- package/src/cli/codex-launcher.ts +12 -5
- package/src/cli/codex-shim-autorestore.ts +5 -4
- package/src/cli/dispatch.ts +11 -176
- package/src/cli/ensure-desired-integrations.ts +4 -3
- package/src/cli/help.ts +2 -2
- package/src/cli/index.ts +9 -2
- package/src/cli/link.ts +1 -1
- package/src/cli/message-command.ts +2 -1
- package/src/cli/message-mcp-command.ts +29 -0
- package/src/cli/registry.ts +12 -4
- package/src/cli/root.ts +8 -0
- package/src/cli/sync-command.ts +243 -0
- package/src/cli/sync-fanout-process.ts +92 -0
- package/src/cli/sync-fanout.ts +150 -0
- package/src/cli/sync-flags.ts +10 -0
- package/src/cli/sync-link-status.ts +39 -0
- package/src/cli/sync-update-guard.ts +18 -0
- package/src/client/connect.ts +31 -14
- package/src/client/link-home.ts +3 -2
- package/src/client/machine-listener.ts +3 -0
- package/src/client/restore-ownership.ts +19 -1
- package/src/client/runtime-restart.ts +12 -4
- package/src/client/runtime.ts +40 -11
- package/src/client/stop-routing.ts +62 -0
- package/src/client/sync-runtime.ts +65 -0
- package/src/clients/config-export.ts +32 -3
- package/src/codex/account-store.ts +1 -0
- package/src/codex/auth-context-provider.ts +15 -0
- package/src/codex/auth-context.ts +59 -122
- package/src/codex/catalog/antigravity-discovery.ts +16 -5
- package/src/codex/catalog/provider-models.ts +6 -8
- package/src/codex/forward-transport-headers.ts +65 -36
- package/src/codex/inject/config-toml.ts +88 -0
- package/src/codex/inject/multi-agent-v2.ts +30 -4
- package/src/codex/inject/plan.ts +34 -7
- package/src/codex/inject-coordination.ts +11 -0
- package/src/codex/inject.ts +18 -7
- package/src/codex/installation-id.ts +72 -0
- package/src/codex/lineage.ts +13 -7
- package/src/codex/quota.ts +22 -6
- package/src/codex/request-owned-affinity-key.ts +11 -0
- package/src/codex/request-owned-affinity.ts +118 -0
- package/src/codex/request-owned-main-pin.ts +86 -0
- package/src/codex/role-capability.ts +52 -41
- package/src/codex/routing/active-account.ts +13 -5
- package/src/codex/routing/selection.ts +40 -1
- package/src/codex/routing/thread-affinity-store.ts +916 -0
- package/src/codex/routing/thread-affinity.ts +90 -12
- package/src/codex/toml-source-lines.ts +72 -13
- package/src/combos/failover.ts +6 -109
- package/src/combos/request.ts +2 -2
- package/src/combos/resolve.ts +29 -11
- package/src/config/process-state.ts +5 -0
- package/src/config/schema/leaf-validators.ts +1 -0
- package/src/generated/compatibility-version.json +496 -192
- package/src/grok/sync.ts +10 -1
- package/src/images/loop.ts +2 -1
- package/src/lib/client-error-body.ts +184 -0
- package/src/lib/client-retry-after.ts +66 -0
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/context-overflow-verdict.ts +113 -0
- package/src/lib/desktop-cli-handoff.d.mts +1 -1
- package/src/lib/desktop-cli-handoff.mjs +11 -1
- package/src/lib/empty-tool-catalog.ts +25 -3
- package/src/lib/error-destination.ts +47 -0
- package/src/lib/failure-detail.ts +66 -0
- package/src/lib/model-identity.ts +44 -0
- package/src/lib/private-sqlite-path.ts +124 -0
- package/src/lib/response-service-tier.ts +17 -0
- package/src/lib/retry-after.ts +3 -0
- package/src/lib/spend-ledger-owner.ts +43 -4
- package/src/lib/upstream-condition.ts +142 -0
- package/src/lib/upstream-retry.ts +14 -11
- package/src/lib/windows-owner-acl.ts +13 -6
- package/src/lib/windows-secret-acl.ts +2 -2
- package/src/link/remote-platform.ts +14 -0
- package/src/link/remote-windows.ts +51 -9
- package/src/link/ssh-argv.ts +63 -10
- package/src/messaging/mcp-queue-rpc.ts +102 -0
- package/src/messaging/mcp-queue-server.ts +42 -0
- package/src/messaging/mcp-queue-tools.ts +39 -0
- package/src/oauth/anthropic-identity.ts +2 -6
- package/src/oauth/generic-account-failover.ts +13 -11
- package/src/oauth/index.ts +41 -74
- package/src/oauth/oauth-errors.ts +67 -0
- package/src/oauth/store.ts +1 -1
- package/src/protocols/codecs/ollama.ts +197 -0
- package/src/protocols/encoders/adapter-events.ts +4 -0
- package/src/protocols/encoders/chat.ts +18 -10
- package/src/protocols/trace.ts +18 -0
- package/src/providers/anthropic-subscription.ts +25 -0
- package/src/providers/claude-cli-usage.ts +15 -67
- package/src/providers/fastwire.ts +3 -2
- package/src/providers/quota/anthropic-decision-windows.ts +5 -19
- package/src/providers/quota/anthropic-usage-windows.ts +65 -0
- package/src/providers/quota/vendor-probes-key.ts +60 -24
- package/src/providers/request-pacing.ts +3 -2
- package/src/responses/apply-patch-envelope.ts +45 -19
- package/src/responses/compaction-history-framing.ts +5 -1
- package/src/responses/freeform-wrapper-scan.ts +5 -3
- package/src/responses/parser-tools.ts +1 -0
- package/src/responses/progressive-freeform-input.ts +354 -45
- package/src/responses/schema.ts +5 -2
- package/src/routing/fallback-policy.ts +3 -1
- package/src/server/admission-model-scope.ts +17 -6
- package/src/server/admitted-http-turn.ts +56 -0
- package/src/server/audio-dictation.ts +3 -0
- package/src/server/audio-live.ts +8 -2
- package/src/server/audio-upstream.ts +2 -0
- package/src/server/auth-cors.ts +5 -0
- package/src/server/chat-completions.ts +45 -20
- package/src/server/chat-native-sse.ts +52 -7
- package/src/server/chat-native.ts +60 -35
- package/src/server/claude-bridge-pool-session.ts +59 -0
- package/src/server/claude-messages.ts +57 -27
- package/src/server/context-history.ts +14 -7
- package/src/server/images.ts +14 -5
- package/src/server/inbound-body-admission.ts +11 -4
- package/src/server/index/live-sideband.ts +16 -2
- package/src/server/index/ollama-routes.ts +89 -0
- package/src/server/index/serve-options.ts +22 -4
- package/src/server/index/websocket-handler.ts +5 -3
- package/src/server/index.ts +6 -36
- package/src/server/inference/client-encoder-delivery.ts +4 -2
- package/src/server/json-serialized-bytes.ts +44 -0
- package/src/server/live.ts +30 -5
- package/src/server/management/agent-settings-routes.ts +24 -21
- package/src/server/management/codex-cli-update-routes.ts +2 -1
- package/src/server/management/route-registry.ts +1 -1
- package/src/server/messages-native-scope.ts +2 -1
- package/src/server/messages-native-tool-guard.ts +1 -1
- package/src/server/messages-native.ts +12 -7
- package/src/server/messages-shared.ts +6 -2
- package/src/server/native-final-log.ts +93 -0
- package/src/server/ollama-inbound.ts +349 -0
- package/src/server/ollama-native-paths.ts +21 -0
- package/src/server/ollama-route-policy.ts +73 -0
- package/src/server/relay.ts +22 -3
- package/src/server/request-decompress.ts +4 -2
- package/src/server/request-log-failure-attribution.ts +22 -0
- package/src/server/request-log-failure-detail.ts +80 -0
- package/src/server/request-log-terminal-status.ts +4 -2
- package/src/server/request-log.ts +79 -42
- package/src/server/response-log-body.ts +6 -1
- package/src/server/responses/account-change-state.ts +17 -6
- package/src/server/responses/adapter-continuation.ts +9 -4
- package/src/server/responses/adapter-delivery.ts +5 -4
- package/src/server/responses/adapter-dispatch.ts +36 -30
- package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
- package/src/server/responses/codex-auth-error.ts +22 -17
- package/src/server/responses/codex-ws-exchange.ts +11 -8
- package/src/server/responses/codex-ws-metadata.ts +94 -21
- package/src/server/responses/codex-ws-request.ts +3 -1
- package/src/server/responses/combo-required-tool-contract.ts +24 -12
- package/src/server/responses/compact.ts +89 -41
- package/src/server/responses/compaction-recovery.ts +4 -2
- package/src/server/responses/compaction-routing.ts +9 -4
- package/src/server/responses/core-auth.ts +32 -14
- package/src/server/responses/core-codex-account.ts +34 -12
- package/src/server/responses/core-combo-failure.ts +5 -1
- package/src/server/responses/core-combo-native.ts +2 -1
- package/src/server/responses/core-combo.ts +51 -33
- package/src/server/responses/core-errors.ts +22 -20
- package/src/server/responses/core-lifetime.ts +6 -3
- package/src/server/responses/core-normalize.ts +8 -1
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/core-pipeline.ts +4 -3
- package/src/server/responses/fetch-helpers.ts +7 -1
- package/src/server/responses/input-admission.ts +28 -2
- package/src/server/responses/native-injection.ts +1 -1
- package/src/server/responses/native-response-json.ts +13 -4
- package/src/server/responses/native-response-output.ts +1 -2
- package/src/server/responses/non-replayable-error.ts +2 -1
- package/src/server/responses/pacing-overload.ts +3 -2
- package/src/server/responses/passthrough-build-error.ts +36 -0
- package/src/server/responses/passthrough-delivery.ts +55 -14
- package/src/server/responses/passthrough-dispatch.ts +26 -39
- package/src/server/responses/passthrough-error.ts +9 -9
- package/src/server/responses/policy-fallback.ts +2 -1
- package/src/server/responses/request-prepare.ts +67 -48
- package/src/server/responses/request-sidecar-auth.ts +3 -1
- package/src/server/responses/request-transport.ts +35 -31
- package/src/server/responses/run-turn-execution.ts +6 -6
- package/src/server/responses/sidecar-execution.ts +16 -12
- package/src/server/responses/spend-storage-error.ts +2 -1
- package/src/server/responses/ws-upstream.ts +9 -0
- package/src/server/responses-custom-tool-repair.ts +14 -3
- package/src/server/responses-terminal-repair.ts +5 -2
- package/src/server/responses-undeclared-tool-guard.ts +39 -16
- package/src/server/safe-response-headers.ts +162 -13
- package/src/server/search.ts +13 -4
- package/src/server/turn-state-handles.ts +164 -0
- package/src/server/workflow-refusal.ts +2 -1
- package/src/server/ws-bridge.ts +5 -2
- package/src/service/ownership-mutation-lease.d.mts +11 -2
- package/src/service/ownership-mutation-lease.mjs +53 -11
- package/src/types/config.ts +2 -0
- package/src/update/index.ts +133 -25
- package/src/update/npm-install.d.mts +8 -0
- package/src/update/npm-install.mjs +20 -1
- package/src/update/orchestrated-admission.d.mts +4 -0
- package/src/update/orchestrated-admission.mjs +12 -0
- package/src/update/orchestrated-arguments.d.mts +12 -0
- package/src/update/orchestrated-arguments.mjs +64 -0
- package/src/update/orchestrated-child.d.mts +12 -0
- package/src/update/orchestrated-child.mjs +70 -0
- package/src/update/orchestrated-entry.ts +234 -0
- package/src/update/orchestrated-identity-probe-entry.ts +20 -0
- package/src/update/orchestrated-identity.ts +53 -0
- package/src/update/orchestrated-live-identity.ts +48 -0
- package/src/update/orchestrated-node-driver.mjs +99 -0
- package/src/update/orchestrated-outcome.d.mts +21 -0
- package/src/update/orchestrated-outcome.mjs +40 -0
- package/src/update/orchestrated-plan.ts +49 -0
- package/src/update/orchestrated-pnpm.d.mts +8 -0
- package/src/update/orchestrated-pnpm.mjs +33 -0
- package/src/update/orchestrated-session.d.mts +37 -0
- package/src/update/orchestrated-session.mjs +264 -0
- package/src/update/orchestrated-token.d.mts +10 -0
- package/src/update/orchestrated-token.mjs +21 -0
- package/src/update/orchestrated-token.ts +3 -0
- package/src/update/orchestrated-tree.d.mts +1 -0
- package/src/update/orchestrated-tree.mjs +14 -0
- package/src/update/pnpm-global-install.d.mts +6 -0
- package/src/update/pnpm-global-install.mjs +9 -2
- package/src/update/posix-install-supervisor-entry.mjs +6 -0
- package/src/update/posix-install-supervisor.d.mts +10 -0
- package/src/update/posix-install-supervisor.mjs +88 -0
- package/src/update/sync-update-mutex.d.mts +10 -0
- package/src/update/sync-update-mutex.mjs +164 -0
- package/src/update/sync-update-mutex.ts +1 -0
- package/src/update/test-home-guard.mjs +33 -0
- package/src/update/transactional-install.mjs +2 -2
- package/src/usage/error-detail.ts +225 -0
- package/src/usage/log.ts +60 -27
- package/src/vision/describe.ts +4 -7
- package/src/web-search/executor.ts +4 -7
- package/src/web-search/loop.ts +31 -5
- package/gui/dist/assets/index-D7DCm5eQ.js +0 -94
package/src/vision/describe.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { OcxProviderConfig } from "../types";
|
|
2
2
|
import type { VisionReasoningEffort } from "../reasoning-effort";
|
|
3
|
-
import {
|
|
3
|
+
import { mergeCodexSelectedHeaders } from "../codex/forward-transport-headers";
|
|
4
4
|
import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort";
|
|
5
5
|
import { redactSecretString } from "../lib/redact";
|
|
6
6
|
import { sidecarEnter } from "../lib/sidecar-tracker";
|
|
@@ -69,12 +69,9 @@ export async function describeImage(
|
|
|
69
69
|
const invalid = validateImageUrl(imageUrl);
|
|
70
70
|
if (invalid) return { text: "", error: invalid };
|
|
71
71
|
|
|
72
|
-
const headers
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const v = selectedForwardHeaders.get(h);
|
|
76
|
-
if (v) headers[h] = v;
|
|
77
|
-
}
|
|
72
|
+
const headers = Object.fromEntries(mergeCodexSelectedHeaders(
|
|
73
|
+
{ "Content-Type": "application/json", ...forwardProvider.headers }, selectedForwardHeaders,
|
|
74
|
+
));
|
|
78
75
|
const content: unknown[] = [];
|
|
79
76
|
if (contextText) content.push({ type: "input_text", text: `The user's request about this image: ${contextText}` });
|
|
80
77
|
content.push({ type: "input_image", image_url: imageUrl, detail: detail ?? "high" });
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { OcxProviderConfig } from "../types";
|
|
2
|
-
import {
|
|
2
|
+
import { mergeCodexSelectedHeaders } from "../codex/forward-transport-headers";
|
|
3
3
|
import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort";
|
|
4
4
|
import { redactSecretString } from "../lib/redact";
|
|
5
5
|
import { sidecarEnter } from "../lib/sidecar-tracker";
|
|
@@ -84,12 +84,9 @@ export async function runWebSearch(
|
|
|
84
84
|
if (settings.reserveCompatibility && settings.model === NATIVE_RESERVE_MODEL) {
|
|
85
85
|
return { text: "", sources: [], error: "Luna Reserve compatibility is only available as a conversation model, not a search helper. Choose another search helper model." };
|
|
86
86
|
}
|
|
87
|
-
const headers
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
const v = selectedForwardHeaders.get(h);
|
|
91
|
-
if (v) headers[h] = v;
|
|
92
|
-
}
|
|
87
|
+
const headers = Object.fromEntries(mergeCodexSelectedHeaders(
|
|
88
|
+
{ "Content-Type": "application/json", ...forwardProvider.headers }, selectedForwardHeaders,
|
|
89
|
+
));
|
|
93
90
|
const body = {
|
|
94
91
|
model: settings.model,
|
|
95
92
|
instructions: settings.describeImages ? BASE_INSTRUCTION + IMAGE_INSTRUCTION : BASE_INSTRUCTION,
|
package/src/web-search/loop.ts
CHANGED
|
@@ -14,7 +14,7 @@ import { bridgeToResponsesSSE } from "../bridge";
|
|
|
14
14
|
import { guardEmptyToolCatalogStream, type ClientToolCatalogRestriction } from "../lib/empty-tool-catalog";
|
|
15
15
|
import { mergeUsage } from "../server/responses/empty-completion-guard";
|
|
16
16
|
import { markSidecarContextOverflow, sidecarLoopTerminalEvent, upstreamErrorCode, type SidecarLoopFailure } from "../server/responses/context-overflow";
|
|
17
|
-
import { markVerifiedModelNotInPlanResponse, MODEL_NOT_IN_PLAN_CODE, verifiedPlanRefusalMessage } from "../lib/errors";
|
|
17
|
+
import { markVerifiedModelNotInPlanResponse, MODEL_NOT_IN_PLAN_CODE, UNDECLARED_TOOL_CALL_ERROR_CODE, verifiedPlanRefusalMessage } from "../lib/errors";
|
|
18
18
|
import { runWebSearch, type SidecarOutcome, type SidecarOutcomeRecorder, type SidecarSettings } from "./executor";
|
|
19
19
|
import { runAnthropicWebSearch } from "./anthropic-executor";
|
|
20
20
|
import { runXaiWebSearch, type XaiSearchOptions } from "./xai-executor";
|
|
@@ -90,7 +90,7 @@ function parseQueries(argsBuf: string): string[] {
|
|
|
90
90
|
* (Codex never sees the synthetic tool); every other event — text, thinking, real tool calls, done —
|
|
91
91
|
* is preserved in order.
|
|
92
92
|
*/
|
|
93
|
-
export function scanEventsForWebSearch(events: AdapterEvent[], options: { advisor?: boolean } = {}): {
|
|
93
|
+
export function scanEventsForWebSearch(events: AdapterEvent[], options: { advisor?: boolean; clientAdvisorAllowed?: boolean } = {}): {
|
|
94
94
|
calls: WebSearchCall[];
|
|
95
95
|
passthrough: AdapterEvent[];
|
|
96
96
|
hasRealToolCall: boolean;
|
|
@@ -100,6 +100,7 @@ export function scanEventsForWebSearch(events: AdapterEvent[], options: { adviso
|
|
|
100
100
|
const passthrough: AdapterEvent[] = [];
|
|
101
101
|
let hasRealToolCall = false;
|
|
102
102
|
let hasMalformedToolCall = false;
|
|
103
|
+
let refusal: Extract<AdapterEvent, { type: "error" }> | undefined;
|
|
103
104
|
let pending: { name: string; id: string; argsBuf: string; closed: boolean; events: AdapterEvent[]; providerMetadata?: OcxProviderOpaqueToolCallMetadata } | null = null;
|
|
104
105
|
const isBlank = (value: string): boolean => value.trim().length === 0;
|
|
105
106
|
const flushPending = (): void => {
|
|
@@ -113,8 +114,18 @@ export function scanEventsForWebSearch(events: AdapterEvent[], options: { adviso
|
|
|
113
114
|
pending = null;
|
|
114
115
|
};
|
|
115
116
|
for (const e of events) {
|
|
117
|
+
if (refusal) {
|
|
118
|
+
if ((e.type === "done" || e.type === "incomplete" || e.type === "error") && e.usage) refusal.usage = e.usage;
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
116
121
|
if (e.type === "tool_call_start") {
|
|
117
122
|
flushPending();
|
|
123
|
+
if (e.name === ADVISOR_TOOL_NAME && !options.advisor && !options.clientAdvisorAllowed) {
|
|
124
|
+
refusal = { type: "error", status: 502, errorType: "upstream_error", code: UNDECLARED_TOOL_CALL_ERROR_CODE,
|
|
125
|
+
message: "routed provider emitted advisor outside the current iteration's permitted tool catalog" };
|
|
126
|
+
passthrough.push(refusal);
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
118
129
|
if (isBlank(e.id) || isBlank(e.name)) hasMalformedToolCall = true;
|
|
119
130
|
pending = { name: e.name, id: e.id, argsBuf: "", closed: false, events: [e], providerMetadata: e.providerMetadata };
|
|
120
131
|
} else if (e.type === "tool_call_delta") {
|
|
@@ -400,6 +411,7 @@ export interface WebSearchLoopDeps {
|
|
|
400
411
|
onFirstOutput?: () => void;
|
|
401
412
|
/** Raw adapter usage at the terminal event, pre wire-normalization (see bridgeToResponsesSSE onUsage). */
|
|
402
413
|
onUsage?: (usage: OcxUsage | undefined) => void;
|
|
414
|
+
proxyErrorContext?: object;
|
|
403
415
|
/**
|
|
404
416
|
* After an `on429` rotation, offered the usage of the hidden iterations the left credential
|
|
405
417
|
* served. Returning true means it was billed to that credential's attempt, so `onUsage` will not
|
|
@@ -513,6 +525,8 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
|
|
|
513
525
|
interface IterationResponse {
|
|
514
526
|
response: Response;
|
|
515
527
|
responseAdapter: ProviderAdapter;
|
|
528
|
+
clientAdvisorAllowed: boolean;
|
|
529
|
+
syntheticAdvisorAllowed: boolean;
|
|
516
530
|
recover?: (error: WebSearchAdapterEventError) => Promise<IterationResponse | undefined>;
|
|
517
531
|
}
|
|
518
532
|
type IterationSplit = ReturnType<typeof scanEventsForWebSearch> & {
|
|
@@ -692,7 +706,19 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
|
|
|
692
706
|
request.releaseBodyObservation?.();
|
|
693
707
|
}
|
|
694
708
|
bindAnthropicRejectionResponse(request, response);
|
|
695
|
-
|
|
709
|
+
const iterTools = iterParsed.context.tools ?? [];
|
|
710
|
+
const toolAllowed = toolChoiceToolPredicate(iterParsed.options.toolChoice, iterTools);
|
|
711
|
+
const clientAdvisorAllowed = iterTools.some(tool => !tool.advisor && !tool.namespace
|
|
712
|
+
&& tool.name === ADVISOR_TOOL_NAME && toolAllowed(tool));
|
|
713
|
+
const declaredAdvisor = iterTools.find(tool => tool.advisor && tool.name === ADVISOR_TOOL_NAME);
|
|
714
|
+
// Exhaustion removes the declaration, but its paired limit result still belongs
|
|
715
|
+
// to the sidecar. A tools-disabled recovery revokes that permission too.
|
|
716
|
+
const advisorCandidate = declaredAdvisor ?? { name: ADVISOR_TOOL_NAME };
|
|
717
|
+
const syntheticAdvisorAllowed = !!deps.advisor && !recoveringEmptyAnswer
|
|
718
|
+
&& (!!declaredAdvisor || deps.advisor.exhausted())
|
|
719
|
+
&& toolChoiceToolPredicate(iterParsed.options.toolChoice,
|
|
720
|
+
declaredAdvisor ? iterTools : [...iterTools, advisorCandidate])(advisorCandidate);
|
|
721
|
+
return { response, responseAdapter: requestAdapter, clientAdvisorAllowed, syntheticAdvisorAllowed };
|
|
696
722
|
};
|
|
697
723
|
|
|
698
724
|
const recover = async (error: WebSearchAdapterEventError): Promise<IterationResponse | undefined> => {
|
|
@@ -908,7 +934,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
|
|
|
908
934
|
throw new LoopError(502, terminal.message, terminal.code === "context_length_exceeded" ? terminal : undefined);
|
|
909
935
|
}
|
|
910
936
|
deps.thinkingRecovery?.observeIteration(events);
|
|
911
|
-
return { ...scanEventsForWebSearch(events, { advisor:
|
|
937
|
+
return { ...scanEventsForWebSearch(events, { advisor: prepared.syntheticAdvisorAllowed, clientAdvisorAllowed: prepared.clientAdvisorAllowed }), streamedPassthroughCount, events, anthropicReplay };
|
|
912
938
|
};
|
|
913
939
|
|
|
914
940
|
/**
|
|
@@ -1303,7 +1329,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
|
|
|
1303
1329
|
internalAbort.abort("client closed responses stream");
|
|
1304
1330
|
}, undefined,
|
|
1305
1331
|
{
|
|
1306
|
-
translatorBudget,
|
|
1332
|
+
translatorBudget, proxyErrorContext: deps.proxyErrorContext,
|
|
1307
1333
|
replayCacheScope: parsed._reasoningReplayScope,
|
|
1308
1334
|
...(deps.clientToolCatalogRestriction ? { ...deps.clientToolCatalogRestriction, enforceDeclaredToolNames: false } : {}),
|
|
1309
1335
|
...(deps.forceEmptyResponseId ? { responseId: "" } : {}),
|