@hang.yang/frankcli 0.1.52 → 0.1.53
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/api.cjs +8 -2
- package/bundle/api.js +10 -4
- package/bundle/gemini.js +17 -11
- package/package.json +2 -2
package/bundle/api.cjs
CHANGED
|
@@ -165438,11 +165438,14 @@ var Config = class {
|
|
|
165438
165438
|
return { memoryContent, fileCount };
|
|
165439
165439
|
}
|
|
165440
165440
|
/**
|
|
165441
|
-
* Get Confluence Advanced Access Token. Checks ~/.mpdai/confluence.key
|
|
165441
|
+
* Get Confluence Advanced Access Token. Checks env X_ID_CONFLUENCE_ACCESS_TOKEN first, then ~/.mpdai/confluence.key, then keys.json.
|
|
165442
165442
|
* @returns The Personal Access Token or null if not found
|
|
165443
165443
|
*/
|
|
165444
165444
|
getConfluenceToken() {
|
|
165445
165445
|
try {
|
|
165446
|
+
const envToken = import_node_process8.default.env.X_ID_CONFLUENCE_ACCESS_TOKEN?.trim();
|
|
165447
|
+
if (envToken)
|
|
165448
|
+
return envToken;
|
|
165446
165449
|
const mpdaiDir = (0, import_node_path7.join)((0, import_node_os3.homedir)(), ".mpdai");
|
|
165447
165450
|
const keyFilePath = (0, import_node_path7.join)(mpdaiDir, "confluence.key");
|
|
165448
165451
|
if ((0, import_node_fs6.existsSync)(keyFilePath)) {
|
|
@@ -165467,11 +165470,14 @@ var Config = class {
|
|
|
165467
165470
|
}
|
|
165468
165471
|
}
|
|
165469
165472
|
/**
|
|
165470
|
-
* Get Jira Personal Access Token. Checks ~/.mpdai/jira.key
|
|
165473
|
+
* Get Jira Personal Access Token. Checks env X_ID_JIRA_ACCESS_TOKEN first, then ~/.mpdai/jira.key, then keys.json.
|
|
165471
165474
|
* @returns The Personal Access Token or null if not found
|
|
165472
165475
|
*/
|
|
165473
165476
|
getJiraToken() {
|
|
165474
165477
|
try {
|
|
165478
|
+
const envToken = import_node_process8.default.env.X_ID_JIRA_ACCESS_TOKEN?.trim();
|
|
165479
|
+
if (envToken)
|
|
165480
|
+
return envToken;
|
|
165475
165481
|
const mpdaiDir = (0, import_node_path7.join)((0, import_node_os3.homedir)(), ".mpdai");
|
|
165476
165482
|
const keyFilePath = (0, import_node_path7.join)(mpdaiDir, "jira.key");
|
|
165477
165483
|
if ((0, import_node_fs6.existsSync)(keyFilePath)) {
|
package/bundle/api.js
CHANGED
|
@@ -27724,7 +27724,7 @@ async function createContentGeneratorConfig(model, authType) {
|
|
|
27724
27724
|
return contentGeneratorConfig;
|
|
27725
27725
|
}
|
|
27726
27726
|
async function createContentGenerator(config2, sessionId2) {
|
|
27727
|
-
const version2 = "0.1.
|
|
27727
|
+
const version2 = "0.1.53";
|
|
27728
27728
|
const httpOptions = {
|
|
27729
27729
|
headers: {
|
|
27730
27730
|
"User-Agent": `GeminiCLI/${version2} (${process.platform}; ${process.arch})`
|
|
@@ -165434,11 +165434,14 @@ var Config = class {
|
|
|
165434
165434
|
return { memoryContent, fileCount };
|
|
165435
165435
|
}
|
|
165436
165436
|
/**
|
|
165437
|
-
* Get Confluence Advanced Access Token. Checks ~/.mpdai/confluence.key
|
|
165437
|
+
* Get Confluence Advanced Access Token. Checks env X_ID_CONFLUENCE_ACCESS_TOKEN first, then ~/.mpdai/confluence.key, then keys.json.
|
|
165438
165438
|
* @returns The Personal Access Token or null if not found
|
|
165439
165439
|
*/
|
|
165440
165440
|
getConfluenceToken() {
|
|
165441
165441
|
try {
|
|
165442
|
+
const envToken = process10.env.X_ID_CONFLUENCE_ACCESS_TOKEN?.trim();
|
|
165443
|
+
if (envToken)
|
|
165444
|
+
return envToken;
|
|
165442
165445
|
const mpdaiDir = join11(homedir6(), ".mpdai");
|
|
165443
165446
|
const keyFilePath = join11(mpdaiDir, "confluence.key");
|
|
165444
165447
|
if (existsSync5(keyFilePath)) {
|
|
@@ -165463,11 +165466,14 @@ var Config = class {
|
|
|
165463
165466
|
}
|
|
165464
165467
|
}
|
|
165465
165468
|
/**
|
|
165466
|
-
* Get Jira Personal Access Token. Checks ~/.mpdai/jira.key
|
|
165469
|
+
* Get Jira Personal Access Token. Checks env X_ID_JIRA_ACCESS_TOKEN first, then ~/.mpdai/jira.key, then keys.json.
|
|
165467
165470
|
* @returns The Personal Access Token or null if not found
|
|
165468
165471
|
*/
|
|
165469
165472
|
getJiraToken() {
|
|
165470
165473
|
try {
|
|
165474
|
+
const envToken = process10.env.X_ID_JIRA_ACCESS_TOKEN?.trim();
|
|
165475
|
+
if (envToken)
|
|
165476
|
+
return envToken;
|
|
165471
165477
|
const mpdaiDir = join11(homedir6(), ".mpdai");
|
|
165472
165478
|
const keyFilePath = join11(mpdaiDir, "jira.key");
|
|
165473
165479
|
if (existsSync5(keyFilePath)) {
|
|
@@ -166476,7 +166482,7 @@ async function getPackageJson() {
|
|
|
166476
166482
|
// packages/cli/src/utils/version.ts
|
|
166477
166483
|
async function getCliVersion() {
|
|
166478
166484
|
const pkgJson = await getPackageJson();
|
|
166479
|
-
return "0.1.
|
|
166485
|
+
return "0.1.53";
|
|
166480
166486
|
}
|
|
166481
166487
|
|
|
166482
166488
|
// packages/cli/src/config/sandboxConfig.ts
|
package/bundle/gemini.js
CHANGED
|
@@ -62351,7 +62351,7 @@ async function createContentGeneratorConfig(model, authType) {
|
|
|
62351
62351
|
return contentGeneratorConfig;
|
|
62352
62352
|
}
|
|
62353
62353
|
async function createContentGenerator(config2, sessionId2) {
|
|
62354
|
-
const version3 = "0.1.
|
|
62354
|
+
const version3 = "0.1.53";
|
|
62355
62355
|
const httpOptions = {
|
|
62356
62356
|
headers: {
|
|
62357
62357
|
"User-Agent": `GeminiCLI/${version3} (${process.platform}; ${process.arch})`
|
|
@@ -193971,11 +193971,14 @@ var init_config2 = __esm({
|
|
|
193971
193971
|
return { memoryContent, fileCount };
|
|
193972
193972
|
}
|
|
193973
193973
|
/**
|
|
193974
|
-
* Get Confluence Advanced Access Token. Checks ~/.mpdai/confluence.key
|
|
193974
|
+
* Get Confluence Advanced Access Token. Checks env X_ID_CONFLUENCE_ACCESS_TOKEN first, then ~/.mpdai/confluence.key, then keys.json.
|
|
193975
193975
|
* @returns The Personal Access Token or null if not found
|
|
193976
193976
|
*/
|
|
193977
193977
|
getConfluenceToken() {
|
|
193978
193978
|
try {
|
|
193979
|
+
const envToken = process21.env.X_ID_CONFLUENCE_ACCESS_TOKEN?.trim();
|
|
193980
|
+
if (envToken)
|
|
193981
|
+
return envToken;
|
|
193979
193982
|
const mpdaiDir = join11(homedir6(), ".mpdai");
|
|
193980
193983
|
const keyFilePath = join11(mpdaiDir, "confluence.key");
|
|
193981
193984
|
if (existsSync6(keyFilePath)) {
|
|
@@ -194000,11 +194003,14 @@ var init_config2 = __esm({
|
|
|
194000
194003
|
}
|
|
194001
194004
|
}
|
|
194002
194005
|
/**
|
|
194003
|
-
* Get Jira Personal Access Token. Checks ~/.mpdai/jira.key
|
|
194006
|
+
* Get Jira Personal Access Token. Checks env X_ID_JIRA_ACCESS_TOKEN first, then ~/.mpdai/jira.key, then keys.json.
|
|
194004
194007
|
* @returns The Personal Access Token or null if not found
|
|
194005
194008
|
*/
|
|
194006
194009
|
getJiraToken() {
|
|
194007
194010
|
try {
|
|
194011
|
+
const envToken = process21.env.X_ID_JIRA_ACCESS_TOKEN?.trim();
|
|
194012
|
+
if (envToken)
|
|
194013
|
+
return envToken;
|
|
194008
194014
|
const mpdaiDir = join11(homedir6(), ".mpdai");
|
|
194009
194015
|
const keyFilePath = join11(mpdaiDir, "jira.key");
|
|
194010
194016
|
if (existsSync6(keyFilePath)) {
|
|
@@ -195092,8 +195098,8 @@ function readTokensFromKeysJson() {
|
|
|
195092
195098
|
function createMinimalConfigForTools() {
|
|
195093
195099
|
const fromKeys = readTokensFromKeysJson();
|
|
195094
195100
|
return {
|
|
195095
|
-
getConfluenceToken: () => readTokenFromKeyFile("confluence")
|
|
195096
|
-
getJiraToken: () => readTokenFromKeyFile("jira")
|
|
195101
|
+
getConfluenceToken: () => process.env.X_ID_CONFLUENCE_ACCESS_TOKEN?.trim() || readTokenFromKeyFile("confluence") || fromKeys.confluence,
|
|
195102
|
+
getJiraToken: () => process.env.X_ID_JIRA_ACCESS_TOKEN?.trim() || readTokenFromKeyFile("jira") || fromKeys.jira
|
|
195097
195103
|
};
|
|
195098
195104
|
}
|
|
195099
195105
|
async function runConfluenceGetPage(confluenceUrl) {
|
|
@@ -199569,7 +199575,7 @@ var init_langfuseClient = __esm({
|
|
|
199569
199575
|
userId,
|
|
199570
199576
|
metadata: {
|
|
199571
199577
|
...safeMetadata,
|
|
199572
|
-
cli_version: this.safeString("0.1.
|
|
199578
|
+
cli_version: this.safeString("0.1.53", "unknown"),
|
|
199573
199579
|
model: this.safeString(process.env.CUSTOM_LLM_MODEL_NAME, "gemini"),
|
|
199574
199580
|
auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
|
|
199575
199581
|
environment: this.safeString(this.configManager.getConfig()?.environment, "unknown")
|
|
@@ -200736,7 +200742,7 @@ var init_langfuseIntegration = __esm({
|
|
|
200736
200742
|
const metadata = {
|
|
200737
200743
|
model: this.config.getModel(),
|
|
200738
200744
|
auth_type: this.config.getContentGeneratorConfig()?.authType,
|
|
200739
|
-
cli_version: "0.1.
|
|
200745
|
+
cli_version: "0.1.53",
|
|
200740
200746
|
start_time: (/* @__PURE__ */ new Date()).toISOString(),
|
|
200741
200747
|
session_id: this.sessionId
|
|
200742
200748
|
};
|
|
@@ -200795,7 +200801,7 @@ var init_langfuseIntegration = __esm({
|
|
|
200795
200801
|
totalCachedTokens: sessionStats.totalCachedTokens,
|
|
200796
200802
|
totalPromptTokens: sessionStats.totalPromptTokens,
|
|
200797
200803
|
metadata: {
|
|
200798
|
-
cli_version: "0.1.
|
|
200804
|
+
cli_version: "0.1.53",
|
|
200799
200805
|
auth_type: this.config.getContentGeneratorConfig()?.authType,
|
|
200800
200806
|
session_end_time: (/* @__PURE__ */ new Date()).toISOString()
|
|
200801
200807
|
}
|
|
@@ -200867,7 +200873,7 @@ var init_langfuseIntegration = __esm({
|
|
|
200867
200873
|
error,
|
|
200868
200874
|
metadata: {
|
|
200869
200875
|
session_id: this.sessionId,
|
|
200870
|
-
cli_version: "0.1.
|
|
200876
|
+
cli_version: "0.1.53",
|
|
200871
200877
|
auth_type: this.config.getContentGeneratorConfig()?.authType
|
|
200872
200878
|
}
|
|
200873
200879
|
});
|
|
@@ -206298,7 +206304,7 @@ __export(version_exports, {
|
|
|
206298
206304
|
});
|
|
206299
206305
|
async function getCliVersion() {
|
|
206300
206306
|
const pkgJson = await getPackageJson();
|
|
206301
|
-
return "0.1.
|
|
206307
|
+
return "0.1.53";
|
|
206302
206308
|
}
|
|
206303
206309
|
var init_version5 = __esm({
|
|
206304
206310
|
"packages/cli/src/utils/version.ts"() {
|
|
@@ -332636,7 +332642,7 @@ var DataCollector = class {
|
|
|
332636
332642
|
// 提取元数据
|
|
332637
332643
|
extractMetadata(data) {
|
|
332638
332644
|
return {
|
|
332639
|
-
cli_version: "0.1.
|
|
332645
|
+
cli_version: "0.1.53",
|
|
332640
332646
|
model: process.env.CUSTOM_LLM_MODEL_NAME || "gemini",
|
|
332641
332647
|
auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
|
|
332642
332648
|
project_path: data.projectPath,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hang.yang/frankcli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.53",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=20.0.0"
|
|
6
6
|
},
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"url": "git+https://git.rakuten-it.com/scm/mpd-ai/mpd-llm-cli.git"
|
|
14
14
|
},
|
|
15
15
|
"config": {
|
|
16
|
-
"sandboxImageUri": "xx:0.1.
|
|
16
|
+
"sandboxImageUri": "xx:0.1.53"
|
|
17
17
|
},
|
|
18
18
|
"scripts": {
|
|
19
19
|
"start": "node scripts/start.js",
|