@mtreeai/msapling-cli 2.3.6-beta.32 → 2.3.6-beta.34

package/dist/index.js

@@ -8680,72 +8680,12 @@ var init_TrustStore = __esm({
   }
 });
 
-// ../../node_modules/.bun/keytar@7.9.0/node_modules/keytar/build/Release/keytar.node
-var keytar_default;
-var init_keytar = __esm({
-  "../../node_modules/.bun/keytar@7.9.0/node_modules/keytar/build/Release/keytar.node"() {
-    keytar_default = "./keytar-F4YAPN53.node";
-  }
-});
-
-// node-file:<repo>\node_modules\.bun\keytar@7.9.0\node_modules\keytar\build\Release\keytar.node
-var require_keytar = __commonJS({
-  "node-file:F:\\MForest\\projects\\MSapling_CLI\\node_modules\\.bun\\keytar@7.9.0\\node_modules\\keytar\\build\\Release\\keytar.node"(exports, module) {
-    "use strict";
-    init_esm_shims();
-    init_keytar();
-    try {
-      module.exports = __require(keytar_default);
-    } catch {
-    }
-  }
-});
-
-// ../../node_modules/.bun/keytar@7.9.0/node_modules/keytar/lib/keytar.js
-var require_keytar2 = __commonJS({
-  "../../node_modules/.bun/keytar@7.9.0/node_modules/keytar/lib/keytar.js"(exports, module) {
-    "use strict";
-    init_esm_shims();
-    var keytar2 = require_keytar();
-    function checkRequired(val, name) {
-      if (!val || val.length <= 0) {
-        throw new Error(name + " is required.");
-      }
-    }
-    module.exports = {
-      getPassword: function(service, account) {
-        checkRequired(service, "Service");
-        checkRequired(account, "Account");
-        return keytar2.getPassword(service, account);
-      },
-      setPassword: function(service, account, password) {
-        checkRequired(service, "Service");
-        checkRequired(account, "Account");
-        checkRequired(password, "Password");
-        return keytar2.setPassword(service, account, password);
-      },
-      deletePassword: function(service, account) {
-        checkRequired(service, "Service");
-        checkRequired(account, "Account");
-        return keytar2.deletePassword(service, account);
-      },
-      findPassword: function(service) {
-        checkRequired(service, "Service");
-        return keytar2.findPassword(service);
-      },
-      findCredentials: function(service) {
-        checkRequired(service, "Service");
-        return keytar2.findCredentials(service);
-      }
-    };
-  }
-});
-
 // ../core/src/Storage/vault.ts
 import { join as join17 } from "path";
 import { chmodSync, existsSync as existsSync13, renameSync as renameSync2, unlinkSync } from "fs";
 import { writeFile as writeFile6, readFile as readFile13 } from "fs/promises";
 import { createHash as createHash4 } from "crypto";
+import * as keytar from "keytar";
 async function saveToken(baseDir, token) {
   const filePath = join17(baseDir, "vault", "token");
   try {
@@ -8813,12 +8753,11 @@ async function readVaultRef(baseDir, label) {
   if (!existsSync13(objectPath)) return null;
   return readFile13(objectPath, "utf8");
 }
-var keytar, KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT;
+var KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT;
 var init_vault = __esm({
   "../core/src/Storage/vault.ts"() {
     "use strict";
     init_esm_shims();
-    keytar = __toESM(require_keytar2(), 1);
     KEYCHAIN_SERVICE = "msapling-cli";
     KEYCHAIN_ACCOUNT = "auth_token";
   }
@@ -11340,15 +11279,18 @@ var init_usage = __esm({
             context.addMessage("system", JSON.stringify(user, null, 2));
             return;
           }
+          const n = (v) => typeof v === "number" && Number.isFinite(v) ? v : 0;
+          const $ = (v) => "$" + n(v).toFixed(4);
+          const k = (v) => n(v).toLocaleString();
           context.addMessage("system", "MSapling Usage Dashboard:");
-          context.addMessage("system", `  - Fuel Credits: $${user.fuel_credits.toFixed(4)}`);
+          context.addMessage("system", `  - Fuel Credits: ${$(user.fuel_credits)}`);
           context.addMessage("system", `  - Daily Spending Limit: ${user.monthly_spending_limit ? "$" + user.monthly_spending_limit : "Unlimited"}`);
           context.addMessage("system", "\n[TRACK BREAKDOWN]");
-          context.addMessage("system", `  - BYOK: ${user.tokens_byok.toLocaleString()} tokens ($${user.cost_byok.toFixed(4)})`);
-          context.addMessage("system", `  - Ollama: ${user.tokens_ollama.toLocaleString()} tokens ($${user.cost_ollama.toFixed(4)})`);
-          context.addMessage("system", `  - Purchased: ${user.tokens_purchased.toLocaleString()} tokens ($${user.cost_purchased.toFixed(4)})`);
-          context.addMessage("system", `  - Subscription: ${user.tokens_subscription.toLocaleString()} tokens ($${user.cost_subscription.toFixed(4)})`);
-          context.addMessage("system", `  - Free: ${user.tokens_free.toLocaleString()} tokens ($${user.cost_free.toFixed(4)})`);
+          context.addMessage("system", `  - BYOK: ${k(user.tokens_byok)} tokens (${$(user.cost_byok)})`);
+          context.addMessage("system", `  - Ollama: ${k(user.tokens_ollama)} tokens (${$(user.cost_ollama)})`);
+          context.addMessage("system", `  - Purchased: ${k(user.tokens_purchased)} tokens (${$(user.cost_purchased)})`);
+          context.addMessage("system", `  - Subscription: ${k(user.tokens_subscription)} tokens (${$(user.cost_subscription)})`);
+          context.addMessage("system", `  - Free: ${k(user.tokens_free)} tokens (${$(user.cost_free)})`);
         } catch (e) {
           context.addMessage("error", `Failed to fetch usage: ${e.message}`);
         }
@@ -12428,7 +12370,7 @@ var init_version = __esm({
       description: "Show version information for CLI and core packages",
       category: "debug",
       handler: async (_args, context) => {
-        const cliVersion = true ? "2.3.6-beta.32" : "(dev)";
+        const cliVersion = true ? "2.3.6-beta.34" : "(dev)";
         const coreVersion = true ? "2.3.2" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -12437,7 +12379,7 @@ var init_version = __esm({
         context.addMessage("system", row2("Core (@msapling/core)", coreVersion));
         context.addMessage("system", row2("Runtime (Node/Bun)", runtime));
         try {
-          const ts = "2026-06-02T15:01:04.780Z";
+          const ts = "2026-06-02T15:12:47.326Z";
           if (ts && ts !== "__BUILD_TIMESTAMP__") {
             context.addMessage("system", row2("Build Timestamp", ts));
           }
@@ -17954,7 +17896,7 @@ import { jsx, jsxs } from "react/jsx-runtime";
 var Header = () => /* @__PURE__ */ jsxs(Box, { borderStyle: "single", borderColor: "cyan", paddingX: 1, marginBottom: 1, children: [
   /* @__PURE__ */ jsxs(Text, { bold: true, color: "cyan", children: [
     "\u25CF MSapling CLI v",
-    "2.3.6-beta.32"
+    "2.3.6-beta.34"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });
@@ -18962,11 +18904,13 @@ function handleCliArgs(args2) {
     (async () => {
       const { runExec: runExec2 } = await Promise.resolve().then(() => (init_exec(), exec_exports));
       const exitCode = await runExec2(cmdStr);
-      process.exit(exitCode);
+      process.exitCode = exitCode;
+      setTimeout(() => process.exit(exitCode), 50).unref();
     })().catch((e) => {
       process.stderr.write(`[msapling-exec] fatal: ${e?.message ?? e}
 `);
-      process.exit(1);
+      process.exitCode = 1;
+      setTimeout(() => process.exit(1), 50).unref();
     });
     return false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtreeai/msapling-cli",
-  "version": "2.3.6-beta.32",
+  "version": "2.3.6-beta.34",
   "description": "MSapling CLI — React/Ink terminal client for the MSapling backend (chat, projects, MDrive, agent tools). Proprietary; redistribution prohibited.",
   "license": "UNLICENSED",
   "author": "MSapling Team",
@@ -54,6 +54,9 @@
     "react": "^18.3.1",
     "yaml": "^2.8.3"
   },
+  "optionalDependencies": {
+    "keytar": "^7.9.0"
+  },
   "devDependencies": {
     "@msapling/api-client": "workspace:*",
     "@msapling/core": "workspace:*",