@bitkyc08/opencodex 2.94.0 → 2.95.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/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-erSMzxPG.js} +1 -1
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +1 -1
- package/package.json +1 -1
- package/src/adapters/anthropic.ts +10 -3
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/kiro/adapter.ts +4 -1
- package/src/adapters/kiro/stream.ts +1 -0
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/messages.ts +20 -7
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +42 -7
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +7 -7
- package/src/adapters/zed.ts +1 -6
- package/src/advisor/consult.ts +22 -10
- package/src/advisor/runtime.ts +10 -4
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +9 -4
- package/src/bridge/sse.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/cli/account-main.ts +3 -2
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/codex-launcher.ts +20 -8
- package/src/cli/codex-shim-autorestore.ts +19 -1
- package/src/cli/dispatch.ts +6 -6
- package/src/cli/doctor.ts +5 -5
- package/src/cli/index.ts +4 -9
- package/src/cli/init.ts +2 -2
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +5 -0
- package/src/cli/registry.ts +1 -0
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +6 -6
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/v2.ts +69 -19
- package/src/client/machine-api.ts +2 -2
- package/src/clients/config-export.ts +14 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +4 -4
- package/src/codex/catalog/bundled.ts +10 -3
- package/src/codex/catalog/metadata.ts +4 -5
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +2 -1
- package/src/codex/catalog/retained-sync.ts +15 -5
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/cli-install-provenance.ts +46 -45
- package/src/codex/cli-update-artifacts.ts +8 -6
- package/src/codex/cli-update-job-store-windows.ts +99 -27
- package/src/codex/cli-update-job-worker.ts +3 -11
- package/src/codex/cli-update-recovery.ts +54 -8
- package/src/codex/cli-update-selection-gate.ts +74 -4
- package/src/codex/cli-windows-plan-provenance.ts +37 -19
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +11 -1
- package/src/codex/exec-boundary.ts +26 -5
- package/src/codex/history-provider.ts +11 -10
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/main-account.ts +6 -6
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +49 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +43 -3
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-wrapper-write.ts +7 -6
- package/src/codex/shim.ts +25 -2
- package/src/codex/transition-state.ts +5 -4
- package/src/combos/failover.ts +43 -4
- package/src/config/atomic-write.ts +38 -7
- package/src/config/diagnostics.ts +3 -0
- package/src/config/initialize.ts +6 -6
- package/src/config/load-degrade.ts +2 -0
- package/src/config/process-state.ts +23 -5
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +29 -1
- package/src/config/schema/leaf-validators.ts +7 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/generated/compatibility-version.json +313 -213
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/windows-secret-acl.ts +47 -29
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/local-credentials/generation.ts +6 -2
- package/src/local-credentials/inventory.ts +132 -8
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/google-antigravity.ts +23 -10
- package/src/oauth/index.ts +2 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +9 -7
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/derive.ts +6 -0
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +5 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/remote-control/workspace-codex-runtime.ts +2 -2
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +29 -0
- package/src/server/auth-cors.ts +5 -2
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +33 -7
- package/src/server/claude-messages.ts +90 -2
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/index/serve-options.ts +12 -2
- package/src/server/index/websocket-handler.ts +3 -0
- package/src/server/management/agent-settings-routes.ts +34 -9
- package/src/server/management/codex-agent-role-routes.ts +1 -0
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +15 -4
- package/src/server/management/context.ts +3 -0
- package/src/server/management/native-integration-routes.ts +22 -0
- package/src/server/management/oauth-account-routes.ts +20 -4
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +2 -0
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-shared.ts +57 -17
- package/src/server/persistent-gui-session.ts +4 -4
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/advisor-plan-slot.ts +4 -0
- package/src/server/responses/advisor-slot.ts +73 -46
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +27 -0
- package/src/server/responses/compact.ts +4 -1
- package/src/server/responses/core-combo-failure.ts +2 -0
- package/src/server/responses/core-combo.ts +66 -5
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +9 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/jev-model-invoke.ts +4 -2
- package/src/server/responses/passthrough-dispatch.ts +5 -4
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +4 -5
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +2 -3
- package/src/server/responses/run-turn-execution.ts +4 -0
- package/src/server/responses/sidecar-execution.ts +21 -5
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/state-lock.ts +12 -11
- package/src/service-manager-probe.ts +53 -8
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +25 -0
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +7 -0
- package/src/types.ts +1 -0
- package/src/update/job.ts +20 -0
- package/src/update/worker-launch.ts +71 -1
- package/src/usage/log.ts +25 -4
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/loop.ts +104 -9
- package/src/web-search/parse.ts +10 -2
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/App-DmvwlhQq.js +0 -58
- package/gui/dist/assets/index-3EPO_KbX.js +0 -94
- package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
|
@@ -3,6 +3,7 @@ import { EMPTY_TOOL_OUTPUT_ANNOTATION, isWhitespaceOnlyTextPartArray } from "../
|
|
|
3
3
|
import { isPlainObject } from "./internal";
|
|
4
4
|
import { peekBridgeSearchReplay } from "../../responses/bridge-search-replay-cache";
|
|
5
5
|
import { externalTaskInputResponsesContent } from "../../responses/task-input";
|
|
6
|
+
import { copyItemProvenance } from "../../responses/item-provenance";
|
|
6
7
|
|
|
7
8
|
const MAX_RESPONSES_CALL_ID_LENGTH = 64;
|
|
8
9
|
|
|
@@ -336,7 +337,7 @@ export function restoreBridgedWebSearchCalls(body: unknown, destinationScope: st
|
|
|
336
337
|
if (memo && !occupiedCallIds.has(memo.callId)) {
|
|
337
338
|
changed = true;
|
|
338
339
|
occupiedCallIds.add(memo.callId);
|
|
339
|
-
|
|
340
|
+
const fnCall: Record<string, unknown> = {
|
|
340
341
|
type: "function_call",
|
|
341
342
|
...(memo.sourceItemId ? { id: memo.sourceItemId } : {}),
|
|
342
343
|
call_id: memo.callId,
|
|
@@ -344,8 +345,16 @@ export function restoreBridgedWebSearchCalls(body: unknown, destinationScope: st
|
|
|
344
345
|
// The bridge records the complete arguments text from the call's own done frame; the
|
|
345
346
|
// empty-object fallback matches what a continuation leg would have sent.
|
|
346
347
|
arguments: memo.argumentsText.length > 0 ? memo.argumentsText : "{}",
|
|
347
|
-
}
|
|
348
|
-
|
|
348
|
+
};
|
|
349
|
+
const fnOutput: Record<string, unknown> = {
|
|
350
|
+
type: "function_call_output",
|
|
351
|
+
call_id: memo.callId,
|
|
352
|
+
output: memo.output,
|
|
353
|
+
};
|
|
354
|
+
copyItemProvenance(item, fnCall);
|
|
355
|
+
copyItemProvenance(item, fnOutput);
|
|
356
|
+
restored.push(fnCall);
|
|
357
|
+
restored.push(fnOutput);
|
|
349
358
|
continue;
|
|
350
359
|
}
|
|
351
360
|
}
|
|
@@ -397,7 +406,7 @@ export function repairOrphanedInputItems(
|
|
|
397
406
|
const taskInput = isFnOutput && !hasStringCallId ? externalTaskInputResponsesContent(item) : undefined;
|
|
398
407
|
if (taskInput) {
|
|
399
408
|
changed = true;
|
|
400
|
-
repaired.push({ type: "message", role: "user", content: taskInput });
|
|
409
|
+
repaired.push(copyItemProvenance(item, { type: "message", role: "user", content: taskInput }));
|
|
401
410
|
continue;
|
|
402
411
|
}
|
|
403
412
|
const callId = typeof item.call_id === "string" ? item.call_id : "";
|
|
@@ -409,11 +418,13 @@ export function repairOrphanedInputItems(
|
|
|
409
418
|
const knownNullOutput = callId.length > 0 && item.output == null;
|
|
410
419
|
if (repairOrphanOutputs && !paired && (knownNullOutput || usableOutput)) {
|
|
411
420
|
changed = true;
|
|
412
|
-
|
|
421
|
+
const msg: Record<string, unknown> = {
|
|
413
422
|
type: "message",
|
|
414
423
|
role: "user",
|
|
415
424
|
content: orphanedToolOutputContent(item.output, callId),
|
|
416
|
-
}
|
|
425
|
+
};
|
|
426
|
+
copyItemProvenance(item, msg);
|
|
427
|
+
repaired.push(msg);
|
|
417
428
|
continue;
|
|
418
429
|
}
|
|
419
430
|
}
|
|
@@ -429,9 +440,11 @@ export function repairOrphanedInputItems(
|
|
|
429
440
|
const name = typeof item.name === "string" && item.name.length > 0 ? item.name : callId;
|
|
430
441
|
const text = `[ocx] no tool result was recorded for "${name}"; execution status unknown — do not treat this as success, failure, or user-provided input.`;
|
|
431
442
|
syntheticKeys.add(`${isFnCall ? "function" : "custom"}:${callId}`);
|
|
432
|
-
|
|
443
|
+
const synthetic: Record<string, unknown> = isFnCall
|
|
433
444
|
? { type: "function_call_output", call_id: callId, output: text }
|
|
434
|
-
: { type: "custom_tool_call_output", call_id: callId, output: text }
|
|
445
|
+
: { type: "custom_tool_call_output", call_id: callId, output: text };
|
|
446
|
+
copyItemProvenance(item, synthetic);
|
|
447
|
+
pendingSyntheticOutputs.push(synthetic);
|
|
435
448
|
}
|
|
436
449
|
}
|
|
437
450
|
continue;
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
XaiToolSchemaCompatibilityError,
|
|
9
9
|
} from "../xai-tool-schema";
|
|
10
10
|
import { isPlainObject } from "./internal";
|
|
11
|
+
import { hasItemProvenance, isHistoricalItem } from "../../responses/item-provenance";
|
|
11
12
|
|
|
12
13
|
function normalizeFunctionToolSchema(tool: unknown, xaiTarget: boolean): unknown | undefined {
|
|
13
14
|
if (!isPlainObject(tool) || tool.type !== "function") return tool;
|
|
@@ -195,11 +196,19 @@ function mergeLoadedTools(declaredTools: unknown[], loadedTools: unknown[]): unk
|
|
|
195
196
|
* serializing the raw request, so activate those returned definitions for upstreams that do not
|
|
196
197
|
* implement the native deferred-loading handshake themselves.
|
|
197
198
|
*/
|
|
198
|
-
export function promoteClientLoadedTools(body: unknown): unknown {
|
|
199
|
+
export function promoteClientLoadedTools(body: unknown, replayPrefixLength?: number): unknown {
|
|
199
200
|
if (!isPlainObject(body) || !Array.isArray(body.input)) return body;
|
|
200
201
|
|
|
201
|
-
const
|
|
202
|
-
|
|
202
|
+
const currentTurnStart = Number.isFinite(replayPrefixLength)
|
|
203
|
+
? Math.max(0, Math.trunc(replayPrefixLength!))
|
|
204
|
+
: 0;
|
|
205
|
+
const hasProvenance = body.input.some(hasItemProvenance);
|
|
206
|
+
const isCurrentItem = (item: unknown, index: number): boolean =>
|
|
207
|
+
hasProvenance ? !isHistoricalItem(item) : index >= currentTurnStart;
|
|
208
|
+
|
|
209
|
+
// Filter the source before declarations lose their item's provenance in a live catalog.
|
|
210
|
+
const loadedTools = body.input.flatMap((item, index) =>
|
|
211
|
+
isCurrentItem(item, index) && isPlainObject(item) && item.type === "tool_search_output" && Array.isArray(item.tools)
|
|
203
212
|
? item.tools
|
|
204
213
|
: []
|
|
205
214
|
);
|
|
@@ -210,17 +219,20 @@ export function promoteClientLoadedTools(body: unknown): unknown {
|
|
|
210
219
|
return tools === body.tools ? body : { ...body, tools };
|
|
211
220
|
}
|
|
212
221
|
|
|
213
|
-
const
|
|
214
|
-
isPlainObject(item) && item.type === "additional_tools" && Array.isArray(item.tools)
|
|
222
|
+
const currentAdditionalToolsIndex = body.input.findIndex((item, index) =>
|
|
223
|
+
isCurrentItem(item, index) && isPlainObject(item) && item.type === "additional_tools" && Array.isArray(item.tools)
|
|
215
224
|
);
|
|
216
|
-
if (additionalToolsIndex < 0) return { ...body, tools: mergeLoadedTools([], loadedTools) };
|
|
217
225
|
|
|
218
|
-
|
|
226
|
+
if (currentAdditionalToolsIndex < 0) {
|
|
227
|
+
return { ...body, tools: mergeLoadedTools([], loadedTools) };
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
const additionalTools = body.input[currentAdditionalToolsIndex];
|
|
219
231
|
if (!isPlainObject(additionalTools) || !Array.isArray(additionalTools.tools)) return body;
|
|
220
232
|
const tools = mergeLoadedTools(additionalTools.tools, loadedTools);
|
|
221
233
|
if (tools === additionalTools.tools) return body;
|
|
222
234
|
const input = [...body.input];
|
|
223
|
-
input[
|
|
235
|
+
input[currentAdditionalToolsIndex] = { ...additionalTools, tools };
|
|
224
236
|
return { ...body, input };
|
|
225
237
|
}
|
|
226
238
|
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { hasItemProvenance, isHistoricalItem } from "../responses/item-provenance";
|
|
2
|
+
|
|
1
3
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
2
4
|
return !!value && typeof value === "object" && !Array.isArray(value);
|
|
3
5
|
}
|
|
@@ -20,13 +22,32 @@ export function isOpenCodeGoResponsesUrl(responseUrl: string): boolean {
|
|
|
20
22
|
&& !destination.href.includes("?") && !destination.href.includes("#");
|
|
21
23
|
}
|
|
22
24
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
const XAI_RESPONSES_HOSTS = new Set(["api.x.ai", "cli-chat-proxy.grok.com"]);
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* True when the Responses target is an official xAI endpoint (public API or Grok CLI proxy).
|
|
29
|
+
*/
|
|
30
|
+
export function isXaiResponsesUrl(responseUrl: string): boolean {
|
|
31
|
+
let destination: URL;
|
|
32
|
+
try {
|
|
33
|
+
destination = new URL(responseUrl);
|
|
34
|
+
} catch {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
return destination.protocol === "https:"
|
|
38
|
+
&& XAI_RESPONSES_HOSTS.has(destination.hostname.toLowerCase())
|
|
39
|
+
&& (destination.port === "" || destination.port === "443");
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Promotes client-loaded `additional_tools` input items into top-level `tools` and strips
|
|
44
|
+
* the wrapper from `input`. Required for gateways whose Rust/OpenAI-strict deserializer
|
|
45
|
+
* rejects unknown items in the `input` array.
|
|
46
|
+
*/
|
|
47
|
+
export function promoteResponsesAdditionalTools(
|
|
25
48
|
body: unknown,
|
|
26
|
-
responseUrl: string,
|
|
27
49
|
replayPrefixLength = 0,
|
|
28
50
|
): unknown {
|
|
29
|
-
if (!isOpenCodeGoResponsesUrl(responseUrl)) return body;
|
|
30
51
|
if (!isRecord(body) || !Array.isArray(body.input)) return body;
|
|
31
52
|
// Do not replace a malformed top-level catalog with a partial promoted one.
|
|
32
53
|
if (body.tools !== undefined && !Array.isArray(body.tools)) return body;
|
|
@@ -36,13 +57,15 @@ export function normalizeOpenCodeGoAdditionalTools(
|
|
|
36
57
|
const currentTurnStart = Number.isFinite(replayPrefixLength)
|
|
37
58
|
? Math.min(body.input.length, Math.max(0, Math.trunc(replayPrefixLength)))
|
|
38
59
|
: 0;
|
|
60
|
+
const hasProvenance = body.input.some(hasItemProvenance);
|
|
39
61
|
let changed = false;
|
|
40
62
|
for (const [index, item] of body.input.entries()) {
|
|
41
63
|
if (isRecord(item) && item.type === "additional_tools" && Array.isArray(item.tools)) {
|
|
42
64
|
changed = true;
|
|
43
65
|
// Replayed wrappers are conversation history, not authority for the current request.
|
|
44
|
-
//
|
|
45
|
-
|
|
66
|
+
// Gateways cannot accept the wrapper itself, so remove it without promoting its catalog.
|
|
67
|
+
const isHistorical = hasProvenance ? isHistoricalItem(item) : (index < currentTurnStart);
|
|
68
|
+
if (isHistorical) continue;
|
|
46
69
|
// Custom/search/namespace lowering already owns identity and deduplication. This pass
|
|
47
70
|
// only moves declarations, including hosted tools that intentionally have no name.
|
|
48
71
|
for (const tool of item.tools) promoted.push(tool);
|
|
@@ -52,3 +75,13 @@ export function normalizeOpenCodeGoAdditionalTools(
|
|
|
52
75
|
}
|
|
53
76
|
return changed ? { ...body, input, tools: [...(body.tools ?? []), ...promoted] } : body;
|
|
54
77
|
}
|
|
78
|
+
|
|
79
|
+
/** Console Go accepts public tools but rejects the private additional_tools input wrapper. */
|
|
80
|
+
export function normalizeOpenCodeGoAdditionalTools(
|
|
81
|
+
body: unknown,
|
|
82
|
+
responseUrl: string,
|
|
83
|
+
replayPrefixLength = 0,
|
|
84
|
+
): unknown {
|
|
85
|
+
if (!isOpenCodeGoResponsesUrl(responseUrl)) return body;
|
|
86
|
+
return promoteResponsesAdditionalTools(body, replayPrefixLength);
|
|
87
|
+
}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { hasItemProvenance, isHistoricalItem, REPLAY_HISTORICAL_ITEM } from "../responses/item-provenance";
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* `agent_message` is Codex's private multi-agent input item: it exists only in the ChatGPT
|
|
3
5
|
* Codex backend's schema. Codex replays every sub-agent reply in the history it sends, so
|
|
@@ -36,6 +38,7 @@ export function normalizeRoutedAgentMessages(
|
|
|
36
38
|
changed = true;
|
|
37
39
|
return {
|
|
38
40
|
type: "message", role: "user",
|
|
41
|
+
...(hasItemProvenance(message) ? { [REPLAY_HISTORICAL_ITEM]: isHistoricalItem(message) } : {}),
|
|
39
42
|
content: [
|
|
40
43
|
...(Object.keys(identities).length ? [{ type: "input_text", text: `Agent message ${JSON.stringify(identities)}` }] : []),
|
|
41
44
|
...content,
|
|
@@ -2,6 +2,7 @@ import type { OcxProviderConfig } from "../types";
|
|
|
2
2
|
import { debugProviderDiagnostic } from "../lib/debug";
|
|
3
3
|
import { isXaiResponsesDestination } from "../providers/xai-transport";
|
|
4
4
|
import { isOpenCodeGoResponsesUrl } from "./opencode-go-additional-tools";
|
|
5
|
+
import { hasItemProvenance, isHistoricalItem } from "../responses/item-provenance";
|
|
5
6
|
|
|
6
7
|
const CODEX_WEB_SEARCH_TOOL = "web_search";
|
|
7
8
|
const CODEX_WEB_SEARCH_PREVIEW_TOOL = "web_search_preview";
|
|
@@ -190,8 +191,8 @@ export function normalizeXaiResponsesWebSearch(
|
|
|
190
191
|
const xaiDestination = isXaiResponsesDestination(provider);
|
|
191
192
|
if (!xaiDestination && !isOpenCodeGoGrokResponses(target?.modelId, target?.responseUrl)) return body;
|
|
192
193
|
// On Go, a wrapper emptied here stays in place: Go promotion (opencode-go-additional-tools.ts)
|
|
193
|
-
// removes every wrapper before the wire
|
|
194
|
-
//
|
|
194
|
+
// removes every wrapper before the wire. Retain positions for callers with untagged input;
|
|
195
|
+
// transformed adapter input carries per-item historical/live provenance instead.
|
|
195
196
|
const keepEmptiedWrappers = !xaiDestination;
|
|
196
197
|
|
|
197
198
|
let next: Record<string, unknown> = body;
|
|
@@ -264,7 +265,9 @@ export function injectXaiResponsesXSearch(
|
|
|
264
265
|
|
|
265
266
|
const input = Array.isArray(body.input) ? body.input : undefined;
|
|
266
267
|
const inputStart = input ? currentInputStart(input.length, replayPrefixLength) : 0;
|
|
267
|
-
const currentInput = input?.
|
|
268
|
+
const currentInput = input?.some(hasItemProvenance)
|
|
269
|
+
? input.filter(item => !isHistoricalItem(item))
|
|
270
|
+
: input?.slice(inputStart) ?? [];
|
|
268
271
|
const currentXSearchDeclared = hasToolType(body.tools, XAI_SEARCH_TOOL)
|
|
269
272
|
|| currentInput.some(item =>
|
|
270
273
|
isPlainObject(item)
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isPlainObject as isRecord } from "./openai-responses/internal";
|
|
2
|
+
import { hasItemProvenance, isHistoricalItem, tagHistoricalInputItems } from "../responses/item-provenance";
|
|
2
3
|
|
|
3
4
|
function toolKey(tool: Record<string, unknown>): string | undefined {
|
|
4
5
|
if (typeof tool.type !== "string" || !tool.type) return undefined;
|
|
@@ -8,8 +9,8 @@ function toolKey(tool: Record<string, unknown>): string | undefined {
|
|
|
8
9
|
|
|
9
10
|
/**
|
|
10
11
|
* Zed's OpenAI Responses schema accepts message and call items, not Codex's private
|
|
11
|
-
* additional_tools wrapper. Drop every wrapper.
|
|
12
|
-
*
|
|
12
|
+
* additional_tools wrapper. Drop every wrapper. Item provenance owns current-turn
|
|
13
|
+
* membership; a numeric prefix is accepted only for input not yet tagged.
|
|
13
14
|
* A non-array tools field is left untouched so a malformed catalog is not replaced
|
|
14
15
|
* by a partial promotion.
|
|
15
16
|
*/
|
|
@@ -17,16 +18,15 @@ export function liftZedAdditionalTools(providerRequest: Record<string, unknown>,
|
|
|
17
18
|
if (!Array.isArray(providerRequest.input)) return;
|
|
18
19
|
if (providerRequest.tools !== undefined && !Array.isArray(providerRequest.tools)) return;
|
|
19
20
|
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
: 0;
|
|
21
|
+
const taggedInput = providerRequest.input.some(hasItemProvenance) ? providerRequest.input
|
|
22
|
+
: tagHistoricalInputItems(providerRequest.input, Number.isFinite(replayPrefixLength) ? replayPrefixLength : 0);
|
|
23
23
|
const input: unknown[] = [];
|
|
24
24
|
const promoted: unknown[] = [];
|
|
25
25
|
let changed = false;
|
|
26
|
-
for (const
|
|
26
|
+
for (const item of taggedInput) {
|
|
27
27
|
if (isRecord(item) && item.type === "additional_tools" && Array.isArray(item.tools)) {
|
|
28
28
|
changed = true;
|
|
29
|
-
if (
|
|
29
|
+
if (!isHistoricalItem(item)) promoted.push(...item.tools);
|
|
30
30
|
continue;
|
|
31
31
|
}
|
|
32
32
|
input.push(item);
|
package/src/adapters/zed.ts
CHANGED
|
@@ -354,12 +354,7 @@ export function createZedAdapter(provider: OcxProviderConfig, cacheRetention?: A
|
|
|
354
354
|
: item,
|
|
355
355
|
);
|
|
356
356
|
}
|
|
357
|
-
|
|
358
|
-
// Codex carries this turn's client tools in a private additional_tools input item.
|
|
359
|
-
// Zed rejects that variant, so promote the current turn and drop every wrapper
|
|
360
|
-
// before the built-in tool filter runs.
|
|
361
|
-
liftZedAdditionalTools(providerRequest, parsed._replayPrefixLen ?? 0);
|
|
362
|
-
}
|
|
357
|
+
// OpenAI wrappers were promoted before delegation; serialized input has no provenance tags.
|
|
363
358
|
if (zedProvider === "open_ai" && Array.isArray(providerRequest.tools)) {
|
|
364
359
|
// Zed's Responses decoder supports function/custom tools, not Codex's built-in web_search.
|
|
365
360
|
const supported = (tool: unknown) => isRecord(tool) && (tool.type === "function" || tool.type === "custom");
|
package/src/advisor/consult.ts
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
* unavailable context or with nothing, depending on the trigger.
|
|
19
19
|
*/
|
|
20
20
|
import type { OcxConfig } from "../types";
|
|
21
|
-
import {
|
|
21
|
+
import { localInferenceDestination, selfFetchAdmissionToken, type LocalInferenceDestination } from "../lib/local-destinations";
|
|
22
22
|
import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort";
|
|
23
23
|
import { redactSecretString } from "../lib/redact";
|
|
24
24
|
import { sidecarEnter } from "../lib/sidecar-tracker";
|
|
@@ -33,8 +33,12 @@ import {
|
|
|
33
33
|
ADVISOR_ADMISSION_SCOPE_HEADER,
|
|
34
34
|
AdvisorAdmissionScopeEncodedBoundExceeded,
|
|
35
35
|
encodeAdvisorAdmissionScope,
|
|
36
|
+
ADVISOR_ADMISSION_POLICY_HEADER,
|
|
37
|
+
registerAdvisorAdmissionPolicy,
|
|
36
38
|
} from "../server/advisor-admission-scope";
|
|
37
39
|
import type { AdmissionModelScope } from "../server/admission-model-scope";
|
|
40
|
+
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
41
|
+
import { captureAdmissionPolicy } from "../server/capture-admission-policy";
|
|
38
42
|
|
|
39
43
|
/**
|
|
40
44
|
* The header the advisor presents on its own loopback request. Its VALUE is this process's
|
|
@@ -66,12 +70,18 @@ export interface AdvisorConsultationResult {
|
|
|
66
70
|
export function advisorDestinationOrigin(
|
|
67
71
|
config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">,
|
|
68
72
|
): string {
|
|
73
|
+
return advisorDestination(config).origin;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function advisorDestination(
|
|
77
|
+
config: Pick<OcxConfig, "port" | "hostname" | "unauthenticatedLoopbackListener">,
|
|
78
|
+
): LocalInferenceDestination {
|
|
69
79
|
// Same port resolution rule as the vision sidecar: config.port can be 0 (ephemeral bind, tests)
|
|
70
80
|
// or stale after a live port override, so prefer the recorded actual bind port when present.
|
|
71
81
|
const port = config.port && config.port > 0
|
|
72
82
|
? config.port
|
|
73
83
|
: Number(configuredPort()) || 10_100;
|
|
74
|
-
return localInferenceDestination(config, port)
|
|
84
|
+
return localInferenceDestination(config, port);
|
|
75
85
|
}
|
|
76
86
|
|
|
77
87
|
function extractContent(payload: unknown): string | undefined {
|
|
@@ -123,6 +133,7 @@ export async function consultAdvisor(
|
|
|
123
133
|
abortSignal?: AbortSignal,
|
|
124
134
|
baseUrlOverride?: string,
|
|
125
135
|
admissionScope?: AdmissionModelScope,
|
|
136
|
+
admissionPolicy?: CapturedAdmissionPolicy,
|
|
126
137
|
): Promise<AdvisorConsultationResult> {
|
|
127
138
|
const t0 = Date.now();
|
|
128
139
|
const headers: Record<string, string> = {
|
|
@@ -130,15 +141,12 @@ export async function consultAdvisor(
|
|
|
130
141
|
[ADVISOR_INTERNAL_CAPABILITY_HEADER]: internalCallCapability(),
|
|
131
142
|
};
|
|
132
143
|
// Admission ladder identical to the vision sidecar: env token || service token file || first
|
|
133
|
-
// configured API key, sent as `x-opencodex-api-key` — never Authorization.
|
|
134
|
-
//
|
|
135
|
-
const admission =
|
|
144
|
+
// configured API key, sent as `x-opencodex-api-key` — never Authorization. A destination that
|
|
145
|
+
// requires no admission gets only a credential this data plane recognizes (#7894).
|
|
146
|
+
const admission = selfFetchAdmissionToken(config, advisorDestination(config));
|
|
136
147
|
if (admission) headers["x-opencodex-api-key"] = admission;
|
|
137
|
-
//
|
|
138
|
-
//
|
|
139
|
-
// restricted host key would then narrow a caller whose own scope allows the destination.
|
|
140
|
-
// Empty lists decode as a defined-but-unrestricted scope, so the capability fence and the
|
|
141
|
-
// malformed-header refusal are unchanged.
|
|
148
|
+
// Keep the bounded scope envelope for transport validation; the process-local policy
|
|
149
|
+
// registration below owns the complete snapshot. The receiver also enforces host limits.
|
|
142
150
|
try {
|
|
143
151
|
headers[ADVISOR_ADMISSION_SCOPE_HEADER] = encodeAdvisorAdmissionScope(admissionScope ?? { providers: [], models: [] });
|
|
144
152
|
} catch (error) {
|
|
@@ -167,7 +175,10 @@ export async function consultAdvisor(
|
|
|
167
175
|
linkedSignal.cleanup();
|
|
168
176
|
return { ok: false, cancelled: true, advice: "", advisorModel: input.advisorModel, error: "advisor cancelled before dispatch", durationMs: Date.now() - t0 };
|
|
169
177
|
}
|
|
178
|
+
let policyRegistration: ReturnType<typeof registerAdvisorAdmissionPolicy> | undefined;
|
|
170
179
|
try {
|
|
180
|
+
policyRegistration = registerAdvisorAdmissionPolicy(admissionPolicy ?? captureAdmissionPolicy(config, undefined, admissionScope), linkedSignal.signal);
|
|
181
|
+
headers[ADVISOR_ADMISSION_POLICY_HEADER] = policyRegistration.token;
|
|
171
182
|
const res = await fetch(`${baseUrlOverride ?? advisorBaseUrl(config)}/v1/chat/completions`, {
|
|
172
183
|
method: "POST",
|
|
173
184
|
headers,
|
|
@@ -239,6 +250,7 @@ export async function consultAdvisor(
|
|
|
239
250
|
durationMs,
|
|
240
251
|
};
|
|
241
252
|
} finally {
|
|
253
|
+
policyRegistration?.release();
|
|
242
254
|
sidecarExit();
|
|
243
255
|
linkedSignal.cleanup();
|
|
244
256
|
}
|
package/src/advisor/runtime.ts
CHANGED
|
@@ -55,6 +55,7 @@ export interface AdvisorRuntimeDeps {
|
|
|
55
55
|
workerIdentity: string;
|
|
56
56
|
workerModelId: string;
|
|
57
57
|
admissionScope?: AdmissionModelScope;
|
|
58
|
+
admissionPolicy?: import("../types/admission-policy").CapturedAdmissionPolicy;
|
|
58
59
|
abortSignal?: AbortSignal;
|
|
59
60
|
/** Test seam; production always self-fetches the resolved local destination. */
|
|
60
61
|
baseUrlOverride?: string;
|
|
@@ -139,7 +140,11 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
139
140
|
reason: AdvisorTrigger,
|
|
140
141
|
question: string | undefined,
|
|
141
142
|
evidence?: AdvisorRepairEvidence,
|
|
143
|
+
abortSignal?: AbortSignal,
|
|
142
144
|
): Promise<AdvisorConsultOutcome> => {
|
|
145
|
+
const consultationSignal = abortSignal && deps.abortSignal
|
|
146
|
+
? AbortSignal.any([deps.abortSignal, abortSignal])
|
|
147
|
+
: abortSignal ?? deps.abortSignal;
|
|
143
148
|
const current = liveSettings();
|
|
144
149
|
if (!current.enabled || current.model.trim() === "") {
|
|
145
150
|
return {
|
|
@@ -187,7 +192,7 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
187
192
|
content: formatAdvisorUnavailable(reason === "manual" ? "manual" : "preflight", result.error),
|
|
188
193
|
};
|
|
189
194
|
}
|
|
190
|
-
if (
|
|
195
|
+
if (consultationSignal?.aborted) return { ok: false, isError: true, cancelled: true, content: "" };
|
|
191
196
|
const budgetKey = identify(parsed).budget;
|
|
192
197
|
const requestCapped = consultations >= MAX_ADVISOR_CONSULTATIONS_PER_REQUEST;
|
|
193
198
|
if (requestCapped
|
|
@@ -216,9 +221,10 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
216
221
|
deps.config,
|
|
217
222
|
current.effort,
|
|
218
223
|
current.timeoutMs,
|
|
219
|
-
|
|
224
|
+
consultationSignal,
|
|
220
225
|
deps.baseUrlOverride,
|
|
221
|
-
|
|
226
|
+
deps.admissionScope,
|
|
227
|
+
deps.admissionPolicy,
|
|
222
228
|
);
|
|
223
229
|
} catch (error) {
|
|
224
230
|
activities.finish(activityId, { status: "failed", durationMs: Math.max(0, now() - startedAt) });
|
|
@@ -334,7 +340,7 @@ export function createAdvisorRuntimePlan(deps: AdvisorRuntimeDeps): AdvisorRunti
|
|
|
334
340
|
};
|
|
335
341
|
|
|
336
342
|
const plan: AdvisorPlan = {
|
|
337
|
-
consult: (parsed, reason, question) => runConsultation(parsed, reason, question),
|
|
343
|
+
consult: (parsed, reason, question, abortSignal) => runConsultation(parsed, reason, question, undefined, abortSignal),
|
|
338
344
|
// The guard's own failure/limit text goes through the same runtime-owned, marker-neutralized
|
|
339
345
|
// formatter so no guard path can emit text that looks like a genuine advice wrapper.
|
|
340
346
|
formatUnavailable: (kind, error) => formatAdvisorUnavailable(kind, error),
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { AdapterEvent, OcxRequestOptions } from "../types";
|
|
2
|
+
|
|
3
|
+
export interface MaxOutputCompletionOptions {
|
|
4
|
+
/** Set only for an explicitly opted-in Responses inbound request. */
|
|
5
|
+
completeOnMaxOutputTokens?: boolean;
|
|
6
|
+
textFormat?: OcxRequestOptions["textFormat"];
|
|
7
|
+
compaction?: boolean;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
/** Track the original event stream: bridge cleanup must not erase an unfinished operation. */
|
|
11
|
+
export function createMaxOutputCompletion(options?: MaxOutputCompletionOptions) {
|
|
12
|
+
let textOnly = options?.completeOnMaxOutputTokens === true && !options.compaction && !options.textFormat;
|
|
13
|
+
let hasText = false;
|
|
14
|
+
let completed = false;
|
|
15
|
+
return {
|
|
16
|
+
observe(event: AdapterEvent): void {
|
|
17
|
+
switch (event.type) {
|
|
18
|
+
case "text_delta":
|
|
19
|
+
if (event.anthropicThinkingSignature !== undefined) textOnly = false;
|
|
20
|
+
if (event.text.length > 0) hasText = true;
|
|
21
|
+
break;
|
|
22
|
+
case "heartbeat":
|
|
23
|
+
case "assistant_boundary":
|
|
24
|
+
break;
|
|
25
|
+
case "done":
|
|
26
|
+
case "incomplete": {
|
|
27
|
+
const reason = event.type === "done" ? event.stopReason : event.reason;
|
|
28
|
+
completed = textOnly && hasText && event.endTurn !== false
|
|
29
|
+
&& (event.type !== "done" || event.compactionEncryptedContent === undefined)
|
|
30
|
+
&& (reason === "max_tokens" || reason === "length" || reason === "max_output_tokens");
|
|
31
|
+
break;
|
|
32
|
+
}
|
|
33
|
+
default:
|
|
34
|
+
// All non-text output and unknown future operations are excluded, even if hidden or closed.
|
|
35
|
+
textOnly = false;
|
|
36
|
+
completed = false;
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
get completed(): boolean { return completed; },
|
|
40
|
+
};
|
|
41
|
+
}
|
|
@@ -45,6 +45,7 @@ import {
|
|
|
45
45
|
import { adapterFailureFromEvent, emptyChunks, joinChunks, responsesUsage, toolCallArgumentsUsable, uuid, webSearchAction, webSearchCellItemId } from "./internal";
|
|
46
46
|
import type { OutputItem, StringChunks } from "./internal";
|
|
47
47
|
import { bridgeToResponsesSSE } from "./sse";
|
|
48
|
+
import { createMaxOutputCompletion, type MaxOutputCompletionOptions } from "./max-output-completion";
|
|
48
49
|
|
|
49
50
|
/** Build a buffered Responses result within a caller-owned or temporary translator budget. */
|
|
50
51
|
export function buildResponseJSON(
|
|
@@ -84,7 +85,7 @@ export function buildResponseJSON(
|
|
|
84
85
|
function buildResponseJSONWithBudget(
|
|
85
86
|
events: AdapterEvent[],
|
|
86
87
|
modelId: string,
|
|
87
|
-
options?: {
|
|
88
|
+
options?: MaxOutputCompletionOptions & {
|
|
88
89
|
hideThinkingSummary?: boolean;
|
|
89
90
|
/** Internal Chat delivery override for raw reasoning only; summaries keep their policy. */
|
|
90
91
|
chatRawReasoningVisible?: boolean;
|
|
@@ -202,6 +203,7 @@ function buildResponseJSONWithBudget(
|
|
|
202
203
|
// which is only true for a `done` without a stop reason. A buffered turn whose adapter simply
|
|
203
204
|
// stopped emitting has no terminal at all, and must not be reported as a success.
|
|
204
205
|
let sawTerminal = false;
|
|
206
|
+
const maxOutputCompletion = createMaxOutputCompletion(options);
|
|
205
207
|
let batchCompaction = emptyChunks();
|
|
206
208
|
let compactionEncryptedContent: string | undefined;
|
|
207
209
|
|
|
@@ -371,6 +373,7 @@ function buildResponseJSONWithBudget(
|
|
|
371
373
|
};
|
|
372
374
|
|
|
373
375
|
for (const e of events) {
|
|
376
|
+
maxOutputCompletion.observe(e);
|
|
374
377
|
if (errorEvent) {
|
|
375
378
|
// Match streaming: once the turn fails, later parallel calls must not become executable
|
|
376
379
|
// completed output. Still release every retained event in order and preserve terminal usage.
|
|
@@ -570,6 +573,7 @@ function buildResponseJSONWithBudget(
|
|
|
570
573
|
break;
|
|
571
574
|
case "incomplete":
|
|
572
575
|
incompleteEvent = e;
|
|
576
|
+
usage = e.usage ?? usage;
|
|
573
577
|
sawTerminal = true;
|
|
574
578
|
endTurn = e.endTurn;
|
|
575
579
|
if (e.providerState) options?.onProviderState?.(e.providerState);
|
|
@@ -640,9 +644,10 @@ function buildResponseJSONWithBudget(
|
|
|
640
644
|
}
|
|
641
645
|
|
|
642
646
|
const failure = errorEvent ? adapterFailureFromEvent(errorEvent) : undefined;
|
|
647
|
+
const gracefulComplete = maxOutputCompletion.completed && !errorEvent;
|
|
643
648
|
const status = errorEvent
|
|
644
649
|
? "failed"
|
|
645
|
-
: incompleteEvent || stopReason === "max_tokens" || stopReason === "content_filter"
|
|
650
|
+
: !gracefulComplete && (incompleteEvent || stopReason === "max_tokens" || stopReason === "content_filter")
|
|
646
651
|
? "incomplete"
|
|
647
652
|
: sawTerminal
|
|
648
653
|
? "completed"
|
|
@@ -662,13 +667,13 @@ function buildResponseJSONWithBudget(
|
|
|
662
667
|
...(failure && isCyberPolicyCode(failure.error.code)
|
|
663
668
|
? { retryable: false }
|
|
664
669
|
: errorEvent?.retryable !== undefined ? { retryable: errorEvent.retryable } : {}),
|
|
665
|
-
...(incompleteEvent ? {
|
|
670
|
+
...(!gracefulComplete && incompleteEvent ? {
|
|
666
671
|
incomplete_details: {
|
|
667
672
|
reason: truncationReasonFor(incompleteEvent.reason) ?? incompleteEvent.reason,
|
|
668
673
|
...(incompleteEvent.message ? { message: incompleteEvent.message } : {}),
|
|
669
674
|
...(incompleteEvent.retryable !== undefined ? { retryable: incompleteEvent.retryable } : {}),
|
|
670
675
|
},
|
|
671
|
-
} : stopReason === "max_tokens" ? {
|
|
676
|
+
} : !gracefulComplete && stopReason === "max_tokens" ? {
|
|
672
677
|
incomplete_details: { reason: "max_output_tokens" },
|
|
673
678
|
} : stopReason === "content_filter" ? {
|
|
674
679
|
incomplete_details: { reason: "content_filter" },
|
package/src/bridge/sse.ts
CHANGED
|
@@ -53,6 +53,7 @@ import {
|
|
|
53
53
|
import { adapterFailureFromEvent, emptyChunks, joinChunks, ownedBudgetAbandonedMs, responsesUsage, toolCallArgumentsCouldBeJson, toolCallArgumentsUsable, uuid, webSearchAction, webSearchCellItemId } from "./internal";
|
|
54
54
|
import type { OutputItem, StringChunks } from "./internal";
|
|
55
55
|
import { terminalRefusalFailure } from "./terminal-refusal";
|
|
56
|
+
import { createMaxOutputCompletion, type MaxOutputCompletionOptions } from "./max-output-completion";
|
|
56
57
|
|
|
57
58
|
function sseEvent(name: string, data: Record<string, unknown>): string {
|
|
58
59
|
return `event: ${name}\ndata: ${JSON.stringify(data)}\n\n`;
|
|
@@ -73,7 +74,7 @@ export function bridgeToResponsesSSE(
|
|
|
73
74
|
toolSearchToolNames?: Set<string>,
|
|
74
75
|
onCancel?: () => void,
|
|
75
76
|
heartbeatMs = 2_000,
|
|
76
|
-
options?: {
|
|
77
|
+
options?: MaxOutputCompletionOptions & {
|
|
77
78
|
responseId?: string;
|
|
78
79
|
/** Trusted structural grouping only; never provider state or execution authority. */
|
|
79
80
|
outputItemIds?: { next(kind: "message" | "reasoning" | "function_call" | "custom_tool_call" | "tool_search_call"): string };
|
|
@@ -165,6 +166,7 @@ export function bridgeToResponsesSSE(
|
|
|
165
166
|
},
|
|
166
167
|
): ReadableStream<Uint8Array> {
|
|
167
168
|
const replayCacheScope = options?.replayCacheScope;
|
|
169
|
+
const maxOutputCompletion = createMaxOutputCompletion(options);
|
|
168
170
|
const outputItemId = (kind: "message" | "reasoning" | "function_call" | "custom_tool_call" | "tool_search_call", prefix: string): string =>
|
|
169
171
|
options?.outputItemIds?.next(kind) ?? `${prefix}_${uuid()}`;
|
|
170
172
|
|
|
@@ -852,6 +854,7 @@ export function bridgeToResponsesSSE(
|
|
|
852
854
|
}
|
|
853
855
|
if (next.done) { upstreamDone = true; break; }
|
|
854
856
|
const event = next.value;
|
|
857
|
+
maxOutputCompletion.observe(event);
|
|
855
858
|
let terminalEvent = false;
|
|
856
859
|
// Invisible adapter heartbeats (and buffered web-search progress) count as upstream
|
|
857
860
|
// liveness only — they must not suppress wire keepalives that re-arm Codex idle timers.
|
|
@@ -1293,7 +1296,7 @@ export function bridgeToResponsesSSE(
|
|
|
1293
1296
|
// Suppression and terminal status must agree: withholding the compaction item while
|
|
1294
1297
|
// still reporting success hands codex-rs a completed response with zero compaction
|
|
1295
1298
|
// items, which it treats as fatal.
|
|
1296
|
-
if (truncationReasonFor(event.stopReason)) {
|
|
1299
|
+
if (truncationReasonFor(event.stopReason) && !maxOutputCompletion.completed) {
|
|
1297
1300
|
// Upstream stopped before a normal completion. Surface as incomplete so the
|
|
1298
1301
|
// client can distinguish a truncated/filtered turn from a finished one.
|
|
1299
1302
|
// #1926 gap 2: bound the window in which a handed-out thought signature is
|
|
@@ -1337,6 +1340,14 @@ export function bridgeToResponsesSSE(
|
|
|
1337
1340
|
flushHiddenReasoningEnvelope();
|
|
1338
1341
|
options?.onUsage?.(event.usage);
|
|
1339
1342
|
await awaitThoughtSignatureDurability();
|
|
1343
|
+
if (maxOutputCompletion.completed) {
|
|
1344
|
+
const response = { ...responseSnapshot("completed", finishedItems, event.endTurn), usage: responsesUsage(event.usage) };
|
|
1345
|
+
options?.onCompletedResponse?.(response, event.providerState);
|
|
1346
|
+
emit("response.completed", { response });
|
|
1347
|
+
reportTerminal("completed");
|
|
1348
|
+
terminalEvent = true;
|
|
1349
|
+
break;
|
|
1350
|
+
}
|
|
1340
1351
|
const refusal = options?.terminalRefusalAsFailed ? terminalRefusalFailure(event) : undefined;
|
|
1341
1352
|
if (refusal) {
|
|
1342
1353
|
emit("response.failed", {
|
|
@@ -28,6 +28,11 @@ export function bundleTrustStat(path: string): ReturnType<BundleTrustDeps["stat"
|
|
|
28
28
|
|
|
29
29
|
type FilesystemTrustDeps = Omit<BundleTrustDeps, "codesign">;
|
|
30
30
|
|
|
31
|
+
/** The inline bundle root is code: protect its file and directory entry like the bundle. */
|
|
32
|
+
export function untrustedLauncherFilesystemReason(path: string, deps: FilesystemTrustDeps, existing = true): string | null {
|
|
33
|
+
return (existing ? ownedSafely(deps, path, "file") : null) ?? untrustedAncestorReason(path, deps);
|
|
34
|
+
}
|
|
35
|
+
|
|
31
36
|
function ownedSafely(deps: FilesystemTrustDeps, path: string, kind: "file" | "directory"): string | null {
|
|
32
37
|
const s = deps.stat(path);
|
|
33
38
|
if (!s) return "is missing";
|