@kaitranntt/ccs 7.66.1 → 7.67.0-dev.2
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 +3 -1
- package/dist/ccs.js +68 -35
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/auth/auth-types.d.ts +29 -6
- package/dist/cliproxy/auth/auth-types.d.ts.map +1 -1
- package/dist/cliproxy/auth/auth-types.js +58 -10
- package/dist/cliproxy/auth/auth-types.js.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts +6 -1
- package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.js +165 -45
- package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
- package/dist/cliproxy/auth/oauth-process.d.ts +26 -1
- package/dist/cliproxy/auth/oauth-process.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-process.js +314 -49
- package/dist/cliproxy/auth/oauth-process.js.map +1 -1
- package/dist/cliproxy/auth/token-manager.d.ts +9 -0
- package/dist/cliproxy/auth/token-manager.d.ts.map +1 -1
- package/dist/cliproxy/auth/token-manager.js +104 -58
- package/dist/cliproxy/auth/token-manager.js.map +1 -1
- package/dist/cliproxy/auth-utils.d.ts +2 -1
- package/dist/cliproxy/auth-utils.d.ts.map +1 -1
- package/dist/cliproxy/auth-utils.js +32 -7
- package/dist/cliproxy/auth-utils.js.map +1 -1
- package/dist/cliproxy/catalog-cache.d.ts +9 -1
- package/dist/cliproxy/catalog-cache.d.ts.map +1 -1
- package/dist/cliproxy/catalog-cache.js +115 -29
- package/dist/cliproxy/catalog-cache.js.map +1 -1
- package/dist/cliproxy/codex-plan-compatibility.d.ts +0 -1
- package/dist/cliproxy/codex-plan-compatibility.d.ts.map +1 -1
- package/dist/cliproxy/codex-plan-compatibility.js +3 -7
- package/dist/cliproxy/codex-plan-compatibility.js.map +1 -1
- package/dist/cliproxy/config/generator.d.ts +2 -1
- package/dist/cliproxy/config/generator.d.ts.map +1 -1
- package/dist/cliproxy/config/generator.js +11 -1
- package/dist/cliproxy/config/generator.js.map +1 -1
- package/dist/cliproxy/executor/index.d.ts +5 -0
- package/dist/cliproxy/executor/index.d.ts.map +1 -1
- package/dist/cliproxy/executor/index.js +119 -16
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/cliproxy/index.d.ts +1 -1
- package/dist/cliproxy/index.d.ts.map +1 -1
- package/dist/cliproxy/index.js.map +1 -1
- package/dist/cliproxy/management-api-client.d.ts +9 -0
- package/dist/cliproxy/management-api-client.d.ts.map +1 -1
- package/dist/cliproxy/management-api-client.js +14 -0
- package/dist/cliproxy/management-api-client.js.map +1 -1
- package/dist/cliproxy/proxy-detector.d.ts.map +1 -1
- package/dist/cliproxy/proxy-detector.js +6 -2
- package/dist/cliproxy/proxy-detector.js.map +1 -1
- package/dist/cliproxy/quota-fetcher-gemini-cli.d.ts.map +1 -1
- package/dist/cliproxy/quota-fetcher-gemini-cli.js +14 -7
- package/dist/cliproxy/quota-fetcher-gemini-cli.js.map +1 -1
- package/dist/cliproxy/routing-strategy-http.d.ts +6 -0
- package/dist/cliproxy/routing-strategy-http.d.ts.map +1 -0
- package/dist/cliproxy/routing-strategy-http.js +115 -0
- package/dist/cliproxy/routing-strategy-http.js.map +1 -0
- package/dist/cliproxy/routing-strategy.d.ts +18 -0
- package/dist/cliproxy/routing-strategy.d.ts.map +1 -0
- package/dist/cliproxy/routing-strategy.js +123 -0
- package/dist/cliproxy/routing-strategy.js.map +1 -0
- package/dist/cliproxy/services/variant-settings.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-settings.js +43 -30
- package/dist/cliproxy/services/variant-settings.js.map +1 -1
- package/dist/cliproxy/startup-lock.d.ts.map +1 -1
- package/dist/cliproxy/startup-lock.js +5 -1
- package/dist/cliproxy/startup-lock.js.map +1 -1
- package/dist/cliproxy/tool-sanitization-proxy.d.ts +1 -0
- package/dist/cliproxy/tool-sanitization-proxy.d.ts.map +1 -1
- package/dist/cliproxy/tool-sanitization-proxy.js +6 -0
- package/dist/cliproxy/tool-sanitization-proxy.js.map +1 -1
- package/dist/cliproxy/types.d.ts +7 -0
- package/dist/cliproxy/types.d.ts.map +1 -1
- package/dist/cliproxy/types.js.map +1 -1
- package/dist/commands/cleanup-command.d.ts +1 -1
- package/dist/commands/cleanup-command.d.ts.map +1 -1
- package/dist/commands/cleanup-command.js +57 -34
- package/dist/commands/cleanup-command.js.map +1 -1
- package/dist/commands/cliproxy/catalog-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/catalog-subcommand.js +12 -38
- package/dist/commands/cliproxy/catalog-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/help-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/help-subcommand.js +3 -0
- package/dist/commands/cliproxy/help-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/index.d.ts.map +1 -1
- package/dist/commands/cliproxy/index.js +14 -0
- package/dist/commands/cliproxy/index.js.map +1 -1
- package/dist/commands/cliproxy/routing-subcommand.d.ts +4 -0
- package/dist/commands/cliproxy/routing-subcommand.d.ts.map +1 -0
- package/dist/commands/cliproxy/routing-subcommand.js +68 -0
- package/dist/commands/cliproxy/routing-subcommand.js.map +1 -0
- package/dist/commands/command-catalog.d.ts +2 -2
- package/dist/commands/command-catalog.d.ts.map +1 -1
- package/dist/commands/command-catalog.js +3 -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 +15 -1
- package/dist/commands/completion-backend.js.map +1 -1
- package/dist/commands/config-command.d.ts.map +1 -1
- package/dist/commands/config-command.js +23 -0
- package/dist/commands/config-command.js.map +1 -1
- package/dist/commands/docker/up-subcommand.js +1 -1
- package/dist/commands/docker/up-subcommand.js.map +1 -1
- package/dist/commands/help-command.d.ts.map +1 -1
- package/dist/commands/help-command.js +62 -1
- package/dist/commands/help-command.js.map +1 -1
- package/dist/config/unified-config-loader.d.ts +2 -1
- package/dist/config/unified-config-loader.d.ts.map +1 -1
- package/dist/config/unified-config-loader.js +37 -1
- package/dist/config/unified-config-loader.js.map +1 -1
- package/dist/config/unified-config-types.d.ts +29 -1
- package/dist/config/unified-config-types.d.ts.map +1 -1
- package/dist/config/unified-config-types.js +13 -1
- package/dist/config/unified-config-types.js.map +1 -1
- package/dist/copilot/copilot-executor.d.ts.map +1 -1
- package/dist/copilot/copilot-executor.js +5 -8
- package/dist/copilot/copilot-executor.js.map +1 -1
- package/dist/delegation/headless-executor.d.ts.map +1 -1
- package/dist/delegation/headless-executor.js +19 -16
- package/dist/delegation/headless-executor.js.map +1 -1
- package/dist/errors/error-handler.d.ts.map +1 -1
- package/dist/errors/error-handler.js +13 -0
- package/dist/errors/error-handler.js.map +1 -1
- package/dist/glmt/glmt-transformer.d.ts +1 -0
- package/dist/glmt/glmt-transformer.d.ts.map +1 -1
- package/dist/glmt/glmt-transformer.js +9 -0
- package/dist/glmt/glmt-transformer.js.map +1 -1
- package/dist/management/checks/image-analysis-check.d.ts.map +1 -1
- package/dist/management/checks/image-analysis-check.js +19 -1
- package/dist/management/checks/image-analysis-check.js.map +1 -1
- package/dist/management/recovery-manager.d.ts +6 -0
- package/dist/management/recovery-manager.d.ts.map +1 -1
- package/dist/management/recovery-manager.js +72 -2
- package/dist/management/recovery-manager.js.map +1 -1
- package/dist/services/logging/index.d.ts +7 -0
- package/dist/services/logging/index.d.ts.map +1 -0
- package/dist/services/logging/index.js +22 -0
- package/dist/services/logging/index.js.map +1 -0
- package/dist/services/logging/log-buffer.d.ts +5 -0
- package/dist/services/logging/log-buffer.d.ts.map +1 -0
- package/dist/services/logging/log-buffer.js +20 -0
- package/dist/services/logging/log-buffer.js.map +1 -0
- package/dist/services/logging/log-config.d.ts +4 -0
- package/dist/services/logging/log-config.d.ts.map +1 -0
- package/dist/services/logging/log-config.js +68 -0
- package/dist/services/logging/log-config.js.map +1 -0
- package/dist/services/logging/log-paths.d.ts +8 -0
- package/dist/services/logging/log-paths.d.ts.map +1 -0
- package/dist/services/logging/log-paths.js +66 -0
- package/dist/services/logging/log-paths.js.map +1 -0
- package/dist/services/logging/log-reader.d.ts +5 -0
- package/dist/services/logging/log-reader.d.ts.map +1 -0
- package/dist/services/logging/log-reader.js +124 -0
- package/dist/services/logging/log-reader.js.map +1 -0
- package/dist/services/logging/log-redaction.d.ts +2 -0
- package/dist/services/logging/log-redaction.d.ts.map +1 -0
- package/dist/services/logging/log-redaction.js +53 -0
- package/dist/services/logging/log-redaction.js.map +1 -0
- package/dist/services/logging/log-storage.d.ts +4 -0
- package/dist/services/logging/log-storage.d.ts.map +1 -0
- package/dist/services/logging/log-storage.js +109 -0
- package/dist/services/logging/log-storage.js.map +1 -0
- package/dist/services/logging/log-types.d.ts +30 -0
- package/dist/services/logging/log-types.d.ts.map +1 -0
- package/dist/services/logging/log-types.js +19 -0
- package/dist/services/logging/log-types.js.map +1 -0
- package/dist/services/logging/logger.d.ts +9 -0
- package/dist/services/logging/logger.d.ts.map +1 -0
- package/dist/services/logging/logger.js +46 -0
- package/dist/services/logging/logger.js.map +1 -0
- package/dist/ui/assets/{accounts-BjfPKR8m.js → accounts-ls0hXYZ9.js} +1 -1
- package/dist/ui/assets/{alert-dialog-Dh2NUFdm.js → alert-dialog-DJMw_zyc.js} +1 -1
- package/dist/ui/assets/{api-C-3mQCFf.js → api-Dz2nP1bN.js} +2 -2
- package/dist/ui/assets/{auth-section-Dp10_YyD.js → auth-section-BD8XqTiz.js} +1 -1
- package/dist/ui/assets/{backups-section-C0jF8MP1.js → backups-section-COOSGu9k.js} +1 -1
- package/dist/ui/assets/{channels-CkXuK5i7.js → channels-AGHzxMPw.js} +1 -1
- package/dist/ui/assets/{checkbox-tA5FH8Ol.js → checkbox-pojB3pE7.js} +1 -1
- package/dist/ui/assets/{claude-extension-Bg2ZkzMz.js → claude-extension-4b8gXOo_.js} +1 -1
- package/dist/ui/assets/cliproxy-BFEBo-pc.js +3 -0
- package/dist/ui/assets/{cliproxy-ai-providers-DBSXTTyw.js → cliproxy-ai-providers-BXE0HGLt.js} +6 -6
- package/dist/ui/assets/{cliproxy-control-panel-Da-sGGyI.js → cliproxy-control-panel-ZnCfRS9l.js} +1 -1
- package/dist/ui/assets/{codex-ooWKOPa2.js → codex-B9uBYmnm.js} +5 -5
- package/dist/ui/assets/{confirm-dialog-CKjwhn9j.js → confirm-dialog-DwPqRjyW.js} +1 -1
- package/dist/ui/assets/{copilot-GA7EPiK1.js → copilot-CSWApqyO.js} +2 -2
- package/dist/ui/assets/{cursor-B6c8CyHG.js → cursor-DYbVB4gp.js} +1 -1
- package/dist/ui/assets/{droid-CPRHOIX2.js → droid-BAovZe7o.js} +2 -2
- package/dist/ui/assets/{globalenv-section-Czgnw_GV.js → globalenv-section-CHHZbjD8.js} +1 -1
- package/dist/ui/assets/{health-CXLOMk8n.js → health-Jp7o0exN.js} +1 -1
- package/dist/ui/assets/icons-DfENUzBo.js +1 -0
- package/dist/ui/assets/{index-CvfzKRSH.js → index--j-jJwzV.js} +1 -1
- package/dist/ui/assets/{index-Boa5e-GY.js → index-C5iouJJ2.js} +1 -1
- package/dist/ui/assets/{index-D2v_-6AW.js → index-C5uQdep3.js} +1 -1
- package/dist/ui/assets/{index-BceMcbCR.js → index-CpkWv5tW.js} +1 -1
- package/dist/ui/assets/index-DFifef9c.css +1 -0
- package/dist/ui/assets/index-Du97tqVQ.js +69 -0
- package/dist/ui/assets/index-VluKB6dO.js +1 -0
- package/dist/ui/assets/logs-BDbHSujh.js +1 -0
- package/dist/ui/assets/{masked-input-B1_asiUI.js → masked-input-BcJDHDE6.js} +1 -1
- package/dist/ui/assets/proxy-status-widget-DQWsa532.js +1 -0
- package/dist/ui/assets/{raw-json-settings-editor-panel-DMbTkxWw.js → raw-json-settings-editor-panel-Cbn2O4rk.js} +1 -1
- package/dist/ui/assets/searchable-select-fldXYfY4.js +1 -0
- package/dist/ui/assets/{separator-CdaalG0K.js → separator-Dd3ktLxa.js} +1 -1
- package/dist/ui/assets/{shared-BiFB-et0.js → shared-CdAn8E3x.js} +1 -1
- package/dist/ui/assets/{table-BPwgFXLQ.js → table-CCf__Q_I.js} +1 -1
- package/dist/ui/assets/{tanstack-DWm6aJ-G.js → tanstack-CrmUhA7Z.js} +2 -2
- package/dist/ui/assets/updates-DfoGG8Jl.js +1 -0
- package/dist/ui/index.html +4 -4
- package/dist/utils/hooks/image-analyzer-hook-utils.d.ts +21 -0
- package/dist/utils/hooks/image-analyzer-hook-utils.d.ts.map +1 -0
- package/dist/utils/hooks/image-analyzer-hook-utils.js +81 -0
- package/dist/utils/hooks/image-analyzer-hook-utils.js.map +1 -0
- package/dist/utils/hooks/image-analyzer-profile-hook-injector.d.ts +1 -0
- package/dist/utils/hooks/image-analyzer-profile-hook-injector.d.ts.map +1 -1
- package/dist/utils/hooks/image-analyzer-profile-hook-injector.js +33 -12
- package/dist/utils/hooks/image-analyzer-profile-hook-injector.js.map +1 -1
- package/dist/utils/hooks/index.d.ts +1 -0
- package/dist/utils/hooks/index.d.ts.map +1 -1
- package/dist/utils/hooks/index.js +3 -1
- package/dist/utils/hooks/index.js.map +1 -1
- package/dist/utils/image-analysis/index.d.ts +1 -0
- package/dist/utils/image-analysis/index.d.ts.map +1 -1
- package/dist/utils/image-analysis/index.js +6 -1
- package/dist/utils/image-analysis/index.js.map +1 -1
- package/dist/utils/image-analysis/repair.d.ts +12 -0
- package/dist/utils/image-analysis/repair.d.ts.map +1 -0
- package/dist/utils/image-analysis/repair.js +105 -0
- package/dist/utils/image-analysis/repair.js.map +1 -0
- package/dist/utils/websearch/trace.d.ts.map +1 -1
- package/dist/utils/websearch/trace.js +7 -0
- package/dist/utils/websearch/trace.js.map +1 -1
- package/dist/web-server/index.d.ts.map +1 -1
- package/dist/web-server/index.js +15 -0
- package/dist/web-server/index.js.map +1 -1
- package/dist/web-server/middleware/request-logging-middleware.d.ts +3 -0
- package/dist/web-server/middleware/request-logging-middleware.d.ts.map +1 -0
- package/dist/web-server/middleware/request-logging-middleware.js +30 -0
- package/dist/web-server/middleware/request-logging-middleware.js.map +1 -0
- package/dist/web-server/routes/auth-routes.d.ts +10 -0
- package/dist/web-server/routes/auth-routes.d.ts.map +1 -1
- package/dist/web-server/routes/auth-routes.js +33 -6
- package/dist/web-server/routes/auth-routes.js.map +1 -1
- package/dist/web-server/routes/catalog-routes.js +7 -7
- package/dist/web-server/routes/catalog-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts +8 -0
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.js +63 -74
- package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-routing-routes.d.ts +3 -0
- package/dist/web-server/routes/cliproxy-routing-routes.d.ts.map +1 -0
- package/dist/web-server/routes/cliproxy-routing-routes.js +34 -0
- package/dist/web-server/routes/cliproxy-routing-routes.js.map +1 -0
- package/dist/web-server/routes/image-analysis-routes.d.ts.map +1 -1
- package/dist/web-server/routes/image-analysis-routes.js +1 -10
- package/dist/web-server/routes/image-analysis-routes.js.map +1 -1
- package/dist/web-server/routes/index.d.ts.map +1 -1
- package/dist/web-server/routes/index.js +22 -0
- package/dist/web-server/routes/index.js.map +1 -1
- package/dist/web-server/routes/logs-routes.d.ts +3 -0
- package/dist/web-server/routes/logs-routes.d.ts.map +1 -0
- package/dist/web-server/routes/logs-routes.js +75 -0
- package/dist/web-server/routes/logs-routes.js.map +1 -0
- package/dist/web-server/routes/settings-routes.d.ts.map +1 -1
- package/dist/web-server/routes/settings-routes.js +2 -0
- package/dist/web-server/routes/settings-routes.js.map +1 -1
- package/dist/web-server/services/logs-dashboard-service.d.ts +7 -0
- package/dist/web-server/services/logs-dashboard-service.d.ts.map +1 -0
- package/dist/web-server/services/logs-dashboard-service.js +33 -0
- package/dist/web-server/services/logs-dashboard-service.js.map +1 -0
- package/dist/web-server/usage/routes.d.ts.map +1 -1
- package/dist/web-server/usage/routes.js +11 -0
- package/dist/web-server/usage/routes.js.map +1 -1
- package/dist/web-server/websocket.d.ts.map +1 -1
- package/dist/web-server/websocket.js +23 -14
- package/dist/web-server/websocket.js.map +1 -1
- package/lib/hooks/image-analyzer-transformer.cjs +5 -0
- package/package.json +1 -1
- package/dist/ui/assets/cliproxy-1qRVSbVC.js +0 -3
- package/dist/ui/assets/icons-B9oTjo-t.js +0 -1
- package/dist/ui/assets/index-BMHPMj0j.js +0 -69
- package/dist/ui/assets/index-CknHGRYp.css +0 -1
- package/dist/ui/assets/index-v-DY6Zby.js +0 -1
- package/dist/ui/assets/proxy-status-widget-Ci1JpStj.js +0 -1
- package/dist/ui/assets/searchable-select-HbP2PXl3.js +0 -1
- package/dist/ui/assets/updates-l8Co9uve.js +0 -1
|
@@ -29,9 +29,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
29
29
|
return result;
|
|
30
30
|
};
|
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.ensureTokenValid = exports.displayAuthStatus = exports.registerAccountFromToken = exports.clearAuth = exports.getAllAuthStatus = exports.getAuthStatus = exports.isAuthenticated = exports.isTokenFileForProvider = exports.getProviderTokenDir = void 0;
|
|
32
|
+
exports.ensureTokenValid = exports.displayAuthStatus = exports.registerAccountFromToken = exports.clearAuth = exports.getAllAuthStatus = exports.getAuthStatus = exports.isAuthenticated = exports.findNewTokenSnapshotForAuthAttempt = exports.findNewTokenSnapshot = exports.listProviderTokenSnapshots = exports.isTokenFileForProvider = exports.getProviderTokenDir = void 0;
|
|
33
33
|
const fs = __importStar(require("fs"));
|
|
34
34
|
const path = __importStar(require("path"));
|
|
35
|
+
const crypto_1 = require("crypto");
|
|
35
36
|
const profile_detector_1 = require("../../auth/profile-detector");
|
|
36
37
|
const config_generator_1 = require("../config-generator");
|
|
37
38
|
const account_manager_1 = require("../account-manager");
|
|
@@ -62,6 +63,107 @@ function isTokenFileForProvider(filePath, provider) {
|
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
65
|
exports.isTokenFileForProvider = isTokenFileForProvider;
|
|
66
|
+
function buildTokenFingerprint(content) {
|
|
67
|
+
return (0, crypto_1.createHash)('sha256').update(content).digest('hex');
|
|
68
|
+
}
|
|
69
|
+
function listTokenCandidates(provider, tokenDir) {
|
|
70
|
+
if (!fs.existsSync(tokenDir)) {
|
|
71
|
+
return [];
|
|
72
|
+
}
|
|
73
|
+
const files = fs.readdirSync(tokenDir);
|
|
74
|
+
const jsonFiles = files.filter((file) => file.endsWith('.json'));
|
|
75
|
+
const existingAccounts = (0, account_manager_1.getProviderAccounts)(provider);
|
|
76
|
+
const rawCandidates = jsonFiles.flatMap((file) => {
|
|
77
|
+
const filePath = path.join(tokenDir, file);
|
|
78
|
+
if (!isTokenFileForProvider(filePath, provider)) {
|
|
79
|
+
return [];
|
|
80
|
+
}
|
|
81
|
+
const content = fs.readFileSync(filePath, 'utf-8');
|
|
82
|
+
const data = JSON.parse(content);
|
|
83
|
+
const email = data.email || undefined;
|
|
84
|
+
const projectId = data.project_id || undefined;
|
|
85
|
+
const stats = fs.statSync(filePath);
|
|
86
|
+
return [
|
|
87
|
+
{
|
|
88
|
+
file,
|
|
89
|
+
filePath,
|
|
90
|
+
content,
|
|
91
|
+
email,
|
|
92
|
+
projectId,
|
|
93
|
+
mtimeMs: stats.mtimeMs,
|
|
94
|
+
alreadyRegistered: existingAccounts.some((account) => account.tokenFile === file),
|
|
95
|
+
},
|
|
96
|
+
];
|
|
97
|
+
});
|
|
98
|
+
const duplicateEmailCounts = new Map();
|
|
99
|
+
const duplicateEmailTokenSets = new Map();
|
|
100
|
+
for (const account of existingAccounts) {
|
|
101
|
+
if (!account.email)
|
|
102
|
+
continue;
|
|
103
|
+
const key = account.email.toLowerCase();
|
|
104
|
+
const tokenSet = duplicateEmailTokenSets.get(key) ?? new Set();
|
|
105
|
+
tokenSet.add(account.tokenFile);
|
|
106
|
+
duplicateEmailTokenSets.set(key, tokenSet);
|
|
107
|
+
}
|
|
108
|
+
for (const candidate of rawCandidates) {
|
|
109
|
+
if (!candidate.email)
|
|
110
|
+
continue;
|
|
111
|
+
const key = candidate.email.toLowerCase();
|
|
112
|
+
const tokenSet = duplicateEmailTokenSets.get(key) ?? new Set();
|
|
113
|
+
tokenSet.add(candidate.file);
|
|
114
|
+
duplicateEmailTokenSets.set(key, tokenSet);
|
|
115
|
+
}
|
|
116
|
+
for (const [key, tokenSet] of duplicateEmailTokenSets) {
|
|
117
|
+
duplicateEmailCounts.set(key, tokenSet.size);
|
|
118
|
+
}
|
|
119
|
+
return rawCandidates
|
|
120
|
+
.map((rawCandidate) => {
|
|
121
|
+
const duplicateEmailCount = rawCandidate.email
|
|
122
|
+
? (duplicateEmailCounts.get(rawCandidate.email.toLowerCase()) ?? 1)
|
|
123
|
+
: 1;
|
|
124
|
+
const accountId = rawCandidate.email
|
|
125
|
+
? (0, email_account_identity_1.buildEmailBackedAccountId)(provider, rawCandidate.file, rawCandidate.email, duplicateEmailCount)
|
|
126
|
+
: (0, token_file_ops_1.extractAccountIdFromTokenFile)(rawCandidate.file, rawCandidate.email);
|
|
127
|
+
return {
|
|
128
|
+
...rawCandidate,
|
|
129
|
+
accountId,
|
|
130
|
+
fingerprint: buildTokenFingerprint(rawCandidate.content),
|
|
131
|
+
};
|
|
132
|
+
})
|
|
133
|
+
.sort((left, right) => right.mtimeMs - left.mtimeMs);
|
|
134
|
+
}
|
|
135
|
+
function listProviderTokenSnapshots(provider, tokenDir = getProviderTokenDir(provider)) {
|
|
136
|
+
return listTokenCandidates(provider, tokenDir).map((candidate) => ({
|
|
137
|
+
file: candidate.file,
|
|
138
|
+
mtimeMs: candidate.mtimeMs,
|
|
139
|
+
accountId: candidate.accountId,
|
|
140
|
+
fingerprint: candidate.fingerprint,
|
|
141
|
+
}));
|
|
142
|
+
}
|
|
143
|
+
exports.listProviderTokenSnapshots = listProviderTokenSnapshots;
|
|
144
|
+
function findNewTokenSnapshot(currentTokenFiles, knownTokenFiles, expectedAccountId) {
|
|
145
|
+
const knownSnapshotsByFile = new Map(knownTokenFiles.map((snapshot) => [snapshot.file, snapshot]));
|
|
146
|
+
return (currentTokenFiles.find((snapshot) => {
|
|
147
|
+
const knownSnapshot = knownSnapshotsByFile.get(snapshot.file);
|
|
148
|
+
if (!expectedAccountId) {
|
|
149
|
+
return !knownSnapshot;
|
|
150
|
+
}
|
|
151
|
+
const matchesExpectedAccount = snapshot.file === expectedAccountId || snapshot.accountId === expectedAccountId;
|
|
152
|
+
if (!matchesExpectedAccount) {
|
|
153
|
+
return false;
|
|
154
|
+
}
|
|
155
|
+
if (!knownSnapshot) {
|
|
156
|
+
return true;
|
|
157
|
+
}
|
|
158
|
+
return (snapshot.fingerprint !== knownSnapshot.fingerprint ||
|
|
159
|
+
snapshot.mtimeMs !== knownSnapshot.mtimeMs);
|
|
160
|
+
}) || null);
|
|
161
|
+
}
|
|
162
|
+
exports.findNewTokenSnapshot = findNewTokenSnapshot;
|
|
163
|
+
function findNewTokenSnapshotForAuthAttempt(provider, tokenDir, knownTokenFiles, expectedAccountId) {
|
|
164
|
+
return findNewTokenSnapshot(listProviderTokenSnapshots(provider, tokenDir), knownTokenFiles, expectedAccountId);
|
|
165
|
+
}
|
|
166
|
+
exports.findNewTokenSnapshotForAuthAttempt = findNewTokenSnapshotForAuthAttempt;
|
|
65
167
|
/**
|
|
66
168
|
* Check if provider has valid authentication
|
|
67
169
|
* CLIProxyAPI stores OAuth tokens as JSON files in the auth directory.
|
|
@@ -204,64 +306,8 @@ function registerAccountFromToken(provider, tokenDir, nickname, verbose = false,
|
|
|
204
306
|
const { registerAccount } = require('../account-manager');
|
|
205
307
|
let selectedCandidate = null;
|
|
206
308
|
try {
|
|
207
|
-
const
|
|
208
|
-
const jsonFiles = files.filter((f) => f.endsWith('.json'));
|
|
309
|
+
const candidates = listTokenCandidates(provider, tokenDir);
|
|
209
310
|
const existingAccounts = (0, account_manager_1.getProviderAccounts)(provider);
|
|
210
|
-
const rawCandidates = jsonFiles.flatMap((file) => {
|
|
211
|
-
const filePath = path.join(tokenDir, file);
|
|
212
|
-
if (!isTokenFileForProvider(filePath, provider))
|
|
213
|
-
return [];
|
|
214
|
-
const content = fs.readFileSync(filePath, 'utf-8');
|
|
215
|
-
const data = JSON.parse(content);
|
|
216
|
-
const email = data.email || undefined;
|
|
217
|
-
const projectId = data.project_id || undefined;
|
|
218
|
-
const stats = fs.statSync(filePath);
|
|
219
|
-
return [
|
|
220
|
-
{
|
|
221
|
-
file,
|
|
222
|
-
filePath,
|
|
223
|
-
email,
|
|
224
|
-
projectId,
|
|
225
|
-
mtimeMs: stats.mtimeMs,
|
|
226
|
-
alreadyRegistered: existingAccounts.some((account) => account.tokenFile === file),
|
|
227
|
-
},
|
|
228
|
-
];
|
|
229
|
-
});
|
|
230
|
-
const duplicateEmailCounts = new Map();
|
|
231
|
-
const duplicateEmailTokenSets = new Map();
|
|
232
|
-
for (const account of existingAccounts) {
|
|
233
|
-
if (!account.email)
|
|
234
|
-
continue;
|
|
235
|
-
const key = account.email.toLowerCase();
|
|
236
|
-
const tokenSet = duplicateEmailTokenSets.get(key) ?? new Set();
|
|
237
|
-
tokenSet.add(account.tokenFile);
|
|
238
|
-
duplicateEmailTokenSets.set(key, tokenSet);
|
|
239
|
-
}
|
|
240
|
-
for (const candidate of rawCandidates) {
|
|
241
|
-
if (!candidate.email)
|
|
242
|
-
continue;
|
|
243
|
-
const key = candidate.email.toLowerCase();
|
|
244
|
-
const tokenSet = duplicateEmailTokenSets.get(key) ?? new Set();
|
|
245
|
-
tokenSet.add(candidate.file);
|
|
246
|
-
duplicateEmailTokenSets.set(key, tokenSet);
|
|
247
|
-
}
|
|
248
|
-
for (const [key, tokenSet] of duplicateEmailTokenSets) {
|
|
249
|
-
duplicateEmailCounts.set(key, tokenSet.size);
|
|
250
|
-
}
|
|
251
|
-
const candidates = rawCandidates
|
|
252
|
-
.map((rawCandidate) => {
|
|
253
|
-
const duplicateEmailCount = rawCandidate.email
|
|
254
|
-
? (duplicateEmailCounts.get(rawCandidate.email.toLowerCase()) ?? 1)
|
|
255
|
-
: 1;
|
|
256
|
-
const accountId = rawCandidate.email
|
|
257
|
-
? (0, email_account_identity_1.buildEmailBackedAccountId)(provider, rawCandidate.file, rawCandidate.email, duplicateEmailCount)
|
|
258
|
-
: (0, token_file_ops_1.extractAccountIdFromTokenFile)(rawCandidate.file, rawCandidate.email);
|
|
259
|
-
return {
|
|
260
|
-
...rawCandidate,
|
|
261
|
-
accountId,
|
|
262
|
-
};
|
|
263
|
-
})
|
|
264
|
-
.sort((a, b) => b.mtimeMs - a.mtimeMs);
|
|
265
311
|
if (expectedAccountId) {
|
|
266
312
|
selectedCandidate =
|
|
267
313
|
candidates.find((candidate) => candidate.accountId === expectedAccountId) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../../src/cliproxy/auth/token-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../../src/cliproxy/auth/token-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,6 @@ export declare function sanitizeEmail(email: string): string;
|
|
|
12
12
|
* Check if token is expired based on the expired timestamp.
|
|
13
13
|
* Returns false if timestamp is missing or invalid (fail-open for quota display).
|
|
14
14
|
*/
|
|
15
|
-
export declare function
|
|
15
|
+
export declare function getTokenExpiryTimestamp(expiredValue?: string | number | null): number | null;
|
|
16
|
+
export declare function isTokenExpired(expiredValue?: string | number | null): boolean;
|
|
16
17
|
//# sourceMappingURL=auth-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-utils.d.ts","sourceRoot":"","sources":["../../src/cliproxy/auth-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"auth-utils.d.ts","sourceRoot":"","sources":["../../src/cliproxy/auth-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAmC5F;AAED,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,OAAO,CAG7E"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* Common functions for OAuth token handling across quota fetchers.
|
|
6
6
|
*/
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
-
exports.isTokenExpired = exports.sanitizeEmail = void 0;
|
|
8
|
+
exports.isTokenExpired = exports.getTokenExpiryTimestamp = exports.sanitizeEmail = void 0;
|
|
9
9
|
/**
|
|
10
10
|
* Sanitize email to match CLIProxyAPI auth file naming convention.
|
|
11
11
|
* Replaces @ and . with underscores for filesystem compatibility.
|
|
@@ -18,16 +18,41 @@ exports.sanitizeEmail = sanitizeEmail;
|
|
|
18
18
|
* Check if token is expired based on the expired timestamp.
|
|
19
19
|
* Returns false if timestamp is missing or invalid (fail-open for quota display).
|
|
20
20
|
*/
|
|
21
|
-
function
|
|
22
|
-
if (
|
|
23
|
-
return
|
|
21
|
+
function getTokenExpiryTimestamp(expiredValue) {
|
|
22
|
+
if (expiredValue === undefined || expiredValue === null || expiredValue === '') {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
const normalizeNumericTimestamp = (value) => {
|
|
26
|
+
if (!Number.isFinite(value) || value <= 0) {
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
// Support Unix seconds from older token stores while preserving millisecond timestamps.
|
|
30
|
+
return value < 1000000000000 ? value * 1000 : value;
|
|
31
|
+
};
|
|
24
32
|
try {
|
|
25
|
-
|
|
26
|
-
|
|
33
|
+
if (typeof expiredValue === 'number') {
|
|
34
|
+
return normalizeNumericTimestamp(expiredValue);
|
|
35
|
+
}
|
|
36
|
+
const trimmed = expiredValue.trim();
|
|
37
|
+
if (!trimmed) {
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
if (/^\d+$/.test(trimmed)) {
|
|
41
|
+
const numericTimestamp = Number(trimmed);
|
|
42
|
+
return normalizeNumericTimestamp(numericTimestamp);
|
|
43
|
+
}
|
|
44
|
+
const expiredDate = new Date(trimmed);
|
|
45
|
+
const expiredAt = expiredDate.getTime();
|
|
46
|
+
return Number.isNaN(expiredAt) ? null : expiredAt;
|
|
27
47
|
}
|
|
28
48
|
catch {
|
|
29
|
-
return
|
|
49
|
+
return null;
|
|
30
50
|
}
|
|
31
51
|
}
|
|
52
|
+
exports.getTokenExpiryTimestamp = getTokenExpiryTimestamp;
|
|
53
|
+
function isTokenExpired(expiredValue) {
|
|
54
|
+
const expiredAt = getTokenExpiryTimestamp(expiredValue);
|
|
55
|
+
return expiredAt !== null ? expiredAt < Date.now() : false;
|
|
56
|
+
}
|
|
32
57
|
exports.isTokenExpired = isTokenExpired;
|
|
33
58
|
//# sourceMappingURL=auth-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../src/cliproxy/auth-utils.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH;;;GAGG;AACH,SAAgB,aAAa,CAAC,KAAa;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC;AAFD,sCAEC;AAED;;;GAGG;AACH,SAAgB,
|
|
1
|
+
{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../src/cliproxy/auth-utils.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH;;;GAGG;AACH,SAAgB,aAAa,CAAC,KAAa;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC;AAFD,sCAEC;AAED;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,YAAqC;IAC3E,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,yBAAyB,GAAG,CAAC,KAAa,EAAiB,EAAE;QACjE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,wFAAwF;QACxF,OAAO,KAAK,GAAG,aAAiB,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAC1D,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,yBAAyB,CAAC,YAAY,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YACzC,OAAO,yBAAyB,CAAC,gBAAgB,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;QACxC,OAAO,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAnCD,0DAmCC;AAED,SAAgB,cAAc,CAAC,YAAqC;IAClE,MAAM,SAAS,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACxD,OAAO,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7D,CAAC;AAHD,wCAGC"}
|
|
@@ -10,6 +10,12 @@ interface CatalogCacheData {
|
|
|
10
10
|
export declare const PROVIDER_TO_CHANNEL: Record<string, string>;
|
|
11
11
|
/** Providers to sync from CLIProxyAPI */
|
|
12
12
|
export declare const SYNCABLE_PROVIDERS: CLIProxyProvider[];
|
|
13
|
+
export type CatalogSource = 'live' | 'cache' | 'static';
|
|
14
|
+
export interface ResolvedCatalogSnapshot {
|
|
15
|
+
catalogs: Partial<Record<CLIProxyProvider, ProviderCatalog>>;
|
|
16
|
+
source: CatalogSource;
|
|
17
|
+
cacheAge: string | null;
|
|
18
|
+
}
|
|
13
19
|
/** Read cached catalog data, null if expired or missing */
|
|
14
20
|
export declare function getCachedCatalog(): CatalogCacheData | null;
|
|
15
21
|
/** Save catalog data to cache */
|
|
@@ -18,12 +24,13 @@ export declare function setCachedCatalog(providers: Record<string, RemoteModelIn
|
|
|
18
24
|
export declare function clearCatalogCache(): boolean;
|
|
19
25
|
/** Get cache age in human-readable format, or null if no cache */
|
|
20
26
|
export declare function getCacheAge(): string | null;
|
|
27
|
+
export declare function refreshCatalogFromProxy(): Promise<Record<string, RemoteModelInfo[]> | null>;
|
|
21
28
|
/**
|
|
22
29
|
* Merge remote models with static catalog for a provider.
|
|
23
30
|
* Remote fields override static where present.
|
|
24
31
|
* Static-only fields preserved: broken, deprecated, deprecationReason, issueUrl, tier.
|
|
25
|
-
* Models in static but not in remote → kept.
|
|
26
32
|
* Models in remote but not in static → added.
|
|
33
|
+
* Models removed upstream stay hidden; UI falls back to static only when live data is unavailable.
|
|
27
34
|
*/
|
|
28
35
|
export declare function mergeCatalog(provider: CLIProxyProvider, remoteModels: RemoteModelInfo[]): ProviderCatalog | undefined;
|
|
29
36
|
/**
|
|
@@ -35,5 +42,6 @@ export declare function getResolvedCatalog(provider: CLIProxyProvider): Provider
|
|
|
35
42
|
* Get all resolved catalogs (for Dashboard).
|
|
36
43
|
*/
|
|
37
44
|
export declare function getAllResolvedCatalogs(): Partial<Record<CLIProxyProvider, ProviderCatalog>>;
|
|
45
|
+
export declare function getResolvedCatalogSnapshot(): Promise<ResolvedCatalogSnapshot>;
|
|
38
46
|
export {};
|
|
39
47
|
//# sourceMappingURL=catalog-cache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-cache.d.ts","sourceRoot":"","sources":["../../src/cliproxy/catalog-cache.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,KAAK,EAAc,eAAe,EAAmB,MAAM,iBAAiB,CAAC;AAEpF,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"catalog-cache.d.ts","sourceRoot":"","sources":["../../src/cliproxy/catalog-cache.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,KAAK,EAAc,eAAe,EAAmB,MAAM,iBAAiB,CAAC;AAEpF,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAQhC,qCAAqC;AACrC,UAAU,gBAAgB;IACxB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAC;CACnB;AAeD,oDAAoD;AACpD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAEtD,CAAC;AAEF,yCAAyC;AACzC,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAE1B,CAAC;AAExB,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAExD,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAAC;IAC7D,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAMD,2DAA2D;AAC3D,wBAAgB,gBAAgB,IAAI,gBAAgB,GAAG,IAAI,CAU1D;AAED,iCAAiC;AACjC,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,GAAG,IAAI,CASnF;AAED,wBAAwB;AACxB,wBAAgB,iBAAiB,IAAI,OAAO,CAW3C;AAED,kEAAkE;AAClE,wBAAgB,WAAW,IAAI,MAAM,GAAG,IAAI,CAa3C;AAqDD,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,GAAG,IAAI,CAAC,CAkBjG;AAyCD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,eAAe,EAAE,GAC9B,eAAe,GAAG,SAAS,CAqD7B;AAsCD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,eAAe,GAAG,SAAS,CAM1F;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,CAG3F;AAED,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAwBnF"}
|
|
@@ -23,14 +23,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.getAllResolvedCatalogs = exports.getResolvedCatalog = exports.mergeCatalog = exports.getCacheAge = exports.clearCatalogCache = exports.setCachedCatalog = exports.getCachedCatalog = exports.SYNCABLE_PROVIDERS = exports.PROVIDER_TO_CHANNEL = void 0;
|
|
26
|
+
exports.getResolvedCatalogSnapshot = exports.getAllResolvedCatalogs = exports.getResolvedCatalog = exports.mergeCatalog = exports.refreshCatalogFromProxy = exports.getCacheAge = exports.clearCatalogCache = exports.setCachedCatalog = exports.getCachedCatalog = exports.SYNCABLE_PROVIDERS = exports.PROVIDER_TO_CHANNEL = void 0;
|
|
27
27
|
const fs = __importStar(require("fs"));
|
|
28
28
|
const path = __importStar(require("path"));
|
|
29
29
|
const config_manager_1 = require("../utils/config-manager");
|
|
30
30
|
const model_catalog_1 = require("./model-catalog");
|
|
31
31
|
const model_id_normalizer_1 = require("./model-id-normalizer");
|
|
32
|
+
const proxy_target_resolver_1 = require("./proxy-target-resolver");
|
|
32
33
|
const CACHE_FILE_NAME = 'model-catalog-cache.json';
|
|
33
34
|
const CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
|
|
35
|
+
const LIVE_FETCH_TIMEOUT_MS = 3000;
|
|
34
36
|
/** Channel name → CCS provider mapping */
|
|
35
37
|
const CHANNEL_TO_PROVIDER = {
|
|
36
38
|
antigravity: 'agy',
|
|
@@ -40,11 +42,15 @@ const CHANNEL_TO_PROVIDER = {
|
|
|
40
42
|
qwen: 'qwen',
|
|
41
43
|
iflow: 'iflow',
|
|
42
44
|
kimi: 'kimi',
|
|
45
|
+
kiro: 'kiro',
|
|
46
|
+
'github-copilot': 'ghcp',
|
|
43
47
|
};
|
|
44
48
|
/** CCS provider → channel name mapping (reverse) */
|
|
45
49
|
exports.PROVIDER_TO_CHANNEL = Object.fromEntries(Object.entries(CHANNEL_TO_PROVIDER).map(([k, v]) => [v, k]));
|
|
46
50
|
/** Providers to sync from CLIProxyAPI */
|
|
47
|
-
exports.SYNCABLE_PROVIDERS = [
|
|
51
|
+
exports.SYNCABLE_PROVIDERS = [
|
|
52
|
+
...new Set(Object.values(CHANNEL_TO_PROVIDER)),
|
|
53
|
+
];
|
|
48
54
|
function getCacheFilePath() {
|
|
49
55
|
return path.join((0, config_manager_1.getCcsDir)(), CACHE_FILE_NAME);
|
|
50
56
|
}
|
|
@@ -112,6 +118,62 @@ function getCacheAge() {
|
|
|
112
118
|
}
|
|
113
119
|
}
|
|
114
120
|
exports.getCacheAge = getCacheAge;
|
|
121
|
+
async function fetchProviderCatalog(provider) {
|
|
122
|
+
const channel = exports.PROVIDER_TO_CHANNEL[provider];
|
|
123
|
+
if (!channel) {
|
|
124
|
+
return [provider, null];
|
|
125
|
+
}
|
|
126
|
+
const controller = new AbortController();
|
|
127
|
+
const timeoutId = setTimeout(() => controller.abort(), LIVE_FETCH_TIMEOUT_MS);
|
|
128
|
+
try {
|
|
129
|
+
const target = (0, proxy_target_resolver_1.getProxyTarget)();
|
|
130
|
+
const response = await fetch((0, proxy_target_resolver_1.buildProxyUrl)(target, `/v0/management/model-definitions/${channel}`), {
|
|
131
|
+
signal: controller.signal,
|
|
132
|
+
headers: (0, proxy_target_resolver_1.buildManagementHeaders)(target),
|
|
133
|
+
});
|
|
134
|
+
if (!response.ok) {
|
|
135
|
+
return [provider, null];
|
|
136
|
+
}
|
|
137
|
+
const data = (await response.json());
|
|
138
|
+
return [provider, Array.isArray(data.models) ? data.models : null];
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
return [provider, null];
|
|
142
|
+
}
|
|
143
|
+
finally {
|
|
144
|
+
clearTimeout(timeoutId);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
async function isProxyCatalogReachable() {
|
|
148
|
+
const controller = new AbortController();
|
|
149
|
+
const timeoutId = setTimeout(() => controller.abort(), 1000);
|
|
150
|
+
try {
|
|
151
|
+
const target = (0, proxy_target_resolver_1.getProxyTarget)();
|
|
152
|
+
const response = await fetch((0, proxy_target_resolver_1.buildProxyUrl)(target, '/'), {
|
|
153
|
+
signal: controller.signal,
|
|
154
|
+
});
|
|
155
|
+
return response.ok;
|
|
156
|
+
}
|
|
157
|
+
catch {
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
160
|
+
finally {
|
|
161
|
+
clearTimeout(timeoutId);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
async function refreshCatalogFromProxy() {
|
|
165
|
+
if (!(await isProxyCatalogReachable())) {
|
|
166
|
+
return null;
|
|
167
|
+
}
|
|
168
|
+
const settled = await Promise.all(exports.SYNCABLE_PROVIDERS.map((provider) => fetchProviderCatalog(provider)));
|
|
169
|
+
const providers = Object.fromEntries(settled.filter(([, models]) => Array.isArray(models) && models.length > 0));
|
|
170
|
+
if (Object.keys(providers).length === 0) {
|
|
171
|
+
return null;
|
|
172
|
+
}
|
|
173
|
+
setCachedCatalog(providers);
|
|
174
|
+
return providers;
|
|
175
|
+
}
|
|
176
|
+
exports.refreshCatalogFromProxy = refreshCatalogFromProxy;
|
|
115
177
|
/** Map remote thinking support to CCS ThinkingSupport */
|
|
116
178
|
function mapThinking(remote) {
|
|
117
179
|
if (!remote)
|
|
@@ -156,8 +218,8 @@ function mapRemoteToModelEntry(remote) {
|
|
|
156
218
|
* Merge remote models with static catalog for a provider.
|
|
157
219
|
* Remote fields override static where present.
|
|
158
220
|
* Static-only fields preserved: broken, deprecated, deprecationReason, issueUrl, tier.
|
|
159
|
-
* Models in static but not in remote → kept.
|
|
160
221
|
* Models in remote but not in static → added.
|
|
222
|
+
* Models removed upstream stay hidden; UI falls back to static only when live data is unavailable.
|
|
161
223
|
*/
|
|
162
224
|
function mergeCatalog(provider, remoteModels) {
|
|
163
225
|
const filteredRemoteModels = provider === 'agy'
|
|
@@ -198,17 +260,6 @@ function mergeCatalog(provider, remoteModels) {
|
|
|
198
260
|
mergedModels.push(remoteEntry);
|
|
199
261
|
}
|
|
200
262
|
}
|
|
201
|
-
// Add static-only models not in remote
|
|
202
|
-
if (staticCatalog) {
|
|
203
|
-
for (const model of staticCatalog.models) {
|
|
204
|
-
if ((0, model_id_normalizer_1.getDeniedModelIdReasonForProvider)(model.id, provider)) {
|
|
205
|
-
continue;
|
|
206
|
-
}
|
|
207
|
-
if (!mergedIds.has(model.id.toLowerCase())) {
|
|
208
|
-
mergedModels.push(model);
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
263
|
return {
|
|
213
264
|
provider,
|
|
214
265
|
displayName,
|
|
@@ -217,6 +268,31 @@ function mergeCatalog(provider, remoteModels) {
|
|
|
217
268
|
};
|
|
218
269
|
}
|
|
219
270
|
exports.mergeCatalog = mergeCatalog;
|
|
271
|
+
function getResolvedCatalogFromProviders(provider, providers) {
|
|
272
|
+
if (providers?.[provider]) {
|
|
273
|
+
return mergeCatalog(provider, providers[provider]);
|
|
274
|
+
}
|
|
275
|
+
return model_catalog_1.MODEL_CATALOG[provider];
|
|
276
|
+
}
|
|
277
|
+
function getAllResolvedCatalogsFromProviders(providers) {
|
|
278
|
+
const result = {};
|
|
279
|
+
const providerIds = new Set();
|
|
280
|
+
for (const provider of Object.keys(model_catalog_1.MODEL_CATALOG)) {
|
|
281
|
+
providerIds.add(provider);
|
|
282
|
+
}
|
|
283
|
+
if (providers) {
|
|
284
|
+
for (const provider of Object.keys(providers)) {
|
|
285
|
+
providerIds.add(provider);
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
for (const provider of providerIds) {
|
|
289
|
+
const catalog = getResolvedCatalogFromProviders(provider, providers);
|
|
290
|
+
if (catalog) {
|
|
291
|
+
result[provider] = catalog;
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
return result;
|
|
295
|
+
}
|
|
220
296
|
/**
|
|
221
297
|
* Get resolved catalog for a provider.
|
|
222
298
|
* Uses cached remote data if available, falls back to static.
|
|
@@ -233,22 +309,32 @@ exports.getResolvedCatalog = getResolvedCatalog;
|
|
|
233
309
|
* Get all resolved catalogs (for Dashboard).
|
|
234
310
|
*/
|
|
235
311
|
function getAllResolvedCatalogs() {
|
|
236
|
-
const result = {};
|
|
237
312
|
const cached = getCachedCatalog();
|
|
238
|
-
|
|
239
|
-
const providers = new Set();
|
|
240
|
-
for (const p of Object.keys(model_catalog_1.MODEL_CATALOG))
|
|
241
|
-
providers.add(p);
|
|
242
|
-
if (cached) {
|
|
243
|
-
for (const p of Object.keys(cached.providers))
|
|
244
|
-
providers.add(p);
|
|
245
|
-
}
|
|
246
|
-
for (const provider of providers) {
|
|
247
|
-
const catalog = getResolvedCatalog(provider);
|
|
248
|
-
if (catalog)
|
|
249
|
-
result[provider] = catalog;
|
|
250
|
-
}
|
|
251
|
-
return result;
|
|
313
|
+
return getAllResolvedCatalogsFromProviders(cached?.providers);
|
|
252
314
|
}
|
|
253
315
|
exports.getAllResolvedCatalogs = getAllResolvedCatalogs;
|
|
316
|
+
async function getResolvedCatalogSnapshot() {
|
|
317
|
+
const liveProviders = await refreshCatalogFromProxy();
|
|
318
|
+
if (liveProviders) {
|
|
319
|
+
return {
|
|
320
|
+
catalogs: getAllResolvedCatalogsFromProviders(liveProviders),
|
|
321
|
+
source: 'live',
|
|
322
|
+
cacheAge: getCacheAge(),
|
|
323
|
+
};
|
|
324
|
+
}
|
|
325
|
+
const cached = getCachedCatalog();
|
|
326
|
+
if (cached?.providers) {
|
|
327
|
+
return {
|
|
328
|
+
catalogs: getAllResolvedCatalogsFromProviders(cached.providers),
|
|
329
|
+
source: 'cache',
|
|
330
|
+
cacheAge: getCacheAge(),
|
|
331
|
+
};
|
|
332
|
+
}
|
|
333
|
+
return {
|
|
334
|
+
catalogs: getAllResolvedCatalogsFromProviders(),
|
|
335
|
+
source: 'static',
|
|
336
|
+
cacheAge: null,
|
|
337
|
+
};
|
|
338
|
+
}
|
|
339
|
+
exports.getResolvedCatalogSnapshot = getResolvedCatalogSnapshot;
|
|
254
340
|
//# sourceMappingURL=catalog-cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-cache.js","sourceRoot":"","sources":["../../src/cliproxy/catalog-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,4DAAoD;AAGpD,mDAAgD;
|
|
1
|
+
{"version":3,"file":"catalog-cache.js","sourceRoot":"","sources":["../../src/cliproxy/catalog-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,6 @@ export declare function resolveRuntimeCodexFallbackModel(options: {
|
|
|
31
31
|
excludeModels?: string[];
|
|
32
32
|
}): string | null;
|
|
33
33
|
export declare function reconcileCodexModelForActivePlan(options: {
|
|
34
|
-
settingsPath: string;
|
|
35
34
|
currentModel: string | undefined;
|
|
36
35
|
verbose: boolean;
|
|
37
36
|
}, deps?: CodexPlanCompatibilityDeps): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-plan-compatibility.d.ts","sourceRoot":"","sources":["../../src/cliproxy/codex-plan-compatibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-plan-compatibility.d.ts","sourceRoot":"","sources":["../../src/cliproxy/codex-plan-compatibility.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAiBzD,MAAM,WAAW,4BAA4B;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,UAAU,0BAA0B;IAClC,iBAAiB,CAAC,EAAE,OAAO,iBAAiB,CAAC;IAC7C,eAAe,CAAC,EAAE,OAAO,eAAe,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,IAAI,CAAC;CAC1B;AAUD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ3D;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE1E;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,YAAY,EAAE,MAAM,GACnB,0BAA0B,GAAG,IAAI,CAwBnC;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE;IACxD,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,4BAA4B,CAAC;IACvC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,GAAG,MAAM,GAAG,IAAI,CAiChB;AAED,wBAAsB,gCAAgC,CACpD,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;CAClB,EACD,IAAI,GAAE,0BAA+B,GACpC,OAAO,CAAC,IAAI,CAAC,CAiDf"}
|