@mtreeai/msapling-cli 2.3.6-beta.20 → 2.3.6-beta.22

package/dist/index.js

@@ -171,15 +171,20 @@ var init_src = __esm({
         }
       }
       async me() {
-        const data = await this.request("/api/projects/overview");
+        const [overviewData, billingData] = await Promise.all([
+          this.request("/api/projects/overview"),
+          this.request("/api/billing/settings").catch(() => null)
+        ]);
+        const data = overviewData;
+        const fuel = billingData?.fuel ?? {};
         return {
           user: {
             id: data.user_id,
             email: data.email,
-            tier: data.tier,
+            tier: billingData?.tier ?? data.tier,
             is_pro: data.is_pro,
-            fuel_credits: data.fuel_credits,
-            fuel_credits_purchased: data.fuel_credits_purchased || 0,
+            fuel_credits: typeof fuel.total === "number" ? fuel.total : data.fuel_credits,
+            fuel_credits_purchased: typeof fuel.purchased === "number" ? fuel.purchased : data.fuel_credits_purchased || 0,
             monthly_spending_limit: data.monthly_spending_limit || null,
             cost_byok: data.cost_byok || 0,
             tokens_byok: data.tokens_byok || 0,
@@ -203,14 +208,19 @@ var init_src = __esm({
         };
       }
       async getLiveUsage() {
-        const data = await this.request("/api/usage/live");
+        const [billingData, overviewData] = await Promise.all([
+          this.request("/api/billing/settings").catch(() => null),
+          this.request("/api/projects/overview").catch(() => ({}))
+        ]);
+        const fuel = billingData?.fuel ?? {};
+        const data = overviewData;
         return {
           id: data.user_id,
           email: data.email,
-          tier: data.tier,
+          tier: billingData?.tier ?? data.tier,
           is_pro: data.is_pro,
-          fuel_credits: data.fuel_credits,
-          fuel_credits_purchased: data.fuel_credits_purchased || 0,
+          fuel_credits: typeof fuel.total === "number" ? fuel.total : data.fuel_credits,
+          fuel_credits_purchased: typeof fuel.purchased === "number" ? fuel.purchased : data.fuel_credits_purchased || 0,
           monthly_spending_limit: data.monthly_spending_limit || null,
           cost_byok: data.cost_byok || 0,
           tokens_byok: data.tokens_byok || 0,
@@ -8534,26 +8544,101 @@ var init_help = __esm({
 });
 
 // src/commands/chat.ts
-var chatCommand;
+function labelFor(i) {
+  return i < 9 ? String(i + 1) : LETTERS[i - 9] ?? `#${i + 1}`;
+}
+async function fetchChatsForCurrentProject(context) {
+  try {
+    const data = await context.client.request("/api/projects/");
+    const currentId = context.getProjectId() || null;
+    const overview = await context.client.me();
+    const activeProject = overview.projects.find((p) => p.id === currentId) ?? overview.projects[0];
+    if (!activeProject) return { error: "No active project; use /project first." };
+    const bucket = data.projects?.[activeProject.name];
+    return {
+      projectName: activeProject.name,
+      chats: bucket?.chats ?? []
+    };
+  } catch (e) {
+    return { error: `Failed to fetch chats: ${e.message}` };
+  }
+}
+function resolveChat(arg, chats) {
+  const trimmed = arg.trim();
+  if (!trimmed) return { kind: "error", message: "empty argument" };
+  const uuidHit = chats.find((c) => c.id === trimmed);
+  if (uuidHit) return { kind: "ok", id: uuidHit.id, title: uuidHit.title };
+  if (/^\d+$/.test(trimmed)) {
+    const n = parseInt(trimmed, 10);
+    if (n >= 1 && n <= chats.length) return { kind: "ok", id: chats[n - 1].id, title: chats[n - 1].title };
+    return { kind: "error", message: `no chat at index ${n} (have ${chats.length})` };
+  }
+  if (/^[a-zA-Z]$/.test(trimmed)) {
+    const idx = 9 + LETTERS.indexOf(trimmed.toLowerCase());
+    if (idx >= 9 && idx < chats.length) return { kind: "ok", id: chats[idx].id, title: chats[idx].title };
+  }
+  const lower = trimmed.toLowerCase();
+  const matches2 = chats.filter((c) => (c.title ?? "").toLowerCase().includes(lower));
+  if (matches2.length === 1) return { kind: "ok", id: matches2[0].id, title: matches2[0].title };
+  if (matches2.length > 1) {
+    return {
+      kind: "error",
+      message: `'${trimmed}' matches ${matches2.length} chats: ${matches2.map((m) => m.title).join(", ")}`
+    };
+  }
+  return { kind: "error", message: `no chat matches '${trimmed}'. Run /chat (no args) for the list.` };
+}
+async function listChats(args2, context) {
+  const arg = args2.join(" ").trim();
+  const result = await fetchChatsForCurrentProject(context);
+  if ("error" in result) {
+    context.addMessage("error", result.error);
+    return;
+  }
+  const { projectName, chats } = result;
+  if (!arg) {
+    if (chats.length === 0) {
+      context.addMessage("system", `No chats in project '${projectName}'. Send a message to start one.`);
+      return;
+    }
+    context.addMessage("system", `Chats in '${projectName}':`);
+    chats.forEach((c, i) => {
+      const label = labelFor(i);
+      const star = c.id === context.activeChatId ? " \u2605" : "";
+      const model = c.model ? ` [${c.model}]` : "";
+      context.addMessage("system", `  ${label}. ${c.title ?? c.id}${model}${star}`);
+    });
+    context.addMessage("system", "");
+    context.addMessage("system", "Switch via /chat <number|letter|title>  (e.g. /chat 1  or  /chat audit)");
+    return;
+  }
+  const resolved = resolveChat(arg, chats);
+  if (resolved.kind === "error") {
+    context.addMessage("error", resolved.message);
+    return;
+  }
+  context.setActiveChatId(resolved.id);
+  context.addMessage("system", `Switched to chat: ${resolved.title ?? resolved.id}`);
+  await context.refreshOverview();
+}
+var LETTERS, chatCommand, chatsCommand;
 var init_chat = __esm({
   "src/commands/chat.ts"() {
     "use strict";
     init_esm_shims();
+    LETTERS = "abcdefghijklmnopqrstuvwxyz";
     chatCommand = {
       name: "chat",
-      args: "<chat_id>",
-      description: "Switch to a specific chat session",
+      args: "[number|letter|title|id]",
+      description: "List chats in the current project, or switch to one",
       category: "chat",
-      handler: async (args2, context) => {
-        const chatId = args2[0];
-        if (!chatId) {
-          context.addMessage("system", "Usage: /chat <chat_id>");
-          return;
-        }
-        context.setActiveChatId(chatId);
-        context.addMessage("system", `Switched to chat: ${chatId}`);
-        await context.refreshOverview();
-      }
+      handler: async (args2, context) => listChats(args2, context)
+    };
+    chatsCommand = {
+      name: "chats",
+      description: "List chats in the current project (alias for /chat with no args)",
+      category: "chat",
+      handler: async (_args, context) => listChats([], context)
     };
   }
 });
@@ -8819,34 +8904,80 @@ var init_memory = __esm({
 });
 
 // src/commands/project.ts
-var projectCommand;
+function labelFor2(i) {
+  return i < 9 ? String(i + 1) : LETTERS2[i - 9] ?? `#${i + 1}`;
+}
+function resolveProject(arg, list) {
+  const trimmed = arg.trim();
+  if (!trimmed) return { kind: "error", message: "empty argument" };
+  const uuidHit = list.find((p) => p.id === trimmed);
+  if (uuidHit) return { kind: "ok", id: uuidHit.id };
+  if (/^\d+$/.test(trimmed)) {
+    const n = parseInt(trimmed, 10);
+    if (n >= 1 && n <= list.length) return { kind: "ok", id: list[n - 1].id };
+    return { kind: "error", message: `no project at index ${n} (have ${list.length})` };
+  }
+  if (/^[a-zA-Z]$/.test(trimmed)) {
+    const idx = 9 + LETTERS2.indexOf(trimmed.toLowerCase());
+    if (idx >= 9 && idx < list.length) return { kind: "ok", id: list[idx].id };
+  }
+  const lower = trimmed.toLowerCase();
+  const matches2 = list.filter((p) => (p.name ?? "").toLowerCase().includes(lower));
+  if (matches2.length === 1) return { kind: "ok", id: matches2[0].id };
+  if (matches2.length > 1) {
+    return {
+      kind: "error",
+      message: `'${trimmed}' matches ${matches2.length} projects: ${matches2.map((m) => m.name).join(", ")}`
+    };
+  }
+  return { kind: "error", message: `no project matches '${trimmed}'. Run /project (no args) for the list.` };
+}
+var LETTERS2, projectCommand;
 var init_project = __esm({
   "src/commands/project.ts"() {
     "use strict";
     init_esm_shims();
+    LETTERS2 = "abcdefghijklmnopqrstuvwxyz";
     projectCommand = {
       name: "project",
-      args: "[project_id]",
+      args: "[number|letter|name|id]",
       description: "List or switch active project",
       category: "project",
       handler: async (args2, context) => {
-        const newProjectId = args2[0];
-        if (!newProjectId) {
-          try {
-            const overview = await context.client.me();
-            context.addMessage("system", "Available Projects:");
-            for (const p of overview.projects) {
-              context.addMessage("system", `  - ${p.id} (${p.name})`);
-            }
-            context.addMessage("system", `
-Current Project: ${context.getProjectId() || "none"}`);
-          } catch (e) {
-            context.addMessage("error", `Failed to fetch projects: ${e.message}`);
+        const arg = args2.join(" ").trim();
+        const currentId = context.getProjectId() || null;
+        let projects = [];
+        try {
+          const overview = await context.client.me();
+          projects = overview.projects;
+        } catch (e) {
+          context.addMessage("error", `Failed to fetch projects: ${e.message}`);
+          return;
+        }
+        if (!arg) {
+          if (projects.length === 0) {
+            context.addMessage("system", "No projects found.");
+            return;
           }
+          context.addMessage("system", "Available Projects:");
+          projects.forEach((p, i) => {
+            const label = labelFor2(i);
+            const star = p.id === currentId ? " \u2605" : "";
+            const usage = p.chat_count != null && p.chat_limit != null ? `  (${p.chat_count}/${p.chat_limit} chats)` : "";
+            context.addMessage("system", `  ${label}. ${p.name ?? p.id}${usage}${star}`);
+          });
+          context.addMessage("system", "");
+          context.addMessage("system", "Switch via /project <number|letter|name>  (e.g. /project 2  or  /project audit)");
           return;
         }
-        context.setProjectId(newProjectId);
-        context.addMessage("system", `Project switched to: ${newProjectId}`);
+        const resolved = resolveProject(arg, projects);
+        if (resolved.kind === "error") {
+          context.addMessage("error", resolved.message);
+          return;
+        }
+        const picked = projects.find((p) => p.id === resolved.id);
+        context.setProjectId(resolved.id);
+        context.addMessage("system", `Project switched to: ${picked.name ?? resolved.id}`);
         await context.refreshOverview();
       }
     };
@@ -9341,7 +9472,7 @@ var init_benchmark = __esm({
         let models = modelArg ?? [];
         if (!models.length) {
           try {
-            const resp = await context.client.get("/api/models");
+            const resp = await context.client.request("/api/benchmark/models");
             const list = Array.isArray(resp) ? resp : resp?.models ?? [];
             models = list.slice(0, 4).map((m) => m.id ?? m.model_id ?? "").filter(Boolean);
           } catch {
@@ -9567,14 +9698,14 @@ var init_status = __esm({
           context.addMessage("error", `Health check failed: ${e.message}`);
         }
         try {
-          const countData = await context.client["request"]("/api/stream/active-count");
+          const countData = await context.client["request"]("/api/chat/stream/active-count");
           const count = countData?.count ?? countData?.active_count ?? 0;
           context.addMessage("system", `[INFO] Active Streams: ${count}`);
         } catch (e) {
           context.addMessage("system", `     Active Streams: unavailable (${e.message})`);
         }
         try {
-          const providerData = await context.client["request"]("/api/admin/provider-health");
+          const providerData = await context.client["request"]("/api/provider/circuit-summary");
           const providers = providerData?.providers ?? (Array.isArray(providerData) ? providerData : []);
           if (providers.length > 0) {
             context.addMessage("system", "     Provider Circuits:");
@@ -9745,7 +9876,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.20" : "(dev)";
+        const cliVersion = true ? "2.3.6-beta.22" : "(dev)";
         const coreVersion = true ? "2.3.2" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -9754,7 +9885,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-28T18:54:30.369Z";
+          const ts = "2026-05-28T19:10:28.448Z";
           if (ts && ts !== "__BUILD_TIMESTAMP__") {
             context.addMessage("system", row2("Build Timestamp", ts));
           }
@@ -10527,6 +10658,7 @@ var init_commands = __esm({
       exitCommand,
       helpCommand,
       chatCommand,
+      chatsCommand,
       clearCommand,
       modeCommand,
       modelCommand,
@@ -10752,9 +10884,22 @@ async function apiFetch(path2, opts = {}) {
   return fetch(`${getBaseURL()}${path2}`, { ...opts, headers, body });
 }
 async function fetchBalance() {
-  const res = await apiFetch("/api/billing/balance");
+  const res = await apiFetch("/api/billing/settings");
   if (!res.ok) throw new Error(`Balance fetch failed: ${res.status}`);
-  return res.json();
+  const data = await res.json();
+  return {
+    tier: data.tier ?? "free",
+    is_pro: data.tier && !["free", "guest"].includes(String(data.tier).toLowerCase()),
+    is_founder: false,
+    fuel_credits: Number(data?.fuel?.total ?? 0),
+    fuel_credits_purchased: Number(data?.fuel?.purchased ?? 0),
+    auto_topup: {
+      enabled: !!data?.auto_topup?.enabled,
+      threshold_usd: Number(data?.auto_topup?.threshold_usd ?? 0),
+      amount_usd: Number(data?.auto_topup?.amount_usd ?? 0),
+      max_per_month_usd: Number(data?.auto_topup?.max_per_month_usd ?? 0)
+    }
+  };
 }
 async function fetchFounderStatus() {
   const res = await apiFetch("/api/billing/founder-status");
@@ -14143,7 +14288,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.20"
+    "2.3.6-beta.22"
   ] }),
   /* @__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.20",
+  "version": "2.3.6-beta.22",
   "description": "MSapling CLI — React/Ink terminal client for the MSapling backend (chat, projects, MDrive, agent tools). Proprietary; redistribution prohibited.",
   "license": "UNLICENSED",
   "author": "MSapling Team",