@kaitranntt/ccs 7.79.1-dev.3 → 7.79.1-dev.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -11
- package/dist/bin/ccsxp-runtime.d.ts.map +1 -1
- package/dist/bin/ccsxp-runtime.js +8 -0
- package/dist/bin/ccsxp-runtime.js.map +1 -1
- package/dist/bin/codex-runtime-router.d.ts +24 -0
- package/dist/bin/codex-runtime-router.d.ts.map +1 -0
- package/dist/bin/codex-runtime-router.js +91 -0
- package/dist/bin/codex-runtime-router.js.map +1 -0
- package/dist/bin/codex-runtime.d.ts +1 -0
- package/dist/bin/codex-runtime.js +7 -2
- package/dist/bin/codex-runtime.js.map +1 -1
- package/dist/ccs.js +2 -1
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js +2 -2
- package/dist/cliproxy/ai-providers/codex-plan-compatibility.js.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts +2 -2
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js +16 -8
- package/dist/cliproxy/ai-providers/codex-reasoning-proxy.js.map +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.js +1 -1
- package/dist/cliproxy/ai-providers/model-id-normalizer.js.map +1 -1
- package/dist/cliproxy/ai-providers/service.d.ts.map +1 -1
- package/dist/cliproxy/ai-providers/service.js +39 -12
- package/dist/cliproxy/ai-providers/service.js.map +1 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.js +9 -1
- package/dist/cliproxy/auth/oauth-trace/redactor.js.map +1 -1
- package/dist/cliproxy/config/thinking-config.js +6 -6
- package/dist/cliproxy/config/thinking-config.js.map +1 -1
- package/dist/cliproxy/executor/env-resolver.js +1 -1
- package/dist/cliproxy/executor/env-resolver.js.map +1 -1
- package/dist/cliproxy/quota/quota-fetcher-claude.d.ts.map +1 -1
- package/dist/cliproxy/quota/quota-fetcher-claude.js +35 -4
- package/dist/cliproxy/quota/quota-fetcher-claude.js.map +1 -1
- package/dist/cliproxy/services/oauth-usage-log-transformer.d.ts.map +1 -1
- package/dist/cliproxy/services/oauth-usage-log-transformer.js +5 -0
- package/dist/cliproxy/services/oauth-usage-log-transformer.js.map +1 -1
- package/dist/codex-auth/codex-account-identity.d.ts +8 -0
- package/dist/codex-auth/codex-account-identity.d.ts.map +1 -0
- package/dist/codex-auth/codex-account-identity.js +53 -0
- package/dist/codex-auth/codex-account-identity.js.map +1 -0
- package/dist/codex-auth/codex-auth-dashboard-service.d.ts +46 -0
- package/dist/codex-auth/codex-auth-dashboard-service.d.ts.map +1 -0
- package/dist/codex-auth/codex-auth-dashboard-service.js +228 -0
- package/dist/codex-auth/codex-auth-dashboard-service.js.map +1 -0
- package/dist/codex-auth/codex-auth-help.d.ts +7 -0
- package/dist/codex-auth/codex-auth-help.d.ts.map +1 -0
- package/dist/codex-auth/codex-auth-help.js +87 -0
- package/dist/codex-auth/codex-auth-help.js.map +1 -0
- package/dist/codex-auth/codex-auth-router.d.ts +16 -0
- package/dist/codex-auth/codex-auth-router.d.ts.map +1 -0
- package/dist/codex-auth/codex-auth-router.js +77 -0
- package/dist/codex-auth/codex-auth-router.js.map +1 -0
- package/dist/codex-auth/codex-config-symlink.d.ts +14 -0
- package/dist/codex-auth/codex-config-symlink.d.ts.map +1 -0
- package/dist/codex-auth/codex-config-symlink.js +128 -0
- package/dist/codex-auth/codex-config-symlink.js.map +1 -0
- package/dist/codex-auth/codex-profile-paths.d.ts +5 -0
- package/dist/codex-auth/codex-profile-paths.d.ts.map +1 -0
- package/dist/codex-auth/codex-profile-paths.js +58 -0
- package/dist/codex-auth/codex-profile-paths.js.map +1 -0
- package/dist/codex-auth/codex-profile-registry.d.ts +34 -0
- package/dist/codex-auth/codex-profile-registry.d.ts.map +1 -0
- package/dist/codex-auth/codex-profile-registry.js +360 -0
- package/dist/codex-auth/codex-profile-registry.js.map +1 -0
- package/dist/codex-auth/commands/create-command.d.ts +9 -0
- package/dist/codex-auth/commands/create-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/create-command.js +189 -0
- package/dist/codex-auth/commands/create-command.js.map +1 -0
- package/dist/codex-auth/commands/import-default-command.d.ts +18 -0
- package/dist/codex-auth/commands/import-default-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/import-default-command.js +385 -0
- package/dist/codex-auth/commands/import-default-command.js.map +1 -0
- package/dist/codex-auth/commands/index.d.ts +13 -0
- package/dist/codex-auth/commands/index.d.ts.map +1 -0
- package/dist/codex-auth/commands/index.js +27 -0
- package/dist/codex-auth/commands/index.js.map +1 -0
- package/dist/codex-auth/commands/login-command.d.ts +9 -0
- package/dist/codex-auth/commands/login-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/login-command.js +152 -0
- package/dist/codex-auth/commands/login-command.js.map +1 -0
- package/dist/codex-auth/commands/remove-command.d.ts +10 -0
- package/dist/codex-auth/commands/remove-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/remove-command.js +230 -0
- package/dist/codex-auth/commands/remove-command.js.map +1 -0
- package/dist/codex-auth/commands/show-command.d.ts +10 -0
- package/dist/codex-auth/commands/show-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/show-command.js +127 -0
- package/dist/codex-auth/commands/show-command.js.map +1 -0
- package/dist/codex-auth/commands/show-detail-view.d.ts +7 -0
- package/dist/codex-auth/commands/show-detail-view.d.ts.map +1 -0
- package/dist/codex-auth/commands/show-detail-view.js +134 -0
- package/dist/codex-auth/commands/show-detail-view.js.map +1 -0
- package/dist/codex-auth/commands/switch-command.d.ts +7 -0
- package/dist/codex-auth/commands/switch-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/switch-command.js +48 -0
- package/dist/codex-auth/commands/switch-command.js.map +1 -0
- package/dist/codex-auth/commands/types.d.ts +45 -0
- package/dist/codex-auth/commands/types.d.ts.map +1 -0
- package/dist/codex-auth/commands/types.js +85 -0
- package/dist/codex-auth/commands/types.js.map +1 -0
- package/dist/codex-auth/commands/use-command.d.ts +16 -0
- package/dist/codex-auth/commands/use-command.d.ts.map +1 -0
- package/dist/codex-auth/commands/use-command.js +86 -0
- package/dist/codex-auth/commands/use-command.js.map +1 -0
- package/dist/codex-auth/decode-id-token.d.ts +12 -0
- package/dist/codex-auth/decode-id-token.d.ts.map +1 -0
- package/dist/codex-auth/decode-id-token.js +83 -0
- package/dist/codex-auth/decode-id-token.js.map +1 -0
- package/dist/codex-auth/index.d.ts +8 -0
- package/dist/codex-auth/index.d.ts.map +1 -0
- package/dist/codex-auth/index.js +19 -0
- package/dist/codex-auth/index.js.map +1 -0
- package/dist/codex-auth/resolve-active-profile.d.ts +13 -0
- package/dist/codex-auth/resolve-active-profile.d.ts.map +1 -0
- package/dist/codex-auth/resolve-active-profile.js +161 -0
- package/dist/codex-auth/resolve-active-profile.js.map +1 -0
- package/dist/codex-auth/shell-detect.d.ts +19 -0
- package/dist/codex-auth/shell-detect.d.ts.map +1 -0
- package/dist/codex-auth/shell-detect.js +129 -0
- package/dist/codex-auth/shell-detect.js.map +1 -0
- package/dist/codex-auth/types.d.ts +26 -0
- package/dist/codex-auth/types.d.ts.map +1 -0
- package/dist/codex-auth/types.js +34 -0
- package/dist/codex-auth/types.js.map +1 -0
- package/dist/commands/cliproxy/variant-subcommand.js +1 -1
- package/dist/commands/cliproxy/variant-subcommand.js.map +1 -1
- package/dist/commands/config-command.d.ts +2 -0
- package/dist/commands/config-command.d.ts.map +1 -1
- package/dist/commands/config-command.js +31 -20
- package/dist/commands/config-command.js.map +1 -1
- package/dist/commands/persist-command.d.ts.map +1 -1
- package/dist/commands/persist-command.js +77 -5
- package/dist/commands/persist-command.js.map +1 -1
- package/dist/dispatcher/cli-argument-parser.d.ts +3 -2
- package/dist/dispatcher/cli-argument-parser.d.ts.map +1 -1
- package/dist/dispatcher/cli-argument-parser.js +37 -7
- package/dist/dispatcher/cli-argument-parser.js.map +1 -1
- package/dist/dispatcher/pre-dispatch.d.ts.map +1 -1
- package/dist/dispatcher/pre-dispatch.js +7 -0
- package/dist/dispatcher/pre-dispatch.js.map +1 -1
- package/dist/dispatcher/target-executor.d.ts +2 -2
- package/dist/dispatcher/target-executor.d.ts.map +1 -1
- package/dist/dispatcher/target-executor.js +5 -5
- package/dist/dispatcher/target-executor.js.map +1 -1
- package/dist/docker/docker-bootstrap.d.ts +1 -1
- package/dist/docker/docker-bootstrap.d.ts.map +1 -1
- package/dist/docker/docker-bootstrap.js +30 -3
- package/dist/docker/docker-bootstrap.js.map +1 -1
- package/dist/docker/docker-executor.d.ts.map +1 -1
- package/dist/docker/docker-executor.js +1 -0
- package/dist/docker/docker-executor.js.map +1 -1
- package/dist/management/checks/config-check.d.ts.map +1 -1
- package/dist/management/checks/config-check.js +10 -1
- package/dist/management/checks/config-check.js.map +1 -1
- package/dist/proxy/proxy-daemon.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon.js +15 -3
- package/dist/proxy/proxy-daemon.js.map +1 -1
- package/dist/proxy/server/messages-route.d.ts.map +1 -1
- package/dist/proxy/server/messages-route.js +27 -1
- package/dist/proxy/server/messages-route.js.map +1 -1
- package/dist/shared/claude-extension-setup.d.ts.map +1 -1
- package/dist/shared/claude-extension-setup.js +21 -1
- package/dist/shared/claude-extension-setup.js.map +1 -1
- package/dist/shared/stale-codex-translator-settings.d.ts +4 -0
- package/dist/shared/stale-codex-translator-settings.d.ts.map +1 -0
- package/dist/shared/stale-codex-translator-settings.js +35 -0
- package/dist/shared/stale-codex-translator-settings.js.map +1 -0
- package/dist/targets/codex-cliproxy-provider-config.d.ts.map +1 -1
- package/dist/targets/codex-cliproxy-provider-config.js +17 -13
- package/dist/targets/codex-cliproxy-provider-config.js.map +1 -1
- package/dist/ui/assets/Trans-dEd8UC39.js +1 -0
- package/dist/ui/assets/{accounts-C-sOjvWS.js → accounts-B2THsSu_.js} +1 -1
- package/dist/ui/assets/{alert-dialog-BrOo6Lh3.js → alert-dialog-Vurq1xzV.js} +1 -1
- package/dist/ui/assets/{api-CXdC3ABc.js → api-CjLfG9mL.js} +1 -1
- package/dist/ui/assets/{auth-section-XJ5PohAT.js → auth-section-iGkrMaT4.js} +1 -1
- package/dist/ui/assets/{backups-section-DjMi9NN5.js → backups-section-DUGG_4KP.js} +1 -1
- package/dist/ui/assets/{channels-dD6o7KFj.js → channels-CimlCc2d.js} +1 -1
- package/dist/ui/assets/{checkbox-CVS69doq.js → checkbox-HiMHasEB.js} +1 -1
- package/dist/ui/assets/claude-extension-B2v9bsN9.js +1 -0
- package/dist/ui/assets/{cliproxy-ai-providers-POOrpQVc.js → cliproxy-ai-providers-2lI5jSHb.js} +6 -6
- package/dist/ui/assets/{cliproxy-control-panel-BWa_KiNM.js → cliproxy-control-panel-63gDI-e5.js} +1 -1
- package/dist/ui/assets/cliproxy-fai69Vyd.js +4 -0
- package/dist/ui/assets/codex-i_hfI4Tv.js +30 -0
- package/dist/ui/assets/{confirm-dialog-BuxHs897.js → confirm-dialog-B_6SrSxL.js} +1 -1
- package/dist/ui/assets/{copilot-BQ4Cltbo.js → copilot-BgG5x_X6.js} +2 -2
- package/dist/ui/assets/{cursor-BVUNUVux.js → cursor-DF63lFcy.js} +1 -1
- package/dist/ui/assets/droid-CqlQmFtN.js +2 -0
- package/dist/ui/assets/{globalenv-section-B4UDGHiP.js → globalenv-section-CYNmD12i.js} +1 -1
- package/dist/ui/assets/{health-30TwUdp_.js → health-7ZO5PEm9.js} +1 -1
- package/dist/ui/assets/{index-BxIFAuoV.js → index-BC5ssPfF.js} +1 -1
- package/dist/ui/assets/index-BMoGhs28.css +1 -0
- package/dist/ui/assets/{index-ByGCSVsI.js → index-Bgcd4FYK.js} +1 -1
- package/dist/ui/assets/{index-BjQ5PWH7.js → index-CFu0saCM.js} +1 -1
- package/dist/ui/assets/index-CqsmdQoA.js +1 -0
- package/dist/ui/assets/index-D3kxCuJ7.js +1 -0
- package/dist/ui/assets/{index-C6j8gpEb.js → index-DmV9wJET.js} +27 -27
- package/dist/ui/assets/{index-BUBCzEHD.js → index-hHb9o079.js} +1 -1
- package/dist/ui/assets/{logs-CDD_WQvt.js → logs-Dy-yZhIK.js} +1 -1
- package/dist/ui/assets/{masked-input-DpM1vKP_.js → masked-input-BSLeznEs.js} +1 -1
- package/dist/ui/assets/proxy-status-widget-hRH1agF9.js +1 -0
- package/dist/ui/assets/{raw-json-settings-editor-panel-D-zQkcvr.js → raw-json-settings-editor-panel-Bs83yILR.js} +1 -1
- package/dist/ui/assets/{searchable-select-B8Kp0x8p.js → searchable-select-pXUC_0Ih.js} +1 -1
- package/dist/ui/assets/{separator-DlXQBF83.js → separator-FZR_61I9.js} +1 -1
- package/dist/ui/assets/{shared-D_h3QKy6.js → shared-BiIwM7--.js} +1 -1
- package/dist/ui/assets/{table-Dyt0FuBK.js → table-_9IusQ8G.js} +1 -1
- package/dist/ui/assets/{updates-DfIV0IC0.js → updates-ButNfJqt.js} +1 -1
- package/dist/ui/assets/{use-accounts-Dy2ogHT-.js → use-accounts-BdtI0lBv.js} +1 -1
- package/dist/ui/index.html +2 -2
- package/dist/utils/claude-subcommand-detector.d.ts +7 -0
- package/dist/utils/claude-subcommand-detector.d.ts.map +1 -1
- package/dist/utils/claude-subcommand-detector.js +51 -9
- package/dist/utils/claude-subcommand-detector.js.map +1 -1
- package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
- package/dist/web-server/middleware/auth-middleware.js +25 -1
- package/dist/web-server/middleware/auth-middleware.js.map +1 -1
- package/dist/web-server/routes/claude-extension-routes.d.ts.map +1 -1
- package/dist/web-server/routes/claude-extension-routes.js +5 -0
- package/dist/web-server/routes/claude-extension-routes.js.map +1 -1
- package/dist/web-server/routes/codex-routes.d.ts.map +1 -1
- package/dist/web-server/routes/codex-routes.js +14 -0
- package/dist/web-server/routes/codex-routes.js.map +1 -1
- package/dist/web-server/services/codex-dashboard-service.d.ts.map +1 -1
- package/dist/web-server/services/codex-dashboard-service.js +30 -3
- package/dist/web-server/services/codex-dashboard-service.js.map +1 -1
- package/dist/web-server/usage/aggregator.d.ts +13 -7
- package/dist/web-server/usage/aggregator.d.ts.map +1 -1
- package/dist/web-server/usage/aggregator.js +37 -22
- package/dist/web-server/usage/aggregator.js.map +1 -1
- package/dist/web-server/usage/handlers.d.ts +1 -0
- package/dist/web-server/usage/handlers.d.ts.map +1 -1
- package/dist/web-server/usage/handlers.js +16 -8
- package/dist/web-server/usage/handlers.js.map +1 -1
- package/dist/web-server/usage/profile-filter.d.ts +13 -0
- package/dist/web-server/usage/profile-filter.d.ts.map +1 -0
- package/dist/web-server/usage/profile-filter.js +30 -0
- package/dist/web-server/usage/profile-filter.js.map +1 -0
- package/dist/web-server/usage/types.d.ts +8 -0
- package/dist/web-server/usage/types.d.ts.map +1 -1
- package/lib/hooks/websearch-transformer.cjs +12 -3
- package/lib/mcp/ccs-browser-server.cjs +217 -12
- package/package.json +1 -1
- package/scripts/run-test-bucket.js +1 -0
- package/dist/ui/assets/claude-extension-D47wkgfq.js +0 -1
- package/dist/ui/assets/cliproxy-CXgzAe6X.js +0 -4
- package/dist/ui/assets/codex-CYyPdHS4.js +0 -30
- package/dist/ui/assets/droid-Bw34FF6c.js +0 -2
- package/dist/ui/assets/index-DtiygQmg.js +0 -1
- package/dist/ui/assets/index-nSsKQx8t.css +0 -1
- package/dist/ui/assets/index-s94_IKNx.js +0 -1
- package/dist/ui/assets/proxy-status-widget-7iMiOpQe.js +0 -1
|
@@ -8,20 +8,45 @@ function maskSecret(value) {
|
|
|
8
8
|
return undefined;
|
|
9
9
|
return value.length > 8 ? `...${value.slice(-4)}` : '***';
|
|
10
10
|
}
|
|
11
|
-
function
|
|
11
|
+
function sanitizeUrlForView(value) {
|
|
12
|
+
const trimmed = value?.trim();
|
|
13
|
+
if (!trimmed)
|
|
14
|
+
return undefined;
|
|
15
|
+
try {
|
|
16
|
+
const parsed = new URL(trimmed);
|
|
17
|
+
if (parsed.username)
|
|
18
|
+
parsed.username = '***';
|
|
19
|
+
if (parsed.password)
|
|
20
|
+
parsed.password = '***';
|
|
21
|
+
return parsed.toString();
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return trimmed;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
function restoreMaskedViewValue(value, existing, sanitizeForView = maskSecret) {
|
|
28
|
+
const next = value?.trim() || undefined;
|
|
29
|
+
if (!next || !existing)
|
|
30
|
+
return next;
|
|
31
|
+
return next === sanitizeForView(existing) ? existing : next;
|
|
32
|
+
}
|
|
33
|
+
function normalizeHeaders(headers, existing) {
|
|
12
34
|
if (!headers)
|
|
13
35
|
return undefined;
|
|
14
36
|
const normalized = headers.reduce((acc, header) => {
|
|
15
37
|
const key = header.key.trim();
|
|
16
38
|
if (!key)
|
|
17
39
|
return acc;
|
|
18
|
-
acc[key] = header.value;
|
|
40
|
+
acc[key] = restoreMaskedViewValue(header.value, existing?.[key]) || '';
|
|
19
41
|
return acc;
|
|
20
42
|
}, {});
|
|
21
43
|
return Object.keys(normalized).length > 0 ? normalized : undefined;
|
|
22
44
|
}
|
|
23
45
|
function toHeaderPairs(headers) {
|
|
24
|
-
return Object.entries(headers || {}).map(([key, value]) => ({
|
|
46
|
+
return Object.entries(headers || {}).map(([key, value]) => ({
|
|
47
|
+
key,
|
|
48
|
+
value: maskSecret(value) || '***',
|
|
49
|
+
}));
|
|
25
50
|
}
|
|
26
51
|
function readModelRulePart(model, key) {
|
|
27
52
|
if (!model || typeof model !== 'object') {
|
|
@@ -42,9 +67,9 @@ function buildApiKeyEntryView(family, entry, index) {
|
|
|
42
67
|
return {
|
|
43
68
|
id: entry.id || `${family}:${index}`,
|
|
44
69
|
index,
|
|
45
|
-
label: entry.prefix?.trim() || entry['base-url']
|
|
46
|
-
baseUrl: entry['base-url']
|
|
47
|
-
proxyUrl: entry['proxy-url']
|
|
70
|
+
label: entry.prefix?.trim() || sanitizeUrlForView(entry['base-url']) || `Entry ${index + 1}`,
|
|
71
|
+
baseUrl: sanitizeUrlForView(entry['base-url']),
|
|
72
|
+
proxyUrl: sanitizeUrlForView(entry['proxy-url']),
|
|
48
73
|
prefix: entry.prefix?.trim() || undefined,
|
|
49
74
|
headers: toHeaderPairs(entry.headers),
|
|
50
75
|
excludedModels: [...(entry['excluded-models'] || [])],
|
|
@@ -59,7 +84,7 @@ function buildOpenAiCompatEntryView(entry, index) {
|
|
|
59
84
|
index,
|
|
60
85
|
name: entry.name,
|
|
61
86
|
label: entry.name,
|
|
62
|
-
baseUrl: entry['base-url']
|
|
87
|
+
baseUrl: sanitizeUrlForView(entry['base-url']),
|
|
63
88
|
headers: toHeaderPairs(entry.headers),
|
|
64
89
|
excludedModels: [],
|
|
65
90
|
models: normalizeModelAliases(entry.models),
|
|
@@ -107,10 +132,10 @@ function toApiKeyEntry(input, existing) {
|
|
|
107
132
|
return {
|
|
108
133
|
id: existing?.id,
|
|
109
134
|
'api-key': nextSecret,
|
|
110
|
-
'base-url': input.baseUrl?.
|
|
111
|
-
'proxy-url': input.proxyUrl?.
|
|
135
|
+
'base-url': restoreMaskedViewValue(input.baseUrl, existing?.['base-url'], sanitizeUrlForView),
|
|
136
|
+
'proxy-url': restoreMaskedViewValue(input.proxyUrl, existing?.['proxy-url'], sanitizeUrlForView),
|
|
112
137
|
prefix: input.prefix?.trim() || undefined,
|
|
113
|
-
headers: normalizeHeaders(input.headers),
|
|
138
|
+
headers: normalizeHeaders(input.headers, existing?.headers),
|
|
114
139
|
'excluded-models': (input.excludedModels || [])
|
|
115
140
|
.map((value) => value.trim())
|
|
116
141
|
.filter((value) => value.length > 0),
|
|
@@ -126,8 +151,10 @@ function toOpenAiCompatEntry(input, existing) {
|
|
|
126
151
|
return {
|
|
127
152
|
id: existing?.id,
|
|
128
153
|
name: input.name?.trim() || existing?.name || 'connector',
|
|
129
|
-
'base-url': input.baseUrl
|
|
130
|
-
|
|
154
|
+
'base-url': restoreMaskedViewValue(input.baseUrl, existing?.['base-url'], sanitizeUrlForView) ||
|
|
155
|
+
existing?.['base-url'] ||
|
|
156
|
+
'',
|
|
157
|
+
headers: normalizeHeaders(input.headers, existing?.headers),
|
|
131
158
|
'api-key-entries': nextApiKeys.map((apiKey) => ({ 'api-key': apiKey })),
|
|
132
159
|
models: normalizeModelAliases(input.models),
|
|
133
160
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/cliproxy/ai-providers/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redactor.d.ts","sourceRoot":"","sources":["../../../../src/cliproxy/auth/oauth-trace/redactor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"redactor.d.ts","sourceRoot":"","sources":["../../../../src/cliproxy/auth/oauth-trace/redactor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgDH,yEAAyE;AACzE,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAc9C;AAED,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAiC3C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoBzF;AAED,4CAA4C;AAC5C,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,eAAO,MAAM,oBAAoB,mBAAW,CAAC"}
|
|
@@ -32,13 +32,21 @@ const REDACTED = '***REDACTED***';
|
|
|
32
32
|
*/
|
|
33
33
|
const QUERY_PARAM_REGEX = new RegExp(`(?<=[?&#])(${SENSITIVE_QUERY_KEYS.join('|')})=[^&#\\s]+`, 'gi');
|
|
34
34
|
const BEARER_REGEX = /Bearer\s+[A-Za-z0-9._\-~+/=]+/gi;
|
|
35
|
+
const KV_SEPARATORS = String.raw `(?:=|:)`;
|
|
36
|
+
const VALUE_FRAGMENT = String.raw `[^\s,;&\]}\"']+`;
|
|
37
|
+
const STRING_KV_KEYS = [...SENSITIVE_QUERY_KEYS, 'token'].filter((key) => key !== 'authorization');
|
|
38
|
+
const SENSITIVE_KEY_GROUP = `(${STRING_KV_KEYS.join('|')})`;
|
|
39
|
+
const LEADING_KV_REGEX = new RegExp(String.raw `(^|\s)${SENSITIVE_KEY_GROUP}(\s*${KV_SEPARATORS}\s*)${VALUE_FRAGMENT}`, 'gi');
|
|
40
|
+
const QUOTED_JSON_KV_REGEX = new RegExp(String.raw `([\"'])${SENSITIVE_KEY_GROUP}\1(\s*:\s*)([\"'])(?:\\.|(?!\4).)*?\4`, 'gi');
|
|
35
41
|
/** Redact sensitive query-param values inside any string. Idempotent. */
|
|
36
42
|
function redactString(s) {
|
|
37
43
|
if (!s)
|
|
38
44
|
return s;
|
|
39
45
|
return s
|
|
40
46
|
.replace(QUERY_PARAM_REGEX, (_full, key) => `${key}=${REDACTED}`)
|
|
41
|
-
.replace(BEARER_REGEX, `Bearer ${REDACTED}`)
|
|
47
|
+
.replace(BEARER_REGEX, `Bearer ${REDACTED}`)
|
|
48
|
+
.replace(QUOTED_JSON_KV_REGEX, (_full, quoteKey, key, separator, quoteVal) => `${quoteKey}${key}${quoteKey}${separator}${quoteVal}${REDACTED}${quoteVal}`)
|
|
49
|
+
.replace(LEADING_KV_REGEX, (_full, prefix, key, separator) => `${prefix}${key}${separator}${REDACTED}`);
|
|
42
50
|
}
|
|
43
51
|
exports.redactString = redactString;
|
|
44
52
|
/** Redact a parsed URL by name; returns redacted href or original on parse error. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redactor.js","sourceRoot":"","sources":["../../../../src/cliproxy/auth/oauth-trace/redactor.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,MAAM,oBAAoB,GAAG;IAC3B,MAAM;IACN,OAAO;IACP,cAAc;IACd,eAAe;IACf,UAAU;IACV,eAAe;IACf,eAAe;IACf,sCAAsC;IACtC,eAAe;IACf,aAAa;IACb,WAAW;IACX,eAAe;CACP,CAAC;AAEX,MAAM,qBAAqB,GAAG,IAAI,GAAG,CACnC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAC9F,CAAC;AAEF,MAAM,QAAQ,GAAG,gBAAgB,CAAC;AAElC;;;;GAIG;AACH,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAClC,cAAc,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EACzD,IAAI,CACL,CAAC;AAEF,MAAM,YAAY,GAAG,iCAAiC,CAAC;AAEvD,yEAAyE;AACzE,SAAgB,YAAY,CAAC,CAAS;IACpC,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,OAAO,CAAC;SACL,OAAO,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;SAChE,OAAO,CAAC,YAAY,EAAE,UAAU,QAAQ,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"redactor.js","sourceRoot":"","sources":["../../../../src/cliproxy/auth/oauth-trace/redactor.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,9 @@ const thinking_validator_1 = require("../thinking-validator");
|
|
|
11
11
|
const model_id_normalizer_1 = require("../ai-providers/model-id-normalizer");
|
|
12
12
|
const ui_1 = require("../../utils/ui");
|
|
13
13
|
const config_loader_facade_1 = require("../../config/config-loader-facade");
|
|
14
|
-
const CODEX_EFFORT_REGEX = /^(medium|high|xhigh)$/i;
|
|
15
|
-
const CODEX_FAST_TUNING_VALUE_REGEX = /^(?:(medium|high|xhigh)-fast|fast-(medium|high|xhigh)|fast)$/i;
|
|
16
|
-
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:
|
|
14
|
+
const CODEX_EFFORT_REGEX = /^(minimal|low|medium|high|xhigh)$/i;
|
|
15
|
+
const CODEX_FAST_TUNING_VALUE_REGEX = /^(?:(minimal|low|medium|high|xhigh)-fast|fast-(minimal|low|medium|high|xhigh)|fast)$/i;
|
|
16
|
+
const CODEX_TUNING_SUFFIX_REGEX = /(?:-(?:minimal|low|medium|high|xhigh)(?:-fast)?|-fast(?:-(?:minimal|low|medium|high|xhigh))?)$/i;
|
|
17
17
|
/**
|
|
18
18
|
* Normalize model ID for provider capability lookup.
|
|
19
19
|
* Codex may carry effort/service-tier suffixes in legacy "(high)" or current "-high-fast" forms.
|
|
@@ -23,13 +23,13 @@ function normalizeModelForThinkingLookup(model, provider) {
|
|
|
23
23
|
const providerNormalized = (0, model_id_normalizer_1.normalizeModelIdForProvider)(withoutExtendedContext, provider);
|
|
24
24
|
if (provider !== 'codex')
|
|
25
25
|
return providerNormalized;
|
|
26
|
-
// New codex suffix forms: gpt-5.4-
|
|
27
|
-
const codexSuffixMatch = providerNormalized.match(/^(.*?)(?:-(?:
|
|
26
|
+
// New codex suffix forms: gpt-5.4-low-fast, gpt-5.4-fast-high -> gpt-5.4
|
|
27
|
+
const codexSuffixMatch = providerNormalized.match(/^(.*?)(?:-(?:minimal|low|medium|high|xhigh)(?:-fast)?|-fast(?:-(?:minimal|low|medium|high|xhigh))?)$/i);
|
|
28
28
|
if (codexSuffixMatch?.[1]) {
|
|
29
29
|
return codexSuffixMatch[1].trim();
|
|
30
30
|
}
|
|
31
31
|
// Legacy codex suffix form: gpt-5.3-codex(high) -> gpt-5.3-codex
|
|
32
|
-
const codexLegacyMatch = providerNormalized.match(/^(.*)\((
|
|
32
|
+
const codexLegacyMatch = providerNormalized.match(/^(.*)\((minimal|low|medium|high|xhigh)\)$/i);
|
|
33
33
|
if (codexLegacyMatch?.[1]) {
|
|
34
34
|
return codexLegacyMatch[1].trim();
|
|
35
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,4EAAmF;AAGnF,oDAA6E;AAC7E,8DAA6E;AAC7E,6EAAkF;AAClF,uCAAsC;AACtC,4EAAsE;AAKtE,MAAM,kBAAkB,GAAG,
|
|
1
|
+
{"version":3,"file":"thinking-config.js","sourceRoot":"","sources":["../../../src/cliproxy/config/thinking-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ const defaultCliproxyImageAnalysisDeps = {
|
|
|
53
53
|
resolveImageAnalysisRuntimeStatus: image_analysis_runtime_status_1.resolveImageAnalysisRuntimeStatus,
|
|
54
54
|
getLocalRuntimeApiKey: auth_token_manager_1.getEffectiveApiKey,
|
|
55
55
|
};
|
|
56
|
-
const CODEX_EFFORT_SUFFIX_REGEX = /^(.*)-(
|
|
56
|
+
const CODEX_EFFORT_SUFFIX_REGEX = /^(.*)-(minimal|low|medium|high|xhigh)$/i;
|
|
57
57
|
const EXTENDED_CONTEXT_SUFFIX_REGEX = /\[1m\]$/i;
|
|
58
58
|
function normalizeCodexModelForDirectUpstream(model) {
|
|
59
59
|
const withoutExtendedContext = model.trim().replace(EXTENDED_CONTEXT_SUFFIX_REGEX, '').trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,iEAKoC;AACpC,+EAA+E;AAG/E,qEAAoE;AACpE,+FAIuD;AACvD,mGAAoG;AACpG,iHAAqG;AACrG,mGAAuF;AACvF,+DAAiF;AAIjF,6EAG6C;AAE7C,mEAAgE;AAChE,+CAA+D;AAkE/D,MAAM,gCAAgC,GAA8B;IAClE,uBAAuB,EAAvB,qDAAuB;IACvB,2BAA2B,EAA3B,kEAA2B;IAC3B,oBAAoB,EAApB,oDAAoB;IACpB,iCAAiC,EAAjC,iEAAiC;IACjC,qBAAqB,EAAE,uCAAkB;CAC1C,CAAC;AAEF,MAAM,yBAAyB,GAAG,
|
|
1
|
+
{"version":3,"file":"env-resolver.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/env-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,iEAKoC;AACpC,+EAA+E;AAG/E,qEAAoE;AACpE,+FAIuD;AACvD,mGAAoG;AACpG,iHAAqG;AACrG,mGAAuF;AACvF,+DAAiF;AAIjF,6EAG6C;AAE7C,mEAAgE;AAChE,+CAA+D;AAkE/D,MAAM,gCAAgC,GAA8B;IAClE,uBAAuB,EAAvB,qDAAuB;IACvB,2BAA2B,EAA3B,kEAA2B;IAC3B,oBAAoB,EAApB,oDAAoB;IACpB,iCAAiC,EAAjC,iEAAiC;IACjC,qBAAqB,EAAE,uCAAkB;CAC1C,CAAC;AAEF,MAAM,yBAAyB,GAAG,yCAAyC,CAAC;AAC5E,MAAM,6BAA6B,GAAG,UAAU,CAAC;AAEjD,SAAS,oCAAoC,CAAC,KAAa;IACzD,MAAM,sBAAsB,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9F,IAAI,CAAC,sBAAsB;QAAE,OAAO,sBAAsB,CAAC;IAE3D,MAAM,WAAW,GAAG,sBAAsB,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC5E,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC;AACrE,CAAC;AAED,SAAS,kCAAkC,CAAC,OAA0B;IACpE,IAAI,OAAO,GAA6B,IAAI,CAAC;IAE7C,KAAK,MAAM,GAAG,IAAI,wCAAkB,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAErE,MAAM,eAAe,GAAG,oCAAoC,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,eAAe,KAAK,KAAK;YAAE,SAAS;QAExC,IAAI,CAAC,OAAO;YAAE,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;IACjC,CAAC;IAED,OAAO,OAAO,IAAI,OAAO,CAAC;AAC5B,CAAC;AAED,SAAS,yBAAyB,CAAC,YAAqB;IACtD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAY,CAAC;QAC5E,OAAO,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,+BAA+B,CACnD,OAA+C,EAC/C,OAA2C,EAAE;IAE7C,MAAM,YAAY,GAAG,EAAE,GAAG,gCAAgC,EAAE,GAAG,IAAI,EAAE,CAAC;IACtE,MAAM,QAAQ,GAAG,yBAAyB,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG;QACd,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,UAAmB;QAChC,gBAAgB,EAAE,OAAO,CAAC,QAAQ;QAClC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,mBAAmB;QACzC,QAAQ;QACR,aAAa,EAAE,YAAY,CAAC,2BAA2B,CACrD,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,mBAAmB,CAC5B;QACD,mBAAmB,EAAE,YAAY,CAAC,oBAAoB,EAAE;KACzD,CAAC;IAEF,MAAM,GAAG,GAAG,YAAY,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACpD,IAAI,GAAG,CAAC,yBAAyB,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/D,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,iCAAiC,CAAC,OAAO,EAAE,SAAS,EAAE;QACtF,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,WAAW;QACzC,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,cAAc;KACtD,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,oBAAoB,KAAK,aAAa,EAAE,CAAC;QAClD,OAAO;YACL,GAAG,EAAE;gBACH,GAAG,GAAG;gBACN,oBAAoB,EAAE,EAAE;gBACxB,uBAAuB,EAAE,GAAG;aAC7B;YACD,OAAO,EAAE,GAAG,MAAM,CAAC,sBAAsB,IAAI,sBAAsB,eAAe,kBAAkB,qCAAqC;SAC1I,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAA,mEAAqC,EAAC;QAC9D,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,EAAE,IAAA,gEAAkC,EAAC,GAAG,EAAE;YAC3C,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,OAAO,EAAE,iBAAiB,CAAC,OAAO;YAClC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ;gBAClC,CAAC,CAAC,iBAAiB,CAAC,MAAM;gBAC1B,CAAC,CAAC,YAAY,CAAC,qBAAqB,EAAE;YACxC,eAAe,EAAE,iBAAiB,CAAC,eAAe;SACnD,CAAC;QACF,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AA5DD,0EA4DC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,MAAwB;IAC7D,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,WAAW,EACX,UAAU,EACV,SAAS,EACT,kBAAkB,EAClB,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,EAClB,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAAE,wBAAwB,EAC1C,iBAAiB,GAClB,GAAG,MAAM,CAAC;IAEX,gDAAgD;IAChD,IAAI,OAA0B,CAAC;IAE/B,IAAI,cAAc,IAAI,YAAY,EAAE,CAAC;QACnC,IAAI,WAAW,IAAI,UAAU,EAAE,CAAC;YAC9B,gCAAgC;YAChC,IAAI,WAAW,IAAI,cAAc,IAAI,oBAAoB,EAAE,CAAC;gBAC1D,OAAO,GAAG,IAAA,sCAAmB,EAC3B,cAAc,EACd,oBAAoB,EACpB,UAAU,EACV,kBAAkB,EAClB;oBACE,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,MAAM;oBAChB,SAAS,EAAE,YAAY,CAAC,SAAS;iBAClC,CACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,IAAA,mCAAgB,EACxB,QAAQ,EACR;oBACE,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,MAAM,EAAE,6BAA6B;oBAC/C,SAAS,EAAE,YAAY,CAAC,SAAS;iBAClC,EACD,kBAAkB,CACnB,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,kCAAkC;YAClC,IAAI,WAAW,IAAI,cAAc,IAAI,oBAAoB,EAAE,CAAC;gBAC1D,OAAO,GAAG,IAAA,sCAAmB,EAC3B,cAAc,EACd,oBAAoB,EACpB,YAAY,CAAC,IAAI,EACjB,kBAAkB,EAClB;oBACE,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,SAAS,EAAE,YAAY,CAAC,SAAS;iBAClC,CACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,IAAA,mCAAgB,EACxB,QAAQ,EACR;oBACE,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,SAAS,EAAE,YAAY,CAAC,SAAS;iBAClC,EACD,kBAAkB,CACnB,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,mBAAmB;QACnB,IAAI,WAAW,IAAI,cAAc,IAAI,oBAAoB,EAAE,CAAC;YAC1D,OAAO,GAAG,IAAA,sCAAmB,EAC3B,cAAc,EACd,oBAAoB,EACpB,SAAS,EACT,kBAAkB,CACnB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,mBAAmB,GAAG,YAAY;gBACtC,CAAC,CAAC;oBACE,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,QAAQ,EAAE,YAAY,CAAC,QAAQ;oBAC/B,SAAS,EAAE,YAAY,CAAC,SAAS;iBAClC;gBACH,CAAC,CAAC,SAAS,CAAC;YAEd,OAAO,GAAG,IAAA,sCAAmB,EAAC,QAAQ,EAAE,SAAS,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAED,kDAAkD;IAClD,IAAI,qBAAqF,CAAC;IAC1F,IAAI,WAAW,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,YAAY,GAAuD,EAAE,CAAC;QAC5E,IAAI,cAAc,CAAC,IAAI,EAAE,QAAQ;YAAE,YAAY,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpF,IAAI,cAAc,CAAC,MAAM,EAAE,QAAQ;YAAE,YAAY,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC1F,IAAI,cAAc,CAAC,KAAK,EAAE,QAAQ;YAAE,YAAY,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC;QACvF,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,qBAAqB,GAAG,YAAY,CAAC;QACvC,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,OAAO,GAAG,IAAA,sCAAmB,EAC3B,OAAO,EACP,QAAQ,EACR,gBAAgB,EAChB,qBAAqB,EACrB,cAAc,CACf,CAAC;IAEF,4DAA4D;IAC5D,yDAAyD;IACzD,IAAA,oDAA0B,EAAC,OAAO,EAAE,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAEvE,oCAAoC;IACpC,0FAA0F;IAC1F,wFAAwF;IACxF,6FAA6F;IAC7F,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChE,OAAO,GAAG,kCAAkC,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,iEAAiE;IACjE,uFAAuF;IACvF,IAAI,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAE9C,IAAI,oBAAoB,EAAE,CAAC;QACzB,YAAY,GAAG,oBAAoB,oBAAoB,EAAE,CAAC;IAC5D,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACvB,kEAAkE;QAClE,YAAY,GAAG,oBAAoB,kBAAkB,qBAAqB,CAAC;IAC7E,CAAC;IAED,MAAM,gBAAgB,GAAG;QACvB,GAAG,OAAO;QACV,kBAAkB,EAAE,YAAY;KACjC,CAAC;IAEF,iCAAiC;IACjC,MAAM,YAAY,GAAG,IAAA,uCAAmB,GAAE,CAAC;IAC3C,MAAM,gBAAgB,GAAG,wBAAwB,IAAI,IAAA,qDAAuB,EAAC,QAAQ,CAAC,CAAC;IAEvF,4DAA4D;IAC5D,MAAM,OAAO,GAAG,IAAA,gCAAe,EAC7B,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAGhF,CACwB,CAAC;IAE5B,MAAM,wBAAwB,GAAG,IAAA,gCAAe,EAC9C,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAC1C,CACF,CAAC;IAE5B,MAAM,SAAS,GAAG;QAChB,GAAG,OAAO;QACV,GAAG,wBAAwB;QAC3B,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,GAAG,YAAY;QACf,GAAG,gBAAgB;QACnB,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC;QAC5B,gBAAgB,EAAE,UAAU,EAAE,0DAA0D;KACzF,CAAC;IAEF,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,IAAA,mCAAkB,EAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CACvD,CAAC;AAC9B,CAAC;AAzLD,wDAyLC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC5B,GAA2B,EAC3B,YAAoC,EACpC,OAAgB;IAEhB,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,MAAM,GAAG,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC;IAEhE,GAAG,CAAC,kCAAkC,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAChE,GAAG,CAAC,+BAA+B,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC;IAE1D,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,GAAG,CAAC,gCAAgC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,qCAAqC;IACrC,IAAI,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,uBAAuB,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;QACpF,GAAG,CAAC,+DAA+D,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AApBD,wCAoBC;AAED,mEAAmE;AACnE,SAAgB,aAAa,CAC3B,GAA2B,EAC3B,UAAuC,EACvC,QAA6C;IAE7C,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE,8BAA8B;QACpC,MAAM,EAAE,gCAAgC;QACxC,KAAK,EAAE,+BAA+B;KAC9B,CAAC;IACX,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IACrD,MAAM,uBAAuB,GAAG,IAAA,iDAA2B,EAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/F,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,uBAAuB,CAAC;IACzD,8DAA8D;IAC9D,IAAI,MAAM,CAAC,eAAe,KAAK,aAAa,EAAE,CAAC;QAC7C,MAAM,CAAC,eAAe,GAAG,uBAAuB,CAAC;IACnD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAnBD,sCAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-fetcher-claude.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/quota/quota-fetcher-claude.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,CAAC;AAEhE,eAAO,MAAM,sBAAsB,8CAA8C,CAAC;
|
|
1
|
+
{"version":3,"file":"quota-fetcher-claude.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/quota/quota-fetcher-claude.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EACL,uBAAuB,EACvB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,CAAC;AAEhE,eAAO,MAAM,sBAAsB,8CAA8C,CAAC;AAwMlF;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,UAAQ,GACd,OAAO,CAAC,iBAAiB,CAAC,CAyH5B;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,UAAQ,GACd,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,iBAAiB,CAAA;CAAE,EAAE,CAAC,CAS1D"}
|
|
@@ -41,6 +41,7 @@ exports.CLAUDE_OAUTH_USAGE_URL = 'https://api.anthropic.com/api/oauth/usage';
|
|
|
41
41
|
const CLAUDE_QUOTA_TIMEOUT_MS = 10000;
|
|
42
42
|
const CLAUDE_QUOTA_MAX_ATTEMPTS = 2;
|
|
43
43
|
const CLAUDE_OAUTH_BETA_HEADER = 'oauth-2025-04-20';
|
|
44
|
+
const CLAUDE_QUOTA_ERROR_BODY_MAX_BYTES = 8192;
|
|
44
45
|
function asString(value) {
|
|
45
46
|
return typeof value === 'string' && value.trim().length > 0 ? value.trim() : null;
|
|
46
47
|
}
|
|
@@ -88,8 +89,30 @@ function extractErrorMessage(payload) {
|
|
|
88
89
|
}
|
|
89
90
|
async function readResponseErrorMessage(response) {
|
|
90
91
|
try {
|
|
91
|
-
const
|
|
92
|
-
if (
|
|
92
|
+
const contentLength = Number(response.headers.get('content-length') ?? '0');
|
|
93
|
+
if (Number.isFinite(contentLength) && contentLength > CLAUDE_QUOTA_ERROR_BODY_MAX_BYTES) {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
const reader = response.body?.getReader();
|
|
97
|
+
if (!reader)
|
|
98
|
+
return null;
|
|
99
|
+
const decoder = new TextDecoder();
|
|
100
|
+
const chunks = [];
|
|
101
|
+
let totalBytes = 0;
|
|
102
|
+
while (true) {
|
|
103
|
+
const { done, value } = await reader.read();
|
|
104
|
+
if (done)
|
|
105
|
+
break;
|
|
106
|
+
if (!value)
|
|
107
|
+
continue;
|
|
108
|
+
totalBytes += value.byteLength;
|
|
109
|
+
if (totalBytes > CLAUDE_QUOTA_ERROR_BODY_MAX_BYTES)
|
|
110
|
+
return null;
|
|
111
|
+
chunks.push(decoder.decode(value, { stream: true }));
|
|
112
|
+
}
|
|
113
|
+
chunks.push(decoder.decode());
|
|
114
|
+
const body = chunks.join('').trim();
|
|
115
|
+
if (!body)
|
|
93
116
|
return null;
|
|
94
117
|
try {
|
|
95
118
|
const parsed = JSON.parse(body);
|
|
@@ -100,7 +123,7 @@ async function readResponseErrorMessage(response) {
|
|
|
100
123
|
catch {
|
|
101
124
|
// fall through to plain-text fallback
|
|
102
125
|
}
|
|
103
|
-
return body
|
|
126
|
+
return body;
|
|
104
127
|
}
|
|
105
128
|
catch {
|
|
106
129
|
return null;
|
|
@@ -213,18 +236,20 @@ async function fetchClaudeQuota(accountId, verbose = false) {
|
|
|
213
236
|
'anthropic-beta': CLAUDE_OAUTH_BETA_HEADER,
|
|
214
237
|
},
|
|
215
238
|
});
|
|
216
|
-
clearTimeout(timeoutId);
|
|
217
239
|
if (verbose) {
|
|
218
240
|
console.error(`[i] Claude OAuth usage status: ${response.status} (attempt ${attempt})`);
|
|
219
241
|
}
|
|
220
242
|
if (response.status === 401) {
|
|
221
243
|
const errorMessage = await readResponseErrorMessage(response);
|
|
244
|
+
clearTimeout(timeoutId);
|
|
222
245
|
return buildEmptyResult(errorMessage || 'Authentication required for Claude OAuth usage', accountId, true);
|
|
223
246
|
}
|
|
224
247
|
if (response.status === 404) {
|
|
248
|
+
clearTimeout(timeoutId);
|
|
225
249
|
return buildEmptyResult('Claude OAuth usage endpoint not found', accountId);
|
|
226
250
|
}
|
|
227
251
|
if (response.status === 403) {
|
|
252
|
+
clearTimeout(timeoutId);
|
|
228
253
|
return buildEmptyResult('Not authorized for Claude OAuth usage', accountId);
|
|
229
254
|
}
|
|
230
255
|
if (!response.ok) {
|
|
@@ -233,8 +258,10 @@ async function fetchClaudeQuota(accountId, verbose = false) {
|
|
|
233
258
|
`Claude OAuth usage API error: ${response.status}`;
|
|
234
259
|
if (attempt < CLAUDE_QUOTA_MAX_ATTEMPTS &&
|
|
235
260
|
(response.status === 429 || response.status >= 500)) {
|
|
261
|
+
clearTimeout(timeoutId);
|
|
236
262
|
continue;
|
|
237
263
|
}
|
|
264
|
+
clearTimeout(timeoutId);
|
|
238
265
|
return buildEmptyResult(lastError, accountId);
|
|
239
266
|
}
|
|
240
267
|
let payload;
|
|
@@ -242,13 +269,16 @@ async function fetchClaudeQuota(accountId, verbose = false) {
|
|
|
242
269
|
payload = await response.json();
|
|
243
270
|
}
|
|
244
271
|
catch {
|
|
272
|
+
clearTimeout(timeoutId);
|
|
245
273
|
return buildEmptyResult('Invalid Claude OAuth usage format', accountId);
|
|
246
274
|
}
|
|
247
275
|
if (!toObject(payload)) {
|
|
276
|
+
clearTimeout(timeoutId);
|
|
248
277
|
return buildEmptyResult('Invalid Claude OAuth usage format', accountId);
|
|
249
278
|
}
|
|
250
279
|
const windows = (0, quota_fetcher_claude_normalizer_1.buildClaudeQuotaWindows)(payload);
|
|
251
280
|
const coreUsage = (0, quota_fetcher_claude_normalizer_1.buildClaudeCoreUsageSummary)(windows);
|
|
281
|
+
clearTimeout(timeoutId);
|
|
252
282
|
return {
|
|
253
283
|
success: true,
|
|
254
284
|
windows,
|
|
@@ -270,6 +300,7 @@ async function fetchClaudeQuota(accountId, verbose = false) {
|
|
|
270
300
|
console.error(`[!] Claude OAuth usage failed (attempt ${attempt}): ${lastError}${errorDetails ? `\n${errorDetails}` : ''}`);
|
|
271
301
|
}
|
|
272
302
|
if (attempt >= CLAUDE_QUOTA_MAX_ATTEMPTS) {
|
|
303
|
+
clearTimeout(timeoutId);
|
|
273
304
|
return buildEmptyResult(lastError, accountId);
|
|
274
305
|
}
|
|
275
306
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-fetcher-claude.js","sourceRoot":"","sources":["../../../src/cliproxy/quota/quota-fetcher-claude.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,gDAAkC;AAClC,sDAAwC;AACxC,iEAAwD;AACxD,iEAAgF;AAChF,mDAAmE;AAEnE,uFAG2C;AAElC,wGAJP,yDAAuB,OAIO;AAAE,4GAHhC,6DAA2B,OAGgC;AAEhD,QAAA,sBAAsB,GAAG,2CAA2C,CAAC;AAClF,MAAM,uBAAuB,GAAG,KAAK,CAAC;AACtC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AACpC,MAAM,wBAAwB,GAAG,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"quota-fetcher-claude.js","sourceRoot":"","sources":["../../../src/cliproxy/quota/quota-fetcher-claude.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-usage-log-transformer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/oauth-usage-log-transformer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAyIhE,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAmChG;
|
|
1
|
+
{"version":3,"file":"oauth-usage-log-transformer.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/services/oauth-usage-log-transformer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAyIhE,wBAAgB,sCAAsC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,CAmChG;AAiBD,wBAAgB,qCAAqC,IAAI,wBAAwB,GAAG,IAAI,CASvF"}
|
|
@@ -143,10 +143,15 @@ function buildUsageResponseFromCliproxyLogLines(lines) {
|
|
|
143
143
|
return (0, usage_compatibility_transformer_1.buildUsageResponseFromQueueRecords)(records);
|
|
144
144
|
}
|
|
145
145
|
exports.buildUsageResponseFromCliproxyLogLines = buildUsageResponseFromCliproxyLogLines;
|
|
146
|
+
const MAX_LOG_BYTES = 2 * 1024 * 1024;
|
|
146
147
|
function readLogFile(filePath) {
|
|
147
148
|
if (!fs.existsSync(filePath)) {
|
|
148
149
|
return null;
|
|
149
150
|
}
|
|
151
|
+
const stats = fs.statSync(filePath);
|
|
152
|
+
if (stats.size > MAX_LOG_BYTES) {
|
|
153
|
+
return null;
|
|
154
|
+
}
|
|
150
155
|
return fs.readFileSync(filePath, 'utf-8');
|
|
151
156
|
}
|
|
152
157
|
function buildUsageResponseFromCliproxyMainLog() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-usage-log-transformer.js","sourceRoot":"","sources":["../../../src/cliproxy/services/oauth-usage-log-transformer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth-usage-log-transformer.js","sourceRoot":"","sources":["../../../src/cliproxy/services/oauth-usage-log-transformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { CodexAccountIdentity } from './types';
|
|
2
|
+
/**
|
|
3
|
+
* Read auth.json from disk and extract display-safe identity fields.
|
|
4
|
+
* Returns {} on any error (missing file, bad JSON, missing token, decode failure).
|
|
5
|
+
* Never throws.
|
|
6
|
+
*/
|
|
7
|
+
export declare function decodeAccountIdentity(authJsonPath: string): CodexAccountIdentity;
|
|
8
|
+
//# sourceMappingURL=codex-account-identity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-account-identity.d.ts","sourceRoot":"","sources":["../../src/codex-auth/codex-account-identity.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAUpD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,oBAAoB,CAiBhF"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.decodeAccountIdentity = void 0;
|
|
27
|
+
const fs = __importStar(require("fs"));
|
|
28
|
+
const logging_1 = require("../services/logging");
|
|
29
|
+
const decode_id_token_1 = require("./decode-id-token");
|
|
30
|
+
const logger = (0, logging_1.createLogger)('codex-auth:identity');
|
|
31
|
+
/**
|
|
32
|
+
* Read auth.json from disk and extract display-safe identity fields.
|
|
33
|
+
* Returns {} on any error (missing file, bad JSON, missing token, decode failure).
|
|
34
|
+
* Never throws.
|
|
35
|
+
*/
|
|
36
|
+
function decodeAccountIdentity(authJsonPath) {
|
|
37
|
+
try {
|
|
38
|
+
const raw = fs.readFileSync(authJsonPath, 'utf8');
|
|
39
|
+
const parsed = JSON.parse(raw);
|
|
40
|
+
const idToken = parsed?.tokens?.id_token;
|
|
41
|
+
if (typeof idToken !== 'string' || idToken.length === 0) {
|
|
42
|
+
return {};
|
|
43
|
+
}
|
|
44
|
+
return (0, decode_id_token_1.decodeIdToken)(idToken);
|
|
45
|
+
}
|
|
46
|
+
catch (err) {
|
|
47
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
48
|
+
logger.warn('codex-auth.identity.decode-failed', `Failed to decode account identity from ${authJsonPath}: ${msg}`);
|
|
49
|
+
return {};
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
exports.decodeAccountIdentity = decodeAccountIdentity;
|
|
53
|
+
//# sourceMappingURL=codex-account-identity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-account-identity.js","sourceRoot":"","sources":["../../src/codex-auth/codex-account-identity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,iDAAmD;AACnD,uDAAkD;AAGlD,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,qBAAqB,CAAC,CAAC;AAQnD;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,YAAoB;IACxD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAa,CAAC;QAC3C,MAAM,OAAO,GAAG,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;QACzC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,IAAA,+BAAa,EAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7D,MAAM,CAAC,IAAI,CACT,mCAAmC,EACnC,0CAA0C,YAAY,KAAK,GAAG,EAAE,CACjE,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAjBD,sDAiBC"}
|