@nevermorelove/ompp 0.2.2 → 0.3.0

package/README.md

@@ -34,12 +34,10 @@ ompp pentest --dry-run  show the omp command line instead of running it
 
 Before launch it prints one line to stderr, `[ompp] mode: pentest`, so you always know where you are.
 
-Modes are read from up to three places, and same-named modes from earlier
-places win:
+Modes are read from two places, and same-named modes from the first win:
 
-1. `OMPP_MODES_DIR`, if you set it
-2. `modes/` shipped next to the script (the repo checkout or the npm package)
-3. `~/.omp/ompp/modes/`, the user-level home for your own modes
+1. `OMPP_MODES_DIR`, if you set it (a repo checkout, any custom folder)
+2. `~/.omp/ompp/modes/`, the user-level home for your own modes
 
 `ompp create` always writes to `~/.omp/ompp/modes/`, so you never edit files
 inside an installed package. The first `ompp create` makes the folder for you.

package/ompp.js

@@ -19,19 +19,86 @@
 const fs = require("fs");
 const path = require("path");
 const { spawn } = require("child_process");
-
 const os = require("os");
+const https = require("https");
+// --- update check -----------------------------------------------------------
+// One registry request per run, bounded by a 5s timeout. If the registry
+// has a newer semver, print an upgrade banner.
+function fetchLatestVersion() {
+  return new Promise((resolve) => {
+    const req = https.get(
+      "https://registry.npmjs.org/@nevermorelove%2fompp",
+      { timeout: 5000 },
+      (res) => {
+        if (res.statusCode !== 200) {
+          res.resume();
+          return resolve(null);
+        }
+        let body = "";
+        res.on("data", (c) => (body += c));
+        res.on("end", () => {
+          try {
+            resolve(JSON.parse(body)["dist-tags"]?.latest ?? null);
+          } catch {
+            resolve(null);
+          }
+        });
+      },
+    );
+    req.on("timeout", () => {
+      req.destroy();
+      resolve(null);
+    });
+    req.on("error", () => resolve(null));
+  });
+}
+
+function isNewerVersion(current, latest) {
+  const parse = (v) =>
+    v.split(/[.-]/).slice(0, 3).map((n) => parseInt(n, 10) || 0);
+  const [cmaj, cmin, cpat] = parse(current);
+  const [lmaj, lmin, lpat] = parse(latest);
+  if (lmaj !== cmaj) return lmaj > cmaj;
+  if (lmin !== cmin) return lmin > cmin;
+  return lpat > cpat;
+}
+
+function printUpdateBanner(current, latest) {
+  const line = `Update available! ${current} → ${latest}`;
+  const hint = `Run "npm i -g @nevermorelove/ompp" to update`;
+  const width = Math.max(line.length, hint.length) + 4;
+  const pad = (s) => "  " + s + " ".repeat(width - 2 - s.length) + "  ";
+  console.error("┌" + "─".repeat(width) + "┐");
+  console.error("│" + " ".repeat(width) + "│");
+  console.error("│" + pad(line) + "│");
+  console.error("│" + pad(hint) + "│");
+  console.error("│" + " ".repeat(width) + "│");
+  console.error("└" + "─".repeat(width) + "┘");
+}
+
+async function checkForUpdate() {
+  if (process.env.OMPP_NO_UPDATE_CHECK === "1") return;
+  if (process.env.CI) return;
+  // Skip dev checkouts: a repo clone updates via git, not npm.
+  if (fs.existsSync(path.join(__dirname, ".git"))) return;
+
+  const current = require("./package.json").version;
+  const latest = await fetchLatestVersion();
+  if (latest && isNewerVersion(current, latest)) {
+    printUpdateBanner(current, latest);
+  }
+}
+
 
-// Modes come from up to three places, in priority order:
-//   1. OMPP_MODES_DIR (explicit override)
-//   2. modes/ next to this script (repo checkout or npm package)
-//   3. ~/.omp/ompp/modes (user-level default where `ompp create` writes)
-// Same-named modes from a higher-priority source win.
+// Modes come from two places, in priority order:
+//   1. OMPP_MODES_DIR (explicit override; repo checkout, custom folder)
+//   2. ~/.omp/ompp/modes (the user-level home; `ompp create` writes here)
+// Same-named modes from OMPP_MODES_DIR win. The folder next to the script
+// is never scanned: with a global install it sits inside node_modules, and
+// user modes must not live there.
 const DEFAULT_MODES_DIR = path.join(os.homedir(), ".omp", "ompp", "modes");
-const BUNDLED_MODES_DIR = path.join(__dirname, "modes");
 const SOURCES = [];
 if (process.env.OMPP_MODES_DIR) SOURCES.push(process.env.OMPP_MODES_DIR);
-SOURCES.push(BUNDLED_MODES_DIR);
 SOURCES.push(DEFAULT_MODES_DIR);
 const RESERVED_NAMES = ["create", "list", "help", "version"];
 const CONFIG_NAMES = ["config.yml", "config.yaml"];
@@ -278,16 +345,43 @@ function createMode(name) {
   return 0;
 }
 
+const CREATE_OPTION = "__create__";
+
+function isValidModeName(name) {
+  return /^[a-z0-9][a-z0-9-]*$/.test(name);
+}
+
 async function pickMode(modeNames) {
-  const { select, isCancel, cancel } = require("@clack/prompts");
+  const { select, text, isCancel, cancel } = require("@clack/prompts");
+  const options = [
+    ...modeNames.map((name) => ({ value: name, label: name })),
+    { value: CREATE_OPTION, label: "Create a new mode +" },
+  ];
   const chosen = await select({
     message: "Pick a mode",
-    options: modeNames.map((name) => ({ value: name, label: name })),
+    options,
   });
   if (isCancel(chosen)) {
     cancel("Cancelled");
     process.exit(130);
   }
+  if (chosen === CREATE_OPTION) {
+    const name = await text({
+      message: "New mode name",
+      validate: (v) => {
+        if (!v || !isValidModeName(v)) {
+          return "Lowercase letters, digits, and dashes only";
+        }
+        if (RESERVED_NAMES.includes(v)) return `"${v}" is reserved`;
+        return undefined;
+      },
+    });
+    if (isCancel(name)) {
+      cancel("Cancelled");
+      process.exit(130);
+    }
+    return { create: name };
+  }
   return chosen;
 }
 
@@ -315,7 +409,39 @@ function pickModePiped(modeNames) {
 
 
 
+// Spawn omp in the given mode.
+function launchMode(mode, userArgs, dryRun) {
+  const modeDir = modeDirOf(mode.name, mode.source);
+  const args = buildArgv(modeDir, userArgs);
+  const { bin, shell } = resolveBin();
+
+  if (dryRun) {
+    console.error(`[ompp] mode: ${mode.name}`);
+    console.error(`[ompp] omp: ${bin}${shell ? " (shell)" : ""}`);
+    console.error(`[ompp] argv: ${JSON.stringify(args)}`);
+    return 0;
+  }
+
+  console.error(`[ompp] mode: ${mode.name}`);
+  const child = shell
+    ? spawn([winQuote(bin), ...args.map(winQuote)].join(" "), {
+        stdio: "inherit",
+        shell: true,
+      })
+    : spawn(bin, args, { stdio: "inherit" });
+  child.on("error", (err) => {
+    console.error(`[ompp] failed to start omp: ${err.message}`);
+    process.exitCode = 1;
+  });
+  child.on("exit", (code, signal) => {
+    process.exitCode = code ?? (signal ? 1 : 0);
+  });
+  return 0;
+}
+
 async function main() {
+  await checkForUpdate();
+
   const argv = process.argv.slice(2);
 
   if (argv[0] === "create") {
@@ -358,13 +484,29 @@ async function main() {
       `[ompp] skipped folders without recognized files: ${skipped.join(", ")}`,
     );
   }
-  if (!modes.length) {
+  if (!modes.length && !process.stdin.isTTY) {
     console.error(
       `You have no modes yet. Create one with "ompp create <name>".`,
     );
     for (const s of SOURCES) console.error(`[ompp] looked in: ${s}`);
     return 1;
   }
+  if (!modes.length) {
+    // TTY with zero modes: jump straight into creating the first one.
+    try {
+      const picked = await pickMode([]);
+      if (picked && typeof picked === "object" && picked.create) {
+        const created = createMode(picked.create);
+        if (created !== 0) return created;
+        const mode2 = { name: picked.create, source: DEFAULT_MODES_DIR };
+        return launchMode(mode2, userArgs, dryRun);
+      }
+      return 1;
+    } catch (err) {
+      console.error(`[ompp] ${err.message}`);
+      return 1;
+    }
+  }
 
   const modeNames = modes.map((m) => m.name);
   let mode = null;
@@ -380,44 +522,28 @@ async function main() {
       console.error(`[ompp] available: ${modeNames.join(", ")}`);
       return 1;
     }
-  } else {
+  }
+
+  if (!mode) {
     try {
-      const name = process.stdin.isTTY
+      const picked = process.stdin.isTTY
         ? await pickMode(modeNames)
         : await pickModePiped(modeNames);
-      mode = modes.find((m) => m.name === name);
+      if (picked && typeof picked === "object" && picked.create) {
+        const created = createMode(picked.create);
+        if (created !== 0) return created;
+        // Launch the freshly created mode right away.
+        mode = { name: picked.create, source: DEFAULT_MODES_DIR };
+      } else {
+        mode = modes.find((m) => m.name === picked);
+      }
     } catch (err) {
       console.error(`[ompp] ${err.message}`);
       return 1;
     }
   }
 
-  const modeDir = modeDirOf(mode.name, mode.source);
-  const args = buildArgv(modeDir, userArgs);
-  const { bin, shell } = resolveBin();
-
-  if (dryRun) {
-    console.error(`[ompp] mode: ${mode.name}`);
-    console.error(`[ompp] omp: ${bin}${shell ? " (shell)" : ""}`);
-    console.error(`[ompp] argv: ${JSON.stringify(args)}`);
-    return 0;
-  }
-
-  console.error(`[ompp] mode: ${mode.name}`);
-  const child = shell
-    ? spawn([winQuote(bin), ...args.map(winQuote)].join(" "), {
-        stdio: "inherit",
-        shell: true,
-      })
-    : spawn(bin, args, { stdio: "inherit" });
-  child.on("error", (err) => {
-    console.error(`[ompp] failed to start omp: ${err.message}`);
-    process.exitCode = 1;
-  });
-  child.on("exit", (code, signal) => {
-    process.exitCode = code ?? (signal ? 1 : 0);
-  });
-  return 0;
+  return launchMode(mode, userArgs, dryRun);
 }
 
 main()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermorelove/ompp",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Mode presets for the omp coding agent: one folder per mode, zero config code.",
   "repository": {
     "type": "git",