@nomac/cli 0.11.2 → 0.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomac/cli",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "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,7 +4,7 @@ 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 { forwardingArg, isShellLine, runProcess, sshArgs, workspaceCommand } from "./session-ssh.mjs";
 import { pullProject, syncProject } from "./session-transfer.mjs";
 import { macRequest, sessionId, transportOptions } from "./mac-transport.mjs";
 import { copyToClipboard, desktop, DESKTOP_HELP, screenSharing } from "./desktop.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]}`;

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}`;
 }