@kaitranntt/ccs 7.66.0 → 7.66.1-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/dist/ccs.js +3 -0
- 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/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/executor/index.d.ts +5 -0
- package/dist/cliproxy/executor/index.d.ts.map +1 -1
- package/dist/cliproxy/executor/index.js +114 -8
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/commands/command-catalog.d.ts +1 -1
- package/dist/commands/command-catalog.d.ts.map +1 -1
- package/dist/commands/command-catalog.js +1 -0
- 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 +9 -1
- package/dist/commands/completion-backend.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 +58 -0
- package/dist/commands/help-command.js.map +1 -1
- package/dist/ui/assets/{accounts-BjfPKR8m.js → accounts-BUBaJvX6.js} +1 -1
- package/dist/ui/assets/{alert-dialog-Dh2NUFdm.js → alert-dialog-BSHMTH4-.js} +1 -1
- package/dist/ui/assets/{api-C-3mQCFf.js → api-ChLCuNLU.js} +1 -1
- package/dist/ui/assets/{auth-section-Dp10_YyD.js → auth-section-BhmOD3zG.js} +1 -1
- package/dist/ui/assets/{backups-section-C0jF8MP1.js → backups-section-Bi22P9k4.js} +1 -1
- package/dist/ui/assets/{channels-CkXuK5i7.js → channels-BzYyOP0U.js} +1 -1
- package/dist/ui/assets/{checkbox-tA5FH8Ol.js → checkbox-DXj-4eLk.js} +1 -1
- package/dist/ui/assets/{claude-extension-Bg2ZkzMz.js → claude-extension-Bh9pF8rf.js} +1 -1
- package/dist/ui/assets/{cliproxy-ai-providers-DBSXTTyw.js → cliproxy-ai-providers-C5Kw8KgM.js} +6 -6
- package/dist/ui/assets/{cliproxy-control-panel-Da-sGGyI.js → cliproxy-control-panel-DLLoW9yz.js} +1 -1
- package/dist/ui/assets/cliproxy-oJmvPKpC.js +3 -0
- package/dist/ui/assets/{codex-ooWKOPa2.js → codex-CNDtlY6P.js} +3 -3
- package/dist/ui/assets/{confirm-dialog-CKjwhn9j.js → confirm-dialog-CF5EDIrm.js} +1 -1
- package/dist/ui/assets/{copilot-GA7EPiK1.js → copilot-DcsWzY5x.js} +2 -2
- package/dist/ui/assets/{cursor-B6c8CyHG.js → cursor-D35uxPJ3.js} +1 -1
- package/dist/ui/assets/{droid-CPRHOIX2.js → droid-cwS_m2Fj.js} +2 -2
- package/dist/ui/assets/{globalenv-section-Czgnw_GV.js → globalenv-section-B7amS8JA.js} +1 -1
- package/dist/ui/assets/{health-CXLOMk8n.js → health-BMb4MU3S.js} +1 -1
- package/dist/ui/assets/icons-BxSzn11s.js +1 -0
- package/dist/ui/assets/{index-CvfzKRSH.js → index-BBHJt5Yt.js} +1 -1
- package/dist/ui/assets/index-Bmd4gqsh.js +69 -0
- package/dist/ui/assets/{index-BceMcbCR.js → index-C90qrEFO.js} +1 -1
- package/dist/ui/assets/{index-D2v_-6AW.js → index-CQSl6vEt.js} +1 -1
- package/dist/ui/assets/{index-Boa5e-GY.js → index-Cnp8oH1Z.js} +1 -1
- package/dist/ui/assets/index-Cw_d3NZ2.css +1 -0
- package/dist/ui/assets/{index-v-DY6Zby.js → index-osM0SZ9h.js} +1 -1
- package/dist/ui/assets/{masked-input-B1_asiUI.js → masked-input-DUqplFGl.js} +1 -1
- package/dist/ui/assets/{proxy-status-widget-Ci1JpStj.js → proxy-status-widget-IxTsEDhP.js} +1 -1
- package/dist/ui/assets/{raw-json-settings-editor-panel-DMbTkxWw.js → raw-json-settings-editor-panel-eQGtUD6M.js} +1 -1
- package/dist/ui/assets/{searchable-select-HbP2PXl3.js → searchable-select-D_SVA6pH.js} +1 -1
- package/dist/ui/assets/{separator-CdaalG0K.js → separator-Cuk1ilZb.js} +1 -1
- package/dist/ui/assets/{shared-BiFB-et0.js → shared-BaW8OUvz.js} +1 -1
- package/dist/ui/assets/{table-BPwgFXLQ.js → table-BKS_LAxP.js} +1 -1
- package/dist/ui/assets/{updates-l8Co9uve.js → updates-CunZLYFy.js} +1 -1
- package/dist/ui/index.html +3 -3
- 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/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/index.d.ts.map +1 -1
- package/dist/web-server/routes/index.js +18 -0
- package/dist/web-server/routes/index.js.map +1 -1
- 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/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
|
@@ -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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"}
|
|
@@ -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"}
|
|
@@ -5,7 +5,6 @@ const account_manager_1 = require("./account-manager");
|
|
|
5
5
|
const model_catalog_1 = require("./model-catalog");
|
|
6
6
|
const quota_fetcher_codex_1 = require("./quota-fetcher-codex");
|
|
7
7
|
const quota_response_cache_1 = require("./quota-response-cache");
|
|
8
|
-
const variant_settings_1 = require("./services/variant-settings");
|
|
9
8
|
const ui_1 = require("../utils/ui");
|
|
10
9
|
const FREE_SAFE_DEFAULT_MODEL = 'gpt-5-codex';
|
|
11
10
|
const FREE_SAFE_FAST_MODEL = 'gpt-5-codex-mini';
|
|
@@ -95,7 +94,7 @@ function resolveRuntimeCodexFallbackModel(options) {
|
|
|
95
94
|
}
|
|
96
95
|
exports.resolveRuntimeCodexFallbackModel = resolveRuntimeCodexFallbackModel;
|
|
97
96
|
async function reconcileCodexModelForActivePlan(options, deps = {}) {
|
|
98
|
-
const {
|
|
97
|
+
const { currentModel, verbose } = options;
|
|
99
98
|
if (!currentModel)
|
|
100
99
|
return;
|
|
101
100
|
const fallbackModel = getFreePlanFallbackCodexModel(currentModel);
|
|
@@ -117,11 +116,8 @@ async function reconcileCodexModelForActivePlan(options, deps = {}) {
|
|
|
117
116
|
(0, quota_response_cache_1.setCachedQuota)('codex', defaultAccount.id, quota);
|
|
118
117
|
}
|
|
119
118
|
if (quota.planType === 'free') {
|
|
120
|
-
(
|
|
121
|
-
|
|
122
|
-
});
|
|
123
|
-
console.error(formatInfo(`Codex free plan detected. Switched unsupported model "${normalizeCodexModelId(currentModel)}" ` +
|
|
124
|
-
`to "${fallbackModel}".`));
|
|
119
|
+
console.error(formatInfo(`Codex free plan detected. Keeping saved model "${normalizeCodexModelId(currentModel)}" in settings; ` +
|
|
120
|
+
`runtime requests will fall back to "${fallbackModel}" when needed.`));
|
|
125
121
|
return;
|
|
126
122
|
}
|
|
127
123
|
if (quota.planType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-plan-compatibility.js","sourceRoot":"","sources":["../../src/cliproxy/codex-plan-compatibility.ts"],"names":[],"mappings":";;;AAAA,uDAAsD;AACtD,mDAAqD;AACrD,+DAAwD;AACxD,iEAAwE;AAExE,
|
|
1
|
+
{"version":3,"file":"codex-plan-compatibility.js","sourceRoot":"","sources":["../../src/cliproxy/codex-plan-compatibility.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,11 @@
|
|
|
10
10
|
* 6. Claude CLI execution with cleanup handlers
|
|
11
11
|
*/
|
|
12
12
|
import { CLIProxyProvider, ExecutorConfig } from '../types';
|
|
13
|
+
export declare function readOptionValue(args: string[], flag: string): {
|
|
14
|
+
present: boolean;
|
|
15
|
+
value?: string;
|
|
16
|
+
missingValue: boolean;
|
|
17
|
+
};
|
|
13
18
|
/**
|
|
14
19
|
* Execute Claude CLI with CLIProxy (main entry point)
|
|
15
20
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAqBH,OAAO,EAAE,gBAAgB,EAAwC,cAAc,EAAE,MAAM,UAAU,CAAC;AAwFlG,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,MAAM,GACX;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAuB7D;AAED;;;;;;;GAOG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC,IAAI,CAAC,CA4lCf;AAGD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,eAAe,sBAAsB,CAAC"}
|
|
@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
34
34
|
return result;
|
|
35
35
|
};
|
|
36
36
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
|
-
exports.findAvailablePort = exports.isPortAvailable = exports.execClaudeWithCLIProxy = void 0;
|
|
37
|
+
exports.findAvailablePort = exports.isPortAvailable = exports.execClaudeWithCLIProxy = exports.readOptionValue = void 0;
|
|
38
38
|
const child_process_1 = require("child_process");
|
|
39
39
|
const fs = __importStar(require("fs"));
|
|
40
40
|
const os = __importStar(require("os"));
|
|
@@ -80,6 +80,28 @@ const DEFAULT_CONFIG = {
|
|
|
80
80
|
verbose: false,
|
|
81
81
|
pollInterval: 100,
|
|
82
82
|
};
|
|
83
|
+
function readOptionValue(args, flag) {
|
|
84
|
+
const inlinePrefix = `${flag}=`;
|
|
85
|
+
const inlineArg = args.find((arg) => arg.startsWith(inlinePrefix));
|
|
86
|
+
if (inlineArg !== undefined) {
|
|
87
|
+
const value = inlineArg.slice(inlinePrefix.length).trim();
|
|
88
|
+
return {
|
|
89
|
+
present: true,
|
|
90
|
+
value: value.length > 0 ? value : undefined,
|
|
91
|
+
missingValue: value.length === 0,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
const index = args.indexOf(flag);
|
|
95
|
+
if (index === -1) {
|
|
96
|
+
return { present: false, missingValue: false };
|
|
97
|
+
}
|
|
98
|
+
const next = args[index + 1];
|
|
99
|
+
if (!next || next.startsWith('-')) {
|
|
100
|
+
return { present: true, missingValue: true };
|
|
101
|
+
}
|
|
102
|
+
return { present: true, value: next.trim(), missingValue: false };
|
|
103
|
+
}
|
|
104
|
+
exports.readOptionValue = readOptionValue;
|
|
83
105
|
/**
|
|
84
106
|
* Execute Claude CLI with CLIProxy (main entry point)
|
|
85
107
|
*
|
|
@@ -270,29 +292,91 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
270
292
|
}
|
|
271
293
|
// Parse --kiro-auth-method flag
|
|
272
294
|
let kiroAuthMethod;
|
|
273
|
-
const
|
|
274
|
-
if (
|
|
275
|
-
const rawMethod =
|
|
276
|
-
if (
|
|
295
|
+
const kiroMethodValue = readOptionValue(argsWithoutProxy, '--kiro-auth-method');
|
|
296
|
+
if (kiroMethodValue.present) {
|
|
297
|
+
const rawMethod = kiroMethodValue.value;
|
|
298
|
+
if (kiroMethodValue.missingValue || !rawMethod) {
|
|
277
299
|
console.error((0, ui_1.fail)('--kiro-auth-method requires a value'));
|
|
278
|
-
console.error(' Supported values: aws, aws-authcode, google, github');
|
|
300
|
+
console.error(' Supported values: aws, aws-authcode, google, github, idc');
|
|
279
301
|
process.exitCode = 1;
|
|
280
302
|
return;
|
|
281
303
|
}
|
|
282
304
|
const normalized = rawMethod.trim().toLowerCase();
|
|
283
305
|
if (!(0, auth_types_1.isKiroAuthMethod)(normalized)) {
|
|
284
306
|
console.error((0, ui_1.fail)(`Invalid --kiro-auth-method value: ${rawMethod}`));
|
|
285
|
-
console.error(' Supported values: aws, aws-authcode, google, github');
|
|
307
|
+
console.error(' Supported values: aws, aws-authcode, google, github, idc');
|
|
286
308
|
process.exitCode = 1;
|
|
287
309
|
return;
|
|
288
310
|
}
|
|
289
311
|
kiroAuthMethod = (0, auth_types_1.normalizeKiroAuthMethod)(normalized);
|
|
290
312
|
}
|
|
313
|
+
let kiroIDCStartUrl;
|
|
314
|
+
const kiroIDCStartUrlValue = readOptionValue(argsWithoutProxy, '--kiro-idc-start-url');
|
|
315
|
+
if (kiroIDCStartUrlValue.present && kiroIDCStartUrlValue.value) {
|
|
316
|
+
kiroIDCStartUrl = kiroIDCStartUrlValue.value;
|
|
317
|
+
}
|
|
318
|
+
else if (kiroIDCStartUrlValue.present) {
|
|
319
|
+
console.error((0, ui_1.fail)('--kiro-idc-start-url requires a value'));
|
|
320
|
+
process.exitCode = 1;
|
|
321
|
+
return;
|
|
322
|
+
}
|
|
323
|
+
let kiroIDCRegion;
|
|
324
|
+
const kiroIDCRegionValue = readOptionValue(argsWithoutProxy, '--kiro-idc-region');
|
|
325
|
+
if (kiroIDCRegionValue.present && kiroIDCRegionValue.value) {
|
|
326
|
+
kiroIDCRegion = kiroIDCRegionValue.value;
|
|
327
|
+
}
|
|
328
|
+
else if (kiroIDCRegionValue.present) {
|
|
329
|
+
console.error((0, ui_1.fail)('--kiro-idc-region requires a value'));
|
|
330
|
+
process.exitCode = 1;
|
|
331
|
+
return;
|
|
332
|
+
}
|
|
333
|
+
let kiroIDCFlow;
|
|
334
|
+
const kiroIDCFlowValue = readOptionValue(argsWithoutProxy, '--kiro-idc-flow');
|
|
335
|
+
if (kiroIDCFlowValue.present) {
|
|
336
|
+
const rawFlow = kiroIDCFlowValue.value;
|
|
337
|
+
if (kiroIDCFlowValue.missingValue || !rawFlow) {
|
|
338
|
+
console.error((0, ui_1.fail)('--kiro-idc-flow requires a value'));
|
|
339
|
+
console.error(' Supported values: authcode, device');
|
|
340
|
+
process.exitCode = 1;
|
|
341
|
+
return;
|
|
342
|
+
}
|
|
343
|
+
const normalized = rawFlow.trim().toLowerCase();
|
|
344
|
+
if (!(0, auth_types_1.isKiroIDCFlow)(normalized)) {
|
|
345
|
+
console.error((0, ui_1.fail)(`Invalid --kiro-idc-flow value: ${rawFlow}`));
|
|
346
|
+
console.error(' Supported values: authcode, device');
|
|
347
|
+
process.exitCode = 1;
|
|
348
|
+
return;
|
|
349
|
+
}
|
|
350
|
+
kiroIDCFlow = (0, auth_types_1.normalizeKiroIDCFlow)(normalized);
|
|
351
|
+
}
|
|
291
352
|
if (kiroAuthMethod && provider !== 'kiro' && !compositeProviders.includes('kiro')) {
|
|
292
353
|
console.error((0, ui_1.fail)('--kiro-auth-method is only valid for ccs kiro'));
|
|
293
354
|
process.exitCode = 1;
|
|
294
355
|
return;
|
|
295
356
|
}
|
|
357
|
+
if ((kiroIDCStartUrl || kiroIDCRegion || kiroIDCFlow) &&
|
|
358
|
+
provider !== 'kiro' &&
|
|
359
|
+
!compositeProviders.includes('kiro')) {
|
|
360
|
+
console.error((0, ui_1.fail)('--kiro-idc-start-url, --kiro-idc-region, and --kiro-idc-flow are only valid for ccs kiro'));
|
|
361
|
+
process.exitCode = 1;
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
364
|
+
if (!kiroAuthMethod && (kiroIDCStartUrl || kiroIDCRegion || kiroIDCFlow)) {
|
|
365
|
+
kiroAuthMethod = 'idc';
|
|
366
|
+
}
|
|
367
|
+
if (kiroAuthMethod === 'idc' && !kiroIDCStartUrl) {
|
|
368
|
+
console.error((0, ui_1.fail)('Kiro IDC login requires --kiro-idc-start-url'));
|
|
369
|
+
console.error(' Example: ccs kiro --auth --kiro-auth-method idc --kiro-idc-start-url https://d-xxx.awsapps.com/start');
|
|
370
|
+
process.exitCode = 1;
|
|
371
|
+
return;
|
|
372
|
+
}
|
|
373
|
+
if (kiroAuthMethod &&
|
|
374
|
+
kiroAuthMethod !== 'idc' &&
|
|
375
|
+
(kiroIDCStartUrl || kiroIDCRegion || kiroIDCFlow)) {
|
|
376
|
+
console.error((0, ui_1.fail)('--kiro-idc-start-url, --kiro-idc-region, and --kiro-idc-flow require --kiro-auth-method idc'));
|
|
377
|
+
process.exitCode = 1;
|
|
378
|
+
return;
|
|
379
|
+
}
|
|
296
380
|
// Parse --thinking / --effort flags (aliases; first occurrence wins)
|
|
297
381
|
const thinkingParse = (0, thinking_arg_parser_1.parseThinkingOverride)(argsWithoutProxy);
|
|
298
382
|
if (thinkingParse.error) {
|
|
@@ -444,6 +528,9 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
444
528
|
verbose,
|
|
445
529
|
import: true,
|
|
446
530
|
...(kiroAuthMethod ? { kiroMethod: kiroAuthMethod } : {}),
|
|
531
|
+
...(kiroIDCStartUrl ? { kiroIDCStartUrl } : {}),
|
|
532
|
+
...(kiroIDCRegion ? { kiroIDCRegion } : {}),
|
|
533
|
+
...(kiroIDCFlow ? { kiroIDCFlow } : {}),
|
|
447
534
|
...(setNickname ? { nickname: setNickname } : {}),
|
|
448
535
|
});
|
|
449
536
|
if (!authSuccess) {
|
|
@@ -497,6 +584,9 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
497
584
|
add: addAccount,
|
|
498
585
|
...(acceptAgyRisk ? { acceptAgyRisk: true } : {}),
|
|
499
586
|
...(kiroAuthMethod && p === 'kiro' ? { kiroMethod: kiroAuthMethod } : {}),
|
|
587
|
+
...(kiroIDCStartUrl && p === 'kiro' ? { kiroIDCStartUrl } : {}),
|
|
588
|
+
...(kiroIDCRegion && p === 'kiro' ? { kiroIDCRegion } : {}),
|
|
589
|
+
...(kiroIDCFlow && p === 'kiro' ? { kiroIDCFlow } : {}),
|
|
500
590
|
...(forceHeadless ? { headless: true } : {}),
|
|
501
591
|
...(setNickname ? { nickname: setNickname } : {}),
|
|
502
592
|
...(noIncognito ? { noIncognito: true } : {}),
|
|
@@ -539,6 +629,9 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
539
629
|
add: addAccount,
|
|
540
630
|
...(acceptAgyRisk ? { acceptAgyRisk: true } : {}),
|
|
541
631
|
...(kiroAuthMethod ? { kiroMethod: kiroAuthMethod } : {}),
|
|
632
|
+
...(kiroIDCStartUrl ? { kiroIDCStartUrl } : {}),
|
|
633
|
+
...(kiroIDCRegion ? { kiroIDCRegion } : {}),
|
|
634
|
+
...(kiroIDCFlow ? { kiroIDCFlow } : {}),
|
|
542
635
|
...(forceHeadless ? { headless: true } : {}),
|
|
543
636
|
...(setNickname ? { nickname: setNickname } : {}),
|
|
544
637
|
...(noIncognito ? { noIncognito: true } : {}),
|
|
@@ -653,7 +746,6 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
653
746
|
(0, config_generator_1.ensureProviderSettings)(provider);
|
|
654
747
|
if (provider === 'codex' && !cfg.isComposite && !skipLocalAuth) {
|
|
655
748
|
await (0, codex_plan_compatibility_1.reconcileCodexModelForActivePlan)({
|
|
656
|
-
settingsPath: cfg.customSettingsPath || (0, config_generator_1.getProviderSettingsPath)(provider),
|
|
657
749
|
currentModel: (0, model_config_1.getCurrentModel)(provider, cfg.customSettingsPath),
|
|
658
750
|
verbose,
|
|
659
751
|
});
|
|
@@ -901,6 +993,9 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
901
993
|
'--use',
|
|
902
994
|
'--nickname',
|
|
903
995
|
'--kiro-auth-method',
|
|
996
|
+
'--kiro-idc-start-url',
|
|
997
|
+
'--kiro-idc-region',
|
|
998
|
+
'--kiro-idc-flow',
|
|
904
999
|
'--thinking',
|
|
905
1000
|
'--effort',
|
|
906
1001
|
'--1m',
|
|
@@ -916,6 +1011,14 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
916
1011
|
const claudeArgs = argsWithoutProxy.filter((arg, idx) => {
|
|
917
1012
|
if (ccsFlags.includes(arg))
|
|
918
1013
|
return false;
|
|
1014
|
+
if (arg.startsWith('--kiro-auth-method='))
|
|
1015
|
+
return false;
|
|
1016
|
+
if (arg.startsWith('--kiro-idc-start-url='))
|
|
1017
|
+
return false;
|
|
1018
|
+
if (arg.startsWith('--kiro-idc-region='))
|
|
1019
|
+
return false;
|
|
1020
|
+
if (arg.startsWith('--kiro-idc-flow='))
|
|
1021
|
+
return false;
|
|
919
1022
|
if (arg.startsWith('--thinking='))
|
|
920
1023
|
return false;
|
|
921
1024
|
if (arg.startsWith('--effort='))
|
|
@@ -925,6 +1028,9 @@ async function execClaudeWithCLIProxy(claudeCli, provider, args, config = {}) {
|
|
|
925
1028
|
if (argsWithoutProxy[idx - 1] === '--use' ||
|
|
926
1029
|
argsWithoutProxy[idx - 1] === '--nickname' ||
|
|
927
1030
|
argsWithoutProxy[idx - 1] === '--kiro-auth-method' ||
|
|
1031
|
+
argsWithoutProxy[idx - 1] === '--kiro-idc-start-url' ||
|
|
1032
|
+
argsWithoutProxy[idx - 1] === '--kiro-idc-region' ||
|
|
1033
|
+
argsWithoutProxy[idx - 1] === '--kiro-idc-flow' ||
|
|
928
1034
|
argsWithoutProxy[idx - 1] === '--thinking' ||
|
|
929
1035
|
argsWithoutProxy[idx - 1] === '--effort')
|
|
930
1036
|
return false;
|