@bitkyc08/opencodex 2.93.0 → 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-BXu4zE8H.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-CizjBqyk.js +0 -58
- package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
- package/gui/dist/assets/index-DQsht3vH.js +0 -94
- package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
|
@@ -8,6 +8,7 @@ import { baseScopedEnv, runCodingAgentTurn, type CodingAgentDeps, type CodingAge
|
|
|
8
8
|
import { QODER_PROFILES, resolveQoderProfile, type QoderProfile } from "./profiles";
|
|
9
9
|
import { QoderScaffoldFilter, QODER_SCAFFOLD_ERROR_CODE, qoderScaffoldErrorMessage } from "./scaffold-guard";
|
|
10
10
|
import { ToolEnvelopeEchoFilter } from "../../lib/tool-envelope-echo-filter";
|
|
11
|
+
import { buildQoderConversationInput, qoderCnImageInputSupported } from "./image-input";
|
|
11
12
|
|
|
12
13
|
export type QoderAdapterDeps = CodingAgentDeps;
|
|
13
14
|
|
|
@@ -275,21 +276,13 @@ export function createQoderAdapter(provider: OcxProviderConfig, deps: QoderAdapt
|
|
|
275
276
|
yield { type: "error", message: "Qoder adapter uses runTurn; the fetch/parseStream path is disabled." };
|
|
276
277
|
},
|
|
277
278
|
async runTurn(parsed, incoming, emit): Promise<void> {
|
|
278
|
-
if (resolveQoderProfile(provider.baseUrl)?.region === "cn") {
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
message: "Qoder image input is not enabled because the CLI provider route has no verified multimodal contract.",
|
|
286
|
-
status: 400,
|
|
287
|
-
errorType: "invalid_request_error",
|
|
288
|
-
code: "unsupported_input_modality",
|
|
289
|
-
retryable: false,
|
|
290
|
-
});
|
|
291
|
-
return;
|
|
292
|
-
}
|
|
279
|
+
if (resolveQoderProfile(provider.baseUrl)?.region === "cn" && !qoderCnImageInputSupported(parsed)) {
|
|
280
|
+
emit({
|
|
281
|
+
type: "error", status: 400, errorType: "invalid_request_error",
|
|
282
|
+
code: "unsupported_input_modality", retryable: false,
|
|
283
|
+
message: "Qoder CN raw-image routing is verified only with qoderclicn 1.1.70, DeepSeek-Flash or Qwen3.8-Flash, and one base64 PNG in a single user turn on stream-json stdin. URL, multiple-image, tool-result and history replay surfaces remain unverified; use the vision sidecar for those inputs.",
|
|
284
|
+
});
|
|
285
|
+
return;
|
|
293
286
|
}
|
|
294
287
|
let catalog: ReturnType<typeof buildCodingAgentToolCatalog>;
|
|
295
288
|
try {
|
|
@@ -325,6 +318,7 @@ export function createQoderAdapter(provider: OcxProviderConfig, deps: QoderAdapt
|
|
|
325
318
|
const system = buildSystemPrompt(parsed);
|
|
326
319
|
await runCodingAgentTurn({
|
|
327
320
|
profiles: QODER_PROFILES,
|
|
321
|
+
conversationInput: buildQoderConversationInput,
|
|
328
322
|
classifyFailure: classifyQoderFailure,
|
|
329
323
|
provider,
|
|
330
324
|
parsed,
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import type { OcxParsedRequest } from "../../types";
|
|
2
|
+
import { buildConversationInput } from "../coding-agent/protocol";
|
|
3
|
+
|
|
4
|
+
// Local resource policy: #7516 verifies a 96x96 PNG, not a vendor size maximum.
|
|
5
|
+
// 1 MiB leaves ample room over its 36 KiB RGBA raster while bounding stdin copies.
|
|
6
|
+
const MAX_CN_PNG_BYTES = 1024 * 1024;
|
|
7
|
+
const PNG_DATA_PREFIX = "data:image/png;base64,";
|
|
8
|
+
const PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
|
|
9
|
+
const PNG_DEPTHS: Readonly<Record<number, readonly number[]>> = {
|
|
10
|
+
0: [1, 2, 4, 8, 16], 2: [8, 16], 3: [1, 2, 4, 8], 4: [8, 16], 6: [8, 16],
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
function boundedPngDataUrl(imageUrl: string): boolean {
|
|
14
|
+
// Bound encoded input before slicing, scanning, decoding or making stdin copies.
|
|
15
|
+
if (!imageUrl.startsWith(PNG_DATA_PREFIX)
|
|
16
|
+
|| imageUrl.length > PNG_DATA_PREFIX.length + 4 * Math.ceil(MAX_CN_PNG_BYTES / 3)) return false;
|
|
17
|
+
const data = imageUrl.slice(PNG_DATA_PREFIX.length);
|
|
18
|
+
if (!data.length || data.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(data)) return false;
|
|
19
|
+
const padding = data.endsWith("==") ? 2 : data.endsWith("=") ? 1 : 0;
|
|
20
|
+
if (data.length / 4 * 3 - padding > MAX_CN_PNG_BYTES) return false;
|
|
21
|
+
const bytes = Buffer.from(data, "base64");
|
|
22
|
+
// Bun's decoder is permissive; round-trip also rejects nonzero padding bits.
|
|
23
|
+
if (bytes.toString("base64") !== data || bytes.length < 33
|
|
24
|
+
|| !bytes.subarray(0, 8).equals(PNG_SIGNATURE)
|
|
25
|
+
|| bytes.readUInt32BE(8) !== 13 || bytes.readUInt32BE(12) !== 0x49484452) return false;
|
|
26
|
+
const width = bytes.readUInt32BE(16);
|
|
27
|
+
const height = bytes.readUInt32BE(20);
|
|
28
|
+
// Minimal IHDR validation only; this does not decompress or validate all chunks.
|
|
29
|
+
return width > 0 && width <= 0x7fffffff && height > 0 && height <= 0x7fffffff
|
|
30
|
+
&& (PNG_DEPTHS[bytes[25]!] ?? []).includes(bytes[24]!)
|
|
31
|
+
&& bytes[26] === 0 && bytes[27] === 0 && (bytes[28] === 0 || bytes[28] === 1);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** #7516 live evidence: qoderclicn 1.1.70, one user PNG on stream-json stdin. */
|
|
35
|
+
export function qoderCnImageInputSupported(parsed: OcxParsedRequest): boolean {
|
|
36
|
+
const messages = parsed.context.messages;
|
|
37
|
+
const imageMessages = messages.filter(message => Array.isArray(message.content)
|
|
38
|
+
&& message.content.some(part => part.type === "image"));
|
|
39
|
+
if (imageMessages.length === 0) return true;
|
|
40
|
+
const nonDev = messages.filter(message => message.role !== "developer");
|
|
41
|
+
if (imageMessages.length !== 1 || nonDev.length !== 1 || imageMessages[0] !== nonDev[0]
|
|
42
|
+
|| nonDev[0]!.role !== "user"
|
|
43
|
+
|| !["DeepSeek-Flash", "Qwen3.8-Flash"].includes(parsed.modelId)) return false;
|
|
44
|
+
const content = nonDev[0]!.content;
|
|
45
|
+
if (!Array.isArray(content)) return false;
|
|
46
|
+
const images = content.filter(part => part.type === "image");
|
|
47
|
+
return images.length === 1 && boundedPngDataUrl(images[0]!.imageUrl);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** Keep Qoder omission markers out of CodeBuddy's and Claude's replay formats. */
|
|
51
|
+
export const buildQoderConversationInput: typeof buildConversationInput = (parsed, options = {}) =>
|
|
52
|
+
buildConversationInput(parsed, { ...options, markUnsupportedImages: true });
|
|
@@ -46,8 +46,8 @@ export function withUniqueToolCallIds(adapter: ProviderAdapter): ProviderAdapter
|
|
|
46
46
|
return adapter.buildRequest(parsed, incoming);
|
|
47
47
|
},
|
|
48
48
|
|
|
49
|
-
async *parseStream(response, budget, tierMetadata): AsyncGenerator<AdapterEvent> {
|
|
50
|
-
for await (const event of adapter.parseStream(response, budget, tierMetadata)) {
|
|
49
|
+
async *parseStream(response, budget, tierMetadata, streamContext): AsyncGenerator<AdapterEvent> {
|
|
50
|
+
for await (const event of adapter.parseStream(response, budget, tierMetadata, streamContext)) {
|
|
51
51
|
yield event.type === "tool_call_start" ? { ...event, id: remintToolCallId(event.id) } : event;
|
|
52
52
|
}
|
|
53
53
|
},
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { isPlainObject as isRecord } from "./openai-responses/internal";
|
|
2
|
+
|
|
3
|
+
function toolKey(tool: Record<string, unknown>): string | undefined {
|
|
4
|
+
if (typeof tool.type !== "string" || !tool.type) return undefined;
|
|
5
|
+
const name = typeof tool.name === "string" ? tool.name : "";
|
|
6
|
+
return tool.type + "\0" + name;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Zed's OpenAI Responses schema accepts message and call items, not Codex's private
|
|
11
|
+
* additional_tools wrapper. Drop every wrapper. Promote only wrappers at or after the
|
|
12
|
+
* replayed prefix: earlier ones are history, not the current turn's tool catalog.
|
|
13
|
+
* A non-array tools field is left untouched so a malformed catalog is not replaced
|
|
14
|
+
* by a partial promotion.
|
|
15
|
+
*/
|
|
16
|
+
export function liftZedAdditionalTools(providerRequest: Record<string, unknown>, replayPrefixLength: number): void {
|
|
17
|
+
if (!Array.isArray(providerRequest.input)) return;
|
|
18
|
+
if (providerRequest.tools !== undefined && !Array.isArray(providerRequest.tools)) return;
|
|
19
|
+
|
|
20
|
+
const currentTurnStart = Number.isFinite(replayPrefixLength)
|
|
21
|
+
? Math.min(providerRequest.input.length, Math.max(0, Math.trunc(replayPrefixLength)))
|
|
22
|
+
: 0;
|
|
23
|
+
const input: unknown[] = [];
|
|
24
|
+
const promoted: unknown[] = [];
|
|
25
|
+
let changed = false;
|
|
26
|
+
for (const [index, item] of providerRequest.input.entries()) {
|
|
27
|
+
if (isRecord(item) && item.type === "additional_tools" && Array.isArray(item.tools)) {
|
|
28
|
+
changed = true;
|
|
29
|
+
if (index >= currentTurnStart) promoted.push(...item.tools);
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
input.push(item);
|
|
33
|
+
}
|
|
34
|
+
if (!changed) return;
|
|
35
|
+
|
|
36
|
+
const seen = new Set<string>();
|
|
37
|
+
const tools: unknown[] = [];
|
|
38
|
+
const existing = Array.isArray(providerRequest.tools) ? providerRequest.tools : [];
|
|
39
|
+
for (const tool of [...existing, ...promoted]) {
|
|
40
|
+
if (!isRecord(tool)) {
|
|
41
|
+
tools.push(tool);
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
const key = toolKey(tool);
|
|
45
|
+
if (key && seen.has(key)) continue;
|
|
46
|
+
if (key) seen.add(key);
|
|
47
|
+
tools.push(tool);
|
|
48
|
+
}
|
|
49
|
+
providerRequest.input = input;
|
|
50
|
+
providerRequest.tools = tools;
|
|
51
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/** Diagnostic terminals carry counters only; opaque usage extensions are untrusted. */
|
|
2
|
+
export function zedDiagnosticUsage(value: unknown): Record<string, unknown> | undefined {
|
|
3
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
|
|
4
|
+
const source = value as Record<string, unknown>;
|
|
5
|
+
const counters = (record: Record<string, unknown>, keys: string[]): Record<string, number> => Object.fromEntries(
|
|
6
|
+
keys.flatMap(key => {
|
|
7
|
+
const count = record[key];
|
|
8
|
+
return typeof count === "number" && Number.isFinite(count) && count >= 0 ? [[key, count]] : [];
|
|
9
|
+
}),
|
|
10
|
+
);
|
|
11
|
+
const usage: Record<string, unknown> = counters(source, ["input_tokens", "output_tokens", "total_tokens"]);
|
|
12
|
+
for (const [field, keys] of [
|
|
13
|
+
["input_tokens_details", ["cached_tokens", "cache_write_tokens", "cache_write_1h_tokens"]],
|
|
14
|
+
["output_tokens_details", ["reasoning_tokens"]],
|
|
15
|
+
] as const) {
|
|
16
|
+
const details = source[field];
|
|
17
|
+
if (details && typeof details === "object" && !Array.isArray(details)) {
|
|
18
|
+
usage[field] = counters(details as Record<string, unknown>, [...keys]);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return usage;
|
|
22
|
+
}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
/** Containers, including the root, are bounded independently of the JS call stack. */
|
|
2
|
+
export const ZED_JSON_MAX_DEPTH = 65_536;
|
|
3
|
+
|
|
4
|
+
export class ZedJsonError extends Error {
|
|
5
|
+
constructor(detail = 'invalid JSON') { super(`Zed tool arguments: ${detail}`); }
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
// Disjoint alphabets preserve token boundaries, exact number spelling and decoded UTF-16.
|
|
9
|
+
// A surrogate pair has the same two units whether literal or escaped; lone units stay distinct.
|
|
10
|
+
const STRING = 0x10000;
|
|
11
|
+
const NUMBER = 0x20000;
|
|
12
|
+
const LITERAL = 0x30000;
|
|
13
|
+
const whitespace = (c: string) => c === ' ' || c === '\t' || c === '\r' || c === '\n';
|
|
14
|
+
const digit = (c: string) => c >= '0' && c <= '9';
|
|
15
|
+
|
|
16
|
+
/** Single-pass, resumable JSON lexer + iterative grammar validator. No value conversion. */
|
|
17
|
+
export class ZedJsonScanner {
|
|
18
|
+
steps = 0;
|
|
19
|
+
offset = 0;
|
|
20
|
+
private frames = [8]; // object: 0..4, array: 5..7, root: 8(value)/9(done)
|
|
21
|
+
private mode: 'plain' | 'string' | 'number' | 'literal' = 'plain';
|
|
22
|
+
private number = '';
|
|
23
|
+
private literal = '';
|
|
24
|
+
private literalAt = 0;
|
|
25
|
+
private escape = false;
|
|
26
|
+
private unicodeLeft = 0;
|
|
27
|
+
private unicodeValue = 0;
|
|
28
|
+
|
|
29
|
+
constructor(private emit: (token: number, end: number) => void) {}
|
|
30
|
+
|
|
31
|
+
private value(): void {
|
|
32
|
+
const top = this.frames.length - 1;
|
|
33
|
+
const state = this.frames[top];
|
|
34
|
+
if (state === 8) this.frames[top] = 9;
|
|
35
|
+
else if (state === 3) this.frames[top] = 4;
|
|
36
|
+
else if (state === 5 || state === 6) this.frames[top] = 7;
|
|
37
|
+
else throw new ZedJsonError();
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
private numberEnd(): void {
|
|
41
|
+
if (!['zero', 'int', 'frac', 'exp'].includes(this.number)) throw new ZedJsonError();
|
|
42
|
+
this.mode = 'plain';
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
push(fragment: string): void {
|
|
46
|
+
for (let i = 0; i < fragment.length; i++) {
|
|
47
|
+
this.steps++;
|
|
48
|
+
const c = fragment[i]!;
|
|
49
|
+
const code = fragment.charCodeAt(i);
|
|
50
|
+
this.offset++;
|
|
51
|
+
if (this.mode === 'string') {
|
|
52
|
+
if (this.unicodeLeft) {
|
|
53
|
+
const hex = code >= 48 && code <= 57 ? code - 48
|
|
54
|
+
: code >= 65 && code <= 70 ? code - 55 : code >= 97 && code <= 102 ? code - 87 : -1;
|
|
55
|
+
if (hex < 0) throw new ZedJsonError();
|
|
56
|
+
this.unicodeValue = this.unicodeValue * 16 + hex;
|
|
57
|
+
if (--this.unicodeLeft === 0) this.emit(STRING + this.unicodeValue, this.offset);
|
|
58
|
+
} else if (this.escape) {
|
|
59
|
+
this.escape = false;
|
|
60
|
+
if (c === 'u') { this.unicodeLeft = 4; this.unicodeValue = 0; }
|
|
61
|
+
else {
|
|
62
|
+
const decoded = '"\\/bfnrt'.indexOf(c);
|
|
63
|
+
if (decoded < 0) throw new ZedJsonError();
|
|
64
|
+
this.emit(STRING + [34, 92, 47, 8, 12, 10, 13, 9][decoded]!, this.offset);
|
|
65
|
+
}
|
|
66
|
+
} else if (c === '\\') this.escape = true;
|
|
67
|
+
else if (c === '"') { this.mode = 'plain'; this.emit(34, this.offset); }
|
|
68
|
+
else {
|
|
69
|
+
if (code < 32) throw new ZedJsonError();
|
|
70
|
+
this.emit(STRING + code, this.offset);
|
|
71
|
+
}
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
if (this.mode === 'literal') {
|
|
75
|
+
if (c !== this.literal[this.literalAt++]) throw new ZedJsonError();
|
|
76
|
+
this.emit(LITERAL + code, this.offset);
|
|
77
|
+
if (this.literalAt === this.literal.length) this.mode = 'plain';
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
if (this.mode === 'number') {
|
|
81
|
+
let next = '';
|
|
82
|
+
if (this.number === 'minus') next = c === '0' ? 'zero' : c >= '1' && c <= '9' ? 'int' : '';
|
|
83
|
+
else if (this.number === 'zero' || this.number === 'int') {
|
|
84
|
+
next = this.number === 'int' && digit(c) ? 'int' : c === '.' ? 'dot' : /[eE]/.test(c) ? 'e' : '';
|
|
85
|
+
} else if (this.number === 'dot' || this.number === 'frac') {
|
|
86
|
+
next = digit(c) ? 'frac' : this.number === 'frac' && /[eE]/.test(c) ? 'e' : '';
|
|
87
|
+
} else if (this.number === 'e') next = c === '+' || c === '-' ? 'sign' : digit(c) ? 'exp' : '';
|
|
88
|
+
else if (this.number === 'sign' || this.number === 'exp') next = digit(c) ? 'exp' : '';
|
|
89
|
+
if (next) { this.number = next; this.emit(NUMBER + code, this.offset); continue; }
|
|
90
|
+
this.numberEnd();
|
|
91
|
+
// The delimiter belongs to the grammar, not to the numeric token.
|
|
92
|
+
}
|
|
93
|
+
if (whitespace(c)) continue;
|
|
94
|
+
const top = this.frames.length - 1;
|
|
95
|
+
const state = this.frames[top];
|
|
96
|
+
if (c === '}' || c === ']') {
|
|
97
|
+
if (c === '}' ? state !== 0 && state !== 4 : state !== 5 && state !== 7) throw new ZedJsonError();
|
|
98
|
+
this.frames.pop();
|
|
99
|
+
} else if (c === ':') {
|
|
100
|
+
if (state !== 2) throw new ZedJsonError();
|
|
101
|
+
this.frames[top] = 3;
|
|
102
|
+
} else if (c === ',') {
|
|
103
|
+
if (state !== 4 && state !== 7) throw new ZedJsonError();
|
|
104
|
+
this.frames[top] = state === 4 ? 1 : 6;
|
|
105
|
+
} else if (c === '"') {
|
|
106
|
+
if (state === 0 || state === 1) this.frames[top] = 2;
|
|
107
|
+
else this.value();
|
|
108
|
+
this.mode = 'string';
|
|
109
|
+
} else {
|
|
110
|
+
this.value();
|
|
111
|
+
if (c === '{' || c === '[') {
|
|
112
|
+
if (this.frames.length > ZED_JSON_MAX_DEPTH) {
|
|
113
|
+
throw new ZedJsonError(`JSON nesting depth limit exceeded (${ZED_JSON_MAX_DEPTH})`);
|
|
114
|
+
}
|
|
115
|
+
this.frames.push(c === '{' ? 0 : 5);
|
|
116
|
+
} else if (c === '-' || digit(c)) {
|
|
117
|
+
this.mode = 'number';
|
|
118
|
+
this.number = c === '-' ? 'minus' : c === '0' ? 'zero' : 'int';
|
|
119
|
+
this.emit(NUMBER + code, this.offset);
|
|
120
|
+
continue;
|
|
121
|
+
} else if (c === 't' || c === 'f' || c === 'n') {
|
|
122
|
+
this.mode = 'literal';
|
|
123
|
+
this.literal = c === 't' ? 'true' : c === 'f' ? 'false' : 'null';
|
|
124
|
+
this.literalAt = 1;
|
|
125
|
+
this.emit(LITERAL + code, this.offset);
|
|
126
|
+
continue;
|
|
127
|
+
} else throw new ZedJsonError();
|
|
128
|
+
}
|
|
129
|
+
this.emit(code, this.offset);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
finish(): void {
|
|
134
|
+
if (this.mode === 'number') this.numberEnd();
|
|
135
|
+
if (this.mode !== 'plain' || this.frames.length !== 1 || this.frames[0] !== 9) throw new ZedJsonError('incomplete JSON');
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
get complete(): boolean {
|
|
139
|
+
return this.frames.length === 1 && this.frames[0] === 9
|
|
140
|
+
&& (this.mode === 'plain' || (this.mode === 'number' && ['zero', 'int', 'frac', 'exp'].includes(this.number)));
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/** Complete a split escape using the next authoritative decoded string unit. */
|
|
144
|
+
escapeSuffix(token: number | undefined): string | undefined {
|
|
145
|
+
if (!this.escape && !this.unicodeLeft) return '';
|
|
146
|
+
if (token === undefined || token < STRING || token >= NUMBER) return;
|
|
147
|
+
const hex = (token - STRING).toString(16).padStart(4, '0');
|
|
148
|
+
if (this.escape) return 'u' + hex;
|
|
149
|
+
const read = 4 - this.unicodeLeft;
|
|
150
|
+
if (parseInt(hex.slice(0, read) || '0', 16) !== this.unicodeValue) return;
|
|
151
|
+
return hex.slice(read);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
export function zedJsonTokens(text: string, positions?: Uint32Array): Uint32Array {
|
|
156
|
+
const tokens = new Uint32Array(text.length);
|
|
157
|
+
let length = 0;
|
|
158
|
+
const scanner = new ZedJsonScanner((token, end) => {
|
|
159
|
+
tokens[length] = token;
|
|
160
|
+
if (positions) positions[length] = end;
|
|
161
|
+
length++;
|
|
162
|
+
});
|
|
163
|
+
scanner.push(text);
|
|
164
|
+
scanner.finish();
|
|
165
|
+
return tokens.subarray(0, length);
|
|
166
|
+
}
|