@mtreeai/msapling-cli 2.3.6-beta.15 → 2.3.6-beta.17

package/dist/index.js

@@ -581,15 +581,22 @@ var init_src = __esm({
         const controller = new AbortController();
         const timeout = setTimeout(() => controller.abort(), 3e4);
         try {
+          const headers = {
+            "Authorization": `Bearer ${this.token}`,
+            "Content-Type": "application/json"
+          };
+          if (this.cookies.size > 0) {
+            headers["Cookie"] = this.serializeCookies();
+          }
+          const csrf = this.cookies.get("msapling_csrftoken");
+          if (csrf) headers["X-CSRF-Token"] = csrf;
           const response = await fetch(`${this.apiUrl}/api/chat/message`, {
             method: "POST",
-            headers: {
-              "Authorization": `Bearer ${this.token}`,
-              "Content-Type": "application/json"
-            },
+            headers,
             body: JSON.stringify(params),
             signal: controller.signal
           });
+          this.updateCookiesFromResponse(response);
           clearTimeout(timeout);
           if (response.status === 423) {
             await new Promise((r) => setTimeout(r, 1e3));
@@ -3620,20 +3627,20 @@ async function copyDir(src, dst) {
 }
 async function backupFile(absPath) {
   try {
-    const { readFile: readFile22, writeFile: writeFile12, mkdir: mkdir9 } = await import("fs/promises");
-    const { homedir: homedir17 } = await import("os");
-    const { join: join30 } = await import("path");
+    const { readFile: readFile23, writeFile: writeFile12, mkdir: mkdir9 } = await import("fs/promises");
+    const { homedir: homedir18 } = await import("os");
+    const { join: join31 } = await import("path");
     const filename = absPath.split(/[\\/]/).pop() ?? "file";
     const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
     const suffix = randomBytes5(4).toString("hex");
-    const backupPath = join30(
-      homedir17(),
+    const backupPath = join31(
+      homedir18(),
       ".msapling",
       "backups",
       `${filename}.backup-${stamp}-${suffix}.bak`
     );
-    await mkdir9(join30(homedir17(), ".msapling", "backups"), { recursive: true });
-    const content = await readFile22(absPath, "utf8");
+    await mkdir9(join31(homedir18(), ".msapling", "backups"), { recursive: true });
+    const content = await readFile23(absPath, "utf8");
     await writeFile12(backupPath, content, "utf8");
     return backupPath;
   } catch {
@@ -3859,14 +3866,14 @@ var init_DeleteFileTool = __esm({
         let backedUpTo = null;
         if (isFile) {
           try {
-            const { readFile: readFile22, writeFile: writeFile12, mkdir: mkdir9 } = await import("fs/promises");
-            const { homedir: homedir17 } = await import("os");
-            const existingContent = await readFile22(abs, "utf8");
+            const { readFile: readFile23, writeFile: writeFile12, mkdir: mkdir9 } = await import("fs/promises");
+            const { homedir: homedir18 } = await import("os");
+            const existingContent = await readFile23(abs, "utf8");
             const filename = abs.split(/[\\/]/).pop() ?? "file";
             const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
             const suffix = randomBytes6(4).toString("hex");
-            const backupPath = join11(homedir17(), ".msapling", "backups", `${filename}.backup-${stamp}-${suffix}.bak`);
-            await mkdir9(join11(homedir17(), ".msapling", "backups"), { recursive: true });
+            const backupPath = join11(homedir18(), ".msapling", "backups", `${filename}.backup-${stamp}-${suffix}.bak`);
+            await mkdir9(join11(homedir18(), ".msapling", "backups"), { recursive: true });
             await writeFile12(backupPath, existingContent, "utf8");
             backedUpTo = backupPath;
           } catch {
@@ -5834,8 +5841,8 @@ var require_graceful_fs = __commonJS({
       fs4.createReadStream = createReadStream;
       fs4.createWriteStream = createWriteStream;
       var fs$readFile = fs4.readFile;
-      fs4.readFile = readFile22;
-      function readFile22(path2, options, cb) {
+      fs4.readFile = readFile23;
+      function readFile23(path2, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
         return go$readFile(path2, options, cb);
@@ -9684,7 +9691,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.15" : "(dev)";
+        const cliVersion = true ? "2.3.6-beta.17" : "(dev)";
         const coreVersion = true ? "2.3.2" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -9693,7 +9700,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-05-28T14:58:50.319Z";
+          const ts = "2026-05-28T16:29:43.918Z";
           if (ts && ts !== "__BUILD_TIMESTAMP__") {
             context.addMessage("system", row2("Build Timestamp", ts));
           }
@@ -10497,11 +10504,91 @@ var init_commands = __esm({
   }
 });
 
+// src/state/parseApprovalMode.ts
+function parseApprovalMode(raw, now) {
+  if (!raw || typeof raw !== "object") {
+    return { kind: "invalid", error: "settings file is not a JSON object" };
+  }
+  const block = raw.approvalMode;
+  if (block === void 0) return { kind: "absent" };
+  if (typeof block === "string") {
+    if (!VALID_MODES.includes(block)) {
+      return { kind: "invalid", error: `unknown approvalMode "${block}"` };
+    }
+    return { kind: "ok", mode: block };
+  }
+  if (typeof block !== "object" || block === null) {
+    return {
+      kind: "invalid",
+      error: `approvalMode must be a string or object, got ${typeof block}`
+    };
+  }
+  const obj = block;
+  const mode = obj.mode;
+  if (typeof mode !== "string" || !VALID_MODES.includes(mode)) {
+    return { kind: "invalid", error: `approvalMode.mode invalid: ${JSON.stringify(mode)}` };
+  }
+  if (mode !== "bypassPermissions") {
+    return { kind: "ok", mode };
+  }
+  if (typeof obj.ttlMs !== "number" || !Number.isFinite(obj.ttlMs) || obj.ttlMs <= 0) {
+    return {
+      kind: "invalid",
+      error: `approvalMode.ttlMs must be a positive number, got ${JSON.stringify(obj.ttlMs)}`
+    };
+  }
+  if (typeof obj.timestamp !== "number" || !Number.isFinite(obj.timestamp) || obj.timestamp <= 0) {
+    return {
+      kind: "invalid",
+      error: `approvalMode.timestamp must be a positive number, got ${JSON.stringify(obj.timestamp)}`
+    };
+  }
+  const age = now - obj.timestamp;
+  if (age > obj.ttlMs) {
+    return { kind: "expired", mode: "default", agedMs: age };
+  }
+  const remainingMs = obj.ttlMs - age;
+  return { kind: "ok", mode: "bypassPermissions", ttl: { remainingMs } };
+}
+var VALID_MODES;
+var init_parseApprovalMode = __esm({
+  "src/state/parseApprovalMode.ts"() {
+    "use strict";
+    init_esm_shims();
+    VALID_MODES = [
+      "default",
+      "plan",
+      "acceptEdits",
+      "bypassPermissions"
+    ];
+  }
+});
+
 // src/runtime/exec.ts
 var exec_exports = {};
 __export(exec_exports, {
   runExec: () => runExec
 });
+import { existsSync as existsSync25 } from "fs";
+import { readFile as readFile22 } from "fs/promises";
+import { homedir as homedir16 } from "os";
+import { join as join27 } from "path";
+async function loadPersistedSettings() {
+  const out = { mode: "default", theme: null };
+  try {
+    const p = join27(homedir16(), ".msapling", "settings.json");
+    if (!existsSync25(p)) return out;
+    const raw = JSON.parse(await readFile22(p, "utf8"));
+    const parsed = parseApprovalMode(raw, Date.now());
+    if (parsed.kind === "ok") out.mode = parsed.mode;
+    const themeRaw = raw?.theme;
+    if (themeRaw === "diamond" || themeRaw === "onyx" || themeRaw === "mono") {
+      out.theme = themeRaw;
+    }
+  } catch {
+  }
+  return out;
+}
 async function runExec(rawInput) {
   const trimmed = (rawInput || "").trim();
   if (!trimmed) {
@@ -10524,7 +10611,9 @@ async function runExec(rawInput) {
     token: token || void 0
   });
   const stdout = process.stdout;
-  let mode = "default";
+  const persisted = await loadPersistedSettings();
+  if (persisted.theme) applyTheme(persisted.theme);
+  let mode = persisted.mode;
   let model = process.env.MSAPLING_MODEL || "google/gemini-2.0-flash-001";
   let projectId = null;
   let activeChatId = null;
@@ -10576,6 +10665,8 @@ var init_exec = __esm({
     init_src();
     init_src3();
     init_commands();
+    init_theme();
+    init_parseApprovalMode();
   }
 });
 
@@ -10628,9 +10719,9 @@ var doctor_exports = {};
 __export(doctor_exports, {
   runDoctor: () => runDoctor
 });
-import { homedir as homedir16, platform as platform3 } from "os";
-import { join as join27 } from "path";
-import { existsSync as existsSync25, statSync as statSync6, accessSync } from "fs";
+import { homedir as homedir17, platform as platform3 } from "os";
+import { join as join28 } from "path";
+import { existsSync as existsSync26, statSync as statSync6, accessSync } from "fs";
 import { readdir as readdir3 } from "fs/promises";
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -10653,8 +10744,8 @@ async function checkNodeVersion() {
   };
 }
 async function checkConfigDir() {
-  const configDir = join27(homedir16(), ".msapling");
-  if (!existsSync25(configDir)) {
+  const configDir = join28(homedir17(), ".msapling");
+  if (!existsSync26(configDir)) {
     return {
       name: "Config directory",
       status: "WARN",
@@ -10720,12 +10811,12 @@ async function checkPathConflicts() {
   const paths = pathEnv.split(platform3() === "win32" ? ";" : ":");
   const conflicts = [];
   for (const dir of paths) {
-    if (!dir || !existsSync25(dir)) continue;
+    if (!dir || !existsSync26(dir)) continue;
     try {
       const files = await readdir3(dir);
       for (const file of files) {
         if (file === "msapling" || file === "msapling.exe" || file === "msapling.py") {
-          const fullPath = join27(dir, file);
+          const fullPath = join28(dir, file);
           conflicts.push(fullPath);
         }
       }
@@ -10827,9 +10918,9 @@ async function checkTokenValidity() {
 async function checkOsSpecific() {
   if (platform3() === "win32") {
     try {
-      const configDir = join27(homedir16(), ".msapling");
+      const configDir = join28(homedir17(), ".msapling");
       const longPath = "A".repeat(260);
-      const testPath = join27(configDir, longPath);
+      const testPath = join28(configDir, longPath);
       try {
         accessSync(configDir);
       } catch {
@@ -12491,7 +12582,7 @@ __export(server_exports, {
   runStdioWithRegistry: () => runStdioWithRegistry
 });
 import { readdirSync as readdirSync4, readFileSync as readFileSync2, statSync as statSync7 } from "fs";
-import { join as join28, relative as relative14, resolve as resolve17 } from "path";
+import { join as join29, relative as relative14, resolve as resolve17 } from "path";
 function asResult2(text, isError = false) {
   return { content: [{ type: "text", text }], ...isError ? { isError: true } : {} };
 }
@@ -12511,7 +12602,7 @@ function buildFileTree(root, maxFiles) {
     for (const name of entries) {
       if (out.length >= maxFiles) break;
       if (SKIP_DIRS2.has(name)) continue;
-      const full = join28(dir, name);
+      const full = join29(dir, name);
       let s;
       try {
         s = statSync7(full);
@@ -13277,7 +13368,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.15"
+    "2.3.6-beta.17"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });
@@ -13800,10 +13891,10 @@ ${prompt}` : prompt;
         for (const mention of fileMentions) {
           const filePath = mention.slice(1);
           try {
-            const { existsSync: existsSync26 } = await import("fs");
-            const { readFile: readFile22 } = await import("fs/promises");
-            if (existsSync26(filePath)) {
-              const content = await readFile22(filePath, "utf8");
+            const { existsSync: existsSync27 } = await import("fs");
+            const { readFile: readFile23 } = await import("fs/promises");
+            if (existsSync27(filePath)) {
+              const content = await readFile23(filePath, "utf8");
               const MAX_LEN = 32768;
               const truncated = content.length > MAX_LEN ? content.slice(0, MAX_LEN) + "\n...[TRUNCATED]" : content;
               finalCmd += `
@@ -13854,67 +13945,9 @@ ${finalCmd}`;
 // src/state/initSession.ts
 init_esm_shims();
 init_src3();
+init_parseApprovalMode();
 import { readFile as readFile21 } from "fs/promises";
 import { existsSync as existsSync24 } from "fs";
-
-// src/state/parseApprovalMode.ts
-init_esm_shims();
-var VALID_MODES = [
-  "default",
-  "plan",
-  "acceptEdits",
-  "bypassPermissions"
-];
-function parseApprovalMode(raw, now) {
-  if (!raw || typeof raw !== "object") {
-    return { kind: "invalid", error: "settings file is not a JSON object" };
-  }
-  const block = raw.approvalMode;
-  if (block === void 0) return { kind: "absent" };
-  if (typeof block === "string") {
-    if (!VALID_MODES.includes(block)) {
-      return { kind: "invalid", error: `unknown approvalMode "${block}"` };
-    }
-    return { kind: "ok", mode: block };
-  }
-  if (typeof block !== "object" || block === null) {
-    return {
-      kind: "invalid",
-      error: `approvalMode must be a string or object, got ${typeof block}`
-    };
-  }
-  const obj = block;
-  const mode = obj.mode;
-  if (typeof mode !== "string" || !VALID_MODES.includes(mode)) {
-    return { kind: "invalid", error: `approvalMode.mode invalid: ${JSON.stringify(mode)}` };
-  }
-  if (obj.ttlMs === void 0 && obj.timestamp === void 0) {
-    return { kind: "ok", mode };
-  }
-  if (typeof obj.ttlMs !== "number" || !Number.isFinite(obj.ttlMs) || obj.ttlMs <= 0) {
-    return {
-      kind: "invalid",
-      error: `approvalMode.ttlMs must be a positive number, got ${JSON.stringify(obj.ttlMs)}`
-    };
-  }
-  if (typeof obj.timestamp !== "number" || !Number.isFinite(obj.timestamp) || obj.timestamp <= 0) {
-    return {
-      kind: "invalid",
-      error: `approvalMode.timestamp must be a positive number, got ${JSON.stringify(obj.timestamp)}`
-    };
-  }
-  if (mode !== "bypassPermissions") {
-    return { kind: "ok", mode };
-  }
-  const age = now - obj.timestamp;
-  if (age > obj.ttlMs) {
-    return { kind: "expired", mode: "default", agedMs: age };
-  }
-  const remainingMs = obj.ttlMs - age;
-  return { kind: "ok", mode: "bypassPermissions", ttl: { remainingMs } };
-}
-
-// src/state/initSession.ts
 async function initSession(ctx) {
   try {
     const { settings } = await loadSettings(
@@ -13928,9 +13961,9 @@ async function initSession(ctx) {
       ctx.setShellEscapeEnabled(settings.shellEscapeEnabled !== false);
     }
     try {
-      const { homedir: homedir17 } = await import("os");
-      const { join: join30 } = await import("path");
-      const userSettingsPath = join30(homedir17(), ".msapling", "settings.json");
+      const { homedir: homedir18 } = await import("os");
+      const { join: join31 } = await import("path");
+      const userSettingsPath = join31(homedir18(), ".msapling", "settings.json");
       if (existsSync24(userSettingsPath)) {
         const userText = await readFile21(userSettingsPath, "utf8");
         let parsed;
@@ -13964,6 +13997,14 @@ async function initSession(ctx) {
             break;
         }
         ctx.setMode(modeToApply);
+        const themeRaw = parsed?.theme;
+        if (themeRaw === "diamond" || themeRaw === "onyx" || themeRaw === "mono") {
+          try {
+            const { applyTheme: applyTheme2 } = await Promise.resolve().then(() => (init_theme(), theme_exports));
+            applyTheme2(themeRaw);
+          } catch {
+          }
+        }
       }
     } catch {
     }
@@ -14229,12 +14270,12 @@ var App = ({ compact: compact2 = false }) => {
 init_esm_shims();
 import { readFileSync as readFileSync3 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { dirname as dirname3, join as join29 } from "path";
+import { dirname as dirname3, join as join30 } from "path";
 function readCliVersion2() {
   const here = dirname3(fileURLToPath2(import.meta.url));
   for (const rel of ["../package.json", "../../package.json"]) {
     try {
-      const pkg = JSON.parse(readFileSync3(join29(here, rel), "utf8"));
+      const pkg = JSON.parse(readFileSync3(join30(here, rel), "utf8"));
       if (pkg.name && pkg.version) {
         return { name: pkg.name, version: pkg.version };
       }

package/package.json

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