@kaitranntt/ccs 7.45.0 → 7.46.0-dev.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -0
- package/config/base-kimi.settings.json +8 -9
- package/config/base-km.settings.json +10 -0
- package/dist/api/services/provider-presets.js +2 -2
- package/dist/api/services/provider-presets.js.map +1 -1
- package/dist/auth/profile-detector.d.ts +4 -1
- package/dist/auth/profile-detector.d.ts.map +1 -1
- package/dist/auth/profile-detector.js +4 -1
- package/dist/auth/profile-detector.js.map +1 -1
- package/dist/ccs.js +235 -63
- package/dist/ccs.js.map +1 -1
- package/dist/cliproxy/auth/auth-types.d.ts +2 -1
- package/dist/cliproxy/auth/auth-types.d.ts.map +1 -1
- package/dist/cliproxy/auth/auth-types.js +20 -50
- package/dist/cliproxy/auth/auth-types.js.map +1 -1
- package/dist/cliproxy/auth/gemini-token-refresh.d.ts +5 -3
- package/dist/cliproxy/auth/gemini-token-refresh.d.ts.map +1 -1
- package/dist/cliproxy/auth/gemini-token-refresh.js +51 -35
- package/dist/cliproxy/auth/gemini-token-refresh.js.map +1 -1
- package/dist/cliproxy/auth/provider-refreshers/index.d.ts +3 -3
- package/dist/cliproxy/auth/provider-refreshers/index.d.ts.map +1 -1
- package/dist/cliproxy/auth/provider-refreshers/index.js +35 -33
- package/dist/cliproxy/auth/provider-refreshers/index.js.map +1 -1
- package/dist/cliproxy/config/generator.d.ts.map +1 -1
- package/dist/cliproxy/config/generator.js +2 -16
- package/dist/cliproxy/config/generator.js.map +1 -1
- package/dist/cliproxy/management-api-client.d.ts.map +1 -1
- package/dist/cliproxy/management-api-client.js +16 -4
- package/dist/cliproxy/management-api-client.js.map +1 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-catalog.js +36 -0
- package/dist/cliproxy/model-catalog.js.map +1 -1
- package/dist/cliproxy/provider-capabilities.d.ts +21 -0
- package/dist/cliproxy/provider-capabilities.d.ts.map +1 -1
- package/dist/cliproxy/provider-capabilities.js +122 -13
- package/dist/cliproxy/provider-capabilities.js.map +1 -1
- package/dist/cliproxy/quota-fetcher-codex.d.ts +8 -2
- package/dist/cliproxy/quota-fetcher-codex.d.ts.map +1 -1
- package/dist/cliproxy/quota-fetcher-codex.js +101 -1
- package/dist/cliproxy/quota-fetcher-codex.js.map +1 -1
- package/dist/cliproxy/quota-types.d.ts +20 -0
- package/dist/cliproxy/quota-types.d.ts.map +1 -1
- package/dist/cliproxy/session-tracker.d.ts +6 -1
- package/dist/cliproxy/session-tracker.d.ts.map +1 -1
- package/dist/cliproxy/session-tracker.js +97 -36
- package/dist/cliproxy/session-tracker.js.map +1 -1
- package/dist/cliproxy/types.d.ts +2 -1
- package/dist/cliproxy/types.d.ts.map +1 -1
- package/dist/cliproxy/types.js.map +1 -1
- package/dist/commands/cliproxy/help-subcommand.js +1 -1
- package/dist/commands/cliproxy/help-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/quota-subcommand.js +73 -4
- package/dist/commands/cliproxy/quota-subcommand.js.map +1 -1
- package/dist/commands/help-command.d.ts.map +1 -1
- package/dist/commands/help-command.js +18 -4
- package/dist/commands/help-command.js.map +1 -1
- package/dist/commands/setup-command.d.ts.map +1 -1
- package/dist/commands/setup-command.js +4 -3
- package/dist/commands/setup-command.js.map +1 -1
- package/dist/config/migration-manager.d.ts.map +1 -1
- package/dist/config/migration-manager.js +2 -1
- package/dist/config/migration-manager.js.map +1 -1
- package/dist/config/unified-config-types.d.ts +14 -6
- package/dist/config/unified-config-types.d.ts.map +1 -1
- package/dist/config/unified-config-types.js +5 -12
- package/dist/config/unified-config-types.js.map +1 -1
- package/dist/cursor/cursor-auth.d.ts.map +1 -1
- package/dist/cursor/cursor-auth.js +11 -1
- package/dist/cursor/cursor-auth.js.map +1 -1
- package/dist/cursor/cursor-client-policy.d.ts +16 -0
- package/dist/cursor/cursor-client-policy.d.ts.map +1 -0
- package/dist/cursor/cursor-client-policy.js +137 -0
- package/dist/cursor/cursor-client-policy.js.map +1 -0
- package/dist/cursor/cursor-daemon-entry.d.ts.map +1 -1
- package/dist/cursor/cursor-daemon-entry.js +59 -19
- package/dist/cursor/cursor-daemon-entry.js.map +1 -1
- package/dist/cursor/cursor-default-models.d.ts +21 -0
- package/dist/cursor/cursor-default-models.d.ts.map +1 -0
- package/dist/cursor/cursor-default-models.js +173 -0
- package/dist/cursor/cursor-default-models.js.map +1 -0
- package/dist/cursor/cursor-executor.d.ts +4 -6
- package/dist/cursor/cursor-executor.d.ts.map +1 -1
- package/dist/cursor/cursor-executor.js +57 -76
- package/dist/cursor/cursor-executor.js.map +1 -1
- package/dist/cursor/cursor-models.d.ts +14 -17
- package/dist/cursor/cursor-models.d.ts.map +1 -1
- package/dist/cursor/cursor-models.js +174 -185
- package/dist/cursor/cursor-models.js.map +1 -1
- package/dist/cursor/cursor-protobuf-decoder.d.ts.map +1 -1
- package/dist/cursor/cursor-protobuf-decoder.js +4 -1
- package/dist/cursor/cursor-protobuf-decoder.js.map +1 -1
- package/dist/cursor/cursor-protobuf-schema.d.ts +1 -1
- package/dist/cursor/cursor-protobuf-schema.d.ts.map +1 -1
- package/dist/cursor/index.d.ts +1 -1
- package/dist/cursor/index.d.ts.map +1 -1
- package/dist/cursor/index.js +4 -1
- package/dist/cursor/index.js.map +1 -1
- package/dist/targets/claude-adapter.d.ts +29 -0
- package/dist/targets/claude-adapter.d.ts.map +1 -0
- package/dist/targets/claude-adapter.js +130 -0
- package/dist/targets/claude-adapter.js.map +1 -0
- package/dist/targets/droid-adapter.d.ts +34 -0
- package/dist/targets/droid-adapter.d.ts.map +1 -0
- package/dist/targets/droid-adapter.js +174 -0
- package/dist/targets/droid-adapter.js.map +1 -0
- package/dist/targets/droid-config-manager.d.ts +33 -0
- package/dist/targets/droid-config-manager.d.ts.map +1 -0
- package/dist/targets/droid-config-manager.js +387 -0
- package/dist/targets/droid-config-manager.js.map +1 -0
- package/dist/targets/droid-detector.d.ts +25 -0
- package/dist/targets/droid-detector.d.ts.map +1 -0
- package/dist/targets/droid-detector.js +140 -0
- package/dist/targets/droid-detector.js.map +1 -0
- package/dist/targets/index.d.ts +14 -0
- package/dist/targets/index.d.ts.map +1 -0
- package/dist/targets/index.js +31 -0
- package/dist/targets/index.js.map +1 -0
- package/dist/targets/target-adapter.d.ts +83 -0
- package/dist/targets/target-adapter.d.ts.map +1 -0
- package/dist/targets/target-adapter.js +9 -0
- package/dist/targets/target-adapter.js.map +1 -0
- package/dist/targets/target-registry.d.ts +30 -0
- package/dist/targets/target-registry.d.ts.map +1 -0
- package/dist/targets/target-registry.js +53 -0
- package/dist/targets/target-registry.js.map +1 -0
- package/dist/targets/target-resolver.d.ts +26 -0
- package/dist/targets/target-resolver.d.ts.map +1 -0
- package/dist/targets/target-resolver.js +146 -0
- package/dist/targets/target-resolver.js.map +1 -0
- package/dist/types/config.d.ts +2 -1
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/config.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/profile.d.ts +5 -0
- package/dist/types/profile.d.ts.map +1 -0
- package/dist/types/profile.js +3 -0
- package/dist/types/profile.js.map +1 -0
- package/dist/ui/assets/{accounts-B8J62kJ6.js → accounts-5ui2q53B.js} +1 -1
- package/dist/ui/assets/{alert-dialog-B5t_5_UL.js → alert-dialog-C3jFRTwI.js} +1 -1
- package/dist/ui/assets/{api-DuZyDFf7.js → api-6SoxBYSB.js} +1 -1
- package/dist/ui/assets/{auth-section-Dnaxf97q.js → auth-section-BDHHhE6e.js} +1 -1
- package/dist/ui/assets/{backups-section-DUIq9Rxi.js → backups-section-CS06Tg2f.js} +1 -1
- package/dist/ui/assets/cliproxy-CUrdHMT1.js +3 -0
- package/dist/ui/assets/cliproxy-control-panel--ldkVsyK.js +1 -0
- package/dist/ui/assets/{confirm-dialog-D7hNt3ez.js → confirm-dialog-DjChZijF.js} +1 -1
- package/dist/ui/assets/copilot-vgXbgIvI.js +3 -0
- package/dist/ui/assets/cursor-BajLT9y0.js +1 -0
- package/dist/ui/assets/default-ports-1QQSffYX.js +1 -0
- package/dist/ui/assets/{globalenv-section-DuUcheRN.js → globalenv-section-Dsdb7zOK.js} +1 -1
- package/dist/ui/assets/{health-Ddkl8zIJ.js → health-BJuP8omT.js} +1 -1
- package/dist/ui/assets/index-BBNL3emu.css +1 -0
- package/dist/ui/assets/index-Bf5t_D35.js +1 -0
- package/dist/ui/assets/{index-BRCdKMse.js → index-Br-F473I.js} +1 -1
- package/dist/ui/assets/{index-D0I8OsQ3.js → index-DLdcTG-c.js} +1 -1
- package/dist/ui/assets/index-sBSBwu__.js +1 -0
- package/dist/ui/assets/index-uj-gfqVW.js +47 -0
- package/dist/ui/assets/providers/kimi.svg +1 -0
- package/dist/ui/assets/{proxy-status-widget-DKYj4dWI.js → proxy-status-widget-C9OwEWsC.js} +1 -1
- package/dist/ui/assets/{separator-DrDw3JjB.js → separator-DIHMuj2A.js} +1 -1
- package/dist/ui/assets/{shared-psG1uSqB.js → shared-B9g38Klw.js} +1 -1
- package/dist/ui/assets/{switch-C0ri2ChT.js → switch-Db-uyN1u.js} +1 -1
- package/dist/ui/index.html +2 -2
- package/dist/utils/shell-executor.d.ts.map +1 -1
- package/dist/utils/shell-executor.js +32 -10
- package/dist/utils/shell-executor.js.map +1 -1
- package/dist/utils/signal-forwarder.d.ts +23 -0
- package/dist/utils/signal-forwarder.d.ts.map +1 -0
- package/dist/utils/signal-forwarder.js +70 -0
- package/dist/utils/signal-forwarder.js.map +1 -0
- package/dist/web-server/jsonl-parser.d.ts +1 -0
- package/dist/web-server/jsonl-parser.d.ts.map +1 -1
- package/dist/web-server/jsonl-parser.js +3 -0
- package/dist/web-server/jsonl-parser.js.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.js +2 -1
- package/dist/web-server/routes/cliproxy-stats-routes.js.map +1 -1
- package/dist/web-server/routes/proxy-routes.d.ts.map +1 -1
- package/dist/web-server/routes/proxy-routes.js +2 -1
- package/dist/web-server/routes/proxy-routes.js.map +1 -1
- package/dist/web-server/usage/data-aggregator.d.ts.map +1 -1
- package/dist/web-server/usage/data-aggregator.js +7 -1
- package/dist/web-server/usage/data-aggregator.js.map +1 -1
- package/dist/web-server/usage/handlers.d.ts.map +1 -1
- package/dist/web-server/usage/handlers.js +1 -0
- package/dist/web-server/usage/handlers.js.map +1 -1
- package/dist/web-server/usage/types.d.ts +2 -0
- package/dist/web-server/usage/types.d.ts.map +1 -1
- package/package.json +5 -2
- package/dist/ui/assets/cliproxy-aK19VC4f.js +0 -3
- package/dist/ui/assets/cliproxy-control-panel-9OS_kdTh.js +0 -1
- package/dist/ui/assets/copilot-B5dVoOMQ.js +0 -3
- package/dist/ui/assets/cursor-4zDGbBRA.js +0 -1
- package/dist/ui/assets/index-BRxqvMyp.js +0 -1
- package/dist/ui/assets/index-C6u1zYVL.css +0 -1
- package/dist/ui/assets/index-DOxNxHpI.js +0 -1
- package/dist/ui/assets/index-Dv5jtphl.js +0 -47
|
@@ -1,68 +1,149 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mapExternalProviderName = exports.getOAuthCallbackPort = exports.getOAuthFlowType = exports.getProvidersByOAuthFlow = exports.getProviderDisplayName = exports.getProviderCapabilities = exports.isCLIProxyProvider = exports.CLIPROXY_PROVIDER_IDS = exports.PROVIDER_CAPABILITIES = void 0;
|
|
3
|
+
exports.mapExternalProviderName = exports.getProviderTokenTypeValues = exports.getProviderAuthFilePrefixes = exports.isRefreshDelegatedToCLIProxy = exports.getTokenRefreshOwnership = exports.getCLIProxyAuthUrlProviderName = exports.getCLIProxyCallbackProviderName = exports.getOAuthCallbackPort = exports.getOAuthFlowType = exports.getProvidersByOAuthFlow = exports.getProviderDescription = exports.getProviderDisplayName = exports.getProviderCapabilities = exports.isCLIProxyProvider = exports.buildProviderAliasMap = exports.buildProviderMap = exports.CLIPROXY_PROVIDER_IDS = exports.PROVIDER_CAPABILITIES = void 0;
|
|
4
4
|
exports.PROVIDER_CAPABILITIES = {
|
|
5
5
|
gemini: {
|
|
6
6
|
displayName: 'Google Gemini',
|
|
7
|
+
description: 'Gemini Pro/Flash models',
|
|
7
8
|
oauthFlow: 'authorization_code',
|
|
8
9
|
callbackPort: 8085,
|
|
10
|
+
callbackProviderName: 'gemini',
|
|
11
|
+
authUrlProviderName: 'gemini-cli',
|
|
12
|
+
refreshOwnership: 'ccs',
|
|
13
|
+
authFilePrefixes: ['gemini-', 'google-'],
|
|
14
|
+
tokenTypeValues: ['gemini'],
|
|
9
15
|
aliases: ['gemini-cli'],
|
|
10
16
|
},
|
|
11
17
|
codex: {
|
|
12
|
-
displayName: 'Codex',
|
|
18
|
+
displayName: 'OpenAI Codex',
|
|
19
|
+
description: 'GPT-4 and codex models',
|
|
13
20
|
oauthFlow: 'authorization_code',
|
|
14
21
|
callbackPort: 1455,
|
|
22
|
+
callbackProviderName: 'codex',
|
|
23
|
+
authUrlProviderName: 'codex',
|
|
24
|
+
refreshOwnership: 'cliproxy',
|
|
25
|
+
authFilePrefixes: ['codex-', 'openai-'],
|
|
26
|
+
tokenTypeValues: ['codex'],
|
|
15
27
|
aliases: [],
|
|
16
28
|
},
|
|
17
29
|
agy: {
|
|
18
|
-
displayName: '
|
|
30
|
+
displayName: 'Antigravity',
|
|
31
|
+
description: 'Antigravity AI models',
|
|
19
32
|
oauthFlow: 'authorization_code',
|
|
20
33
|
callbackPort: 51121,
|
|
34
|
+
callbackProviderName: 'antigravity',
|
|
35
|
+
authUrlProviderName: 'antigravity',
|
|
36
|
+
refreshOwnership: 'cliproxy',
|
|
37
|
+
authFilePrefixes: ['antigravity-', 'agy-'],
|
|
38
|
+
tokenTypeValues: ['antigravity'],
|
|
21
39
|
aliases: ['antigravity'],
|
|
22
40
|
},
|
|
23
41
|
qwen: {
|
|
24
|
-
displayName: 'Qwen',
|
|
42
|
+
displayName: 'Alibaba Qwen',
|
|
43
|
+
description: 'Qwen Code models',
|
|
25
44
|
oauthFlow: 'device_code',
|
|
26
45
|
callbackPort: null,
|
|
46
|
+
callbackProviderName: 'qwen',
|
|
47
|
+
authUrlProviderName: 'qwen',
|
|
48
|
+
refreshOwnership: 'cliproxy',
|
|
49
|
+
authFilePrefixes: ['qwen-'],
|
|
50
|
+
tokenTypeValues: ['qwen'],
|
|
27
51
|
aliases: [],
|
|
28
52
|
},
|
|
29
53
|
iflow: {
|
|
30
54
|
displayName: 'iFlow',
|
|
55
|
+
description: 'iFlow AI models',
|
|
31
56
|
oauthFlow: 'authorization_code',
|
|
32
57
|
callbackPort: 11451,
|
|
58
|
+
callbackProviderName: 'iflow',
|
|
59
|
+
authUrlProviderName: 'iflow',
|
|
60
|
+
refreshOwnership: 'cliproxy',
|
|
61
|
+
authFilePrefixes: ['iflow-'],
|
|
62
|
+
tokenTypeValues: ['iflow'],
|
|
33
63
|
aliases: [],
|
|
34
64
|
},
|
|
35
65
|
kiro: {
|
|
36
66
|
displayName: 'Kiro (AWS)',
|
|
67
|
+
description: 'AWS CodeWhisperer models',
|
|
37
68
|
oauthFlow: 'device_code',
|
|
38
69
|
callbackPort: null,
|
|
70
|
+
callbackProviderName: 'kiro',
|
|
71
|
+
authUrlProviderName: 'kiro',
|
|
72
|
+
refreshOwnership: 'cliproxy',
|
|
73
|
+
authFilePrefixes: ['kiro-', 'aws-', 'codewhisperer-'],
|
|
74
|
+
tokenTypeValues: ['kiro', 'codewhisperer'],
|
|
39
75
|
aliases: ['codewhisperer'],
|
|
40
76
|
},
|
|
41
77
|
ghcp: {
|
|
42
78
|
displayName: 'GitHub Copilot (OAuth)',
|
|
79
|
+
description: 'GitHub Copilot via OAuth',
|
|
43
80
|
oauthFlow: 'device_code',
|
|
44
81
|
callbackPort: null,
|
|
82
|
+
callbackProviderName: 'copilot',
|
|
83
|
+
authUrlProviderName: 'github',
|
|
84
|
+
refreshOwnership: 'cliproxy',
|
|
85
|
+
authFilePrefixes: ['github-copilot-', 'copilot-', 'gh-'],
|
|
86
|
+
tokenTypeValues: ['github-copilot', 'copilot'],
|
|
45
87
|
aliases: ['github-copilot', 'copilot'],
|
|
46
88
|
},
|
|
47
89
|
claude: {
|
|
48
|
-
displayName: 'Claude',
|
|
90
|
+
displayName: 'Claude (Anthropic)',
|
|
91
|
+
description: 'Claude Opus/Sonnet models',
|
|
49
92
|
oauthFlow: 'authorization_code',
|
|
50
93
|
callbackPort: 54545,
|
|
94
|
+
callbackProviderName: 'anthropic',
|
|
95
|
+
authUrlProviderName: 'anthropic',
|
|
96
|
+
refreshOwnership: 'unsupported',
|
|
97
|
+
authFilePrefixes: ['claude-', 'anthropic-'],
|
|
98
|
+
tokenTypeValues: ['claude', 'anthropic'],
|
|
51
99
|
aliases: ['anthropic'],
|
|
52
100
|
},
|
|
101
|
+
kimi: {
|
|
102
|
+
displayName: 'Kimi (Moonshot)',
|
|
103
|
+
description: 'Moonshot AI K2/K2.5 models',
|
|
104
|
+
oauthFlow: 'device_code',
|
|
105
|
+
callbackPort: null,
|
|
106
|
+
callbackProviderName: 'kimi',
|
|
107
|
+
authUrlProviderName: 'kimi',
|
|
108
|
+
refreshOwnership: 'cliproxy',
|
|
109
|
+
authFilePrefixes: ['kimi-'],
|
|
110
|
+
tokenTypeValues: ['kimi'],
|
|
111
|
+
aliases: ['moonshot'],
|
|
112
|
+
},
|
|
53
113
|
};
|
|
54
114
|
exports.CLIPROXY_PROVIDER_IDS = Object.freeze(Object.keys(exports.PROVIDER_CAPABILITIES));
|
|
115
|
+
function buildProviderMap(valueFor) {
|
|
116
|
+
return exports.CLIPROXY_PROVIDER_IDS.reduce((acc, provider) => {
|
|
117
|
+
acc[provider] = valueFor(provider);
|
|
118
|
+
return acc;
|
|
119
|
+
}, {});
|
|
120
|
+
}
|
|
121
|
+
exports.buildProviderMap = buildProviderMap;
|
|
55
122
|
const PROVIDER_ID_SET = new Set(exports.CLIPROXY_PROVIDER_IDS);
|
|
56
|
-
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
123
|
+
function buildProviderAliasMap(capabilities = exports.PROVIDER_CAPABILITIES) {
|
|
124
|
+
const aliasMap = new Map();
|
|
125
|
+
const providers = Object.keys(capabilities);
|
|
126
|
+
const registerAlias = (alias, provider) => {
|
|
127
|
+
const normalized = alias.trim().toLowerCase();
|
|
128
|
+
if (!normalized) {
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
131
|
+
const existingProvider = aliasMap.get(normalized);
|
|
132
|
+
if (existingProvider && existingProvider !== provider) {
|
|
133
|
+
throw new Error(`Provider alias collision for "${normalized}": ${existingProvider} and ${provider}`);
|
|
134
|
+
}
|
|
135
|
+
aliasMap.set(normalized, provider);
|
|
136
|
+
};
|
|
137
|
+
for (const provider of providers) {
|
|
138
|
+
registerAlias(provider, provider);
|
|
139
|
+
for (const alias of capabilities[provider].aliases) {
|
|
140
|
+
registerAlias(alias, provider);
|
|
62
141
|
}
|
|
63
142
|
}
|
|
64
|
-
return
|
|
65
|
-
}
|
|
143
|
+
return aliasMap;
|
|
144
|
+
}
|
|
145
|
+
exports.buildProviderAliasMap = buildProviderAliasMap;
|
|
146
|
+
const PROVIDER_ALIAS_MAP = buildProviderAliasMap();
|
|
66
147
|
function isCLIProxyProvider(provider) {
|
|
67
148
|
return PROVIDER_ID_SET.has(provider);
|
|
68
149
|
}
|
|
@@ -75,6 +156,10 @@ function getProviderDisplayName(provider) {
|
|
|
75
156
|
return exports.PROVIDER_CAPABILITIES[provider].displayName;
|
|
76
157
|
}
|
|
77
158
|
exports.getProviderDisplayName = getProviderDisplayName;
|
|
159
|
+
function getProviderDescription(provider) {
|
|
160
|
+
return exports.PROVIDER_CAPABILITIES[provider].description;
|
|
161
|
+
}
|
|
162
|
+
exports.getProviderDescription = getProviderDescription;
|
|
78
163
|
function getProvidersByOAuthFlow(flowType) {
|
|
79
164
|
return exports.CLIPROXY_PROVIDER_IDS.filter((provider) => exports.PROVIDER_CAPABILITIES[provider].oauthFlow === flowType);
|
|
80
165
|
}
|
|
@@ -87,6 +172,30 @@ function getOAuthCallbackPort(provider) {
|
|
|
87
172
|
return exports.PROVIDER_CAPABILITIES[provider].callbackPort;
|
|
88
173
|
}
|
|
89
174
|
exports.getOAuthCallbackPort = getOAuthCallbackPort;
|
|
175
|
+
function getCLIProxyCallbackProviderName(provider) {
|
|
176
|
+
return exports.PROVIDER_CAPABILITIES[provider].callbackProviderName;
|
|
177
|
+
}
|
|
178
|
+
exports.getCLIProxyCallbackProviderName = getCLIProxyCallbackProviderName;
|
|
179
|
+
function getCLIProxyAuthUrlProviderName(provider) {
|
|
180
|
+
return exports.PROVIDER_CAPABILITIES[provider].authUrlProviderName;
|
|
181
|
+
}
|
|
182
|
+
exports.getCLIProxyAuthUrlProviderName = getCLIProxyAuthUrlProviderName;
|
|
183
|
+
function getTokenRefreshOwnership(provider) {
|
|
184
|
+
return exports.PROVIDER_CAPABILITIES[provider].refreshOwnership;
|
|
185
|
+
}
|
|
186
|
+
exports.getTokenRefreshOwnership = getTokenRefreshOwnership;
|
|
187
|
+
function isRefreshDelegatedToCLIProxy(provider) {
|
|
188
|
+
return exports.PROVIDER_CAPABILITIES[provider].refreshOwnership === 'cliproxy';
|
|
189
|
+
}
|
|
190
|
+
exports.isRefreshDelegatedToCLIProxy = isRefreshDelegatedToCLIProxy;
|
|
191
|
+
function getProviderAuthFilePrefixes(provider) {
|
|
192
|
+
return exports.PROVIDER_CAPABILITIES[provider].authFilePrefixes;
|
|
193
|
+
}
|
|
194
|
+
exports.getProviderAuthFilePrefixes = getProviderAuthFilePrefixes;
|
|
195
|
+
function getProviderTokenTypeValues(provider) {
|
|
196
|
+
return exports.PROVIDER_CAPABILITIES[provider].tokenTypeValues;
|
|
197
|
+
}
|
|
198
|
+
exports.getProviderTokenTypeValues = getProviderTokenTypeValues;
|
|
90
199
|
function mapExternalProviderName(providerName) {
|
|
91
200
|
const normalized = providerName.toLowerCase();
|
|
92
201
|
return PROVIDER_ALIAS_MAP.get(normalized) ?? null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-capabilities.js","sourceRoot":"","sources":["../../src/cliproxy/provider-capabilities.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"provider-capabilities.js","sourceRoot":"","sources":["../../src/cliproxy/provider-capabilities.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Fetches quota information from ChatGPT backend API.
|
|
5
5
|
* Used for displaying rate limit windows and reset times.
|
|
6
6
|
*/
|
|
7
|
-
import type { CodexQuotaResult, CodexQuotaWindow } from './quota-types';
|
|
7
|
+
import type { CodexQuotaResult, CodexQuotaWindow, CodexCoreUsageSummary } from './quota-types';
|
|
8
8
|
/** Auth data extracted from Codex auth file */
|
|
9
9
|
interface CodexAuthData {
|
|
10
10
|
accessToken: string;
|
|
@@ -35,6 +35,12 @@ interface CodexWindowData {
|
|
|
35
35
|
reset_after_seconds?: number | null;
|
|
36
36
|
resetAfterSeconds?: number | null;
|
|
37
37
|
}
|
|
38
|
+
declare function getUnknownCodexWindowLabels(windows: CodexQuotaWindow[]): string[];
|
|
39
|
+
/**
|
|
40
|
+
* Build explicit 5h + weekly usage summary from raw Codex windows.
|
|
41
|
+
* Falls back to shortest/longest reset windows if API labels change.
|
|
42
|
+
*/
|
|
43
|
+
export declare function buildCodexCoreUsageSummary(windows: CodexQuotaWindow[]): CodexCoreUsageSummary;
|
|
38
44
|
/**
|
|
39
45
|
* Read auth data from Codex auth file
|
|
40
46
|
*/
|
|
@@ -62,5 +68,5 @@ export declare function fetchAllCodexQuotas(verbose?: boolean): Promise<{
|
|
|
62
68
|
account: string;
|
|
63
69
|
quota: CodexQuotaResult;
|
|
64
70
|
}[]>;
|
|
65
|
-
export { readCodexAuthData, buildCodexQuotaWindows };
|
|
71
|
+
export { readCodexAuthData, buildCodexQuotaWindows, getUnknownCodexWindowLabels };
|
|
66
72
|
//# sourceMappingURL=quota-fetcher-codex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-fetcher-codex.d.ts","sourceRoot":"","sources":["../../src/cliproxy/quota-fetcher-codex.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"quota-fetcher-codex.d.ts","sourceRoot":"","sources":["../../src/cliproxy/quota-fetcher-codex.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAa/F,+CAA+C;AAC/C,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,iCAAiC;AACjC,UAAU,kBAAkB;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,SAAS,CAAC,EAAE,oBAAoB,CAAC;IACjC,sBAAsB,CAAC,EAAE,oBAAoB,CAAC;IAC9C,mBAAmB,CAAC,EAAE,oBAAoB,CAAC;CAC5C;AAED,iCAAiC;AACjC,UAAU,oBAAoB;IAC5B,cAAc,CAAC,EAAE,eAAe,CAAC;IACjC,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,gBAAgB,CAAC,EAAE,eAAe,CAAC;IACnC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,6BAA6B;AAC7B,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AA2BD,iBAAS,2BAA2B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,EAAE,CAM1E;AAQD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,qBAAqB,CA8D7F;AAED;;GAEG;AACH,iBAAS,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAkDlE;AAED;;;GAGG;AACH,iBAAS,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,GAAG,gBAAgB,EAAE,CAmD/E;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,OAAO,UAAQ,GACd,OAAO,CAAC,gBAAgB,CAAC,CAsL3B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,UAAQ,GACd,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,gBAAgB,CAAA;CAAE,EAAE,CAAC,CAezD;AAGD,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,CAAC"}
|
|
@@ -29,7 +29,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
29
29
|
return result;
|
|
30
30
|
};
|
|
31
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
32
|
-
exports.buildCodexQuotaWindows = exports.readCodexAuthData = exports.fetchAllCodexQuotas = exports.fetchCodexQuota = void 0;
|
|
32
|
+
exports.getUnknownCodexWindowLabels = exports.buildCodexQuotaWindows = exports.readCodexAuthData = exports.fetchAllCodexQuotas = exports.fetchCodexQuota = exports.buildCodexCoreUsageSummary = void 0;
|
|
33
33
|
const fs = __importStar(require("node:fs"));
|
|
34
34
|
const path = __importStar(require("node:path"));
|
|
35
35
|
const config_generator_1 = require("./config-generator");
|
|
@@ -44,6 +44,99 @@ const CODEX_QUOTA_MAX_ATTEMPTS = 2;
|
|
|
44
44
|
* Update when Codex CLI releases new versions to maintain compatibility.
|
|
45
45
|
*/
|
|
46
46
|
const USER_AGENT = 'codex_cli_rs/0.76.0 (Debian 13.0.0; x86_64) WindowsTerminal';
|
|
47
|
+
function getCodexWindowKind(label) {
|
|
48
|
+
const lower = (label || '').toLowerCase();
|
|
49
|
+
const isCodeReview = lower.includes('code review') || lower.includes('code_review');
|
|
50
|
+
const isPrimary = lower.includes('primary');
|
|
51
|
+
const isSecondary = lower.includes('secondary');
|
|
52
|
+
if (isCodeReview) {
|
|
53
|
+
if (isPrimary)
|
|
54
|
+
return 'code-review-5h';
|
|
55
|
+
if (isSecondary)
|
|
56
|
+
return 'code-review-weekly';
|
|
57
|
+
return 'code-review';
|
|
58
|
+
}
|
|
59
|
+
if (isPrimary)
|
|
60
|
+
return 'usage-5h';
|
|
61
|
+
if (isSecondary)
|
|
62
|
+
return 'usage-weekly';
|
|
63
|
+
return 'unknown';
|
|
64
|
+
}
|
|
65
|
+
function getUnknownCodexWindowLabels(windows) {
|
|
66
|
+
const unknownLabels = windows
|
|
67
|
+
.filter((window) => getCodexWindowKind(window.label) === 'unknown')
|
|
68
|
+
.map((window) => window.label)
|
|
69
|
+
.filter((label) => typeof label === 'string' && label.trim().length > 0);
|
|
70
|
+
return Array.from(new Set(unknownLabels));
|
|
71
|
+
}
|
|
72
|
+
exports.getUnknownCodexWindowLabels = getUnknownCodexWindowLabels;
|
|
73
|
+
function shouldLogCodexWindowWarnings(verbose) {
|
|
74
|
+
if (verbose)
|
|
75
|
+
return true;
|
|
76
|
+
const debugFlag = process.env['CCS_DEBUG'];
|
|
77
|
+
return debugFlag === '1' || debugFlag === 'true';
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Build explicit 5h + weekly usage summary from raw Codex windows.
|
|
81
|
+
* Falls back to shortest/longest reset windows if API labels change.
|
|
82
|
+
*/
|
|
83
|
+
function buildCodexCoreUsageSummary(windows) {
|
|
84
|
+
if (!windows || windows.length === 0) {
|
|
85
|
+
return { fiveHour: null, weekly: null };
|
|
86
|
+
}
|
|
87
|
+
let fiveHourWindow = null;
|
|
88
|
+
let weeklyWindow = null;
|
|
89
|
+
const nonCodeReviewWindows = [];
|
|
90
|
+
for (const window of windows) {
|
|
91
|
+
const kind = getCodexWindowKind(window.label);
|
|
92
|
+
if (kind === 'usage-5h') {
|
|
93
|
+
if (!fiveHourWindow)
|
|
94
|
+
fiveHourWindow = window;
|
|
95
|
+
nonCodeReviewWindows.push(window);
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
if (kind === 'usage-weekly') {
|
|
99
|
+
if (!weeklyWindow)
|
|
100
|
+
weeklyWindow = window;
|
|
101
|
+
nonCodeReviewWindows.push(window);
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
if (kind === 'unknown') {
|
|
105
|
+
nonCodeReviewWindows.push(window);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
if ((!fiveHourWindow || !weeklyWindow) && nonCodeReviewWindows.length > 0) {
|
|
109
|
+
const withReset = nonCodeReviewWindows
|
|
110
|
+
.filter((w) => typeof w.resetAfterSeconds === 'number' &&
|
|
111
|
+
isFinite(w.resetAfterSeconds) &&
|
|
112
|
+
w.resetAfterSeconds >= 0)
|
|
113
|
+
.sort((a, b) => (a.resetAfterSeconds || 0) - (b.resetAfterSeconds || 0));
|
|
114
|
+
if (!fiveHourWindow) {
|
|
115
|
+
fiveHourWindow = withReset[0] || nonCodeReviewWindows[0] || null;
|
|
116
|
+
}
|
|
117
|
+
if (!weeklyWindow) {
|
|
118
|
+
weeklyWindow =
|
|
119
|
+
withReset.length > 1
|
|
120
|
+
? withReset[withReset.length - 1]
|
|
121
|
+
: nonCodeReviewWindows.find((w) => w !== fiveHourWindow) || null;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
const mapWindow = (window) => {
|
|
125
|
+
if (!window)
|
|
126
|
+
return null;
|
|
127
|
+
return {
|
|
128
|
+
label: window.label,
|
|
129
|
+
remainingPercent: window.remainingPercent,
|
|
130
|
+
resetAfterSeconds: window.resetAfterSeconds,
|
|
131
|
+
resetAt: window.resetAt,
|
|
132
|
+
};
|
|
133
|
+
};
|
|
134
|
+
return {
|
|
135
|
+
fiveHour: mapWindow(fiveHourWindow),
|
|
136
|
+
weekly: mapWindow(weeklyWindow),
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
exports.buildCodexCoreUsageSummary = buildCodexCoreUsageSummary;
|
|
47
140
|
/**
|
|
48
141
|
* Read auth data from Codex auth file
|
|
49
142
|
*/
|
|
@@ -256,6 +349,12 @@ async function fetchCodexQuota(accountId, verbose = false) {
|
|
|
256
349
|
}
|
|
257
350
|
const data = (await response.json());
|
|
258
351
|
const windows = buildCodexQuotaWindows(data);
|
|
352
|
+
const unknownWindowLabels = getUnknownCodexWindowLabels(windows);
|
|
353
|
+
if (unknownWindowLabels.length > 0 && shouldLogCodexWindowWarnings(verbose)) {
|
|
354
|
+
console.error(`[!] Codex quota detected unknown window labels: ${unknownWindowLabels.join(', ')}`);
|
|
355
|
+
console.error(' Window classification may need an update for upstream API changes.');
|
|
356
|
+
}
|
|
357
|
+
const coreUsage = buildCodexCoreUsageSummary(windows);
|
|
259
358
|
// Extract plan type
|
|
260
359
|
const planTypeRaw = data.plan_type || data.planType;
|
|
261
360
|
let planType = null;
|
|
@@ -273,6 +372,7 @@ async function fetchCodexQuota(accountId, verbose = false) {
|
|
|
273
372
|
return {
|
|
274
373
|
success: true,
|
|
275
374
|
windows,
|
|
375
|
+
coreUsage,
|
|
276
376
|
planType,
|
|
277
377
|
lastUpdated: Date.now(),
|
|
278
378
|
accountId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-fetcher-codex.js","sourceRoot":"","sources":["../../src/cliproxy/quota-fetcher-codex.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"quota-fetcher-codex.js","sourceRoot":"","sources":["../../src/cliproxy/quota-fetcher-codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,24 @@ export interface CodexQuotaWindow {
|
|
|
22
22
|
/** ISO timestamp when quota resets, null if unknown */
|
|
23
23
|
resetAt: string | null;
|
|
24
24
|
}
|
|
25
|
+
/** Core Codex usage window (5h/weekly) extracted from raw windows */
|
|
26
|
+
export interface CodexCoreUsageWindow {
|
|
27
|
+
/** Source window label */
|
|
28
|
+
label: string;
|
|
29
|
+
/** Percentage remaining (0-100) */
|
|
30
|
+
remainingPercent: number;
|
|
31
|
+
/** Seconds until quota resets, null if unknown */
|
|
32
|
+
resetAfterSeconds: number | null;
|
|
33
|
+
/** ISO timestamp when quota resets, null if unknown */
|
|
34
|
+
resetAt: string | null;
|
|
35
|
+
}
|
|
36
|
+
/** Core Codex usage summary with explicit 5h and weekly windows */
|
|
37
|
+
export interface CodexCoreUsageSummary {
|
|
38
|
+
/** Short-cycle usage limit window (typically 5h) */
|
|
39
|
+
fiveHour: CodexCoreUsageWindow | null;
|
|
40
|
+
/** Long-cycle usage limit window (typically weekly) */
|
|
41
|
+
weekly: CodexCoreUsageWindow | null;
|
|
42
|
+
}
|
|
25
43
|
/**
|
|
26
44
|
* Codex quota fetch result
|
|
27
45
|
*/
|
|
@@ -30,6 +48,8 @@ export interface CodexQuotaResult {
|
|
|
30
48
|
success: boolean;
|
|
31
49
|
/** Quota windows (primary, secondary, code review) */
|
|
32
50
|
windows: CodexQuotaWindow[];
|
|
51
|
+
/** Explicit core usage windows (5h + weekly) for easier reset display */
|
|
52
|
+
coreUsage?: CodexCoreUsageSummary;
|
|
33
53
|
/** Plan type: free, plus, team, or null if unknown */
|
|
34
54
|
planType: 'free' | 'plus' | 'team' | null;
|
|
35
55
|
/** Timestamp of fetch */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-types.d.ts","sourceRoot":"","sources":["../../src/cliproxy/quota-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,gCAAgC;AAChC,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAGvD,YAAY,EAAE,WAAW,IAAI,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,+FAA+F;IAC/F,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,+CAA+C;IAC/C,gBAAgB,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,uDAAuD;IACvD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,sDAAsD;IACtD,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,sDAAsD;IACtD,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1C,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kFAAkF;IAClF,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,EAAE,EAAE,MAAM,CAAC;IACX,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,yDAAyD;IACzD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,wCAAwC;IACxC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,4CAA4C;IAC5C,gBAAgB,EAAE,MAAM,CAAC;IACzB,uDAAuD;IACvD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,sCAAsC;IACtC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}
|
|
1
|
+
{"version":3,"file":"quota-types.d.ts","sourceRoot":"","sources":["../../src/cliproxy/quota-types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,gCAAgC;AAChC,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AAGvD,YAAY,EAAE,WAAW,IAAI,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,+FAA+F;IAC/F,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,+CAA+C;IAC/C,gBAAgB,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,uDAAuD;IACvD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,qEAAqE;AACrE,MAAM,WAAW,oBAAoB;IACnC,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,mCAAmC;IACnC,gBAAgB,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,uDAAuD;IACvD,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,mEAAmE;AACnE,MAAM,WAAW,qBAAqB;IACpC,oDAAoD;IACpD,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACtC,uDAAuD;IACvD,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACrC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,sDAAsD;IACtD,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,yEAAyE;IACzE,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,sDAAsD;IACtD,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1C,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kFAAkF;IAClF,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,oEAAoE;IACpE,EAAE,EAAE,MAAM,CAAC;IACX,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,yDAAyD;IACzD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,wCAAwC;IACxC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,4CAA4C;IAC5C,gBAAgB,EAAE,MAAM,CAAC;IACzB,uDAAuD;IACvD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,4CAA4C;IAC5C,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,sCAAsC;IACtC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}
|
|
@@ -23,6 +23,10 @@ interface SessionLock {
|
|
|
23
23
|
version?: string;
|
|
24
24
|
/** Backend type running (original vs plus) */
|
|
25
25
|
backend?: 'original' | 'plus';
|
|
26
|
+
/** Target summary for active sessions ('mixed' when multiple targets share the proxy) */
|
|
27
|
+
target?: string;
|
|
28
|
+
/** Per-session target metadata */
|
|
29
|
+
sessionTargets?: Record<string, string>;
|
|
26
30
|
}
|
|
27
31
|
/** Get path to session lock file (default port) - kept for future use */
|
|
28
32
|
declare function _getSessionLockPath(): string;
|
|
@@ -44,7 +48,7 @@ export declare function getExistingProxy(port: number): SessionLock | null;
|
|
|
44
48
|
* @param backend Optional backend type (original vs plus)
|
|
45
49
|
* @returns Session ID for this session
|
|
46
50
|
*/
|
|
47
|
-
export declare function registerSession(port: number, proxyPid: number, version?: string, backend?: 'original' | 'plus'): string;
|
|
51
|
+
export declare function registerSession(port: number, proxyPid: number, version?: string, backend?: 'original' | 'plus', target?: string): string;
|
|
48
52
|
/**
|
|
49
53
|
* Unregister a session from the proxy.
|
|
50
54
|
* @param sessionId Session ID to unregister
|
|
@@ -90,6 +94,7 @@ export declare function getProxyStatus(port?: number): {
|
|
|
90
94
|
sessionCount?: number;
|
|
91
95
|
startedAt?: string;
|
|
92
96
|
version?: string;
|
|
97
|
+
target?: string;
|
|
93
98
|
};
|
|
94
99
|
/**
|
|
95
100
|
* Get the version of the running proxy from session lock.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-tracker.d.ts","sourceRoot":"","sources":["../../src/cliproxy/session-tracker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"session-tracker.d.ts","sourceRoot":"","sources":["../../src/cliproxy/session-tracker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,kCAAkC;AAClC,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;IAC9B,yFAAyF;IACzF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kCAAkC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;AA2CD,yEAAyE;AACzE,iBAAS,mBAAmB,IAAI,MAAM,CAErC;AAGD,OAAO,EAAE,mBAAmB,IAAI,kBAAkB,EAAE,CAAC;AAGrD,OAAO,EAAE,wBAAwB,EAAE,CAAC;AAmDpC,iDAAiD;AACjD,iBAAS,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CASpD;AAyCD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAmBjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,UAAU,GAAG,MAAM,EAC7B,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CA+BR;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CA+D3E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,GAAE,MAA8B,GAAG,MAAM,CAM5E;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,MAA8B,GAAG,OAAO,CAa/E;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAe1D;AAED;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,IAAI,GAAE,MAA8B,GAAG,OAAO,CAAC;IAC7E,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAkFD;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,GAAE,MAA8B,GAAG;IACpE,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAsBA;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,GAAE,MAA8B,GAAG,MAAM,GAAG,IAAI,CAa1F"}
|