mpd-llm-cli 0.1.39 → 0.1.41

package/bundle/api.js

@@ -27724,7 +27724,7 @@ async function createContentGeneratorConfig(model, authType) {
   return contentGeneratorConfig;
 }
 async function createContentGenerator(config2, sessionId2) {
-  const version2 = "0.1.39";
+  const version2 = "0.1.41";
   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.39";
+  return "0.1.41";
 }
 
 // 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.39";
+  const version3 = "0.1.41";
   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.39", "unknown"),
+              cli_version: this.safeString("0.1.41", "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.39",
+            cli_version: "0.1.41",
             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.39",
+              cli_version: "0.1.41",
               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.39",
+              cli_version: "0.1.41",
               auth_type: this.config.getContentGeneratorConfig()?.authType
             }
           });
@@ -209197,12 +209197,13 @@ var require_lib6 = __commonJS({
 // packages/router/dist/src/constants.js
 import path37 from "node:path";
 import os11 from "node:os";
-var HOME_DIR, CONFIG_FILE, PLUGINS_DIR, PID_FILE, REFERENCE_COUNT_FILE, CLAUDE_PROJECTS_DIR, DEFAULT_CONFIG;
+var HOME_DIR, CONFIG_FILE, RAKUTENSOLO_CONFIG_FILE, PLUGINS_DIR, PID_FILE, REFERENCE_COUNT_FILE, CLAUDE_PROJECTS_DIR, DEFAULT_CONFIG;
 var init_constants2 = __esm({
   "packages/router/dist/src/constants.js"() {
     "use strict";
     HOME_DIR = path37.join(os11.homedir(), ".mpdai");
     CONFIG_FILE = path37.join(HOME_DIR, "router-config.json");
+    RAKUTENSOLO_CONFIG_FILE = path37.join(HOME_DIR, "rakutensolo.json");
     PLUGINS_DIR = path37.join(HOME_DIR, "plugins");
     PID_FILE = path37.join(HOME_DIR, ".mpdai-router.pid");
     REFERENCE_COUNT_FILE = path37.join(os11.tmpdir(), "mpdai-router-reference-count.txt");
@@ -209308,7 +209309,7 @@ var init_update = __esm({
 // packages/router/dist/src/utils/index.js
 import fs33 from "node:fs/promises";
 import path39 from "node:path";
-var import_json5, interpolateEnvVars, ensureDir, initDir, readConfigFile, backupConfigFile, writeConfigFile, initConfig, updateRouterConfigFromModel;
+var import_json5, interpolateEnvVars, ensureDir, initDir, getConfigFilePath, readAndParseConfig, readConfigFile, backupConfigFile, writeConfigFile, initConfig, updateRouterConfigFromModel;
 var init_utils6 = __esm({
   "packages/router/dist/src/utils/index.js"() {
     "use strict";
@@ -209345,85 +209346,101 @@ var init_utils6 = __esm({
       await ensureDir(PLUGINS_DIR);
       await ensureDir(path39.join(HOME_DIR, "logs"));
     };
-    readConfigFile = async () => {
+    getConfigFilePath = async () => {
+      try {
+        await fs33.access(RAKUTENSOLO_CONFIG_FILE);
+        return RAKUTENSOLO_CONFIG_FILE;
+      } catch {
+        return CONFIG_FILE;
+      }
+    };
+    readAndParseConfig = async (filePath) => {
       try {
-        const config2 = await fs33.readFile(CONFIG_FILE, "utf-8");
+        const config2 = await fs33.readFile(filePath, "utf-8");
         try {
           const parsedConfig = import_json5.default.parse(config2);
           return interpolateEnvVars(parsedConfig);
         } catch (parseError) {
-          console.error(`Failed to parse config file at ${CONFIG_FILE}`);
+          console.error(`Failed to parse config file at ${filePath}`);
           console.error("Error details:", parseError.message);
           console.error("Please check your config file syntax.");
-          process.exit(1);
+          throw parseError;
         }
-      } catch (readError) {
-        if (readError.code === "ENOENT") {
-          try {
-            await initDir();
-            const backupPath = await backupConfigFile();
-            if (backupPath) {
-              console.log(`Backed up existing configuration file to ${backupPath}`);
-            }
-            const config2 = {
-              LOG: true,
-              LOG_LEVEL: "debug",
-              CLAUDE_PATH: "",
-              HOST: "127.0.0.1",
-              PORT: 3456,
-              APIKEY: "123456",
-              API_TIMEOUT_MS: "600000",
-              PROXY_URL: "",
-              transformers: [],
-              Providers: [
-                {
-                  name: "Rakuten-AI",
-                  api_base_url: "https://api.ai.public.rakuten-it.com/rakutenllms/v1/chat/completions",
-                  api_key: "raik-sk-b0bf37082r10ai3ba52386dd24bb102fb0a7348fa7564a3ba52386dd24bb102f",
-                  models: [
-                    "Rakuten-AI-3.0-Alpha"
-                  ],
-                  transformer: {
-                    use: [
-                      "openrouter"
-                    ]
-                  }
-                }
-              ],
-              StatusLine: {
-                enabled: false,
-                currentStyle: "default",
-                default: {
-                  modules: []
-                },
-                powerline: {
-                  modules: []
-                }
-              },
-              Router: {
-                default: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
-                background: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
-                think: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
-                longContext: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
-                longContextThreshold: 6e4,
-                webSearch: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
-                image: "Rakuten-AI,Rakuten-AI-3.0-Alpha"
-              },
-              CUSTOM_ROUTER_PATH: ""
-            };
-            await writeConfigFile(config2);
-            console.log("Created default configuration file at ~/.mpdai/router-config.json");
-            console.log("Please edit this file with your actual configuration.");
-            return config2;
-          } catch (error) {
-            console.error("Failed to create default configuration:", error.message);
-            process.exit(1);
-          }
-        } else {
-          console.error(`Failed to read config file at ${CONFIG_FILE}`);
-          console.error("Error details:", readError.message);
-          process.exit(1);
+      } catch (error) {
+        if (error.code === "ENOENT") {
+          return null;
         }
+        throw error;
+      }
+    };
+    readConfigFile = async () => {
+      let config2 = await readAndParseConfig(RAKUTENSOLO_CONFIG_FILE);
+      if (config2 !== null) {
+        return config2;
+      }
+      config2 = await readAndParseConfig(CONFIG_FILE);
+      if (config2 !== null) {
+        return config2;
+      }
+      try {
+        await initDir();
+        const backupPath = await backupConfigFile();
+        if (backupPath) {
+          console.log(`Backed up existing configuration file to ${backupPath}`);
+        }
+        const config3 = {
+          LOG: true,
+          LOG_LEVEL: "debug",
+          CLAUDE_PATH: "",
+          HOST: "127.0.0.1",
+          PORT: 3456,
+          APIKEY: "123456",
+          API_TIMEOUT_MS: "600000",
+          PROXY_URL: "",
+          transformers: [],
+          Providers: [
+            {
+              name: "Rakuten-AI",
+              api_base_url: "https://api.ai.public.rakuten-it.com/rakutenllms/v1/chat/completions",
+              api_key: "raik-sk-b0bf37082r10ai3ba52386dd24bb102fb0a7348fa7564a3ba52386dd24bb102f",
+              models: [
+                "Rakuten-AI-3.0-Alpha"
+              ],
+              transformer: {
+                use: [
+                  "openrouter"
+                ]
+              }
+            }
+          ],
+          StatusLine: {
+            enabled: false,
+            currentStyle: "default",
+            default: {
+              modules: []
+            },
+            powerline: {
+              modules: []
+            }
+          },
+          Router: {
+            default: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
+            background: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
+            think: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
+            longContext: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
+            longContextThreshold: 6e4,
+            webSearch: "Rakuten-AI,Rakuten-AI-3.0-Alpha",
+            image: "Rakuten-AI,Rakuten-AI-3.0-Alpha"
+          },
+          CUSTOM_ROUTER_PATH: ""
+        };
+        await writeConfigFile(config3);
+        console.log("Created default configuration file at ~/.mpdai/router-config.json");
+        console.log("Please edit this file with your actual configuration.");
+        return config3;
+      } catch (error) {
+        console.error("Failed to create default configuration:", error.message);
+        process.exit(1);
       }
     };
     backupConfigFile = async () => {
@@ -276258,7 +276275,7 @@ var require_package7 = __commonJS({
   "packages/router/package.json"(exports2, module2) {
     module2.exports = {
       name: "@mpdai/router",
-      version: "0.1.3",
+      version: "0.1.6",
       description: "MPD AI Router - Route Claude Code to other LLM providers",
       type: "module",
       main: "dist/index.js",
@@ -278074,8 +278091,9 @@ async function run(options = {}) {
       maxSize: "50M"
     })
   } : false;
+  const actualConfigFilePath = await getConfigFilePath();
   const server = createServer3({
-    jsonPath: CONFIG_FILE,
+    jsonPath: actualConfigFilePath,
     initialConfig: {
       providers: config2.Providers || config2.providers,
       HOST,
@@ -278310,7 +278328,6 @@ var init_src2 = __esm({
     init_auth3();
     init_processCheck();
     init_constants2();
-    init_constants2();
     init_cache();
     init_SSEParser_transform();
     init_SSESerializer_transform();
@@ -282495,6 +282512,7 @@ __export(dist_exports2, {
   HOME_DIR: () => HOME_DIR,
   PID_FILE: () => PID_FILE,
   PLUGINS_DIR: () => PLUGINS_DIR,
+  RAKUTENSOLO_CONFIG_FILE: () => RAKUTENSOLO_CONFIG_FILE,
   REFERENCE_COUNT_FILE: () => REFERENCE_COUNT_FILE,
   backupConfigFile: () => backupConfigFile,
   checkForUpdates: () => checkForUpdates,
@@ -282502,6 +282520,7 @@ __export(dist_exports2, {
   cleanupPidFile: () => cleanupPidFile,
   decrementReferenceCount: () => decrementReferenceCount,
   executeCodeCommand: () => executeCodeCommand,
+  getConfigFilePath: () => getConfigFilePath,
   getReferenceCount: () => getReferenceCount,
   getServiceInfo: () => getServiceInfo,
   getServicePid: () => getServicePid,
@@ -310241,7 +310260,7 @@ import { promises as fs36 } from "fs";
 import path40 from "path";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "ed0e6dd";
+var GIT_COMMIT_INFO = "77abd11 (local modifications)";
 
 // node_modules/read-package-up/index.js
 import path35 from "node:path";
@@ -310454,7 +310473,7 @@ async function getPackageJson() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.1.39";
+  return "0.1.41";
 }
 
 // packages/cli/src/ui/commands/memoryCommand.ts
@@ -331723,7 +331742,7 @@ var DataCollector = class {
   // 提取元数据
   extractMetadata(data) {
     return {
-      cli_version: "0.1.39",
+      cli_version: "0.1.41",
       model: process.env.CUSTOM_LLM_MODEL_NAME || "gemini",
       auth_type: process.env.USE_CUSTOM_LLM ? "custom_llm" : "google_oauth",
       project_path: data.projectPath,
@@ -332143,7 +332162,7 @@ var ToolConfirmationMessage = ({
     }
   };
   let bodyContent = null;
-  let question3;
+  let question2;
   const options = new Array();
   function availableBodyContentHeight() {
     if (options.length === 0) {
@@ -332178,7 +332197,7 @@ var ToolConfirmationMessage = ({
         }
       );
     }
-    question3 = `Apply this change?`;
+    question2 = `Apply this change?`;
     options.push(
       {
         label: "Yes, allow once",
@@ -332205,7 +332224,7 @@ var ToolConfirmationMessage = ({
     );
   } else if (confirmationDetails.type === "exec") {
     const executionProps = confirmationDetails;
-    question3 = `Allow execution?`;
+    question2 = `Allow execution?`;
     options.push(
       {
         label: "Yes, allow once",
@@ -332232,7 +332251,7 @@ var ToolConfirmationMessage = ({
   } else if (confirmationDetails.type === "info") {
     const infoProps = confirmationDetails;
     const displayUrls = infoProps.urls && !(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
-    question3 = `Do you want to proceed?`;
+    question2 = `Do you want to proceed?`;
     options.push(
       {
         label: "Yes, allow once",
@@ -332270,7 +332289,7 @@ var ToolConfirmationMessage = ({
         /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: Colors.Gray, children: mcpProps.args ? JSON.stringify(mcpProps.args, null, 2) : "No parameters" }) })
       ] })
     ] });
-    question3 = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
+    question2 = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
     options.push(
       {
         label: "Yes, allow once",
@@ -332290,7 +332309,7 @@ var ToolConfirmationMessage = ({
   }
   return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(Box_default, { flexDirection: "column", padding: 1, width: childWidth, children: [
     /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Box_default, { flexGrow: 1, flexShrink: 1, overflow: "hidden", marginBottom: 1, children: bodyContent }),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Box_default, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { wrap: "truncate", children: question3 }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Box_default, { marginBottom: 1, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { wrap: "truncate", children: question2 }) }),
     /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Box_default, { flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
       RadioButtonSelect,
       {
@@ -339193,7 +339212,6 @@ Example:
 init_dist4();
 init_dist4();
 init_dist4();
-var readlineSync2 = __toESM(require_readline_sync(), 1);
 var import_jsx_runtime52 = __toESM(require_jsx_runtime(), 1);
 function getNodeMemoryArgs(config2) {
   const totalMemoryMB = os23.totalmem() / (1024 * 1024);
@@ -339245,8 +339263,8 @@ async function waitForService3(timeout2 = 1e4, initialDelay = 1e3) {
 }
 async function installClaudeCode() {
   return new Promise((resolve18) => {
-    console.log("Installing @anthropic-ai/claude-code@2.0.35...");
-    const installProcess = spawn11("npm", ["install", "-g", "@anthropic-ai/claude-code@2.0.35"], {
+    console.log("Installing mpdai-claude-code@2.0.35...");
+    const installProcess = spawn11("npm", ["install", "-g", "mpdai-claude-code@2.0.35"], {
       stdio: "inherit",
       shell: true
     });
@@ -339283,25 +339301,15 @@ async function handleClaudeCodeCommand(args) {
           shell: true
         });
         checkProcess.on("error", async (error) => {
-          console.error("\u274C Claude Code is not installed or not found in PATH");
-          console.log("\nTo install Claude Code, run:");
-          console.log("  npm install -g @anthropic-ai/claude-code@2.0.35\n");
-          if (process.stdin.isTTY && process.stdout.isTTY) {
-            const answer = readlineSync2.question("Would you like to install it now? (y/n): ");
-            const shouldInstall = answer.toLowerCase() === "y" || answer.toLowerCase() === "yes";
-            if (shouldInstall) {
-              const installed = await installClaudeCode();
-              if (installed) {
-                executeCodeCommand(args);
-                resolve18();
-              } else {
-                reject(new Error("Installation failed"));
-              }
-            } else {
-              reject(new Error("User declined installation"));
-            }
+          console.log("\u274C Claude Code is not installed or not found in PATH");
+          console.log("\u{1F4E6} Automatically installing mpdai-claude-code@2.0.35...\n");
+          const installed = await installClaudeCode();
+          if (installed) {
+            console.log("\u2705 Installation complete, executing command...\n");
+            executeCodeCommand(args);
+            resolve18();
           } else {
-            reject(new Error("Claude Code not found and cannot install in non-interactive mode"));
+            reject(new Error("Failed to install Claude Code. Please install manually: npm install -g mpdai-claude-code@2.0.35"));
           }
         });
         checkProcess.on("close", (code) => {
@@ -339330,9 +339338,14 @@ async function main() {
       return;
     }
   }
-  if (args.length > 0 && args[0] === "claude" && args.length > 1 && args[1] === "code") {
-    await handleClaudeCodeCommand(args.slice(2));
-    return;
+  if (args.length > 0 && args[0] === "claude") {
+    if (args.length > 1 && args[1] === "code") {
+      await handleClaudeCodeCommand(args.slice(2));
+      return;
+    } else {
+      await handleClaudeCodeCommand(args.slice(1));
+      return;
+    }
   }
   loadStartupConfig();
   const workspaceRoot = process.cwd();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mpd-llm-cli",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -13,7 +13,7 @@
     "url": "git+https://git.rakuten-it.com/scm/mpd-ai/mpd-llm-cli.git"
   },
   "config": {
-    "sandboxImageUri": "xx:0.1.37"
+    "sandboxImageUri": "xx:0.1.41"
   },
   "scripts": {
     "start": "node scripts/start.js",