mpd-llm-cli 0.1.38 → 0.1.39

package/bundle/api.js

@@ -27724,7 +27724,7 @@ async function createContentGeneratorConfig(model, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, sessionId2) {
-  const version2 = "0.1.38";
+  const version2 = "0.1.39";
   const httpOptions = {
     headers: {
       "User-Agent": `GeminiCLI/${version2} (${process.platform}; ${process.arch})`
@@ -166412,7 +166412,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.38";
+  return "0.1.39";
 }
 
 // packages/cli/src/config/sandboxConfig.ts

package/bundle/gemini.js

@@ -62351,7 +62351,7 @@ async function createContentGeneratorConfig(model, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, sessionId2) {
-  const version3 = "0.1.38";
+  const version3 = "0.1.39";
   const httpOptions = {
     headers: {
       "User-Agent": `GeminiCLI/${version3} (${process.platform}; ${process.arch})`
@@ -199411,7 +199411,7 @@ var init_langfuseClient = __esm({
             userId,
             metadata: {
               ...safeMetadata,
-              cli_version: this.safeString("0.1.38", "unknown"),
+              cli_version: this.safeString("0.1.39", "unknown"),
               model: this.safeString(process.env.CUSTOM_LLM_MODEL_NAME, "gemini"),
               auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
               environment: this.safeString(this.configManager.getConfig()?.environment, "unknown")
@@ -200578,7 +200578,7 @@ var init_langfuseIntegration = __esm({
           const metadata = {
             model: this.config.getModel(),
             auth_type: this.config.getContentGeneratorConfig()?.authType,
-            cli_version: "0.1.38",
+            cli_version: "0.1.39",
             start_time: (/* @__PURE__ */ new Date()).toISOString(),
             session_id: this.sessionId
           };
@@ -200637,7 +200637,7 @@ var init_langfuseIntegration = __esm({
             totalCachedTokens: sessionStats.totalCachedTokens,
             totalPromptTokens: sessionStats.totalPromptTokens,
             metadata: {
-              cli_version: "0.1.38",
+              cli_version: "0.1.39",
               auth_type: this.config.getContentGeneratorConfig()?.authType,
               session_end_time: (/* @__PURE__ */ new Date()).toISOString()
             }
@@ -200709,7 +200709,7 @@ var init_langfuseIntegration = __esm({
             error,
             metadata: {
               session_id: this.sessionId,
-              cli_version: "0.1.38",
+              cli_version: "0.1.39",
               auth_type: this.config.getContentGeneratorConfig()?.authType
             }
           });
@@ -205955,6 +205955,11 @@ var init_mpdaiConfig = __esm({
         const config2 = this.loadConfig();
         return config2?.retryAttempts || 3;
       }
+      getTokenUrl() {
+        const config2 = this.loadConfig();
+        if (!config2) return "http://lb-100-123-141-85.lbaas.jpe2f.dcnw.rakuten/api/auth/token";
+        return `${config2.api.baseUrl}/api/auth/token`;
+      }
     };
   }
 });
@@ -207674,13 +207679,17 @@ var init_AuthService = __esm({
     AuthService = class {
       userJsonPath;
       keysJsonPath;
+      idTokenPath;
       authApiUrl;
+      tokenApiUrl;
       mpdaiConfig;
       constructor(authApiUrl) {
         this.mpdaiConfig = MpdaiConfigManager.getInstance();
         this.authApiUrl = authApiUrl || this.mpdaiConfig.getAuthUrl();
+        this.tokenApiUrl = this.mpdaiConfig.getTokenUrl();
         this.userJsonPath = join17(homedir12(), ".mpdai", "user.json");
         this.keysJsonPath = join17(homedir12(), ".mpdai", "keys.json");
+        this.idTokenPath = join17(homedir12(), ".mpdai", "id.token");
       }
       /**
        * 检查本地是否存在用户凭据文件
@@ -207708,6 +207717,91 @@ var init_AuthService = __esm({
           return null;
         }
       }
+      /**
+       * 检查是否有 username 但没有 encodedPassword
+       */
+      hasUsernameWithoutPassword() {
+        try {
+          if (!this.hasLocalCredentials()) {
+            return false;
+          }
+          const content = readFileSync11(this.userJsonPath, "utf-8");
+          const credentials = JSON.parse(content);
+          return !!(credentials.username && !credentials.encodedPassword);
+        } catch (error) {
+          return false;
+        }
+      }
+      /**
+       * 读取 id.token 文件
+       */
+      readIdToken() {
+        try {
+          if (!existsSync12(this.idTokenPath)) {
+            return null;
+          }
+          const token2 = readFileSync11(this.idTokenPath, "utf-8").trim();
+          return token2 || null;
+        } catch (error) {
+          console.error("Failed to read id.token:", error);
+          return null;
+        }
+      }
+      /**
+       * 解析 JWT token 的 payload 部分（不验证签名）
+       */
+      parseJwtPayload(token2) {
+        try {
+          const parts = token2.split(".");
+          if (parts.length !== 3) {
+            throw new Error("Invalid JWT format");
+          }
+          const payload = parts[1];
+          const base64 = payload.replace(/-/g, "+").replace(/_/g, "/");
+          const padding = base64.length % 4;
+          const paddedBase64 = padding ? base64 + "=".repeat(4 - padding) : base64;
+          const decoded = Buffer.from(paddedBase64, "base64").toString("utf-8");
+          return JSON.parse(decoded);
+        } catch (error) {
+          console.error("Failed to parse JWT payload:", error);
+          return null;
+        }
+      }
+      /**
+       * 使用 token payload 进行认证
+       */
+      async authenticateWithToken(tokenPayload) {
+        const isDebugMode = process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true";
+        try {
+          if (isDebugMode) {
+            console.log(`Attempting to authenticate with token API: ${this.tokenApiUrl}`);
+          }
+          const response = await fetch(this.tokenApiUrl, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify(tokenPayload)
+          });
+          if (!response.ok) {
+            throw new Error(`Token authentication failed: ${response.status} ${response.statusText}`);
+          }
+          const data = await response.json();
+          if (!data.success) {
+            throw new Error("Token authentication failed: Invalid token payload");
+          }
+          return data;
+        } catch (error) {
+          console.error("Token authentication error:", error);
+          if (error instanceof Error && error.message.includes("fetch failed")) {
+            console.error("\n\u274C \u65E0\u6CD5\u8FDE\u63A5\u5230\u8BA4\u8BC1\u670D\u52A1\u5668\uFF01");
+            console.error("\u8BF7\u786E\u4FDD\u8BA4\u8BC1API\u670D\u52A1\u6B63\u5728\u8FD0\u884C:");
+            console.error(`   ${this.tokenApiUrl}`);
+            console.error("\n\u5982\u679C\u60A8\u8FD8\u6CA1\u6709\u542F\u52A8\u8BA4\u8BC1\u670D\u52A1\uFF0C\u8BF7\u5148\u542F\u52A8\u5B83\u3002");
+          }
+          throw error;
+        }
+      }
       /**
        * 保存用户凭据到本地文件
        */
@@ -207833,6 +207927,39 @@ var init_AuthService = __esm({
       async performAuthFlow() {
         const isDebugMode = process.env.DEBUG === "true" || process.env.DEBUG_MODE === "true" || process.env.dev === "true";
         let credentials = this.getLocalCredentials();
+        if (this.hasUsernameWithoutPassword()) {
+          if (isDebugMode) {
+            console.log("Found username without password, trying token-based authentication...");
+          }
+          const idToken = this.readIdToken();
+          if (idToken) {
+            if (isDebugMode) {
+              console.log("Found id.token file, parsing JWT payload...");
+            }
+            const tokenPayload = this.parseJwtPayload(idToken);
+            if (tokenPayload) {
+              if (isDebugMode) {
+                console.log("JWT payload parsed successfully, using token authentication...");
+              }
+              const authResponse2 = await this.authenticateWithToken(tokenPayload);
+              if (authResponse2.keys && authResponse2.keys.length > 0) {
+                this.saveKeys(authResponse2.keys);
+                if (isDebugMode) {
+                  console.log(`Saved ${authResponse2.keys.length} keys to local storage`);
+                }
+              }
+              return authResponse2;
+            } else {
+              if (isDebugMode) {
+                console.warn("Failed to parse JWT payload, falling back to password authentication...");
+              }
+            }
+          } else {
+            if (isDebugMode) {
+              console.warn("id.token file not found or empty, falling back to password authentication...");
+            }
+          }
+        }
         if (!credentials) {
           if (isDebugMode) {
             console.log("No local credentials found, prompting for user input...");
@@ -276131,7 +276258,7 @@ var require_package7 = __commonJS({
   "packages/router/package.json"(exports2, module2) {
     module2.exports = {
       name: "@mpdai/router",
-      version: "0.1.2",
+      version: "0.1.3",
       description: "MPD AI Router - Route Claude Code to other LLM providers",
       type: "module",
       main: "dist/index.js",
@@ -310114,7 +310241,7 @@ import { promises as fs36 } from "fs";
 import path40 from "path";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "3f6bfbf (local modifications)";
+var GIT_COMMIT_INFO = "ed0e6dd";
 
 // node_modules/read-package-up/index.js
 import path35 from "node:path";
@@ -310327,7 +310454,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.38";
+  return "0.1.39";
 }
 
 // packages/cli/src/ui/commands/memoryCommand.ts
@@ -331596,7 +331723,7 @@ var DataCollector = class {
   // 提取元数据
   extractMetadata(data) {
     return {
-      cli_version: "0.1.38",
+      cli_version: "0.1.39",
       model: process.env.CUSTOM_LLM_MODEL_NAME || "gemini",
       auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
       project_path: data.projectPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpd-llm-cli",
-  "version": "0.1.38",
+  "version": "0.1.39",
   "engines": {
     "node": ">=20.0.0"
   },