@nomac/cli 0.5.2 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomac/cli",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Cloud Mac sessions over SSH and HTTPS, plus iOS builds and publishing — built for agents.",
   "license": "UNLICENSED",
   "type": "module",

package/src/api.mjs

@@ -1,4 +1,5 @@
 import { loadApiKey, loadApiUrl } from "./config.mjs";
+import { clientHeaders } from "./client-info.mjs";
 
 export class CliError extends Error {
   constructor(message, friendly, status, code, details) {
@@ -16,7 +17,7 @@ export async function apiPublic(method, path, body) {
   const url = `${loadApiUrl()}${path}`;
   const res = await fetch(url, {
     method,
-    headers: body !== undefined ? { "content-type": "application/json" } : {},
+    headers: { ...clientHeaders(), ...(body !== undefined ? { "content-type": "application/json" } : {}) },
     body: body !== undefined ? JSON.stringify(body) : undefined,
   });
   const text = await res.text();
@@ -41,6 +42,7 @@ export async function api(method, path, { body, raw, idempotencyKey } = {}) {
   const res = await fetch(url, {
     method,
     headers: {
+      ...clientHeaders(),
       authorization: `Bearer ${key}`,
       ...(raw
         ? { "content-type": "application/gzip" }

package/src/client-info.mjs

@@ -0,0 +1,33 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+import { readFileSync } from "node:fs";
+
+/**
+ * How requests identify this CLI to nomac.app for product analytics: version,
+ * OS and, under `nomac mcp`, the agent and tool making the call. No hostnames,
+ * paths or arguments.
+ */
+export const CLI_VERSION = (() => {
+  try { return JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version; } catch { return "0.0.0"; }
+})();
+export const USER_AGENT = `nomac-cli/${CLI_VERSION} (${process.platform}; node ${process.versions.node})`;
+
+/** Set by the stdio MCP server: the connected agent (from initialize) and the running tool. */
+export const mcpContext = { client: undefined };
+export const toolScope = new AsyncLocalStorage();
+
+export function clientHeaders() {
+  const tool = toolScope.getStore()?.tool;
+  return {
+    "user-agent": USER_AGENT,
+    ...(mcpContext.client ? { "x-nomac-mcp-client": mcpContext.client } : {}),
+    ...(tool ? { "x-nomac-tool": tool } : {}),
+  };
+}
+
+/** "claude-code/2.1.4" from an MCP clientInfo, or undefined. */
+export function mcpClientName(info) {
+  const name = typeof info?.name === "string" ? info.name.toLowerCase().replace(/[^a-z0-9._+-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) : "";
+  if (!name) return undefined;
+  const version = typeof info?.version === "string" ? /^\d{1,4}(\.\d{1,6}){0,3}/.exec(info.version)?.[0] : undefined;
+  return version ? `${name}/${version}` : name;
+}

package/src/mac-credits.mjs

@@ -9,6 +9,7 @@ const HELP = `nomac credits [--json]
 nomac credits buy [--packs N] [--open] [--request-key KEY] [--json]
   Get a payment link for the human. $10 packs, 1 to 10 per purchase;
   each pack is 12.5 hours. $0.80 an hour, billed by the minute, never expires.
+  Bigger purchases earn bonus credit: +5% from $30, +10% from $50, +20% at $100.
   --open opens the link in this machine's browser (default when run by a person).
   Reuse --request-key after a lost response; a new key is a new purchase.
 
@@ -17,6 +18,8 @@ browser tab that opened (or give them the printed link), then poll
 \`nomac credits --json\` until spendable_seconds covers the work.`;
 
 const usd = microunits => `$${(Number(microunits) / 1_000_000).toFixed(2)}`;
+const money = dollars => `$${Number.isInteger(dollars) ? dollars : dollars.toFixed(2)}`;
+const hours = value => `${Number(Number(value).toFixed(1))} hours`;
 const clock = seconds => {
   const minutes = Math.floor(seconds / 60);
   return minutes < 60 ? `${minutes}m` : `${Math.floor(minutes / 60)}h ${String(minutes % 60).padStart(2, "0")}m`;
@@ -64,7 +67,10 @@ export async function creditsCommand(argv, { request = api, print = console.log,
   if (values.json) return print(JSON.stringify({ ...result, opened_in_browser: opened }, null, 2));
   if (result.action !== "open_checkout_url") return print(`${result.message}\nrequest key: ${result.request_key}`);
   return print([
-    `${packs} × $10 = $${result.amount_usd} for ${result.credit_hours} hours of Mac time.`,
+    result.bonus_usd > 0
+      ? `${packs} × $10 = $${result.amount_usd} for ${money(result.credit_usd)} of credit, including a +${result.bonus_percent}% bonus (${hours(result.credit_hours)} of Mac time).`
+      : `${packs} × $10 = $${result.amount_usd} for ${hours(result.credit_hours)} of Mac time.`,
+    ...(result.next_bonus && result.next_bonus.packs - packs === 1 ? [`Tip: ${result.next_bonus.packs} packs ($${result.next_bonus.packs * 10}) earn a +${result.next_bonus.bonus_percent}% bonus.`] : []),
     opened ? "Opened the payment page in your browser. Pay there to add the credit." : "Open this link to pay:",
     result.url,
     `Credit appears within a minute of payment; check with \`nomac credits\`. Request key (reuse if this response was lost): ${result.request_key}`,

package/src/mac-tools.mjs

@@ -7,12 +7,12 @@ const key = { type: "string", pattern: "^[A-Za-z0-9_.:-]{8,128}$" };
 const schema = (properties, required = []) => ({ type: "object", properties, required, additionalProperties: false });
 const base = args => `/api/v1/mac/sessions/${encodeURIComponent(args.session_id)}`;
 export const MAC_TOOLS = [
-  { name: "get_mac_checkout", description: "Get a payment link for Mac credit and open it in the human's browser on this machine. Credit is $0.80 an hour, billed by the minute, sold in $10 packs (12.5 hours each), 1 to 10 packs per purchase, and never expires. Call this when get_mac_credits shows too little credit or start_mac returns insufficient_credit. Then tell the human a payment page opened (or give them the returned url if opened_in_browser is false) and ask them to pay. Never enter payment details yourself. Poll get_mac_credits until the balance appears, then start the Mac. Reuse request_key after a lost response; a new key is a new purchase.", inputSchema: schema({ packs: { type: "integer", minimum: 1, maximum: 10, default: 1, description: "Number of $10 packs, 1-10. Pick from the human's budget or expected hours." }, open: { type: "boolean", default: true, description: "Open the link in this machine's browser." }, request_key: key }, ["request_key"]), handler: async ({ packs = 1, open = true, request_key }) => {
+  { name: "get_mac_checkout", description: "Get a payment link for Mac credit and open it in the human's browser on this machine. Credit is $0.80 an hour, billed by the minute, sold in $10 packs (12.5 hours each), 1 to 10 packs per purchase, and never expires. Bigger purchases earn bonus credit: +5% from 3 packs ($30), +10% from 5 ($50), +20% at 10 ($100 buys $120, 150 hours). When the human expects ongoing use, offer a choice, for example $10 (12.5 hours) or $50 (+10%, about 69 hours), and let them decide. Call this when get_mac_credits shows too little credit or start_mac returns insufficient_credit. Then tell the human a payment page opened (or give them the returned url if opened_in_browser is false) and ask them to pay. Never enter payment details yourself. Poll get_mac_credits until the balance appears, then start the Mac. Reuse request_key after a lost response; a new key is a new purchase.", inputSchema: schema({ packs: { type: "integer", minimum: 1, maximum: 10, default: 1, description: "Number of $10 packs, 1-10. Pick from the human's budget or expected hours; 3+ packs earn bonus credit." }, open: { type: "boolean", default: true, description: "Open the link in this machine's browser." }, request_key: key }, ["request_key"]), handler: async ({ packs = 1, open = true, request_key }) => {
     const result = await api("POST", "/api/v1/mac/credits/checkout", { body: { packs }, idempotencyKey: request_key });
     const opened = open && result.action === "open_checkout_url" && result.url ? openUrl(result.url) : false;
     return text({ ...result, opened_in_browser: opened });
   } },
-  { name: "get_mac_credits", description: "Read the prepaid Mac credit balance: spendable dollars, spendable_seconds (how long a Mac can run on it), amounts held by a running session, pricing and recent purchases. Credit never expires. If spendable_seconds is below what the task needs, call get_mac_checkout.", inputSchema: schema({}), handler: async () => text(await api("GET", "/api/v1/mac/credits")) },
+  { name: "get_mac_credits", description: "Read the prepaid Mac credit balance: spendable dollars, spendable_seconds (how long a Mac can run on it), amounts held by a running session, pricing (including bonus_tiers for bigger purchases) and recent purchases. Credit never expires. If spendable_seconds is below what the task needs, call get_mac_checkout.", inputSchema: schema({}), handler: async () => text(await api("GET", "/api/v1/mac/credits")) },
   { name: "start_mac", description: "Allocate a full cloud Mac VM, billed from prepaid credit at $0.80 an hour by the minute. If it returns insufficient_credit, call get_mac_checkout, have the human pay, then retry with the same request_key. Supply a stable request_key; SSH public_key is optional for HTTPS-only agents; reuse both after a lost response. Inspect the returned offer and limits. Poll get_mac_session until ready. No project pipeline is imposed; stop_mac deletes the VM and files.", inputSchema: schema({ public_key: { type: "string" }, request_key: key, limits: { type: "object", properties: { max_duration_seconds: { type: "integer", minimum: 60, maximum: 28800 }, idle_timeout_seconds: { type: "integer", minimum: 60, maximum: 3600 }, spend_cap_microunits: { type: "string", pattern: "^[1-9][0-9]{0,17}$" } }, additionalProperties: false } }, ["request_key"]), handler: async ({ request_key, ...body }) => text(await api("POST", "/api/v1/mac/sessions", { body, idempotencyKey: request_key })) },
   { name: "list_mac_sessions", description: "Find existing Mac sessions, including after losing a response. Shows state, cost, limits and cleanup.", inputSchema: schema({}), handler: async () => text(await api("GET", "/api/v1/mac/sessions")) },
   { name: "get_mac_session", description: "Read live Mac allocation state, cost, funded time and cleanup confirmation. queued/provisioning means wait; stopping is not yet confirmed cleanup.", inputSchema: schema({ session_id: session }, ["session_id"]), handler: async args => text(await api("GET", base(args))) },

package/src/mac-transport.mjs

@@ -4,6 +4,7 @@ import { HttpsProxyAgent } from "https-proxy-agent";
 import { getProxyForUrl } from "proxy-from-env";
 import WebSocket, { createWebSocketStream } from "ws";
 import { CliError } from "./api.mjs";
+import { clientHeaders } from "./client-info.mjs";
 
 export function sessionId(value) {
   const id = String(value ?? "").replace(/^nomac-/, "");
@@ -60,6 +61,7 @@ function macRequestOnce(method, path, { body, raw, requestKey, ...options } = {}
     };
     const request = (target.protocol === "https:" ? https : http).request(target, {
       method, agent, ca, headers: {
+        ...clientHeaders(),
         authorization: `Bearer ${token}`,
         ...(payload ? { "content-type": raw ? "application/octet-stream" : "application/json", "content-length": payload.length } : {}),
         ...(requestKey ? { "idempotency-key": requestKey } : {}),
@@ -99,7 +101,7 @@ export function tunnel(value, { input = process.stdin, output = process.stdout,
   url.protocol = url.protocol === "https:" ? "wss:" : "ws:";
   return new Promise((resolve, reject) => {
     const ws = new WebSocket(url, {
-      agent, ca, headers: { authorization: `Bearer ${token}` },
+      agent, ca, headers: { ...clientHeaders(), authorization: `Bearer ${token}` },
       handshakeTimeout: 15_000, perMessageDeflate: false, maxPayload: 1024 * 1024,
       followRedirects: false,
     });

package/src/mcp.mjs

@@ -7,6 +7,7 @@ import { readFileSync } from "node:fs";
 const lifecycleSchemas = JSON.parse(readFileSync(new URL("./lifecycle-schemas.json", import.meta.url), "utf8"));
 import { createInterface } from "node:readline";
 import { api } from "./api.mjs";
+import { mcpClientName, mcpContext, toolScope } from "./client-info.mjs";
 import { loadProjectState, saveProjectState } from "./config.mjs";
 import { packTarball } from "./pack.mjs";
 import { uploadSourceSnapshot } from "./upload.mjs";
@@ -401,6 +402,7 @@ export async function runMcpServer() {
     try {
       switch (method) {
         case "initialize":
+          mcpContext.client = mcpClientName(params?.clientInfo);
           reply({
             protocolVersion: params?.protocolVersion ?? PROTOCOL_FALLBACK,
             capabilities: { tools: {} },
@@ -422,7 +424,7 @@ export async function runMcpServer() {
           const tool = TOOLS.find((t) => t.name === params?.name);
           if (!tool) return fail(-32602, `unknown tool: ${params?.name}`);
           try {
-            reply(await tool.handler(params?.arguments ?? {}));
+            reply(await toolScope.run({ tool: tool.name }, () => tool.handler(params?.arguments ?? {})));
           } catch (err) {
             reply({
               content: [{ type: "text", text: err?.details ? JSON.stringify({ error: { ...err.details, message: err.friendly ?? err.message } }, null, 2) : err?.friendly ?? err?.message ?? String(err) }],