@nevermorelove/ompp 0.1.0 → 0.2.1

package/README.md

@@ -8,32 +8,44 @@ ompp gives each kind of work a name and a folder. Launch a session in a mode and
 
 ## Install
 
+```sh
+npm install -g @nevermorelove/ompp
+```
+
+Node 18 or newer, that is the whole requirement. bun works too. The binary is
+named `ompp` even though the package is scoped. You can also install from
+source:
+
 ```sh
 git clone git@github.com:ForeverInLaw/ompp.git
 cd ompp
 npm install -g .
 ```
 
-Node 18 or newer, that is the whole requirement. bun works too. After install, `ompp` is on your PATH. To update, `git pull` and install again.
-
-## Usage
-
 ```sh
 ompp                    arrow-key picker, then launches omp
 ompp pentest            launch in a mode
 ompp writing -p "..."   mode plus any omp flags
+ompp create pentest     make a new mode with placeholder files,
+                         then open its folder in your file manager
 ompp list               print mode names
 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.
 
-## What a mode is
+Modes are read from up to three places, and same-named modes from earlier
+places win:
 
-A folder under `modes/`. Every file is optional, whatever exists gets wired into the launch flags.
+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
+
+`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.
 
 ```
-modes/pentest/
+~/.omp/ompp/modes/pentest/
   config.yml      settings overlay
   system.md       full system prompt replacement
   append.md       prompt addendum, used when system.md is absent
@@ -49,7 +61,9 @@ modes/pentest/
 | `append.md` | `--append-system-prompt` | Rides on top of your normal prompt. This is what most modes want. |
 | the folder itself | `--plugin-dir` | omp treats the mode folder as a plugin root, so `skills/` and `.mcp.json` inside it load too. |
 
-A new mode is `mkdir modes/<name>` plus files. No manifest, no code. The wrapper reads the folder, so it never needs to change when you add modes. `modes/general` is a working example to copy from.
+A new mode is `ompp create <name>` (or plain `mkdir` plus files). No manifest,
+no code. The wrapper reads the folder, so it never needs to change when you
+add modes. `modes/general` in the repo is a working example.
 
 ## Precedence
 
@@ -65,9 +79,7 @@ MCP servers can be added by a mode but never removed. omp has no launch-time MCP
 
 Mode-local `skills/` are additive as well. To have fewer skills, set `skills.includeSkills` in the mode's `config.yml`. The allowlist filters every discovered skill, global ones included.
 
-The picker needs a TTY. Piped or otherwise headless stdin gets a numbered prompt instead.
-
 ## Environment
 
-- `OMPP_MODES_DIR`, where modes live. Default is `modes/` next to the script.
+- `OMPP_MODES_DIR`, an extra modes directory that wins over the bundled one.
 - `OMPP_OMP_BIN`, which omp to launch. Default is omp from PATH.

package/ompp.js

@@ -20,7 +20,20 @@ const fs = require("fs");
 const path = require("path");
 const { spawn } = require("child_process");
 
-const MODES_DIR = process.env.OMPP_MODES_DIR || path.join(__dirname, "modes");
+const os = require("os");
+
+// 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.
+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"];
 const PLUGIN_ARTIFACTS = [
   "skills",
@@ -32,6 +45,10 @@ const PLUGIN_ARTIFACTS = [
   "tools",
 ];
 
+function modeDirOf(name, source) {
+  return path.join(source, name);
+}
+
 function firstExisting(dir, names) {
   for (const n of names) {
     const p = path.join(dir, n);
@@ -40,27 +57,43 @@ function firstExisting(dir, names) {
   return null;
 }
 
-function discoverModes() {
-  const modes = [];
-  const skipped = [];
-  if (!fs.existsSync(MODES_DIR)) return { modes, skipped };
+function scanSource(source, modes, skipped, seen) {
+  if (!fs.existsSync(source)) return;
   const entries = fs
-    .readdirSync(MODES_DIR, { withFileTypes: true })
+    .readdirSync(source, { withFileTypes: true })
     .filter((e) => e.isDirectory())
     .map((e) => e.name)
     .sort();
   for (const name of entries) {
     if (name.startsWith(".") || name.startsWith("_")) continue;
-    const dir = path.join(MODES_DIR, name);
+    const dir = modeDirOf(name, source);
     const hasSomething = firstExisting(dir, [
       ...CONFIG_NAMES,
       "system.md",
       "append.md",
       ...PLUGIN_ARTIFACTS,
     ]);
-    if (hasSomething) modes.push(name);
-    else skipped.push(name);
+    if (!hasSomething) {
+      skipped.push(name);
+      continue;
+    }
+    if (seen.has(name)) {
+      // A same-named mode from a higher-priority source already won.
+      console.error(
+        `[ompp] mode "${name}" exists in several mode folders; using the one in ${modeDirOf(name, SOURCES[0])}`,
+      );
+      continue;
+    }
+    seen.add(name);
+    modes.push({ name, source });
   }
+}
+
+function discoverModes() {
+  const modes = [];
+  const skipped = [];
+  const seen = new Set();
+  for (const source of SOURCES) scanSource(source, modes, skipped, seen);
   return { modes, skipped };
 }
 
@@ -130,9 +163,13 @@ Usage:
   ompp                    pick a mode interactively, then launch omp
   ompp <mode> [args...]   launch omp in a mode; everything after <mode>
                           is passed to omp unchanged and wins over the mode
+  ompp create <name>      create a new mode with placeholder files
+                          and open its folder
   ompp list               list available modes
 
-A mode is a folder under modes/. All files are optional:
+Modes live in ~/.omp/ompp/modes/ (created for you by "ompp create") and,
+if OMPP_MODES_DIR is set, in that folder too. Same-named modes from
+OMPP_MODES_DIR win. All files are optional:
   config.yml              settings overlay: model, thinking level,
                          skills.includeSkills allowlist, approval mode, ...
   system.md               replaces the system prompt entirely
@@ -147,124 +184,154 @@ Flags:
   -v, --version           version
 
 Environment:
-  OMPP_MODES_DIR          modes directory (default: modes/ next to this script)
+  OMPP_MODES_DIR          extra modes directory (repo checkout or custom)
   OMPP_OMP_BIN            omp executable to launch (default: omp from PATH)`);
 }
 
-function pickInteractive(modes) {
-  return new Promise((resolve, reject) => {
-    const stdin = process.stdin;
-    let idx = 0;
-    let settled = false;
-
-    const finish = (value) => {
-      if (settled) return;
-      settled = true;
-      stdin.removeListener("data", onData);
-      stdin.setRawMode(false);
-      process.stdout.write("\u001b[?25h"); // show cursor
-      if (value === null) reject(new Error("mode selection cancelled"));
-      else resolve(value);
-    };
-
-    const render = (first) => {
-      if (!first) process.stdout.write(`\u001b[${modes.length}A`);
-      const body = modes
-        .map((m, i) => (i === idx ? "> " + m : "  " + m))
-        .map((l) => "\u001b[2K" + l)
-        .join("\n");
-      process.stdout.write("\u001b[?25l" + body + "\n");
-    };
-
-    function onData(buf) {
-      // A single read can carry several keys (arrow + Enter glued together,
-      // a paste). Walk key by key instead of matching the whole chunk.
-      const s = buf.toString();
-      let i = 0;
-      while (i < s.length) {
-        const ch = s[i];
-        if (ch === "\u001b") {
-          const seq = s.slice(i);
-          if (seq.startsWith("\u001b[A") || seq.startsWith("\u001b[B") ||
-              seq.startsWith("\u001b[C") || seq.startsWith("\u001b[D")) {
-            if (seq.startsWith("\u001b[A")) {
-              idx = (idx - 1 + modes.length) % modes.length;
-              render(false);
-            } else if (seq.startsWith("\u001b[B")) {
-              idx = (idx + 1) % modes.length;
-              render(false);
-            } // C/D: left/right, ignore
-            i += 3;
-            continue;
-          }
-          if (seq.length === 1) {
-            // Bare escape with nothing after it in this chunk: cancel.
-            finish(null);
-            process.exit(0);
-          }
-          i++; // unknown or split sequence, skip the escape byte
-          continue;
-        }
-        if (ch === "\r" || ch === "\n") return finish(modes[idx]);
-        if (ch === "\u0003") {
-          // Ctrl+C: restore the terminal and bail like a shell would.
-          finish(null);
-          process.exit(130);
-        }
-        if (ch === "q") {
-          finish(null);
-          process.exit(0);
-        }
-        if (ch === "j") {
-          idx = (idx + 1) % modes.length;
-          render(false);
-        }
-        if (ch === "k") {
-          idx = (idx - 1 + modes.length) % modes.length;
-          render(false);
-        }
-        i++;
-      }
+const CONFIG_TEMPLATE = `# Settings overlay for this mode. Every line is optional:
+# uncomment what you need. See "omp config list" for all keys.
+
+# modelRoles:
+#   default: anthropic/claude-sonnet-4-5
+# defaultThinkingLevel: high
+# tools:
+#   approvalMode: write
+
+# Allowlist of skills this mode can see. Globs are allowed.
+# Empty (or absent) means every discovered skill loads.
+# skills:
+#   includeSkills:
+#     - tdd
+#     - diagnosing-bugs
+`;
+
+const APPEND_TEMPLATE = `# Extra instructions added on top of your normal system prompt.
+# This file is plain text: delete these lines and write your own.
+
+Answer directly and briefly. No preamble, no restating the question.
+`;
+
+const SYSTEM_TEMPLATE = `# Rename this file to system.md to REPLACE the whole system prompt
+# instead of appending. Replacing drops omp's default instructions and
+# your global ~/.omp/agent/SYSTEM.md, including tool policy: write
+# what you need into the file itself.
+`;
+
+const MCP_TEMPLATE = `{
+  "mcpServers": {
+    "example": {
+      "type": "http",
+      "url": "https://mcp.example.com/mcp"
     }
+  }
+}
+`;
+
+function revealInFileManager(dir) {
+  const cmd =
+    process.platform === "win32"
+      ? { bin: "explorer", args: [dir] }
+      : process.platform === "darwin"
+        ? { bin: "open", args: [dir] }
+        : { bin: "xdg-open", args: [dir] };
+  const child = spawn(cmd.bin, cmd.args, { stdio: "ignore", detached: true });
+  child.on("error", (err) => {
+    console.error(`[ompp] could not open a file manager: ${err.message}`);
+  });
+  child.unref();
+}
 
-    stdin.setRawMode(true);
-    stdin.resume();
-    stdin.on("data", onData);
-    render(true);
+function createMode(name) {
+  if (!name) {
+    console.error(`[ompp] usage: ompp create <name>`);
+    return 1;
+  }
+  if (!/^[a-z0-9][a-z0-9-]*$/.test(name)) {
+    console.error(
+      `[ompp] "${name}" is not a valid mode name. Use lowercase letters, digits, and dashes.`,
+    );
+    return 1;
+  }
+  if (RESERVED_NAMES.includes(name)) {
+    console.error(`[ompp] "${name}" is reserved for ompp commands.`);
+    return 1;
+  }
+
+  // Always create in the user-level default, regardless of OMPP_MODES_DIR.
+  const dir = modeDirOf(name, DEFAULT_MODES_DIR);
+  if (fs.existsSync(dir)) {
+    console.error(`[ompp] mode "${name}" already exists, opening its folder.`);
+    revealInFileManager(dir);
+    return 0;
+  }
+
+  fs.mkdirSync(path.join(dir, "skills"), { recursive: true });
+  fs.writeFileSync(path.join(dir, "config.yml"), CONFIG_TEMPLATE);
+  fs.writeFileSync(path.join(dir, "append.md"), APPEND_TEMPLATE);
+  fs.writeFileSync(path.join(dir, "system.md.example"), SYSTEM_TEMPLATE);
+  fs.writeFileSync(path.join(dir, ".mcp.json.example"), MCP_TEMPLATE);
+  fs.writeFileSync(path.join(dir, "skills", ".gitkeep"), "");
+
+  console.error(`[ompp] created mode "${name}" in ${dir}`);
+  revealInFileManager(dir);
+  console.error(`[ompp] edit the placeholders, then launch it: ompp ${name}`);
+  return 0;
+}
+
+async function pickMode(modeNames) {
+  const { select, isCancel, cancel } = require("@clack/prompts");
+  const chosen = await select({
+    message: "Pick a mode",
+    options: modeNames.map((name) => ({ value: name, label: name })),
   });
+  if (isCancel(chosen)) {
+    cancel("Cancelled");
+    process.exit(130);
+  }
+  return chosen;
 }
 
-function pickByNumber(modes) {
+// Non-TTY stdin: clack needs an interactive terminal, so numbered input.
+function pickModePiped(modeNames) {
   return new Promise((resolve, reject) => {
     const readline = require("readline");
     const rl = readline.createInterface({ input: process.stdin });
     process.stdout.write("Select a mode:\n");
-    modes.forEach((m, i) => process.stdout.write(`  ${i + 1}. ${m}\n`));
-    process.stdout.write(`Choice [1-${modes.length}]: `);
+    modeNames.forEach((m, i) => process.stdout.write(`  ${i + 1}. ${m}\n`));
+    process.stdout.write(`Choice [1-${modeNames.length}]: `);
+    let done = false;
     rl.once("line", (line) => {
+      done = true;
       rl.close();
       const n = parseInt(line.trim(), 10);
-      if (n >= 1 && n <= modes.length) resolve(modes[n - 1]);
+      if (n >= 1 && n <= modeNames.length) resolve(modeNames[n - 1]);
       else reject(new Error(`"${line.trim()}" is not a valid choice`));
     });
     rl.once("close", () => {
-      reject(new Error("no mode selected"));
+      if (!done) reject(new Error("no mode selected"));
     });
   });
 }
 
+
+
 async function main() {
   const argv = process.argv.slice(2);
 
+  if (argv[0] === "create") {
+    return createMode(argv[1]);
+  }
+
   if (argv[0] === "list") {
     const { modes, skipped } = discoverModes();
     if (!modes.length) {
       console.error(
-        `[ompp] no modes found in ${MODES_DIR}. Create modes/<name>/ with at least one mode file.`,
+        `[ompp] no modes found. Run "ompp create <name>" to make one.`,
       );
+      for (const s of SOURCES) console.error(`[ompp] looked in: ${s}`);
       return 1;
     }
-    for (const m of modes) console.log(m);
+    for (const m of modes) console.log(m.name);
     if (skipped.length) {
       console.error(
         `[ompp] skipped folders without recognized files: ${skipped.join(", ")}`,
@@ -293,46 +360,50 @@ async function main() {
   }
   if (!modes.length) {
     console.error(
-      `[ompp] no modes found in ${MODES_DIR}. Create modes/<name>/ with at least one mode file.`,
+      `[ompp] no modes found. Run "ompp create <name>" to make one.`,
     );
+    for (const s of SOURCES) console.error(`[ompp] looked in: ${s}`);
     return 1;
   }
 
+  const modeNames = modes.map((m) => m.name);
   let mode = null;
   let userArgs = rest;
   if (rest.length && !rest[0].startsWith("-")) {
     const candidate = rest[0];
-    if (modes.includes(candidate)) {
-      mode = candidate;
+    const found = modes.find((m) => m.name === candidate);
+    if (found) {
+      mode = found;
       userArgs = rest.slice(1);
     } else {
       console.error(`[ompp] unknown mode "${candidate}"`);
-      console.error(`[ompp] available: ${modes.join(", ")}`);
+      console.error(`[ompp] available: ${modeNames.join(", ")}`);
       return 1;
     }
   } else {
     try {
-      mode = process.stdin.isTTY
-        ? await pickInteractive(modes)
-        : await pickByNumber(modes);
+      const name = process.stdin.isTTY
+        ? await pickMode(modeNames)
+        : await pickModePiped(modeNames);
+      mode = modes.find((m) => m.name === name);
     } catch (err) {
       console.error(`[ompp] ${err.message}`);
       return 1;
     }
   }
 
-  const modeDir = path.join(MODES_DIR, mode);
+  const modeDir = modeDirOf(mode.name, mode.source);
   const args = buildArgv(modeDir, userArgs);
   const { bin, shell } = resolveBin();
 
   if (dryRun) {
-    console.error(`[ompp] mode: ${mode}`);
+    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}`);
+  console.error(`[ompp] mode: ${mode.name}`);
   const child = shell
     ? spawn([winQuote(bin), ...args.map(winQuote)].join(" "), {
         stdio: "inherit",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermorelove/ompp",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Mode presets for the omp coding agent: one folder per mode, zero config code.",
   "repository": {
     "type": "git",
@@ -24,5 +24,8 @@
     "cli"
   ],
   "author": "ForeverInLaw",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "@clack/prompts": "^1.8.1"
+  }
 }