@google/gemini-cli-core 0.68.0-preview.0 → 0.69.0-nightly.20261105.g1fe22af5f
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/docs/reference/commands.md +4 -0
- package/dist/google-gemini-cli-core-0.69.0-nightly.20261104.g89e9d25d6.tgz +0 -0
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/prompts/utils.js +4 -4
- package/dist/src/prompts/utils.js.map +1 -1
- package/dist/src/prompts/utils.test.js +22 -0
- package/dist/src/prompts/utils.test.js.map +1 -1
- package/dist/src/services/usageAggregator.d.ts +61 -0
- package/dist/src/services/usageAggregator.js +379 -0
- package/dist/src/services/usageAggregator.js.map +1 -0
- package/dist/src/services/usageAggregator.test.d.ts +6 -0
- package/dist/src/services/usageAggregator.test.js +257 -0
- package/dist/src/services/usageAggregator.test.js.map +1 -0
- package/dist/src/tools/mcp-client.test.js +48 -0
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/utils/envExpansion.js +9 -4
- package/dist/src/utils/envExpansion.js.map +1 -1
- package/dist/src/utils/envExpansion.test.js +58 -0
- package/dist/src/utils/envExpansion.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usageAggregator.js","sourceRoot":"","sources":["../../../src/services/usageAggregator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAE1C,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAG,CAAC;AAC/C,MAAM,CAAC,MAAM,0BAA0B,GACrC,oEAAoE,CAAC;AAEvE,MAAM,cAAc,GAAG,UAAU,CAAC;AAClC,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;AA2DrD,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAU;IAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpD,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,EAAE,CAAC;AACnC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE1C,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,IAAI,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,IACE,KAAK,CAAC,cAAc,EAAE,KAAK,IAAI;QAC/B,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,KAAK;QACjC,KAAK,CAAC,UAAU,EAAE,KAAK,GAAG,EAC1B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAa;IACzC,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpD,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,EAAE,CAAC;AACnC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,OAAe,EAAE,SAAiB;IAChE,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,oBAAoB,CAAC,KAAK,GAAG,SAAS,GAAG,cAAc,CAAC,CAAC;AAClE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,YAAoB,EACpB,UAAkB;IAElB,MAAM,OAAO,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC9C,IAAI,OAAO,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAc,EACd,gBAAsB,IAAI,IAAI,EAAE;IAEhC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAEnD,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QAC3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACtC,CAAC;IACD,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QAC/B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,CAAC;IAED,IAAI,mBAAmB,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACrC,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAa,EACb,WAAyB;IAEzB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAoB,IAAI,CAAC;IACrC,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnD,IAAI,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC;QAClD,CAAC,CAAC,MAAM,CAAC,MAAM;QACf,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC;YACnC,CAAC,CAAC,MAAM,CAAC,aAAa;YACtB,CAAC,CAAC,IAAI,CAAC;IACX,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAmB,eAAe,CAAC;IACpD,MAAM,WAAW,GAAG,mBAAmB,CACrC,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,WAAW,CAC7C,CAAC;IACF,MAAM,YAAY,GAAG,mBAAmB,CACtC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,YAAY,CAC/C,CAAC;IACF,MAAM,YAAY,GAAG,mBAAmB,CACtC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,YAAY,CAC/C,CAAC;IACF,MAAM,cAAc,GAAG,mBAAmB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,aAAa,GACjB,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC;QAClC,eAAe,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,WAAW,GACf,aAAa,IAAI,WAAW,GAAG,YAAY,GAAG,cAAc,GAAG,UAAU,CAAC;IAE5E,MAAM,KAAK,GACT,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QAChE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;QACrB,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,GAAG,GACP,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC;QACnD,CAAC,CAAC,MAAM,CAAC,EAAE;QACX,CAAC,CAAC,WAAW,EAAE,CAAC;IAEpB,OAAO;QACL,GAAG;QACH,KAAK,EAAE;YACL,OAAO,EAAE,kBAAkB,CAAC,eAAe,CAAC;YAC5C,WAAW;YACX,YAAY;YACZ,YAAY;YACZ,WAAW;YACX,KAAK;SACN;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,QAAgB;IACrD,IAAI,OAAoB,CAAC;IACzB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YAC/B,sFAAsF;YACtF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;oBACnD,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;gBACH,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;oBAClC,IAAI,QAAQ,CAAC,MAAM,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAC1D,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;oBACpD,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,+CAA+C;YACjD,CAAC;QACH,CAAC;IACH,CAAC;IAED,UAAU,CAAC,IAAI,EAAE,CAAC;IAClB,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,QAAgB;IAInD,MAAM,YAAY,GAAG,IAAI,GAAG,EAA4B,CAAC;IACzD,IAAI,iBAAqC,CAAC;IAC1C,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,UAAU,WAAW,EAAE,EAAE,CAAC;IAEpD,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IACxE,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;QAClC,KAAK,EAAE,UAAU;QACjB,SAAS,EAAE,QAAQ;KACpB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;gBACjB,SAAS;YACX,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBAED,MAAM,MAAM,GAAoB,MAAM,CAAC;gBACvC,IACE,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;oBACpC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAClC,CAAC;oBACD,iBAAiB,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBAC9C,CAAC;gBAED,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC/B,MAAM,SAAS,GAAoB,MAAM,CAAC,IAAI,CAAC;oBAC/C,IACE,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ;wBACvC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EACrC,CAAC;wBACD,iBAAiB,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBACjD,CAAC;oBACD,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACtC,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;4BACrC,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;4BACvD,IAAI,SAAS,EAAE,CAAC;gCACd,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;4BACnD,CAAC;wBACH,CAAC;oBACH,CAAC;oBACD,SAAS;gBACX,CAAC;gBAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACnC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;wBAClC,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;wBACvD,IAAI,SAAS,EAAE,CAAC;4BACd,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;wBACnD,CAAC;oBACH,CAAC;oBACD,SAAS;gBACX,CAAC;gBAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;gBAC1D,IAAI,SAAS,EAAE,CAAC;oBACd,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,qDAAqD;gBACrD,SAAS;YACX,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,2EAA2E;IAC7E,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;QACX,UAAU,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,OAAO;QACL,UAAU,EAAE,iBAAiB,IAAI,QAAQ;QACzC,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAwC,EACxC,cAAwD,EACxD,UAAkB,EAClB,aAAmB;IAEnB,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;SAC/C,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;SAC3B,IAAI,EAAE,CAAC;IAEV,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,WAAW,GAAkB,IAAI,CAAC;IAEtC,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,WAAW,KAAK,IAAI,IAAI,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzE,aAAa,IAAI,CAAC,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,aAAa,GAAG,CAAC,CAAC;QACpB,CAAC;QACD,IAAI,aAAa,GAAG,aAAa,EAAE,CAAC;YAClC,aAAa,GAAG,aAAa,CAAC;QAChC,CAAC;QACD,WAAW,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CACrC,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAE5C,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,SAAS,GAAkB,cAAc,CAAC,QAAQ,CAAC;QACrD,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC;YAC5B,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,IAAI,CAAC;IAEX,OAAO,SAAS,KAAK,IAAI,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACvD,aAAa,IAAI,CAAC,CAAC;QACnB,SAAS,GAAG,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;QAC/D,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YACpD,IAAI,OAAO,IAAI,SAAS,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAChD,iBAAiB,IAAI,OAAO,CAAC,WAAW,CAAC;gBACzC,gBAAgB,IAAI,OAAO,CAAC,KAAK,CAAC;gBAClC,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACjD,IAAI,YAAY,EAAE,CAAC;oBACjB,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;wBACtC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBACjC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,UAAU,EAAE,QAAQ;QACpB,iBAAiB;QACjB,mBAAmB,EAAE,cAAc,CAAC,IAAI;QACxC,gBAAgB;QAChB,aAAa;QACb,aAAa;KACd,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAChD,QAAgB,EAChB,UAAU,GAAG,2BAA2B,EACxC,gBAAsB,IAAI,IAAI,EAAE;IAEhC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA6B,CAAC;IACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACrB,OAAO;YACL,UAAU,EAAE,QAAQ;YACpB,iBAAiB,EAAE,CAAC;YACpB,mBAAmB,EAAE,CAAC;YACtB,gBAAgB,EAAE,CAAC;YACnB,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,CAAC;SACjB,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAuB,CAAC;IAEtD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;QAC7B,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACpE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI;gBAC1C,IAAI,EAAE,IAAI,CAAC,OAAO;gBAClB,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,CAAC;gBACd,YAAY,EAAE,CAAC;gBACf,YAAY,EAAE,CAAC;gBACf,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,CAAC;gBACX,cAAc,EAAE,EAAE;aACnB,CAAC;YAEF,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC;YACtC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;YACxC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;YACxC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC;YACtC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;YAEjB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC9B,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;YAC/D,CAAC;YAED,IAAI,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;gBACjC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACjD,CAAC;YACD,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC7B,KAAK,CAAC,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC;YAEnC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,OAAO,qBAAqB,CAC1B,QAAQ,EACR,cAAc,EACd,UAAU,EACV,aAAa,CACd,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import fsSync from 'node:fs';
|
|
7
|
+
import * as fs from 'node:fs/promises';
|
|
8
|
+
import * as os from 'node:os';
|
|
9
|
+
import * as path from 'node:path';
|
|
10
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
11
|
+
import { INVALID_HEATMAP_DATE_ERROR, addCalendarDays, aggregateUsageFromRecordings, diffCalendarDays, formatLocalDateKey, parseDateKeyToUtcMs, resolveHeatmapDateArg, } from './usageAggregator.js';
|
|
12
|
+
describe('usageAggregator', () => {
|
|
13
|
+
let tempDir;
|
|
14
|
+
beforeEach(async () => {
|
|
15
|
+
vi.stubEnv('TZ', 'UTC');
|
|
16
|
+
tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-heatmap-test-'));
|
|
17
|
+
});
|
|
18
|
+
afterEach(async () => {
|
|
19
|
+
vi.restoreAllMocks();
|
|
20
|
+
vi.unstubAllEnvs();
|
|
21
|
+
await fs.rm(tempDir, { recursive: true, force: true });
|
|
22
|
+
});
|
|
23
|
+
describe('calendar date helpers & validation', () => {
|
|
24
|
+
it('validates real calendar dates and rejects invalid or rollover dates', () => {
|
|
25
|
+
expect(parseDateKeyToUtcMs('2026-11-03')).not.toBeNull();
|
|
26
|
+
expect(parseDateKeyToUtcMs('2024-02-29')).not.toBeNull(); // Leap year
|
|
27
|
+
expect(parseDateKeyToUtcMs('2025-02-29')).toBeNull(); // Non-leap year
|
|
28
|
+
expect(parseDateKeyToUtcMs('2026-02-31')).toBeNull();
|
|
29
|
+
expect(parseDateKeyToUtcMs('2026-13-01')).toBeNull();
|
|
30
|
+
expect(parseDateKeyToUtcMs('../chats/session')).toBeNull();
|
|
31
|
+
});
|
|
32
|
+
it('adds and diffs calendar days without DST drift', () => {
|
|
33
|
+
vi.stubEnv('TZ', 'America/Los_Angeles');
|
|
34
|
+
expect(addCalendarDays('2026-03-08', 1)).toBe('2026-03-09');
|
|
35
|
+
expect(addCalendarDays('2026-11-01', 1)).toBe('2026-11-02');
|
|
36
|
+
expect(addCalendarDays('2026-11-02', -1)).toBe('2026-11-01');
|
|
37
|
+
expect(diffCalendarDays('2026-03-07', '2026-03-09')).toBe(2);
|
|
38
|
+
expect(diffCalendarDays('2024-02-28', '2024-03-01')).toBe(2);
|
|
39
|
+
});
|
|
40
|
+
it('resolves today, yesterday, YYYY-MM-DD, and rejects invalid arguments', () => {
|
|
41
|
+
const ref = new Date('2026-11-03T15:30:00.000Z');
|
|
42
|
+
expect(resolveHeatmapDateArg('', ref)).toEqual({
|
|
43
|
+
ok: true,
|
|
44
|
+
date: undefined,
|
|
45
|
+
});
|
|
46
|
+
expect(resolveHeatmapDateArg(' today ', ref)).toEqual({
|
|
47
|
+
ok: true,
|
|
48
|
+
date: '2026-11-03',
|
|
49
|
+
});
|
|
50
|
+
expect(resolveHeatmapDateArg('YESTERDAY', ref)).toEqual({
|
|
51
|
+
ok: true,
|
|
52
|
+
date: '2026-11-02',
|
|
53
|
+
});
|
|
54
|
+
expect(resolveHeatmapDateArg('2026-10-15', ref)).toEqual({
|
|
55
|
+
ok: true,
|
|
56
|
+
date: '2026-10-15',
|
|
57
|
+
});
|
|
58
|
+
expect(resolveHeatmapDateArg('2026-02-30', ref)).toEqual({
|
|
59
|
+
ok: false,
|
|
60
|
+
error: INVALID_HEATMAP_DATE_ERROR,
|
|
61
|
+
});
|
|
62
|
+
expect(resolveHeatmapDateArg('../../etc/passwd', ref)).toEqual({
|
|
63
|
+
ok: false,
|
|
64
|
+
error: INVALID_HEATMAP_DATE_ERROR,
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
it('normalizes UTC ISO timestamps into local date keys', () => {
|
|
68
|
+
vi.stubEnv('TZ', 'America/New_York');
|
|
69
|
+
// 2026-11-03T02:30:00Z is 2026-11-02 21:30 EST
|
|
70
|
+
expect(formatLocalDateKey(new Date('2026-11-03T02:30:00.000Z'))).toBe('2026-11-02');
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
describe('aggregateUsageFromRecordings', () => {
|
|
74
|
+
it('returns an empty dataset when directory is missing or has no .jsonl files', async () => {
|
|
75
|
+
const existsSyncSpy = vi.spyOn(fsSync, 'existsSync');
|
|
76
|
+
const blankResult = await aggregateUsageFromRecordings(' ');
|
|
77
|
+
expect(blankResult.dailyUsage.size).toBe(0);
|
|
78
|
+
expect(blankResult.totalWindowTokens).toBe(0);
|
|
79
|
+
const missingPath = path.join(tempDir, 'does-not-exist');
|
|
80
|
+
const missingResult = await aggregateUsageFromRecordings(missingPath);
|
|
81
|
+
expect(missingResult.dailyUsage.size).toBe(0);
|
|
82
|
+
expect(missingResult.totalWindowTokens).toBe(0);
|
|
83
|
+
expect(missingResult.totalWindowSessions).toBe(0);
|
|
84
|
+
expect(missingResult.totalWindowTurns).toBe(0);
|
|
85
|
+
expect(missingResult.currentStreak).toBe(0);
|
|
86
|
+
expect(missingResult.longestStreak).toBe(0);
|
|
87
|
+
const notesFilePath = path.join(tempDir, 'notes.txt');
|
|
88
|
+
await fs.writeFile(notesFilePath, 'ignored');
|
|
89
|
+
const nonDirResult = await aggregateUsageFromRecordings(notesFilePath);
|
|
90
|
+
expect(nonDirResult.dailyUsage.size).toBe(0);
|
|
91
|
+
const emptyResult = await aggregateUsageFromRecordings(tempDir);
|
|
92
|
+
expect(emptyResult.dailyUsage.size).toBe(0);
|
|
93
|
+
expect(existsSyncSpy).not.toHaveBeenCalled();
|
|
94
|
+
});
|
|
95
|
+
it('aggregates MessageRecord.tokens, deduplicates repeated message IDs, and skips corrupt lines', async () => {
|
|
96
|
+
const sessionA = path.join(tempDir, 'session-a.jsonl');
|
|
97
|
+
const linesA = [
|
|
98
|
+
JSON.stringify({
|
|
99
|
+
sessionId: 'sess-a',
|
|
100
|
+
projectHash: 'hash',
|
|
101
|
+
startTime: '2026-11-01T10:00:00.000Z',
|
|
102
|
+
}),
|
|
103
|
+
// Initial message snapshot without tokens
|
|
104
|
+
JSON.stringify({
|
|
105
|
+
id: 'msg-1',
|
|
106
|
+
type: 'gemini',
|
|
107
|
+
timestamp: '2026-11-01T10:01:00.000Z',
|
|
108
|
+
content: 'Hello',
|
|
109
|
+
tokens: null,
|
|
110
|
+
model: 'gemini-2.5-pro',
|
|
111
|
+
}),
|
|
112
|
+
// Updated snapshot after recordMessageTokens
|
|
113
|
+
JSON.stringify({
|
|
114
|
+
id: 'msg-1',
|
|
115
|
+
type: 'gemini',
|
|
116
|
+
timestamp: '2026-11-01T10:01:00.000Z',
|
|
117
|
+
content: 'Hello',
|
|
118
|
+
tokens: { input: 100, output: 50, cached: 20, total: 150 },
|
|
119
|
+
model: 'gemini-2.5-pro',
|
|
120
|
+
}),
|
|
121
|
+
// Repeated snapshot after recordToolCalls with same ID — must NOT double count
|
|
122
|
+
JSON.stringify({
|
|
123
|
+
id: 'msg-1',
|
|
124
|
+
type: 'gemini',
|
|
125
|
+
timestamp: '2026-11-01T10:01:00.000Z',
|
|
126
|
+
content: 'Hello',
|
|
127
|
+
toolCalls: [{ id: 'tc-1', name: 'read_file', args: {} }],
|
|
128
|
+
tokens: { input: 100, output: 50, cached: 20, total: 150 },
|
|
129
|
+
model: 'gemini-2.5-pro',
|
|
130
|
+
}),
|
|
131
|
+
'{corrupt json line from interrupted write',
|
|
132
|
+
'',
|
|
133
|
+
JSON.stringify({
|
|
134
|
+
id: 'msg-bad-ts',
|
|
135
|
+
type: 'gemini',
|
|
136
|
+
timestamp: 'not-a-timestamp',
|
|
137
|
+
tokens: { input: 999, output: 999, cached: 0, total: 1998 },
|
|
138
|
+
}),
|
|
139
|
+
// Second turn in same session on same day with different model
|
|
140
|
+
JSON.stringify({
|
|
141
|
+
id: 'msg-2',
|
|
142
|
+
type: 'gemini',
|
|
143
|
+
timestamp: '2026-11-01T12:00:00.000Z',
|
|
144
|
+
tokens: { input: 200, output: 100, cached: 50, total: 300 },
|
|
145
|
+
model: 'gemini-2.5-flash',
|
|
146
|
+
}),
|
|
147
|
+
];
|
|
148
|
+
await fs.writeFile(sessionA, linesA.join('\n') + '\n');
|
|
149
|
+
// Second session + nested subagent directory on same and next day
|
|
150
|
+
const sessionB = path.join(tempDir, 'session-b.jsonl');
|
|
151
|
+
await fs.writeFile(sessionB, [
|
|
152
|
+
JSON.stringify({ sessionId: 'sess-b', projectHash: 'hash' }),
|
|
153
|
+
JSON.stringify({
|
|
154
|
+
id: 'msg-b1',
|
|
155
|
+
type: 'gemini',
|
|
156
|
+
timestamp: '2026-11-01T18:00:00.000Z',
|
|
157
|
+
tokensSummary: {
|
|
158
|
+
inputTokens: 40,
|
|
159
|
+
outputTokens: 10,
|
|
160
|
+
cachedTokens: 5,
|
|
161
|
+
},
|
|
162
|
+
model: 'gemini-2.5-pro',
|
|
163
|
+
}),
|
|
164
|
+
JSON.stringify({
|
|
165
|
+
id: 'msg-b2',
|
|
166
|
+
type: 'gemini',
|
|
167
|
+
timestamp: '2026-11-02T09:00:00.000Z',
|
|
168
|
+
tokens: { input: 300, output: 200, cached: 100, total: 500 },
|
|
169
|
+
model: 'gemini-2.5-pro',
|
|
170
|
+
}),
|
|
171
|
+
].join('\n') + '\n');
|
|
172
|
+
const subagentDir = path.join(tempDir, 'sess-b');
|
|
173
|
+
await fs.mkdir(subagentDir);
|
|
174
|
+
await fs.writeFile(path.join(subagentDir, 'subagent-1.jsonl'), [
|
|
175
|
+
JSON.stringify({ sessionId: 'sub-1', projectHash: 'hash' }),
|
|
176
|
+
JSON.stringify({
|
|
177
|
+
id: 'msg-sub-1',
|
|
178
|
+
type: 'gemini',
|
|
179
|
+
timestamp: '2026-11-02T09:05:00.000Z',
|
|
180
|
+
tokens: { input: 50, output: 25, cached: 0, total: 75 },
|
|
181
|
+
model: 'gemini-2.5-flash',
|
|
182
|
+
}),
|
|
183
|
+
].join('\n') + '\n');
|
|
184
|
+
const refDate = new Date('2026-11-03T10:00:00.000Z');
|
|
185
|
+
const result = await aggregateUsageFromRecordings(tempDir, 196, refDate);
|
|
186
|
+
const nov1 = result.dailyUsage.get('2026-11-01');
|
|
187
|
+
expect(nov1).toEqual({
|
|
188
|
+
date: '2026-11-01',
|
|
189
|
+
inputTokens: 340,
|
|
190
|
+
outputTokens: 160,
|
|
191
|
+
cachedTokens: 75,
|
|
192
|
+
totalTokens: 500,
|
|
193
|
+
turns: 3,
|
|
194
|
+
sessions: 2,
|
|
195
|
+
modelBreakdown: {
|
|
196
|
+
'gemini-2.5-pro': 200,
|
|
197
|
+
'gemini-2.5-flash': 300,
|
|
198
|
+
},
|
|
199
|
+
});
|
|
200
|
+
const nov2 = result.dailyUsage.get('2026-11-02');
|
|
201
|
+
expect(nov2).toEqual({
|
|
202
|
+
date: '2026-11-02',
|
|
203
|
+
inputTokens: 350,
|
|
204
|
+
outputTokens: 225,
|
|
205
|
+
cachedTokens: 100,
|
|
206
|
+
totalTokens: 575,
|
|
207
|
+
turns: 2,
|
|
208
|
+
sessions: 2,
|
|
209
|
+
modelBreakdown: {
|
|
210
|
+
'gemini-2.5-pro': 500,
|
|
211
|
+
'gemini-2.5-flash': 75,
|
|
212
|
+
},
|
|
213
|
+
});
|
|
214
|
+
// Today (2026-11-03) has 0 usage, but yesterday (2026-11-02) + 2026-11-01 had usage -> streak = 2
|
|
215
|
+
expect(result.currentStreak).toBe(2);
|
|
216
|
+
expect(result.longestStreak).toBe(2);
|
|
217
|
+
expect(result.totalWindowTokens).toBe(1075);
|
|
218
|
+
// sess-a, sess-b (shared across both days), and sub-1 -> 3 unique sessions, 5 turns
|
|
219
|
+
expect(result.totalWindowSessions).toBe(3);
|
|
220
|
+
expect(result.totalWindowTurns).toBe(5);
|
|
221
|
+
});
|
|
222
|
+
it('calculates longest historical streak separately from current streak and excludes out-of-window tokens', async () => {
|
|
223
|
+
const logPath = path.join(tempDir, 'history.jsonl');
|
|
224
|
+
const records = [
|
|
225
|
+
// 4-day historical streak outside 10-day window
|
|
226
|
+
'2026-01-10T12:00:00.000Z',
|
|
227
|
+
'2026-01-11T12:00:00.000Z',
|
|
228
|
+
'2026-01-12T12:00:00.000Z',
|
|
229
|
+
'2026-01-13T12:00:00.000Z',
|
|
230
|
+
// Current 2-day streak ending today
|
|
231
|
+
'2026-11-02T12:00:00.000Z',
|
|
232
|
+
'2026-11-03T12:00:00.000Z',
|
|
233
|
+
].map((timestamp, idx) => JSON.stringify({
|
|
234
|
+
id: `turn-${idx}`,
|
|
235
|
+
type: 'gemini',
|
|
236
|
+
timestamp,
|
|
237
|
+
tokens: { input: 80, output: 20, cached: 0, total: 100 },
|
|
238
|
+
}));
|
|
239
|
+
// Zero-token record between streaks must NOT bridge or extend streaks
|
|
240
|
+
records.push(JSON.stringify({
|
|
241
|
+
id: 'zero-turn',
|
|
242
|
+
type: 'gemini',
|
|
243
|
+
timestamp: '2026-11-01T12:00:00.000Z',
|
|
244
|
+
tokens: { input: 0, output: 0, cached: 0, total: 0 },
|
|
245
|
+
}));
|
|
246
|
+
await fs.writeFile(logPath, records.join('\n') + '\n');
|
|
247
|
+
const refDate = new Date('2026-11-03T20:00:00.000Z');
|
|
248
|
+
const result = await aggregateUsageFromRecordings(tempDir, 10, refDate);
|
|
249
|
+
expect(result.longestStreak).toBe(4);
|
|
250
|
+
expect(result.currentStreak).toBe(2);
|
|
251
|
+
expect(result.totalWindowTokens).toBe(200);
|
|
252
|
+
expect(result.totalWindowSessions).toBe(1);
|
|
253
|
+
expect(result.totalWindowTurns).toBe(3);
|
|
254
|
+
});
|
|
255
|
+
});
|
|
256
|
+
});
|
|
257
|
+
//# sourceMappingURL=usageAggregator.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usageAggregator.test.js","sourceRoot":"","sources":["../../../src/services/usageAggregator.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EACL,0BAA0B,EAC1B,eAAe,EACf,4BAA4B,EAC5B,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,OAAe,CAAC;IAEpB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACxB,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,EAAE,CAAC,eAAe,EAAE,CAAC;QACrB,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAClD,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;YAC7E,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACzD,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY;YACtE,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,gBAAgB;YACtE,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACrD,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACrD,MAAM,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YACxD,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;YACxC,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5D,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5D,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7D,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7D,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sEAAsE,EAAE,GAAG,EAAE;YAC9E,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACjD,MAAM,CAAC,qBAAqB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC7C,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBACrD,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,YAAY;aACnB,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBACtD,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,YAAY;aACnB,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBACvD,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,YAAY;aACnB,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBACvD,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,0BAA0B;aAClC,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC7D,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,0BAA0B;aAClC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YACrC,+CAA+C;YAC/C,MAAM,CAAC,kBAAkB,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,IAAI,CACnE,YAAY,CACb,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC5C,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;YACzF,MAAM,aAAa,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAErD,MAAM,WAAW,GAAG,MAAM,4BAA4B,CAAC,KAAK,CAAC,CAAC;YAC9D,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAE9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YACzD,MAAM,aAAa,GAAG,MAAM,4BAA4B,CAAC,WAAW,CAAC,CAAC;YACtE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAE5C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACtD,MAAM,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YAC7C,MAAM,YAAY,GAAG,MAAM,4BAA4B,CAAC,aAAa,CAAC,CAAC;YACvE,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAE7C,MAAM,WAAW,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,CAAC;YAChE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6FAA6F,EAAE,KAAK,IAAI,EAAE;YAC3G,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG;gBACb,IAAI,CAAC,SAAS,CAAC;oBACb,SAAS,EAAE,QAAQ;oBACnB,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;iBACtC,CAAC;gBACF,0CAA0C;gBAC1C,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,OAAO;oBACX,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,0BAA0B;oBACrC,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,gBAAgB;iBACxB,CAAC;gBACF,6CAA6C;gBAC7C,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,OAAO;oBACX,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,0BAA0B;oBACrC,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;oBAC1D,KAAK,EAAE,gBAAgB;iBACxB,CAAC;gBACF,+EAA+E;gBAC/E,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,OAAO;oBACX,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,0BAA0B;oBACrC,OAAO,EAAE,OAAO;oBAChB,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;oBACxD,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;oBAC1D,KAAK,EAAE,gBAAgB;iBACxB,CAAC;gBACF,2CAA2C;gBAC3C,EAAE;gBACF,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,YAAY;oBAChB,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,iBAAiB;oBAC5B,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE;iBAC5D,CAAC;gBACF,+DAA+D;gBAC/D,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,OAAO;oBACX,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,0BAA0B;oBACrC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;oBAC3D,KAAK,EAAE,kBAAkB;iBAC1B,CAAC;aACH,CAAC;YACF,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;YAEvD,kEAAkE;YAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YACvD,MAAM,EAAE,CAAC,SAAS,CAChB,QAAQ,EACR;gBACE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;gBAC5D,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,QAAQ;oBACZ,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,0BAA0B;oBACrC,aAAa,EAAE;wBACb,WAAW,EAAE,EAAE;wBACf,YAAY,EAAE,EAAE;wBAChB,YAAY,EAAE,CAAC;qBAChB;oBACD,KAAK,EAAE,gBAAgB;iBACxB,CAAC;gBACF,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,QAAQ;oBACZ,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,0BAA0B;oBACrC,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;oBAC5D,KAAK,EAAE,gBAAgB;iBACxB,CAAC;aACH,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CACpB,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACjD,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC5B,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,EAC1C;gBACE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;gBAC3D,IAAI,CAAC,SAAS,CAAC;oBACb,EAAE,EAAE,WAAW;oBACf,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,0BAA0B;oBACrC,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;oBACvD,KAAK,EAAE,kBAAkB;iBAC1B,CAAC;aACH,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CACpB,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,4BAA4B,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YAEzE,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;gBACnB,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,GAAG;gBAChB,YAAY,EAAE,GAAG;gBACjB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,GAAG;gBAChB,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,CAAC;gBACX,cAAc,EAAE;oBACd,gBAAgB,EAAE,GAAG;oBACrB,kBAAkB,EAAE,GAAG;iBACxB;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;gBACnB,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,GAAG;gBAChB,YAAY,EAAE,GAAG;gBACjB,YAAY,EAAE,GAAG;gBACjB,WAAW,EAAE,GAAG;gBAChB,KAAK,EAAE,CAAC;gBACR,QAAQ,EAAE,CAAC;gBACX,cAAc,EAAE;oBACd,gBAAgB,EAAE,GAAG;oBACrB,kBAAkB,EAAE,EAAE;iBACvB;aACF,CAAC,CAAC;YAEH,kGAAkG;YAClG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,oFAAoF;YACpF,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uGAAuG,EAAE,KAAK,IAAI,EAAE;YACrH,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACpD,MAAM,OAAO,GAAG;gBACd,gDAAgD;gBAChD,0BAA0B;gBAC1B,0BAA0B;gBAC1B,0BAA0B;gBAC1B,0BAA0B;gBAC1B,oCAAoC;gBACpC,0BAA0B;gBAC1B,0BAA0B;aAC3B,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CACvB,IAAI,CAAC,SAAS,CAAC;gBACb,EAAE,EAAE,QAAQ,GAAG,EAAE;gBACjB,IAAI,EAAE,QAAQ;gBACd,SAAS;gBACT,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE;aACzD,CAAC,CACH,CAAC;YAEF,sEAAsE;YACtE,OAAO,CAAC,IAAI,CACV,IAAI,CAAC,SAAS,CAAC;gBACb,EAAE,EAAE,WAAW;gBACf,IAAI,EAAE,QAAQ;gBACd,SAAS,EAAE,0BAA0B;gBACrC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;aACrD,CAAC,CACH,CAAC;YAEF,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,4BAA4B,CAAC,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;YAExE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -77,6 +77,7 @@ describe('mcp-client', () => {
|
|
|
77
77
|
await cleanupTmpDir(testWorkspace);
|
|
78
78
|
workspaceContext = null;
|
|
79
79
|
vi.restoreAllMocks();
|
|
80
|
+
vi.unstubAllEnvs();
|
|
80
81
|
});
|
|
81
82
|
describe('McpClient', () => {
|
|
82
83
|
it('should discover tools', async () => {
|
|
@@ -1618,6 +1619,31 @@ describe('mcp-client', () => {
|
|
|
1618
1619
|
},
|
|
1619
1620
|
});
|
|
1620
1621
|
});
|
|
1622
|
+
describe('with __GCLI_EXPAND_TARGET__ in environment', () => {
|
|
1623
|
+
beforeEach(() => {
|
|
1624
|
+
vi.stubEnv('GEMINI_CLI_HEADER_VAR', 'header-value');
|
|
1625
|
+
vi.stubEnv('__GCLI_EXPAND_TARGET__', 'unexpected-override');
|
|
1626
|
+
});
|
|
1627
|
+
it('expands headers without being overwritten by __GCLI_EXPAND_TARGET__', async () => {
|
|
1628
|
+
const transport = await createTransport('test-server', {
|
|
1629
|
+
url: 'http://test-server',
|
|
1630
|
+
headers: {
|
|
1631
|
+
'X-Custom-Header': 'Prefix $GEMINI_CLI_HEADER_VAR',
|
|
1632
|
+
'X-Static-Header': 'literal-value',
|
|
1633
|
+
},
|
|
1634
|
+
}, false, MOCK_CONTEXT);
|
|
1635
|
+
expect(unwrap(transport)).toBeInstanceOf(StreamableHTTPClientTransport);
|
|
1636
|
+
expect(unwrap(transport)).toMatchObject({
|
|
1637
|
+
_url: new URL('http://test-server'),
|
|
1638
|
+
_requestInit: {
|
|
1639
|
+
headers: {
|
|
1640
|
+
'X-Custom-Header': 'Prefix header-value',
|
|
1641
|
+
'X-Static-Header': 'literal-value',
|
|
1642
|
+
},
|
|
1643
|
+
},
|
|
1644
|
+
});
|
|
1645
|
+
});
|
|
1646
|
+
});
|
|
1621
1647
|
it('with type="http" creates StreamableHTTPClientTransport', async () => {
|
|
1622
1648
|
const transport = await createTransport('test-server', {
|
|
1623
1649
|
url: 'http://test-server',
|
|
@@ -1886,6 +1912,28 @@ describe('mcp-client', () => {
|
|
|
1886
1912
|
expect(callArgs.env['TEST_EXPANDED']).toBe('Value is expanded-value');
|
|
1887
1913
|
expect(callArgs.env['SECRET_KEY']).toBe('intentional-secret-123');
|
|
1888
1914
|
});
|
|
1915
|
+
describe('when __GCLI_EXPAND_TARGET__ is set in environment', () => {
|
|
1916
|
+
beforeEach(() => {
|
|
1917
|
+
vi.stubEnv('GEMINI_CLI_TEST_VAR', 'expanded-value');
|
|
1918
|
+
vi.stubEnv('__GCLI_EXPAND_TARGET__', 'unexpected-override');
|
|
1919
|
+
});
|
|
1920
|
+
it('expands mcpServerConfig.env values without overwriting them', async () => {
|
|
1921
|
+
const mockedTransport = vi
|
|
1922
|
+
.spyOn(SdkClientStdioLib, 'StdioClientTransport')
|
|
1923
|
+
.mockReturnValue({});
|
|
1924
|
+
await createTransport('test-server', {
|
|
1925
|
+
command: 'test-command',
|
|
1926
|
+
env: {
|
|
1927
|
+
TEST_EXPANDED: 'Value is $GEMINI_CLI_TEST_VAR',
|
|
1928
|
+
SECRET_KEY: 'intentional-secret-123',
|
|
1929
|
+
},
|
|
1930
|
+
}, false, MOCK_CONTEXT);
|
|
1931
|
+
const callArgs = mockedTransport.mock.calls[0][0];
|
|
1932
|
+
expect(callArgs.env).toBeDefined();
|
|
1933
|
+
expect(callArgs.env['TEST_EXPANDED']).toBe('Value is expanded-value');
|
|
1934
|
+
expect(callArgs.env['SECRET_KEY']).toBe('intentional-secret-123');
|
|
1935
|
+
});
|
|
1936
|
+
});
|
|
1889
1937
|
it('should filter out dangerous environment variables from mcpServerConfig.env', async () => {
|
|
1890
1938
|
const mockedTransport = vi
|
|
1891
1939
|
.spyOn(SdkClientStdioLib, 'StdioClientTransport')
|