@kaitranntt/ccs 7.79.1 → 8.0.0-dev.1
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 +29 -11
- package/dist/bin/ccsxp-runtime.d.ts.map +1 -1
- package/dist/bin/ccsxp-runtime.js +8 -0
- package/dist/bin/ccsxp-runtime.js.map +1 -1
- package/dist/bin/codex-runtime-router.d.ts +24 -0
- package/dist/bin/codex-runtime-router.d.ts.map +1 -0
- package/dist/bin/codex-runtime-router.js +117 -0
- package/dist/bin/codex-runtime-router.js.map +1 -0
- package/dist/bin/codex-runtime.d.ts +1 -0
- package/dist/bin/codex-runtime.js +7 -2
- package/dist/bin/codex-runtime.js.map +1 -1
- package/dist/ccs.js +2 -1
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js +2 -2
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts +2 -2
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +16 -8
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js.map +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts +8 -0
- package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.js +19 -2
- package/dist/cliproxy/ai-providers/model-id-normalizer.js.map +1 -1
- package/dist/cliproxy/ai-providers/service.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/service.js +39 -12
- package/dist/cliproxy/ai-providers/service.js.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts +13 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.js +111 -34
- package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.js +9 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.js.map +1 -1
- package/dist/cliproxy/config/generator.d.ts.map +1 -1
- package/dist/cliproxy/config/generator.js +5 -2
- package/dist/cliproxy/config/generator.js.map +1 -1
- package/dist/cliproxy/config/thinking-config.js +6 -6
- package/dist/cliproxy/config/thinking-config.js.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +1 -1
- package/dist/cliproxy/executor/env-resolver.js.map +1 -1
- package/dist/cliproxy/executor/session-bridge.d.ts.map +1 -1
- package/dist/cliproxy/executor/session-bridge.js +11 -8
- package/dist/cliproxy/executor/session-bridge.js.map +1 -1
- package/dist/cliproxy/quota/quota-fetcher-claude.d.ts.map +1 -1
- package/dist/cliproxy/quota/quota-fetcher-claude.js +35 -4
- package/dist/cliproxy/quota/quota-fetcher-claude.js.map +1 -1
- package/dist/cliproxy/quota/quota-manager.d.ts +1 -0
- package/dist/cliproxy/quota/quota-manager.d.ts.map +1 -1
- package/dist/cliproxy/quota/quota-manager.js +53 -2
- package/dist/cliproxy/quota/quota-manager.js.map +1 -1
- package/dist/cliproxy/services/oauth-usage-log-transformer.d.ts.map +1 -1
- package/dist/cliproxy/services/oauth-usage-log-transformer.js +5 -0
- package/dist/cliproxy/services/oauth-usage-log-transformer.js.map +1 -1
- package/dist/codex-auth/codex-account-identity.d.ts +8 -0
- package/dist/codex-auth/codex-account-identity.d.ts.map +1 -0
- package/dist/codex-auth/codex-account-identity.js +53 -0
- package/dist/codex-auth/codex-account-identity.js.map +1 -0
- package/dist/codex-auth/codex-auth-dashboard-service.d.ts +46 -0
- package/dist/codex-auth/codex-auth-dashboard-service.d.ts.map +1 -0
- package/dist/codex-auth/codex-auth-dashboard-service.js +228 -0
- package/dist/codex-auth/codex-auth-dashboard-service.js.map +1 -0
- package/dist/codex-auth/codex-auth-help.d.ts +7 -0
- package/dist/codex-auth/codex-auth-help.d.ts.map +1 -0
- package/dist/codex-auth/codex-auth-help.js +87 -0
- package/dist/codex-auth/codex-auth-help.js.map +1 -0
- package/dist/codex-auth/codex-auth-router.d.ts +16 -0
- package/dist/codex-auth/codex-auth-router.d.ts.map +1 -0
- package/dist/codex-auth/codex-auth-router.js +77 -0
- package/dist/codex-auth/codex-auth-router.js.map +1 -0
- package/dist/codex-auth/codex-config-symlink.d.ts +14 -0
- package/dist/codex-auth/codex-config-symlink.d.ts.map +1 -0
- package/dist/codex-auth/codex-config-symlink.js +128 -0
- package/dist/codex-auth/codex-config-symlink.js.map +1 -0
- package/dist/codex-auth/codex-profile-paths.d.ts +5 -0
- package/dist/codex-auth/codex-profile-paths.d.ts.map +1 -0
- package/dist/codex-auth/codex-profile-paths.js +58 -0
- package/dist/codex-auth/codex-profile-paths.js.map +1 -0
- package/dist/codex-auth/codex-profile-registry.d.ts +34 -0
- package/dist/codex-auth/codex-profile-registry.d.ts.map +1 -0
- package/dist/codex-auth/codex-profile-registry.js +360 -0
- package/dist/codex-auth/codex-profile-registry.js.map +1 -0
- package/dist/codex-auth/codex-profile-resources.d.ts +6 -0
- package/dist/codex-auth/codex-profile-resources.d.ts.map +1 -0
- package/dist/codex-auth/codex-profile-resources.js +119 -0
- package/dist/codex-auth/codex-profile-resources.js.map +1 -0
- package/dist/codex-auth/commands/create-command.d.ts +9 -0
- package/dist/codex-auth/commands/create-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/create-command.js +203 -0
- package/dist/codex-auth/commands/create-command.js.map +1 -0
- package/dist/codex-auth/commands/import-default-command.d.ts +18 -0
- package/dist/codex-auth/commands/import-default-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/import-default-command.js +385 -0
- package/dist/codex-auth/commands/import-default-command.js.map +1 -0
- package/dist/codex-auth/commands/index.d.ts +13 -0
- package/dist/codex-auth/commands/index.d.ts.map +1 -0
- package/dist/codex-auth/commands/index.js +27 -0
- package/dist/codex-auth/commands/index.js.map +1 -0
- package/dist/codex-auth/commands/login-command.d.ts +9 -0
- package/dist/codex-auth/commands/login-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/login-command.js +152 -0
- package/dist/codex-auth/commands/login-command.js.map +1 -0
- package/dist/codex-auth/commands/remove-command.d.ts +10 -0
- package/dist/codex-auth/commands/remove-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/remove-command.js +230 -0
- package/dist/codex-auth/commands/remove-command.js.map +1 -0
- package/dist/codex-auth/commands/show-command.d.ts +10 -0
- package/dist/codex-auth/commands/show-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/show-command.js +127 -0
- package/dist/codex-auth/commands/show-command.js.map +1 -0
- package/dist/codex-auth/commands/show-detail-view.d.ts +7 -0
- package/dist/codex-auth/commands/show-detail-view.d.ts.map +1 -0
- package/dist/codex-auth/commands/show-detail-view.js +134 -0
- package/dist/codex-auth/commands/show-detail-view.js.map +1 -0
- package/dist/codex-auth/commands/switch-command.d.ts +7 -0
- package/dist/codex-auth/commands/switch-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/switch-command.js +48 -0
- package/dist/codex-auth/commands/switch-command.js.map +1 -0
- package/dist/codex-auth/commands/types.d.ts +45 -0
- package/dist/codex-auth/commands/types.d.ts.map +1 -0
- package/dist/codex-auth/commands/types.js +85 -0
- package/dist/codex-auth/commands/types.js.map +1 -0
- package/dist/codex-auth/commands/use-command.d.ts +16 -0
- package/dist/codex-auth/commands/use-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/use-command.js +86 -0
- package/dist/codex-auth/commands/use-command.js.map +1 -0
- package/dist/codex-auth/decode-id-token.d.ts +12 -0
- package/dist/codex-auth/decode-id-token.d.ts.map +1 -0
- package/dist/codex-auth/decode-id-token.js +83 -0
- package/dist/codex-auth/decode-id-token.js.map +1 -0
- package/dist/codex-auth/index.d.ts +9 -0
- package/dist/codex-auth/index.d.ts.map +1 -0
- package/dist/codex-auth/index.js +22 -0
- package/dist/codex-auth/index.js.map +1 -0
- package/dist/codex-auth/resolve-active-profile.d.ts +13 -0
- package/dist/codex-auth/resolve-active-profile.d.ts.map +1 -0
- package/dist/codex-auth/resolve-active-profile.js +161 -0
- package/dist/codex-auth/resolve-active-profile.js.map +1 -0
- package/dist/codex-auth/shell-detect.d.ts +19 -0
- package/dist/codex-auth/shell-detect.d.ts.map +1 -0
- package/dist/codex-auth/shell-detect.js +129 -0
- package/dist/codex-auth/shell-detect.js.map +1 -0
- package/dist/codex-auth/types.d.ts +26 -0
- package/dist/codex-auth/types.d.ts.map +1 -0
- package/dist/codex-auth/types.js +34 -0
- package/dist/codex-auth/types.js.map +1 -0
- package/dist/commands/cliproxy/variant-subcommand.js +1 -1
- package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
- package/dist/commands/command-catalog.d.ts +1 -1
- package/dist/commands/command-catalog.d.ts.map +1 -1
- package/dist/commands/command-catalog.js +10 -1
- package/dist/commands/command-catalog.js.map +1 -1
- package/dist/commands/completion-backend.d.ts.map +1 -1
- package/dist/commands/completion-backend.js +2 -0
- package/dist/commands/completion-backend.js.map +1 -1
- package/dist/commands/config-command.d.ts +2 -0
- package/dist/commands/config-command.d.ts.map +1 -1
- package/dist/commands/config-command.js +31 -20
- package/dist/commands/config-command.js.map +1 -1
- package/dist/commands/docker/finalize-key-rotation-subcommand.d.ts +2 -0
- package/dist/commands/docker/finalize-key-rotation-subcommand.d.ts.map +1 -0
- package/dist/commands/docker/finalize-key-rotation-subcommand.js +79 -0
- package/dist/commands/docker/finalize-key-rotation-subcommand.js.map +1 -0
- package/dist/commands/docker/help-subcommand.d.ts.map +1 -1
- package/dist/commands/docker/help-subcommand.js +6 -0
- package/dist/commands/docker/help-subcommand.js.map +1 -1
- package/dist/commands/docker/index.d.ts.map +1 -1
- package/dist/commands/docker/index.js +4 -0
- package/dist/commands/docker/index.js.map +1 -1
- package/dist/commands/docker/show-key-subcommand.d.ts +2 -0
- package/dist/commands/docker/show-key-subcommand.d.ts.map +1 -0
- package/dist/commands/docker/show-key-subcommand.js +96 -0
- package/dist/commands/docker/show-key-subcommand.js.map +1 -0
- package/dist/commands/docker/up-subcommand.d.ts.map +1 -1
- package/dist/commands/docker/up-subcommand.js +4 -0
- package/dist/commands/docker/up-subcommand.js.map +1 -1
- package/dist/commands/persist-command.d.ts.map +1 -1
- package/dist/commands/persist-command.js +77 -5
- package/dist/commands/persist-command.js.map +1 -1
- package/dist/dispatcher/cli-argument-parser.d.ts +3 -2
- package/dist/dispatcher/cli-argument-parser.d.ts.map +1 -1
- package/dist/dispatcher/cli-argument-parser.js +37 -7
- package/dist/dispatcher/cli-argument-parser.js.map +1 -1
- package/dist/dispatcher/pre-dispatch.d.ts.map +1 -1
- package/dist/dispatcher/pre-dispatch.js +7 -0
- package/dist/dispatcher/pre-dispatch.js.map +1 -1
- package/dist/dispatcher/target-executor.d.ts +2 -2
- package/dist/dispatcher/target-executor.d.ts.map +1 -1
- package/dist/dispatcher/target-executor.js +5 -5
- package/dist/dispatcher/target-executor.js.map +1 -1
- package/dist/docker/docker-bootstrap.d.ts +1 -1
- package/dist/docker/docker-bootstrap.d.ts.map +1 -1
- package/dist/docker/docker-bootstrap.js +99 -3
- package/dist/docker/docker-bootstrap.js.map +1 -1
- package/dist/docker/docker-executor.d.ts +3 -0
- package/dist/docker/docker-executor.d.ts.map +1 -1
- package/dist/docker/docker-executor.js +53 -0
- package/dist/docker/docker-executor.js.map +1 -1
- package/dist/docker/docker-key-rotation.d.ts +48 -0
- package/dist/docker/docker-key-rotation.d.ts.map +1 -0
- package/dist/docker/docker-key-rotation.js +179 -0
- package/dist/docker/docker-key-rotation.js.map +1 -0
- package/dist/management/checks/config-check.d.ts.map +1 -1
- package/dist/management/checks/config-check.js +10 -1
- package/dist/management/checks/config-check.js.map +1 -1
- package/dist/management/doctor.d.ts +1 -0
- package/dist/management/doctor.d.ts.map +1 -1
- package/dist/management/doctor.js +23 -0
- package/dist/management/doctor.js.map +1 -1
- package/dist/proxy/proxy-daemon.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon.js +15 -3
- package/dist/proxy/proxy-daemon.js.map +1 -1
- package/dist/proxy/server/messages-route.d.ts.map +1 -1
- package/dist/proxy/server/messages-route.js +27 -1
- package/dist/proxy/server/messages-route.js.map +1 -1
- package/dist/shared/claude-extension-setup.d.ts.map +1 -1
- package/dist/shared/claude-extension-setup.js +21 -1
- package/dist/shared/claude-extension-setup.js.map +1 -1
- package/dist/shared/stale-codex-translator-settings.d.ts +4 -0
- package/dist/shared/stale-codex-translator-settings.d.ts.map +1 -0
- package/dist/shared/stale-codex-translator-settings.js +35 -0
- package/dist/shared/stale-codex-translator-settings.js.map +1 -0
- package/dist/targets/codex-adapter.d.ts.map +1 -1
- package/dist/targets/codex-adapter.js +64 -5
- package/dist/targets/codex-adapter.js.map +1 -1
- package/dist/targets/codex-cliproxy-provider-config.d.ts.map +1 -1
- package/dist/targets/codex-cliproxy-provider-config.js +56 -24
- package/dist/targets/codex-cliproxy-provider-config.js.map +1 -1
- package/dist/ui/assets/Trans-dEd8UC39.js +1 -0
- package/dist/ui/assets/accounts-B2THsSu_.js +1 -0
- package/dist/ui/assets/{alert-dialog-DC1l1GRX.js → alert-dialog-Vurq1xzV.js} +1 -1
- package/dist/ui/assets/api-CjLfG9mL.js +4 -0
- package/dist/ui/assets/auth-section-iGkrMaT4.js +1 -0
- package/dist/ui/assets/backups-section-DUGG_4KP.js +1 -0
- package/dist/ui/assets/channels-CimlCc2d.js +1 -0
- package/dist/ui/assets/{charts-CeK2xCSo.js → charts-eIPy2oG6.js} +34 -34
- package/dist/ui/assets/{checkbox-Dgd2ucy2.js → checkbox-HiMHasEB.js} +1 -1
- package/dist/ui/assets/claude-extension-B2v9bsN9.js +1 -0
- package/dist/ui/assets/{cliproxy-ai-providers-DxoCNEaQ.js → cliproxy-ai-providers-2lI5jSHb.js} +6 -6
- package/dist/ui/assets/cliproxy-control-panel-63gDI-e5.js +1 -0
- package/dist/ui/assets/cliproxy-fai69Vyd.js +4 -0
- package/dist/ui/assets/code-highlight-ClSMkeL5.js +1 -0
- package/dist/ui/assets/codex-i_hfI4Tv.js +30 -0
- package/dist/ui/assets/{confirm-dialog-nDFNrH0F.js → confirm-dialog-B_6SrSxL.js} +1 -1
- package/dist/ui/assets/copilot-BgG5x_X6.js +3 -0
- package/dist/ui/assets/cursor-DF63lFcy.js +1 -0
- package/dist/ui/assets/droid-CqlQmFtN.js +2 -0
- package/dist/ui/assets/globalenv-section-CYNmD12i.js +1 -0
- package/dist/ui/assets/health-7ZO5PEm9.js +1 -0
- package/dist/ui/assets/index-BC5ssPfF.js +1 -0
- package/dist/ui/assets/index-BMoGhs28.css +1 -0
- package/dist/ui/assets/index-Bgcd4FYK.js +1 -0
- package/dist/ui/assets/index-CFu0saCM.js +1 -0
- package/dist/ui/assets/index-CqsmdQoA.js +1 -0
- package/dist/ui/assets/index-D3kxCuJ7.js +1 -0
- package/dist/ui/assets/index-DmV9wJET.js +56 -0
- package/dist/ui/assets/index-hHb9o079.js +1 -0
- package/dist/ui/assets/logs-Dy-yZhIK.js +1 -0
- package/dist/ui/assets/{masked-input-5TJ4LSuz.js → masked-input-BSLeznEs.js} +1 -1
- package/dist/ui/assets/proxy-status-widget-hRH1agF9.js +1 -0
- package/dist/ui/assets/{raw-json-settings-editor-panel-Fg4WMiuD.js → raw-json-settings-editor-panel-Bs83yILR.js} +1 -1
- package/dist/ui/assets/{searchable-select-CPJn5vA1.js → searchable-select-pXUC_0Ih.js} +1 -1
- package/dist/ui/assets/{separator-BrQkfpAp.js → separator-FZR_61I9.js} +1 -1
- package/dist/ui/assets/shared-BiIwM7--.js +8 -0
- package/dist/ui/assets/{table-DRzNRkpJ.js → table-_9IusQ8G.js} +1 -1
- package/dist/ui/assets/updates-ButNfJqt.js +1 -0
- package/dist/ui/assets/{use-accounts-B6AXtlfF.js → use-accounts-BdtI0lBv.js} +1 -1
- package/dist/ui/index.html +3 -3
- package/dist/utils/claude-subcommand-detector.d.ts +12 -3
- package/dist/utils/claude-subcommand-detector.d.ts.map +1 -1
- package/dist/utils/claude-subcommand-detector.js +59 -12
- package/dist/utils/claude-subcommand-detector.js.map +1 -1
- package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
- package/dist/web-server/middleware/auth-middleware.js +25 -1
- package/dist/web-server/middleware/auth-middleware.js.map +1 -1
- package/dist/web-server/routes/claude-extension-routes.d.ts.map +1 -1
- package/dist/web-server/routes/claude-extension-routes.js +5 -0
- package/dist/web-server/routes/claude-extension-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts +8 -0
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.js +13 -26
- package/dist/web-server/routes/cliproxy-stats-routes.js.map +1 -1
- package/dist/web-server/routes/codex-routes.d.ts.map +1 -1
- package/dist/web-server/routes/codex-routes.js +14 -0
- package/dist/web-server/routes/codex-routes.js.map +1 -1
- package/dist/web-server/services/cliproxy-dashboard-restart-service.d.ts +21 -0
- package/dist/web-server/services/cliproxy-dashboard-restart-service.d.ts.map +1 -0
- package/dist/web-server/services/cliproxy-dashboard-restart-service.js +49 -0
- package/dist/web-server/services/cliproxy-dashboard-restart-service.js.map +1 -0
- package/dist/web-server/services/codex-dashboard-service.d.ts.map +1 -1
- package/dist/web-server/services/codex-dashboard-service.js +30 -3
- package/dist/web-server/services/codex-dashboard-service.js.map +1 -1
- package/dist/web-server/usage/aggregator.d.ts +13 -7
- package/dist/web-server/usage/aggregator.d.ts.map +1 -1
- package/dist/web-server/usage/aggregator.js +37 -22
- package/dist/web-server/usage/aggregator.js.map +1 -1
- package/dist/web-server/usage/handlers.d.ts +1 -0
- package/dist/web-server/usage/handlers.d.ts.map +1 -1
- package/dist/web-server/usage/handlers.js +16 -8
- package/dist/web-server/usage/handlers.js.map +1 -1
- package/dist/web-server/usage/profile-filter.d.ts +13 -0
- package/dist/web-server/usage/profile-filter.d.ts.map +1 -0
- package/dist/web-server/usage/profile-filter.js +30 -0
- package/dist/web-server/usage/profile-filter.js.map +1 -0
- package/dist/web-server/usage/types.d.ts +8 -0
- package/dist/web-server/usage/types.d.ts.map +1 -1
- package/lib/hooks/websearch-transformer.cjs +12 -3
- package/lib/mcp/ccs-browser-server.cjs +217 -12
- package/package.json +1 -1
- package/scripts/docker-dashboard-sunset-guard.js +171 -0
- package/scripts/run-test-bucket.js +1 -0
- package/scripts/verify-bundle.js +4 -1
- package/dist/ui/assets/accounts-BQu3Aeey.js +0 -1
- package/dist/ui/assets/api-BTbrbjic.js +0 -4
- package/dist/ui/assets/auth-section-BsSVWOMp.js +0 -1
- package/dist/ui/assets/backups-section-BGHYHASS.js +0 -1
- package/dist/ui/assets/channels-vJ8L4j-z.js +0 -1
- package/dist/ui/assets/claude-extension-B3ern4Ad.js +0 -1
- package/dist/ui/assets/cliproxy-CGljI0Or.js +0 -4
- package/dist/ui/assets/cliproxy-control-panel-BJ3Mliy1.js +0 -1
- package/dist/ui/assets/code-highlight-D4E79GKQ.js +0 -3
- package/dist/ui/assets/codex-DBGHPn0v.js +0 -30
- package/dist/ui/assets/copilot-CE_Z3NB0.js +0 -3
- package/dist/ui/assets/cursor-YzGsSR_d.js +0 -1
- package/dist/ui/assets/droid-C-ItViCi.js +0 -2
- package/dist/ui/assets/globalenv-section-C9gSGyZ8.js +0 -1
- package/dist/ui/assets/health-DEeA97sQ.js +0 -1
- package/dist/ui/assets/index-B71yJlMj.css +0 -1
- package/dist/ui/assets/index-BPVO-QAw.js +0 -1
- package/dist/ui/assets/index-BRZp_Csi.js +0 -72
- package/dist/ui/assets/index-BYUwpOeA.js +0 -1
- package/dist/ui/assets/index-D2r_fAW5.js +0 -1
- package/dist/ui/assets/index-DGiziSVQ.js +0 -1
- package/dist/ui/assets/index-DwG6bbUr.js +0 -1
- package/dist/ui/assets/index-Dwtj4wGT.js +0 -1
- package/dist/ui/assets/logs-Mt2W7M3G.js +0 -1
- package/dist/ui/assets/proxy-status-widget-BQOAlYsb.js +0 -1
- package/dist/ui/assets/shared-BlkDl2HF.js +0 -8
- package/dist/ui/assets/updates-BQNeSzLj.js +0 -1
|
@@ -1,17 +1,113 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.ensureDockerCliproxyAuth = void 0;
|
|
27
|
+
const crypto_1 = require("crypto");
|
|
3
28
|
const child_process_1 = require("child_process");
|
|
29
|
+
const fs = __importStar(require("fs"));
|
|
4
30
|
const binary_manager_1 = require("../cliproxy/binary-manager");
|
|
5
31
|
const config_generator_1 = require("../cliproxy/config/config-generator");
|
|
6
32
|
const port_manager_1 = require("../cliproxy/config/port-manager");
|
|
7
33
|
const path_resolver_1 = require("../cliproxy/config/path-resolver");
|
|
8
34
|
const session_tracker_1 = require("../cliproxy/session-tracker");
|
|
9
|
-
const
|
|
35
|
+
const config_loader_facade_1 = require("../config/config-loader-facade");
|
|
36
|
+
const docker_key_rotation_1 = require("./docker-key-rotation");
|
|
37
|
+
function generateDockerSecret() {
|
|
38
|
+
return (0, crypto_1.randomBytes)(32).toString('base64url');
|
|
39
|
+
}
|
|
40
|
+
function ensureDockerCliproxyAuth() {
|
|
41
|
+
const now = new Date();
|
|
42
|
+
const hadUnifiedConfig = fs.existsSync((0, config_loader_facade_1.getConfigYamlPath)());
|
|
43
|
+
const hadCliproxyConfig = (0, config_generator_1.configExists)(port_manager_1.CLIPROXY_DEFAULT_PORT);
|
|
44
|
+
const cliproxyConfigPath = (0, path_resolver_1.getCliproxyConfigPath)();
|
|
45
|
+
const existingCliproxyConfig = hadCliproxyConfig
|
|
46
|
+
? fs.readFileSync(cliproxyConfigPath, 'utf8')
|
|
47
|
+
: '';
|
|
48
|
+
const config = (0, config_loader_facade_1.loadOrCreateUnifiedConfig)();
|
|
49
|
+
const auth = config.cliproxy.auth;
|
|
50
|
+
const needsApiKey = !auth?.api_key || auth.api_key === config_generator_1.CCS_INTERNAL_API_KEY;
|
|
51
|
+
const needsManagementSecret = !auth?.management_secret || auth.management_secret === config_generator_1.CCS_CONTROL_PANEL_SECRET;
|
|
52
|
+
const stateRead = (0, docker_key_rotation_1.readDockerBootstrapState)();
|
|
53
|
+
const existingState = stateRead.state;
|
|
54
|
+
const existingApiKey = auth?.api_key;
|
|
55
|
+
let replacementApiKey = existingApiKey;
|
|
56
|
+
let configChanged = false;
|
|
57
|
+
if (needsApiKey || needsManagementSecret) {
|
|
58
|
+
(0, config_loader_facade_1.mutateConfig)((nextConfig) => {
|
|
59
|
+
var _a;
|
|
60
|
+
(_a = nextConfig.cliproxy).auth ?? (_a.auth = {});
|
|
61
|
+
if (needsApiKey) {
|
|
62
|
+
replacementApiKey = generateDockerSecret();
|
|
63
|
+
nextConfig.cliproxy.auth.api_key = replacementApiKey;
|
|
64
|
+
}
|
|
65
|
+
if (needsManagementSecret) {
|
|
66
|
+
nextConfig.cliproxy.auth.management_secret = generateDockerSecret();
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
configChanged = true;
|
|
70
|
+
}
|
|
71
|
+
if (!replacementApiKey) {
|
|
72
|
+
replacementApiKey = (0, config_loader_facade_1.loadOrCreateUnifiedConfig)().cliproxy.auth?.api_key;
|
|
73
|
+
}
|
|
74
|
+
const existingLegacyKeyInCliproxyConfig = existingCliproxyConfig.includes(`"${docker_key_rotation_1.DOCKER_LEGACY_API_KEY}"`);
|
|
75
|
+
const freshInstall = !hadUnifiedConfig && !hadCliproxyConfig;
|
|
76
|
+
const oldDefaultUpgrade = needsApiKey && !freshInstall;
|
|
77
|
+
const explicitLegacyRestore = (0, docker_key_rotation_1.shouldRestoreDockerLegacyApiKey)();
|
|
78
|
+
const legacyRestoreEligible = !existingState?.legacyKeyGrace;
|
|
79
|
+
const alreadyBrokenUpgrade = explicitLegacyRestore &&
|
|
80
|
+
legacyRestoreEligible &&
|
|
81
|
+
hadCliproxyConfig &&
|
|
82
|
+
(0, docker_key_rotation_1.isLikelyDockerGeneratedApiKey)(replacementApiKey) &&
|
|
83
|
+
!existingLegacyKeyInCliproxyConfig;
|
|
84
|
+
const corruptedRecoverableUpgrade = explicitLegacyRestore &&
|
|
85
|
+
stateRead.corrupted &&
|
|
86
|
+
hadCliproxyConfig &&
|
|
87
|
+
(0, docker_key_rotation_1.isLikelyDockerGeneratedApiKey)(replacementApiKey);
|
|
88
|
+
let nextState = existingState ?? (0, docker_key_rotation_1.createDockerBootstrapState)(replacementApiKey, now);
|
|
89
|
+
if (replacementApiKey && !nextState.apiKey) {
|
|
90
|
+
nextState = { ...nextState, apiKey: replacementApiKey };
|
|
91
|
+
}
|
|
92
|
+
if (replacementApiKey &&
|
|
93
|
+
!(0, docker_key_rotation_1.isDockerLegacyKeyGraceActive)(existingState, now) &&
|
|
94
|
+
(oldDefaultUpgrade || alreadyBrokenUpgrade || corruptedRecoverableUpgrade)) {
|
|
95
|
+
nextState = (0, docker_key_rotation_1.addLegacyKeyGrace)(nextState, replacementApiKey, now);
|
|
96
|
+
}
|
|
97
|
+
if (!existingState || stateRead.corrupted || nextState !== existingState) {
|
|
98
|
+
(0, docker_key_rotation_1.writeDockerBootstrapState)(nextState);
|
|
99
|
+
}
|
|
100
|
+
const legacyShouldBePresent = (0, docker_key_rotation_1.isDockerLegacyKeyGraceActive)(nextState, now);
|
|
101
|
+
const legacyPresenceChanged = existingLegacyKeyInCliproxyConfig !== legacyShouldBePresent;
|
|
102
|
+
return configChanged || legacyPresenceChanged;
|
|
103
|
+
}
|
|
104
|
+
exports.ensureDockerCliproxyAuth = ensureDockerCliproxyAuth;
|
|
10
105
|
async function prepareIntegratedRuntime() {
|
|
11
106
|
const binaryPath = await (0, binary_manager_1.ensureCLIProxyBinary)(false);
|
|
107
|
+
const authWasGenerated = ensureDockerCliproxyAuth();
|
|
12
108
|
const configPath = !(0, config_generator_1.configExists)(port_manager_1.CLIPROXY_DEFAULT_PORT)
|
|
13
109
|
? (0, config_generator_1.generateConfig)('gemini', port_manager_1.CLIPROXY_DEFAULT_PORT)
|
|
14
|
-
: (0, config_generator_1.configNeedsRegeneration)()
|
|
110
|
+
: authWasGenerated || (0, config_generator_1.configNeedsRegeneration)()
|
|
15
111
|
? (0, config_generator_1.regenerateConfig)(port_manager_1.CLIPROXY_DEFAULT_PORT)
|
|
16
112
|
: (0, path_resolver_1.getCliproxyConfigPath)();
|
|
17
113
|
return { binaryPath, configPath };
|
|
@@ -32,7 +128,7 @@ async function runCliproxy() {
|
|
|
32
128
|
if (!child.pid)
|
|
33
129
|
return;
|
|
34
130
|
try {
|
|
35
|
-
const version = (0,
|
|
131
|
+
const version = (0, binary_manager_1.getInstalledCliproxyVersion)();
|
|
36
132
|
sessionId = (0, session_tracker_1.registerSession)(port_manager_1.CLIPROXY_DEFAULT_PORT, child.pid, version, 'plus');
|
|
37
133
|
}
|
|
38
134
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-bootstrap.js","sourceRoot":"","sources":["../../src/docker/docker-bootstrap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docker-bootstrap.js","sourceRoot":"","sources":["../../src/docker/docker-bootstrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,9 @@ export declare class DockerExecutor {
|
|
|
29
29
|
status(options: DockerCommandTarget): DockerStatusResult;
|
|
30
30
|
update(options: DockerCommandTarget): void;
|
|
31
31
|
logs(options: DockerLogsOptions): Promise<string | void>;
|
|
32
|
+
showKey(options: DockerCommandTarget, full: boolean): string;
|
|
33
|
+
finalizeKeyRotation(options: DockerCommandTarget): string;
|
|
34
|
+
getKeyRotationBanner(options: DockerCommandTarget): string;
|
|
32
35
|
private stageRemoteAssets;
|
|
33
36
|
private runCompose;
|
|
34
37
|
private runDocker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-executor.d.ts","sourceRoot":"","sources":["../../src/docker/docker-executor.ts"],"names":[],"mappings":";;AAEA,OAAO,EAIL,KAAK,gBAAgB,EAItB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAmBxB,UAAU,oBAAoB;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"docker-executor.d.ts","sourceRoot":"","sources":["../../src/docker/docker-executor.ts"],"names":[],"mappings":";;AAEA,OAAO,EAIL,KAAK,gBAAgB,EAItB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAmBxB,UAAU,oBAAoB;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAoID,UAAU,kBAAkB;IAC1B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,MAAM,CAAC;IACtC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,CACR,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,CAAC,EAAE,oBAAoB,KAC3B,mBAAmB,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AAED,qBAAa,cAAc;IAGb,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;gBAEb,IAAI,GAAE,kBAAuB;IAI1D,SAAS,CAAC,OAAO,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,mBAAmB;IAI7F,EAAE,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAuBlC,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAIxC,MAAM,CAAC,OAAO,EAAE,mBAAmB,GAAG,kBAAkB;IAaxD,MAAM,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAcpC,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAuB9D,OAAO,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM;IAe5D,mBAAmB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM;IAgBzD,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM;IAqB1D,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,UAAU;IA0BlB,OAAO,CAAC,SAAS;YAcH,kBAAkB;IAQhC,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,yBAAyB;IAIjC,OAAO,CAAC,OAAO;YAYD,YAAY;IAI1B,OAAO,CAAC,aAAa;CAgBtB"}
|
|
@@ -98,6 +98,10 @@ function runStreaming(command, args) {
|
|
|
98
98
|
});
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
|
+
function sleepSync(ms) {
|
|
102
|
+
const buffer = new SharedArrayBuffer(4);
|
|
103
|
+
Atomics.wait(new Int32Array(buffer), 0, 0, ms);
|
|
104
|
+
}
|
|
101
105
|
let cachedLocalComposePrefix;
|
|
102
106
|
function resolveLocalComposePrefix() {
|
|
103
107
|
if (cachedLocalComposePrefix) {
|
|
@@ -149,6 +153,9 @@ class DockerExecutor {
|
|
|
149
153
|
CCS_NPM_VERSION: this.getInstalledCcsVersion(),
|
|
150
154
|
CCS_DASHBOARD_PORT: String(options.port),
|
|
151
155
|
CCS_CLIPROXY_PORT: String(options.proxyPort),
|
|
156
|
+
CCS_DOCKER_BIND_HOST: process.env.CCS_DOCKER_BIND_HOST || '127.0.0.1',
|
|
157
|
+
CCS_DOCKER_LEGACY_KEY_GRACE_DAYS: process.env.CCS_DOCKER_LEGACY_KEY_GRACE_DAYS || '',
|
|
158
|
+
CCS_DOCKER_RESTORE_LEGACY_API_KEY: process.env.CCS_DOCKER_RESTORE_LEGACY_API_KEY || '',
|
|
152
159
|
}, REMOTE_DOCKER_BUILD_TIMEOUT_MS), 'Docker stack startup', options);
|
|
153
160
|
}
|
|
154
161
|
down(options) {
|
|
@@ -185,6 +192,52 @@ class DockerExecutor {
|
|
|
185
192
|
this.ensureSuccess(result, 'Docker log retrieval', options);
|
|
186
193
|
return result.stdout;
|
|
187
194
|
}
|
|
195
|
+
showKey(options, full) {
|
|
196
|
+
const args = [
|
|
197
|
+
'exec',
|
|
198
|
+
docker_assets_1.DOCKER_CONTAINER_NAME,
|
|
199
|
+
'ccs',
|
|
200
|
+
'docker',
|
|
201
|
+
'show-key',
|
|
202
|
+
'--container-scope',
|
|
203
|
+
...(full ? ['--full'] : []),
|
|
204
|
+
];
|
|
205
|
+
const result = this.runDocker(args, options);
|
|
206
|
+
this.ensureSuccess(result, 'Docker key display', options);
|
|
207
|
+
return result.stdout;
|
|
208
|
+
}
|
|
209
|
+
finalizeKeyRotation(options) {
|
|
210
|
+
const result = this.runDocker([
|
|
211
|
+
'exec',
|
|
212
|
+
docker_assets_1.DOCKER_CONTAINER_NAME,
|
|
213
|
+
'ccs',
|
|
214
|
+
'docker',
|
|
215
|
+
'finalize-key-rotation',
|
|
216
|
+
'--container-scope',
|
|
217
|
+
], options);
|
|
218
|
+
this.ensureSuccess(result, 'Docker key rotation finalization', options);
|
|
219
|
+
return result.stdout;
|
|
220
|
+
}
|
|
221
|
+
getKeyRotationBanner(options) {
|
|
222
|
+
const args = [
|
|
223
|
+
'exec',
|
|
224
|
+
docker_assets_1.DOCKER_CONTAINER_NAME,
|
|
225
|
+
'ccs',
|
|
226
|
+
'docker',
|
|
227
|
+
'show-key',
|
|
228
|
+
'--container-scope',
|
|
229
|
+
'--full',
|
|
230
|
+
'--banner-only',
|
|
231
|
+
];
|
|
232
|
+
for (let attempt = 0; attempt < 10; attempt += 1) {
|
|
233
|
+
const result = this.runDocker(args, options, LOCAL_DOCKER_SYNC_TIMEOUT_MS);
|
|
234
|
+
if (result.exitCode === 0) {
|
|
235
|
+
return result.stdout.trim();
|
|
236
|
+
}
|
|
237
|
+
sleepSync(500);
|
|
238
|
+
}
|
|
239
|
+
return '';
|
|
240
|
+
}
|
|
188
241
|
stageRemoteAssets(host) {
|
|
189
242
|
this.ensureSuccess(this.runSync('ssh', [host, `mkdir -p ${docker_assets_1.DOCKER_REMOTE_DIR}`], { remote: true }), 'Remote Docker asset staging', { host });
|
|
190
243
|
const files = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-executor.js","sourceRoot":"","sources":["../../src/docker/docker-executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"docker-executor.js","sourceRoot":"","sources":["../../src/docker/docker-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAiD;AACjD,2CAA6B;AAC7B,mDAQyB;AAUzB,MAAM,4BAA4B,GAAG,KAAM,CAAC;AAC5C,MAAM,6BAA6B,GAAG,KAAM,CAAC;AAC7C,MAAM,8BAA8B,GAAG,MAAO,CAAC;AAE/C,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;AAC/C,CAAC;AAED,SAAS,aAAa,CAAC,OAAe,EAAE,IAAc;IACpD,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,eAAe,CAAC,KAAyC;IAChE,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7C,CAAC;AASD,SAAS,aAAa,CAAC,SAAiB;IACtC,OAAO,SAAS,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,CAAC;AAC5E,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAAe,EACf,IAAc,EACd,SAAiB,EACjB,MAAe;IAEf,OAAO;QACL,2BAA2B,aAAa,CAAC,SAAS,CAAC,oBACjD,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OACtB,kBAAkB;QAClB,YAAY,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM;YACJ,CAAC,CAAC,oEAAoE;YACtE,CAAC,CAAC,4DAA4D;KACjE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAAC,OAA6B;IACzD,OAAO;QACL,GAAG,OAAO;QACV,SAAS,EACP,OAAO,CAAC,SAAS;YACjB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,4BAA4B,CAAC;KAClF,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CACd,OAAe,EACf,IAAc,EACd,UAAgC,EAAE;IAElC,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,EAAE;QACtC,GAAG,EAAE,iBAAiB,CAAC,GAAG;QAC1B,GAAG,EAAE,iBAAiB,CAAC,GAAG;QAC1B,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,iBAAiB,CAAC,SAAS;QACpC,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,MAAM,YAAY,GAChB,MAAM,CAAC,KAAK,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW;QACzE,CAAC,CAAC,mBAAmB,CACjB,OAAO,EACP,IAAI,EACJ,iBAAiB,CAAC,SAAS,IAAI,4BAA4B,EAC3D,iBAAiB,CAAC,MAAM,IAAI,KAAK,CAClC;QACH,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC;IAC5B,MAAM,MAAM,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzF,OAAO;QACL,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC;QACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,IAAI,CAAC;QAC5B,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC;QACtC,MAAM;QACN,MAAM,EAAE,iBAAiB,CAAC,MAAM,IAAI,KAAK;KAC1C,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,OAAe,EAAE,IAAc;IACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,OAAO,EAAE,IAAI,EAAE;YACjC,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACzB,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,OAAO,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YACD,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,IAAI,IAAI,CAAC,MAAM,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,EAAU;IAC3B,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACxC,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,IAAI,wBAA8C,CAAC;AAEnD,SAAS,yBAAyB;IAChC,IAAI,wBAAwB,EAAE,CAAC;QAC7B,OAAO,CAAC,GAAG,wBAAwB,CAAC,CAAC;IACvC,CAAC;IACD,IACE,OAAO,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE;QACxC,SAAS,EAAE,4BAA4B;KACxC,CAAC,CAAC,QAAQ,KAAK,CAAC,EACjB,CAAC;QACD,wBAAwB,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACjD,OAAO,CAAC,GAAG,wBAAwB,CAAC,CAAC;IACvC,CAAC;IACD,IACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,SAAS,CAAC,EAAE;QACrC,SAAS,EAAE,4BAA4B;KACxC,CAAC,CAAC,QAAQ,KAAK,CAAC,EACjB,CAAC;QACD,wBAAwB,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,wBAAwB,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;AAChG,CAAC;AAED,SAAS,yBAAyB,CAAC,WAAqB;IACtD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnE,OAAO;QACL,iDAAiD;QACjD,kBAAkB,MAAM,GAAG;QAC3B,mDAAmD;QACnD,kBAAkB,MAAM,GAAG;QAC3B,MAAM;QACN,iEAAiE;QACjE,WAAW;QACX,IAAI;KACL,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAc;IAC9C,OAAO,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACrE,CAAC;AAcD,MAAa,cAAc;IAGzB,YAA6B,OAA2B,EAAE;QAA7B,SAAI,GAAJ,IAAI,CAAyB;QACxD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAA,mCAAmB,GAAE,CAAC;IACrD,CAAC;IAED,SAAS,CAAC,OAA6D;QACrE,OAAO,IAAA,yCAAyB,EAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,EAAE,CAAC,OAAwB;QACzB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,aAAa,CAChB,IAAI,CAAC,UAAU,CACb,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,EACvB,OAAO,EACP;YACE,eAAe,EAAE,IAAI,CAAC,sBAAsB,EAAE;YAC9C,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YACxC,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;YAC5C,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,WAAW;YACrE,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE;YACpF,iCAAiC,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,EAAE;SACvF,EACD,8BAA8B,CAC/B,EACD,sBAAsB,EACtB,OAAO,CACR,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,OAA4B;QAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAC3F,CAAC;IAED,MAAM,CAAC,OAA4B;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,UAA2C,CAAC;QAChD,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC3B,UAAU,GAAG,IAAI,CAAC,SAAS,CACzB,CAAC,MAAM,EAAE,qCAAqB,EAAE,eAAe,EAAE,IAAI,EAAE,uBAAuB,EAAE,QAAQ,CAAC,EACzF,OAAO,CACR,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,OAA4B;QACjC,MAAM,MAAM,GACV,iJAAiJ,CAAC;QACpJ,IAAI,CAAC,aAAa,CAChB,IAAI,CAAC,SAAS,CACZ,CAAC,MAAM,EAAE,qCAAqB,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,EACpD,OAAO,EACP,8BAA8B,CAC/B,EACD,qBAAqB,EACrB,OAAO,CACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA0B;QACnC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO;YAC3B,CAAC,CAAC,CAAC,gCAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC,gCAAgB,CAAC,GAAG,EAAE,gCAAgB,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,kCAAkC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAClG,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM;YAC5B,CAAC,CAAC,GAAG,KAAK,sBAAsB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACjF,CAAC,CAAC,OAAO,CAAC,OAAO;gBACf,CAAC,CAAC,GAAG,KAAK,mBAAmB,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;gBACnD,CAAC,CAAC,GAAG,KAAK,4CAA4C,UAAU,CAC5D,gCAAgB,CAAC,GAAG,CACrB,oDAAoD,UAAU,CAAC,gCAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAEnG,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,EAAE,qCAAqB,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;YAC9F,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,qCAAqB,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9F,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC5D,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,OAAO,CAAC,OAA4B,EAAE,IAAa;QACjD,MAAM,IAAI,GAAG;YACX,MAAM;YACN,qCAAqB;YACrB,KAAK;YACL,QAAQ;YACR,UAAU;YACV,mBAAmB;YACnB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5B,CAAC;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,mBAAmB,CAAC,OAA4B;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAC3B;YACE,MAAM;YACN,qCAAqB;YACrB,KAAK;YACL,QAAQ;YACR,uBAAuB;YACvB,mBAAmB;SACpB,EACD,OAAO,CACR,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,kCAAkC,EAAE,OAAO,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,oBAAoB,CAAC,OAA4B;QAC/C,MAAM,IAAI,GAAG;YACX,MAAM;YACN,qCAAqB;YACrB,KAAK;YACL,QAAQ;YACR,UAAU;YACV,mBAAmB;YACnB,QAAQ;YACR,eAAe;SAChB,CAAC;QACF,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;YACjD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,4BAA4B,CAAC,CAAC;YAC3E,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;gBAC1B,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC9B,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,iBAAiB,CAAC,IAAY;QACpC,IAAI,CAAC,aAAa,CAChB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,YAAY,iCAAiB,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAC9E,6BAA6B,EAC7B,EAAE,IAAI,EAAE,CACT,CAAC;QACF,MAAM,KAAK,GAAG;YACZ,IAAI,CAAC,MAAM,CAAC,WAAW;YACvB,IAAI,CAAC,MAAM,CAAC,UAAU;YACtB,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAC7B,IAAI,CAAC,MAAM,CAAC,UAAU;SACvB,CAAC;QACF,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,iCAAiB,GAAG,CAAC;QAC/C,IAAI,CAAC,aAAa,CAChB,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EACzD,0BAA0B,EAC1B;YACE,IAAI;SACL,CACF,CAAC;IACJ,CAAC;IAEO,UAAU,CAChB,IAAc,EACd,OAA4B,EAC5B,MAA8B,EAAE,EAChC,SAAkB;QAElB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,WAAW,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,CAAC;YACjF,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE;gBACxC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;gBAC1C,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE;gBAC/B,MAAM,EAAE,KAAK;gBACb,SAAS;aACV,CAAC,CAAC;QACL,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;aACnC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;aAC3D,IAAI,CAAC,MAAM,CAAC,CAAC;QAChB,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,MAAM,iCAAiB,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,yBAAyB,CAAC,WAAW,CAAC,EAAE,CAAC;QACrI,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IACzF,CAAC;IAEO,SAAS,CACf,IAAc,EACd,OAA4B,EAC5B,SAAkB;QAElB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC,CAAC,EAAE;YACzE,MAAM,EAAE,IAAI;YACZ,SAAS;SACV,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,IAAc,EAAE,OAA4B;QAC3E,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;IAEO,sBAAsB;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,IAAI,IAAA,sCAAsB,GAAE,CAAC;IAC1E,CAAC;IAEO,yBAAyB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,IAAI,yBAAyB,EAAE,CAAC;IAChF,CAAC;IAEO,OAAO,CACb,OAAe,EACf,IAAc,EACd,UAAgC,EAAE;QAElC,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACxD,OAAO,CACL,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,iBAAiB,CAAC;YACrD,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAC1C,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,IAAc;QACxD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACjF,CAAC;IAEO,aAAa,CACnB,MAA2B,EAC3B,KAAa,EACb,OAA4B;QAE5B,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACvD,MAAM,IAAI,GACR,OAAO,CAAC,IAAI,IAAI,wDAAwD,CAAC,IAAI,CAAC,MAAM,CAAC;YACnF,CAAC,CAAC,gCAAgC,OAAO,CAAC,IAAI,WAAW;YACzD,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,WAAW,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;CACF;AA1PD,wCA0PC"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
/// <reference types="bun-types" />
|
|
3
|
+
export declare const DOCKER_BOOTSTRAP_STATE_FILENAME = ".docker-bootstrap-state.json";
|
|
4
|
+
export declare const DOCKER_LEGACY_API_KEY = "ccs-internal-managed";
|
|
5
|
+
export declare const DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS = 14;
|
|
6
|
+
export declare const DOCKER_LEGACY_KEY_GRACE_ENV = "CCS_DOCKER_LEGACY_KEY_GRACE_DAYS";
|
|
7
|
+
export declare const DOCKER_RESTORE_LEGACY_KEY_ENV = "CCS_DOCKER_RESTORE_LEGACY_API_KEY";
|
|
8
|
+
export interface DockerLegacyKeyGrace {
|
|
9
|
+
legacyKey: string;
|
|
10
|
+
replacementKey: string;
|
|
11
|
+
startedAt: string;
|
|
12
|
+
expiresAt: string;
|
|
13
|
+
finalizedAt?: string;
|
|
14
|
+
}
|
|
15
|
+
export interface DockerBootstrapState {
|
|
16
|
+
version: number;
|
|
17
|
+
apiKey?: string;
|
|
18
|
+
bootstrappedAt: string;
|
|
19
|
+
legacyKeyGrace?: DockerLegacyKeyGrace;
|
|
20
|
+
}
|
|
21
|
+
export interface DockerBootstrapStateReadResult {
|
|
22
|
+
state: DockerBootstrapState | null;
|
|
23
|
+
corrupted: boolean;
|
|
24
|
+
path: string;
|
|
25
|
+
}
|
|
26
|
+
export interface DockerKeyRotationStatus {
|
|
27
|
+
apiKey?: string;
|
|
28
|
+
maskedApiKey?: string;
|
|
29
|
+
statePath: string;
|
|
30
|
+
stateCorrupted: boolean;
|
|
31
|
+
legacyGraceActive: boolean;
|
|
32
|
+
legacyGrace?: DockerLegacyKeyGrace;
|
|
33
|
+
}
|
|
34
|
+
export declare function getDockerBootstrapStatePath(): string;
|
|
35
|
+
export declare function parseDockerLegacyKeyGraceDays(env?: NodeJS.ProcessEnv): number;
|
|
36
|
+
export declare function isLikelyDockerGeneratedApiKey(value: string | undefined): boolean;
|
|
37
|
+
export declare function shouldRestoreDockerLegacyApiKey(env?: NodeJS.ProcessEnv): boolean;
|
|
38
|
+
export declare function readDockerBootstrapState(): DockerBootstrapStateReadResult;
|
|
39
|
+
export declare function writeDockerBootstrapState(state: DockerBootstrapState): void;
|
|
40
|
+
export declare function createDockerBootstrapState(apiKey: string | undefined, now?: Date): DockerBootstrapState;
|
|
41
|
+
export declare function addLegacyKeyGrace(state: DockerBootstrapState, replacementKey: string, now?: Date, graceDays?: number): DockerBootstrapState;
|
|
42
|
+
export declare function isDockerLegacyKeyGraceActive(state: DockerBootstrapState | null, now?: Date): boolean;
|
|
43
|
+
export declare function getActiveDockerLegacyApiKeys(now?: Date): string[];
|
|
44
|
+
export declare function maskDockerApiKey(apiKey: string | undefined): string | undefined;
|
|
45
|
+
export declare function getDockerKeyRotationStatus(now?: Date): DockerKeyRotationStatus;
|
|
46
|
+
export declare function renderDockerKeyRotationBanner(status?: DockerKeyRotationStatus): string;
|
|
47
|
+
export declare function finalizeDockerKeyRotation(now?: Date): DockerKeyRotationStatus;
|
|
48
|
+
//# sourceMappingURL=docker-key-rotation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"docker-key-rotation.d.ts","sourceRoot":"","sources":["../../src/docker/docker-key-rotation.ts"],"names":[],"mappings":";;AAIA,eAAO,MAAM,+BAA+B,iCAAiC,CAAC;AAC9E,eAAO,MAAM,qBAAqB,yBAAyB,CAAC;AAC5D,eAAO,MAAM,oCAAoC,KAAK,CAAC;AACvD,eAAO,MAAM,2BAA2B,qCAAqC,CAAC;AAC9E,eAAO,MAAM,6BAA6B,sCAAsC,CAAC;AAKjF,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,oBAAoB,CAAC;CACvC;AAED,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACpC;AAED,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AAED,wBAAgB,6BAA6B,CAAC,GAAG,oBAAc,GAAG,MAAM,CAYvE;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEhF;AAED,wBAAgB,+BAA+B,CAAC,GAAG,oBAAc,GAAG,OAAO,CAE1E;AAED,wBAAgB,wBAAwB,IAAI,8BAA8B,CAezE;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAM3E;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,OAAa,GACf,oBAAoB,CAMtB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,oBAAoB,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,OAAa,EAChB,SAAS,SAAkC,GAC1C,oBAAoB,CAWtB;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,oBAAoB,GAAG,IAAI,EAClC,GAAG,OAAa,GACf,OAAO,CAQT;AAED,wBAAgB,4BAA4B,CAAC,GAAG,OAAa,GAAG,MAAM,EAAE,CAOvE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAQ/E;AAED,wBAAgB,0BAA0B,CAAC,GAAG,OAAa,GAAG,uBAAuB,CAapF;AAED,wBAAgB,6BAA6B,CAAC,MAAM,0BAA+B,GAAG,MAAM,CAe3F;AAED,wBAAgB,yBAAyB,CAAC,GAAG,OAAa,GAAG,uBAAuB,CAkBnF"}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.finalizeDockerKeyRotation = exports.renderDockerKeyRotationBanner = exports.getDockerKeyRotationStatus = exports.maskDockerApiKey = exports.getActiveDockerLegacyApiKeys = exports.isDockerLegacyKeyGraceActive = exports.addLegacyKeyGrace = exports.createDockerBootstrapState = exports.writeDockerBootstrapState = exports.readDockerBootstrapState = exports.shouldRestoreDockerLegacyApiKey = exports.isLikelyDockerGeneratedApiKey = exports.parseDockerLegacyKeyGraceDays = exports.getDockerBootstrapStatePath = exports.DOCKER_RESTORE_LEGACY_KEY_ENV = exports.DOCKER_LEGACY_KEY_GRACE_ENV = exports.DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS = exports.DOCKER_LEGACY_API_KEY = exports.DOCKER_BOOTSTRAP_STATE_FILENAME = void 0;
|
|
27
|
+
const fs = __importStar(require("fs"));
|
|
28
|
+
const path = __importStar(require("path"));
|
|
29
|
+
const config_loader_facade_1 = require("../config/config-loader-facade");
|
|
30
|
+
exports.DOCKER_BOOTSTRAP_STATE_FILENAME = '.docker-bootstrap-state.json';
|
|
31
|
+
exports.DOCKER_LEGACY_API_KEY = 'ccs-internal-managed';
|
|
32
|
+
exports.DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS = 14;
|
|
33
|
+
exports.DOCKER_LEGACY_KEY_GRACE_ENV = 'CCS_DOCKER_LEGACY_KEY_GRACE_DAYS';
|
|
34
|
+
exports.DOCKER_RESTORE_LEGACY_KEY_ENV = 'CCS_DOCKER_RESTORE_LEGACY_API_KEY';
|
|
35
|
+
const DAY_MS = 24 * 60 * 60 * 1000;
|
|
36
|
+
const STATE_VERSION = 1;
|
|
37
|
+
function getDockerBootstrapStatePath() {
|
|
38
|
+
return path.join((0, config_loader_facade_1.getCcsDir)(), 'cliproxy', exports.DOCKER_BOOTSTRAP_STATE_FILENAME);
|
|
39
|
+
}
|
|
40
|
+
exports.getDockerBootstrapStatePath = getDockerBootstrapStatePath;
|
|
41
|
+
function parseDockerLegacyKeyGraceDays(env = process.env) {
|
|
42
|
+
const rawValue = env[exports.DOCKER_LEGACY_KEY_GRACE_ENV];
|
|
43
|
+
if (rawValue === undefined || rawValue.trim() === '') {
|
|
44
|
+
return exports.DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS;
|
|
45
|
+
}
|
|
46
|
+
const parsed = Number(rawValue);
|
|
47
|
+
if (!Number.isFinite(parsed) || parsed < 0) {
|
|
48
|
+
return exports.DEFAULT_DOCKER_LEGACY_KEY_GRACE_DAYS;
|
|
49
|
+
}
|
|
50
|
+
return Math.floor(parsed);
|
|
51
|
+
}
|
|
52
|
+
exports.parseDockerLegacyKeyGraceDays = parseDockerLegacyKeyGraceDays;
|
|
53
|
+
function isLikelyDockerGeneratedApiKey(value) {
|
|
54
|
+
return Boolean(value && /^[A-Za-z0-9_-]{43}$/.test(value));
|
|
55
|
+
}
|
|
56
|
+
exports.isLikelyDockerGeneratedApiKey = isLikelyDockerGeneratedApiKey;
|
|
57
|
+
function shouldRestoreDockerLegacyApiKey(env = process.env) {
|
|
58
|
+
return env[exports.DOCKER_RESTORE_LEGACY_KEY_ENV] === '1';
|
|
59
|
+
}
|
|
60
|
+
exports.shouldRestoreDockerLegacyApiKey = shouldRestoreDockerLegacyApiKey;
|
|
61
|
+
function readDockerBootstrapState() {
|
|
62
|
+
const statePath = getDockerBootstrapStatePath();
|
|
63
|
+
if (!fs.existsSync(statePath)) {
|
|
64
|
+
return { state: null, corrupted: false, path: statePath };
|
|
65
|
+
}
|
|
66
|
+
try {
|
|
67
|
+
const parsed = JSON.parse(fs.readFileSync(statePath, 'utf8'));
|
|
68
|
+
if (!parsed || parsed.version !== STATE_VERSION || typeof parsed.bootstrappedAt !== 'string') {
|
|
69
|
+
return { state: null, corrupted: true, path: statePath };
|
|
70
|
+
}
|
|
71
|
+
return { state: parsed, corrupted: false, path: statePath };
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
return { state: null, corrupted: true, path: statePath };
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
exports.readDockerBootstrapState = readDockerBootstrapState;
|
|
78
|
+
function writeDockerBootstrapState(state) {
|
|
79
|
+
const statePath = getDockerBootstrapStatePath();
|
|
80
|
+
fs.mkdirSync(path.dirname(statePath), { recursive: true, mode: 0o700 });
|
|
81
|
+
const tempPath = `${statePath}.${process.pid}.${Date.now()}.tmp`;
|
|
82
|
+
fs.writeFileSync(tempPath, `${JSON.stringify(state, null, 2)}\n`, { mode: 0o600 });
|
|
83
|
+
fs.renameSync(tempPath, statePath);
|
|
84
|
+
}
|
|
85
|
+
exports.writeDockerBootstrapState = writeDockerBootstrapState;
|
|
86
|
+
function createDockerBootstrapState(apiKey, now = new Date()) {
|
|
87
|
+
return {
|
|
88
|
+
version: STATE_VERSION,
|
|
89
|
+
apiKey,
|
|
90
|
+
bootstrappedAt: now.toISOString(),
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
exports.createDockerBootstrapState = createDockerBootstrapState;
|
|
94
|
+
function addLegacyKeyGrace(state, replacementKey, now = new Date(), graceDays = parseDockerLegacyKeyGraceDays()) {
|
|
95
|
+
return {
|
|
96
|
+
...state,
|
|
97
|
+
apiKey: replacementKey,
|
|
98
|
+
legacyKeyGrace: {
|
|
99
|
+
legacyKey: exports.DOCKER_LEGACY_API_KEY,
|
|
100
|
+
replacementKey,
|
|
101
|
+
startedAt: now.toISOString(),
|
|
102
|
+
expiresAt: new Date(now.getTime() + graceDays * DAY_MS).toISOString(),
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
exports.addLegacyKeyGrace = addLegacyKeyGrace;
|
|
107
|
+
function isDockerLegacyKeyGraceActive(state, now = new Date()) {
|
|
108
|
+
const grace = state?.legacyKeyGrace;
|
|
109
|
+
if (!grace || grace.finalizedAt) {
|
|
110
|
+
return false;
|
|
111
|
+
}
|
|
112
|
+
const expiresAt = Date.parse(grace.expiresAt);
|
|
113
|
+
return Number.isFinite(expiresAt) && expiresAt > now.getTime();
|
|
114
|
+
}
|
|
115
|
+
exports.isDockerLegacyKeyGraceActive = isDockerLegacyKeyGraceActive;
|
|
116
|
+
function getActiveDockerLegacyApiKeys(now = new Date()) {
|
|
117
|
+
const { state } = readDockerBootstrapState();
|
|
118
|
+
if (!isDockerLegacyKeyGraceActive(state, now)) {
|
|
119
|
+
return [];
|
|
120
|
+
}
|
|
121
|
+
return state?.legacyKeyGrace?.legacyKey ? [state.legacyKeyGrace.legacyKey] : [];
|
|
122
|
+
}
|
|
123
|
+
exports.getActiveDockerLegacyApiKeys = getActiveDockerLegacyApiKeys;
|
|
124
|
+
function maskDockerApiKey(apiKey) {
|
|
125
|
+
if (!apiKey) {
|
|
126
|
+
return undefined;
|
|
127
|
+
}
|
|
128
|
+
if (apiKey.length <= 8) {
|
|
129
|
+
return '****';
|
|
130
|
+
}
|
|
131
|
+
return `${apiKey.slice(0, 4)}...${apiKey.slice(-4)}`;
|
|
132
|
+
}
|
|
133
|
+
exports.maskDockerApiKey = maskDockerApiKey;
|
|
134
|
+
function getDockerKeyRotationStatus(now = new Date()) {
|
|
135
|
+
const config = (0, config_loader_facade_1.loadOrCreateUnifiedConfig)();
|
|
136
|
+
const readResult = readDockerBootstrapState();
|
|
137
|
+
const apiKey = config.cliproxy.auth?.api_key;
|
|
138
|
+
return {
|
|
139
|
+
apiKey,
|
|
140
|
+
maskedApiKey: maskDockerApiKey(apiKey),
|
|
141
|
+
statePath: readResult.path,
|
|
142
|
+
stateCorrupted: readResult.corrupted,
|
|
143
|
+
legacyGraceActive: isDockerLegacyKeyGraceActive(readResult.state, now),
|
|
144
|
+
legacyGrace: readResult.state?.legacyKeyGrace,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
exports.getDockerKeyRotationStatus = getDockerKeyRotationStatus;
|
|
148
|
+
function renderDockerKeyRotationBanner(status = getDockerKeyRotationStatus()) {
|
|
149
|
+
if (!status.legacyGraceActive || !status.legacyGrace) {
|
|
150
|
+
return '';
|
|
151
|
+
}
|
|
152
|
+
const maskedReplacementKey = maskDockerApiKey(status.legacyGrace.replacementKey) ?? '(not configured)';
|
|
153
|
+
return [
|
|
154
|
+
'[!] Docker CLIProxy API key rotation grace period is active.',
|
|
155
|
+
`[i] New CLIProxy API key: ${maskedReplacementKey}`,
|
|
156
|
+
`[i] Legacy key ${status.legacyGrace.legacyKey} remains valid until ${status.legacyGrace.expiresAt}.`,
|
|
157
|
+
'[i] Reveal the full key with `ccs docker show-key --full`.',
|
|
158
|
+
'[i] Update existing clients, then run `ccs docker finalize-key-rotation`.',
|
|
159
|
+
].join('\n');
|
|
160
|
+
}
|
|
161
|
+
exports.renderDockerKeyRotationBanner = renderDockerKeyRotationBanner;
|
|
162
|
+
function finalizeDockerKeyRotation(now = new Date()) {
|
|
163
|
+
const readResult = readDockerBootstrapState();
|
|
164
|
+
const state = readResult.state ??
|
|
165
|
+
createDockerBootstrapState((0, config_loader_facade_1.loadOrCreateUnifiedConfig)().cliproxy.auth?.api_key, now);
|
|
166
|
+
writeDockerBootstrapState({
|
|
167
|
+
...state,
|
|
168
|
+
legacyKeyGrace: state.legacyKeyGrace
|
|
169
|
+
? {
|
|
170
|
+
...state.legacyKeyGrace,
|
|
171
|
+
finalizedAt: now.toISOString(),
|
|
172
|
+
expiresAt: now.toISOString(),
|
|
173
|
+
}
|
|
174
|
+
: undefined,
|
|
175
|
+
});
|
|
176
|
+
return getDockerKeyRotationStatus(now);
|
|
177
|
+
}
|
|
178
|
+
exports.finalizeDockerKeyRotation = finalizeDockerKeyRotation;
|
|
179
|
+
//# sourceMappingURL=docker-key-rotation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"docker-key-rotation.js","sourceRoot":"","sources":["../../src/docker/docker-key-rotation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-check.d.ts","sourceRoot":"","sources":["../../../src/management/checks/config-check.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAE,WAAW,EAAE,cAAc,EAAiB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"config-check.d.ts","sourceRoot":"","sources":["../../../src/management/checks/config-check.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAE,WAAW,EAAE,cAAc,EAAiB,MAAM,SAAS,CAAC;AAYrE;;;;GAIG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,IAAI,SAAkB;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;;IAMhC,GAAG,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;IAU/B;;OAEG;IACH,OAAO,CAAC,eAAe;IA+EvB;;;OAGG;IACH,OAAO,CAAC,0BAA0B;CAiEnC;AAED;;GAEG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,IAAI,SAAqB;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;;IAMnC,GAAG,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CAkDhC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAM1D"}
|
|
@@ -33,6 +33,7 @@ const ui_1 = require("../../utils/ui");
|
|
|
33
33
|
const types_1 = require("./types");
|
|
34
34
|
const claude_config_path_1 = require("../../utils/claude-config-path");
|
|
35
35
|
const config_loader_facade_1 = require("../../config/config-loader-facade");
|
|
36
|
+
const stale_codex_translator_settings_1 = require("../../shared/stale-codex-translator-settings");
|
|
36
37
|
const ora = (0, types_1.createSpinner)();
|
|
37
38
|
/**
|
|
38
39
|
* Check CCS config files exist and are valid
|
|
@@ -189,7 +190,15 @@ class ClaudeSettingsChecker {
|
|
|
189
190
|
// Validate JSON
|
|
190
191
|
try {
|
|
191
192
|
const content = fs.readFileSync(settingsPath, 'utf8');
|
|
192
|
-
JSON.parse(content);
|
|
193
|
+
const settings = JSON.parse(content);
|
|
194
|
+
const codexTranslatorUrlPaths = (0, stale_codex_translator_settings_1.findCodexTranslatorUrlPaths)(settings);
|
|
195
|
+
if (codexTranslatorUrlPaths.length > 0) {
|
|
196
|
+
const formattedPaths = (0, stale_codex_translator_settings_1.formatSettingsPathList)(codexTranslatorUrlPaths);
|
|
197
|
+
spinner.warn();
|
|
198
|
+
console.log(` ${(0, ui_1.warn)(settingsName.padEnd(22))} Codex CLIProxy bridge persisted at ${formattedPaths}`);
|
|
199
|
+
results.addCheck('Claude Settings', 'warning', `Claude settings route Claude Code through the Codex CLIProxy translator at ${formattedPaths} (${stale_codex_translator_settings_1.CODEX_TRANSLATOR_URL_MARKER})`, 'Run: ccs persist default --yes; use ccsxp or ccs codex --target codex for Codex');
|
|
200
|
+
return;
|
|
201
|
+
}
|
|
193
202
|
spinner.succeed();
|
|
194
203
|
console.log(` ${(0, ui_1.ok)(settingsName.padEnd(22))} Valid`);
|
|
195
204
|
results.addCheck('Claude Settings', 'success');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-check.js","sourceRoot":"","sources":["../../../src/management/checks/config-check.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAC7B,uCAAsD;AACtD,mCAAqE;AAErE,uEAAoE;AACpE,4EAA8D;
|
|
1
|
+
{"version":3,"file":"config-check.js","sourceRoot":"","sources":["../../../src/management/checks/config-check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/management/doctor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EACL,WAAW,EASZ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/management/doctor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EACL,WAAW,EASZ,MAAM,UAAU,CAAC;AAIlB;;GAEG;AACH,cAAM,MAAM;IACV,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;;IAOpC;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC;IAuD1C;;OAEG;IACH,OAAO,CAAC,UAAU;IAqElB,OAAO,CAAC,yBAAyB;IA0CjC;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAiB5B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC;;OAEG;IACH,SAAS,IAAI,OAAO;CAGrB;AAED,eAAe,MAAM,CAAC"}
|