htmlhost-cli 1.1.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlhost-cli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Deploy HTML files from the terminal — htmlhost.co CLI",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -4,34 +4,39 @@
 import { bold, dim, cyan, err } from "./ui.mjs";
 import { ApiError } from "./api.mjs";
 
-const VERSION = "1.1.0";
+const VERSION = "1.2.0";
 
 const HELP = `
   ${bold("htmlhost")} ${dim(`v${VERSION}`)} — deploy HTML from the terminal
 
   ${bold("Usage:")}
-    ${cyan("htmlhost login")}                    Authenticate with an API token
-    ${cyan("htmlhost deploy")} <file> [options]  Deploy an HTML file
+    ${cyan("htmlhost deploy")} [file] [options]  Deploy (defaults to index.html)
     ${cyan("htmlhost list")}                     List your sites
     ${cyan("htmlhost delete")} <slug>            Delete a site
     ${cyan("htmlhost upload")} <file|dir>        Upload media assets
+    ${cyan("htmlhost login")}                    Authenticate with an API token
     ${cyan("htmlhost whoami")}                   Show current user
     ${cyan("htmlhost logout")}                   Remove saved token
 
   ${bold("Deploy options:")}
     --ttl <value>     Set TTL: 1d, 7d, 30d, never
-    --slug <slug>     Re-deploy to an existing site
+    --slug <slug>     Re-deploy to a specific site
     --title <title>   Set the site title
+    --new             Force a new site (ignore .htmlhost link)
 
   ${bold("Delete options:")}
     --force, -f       Skip confirmation prompt
 
+  ${bold("How deploy works:")}
+    1st deploy: creates a site, saves slug to ${dim(".htmlhost")}
+    2nd deploy: reads ${dim(".htmlhost")}, updates the same site
+
   ${bold("Examples:")}
-    ${dim("$")} htmlhost deploy index.html
-    ${dim("$")} htmlhost deploy index.html --ttl 30d --title "My Portfolio"
-    ${dim("$")} htmlhost deploy build/index.html --slug my-project
+    ${dim("$")} htmlhost deploy                ${dim("# deploys ./index.html")}
+    ${dim("$")} htmlhost deploy page.html      ${dim("# deploys a specific file")}
+    ${dim("$")} htmlhost deploy --ttl 30d      ${dim("# deploy with 30-day TTL")}
+    ${dim("$")} htmlhost deploy --new          ${dim("# force a new site")}
     ${dim("$")} htmlhost upload logo.png
-    ${dim("$")} htmlhost upload ./assets/
     ${dim("$")} htmlhost delete old-project --force
 
   ${dim(`Docs: https://htmlhost.co/docs`)}
@@ -41,7 +46,7 @@ export async function run(argv) {
   const command = argv[0];
   const args = argv.slice(1);
 
-  if (!command || command === "--help" || command === "-h") {
+  if (!command || command === "help" || command === "--help" || command === "-h") {
     console.log(HELP);
     return;
   }

package/src/commands/deploy.mjs

@@ -1,11 +1,59 @@
-import { readFileSync, statSync, existsSync } from "node:fs";
-import { basename, resolve } from "node:path";
+import { readFileSync, writeFileSync, statSync, existsSync } from "node:fs";
+import { basename, resolve, dirname, join } from "node:path";
+import { createInterface } from "node:readline";
 import { post } from "../api.mjs";
-import { ok, err, info, cyan, dim, bold, formatBytes } from "../ui.mjs";
+import { ok, err, info, cyan, dim, bold, yellow, formatBytes } from "../ui.mjs";
+
+const LINK_FILE = ".htmlhost";
+
+/**
+ * Read the project link from .htmlhost
+ */
+function readLink(dir) {
+  const linkPath = join(dir, LINK_FILE);
+  if (!existsSync(linkPath)) return null;
+  try {
+    return JSON.parse(readFileSync(linkPath, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Save project link to .htmlhost
+ */
+function writeLink(dir, data) {
+  const linkPath = join(dir, LINK_FILE);
+  writeFileSync(linkPath, JSON.stringify(data, null, 2) + "\n", "utf8");
+}
 
 /**
- * htmlhost deploy [file] [--ttl 7d] [--slug existing-slug] [--title "My Site"]
- * Defaults to index.html in the current directory.
+ * Interactive menu prompt — returns the index of the selected option.
+ */
+function promptChoice(question, options) {
+  return new Promise((resolve) => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    console.log("");
+    console.log(`  ${yellow("?")} ${question}`);
+    console.log("");
+    options.forEach((opt, i) => {
+      console.log(`    ${bold(String(i + 1))}. ${opt}`);
+    });
+    console.log("");
+    rl.question(`  Enter choice (1-${options.length}): `, (answer) => {
+      rl.close();
+      const idx = parseInt(answer.trim(), 10) - 1;
+      resolve(idx >= 0 && idx < options.length ? idx : -1);
+    });
+  });
+}
+
+/**
+ * htmlhost deploy [file] [--ttl 7d] [--slug existing-slug] [--title "My Site"] [--new]
+ *
+ * - Defaults to index.html in the current directory
+ * - Remembers the site via .htmlhost file (auto re-deploy)
+ * - Use --new to force a fresh deploy
  */
 export async function deploy(args) {
   let file = args.find((a) => !a.startsWith("--"));
@@ -18,16 +66,72 @@ export async function deploy(args) {
       info(`No file specified, using ${cyan("index.html")}`);
     } else {
       err("No file specified and no index.html found in the current directory.");
-      console.log(`  ${dim("Usage: htmlhost deploy [file.html] [--ttl 7d] [--slug my-site]")}`);
+      console.log(`  ${dim("Usage: htmlhost deploy [file.html] [--ttl 7d]")}`);
       process.exit(1);
     }
   }
 
   const ttl = getFlag(args, "--ttl");
-  const slug = getFlag(args, "--slug");
   const title = getFlag(args, "--title");
+  const forceNew = args.includes("--new");
 
   const filePath = resolve(file);
+  const projectDir = dirname(filePath);
+
+  // Resolve slug: explicit --slug > .htmlhost link > new deploy
+  let slug = getFlag(args, "--slug");
+  let isLinked = false;
+
+  if (!slug && !forceNew) {
+    const link = readLink(projectDir);
+    if (link?.slug) {
+      // Check if user has a saved preference
+      if (link.onRedeploy === "overwrite") {
+        slug = link.slug;
+        isLinked = true;
+        info(`Linked to ${cyan(slug)} ${dim("(auto-overwrite)")}`);
+      } else if (link.onRedeploy === "new") {
+        info(`Creating new site ${dim("(auto-new)")}`);
+        // slug stays null → new deploy
+      } else {
+        // Ask the user
+        const choice = await promptChoice(
+          `This project is linked to ${cyan(bold(link.slug + ".htmlhost.co"))}`,
+          [
+            "Overwrite existing site",
+            "Create a new site instead",
+            "Cancel",
+            `Always overwrite ${dim("(remember for this project)")}`,
+            `Always create new ${dim("(remember for this project)")}`,
+          ]
+        );
+
+        switch (choice) {
+          case 0: // Overwrite
+            slug = link.slug;
+            isLinked = true;
+            break;
+          case 1: // New
+            break;
+          case 2: // Cancel
+          case -1:
+            console.log("  Cancelled.");
+            process.exit(0);
+            break;
+          case 3: // Always overwrite
+            slug = link.slug;
+            isLinked = true;
+            writeLink(projectDir, { ...link, onRedeploy: "overwrite" });
+            info(`Saved preference: ${dim("always overwrite")}`);
+            break;
+          case 4: // Always new
+            writeLink(projectDir, { ...link, onRedeploy: "new" });
+            info(`Saved preference: ${dim("always create new")}`);
+            break;
+        }
+      }
+    }
+  }
 
   // Verify file exists
   let stat;
@@ -47,7 +151,7 @@ export async function deploy(args) {
   const name = basename(filePath);
 
   info(`Reading ${cyan(name)} ${dim(`(${formatBytes(stat.size)})`)}`);
-  info("Deploying…");
+  info(slug ? `Re-deploying to ${cyan(slug)}…` : "Deploying new site…");
 
   const body = { html };
   if (ttl) body.ttl = ttl;
@@ -56,12 +160,23 @@ export async function deploy(args) {
 
   const data = await post("/api/sites", body);
 
+  // Save/update the link (preserve onRedeploy preference)
+  const existingLink = readLink(projectDir);
+  writeLink(projectDir, {
+    slug: data.slug,
+    url: data.url,
+    ...(existingLink?.onRedeploy ? { onRedeploy: existingLink.onRedeploy } : {}),
+  });
+
   console.log("");
   ok(`${bold("Live")} at ${cyan(`https://${data.url}`)}`);
   if (data.version > 1) {
     console.log(`   ${dim(`Version ${data.version} · ${data.ttl} TTL`)}`);
   } else {
     console.log(`   ${dim(`${data.slug} · ${data.ttl} TTL`)}`);
+    if (!isLinked) {
+      console.log(`   ${dim(`Linked → .htmlhost`)}`);
+    }
   }
   if (data.expiresAt) {
     const d = new Date(data.expiresAt);