@google/gemini-cli 0.45.2 → 0.45.3
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/bundle/builtin/antigravity-support/SKILL.md +58 -0
- package/bundle/{chunk-LYEXUQ4X.js → chunk-27KR2X7B.js} +1 -1
- package/bundle/{chunk-P3GSBAEP.js → chunk-2M4RXPLR.js} +1 -1
- package/bundle/{chunk-CWO4SMA7.js → chunk-2TMMZCLT.js} +1 -1
- package/bundle/{chunk-6GEZV4AF.js → chunk-3C7OYQ34.js} +1 -1
- package/bundle/{chunk-4YNBYIJA.js → chunk-5NOLNQ6P.js} +3 -3
- package/bundle/{chunk-SG5DULX4.js → chunk-62H4B3QP.js} +165 -114
- package/bundle/{chunk-2B6NXQYE.js → chunk-6K7CUAY2.js} +1 -1
- package/bundle/{chunk-FCYM73EG.js → chunk-A7A66OT3.js} +2 -2
- package/bundle/{chunk-CTTYNCHI.js → chunk-ANW4T6AL.js} +1 -1
- package/bundle/{chunk-K2JT5CUB.js → chunk-AWDCIQVG.js} +63 -7
- package/bundle/{chunk-PUOWQXRH.js → chunk-AWL3SM7R.js} +2 -2
- package/bundle/{chunk-5VGUJAN2.js → chunk-CN36P5IL.js} +1 -1
- package/bundle/{chunk-7ZDQV5DQ.js → chunk-DVJHZORD.js} +1 -1
- package/bundle/{chunk-GGJVZUJT.js → chunk-FGMKLRCQ.js} +1 -1
- package/bundle/{chunk-MHSMZKC6.js → chunk-FPO2C6P5.js} +1 -1
- package/bundle/{chunk-NRSJ3JUA.js → chunk-HMPSOK5T.js} +1 -1
- package/bundle/{chunk-YEROR775.js → chunk-HRPUDMPC.js} +2 -2
- package/bundle/{chunk-E65V7MX5.js → chunk-I6O4CR3L.js} +2 -2
- package/bundle/{chunk-PMKKVFOZ.js → chunk-JEVBAU4N.js} +1 -1
- package/bundle/{chunk-25BU7OMU.js → chunk-JFHLX57N.js} +165 -114
- package/bundle/{chunk-VPNI55G3.js → chunk-JNY4RZAI.js} +1 -1
- package/bundle/{chunk-SSINWKB6.js → chunk-K3ZTQB3K.js} +3 -3
- package/bundle/{chunk-L4G73C3Y.js → chunk-L3OGQWGS.js} +64 -8
- package/bundle/{chunk-35YZAQWE.js → chunk-LTLRCSQ2.js} +1 -1
- package/bundle/{chunk-LSXUKR6W.js → chunk-Q7OASXX5.js} +63 -7
- package/bundle/{chunk-Y6JP7OVV.js → chunk-QKCKVMGR.js} +3 -3
- package/bundle/{chunk-KAD4VDUI.js → chunk-RFSXII54.js} +3 -3
- package/bundle/{chunk-MXTWZ3CE.js → chunk-S7UDG7KJ.js} +1 -1
- package/bundle/{chunk-3AIAY5PD.js → chunk-SS6F5OZH.js} +77 -12
- package/bundle/{chunk-7FGZGJNF.js → chunk-W72ZVJMX.js} +165 -114
- package/bundle/{chunk-ZN7V2SWM.js → chunk-X3G3PGCJ.js} +1 -1
- package/bundle/{chunk-KB2JUDKD.js → chunk-ZVWC5RAC.js} +165 -114
- package/bundle/{cleanup-G4VWZ3XN.js → cleanup-5DKLZC3X.js} +2 -2
- package/bundle/{cleanup-LPS6MSYO.js → cleanup-6GPACZYC.js} +2 -2
- package/bundle/{cleanup-W3WS5ZAJ.js → cleanup-DVF44ZSC.js} +2 -2
- package/bundle/{cleanup-XZSL4265.js → cleanup-WBYWCGNP.js} +2 -2
- package/bundle/{core-HZQW4AJT.js → core-MSNK7SZS.js} +3 -1
- package/bundle/{devtoolsService-2KN6EUI5.js → devtoolsService-2J5ME7SJ.js} +2 -2
- package/bundle/{devtoolsService-NIPM7EYR.js → devtoolsService-MCY62DTZ.js} +2 -2
- package/bundle/{devtoolsService-CITULPO6.js → devtoolsService-YMIPTCBK.js} +2 -2
- package/bundle/{devtoolsService-KOD5PTTB.js → devtoolsService-Z4KZCDYV.js} +2 -2
- package/bundle/{dist-5NDSNRMN.js → dist-2HPULYS3.js} +3 -1
- package/bundle/{dist-Q5HIYSDI.js → dist-53XAMFTR.js} +3 -1
- package/bundle/{dist-X7BXM7FW.js → dist-JVMFINEN.js} +3 -1
- package/bundle/{gemini-4IQ2UBE4.js → gemini-HOIIWSCV.js} +13 -13
- package/bundle/{gemini-75GSY6S7.js → gemini-K3E7FKCI.js} +14 -14
- package/bundle/{gemini-IHDGRWWD.js → gemini-SPREGLEO.js} +14 -14
- package/bundle/{gemini-YZFND2X2.js → gemini-XT6QQWZ4.js} +14 -14
- package/bundle/gemini.js +7 -7
- package/bundle/{interactiveCli-76DU2VGH.js → interactiveCli-5WB624HL.js} +30 -20
- package/bundle/{interactiveCli-EYDFUDAD.js → interactiveCli-DO6AJ3AX.js} +30 -20
- package/bundle/{interactiveCli-CFXMMG32.js → interactiveCli-GSMT5FN7.js} +30 -20
- package/bundle/{interactiveCli-B6OMNE4Q.js → interactiveCli-IRW7PET2.js} +30 -20
- package/bundle/{liteRtServerManager-5DJRY5PB.js → liteRtServerManager-25BOLUT5.js} +4 -4
- package/bundle/{liteRtServerManager-HIX7EWET.js → liteRtServerManager-47EPMYBF.js} +4 -4
- package/bundle/{liteRtServerManager-JSJ7U5MN.js → liteRtServerManager-4UI6KYBI.js} +4 -4
- package/bundle/{liteRtServerManager-LZAUADEL.js → liteRtServerManager-PPS5H3Z5.js} +4 -4
- package/bundle/{oauth2-provider-GK36RHO3.js → oauth2-provider-FPVEANGB.js} +1 -1
- package/bundle/{oauth2-provider-JWOBX6HR.js → oauth2-provider-JZVXAKTG.js} +1 -1
- package/bundle/{oauth2-provider-PYU5GIOF.js → oauth2-provider-RZJHDH5K.js} +1 -1
- package/bundle/{oauth2-provider-D6YBGNZY.js → oauth2-provider-T6KMRWSV.js} +1 -1
- package/bundle/{start-EUUTULL6.js → start-4ECNBDOR.js} +6 -6
- package/bundle/{start-NSQH4XZZ.js → start-ERELMZFP.js} +6 -6
- package/bundle/{start-WUH65UMB.js → start-GOUVXDR6.js} +6 -6
- package/bundle/{start-WYV53B3R.js → start-ZEO4UHAL.js} +6 -6
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
|
|
2
2
|
import {
|
|
3
3
|
runExitCleanup
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-2TMMZCLT.js";
|
|
5
5
|
import {
|
|
6
6
|
__commonJS,
|
|
7
7
|
__require
|
|
@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
exitCli,
|
|
4
4
|
require_source
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-HMPSOK5T.js";
|
|
6
6
|
import {
|
|
7
7
|
DEFAULT_PORT,
|
|
8
8
|
SERVER_START_WAIT_MS,
|
|
@@ -14,10 +14,10 @@ import {
|
|
|
14
14
|
isServerRunning,
|
|
15
15
|
resolveGemmaConfig,
|
|
16
16
|
writeServerProcessInfo
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-2M4RXPLR.js";
|
|
18
18
|
import {
|
|
19
19
|
debugLogger
|
|
20
|
-
} from "./chunk-
|
|
20
|
+
} from "./chunk-SS6F5OZH.js";
|
|
21
21
|
import {
|
|
22
22
|
__toESM
|
|
23
23
|
} from "./chunk-34MYV7JD.js";
|
|
@@ -276060,6 +276060,9 @@ function isActiveModel(model, useGemini3_1 = false, useCustomToolModel = false,
|
|
|
276060
276060
|
return model !== PREVIEW_GEMINI_3_1_MODEL && model !== PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL;
|
|
276061
276061
|
}
|
|
276062
276062
|
}
|
|
276063
|
+
var CCPA_AI_MODEL_MAPPINGS = {
|
|
276064
|
+
[DEFAULT_GEMINI_3_5_FLASH_MODEL]: SECONDARY_GEMINI_3_5_FLASH_MODEL
|
|
276065
|
+
};
|
|
276063
276066
|
|
|
276064
276067
|
// packages/core/dist/src/billing/billing.js
|
|
276065
276068
|
var G1_CREDIT_TYPE = "GOOGLE_ONE_AI";
|
|
@@ -279300,8 +279303,8 @@ function isValidToolName(name3, options = {}) {
|
|
|
279300
279303
|
}
|
|
279301
279304
|
|
|
279302
279305
|
// packages/core/dist/src/generated/git-commit.js
|
|
279303
|
-
var GIT_COMMIT_INFO = "
|
|
279304
|
-
var CLI_VERSION = "0.45.
|
|
279306
|
+
var GIT_COMMIT_INFO = "7e87af9cf";
|
|
279307
|
+
var CLI_VERSION = "0.45.3";
|
|
279305
279308
|
|
|
279306
279309
|
// packages/core/dist/src/ide/detect-ide.js
|
|
279307
279310
|
var IDE_DEFINITIONS = {
|
|
@@ -303466,7 +303469,7 @@ function getVersion() {
|
|
|
303466
303469
|
}
|
|
303467
303470
|
versionPromise = (async () => {
|
|
303468
303471
|
const pkgJson = await getPackageJson(__dirname4);
|
|
303469
|
-
return "0.45.
|
|
303472
|
+
return "0.45.3";
|
|
303470
303473
|
})();
|
|
303471
303474
|
return versionPromise;
|
|
303472
303475
|
}
|
|
@@ -307900,6 +307903,52 @@ var LoggingContentGenerator = class {
|
|
|
307900
307903
|
}
|
|
307901
307904
|
};
|
|
307902
307905
|
|
|
307906
|
+
// packages/core/dist/src/core/modelMappingContentGenerator.js
|
|
307907
|
+
var ModelMappingContentGenerator = class {
|
|
307908
|
+
wrapped;
|
|
307909
|
+
mappings;
|
|
307910
|
+
constructor(wrapped, mappings) {
|
|
307911
|
+
this.wrapped = wrapped;
|
|
307912
|
+
this.mappings = mappings;
|
|
307913
|
+
}
|
|
307914
|
+
getWrapped() {
|
|
307915
|
+
return this.wrapped;
|
|
307916
|
+
}
|
|
307917
|
+
get userTier() {
|
|
307918
|
+
return this.wrapped.userTier;
|
|
307919
|
+
}
|
|
307920
|
+
get userTierName() {
|
|
307921
|
+
return this.wrapped.userTierName;
|
|
307922
|
+
}
|
|
307923
|
+
get paidTier() {
|
|
307924
|
+
return this.wrapped.paidTier;
|
|
307925
|
+
}
|
|
307926
|
+
mapModel(req) {
|
|
307927
|
+
if (req.model) {
|
|
307928
|
+
const normalizedModel = normalizeModelId(req.model);
|
|
307929
|
+
if (this.mappings[normalizedModel]) {
|
|
307930
|
+
return {
|
|
307931
|
+
...req,
|
|
307932
|
+
model: req.model.startsWith("models/") ? `models/${this.mappings[normalizedModel]}` : this.mappings[normalizedModel]
|
|
307933
|
+
};
|
|
307934
|
+
}
|
|
307935
|
+
}
|
|
307936
|
+
return req;
|
|
307937
|
+
}
|
|
307938
|
+
generateContent(request, userPromptId, role) {
|
|
307939
|
+
return this.wrapped.generateContent(this.mapModel(request), userPromptId, role);
|
|
307940
|
+
}
|
|
307941
|
+
generateContentStream(request, userPromptId, role) {
|
|
307942
|
+
return this.wrapped.generateContentStream(this.mapModel(request), userPromptId, role);
|
|
307943
|
+
}
|
|
307944
|
+
countTokens(request) {
|
|
307945
|
+
return this.wrapped.countTokens(this.mapModel(request));
|
|
307946
|
+
}
|
|
307947
|
+
embedContent(request) {
|
|
307948
|
+
return this.wrapped.embedContent(this.mapModel(request));
|
|
307949
|
+
}
|
|
307950
|
+
};
|
|
307951
|
+
|
|
307903
307952
|
// packages/core/dist/src/code_assist/codeAssist.js
|
|
307904
307953
|
async function createCodeAssistContentGenerator(httpOptions, authType, config2, sessionId) {
|
|
307905
307954
|
if (authType === AuthType2.LOGIN_WITH_GOOGLE || authType === AuthType2.COMPUTE_ADC) {
|
|
@@ -307911,8 +307960,14 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config2,
|
|
|
307911
307960
|
}
|
|
307912
307961
|
function getCodeAssistServer(config2) {
|
|
307913
307962
|
let server = config2.getContentGenerator();
|
|
307914
|
-
|
|
307915
|
-
server
|
|
307963
|
+
while (true) {
|
|
307964
|
+
if (server instanceof LoggingContentGenerator) {
|
|
307965
|
+
server = server.getWrapped();
|
|
307966
|
+
} else if (server instanceof ModelMappingContentGenerator) {
|
|
307967
|
+
server = server.getWrapped();
|
|
307968
|
+
} else {
|
|
307969
|
+
break;
|
|
307970
|
+
}
|
|
307916
307971
|
}
|
|
307917
307972
|
if (!(server instanceof CodeAssistServer)) {
|
|
307918
307973
|
return void 0;
|
|
@@ -308281,7 +308336,7 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
|
|
|
308281
308336
|
}
|
|
308282
308337
|
if (config2.authType === AuthType2.LOGIN_WITH_GOOGLE || config2.authType === AuthType2.COMPUTE_ADC) {
|
|
308283
308338
|
const httpOptions = { headers: baseHeaders };
|
|
308284
|
-
return new LoggingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config2.authType, gcConfig, sessionId), gcConfig);
|
|
308339
|
+
return new LoggingContentGenerator(new ModelMappingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config2.authType, gcConfig, sessionId), CCPA_AI_MODEL_MAPPINGS), gcConfig);
|
|
308285
308340
|
}
|
|
308286
308341
|
if (config2.authType === AuthType2.USE_GEMINI || config2.authType === AuthType2.USE_VERTEX_AI || config2.authType === AuthType2.GATEWAY) {
|
|
308287
308342
|
let headers = { ...baseHeaders };
|
|
@@ -335804,7 +335859,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
|
|
|
335804
335859
|
return provider;
|
|
335805
335860
|
}
|
|
335806
335861
|
case "oauth2": {
|
|
335807
|
-
const { OAuth2AuthProvider } = await import("./oauth2-provider-
|
|
335862
|
+
const { OAuth2AuthProvider } = await import("./oauth2-provider-JZVXAKTG.js");
|
|
335808
335863
|
const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
|
|
335809
335864
|
await provider.initialize();
|
|
335810
335865
|
return provider;
|
|
@@ -375642,7 +375697,7 @@ ${sections.join("\n")}
|
|
|
375642
375697
|
if (authType === AuthType2.USE_GEMINI) {
|
|
375643
375698
|
setFlashModels("gemini-3-flash-preview", "gemini-3.5-flash");
|
|
375644
375699
|
} else {
|
|
375645
|
-
setFlashModels("gemini-3-flash", "gemini-3-flash");
|
|
375700
|
+
setFlashModels("gemini-3.5-flash", "gemini-3.5-flash");
|
|
375646
375701
|
}
|
|
375647
375702
|
} else {
|
|
375648
375703
|
setFlashModels("gemini-3-flash-preview", "gemini-2.5-flash");
|
|
@@ -393385,6 +393440,7 @@ export {
|
|
|
393385
393440
|
isAutoModel,
|
|
393386
393441
|
supportsMultimodalFunctionResponse,
|
|
393387
393442
|
isActiveModel,
|
|
393443
|
+
CCPA_AI_MODEL_MAPPINGS,
|
|
393388
393444
|
G1_CREDIT_TYPE,
|
|
393389
393445
|
OVERAGE_ELIGIBLE_MODELS,
|
|
393390
393446
|
isOverageEligibleModel,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
|
|
2
2
|
import {
|
|
3
3
|
checkExhaustive
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-SS6F5OZH.js";
|
|
5
5
|
import {
|
|
6
6
|
__commonJS,
|
|
7
7
|
__toESM
|
|
@@ -276060,6 +276060,9 @@ function isActiveModel(model, useGemini3_1 = false, useCustomToolModel = false,
|
|
|
276060
276060
|
return model !== PREVIEW_GEMINI_3_1_MODEL && model !== PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL;
|
|
276061
276061
|
}
|
|
276062
276062
|
}
|
|
276063
|
+
var CCPA_AI_MODEL_MAPPINGS = {
|
|
276064
|
+
[DEFAULT_GEMINI_3_5_FLASH_MODEL]: SECONDARY_GEMINI_3_5_FLASH_MODEL
|
|
276065
|
+
};
|
|
276063
276066
|
|
|
276064
276067
|
// packages/core/dist/src/billing/billing.js
|
|
276065
276068
|
var G1_CREDIT_TYPE = "GOOGLE_ONE_AI";
|
|
@@ -279300,7 +279303,7 @@ function isValidToolName(name3, options = {}) {
|
|
|
279300
279303
|
}
|
|
279301
279304
|
|
|
279302
279305
|
// packages/core/dist/src/generated/git-commit.js
|
|
279303
|
-
var GIT_COMMIT_INFO = "
|
|
279306
|
+
var GIT_COMMIT_INFO = "7e87af9cf";
|
|
279304
279307
|
var CLI_VERSION = "0.45.2";
|
|
279305
279308
|
|
|
279306
279309
|
// packages/core/dist/src/ide/detect-ide.js
|
|
@@ -303466,7 +303469,7 @@ function getVersion() {
|
|
|
303466
303469
|
}
|
|
303467
303470
|
versionPromise = (async () => {
|
|
303468
303471
|
const pkgJson = await getPackageJson(__dirname4);
|
|
303469
|
-
return "0.45.
|
|
303472
|
+
return "0.45.3";
|
|
303470
303473
|
})();
|
|
303471
303474
|
return versionPromise;
|
|
303472
303475
|
}
|
|
@@ -307900,6 +307903,52 @@ var LoggingContentGenerator = class {
|
|
|
307900
307903
|
}
|
|
307901
307904
|
};
|
|
307902
307905
|
|
|
307906
|
+
// packages/core/dist/src/core/modelMappingContentGenerator.js
|
|
307907
|
+
var ModelMappingContentGenerator = class {
|
|
307908
|
+
wrapped;
|
|
307909
|
+
mappings;
|
|
307910
|
+
constructor(wrapped, mappings) {
|
|
307911
|
+
this.wrapped = wrapped;
|
|
307912
|
+
this.mappings = mappings;
|
|
307913
|
+
}
|
|
307914
|
+
getWrapped() {
|
|
307915
|
+
return this.wrapped;
|
|
307916
|
+
}
|
|
307917
|
+
get userTier() {
|
|
307918
|
+
return this.wrapped.userTier;
|
|
307919
|
+
}
|
|
307920
|
+
get userTierName() {
|
|
307921
|
+
return this.wrapped.userTierName;
|
|
307922
|
+
}
|
|
307923
|
+
get paidTier() {
|
|
307924
|
+
return this.wrapped.paidTier;
|
|
307925
|
+
}
|
|
307926
|
+
mapModel(req) {
|
|
307927
|
+
if (req.model) {
|
|
307928
|
+
const normalizedModel = normalizeModelId(req.model);
|
|
307929
|
+
if (this.mappings[normalizedModel]) {
|
|
307930
|
+
return {
|
|
307931
|
+
...req,
|
|
307932
|
+
model: req.model.startsWith("models/") ? `models/${this.mappings[normalizedModel]}` : this.mappings[normalizedModel]
|
|
307933
|
+
};
|
|
307934
|
+
}
|
|
307935
|
+
}
|
|
307936
|
+
return req;
|
|
307937
|
+
}
|
|
307938
|
+
generateContent(request, userPromptId, role) {
|
|
307939
|
+
return this.wrapped.generateContent(this.mapModel(request), userPromptId, role);
|
|
307940
|
+
}
|
|
307941
|
+
generateContentStream(request, userPromptId, role) {
|
|
307942
|
+
return this.wrapped.generateContentStream(this.mapModel(request), userPromptId, role);
|
|
307943
|
+
}
|
|
307944
|
+
countTokens(request) {
|
|
307945
|
+
return this.wrapped.countTokens(this.mapModel(request));
|
|
307946
|
+
}
|
|
307947
|
+
embedContent(request) {
|
|
307948
|
+
return this.wrapped.embedContent(this.mapModel(request));
|
|
307949
|
+
}
|
|
307950
|
+
};
|
|
307951
|
+
|
|
307903
307952
|
// packages/core/dist/src/code_assist/codeAssist.js
|
|
307904
307953
|
async function createCodeAssistContentGenerator(httpOptions, authType, config2, sessionId) {
|
|
307905
307954
|
if (authType === AuthType2.LOGIN_WITH_GOOGLE || authType === AuthType2.COMPUTE_ADC) {
|
|
@@ -307911,8 +307960,14 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config2,
|
|
|
307911
307960
|
}
|
|
307912
307961
|
function getCodeAssistServer(config2) {
|
|
307913
307962
|
let server = config2.getContentGenerator();
|
|
307914
|
-
|
|
307915
|
-
server
|
|
307963
|
+
while (true) {
|
|
307964
|
+
if (server instanceof LoggingContentGenerator) {
|
|
307965
|
+
server = server.getWrapped();
|
|
307966
|
+
} else if (server instanceof ModelMappingContentGenerator) {
|
|
307967
|
+
server = server.getWrapped();
|
|
307968
|
+
} else {
|
|
307969
|
+
break;
|
|
307970
|
+
}
|
|
307916
307971
|
}
|
|
307917
307972
|
if (!(server instanceof CodeAssistServer)) {
|
|
307918
307973
|
return void 0;
|
|
@@ -308281,7 +308336,7 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
|
|
|
308281
308336
|
}
|
|
308282
308337
|
if (config2.authType === AuthType2.LOGIN_WITH_GOOGLE || config2.authType === AuthType2.COMPUTE_ADC) {
|
|
308283
308338
|
const httpOptions = { headers: baseHeaders };
|
|
308284
|
-
return new LoggingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config2.authType, gcConfig, sessionId), gcConfig);
|
|
308339
|
+
return new LoggingContentGenerator(new ModelMappingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config2.authType, gcConfig, sessionId), CCPA_AI_MODEL_MAPPINGS), gcConfig);
|
|
308285
308340
|
}
|
|
308286
308341
|
if (config2.authType === AuthType2.USE_GEMINI || config2.authType === AuthType2.USE_VERTEX_AI || config2.authType === AuthType2.GATEWAY) {
|
|
308287
308342
|
let headers = { ...baseHeaders };
|
|
@@ -335804,7 +335859,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
|
|
|
335804
335859
|
return provider;
|
|
335805
335860
|
}
|
|
335806
335861
|
case "oauth2": {
|
|
335807
|
-
const { OAuth2AuthProvider } = await import("./oauth2-provider-
|
|
335862
|
+
const { OAuth2AuthProvider } = await import("./oauth2-provider-RZJHDH5K.js");
|
|
335808
335863
|
const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
|
|
335809
335864
|
await provider.initialize();
|
|
335810
335865
|
return provider;
|
|
@@ -375642,7 +375697,7 @@ ${sections.join("\n")}
|
|
|
375642
375697
|
if (authType === AuthType2.USE_GEMINI) {
|
|
375643
375698
|
setFlashModels("gemini-3-flash-preview", "gemini-3.5-flash");
|
|
375644
375699
|
} else {
|
|
375645
|
-
setFlashModels("gemini-3-flash", "gemini-3-flash");
|
|
375700
|
+
setFlashModels("gemini-3.5-flash", "gemini-3.5-flash");
|
|
375646
375701
|
}
|
|
375647
375702
|
} else {
|
|
375648
375703
|
setFlashModels("gemini-3-flash-preview", "gemini-2.5-flash");
|
|
@@ -393385,6 +393440,7 @@ export {
|
|
|
393385
393440
|
isAutoModel,
|
|
393386
393441
|
supportsMultimodalFunctionResponse,
|
|
393387
393442
|
isActiveModel,
|
|
393443
|
+
CCPA_AI_MODEL_MAPPINGS,
|
|
393388
393444
|
G1_CREDIT_TYPE,
|
|
393389
393445
|
OVERAGE_ELIGIBLE_MODELS,
|
|
393390
393446
|
isOverageEligibleModel,
|
|
@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
exitCli,
|
|
4
4
|
require_source
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-JNY4RZAI.js";
|
|
6
6
|
import {
|
|
7
7
|
DEFAULT_PORT,
|
|
8
8
|
SERVER_START_WAIT_MS,
|
|
@@ -14,10 +14,10 @@ import {
|
|
|
14
14
|
isServerRunning,
|
|
15
15
|
resolveGemmaConfig,
|
|
16
16
|
writeServerProcessInfo
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-X3G3PGCJ.js";
|
|
18
18
|
import {
|
|
19
19
|
debugLogger
|
|
20
|
-
} from "./chunk-
|
|
20
|
+
} from "./chunk-Q7OASXX5.js";
|
|
21
21
|
import {
|
|
22
22
|
__toESM
|
|
23
23
|
} from "./chunk-34MYV7JD.js";
|
|
@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
exitCli,
|
|
4
4
|
require_source
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-ANW4T6AL.js";
|
|
6
6
|
import {
|
|
7
7
|
DEFAULT_PORT,
|
|
8
8
|
SERVER_START_WAIT_MS,
|
|
@@ -14,10 +14,10 @@ import {
|
|
|
14
14
|
isServerRunning,
|
|
15
15
|
resolveGemmaConfig,
|
|
16
16
|
writeServerProcessInfo
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-JEVBAU4N.js";
|
|
18
18
|
import {
|
|
19
19
|
debugLogger
|
|
20
|
-
} from "./chunk-
|
|
20
|
+
} from "./chunk-L3OGQWGS.js";
|
|
21
21
|
import {
|
|
22
22
|
__toESM
|
|
23
23
|
} from "./chunk-34MYV7JD.js";
|
|
@@ -276503,6 +276503,9 @@ function isActiveModel(model, useGemini3_1 = false, useCustomToolModel = false,
|
|
|
276503
276503
|
return model !== PREVIEW_GEMINI_3_1_MODEL && model !== PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL;
|
|
276504
276504
|
}
|
|
276505
276505
|
}
|
|
276506
|
+
var CCPA_AI_MODEL_MAPPINGS = {
|
|
276507
|
+
[DEFAULT_GEMINI_3_5_FLASH_MODEL]: SECONDARY_GEMINI_3_5_FLASH_MODEL
|
|
276508
|
+
};
|
|
276506
276509
|
|
|
276507
276510
|
// packages/core/src/billing/billing.ts
|
|
276508
276511
|
var G1_CREDIT_TYPE = "GOOGLE_ONE_AI";
|
|
@@ -279559,8 +279562,8 @@ function isValidToolName(name3, options = {}) {
|
|
|
279559
279562
|
}
|
|
279560
279563
|
|
|
279561
279564
|
// packages/core/src/generated/git-commit.ts
|
|
279562
|
-
var GIT_COMMIT_INFO = "
|
|
279563
|
-
var CLI_VERSION = "0.45.
|
|
279565
|
+
var GIT_COMMIT_INFO = "7e87af9cf";
|
|
279566
|
+
var CLI_VERSION = "0.45.2";
|
|
279564
279567
|
|
|
279565
279568
|
// packages/core/src/ide/detect-ide.ts
|
|
279566
279569
|
var IDE_DEFINITIONS = {
|
|
@@ -304029,7 +304032,7 @@ function getVersion() {
|
|
|
304029
304032
|
}
|
|
304030
304033
|
versionPromise = (async () => {
|
|
304031
304034
|
const pkgJson = await getPackageJson(__dirname4);
|
|
304032
|
-
return "0.45.
|
|
304035
|
+
return "0.45.2";
|
|
304033
304036
|
})();
|
|
304034
304037
|
return versionPromise;
|
|
304035
304038
|
}
|
|
@@ -309267,6 +309270,58 @@ var LoggingContentGenerator = class {
|
|
|
309267
309270
|
}
|
|
309268
309271
|
};
|
|
309269
309272
|
|
|
309273
|
+
// packages/core/src/core/modelMappingContentGenerator.ts
|
|
309274
|
+
var ModelMappingContentGenerator = class {
|
|
309275
|
+
constructor(wrapped, mappings) {
|
|
309276
|
+
this.wrapped = wrapped;
|
|
309277
|
+
this.mappings = mappings;
|
|
309278
|
+
}
|
|
309279
|
+
getWrapped() {
|
|
309280
|
+
return this.wrapped;
|
|
309281
|
+
}
|
|
309282
|
+
get userTier() {
|
|
309283
|
+
return this.wrapped.userTier;
|
|
309284
|
+
}
|
|
309285
|
+
get userTierName() {
|
|
309286
|
+
return this.wrapped.userTierName;
|
|
309287
|
+
}
|
|
309288
|
+
get paidTier() {
|
|
309289
|
+
return this.wrapped.paidTier;
|
|
309290
|
+
}
|
|
309291
|
+
mapModel(req) {
|
|
309292
|
+
if (req.model) {
|
|
309293
|
+
const normalizedModel = normalizeModelId(req.model);
|
|
309294
|
+
if (this.mappings[normalizedModel]) {
|
|
309295
|
+
return {
|
|
309296
|
+
...req,
|
|
309297
|
+
model: req.model.startsWith("models/") ? `models/${this.mappings[normalizedModel]}` : this.mappings[normalizedModel]
|
|
309298
|
+
};
|
|
309299
|
+
}
|
|
309300
|
+
}
|
|
309301
|
+
return req;
|
|
309302
|
+
}
|
|
309303
|
+
generateContent(request, userPromptId, role) {
|
|
309304
|
+
return this.wrapped.generateContent(
|
|
309305
|
+
this.mapModel(request),
|
|
309306
|
+
userPromptId,
|
|
309307
|
+
role
|
|
309308
|
+
);
|
|
309309
|
+
}
|
|
309310
|
+
generateContentStream(request, userPromptId, role) {
|
|
309311
|
+
return this.wrapped.generateContentStream(
|
|
309312
|
+
this.mapModel(request),
|
|
309313
|
+
userPromptId,
|
|
309314
|
+
role
|
|
309315
|
+
);
|
|
309316
|
+
}
|
|
309317
|
+
countTokens(request) {
|
|
309318
|
+
return this.wrapped.countTokens(this.mapModel(request));
|
|
309319
|
+
}
|
|
309320
|
+
embedContent(request) {
|
|
309321
|
+
return this.wrapped.embedContent(this.mapModel(request));
|
|
309322
|
+
}
|
|
309323
|
+
};
|
|
309324
|
+
|
|
309270
309325
|
// packages/core/src/code_assist/codeAssist.ts
|
|
309271
309326
|
async function createCodeAssistContentGenerator(httpOptions, authType, config2, sessionId) {
|
|
309272
309327
|
if (authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authType === "compute-default-credentials" /* COMPUTE_ADC */) {
|
|
@@ -309287,8 +309342,14 @@ async function createCodeAssistContentGenerator(httpOptions, authType, config2,
|
|
|
309287
309342
|
}
|
|
309288
309343
|
function getCodeAssistServer(config2) {
|
|
309289
309344
|
let server = config2.getContentGenerator();
|
|
309290
|
-
|
|
309291
|
-
server
|
|
309345
|
+
while (true) {
|
|
309346
|
+
if (server instanceof LoggingContentGenerator) {
|
|
309347
|
+
server = server.getWrapped();
|
|
309348
|
+
} else if (server instanceof ModelMappingContentGenerator) {
|
|
309349
|
+
server = server.getWrapped();
|
|
309350
|
+
} else {
|
|
309351
|
+
break;
|
|
309352
|
+
}
|
|
309292
309353
|
}
|
|
309293
309354
|
if (!(server instanceof CodeAssistServer)) {
|
|
309294
309355
|
return void 0;
|
|
@@ -309684,11 +309745,14 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
|
|
|
309684
309745
|
if (config2.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || config2.authType === "compute-default-credentials" /* COMPUTE_ADC */) {
|
|
309685
309746
|
const httpOptions = { headers: baseHeaders };
|
|
309686
309747
|
return new LoggingContentGenerator(
|
|
309687
|
-
|
|
309688
|
-
|
|
309689
|
-
|
|
309690
|
-
|
|
309691
|
-
|
|
309748
|
+
new ModelMappingContentGenerator(
|
|
309749
|
+
await createCodeAssistContentGenerator(
|
|
309750
|
+
httpOptions,
|
|
309751
|
+
config2.authType,
|
|
309752
|
+
gcConfig,
|
|
309753
|
+
sessionId
|
|
309754
|
+
),
|
|
309755
|
+
CCPA_AI_MODEL_MAPPINGS
|
|
309692
309756
|
),
|
|
309693
309757
|
gcConfig
|
|
309694
309758
|
);
|
|
@@ -338373,7 +338437,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
|
|
|
338373
338437
|
return provider;
|
|
338374
338438
|
}
|
|
338375
338439
|
case "oauth2": {
|
|
338376
|
-
const { OAuth2AuthProvider } = await import("./oauth2-provider-
|
|
338440
|
+
const { OAuth2AuthProvider } = await import("./oauth2-provider-T6KMRWSV.js");
|
|
338377
338441
|
const provider = new OAuth2AuthProvider(
|
|
338378
338442
|
authConfig,
|
|
338379
338443
|
options.agentName ?? "unknown",
|
|
@@ -381455,7 +381519,7 @@ ${sections.join("\n")}
|
|
|
381455
381519
|
if (authType === "gemini-api-key" /* USE_GEMINI */) {
|
|
381456
381520
|
setFlashModels("gemini-3-flash-preview", "gemini-3.5-flash");
|
|
381457
381521
|
} else {
|
|
381458
|
-
setFlashModels("gemini-3-flash", "gemini-3-flash");
|
|
381522
|
+
setFlashModels("gemini-3.5-flash", "gemini-3.5-flash");
|
|
381459
381523
|
}
|
|
381460
381524
|
} else {
|
|
381461
381525
|
setFlashModels("gemini-3-flash-preview", "gemini-2.5-flash");
|
|
@@ -399920,6 +399984,7 @@ export {
|
|
|
399920
399984
|
isAutoModel,
|
|
399921
399985
|
supportsMultimodalFunctionResponse,
|
|
399922
399986
|
isActiveModel,
|
|
399987
|
+
CCPA_AI_MODEL_MAPPINGS,
|
|
399923
399988
|
G1_CREDIT_TYPE,
|
|
399924
399989
|
OVERAGE_ELIGIBLE_MODELS,
|
|
399925
399990
|
isOverageEligibleModel,
|