ai-remote 0.5.0 → 0.6.0

package/dist/cli.mjs

@@ -13,21 +13,108 @@ import {
   metaPath,
   sessionName,
   socketPath
-} from "./cli-chunk-OZG2CODR.mjs";
+} from "./cli-chunk-TKKENOSJ.mjs";
 
 // src/cli/cli.ts
 import { resolve as resolvePath } from "node:path";
 import { readFileSync as readFileSync2, openSync } from "node:fs";
 
+// src/cli/target.ts
+function splitTarget(target, fallbackPort) {
+  const stripped = target.replace(/^\w+:\/\//, "");
+  const at = stripped.lastIndexOf("@");
+  const account = at === -1 ? "" : stripped.slice(0, at);
+  const [host, port] = (at === -1 ? stripped : stripped.slice(at + 1)).split(":");
+  return { account, host, port: port ? Number(port) : fallbackPort };
+}
+
+// src/cli/args.ts
+var CliError = class extends Error {
+  constructor(message, code) {
+    super(message);
+    this.code = code;
+  }
+  code;
+};
+var VALUE_FLAGS = /* @__PURE__ */ new Set([
+  "u",
+  "user",
+  "d",
+  "domain",
+  "s",
+  "security",
+  "W",
+  "width",
+  "H",
+  "height",
+  "o",
+  "out",
+  "at",
+  "button",
+  "max-edge",
+  "view-port",
+  "idle",
+  "name",
+  "session",
+  "ssh-user",
+  "ssh-port",
+  "settle",
+  "vnc-port",
+  "port",
+  "keys",
+  "region"
+]);
+var OPTIONAL_VALUE_FLAGS = { shot: /\.(png|jpe?g)$/i };
+function parse(argv) {
+  const flags = {};
+  const positional = [];
+  const identities = [];
+  for (let i = 0; i < argv.length; i++) {
+    const token = argv[i];
+    if (!token.startsWith("-") || token === "-") {
+      positional.push(token);
+      continue;
+    }
+    const split = token.indexOf("=");
+    const name = (split === -1 ? token : token.slice(0, split)).replace(/^--?/, "");
+    const attached = split === -1 ? void 0 : token.slice(split + 1);
+    if (name === "i" || name === "identity") {
+      identities.push(attached ?? argv[++i] ?? "");
+      continue;
+    }
+    if (attached !== void 0) {
+      if (!VALUE_FLAGS.has(name) && !(name in OPTIONAL_VALUE_FLAGS)) {
+        throw new CliError(`--${name} takes no value, so --${name}=... is not a thing.`, 12);
+      }
+      flags[name] = attached;
+    } else if (VALUE_FLAGS.has(name)) flags[name] = argv[++i] ?? "";
+    else if (name in OPTIONAL_VALUE_FLAGS) {
+      const next = argv[i + 1];
+      flags[name] = next !== void 0 && OPTIONAL_VALUE_FLAGS[name].test(next) ? argv[++i] : true;
+    } else flags[name] = true;
+  }
+  return { command: positional[0] ?? "", rest: positional.slice(1), flags, identities };
+}
+var flag = (args, ...names) => {
+  for (const name of names) if (typeof args.flags[name] === "string") return args.flags[name];
+  return void 0;
+};
+var has = (args, ...names) => names.some((name) => args.flags[name] === true);
+var shotFile = (args) => {
+  const value = args.flags.shot;
+  if (value === void 0) return void 0;
+  return typeof value === "string" && value || flag(args, "o", "out") || "screen.png";
+};
+
 // src/cli/prompt.ts
 function canPrompt() {
-  return Boolean(process.stdin.isTTY) && !process.env.AI_REMOTE_NO_PROMPT;
+  return process.stdin.isTTY && !process.env.AI_REMOTE_NO_PROMPT;
 }
 function askPassword(label) {
   if (!canPrompt()) return Promise.resolve("");
   return new Promise((resolve, reject) => {
     const input = process.stdin;
-    const wasRaw = Boolean(input.isRaw);
+    const wasRaw = input.isRaw;
     const bytes = [];
     const done = (finish) => {
       input.off("data", onData);
@@ -171,6 +258,7 @@ The rest drive that session, and take no host:
   ${NAME} clipboard [on|off]       share this machine's clipboard both ways
   ${NAME} cp <src> <dst>           copy files; a remote path starts with ':'
   ${NAME} do    "steps"            several actions in one go
+  ${NAME} batch actions.json       structured actions; - reads JSON from stdin
   ${NAME} vnc                      give this session a screen over VNC
                                    (--vnc-port N, default 5900)
   ${NAME} view                     open the window on the session
@@ -180,6 +268,8 @@ The rest drive that session, and take no host:
   ${NAME} list                     every session open, and every password kept
   ${NAME} saved                    machines with a password kept
   ${NAME} forget [<host[:port]>]   throw one away; --all throws all
+  ${NAME} hosts                    SSH host keys this machine has accepted
+  ${NAME} forget-host <host[:port]> stop trusting one, after a rebuild
   ${NAME} close                    close it; --all closes every session
   ${NAME} probe [<host[:port]>]    is anything listening?
   ${NAME} --version                which version this is
@@ -219,6 +309,10 @@ Options for open
       --side-panel       open the SSH terminal docked on the right
       --audio            play the remote computer's sound in the window (RDP)
       --no-clipboard     do not share this machine's clipboard (shared by default)
+      --insecure-host-key
+                         accept an SSH host key that does not match the one on
+                         file. For a machine you rebuild often, and nothing else:
+                         a changed key is otherwise refused, which is the point
       --keys MODE        adapt | literal  (default: adapt)
                          adapt swaps Control and Command when one end is a Mac,
                          so Command-C copies on Windows and Control-C copies on
@@ -238,7 +332,14 @@ Options for the rest
   -r, --recursive        for cp: copy a directory
       --reconnect        for exec: a new terminal first, then the command
   -o, --out FILE         where a screenshot goes       (default: screen.png)
+      --shot [FILE.png]  for click, type, key, do and batch: screenshot the
+                         steps produced, in the same command. Waits for the
+                         frame they caused rather than a fixed delay, and says
+                         so when nothing on screen changed. Bare --shot writes
+                         to -o, or to screen.png; a name that is not a .png
+                         has to be given as --shot=NAME
       --max-edge N       shrink a screenshot to fit N
+      --region X,Y,W,H   capture a desktop region; --json reports its origin
       --json             machine-readable result on stdout
 
 Signing in
@@ -260,63 +361,6 @@ Signing in
 
 Exit codes: 0 ok \xB7 10 unreachable \xB7 11 auth rejected \xB7 12 bad usage \xB7 13 timeout
 `;
-var VALUE_FLAGS = /* @__PURE__ */ new Set([
-  "u",
-  "user",
-  "d",
-  "domain",
-  "s",
-  "security",
-  "W",
-  "width",
-  "H",
-  "height",
-  "o",
-  "out",
-  "at",
-  "button",
-  "max-edge",
-  "view-port",
-  "idle",
-  "name",
-  "session",
-  "ssh-user",
-  "ssh-port",
-  "settle",
-  "vnc-port",
-  "port",
-  "keys"
-]);
-function parse(argv) {
-  const flags = {};
-  const positional = [];
-  const identities = [];
-  for (let i = 0; i < argv.length; i++) {
-    const token = argv[i];
-    if (!token.startsWith("-") || token === "-") {
-      positional.push(token);
-      continue;
-    }
-    const name = token.replace(/^--?/, "");
-    if (name === "i" || name === "identity") {
-      identities.push(argv[++i] ?? "");
-      continue;
-    }
-    if (VALUE_FLAGS.has(name)) flags[name] = argv[++i] ?? "";
-    else flags[name] = true;
-  }
-  return { command: positional[0] ?? "", rest: positional.slice(1), flags, identities };
-}
-var flag = (args, ...names) => {
-  for (const name of names) if (typeof args.flags[name] === "string") return args.flags[name];
-  return void 0;
-};
-var has = (args, ...names) => names.some((name) => args.flags[name] === true);
-function splitTarget(target, fallbackPort) {
-  const stripped = target.replace(/^\w+:\/\//, "");
-  const [host, port] = stripped.split(":");
-  return { host, port: port ? Number(port) : fallbackPort };
-}
 var PORTS = { rdp: 3389, vnc: 5900, ssh: 22 };
 function modeFor(args, target) {
   if (has(args, "ssh", "ssh-only", "terminal")) return "ssh";
@@ -328,19 +372,12 @@ function modeFor(args, target) {
   return "rdp";
 }
 var defaultPort = (mode) => PORTS[mode];
-var CliError = class extends Error {
-  constructor(message, code) {
-    super(message);
-    this.code = code;
-  }
-  code;
-};
 var password = () => process.env.AI_REMOTE_PASSWORD ?? "";
 function splitKey(key) {
   const at = key.lastIndexOf("@");
   return at === -1 ? ["", key] : [key.slice(0, at), key.slice(at + 1)];
 }
-var secrets = () => import("./cli-secrets-26D3F6EN.mjs");
+var secrets = () => import("./cli-secrets-BMYFPDB2.mjs");
 async function passwordFor(host, port, username) {
   const exported = password();
   if (exported) return exported;
@@ -361,7 +398,7 @@ async function promptFor(host, port, username, note = "") {
 }
 function identityLoader(paths) {
   return async () => {
-    const { loadIdentities } = await import("./cli-identities-ZILT4XCR.mjs");
+    const { loadIdentities } = await import("./cli-identities-GBQWYF2O.mjs");
     const { identities, skipped } = await loadIdentities(paths);
     for (const note of skipped) console.log(`[ssh] skipped ${note}`);
     console.log(identities.length ? `[ssh] keys: ${identities.map((identity) => identity.comment).join(", ")}` : "[ssh] no keys to offer");
@@ -384,7 +421,7 @@ function refuseTarget(command, token) {
     12
   );
 }
-var DESKTOP_ONLY = /* @__PURE__ */ new Set(["shot", "click", "type", "key", "do"]);
+var DESKTOP_ONLY = /* @__PURE__ */ new Set(["shot", "click", "type", "key", "do", "batch"]);
 var TAKES_NOTHING = /* @__PURE__ */ new Set(["shot", "view", "status", "shell", "close", "vnc", "reconnect"]);
 var COORDINATE = /^-?\d+\s*,\s*-?\d+$/;
 function refuseLegacyTarget(args) {
@@ -415,7 +452,7 @@ async function ask(name, op, args = {}, timeoutMs) {
 async function tell(session, op, args = {}, timeoutMs) {
   const result = await ask(session.name, op, args, timeoutMs).catch((error) => {
     const message = error instanceof Error ? error.message : String(error);
-    if (/^Unknown operation/.test(message)) {
+    if (message.startsWith("Unknown operation")) {
       throw new CliError(
         `The session ${session.name} does not support \`${op}\`: it was started by an older version of ${NAME} and is still running it.
   ${NAME} close --session ${session.name}    then open it again`,
@@ -430,13 +467,13 @@ async function tell(session, op, args = {}, timeoutMs) {
   }
   return result;
 }
-async function startSession(args, name, host, port, secret) {
+async function startSession(args, name, host, port, secret, account = "") {
   const mode = modeFor(args, `${host}:${port}`);
   const explicitWidth = flag(args, "W", "width");
   const explicitHeight = flag(args, "H", "height");
   let fullscreenSize = null;
   if (mode === "rdp" && has(args, "fullscreen") && (!explicitWidth || !explicitHeight)) {
-    const { detectCurrentDisplaySize } = await import("./cli-window-ZKAXEHQV.mjs");
+    const { detectCurrentDisplaySize } = await import("./cli-window-AWXZ5NJX.mjs");
     const display = await detectCurrentDisplaySize();
     if (display) fullscreenSize = fullscreenRdpSize(display, has(args, "side-panel"));
   }
@@ -453,7 +490,7 @@ async function startSession(args, name, host, port, secret) {
     "--name",
     name,
     "-u",
-    flag(args, "u", "user") ?? "",
+    flag(args, "u", "user") ?? account,
     "-d",
     flag(args, "d", "domain") ?? "",
     "-s",
@@ -463,7 +500,7 @@ async function startSession(args, name, host, port, secret) {
     "-H",
     height,
     "--ssh-user",
-    flag(args, "ssh-user") ?? flag(args, "u", "user") ?? "",
+    flag(args, "ssh-user") ?? flag(args, "u", "user") ?? account,
     // In a terminal session the target port is the SSH port; there is no other.
     "--ssh-port",
     flag(args, "ssh-port") ?? (mode === "ssh" ? String(port) : "22"),
@@ -481,6 +518,7 @@ async function startSession(args, name, host, port, secret) {
   if (has(args, "no-view", "headless")) daemonArgs.push("--no-view");
   if (has(args, "no-open")) daemonArgs.push("--no-open");
   if (has(args, "no-clipboard")) daemonArgs.push("--no-clipboard");
+  if (has(args, "insecure-host-key")) daemonArgs.push("--insecure-host-key");
   if (has(args, "watch-only", "observe")) daemonArgs.push("--watch-only");
   if (has(args, "tab")) daemonArgs.push("--tab");
   if (has(args, "fullscreen")) daemonArgs.push("--fullscreen");
@@ -559,7 +597,7 @@ async function main() {
   }
   const json = has(args, "json");
   if (args.command === "__display-size") {
-    const { readCurrentDisplaySize } = await import("./cli-window-ZKAXEHQV.mjs");
+    const { readCurrentDisplaySize } = await import("./cli-window-AWXZ5NJX.mjs");
     const size = await readCurrentDisplaySize();
     if (size) process.stdout.write(`${JSON.stringify(size)}
 `);
@@ -568,7 +606,7 @@ async function main() {
   if (args.command === "__session") {
     const mode = modeFor(args, args.rest[0]);
     const { host, port } = splitTarget(args.rest[0] ?? "", defaultPort(mode));
-    const { runDaemon } = await import("./cli-daemon-3BBFQCML.mjs");
+    const { runDaemon } = await import("./cli-daemon-3L36TBIB.mjs");
     await runDaemon({
       name: sessionName(host, port, flag(args, "name", "session")),
       host,
@@ -596,12 +634,13 @@ async function main() {
       audio: has(args, "audio", "sound") && mode === "rdp" && !has(args, "no-view", "headless"),
       idleMs: Math.max(0, Number(flag(args, "idle") ?? 0)) * 6e4,
       keys: flag(args, "keys") === "literal" ? "literal" : "adapt",
-      clipboard: !has(args, "no-clipboard")
+      clipboard: !has(args, "no-clipboard"),
+      insecureHostKey: has(args, "insecure-host-key")
     });
     return;
   }
   if (args.command === "__window") {
-    const { runWindow } = await import("./cli-window-ZKAXEHQV.mjs");
+    const { runWindow } = await import("./cli-window-AWXZ5NJX.mjs");
     await runWindow(process.argv.slice(3));
     return;
   }
@@ -653,11 +692,11 @@ Saved, nothing open (\`${NAME} open <host>\` needs no password):
       throw new CliError(`--keys takes "adapt" or "literal", not "${keys}".`, 12);
     }
     const mode = modeFor(args, target);
-    const { host, port } = splitTarget(target, defaultPort(mode));
+    const { account: targetAccount, host, port } = splitTarget(target, defaultPort(mode));
     const asked = flag(args, "session", "name");
     const base = sessionName(host, port, asked);
     const name2 = has(args, "no-reuse") && !asked ? freeName(base, liveSessions().map((meta) => meta.name)) : base;
-    const account = flag(args, "u", "user") ?? "";
+    const account = flag(args, "u", "user") ?? targetAccount;
     const prompts = prompting(args);
     let secret = await passwordFor(host, port, account);
     let prompted = false;
@@ -669,7 +708,7 @@ Saved, nothing open (\`${NAME} open <host>\` needs no password):
     const reused = Boolean(status);
     if (!status) {
       try {
-        status = await startSession(args, name2, host, port, secret);
+        status = await startSession(args, name2, host, port, secret, account);
       } catch (error) {
         const refused = error instanceof CliError && error.code === 11;
         if (!refused || prompted || !prompts) throw error;
@@ -683,7 +722,7 @@ Saved, nothing open (\`${NAME} open <host>\` needs no password):
         cleanup(name2);
         secret = typed;
         prompted = true;
-        status = await startSession(args, name2, host, port, secret);
+        status = await startSession(args, name2, host, port, secret, account);
       }
     }
     const saved = has(args, "save") && secret ? await keepSecret(host, port, account, secret) : null;
@@ -760,6 +799,36 @@ Saved, nothing open (\`${NAME} open <host>\` needs no password):
     }
     return;
   }
+  if (args.command === "hosts") {
+    const { knownHosts } = await import("./cli-known-hosts-UU427T4N.mjs");
+    const entries = knownHosts();
+    if (json) {
+      process.stdout.write(`${JSON.stringify({ hosts: entries })}
+`);
+      return;
+    }
+    if (!entries.length) {
+      process.stdout.write("No SSH host keys have been accepted yet.\n");
+      return;
+    }
+    for (const entry of entries) {
+      process.stdout.write(`  ${entry.address.padEnd(28)}  ${entry.fingerprint}  ${entry.keyType}  first seen ${entry.firstSeen.slice(0, 10)}
+`);
+    }
+    return;
+  }
+  if (args.command === "forget-host") {
+    const { forgetHostKey } = await import("./cli-known-hosts-UU427T4N.mjs");
+    const target = args.rest[0];
+    if (!target) throw new CliError(`\`${NAME} forget-host <host[:port]>\` needs a machine to forget.`, 2);
+    const where = splitTarget(target, 22);
+    const address = `${where.host}:${where.port}`;
+    const forgotten = forgetHostKey(address);
+    process.stdout.write(forgotten ? `Forgot the host key for ${address}. The next connection records a new one.
+` : `No host key was on file for ${address}. \`${NAME} hosts\` lists what is.
+`);
+    return;
+  }
   if (args.command === "forget") {
     const { forgetAll, forgetSecret, secretKey } = await secrets();
     if (has(args, "all")) {
@@ -899,6 +968,22 @@ Open the host again without --ssh for a desktop.`,
     width: session.width,
     height: session.height
   };
+  const runSteps = async (script) => {
+    const shot = shotFile(args);
+    if (shot === void 0) return tell(session, "script", { script });
+    return tell(session, "act", {
+      script,
+      file: resolvePath(shot),
+      maxEdge: Number(flag(args, "max-edge") ?? 0),
+      region: flag(args, "region")
+    });
+  };
+  const observation = (shot) => shot === void 0 ? { observe: false } : {
+    observe: true,
+    file: resolvePath(shot),
+    region: flag(args, "region"),
+    maxEdge: Number(flag(args, "max-edge") ?? 0)
+  };
   switch (args.command) {
     case "status": {
       Object.assign(summary, await tell(session, "status", {}, 1e4));
@@ -919,7 +1004,7 @@ Open the host again without --ssh for a desktop.`,
     case "shot": {
       const file = resolvePath(flag(args, "o", "out") ?? "screen.png");
       const maxEdge = Number(flag(args, "max-edge") ?? 0);
-      Object.assign(summary, await tell(session, "shot", { file, maxEdge }));
+      Object.assign(summary, await tell(session, "shot", { file, maxEdge, region: flag(args, "region") }));
       break;
     }
     case "click": {
@@ -928,7 +1013,7 @@ Open the host again without --ssh for a desktop.`,
       const [x, y] = spec.split(",").map(Number);
       const button = flag(args, "button") ?? "left";
       const step = `click ${x},${y}${button === "left" ? "" : `,${button}`}`;
-      await tell(session, "script", { script: has(args, "double") ? `${step}; ${step}` : step });
+      Object.assign(summary, await runSteps(has(args, "double") ? `${step}; ${step}` : step));
       Object.assign(summary, { clicked: { x, y, button } });
       break;
     }
@@ -936,13 +1021,16 @@ Open the host again without --ssh for a desktop.`,
       refuseSessionHost(args, "type", session);
       const text = args.rest.join(" ");
       if (!text) throw new CliError("type needs some text", 12);
-      await tell(session, "script", { script: `type ${text}` });
+      Object.assign(summary, await tell(session, "batch", {
+        actions: [{ type: "type", text }],
+        ...observation(shotFile(args))
+      }));
       Object.assign(summary, { typed: text.length });
       break;
     }
     case "key": {
       if (!args.rest.length) throw new CliError("key needs at least one code, e.g. MetaLeft", 12);
-      await tell(session, "script", { script: args.rest.map((code) => `key ${code}`).join("; ") });
+      Object.assign(summary, await runSteps(args.rest.map((code) => `key ${code}`).join("; ")));
       Object.assign(summary, { keys: args.rest });
       break;
     }
@@ -950,7 +1038,20 @@ Open the host again without --ssh for a desktop.`,
       refuseSessionHost(args, "do", session);
       const script = args.rest.join(" ");
       if (!script) throw new CliError('do needs a script, e.g. "key MetaLeft; wait 800; shot s.png"', 12);
-      Object.assign(summary, await tell(session, "script", { script }));
+      Object.assign(summary, await runSteps(script));
+      break;
+    }
+    case "batch": {
+      const file = args.rest[0];
+      if (!file || args.rest.length !== 1) throw new CliError("batch needs a JSON file containing an action array; use - for stdin.", 12);
+      const source = readFileSync2(file === "-" ? 0 : resolvePath(file), "utf8");
+      let actions;
+      try {
+        actions = JSON.parse(source);
+      } catch (error) {
+        throw new CliError(`${file === "-" ? "stdin" : file} is not valid JSON: ${error.message}`, 12);
+      }
+      Object.assign(summary, await tell(session, "batch", { actions, ...observation(shotFile(args)) }));
       break;
     }
     case "exec": {
@@ -983,7 +1084,7 @@ function report(json, command, summary) {
 `);
 }
 async function sshLogin(args, session, what) {
-  const { bareUsername } = await import("./cli-shell-45XRTE7O.mjs");
+  const { bareUsername } = await import("./cli-shell-JEC6BEME.mjs");
   const username = bareUsername(flag(args, "ssh-user") ?? session.sshUser ?? "");
   if (!username) {
     throw new CliError(
@@ -991,15 +1092,15 @@ async function sshLogin(args, session, what) {
       12
     );
   }
-  const { loadIdentities } = await import("./cli-identities-ZILT4XCR.mjs");
+  const { loadIdentities } = await import("./cli-identities-GBQWYF2O.mjs");
   const { identities, skipped } = await loadIdentities(args.identities);
   const port = Number(flag(args, "ssh-port") ?? session.sshPort ?? 22);
-  let password2 = await passwordFor(session.host, port, username);
-  if (!password2 && session.port !== port) {
-    password2 = await passwordFor(session.host, session.port, username);
+  let sshPassword = await passwordFor(session.host, port, username);
+  if (!sshPassword && session.port !== port) {
+    sshPassword = await passwordFor(session.host, session.port, username);
   }
   let asked = false;
-  if (!password2 && !identities.length) {
+  if (!sshPassword && !identities.length) {
     if (!prompting(args)) {
       throw new CliError(
         `${what} signs in for itself, and this shell has nothing for it to use.
@@ -1010,10 +1111,10 @@ Keys passed over: ${skipped.join("; ")}` : ""),
         11
       );
     }
-    password2 = await promptFor(session.host, port, username);
-    asked = Boolean(password2);
+    sshPassword = await promptFor(session.host, port, username);
+    asked = Boolean(sshPassword);
   }
-  return { username, port, identities, password: password2, asked };
+  return { username, port, identities, password: sshPassword, asked };
 }
 function resolveEndpoint(args, endpoint) {
   if (!endpoint.remote) return { endpoint, session: null };
@@ -1065,7 +1166,7 @@ async function copyFiles(args, json) {
     upload,
     walkLocal,
     walkRemote
-  } = await import("./cli-copy-BOF44DWQ.mjs");
+  } = await import("./cli-copy-2HQU2E7D.mjs");
   const from = resolveEndpoint(args, parseEndpoint(args.rest[0]));
   const to = resolveEndpoint(args, parseEndpoint(args.rest[1]));
   if (!from.endpoint.remote && !to.endpoint.remote) {
@@ -1087,7 +1188,8 @@ async function copyFiles(args, json) {
       port: login.port,
       username: login.username,
       password: login.password,
-      identities: login.identities
+      identities: login.identities,
+      insecureHostKey: has(args, "insecure-host-key")
     });
     await connection.connect().catch((error) => {
       throw new CliError(error.message, /password|auth|denied|refused the/i.test(error.message) ? 11 : 10);
@@ -1143,7 +1245,7 @@ async function copyFiles(args, json) {
   }
 }
 async function interactiveShell(args, session) {
-  const { Shell } = await import("./cli-shell-45XRTE7O.mjs");
+  const { Shell } = await import("./cli-shell-JEC6BEME.mjs");
   const login = await sshLogin(args, session, "a terminal");
   const { username, port, identities } = login;
   const prompts = prompting(args);
@@ -1156,6 +1258,7 @@ async function interactiveShell(args, session) {
       username,
       password: secret,
       identities,
+      insecureHostKey: has(args, "insecure-host-key"),
       columns: process.stdout.columns ?? 120,
       rows: process.stdout.rows ?? 30
     });
@@ -1211,11 +1314,11 @@ async function probe(host, port) {
   });
 }
 function describe(command, summary) {
-  const size = `${summary.width}x${summary.height}`;
+  const size = `${summary.desktopWidth ?? summary.width}x${summary.desktopHeight ?? summary.height}`;
   const terminalOnly = summary.mode === "ssh";
   if (command === "open") {
     const window = summary.window === "window" ? "A window is open on it." : summary.window === "tab" ? "It opened in your browser." : summary.viewer ? `Open it at ${summary.viewer}` : "No window (headless).";
-    const shape = terminalOnly ? "a terminal" : `${size}`;
+    const shape = terminalOnly ? "a terminal" : size;
     const next = terminalOnly ? `
 Session ${summary.name}. \`${NAME} exec "cmd"\` runs something there, \`${NAME} shell\` opens it, \`${NAME} close\` ends it.` : `
 Session ${summary.name}. Run more commands with no host, then \`${NAME} close\` when you are done.`;
@@ -1231,9 +1334,14 @@ ${summary.viewer ? `Window: ${summary.viewer} (${summary.viewers} watching)` : "
     if (summary.already) {
       return `${summary.name} already has a screen (${summary.mode}), ${size}.`;
     }
-    return `${summary.name} now has a screen over VNC, ${size}.${summary.viewer ? ` Watch it at ${summary.viewer}` : ""}
-\`${NAME} shot\`, \`${NAME} click X,Y\` and \`${NAME} type\` now work on it.${summary.saved ? `
-The password is saved in ${summary.saved}.` : ""}`;
+    return [
+      `${summary.name} now has a screen over VNC, ${size}.`,
+      summary.viewer ? ` Watch it at ${summary.viewer}` : "",
+      `
+\`${NAME} shot\`, \`${NAME} click X,Y\` and \`${NAME} type\` now work on it.`,
+      summary.saved ? `
+The password is saved in ${summary.saved}.` : ""
+    ].join("");
   }
   if (command === "view") {
     if (summary.viewer) return `Window: ${summary.viewer}`;
@@ -1254,13 +1362,15 @@ The password is saved in ${summary.saved}.` : ""}`;
     return `${summary.replaced ? "Replaced" : "Opened"} the terminal on ${summary.name}. It is a new login, so it sees whatever the PATH says now -- and has forgotten the working directory and any exported variables.`;
   }
   if (command === "shot") return `Wrote ${summary.file} (${summary.width}x${summary.height}) from ${summary.name}.`;
+  const looked = summary.file ? ` Wrote ${summary.file} (${summary.width}x${summary.height})` + (summary.changed === false ? ", though nothing on screen changed" : "") + (summary.quiet === false ? "; the screen was still moving" : "") + "." : "";
   if (command === "click") {
     const { x, y } = summary.clicked;
-    return `Clicked (${x}, ${y}) on a ${size} desktop.`;
+    return `Clicked (${x}, ${y}) on a ${size} desktop.${looked}`;
   }
-  if (command === "type") return `Typed ${summary.typed} characters.`;
-  if (command === "key") return `Pressed ${summary.keys.join(", ")}.`;
-  if (command === "do") return `Ran ${summary.steps.length} steps: ${summary.steps.join(" \u2192 ")}`;
+  if (command === "type") return `Typed ${summary.typed} characters.${looked}`;
+  if (command === "batch") return `Ran ${summary.actions} actions (${summary.clicks} clicks) in ${summary.dispatchMs} ms of dispatch.${looked}`;
+  if (command === "key") return `Pressed ${summary.keys.join(", ")}.${looked}`;
+  if (command === "do") return `Ran ${summary.steps.length} steps: ${summary.steps.join(" \u2192 ")}${looked}`;
   return "Done.";
 }
 main().catch((error) => {