@nomac/cli 0.11.3 → 0.11.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomac/cli",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "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

@@ -5,7 +5,7 @@ import { parseArgs } from "node:util";
 import { api, CliError } from "./api.mjs";
 import { sessionStore } from "./session-store.mjs";
 import { forwardingArg, isShellLine, runProcess, sshArgs, workspaceCommand } from "./session-ssh.mjs";
-import { pullProject, syncProject } from "./session-transfer.mjs";
+import { describePull, describeSync, pullProject, syncProject } from "./session-transfer.mjs";
 import { macRequest, sessionId, transportOptions } from "./mac-transport.mjs";
 import { copyToClipboard, desktop, DESKTOP_HELP, screenSharing } from "./desktop.mjs";
 import { screenshot, startRecording, stopRecording } from "./mac-screen.mjs";
@@ -299,7 +299,10 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
       : `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`;
     const next = result.session.state === "ready" ? "Next: nomac sync . → nomac ssh"
       : result.session.failure_code === "capacity_unavailable" ? "No Mac was free within 5 minutes; nothing was charged. Run nomac start again in a few minutes."
-      : result.session.state === "queued" ? "Waiting for a free Mac (waiting is free). Check again: nomac start" : "Check: nomac session status --json";
+      : result.session.state === "queued" ? "Waiting for a free Mac (waiting is free). Check again: nomac start"
+      : ["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}` : ""}`);
     return result;
   };
@@ -583,11 +586,15 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
     await ready(local);
     if (command === "sync") {
       if (positionals.length > 1 || (positionals[0] && resolve(positionals[0]) !== store.project)) throw new CliError("Run nomac sync . from the attached project.");
-      return output(await syncProject(local, store, { overwrite: values.overwrite, dryRun: values["dry-run"], run }));
+      const result = await syncProject(local, store, { overwrite: values.overwrite, dryRun: values["dry-run"], run });
+      if (!values.json) { print(describeSync(result)); return result; }
+      return output(result);
     }
     if (command === "pull") {
       if (positionals.length !== 1) throw new CliError("Usage: nomac pull LOCAL_PATH [--from REMOTE_PATH]");
-      return output(await pullProject(local, store, positionals[0], { from: values.from ?? positionals[0], overwrite: values.overwrite, dryRun: values["dry-run"], run }));
+      const result = await pullProject(local, store, positionals[0], { from: values.from ?? positionals[0], overwrite: values.overwrite, dryRun: values["dry-run"], run });
+      if (!values.json) { print(describePull(result)); return result; }
+      return output(result);
     }
     throw new CliError("Unknown cloud session command.");
   });

package/src/session-transfer.mjs

@@ -186,6 +186,9 @@ export function describeSync(result) {
   return lines.join("\n");
 }
 
+/** The human summary of a pull. */
+export const describePull = (result) => `${result.dry_run ? "Would retrieve" : "Retrieved"} ${result.changed.length} changed files (${result.files} considered).${result.recovery_directory ? `\nPrevious local files: ${result.recovery_directory}` : ""}`;
+
 const transferEnv = (session, remoteDirectory = ".") => ({ ...process.env, NOMAC_TRANSFER_SESSION: JSON.stringify({ ...session, remoteDirectory }) });
 
 function conflictError(paths, side) {

package/src/sessions.mjs

@@ -5,7 +5,7 @@ import { parseArgs } from "node:util";
 import { CliError } from "./api.mjs";
 import { sessionStore } from "./session-store.mjs";
 import { forwardingArg, prepareWorkspace, runProcess, shellQuote, sshArgs, validateTarget, workspaceCommand } from "./session-ssh.mjs";
-import { describeSync, pullProject, syncProject } from "./session-transfer.mjs";
+import { describePull, describeSync, pullProject, syncProject } from "./session-transfer.mjs";
 
 export const SESSION_HELP = `Nomac 2.0 — SSH workspace preview
 
@@ -137,7 +137,7 @@ export async function sessionCommand(command, argv, { store: suppliedStore, run
     if (command === "pull") {
       if (positionals.length !== 1) throw new CliError("pull usage", "Usage: nomac pull LOCAL_DIRECTORY [--from REMOTE_DIRECTORY] [--dry-run] [--overwrite]");
       const result = await pullProject(session, store, positionals[0], { from: values.from ?? positionals[0], overwrite: values.overwrite, dryRun: values["dry-run"], run });
-      return output(result, `${result.dry_run ? "Would retrieve" : "Retrieved"} ${result.changed.length} changed files (${result.files} considered).${result.recovery_directory ? `\nPrevious local files: ${result.recovery_directory}` : ""}`);
+      return output(result, describePull(result));
     }
     throw new CliError("unknown session command");
   });