@nomac/cli 0.11.2 → 0.11.4

package/package.json

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

@@ -4,8 +4,8 @@ import { join, resolve } from "node:path";
 import { parseArgs } from "node:util";
 import { api, CliError } from "./api.mjs";
 import { sessionStore } from "./session-store.mjs";
-import { forwardingArg, runProcess, sshArgs, workspaceCommand } from "./session-ssh.mjs";
-import { pullProject, syncProject } from "./session-transfer.mjs";
+import { forwardingArg, isShellLine, runProcess, sshArgs, workspaceCommand } from "./session-ssh.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";
@@ -386,7 +386,7 @@ export async function hostedSessionCommand(command, argv, { store = sessionStore
       // A command may run an hour (the gateway's limit); waiting can cover all of it.
       const waitFor = integer(values.wait, 30, 0, 3600);
       const timeout = integer(values.timeout, values["request-key"] === undefined ? Math.max(300, waitFor) : 600, 1, 3600);
-      method = "POST"; path = `${base}/jobs`; params = { requestKey: values["request-key"] ?? `cli-${randomUUID()}`, body: { argv: positionals, timeout_seconds: timeout } };
+      method = "POST"; path = `${base}/jobs`; params = { requestKey: values["request-key"] ?? `cli-${randomUUID()}`, body: { argv: isShellLine(positionals) ? ["/bin/bash", "-lc", positionals[0]] : positionals, timeout_seconds: timeout } };
     } else {
       if (positionals.length !== 1 || !/^job_[a-f0-9]{40}$/.test(positionals[0])) throw new CliError("Supply the existing job ID.");
       path = `${base}/jobs/${positionals[0]}`;
@@ -583,11 +583,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-ssh.mjs

@@ -127,8 +127,14 @@ export async function prepareWorkspace(session, options) {
   return { workspace, capabilities: { os: "macOS", version: osVersion, architecture, administrator: admin, available_disk_bytes: Number(availableKb) * 1024 } };
 }
 
+/**
+ * One argument with spaces or shell syntax is a shell command line, as ssh host 'a; b' runs it;
+ * several are a program and its arguments, passed exactly.
+ */
+export const isShellLine = (args) => args.length === 1 && /[\s;&|<>()$`*?{}~#'"\\]/.test(args[0]);
+
 export function workspaceCommand(session, args = []) {
-  const command = args.length ? args.map(shellQuote).join(" ") : '"$SHELL" -l';
+  const command = !args.length ? '"$SHELL" -l' : isShellLine(args) ? `"$SHELL" -lc ${shellQuote(args[0])}` : args.map(shellQuote).join(" ");
   return `cd ${shellQuote(validateWorkspace(session.workspace))} && exec ${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");
   });