@jsonstudio/rcc 0.89.2239 → 0.90.89
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 -0
- package/dist/build-info.js +2 -2
- package/dist/build-info.js.map +1 -1
- package/dist/cli/commands/claude.js +4 -8
- package/dist/cli/commands/claude.js.map +1 -1
- package/dist/cli/commands/codex.js +6 -3
- package/dist/cli/commands/codex.js.map +1 -1
- package/dist/cli/commands/guardian-daemon.d.ts +2 -0
- package/dist/cli/commands/guardian-daemon.js +299 -0
- package/dist/cli/commands/guardian-daemon.js.map +1 -0
- package/dist/cli/commands/init/camoufox.js +1 -1
- package/dist/cli/commands/init/camoufox.js.map +1 -1
- package/dist/cli/commands/launcher/index.d.ts +1 -1
- package/dist/cli/commands/launcher/types.d.ts +7 -1
- package/dist/cli/commands/launcher/utils.d.ts +4 -1
- package/dist/cli/commands/launcher/utils.js +18 -8
- package/dist/cli/commands/launcher/utils.js.map +1 -1
- package/dist/cli/commands/launcher-kernel.d.ts +1 -1
- package/dist/cli/commands/launcher-kernel.js +608 -249
- package/dist/cli/commands/launcher-kernel.js.map +1 -1
- package/dist/cli/commands/port.js +28 -8
- package/dist/cli/commands/port.js.map +1 -1
- package/dist/cli/commands/restart.d.ts +4 -0
- package/dist/cli/commands/restart.js +91 -42
- package/dist/cli/commands/restart.js.map +1 -1
- package/dist/cli/commands/{clock-admin.d.ts → session-admin.d.ts} +2 -2
- package/dist/cli/commands/{clock-admin.js → session-admin.js} +17 -17
- package/dist/cli/commands/session-admin.js.map +1 -0
- package/dist/cli/commands/{tmux-inject.d.ts → session-inject.d.ts} +2 -2
- package/dist/cli/commands/{tmux-inject.js → session-inject.js} +12 -12
- package/dist/cli/commands/session-inject.js.map +1 -0
- package/dist/cli/commands/start-types.d.ts +4 -0
- package/dist/cli/commands/start-utils.d.ts +1 -0
- package/dist/cli/commands/start-utils.js +3 -0
- package/dist/cli/commands/start-utils.js.map +1 -1
- package/dist/cli/commands/start.js +122 -72
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/commands/stop.d.ts +3 -0
- package/dist/cli/commands/stop.js +30 -63
- package/dist/cli/commands/stop.js.map +1 -1
- package/dist/cli/config/init-provider-catalog.js +8 -3
- package/dist/cli/config/init-provider-catalog.js.map +1 -1
- package/dist/cli/guardian/client.d.ts +38 -0
- package/dist/cli/guardian/client.js +237 -0
- package/dist/cli/guardian/client.js.map +1 -0
- package/dist/cli/guardian/paths.d.ts +7 -0
- package/dist/cli/guardian/paths.js +13 -0
- package/dist/cli/guardian/paths.js.map +1 -0
- package/dist/cli/guardian/types.d.ts +30 -0
- package/dist/cli/guardian/types.js +2 -0
- package/dist/cli/guardian/types.js.map +1 -0
- package/dist/cli/register/guardian-daemon-command.d.ts +2 -0
- package/dist/cli/register/guardian-daemon-command.js +5 -0
- package/dist/cli/register/guardian-daemon-command.js.map +1 -0
- package/dist/cli/register/session-admin-command.d.ts +3 -0
- package/dist/cli/register/session-admin-command.js +5 -0
- package/dist/cli/register/session-admin-command.js.map +1 -0
- package/dist/cli/register/session-inject-command.d.ts +3 -0
- package/dist/cli/register/session-inject-command.js +5 -0
- package/dist/cli/register/session-inject-command.js.map +1 -0
- package/dist/cli/server/port-utils.js +57 -1
- package/dist/cli/server/port-utils.js.map +1 -1
- package/dist/cli.js +52 -4
- package/dist/cli.js.map +1 -1
- package/dist/commands/oauth.js +6 -6
- package/dist/commands/oauth.js.map +1 -1
- package/dist/config/provider-v2-loader.js +18 -3
- package/dist/config/provider-v2-loader.js.map +1 -1
- package/dist/config/routecodex-config-loader.js +184 -9
- package/dist/config/routecodex-config-loader.js.map +1 -1
- package/dist/config/unified-config-paths.js +22 -0
- package/dist/config/unified-config-paths.js.map +1 -1
- package/dist/config/virtual-router-builder.js +18 -5
- package/dist/config/virtual-router-builder.js.map +1 -1
- package/dist/config/virtual-router-types.js +20 -5
- package/dist/config/virtual-router-types.js.map +1 -1
- package/dist/daemon-admin-ui/assets/index-C8vP_c5E.js +15 -0
- package/dist/daemon-admin-ui/assets/index-DjIoHmNv.css +1 -0
- package/dist/daemon-admin-ui/index.html +13 -0
- package/dist/docs/daemon-admin-ui.html +334 -63
- package/dist/index.d.ts +9 -0
- package/dist/index.js +268 -10
- package/dist/index.js.map +1 -1
- package/dist/manager/modules/quota/provider-key-normalization.js +1 -10
- package/dist/manager/modules/quota/provider-key-normalization.js.map +1 -1
- package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.d.ts +1 -0
- package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.js +36 -0
- package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.js.map +1 -1
- package/dist/manager/modules/quota/provider-quota-daemon.events.js +89 -49
- package/dist/manager/modules/quota/provider-quota-daemon.events.js.map +1 -1
- package/dist/manager/modules/quota/provider-quota-daemon.model-backoff.js +2 -16
- package/dist/manager/modules/quota/provider-quota-daemon.model-backoff.js.map +1 -1
- package/dist/manager/modules/token/index.d.ts +1 -0
- package/dist/manager/modules/token/index.js +6 -1
- package/dist/manager/modules/token/index.js.map +1 -1
- package/dist/manager/types.d.ts +1 -0
- package/dist/modules/llmswitch/bridge/state-integrations.js +1 -1
- package/dist/modules/llmswitch/bridge/state-integrations.js.map +1 -1
- package/dist/providers/auth/antigravity-user-agent.js +78 -31
- package/dist/providers/auth/antigravity-user-agent.js.map +1 -1
- package/dist/providers/auth/gemini-cli-userinfo-helper.js +94 -63
- package/dist/providers/auth/gemini-cli-userinfo-helper.js.map +1 -1
- package/dist/providers/auth/iflow-userinfo-helper.js +1 -1
- package/dist/providers/auth/iflow-userinfo-helper.js.map +1 -1
- package/dist/providers/auth/oauth-error-message.d.ts +1 -0
- package/dist/providers/auth/oauth-error-message.js +44 -0
- package/dist/providers/auth/oauth-error-message.js.map +1 -0
- package/dist/providers/auth/oauth-lifecycle/error-detection.js +42 -8
- package/dist/providers/auth/oauth-lifecycle/error-detection.js.map +1 -1
- package/dist/providers/auth/oauth-lifecycle/token-io.d.ts +1 -0
- package/dist/providers/auth/oauth-lifecycle/token-io.js +12 -0
- package/dist/providers/auth/oauth-lifecycle/token-io.js.map +1 -1
- package/dist/providers/auth/oauth-lifecycle.js +502 -87
- package/dist/providers/auth/oauth-lifecycle.js.map +1 -1
- package/dist/providers/auth/oauth-repair-env.js +3 -5
- package/dist/providers/auth/oauth-repair-env.js.map +1 -1
- package/dist/providers/auth/oauth-utils/error-extraction.js +42 -8
- package/dist/providers/auth/oauth-utils/error-extraction.js.map +1 -1
- package/dist/providers/core/config/camoufox-actions.d.ts +31 -0
- package/dist/providers/core/config/camoufox-actions.js +470 -0
- package/dist/providers/core/config/camoufox-actions.js.map +1 -0
- package/dist/providers/core/config/camoufox-launcher.d.ts +3 -0
- package/dist/providers/core/config/camoufox-launcher.js +553 -159
- package/dist/providers/core/config/camoufox-launcher.js.map +1 -1
- package/dist/providers/core/config/oauth-flows.js +6 -44
- package/dist/providers/core/config/oauth-flows.js.map +1 -1
- package/dist/providers/core/config/provider-oauth-configs.js +51 -7
- package/dist/providers/core/config/provider-oauth-configs.js.map +1 -1
- package/dist/providers/core/config/service-profiles.js +2 -2
- package/dist/providers/core/config/service-profiles.js.map +1 -1
- package/dist/providers/core/runtime/base-provider-runtime-helpers.js +15 -2
- package/dist/providers/core/runtime/base-provider-runtime-helpers.js.map +1 -1
- package/dist/providers/core/runtime/provider-error-classifier.js +32 -15
- package/dist/providers/core/runtime/provider-error-classifier.js.map +1 -1
- package/dist/providers/core/runtime/provider-family-profile-utils.js +1 -1
- package/dist/providers/core/runtime/provider-family-profile-utils.js.map +1 -1
- package/dist/providers/core/runtime/provider-response-postprocessor.js +61 -14
- package/dist/providers/core/runtime/provider-response-postprocessor.js.map +1 -1
- package/dist/providers/core/strategies/oauth-auth-code-flow.d.ts +1 -0
- package/dist/providers/core/strategies/oauth-auth-code-flow.js +124 -19
- package/dist/providers/core/strategies/oauth-auth-code-flow.js.map +1 -1
- package/dist/providers/core/strategies/oauth-device-flow.js +32 -6
- package/dist/providers/core/strategies/oauth-device-flow.js.map +1 -1
- package/dist/providers/core/utils/provider-error-reporter.js +51 -0
- package/dist/providers/core/utils/provider-error-reporter.js.map +1 -1
- package/dist/providers/profile/families/iflow-profile.js +83 -10
- package/dist/providers/profile/families/iflow-profile.js.map +1 -1
- package/dist/scripts/camoufox/launch-auth.mjs +112 -5
- package/dist/server/handlers/config-admin-handler.js +9 -2
- package/dist/server/handlers/config-admin-handler.js.map +1 -1
- package/dist/server/handlers/handler-response-utils.js +3 -6
- package/dist/server/handlers/handler-response-utils.js.map +1 -1
- package/dist/server/handlers/handler-utils.js +14 -17
- package/dist/server/handlers/handler-utils.js.map +1 -1
- package/dist/server/handlers/logging.js +3 -4
- package/dist/server/handlers/logging.js.map +1 -1
- package/dist/server/handlers/responses-handler.js +5 -3
- package/dist/server/handlers/responses-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/auth-handler.js +5 -3
- package/dist/server/runtime/http-server/daemon-admin/auth-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/control-handler.js +104 -15
- package/dist/server/runtime/http-server/daemon-admin/control-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js +2 -2
- package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.d.ts +24 -0
- package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.js +316 -70
- package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/providers-handler.js +190 -1
- package/dist/server/runtime/http-server/daemon-admin/providers-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/routing-policy.d.ts +1 -1
- package/dist/server/runtime/http-server/daemon-admin/routing-policy.js +21 -32
- package/dist/server/runtime/http-server/daemon-admin/routing-policy.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/stats-handler.js +2 -0
- package/dist/server/runtime/http-server/daemon-admin/stats-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin-routes.d.ts +8 -1
- package/dist/server/runtime/http-server/daemon-admin-routes.js +30 -0
- package/dist/server/runtime/http-server/daemon-admin-routes.js.map +1 -1
- package/dist/server/runtime/http-server/executor/client-injection-flow.d.ts +14 -0
- package/dist/server/runtime/http-server/executor/client-injection-flow.js +297 -0
- package/dist/server/runtime/http-server/executor/client-injection-flow.js.map +1 -0
- package/dist/server/runtime/http-server/executor/index.d.ts +1 -1
- package/dist/server/runtime/http-server/executor/index.js +1 -1
- package/dist/server/runtime/http-server/executor/index.js.map +1 -1
- package/dist/server/runtime/http-server/executor/provider-response-converter.js +281 -70
- package/dist/server/runtime/http-server/executor/provider-response-converter.js.map +1 -1
- package/dist/server/runtime/http-server/executor/provider-runtime-resolver.js +8 -6
- package/dist/server/runtime/http-server/executor/provider-runtime-resolver.js.map +1 -1
- package/dist/server/runtime/http-server/executor/request-executor-core-utils.d.ts +1 -0
- package/dist/server/runtime/http-server/executor/request-executor-core-utils.js +12 -0
- package/dist/server/runtime/http-server/executor/request-executor-core-utils.js.map +1 -1
- package/dist/server/runtime/http-server/executor/request-retry-helpers.d.ts +1 -1
- package/dist/server/runtime/http-server/executor/request-retry-helpers.js +23 -19
- package/dist/server/runtime/http-server/executor/request-retry-helpers.js.map +1 -1
- package/dist/server/runtime/http-server/executor/retry-engine.d.ts +2 -2
- package/dist/server/runtime/http-server/executor/retry-engine.js +2 -2
- package/dist/server/runtime/http-server/executor/retry-engine.js.map +1 -1
- package/dist/server/runtime/http-server/executor/sse-error-handler.d.ts +1 -0
- package/dist/server/runtime/http-server/executor/sse-error-handler.js +13 -2
- package/dist/server/runtime/http-server/executor/sse-error-handler.js.map +1 -1
- package/dist/server/runtime/http-server/executor/usage-aggregator.d.ts +0 -12
- package/dist/server/runtime/http-server/executor/usage-aggregator.js +89 -90
- package/dist/server/runtime/http-server/executor/usage-aggregator.js.map +1 -1
- package/dist/server/runtime/http-server/executor-metadata.js +318 -17
- package/dist/server/runtime/http-server/executor-metadata.js.map +1 -1
- package/dist/server/runtime/http-server/executor-provider.d.ts +1 -0
- package/dist/server/runtime/http-server/executor-provider.js +5 -1
- package/dist/server/runtime/http-server/executor-provider.js.map +1 -1
- package/dist/server/runtime/http-server/executor-response.d.ts +1 -0
- package/dist/server/runtime/http-server/executor-response.js +52 -58
- package/dist/server/runtime/http-server/executor-response.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-bootstrap.js +50 -6
- package/dist/server/runtime/http-server/http-server-bootstrap.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-lifecycle.js +6 -5
- package/dist/server/runtime/http-server/http-server-lifecycle.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-runtime-setup.js +1 -1
- package/dist/server/runtime/http-server/http-server-runtime-setup.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-session-daemon.d.ts +6 -0
- package/dist/server/runtime/http-server/http-server-session-daemon.js +404 -0
- package/dist/server/runtime/http-server/http-server-session-daemon.js.map +1 -0
- package/dist/server/runtime/http-server/hub-shadow-compare.js +1 -1
- package/dist/server/runtime/http-server/hub-shadow-compare.js.map +1 -1
- package/dist/server/runtime/http-server/index.d.ts +11 -10
- package/dist/server/runtime/http-server/index.js +21 -20
- package/dist/server/runtime/http-server/index.js.map +1 -1
- package/dist/server/runtime/http-server/managed-process-probe.js +1 -1
- package/dist/server/runtime/http-server/managed-process-probe.js.map +1 -1
- package/dist/server/runtime/http-server/middleware.js +91 -5
- package/dist/server/runtime/http-server/middleware.js.map +1 -1
- package/dist/server/runtime/http-server/request-executor.js +19 -9
- package/dist/server/runtime/http-server/request-executor.js.map +1 -1
- package/dist/server/runtime/http-server/routes.d.ts +2 -1
- package/dist/server/runtime/http-server/routes.js +7 -5
- package/dist/server/runtime/http-server/routes.js.map +1 -1
- package/dist/server/runtime/http-server/{clock-client-reaper.d.ts → session-client-reaper.d.ts} +6 -6
- package/dist/server/runtime/http-server/{clock-client-reaper.js → session-client-reaper.js} +26 -49
- package/dist/server/runtime/http-server/session-client-reaper.js.map +1 -0
- package/dist/server/runtime/http-server/{clock-client-registry-utils.d.ts → session-client-registry-utils.d.ts} +14 -10
- package/dist/server/runtime/http-server/{clock-client-registry-utils.js → session-client-registry-utils.js} +77 -19
- package/dist/server/runtime/http-server/session-client-registry-utils.js.map +1 -0
- package/dist/server/runtime/http-server/{clock-client-registry.d.ts → session-client-registry.d.ts} +26 -11
- package/dist/server/runtime/http-server/{clock-client-registry.js → session-client-registry.js} +305 -11
- package/dist/server/runtime/http-server/session-client-registry.js.map +1 -0
- package/dist/server/runtime/http-server/{clock-client-route-utils.d.ts → session-client-route-utils.d.ts} +1 -1
- package/dist/server/runtime/http-server/{clock-client-route-utils.js → session-client-route-utils.js} +4 -4
- package/dist/server/runtime/http-server/session-client-route-utils.js.map +1 -0
- package/dist/server/runtime/http-server/session-client-routes.d.ts +2 -0
- package/dist/server/runtime/http-server/{clock-client-routes.js → session-client-routes.js} +107 -59
- package/dist/server/runtime/http-server/session-client-routes.js.map +1 -0
- package/dist/server/runtime/http-server/session-daemon-inject-config.d.ts +1 -0
- package/dist/server/runtime/http-server/{clock-daemon-inject-config.js → session-daemon-inject-config.js} +2 -2
- package/dist/server/runtime/http-server/session-daemon-inject-config.js.map +1 -0
- package/dist/server/runtime/http-server/session-daemon-log-throttle.d.ts +28 -0
- package/dist/server/runtime/http-server/session-daemon-log-throttle.js +105 -0
- package/dist/server/runtime/http-server/session-daemon-log-throttle.js.map +1 -0
- package/dist/server/runtime/http-server/session-dir.js +12 -1
- package/dist/server/runtime/http-server/session-dir.js.map +1 -1
- package/dist/server/runtime/http-server/session-scope-resolution.d.ts +14 -0
- package/dist/server/runtime/http-server/session-scope-resolution.js +208 -0
- package/dist/server/runtime/http-server/session-scope-resolution.js.map +1 -0
- package/dist/server/runtime/http-server/stats-manager.d.ts +35 -0
- package/dist/server/runtime/http-server/stats-manager.js +269 -21
- package/dist/server/runtime/http-server/stats-manager.js.map +1 -1
- package/dist/server/runtime/http-server/stopmessage-scope-rebind.d.ts +21 -0
- package/dist/server/runtime/http-server/stopmessage-scope-rebind.js +197 -0
- package/dist/server/runtime/http-server/stopmessage-scope-rebind.js.map +1 -0
- package/dist/server/runtime/http-server/tmux-session-probe.d.ts +10 -0
- package/dist/server/runtime/http-server/tmux-session-probe.js +98 -1
- package/dist/server/runtime/http-server/tmux-session-probe.js.map +1 -1
- package/dist/server-lifecycle/port-utils.d.ts +2 -1
- package/dist/server-lifecycle/port-utils.js +84 -4
- package/dist/server-lifecycle/port-utils.js.map +1 -1
- package/dist/token-daemon/index.d.ts +1 -0
- package/dist/token-daemon/index.js +17 -12
- package/dist/token-daemon/index.js.map +1 -1
- package/dist/token-daemon/token-daemon.d.ts +2 -0
- package/dist/token-daemon/token-daemon.js +18 -10
- package/dist/token-daemon/token-daemon.js.map +1 -1
- package/dist/utils/llms-engine-shadow.js +1 -1
- package/dist/utils/llms-engine-shadow.js.map +1 -1
- package/dist/utils/log-helpers.js +46 -0
- package/dist/utils/log-helpers.js.map +1 -1
- package/dist/utils/session-client-token.d.ts +4 -0
- package/dist/utils/session-client-token.js +93 -0
- package/dist/utils/session-client-token.js.map +1 -0
- package/dist/utils/session-scope-trace.d.ts +11 -0
- package/dist/utils/session-scope-trace.js +41 -0
- package/dist/utils/session-scope-trace.js.map +1 -0
- package/docs/CLOCK.md +0 -1
- package/docs/DAEMON_CONTROL_PLANE.md +1 -0
- package/docs/PORTS.md +2 -2
- package/docs/ROUTING_POLICY_SCHEMA.md +5 -3
- package/docs/antigravity-routing-contract.md +2 -2
- package/docs/daemon-admin-ui.html +334 -63
- package/docs/design/servertool-stopmessage-lifecycle.md +109 -0
- package/docs/exec-command-guard-policy.example.v1.json +7 -1
- package/docs/providers/antigravity-gemini-provider-compat.md +2 -2
- package/docs/{clock-client-daemon-design.md → session-client-daemon-design.md} +34 -34
- package/package.json +23 -7
- package/scripts/build-core.mjs +12 -0
- package/scripts/camoufox/launch-auth.mjs +112 -5
- package/scripts/ci/repo-sanity.mjs +1 -0
- package/scripts/compare-responses-sse.mjs +267 -0
- package/scripts/install-global.sh +6 -0
- package/scripts/install-verify.mjs +33 -16
- package/scripts/replay-codex-sample.mjs +52 -6
- package/scripts/run-bg.sh +226 -43
- package/scripts/run-fg-gtimeout.sh +158 -14
- package/scripts/tests/blackbox-rcc-vs-routecodex-antigravity.mjs +3 -3
- package/scripts/tests/ci-jest.mjs +9 -1
- package/scripts/triage-errorsamples.mjs +216 -0
- package/scripts/verify-codex-error-samples.mjs +92 -15
- package/scripts/verify-install-e2e.mjs +57 -27
- package/scripts/virtual-router-dryrun.mjs +7 -1
- package/dist/cli/commands/clock-admin.js.map +0 -1
- package/dist/cli/commands/tmux-inject.js.map +0 -1
- package/dist/cli/register/clock-admin-command.d.ts +0 -3
- package/dist/cli/register/clock-admin-command.js +0 -5
- package/dist/cli/register/clock-admin-command.js.map +0 -1
- package/dist/cli/register/tmux-inject-command.d.ts +0 -3
- package/dist/cli/register/tmux-inject-command.js +0 -5
- package/dist/cli/register/tmux-inject-command.js.map +0 -1
- package/dist/server/runtime/http-server/clock-client-reaper.js.map +0 -1
- package/dist/server/runtime/http-server/clock-client-registry-utils.js.map +0 -1
- package/dist/server/runtime/http-server/clock-client-registry.js.map +0 -1
- package/dist/server/runtime/http-server/clock-client-route-utils.js.map +0 -1
- package/dist/server/runtime/http-server/clock-client-routes.d.ts +0 -2
- package/dist/server/runtime/http-server/clock-client-routes.js.map +0 -1
- package/dist/server/runtime/http-server/clock-daemon-inject-config.d.ts +0 -1
- package/dist/server/runtime/http-server/clock-daemon-inject-config.js.map +0 -1
- package/dist/server/runtime/http-server/clock-daemon-log-throttle.d.ts +0 -12
- package/dist/server/runtime/http-server/clock-daemon-log-throttle.js +0 -56
- package/dist/server/runtime/http-server/clock-daemon-log-throttle.js.map +0 -1
- package/dist/server/runtime/http-server/http-server-clock-daemon.d.ts +0 -5
- package/dist/server/runtime/http-server/http-server-clock-daemon.js +0 -255
- package/dist/server/runtime/http-server/http-server-clock-daemon.js.map +0 -1
- package/dist/utils/clock-client-token.d.ts +0 -3
- package/dist/utils/clock-client-token.js +0 -54
- package/dist/utils/clock-client-token.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getSessionClientRegistry } from '../session-client-registry.js';
|
|
2
2
|
const DEFAULT_ANTIGRAVITY_MAX_PROVIDER_ATTEMPTS = 20;
|
|
3
3
|
const RATE_LIMIT_ERROR_CODE_HINTS = [
|
|
4
4
|
'429',
|
|
@@ -176,16 +176,18 @@ function normalizeSessionToken(value) {
|
|
|
176
176
|
const trimmed = value.trim();
|
|
177
177
|
return trimmed || undefined;
|
|
178
178
|
}
|
|
179
|
-
function
|
|
180
|
-
const
|
|
181
|
-
?? normalizeSessionToken(metadata.
|
|
182
|
-
|
|
183
|
-
|
|
179
|
+
function resolveSessionConversationSessionId(metadata) {
|
|
180
|
+
const tmuxSessionId = normalizeSessionToken(metadata.clientTmuxSessionId)
|
|
181
|
+
?? normalizeSessionToken(metadata.client_tmux_session_id)
|
|
182
|
+
?? normalizeSessionToken(metadata.tmuxSessionId)
|
|
183
|
+
?? normalizeSessionToken(metadata.tmux_session_id);
|
|
184
|
+
if (tmuxSessionId) {
|
|
185
|
+
return `tmux:${tmuxSessionId}`;
|
|
184
186
|
}
|
|
185
|
-
return
|
|
187
|
+
return undefined;
|
|
186
188
|
}
|
|
187
|
-
function
|
|
188
|
-
const direct = normalizeSessionToken(metadata.
|
|
189
|
+
function inferSessionClientTypeFromMetadata(metadata) {
|
|
190
|
+
const direct = normalizeSessionToken(metadata.sessionClientType) ?? normalizeSessionToken(metadata.clientType);
|
|
189
191
|
if (direct) {
|
|
190
192
|
return direct;
|
|
191
193
|
}
|
|
@@ -198,26 +200,28 @@ function inferClockClientTypeFromMetadata(metadata) {
|
|
|
198
200
|
}
|
|
199
201
|
return undefined;
|
|
200
202
|
}
|
|
201
|
-
export function
|
|
202
|
-
const conversationSessionId =
|
|
203
|
+
export function bindSessionConversationSession(metadata) {
|
|
204
|
+
const conversationSessionId = resolveSessionConversationSessionId(metadata);
|
|
203
205
|
if (!conversationSessionId) {
|
|
204
206
|
return;
|
|
205
207
|
}
|
|
206
|
-
const tmuxSessionId = normalizeSessionToken(metadata.
|
|
207
|
-
|
|
208
|
-
?? normalizeSessionToken(metadata.
|
|
209
|
-
const clientType =
|
|
210
|
-
const workdir = normalizeSessionToken(metadata.
|
|
208
|
+
const tmuxSessionId = normalizeSessionToken(metadata.clientTmuxSessionId)
|
|
209
|
+
?? normalizeSessionToken(metadata.client_tmux_session_id)
|
|
210
|
+
?? normalizeSessionToken(metadata.tmuxSessionId);
|
|
211
|
+
const clientType = inferSessionClientTypeFromMetadata(metadata);
|
|
212
|
+
const workdir = normalizeSessionToken(metadata.clientWorkdir)
|
|
213
|
+
?? normalizeSessionToken(metadata.client_workdir)
|
|
214
|
+
?? normalizeSessionToken(metadata.workdir)
|
|
211
215
|
?? normalizeSessionToken(metadata.cwd)
|
|
212
216
|
?? normalizeSessionToken(metadata.workingDirectory);
|
|
213
217
|
try {
|
|
214
|
-
|
|
218
|
+
const bindInput = {
|
|
215
219
|
conversationSessionId,
|
|
216
220
|
...(tmuxSessionId ? { tmuxSessionId } : {}),
|
|
217
|
-
...(daemonId ? { daemonId } : {}),
|
|
218
221
|
...(clientType ? { clientType } : {}),
|
|
219
222
|
...(workdir ? { workdir } : {})
|
|
220
|
-
}
|
|
223
|
+
};
|
|
224
|
+
getSessionClientRegistry().bindConversationSession(bindInput);
|
|
221
225
|
}
|
|
222
226
|
catch {
|
|
223
227
|
// best-effort only
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-retry-helpers.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/request-retry-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"request-retry-helpers.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/request-retry-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Handles retry logic, backoff, and retryable error detection.
|
|
5
5
|
*/
|
|
6
|
-
import { describeRetryReason, shouldRetryProviderError, waitBeforeRetry } from '../executor-provider.js';
|
|
7
|
-
export { describeRetryReason, shouldRetryProviderError, waitBeforeRetry };
|
|
6
|
+
import { describeRetryReason, isPromptTooLongError, shouldRetryProviderError, waitBeforeRetry } from '../executor-provider.js';
|
|
7
|
+
export { describeRetryReason, isPromptTooLongError, shouldRetryProviderError, waitBeforeRetry };
|
|
8
8
|
export declare const RETRYABLE_SSE_ERROR_CODE_HINTS: string[];
|
|
9
9
|
export declare const RETRYABLE_SSE_MESSAGE_HINTS: string[];
|
|
10
10
|
/**
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Handles retry logic, backoff, and retryable error detection.
|
|
5
5
|
*/
|
|
6
|
-
import { describeRetryReason, shouldRetryProviderError, waitBeforeRetry } from '../executor-provider.js';
|
|
6
|
+
import { describeRetryReason, isPromptTooLongError, shouldRetryProviderError, waitBeforeRetry } from '../executor-provider.js';
|
|
7
7
|
// Re-export for backward compatibility
|
|
8
|
-
export { describeRetryReason, shouldRetryProviderError, waitBeforeRetry };
|
|
8
|
+
export { describeRetryReason, isPromptTooLongError, shouldRetryProviderError, waitBeforeRetry };
|
|
9
9
|
// Retryable error detection for SSE responses
|
|
10
10
|
export const RETRYABLE_SSE_ERROR_CODE_HINTS = [
|
|
11
11
|
'internal_network_failure',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-engine.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/retry-engine.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"retry-engine.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/retry-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,9 +61,16 @@ function normalizeSseWrapperErrorValue(value, depth) {
|
|
|
61
61
|
// fallback to raw string
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
+
const bracketCodeMatch = trimmed.match(/\[([^\]]+)\]/);
|
|
65
|
+
const bracketCode = bracketCodeMatch && bracketCodeMatch[1] ? bracketCodeMatch[1].trim() : '';
|
|
66
|
+
const parsedStatus = /^\d+$/.test(bracketCode) && Number(bracketCode) >= 100 && Number(bracketCode) <= 599
|
|
67
|
+
? Number(bracketCode)
|
|
68
|
+
: undefined;
|
|
64
69
|
return {
|
|
65
70
|
message: trimmed,
|
|
66
|
-
|
|
71
|
+
...(bracketCode ? { errorCode: bracketCode } : {}),
|
|
72
|
+
...(parsedStatus !== undefined ? { statusCode: parsedStatus } : {}),
|
|
73
|
+
retryable: isRetryableSseWrapperError(trimmed, bracketCode || undefined, parsedStatus)
|
|
67
74
|
};
|
|
68
75
|
}
|
|
69
76
|
if (typeof value !== 'object' || Array.isArray(value)) {
|
|
@@ -92,11 +99,13 @@ function normalizeSseWrapperErrorValue(value, depth) {
|
|
|
92
99
|
const nestedInfo = normalizeSseWrapperErrorValue(record[key], depth - 1);
|
|
93
100
|
if (nestedInfo) {
|
|
94
101
|
const mergedCode = nestedInfo.errorCode ?? directCode;
|
|
102
|
+
const mergedStatus = nestedInfo.statusCode ?? directStatus;
|
|
95
103
|
const retryable = nestedInfo.retryable ||
|
|
96
|
-
isRetryableSseWrapperError(nestedInfo.message, mergedCode,
|
|
104
|
+
isRetryableSseWrapperError(nestedInfo.message, mergedCode, mergedStatus);
|
|
97
105
|
return {
|
|
98
106
|
message: nestedInfo.message,
|
|
99
107
|
...(mergedCode ? { errorCode: mergedCode } : {}),
|
|
108
|
+
...(mergedStatus !== undefined ? { statusCode: mergedStatus } : {}),
|
|
100
109
|
retryable
|
|
101
110
|
};
|
|
102
111
|
}
|
|
@@ -106,6 +115,7 @@ function normalizeSseWrapperErrorValue(value, depth) {
|
|
|
106
115
|
return {
|
|
107
116
|
message: directMessage,
|
|
108
117
|
...(directCode ? { errorCode: directCode } : {}),
|
|
118
|
+
...(directStatus !== undefined ? { statusCode: directStatus } : {}),
|
|
109
119
|
retryable: isRetryableSseWrapperError(directMessage, directCode, directStatus)
|
|
110
120
|
};
|
|
111
121
|
}
|
|
@@ -115,6 +125,7 @@ function normalizeSseWrapperErrorValue(value, depth) {
|
|
|
115
125
|
return {
|
|
116
126
|
message: serialized,
|
|
117
127
|
...(directCode ? { errorCode: directCode } : {}),
|
|
128
|
+
...(directStatus !== undefined ? { statusCode: directStatus } : {}),
|
|
118
129
|
retryable: isRetryableSseWrapperError(serialized, directCode, directStatus)
|
|
119
130
|
};
|
|
120
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-error-handler.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/sse-error-handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"sse-error-handler.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/sse-error-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,18 +17,6 @@ export declare function extractUsageFromResult(result: {
|
|
|
17
17
|
* Normalize usage metrics from various provider formats
|
|
18
18
|
*/
|
|
19
19
|
export declare function normalizeUsage(value: unknown): UsageMetrics | undefined;
|
|
20
|
-
/**
|
|
21
|
-
* Extract estimated input tokens from metadata
|
|
22
|
-
*/
|
|
23
|
-
export declare function extractEstimatedInputTokens(metadata?: Record<string, unknown>): number | undefined;
|
|
24
|
-
/**
|
|
25
|
-
* Reconcile upstream usage with local estimate
|
|
26
|
-
*/
|
|
27
|
-
export declare function reconcileUsageWithEstimate(usage: UsageMetrics, estimatedInput?: number, candidate?: unknown): UsageMetrics;
|
|
28
|
-
/**
|
|
29
|
-
* Patch usage candidate object with reconciled values
|
|
30
|
-
*/
|
|
31
|
-
export declare function patchUsageCandidate(candidate: unknown, prompt: number, completion: number, total: number): void;
|
|
32
20
|
/**
|
|
33
21
|
* Merge multiple usage metrics
|
|
34
22
|
*/
|
|
@@ -8,31 +8,71 @@ export {};
|
|
|
8
8
|
* Extract usage metrics from provider response
|
|
9
9
|
*/
|
|
10
10
|
export function extractUsageFromResult(result, metadata) {
|
|
11
|
-
|
|
11
|
+
void metadata;
|
|
12
12
|
const candidates = [];
|
|
13
|
-
if (metadata && typeof metadata === 'object') {
|
|
14
|
-
const bag = metadata;
|
|
15
|
-
if (bag.usage) {
|
|
16
|
-
candidates.push(bag.usage);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
13
|
if (result.body && typeof result.body === 'object') {
|
|
20
14
|
const body = result.body;
|
|
21
15
|
if (body.usage) {
|
|
22
16
|
candidates.push(body.usage);
|
|
23
17
|
}
|
|
18
|
+
if (body.metadata && typeof body.metadata === 'object') {
|
|
19
|
+
const bodyMeta = body.metadata;
|
|
20
|
+
if (bodyMeta.usage) {
|
|
21
|
+
candidates.push(bodyMeta.usage);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
if (body.data && typeof body.data === 'object') {
|
|
25
|
+
const bodyData = body.data;
|
|
26
|
+
if (bodyData.usage) {
|
|
27
|
+
candidates.push(bodyData.usage);
|
|
28
|
+
}
|
|
29
|
+
if (bodyData.metadata && typeof bodyData.metadata === 'object') {
|
|
30
|
+
const bodyDataMeta = bodyData.metadata;
|
|
31
|
+
if (bodyDataMeta.usage) {
|
|
32
|
+
candidates.push(bodyDataMeta.usage);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
24
36
|
if (body.response && typeof body.response === 'object') {
|
|
25
37
|
const responseNode = body.response;
|
|
26
38
|
if (responseNode.usage) {
|
|
27
39
|
candidates.push(responseNode.usage);
|
|
28
40
|
}
|
|
29
41
|
}
|
|
42
|
+
if (body.payload && typeof body.payload === 'object') {
|
|
43
|
+
const payload = body.payload;
|
|
44
|
+
if (payload.usage) {
|
|
45
|
+
candidates.push(payload.usage);
|
|
46
|
+
}
|
|
47
|
+
if (payload.metadata && typeof payload.metadata === 'object') {
|
|
48
|
+
const payloadMeta = payload.metadata;
|
|
49
|
+
if (payloadMeta.usage) {
|
|
50
|
+
candidates.push(payloadMeta.usage);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
if (payload.response && typeof payload.response === 'object') {
|
|
54
|
+
const payloadResponse = payload.response;
|
|
55
|
+
if (payloadResponse.usage) {
|
|
56
|
+
candidates.push(payloadResponse.usage);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (result.headers && typeof result.headers === 'object') {
|
|
62
|
+
const usageHeader = (result.headers['x-usage'] || result.headers['X-Usage'] || result.headers['x-routecodex-usage']);
|
|
63
|
+
if (typeof usageHeader === 'string' && usageHeader.trim()) {
|
|
64
|
+
try {
|
|
65
|
+
candidates.push(JSON.parse(usageHeader));
|
|
66
|
+
}
|
|
67
|
+
catch {
|
|
68
|
+
// ignore non-json usage header
|
|
69
|
+
}
|
|
70
|
+
}
|
|
30
71
|
}
|
|
31
72
|
for (const candidate of candidates) {
|
|
32
73
|
const normalized = normalizeUsage(candidate);
|
|
33
74
|
if (normalized) {
|
|
34
|
-
|
|
35
|
-
return reconciled;
|
|
75
|
+
return normalized;
|
|
36
76
|
}
|
|
37
77
|
}
|
|
38
78
|
return undefined;
|
|
@@ -45,29 +85,51 @@ export function normalizeUsage(value) {
|
|
|
45
85
|
return undefined;
|
|
46
86
|
}
|
|
47
87
|
const record = value;
|
|
48
|
-
const
|
|
49
|
-
? record.
|
|
50
|
-
:
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
88
|
+
const usageRecord = record.usageMetadata && typeof record.usageMetadata === 'object'
|
|
89
|
+
? record.usageMetadata
|
|
90
|
+
: record;
|
|
91
|
+
const readNumeric = (raw) => {
|
|
92
|
+
if (typeof raw === 'number' && Number.isFinite(raw)) {
|
|
93
|
+
return raw;
|
|
94
|
+
}
|
|
95
|
+
if (typeof raw === 'string' && raw.trim()) {
|
|
96
|
+
const parsed = Number(raw);
|
|
97
|
+
if (Number.isFinite(parsed)) {
|
|
98
|
+
return parsed;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return undefined;
|
|
102
|
+
};
|
|
103
|
+
const basePrompt = readNumeric(usageRecord.prompt_tokens) ??
|
|
104
|
+
readNumeric(usageRecord.input_tokens) ??
|
|
105
|
+
readNumeric(usageRecord.promptTokens) ??
|
|
106
|
+
readNumeric(usageRecord.inputTokens) ??
|
|
107
|
+
readNumeric(usageRecord.request_tokens) ??
|
|
108
|
+
readNumeric(usageRecord.requestTokens);
|
|
109
|
+
let cacheRead = readNumeric(usageRecord.cache_read_input_tokens);
|
|
110
|
+
if (cacheRead === undefined && usageRecord.input_tokens_details && typeof usageRecord.input_tokens_details === 'object') {
|
|
111
|
+
const details = usageRecord.input_tokens_details;
|
|
112
|
+
const cached = readNumeric(details.cached_tokens);
|
|
113
|
+
if (cached !== undefined) {
|
|
114
|
+
cacheRead = cached;
|
|
58
115
|
}
|
|
59
116
|
}
|
|
60
117
|
const prompt = basePrompt !== undefined || cacheRead !== undefined
|
|
61
118
|
? (basePrompt ?? 0) + (cacheRead ?? 0)
|
|
62
119
|
: undefined;
|
|
63
|
-
const completion =
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
120
|
+
const completion = readNumeric(usageRecord.completion_tokens) ??
|
|
121
|
+
readNumeric(usageRecord.output_tokens) ??
|
|
122
|
+
readNumeric(usageRecord.completionTokens) ??
|
|
123
|
+
readNumeric(usageRecord.outputTokens) ??
|
|
124
|
+
readNumeric(usageRecord.response_tokens) ??
|
|
125
|
+
readNumeric(usageRecord.responseTokens);
|
|
126
|
+
let total = readNumeric(usageRecord.total_tokens) ??
|
|
127
|
+
readNumeric(usageRecord.totalTokens);
|
|
128
|
+
if (prompt !== undefined && completion !== undefined) {
|
|
129
|
+
const expected = prompt + completion;
|
|
130
|
+
if (total === undefined || total < expected) {
|
|
131
|
+
total = expected;
|
|
132
|
+
}
|
|
71
133
|
}
|
|
72
134
|
if (prompt === undefined && completion === undefined && total === undefined) {
|
|
73
135
|
return undefined;
|
|
@@ -78,69 +140,6 @@ export function normalizeUsage(value) {
|
|
|
78
140
|
total_tokens: total
|
|
79
141
|
};
|
|
80
142
|
}
|
|
81
|
-
/**
|
|
82
|
-
* Extract estimated input tokens from metadata
|
|
83
|
-
*/
|
|
84
|
-
export function extractEstimatedInputTokens(metadata) {
|
|
85
|
-
if (!metadata || typeof metadata !== 'object') {
|
|
86
|
-
return undefined;
|
|
87
|
-
}
|
|
88
|
-
const bag = metadata;
|
|
89
|
-
const raw = bag.estimatedInputTokens ??
|
|
90
|
-
bag.estimated_tokens ??
|
|
91
|
-
bag.estimatedTokens;
|
|
92
|
-
const value = typeof raw === 'number' ? raw : Number(raw);
|
|
93
|
-
if (!Number.isFinite(value) || value <= 0) {
|
|
94
|
-
return undefined;
|
|
95
|
-
}
|
|
96
|
-
return value;
|
|
97
|
-
}
|
|
98
|
-
/**
|
|
99
|
-
* Reconcile upstream usage with local estimate
|
|
100
|
-
*/
|
|
101
|
-
export function reconcileUsageWithEstimate(usage, estimatedInput, candidate) {
|
|
102
|
-
if (!estimatedInput || !Number.isFinite(estimatedInput) || estimatedInput <= 0) {
|
|
103
|
-
return usage;
|
|
104
|
-
}
|
|
105
|
-
const upstreamPrompt = usage.prompt_tokens ?? usage.total_tokens ?? undefined;
|
|
106
|
-
const completion = usage.completion_tokens ?? 0;
|
|
107
|
-
// Use local estimate if upstream is missing
|
|
108
|
-
if (upstreamPrompt === undefined || upstreamPrompt <= 0) {
|
|
109
|
-
const total = estimatedInput + completion;
|
|
110
|
-
patchUsageCandidate(candidate, estimatedInput, completion, total);
|
|
111
|
-
return {
|
|
112
|
-
prompt_tokens: estimatedInput,
|
|
113
|
-
completion_tokens: completion,
|
|
114
|
-
total_tokens: total
|
|
115
|
-
};
|
|
116
|
-
}
|
|
117
|
-
const ratio = upstreamPrompt > 0 ? upstreamPrompt / estimatedInput : 1;
|
|
118
|
-
// Use local estimate if difference is too large
|
|
119
|
-
if (ratio > 5 || ratio < 0.2) {
|
|
120
|
-
const total = estimatedInput + completion;
|
|
121
|
-
patchUsageCandidate(candidate, estimatedInput, completion, total);
|
|
122
|
-
return {
|
|
123
|
-
prompt_tokens: estimatedInput,
|
|
124
|
-
completion_tokens: completion,
|
|
125
|
-
total_tokens: total
|
|
126
|
-
};
|
|
127
|
-
}
|
|
128
|
-
return usage;
|
|
129
|
-
}
|
|
130
|
-
/**
|
|
131
|
-
* Patch usage candidate object with reconciled values
|
|
132
|
-
*/
|
|
133
|
-
export function patchUsageCandidate(candidate, prompt, completion, total) {
|
|
134
|
-
if (!candidate || typeof candidate !== 'object') {
|
|
135
|
-
return;
|
|
136
|
-
}
|
|
137
|
-
const record = candidate;
|
|
138
|
-
record.prompt_tokens = prompt;
|
|
139
|
-
record.input_tokens = prompt;
|
|
140
|
-
record.completion_tokens = completion;
|
|
141
|
-
record.output_tokens = completion;
|
|
142
|
-
record.total_tokens = total;
|
|
143
|
-
}
|
|
144
143
|
/**
|
|
145
144
|
* Merge multiple usage metrics
|
|
146
145
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-aggregator.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/usage-aggregator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAA6E,EAC7E,QAAkC;IAElC,
|
|
1
|
+
{"version":3,"file":"usage-aggregator.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/executor/usage-aggregator.ts"],"names":[],"mappings":"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"}
|