@xixka/dsh-hub 0.4.8 → 0.4.9-rc.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 +1085 -93
- package/docs/DETAIL.md +66 -0
- package/docs/DETAIL.zh.md +40 -0
- package/lib/accio-adapter.d.ts +30 -1
- package/lib/accio-adapter.d.ts.map +1 -1
- package/lib/accio-adapter.js +102 -15
- package/lib/accio-adapter.js.map +1 -1
- package/lib/account-pool.d.ts +61 -106
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +269 -275
- package/lib/account-pool.js.map +1 -1
- package/lib/account-probe.d.ts +5 -1
- package/lib/account-probe.d.ts.map +1 -1
- package/lib/account-probe.js +8 -5
- package/lib/account-probe.js.map +1 -1
- package/lib/aggregate-adapter.d.ts +0 -38
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +43 -138
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-core.d.ts +50 -0
- package/lib/aggregate-core.d.ts.map +1 -1
- package/lib/aggregate-core.js +80 -0
- package/lib/aggregate-core.js.map +1 -1
- package/lib/aggregate-dispatch-context.d.ts +57 -0
- package/lib/aggregate-dispatch-context.d.ts.map +1 -0
- package/lib/aggregate-dispatch-context.js +77 -0
- package/lib/aggregate-dispatch-context.js.map +1 -0
- package/lib/aggregate-expiry.d.ts +1 -1
- package/lib/aggregate-expiry.js +1 -1
- package/lib/astudio-adapter.d.ts +34 -14
- package/lib/astudio-adapter.d.ts.map +1 -1
- package/lib/astudio-adapter.js +42 -25
- package/lib/astudio-adapter.js.map +1 -1
- package/lib/astudio-product.d.ts +60 -19
- package/lib/astudio-product.d.ts.map +1 -1
- package/lib/astudio-product.js +36 -18
- package/lib/astudio-product.js.map +1 -1
- package/lib/astudio.d.ts +68 -22
- package/lib/astudio.d.ts.map +1 -1
- package/lib/astudio.js +420 -28
- package/lib/astudio.js.map +1 -1
- package/lib/atomcode-adapter.d.ts.map +1 -1
- package/lib/atomcode-adapter.js +1 -2
- package/lib/atomcode-adapter.js.map +1 -1
- package/lib/auto-checkin.d.ts +15 -10
- package/lib/auto-checkin.d.ts.map +1 -1
- package/lib/auto-checkin.js +31 -30
- package/lib/auto-checkin.js.map +1 -1
- package/lib/autoclaw-adapter.d.ts +1 -1
- package/lib/autoclaw-adapter.d.ts.map +1 -1
- package/lib/autoclaw-adapter.js +4 -4
- package/lib/autoclaw-adapter.js.map +1 -1
- package/lib/backup.d.ts +2 -22
- package/lib/backup.d.ts.map +1 -1
- package/lib/backup.js +20 -43
- package/lib/backup.js.map +1 -1
- package/lib/baizhi-adapter.d.ts.map +1 -1
- package/lib/baizhi-adapter.js +1 -2
- package/lib/baizhi-adapter.js.map +1 -1
- package/lib/balance-cache.d.ts +0 -36
- package/lib/balance-cache.d.ts.map +1 -1
- package/lib/balance-cache.js +0 -23
- package/lib/balance-cache.js.map +1 -1
- package/lib/buddy-adapter.d.ts +11 -1
- package/lib/buddy-adapter.d.ts.map +1 -1
- package/lib/buddy-adapter.js +38 -7
- package/lib/buddy-adapter.js.map +1 -1
- package/lib/buddy-balance-rank.d.ts +67 -0
- package/lib/buddy-balance-rank.d.ts.map +1 -1
- package/lib/buddy-balance-rank.js +80 -0
- package/lib/buddy-balance-rank.js.map +1 -1
- package/lib/buddy-balance-selector.d.ts +19 -0
- package/lib/buddy-balance-selector.d.ts.map +1 -1
- package/lib/buddy-balance-selector.js +18 -2
- package/lib/buddy-balance-selector.js.map +1 -1
- package/lib/buddy-oauth.d.ts.map +1 -1
- package/lib/buddy-oauth.js +34 -1
- package/lib/buddy-oauth.js.map +1 -1
- package/lib/buddy.d.ts +42 -0
- package/lib/buddy.d.ts.map +1 -1
- package/lib/buddy.js +106 -4
- package/lib/buddy.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +175 -7
- package/lib/canonical-models.js.map +1 -1
- package/lib/chromium-session.d.ts +29 -85
- package/lib/chromium-session.d.ts.map +1 -1
- package/lib/chromium-session.js +33 -236
- package/lib/chromium-session.js.map +1 -1
- package/lib/client/jet-hub.js +18452 -107
- package/lib/cline-adapter.d.ts +2 -10
- package/lib/cline-adapter.d.ts.map +1 -1
- package/lib/cline-adapter.js +7 -23
- package/lib/cline-adapter.js.map +1 -1
- package/lib/cline-models.d.ts +11 -13
- package/lib/cline-models.d.ts.map +1 -1
- package/lib/cline-models.js +9 -41
- package/lib/cline-models.js.map +1 -1
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +6 -7
- package/lib/codearts-credits.js.map +1 -1
- package/lib/codearts-identity.d.ts +109 -0
- package/lib/codearts-identity.d.ts.map +1 -0
- package/lib/codearts-identity.js +189 -0
- package/lib/codearts-identity.js.map +1 -0
- package/lib/codearts-vision.d.ts +8 -9
- package/lib/codearts-vision.d.ts.map +1 -1
- package/lib/codearts-vision.js +8 -10
- package/lib/codearts-vision.js.map +1 -1
- package/lib/codely-adapter.d.ts.map +1 -1
- package/lib/codely-adapter.js +2 -5
- package/lib/codely-adapter.js.map +1 -1
- package/lib/credential-resolver.d.ts +17 -1
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +96 -2
- package/lib/credential-resolver.js.map +1 -1
- package/lib/credits.d.ts +10 -0
- package/lib/credits.d.ts.map +1 -1
- package/lib/credits.js +65 -2
- package/lib/credits.js.map +1 -1
- package/lib/dead-model-store.d.ts.map +1 -1
- package/lib/dead-model-store.js +24 -2
- package/lib/dead-model-store.js.map +1 -1
- package/lib/doubao-credits.d.ts +52 -0
- package/lib/doubao-credits.d.ts.map +1 -0
- package/lib/doubao-credits.js +61 -0
- package/lib/doubao-credits.js.map +1 -0
- package/lib/doubao-login.d.ts +118 -0
- package/lib/doubao-login.d.ts.map +1 -0
- package/lib/doubao-login.js +438 -0
- package/lib/doubao-login.js.map +1 -0
- package/lib/doubao-signin.d.ts +58 -0
- package/lib/doubao-signin.d.ts.map +1 -0
- package/lib/doubao-signin.js +405 -0
- package/lib/doubao-signin.js.map +1 -0
- package/lib/doubao.d.ts +94 -0
- package/lib/doubao.d.ts.map +1 -0
- package/lib/doubao.js +186 -0
- package/lib/doubao.js.map +1 -0
- package/lib/gemini-adapter.d.ts +1 -1
- package/lib/gemini-adapter.d.ts.map +1 -1
- package/lib/gemini-adapter.js +4 -10
- package/lib/gemini-adapter.js.map +1 -1
- package/lib/image-budget.d.ts +11 -3
- package/lib/image-budget.d.ts.map +1 -1
- package/lib/image-budget.js +5 -43
- package/lib/image-budget.js.map +1 -1
- package/lib/index.d.ts +51 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +239 -283
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +18 -89
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +1258 -366
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +110 -49
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +141 -36
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/llm-adapter.d.ts +97 -33
- package/lib/llm-adapter.d.ts.map +1 -1
- package/lib/llm-adapter.js +191 -47
- package/lib/llm-adapter.js.map +1 -1
- package/lib/llm-register-compat.d.ts +0 -57
- package/lib/llm-register-compat.d.ts.map +1 -1
- package/lib/llm-register-compat.js +30 -91
- package/lib/llm-register-compat.js.map +1 -1
- package/lib/lobsterai-adapter.d.ts +1 -1
- package/lib/lobsterai-adapter.d.ts.map +1 -1
- package/lib/lobsterai-adapter.js +18 -57
- package/lib/lobsterai-adapter.js.map +1 -1
- package/lib/lobsterai-auth.d.ts.map +1 -1
- package/lib/lobsterai-auth.js +2 -1
- package/lib/lobsterai-auth.js.map +1 -1
- package/lib/login.d.ts +90 -5
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +297 -106
- package/lib/login.js.map +1 -1
- package/lib/loomy-adapter.d.ts +1 -4
- package/lib/loomy-adapter.d.ts.map +1 -1
- package/lib/loomy-adapter.js +9 -67
- package/lib/loomy-adapter.js.map +1 -1
- package/lib/marvis-adapter.d.ts +13 -3
- package/lib/marvis-adapter.d.ts.map +1 -1
- package/lib/marvis-adapter.js +105 -7
- package/lib/marvis-adapter.js.map +1 -1
- package/lib/marvis-identity.d.ts +106 -0
- package/lib/marvis-identity.d.ts.map +1 -0
- package/lib/marvis-identity.js +144 -0
- package/lib/marvis-identity.js.map +1 -0
- package/lib/marvis-messages.d.ts +65 -4
- package/lib/marvis-messages.d.ts.map +1 -1
- package/lib/marvis-messages.js +88 -8
- package/lib/marvis-messages.js.map +1 -1
- package/lib/marvis-product.d.ts +31 -6
- package/lib/marvis-product.d.ts.map +1 -1
- package/lib/marvis-product.js +60 -13
- package/lib/marvis-product.js.map +1 -1
- package/lib/marvis-slots.d.ts +43 -0
- package/lib/marvis-slots.d.ts.map +1 -0
- package/lib/marvis-slots.js +9 -0
- package/lib/marvis-slots.js.map +1 -0
- package/lib/minimax-adapter.d.ts +1 -6
- package/lib/minimax-adapter.d.ts.map +1 -1
- package/lib/minimax-adapter.js +4 -10
- package/lib/minimax-adapter.js.map +1 -1
- package/lib/minimax-auth.d.ts.map +1 -1
- package/lib/minimax-auth.js +2 -1
- package/lib/minimax-auth.js.map +1 -1
- package/lib/model-catalog.d.ts +19 -8
- package/lib/model-catalog.d.ts.map +1 -1
- package/lib/model-catalog.js +10 -127
- package/lib/model-catalog.js.map +1 -1
- package/lib/model-promotions.d.ts +377 -0
- package/lib/model-promotions.d.ts.map +1 -0
- package/lib/model-promotions.js +856 -0
- package/lib/model-promotions.js.map +1 -0
- package/lib/models-dev-cache.d.ts +0 -27
- package/lib/models-dev-cache.d.ts.map +1 -1
- package/lib/models-dev-cache.js +3 -48
- package/lib/models-dev-cache.js.map +1 -1
- package/lib/models.d.ts +17 -14
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +23 -47
- package/lib/models.js.map +1 -1
- package/lib/modelscope-adapter.d.ts +89 -0
- package/lib/modelscope-adapter.d.ts.map +1 -1
- package/lib/modelscope-adapter.js +167 -23
- package/lib/modelscope-adapter.js.map +1 -1
- package/lib/modelscope-checkin.d.ts +5 -0
- package/lib/modelscope-checkin.d.ts.map +1 -0
- package/lib/modelscope-checkin.js +265 -0
- package/lib/modelscope-checkin.js.map +1 -0
- package/lib/modelscope-credits.d.ts +1 -1
- package/lib/modelscope-credits.d.ts.map +1 -1
- package/lib/modelscope-credits.js +31 -12
- package/lib/modelscope-credits.js.map +1 -1
- package/lib/modelscope-messages.d.ts +9 -1
- package/lib/modelscope-messages.d.ts.map +1 -1
- package/lib/modelscope-messages.js +12 -3
- package/lib/modelscope-messages.js.map +1 -1
- package/lib/monkeycode-adapter.d.ts.map +1 -1
- package/lib/monkeycode-adapter.js +0 -3
- package/lib/monkeycode-adapter.js.map +1 -1
- package/lib/officeace-adapter.d.ts.map +1 -1
- package/lib/officeace-adapter.js +21 -147
- package/lib/officeace-adapter.js.map +1 -1
- package/lib/officeace-auth.d.ts +0 -15
- package/lib/officeace-auth.d.ts.map +1 -1
- package/lib/officeace-auth.js +12 -278
- package/lib/officeace-auth.js.map +1 -1
- package/lib/openai-compat.d.ts.map +1 -1
- package/lib/openai-compat.js +1 -18
- package/lib/openai-compat.js.map +1 -1
- package/lib/openai-gateway/config.d.ts +1 -0
- package/lib/openai-gateway/config.d.ts.map +1 -1
- package/lib/openai-gateway/config.js +20 -0
- package/lib/openai-gateway/config.js.map +1 -1
- package/lib/openai-gateway/models.d.ts +77 -1
- package/lib/openai-gateway/models.d.ts.map +1 -1
- package/lib/openai-gateway/models.js +110 -2
- package/lib/openai-gateway/models.js.map +1 -1
- package/lib/openai-gateway/server.d.ts.map +1 -1
- package/lib/openai-gateway/server.js +23 -17
- package/lib/openai-gateway/server.js.map +1 -1
- package/lib/openai-gateway/stream.d.ts.map +1 -1
- package/lib/openai-gateway/stream.js +24 -2
- package/lib/openai-gateway/stream.js.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.d.ts.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.js +14 -2
- package/lib/openai-gateway/tencent-fingerprint.js.map +1 -1
- package/lib/product.d.ts +17 -12
- package/lib/product.d.ts.map +1 -1
- package/lib/product.js +17 -12
- package/lib/product.js.map +1 -1
- package/lib/promotion-edge-broadcast.d.ts +76 -0
- package/lib/promotion-edge-broadcast.d.ts.map +1 -0
- package/lib/promotion-edge-broadcast.js +172 -0
- package/lib/promotion-edge-broadcast.js.map +1 -0
- package/lib/provider-credits.d.ts +6 -17
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +98 -65
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-registry.d.ts +19 -6
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +80 -29
- package/lib/provider-registry.js.map +1 -1
- package/lib/provider-runtime.d.ts +17 -3
- package/lib/provider-runtime.d.ts.map +1 -1
- package/lib/provider-runtime.js.map +1 -1
- package/lib/qiniu-messages.d.ts +4 -1
- package/lib/qiniu-messages.d.ts.map +1 -1
- package/lib/qiniu-messages.js +6 -3
- package/lib/qiniu-messages.js.map +1 -1
- package/lib/qoder-adapter.d.ts +113 -8
- package/lib/qoder-adapter.d.ts.map +1 -1
- package/lib/qoder-adapter.js +638 -231
- package/lib/qoder-adapter.js.map +1 -1
- package/lib/qoder-align.d.ts +104 -0
- package/lib/qoder-align.d.ts.map +1 -0
- package/lib/qoder-align.js +215 -0
- package/lib/qoder-align.js.map +1 -0
- package/lib/qoder-catalog.d.ts.map +1 -1
- package/lib/qoder-catalog.js +7 -0
- package/lib/qoder-catalog.js.map +1 -1
- package/lib/qoder-credits.d.ts.map +1 -1
- package/lib/qoder-credits.js +29 -5
- package/lib/qoder-credits.js.map +1 -1
- package/lib/qoder-machine.d.ts.map +1 -1
- package/lib/qoder-machine.js +0 -52
- package/lib/qoder-machine.js.map +1 -1
- package/lib/qoder-product.d.ts +20 -4
- package/lib/qoder-product.d.ts.map +1 -1
- package/lib/qoder-product.js.map +1 -1
- package/lib/qoder-rpc.d.ts +16 -1
- package/lib/qoder-rpc.d.ts.map +1 -1
- package/lib/qoder-rpc.js +56 -1
- package/lib/qoder-rpc.js.map +1 -1
- package/lib/qoder-traffic-guard.d.ts +6 -0
- package/lib/qoder-traffic-guard.d.ts.map +1 -0
- package/lib/qoder-traffic-guard.js +44 -0
- package/lib/qoder-traffic-guard.js.map +1 -0
- package/lib/qoder-web-usage.d.ts +165 -0
- package/lib/qoder-web-usage.d.ts.map +1 -0
- package/lib/qoder-web-usage.js +471 -0
- package/lib/qoder-web-usage.js.map +1 -0
- package/lib/raccoon-adapter.d.ts +3 -53
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +32 -151
- package/lib/raccoon-adapter.js.map +1 -1
- package/lib/raccoon-auth.d.ts +3 -2
- package/lib/raccoon-auth.d.ts.map +1 -1
- package/lib/raccoon-auth.js +6 -4
- package/lib/raccoon-auth.js.map +1 -1
- package/lib/raccoon-credits.d.ts +105 -40
- package/lib/raccoon-credits.d.ts.map +1 -1
- package/lib/raccoon-credits.js +250 -119
- package/lib/raccoon-credits.js.map +1 -1
- package/lib/raccoon-login-page.d.ts +10 -5
- package/lib/raccoon-login-page.d.ts.map +1 -1
- package/lib/raccoon-login-page.js +110 -23
- package/lib/raccoon-login-page.js.map +1 -1
- package/lib/raccoon-oauth.d.ts +67 -11
- package/lib/raccoon-oauth.d.ts.map +1 -1
- package/lib/raccoon-oauth.js +140 -16
- package/lib/raccoon-oauth.js.map +1 -1
- package/lib/raccoon.d.ts +98 -12
- package/lib/raccoon.d.ts.map +1 -1
- package/lib/raccoon.js +98 -12
- package/lib/raccoon.js.map +1 -1
- package/lib/reasoning-default.d.ts +207 -0
- package/lib/reasoning-default.d.ts.map +1 -0
- package/lib/reasoning-default.js +450 -0
- package/lib/reasoning-default.js.map +1 -0
- package/lib/reasoning-preferences.d.ts +86 -0
- package/lib/reasoning-preferences.d.ts.map +1 -0
- package/lib/reasoning-preferences.js +172 -0
- package/lib/reasoning-preferences.js.map +1 -0
- package/lib/service.d.ts +4 -9
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +12 -13
- package/lib/service.js.map +1 -1
- package/lib/session-balance.d.ts.map +1 -1
- package/lib/session-balance.js +14 -6
- package/lib/session-balance.js.map +1 -1
- package/lib/session-title.d.ts +3 -2
- package/lib/session-title.d.ts.map +1 -1
- package/lib/session-title.js +27 -3
- package/lib/session-title.js.map +1 -1
- package/lib/sync-apply.d.ts +97 -0
- package/lib/sync-apply.d.ts.map +1 -0
- package/lib/sync-apply.js +201 -0
- package/lib/sync-apply.js.map +1 -0
- package/lib/sync-rpc.d.ts +38 -0
- package/lib/sync-rpc.d.ts.map +1 -0
- package/lib/sync-rpc.js +144 -0
- package/lib/sync-rpc.js.map +1 -0
- package/lib/sync-service.d.ts +220 -0
- package/lib/sync-service.d.ts.map +1 -0
- package/lib/sync-service.js +434 -0
- package/lib/sync-service.js.map +1 -0
- package/lib/sync-targets.d.ts +184 -0
- package/lib/sync-targets.d.ts.map +1 -0
- package/lib/sync-targets.js +560 -0
- package/lib/sync-targets.js.map +1 -0
- package/lib/system-prompt-fold.d.ts +53 -0
- package/lib/system-prompt-fold.d.ts.map +1 -0
- package/lib/system-prompt-fold.js +66 -0
- package/lib/system-prompt-fold.js.map +1 -0
- package/lib/token-ledger-store.d.ts.map +1 -1
- package/lib/token-ledger-store.js +27 -121
- package/lib/token-ledger-store.js.map +1 -1
- package/lib/token-ledger.d.ts +13 -1
- package/lib/token-ledger.d.ts.map +1 -1
- package/lib/token-ledger.js.map +1 -1
- package/lib/trae-adapter.d.ts +1 -1
- package/lib/trae-adapter.d.ts.map +1 -1
- package/lib/trae-adapter.js +4 -6
- package/lib/trae-adapter.js.map +1 -1
- package/lib/trae-auth.d.ts +3 -1
- package/lib/trae-auth.d.ts.map +1 -1
- package/lib/trae-auth.js +12 -2
- package/lib/trae-auth.js.map +1 -1
- package/lib/trae-oauth.d.ts +27 -0
- package/lib/trae-oauth.d.ts.map +1 -1
- package/lib/trae-oauth.js +143 -0
- package/lib/trae-oauth.js.map +1 -1
- package/lib/types.d.ts +164 -154
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/usage-badge.d.ts +2 -83
- package/lib/usage-badge.d.ts.map +1 -1
- package/lib/usage-badge.js +27 -227
- package/lib/usage-badge.js.map +1 -1
- package/lib/workbuddy-intl-activity.d.ts +112 -0
- package/lib/workbuddy-intl-activity.d.ts.map +1 -0
- package/lib/workbuddy-intl-activity.js +370 -0
- package/lib/workbuddy-intl-activity.js.map +1 -0
- package/lib/zcode-adapter.d.ts.map +1 -1
- package/lib/zcode-adapter.js +31 -112
- package/lib/zcode-adapter.js.map +1 -1
- package/lib/zcode-auth.d.ts.map +1 -1
- package/lib/zcode-auth.js +1 -8
- package/lib/zcode-auth.js.map +1 -1
- package/lib/zcode-login.d.ts.map +1 -1
- package/lib/zcode-login.js +3 -5
- package/lib/zcode-login.js.map +1 -1
- package/lib/zcode-transport.d.ts.map +1 -1
- package/lib/zcode-transport.js +1 -3
- package/lib/zcode-transport.js.map +1 -1
- package/lib/zcode-upstream.d.ts +0 -59
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +10 -156
- package/lib/zcode-upstream.js.map +1 -1
- package/locale/en.json +2 -1
- package/locale/zh.json +2 -1
- package/package.json +7 -11
- package/lib/image-data-cache.d.ts +0 -87
- package/lib/image-data-cache.d.ts.map +0 -1
- package/lib/image-data-cache.js +0 -144
- package/lib/image-data-cache.js.map +0 -1
- package/lib/provider-http-pool.d.ts +0 -134
- package/lib/provider-http-pool.d.ts.map +0 -1
- package/lib/provider-http-pool.js +0 -519
- package/lib/provider-http-pool.js.map +0 -1
- package/lib/qoder-umid.d.ts +0 -184
- package/lib/qoder-umid.d.ts.map +0 -1
- package/lib/qoder-umid.js +0 -503
- package/lib/qoder-umid.js.map +0 -1
- package/lib/webdav-auto-sync.d.ts +0 -101
- package/lib/webdav-auto-sync.d.ts.map +0 -1
- package/lib/webdav-auto-sync.js +0 -0
- package/lib/webdav-auto-sync.js.map +0 -1
- package/lib/webdav-rpc.d.ts +0 -13
- package/lib/webdav-rpc.d.ts.map +0 -1
- package/lib/webdav-rpc.js +0 -137
- package/lib/webdav-rpc.js.map +0 -1
- package/lib/webdav-sync-crypto.d.ts +0 -18
- package/lib/webdav-sync-crypto.d.ts.map +0 -1
- package/lib/webdav-sync-crypto.js +0 -72
- package/lib/webdav-sync-crypto.js.map +0 -1
- package/lib/webdav-sync-merge.d.ts +0 -31
- package/lib/webdav-sync-merge.d.ts.map +0 -1
- package/lib/webdav-sync-merge.js +0 -0
- package/lib/webdav-sync-merge.js.map +0 -1
- package/lib/webdav-sync.d.ts +0 -155
- package/lib/webdav-sync.d.ts.map +0 -1
- package/lib/webdav-sync.js +0 -412
- package/lib/webdav-sync.js.map +0 -1
- package/lib/workbuddy-keepalive.d.ts +0 -81
- package/lib/workbuddy-keepalive.d.ts.map +0 -1
- package/lib/workbuddy-keepalive.js +0 -218
- package/lib/workbuddy-keepalive.js.map +0 -1
|
@@ -0,0 +1,560 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 「把网关模型目录同步到外部 agent」的**纯计划层**。
|
|
3
|
+
*
|
|
4
|
+
* ## 职责边界(接线 RPC 时不许越界)
|
|
5
|
+
*
|
|
6
|
+
* - 输入:目标文件的**当前内容**(已 parse 的对象)+ 网关模型目录 + 网关地址;
|
|
7
|
+
* - 输出:新文件内容 + diff;
|
|
8
|
+
* - **不碰磁盘**:不读路径、不备份、不写文件(那是 `sync-apply.ts` 的事)。
|
|
9
|
+
*
|
|
10
|
+
* 这样所有行为都能用内存对象断言,不需要临时目录,也不会在单测里写用户的真实配置。
|
|
11
|
+
*
|
|
12
|
+
* ## 为什么按 baseUrl 定位而不是写死 providerId
|
|
13
|
+
*
|
|
14
|
+
* 两边的网关 provider 都是**用户手工加的**:pi 里叫 `dsh-gateway`、ZCode 里叫
|
|
15
|
+
* `dsh-openai-gateway`,但用户随时可能改名。写死 id 会在改名后静默匹配失败
|
|
16
|
+
* (表现为「同步成功但什么都没变」)。因此按端点匹配,改名免疫。
|
|
17
|
+
*
|
|
18
|
+
* ## 目标文件的结构差异(这是本模块存在的根本原因)
|
|
19
|
+
*
|
|
20
|
+
* | 目标 | 模型能力信息存在哪 |
|
|
21
|
+
* |---|---|
|
|
22
|
+
* | pi | **自描述**:`providers.<k>.models[]` 每项自带 contextWindow/maxTokens |
|
|
23
|
+
* | ZCode | **不自描述**:provider 里只有 id 列表,能力来自 `modelConfigRules.providerModelRules` 的匹配 |
|
|
24
|
+
*
|
|
25
|
+
* ⇒ ZCode 侧只写 id 列表**是不够的**:规则里没有 contextWindow 时,ZCode 读目录会报
|
|
26
|
+
* `Missing token limits`。所以 {@link planZcodeSync} 必须同时 upsert 规则。
|
|
27
|
+
*
|
|
28
|
+
* @module src/sync-targets.ts
|
|
29
|
+
*/
|
|
30
|
+
/** 从模型 id 里取 provider 段(`<provider>/<model>`;模型名本身可含 `/`,故只切首个)。 */
|
|
31
|
+
export function providerOfModelId(id) {
|
|
32
|
+
const slash = id.indexOf('/');
|
|
33
|
+
return slash > 0 ? id.slice(0, slash) : '';
|
|
34
|
+
}
|
|
35
|
+
/** 判断某模型是否属于「本次采集失败的渠道」。 */
|
|
36
|
+
function makeProtectedCheck(failedProviders) {
|
|
37
|
+
if (!failedProviders || failedProviders.length === 0)
|
|
38
|
+
return () => false;
|
|
39
|
+
const failed = new Set(failedProviders);
|
|
40
|
+
return (id) => failed.has(providerOfModelId(id));
|
|
41
|
+
}
|
|
42
|
+
/** 计划阶段的失败(目标 provider 不存在、文件结构不认识等)。 */
|
|
43
|
+
export class SyncPlanError extends Error {
|
|
44
|
+
constructor(message) {
|
|
45
|
+
super(message);
|
|
46
|
+
this.name = 'SyncPlanError';
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/** 深拷贝配置对象:目标文件都是纯 JSON,用序列化往返最省事。 */
|
|
50
|
+
function clone(value) {
|
|
51
|
+
return JSON.parse(JSON.stringify(value));
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* 把端点归一成 `scheme://host:port`,用于跨配置匹配。
|
|
55
|
+
*
|
|
56
|
+
* 忽略 path / 尾斜杠 / query:用户可能写 `http://127.0.0.1:8326`、
|
|
57
|
+
* `.../v1`,或带尾斜杠。解析失败时退化成原串比较(不抛错)。
|
|
58
|
+
*/
|
|
59
|
+
function normalizeEndpoint(raw) {
|
|
60
|
+
if (typeof raw !== 'string' || !raw.trim())
|
|
61
|
+
return '';
|
|
62
|
+
const trimmed = raw.trim();
|
|
63
|
+
try {
|
|
64
|
+
const url = new URL(trimmed);
|
|
65
|
+
// ⚠️ `new URL('localhost:8326')` **不抛错**,而是把 `localhost` 当成 scheme、
|
|
66
|
+
// host 留空 ⇒ 所有裸 `host:port` 会归一成同一个 `localhost://`,
|
|
67
|
+
// 于是 8326 与 9999 被判成同一端点(实测会匹配到错的 provider)。
|
|
68
|
+
if (url.host)
|
|
69
|
+
return `${url.protocol}//${url.host}`.toLowerCase();
|
|
70
|
+
throw new Error('empty host');
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
// 裸 `host:port` / `127.0.0.1:8326`:补 scheme 再解析一次
|
|
74
|
+
try {
|
|
75
|
+
const url = new URL(`http://${trimmed}`);
|
|
76
|
+
if (url.host)
|
|
77
|
+
return `${url.protocol}//${url.host}`.toLowerCase();
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
// 落到下面的原串比较
|
|
81
|
+
}
|
|
82
|
+
return trimmed.toLowerCase().replace(/\/+$/, '');
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
/** 能力值是否可安全写入配置:必须是正的有限数(0 / 负数 / NaN 一律拒)。 */
|
|
86
|
+
function usableNumber(value) {
|
|
87
|
+
return typeof value === 'number' && Number.isFinite(value) && value > 0;
|
|
88
|
+
}
|
|
89
|
+
/** 逐元素比较两个字符串数组(`input` 模态列表用)。 */
|
|
90
|
+
function sameStringArray(left, right) {
|
|
91
|
+
if (!Array.isArray(left) || left.length !== right.length)
|
|
92
|
+
return false;
|
|
93
|
+
return left.every((value, index) => value === right[index]);
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* 拆分出可写入的模型与需跳过的模型。
|
|
97
|
+
*
|
|
98
|
+
* ⚠️ **只要求 `contextWindow`**,`maxTokens` 缺失不算非法:
|
|
99
|
+
* - ZCode 侧只消费 `contextWindow`(缺了它模型直接不可用);
|
|
100
|
+
* - pi / 网关适配器普遍不声明 `maxTokens`,把它设成硬门槛会让绝大多数模型
|
|
101
|
+
* (实测 369 个里 0 个带 `max_tokens`)被判为「能力值缺失」而全部跳过。
|
|
102
|
+
*/
|
|
103
|
+
function partitionModels(models) {
|
|
104
|
+
const ok = [];
|
|
105
|
+
const skipped = [];
|
|
106
|
+
const seen = new Set();
|
|
107
|
+
for (const model of models) {
|
|
108
|
+
const id = typeof model?.id === 'string' ? model.id.trim() : '';
|
|
109
|
+
// 重复 id 只保留第一条:否则会往配置里写重复模型
|
|
110
|
+
if (!id || seen.has(id))
|
|
111
|
+
continue;
|
|
112
|
+
if (!usableNumber(model.contextWindow)) {
|
|
113
|
+
skipped.push(id);
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
116
|
+
seen.add(id);
|
|
117
|
+
ok.push({ ...model, id });
|
|
118
|
+
}
|
|
119
|
+
return { ok, skipped };
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* 在 pi 的 models.json 里按端点找到网关 provider 的键名。
|
|
123
|
+
*
|
|
124
|
+
* @throws {SyncPlanError} 找不到时抛错并点名端点(不擅自新建 provider —— 那需要 apiKey)
|
|
125
|
+
*/
|
|
126
|
+
export function findPiProvider(config, gatewayBaseUrl) {
|
|
127
|
+
const wanted = normalizeEndpoint(gatewayBaseUrl);
|
|
128
|
+
const providers = config?.providers ?? {};
|
|
129
|
+
for (const [key, provider] of Object.entries(providers)) {
|
|
130
|
+
if (normalizeEndpoint(provider?.baseUrl) === wanted)
|
|
131
|
+
return key;
|
|
132
|
+
}
|
|
133
|
+
throw new SyncPlanError(`pi 的 models.json 里没有端点匹配 ${gatewayBaseUrl} 的 provider`);
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* 在 ZCode 的 provider_config.json 里按 `config.api.baseUrl` 找网关 provider。
|
|
137
|
+
*
|
|
138
|
+
* @throws {SyncPlanError} 找不到时抛错(同样不擅自新建)
|
|
139
|
+
*/
|
|
140
|
+
export function findZcodeProvider(config, gatewayBaseUrl) {
|
|
141
|
+
const wanted = normalizeEndpoint(gatewayBaseUrl);
|
|
142
|
+
const rules = config?.config?.providerConfigRules?.providerRules ?? [];
|
|
143
|
+
for (const rule of rules) {
|
|
144
|
+
if (normalizeEndpoint(rule?.config?.api?.baseUrl) === wanted)
|
|
145
|
+
return String(rule.providerId);
|
|
146
|
+
}
|
|
147
|
+
throw new SyncPlanError(`ZCode 的 provider_config.json 里没有端点匹配 ${gatewayBaseUrl} 的 provider`);
|
|
148
|
+
}
|
|
149
|
+
/**
|
|
150
|
+
* 规划 pi 侧同步:刷新网关 provider 的 `models[]`。
|
|
151
|
+
*
|
|
152
|
+
* ## 三条不变量
|
|
153
|
+
*
|
|
154
|
+
* 1. **按模型 id 保留 pi 本地字段**:`reasoning` / `thinkingLevelMap` / `compat` 是 pi
|
|
155
|
+
* 独有配置,网关目录里没有对应来源。不保留会让用户手调的思考档位与兼容开关归零。
|
|
156
|
+
* 2. **不搬运密钥**:`apiKey` / `baseUrl` / `api` 原样保留(两边本来就有)。
|
|
157
|
+
* 3. **外科手术**:同文件里其它 provider 一个字节都不动。
|
|
158
|
+
*/
|
|
159
|
+
export function planPiSync(config, models, gatewayBaseUrl, options = {}) {
|
|
160
|
+
const key = findPiProvider(config, gatewayBaseUrl);
|
|
161
|
+
const result = clone(config);
|
|
162
|
+
const provider = result.providers[key] ?? {};
|
|
163
|
+
const { ok, skipped } = partitionModels(models);
|
|
164
|
+
// 旧模型按 id 建索引:既用于保留本地字段,也用于算 diff
|
|
165
|
+
const previous = new Map();
|
|
166
|
+
for (const model of Array.isArray(provider.models) ? provider.models : []) {
|
|
167
|
+
if (model && typeof model.id === 'string')
|
|
168
|
+
previous.set(model.id, model);
|
|
169
|
+
}
|
|
170
|
+
const added = [];
|
|
171
|
+
const updated = [];
|
|
172
|
+
const byId = new Map(ok.map(model => [model.id, model]));
|
|
173
|
+
/** 用目录值覆盖本地条目;本地独有字段(reasoning 等)由展开保留。 */
|
|
174
|
+
const buildEntry = (model, kept) => {
|
|
175
|
+
const entry = { ...(kept ?? {}) };
|
|
176
|
+
entry.id = model.id;
|
|
177
|
+
entry.name = model.name ?? model.id;
|
|
178
|
+
entry.contextWindow = model.contextWindow;
|
|
179
|
+
// ⚠️ maxTokens 只在目录给了合法值时才覆盖:缺失时**保留本地已有值**,
|
|
180
|
+
// 本地也没有就不写该字段(交给 pi 的默认值),绝不用猜出来的数覆盖。
|
|
181
|
+
if (usableNumber(model.maxTokens))
|
|
182
|
+
entry.maxTokens = model.maxTokens;
|
|
183
|
+
entry.input = [...model.input];
|
|
184
|
+
return entry;
|
|
185
|
+
};
|
|
186
|
+
// ⚠️ 两种「本次写不进去」都必须**保留目标现有条目**,绝不能判 removed:
|
|
187
|
+
// ① 渠道采集失败(token 过期 / 网络抖动);
|
|
188
|
+
// ② 目录侧该模型能力值凑不齐(`skipped`)—— 它只是「这次没拿到窗口」,
|
|
189
|
+
// 不等于「这个模型下架了」。整条删掉 = 一次目录抖动就删用户配置。
|
|
190
|
+
const isProtected = makeProtectedCheck(options.failedProviders);
|
|
191
|
+
const skippedSet = new Set(skipped);
|
|
192
|
+
const keepAsIs = (id) => isProtected(id) || skippedSet.has(id);
|
|
193
|
+
const protectedModels = [];
|
|
194
|
+
// 先按旧顺序铺(保留既有条目的位置),再把新增模型追加到末尾:
|
|
195
|
+
// 直接 `ok.map` + `push(previousEntry)` 会把受保护模型挪到数组末尾,
|
|
196
|
+
// 覆盖用户手排的 modelOrder。
|
|
197
|
+
const nextModels = [];
|
|
198
|
+
const emitted = new Set();
|
|
199
|
+
for (const [id, previousEntry] of previous) {
|
|
200
|
+
const model = byId.get(id);
|
|
201
|
+
if (model) {
|
|
202
|
+
nextModels.push(buildEntry(model, previousEntry));
|
|
203
|
+
emitted.add(id);
|
|
204
|
+
if (previousEntry.contextWindow !== model.contextWindow
|
|
205
|
+
|| (usableNumber(model.maxTokens) && previousEntry.maxTokens !== model.maxTokens)
|
|
206
|
+
|| previousEntry.name !== (model.name ?? model.id)
|
|
207
|
+
|| !sameStringArray(previousEntry.input, model.input))
|
|
208
|
+
updated.push(id);
|
|
209
|
+
continue;
|
|
210
|
+
}
|
|
211
|
+
if (!keepAsIs(id))
|
|
212
|
+
continue;
|
|
213
|
+
nextModels.push(previousEntry);
|
|
214
|
+
emitted.add(id);
|
|
215
|
+
if (isProtected(id))
|
|
216
|
+
protectedModels.push(id);
|
|
217
|
+
}
|
|
218
|
+
for (const model of ok) {
|
|
219
|
+
if (emitted.has(model.id))
|
|
220
|
+
continue;
|
|
221
|
+
nextModels.push(buildEntry(model, undefined));
|
|
222
|
+
emitted.add(model.id);
|
|
223
|
+
added.push(model.id);
|
|
224
|
+
}
|
|
225
|
+
const removed = [...previous.keys()].filter(id => !emitted.has(id));
|
|
226
|
+
provider.models = nextModels;
|
|
227
|
+
result.providers[key] = provider;
|
|
228
|
+
return { config: result, diff: { added, removed, updated, skipped, protectedModels } };
|
|
229
|
+
}
|
|
230
|
+
/**
|
|
231
|
+
* 由本功能管理的 ZCode provider id 前缀。
|
|
232
|
+
*
|
|
233
|
+
* 每个网关渠道对应一个 `<前缀><渠道 id>` 的 provider —— 这样 ZCode 的模型选择器
|
|
234
|
+
* 会像 pi 一样按渠道平铺,而不是把 168 个模型全塞进同一个 `dsh` 条目里。
|
|
235
|
+
*
|
|
236
|
+
* ⚠️ 前缀是「本功能管理范围」的判据之一(另一个判据是 `api.baseUrl` 指向网关):
|
|
237
|
+
* 只有同时满足两者的 provider 才会被同步改写,用户手工加的 provider 一律不碰。
|
|
238
|
+
*/
|
|
239
|
+
const ZCODE_PROVIDER_PREFIX = 'dsh-';
|
|
240
|
+
/** 渠道 id → 它在 ZCode 里对应的 provider id(如 `codearts` → `dsh-codearts`)。 */
|
|
241
|
+
export function zcodeProviderIdFor(channel) {
|
|
242
|
+
return ZCODE_PROVIDER_PREFIX + channel;
|
|
243
|
+
}
|
|
244
|
+
/**
|
|
245
|
+
* `zcodeProviderIdFor` 的逆运算:从 providerId 反推渠道名。
|
|
246
|
+
* 不带前缀的 provider 返回 `''`(它不是本功能生成的)。
|
|
247
|
+
*/
|
|
248
|
+
export function channelOfZcodeProviderId(providerId) {
|
|
249
|
+
return providerId.startsWith(ZCODE_PROVIDER_PREFIX)
|
|
250
|
+
? providerId.slice(ZCODE_PROVIDER_PREFIX.length)
|
|
251
|
+
: '';
|
|
252
|
+
}
|
|
253
|
+
/**
|
|
254
|
+
* 列出配置里所有「端点匹配网关」的 provider 规则。
|
|
255
|
+
*
|
|
256
|
+
* 含**升级前**的那个单一条目(如 `dsh-openai-gateway`):它装的模型会按渠道
|
|
257
|
+
* 拆到各自的 provider 里,本条目随后被移除。
|
|
258
|
+
*/
|
|
259
|
+
function managedZcodeRules(config, gatewayBaseUrl) {
|
|
260
|
+
const wanted = normalizeEndpoint(gatewayBaseUrl);
|
|
261
|
+
const rules = config?.config?.providerConfigRules?.providerRules ?? [];
|
|
262
|
+
return rules.filter(rule => normalizeEndpoint(rule?.config?.api?.baseUrl) === wanted);
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* 规划 ZCode 侧同步:**每个网关渠道一个 provider**。
|
|
266
|
+
*
|
|
267
|
+
* ## 为什么不是「一个 provider 装全部模型」
|
|
268
|
+
*
|
|
269
|
+
* 初版沿用用户的既有形态(`dsh-openai-gateway` 一条 + 168 个带渠道前缀的模型),
|
|
270
|
+
* 结果 ZCode 的模型选择器里所有渠道的模型都折叠在 `dsh` 一个条目下,与 pi 里
|
|
271
|
+
* 「按渠道铺开」的观感不一致。现改为每渠道一条,provider 的 group / access(含
|
|
272
|
+
* apiKey)/ api(含 baseUrl)/ 启用状态全部继承原条目。
|
|
273
|
+
*
|
|
274
|
+
* ## 三条不变量
|
|
275
|
+
*
|
|
276
|
+
* 1. **模型 id 仍带渠道前缀**(`codearts/GLM-5.2`):网关靠首个 `/` 之前做路由,
|
|
277
|
+
* 去掉前缀它就不认了;
|
|
278
|
+
* 2. **受保护渠道整条不动**:采集失败 / 用户未勾选的渠道,其 provider 与能力规则
|
|
279
|
+
* 原样保留(只把 id 迁成 `dsh-<渠道>` 以统一结构);
|
|
280
|
+
* 3. **外科手术**:非管理范围的 provider 与其能力规则一个字节都不动。
|
|
281
|
+
*/
|
|
282
|
+
export function planZcodeSync(config, models, gatewayBaseUrl, options = {}) {
|
|
283
|
+
const managed = managedZcodeRules(config, gatewayBaseUrl);
|
|
284
|
+
if (managed.length === 0) {
|
|
285
|
+
throw new SyncPlanError(`ZCode 的 provider_config.json 里没有端点匹配 ${gatewayBaseUrl} 的 provider`);
|
|
286
|
+
}
|
|
287
|
+
const result = clone(config);
|
|
288
|
+
const rules = result.config.providerConfigRules.providerRules;
|
|
289
|
+
const wanted = normalizeEndpoint(gatewayBaseUrl);
|
|
290
|
+
// 模板:沿用现有网关 provider 的连接参数(不新建、不猜)
|
|
291
|
+
const template = rules.find(entry => normalizeEndpoint(entry?.config?.api?.baseUrl) === wanted);
|
|
292
|
+
if (!template)
|
|
293
|
+
throw new SyncPlanError(`ZCode 配置在匹配后又找不到端点 ${gatewayBaseUrl} 的 provider`);
|
|
294
|
+
// 旧模型:把所有管理中 provider 的模型按渠道汇总(升级前是「一条装全部」)
|
|
295
|
+
const oldByChannel = new Map();
|
|
296
|
+
// ⚠️ 没有 `<channel>/` 前缀的旧 id(例如 `gpt-4o`)无法归属任何渠道。
|
|
297
|
+
// 过去直接 `continue` ⇒ 它既不进 old 也不进 new,被静默删掉且 diff 完全不提。
|
|
298
|
+
// 现在收集起来如实计进 removed,至少让用户看见「这条被移除了」。
|
|
299
|
+
const unroutableOld = [];
|
|
300
|
+
for (const rule of managed) {
|
|
301
|
+
const list = Array.isArray(rule?.config?.personalModelIds) ? rule.config.personalModelIds : [];
|
|
302
|
+
for (const id of list) {
|
|
303
|
+
if (typeof id !== 'string' || !id)
|
|
304
|
+
continue;
|
|
305
|
+
const channel = providerOfModelId(id);
|
|
306
|
+
if (!channel) {
|
|
307
|
+
if (!unroutableOld.includes(id))
|
|
308
|
+
unroutableOld.push(id);
|
|
309
|
+
continue;
|
|
310
|
+
}
|
|
311
|
+
const bucket = oldByChannel.get(channel) ?? [];
|
|
312
|
+
bucket.push(id);
|
|
313
|
+
oldByChannel.set(channel, bucket);
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
const { ok, skipped } = partitionModels(models);
|
|
317
|
+
const skippedSet = new Set(skipped);
|
|
318
|
+
const newByChannel = new Map();
|
|
319
|
+
for (const model of ok) {
|
|
320
|
+
const channel = providerOfModelId(model.id);
|
|
321
|
+
if (!channel)
|
|
322
|
+
continue;
|
|
323
|
+
const bucket = newByChannel.get(channel) ?? [];
|
|
324
|
+
bucket.push(model);
|
|
325
|
+
newByChannel.set(channel, bucket);
|
|
326
|
+
}
|
|
327
|
+
const protectedChannels = new Set(options.failedProviders ?? []);
|
|
328
|
+
/**
|
|
329
|
+
* 每个渠道最终的模型列表。
|
|
330
|
+
*
|
|
331
|
+
* - 受保护渠道 → 沿用旧列表(**不增不删**);
|
|
332
|
+
* - 其余渠道 → 仍存在的按旧顺序保留 + 新模型追加到末尾(不按字母重排,
|
|
333
|
+
* 否则每次同步都会覆盖用户手工排的 `modelOrder`);
|
|
334
|
+
* - 目录里彻底消失的渠道 → 不入表 ⇒ 它的 provider 随后被移除。
|
|
335
|
+
*/
|
|
336
|
+
const finalByChannel = new Map();
|
|
337
|
+
const protectedModels = [];
|
|
338
|
+
const allChannels = new Set([...newByChannel.keys(), ...oldByChannel.keys()]);
|
|
339
|
+
for (const channel of allChannels) {
|
|
340
|
+
const old = oldByChannel.get(channel) ?? [];
|
|
341
|
+
if (protectedChannels.has(channel)) {
|
|
342
|
+
if (old.length > 0) {
|
|
343
|
+
finalByChannel.set(channel, old);
|
|
344
|
+
protectedModels.push(...old);
|
|
345
|
+
}
|
|
346
|
+
continue;
|
|
347
|
+
}
|
|
348
|
+
const fresh = newByChannel.get(channel) ?? [];
|
|
349
|
+
if (fresh.length === 0) {
|
|
350
|
+
// 目录里这条渠道一个可写模型都没有。但旧配置里如果还有本轮 `skipped` 的模型,
|
|
351
|
+
// 必须连渠道一起保留 —— 否则它们会跟着 provider 一起消失。
|
|
352
|
+
const skippedOld = old.filter(id => skippedSet.has(id));
|
|
353
|
+
if (skippedOld.length > 0)
|
|
354
|
+
finalByChannel.set(channel, skippedOld);
|
|
355
|
+
continue;
|
|
356
|
+
}
|
|
357
|
+
const freshIds = fresh.map(model => model.id);
|
|
358
|
+
const freshSet = new Set(freshIds);
|
|
359
|
+
const oldSet = new Set(old);
|
|
360
|
+
// ⚠️ 本轮 `skipped` 的旧 id 必须保留:它只是「这次没拿到窗口」,不是「模型下架」。
|
|
361
|
+
// 不保留会被从 personalModelIds 与能力规则里同时删除。
|
|
362
|
+
// 另外用 `new Set` 去掉升级残留造成的重复 id(旧 provider 与新 provider 同装一条)。
|
|
363
|
+
finalByChannel.set(channel, [...new Set([
|
|
364
|
+
...old.filter(id => freshSet.has(id) || skippedSet.has(id)),
|
|
365
|
+
...freshIds.filter(id => !oldSet.has(id)),
|
|
366
|
+
])]);
|
|
367
|
+
}
|
|
368
|
+
// diff:按模型 id 算(跨 provider 迁移不算变更,只有真的增/删才算)
|
|
369
|
+
const added = [];
|
|
370
|
+
const removed = [];
|
|
371
|
+
for (const [channel, ids] of finalByChannel) {
|
|
372
|
+
const old = oldByChannel.get(channel) ?? [];
|
|
373
|
+
for (const id of ids)
|
|
374
|
+
if (!old.includes(id))
|
|
375
|
+
added.push(id);
|
|
376
|
+
for (const id of old)
|
|
377
|
+
if (!ids.includes(id))
|
|
378
|
+
removed.push(id);
|
|
379
|
+
}
|
|
380
|
+
for (const [channel, ids] of oldByChannel) {
|
|
381
|
+
if (!finalByChannel.has(channel))
|
|
382
|
+
removed.push(...ids);
|
|
383
|
+
}
|
|
384
|
+
// 无渠道前缀的旧 id 无法路由,会被移出 personalModelIds;如实计入 removed 而不是静默丢
|
|
385
|
+
removed.push(...unroutableOld);
|
|
386
|
+
// ── 能力规则(缺 contextWindow 会让模型在 ZCode 里不可用)──
|
|
387
|
+
result.config.modelConfigRules = result.config.modelConfigRules ?? {};
|
|
388
|
+
const modelRules = result.config.modelConfigRules;
|
|
389
|
+
const existingRules = Array.isArray(modelRules.providerModelRules) ? modelRules.providerModelRules : [];
|
|
390
|
+
const managedIds = new Set(managed.map(entry => String(entry?.providerId)));
|
|
391
|
+
/**
|
|
392
|
+
* 判定某条能力规则是否属于「本功能管理范围」(含已消失渠道的旧 rule,需一并清理)。
|
|
393
|
+
*
|
|
394
|
+
* ⚠️ 判据**只有「provider 的端点指向网关」**(`managedIds` 由端点算出)。
|
|
395
|
+
* 曾经额外用 `pid.startsWith('dsh-')` 兜底,结果把用户**手工创建**、
|
|
396
|
+
* id 恰好以 `dsh-` 开头但端点指向别家的 provider 一起接管:
|
|
397
|
+
* provider 条目保留、能力规则却被删光 ⇒ 该 provider 的模型全部缺
|
|
398
|
+
* contextWindow 变成不可用,而 diff 一行都不显示(实测)。
|
|
399
|
+
*/
|
|
400
|
+
const isManagedRule = (entry) => managedIds.has(String(entry?.providerId ?? ''));
|
|
401
|
+
// 旧窗口值:既用于判断 updated,也用于受保护渠道原样保留
|
|
402
|
+
const oldWindow = new Map();
|
|
403
|
+
for (const entry of existingRules) {
|
|
404
|
+
if (!isManagedRule(entry))
|
|
405
|
+
continue;
|
|
406
|
+
const mid = typeof entry?.modelId === 'string' ? entry.modelId : '';
|
|
407
|
+
if (mid)
|
|
408
|
+
oldWindow.set(mid, entry?.config?.properties?.contextWindow);
|
|
409
|
+
}
|
|
410
|
+
// 非管理范围的规则原样保留;管理范围的只保留「受保护渠道」或「本轮 skipped 模型」的那些。
|
|
411
|
+
//
|
|
412
|
+
// ⚠️ 受保护渠道的规则**不能**把 providerId 改写成 `dsh-<渠道>`:该渠道的 provider
|
|
413
|
+
// 本轮是原样保留的(不重建),改写后规则会指向一个不存在的 provider,
|
|
414
|
+
// ZCode 找不到 provider ⇒ 模型直接不可用(实测)。
|
|
415
|
+
// skipped 模型则相反:它们的旧 provider 会被移除,规则必须跟着迁到新 provider。
|
|
416
|
+
const keptRules = existingRules
|
|
417
|
+
.filter(entry => {
|
|
418
|
+
if (!isManagedRule(entry))
|
|
419
|
+
return true;
|
|
420
|
+
const mid = typeof entry?.modelId === 'string' ? entry.modelId : '';
|
|
421
|
+
return protectedChannels.has(providerOfModelId(mid)) || skippedSet.has(mid);
|
|
422
|
+
})
|
|
423
|
+
.map(entry => {
|
|
424
|
+
if (!isManagedRule(entry))
|
|
425
|
+
return entry;
|
|
426
|
+
const mid = typeof entry?.modelId === 'string' ? entry.modelId : '';
|
|
427
|
+
const channel = providerOfModelId(mid);
|
|
428
|
+
if (protectedChannels.has(channel))
|
|
429
|
+
return entry;
|
|
430
|
+
return { ...entry, providerId: zcodeProviderIdFor(channel) };
|
|
431
|
+
});
|
|
432
|
+
const updated = [];
|
|
433
|
+
for (const model of ok) {
|
|
434
|
+
const channel = providerOfModelId(model.id);
|
|
435
|
+
if (!channel || protectedChannels.has(channel))
|
|
436
|
+
continue;
|
|
437
|
+
const previous = oldWindow.get(model.id);
|
|
438
|
+
if (previous !== undefined && previous !== model.contextWindow)
|
|
439
|
+
updated.push(model.id);
|
|
440
|
+
keptRules.push({
|
|
441
|
+
providerId: zcodeProviderIdFor(channel),
|
|
442
|
+
modelId: model.id,
|
|
443
|
+
config: { properties: { contextWindow: model.contextWindow } },
|
|
444
|
+
});
|
|
445
|
+
}
|
|
446
|
+
modelRules.providerModelRules = keptRules;
|
|
447
|
+
// ── provider 条目:移除管理中的旧条目,按渠道重建 ──
|
|
448
|
+
/**
|
|
449
|
+
* 保留的 provider 条目。
|
|
450
|
+
*
|
|
451
|
+
* ⚠️ 受保护渠道(未勾选 / 采集失败 / 目标独有)的 provider 必须**原样保留**:
|
|
452
|
+
* 过去按 `!managedIds.has(pid)` 过滤,会把受保护渠道也滤掉、再用模板重建一条,
|
|
453
|
+
* 结果 `enabled` / `providerName` / `access.apiKey` 全被模板值覆盖(实测)。
|
|
454
|
+
*/
|
|
455
|
+
const keptProviders = rules.filter(entry => {
|
|
456
|
+
const pid = String(entry?.providerId ?? '');
|
|
457
|
+
if (!managedIds.has(pid))
|
|
458
|
+
return true;
|
|
459
|
+
// ① 已经是「按渠道命名」的 provider(dsh-<渠道>):受保护渠道原样保留
|
|
460
|
+
const channel = channelOfZcodeProviderId(pid);
|
|
461
|
+
if (channel !== '' && protectedChannels.has(channel))
|
|
462
|
+
return true;
|
|
463
|
+
// ② 升级前的形态(一条 provider 装多个渠道,如 dsh-openai-gateway):
|
|
464
|
+
// 只要它还装着**受保护渠道**的模型,就整体保留 ——
|
|
465
|
+
// 否则该渠道的模型会随着这条 provider 一起消失。
|
|
466
|
+
const ids = Array.isArray(entry?.config?.personalModelIds) ? entry.config.personalModelIds : [];
|
|
467
|
+
return ids.some((id) => typeof id === 'string' && protectedChannels.has(providerOfModelId(id)));
|
|
468
|
+
});
|
|
469
|
+
const keptProviderIds = new Set(keptProviders.map(entry => String(entry?.providerId)));
|
|
470
|
+
const baseConfig = template.config ?? {};
|
|
471
|
+
for (const [channel, ids] of finalByChannel) {
|
|
472
|
+
if (protectedChannels.has(channel))
|
|
473
|
+
continue;
|
|
474
|
+
const providerId = zcodeProviderIdFor(channel);
|
|
475
|
+
if (keptProviderIds.has(providerId)) {
|
|
476
|
+
throw new SyncPlanError(`ZCode 里已存在名为 ${providerId} 的 provider,但它不指向网关(${gatewayBaseUrl});`
|
|
477
|
+
+ '为避免覆盖你手工配置的 provider,已拒绝同步。请先重命名或删除该 provider 后重试。');
|
|
478
|
+
}
|
|
479
|
+
keptProviders.push({
|
|
480
|
+
providerId,
|
|
481
|
+
providerName: providerId,
|
|
482
|
+
enabled: template.enabled !== false,
|
|
483
|
+
config: {
|
|
484
|
+
...baseConfig.group === undefined ? {} : { group: baseConfig.group },
|
|
485
|
+
// access(含 apiKey)与 api(含 baseUrl)逐条复制:ZCode 的 provider 是
|
|
486
|
+
// 自包含的,没有「继承自某一条」的机制
|
|
487
|
+
access: clone(baseConfig.access ?? {}),
|
|
488
|
+
api: clone(baseConfig.api ?? {}),
|
|
489
|
+
personalModelIds: [...ids],
|
|
490
|
+
modelOrder: [...ids],
|
|
491
|
+
},
|
|
492
|
+
});
|
|
493
|
+
keptProviderIds.add(providerId);
|
|
494
|
+
}
|
|
495
|
+
result.config.providerConfigRules.providerRules = keptProviders;
|
|
496
|
+
// providerOrder:保留仍存在的顺序,新 provider 追加到末尾
|
|
497
|
+
const providerIds = new Set(keptProviders.map(entry => String(entry?.providerId)));
|
|
498
|
+
const oldOrder = Array.isArray(result.config.providerOrder) ? result.config.providerOrder : [];
|
|
499
|
+
const keptOrder = oldOrder.filter(id => providerIds.has(id));
|
|
500
|
+
const missingOrder = [...finalByChannel.keys()]
|
|
501
|
+
.map(zcodeProviderIdFor)
|
|
502
|
+
.filter(id => !keptOrder.includes(id));
|
|
503
|
+
result.config.providerOrder = [...keptOrder, ...missingOrder];
|
|
504
|
+
return { config: result, diff: { added, removed, updated, skipped, protectedModels } };
|
|
505
|
+
}
|
|
506
|
+
/**
|
|
507
|
+
* 读出 pi 配置里网关 provider 当前已配置的模型 id。
|
|
508
|
+
*
|
|
509
|
+
* 找不到网关 provider 时返回**空数组而不抛错**:本函数服务于「UI 展示哪些渠道
|
|
510
|
+
* 已在目标里」这种附加信息,目标还没配网关是正常状态(用户尚未加过),
|
|
511
|
+
* 不该让整个预览因此失败。
|
|
512
|
+
*/
|
|
513
|
+
export function existingPiModelIds(config, gatewayBaseUrl) {
|
|
514
|
+
let key;
|
|
515
|
+
try {
|
|
516
|
+
key = findPiProvider(config, gatewayBaseUrl);
|
|
517
|
+
}
|
|
518
|
+
catch {
|
|
519
|
+
return [];
|
|
520
|
+
}
|
|
521
|
+
const models = config?.providers?.[key]?.models;
|
|
522
|
+
if (!Array.isArray(models))
|
|
523
|
+
return [];
|
|
524
|
+
return models
|
|
525
|
+
.map((model) => (typeof model?.id === 'string' ? model.id : ''))
|
|
526
|
+
.filter((id) => id !== '');
|
|
527
|
+
}
|
|
528
|
+
/**
|
|
529
|
+
* 读出 ZCode 配置里**所有**网关 provider 当前已配置的模型 id(汇总,跨渠道)。
|
|
530
|
+
*
|
|
531
|
+
* 找不到网关 provider 时返回空数组而不抛错:本函数服务于「UI 展示哪些渠道已在
|
|
532
|
+
* 目标里」这种附加信息,目标还没配网关是正常状态。
|
|
533
|
+
*/
|
|
534
|
+
export function existingZcodeModelIds(config, gatewayBaseUrl) {
|
|
535
|
+
const ids = [];
|
|
536
|
+
for (const rule of managedZcodeRules(config, gatewayBaseUrl)) {
|
|
537
|
+
const list = rule?.config?.personalModelIds;
|
|
538
|
+
if (!Array.isArray(list))
|
|
539
|
+
continue;
|
|
540
|
+
for (const id of list)
|
|
541
|
+
if (typeof id === 'string' && id)
|
|
542
|
+
ids.push(id);
|
|
543
|
+
}
|
|
544
|
+
return ids;
|
|
545
|
+
}
|
|
546
|
+
/** diff 是否为空(UI 用它决定「无需同步」而不是让用户点一个什么都没做的按钮)。 */
|
|
547
|
+
export function isDiffEmpty(diff) {
|
|
548
|
+
return diff.added.length === 0 && diff.removed.length === 0 && diff.updated.length === 0;
|
|
549
|
+
}
|
|
550
|
+
/**
|
|
551
|
+
* 对外暴露「可写入模型」的拆分结果。
|
|
552
|
+
*
|
|
553
|
+
* 调用方(`sync-service.ts`)必须用它在落盘前判定「可写列表是否为空」:
|
|
554
|
+
* 目录里**有模型但能力值全都非法**时,`models.length !== 0` 却同样会算出
|
|
555
|
+
* 一份空列表 ⇒ 把目标现有模型全部判为已删除。两种情形必须同样拒绝。
|
|
556
|
+
*/
|
|
557
|
+
export function splitUsableModels(models) {
|
|
558
|
+
return partitionModels(models);
|
|
559
|
+
}
|
|
560
|
+
//# sourceMappingURL=sync-targets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sync-targets.js","sourceRoot":"","sources":["../src/sync-targets.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 把「请求体顶层的 `system`」折进 `messages[]`(OpenAI 兼容渠道的通用修法)。
|
|
3
|
+
*
|
|
4
|
+
* ## 为什么
|
|
5
|
+
*
|
|
6
|
+
* 这批渠道的网关**只从 `messages[]` 读系统提示词**,请求体顶层的 `system` 字段被
|
|
7
|
+
* **静默忽略** —— 请求 200、正文正常、上游零报错,只是模型完全不知道 system 存在。
|
|
8
|
+
*
|
|
9
|
+
* 2026-11-17 真机三渠道实测(判据是「模型有没有收到我写的字面量」,不是 HTTP 码):
|
|
10
|
+
*
|
|
11
|
+
* | 渠道 | 顶层 `system` | `messages[]`-system |
|
|
12
|
+
* |---|---|---|
|
|
13
|
+
* | marvis | 200 但**没收到指令** | 200 且收到 |
|
|
14
|
+
* | modelscope | 200 但**没收到指令**(回复「Hi! How can I help you today?」) | 200 且收到 |
|
|
15
|
+
* | qiniu | 未验证(本机无凭据;OpenAI 兼容 `/chat/completions`,同源风险) | 未验证 |
|
|
16
|
+
*
|
|
17
|
+
* ⚠️ **`baizhi` 不在修法范围内,那是误报**:`src/baizhi-messages.ts` 构造的是
|
|
18
|
+
* **Anthropic Messages**(`max_tokens` 必填、`stop_sequences`、`tools[].input_schema`),
|
|
19
|
+
* 而 Anthropic 协议里 `system` **本来就是顶层参数**。实测 baizhi 顶层 `system`
|
|
20
|
+
* 模型确实收到了 —— 挪进 `messages[]` 反而会造出非法角色。**别把它「统一」进来。**
|
|
21
|
+
*
|
|
22
|
+
* ## 影响面
|
|
23
|
+
*
|
|
24
|
+
* 需要 system 的**辅助请求**(auto-review 风险评审、session-title)在这些渠道上拿不到
|
|
25
|
+
* 策略:模型收不到「按要求输出 JSON」这类指令 ⇒ 输出散文 ⇒ 上层 `JSON.parse` 失败 ⇒
|
|
26
|
+
* 评审 fail-closed 拒绝 ⇒ Auto 预设下所有工具调用无法执行(而且想关掉 auto-review
|
|
27
|
+
* 也要过同一条评审,形成死锁)。
|
|
28
|
+
*
|
|
29
|
+
* ## 为什么是一个函数、而不是三份内联拷贝
|
|
30
|
+
*
|
|
31
|
+
* 仓库红线「同一判据只留一份实现」。三个 builder(marvis / modelscope / qiniu)
|
|
32
|
+
* 各自内联一份 `{ system }` 的写法是这次缺陷的成因之一 —— 加一处、忘两处。
|
|
33
|
+
*
|
|
34
|
+
* ## 调用位置
|
|
35
|
+
*
|
|
36
|
+
* 必须写在**构造 payload 的函数里**(`build*Payload`),不是 adapter 里:
|
|
37
|
+
* builder 才是把 `system` 写成 wire 字段的那一处。两边都写会出现第二份判据,
|
|
38
|
+
* 删掉任一处都不红(本仓踩过同型的坑)。
|
|
39
|
+
*/
|
|
40
|
+
/** 折进去的那条 system 消息(与 OpenAI 的 `messages[]` 成员同形)。 */
|
|
41
|
+
export interface SystemMessageLike {
|
|
42
|
+
role: 'system';
|
|
43
|
+
content: string;
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* `system` 非空时,作为**第一条** `messages[]` 成员返回;否则原样返回入参。
|
|
47
|
+
*
|
|
48
|
+
* 刻意**不**去重、不合并:`options.system` 与 `messages[]` 里可能已存在的 system
|
|
49
|
+
* 是两件不同的事(前者是本次辅助请求的策略,后者是对话历史的一部分),
|
|
50
|
+
* 合并文本会改变语义。多条 system 是协议允许的。
|
|
51
|
+
*/
|
|
52
|
+
export declare function foldSystemIntoMessages<T extends Record<string, unknown>>(messages: ReadonlyArray<T>, system: string | undefined): ReadonlyArray<T | SystemMessageLike>;
|
|
53
|
+
//# sourceMappingURL=system-prompt-fold.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system-prompt-fold.d.ts","sourceRoot":"","sources":["../src/system-prompt-fold.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AAEH,sDAAsD;AACtD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,aAAa,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAoBtC"}
|