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

package/dist/index.js

@@ -457,9 +457,9 @@ var init_src = __esm({
        * Single-turn chat: send a prompt, accumulate the streaming response into
        * a single string. Used by the MCP `msapling_chat` tool.
        */
-      async chatOnce(prompt, model, chatId) {
+      async chatOnce(prompt4, model, chatId) {
         let acc = "";
-        for await (const chunk of this.streamChat({ content: prompt, model, chat_id: chatId ?? "" })) {
+        for await (const chunk of this.streamChat({ content: prompt4, model, chat_id: chatId ?? "" })) {
           if (chunk.delta) acc += chunk.delta;
           else if (chunk.content) acc += chunk.content;
         }
@@ -470,10 +470,10 @@ var init_src = __esm({
        * one row per model with status + response or error. Used by the MCP
        * `msapling_multi_chat` tool and the existing /swarm slash command path.
        */
-      async multiChat(prompt, models) {
+      async multiChat(prompt4, models) {
         const results = await Promise.all(models.map(async (model) => {
           try {
-            const response = await this.chatOnce(prompt, model);
+            const response = await this.chatOnce(prompt4, model);
             return { model, status: "ok", response };
           } catch (e) {
             return { model, status: "error", error: e?.message ?? String(e) };
@@ -2365,7 +2365,7 @@ var init_DispatchAgentTool = __esm({
             isError: true
           };
         }
-        const prompt = args2.prompt.trim().slice(0, MAX_PROMPT_CHARS);
+        const prompt4 = args2.prompt.trim().slice(0, MAX_PROMPT_CHARS);
         const model = typeof args2.model === "string" && args2.model.trim() ? args2.model.trim() : DEFAULT_SUB_AGENT_MODEL;
         const chatId = typeof args2.chat_id === "string" && args2.chat_id.trim() ? args2.chat_id.trim() : this.parentChatId;
         const description = typeof args2.description === "string" && args2.description.trim() ? args2.description.trim() : "sub-task";
@@ -2378,7 +2378,7 @@ var init_DispatchAgentTool = __esm({
         );
         const streamPromise = (async () => {
           const stream = this.client.streamChat({
-            prompt,
+            prompt: prompt4,
             model,
             // No tools — sub-agent is read/reasoning only.
             tools: [],
@@ -4248,7 +4248,7 @@ var init_ShadowService = __esm({
        * that regex might miss.
        */
       async redact(text) {
-        const prompt = `You are a security shadow. Redact all API keys, secrets, and private credentials from the following text. 
+        const prompt4 = `You are a security shadow. Redact all API keys, secrets, and private credentials from the following text. 
     Return the text exactly as is, but replace secrets with [REDACTED]. 
     If no secrets are found, return the text UNCHANGED.
     
@@ -4256,7 +4256,7 @@ var init_ShadowService = __esm({
     ${text}`;
         let result = "";
         for await (const chunk of this.client.streamChat({
-          prompt,
+          prompt: prompt4,
           model: this.shadowModel,
           history: []
         })) {
@@ -4268,14 +4268,14 @@ var init_ShadowService = __esm({
        * Shadow Verification: Double-check a primary model's plan or tool call.
        */
       async verifyAction(action, context) {
-        const prompt = `Review this proposed agent action for safety and logical correctness.
+        const prompt4 = `Review this proposed agent action for safety and logical correctness.
     CONTEXT: ${context}
     PROPOSED ACTION: ${action}
     
     Respond in JSON: { "approved": boolean, "reasoning": "string" }`;
         let response = "";
         for await (const chunk of this.client.streamChat({
-          prompt,
+          prompt: prompt4,
           model: this.shadowModel,
           history: []
         })) {
@@ -4293,14 +4293,14 @@ var init_ShadowService = __esm({
        * Double-Read: Read a file using the shadow model to verify findings.
        */
       async doubleRead(filePath, content, query) {
-        const prompt = `Verification Read of ${filePath}. 
+        const prompt4 = `Verification Read of ${filePath}. 
     The primary agent is looking for: ${query}
     
     FILE CONTENT:
     ${content}`;
         let response = "";
         for await (const chunk of this.client.streamChat({
-          prompt,
+          prompt: prompt4,
           model: this.shadowModel,
           history: []
         })) {
@@ -4458,7 +4458,15 @@ var init_ToolExecutor = __esm({
       mdrive;
       voice;
       shadow;
-      toolsEnabled = false;
+      // CLI-TOOLS-ENABLED-DEFAULT-ON-01 (Iter 30): default to true so the CLI's
+      // 19 client-side tools are actually advertised to the backend in
+      // ChatMessagePayload.tools. Previously false, and nothing in the CLI ever
+      // called setToolsEnabled(true), so getToolSchemas() always returned [] and
+      // the LLM had no idea tools existed — which is why every chat refused
+      // file/shell access. Side effects are still gated by the permission mode
+      // (default prompts before each call) and the persistent trust store.
+      // Opt out via MSAPLING_TOOLS_ENABLED=false.
+      toolsEnabled = process.env.MSAPLING_TOOLS_ENABLED !== "false";
       mode = "default";
       approvalCallback = null;
       /**
@@ -4696,12 +4704,14 @@ Please approve the diff in the UI to sync this change locally.`
         const builtin = Array.from(this.tools.values()).map((t) => ({
           name: t.name,
           description: t.description,
-          parameters: t.parameters
+          parameters: t.parameters,
+          input_schema: t.parameters
         }));
         const mcp = this.getMCPTools().map(({ server, tool }) => ({
           name: tool.name,
           description: tool.description ? `[mcp:${server}] ${tool.description}` : `[mcp:${server}]`,
-          parameters: tool.inputSchema ?? {}
+          parameters: tool.inputSchema ?? {},
+          input_schema: tool.inputSchema ?? {}
         }));
         return [...builtin, ...mcp];
       }
@@ -5017,11 +5027,11 @@ var init_Agent = __esm({
        * Returns null when the backend stream did not include a usage chunk (e.g.
        * old backend versions or local/offline models that omit billing data).
        */
-      async runWorkerTurn(chatId, prompt, model, onContent) {
+      async runWorkerTurn(chatId, prompt4, model, onContent) {
         if (this.hooks) {
           const outcomes = await this.hooks.fire({
             event: "user-prompt-submit",
-            payload: prompt,
+            payload: prompt4,
             cwd: this.projectRoot
           });
           const blocker = HookRunner.anyBlocked(outcomes);
@@ -5033,7 +5043,7 @@ var init_Agent = __esm({
         }
         const config = await this.getProjectConfig();
         const MAX_WORKER_TURN_DEPTH = 25;
-        const queue = [prompt];
+        const queue = [prompt4];
         let rounds = 0;
         let streamUsage = null;
         while (queue.length > 0 && rounds < MAX_WORKER_TURN_DEPTH) {
@@ -5122,9 +5132,9 @@ ${next}`;
         }
         return streamUsage;
       }
-      async run(prompt, model) {
+      async run(prompt4, model) {
         let fullResponse = "";
-        const stream = this.client.streamChat({ prompt, model });
+        const stream = this.client.streamChat({ prompt: prompt4, model });
         for await (const chunk of stream) {
           if (chunk.content) fullResponse += chunk.content;
         }
@@ -7976,6 +7986,47 @@ ${combinedData}`;
 });
 
 // ../core/src/index.ts
+var src_exports2 = {};
+__export(src_exports2, {
+  APPROVAL_GATED: () => APPROVAL_GATED,
+  Agent: () => Agent,
+  AsyncMutex: () => AsyncMutex,
+  BashTool: () => BashTool,
+  ContextBudget: () => ContextBudget,
+  DEFAULT_SETTINGS: () => DEFAULT_SETTINGS,
+  DeleteFileTool: () => DeleteFileTool,
+  DispatchAgentTool: () => DispatchAgentTool,
+  GlobFilesTool: () => GlobFilesTool,
+  GrepSearchTool: () => GrepSearchTool,
+  HookRunner: () => HookRunner,
+  ListDirectoryTool: () => ListDirectoryTool,
+  MCPClient: () => MCPClient,
+  MCPClientError: () => MCPClientError,
+  MCPRegistry: () => MCPRegistry,
+  MoveFileTool: () => MoveFileTool,
+  MultiEditFileTool: () => MultiEditFileTool,
+  NotebookEditTool: () => NotebookEditTool,
+  NotebookReadTool: () => NotebookReadTool,
+  PatchFileTool: () => PatchFileTool,
+  StorageManager: () => StorageManager,
+  SwarmManager: () => SwarmManager,
+  TodoReadTool: () => TodoReadTool,
+  TodoStore: () => TodoStore,
+  TodoWriteTool: () => TodoWriteTool,
+  ToolExecutor: () => ToolExecutor,
+  TrustStore: () => TrustStore,
+  WebFetchTool: () => WebFetchTool,
+  WriteFileTool: () => WriteFileTool,
+  buildCompactionPrompt: () => buildCompactionPrompt,
+  buildHwContext: () => buildHwContext,
+  ensureConfigDir: () => ensureConfigDir,
+  formatCell: () => formatCell,
+  formatNotebookHeader: () => formatNotebookHeader,
+  formatTodos: () => formatTodos,
+  loadProjectConfig: () => loadProjectConfig,
+  loadSettings: () => loadSettings,
+  takeSnapshot: () => takeSnapshot
+});
 var init_src3 = __esm({
   "../core/src/index.ts"() {
     "use strict";
@@ -8023,11 +8074,11 @@ function setRawModeGuarded(stdin, mode) {
   } catch (e) {
   }
 }
-async function promptPassword(prompt) {
+async function promptPassword(prompt4) {
   return new Promise((resolve18) => {
     const stdin = process.stdin;
     const stdout = process.stdout;
-    stdout.write(prompt);
+    stdout.write(prompt4);
     const wasRaw = stdin.isRaw ?? false;
     setRawModeGuarded(stdin, true);
     let password = "";
@@ -8906,12 +8957,12 @@ var init_review = __esm({
         } catch (e) {
           content = `Review target: ${target}`;
         }
-        const prompt = `Please review the following code/target for issues, best practices, and bugs:
+        const prompt4 = `Please review the following code/target for issues, best practices, and bugs:
 
 ${content}`;
         context.addMessage("user", `/review ${target}`);
         if (context.runAgent) {
-          await context.runAgent(prompt);
+          await context.runAgent(prompt4);
         } else {
           context.addMessage("error", "Agent execution from commands not wired up. Use regular prompt for now.");
         }
@@ -8938,15 +8989,15 @@ var init_swarm = __esm({
       description: `Run the prompt against ${DEFAULT_MODELS.length} models in parallel; synthesize.`,
       category: "swarm",
       handler: async (args2, context) => {
-        const prompt = args2.join(" ").trim();
-        if (!prompt) {
+        const prompt4 = args2.join(" ").trim();
+        if (!prompt4) {
           context.addMessage("system", "Usage: /swarm <prompt>");
           return;
         }
         const tasks = DEFAULT_MODELS.map((model, i) => ({
           id: `w${i + 1}`,
           name: `worker-${i + 1}`,
-          prompt,
+          prompt: prompt4,
           model
         }));
         const initialWorkers = tasks.map((t) => ({
@@ -9046,13 +9097,13 @@ var init_recipe = __esm({
           return;
         }
         const name = args2[0];
-        const prompt = args2.slice(1).join(" ").trim();
+        const prompt4 = args2.slice(1).join(" ").trim();
         const path2 = findRecipe(name, cwd);
         if (!path2) {
           context.addMessage("error", `Recipe '${name}' not found. Tried: ${RECIPE_DIRS.map((d) => `${d}/${name}{,_workflow}.{yaml,yml}`).join(", ")}`);
           return;
         }
-        if (!prompt) {
+        if (!prompt4) {
           context.addMessage("system", `Usage: /recipe ${name} <prompt>  (the prompt fills $SELECTION / $PROMPT in step templates)`);
           return;
         }
@@ -9086,7 +9137,7 @@ var init_recipe = __esm({
             const sysPrompt = String(params.system_prompt ?? "");
             const tpl = String(params.prompt_template ?? "$PROMPT");
             const model = String(params.model ?? context.getModel());
-            const rendered = renderTemplate(tpl, { prompt });
+            const rendered = renderTemplate(tpl, { prompt: prompt4 });
             context.addMessage("system", `${stepLabel}  (model: ${model})`);
             const fullPrompt = sysPrompt ? `[System: ${sysPrompt}]
 
@@ -9201,13 +9252,13 @@ var init_skill = __esm({
           return;
         }
         const ref = args2[0];
-        const prompt = args2.slice(1).join(" ").trim();
+        const prompt4 = args2.slice(1).join(" ").trim();
         const skill = findSkill(root, ref);
         if (!skill) {
           context.addMessage("error", `No skill matches '${ref}'. Run /skill (no args) for the list.`);
           return;
         }
-        if (!prompt) {
+        if (!prompt4) {
           context.addMessage("system", `Usage: /skill ${skill.domain}/${skill.name} <prompt>`);
           return;
         }
@@ -9224,7 +9275,7 @@ ${body.trim()}
 
 ---
 
-${prompt}`;
+${prompt4}`;
         if (context.runAgent) {
           context.addMessage("system", `Running /skill ${skill.domain}/${skill.name}...`);
           await context.runAgent(fullPrompt);
@@ -9694,7 +9745,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.19" : "(dev)";
+        const cliVersion = true ? "2.3.6-beta.20" : "(dev)";
         const coreVersion = true ? "2.3.2" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -9703,7 +9754,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:28:54.068Z";
+          const ts = "2026-05-28T18:54:30.369Z";
           if (ts && ts !== "__BUILD_TIMESTAMP__") {
             context.addMessage("system", row2("Build Timestamp", ts));
           }
@@ -10673,6 +10724,727 @@ var init_exec = __esm({
   }
 });
 
+// src/commands/billing/api.ts
+async function getAuthToken() {
+  if (process.env.MSAPLING_AUTH_TOKEN) return process.env.MSAPLING_AUTH_TOKEN;
+  try {
+    const { StorageManager: StorageManager3 } = await Promise.resolve().then(() => (init_src3(), src_exports2));
+    const sm = new StorageManager3();
+    return await sm.loadToken();
+  } catch {
+    return null;
+  }
+}
+function getBaseURL() {
+  return (process.env.MSAPLING_API_URL ?? "https://api.msapling.com").replace(/\/$/, "");
+}
+async function apiFetch(path2, opts = {}) {
+  const token = await getAuthToken();
+  const headers = {
+    "X-Surface": "cli",
+    "Content-Type": "application/json",
+    ...opts.headers
+  };
+  if (token) {
+    headers["Authorization"] = `Bearer ${token}`;
+  }
+  const body = opts.json !== void 0 ? JSON.stringify(opts.json) : opts.body;
+  return fetch(`${getBaseURL()}${path2}`, { ...opts, headers, body });
+}
+async function fetchBalance() {
+  const res = await apiFetch("/api/billing/balance");
+  if (!res.ok) throw new Error(`Balance fetch failed: ${res.status}`);
+  return res.json();
+}
+async function fetchFounderStatus() {
+  const res = await apiFetch("/api/billing/founder-status");
+  if (!res.ok) return { lifetime_total_spots: 50, lifetime_sold: 0, lifetime_spots_remaining: 50 };
+  return res.json();
+}
+async function postCheckout(payload) {
+  const res = await apiFetch("/api/billing/checkout", { method: "POST", json: payload });
+  if (!res.ok) {
+    const err = await res.json().catch(() => ({}));
+    throw new Error(err.detail ?? `Checkout failed: ${res.status}`);
+  }
+  return res.json();
+}
+async function fetchCheckoutStatus(token) {
+  const res = await apiFetch(`/api/billing/checkout/${token}/status`);
+  if (!res.ok) return { state: "expired" };
+  return res.json();
+}
+async function patchAutoTopup(payload) {
+  const res = await apiFetch("/api/billing/auto-topup", { method: "PATCH", json: payload });
+  if (!res.ok) throw new Error(`Auto-topup update failed: ${res.status}`);
+  return res.json();
+}
+async function postSubscriptionCancel() {
+  const res = await apiFetch("/subscription/cancel", { method: "POST" });
+  if (!res.ok) throw new Error(`Cancel failed: ${res.status}`);
+  return res.json();
+}
+async function fetchUserLookup(username) {
+  const res = await apiFetch(`/api/users/lookup?username=${encodeURIComponent(username)}`);
+  if (res.status === 404) return null;
+  if (!res.ok) throw new Error(`User lookup failed: ${res.status}`);
+  return res.json();
+}
+async function postGiftRedeem(code) {
+  const res = await apiFetch("/api/billing/gift/redeem", { method: "POST", json: { code } });
+  if (!res.ok) {
+    const err = await res.json().catch(() => ({}));
+    throw new Error(err.detail ?? `Redeem failed: ${res.status}`);
+  }
+  return res.json();
+}
+var init_api = __esm({
+  "src/commands/billing/api.ts"() {
+    "use strict";
+    init_esm_shims();
+  }
+});
+
+// src/commands/billing/format.ts
+function formatTier(tier) {
+  const map = {
+    free: "Free",
+    monthly: "Pro ($20/mo)",
+    lifetime: "Lifetime ($129 once, Founder)",
+    pro: "Pro"
+  };
+  return map[tier.toLowerCase()] ?? tier;
+}
+function formatUSD(amount) {
+  return `$${amount.toFixed(2)}`;
+}
+function formatCredits(amount) {
+  return `${amount.toFixed(4)} credits`;
+}
+function formatCreditsAsUSD(credits) {
+  return formatUSD(credits * CREDIT_RATE_USD);
+}
+function formatSubSummary(info) {
+  const tierLabel = formatTier(info.tier);
+  const creditsStr = formatCredits(info.fuel_credits);
+  const lines = [
+    `Tier:    ${tierLabel}`,
+    `Credits: ${creditsStr} (${formatCreditsAsUSD(info.fuel_credits)})`
+  ];
+  if (info.auto_topup.enabled) {
+    lines.push(
+      `Auto-topup: ON \u2014 tops up ${formatUSD(info.auto_topup.amount_usd)} when below ${formatUSD(info.auto_topup.threshold_usd)} (cap ${formatUSD(info.auto_topup.max_per_month_usd)}/mo)`
+    );
+  } else {
+    lines.push("Auto-topup: OFF");
+  }
+  return lines.join("\n");
+}
+var CREDIT_RATE_USD, TOPUP_MENU;
+var init_format = __esm({
+  "src/commands/billing/format.ts"() {
+    "use strict";
+    init_esm_shims();
+    CREDIT_RATE_USD = 1.556;
+    TOPUP_MENU = [
+      { key: "fuel_5", label: "5 credits  \u2014 $7.78" },
+      { key: "fuel_10", label: "10 credits \u2014 $15.56" }
+    ];
+  }
+});
+
+// src/commands/billing/open-browser.ts
+import { spawn as spawn10 } from "child_process";
+async function openBrowser(url) {
+  const platform4 = process.platform;
+  let cmd;
+  let args2;
+  if (platform4 === "win32") {
+    cmd = "cmd";
+    args2 = ["/c", "start", "", url];
+  } else if (platform4 === "darwin") {
+    cmd = "open";
+    args2 = [url];
+  } else {
+    cmd = "xdg-open";
+    args2 = [url];
+  }
+  return new Promise((resolve18) => {
+    try {
+      const child = spawn10(cmd, args2, { stdio: "ignore", detached: true });
+      child.unref();
+    } catch {
+    }
+    resolve18();
+  });
+}
+var init_open_browser = __esm({
+  "src/commands/billing/open-browser.ts"() {
+    "use strict";
+    init_esm_shims();
+  }
+});
+
+// src/commands/billing/checkout.ts
+async function runCheckout(opts) {
+  const surface = opts.surface ?? "cli";
+  const log = opts.onStatus ?? (() => {
+  });
+  log("Creating checkout session...");
+  const session = await postCheckout({
+    product: opts.product,
+    surface,
+    recipient: opts.recipient,
+    gift_method: opts.gift_method
+  });
+  log(`Opening browser: ${session.checkout_url}`);
+  await openBrowser(session.checkout_url);
+  log("Browser opened. Complete payment in the browser, then return here.");
+  log("Waiting for payment confirmation (up to 15 minutes)...");
+  const sseResult = await _watchViaSSE(session.checkout_token, log);
+  if (sseResult !== null) return sseResult;
+  return _watchViaPoll(session.checkout_token, log);
+}
+async function _watchViaSSE(token, log) {
+  try {
+    const res = await apiFetch(`/api/billing/checkout/${token}/watch`, {
+      headers: { Accept: "text/event-stream" }
+    });
+    if (!res.ok || !res.body) return null;
+    const reader = res.body.getReader();
+    const decoder = new TextDecoder();
+    const deadline = Date.now() + MAX_POLL_MS;
+    let buffer = "";
+    while (Date.now() < deadline) {
+      const { value, done } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        if (line.startsWith("data: ")) {
+          try {
+            const payload = JSON.parse(line.slice(6));
+            if (TERMINAL_STATES.has(payload.state)) {
+              return payload;
+            }
+          } catch {
+          }
+        }
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+async function _watchViaPoll(token, log) {
+  const deadline = Date.now() + MAX_POLL_MS;
+  while (Date.now() < deadline) {
+    await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
+    const status = await fetchCheckoutStatus(token);
+    if (TERMINAL_STATES.has(status.state)) {
+      return status;
+    }
+  }
+  return { state: "expired" };
+}
+var TERMINAL_STATES, POLL_INTERVAL_MS, MAX_POLL_MS;
+var init_checkout = __esm({
+  "src/commands/billing/checkout.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_api();
+    init_open_browser();
+    TERMINAL_STATES = /* @__PURE__ */ new Set(["completed", "cancelled", "expired"]);
+    POLL_INTERVAL_MS = 2e3;
+    MAX_POLL_MS = 14 * 60 * 1e3;
+  }
+});
+
+// src/commands/billing/sub.ts
+import * as readline from "readline";
+function prompt(rl, question) {
+  return new Promise((resolve18) => rl.question(question, resolve18));
+}
+async function runSub(argv) {
+  const subCmd = argv[0] ?? "";
+  if (subCmd === "upgrade") {
+    return runSubUpgrade(argv.slice(1));
+  }
+  if (subCmd === "manage") {
+    return runSubManage();
+  }
+  if (subCmd === "cancel") {
+    return runSubCancel();
+  }
+  try {
+    const balance = await fetchBalance();
+    console.log("\n--- MSapling Subscription ---");
+    console.log(formatSubSummary(balance));
+    console.log("");
+  } catch (e) {
+    console.error(`Error fetching subscription status: ${e.message}`);
+    process.exit(1);
+  }
+}
+async function runSubUpgrade(flags) {
+  const wantPro = flags.includes("--pro");
+  const wantLifetime = flags.includes("--lifetime");
+  let product;
+  if (wantPro) {
+    product = "monthly";
+  } else if (wantLifetime) {
+    product = "lifetime";
+  } else {
+    let founderRemaining = null;
+    try {
+      const fs3 = await fetchFounderStatus();
+      founderRemaining = fs3.lifetime_spots_remaining;
+    } catch {
+      founderRemaining = null;
+    }
+    console.log("\n--- Upgrade MSapling ---");
+    console.log("1) Pro \u2014 $20.00/month");
+    const lifetimeLabel = founderRemaining !== null ? `Lifetime \u2014 $129.00 one-time (${founderRemaining} founder spots remaining)` : "Lifetime \u2014 $129.00 one-time (50 founder spots)";
+    console.log(`2) ${lifetimeLabel}`);
+    console.log("0) Cancel");
+    console.log("");
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const choice = (await prompt(rl, "Select option: ")).trim();
+    rl.close();
+    if (choice === "1") {
+      product = "monthly";
+    } else if (choice === "2") {
+      product = "lifetime";
+    } else {
+      console.log("Upgrade cancelled.");
+      return;
+    }
+  }
+  console.log(`
+Starting checkout for ${product}...`);
+  try {
+    const result = await runCheckout({
+      product,
+      surface: "cli",
+      onStatus: (msg) => console.log(msg)
+    });
+    if (result.state === "completed") {
+      console.log(`
+Payment confirmed. Your plan has been upgraded to ${formatTier(product)}.`);
+    } else {
+      console.log(`
+Checkout ${result.state}. No charges were made.`);
+    }
+  } catch (e) {
+    console.error(`Checkout error: ${e.message}`);
+    process.exit(1);
+  }
+}
+async function runSubManage() {
+  console.log(
+    "\nCustomer Portal endpoint (/api/billing/portal) is not yet implemented.\nTo manage your subscription, visit: https://msapling.com/billing\n"
+  );
+}
+async function runSubCancel() {
+  try {
+    const balance = await fetchBalance();
+    if (!balance.is_pro && balance.tier !== "monthly") {
+      console.log("You are not on a Pro subscription. Nothing to cancel.");
+      return;
+    }
+    console.log(`
+Current plan: ${formatTier(balance.tier)}`);
+  } catch (e) {
+    console.error(`Error fetching subscription: ${e.message}`);
+    process.exit(1);
+  }
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const confirm1 = (await prompt(rl, "Are you sure you want to cancel? [y/N] ")).trim().toLowerCase();
+  if (confirm1 !== "y") {
+    rl.close();
+    console.log("Cancelled \u2014 no changes made.");
+    return;
+  }
+  const confirm2 = (await prompt(rl, "Type 'cancel' to confirm: ")).trim().toLowerCase();
+  rl.close();
+  if (confirm2 !== "cancel") {
+    console.log("Cancelled \u2014 no changes made.");
+    return;
+  }
+  try {
+    await postSubscriptionCancel();
+    console.log("\nSubscription cancelled. You retain access until the end of your billing period.");
+  } catch (e) {
+    console.error(`Cancel failed: ${e.message}`);
+    process.exit(1);
+  }
+}
+var init_sub = __esm({
+  "src/commands/billing/sub.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_api();
+    init_format();
+    init_checkout();
+  }
+});
+
+// src/commands/billing/topup.ts
+import * as readline2 from "readline";
+function prompt2(rl, question) {
+  return new Promise((resolve18) => rl.question(question, resolve18));
+}
+function promptDefault(rl, question, defaultVal) {
+  return new Promise(
+    (resolve18) => rl.question(`${question} [${defaultVal}]: `, (ans) => resolve18(ans.trim() || defaultVal))
+  );
+}
+async function runTopup(argv) {
+  const subCmd = argv[0] ?? "";
+  if (subCmd === "auto") {
+    return runTopupAuto();
+  }
+  console.log("\n--- MSapling Fuel Top-Up ---");
+  TOPUP_MENU.forEach((item, i) => console.log(`${i + 1}) ${item.label}`));
+  console.log("0) Cancel");
+  console.log("");
+  const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
+  const choice = (await prompt2(rl, "Select option: ")).trim();
+  rl.close();
+  const index = parseInt(choice, 10);
+  if (!index || index < 1 || index > TOPUP_MENU.length) {
+    console.log("Top-up cancelled.");
+    return;
+  }
+  const product = TOPUP_MENU[index - 1].key;
+  console.log(`
+Starting checkout for ${TOPUP_MENU[index - 1].label}...`);
+  try {
+    const result = await runCheckout({
+      product,
+      surface: "cli",
+      onStatus: (msg) => console.log(msg)
+    });
+    if (result.state === "completed") {
+      try {
+        const balance = await fetchBalance();
+        console.log(
+          `
+Payment confirmed. New balance: ${formatCredits(balance.fuel_credits)} (${formatUSD(
+            balance.fuel_credits
+          )}).`
+        );
+      } catch {
+        console.log("\nPayment confirmed. Run `msapling sub` to see updated balance.");
+      }
+    } else {
+      console.log(`
+Checkout ${result.state}. No charges were made.`);
+    }
+  } catch (e) {
+    console.error(`Checkout error: ${e.message}`);
+    process.exit(1);
+  }
+}
+async function runTopupAuto() {
+  let balance;
+  try {
+    balance = await fetchBalance();
+  } catch (e) {
+    console.error(`Error fetching settings: ${e.message}`);
+    process.exit(1);
+  }
+  const at = balance.auto_topup;
+  console.log("\n--- Auto-Topup Settings ---");
+  console.log(`Enabled:      ${at.enabled ? "yes" : "no"}`);
+  console.log(`Threshold:    ${formatUSD(at.threshold_usd)} (topup when below this)`);
+  console.log(`Amount:       ${formatUSD(at.amount_usd)} per topup`);
+  console.log(`Monthly cap:  ${formatUSD(at.max_per_month_usd)}`);
+  console.log("");
+  const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
+  const edit = (await prompt2(rl, "Edit settings? [y/N] ")).trim().toLowerCase();
+  if (edit !== "y") {
+    rl.close();
+    return;
+  }
+  const enabledStr = await promptDefault(rl, "Enable auto-topup? (yes/no)", at.enabled ? "yes" : "no");
+  const threshStr = await promptDefault(rl, "Threshold USD (min $1)", String(at.threshold_usd));
+  const amountStr = await promptDefault(rl, "Topup amount USD (min $5)", String(at.amount_usd));
+  const capStr = await promptDefault(rl, "Monthly cap USD (min $10)", String(at.max_per_month_usd));
+  rl.close();
+  const enabled = enabledStr.toLowerCase().startsWith("y") || enabledStr === "1";
+  const threshold = parseFloat(threshStr);
+  const amount = parseFloat(amountStr);
+  const cap = parseFloat(capStr);
+  if (isNaN(threshold) || isNaN(amount) || isNaN(cap)) {
+    console.error("Invalid values \u2014 no changes made.");
+    process.exit(1);
+  }
+  try {
+    await patchAutoTopup({
+      enabled,
+      threshold_usd: threshold,
+      amount_usd: amount,
+      monthly_cap_usd: cap
+    });
+    console.log("Auto-topup settings updated.");
+  } catch (e) {
+    console.error(`Update failed: ${e.message}`);
+    process.exit(1);
+  }
+}
+var init_topup = __esm({
+  "src/commands/billing/topup.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_api();
+    init_format();
+    init_checkout();
+  }
+});
+
+// src/commands/billing/redeem.ts
+var redeem_exports = {};
+__export(redeem_exports, {
+  runRedeem: () => runRedeem
+});
+async function runRedeem(argv) {
+  const code = (argv[0] ?? "").trim().toUpperCase();
+  if (!code) {
+    console.error("Usage: msapling gift redeem <code>  (e.g. MSAPL-GIFT-ABCD-EFGH)");
+    process.exit(1);
+  }
+  try {
+    const result = await postGiftRedeem(code);
+    if (result.applied) {
+      console.log(`Gift applied: ${result.message}`);
+    } else {
+      console.log(`Could not apply gift: ${result.message}`);
+    }
+  } catch (e) {
+    console.error(`Redeem failed: ${e.message}`);
+    process.exit(1);
+  }
+}
+var init_redeem = __esm({
+  "src/commands/billing/redeem.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_api();
+  }
+});
+
+// src/commands/billing/gift.ts
+import * as readline3 from "readline";
+function prompt3(rl, question) {
+  return new Promise((resolve18) => rl.question(question, resolve18));
+}
+async function runGift(argv) {
+  const subCmd = argv[0] ?? "";
+  if (subCmd === "sub") return runGiftSub(argv.slice(1));
+  if (subCmd === "credits") return runGiftCredits(argv.slice(1));
+  if (subCmd === "redeem") return runRedeem(argv.slice(1));
+  console.error("Usage: msapling gift sub <user> | credits <user> <5|10> | redeem <code>");
+  process.exit(1);
+}
+async function _resolveRecipient(username) {
+  const clean = username.replace(/^@/, "");
+  try {
+    const user = await fetchUserLookup(clean);
+    if (user === null) {
+      console.error(`User @${clean} not found.`);
+      process.exit(1);
+    }
+  } catch (e) {
+    console.error(`User lookup failed: ${e.message}`);
+    process.exit(1);
+  }
+  return clean;
+}
+async function _giftMethodMenu() {
+  console.log("\n1) Direct \u2014 applied to recipient immediately after payment");
+  console.log("2) Redeemable code \u2014 90-day expiry, share anywhere");
+  console.log("");
+  const rl = readline3.createInterface({ input: process.stdin, output: process.stdout });
+  const choice = (await prompt3(rl, "Select gift method: ")).trim();
+  rl.close();
+  if (choice === "1") return "direct";
+  if (choice === "2") return "code";
+  console.error("Invalid choice.");
+  process.exit(1);
+}
+async function runGiftSub(argv) {
+  const usernameRaw = argv[0] ?? "";
+  if (!usernameRaw) {
+    console.error("Usage: msapling gift sub <username|@username>");
+    process.exit(1);
+  }
+  const recipient = await _resolveRecipient(usernameRaw);
+  console.log(`
+Gifting Pro subscription to @${recipient}`);
+  const giftMethod = await _giftMethodMenu();
+  try {
+    const result = await runCheckout({
+      product: "gift_monthly",
+      surface: "cli",
+      recipient,
+      gift_method: giftMethod,
+      onStatus: (msg) => console.log(msg)
+    });
+    if (result.state === "completed") {
+      if (giftMethod === "direct") {
+        console.log(`
+Gifted to @${recipient}. They will see the upgrade on next login.`);
+      } else {
+        const code = result.gift_code;
+        if (code) {
+          console.log(`
+Gift code generated:`);
+          console.log(`
+  ${code}
+`);
+          console.log(`Share this code with @${recipient}. It expires in 90 days.`);
+          console.log(`They can redeem it with: msapling gift redeem ${code}`);
+        } else {
+          console.log(`
+Payment confirmed. Gift code will be emailed to you shortly.`);
+        }
+      }
+    } else {
+      console.log(`
+Checkout ${result.state}. No charges were made.`);
+    }
+  } catch (e) {
+    console.error(`Gift checkout error: ${e.message}`);
+    process.exit(1);
+  }
+}
+async function runGiftCredits(argv) {
+  const usernameRaw = argv[0] ?? "";
+  const countStr = argv[1] ?? "";
+  if (!usernameRaw || !countStr) {
+    console.error("Usage: msapling gift credits <username|@username> <5|10>");
+    process.exit(1);
+  }
+  const count = parseInt(countStr, 10);
+  if (count !== 5 && count !== 10) {
+    console.error("Credit amount must be 5 or 10.");
+    process.exit(1);
+  }
+  const recipient = await _resolveRecipient(usernameRaw);
+  const product = `gift_fuel_${count}`;
+  const priceLabel = count === 5 ? "$7.78" : "$15.56";
+  console.log(`
+Gifting ${count} credits (${priceLabel}) to @${recipient}`);
+  const giftMethod = await _giftMethodMenu();
+  try {
+    const result = await runCheckout({
+      product,
+      surface: "cli",
+      recipient,
+      gift_method: giftMethod,
+      onStatus: (msg) => console.log(msg)
+    });
+    if (result.state === "completed") {
+      if (giftMethod === "direct") {
+        console.log(`
+${count} credits gifted to @${recipient}.`);
+      } else {
+        const code = result.gift_code;
+        if (code) {
+          console.log(`
+Gift code generated:`);
+          console.log(`
+  ${code}
+`);
+          console.log(`Share this code with @${recipient}. It expires in 90 days.`);
+          console.log(`They can redeem it with: msapling gift redeem ${code}`);
+        } else {
+          console.log(`
+Payment confirmed. Gift code will be emailed to you shortly.`);
+        }
+      }
+    } else {
+      console.log(`
+Checkout ${result.state}. No charges were made.`);
+    }
+  } catch (e) {
+    console.error(`Gift checkout error: ${e.message}`);
+    process.exit(1);
+  }
+}
+var init_gift = __esm({
+  "src/commands/billing/gift.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_api();
+    init_checkout();
+    init_redeem();
+  }
+});
+
+// src/commands/billing/index.ts
+var billing_exports = {};
+__export(billing_exports, {
+  dispatchBillingCommand: () => dispatchBillingCommand,
+  printBillingHelp: () => printBillingHelp
+});
+async function dispatchBillingCommand(cmd, argv) {
+  switch (cmd) {
+    case "sub":
+      return runSub(argv);
+    case "topup":
+      return runTopup(argv);
+    case "gift":
+      return runGift(argv);
+    default: {
+      const _exhaustive = cmd;
+      console.error(`Unknown billing command: ${_exhaustive}`);
+      process.exit(1);
+    }
+  }
+}
+function printBillingHelp() {
+  const lines = [
+    "",
+    "MSapling Billing Commands",
+    "",
+    "  msapling sub                   Show current tier and credits balance",
+    "  msapling sub upgrade            Interactive upgrade menu (Pro / Lifetime)",
+    "  msapling sub upgrade --pro      Upgrade to Pro directly ($20/mo)",
+    "  msapling sub upgrade --lifetime Upgrade to Lifetime directly ($129)",
+    "  msapling sub manage             Open Stripe Customer Portal in browser",
+    "  msapling sub cancel             Cancel Pro subscription (double confirm)",
+    "",
+    "  msapling topup                  Buy fuel credits (5 or 10)",
+    "  msapling topup auto             View/edit auto-topup settings",
+    "",
+    "  msapling gift sub <user>        Gift a Pro subscription to @user",
+    "  msapling gift credits <user> <5|10>  Gift credits to @user",
+    "  msapling gift redeem <code>     Redeem a gift code (MSAPL-GIFT-XXXX-XXXX)",
+    "",
+    "Pricing:",
+    "  Pro:          $20.00/month",
+    "  Lifetime:     $129.00 one-time (50 founder spots)",
+    "  5 credits:    $7.78",
+    "  10 credits:   $15.56",
+    "  1 credit  =   $1.556",
+    ""
+  ];
+  console.log(lines.join("\n"));
+}
+var init_billing = __esm({
+  "src/commands/billing/index.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_sub();
+    init_topup();
+    init_gift();
+  }
+});
+
 // src/runtime/doctorRedact.ts
 function redactSecrets(text) {
   let out = text;
@@ -12234,7 +13006,7 @@ var init_registry_merger = __esm({
 });
 
 // ../core/src/mcp/local_tools.ts
-import { spawn as spawn10 } from "child_process";
+import { spawn as spawn11 } from "child_process";
 import { readdir as readdir4, stat as stat4, realpath as realpath2 } from "fs/promises";
 import { resolve as resolve16 } from "path";
 function asResult(text, isError = false) {
@@ -12248,7 +13020,7 @@ async function runCommand(command, cwd) {
       resolve18({ stdout: "", stderr: "Command timed out after 30s", exit_code: -1 });
     }, 3e4);
     try {
-      p = spawn10("sh", ["-c", command], {
+      p = spawn11("sh", ["-c", command], {
         cwd: cwd || process.cwd(),
         stdio: ["ignore", "pipe", "pipe"],
         timeout: 3e4
@@ -13371,7 +14143,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.19"
+    "2.3.6-beta.20"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });
@@ -13752,7 +14524,7 @@ function formatContextBudgetLabel(snap) {
 init_esm_shims();
 function createIdleAwarePoll(pollingIntervalRef, lastActivityRef, client, setUser) {
   const IDLE_THRESHOLD_MS = 5 * 60 * 1e3;
-  const POLL_INTERVAL_MS = 3e4;
+  const POLL_INTERVAL_MS2 = 3e4;
   if (pollingIntervalRef.current !== null) return;
   pollingIntervalRef.current = setInterval(async () => {
     const timeSinceActivity = Date.now() - lastActivityRef.current;
@@ -13768,7 +14540,7 @@ function createIdleAwarePoll(pollingIntervalRef, lastActivityRef, client, setUse
       setUser(liveUser);
     } catch (e) {
     }
-  }, POLL_INTERVAL_MS);
+  }, POLL_INTERVAL_MS2);
 }
 
 // src/state/commandHandler.ts
@@ -13810,7 +14582,7 @@ function buildHandleCommand(ctx) {
           setSwarmWorkers: ctx.setSwarmWorkers,
           getPlan: ctx.getPlan,
           setPlan: ctx.setPlan,
-          runAgent: async (prompt) => {
+          runAgent: async (prompt4) => {
             ctx.setIsRunning(true);
             let chatId = ctx.activeChatId;
             if (!chatId) {
@@ -13820,7 +14592,7 @@ function buildHandleCommand(ctx) {
             const plan = ctx.getPlan();
             const finalPrompt = plan && plan.length > 0 ? `${buildPlanPrefix(plan)}
 
-${prompt}` : prompt;
+${prompt4}` : prompt4;
             try {
               const usage = await ctx.agent.runWorkerTurn(chatId, finalPrompt, ctx.activeModel, (chunk) => {
                 ctx.updateAssistantMessage(chunk);
@@ -14301,6 +15073,10 @@ function handleCliArgs(args2) {
     console.log("       msapling mcp serve        run as MCP stdio server (Claude Code / Cursor / Windsurf integration)");
     console.log("       msapling doctor           run diagnostic health checks");
     console.log("       msapling doctor --debug   run doctor with full environment dump");
+    console.log("       msapling sub              subscription & tier management (sub upgrade|manage|cancel)");
+    console.log("       msapling topup            buy fuel credits (5 or 10) or configure auto-topup");
+    console.log("       msapling gift             gift Pro / credits to another user, or redeem a code");
+    console.log("       msapling redeem <code>    redeem a gift code (alias for `msapling gift redeem`)");
     console.log("       msapling --version        print version and exit");
     console.log("       msapling --help           print this message");
     console.log("Inside the REPL: type /help for slash-command help.");
@@ -14316,6 +15092,30 @@ function handleCliArgs(args2) {
       process.exit(exitCode);
     })().catch((e) => {
       process.stderr.write(`[msapling-exec] fatal: ${e?.message ?? e}
+`);
+      process.exit(1);
+    });
+    return false;
+  }
+  if (args2[0] === "sub" || args2[0] === "topup" || args2[0] === "gift") {
+    (async () => {
+      const { dispatchBillingCommand: dispatchBillingCommand2 } = await Promise.resolve().then(() => (init_billing(), billing_exports));
+      await dispatchBillingCommand2(args2[0], args2.slice(1));
+      process.exit(0);
+    })().catch((e) => {
+      process.stderr.write(`[msapling-billing] fatal: ${e?.message ?? e}
+`);
+      process.exit(1);
+    });
+    return false;
+  }
+  if (args2[0] === "redeem") {
+    (async () => {
+      const { runRedeem: runRedeem2 } = await Promise.resolve().then(() => (init_redeem(), redeem_exports));
+      await runRedeem2(args2.slice(1));
+      process.exit(0);
+    })().catch((e) => {
+      process.stderr.write(`[msapling-billing] fatal: ${e?.message ?? e}
 `);
       process.exit(1);
     });

package/package.json

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