@nomac/cli 0.11.10 → 0.11.11

package/package.json

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

package/src/hosted-sessions.mjs

@@ -308,14 +308,17 @@ export function projectLine({ path, on_drive }) {
   return on_drive ? `Project: ${short}, on your drive: kept when the Mac stops, and the next session builds only what changed.`
     : `Project: ${short}, deleted when the Mac stops: nomac pull what you need first.`;
 }
+/** "Mac: macOS 26.6.2, Xcode 27.0 (default) and Xcode 26.6 (/Applications/Xcode-26.6.app), iOS 27.0 Simulator", or "". */
+export function macLine(image) {
+  if (!image?.macos) return "";
+  // An image with a second Xcode names it and its path, as the API's image line does.
+  const others = (image.xcodes ?? []).filter(x => !x.default);
+  const xcode = others.length ? `Xcode ${image.xcode} (default) and ${others.map(x => `Xcode ${x.version} (${x.path})`).join(" and ")}` : `Xcode ${image.xcode}`;
+  return `Mac: macOS ${image.macos.split(" ")[0]}, ${xcode}${(image.simulator_runtimes ?? []).map(r => `, ${r} Simulator`).join("")}`;
+}
 export function statusSummary(session, image) {
   const lines = [`${session.id}: ${session.state}`];
-  if (image?.macos) {
-    // An image with a second Xcode names it and its path, as the API's image line does.
-    const others = (image.xcodes ?? []).filter(x => !x.default);
-    const xcode = others.length ? `Xcode ${image.xcode} (default) and ${others.map(x => `Xcode ${x.version} (${x.path})`).join(" and ")}` : `Xcode ${image.xcode}`;
-    lines.push(`Mac: macOS ${image.macos.split(" ")[0]}, ${xcode}${(image.simulator_runtimes ?? []).map(r => `, ${r} Simulator`).join("")}`);
-  }
+  if (macLine(image)) lines.push(macLine(image));
   if (["ready", "provisioning", "queued"].includes(session.state)) lines.push(`Cost so far: ${usd(session.cost?.accrued_microunits)} ($0.80/hour, billed by the minute while ready). Credit left: nomac credits`);
   const a = session.activity ?? {};
   if (session.state === "ready") {
@@ -351,6 +354,8 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
   if (values.help) return print(command === "desktop" ? DESKTOP_HELP : HELP);
   const wait = ["start", "attach", "stop"].includes(command) ? integer(values.wait, command === "stop" ? 60 : 300, 0, command === "stop" ? 300 : 600) : 0;
   if (command === "start" && values["request-key"] !== undefined && !validRequestKey(values["request-key"])) throw new CliError("Use a request key of 8–128 letters, digits, underscores, periods, colons or hyphens.");
+  // The image the last read reported (macOS, Xcodes, Simulators), for start's summary.
+  let lastImage;
   const output = result => {
     // Sync, pull and the other commands answer with their own result, which has no session.
     if (values.json || !["start", "attach", "stop"].includes(command)) { print(JSON.stringify(result, null, 2)); return result; }
@@ -364,7 +369,9 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
       : ["stopped", "failed"].includes(result.session.state) ? `${result.session.drive ? "The drive saves in the background (nomac drive shows it). " : ""}Start another: nomac start`
       : result.session.state === "stopping" ? "Stopping. Check: nomac status"
       : "Check: nomac status";
-    print(`${result.attached ? `${result.attached}\n` : ""}${result.session.id}: ${result.session.state}\n${next}\n${usage}${result.warning ? `\n${result.warning}` : ""}`);
+    // A ready Mac says what is on it, as nomac status does.
+    const mac = result.session.state === "ready" && macLine(lastImage) ? `${macLine(lastImage)}\n` : "";
+    print(`${result.attached ? `${result.attached}\n` : ""}${result.session.id}: ${result.session.state}\n${mac}${next}\n${usage}${result.warning ? `\n${result.warning}` : ""}`);
     return result;
   };
   const saveView = (local, view) => {
@@ -373,7 +380,11 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
     Object.assign(local, { id: view.id, state: view.state, snapshot: view }); store.save(local);
     return view;
   };
-  const refresh = async local => saveView(local, (await request("GET", `/api/v1/mac/sessions/${sessionId(local.id)}`)).session);
+  const refresh = async local => {
+    const answer = await request("GET", `/api/v1/mac/sessions/${sessionId(local.id)}`);
+    if (answer.image) lastImage = answer.image;
+    return saveView(local, answer.session);
+  };
   async function ready(local) {
     await refresh(local);
     if (local.state !== "ready") throw new CliError("Mac is not ready.", `Session ${local.id} is ${local.state}. Run nomac session status --json.`, undefined, "session_not_ready");

package/src/mcp.mjs

@@ -70,7 +70,7 @@ export const TOOLS = [
     handler: async args => text(await api("GET", `/api/v1/store-capabilities?${new URLSearchParams(Object.entries(args ?? {}).filter(([, value]) => value !== undefined).map(([key, value]) => [key, String(value)]))}`)),
   },
   ...[
-    ["read_store", "read", "Read a discovered Apple GET operation. Start with an apps_* relationship and scope:[]; reuse the returned resource scopes. Paginate with next_cursor and unchanged query. Raw IDs are accepted only for global lookups. Reads live Apple state, file upload operations and analytics report URLs."],
+    ["read_store", "read", "Read a discovered Apple GET operation. Start with an apps_* relationship and scope:[]; reuse the returned resource scopes. Paginate with next_cursor and unchanged query. Raw IDs are accepted only for global lookups. Reads live Apple state and analytics report URLs; a file's upload ranges come only in the answer to its reservation, so use upload_store_asset."],
     ["set_subscription_prices", "subscription-prices", "Sets a subscription's price in every territory from one base price point, using Apple's equalized prices (what App Store Connect's all-territories pricing does): territories already at that price are skipped, the others are set one by one, about 40 per call within 35 seconds. Call again (a new request_key, or none) until remaining is 0; a repeat changes nothing. Apple's refusal for a territory is listed in failed (UNSUPPORTED_TERRITORY: set the subscription's availability there first). Without confirm it returns a preview with the counts. Prices come from the human."],
     ["update_store", "write", "Execute a discovered Apple write using its exact JSON:API body. Copy scope and relationship references from read_store. Preview by default; confirm:true changes real Apple resources. Use owner-authorized prices and attestations. On pending, retry identical arguments with request_key; get_store_operation recovers lost keys. Use publish/update_review/manage_testflight for their dedicated lifecycle actions."],
   ].map(([name, route, description]) => ({
@@ -260,7 +260,7 @@ export const TOOLS = [
   {
     name: "upload_screenshots",
     description:
-      "Start a screenshot replacement for one display type and iOS version. PNGs are validated and prior images are backed up. Reuse request_key and the original body when retrying. Poll get_screenshot_upload until complete, rolled_back or needs_attention; accepted means still in progress. images: [{filename, data: base64 PNG}].",
+      "Start a screenshot replacement for one display type and iOS version. PNGs are validated and prior images are backed up. Reuse request_key and the original body when retrying. Poll get_screenshot_upload until complete, rolled_back or needs_attention; accepted means still in progress. images: [{filename, link}] with a create_mac_download_link url for each PNG on the Mac (any size; preferred), or [{filename, data: base64 PNG}] for small images (a request is capped near 4.5 MB in all).",
     inputSchema: {
       type: "object",
       properties: {

package/src/store-upload.mjs

@@ -1,6 +1,6 @@
 // Shared by the hosted upload endpoint and the published CLI (copied by the
-// schema generator). Provider upload URLs come only from an authenticated,
-// app-scoped read_store response; Nomac credentials never go to those URLs.
+// schema generator). Provider upload URLs come only from the authenticated,
+// app-scoped answer to the reservation; Nomac credentials never go to those URLs.
 import { createHash, randomUUID } from 'node:crypto';
 import { open } from 'node:fs/promises';
 import { basename } from 'node:path';
@@ -82,8 +82,9 @@ export async function uploadStoreAsset(args, call) {
     stage = 'upload';
     const completed = ['UPLOAD_COMPLETE', 'COMPLETE', 'FAILED'].includes(attributes.assetDeliveryState?.state);
     if (!completed) {
-      const operations = attributes.uploadOperations;
-      if (!Array.isArray(operations) || !operations.length) throw new Error('Apple has not exposed upload operations yet. Retry this same upload.');
+      // Apple lists the upload ranges in its answer to the reservation only (a later read has none).
+      const operations = reservation.upload_operations?.length ? reservation.upload_operations : attributes.uploadOperations;
+      if (!Array.isArray(operations) || !operations.length) throw new Error(`Apple gives a file's upload links only in its answer to the reservation, and this request has none (that answer was lost). Delete the reservation (update_store with ${args.operation.replace(/_createInstance$/, '_deleteInstance')} and this scope), then upload again with a new request_key.`);
       let end = 0;
       for (const op of [...operations].sort((a, b) => a.offset - b.offset)) {
         if (op.method !== 'PUT' || !Number.isSafeInteger(op.offset) || !Number.isSafeInteger(op.length) || op.length < 1 || op.offset !== end || op.offset + op.length > size) throw new Error('Apple returned invalid or incomplete upload byte ranges.');
@@ -105,7 +106,7 @@ export async function uploadStoreAsset(args, call) {
         const part = await source(op.offset, op.length);
         try {
           const response = await fetch(op.url, { method: 'PUT', headers, body: part, duplex: 'half', redirect: 'error', signal: AbortSignal.timeout(120_000) });
-          if (!response.ok) throw new Error(`Apple asset upload returned HTTP ${response.status}. Retry with this same request key to refresh its upload URLs.`);
+          if (!response.ok) throw new Error(`Apple asset upload returned HTTP ${response.status}. Retry with this same request key; if it fails again, its upload links have expired: delete the reservation (update_store with ${args.operation.replace(/_createInstance$/, '_deleteInstance')} and this scope) and upload again with a new request_key.`);
           await response.body?.cancel();
         } finally { if (typeof part.destroy === 'function') part.destroy(); }
       }