airterm 1.0.3 → 1.2.0

package/dist/cli.js

@@ -2,7 +2,7 @@
 
 // src/cli.tsx
 import { render } from "ink";
-import meow from "meow";
+import { createRequire } from "module";
 
 // src/components/App.tsx
 import { useState as useState5 } from "react";
@@ -81,6 +81,14 @@ function resetAll() {
   }
   return count;
 }
+function wasGlobalInstallDeclined() {
+  return loadConfig().globalInstallDeclined === true;
+}
+function setGlobalInstallDeclined() {
+  const config = loadConfig();
+  config.globalInstallDeclined = true;
+  saveConfig(config);
+}
 
 // src/components/Welcome.tsx
 import { useState, useEffect } from "react";
@@ -276,12 +284,14 @@ function SelectMachine({
 import { useEffect as useEffect2, useState as useState4 } from "react";
 import { Box as Box5, Text as Text5, useApp as useApp2 } from "ink";
 import Spinner from "ink-spinner";
+import { execFileSync } from "child_process";
+import { createInterface } from "readline";
 
 // src/lib/ssh.ts
 import { spawnSync } from "child_process";
-function connectSSH(conn) {
+function connectSSH(conn, command) {
   const needsTls = conn.hostname.endsWith(".fly.dev");
-  const args = [
+  const args2 = [
     "-i",
     conn.keyPath,
     "-p",
@@ -294,18 +304,44 @@ function connectSSH(conn) {
     "LogLevel=ERROR"
   ];
   if (needsTls) {
-    args.push(
+    args2.push(
       "-o",
       `ProxyCommand openssl s_client -connect %h:%p -quiet 2>/dev/null`
     );
   }
-  args.push(`${conn.username}@${conn.hostname}`);
-  const result = spawnSync("ssh", args, { stdio: "inherit" });
+  if (command && command.length > 0 && process.stdin.isTTY) {
+    args2.push("-t");
+  }
+  args2.push(`${conn.username}@${conn.hostname}`);
+  if (command && command.length > 0) {
+    args2.push("--", ...command);
+  }
+  const result = spawnSync("ssh", args2, { stdio: "inherit" });
   return result.status ?? 1;
 }
 
 // src/components/Connecting.tsx
 import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+function isGloballyInstalled() {
+  try {
+    const p = execFileSync("which", ["airterm"], {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "ignore"]
+    }).trim();
+    return !!p && !p.includes("_npx") && !p.includes(".dlx");
+  } catch {
+    return false;
+  }
+}
+function ask(question) {
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase());
+    });
+  });
+}
 function Connecting({ code, connection, onError }) {
   const [status, setStatus] = useState4(
     code ? "Redeeming access code..." : "Connecting..."
@@ -315,6 +351,7 @@ function Connecting({ code, connection, onError }) {
     let cancelled = false;
     async function run() {
       let conn = connection;
+      const isNewConnection = !!code;
       if (code && !conn) {
         const result = await redeemCode(code);
         if (cancelled) return;
@@ -352,6 +389,36 @@ function Connecting({ code, connection, onError }) {
       await new Promise((r) => setTimeout(r, 200));
       if (cancelled) return;
       exit();
+      if (isNewConnection) {
+        console.log("");
+        console.log(
+          "Connected to your AirClaw. From now on:"
+        );
+        console.log("  airterm          sign in to your machine");
+        console.log("  airterm ls -la   run commands directly");
+        console.log("");
+        if (!isGloballyInstalled() && !wasGlobalInstallDeclined()) {
+          const answer = await ask(
+            "Install airterm globally so you can just type `airterm`? (y/n) "
+          );
+          if (answer === "y" || answer === "yes") {
+            console.log("");
+            try {
+              execFileSync("npm", ["install", "-g", "airterm"], {
+                stdio: "inherit"
+              });
+              console.log("\nNext time, just type `airterm`.\n");
+            } catch {
+              console.log(
+                "\nInstall failed. You can try manually: npm install -g airterm\n"
+              );
+            }
+          } else {
+            setGlobalInstallDeclined();
+            console.log("No problem. Run `npx airterm` anytime.\n");
+          }
+        }
+      }
       const exitCode = connectSSH(conn);
       process.exit(exitCode);
     }
@@ -397,14 +464,14 @@ function ErrorView({ message }) {
 
 // src/components/App.tsx
 import { jsx as jsx7 } from "react/jsx-runtime";
-function App({ initialCode: initialCode2, initialScreen: initialScreen2 }) {
+function App({ initialCode, initialScreen }) {
   const connections = getConnections();
   let startScreen;
-  if (initialCode2) {
-    startScreen = { type: "connecting", code: initialCode2 };
-  } else if (initialScreen2 === "add") {
+  if (initialCode) {
+    startScreen = { type: "connecting", code: initialCode };
+  } else if (initialScreen === "add") {
     startScreen = { type: "add" };
-  } else if (initialScreen2 === "list") {
+  } else if (initialScreen === "list") {
     startScreen = { type: "select" };
   } else if (connections.length === 0) {
     startScreen = { type: "welcome" };
@@ -460,71 +527,81 @@ function App({ initialCode: initialCode2, initialScreen: initialScreen2 }) {
 
 // src/cli.tsx
 import { jsx as jsx8 } from "react/jsx-runtime";
-if (process.argv.includes("-h")) {
-  process.argv[process.argv.indexOf("-h")] = "--help";
-}
-if (process.argv.includes("-v")) {
-  process.argv[process.argv.indexOf("-v")] = "--version";
-}
-var cli = meow(
-  `
+var require2 = createRequire(import.meta.url);
+var pkg = require2("../package.json");
+var args = process.argv.slice(2);
+var first = args[0];
+function showHelp(exitCode = 0) {
+  console.log(`
+  airterm v${pkg.version} \u2014 ${pkg.description}
+
   Usage:
-    airterm              Connect to your machine
-    airterm <code>       Redeem an access code and connect
-    airterm add [code]   Add a machine with an access code
-    airterm list         Manage saved connections
-    airterm reset        Remove all saved connections and keys
+    airterm                  Connect to your machine
+    airterm <code>           Redeem an access code and connect
+    airterm <command...>     Run a command on your machine
 
-  Options:
-    -h, --help           Show this help
-    -v, --version        Show version
+  Management:
+    -a, --add <code>         Add a machine with an access code
+    -l, --list               Manage saved connections
+    -r, --reset              Remove all saved connections
+    -h, --help               Show this help
+    -v, --version            Show version
 
-  First time? Run \`airterm\` and paste the access code from your AirClaw agent.
-`,
-  {
-    importMeta: import.meta,
-    flags: {}
-  }
-);
-var command = cli.input[0];
-if (command === "reset") {
+  Examples:
+    airterm ata_abc123...    Redeem an access code
+    airterm                  Open an interactive SSH session
+    airterm ls -la           List files on your machine
+    airterm cat /tmp/log     View a remote file
+    airterm openclaw tui     Launch OpenClaw TUI
+`);
+  process.exit(exitCode);
+}
+if (first === "--help" || first === "-h") showHelp();
+if (first === "--version" || first === "-v") {
+  console.log(pkg.version);
+  process.exit(0);
+}
+if (first === "--reset" || first === "-r") {
   const count = resetAll();
   if (count > 0) {
     console.log(
       `Removed ${count} saved connection${count !== 1 ? "s" : ""} and keys.`
     );
   }
-  console.log(
-    "AirTerm data wiped. Run `airterm add` to set up again."
-  );
+  console.log("AirTerm data wiped. Run `airterm --add <code>` to set up again.");
   process.exit(0);
 }
-if (command === "help") {
-  cli.showHelp(0);
-}
-var initialCode;
-var initialScreen;
-if (command === "add") {
-  const code = cli.input[1];
-  if (code) {
-    initialCode = code;
-  } else {
-    initialScreen = "add";
-  }
-} else if (command === "list" || command === "ls") {
+if (first === "--list" || first === "-l") {
   const connections = getConnections();
   if (connections.length === 0) {
-    console.log("No saved connections. Run `airterm add` to set up.");
+    console.log("No saved connections. Run `airterm --add <code>` to set up.");
     process.exit(0);
   }
-  initialScreen = "list";
-} else if (command && !["add", "list", "ls", "help", "reset"].includes(command)) {
-  if (/^[A-Za-z0-9_-]{10,}$/.test(command)) {
-    initialCode = command;
+  render(/* @__PURE__ */ jsx8(App, { initialScreen: "list" }));
+} else if (first === "--add" || first === "-a") {
+  const code = args[1];
+  if (code) {
+    render(/* @__PURE__ */ jsx8(App, { initialCode: code }));
   } else {
-    console.error(`Unknown command: ${command}
-`);
-    cli.showHelp(1);
+    render(/* @__PURE__ */ jsx8(App, { initialScreen: "add" }));
+  }
+} else if (args.length > 0) {
+  if (first.startsWith("ata_")) {
+    render(/* @__PURE__ */ jsx8(App, { initialCode: first }));
+  } else {
+    const remoteCmd = first === "--" ? args.slice(1) : args;
+    if (remoteCmd.length === 0) showHelp(1);
+    const connections = getConnections();
+    if (connections.length === 0) {
+      console.error(
+        "No saved connections. Run `airterm --add <code>` to set up first."
+      );
+      process.exit(1);
+    }
+    const conn = connections[0];
+    const exitCode = connectSSH(conn, remoteCmd);
+    process.exit(exitCode);
   }
+} else {
+  render(/* @__PURE__ */ jsx8(App, {}));
 }
-render(/* @__PURE__ */ jsx8(App, { initialCode, initialScreen }));

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "airterm",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "SSH into your AirClaw machine",
   "type": "module",
   "bin": {
-    "airterm": "./dist/cli.js"
+    "airterm": "dist/cli.js"
   },
   "files": [
     "dist"
@@ -19,7 +19,6 @@
     "ink-select-input": "^6.0.0",
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
-    "meow": "^13.0.0",
     "react": "^18.3.1"
   },
   "devDependencies": {