@moor-sh/cli 0.1.0 → 0.2.1

package/README.md

@@ -0,0 +1,75 @@
+# @moor-sh/cli
+
+Command-line interface for [moor](https://github.com/caiopizzol/moor) - manage your moor server's projects, logs, env vars, and container lifecycle from a terminal. Ships a `moor` binary.
+
+Requires [Bun](https://bun.sh) on the machine running the CLI.
+
+## Install
+
+**One-shot** (no install):
+
+```bash
+bunx @moor-sh/cli status
+```
+
+**Global install** (puts `moor` on PATH):
+
+```bash
+bun add -g @moor-sh/cli
+moor status
+```
+
+Don't use `bunx moor` (without the scope) - `moor` on npm is an unrelated package.
+
+## Configure
+
+```bash
+export MOOR_URL=https://moor.example.com   # or http://127.0.0.1:8080 via SSH tunnel
+export MOOR_API_KEY=your-api-key
+```
+
+`MOOR_API_KEY` grants admin-equivalent control of the moor host. See the [self-hosting guide](https://github.com/caiopizzol/moor/blob/main/docs/self-hosting.md#api-keys) for how to generate and rotate it.
+
+For a remote moor with private admin (the default), open an SSH tunnel from your laptop before running CLI commands:
+
+```bash
+ssh -L 8080:127.0.0.1:3000 your-server
+export MOOR_URL=http://127.0.0.1:8080
+```
+
+## Commands
+
+```
+moor status                          # list all projects
+moor logs <project> [-f] [-n 100]    # view container logs
+moor rebuild <project>               # rebuild from source
+moor restart <project>               # stop + start
+moor exec <project> <command>        # run a command in the container
+moor env list <project>              # list environment variables
+moor env set <project> KEY=VALUE     # set environment variables and restart
+moor stats                           # server resource usage
+moor mcp config --client <name>      # generate MCP client config snippet
+```
+
+## `moor mcp config`
+
+Generates a ready-to-paste config snippet for an MCP-compatible AI client. Removes the "open a doc, copy a JSON block, fill in the blanks" step from MCP setup.
+
+```bash
+moor mcp config --client claude        # or --client claude-code (alias)
+moor mcp config --client codex
+```
+
+Output is JSON for `claude` / `claude-code` and TOML for `codex`. Prints to stdout - redirect or paste into `~/.claude.json` or `~/.codex/config.toml`. Optional flags: `--url <url>` (default `http://127.0.0.1:8080`), `--api-key <key>` (else read from `MOOR_API_KEY` env, then cwd `.env`, then a placeholder).
+
+See [`@moor-sh/mcp`](https://www.npmjs.com/package/@moor-sh/mcp) for the MCP server itself.
+
+## Links
+
+- [moor repo](https://github.com/caiopizzol/moor) - main project, install instructions
+- [Self-hosting guide](https://github.com/caiopizzol/moor/blob/main/docs/self-hosting.md) - first boot, API keys, admin domain, port model
+- [`@moor-sh/mcp`](https://www.npmjs.com/package/@moor-sh/mcp) - MCP server for AI agent integration
+
+## License
+
+MIT.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moor-sh/cli",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Command-line interface for moor - manage your moor server's projects, logs, env vars, and container lifecycle.",
   "license": "MIT",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "https://github.com/caiopizzol/moor.git",
     "directory": "packages/cli"
   },
-  "homepage": "https://github.com/caiopizzol/moor#cli",
+  "homepage": "https://github.com/caiopizzol/moor/tree/main/packages/cli",
   "bugs": "https://github.com/caiopizzol/moor/issues",
   "keywords": [
     "moor",

package/src/commands/mcp.ts

@@ -0,0 +1,136 @@
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+type Client = "claude" | "codex";
+
+const CLIENT_ALIASES: Record<string, Client> = {
+  claude: "claude",
+  "claude-code": "claude",
+  codex: "codex",
+};
+
+const DEFAULT_URL = "http://127.0.0.1:8080";
+const PLACEHOLDER_KEY = "<your-api-key>";
+
+/** Parse cwd's .env conservatively. Skips blank/comment lines, strips one
+ *  matching pair of surrounding quotes, does not interpolate or expand. */
+function parseDotEnv(path: string): Record<string, string> {
+  if (!existsSync(path)) return {};
+  const content = readFileSync(path, "utf8");
+  const env: Record<string, string> = {};
+  for (const rawLine of content.split("\n")) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith("#")) continue;
+    const eq = line.indexOf("=");
+    if (eq === -1) continue;
+    const key = line.slice(0, eq).trim();
+    let value = line.slice(eq + 1).trim();
+    if (
+      value.length >= 2 &&
+      ((value.startsWith('"') && value.endsWith('"')) ||
+        (value.startsWith("'") && value.endsWith("'")))
+    ) {
+      value = value.slice(1, -1);
+    }
+    env[key] = value;
+  }
+  return env;
+}
+
+function resolveApiKey(flagValue: string | undefined): string {
+  if (flagValue) return flagValue;
+  if (process.env.MOOR_API_KEY) return process.env.MOOR_API_KEY;
+  const dotenv = parseDotEnv(join(process.cwd(), ".env"));
+  if (dotenv.MOOR_API_KEY) return dotenv.MOOR_API_KEY;
+  return PLACEHOLDER_KEY;
+}
+
+function configFor(client: Client, url: string, apiKey: string): string {
+  if (client === "claude") {
+    return JSON.stringify(
+      {
+        mcpServers: {
+          moor: {
+            command: "bunx",
+            args: ["@moor-sh/mcp"],
+            env: { MOOR_URL: url, MOOR_API_KEY: apiKey },
+          },
+        },
+      },
+      null,
+      2,
+    );
+  }
+  // codex TOML. TOML basic-string escape rules (" and \) are a subset of
+  // JSON's, so JSON.stringify produces a valid quoted TOML string for any
+  // value - including URLs/keys that contain quotes or backslashes.
+  return [
+    "[mcp_servers.moor]",
+    'command = "bunx"',
+    'args = ["@moor-sh/mcp"]',
+    "",
+    "[mcp_servers.moor.env]",
+    `MOOR_URL = ${JSON.stringify(url)}`,
+    `MOOR_API_KEY = ${JSON.stringify(apiKey)}`,
+  ].join("\n");
+}
+
+function parseFlags(args: string[]): { client?: string; url?: string; apiKey?: string } {
+  const flags: { client?: string; url?: string; apiKey?: string } = {};
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === "--client" && i + 1 < args.length) flags.client = args[++i];
+    else if (a === "--url" && i + 1 < args.length) flags.url = args[++i];
+    else if (a === "--api-key" && i + 1 < args.length) flags.apiKey = args[++i];
+  }
+  return flags;
+}
+
+function printHelp() {
+  console.log(`moor mcp config - Generate MCP client config snippet for moor
+
+Usage: moor mcp config --client <name> [--url <url>] [--api-key <key>]
+
+Required:
+  --client <name>     One of: claude, claude-code, codex
+
+Optional:
+  --url <url>         moor URL the MCP server should reach (default: ${DEFAULT_URL})
+  --api-key <key>     bearer token. Falls back to MOOR_API_KEY env, then
+                      cwd's .env, then a placeholder.
+
+Output is printed to stdout for you to paste into your client's config file:
+  Claude Code:  ~/.claude.json
+  Codex:        ~/.codex/config.toml`);
+}
+
+export function mcpCommand(args: string[]) {
+  const subcommand = args[0];
+
+  if (subcommand === "--help" || subcommand === "-h" || subcommand === "help" || !subcommand) {
+    printHelp();
+    return;
+  }
+
+  if (subcommand !== "config") {
+    console.error(`Unknown mcp subcommand: ${subcommand}\n`);
+    printHelp();
+    process.exit(1);
+  }
+
+  const flags = parseFlags(args.slice(1));
+  if (!flags.client) {
+    console.error("moor mcp config requires --client <claude|claude-code|codex>\n");
+    printHelp();
+    process.exit(1);
+  }
+  const client = CLIENT_ALIASES[flags.client];
+  if (!client) {
+    console.error(`Unknown client: ${flags.client}. Expected one of: claude, claude-code, codex`);
+    process.exit(1);
+  }
+
+  const url = flags.url || DEFAULT_URL;
+  const apiKey = resolveApiKey(flags.apiKey);
+  console.log(configFor(client, url, apiKey));
+}

package/src/index.ts

@@ -4,6 +4,7 @@ import { join } from "node:path";
 import { envCommand } from "./commands/env";
 import { execCommand } from "./commands/exec";
 import { logsCommand } from "./commands/logs";
+import { mcpCommand } from "./commands/mcp";
 import { rebuildCommand } from "./commands/rebuild";
 import { restartCommand } from "./commands/restart";
 import { statsCommand } from "./commands/stats";
@@ -33,6 +34,7 @@ Commands:
   env list <project>              List environment variables
   env set <project> K=V [K=V ...] Set environment variables
   stats                           Show server resource usage
+  mcp config --client <name>      Generate MCP client config snippet
 
 Environment:
   MOOR_URL      Server URL (e.g. https://moor.example.com)
@@ -64,6 +66,9 @@ switch (command) {
   case "stats":
     await statsCommand();
     break;
+  case "mcp":
+    mcpCommand(args.slice(1));
+    break;
   case "--help":
   case "-h":
   case "help":