@mtreeai/msapling-cli 2.3.6-beta.40 → 2.3.6-beta.42

package/dist/index.js

@@ -8685,11 +8685,22 @@ 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 getKeytar() {
+  if (_keytar !== "pending") return _keytar;
+  try {
+    const mod = await import("keytar");
+    _keytar = mod && typeof mod.setPassword === "function" ? mod : mod?.default ?? mod;
+  } catch {
+    _keytar = null;
+  }
+  return _keytar;
+}
 async function saveToken(baseDir, token) {
   const filePath = join17(baseDir, "vault", "token");
   try {
-    await keytar.setPassword(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT, token);
+    const kt = await getKeytar();
+    if (!kt) throw new Error("keytar not loadable");
+    await kt.setPassword(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT, token);
     try {
       if (existsSync13(filePath)) unlinkSync(filePath);
     } catch {
@@ -8705,7 +8716,9 @@ async function saveToken(baseDir, token) {
 async function loadToken(baseDir) {
   const filePath = join17(baseDir, "vault", "token");
   try {
-    const keychainToken = await keytar.getPassword(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT);
+    const kt = await getKeytar();
+    if (!kt) throw new Error("keytar not loadable");
+    const keychainToken = await kt.getPassword(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT);
     if (keychainToken) return keychainToken;
   } catch (e) {
     console.debug(`Keychain unavailable (${e instanceof Error ? e.message : String(e)}), falling back to file storage`);
@@ -8719,7 +8732,8 @@ async function loadToken(baseDir) {
 async function clearToken(baseDir) {
   const filePath = join17(baseDir, "vault", "token");
   try {
-    await keytar.deletePassword(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT);
+    const kt = await getKeytar();
+    if (kt) await kt.deletePassword(KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT);
   } catch (e) {
     console.debug(`Keychain unavailable for deletion (${e instanceof Error ? e.message : String(e)})`);
   }
@@ -8753,11 +8767,12 @@ async function readVaultRef(baseDir, label) {
   if (!existsSync13(objectPath)) return null;
   return readFile13(objectPath, "utf8");
 }
-var KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT;
+var _keytar, KEYCHAIN_SERVICE, KEYCHAIN_ACCOUNT;
 var init_vault = __esm({
   "../core/src/Storage/vault.ts"() {
     "use strict";
     init_esm_shims();
+    _keytar = "pending";
     KEYCHAIN_SERVICE = "msapling-cli";
     KEYCHAIN_ACCOUNT = "auth_token";
   }
@@ -9757,10 +9772,22 @@ async function loginWithEmailPassword(email, context, preSuppliedPassword) {
   context.addMessage("system", `Logging in as ${email}...`);
   let password = preSuppliedPassword || process.env.MSAPLING_PASSWORD || "";
   if (!password) {
-    context.addMessage(
-      "system",
-      "NOTE: the interactive password prompt is known to leak keystrokes into the REPL input. Safer alternatives: /login <email> <password>  OR  set MSAPLING_PASSWORD env var  OR  use /login <token>."
-    );
+    const inkAlreadyListening = process.stdin.listenerCount("data") > 0;
+    if (inkAlreadyListening) {
+      context.addMessage(
+        "error",
+        "Cannot prompt for password inside the REPL \u2014 Ink owns stdin and would corrupt the input."
+      );
+      context.addMessage(
+        "system",
+        "Use one of these instead:"
+      );
+      context.addMessage("system", `  /login ${email} <your-password>`);
+      context.addMessage("system", `  or set the env var before launching:  $env:MSAPLING_PASSWORD="..."`);
+      context.addMessage("system", "  or paste an API token:  /login <token>  (get one at msapling.com \u2192 Settings \u2192 API Keys)");
+      context.addMessage("system", "  or use a different login mode:  /login github  |  /login guest");
+      return;
+    }
     try {
       password = await promptPassword("Password: ");
       if (!password) {
@@ -9941,19 +9968,19 @@ var init_login = __esm({
 });
 
 // src/state/secureStore.ts
-async function getKeytar() {
-  if (_keytar !== "pending") return _keytar;
+async function getKeytar2() {
+  if (_keytar2 !== "pending") return _keytar2;
   try {
-    _keytar = await import("keytar");
-    return _keytar;
+    _keytar2 = await import("keytar");
+    return _keytar2;
   } catch (e) {
     console.warn(`[secureStore] keytar unavailable, falling back to file token: ${e instanceof Error ? e.message : String(e)}`);
-    _keytar = null;
+    _keytar2 = null;
     return null;
   }
 }
 async function secureStoreDelete() {
-  const kt = await getKeytar();
+  const kt = await getKeytar2();
   if (!kt) return;
   try {
     await kt.deletePassword(KEYCHAIN_SERVICE2, KEYCHAIN_ACCOUNT2);
@@ -9961,14 +9988,14 @@ async function secureStoreDelete() {
     console.warn(`[secureStore] deletePassword failed: ${e instanceof Error ? e.message : String(e)}`);
   }
 }
-var KEYCHAIN_SERVICE2, KEYCHAIN_ACCOUNT2, _keytar;
+var KEYCHAIN_SERVICE2, KEYCHAIN_ACCOUNT2, _keytar2;
 var init_secureStore = __esm({
   "src/state/secureStore.ts"() {
     "use strict";
     init_esm_shims();
     KEYCHAIN_SERVICE2 = "msapling-cli";
     KEYCHAIN_ACCOUNT2 = "auth-cookie";
-    _keytar = "pending";
+    _keytar2 = "pending";
   }
 });
 
@@ -12380,7 +12407,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.40" : "(dev)";
+        const cliVersion = true ? "2.3.6-beta.42" : "(dev)";
         const coreVersion = true ? "2.3.2" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -12389,7 +12416,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:27:42.676Z";
+          const ts = "2026-06-02T16:20:01.508Z";
           if (ts && ts !== "__BUILD_TIMESTAMP__") {
             context.addMessage("system", row2("Build Timestamp", ts));
           }
@@ -15271,8 +15298,8 @@ async function checkConfigDir() {
 }
 async function checkKeytar() {
   try {
-    const keytar2 = await import("keytar");
-    if (keytar2 && typeof keytar2.getPassword === "function") {
+    const keytar = await import("keytar");
+    if (keytar && typeof keytar.getPassword === "function") {
       return {
         name: "Keytar native binary",
         status: "PASS",
@@ -15395,10 +15422,10 @@ async function checkNetworkReach() {
 }
 async function checkTokenValidity() {
   try {
-    const keytar2 = await import("keytar");
+    const keytar = await import("keytar");
     const KEYCHAIN_SERVICE3 = "msapling-cli";
     const KEYCHAIN_ACCOUNT3 = "auth_token";
-    const token = await keytar2.getPassword(KEYCHAIN_SERVICE3, KEYCHAIN_ACCOUNT3);
+    const token = await keytar.getPassword(KEYCHAIN_SERVICE3, KEYCHAIN_ACCOUNT3);
     if (!token) {
       return {
         name: "Token validity",
@@ -17905,7 +17932,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.40"
+    "2.3.6-beta.42"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtreeai/msapling-cli",
-  "version": "2.3.6-beta.40",
+  "version": "2.3.6-beta.42",
   "description": "MSapling CLI — React/Ink terminal client for the MSapling backend (chat, projects, MDrive, agent tools). Proprietary; redistribution prohibited.",
   "license": "UNLICENSED",
   "author": "MSapling Team",