@nomac/cli 0.4.0 → 0.5.0

package/package.json

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

package/skill/SKILL.md

@@ -10,13 +10,17 @@ description: >
 # nomac — a Mac for your agent
 
 NoMac 2.0 provides a full macOS VM with administrator access. You choose the
-commands and tools. A weekly Mac subscription is separate from Builder.
+commands and tools. Mac time is prepaid credit, separate from Builder.
 
 ## Cloud Mac setup and workflow
 
-1. Sign in at https://nomac.app/mac. The human chooses $5/week for 5 hours
-   or $20/week for 25 hours. Verify with `get_mac_credits`; a checkout URL
-   is not a payment. No Apple Developer account is needed for an unsigned build.
+1. Check credit with `nomac credits --json` or `get_mac_credits`. Mac time is
+   $0.80 an hour, billed by the minute; $10 buys 12.5 hours; credit never
+   expires. Too little? Run `nomac credits buy --packs N --open` or call
+   `get_mac_checkout` (packs 1-10). Tell the human a payment page opened, or
+   give them the printed link, and ask them to pay. Never enter payment
+   details yourself. Poll credits until the balance appears; a checkout URL is
+   not a payment. No Apple Developer account is needed for an unsigned build.
 2. Install `npm install -g @nomac/cli`, run `nomac login`, and give the human
    the printed device URL and code. MCP: `claude mcp add nomac -- npx @nomac/cli mcp`.
    Hosted MCP: https://mcp.nomac.app/mcp with `Authorization: Bearer <nmk_key>`.
@@ -29,7 +33,9 @@ commands and tools. A weekly Mac subscription is separate from Builder.
 
 Stopping deletes files and logs. Download before stopping. SSH disconnects
 do not stop the session. Ready time includes idle time; queue/setup are free.
-Unused hours expire weekly. One session at a time; no automatic overage.
+One-minute minimum, then by the minute. One session at a time; no overage.
+If start returns `insufficient_credit`, buy credit as in step 1, then retry
+with the same request key.
 Keep the same request key and arguments after uncertain responses; inspect
 the original job before retrying. Output retrieval failure is not job failure.
 Managed jobs have a 600-second limit; SSH can run longer within session limits.

package/src/cli.mjs

@@ -7,7 +7,8 @@ import { uploadSourceSnapshot } from "./upload.mjs";
 const HELP = `nomac — Mac workspaces for agents / iOS app publishing
 
 Nomac 2.0 cloud Macs:
-  nomac credits               weekly hours and plan checkout
+  nomac credits               Mac credit left ($0.80/hour, by the minute)
+  nomac credits buy --packs N  payment link for $10 packs, opened in the browser
   nomac start                 allocate or reconnect to your Mac
   nomac exec --request-key KEY -- command args
   nomac job JOB_ID             inspect a submitted command

package/src/hosted-sessions.mjs

@@ -22,8 +22,9 @@ const HELP = `Nomac cloud Mac sessions
 
 Login once with nomac login. The CLI creates a local SSH key; it sends only the
 public key. Sessions use the port-443 gateway and verified guest host keys.
-Time continues while the VM is ready, including between commands. Inspect the
-returned offer and limits. Stop removes the VM and its files; pull first.
+Credit is used at $0.80 an hour, billed by the minute, while the VM is ready,
+including between commands. Sessions run 2 hours by default (--max-duration,
+up to 8 hours) and spend at most $5 (--max-cost). No credit? nomac credits buy. Stop removes the VM and its files; pull first.
 A wait timeout leaves the session attached: inspect status or run stop.
 Use nomac start --host user@mac to connect an existing Mac instead.`;
 const options = {
@@ -49,7 +50,7 @@ const validRequestKey = value => typeof value === "string" && /^[A-Za-z0-9_.:-]{
 // Only explicit pre-allocation rejections permit a fresh intent. A timeout,
 // unreadable response or idempotency conflict may still own a real session.
 const startRejections = new Set(["invalid_request", "invalid_public_key", "profile_unavailable", "session_cap_too_low",
-  "weekly_time_unavailable", "weekly_time_expired", "insufficient_compute_credit", "compute_account_blocked",
+  "weekly_time_unavailable", "weekly_time_expired", "insufficient_compute_credit", "insufficient_credit", "compute_account_blocked",
   "session_limit_reached", "organization_not_found", "compute_unavailable", "unauthenticated", "invalid_origin"]);
 export async function sessionAccess(id, request = api) {
   sessionId(id);
@@ -75,7 +76,7 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
     const billing = result.session?.billing;
     const usage = billing?.mode === "weekly_included"
       ? `Included time used: ${billing.used_seconds} seconds. No extra charge.`
-      : `Cost: ${JSON.stringify(result.session?.cost)}`;
+      : `Cost so far: $${(Number(result.session?.cost?.accrued_microunits ?? 0) / 1_000_000).toFixed(2)} ($0.80/hour, billed by the minute while the Mac is ready). Credit left: nomac credits`;
     print(values.json || !["start", "stop"].includes(command) ? JSON.stringify(result, null, 2) : `${result.session.id}: ${result.session.state}\n${result.session.state === "ready" ? "Next: nomac sync . → nomac ssh" : "Check: nomac session status --json"}\n${usage}`);
     return result;
   };
@@ -131,7 +132,7 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
       if (positionals.length) throw new CliError("Usage: nomac start [--wait SECONDS] [--json]");
       let local = store.load();
       if (local && local.mode !== "hosted") throw new CliError("An existing Mac workspace is attached.");
-      const limits = { max_duration_seconds: integer(values["max-duration"], 7200, 60, 86400), idle_timeout_seconds: integer(values["idle-timeout"], 600, 60, 3600), spend_cap_microunits: budget(values["max-cost"]) };
+      const limits = { max_duration_seconds: integer(values["max-duration"], 7200, 60, 28800), idle_timeout_seconds: integer(values["idle-timeout"], 600, 60, 3600), spend_cap_microunits: budget(values["max-cost"]) };
       // Older CLIs persisted invalid keys before contacting the API. Such a key
       // cannot pass server validation and therefore cannot have allocated a VM.
       if (local && !local.id && !validRequestKey(local.requestKey)) { local.state = "failed"; store.save(local); }

package/src/mac-credits.mjs

@@ -1,10 +1,72 @@
 import { parseArgs } from "node:util";
+import { spawn } from "node:child_process";
+import { randomUUID } from "node:crypto";
 import { api, CliError } from "./api.mjs";
-export async function creditsCommand(argv, { request = api, print = console.log } = {}) {
-  const { values, positionals } = parseArgs({ args: argv, options: { plan: { type: "string" }, "request-key": { type: "string" }, json: { type: "boolean" }, help: { type: "boolean" } }, allowPositionals: true });
-  if (values.help) return print("nomac credits [--json]\nnomac credits --plan five|twenty_five --request-key STABLE_KEY\n$5/week for 5 hours or $20/week for 25 hours. Unused hours expire weekly.\nReturns a subscription checkout link; the human reviews and pays. Reuse the key after a lost response.");
-  if (positionals.length) throw new CliError("Unexpected credits argument.");
-  if (!values.plan) return print(JSON.stringify(await request("GET", "/api/v1/mac/credits"), null, 2));
-  if (!["five", "twenty_five"].includes(values.plan) || !/^[A-Za-z0-9_.:-]{8,128}$/.test(values["request-key"] ?? "")) throw new CliError("Choose --plan five or twenty_five and supply a stable --request-key.");
-  return print(JSON.stringify(await request("POST", "/api/v1/mac/credits/checkout", { idempotencyKey: values["request-key"], body: { plan: values.plan } }), null, 2));
+
+const HELP = `nomac credits [--json]
+  Show your Mac credit: dollars left and how long a Mac can run on it.
+
+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.
+  --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.
+
+Agents: run \`nomac credits buy --packs N --open\`, tell the human to pay in the
+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 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`;
+};
+
+/** Best effort: an agent without a desktop still has the printed link. */
+export function openUrl(url, { platform = process.platform, run = spawn } = {}) {
+  const [command, args] = platform === "darwin" ? ["open", [url]] : platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
+  try {
+    const child = run(command, args, { stdio: "ignore", detached: true });
+    child.on?.("error", () => {});
+    child.unref?.();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function creditsCommand(argv, { request = api, print = console.log, open = openUrl, interactive = Boolean(process.stdout.isTTY) } = {}) {
+  const { values, positionals } = parseArgs({ args: argv, allowPositionals: true, options: {
+    packs: { type: "string" }, plan: { type: "string" }, open: { type: "boolean" }, "no-open": { type: "boolean" },
+    "request-key": { type: "string" }, json: { type: "boolean" }, help: { type: "boolean" } } });
+  if (values.help) return print(HELP);
+  // `--plan` is the retired weekly-plan spelling; it now buys one pack.
+  const buying = positionals[0] === "buy" || values.plan !== undefined || values.packs !== undefined;
+  if (positionals.length > (positionals[0] === "buy" ? 1 : 0)) throw new CliError("Unexpected credits argument. Use `nomac credits` or `nomac credits buy --packs N`.");
+
+  if (!buying) {
+    const { credits, purchases } = await request("GET", "/api/v1/mac/credits");
+    if (values.json) return print(JSON.stringify({ credits, purchases }, null, 2));
+    const lines = [`Mac credit: ${usd(credits.spendable_microunits)} (${clock(credits.spendable_seconds)} of Mac time at $0.80/hour, billed by the minute)`];
+    if (BigInt(credits.reserved_microunits) > 0n) lines.push(`Held for a running session: ${usd(credits.reserved_microunits)}`);
+    if (credits.spending_blocked) lines.push("Mac usage is paused. Contact support@nomac.app.");
+    else if (credits.spendable_seconds < 60) lines.push("No credit left. Buy some: nomac credits buy --packs 1");
+    return print(lines.join("\n"));
+  }
+
+  const packs = values.packs === undefined ? 1 : Number(values.packs);
+  if (!Number.isInteger(packs) || packs < 1 || packs > 10) throw new CliError("--packs must be a whole number from 1 to 10 ($10 each).");
+  const key = values["request-key"] ?? `cli-${randomUUID()}`;
+  if (!/^[A-Za-z0-9_.:-]{8,128}$/.test(key)) throw new CliError("--request-key must be 8-128 letters, digits or . _ : -");
+  const result = await request("POST", "/api/v1/mac/credits/checkout", { idempotencyKey: key, body: { packs } });
+  const shouldOpen = result.action === "open_checkout_url" && result.url && !values["no-open"] && (values.open || interactive);
+  const opened = shouldOpen ? open(result.url) : false;
+  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.`,
+    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}`,
+  ].join("\n"));
 }

package/src/mac-tools.mjs

@@ -1,4 +1,5 @@
 import { api } from "./api.mjs";
+import { openUrl } from "./mac-credits.mjs";
 const text = value => ({ content: [{ type: "text", text: JSON.stringify(value, null, 2) }] });
 const session = { type: "string", pattern: "^ses_[A-Za-z0-9_-]{1,80}$" };
 const job = { type: "string", pattern: "^job_[a-f0-9]{40}$" };
@@ -6,9 +7,13 @@ 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: "Return a weekly subscription checkout: five is $5/week for 5 hours; twenty_five is $20/week for 25 hours. Renews until canceled; no rollover or overage. The human reviews and subscribes. Reuse request_key after a lost response.", inputSchema: schema({ plan: { type: "string", enum: ["five", "twenty_five"] }, request_key: key }, ["plan", "request_key"]), handler: async ({ plan, request_key }) => text(await api("POST", "/api/v1/mac/credits/checkout", { body: { plan }, idempotencyKey: request_key })) },
-  { name: "get_mac_credits", description: "Read weekly Mac hours, expiry, reservations and concurrency, separate from legacy build subscriptions.", inputSchema: schema({}), handler: async () => text(await api("GET", "/api/v1/mac/credits")) },
-  { name: "start_mac", description: "Allocate a full cloud Mac VM. 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: 86400 }, 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: "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 }) => {
+    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: "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))) },
   { name: "stop_mac", description: "Stop billing by shutting down the VM and deleting its files. Retrieve files first. Poll get_mac_session until cleanup_confirmed; stopping only acknowledges the request.", inputSchema: schema({ session_id: session }, ["session_id"]), handler: async args => text(await api("DELETE", base(args))) },