blun-king-cli 2.6.0 → 2.6.2

package/bin/blun.js

@@ -25,12 +25,9 @@ if (!fs.existsSync(SKILLS_DIR)) fs.mkdirSync(SKILLS_DIR, { recursive: true });
 
 // ── Default Config ──
 function loadConfig() {
-  if (fs.existsSync(CONFIG_FILE)) {
-    try { return JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8")); } catch(e) {}
-  }
-  return {
+  var defaults = {
     auth: { type: "api_key", api_key: "", oauth_token: "", oauth_expires: null },
-    api: { base_url: "http://176.9.158.30:3200", timeout: 60000 },
+    api: { base_url: "http://176.9.158.30:3200", timeout: 60000, key: "" },
     telegram: { enabled: false, bot_token: "", chat_id: "" },
     model: "blun-king-v100",
     workdir: process.cwd(),
@@ -38,6 +35,20 @@ function loadConfig() {
     verbose: false,
     watchdog: { enabled: false, interval: 600 }
   };
+  if (fs.existsSync(CONFIG_FILE)) {
+    try {
+      var saved = JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8"));
+      // Deep merge saved over defaults
+      Object.keys(defaults).forEach(function(k) {
+        if (typeof defaults[k] === "object" && defaults[k] !== null && saved[k]) {
+          defaults[k] = Object.assign({}, defaults[k], saved[k]);
+        } else if (saved[k] !== undefined) {
+          defaults[k] = saved[k];
+        }
+      });
+    } catch(e) {}
+  }
+  return defaults;
 }
 
 function saveConfig(cfg) {
@@ -74,8 +85,9 @@ function apiCall(method, endpoint, body) {
       timeout: config.api.timeout
     };
 
-    if (config.auth.type === "api_key" && config.auth.api_key) {
-      options.headers["Authorization"] = "Bearer " + config.auth.api_key;
+    var authToken = config.api.key || config.auth.api_key;
+    if (authToken) {
+      options.headers["Authorization"] = "Bearer " + authToken;
     } else if (config.auth.type === "oauth" && config.auth.oauth_token) {
       options.headers["Authorization"] = "Bearer " + config.auth.oauth_token;
     }
@@ -495,9 +507,17 @@ async function sendChat(message) {
     chatHistory.push({ role: "user", content: message });
     chatHistory.push({ role: "assistant", content: resp.data.answer });
 
+    // Token tracking
+    var inTok = Math.ceil(message.length / 3.5);
+    var outTok = Math.ceil((resp.data.answer || "").length / 3.5);
+    sessionCost.requests++;
+    sessionCost.inputTokensEst += inTok;
+    sessionCost.outputTokensEst += outTok;
+
     var q = resp.data.quality || {};
+    var tokInfo = C.dim + (inTok + outTok) + " tok" + C.reset;
     var meta = resp.data.task_type + "/" + resp.data.role + " " + BOX.dot + " score: " + (q.score || "?") +
-      (q.retried ? " " + BOX.dot + " retried" : "");
+      (q.retried ? " " + BOX.dot + " retried" : "") + " " + BOX.dot + " " + tokInfo;
     printAnswer(resp.data.answer, meta);
 
     // Auto Memory Dream Mode
@@ -2442,7 +2462,9 @@ async function main() {
     var permColor = isDangerous ? C.red + C.bold : permMode === "deny" ? C.red : C.yellow;
     var modelName = typeof config.model === "string" ? config.model : (config.model && config.model.name ? config.model.name : "default");
     var wdShort = config.workdir ? path.basename(config.workdir) : "~";
-    lines.push(permColor + "  " + permIcon + " " + permLabel + C.reset + C.dim + "  \u2502  " + C.reset + C.cyan + modelName + C.reset + C.dim + "  \u2502  " + C.reset + C.dim + wdShort + C.reset);
+    var totalTok = sessionCost.inputTokensEst + sessionCost.outputTokensEst;
+    var tokStr = totalTok > 1000 ? (totalTok / 1000).toFixed(1) + "k" : String(totalTok);
+    lines.push(permColor + "  " + permIcon + " " + permLabel + C.reset + C.dim + "  \u2502  " + C.reset + C.cyan + modelName + C.reset + C.dim + "  \u2502  " + C.reset + C.dim + wdShort + C.reset + C.dim + "  \u2502  " + C.reset + C.yellow + tokStr + " tok" + C.reset);
 
     // Menu
     if (menuVisible && menuItems.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "BLUN King CLI — Premium KI Console",
   "bin": {
     "blun": "./bin/blun.js"