@bitkyc08/opencodex 2.93.0-preview.20261027 → 2.94.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/README.md +27 -8
- package/bin/ocx.mjs +215 -63
- package/gui/dist/assets/App-DmvwlhQq.js +58 -0
- package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
- package/gui/dist/assets/index-3EPO_KbX.js +94 -0
- package/gui/dist/assets/index-CHWwDo9L.css +1 -0
- package/gui/dist/assets/{quota-summary-DxToX1rV.js → quota-summary-BHvWg9mi.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/gui/dist/provider-icons/t3code.svg +4 -0
- package/package.json +7 -4
- package/src/adapters/anthropic/account-metadata.ts +34 -3
- package/src/adapters/anthropic/beta-allowlist.ts +5 -5
- package/src/adapters/anthropic/passthrough.ts +5 -2
- package/src/adapters/anthropic.ts +17 -4
- package/src/adapters/antigravity-refusal.ts +29 -0
- package/src/adapters/base.ts +11 -1
- package/src/adapters/client-fingerprint.ts +43 -9
- package/src/adapters/coding-agent/protocol.ts +19 -9
- package/src/adapters/command-code.ts +4 -5
- package/src/adapters/cursor/catalog.ts +5 -3
- package/src/adapters/cursor/claude-id.ts +30 -19
- package/src/adapters/cursor/cursor-errors.ts +5 -2
- package/src/adapters/cursor/h2-pool.ts +9 -7
- package/src/adapters/cursor/http1-bidi.ts +1 -0
- package/src/adapters/cursor/live-models.ts +4 -2
- package/src/adapters/cursor.ts +4 -1
- package/src/adapters/devin/cloud-direct/chat.ts +18 -2
- package/src/adapters/google-antigravity-replay.ts +13 -2
- package/src/adapters/google-antigravity-wire.ts +8 -3
- package/src/adapters/google-errors.ts +33 -0
- package/src/adapters/google-http.ts +41 -16
- package/src/adapters/google-wire-compiler.ts +4 -0
- package/src/adapters/google.ts +21 -10
- package/src/adapters/kiro/adapter.ts +3 -0
- package/src/adapters/kiro/stream.ts +18 -13
- package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
- package/src/adapters/openai-chat/messages.ts +22 -10
- package/src/adapters/openai-chat/required-tool-result.ts +3 -3
- package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
- package/src/adapters/openai-chat/wire.ts +9 -0
- package/src/adapters/openai-chat.ts +18 -17
- package/src/adapters/openai-responses/image-gen.ts +15 -1
- package/src/adapters/openai-responses/passthrough.ts +11 -34
- package/src/adapters/openai-responses/transport.ts +20 -2
- package/src/adapters/openai-responses/usage.ts +34 -0
- package/src/adapters/qoder/adapter.ts +9 -15
- package/src/adapters/qoder/image-input.ts +52 -0
- package/src/adapters/unique-tool-call-ids.ts +2 -2
- package/src/adapters/zed-additional-tools.ts +51 -0
- package/src/adapters/zed-diagnostic-usage.ts +22 -0
- package/src/adapters/zed-json-tokens.ts +166 -0
- package/src/adapters/zed-openai-stream.ts +723 -0
- package/src/adapters/zed-tool-arguments.ts +79 -0
- package/src/adapters/zed.ts +53 -3
- package/src/advisor/consult.ts +22 -0
- package/src/advisor/runtime.ts +3 -0
- package/src/bridge/errors.ts +22 -1
- package/src/bridge/response-json.ts +4 -1
- package/src/bridge/sse.ts +21 -12
- package/src/chat/inbound.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
- package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
- package/src/claude/desktop-first-party.ts +16 -5
- package/src/claude/desktop-gateway-state.ts +4 -0
- package/src/claude/inbound-tool-loading.ts +93 -0
- package/src/claude/intercept/picker-listener.ts +33 -1
- package/src/claude/model-info.ts +29 -4
- package/src/claude/outbound.ts +33 -13
- package/src/cli/account-main.ts +43 -5
- package/src/cli/capabilities-base.ts +22 -5
- package/src/cli/capabilities-integrations.ts +4 -4
- package/src/cli/claude-desktop.ts +139 -98
- package/src/cli/codex-cli-update.ts +102 -48
- package/src/cli/codex-launch-auth.ts +93 -0
- package/src/cli/codex-launch-command.ts +32 -0
- package/src/cli/codex-launch-diagnostics.ts +37 -0
- package/src/cli/codex-launch-ownership.ts +307 -0
- package/src/cli/codex-launch-policy.ts +84 -0
- package/src/cli/codex-launcher.ts +310 -0
- package/src/cli/codex-shim-autorestore.ts +2 -0
- package/src/cli/config-command.ts +9 -4
- package/src/cli/config-mutation.ts +13 -0
- package/src/cli/dispatch.ts +13 -7
- package/src/cli/effort.ts +19 -14
- package/src/cli/ensure-desired-integrations.ts +21 -14
- package/src/cli/ensure-desktop-cold-start.ts +41 -10
- package/src/cli/export-command.ts +8 -4
- package/src/cli/help.ts +3 -1
- package/src/cli/index.ts +58 -64
- package/src/cli/integration-input.ts +12 -0
- package/src/cli/integration-plan-dto.ts +2 -0
- package/src/cli/integration-preview.ts +6 -3
- package/src/cli/integrations.ts +2 -1
- package/src/cli/link-cleanup.ts +8 -23
- package/src/cli/link-enrollment.ts +1 -4
- package/src/cli/link.ts +1 -1
- package/src/cli/loopback-family.ts +2 -31
- package/src/cli/models.ts +62 -49
- package/src/cli/provider.ts +146 -139
- package/src/cli/registry.ts +34 -3
- package/src/cli/root.ts +2 -0
- package/src/cli/start-owner-fence.ts +22 -3
- package/src/cli/status-link.ts +28 -0
- package/src/cli/status.ts +15 -0
- package/src/cli/stop-restore-guard.ts +48 -0
- package/src/cli/stop-restore.ts +117 -36
- package/src/cli/system-command.ts +2 -0
- package/src/cli/v2.ts +17 -4
- package/src/client/lifecycle-lock.ts +1 -1
- package/src/client/link-connection.ts +19 -0
- package/src/client/link-relay-transport.ts +25 -3
- package/src/client/link-tunnel.ts +10 -0
- package/src/client/machine-listener.ts +7 -1
- package/src/client/restore-ownership.ts +45 -0
- package/src/client/runtime.ts +13 -1
- package/src/client/state.ts +1 -1
- package/src/clients/client-ids.ts +7 -0
- package/src/clients/client-path.ts +13 -5
- package/src/clients/config-export/agent-clients.ts +3 -6
- package/src/clients/config-export/alias-selectors.ts +85 -0
- package/src/clients/config-export/contracts.ts +6 -25
- package/src/clients/config-export/dsh.ts +8 -1
- package/src/clients/config-export/model-metadata.ts +19 -0
- package/src/clients/config-export/model-names.ts +31 -0
- package/src/clients/config-export/qoder.ts +3 -11
- package/src/clients/config-export/t3code.ts +141 -0
- package/src/clients/config-export.ts +51 -15
- package/src/clients/gentle-shell-path.ts +3 -3
- package/src/codex/account-lifecycle.ts +27 -13
- package/src/codex/account-store.ts +32 -6
- package/src/codex/app-server-processes.ts +84 -1
- package/src/codex/auth-api/main-account-probe.ts +50 -11
- package/src/codex/auth-api/pool-mode-gate.ts +16 -8
- package/src/codex/auth-context.ts +45 -4
- package/src/codex/catalog/antigravity-discovery.ts +59 -0
- package/src/codex/catalog/build-entries.ts +12 -13
- package/src/codex/catalog/bundled.ts +59 -9
- package/src/codex/catalog/derive-entry.ts +2 -0
- package/src/codex/catalog/gather-capture.ts +3 -0
- package/src/codex/catalog/metadata.ts +6 -5
- package/src/codex/catalog/model-hints.ts +36 -4
- package/src/codex/catalog/native-priority.ts +63 -0
- package/src/codex/catalog/provider-models.ts +20 -4
- package/src/codex/catalog/retained-sync.ts +1 -1
- package/src/codex/chatgpt-refresh-failure.ts +2 -2
- package/src/codex/cli-install-provenance.ts +57 -29
- package/src/codex/cli-installation-identity.ts +1 -1
- package/src/codex/cli-installation-limits.ts +7 -0
- package/src/codex/cli-update-apply.ts +391 -0
- package/src/codex/cli-update-artifacts.ts +257 -0
- package/src/codex/cli-update-files.ts +100 -0
- package/src/codex/cli-update-inspection-context.ts +49 -0
- package/src/codex/cli-update-job-execution.ts +77 -0
- package/src/codex/cli-update-job-store-windows.ts +1010 -0
- package/src/codex/cli-update-job-worker.ts +393 -0
- package/src/codex/cli-update-job.ts +369 -0
- package/src/codex/cli-update-lease.ts +71 -0
- package/src/codex/cli-update-paths.ts +76 -0
- package/src/codex/cli-update-plan.ts +180 -47
- package/src/codex/cli-update-recovery.ts +236 -0
- package/src/codex/cli-update-selection-gate.ts +235 -0
- package/src/codex/cli-update-windows-apply.ts +308 -0
- package/src/codex/cli-update-windows-layout.ts +110 -0
- package/src/codex/cli-update-windows-observation.ts +91 -0
- package/src/codex/cli-update-windows-paths.ts +26 -0
- package/src/codex/cli-update-worker-recovery.ts +32 -0
- package/src/codex/cli-update-worker.ts +185 -0
- package/src/codex/cli-windows-plan-provenance.ts +250 -0
- package/src/codex/desktop-app-restart.ts +22 -3
- package/src/codex/exec-boundary.ts +208 -0
- package/src/codex/forward-transport-headers.ts +80 -0
- package/src/codex/history-job.ts +7 -0
- package/src/codex/history-provider.ts +5 -2
- package/src/codex/history-worker.ts +20 -1
- package/src/codex/inject/restore.ts +57 -25
- package/src/codex/internal/history-writer.ts +2 -1
- package/src/codex/mac-app-bundle.ts +52 -0
- package/src/codex/main-account.ts +161 -23
- package/src/codex/native-main-auth-temp.ts +3 -2
- package/src/codex/native-main-refresh-mode.ts +18 -3
- package/src/codex/native-profile-manager.ts +8 -6
- package/src/codex/native-profile-store.ts +9 -0
- package/src/codex/ocx-compaction-history.ts +3 -2
- package/src/codex/prompt-text-probe.ts +211 -69
- package/src/codex/quota.ts +9 -0
- package/src/codex/role-model-history.ts +253 -0
- package/src/codex/runtime.ts +120 -71
- package/src/codex/shim-overlay.ts +22 -3
- package/src/codex/shim-templates.ts +5 -2
- package/src/codex/shim-wrapper-write.ts +136 -0
- package/src/codex/shim.ts +24 -125
- package/src/codex/windows-cli-child-native.ts +119 -0
- package/src/codex/windows-cli-child-pipe.ts +87 -0
- package/src/codex/windows-cli-child.ts +260 -0
- package/src/codex/windows-cli-recovery-guardian.ts +89 -0
- package/src/codex/windows-cli-recovery.ts +39 -0
- package/src/codex/windows-installation-files.ts +52 -6
- package/src/codex/windows-npm-execution.ts +25 -0
- package/src/combos/failover.ts +84 -5
- package/src/combos/index.ts +1 -0
- package/src/combos/resolve.ts +60 -22
- package/src/config/atomic-write.ts +75 -22
- package/src/config/diagnostics.ts +18 -10
- package/src/config/live-reconcile.ts +11 -3
- package/src/config/owner-registry.ts +5 -4
- package/src/config/persist-unlocked.ts +34 -8
- package/src/config/persisted-mutation.ts +7 -0
- package/src/config/process-state.ts +9 -5
- package/src/config/removed-opencode-free-backup.ts +99 -0
- package/src/config/removed-opencode-free.ts +4 -8
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +16 -1
- package/src/config/schema/leaf-validators.ts +15 -0
- package/src/config.ts +4 -4
- package/src/generated/compatibility-version.json +743 -315
- package/src/grok/inject.ts +2 -1
- package/src/grok/sync.ts +5 -2
- package/src/images/loop.ts +14 -5
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-refresh.ts +28 -0
- package/src/integrations/model-name-guard.ts +31 -0
- package/src/integrations/mutation-plan.ts +17 -4
- package/src/integrations/ownership.ts +3 -0
- package/src/integrations/registry.ts +10 -1
- package/src/integrations/state.ts +6 -0
- package/src/integrations/writer.ts +64 -59
- package/src/lib/abort.ts +8 -4
- package/src/lib/bounded-body.ts +7 -1
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/errors.ts +2 -0
- package/src/lib/eventstream-decoder.ts +3 -2
- package/src/lib/http-response-semantics.ts +9 -6
- package/src/lib/inbound-body-policy.ts +11 -0
- package/src/lib/jsonc.ts +7 -2
- package/src/lib/local-management-capability.ts +3 -1
- package/src/lib/local-upstream.ts +22 -26
- package/src/lib/loopback-family.ts +31 -0
- package/src/lib/plain-data.ts +7 -5
- package/src/lib/process-control.ts +30 -5
- package/src/lib/shadow-call.ts +55 -1
- package/src/lib/tool-argument-integers.ts +99 -7
- package/src/lib/upstream-retry.ts +6 -1
- package/src/lib/windows-elevation.ts +34 -11
- package/src/lib/windows-owner-acl.ts +272 -32
- package/src/lib/windows-secret-acl.ts +310 -44
- package/src/lib/windows-service-wrappers.ts +10 -7
- package/src/lib/winsw.ts +8 -4
- package/src/link/relay-auth.ts +38 -1
- package/src/link/remote-platform.ts +11 -23
- package/src/link/remote-probe.ts +3 -1
- package/src/link/remote-windows.ts +150 -0
- package/src/link/ssh-argv.ts +13 -5
- package/src/link/store.ts +4 -1
- package/src/link/supervisor.ts +9 -0
- package/src/local-credentials/generation.ts +238 -0
- package/src/local-credentials/inventory.ts +281 -0
- package/src/local-credentials/observation-lease.ts +83 -0
- package/src/local-credentials/publication-fence.ts +81 -0
- package/src/local-credentials/references.ts +36 -0
- package/src/local-credentials/runtime-observation.ts +28 -0
- package/src/oauth/account-auto-pause-policy.ts +11 -0
- package/src/oauth/anthropic-account-refusal.ts +1 -0
- package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
- package/src/oauth/anthropic-routing.ts +34 -44
- package/src/oauth/anthropic-session-affinity-store.ts +177 -0
- package/src/oauth/chatgpt.ts +11 -9
- package/src/oauth/cursor.ts +8 -2
- package/src/oauth/generic-account-failover.ts +33 -2
- package/src/oauth/generic-session-affinity.ts +7 -0
- package/src/oauth/google-antigravity.ts +29 -5
- package/src/oauth/index.ts +1 -0
- package/src/oauth/store.ts +32 -4
- package/src/protocols/encoders/adapter-events.ts +7 -4
- package/src/protocols/encoders/messages.ts +1 -1
- package/src/providers/antigravity-account-roster.ts +73 -7
- package/src/providers/antigravity-models.ts +8 -4
- package/src/providers/api-key-resolve.ts +16 -3
- package/src/providers/claude-cli-identity.ts +2 -0
- package/src/providers/codex-capacity.ts +3 -2
- package/src/providers/free-directory.ts +10 -2
- package/src/providers/key-store.ts +7 -2
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/antigravity.ts +6 -4
- package/src/providers/quota/vendor-probes-oauth.ts +0 -1
- package/src/providers/stale-model-roster-migration.ts +3 -0
- package/src/quota-pool/assemble.ts +51 -21
- package/src/quota-pool/pooled.ts +162 -0
- package/src/remote-control/workspace-codex-runtime.ts +63 -20
- package/src/responses/apply-patch-envelope.ts +35 -0
- package/src/responses/compaction-history-framing.ts +15 -4
- package/src/responses/turn-membership.ts +111 -0
- package/src/server/advisor-admission-scope.ts +43 -0
- package/src/server/audio-upstream.ts +10 -2
- package/src/server/auth-cors.ts +23 -0
- package/src/server/bind-host.ts +5 -0
- package/src/server/chat-completions.ts +17 -2
- package/src/server/chat-native.ts +16 -11
- package/src/server/claude-messages.ts +9 -1
- package/src/server/codex-model-list.ts +46 -0
- package/src/server/gui-session.ts +5 -2
- package/src/server/inbound-body-admission.ts +21 -13
- package/src/server/inbound-body-budget.ts +128 -0
- package/src/server/index/link-listener.ts +3 -1
- package/src/server/index/link-relay-sessions.ts +9 -2
- package/src/server/index/optional-listeners.ts +1 -0
- package/src/server/index/serve-options.ts +9 -43
- package/src/server/index/websocket-handler.ts +7 -0
- package/src/server/index.ts +6 -5
- package/src/server/inference/client-encoder-delivery.ts +3 -1
- package/src/server/lifecycle.ts +8 -1
- package/src/server/management/advisor-routes.ts +26 -9
- package/src/server/management/agent-settings-routes.ts +424 -543
- package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
- package/src/server/management/claude-code-settings-patch.ts +211 -0
- package/src/server/management/claude-desktop-config-writers.ts +78 -0
- package/src/server/management/codex-agent-role-routes.ts +79 -2
- package/src/server/management/codex-cli-update-routes.ts +55 -0
- package/src/server/management/codex-prompt-routes.ts +2 -1
- package/src/server/management/config-routes.ts +444 -380
- package/src/server/management/consent-session.ts +6 -0
- package/src/server/management/desktop-compatibility-authorization.ts +12 -0
- package/src/server/management/desktop-compatibility-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
- package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
- package/src/server/management/integration-routes.ts +45 -5
- package/src/server/management/link-enrollment.ts +21 -32
- package/src/server/management/link-route-state.ts +1 -0
- package/src/server/management/link-routes.ts +4 -1
- package/src/server/management/model-routes.ts +22 -6
- package/src/server/management/model-rows.ts +3 -1
- package/src/server/management/native-integration-routes.ts +90 -38
- package/src/server/management/oauth-account-routes.ts +8 -7
- package/src/server/management/route-registry.ts +8 -3
- package/src/server/management/session-routes.ts +20 -2
- package/src/server/management/shadow-call-validation.ts +43 -2
- package/src/server/management/sidebar-routes.ts +2 -1
- package/src/server/management/system-restart.ts +47 -7
- package/src/server/management-api.ts +61 -51
- package/src/server/management-auth.ts +11 -3
- package/src/server/messages-native.ts +21 -7
- package/src/server/messages-shared.ts +110 -18
- package/src/server/persistent-gui-session.ts +155 -0
- package/src/server/port-reclaim.ts +29 -5
- package/src/server/proxy-liveness.ts +110 -33
- package/src/server/request-decompress.ts +5 -1
- package/src/server/responses/account-change-state.ts +14 -2
- package/src/server/responses/adapter-continuation.ts +5 -4
- package/src/server/responses/adapter-delivery.ts +20 -5
- package/src/server/responses/adapter-dispatch.ts +39 -45
- package/src/server/responses/advisor-plan-slot.ts +3 -0
- package/src/server/responses/advisor-slot.ts +4 -2
- package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
- package/src/server/responses/antigravity-validation-refusal.ts +6 -0
- package/src/server/responses/combo-required-tool-contract.ts +2 -1
- package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
- package/src/server/responses/combo-required-tool-stream.ts +119 -0
- package/src/server/responses/combo-stream-preflight.ts +47 -7
- package/src/server/responses/compact.ts +14 -7
- package/src/server/responses/compaction-recovery.ts +2 -1
- package/src/server/responses/core-auth.ts +2 -1
- package/src/server/responses/core-codex-account.ts +1 -0
- package/src/server/responses/core-combo-failure.ts +11 -6
- package/src/server/responses/core-combo-native.ts +6 -5
- package/src/server/responses/core-combo.ts +93 -20
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/fetch-helpers.ts +5 -1
- package/src/server/responses/jev-model-invoke.ts +8 -3
- package/src/server/responses/memory-models.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +36 -8
- package/src/server/responses/passthrough-dispatch.ts +12 -12
- package/src/server/responses/request-prepare.ts +10 -1
- package/src/server/responses/request-transport.ts +41 -6
- package/src/server/responses/run-turn-execution.ts +11 -3
- package/src/server/responses/sidecar-execution.ts +5 -0
- package/src/server/responses/turn-membership.ts +30 -0
- package/src/server/responses-custom-tool-repair.ts +86 -11
- package/src/server/responses-image-gen-repair.ts +1 -1
- package/src/server/restart-parent-ownership.ts +49 -0
- package/src/server/stop-teardown.ts +46 -9
- package/src/server/windows-tcp-drop.ts +4 -2
- package/src/service/desktop-recovery-process.ts +341 -0
- package/src/service/desktop-recovery.ts +172 -0
- package/src/service/windows-ops.ts +6 -3
- package/src/service/windows-scheduler.ts +29 -6
- package/src/stall-timeout.ts +47 -0
- package/src/tray/windows.ts +6 -4
- package/src/types/config.ts +61 -10
- package/src/types/request.ts +1 -1
- package/src/types.ts +1 -0
- package/src/update/async-check.ts +4 -3
- package/src/update/bind-probe.ts +2 -2
- package/src/update/codex-cli-update-launch-policy.mjs +9 -0
- package/src/update/guarded-port-reclaim.ts +14 -0
- package/src/update/guarded-runtime-ops.ts +58 -0
- package/src/update/guarded-tray-ops.ts +9 -0
- package/src/update/index.ts +196 -58
- package/src/update/job-pinned-start.ts +53 -0
- package/src/update/job-supervised-restart.ts +23 -6
- package/src/update/job-update-home.ts +62 -0
- package/src/update/job-update-tray.ts +29 -0
- package/src/update/job-windows-restart.ts +39 -0
- package/src/update/job.ts +179 -193
- package/src/update/mutation-guard.d.mts +30 -0
- package/src/update/mutation-guard.mjs +103 -0
- package/src/update/notify.ts +2 -2
- package/src/update/npm-cache-preflight.mjs +4 -4
- package/src/update/npm-install.mjs +5 -3
- package/src/update/pnpm-read-policy.mjs +3 -2
- package/src/update/proxy-liveness-probe.mjs +2 -2
- package/src/update/service-home-authority.ts +35 -0
- package/src/update/service-home-package-only-protocol.json +1 -0
- package/src/update/service-home-policy.d.mts +25 -0
- package/src/update/service-home-policy.mjs +112 -0
- package/src/update/service-home-probe-entry.ts +9 -0
- package/src/update/service-home-probe.d.mts +15 -0
- package/src/update/service-home-probe.mjs +79 -0
- package/src/update/service-home-protocol.json +1 -0
- package/src/update/supervised-recovery.d.mts +2 -2
- package/src/update/supervised-recovery.mjs +14 -7
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +29 -19
- package/src/update/update-failure-guidance.mjs +1 -1
- package/src/update/worker-launch.ts +3 -3
- package/src/vision/anthropic-describe.ts +2 -1
- package/src/web-search/anthropic-executor.ts +2 -1
- package/src/web-search/anthropic-history.ts +1 -0
- package/src/web-search/format-result.ts +3 -2
- package/src/web-search/header-deadline.ts +3 -2
- package/src/web-search/loop.ts +10 -4
- package/src/web-search/parse.ts +191 -38
- package/gui/dist/assets/App-CJZoq-uF.js +0 -58
- package/gui/dist/assets/Tray-BWQPcgZn.js +0 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
- package/gui/dist/assets/index-Xfct8owH.js +0 -94
package/src/web-search/parse.ts
CHANGED
|
@@ -30,6 +30,72 @@ interface OutputItem {
|
|
|
30
30
|
type?: string;
|
|
31
31
|
content?: OutputTextBlock[];
|
|
32
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Completed output text and citations. `parts` holds each output_text block's text keyed by
|
|
35
|
+
* `output_index:content_index`, and `incomplete` marks skipped malformed entries.
|
|
36
|
+
*/
|
|
37
|
+
type CompletedOutput = WebSearchResult & { incomplete: boolean; parts: Map<string, string> };
|
|
38
|
+
/** Streamed text for one `output_text` content part. */
|
|
39
|
+
interface StreamedPart {
|
|
40
|
+
delta: string;
|
|
41
|
+
done: string | null;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** The streamed part for events that carry no valid `output_index`/`content_index`. */
|
|
45
|
+
const UNINDEXED_PART = "unindexed";
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Key a streamed text event by its content part. An event without valid indexes joins the only
|
|
49
|
+
* indexed part when exactly one exists. The first indexed event identifies any preceding
|
|
50
|
+
* unindexed accumulator; once multiple indexed parts exist, unindexed text stays separate.
|
|
51
|
+
*/
|
|
52
|
+
function streamedPartKey(data: Record<string, unknown>, parts: Map<string, StreamedPart>): string {
|
|
53
|
+
const output = data.output_index;
|
|
54
|
+
const content = data.content_index;
|
|
55
|
+
if (Number.isInteger(output) && Number.isInteger(content)) {
|
|
56
|
+
const key = `${output}:${content}`;
|
|
57
|
+
if (parts.size === 1 && parts.has(UNINDEXED_PART)) {
|
|
58
|
+
parts.set(key, parts.get(UNINDEXED_PART)!);
|
|
59
|
+
parts.delete(UNINDEXED_PART);
|
|
60
|
+
}
|
|
61
|
+
return key;
|
|
62
|
+
}
|
|
63
|
+
const indexed = [...parts.keys()].filter(key => key !== UNINDEXED_PART);
|
|
64
|
+
return indexed.length === 1 ? indexed[0]! : UNINDEXED_PART;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/** Order `output_index:content_index` keys numerically. */
|
|
68
|
+
function comparePartKeys(left: string, right: string): number {
|
|
69
|
+
const [leftOutput = 0, leftContent = 0] = left.split(":").map(Number);
|
|
70
|
+
const [rightOutput = 0, rightContent = 0] = right.split(":").map(Number);
|
|
71
|
+
return leftOutput - rightOutput || leftContent - rightContent;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/** One part's streamed text: its done text when present, otherwise its deltas. */
|
|
75
|
+
function streamedPartText(part: StreamedPart): string {
|
|
76
|
+
return part.done?.trim() ? part.done : part.delta;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** Join indexed parts in index order, followed by any unindexed text. */
|
|
80
|
+
function assembleStreamedText(parts: Map<string, StreamedPart>): string {
|
|
81
|
+
const keys = [...parts.keys()].filter(key => key !== UNINDEXED_PART).sort(comparePartKeys);
|
|
82
|
+
if (parts.has(UNINDEXED_PART)) keys.push(UNINDEXED_PART);
|
|
83
|
+
return keys.map(key => streamedPartText(parts.get(key)!)).join("");
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Rebuild an incomplete completed output part by part: a part keeps its completed text when the
|
|
88
|
+
* completed output has it, and otherwise takes that part's streamed text.
|
|
89
|
+
*/
|
|
90
|
+
function mergeIncompleteOutput(completed: Map<string, string>, streamed: Map<string, StreamedPart>): string {
|
|
91
|
+
const keys = [...new Set([...completed.keys(), ...streamed.keys()])].sort(comparePartKeys);
|
|
92
|
+
return keys.map(key => {
|
|
93
|
+
const text = completed.get(key);
|
|
94
|
+
if (text?.trim()) return text;
|
|
95
|
+
const part = streamed.get(key);
|
|
96
|
+
return part ? streamedPartText(part) : text ?? "";
|
|
97
|
+
}).join("");
|
|
98
|
+
}
|
|
33
99
|
|
|
34
100
|
// Keep this compatibility export for non-Responses sidecar executors and bounded error bodies.
|
|
35
101
|
export const MAX_SIDECAR_RESPONSE_BYTES = 64 * 1024;
|
|
@@ -62,7 +128,8 @@ const URL_RE = /https?:\/\/[^\s<>()\[\]]+/i;
|
|
|
62
128
|
// Recognize URI-like candidates separately from the HTTP(S)-only acceptance boundary. A rejected
|
|
63
129
|
// citation (for example `javascript:`) still belongs to the trailing Sources block and must not be
|
|
64
130
|
// left behind as ordinary assistant text.
|
|
65
|
-
|
|
131
|
+
// The scheme length is bounded so a long word without a colon is scanned in linear time.
|
|
132
|
+
const URI_LIKE_RE = /[a-z][a-z0-9+.-]{0,31}:[^\s<>()\[\]]+/i;
|
|
66
133
|
// A "Sources:" / "Source:" header, allowing markdown prefixes (#, *, -, >) and bold/italic wrappers.
|
|
67
134
|
const SOURCES_WORD_RE = /^sources?/i;
|
|
68
135
|
|
|
@@ -111,19 +178,65 @@ function isSourcesHeader(line: string): boolean {
|
|
|
111
178
|
return cursor === line.length;
|
|
112
179
|
}
|
|
113
180
|
|
|
114
|
-
/** Trim wrapping/trailing noise from a captured URL: angle brackets, then trailing punctuation. */
|
|
181
|
+
/** Trim wrapping/trailing noise from a captured URL: angle brackets, then trailing punctuation and code backticks. */
|
|
115
182
|
function cleanUrl(url: string): string {
|
|
116
|
-
return url.replace(/^<+/, "").replace(/[)>\]
|
|
183
|
+
return url.replace(/^<+/, "").replace(/[)>\].,;:`]+$/, "");
|
|
117
184
|
}
|
|
118
185
|
|
|
119
186
|
/** Derive a human title from the list-item text preceding the URL (strip markers, md link, seps). */
|
|
120
187
|
function cleanTitle(prefix: string): string {
|
|
121
|
-
let title = prefix.replace(/^[
|
|
188
|
+
let title = prefix.replace(/^[-*+>\d.)\s]+/, "").trim();
|
|
122
189
|
// `[title](` from a markdown link, or a leading `[`.
|
|
123
|
-
title = title.replace(/^\[/, "").replace(/\]\(?$/, "")
|
|
124
|
-
|
|
190
|
+
title = title.replace(/^\[/, "").replace(/\]\(?$/, "");
|
|
191
|
+
// Trailing separators and an opening code backtick, trimmed by a linear scan.
|
|
192
|
+
let end = title.length;
|
|
193
|
+
while (end > 0 && TITLE_TRAILING_SEPARATORS.has(title[end - 1]!)) end -= 1;
|
|
194
|
+
return title.slice(0, end).trim();
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
const TITLE_TRAILING_SEPARATORS = new Set([":", "-", "—", "(", "<", "`", " ", "\t"]);
|
|
198
|
+
|
|
199
|
+
/** A line that looks like a list item (bullet, quote or ordinal marker). */
|
|
200
|
+
const LIST_ITEM_RE = /^[-*+>\d.)]/;
|
|
201
|
+
|
|
202
|
+
/**
|
|
203
|
+
* Replace inline code spans with spaces of equal length. A span opens and closes with backtick runs
|
|
204
|
+
* of equal length; runs are paired in one pass, so an unmatched run cannot cause backtracking.
|
|
205
|
+
*/
|
|
206
|
+
function maskInlineCode(line: string): string {
|
|
207
|
+
const runs: Array<{ start: number; end: number }> = [];
|
|
208
|
+
for (let index = 0; index < line.length;) {
|
|
209
|
+
if (line[index] !== "`") { index += 1; continue; }
|
|
210
|
+
const start = index;
|
|
211
|
+
while (line[index] === "`") index += 1;
|
|
212
|
+
runs.push({ start, end: index });
|
|
213
|
+
}
|
|
214
|
+
if (runs.length < 2) return line;
|
|
215
|
+
// For each run, the index of the next run with the same length, or -1.
|
|
216
|
+
const next = new Array<number>(runs.length).fill(-1);
|
|
217
|
+
const lastByLength = new Map<number, number>();
|
|
218
|
+
for (let run = runs.length - 1; run >= 0; run -= 1) {
|
|
219
|
+
const length = runs[run]!.end - runs[run]!.start;
|
|
220
|
+
next[run] = lastByLength.get(length) ?? -1;
|
|
221
|
+
lastByLength.set(length, run);
|
|
222
|
+
}
|
|
223
|
+
let masked = "";
|
|
224
|
+
let cursor = 0;
|
|
225
|
+
for (let run = 0; run < runs.length;) {
|
|
226
|
+
const close = next[run]!;
|
|
227
|
+
if (close === -1) { run += 1; continue; }
|
|
228
|
+
masked += line.slice(cursor, runs[run]!.start) + " ".repeat(runs[close]!.end - runs[run]!.start);
|
|
229
|
+
cursor = runs[close]!.end;
|
|
230
|
+
run = close + 1;
|
|
231
|
+
}
|
|
232
|
+
return masked + line.slice(cursor);
|
|
125
233
|
}
|
|
126
234
|
|
|
235
|
+
/**
|
|
236
|
+
* Move citation lines from the last `Sources:` block into `sources` and strip them from the text.
|
|
237
|
+
* List items that cannot be paired with a URL stay in the answer, and every consumed citation line,
|
|
238
|
+
* including one whose URL is rejected as unsafe, leaves the text.
|
|
239
|
+
*/
|
|
127
240
|
function extractTrailingSources(text: string): { text: string; sources: WebSearchSource[]; stripped: boolean } {
|
|
128
241
|
const lines = text.split("\n");
|
|
129
242
|
// Find the LAST line that is a "Sources:" header (markdown prefixes allowed).
|
|
@@ -139,6 +252,9 @@ function extractTrailingSources(text: string): { text: string; sources: WebSearc
|
|
|
139
252
|
let lastConsumed = headerIdx;
|
|
140
253
|
// A title line whose URL is expected on a following line (multiline entry).
|
|
141
254
|
let pendingTitle: string | null = null;
|
|
255
|
+
let pendingIndex = -1;
|
|
256
|
+
// Line indexes of list items that turned out not to title a URL; they remain answer text.
|
|
257
|
+
const keptNotes: number[] = [];
|
|
142
258
|
let consumedSourceLine = false;
|
|
143
259
|
for (let i = headerIdx + 1; i < lines.length; i++) {
|
|
144
260
|
const raw = lines[i].trim();
|
|
@@ -148,52 +264,73 @@ function extractTrailingSources(text: string): { text: string; sources: WebSearc
|
|
|
148
264
|
continue;
|
|
149
265
|
}
|
|
150
266
|
const httpMatch = raw.match(URL_RE);
|
|
151
|
-
|
|
267
|
+
// URI-like text inside an inline code span of any backtick run, such as `mode:fast`, is prose
|
|
268
|
+
// rather than a citation. HTTP(S) URLs keep their citation meaning even when code-formatted.
|
|
269
|
+
const m = httpMatch ?? maskInlineCode(raw).match(URI_LIKE_RE);
|
|
152
270
|
if (!m) {
|
|
153
271
|
// A list-ish line with no URL may be a title whose URL is on the next line. Only treat it as a
|
|
154
|
-
// pending title when it looks like a list item; otherwise it's prose → stop.
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
272
|
+
// pending title when it looks like a list item; otherwise it's prose → stop. A second list item
|
|
273
|
+
// means the previous one was a note, so it is kept instead of discarded.
|
|
274
|
+
if (!LIST_ITEM_RE.test(raw)) break;
|
|
275
|
+
if (pendingTitle !== null) keptNotes.push(pendingIndex);
|
|
276
|
+
pendingTitle = raw;
|
|
277
|
+
pendingIndex = i;
|
|
278
|
+
continue;
|
|
159
279
|
}
|
|
160
280
|
// A non-HTTP URI embedded in prose is not sufficient to classify the line as a citation.
|
|
161
281
|
// Accept it as a consumed source line only when it is a list item or the whole line starts with
|
|
162
282
|
// the URI candidate, matching the existing bare-URL grammar.
|
|
163
|
-
if (!httpMatch &&
|
|
283
|
+
if (!httpMatch && !LIST_ITEM_RE.test(raw) && m.index !== 0) break;
|
|
164
284
|
const url = cleanUrl(m[0]);
|
|
165
285
|
if (!url) { break; }
|
|
286
|
+
const inlinePrefix = raw.slice(0, m.index);
|
|
287
|
+
const inlineTitle = cleanTitle(inlinePrefix);
|
|
288
|
+
// A self-titled citation, or a URL that starts its own list item, does not prove that the
|
|
289
|
+
// preceding bullet was its title. Only an unmarked continuation line pairs with it.
|
|
290
|
+
const startsListItem = /^(?:[-*+>]|\d+[.)])\s/.test(raw);
|
|
291
|
+
const pairsWithPending = pendingTitle !== null && !inlineTitle && !startsListItem;
|
|
292
|
+
if (pendingTitle !== null && !pairsWithPending) keptNotes.push(pendingIndex);
|
|
166
293
|
consumedSourceLine = true;
|
|
167
294
|
lastConsumed = i;
|
|
168
295
|
// Title: text before the URL on this line, else a buffered title from a preceding line.
|
|
169
|
-
const
|
|
170
|
-
const title = cleanTitle(inlinePrefix) || (pendingTitle ? cleanTitle(pendingTitle) : "");
|
|
296
|
+
const title = inlineTitle || (pairsWithPending ? cleanTitle(pendingTitle!) : "");
|
|
171
297
|
pendingTitle = null;
|
|
172
298
|
if (seen.has(url)) continue;
|
|
173
299
|
if (appendSafeWebSearchSource(sources, title ? { url, title } : { url })) seen.add(url);
|
|
174
300
|
}
|
|
175
301
|
if (!consumedSourceLine) return { text, sources: [], stripped: false };
|
|
176
|
-
// Keep text before the header
|
|
302
|
+
// Keep text before the header, notes found between citations, and anything after the last citation.
|
|
177
303
|
const before = lines.slice(0, headerIdx).join("\n").replace(/\s+$/, "");
|
|
178
|
-
const
|
|
304
|
+
const notes = keptNotes.filter(index => index < lastConsumed).map(index => lines[index]);
|
|
305
|
+
const after = [...notes, lines.slice(lastConsumed + 1).join("\n").replace(/^\s+/, "")].filter(Boolean).join("\n");
|
|
179
306
|
const body = after ? (before ? `${before}\n\n${after}` : after) : before;
|
|
180
307
|
return { text: body, sources, stripped: true };
|
|
181
308
|
}
|
|
182
309
|
|
|
183
|
-
/**
|
|
184
|
-
|
|
310
|
+
/**
|
|
311
|
+
* Pull final text + url_citation sources from a completed Responses `output[]` array.
|
|
312
|
+
* Malformed entries are skipped, and `incomplete` records that the text may be partial.
|
|
313
|
+
*/
|
|
314
|
+
function fromOutputArray(output: OutputItem[], seen: Set<string>): CompletedOutput {
|
|
185
315
|
let text = "";
|
|
316
|
+
let incomplete = false;
|
|
317
|
+
const parts = new Map<string, string>();
|
|
186
318
|
const sources: WebSearchSource[] = [];
|
|
187
|
-
for (const item of output) {
|
|
188
|
-
if (item
|
|
189
|
-
|
|
190
|
-
|
|
319
|
+
for (const [outputIndex, item] of output.entries()) {
|
|
320
|
+
if (!item || typeof item !== "object") { incomplete = true; continue; }
|
|
321
|
+
if (item.type !== "message") continue;
|
|
322
|
+
if (!Array.isArray(item.content)) { incomplete = true; continue; }
|
|
323
|
+
for (const [contentIndex, block] of item.content.entries()) {
|
|
324
|
+
if (!block || typeof block !== "object") { incomplete = true; continue; }
|
|
325
|
+
if (block.type === "output_text") {
|
|
326
|
+
if (typeof block.text !== "string") { incomplete = true; continue; }
|
|
191
327
|
text += block.text;
|
|
192
|
-
|
|
328
|
+
parts.set(`${outputIndex}:${contentIndex}`, block.text);
|
|
329
|
+
for (const ann of Array.isArray(block.annotations) ? block.annotations : []) collectAnnotation(ann, sources, seen);
|
|
193
330
|
}
|
|
194
331
|
}
|
|
195
332
|
}
|
|
196
|
-
return { text, sources };
|
|
333
|
+
return { text, sources, incomplete, parts };
|
|
197
334
|
}
|
|
198
335
|
|
|
199
336
|
export function cancelReaderWithoutWaiting(
|
|
@@ -223,17 +360,15 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
|
|
|
223
360
|
const seen = new Set<string>();
|
|
224
361
|
// Holder object — fields are mutated inside the closure, so they can't live as narrowed locals.
|
|
225
362
|
const acc: {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
final: WebSearchResult | null;
|
|
363
|
+
parts: Map<string, StreamedPart>;
|
|
364
|
+
final: CompletedOutput | null;
|
|
229
365
|
streamSources: WebSearchSource[];
|
|
230
366
|
error: string | null;
|
|
231
367
|
decodedChars: number;
|
|
232
368
|
terminalEvent: boolean;
|
|
233
369
|
limitReached: boolean;
|
|
234
370
|
} = {
|
|
235
|
-
|
|
236
|
-
doneText: "",
|
|
371
|
+
parts: new Map(),
|
|
237
372
|
final: null,
|
|
238
373
|
streamSources: [],
|
|
239
374
|
error: null,
|
|
@@ -242,6 +377,14 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
|
|
|
242
377
|
limitReached: false,
|
|
243
378
|
};
|
|
244
379
|
|
|
380
|
+
/** The accumulator for the content part that `data` belongs to. */
|
|
381
|
+
const streamedPart = (data: Record<string, unknown>): StreamedPart => {
|
|
382
|
+
const key = streamedPartKey(data, acc.parts);
|
|
383
|
+
let part = acc.parts.get(key);
|
|
384
|
+
if (!part) { part = { delta: "", done: null }; acc.parts.set(key, part); }
|
|
385
|
+
return part;
|
|
386
|
+
};
|
|
387
|
+
|
|
245
388
|
const acceptDecodedChars = (count: number): boolean => {
|
|
246
389
|
if (count > MAX_SIDECAR_DECODED_CHARS - acc.decodedChars) {
|
|
247
390
|
acc.error = "sidecar response decoded text limit reached";
|
|
@@ -276,16 +419,19 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
|
|
|
276
419
|
return;
|
|
277
420
|
}
|
|
278
421
|
const data = parsed as Record<string, unknown>;
|
|
279
|
-
const type = data.type
|
|
422
|
+
const type = typeof data.type === "string" ? data.type : undefined;
|
|
280
423
|
if (type === "response.output_text.delta" && typeof data.delta === "string") {
|
|
281
|
-
if (acceptDecodedChars(data.delta.length))
|
|
424
|
+
if (acceptDecodedChars(data.delta.length)) streamedPart(data).delta += data.delta;
|
|
282
425
|
} else if (type === "response.output_text.done" && typeof data.text === "string") {
|
|
283
426
|
// The `done` event carries the full, authoritative text for one content part.
|
|
284
|
-
if (acceptDecodedChars(data.text.length))
|
|
427
|
+
if (acceptDecodedChars(data.text.length)) {
|
|
428
|
+
const part = streamedPart(data);
|
|
429
|
+
part.done = (part.done ?? "") + data.text;
|
|
430
|
+
}
|
|
285
431
|
} else if (type === "response.completed" || type === "response.done") {
|
|
286
432
|
acc.terminalEvent = true;
|
|
287
433
|
const resp = data.response as { output?: OutputItem[] } | undefined;
|
|
288
|
-
if (resp?.output) {
|
|
434
|
+
if (Array.isArray(resp?.output)) {
|
|
289
435
|
const final = fromOutputArray(resp.output, seen);
|
|
290
436
|
if (acceptDecodedChars(final.text.length)) acc.final = final;
|
|
291
437
|
}
|
|
@@ -295,7 +441,7 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
|
|
|
295
441
|
const msg = resp?.error?.message
|
|
296
442
|
?? (data.error as { message?: string } | undefined)?.message
|
|
297
443
|
?? (typeof data.message === "string" ? data.message : undefined);
|
|
298
|
-
acc.error = msg
|
|
444
|
+
acc.error = typeof msg === "string" && msg.trim() ? msg : `sidecar stream ended with ${type}`;
|
|
299
445
|
} else if (type?.includes("reasoning") && typeof data.delta === "string") {
|
|
300
446
|
// Reasoning is not returned, but it is still decoded payload retained transiently by JSON.parse.
|
|
301
447
|
acceptDecodedChars(data.delta.length);
|
|
@@ -345,9 +491,16 @@ export async function parseSidecarSSE(response: Response): Promise<WebSearchResu
|
|
|
345
491
|
}
|
|
346
492
|
|
|
347
493
|
// Prefer the authoritative completed output[], then the done text, then accumulated deltas.
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
494
|
+
// Each streamed content part contributes its done text, or its deltas when the done event never
|
|
495
|
+
// arrived. A completed output that skipped malformed entries may be partial: indexed streams fill
|
|
496
|
+
// only the parts it lacks, while an unindexed stream replaces it as a whole.
|
|
497
|
+
const streamedText = assembleStreamedText(acc.parts);
|
|
498
|
+
const completedText = acc.final?.text.trim() ? acc.final.text : "";
|
|
499
|
+
let text = completedText || streamedText;
|
|
500
|
+
if (acc.final?.incomplete) {
|
|
501
|
+
const repaired = acc.parts.has(UNINDEXED_PART) ? streamedText : mergeIncompleteOutput(acc.final.parts, acc.parts);
|
|
502
|
+
if (repaired.trim()) text = repaired;
|
|
503
|
+
}
|
|
351
504
|
// Merge sources from the final output[] and the streaming annotation events.
|
|
352
505
|
const sources = safeWebSearchSources(acc.final?.sources ?? []);
|
|
353
506
|
for (const s of acc.streamSources) {
|