@tonbo/cli 0.17.1 → 0.17.2

package/dist/bin/tonbo.js

@@ -5688,7 +5688,10 @@ function awakeFields(machine) {
   const held = awake.held_by.length > 0;
   const sleeps = awake.sleeps_at_earliest ? `${awake.sleeps_at_earliest} (${awake.sleeps_by === "idle_early" ? `idle_early: quiet for ${duration(earlyReclaimSeconds)}` : `sleep_after: idle for ${duration(machine.sleep_after_seconds)}`})` : held ? "not while anything holds it" : "not known yet";
   return [
-    ["Held by", held ? awake.held_by.map(holderText).join(", ") : "nothing"],
+    [
+      "Held by",
+      held ? awake.held_by.map(holderText).join(", ") : `nothing${awake.sleeps_at_earliest ? `, so it sleeps at ${awake.sleeps_at_earliest}` : ""}; a detached process (tonbo machine exec ${machine.name} --detach -- <command>) or a hold (tonbo machine hold set ${machine.name} <hold> --for 15m) keeps it awake`
+    ],
     ...awake.idle_since ? [["Idle since", awake.idle_since]] : [],
     ["Quiet", awake.quiet.passes ? "yes" : `no: ${awake.quiet.reason ?? "measuring"}`],
     ["Sleeps at", sleeps],
@@ -6825,7 +6828,7 @@ var COMMAND_HELP = {
   },
   "tonbo machine exec": {
     about: [
-      "Runs one command in the Machine's running activation through its region's cell origin, waking the Machine first when it is asleep, and streams its stdout and stderr here as they come; a call that woke the Machine prints its hourly ceiling on stderr. The command runs without a shell, as the image's User, and lives exactly as long as the call: there is no terminal and no streamed stdin, and `--stdin` sends at most 1 MiB read before the call.",
+      "Runs one command in the Machine's running activation through its region's cell origin, waking the Machine first when it is asleep, and streams its stdout and stderr here as they come; a call that woke the Machine prints its hourly ceiling on stderr. The command runs without a shell, as the image's User, and lives exactly as long as the call: what it starts in the background, with `nohup`, `setsid` or `&`, is ended when it returns, and the CLI then says how many it ended. There is no terminal and no streamed stdin, and `--stdin` sends at most 1 MiB read before the call.",
       "The CLI exits with the command's status: 128 plus the signal's number when a signal ended it, 124 at `--timeout`, 125 when it was refused, killed or passed 64 MiB of output, 126 or 127 when it could not run, and 255 when the connection ended first and the outcome is unknown. `--json` prints the answer's document instead, with the first and last 512 KiB of each stream.",
       "`--detach` starts the command in the background instead, prints its process id and returns at once: it runs whatever happens to this call, keeps the Machine awake until it ends, and is ended at `--timeout` (default 3600, at most 21600). Read it with `tonbo machine output`, wait for it with `tonbo machine wait`, list them with `tonbo machine ps` and end one with `tonbo machine kill`. A budget or funding stop, or a sleep you ask for, still ends it."
     ],
@@ -7215,9 +7218,30 @@ function parseEnv2(pairs) {
   }
   return env;
 }
+var BACKGROUNDERS = /* @__PURE__ */ new Set(["nohup", "setsid"]);
+var SHELLS = /* @__PURE__ */ new Set(["sh", "bash", "zsh", "dash", "ash", "ksh", "mksh"]);
+function backgroundsWork(command) {
+  const base = (arg) => arg.slice(arg.lastIndexOf("/") + 1);
+  if (command.some((arg) => BACKGROUNDERS.has(base(arg)))) return true;
+  const shell = command.findIndex((arg) => SHELLS.has(base(arg)));
+  if (shell < 0) return false;
+  const flag = command.findIndex((arg, at) => at > shell && /^-[a-zA-Z]*c[a-zA-Z]*$/.test(arg));
+  const script = flag < 0 ? void 0 : command[flag + 1]?.trimEnd();
+  if (script === void 0) return false;
+  return script.endsWith("&") && !script.endsWith("&&") || /\b(nohup|disown|setsid)\b/.test(script);
+}
+var detachWay = (name) => `To keep work running after the call, use: tonbo machine exec ${name} --detach -- <command>`;
+function backgroundEndedNotice(name, count) {
+  const processes = count === 1 ? "1 background process" : `${count} background processes`;
+  return `${processes} this command started ${count === 1 ? "was" : "were"} ended when it returned. ${detachWay(name)}`;
+}
+function backgroundsWorkNotice(name, detach) {
+  return detach ? `--detach already keeps the command running after the call, and what it puts in the background with nohup or & is ended when the command itself returns. Run the work in the foreground: tonbo machine exec ${name} --detach -- <command>` : `This command puts work in the background, which is ended when the command returns. ${detachWay(name)}`;
+}
 async function machineExecCommand(deps, name, command, options = {}) {
   if (command.length === 0)
     throw new Error("Name the command after --, such as `tonbo machine exec web -- ls /`.");
+  if (backgroundsWork(command)) deps.notice(backgroundsWorkNotice(name, false));
   const key = await deps.auth.apiKey();
   const region = await regionOf(deps, key, name);
   const body = { command };
@@ -7244,6 +7268,7 @@ async function machineExecCommand(deps, name, command, options = {}) {
   if (options.json) {
     const answer = await response.json();
     print(deps, true, answer.data, "");
+    noticeEnded(deps, name, answer.data);
     exitWith(deps, answer.data.reason ? execExitCode(answer.data) : 0);
     return;
   }
@@ -7276,10 +7301,17 @@ async function machineExecCommand(deps, name, command, options = {}) {
   }
   line(buffered);
   const ended = end ?? { reason: "lost", exit_code: null, signal: null };
-  if (ended.reason !== "exited" && ended.reason !== "signaled")
+  if (ended.reason === "timeout") deps.notice(`The command ended: timeout. ${detachWay(name)}`);
+  else if (ended.reason !== "exited" && ended.reason !== "signaled")
     deps.notice(`The command ended: ${ended.reason}.`);
+  noticeEnded(deps, name, ended);
   exitWith(deps, execExitCode(ended));
 }
+function noticeEnded(deps, name, end) {
+  const count = end.killed_processes ?? 0;
+  if (count > 0 && (end.reason === "exited" || end.reason === "signaled"))
+    deps.notice(backgroundEndedNotice(name, count));
+}
 function processEndText(process2) {
   const end = process2.end;
   if (!end) return "-";
@@ -7299,6 +7331,7 @@ async function machineProcessStartCommand(deps, name, command, options = {}) {
     throw new Error(
       "Name the command after --, such as `tonbo machine exec web --detach -- npm run build`."
     );
+  if (backgroundsWork(command)) deps.notice(backgroundsWorkNotice(name, true));
   const body = { command };
   if (options.cwd) body.cwd = options.cwd;
   if (options.env?.length) body.env = parseEnv2(options.env);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonbo/cli",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "The Tonbo CLI. Compute, disks, databases and streams for AI agents: your agent picks what it needs, sets it up, and knows what it costs, from the command line.",
   "homepage": "https://tonbo.dev",
   "bugs": {